Sync with portage [Thu Mar 18 08:43:12 MSK 2021].

acct-group/crontab/crontab-0.ebuild

@@ -0,0 +1,8 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=460

acct-group/crontab/metadata.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
+</pkgmetadata>

app-admin/ansible-base/Manifest

@@ -1,2 +1,3 @@
 DIST ansible-base-2.10.4.tar.gz 5708083 BLAKE2B dcae17dd84dd1985703bf55bffd4a7907ecf072fcc52c76633fd2fc1d3461901b284002f69ce542ab8447f7aa6a2f65ff4c9abca1a7c1c8df3ad69a4179b1c33 SHA512 50dcccc0b40f47590d3ea56907f987bddbb858952b0d6a999db0b706232a571037dc31e66a773370be57ca14d11a7091c53a480d7f3cecf4a5e7f91895661100
 DIST ansible-base-2.10.5.tar.gz 5714628 BLAKE2B 28860023f652866b82fff6441cb5ec928de8a19f04c0d354107882854ada3d3637573e3a933d39aa64b5d3f743dec2adf759aa4fd2e9c051a0f4096a8807c338 SHA512 2449a36bdea7242a3f4e248e42388339299340cd6c377d6a20b02803db527895912e49040f3931a1aa2ebf04e3d4d5594cfc08aec28da44b73c8206dc81ddb89
+DIST ansible-base-2.10.7.tar.gz 5737915 BLAKE2B f86e7ec00c73b8f644e261d89bb5b665a0c94cba6cb5dd983b7493715f5d5843812a49684f998f92c1b70879c4d134ef803b43a5c129e443fcea3b9b0fa35a18 SHA512 170a159956b577e122421d016ed81fbeda34de8036a6294e70999a8f0c1eebb2406e6f5766b7f2e00fbf06e01d45ee343c98dd74d667f9bedfa8a88c84c805a0

app-admin/ansible-base/ansible-base-2.10.7.ebuild

@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+IUSE="test"
+RESTRICT="test"
+# doc removed due to https://github.com/ansible/ansible/issues/71395
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+	!<app-admin/ansible-2.10
+"
+# ansible-2.10 or above is needed for the collections
+DEPEND="
+	!<app-admin/ansible-2.10
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+python_compile() {
+	# disable version checks on upgrade
+	export ANSIBLE_SKIP_CONFLICT_CHECK=1
+	distutils-r1_python_compile
+}
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	dodoc -r examples
+}

app-admin/ansible/Manifest

@@ -1,2 +1,3 @@
 DIST ansible-2.10.5.tar.gz 29123326 BLAKE2B a63ba7d26d2bf49f8367c48962ad77461994601b073986342ce090f7ec16a2c4d23e9176f9463adb558996ad33a5b6e27bf829983e648f2b9b3d9992b7678f01 SHA512 9eca87e0a98e2641112ac3c4fff07d624afa3db9655ba88d3ac5faa76464f7e89f6a64fe0613582c6e5528c2c0408fe1ee237f4c69353bdfcd73b264444fe3dc
 DIST ansible-2.10.6.tar.gz 29620960 BLAKE2B 4a894eb100b7351e5b9c24e163333fde37fd2f5a0ab34e248e59a0196d81393165796b1b76993c883a08fe378ce12dbbeb289c6146a9b135b42afa831d4d83f7 SHA512 d5d2af728f3f6ff281e078fd4791c7278819d79d6c734f8e9d01fa549f0db25241045456d6aa6e8ccbceab4905039e7431c9db3aaaa89acb01ca599186963e24
+DIST ansible-2.10.7.tar.gz 29862966 BLAKE2B fa86deaac034adc8e02f91cbf4b63ca718d50376cab19e156c85f8372c1787275e2ce24840fc3cbad2b9191146c785feafcf024a0c14052ee39a839390cc1319 SHA512 7a6522bcc57c178c9c6e87e313f6f175d5c74ac0d1b9dd0cad5506c7fa0efb16d4a627dc2d9c73f988177544bd9ccfdbec162d0feacc757edeb20280d7414191

app-admin/ansible/ansible-2.10.7.ebuild

@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
+	EGIT_BRANCH="devel"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="test"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+	app-admin/ansible-base
+"
+DEPEND="
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	app-admin/ansible-base
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+python_compile() {
+	export ANSIBLE_SKIP_CONFLICT_CHECK=1
+	distutils-r1_python_compile
+}
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}

app-admin/checksec/checksec-2.4.0.ebuild

@@ -10,7 +10,7 @@ SRC_URI="https://github.com/slimm609/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 S="${WORKDIR}"/${MY_PN}-${PV}

app-admin/conky/Manifest

@@ -1,2 +1,2 @@
-DIST conky-1.10.8.tar.gz 373075 BLAKE2B 749d8bb37557c1eeb8b07955bbd45704fadb41995fad8380dd89afdf7b0c9dce02d19692691e3ef1857d849c05eae1b2fdf20243460d767199a681aeb9e87746 SHA512 743b1d17db4ae654c7a319fe9157e9ebc5eb4ae0462a1f7269332d379e8bdd1dbfecc3ab6f46c8b5176b7e40918301649ac3ee883a84dc4fc8d766abbac6585a
 DIST conky-1.11.6.tar.gz 2402216 BLAKE2B 573e2a16781ffb246041052796fd2e2f02937e0e1399edb6b8d0a16b90bbd73f84b3332d7dfba4d8bf53becc05b907efaf33fc48d4efda425c87756d44fe35f4 SHA512 f7bffcef33680d61d0171ba50b29ddda011c1c1989fc847cd4b5b60d46bed4772294eec34fd27c4d642a9c03e3cedaa31855ffc0f3b60791f4bed14ffdf7490a
+DIST conky-1.12.1.tar.gz 2404597 BLAKE2B 9e751844db9d1c90990b1e7dd5d9731330244f6ee772a7403e3520636f2ac930ccf3219e65da970d63396512cf843d4f8137854781fdf3c797fe910a8edb872d SHA512 897c6b83528809aa2e33e15b9ad6644d8cf36f4cff93f014811754f982c13180001b972b2b145b607de8d865c2af9a425ab50246065f537e14be75da5631593a

app-admin/conky/conky-1.10.8-r9.ebuild

@@ -1,185 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake linux-info readme.gentoo-r1
-
-DESCRIPTION="An advanced, highly configurable system monitor for X"
-HOMEPAGE="https://github.com/brndnmtthws/conky"
-SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3 BSD LGPL-2.1 MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ppc64 sparc x86"
-IUSE="apcupsd cmus curl eve hddtemp ical iconv imlib iostats ipv6 irc
-	lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax ncurses
-	nvidia +portmon pulseaudio rss systemd thinkpad truetype vim-syntax
-	weather-metar webserver wifi X xmms2"
-
-COMMON_DEPEND="
-	X? (
-		imlib? ( media-libs/imlib2[X] )
-		lua-cairo? ( >=dev-lua/toluapp-1.0.93 x11-libs/cairo[X] )
-		lua-imlib? ( >=dev-lua/toluapp-1.0.93 media-libs/imlib2[X] )
-		lua-rsvg? ( >=dev-lua/toluapp-1.0.93 gnome-base/librsvg )
-		nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
-		truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
-		x11-libs/libX11
-		x11-libs/libXdamage
-		x11-libs/libXinerama
-		x11-libs/libXfixes
-		x11-libs/libXext
-		xmms2? ( media-sound/xmms2 )
-	)
-	cmus? ( media-sound/cmus )
-	curl? ( net-misc/curl )
-	eve? ( net-misc/curl dev-libs/libxml2 )
-	ical? ( dev-libs/libical:= )
-	iconv? ( virtual/libiconv )
-	irc? ( net-libs/libircclient )
-	mysql? ( dev-db/mysql-connector-c )
-	ncurses? ( sys-libs/ncurses:= )
-	pulseaudio? ( media-sound/pulseaudio )
-	rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 )
-	systemd? ( sys-apps/systemd )
-	wifi? ( net-wireless/wireless-tools )
-	weather-metar? ( net-misc/curl )
-	webserver? ( net-libs/libmicrohttpd )
-	|| ( dev-lang/lua:0 dev-lang/lua:5.1 )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	apcupsd? ( sys-power/apcupsd )
-	hddtemp? ( app-admin/hddtemp )
-	moc? ( media-sound/moc )
-	nano-syntax? ( app-editors/nano )
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	app-text/docbook2X
-"
-
-CONFIG_CHECK="~IPV6"
-
-DOCS=( README.md TODO ChangeLog NEWS AUTHORS )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-use-pkgconfig.patch
-	"${FILESDIR}"/${P}-libical-3.patch
-	"${FILESDIR}"/${P}-portmon.patch
-	"${FILESDIR}"/${P}-clang.patch
-)
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="You can find sample configurations at ${ROOT}/usr/share/doc/${PF}.
-To customize, copy to ${XDG_CONFIG_HOME}/conky/conky.conf
-and edit it to your liking.
-
-There are pretty html docs available at the conky homepage
-or in ${ROOT}/usr/share/doc/${PF}/html.
-
-Also see https://wiki.gentoo.org/wiki/Conky/HOWTO"
-
-pkg_setup() {
-	use ipv6 && linux-info_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -i -e "s|find_program(APP_MAN man)|set(APP_MAN $(which man) CACHE FILEPATH MAN_BINARY)|" \
-		cmake/ConkyPlatformChecks.cmake || die
-}
-
-src_configure() {
-	local mycmakeargs
-
-	if use X; then
-		mycmakeargs=(
-			-DBUILD_X11=ON
-			-DOWN_WINDOW=ON
-			-DBUILD_XDAMAGE=ON
-			-DBUILD_XINERAMA=ON
-			-DBUILD_XDBE=ON
-			-DBUILD_XFT=$(usex truetype)
-			-DBUILD_IMLIB2=$(usex imlib)
-			-DBUILD_XSHAPE=ON
-			-DBUILD_ARGB=ON
-			-DBUILD_LUA_CAIRO=$(usex lua-cairo)
-			-DBUILD_LUA_IMLIB2=$(usex lua-imlib)
-			-DBUILD_LUA_RSVG=$(usex lua-rsvg)
-			-DBUILD_NVIDIA=$(usex nvidia)
-			-DBUILD_XMMS2=$(usex xmms2)
-		)
-	else
-		mycmakeargs=(
-			-DBUILD_X11=OFF
-			-DBUILD_NVIDIA=OFF
-			-DBUILD_LUA_CAIRO=OFF
-			-DBUILD_LUA_IMLIB2=OFF
-			-DBUILD_LUA_RSVG=OFF
-			-DBUILD_XMMS2=OFF
-		)
-	fi
-
-	mycmakeargs+=(
-		-DBUILD_APCUPSD=$(usex apcupsd)
-		-DBUILD_CMUS=$(usex cmus)
-		-DBUILD_CURL=$(usex curl)
-		-DBUILD_EVE=$(usex eve)
-		-DBUILD_HDDTEMP=$(usex hddtemp)
-		-DBUILD_IOSTATS=$(usex iostats)
-		-DBUILD_ICAL=$(usex ical)
-		-DBUILD_ICONV=$(usex iconv)
-		-DBUILD_IPV6=$(usex ipv6)
-		-DBUILD_IRC=$(usex irc)
-		-DBUILD_MATH=$(usex math)
-		-DBUILD_MOC=$(usex moc)
-		-DBUILD_MPD=$(usex mpd)
-		-DBUILD_MYSQL=$(usex mysql)
-		-DBUILD_NCURSES=$(usex ncurses)
-		-DBUILD_PORT_MONITORS=$(usex portmon)
-		-DBUILD_PULSEAUDIO=$(usex pulseaudio)
-		-DBUILD_RSS=$(usex rss)
-		-DBUILD_JOURNAL=$(usex systemd)
-		-DBUILD_IBM=$(usex thinkpad)
-		-DBUILD_HTTP=$(usex webserver)
-		-DBUILD_WEATHER_METAR=$(usex weather-metar)
-		-DBUILD_WLAN=$(usex wifi)
-		-DBUILD_BUILTIN_CONFIG=ON
-		-DBUILD_OLD_CONFIG=ON
-		-DBUILD_I18N=ON
-		-DMAINTAINER_MODE=ON
-		-DRELEASE=ON
-		-DBUILD_AUDACIOUS=OFF
-		-DBUILD_BMPX=OFF
-		-DDOC_PATH=/usr/share/doc/${PF}
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${S}"/extras/vim/ftdetect/conkyrc.vim
-
-		insinto /usr/share/vim/vimfiles/syntax
-		doins "${S}"/extras/vim/syntax/conkyrc.vim
-	fi
-
-	if use nano-syntax; then
-		insinto /usr/share/nano/
-		doins "${S}"/extras/nano/conky.nanorc
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}

app-admin/conky/conky-1.12.1.ebuild

@@ -1,9 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake linux-info readme.gentoo-r1
+LUA_COMPAT=( lua5-3 )
+
+inherit cmake linux-info lua-single readme.gentoo-r1 xdg
 
 DESCRIPTION="An advanced, highly configurable system monitor for X"
 HOMEPAGE="https://github.com/brndnmtthws/conky"
@@ -12,41 +14,40 @@ SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 LICENSE="GPL-3 BSD LGPL-2.1 MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="apcupsd cmus curl eve hddtemp ical iconv imlib iostats ipv6 irc
+IUSE="apcupsd bundled-toluapp cmus curl doc hddtemp ical iconv imlib iostats
-	lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax ncurses
+	ipv6 irc lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax
-	nvidia +portmon pulseaudio rss systemd thinkpad truetype vim-syntax
+	ncurses nvidia +portmon pulseaudio rss systemd thinkpad truetype
-	weather-metar webserver wifi X xmms2"
+	vim-syntax weather-metar webserver wifi X xinerama xmms2"
 
 COMMON_DEPEND="
-	X? (
-		imlib? ( media-libs/imlib2[X] )
-		lua-cairo? ( >=dev-lua/toluapp-1.0.93 x11-libs/cairo[X] )
-		lua-imlib? ( >=dev-lua/toluapp-1.0.93 media-libs/imlib2[X] )
-		lua-rsvg? ( >=dev-lua/toluapp-1.0.93 gnome-base/librsvg )
-		nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
-		truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
-		x11-libs/libX11
-		x11-libs/libXdamage
-		x11-libs/libXinerama
-		x11-libs/libXfixes
-		x11-libs/libXext
-		xmms2? ( media-sound/xmms2 )
-	)
 	cmus? ( media-sound/cmus )
 	curl? ( net-misc/curl )
-	eve? ( net-misc/curl dev-libs/libxml2 )
 	ical? ( dev-libs/libical:= )
 	iconv? ( virtual/libiconv )
+	imlib? ( media-libs/imlib2[X] )
 	irc? ( net-libs/libircclient )
+	lua-cairo? ( x11-libs/cairo[X] )
+	lua-imlib? ( media-libs/imlib2[X] )
+	lua-rsvg? ( gnome-base/librsvg )
 	mysql? ( dev-db/mysql-connector-c )
 	ncurses? ( sys-libs/ncurses:= )
+	nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
 	pulseaudio? ( media-sound/pulseaudio )
 	rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 )
 	systemd? ( sys-apps/systemd )
+	truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
 	wifi? ( net-wireless/wireless-tools )
 	weather-metar? ( net-misc/curl )
 	webserver? ( net-libs/libmicrohttpd )
-	|| ( dev-lang/lua:0 dev-lang/lua:5.1 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXdamage
+		x11-libs/libXfixes
+		x11-libs/libXext
+	)
+	xinerama? ( x11-libs/libXinerama )
+	xmms2? ( media-sound/xmms2 )
+	${LUA_DEPS}
 "
 RDEPEND="
 	${COMMON_DEPEND}
@@ -58,39 +59,44 @@ RDEPEND="
 "
 DEPEND="
 	${COMMON_DEPEND}
-	app-text/docbook2X
+	doc? ( app-text/docbook2X dev-libs/libxslt )
 "
 
-CONFIG_CHECK="~IPV6"
+REQUIRED_USE="
+	imlib? ( X )
+	lua-cairo? ( X  bundled-toluapp )
+	lua-imlib? ( X  bundled-toluapp )
+	lua-rsvg? ( X  bundled-toluapp )
+	nvidia? ( X )
+	truetype? ( X )
+	xinerama? ( X )
+"
 
-DOCS=( README.md TODO ChangeLog NEWS AUTHORS )
+CONFIG_CHECK="~IPV6"
 
-PATCHES=(
+DOCS=( README.md AUTHORS )
-	"${FILESDIR}"/${P}-use-pkgconfig.patch
-	"${FILESDIR}"/${P}-libical-3.patch
-	"${FILESDIR}"/${P}-portmon.patch
-	"${FILESDIR}"/${P}-clang.patch
-	"${FILESDIR}"/${P}-virtual-sinks.patch
-	"${FILESDIR}"/${P}-fpermissive.patch
-)
 
 DISABLE_AUTOFORMATTING="yes"
 DOC_CONTENTS="You can find sample configurations at ${ROOT}/usr/share/doc/${PF}.
-To customize, copy to ${XDG_CONFIG_HOME}/conky/conky.conf
+To customize, copy to \${XDG_CONFIG_HOME}/conky/conky.conf
 and edit it to your liking.
 
 There are pretty html docs available at the conky homepage
-or in ${ROOT}/usr/share/doc/${PF}/html.
+or in ${ROOT}/usr/share/doc/${PF}/html when built with USE=doc.
 
 Also see https://wiki.gentoo.org/wiki/Conky/HOWTO"
 
 pkg_setup() {
 	use ipv6 && linux-info_pkg_setup
+
+	lua-single_pkg_setup
 }
 
 src_prepare() {
 	cmake_src_prepare
 
+	xdg_environment_reset
+
 	sed -i -e "s|find_program(APP_MAN man)|set(APP_MAN $(which man) CACHE FILEPATH MAN_BINARY)|" \
 		cmake/ConkyPlatformChecks.cmake || die
 }
@@ -100,64 +106,58 @@ src_configure() {
 
 	if use X; then
 		mycmakeargs=(
-			-DBUILD_X11=ON
+			-DBUILD_ARGB=yes
-			-DOWN_WINDOW=ON
+			-DBUILD_X11=yes
-			-DBUILD_XDAMAGE=ON
+			-DBUILD_XDAMAGE=yes
-			-DBUILD_XINERAMA=ON
+			-DBUILD_XDBE=yes
-			-DBUILD_XDBE=ON
+			-DBUILD_XSHAPE=yes
-			-DBUILD_XFT=$(usex truetype)
+			-DOWN_WINDOW=yes
-			-DBUILD_IMLIB2=$(usex imlib)
-			-DBUILD_XSHAPE=ON
-			-DBUILD_ARGB=ON
-			-DBUILD_LUA_CAIRO=$(usex lua-cairo)
-			-DBUILD_LUA_IMLIB2=$(usex lua-imlib)
-			-DBUILD_LUA_RSVG=$(usex lua-rsvg)
-			-DBUILD_NVIDIA=$(usex nvidia)
-			-DBUILD_XMMS2=$(usex xmms2)
 		)
 	else
 		mycmakeargs=(
-			-DBUILD_X11=OFF
+			-DBUILD_X11=no
-			-DBUILD_NVIDIA=OFF
-			-DBUILD_LUA_CAIRO=OFF
-			-DBUILD_LUA_IMLIB2=OFF
-			-DBUILD_LUA_RSVG=OFF
-			-DBUILD_XMMS2=OFF
 		)
 	fi
 
 	mycmakeargs+=(
 		-DBUILD_APCUPSD=$(usex apcupsd)
+		-DBUILD_AUDACIOUS=no
+		-DBUILD_BUILTIN_CONFIG=yes
 		-DBUILD_CMUS=$(usex cmus)
 		-DBUILD_CURL=$(usex curl)
-		-DBUILD_EVE=$(usex eve)
+		-DBUILD_DOCS=$(usex doc)
 		-DBUILD_HDDTEMP=$(usex hddtemp)
-		-DBUILD_IOSTATS=$(usex iostats)
+		-DBUILD_HTTP=$(usex webserver)
+		-DBUILD_I18N=yes
+		-DBUILD_IBM=$(usex thinkpad)
 		-DBUILD_ICAL=$(usex ical)
 		-DBUILD_ICONV=$(usex iconv)
+		-DBUILD_IMLIB2=$(usex imlib)
+		-DBUILD_IOSTATS=$(usex iostats)
 		-DBUILD_IPV6=$(usex ipv6)
 		-DBUILD_IRC=$(usex irc)
+		-DBUILD_JOURNAL=$(usex systemd)
+		-DBUILD_LUA_CAIRO=$(usex lua-cairo)
+		-DBUILD_LUA_IMLIB2=$(usex lua-imlib)
+		-DBUILD_LUA_RSVG=$(usex lua-rsvg)
 		-DBUILD_MATH=$(usex math)
 		-DBUILD_MOC=$(usex moc)
 		-DBUILD_MPD=$(usex mpd)
 		-DBUILD_MYSQL=$(usex mysql)
 		-DBUILD_NCURSES=$(usex ncurses)
+		-DBUILD_NVIDIA=$(usex nvidia)
+		-DBUILD_OLD_CONFIG=yes
 		-DBUILD_PORT_MONITORS=$(usex portmon)
 		-DBUILD_PULSEAUDIO=$(usex pulseaudio)
 		-DBUILD_RSS=$(usex rss)
-		-DBUILD_JOURNAL=$(usex systemd)
-		-DBUILD_IBM=$(usex thinkpad)
-		-DBUILD_HTTP=$(usex webserver)
 		-DBUILD_WEATHER_METAR=$(usex weather-metar)
 		-DBUILD_WLAN=$(usex wifi)
-		-DBUILD_BUILTIN_CONFIG=ON
+		-DBUILD_XFT=$(usex truetype)
-		-DBUILD_OLD_CONFIG=ON
+		-DBUILD_XINERAMA=$(usex xinerama)
-		-DBUILD_I18N=ON
+		-DBUILD_XMMS2=$(usex xmms2)
-		-DMAINTAINER_MODE=ON
-		-DRELEASE=ON
-		-DBUILD_AUDACIOUS=OFF
-		-DBUILD_BMPX=OFF
 		-DDOC_PATH=/usr/share/doc/${PF}
+		-DMAINTAINER_MODE=no
+		-DRELEASE=yes
 	)
 
 	cmake_src_configure
@@ -184,4 +184,6 @@ src_install() {
 
 pkg_postinst() {
 	readme.gentoo_print_elog
+
+	xdg_pkg_postinst
 }

app-admin/conky/files/conky-1.10.8-clang.patch

@@ -1,30 +0,0 @@
---- conky-1.10.8/src/linux.cc	2018-02-07 17:16:39.000000000 +0300
-+++ conky-1.10.8.new/src/linux.cc	2020-02-22 00:43:52.336620654 +0300
-@@ -37,6 +37,7 @@
- #include <ctype.h>
- #include <errno.h>
- #include <limits.h>
-+#include <clocale>
- #include <sys/types.h>
- #include <sys/sysinfo.h>
- #include <sys/stat.h>
---- conky-1.10.8/src/luamm.cc	2020-02-22 00:57:25.847867585 +0300
-+++ conky-1.10.8.new/src/luamm.cc	2020-02-22 00:59:29.820510124 +0300
-@@ -23,6 +23,8 @@
- 
- #include "luamm.hh"
- 
-+#include <cxxabi.h>
-+
- namespace lua {
- 	namespace {
- 
-@@ -57,7 +59,7 @@
- 				lua_pushstring(l, e.what());
- 			}
- 			catch(...) {
--				lua_pushstring(l, ptr->__cxa_exception_type()->name());
-+				lua_pushstring(l, abi::__cxa_current_exception_type()->name());
- 			}
- 			return 1;
- 		}

app-admin/conky/files/conky-1.10.8-fpermissive.patch

@@ -1,14 +0,0 @@
---- conky-1.10.8/src/conky.cc.orig	2020-08-28 13:17:22.330113596 -0400
-+++ conky-1.10.8/src/conky.cc	2020-08-28 13:19:48.564891015 -0400
-@@ -478,9 +478,9 @@
- struct MHD_Daemon *httpd;
- static conky::simple_config_setting<bool> http_refresh("http_refresh", false, true);
- 
--int sendanswer(void *cls, struct MHD_Connection *connection, const char *url, const char *method, const char *version, const char *upload_data, size_t *upload_data_size, void **con_cls) {
-+MHD_Result sendanswer(void *cls, struct MHD_Connection *connection, const char *url, const char *method, const char *version, const char *upload_data, size_t *upload_data_size, void **con_cls) {
- 	struct MHD_Response *response = MHD_create_response_from_data(webpage.length(), (void*) webpage.c_str(), MHD_NO, MHD_NO);
--	int ret = MHD_queue_response (connection, MHD_HTTP_OK, response);
-+	MHD_Result ret = MHD_queue_response (connection, MHD_HTTP_OK, response);
- 	MHD_destroy_response(response);
- 	if(cls || url || method || version || upload_data || upload_data_size || con_cls) {}	//make compiler happy
- 	return ret;

app-admin/conky/files/conky-1.10.8-libical-3.patch

@@ -1,32 +0,0 @@
-From 128c8cce3415839a3d19a5cb877fd77af2538d35 Mon Sep 17 00:00:00 2001
-From: Adam Majer <amajer@suse.de>
-Date: Tue, 6 Mar 2018 13:46:31 +0100
-Subject: [PATCH] Add support for libical 3.x (#465)
-
-In libical3, deprecated icaltime_from_timet is removed
-Use icaltime_from_timet_with_zone instead. This function
-exists in libical 2.x so no need to change requirements
----
- src/ical.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/ical.cc b/src/ical.cc
-index e4b48511..ef069124 100644
---- a/src/ical.cc
-+++ b/src/ical.cc
-@@ -49,13 +49,13 @@ struct ical_event *add_event(struct ical_event *listend, icalcomponent *new_ev)
- 	icaltimetype start;
- 
- 	start = icalcomponent_get_dtstart(new_ev);
--	if(icaltime_compare(start, icaltime_from_timet(time(NULL), 0)) <= 0) {
-+	if(icaltime_compare(start, icaltime_from_timet_with_zone(time(NULL), 0, NULL)) <= 0) {
- 		icalproperty *rrule = icalcomponent_get_first_property(new_ev, ICAL_RRULE_PROPERTY);
- 		if(rrule) {
- 			icalrecur_iterator* ritr = icalrecur_iterator_new(icalproperty_get_rrule(rrule), start);
- 			icaltimetype nexttime = icalrecur_iterator_next(ritr);
- 			while (!icaltime_is_null_time(nexttime)) {
--				if(icaltime_compare(nexttime, icaltime_from_timet(time(NULL), 0)) > 0) {
-+				if(icaltime_compare(nexttime, icaltime_from_timet_with_zone(time(NULL), 0, NULL)) > 0) {
- 					start = nexttime;
- 					break;
- 				}

app-admin/conky/files/conky-1.10.8-portmon.patch

@@ -1,20 +0,0 @@
---- conky-1.10.8/src/CMakeLists.txt	2019-03-09 08:24:26.315879386 +0100
-+++ conky-1.10.8/src/CMakeLists.txt	2019-03-09 08:24:38.555878656 +0100
-@@ -220,6 +220,15 @@
- install(TARGETS
- 	conky
- 	RUNTIME DESTINATION bin
--	LIBRARY DESTINATION lib
--	ARCHIVE DESTINATION lib
-+	LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-+	ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
- )
-+
-+if(BUILD_PORT_MONITORS)
-+	install(TARGETS
-+	tcp-portmon
-+	RUNTIME DESTINATION bin
-+	LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-+	ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
-+)
-+endif(BUILD_PORT_MONITORS)

app-admin/conky/files/conky-1.10.8-use-pkgconfig.patch

@@ -1,34 +0,0 @@
-Reversed patch
-
-From abd0be51a00444d3be6b213e0926675e5a4e5ed3 Mon Sep 17 00:00:00 2001
-From: Brenden Matthews <brenden@diddyinc.com>
-Date: Tue, 23 Jan 2018 12:56:06 -0500
-Subject: [PATCH] Use FindCurses instead of pkg_check_modules.
-
-This should resolve #217.
----
- cmake/ConkyPlatformChecks.cmake | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/cmake/ConkyPlatformChecks.cmake b/cmake/ConkyPlatformChecks.cmake
-index c5b39b2f..19ec7b9b 100644
---- a/cmake/ConkyPlatformChecks.cmake
-+++ b/cmake/ConkyPlatformChecks.cmake
-@@ -129,12 +129,12 @@ if(BUILD_HTTP)
- endif(BUILD_HTTP)
- 
- if(BUILD_NCURSES)
-+	pkg_check_modules(NCURSES ncurses)
-+	if(NOT NCURSES_FOUND)
--	include(FindCurses)
--	if(NOT CURSES_FOUND)
- 		message(FATAL_ERROR "Unable to find ncurses library")
-+	endif(NOT NCURSES_FOUND)
-+	set(conky_libs ${conky_libs} ${NCURSES_LIBRARIES})
-+	set(conky_includes ${conky_includes} ${NCURSES_INCLUDE_DIRS})
--	endif(NOT CURSES_FOUND)
--	set(conky_libs ${conky_libs} ${CURSES_LIBRARIES})
--	set(conky_includes ${conky_includes} ${CURSES_INCLUDE_DIR})
- endif(BUILD_NCURSES)
- 
- if(BUILD_MYSQL)

app-admin/conky/files/conky-1.10.8-virtual-sinks.patch

@@ -1,49 +0,0 @@
-From 8221ba62045012abf8a4443de20f17a0a8fc1288 Mon Sep 17 00:00:00 2001
-From: Jan Seeger <jan.seeger@thenybble.de>
-Date: Wed, 5 Aug 2020 15:39:20 +0200
-Subject: Fixed crash on virtual sinks.
-
-Taken from upstream commits
-https://github.com/brndnmtthws/conky/commit/ddf8a0f58f3110e31ec4c44ecff838d2b231f6f3 and
-https://github.com/brndnmtthws/conky/commit/2a7226d89331f7d5d0abf0b9aff6d75435dd3a2d.
-
-Signed-off-by: Jan Seeger <jan.seeger@thenybble.de>
----
- src/pulseaudio.cc | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/src/pulseaudio.cc b/src/pulseaudio.cc
-index 93226c1b..af814bd6 100644
---- a/src/pulseaudio.cc
-+++ b/src/pulseaudio.cc
-@@ -53,8 +53,13 @@ void pa_sink_info_callback(pa_context *c, const pa_sink_info *i, int eol, void *
-         pdr->sink_mute = i->mute;
-         pdr->sink_card = i->card;
-         pdr->sink_index = i->index;
--        pdr->sink_active_port_name.assign(i->active_port->name);
--        pdr->sink_active_port_description.assign(i->active_port->description);
-+		if (i->active_port != nullptr) {
-+			pdr->sink_active_port_name.assign(i->active_port->name);
-+			pdr->sink_active_port_description.assign(i->active_port->description);
-+		} else {
-+			pdr->sink_active_port_name.erase();
-+			pdr->sink_active_port_name.erase();
-+		}
-         pdr->sink_volume = round_to_int(100.0f * (float)pa_cvolume_avg(&(i->volume)) / (float)PA_VOLUME_NORM);
-         pa_threaded_mainloop_signal(pulseaudio->mainloop, 0);
-     }
-@@ -224,9 +229,10 @@ void init_pulseaudio(struct text_object *obj) {
-         return;
-     }
- 
--    if(pulseaudio->result.sink_card!=(uint32_t)-1)
-+    if(pulseaudio->result.sink_card!=(uint32_t)-1) {
-         PULSEAUDIO_WAIT(pa_context_get_card_info_by_index(pulseaudio->context, pulseaudio->result.sink_card,
-                                                           pa_card_info_callback, &pulseaudio->result));
-+	}
- 
- 	// get notification when something changes in PA
-     pa_context_set_subscribe_callback(pulseaudio->context, subscribe_cb, &pulseaudio->result);
--- 
-2.26.2
-

app-admin/conky/metadata.xml

@@ -18,7 +18,6 @@
 		<flag name="apcupsd">Enable support for <pkg>sys-power/apcupsd</pkg></flag>
 		<flag name="bundled-toluapp">Enable support for bundled toluapp. This only makes sense in combination with the lua-* flags</flag>
 		<flag name="cmus">Enable monitoring of music played by <pkg>media-sound/cmus</pkg></flag>
-		<flag name="eve">Enable support for the eve-online skill monitor</flag>
 		<flag name="ical">Enable support for events from iCalendar (RFC 5545) files using <pkg>dev-libs/libical</pkg></flag>
 		<flag name="iostats">Enable support for per-task I/O statistics</flag>
 		<flag name="irc">Enable support for displaying everything from an irc channel using <pkg>net-libs/libircclient</pkg></flag>

app-admin/needrestart/needrestart-3.5.ebuild

@@ -28,7 +28,8 @@ RDEPEND="
 	dev-perl/Sort-Naturally
 	dev-perl/TermReadKey
 	sys-apps/init-system-helpers
-	sys-apps/iucode_tool
+	amd64? ( sys-apps/iucode_tool )
+	x86? ( sys-apps/iucode_tool )
 "
 DEPEND="${RDEPEND}
 	sys-devel/gettext

app-admin/needrestart/needrestart-9999.ebuild

@@ -28,7 +28,8 @@ RDEPEND="
 	dev-perl/Sort-Naturally
 	dev-perl/TermReadKey
 	sys-apps/init-system-helpers
-	sys-apps/iucode_tool
+	amd64? ( sys-apps/iucode_tool )
+	x86? ( sys-apps/iucode_tool )
 "
 DEPEND="${RDEPEND}
 	sys-devel/gettext

app-admin/verynice/metadata.xml

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 </pkgmetadata>

app-arch/bzip2/bzip2-1.0.8-r1.ebuild

@@ -14,7 +14,7 @@ SRC_URI="https://sourceware.org/pub/${PN}/${P}.tar.gz"
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="static static-libs"
 
 PATCHES=(

app-arch/lzma/lzma-19.00.ebuild

@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/sevenzip/${MY_P}.7z -> ${P}.7z"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc"
 
 BDEPEND="app-arch/p7zip"

app-arch/rpm2targz/Manifest

@@ -1 +1,2 @@
+DIST rpm2targz-2021.03.16.tar.xz 6500 BLAKE2B fac1122fbfcab2b982ea6f5369b95b30814d438d0f853d846ef62a33ceaaf81d44b2a743bc20a3ef46defb63331bff06f9a268a5a805ecd899b11f86ec414bc2 SHA512 efd677642fbf73d4b8c90f338eea20452052f2bdc2b7a3a61c0e9215676575b5063aad733ec3ea4840baf281eb332db8f6fdeef600cc8a8aa7e208f2fa8ee599
 DIST rpm2targz-9.0.0.5g.tar.xz 5740 BLAKE2B 88c903119fc19bd1d2eec1ccc7616e05594465a0595b75be8ab8095b5404420a8a09ba8fb176ee21efa5df3b12d4436b60119a637f70910cc020bcb3dcc3833b SHA512 a595d23581bd396a3a00b6eae4cf6edca1c65b52510a02c7b162afc3d89f45026663a271279bb519741b4a35a0ee653fbfb124c5a7d6d921b466dc9236cbf549

app-arch/rpm2targz/rpm2targz-2021.03.16.ebuild

@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Convert a .rpm file to a .tar.gz archive"
+HOMEPAGE="http://www.slackware.com/config/packages.php"
+SRC_URI="mirror://gentoo/${P}.tar.xz
+	https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
+
+LICENSE="BSD-1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=""
+RDEPEND="app-arch/cpio"
+
+src_configure() {
+	tc-export CC
+}

app-backup/dar/dar-2.6.13.ebuild

@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/dar/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux"
+KEYWORDS="amd64 ppc sparc x86 ~amd64-linux"
 IUSE="curl dar32 dar64 doc gcrypt gpg lzo nls static static-libs xattr"
 
 RESTRICT="test" # need to be run as root

app-backup/duply/files/README.gentoo

@@ -1,4 +0,0 @@
-If you use duply at the first time please have a
-look at the the usage help text "duply usage"
-for further information."
-

app-crypt/monkeysphere/Manifest

@@ -1,2 +1 @@
-DIST monkeysphere_0.41.orig.tar.gz 109040 BLAKE2B dadbd65c879bc8e73e7dd1360ebe7f7242aef125af3907d4487f8d0711afda6d87736ab82938867201eead5c1008d192dbd90602eff5a4843d990b3c87ee2949 SHA512 fcc3dd6c191635ed7ef27a8219d4c9d7043629dc8a02de947fcc4dfc8e612ec767f68d4e4c41252a0c0fc80e4184018e53991d85fcde50cb5def75b925341962
 DIST monkeysphere_0.44.orig.tar.gz 110289 BLAKE2B 8a067035d3a40436fd5c27291ab25f15d475d9a0f17b51259c0431c77841807af93cb04d045b77c5f5dda3cd0061ab52561fdb62a704715d0d8cbbf96cb43259 SHA512 cb3c655a08b1c0a382502f8609f57d0c870fe4491b1b967e9931bdfd146b3926470496577949630452e073f04442b91a1ef679254c0f3091a834f3429e0f8e93

app-crypt/monkeysphere/files/monkeysphere-0.36_default_shell.patch

@@ -1,12 +0,0 @@
-diff -r d0c02fe6a949 src/share/common
---- a/src/share/common	Sun Oct 06 19:21:18 2013 +0200
-+++ b/src/share/common	Sun Oct 06 19:21:49 2013 +0200
-@@ -108,7 +108,7 @@
-          # if root, su command as monkeysphere user
- 	'root')
-             # requote arguments using bash builtin feature (see "help printf"):
--	    su "$MONKEYSPHERE_USER" -c "$(printf "%q " "$@")"
-+	    su -s /bin/bash "$MONKEYSPHERE_USER" -c "$(printf "%q " "$@")"
- 	    ;;
- 
- 	# otherwise, fail

app-crypt/monkeysphere/files/monkeysphere-0.36_hd_od.patch

@@ -1,14 +0,0 @@
-diff -r 6150774ec7f4 tests/keytrans
---- a/tests/keytrans	Sun Feb 16 20:11:02 2014 +0100
-+++ b/tests/keytrans	Sun Feb 16 20:11:40 2014 +0100
-@@ -104,8 +104,8 @@
-     <(gpg --list-packets < "$TEMPDIR"/converted.secret.key)
- 
- diff -u \
--    <(hd "$TEMPDIR"/secret.key) \
--    <(hd "$TEMPDIR"/converted.secret.key)
-+    <(od -xc "$TEMPDIR"/secret.key) \
-+    <(od -xc "$TEMPDIR"/converted.secret.key)
- 
- KEYFPR=$(gpg --fingerprint --with-colons --list-keys | grep ^fpr | cut -f10 -d:)
- KEYID=$(printf "%s" "$KEYFPR" | cut -b25-40)

app-crypt/monkeysphere/files/monkeysphere-0.36_non_default_port.patch

@@ -1,14 +0,0 @@
-diff -r 5f7ee764ec1f src/share/common
---- a/src/share/common	Mon Oct 07 19:22:36 2013 +0200
-+++ b/src/share/common	Mon Oct 07 19:22:58 2013 +0200
-@@ -863,6 +863,10 @@
- 		    ;;
- 		('known_hosts')
- 		    host=${userID#ssh://}
-+	    	    if [[ "${host}" == *:* ]]; then
-+			IFS=':' read -a ARR <<< "${host}"
-+			host="[${ARR[0]}]:${ARR[1]}"
-+		    fi
- 		    remove_line "$keyFile" "$host" "$sshKey"
- 		    ;;
- 	    esac

app-crypt/monkeysphere/files/monkeysphere-0.36_openpgp2ssh_sanity_check.patch

@@ -1,34 +0,0 @@
-diff --git a/src/monkeysphere-authentication b/src/monkeysphere-authentication
-index edc7995..2711ff2 100755
---- a/src/monkeysphere-authentication
-+++ b/src/monkeysphere-authentication
-@@ -84,6 +84,13 @@ gpg_sphere() {
-     su_monkeysphere_user gpg --fixed-list-mode --no-greeting --quiet --no-tty "$@"
- }
- 
-+check_openpgp2ssh_sanity() {
-+    if [[ `su_monkeysphere_user openpgp2ssh ABC &>/dev/null || echo $?` != "255" ]]; then
-+    echo "openpgp2ssh command gives unexpected return code. This can lead to a scenario where no authorized keys are populated, even though they are otherwise valid. Aborting!"
-+    exit 1
-+    fi; 
-+}
-+
- # output to stdout the core fingerprint from the gpg core secret
- # keyring
- core_fingerprint() {
-@@ -163,6 +170,7 @@ case $COMMAND in
-     'update-users'|'update-user'|'update'|'u')
- 	source "${MASHAREDIR}/setup"
- 	setup
-+	check_openpgp2ssh_sanity
- 	source "${MASHAREDIR}/update_users"
- 	OUTPUT_STDOUT= update_users "$@"
- 	;;
-@@ -171,6 +179,7 @@ case $COMMAND in
- 	(( $# > 0 )) || failure "Must specify user."
- 	source "${MASHAREDIR}/setup"
- 	setup
-+	check_openpgp2ssh_sanity
- 	source "${MASHAREDIR}/update_users"
- 	OUTPUT_STDOUT=true update_users "$1"
- 	;;

app-crypt/monkeysphere/files/monkeysphere-0.36_tests_gnupg2.patch

@@ -1,50 +0,0 @@
-diff -r c13f4b11061e tests/keytrans
---- a/tests/keytrans	Sun Feb 16 19:24:08 2014 +0100
-+++ b/tests/keytrans	Sun Feb 16 19:27:42 2014 +0100
-@@ -131,9 +131,9 @@
- cat >"$TEMPDIR"/expectedout <<EOF
- pub:u:1024:1:$KEYID:$timestamp:::u:::scSC:
- uid:u::::$timestamp::E90EC72E68C6C2A0751DADC70F54F60D27B88C3D::monkeymonkey:
--sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
-+sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8:
- uid:u::::$timestamp::8200BD0425CC70C7D698DF3FE412044EAAB83F94::testtest:
--sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
-+sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8:
- EOF
- 
- diff -u "$TEMPDIR"/expectedout <(gpg --check-sigs --with-colons | grep -v ^tru)
-@@ -159,10 +159,10 @@
- cat >"$TEMPDIR"/expectedout <<EOF
- pub:u:1024:1:$KEYID:$timestamp:::u:::scSC:
- uid:u::::$timestamp::E90EC72E68C6C2A0751DADC70F54F60D27B88C3D::monkeymonkey:
--sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
-+sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8:
- uid:r::::::8200BD0425CC70C7D698DF3FE412044EAAB83F94::testtest:
--sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
--rev:!::1:$KEYID:$revtime::::monkeymonkey:30x:
-+sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8:
-+rev:!::1:$KEYID:$revtime::::monkeymonkey:30x:::::8:
- EOF
- 
- 
-@@ -190,15 +190,15 @@
- cat >"$TEMPDIR"/expectedout <<EOF
- pub:u:1024:1:$KEYID:$timestamp:::u:::scSC:
- uid:u::::$timestamp::E90EC72E68C6C2A0751DADC70F54F60D27B88C3D::monkeymonkey:
--sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
-+sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8:
- uid:r::::::8200BD0425CC70C7D698DF3FE412044EAAB83F94::testtest:
--sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
--rev:!::1:$KEYID:$revtime::::monkeymonkey:30x:
-+sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8:
-+rev:!::1:$KEYID:$revtime::::monkeymonkey:30x:::::8:
- uid:u::::$timestamp::EDDC32D783E7F4C7B6982D9AE5DC4A61000648BA::baz:
--sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
-+sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8:
- pub:-:1024:1:$NEWKEYID:$(($timestamp + 1)):::-:::caCA:
- uid:-::::$(($timestamp + 1))::A0D708F51CC257DEFC01AEDE1E0A5F329DFD8F16::fubar:
--sig:!::1:$NEWKEYID:$(($timestamp + 1))::::fubar:13x:
-+sig:!::1:$NEWKEYID:$(($timestamp + 1))::::fubar:13x:::::8:
- EOF
- 
- echo "test: diff expected gpg list output"

app-crypt/monkeysphere/files/monkeysphere-0.36_userid_empty_line.patch

@@ -1,12 +0,0 @@
-diff -r 2315bb7781c6 src/share/common
---- a/src/share/common	Thu Oct 10 19:25:10 2013 +0200
-+++ b/src/share/common	Thu Oct 10 19:25:50 2013 +0200
-@@ -917,7 +917,7 @@
-     IFS=$'\n'
-     while read line ; do
- 	case "$line" in
--	    ("#"*)
-+	    ("#"*|"")
- 		continue
- 		;;
- 	    (" "*|$'\t'*)

app-crypt/monkeysphere/monkeysphere-0.41.ebuild

@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils user
-
-DESCRIPTION="Leverage the OpenPGP web of trust for OpenSSH and Web authentication"
-HOMEPAGE="http://web.monkeysphere.info/"
-
-LICENSE="GPL-3"
-SLOT="0/0"
-IUSE=""
-SRC_URI="mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz"
-KEYWORDS="amd64 ~arm x86"
-
-DOCS=( README Changelog )
-
-## Tests fail upstream for SSH connection. Issue has been reported.
-RESTRICT="test"
-
-DEPEND="app-crypt/gnupg:0=
-	net-misc/socat:0=
-	dev-perl/Crypt-OpenSSL-RSA:0=
-	dev-perl/Digest-SHA1:0=
-	app-misc/lockfile-progs:0="
-
-RDEPEND="${DEPEND}"
-
-pkg_setup()
-{
-	einfo "Creating named group and user"
-	enewgroup monkeysphere
-	enewuser monkeysphere -1 -1 /var/lib/monkeysphere monkeysphere
-	# Using fperms and fowner in src_install leave unusable config with error
-	# Authentication refused: bad ownership or modes for directory /var/lib/monkeysphere
-	chown root:monkeysphere /var/lib/monkeysphere
-	chmod 751 /var/lib/monkeysphere
-}
-
-src_prepare()
-{
-	sed -i "s#share/doc/monkeysphere#share/doc/${PF}#" Makefile || die
-}
-
-src_install()
-{
-	default
-	dodir /var/lib/monkeysphere
-}
-
-pkg_postinst()
-{
-	monkeysphere-authentication setup || die
-}

app-crypt/monkeysphere/monkeysphere-0.44.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ IUSE=""
 SRC_URI="
 	mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz
 	http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 
 DOCS=( README Changelog )
 

app-editors/ne/Manifest

@@ -1 +1 @@
-DIST ne-3.1.1.tar.gz 1219488 BLAKE2B 6d778c1b2e9e18154322a6b327cc4a2711619c353eb82073ad00f3e40b3b8e61f7ee7ce6fee3f0e02b38d001dc26365f44b63f70ddd6089f186a52bdf4c69a17 SHA512 e572ca2a0cd39a59adaea911c80e083872103d90a586117efcabbc3881cf1a48d0c3d06f20eebcd9254177afafef15fd581778cd251b1b25b64ad68a5f8afc37
+DIST ne-3.3.0.tar.gz 1173159 BLAKE2B a4be3fd37a0a79b440290846184bc50551cfb9b73dc50c0376110f3603233879b396f67a87e2f9defe9c0cbc42c963e66bc43ab5396f8ccb27e5b6182c429006 SHA512 73a1bbc5a9f62354834288e25b8f4bf2b0d2ff6faf3408108b217305e2c9d8fed768b5a3c3fd21df7b3bf75a3f9c71ea899a8b3f528b560a8e5e66accd442919

app-editors/ne/metadata.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<!-- maintainer-needed -->
-<use>
+	<upstream>
-<flag name="tinfo">Link against libtinfo from sys-libs/ncurses</flag>
+		<remote-id type="github">vigna/ne</remote-id>
-</use>
+	</upstream>
 </pkgmetadata>

app-editors/ne/ne-3.3.0.ebuild

@@ -1,21 +1,20 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit flag-o-matic toolchain-funcs
+inherit autotools flag-o-matic toolchain-funcs
 
-DESCRIPTION="the nice editor, easy to use for the beginner and powerful for the wizard"
+DESCRIPTION="The nice editor, easy to use for the beginner and powerful for the wizard"
-HOMEPAGE="http://ne.di.unimi.it/"
+HOMEPAGE="https://ne.di.unimi.it/"
-SRC_URI="http://ne.di.unimi.it/${P}.tar.gz"
+SRC_URI="https://ne.di.unimi.it/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="tinfo"
-
-DEPEND="sys-libs/ncurses:0=[tinfo?]"
 
+BDEPEND="virtual/pkgconfig"
+DEPEND="sys-libs/ncurses:="
 RDEPEND="
 	${DEPEND}
 	dev-lang/perl
@@ -25,13 +24,13 @@ HTML_DOCS=( doc/html/. )
 
 src_prepare() {
 	default
+
 	sed -i -e 's/-O3//' src/makefile || die
 }
 
 src_configure() {
-	local sedflags="s|-lcurses|-lncurses|g"
+	# bug #776799
-	use tinfo && sedflags="s|-lcurses|-ltinfo|g"
+	sed -i -e "s/-lcurses/$($(tc-getPKG_CONFIG) --libs ncurses)/" src/makefile || die
-	sed -i -e "${sedflags}" src/makefile || die
 }
 
 src_compile() {

app-editors/wxhexeditor/files/wxhexeditor-0.24-desktop.patch

@@ -0,0 +1,13 @@
+Index: resources/wxHexEditor.desktop
+===================================================================
+--- a/resources/wxHexEditor.desktop	2017-03-16 05:50:42.000000000 +0200
++++ b/resources/wxHexEditor.desktop	2017-03-24 12:16:39.931400635 +0200
+@@ -8,6 +8,7 @@ Exec=wxHexEditor
+ Icon=wxHexEditor
+ Terminal=false
+ Type=Application
+-Categories=Utility;TextEditor;Utility;
++Categories=Utility;TextEditor;
++Keywords=disk;drive;volume;harddisk;hdd;disc;cdrom;dvd;partition;iso;image;backup;restore;editor;
+ Keywords[en_GB]=disk;drive;volume;harddisk;hdd;disc;cdrom;dvd;partition;iso;image;backup;restore;editor;
+ 

app-editors/wxhexeditor/wxhexeditor-0.24-r1.ebuild

@@ -1,15 +1,14 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
-WX_GTK_VER=3.0-gtk3
-
-inherit toolchain-funcs wxwidgets
 
 MY_PN="wxHexEditor"
+WX_GTK_VER=3.0-gtk3
+inherit toolchain-funcs wxwidgets
 
 DESCRIPTION="A cross-platform hex editor designed specially for large files"
-HOMEPAGE="http://www.wxhexeditor.org/"
+HOMEPAGE="https://github.com/EUA/wxHexEditor"
 SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-v${PV}-src.tar.xz"
 
 LICENSE="GPL-2"
@@ -27,6 +26,7 @@ S="${WORKDIR}/${MY_PN}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-syslibs.patch
+	"${FILESDIR}"/${P}-desktop.patch
 )
 
 pkg_pretend() {

app-emulation/conmon/Manifest

@@ -1,2 +1,3 @@
 DIST conmon-2.0.22.tar.gz 103371 BLAKE2B f509ba800c847886ec2350e141d2b965ff1cc09822467718fb0d94acdabdc86c6f40dff9428679e4c4171ac6a522b3ba7622d66ebd8108be1a68cbf7418d5c09 SHA512 819e1d9279c1a22388220d710b975cdeb3c0b56413afb177afe1c96b649e2dce496d5f51fe4094f572111f771102ccd0ae86f1776e99fedb2e76e6e9130c2d5c
 DIST conmon-2.0.26.tar.gz 104681 BLAKE2B fc8369258a414d3a169b64019199c604d1d8bded70d5a38230f243053dcf09c6f9aee931b328913e6cbbe3c495aab4894647897f40f537a79eb587ecee58517a SHA512 5cbb66053fb48b514f93b3be4d4ac428f9eea8a3e1452b4df232250e9cd01202ecb7477c05e1e4dfb21595f2d1881be35cdea9b23f43c02bb7c0e67a3161396e
+DIST conmon-2.0.27.tar.gz 106647 BLAKE2B f242b1be4f86b18ca94dade3d1f5522d1ae1951f4b7abf7e563e1a93472c2a673cd48a136fdff12b410ebaa46694b70ffbf173fc37a3bbefb03891452c22dfae SHA512 2bc389fa3963cbb612669ec1d288adc888d7ac1de2b9bf483f18e0f62220775327ebcb771bfa7236815ef7247adb8fc6b8ae38748f7a383ec9590e3ee5769b65

app-emulation/conmon/conmon-2.0.27.ebuild

@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="An OCI container runtime monitor"
+HOMEPAGE="https://github.com/containers/conmon"
+SRC_URI="https://github.com/containers/conmon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="systemd"
+RESTRICT="test"
+
+RDEPEND="dev-libs/glib:=
+	systemd? ( sys-apps/systemd:= )"
+DEPEND="${RDEPEND}
+	dev-go/go-md2man"
+
+src_prepare() {
+	default
+
+	if ! use systemd; then
+		sed -e 's| $(PKG_CONFIG) --exists libsystemd-journal | false |' \
+			-e 's| $(PKG_CONFIG) --exists libsystemd | false |' \
+			-i Makefile || die
+	fi
+	sed -e 's|make -C tools|$(MAKE) -C tools|' -i Makefile || die
+	sed -e 's|^GOMD2MAN = .*|GOMD2MAN = go-md2man|' -i docs/Makefile || die
+}
+
+src_compile() {
+	tc-export CC
+	emake GIT_COMMIT="v${PV}" \
+		all
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		PREFIX="/usr" \
+		install
+	dodir /usr/libexec/podman
+	ln "${ED}/usr/"{bin,libexec/podman}/conmon || die
+	dodoc README.md
+}

app-forensics/lynis/lynis-3.0.3-r2.ebuild

@@ -41,7 +41,8 @@ src_install() {
 
 	insinto /etc/${PN}
 	doins default.prf
-	systemd_dounit "${S}/extras/systemd/${PN}.service"
+	sed -i -e 's/\/path\/to\///' "${S}/extras/systemd/${PN}.service" || die "Sed Failed!"
+	systemd_dounit "${S}/extras/systemd/${PN}.service" || die "Sed Failed!"
 	systemd_dounit "${S}/extras/systemd/${PN}.timer"
 }
 

app-laptop/tuxedo-keyboard/Manifest

@@ -1 +1,2 @@
 DIST tuxedo-keyboard-2.0.5.tar.gz 31001 BLAKE2B 931d011e2ac521cef1670a8952886c1ac9b2476c6227c2b3cfce28d52622d3869f3c55773279eea3cbcc94d7c5b12d5d5653a8e2f9c142d0c044fa23fddd958c SHA512 3b7a9331d04e2918f3452f9561b05f39ea458960c2ade299a368899638987178cfd33fa066a0835f88b14c240d7937692d7994ccf978749ea7fdc428e587e06a
+DIST tuxedo-keyboard-3.0.3.tar.gz 48275 BLAKE2B be4fd4a52cd578ec7db2d0f94c64ba842c2b28ecabbca10331024e104cf4dbaa655e0686f412141ac3ad6bc0430398797f628139a396e5a41ac73c33943230cf SHA512 6ebbde6ea9351f9fd7167d38d8b5f836d1fda2fbbcf80755e86c2b76c49cf263ad2e9cfc47bea3449387626d88d8c1725335c2861ec2ff5a76e64ef87e27d9fb

app-laptop/tuxedo-keyboard/tuxedo-keyboard-3.0.3.ebuild

@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-mod toolchain-funcs
+
+DESCRIPTION="Kernel Module for Tuxedo Keyboard"
+HOMEPAGE="https://github.com/tuxedocomputers/tuxedo-keyboard"
+SRC_URI="https://github.com/tuxedocomputers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BUILD_TARGETS="all"
+MODULE_NAMES="clevo_acpi(tuxedo:${S}:src) clevo_wmi(tuxedo:${S}:src) tuxedo_keyboard(tuxedo:${S}:src) tuxedo_io(tuxedo:${S}:src/tuxedo_io)"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="CC=$(tc-getBUILD_CC) KDIR=${KV_DIR} V=1 KBUILD_VERBOSE=1"
+}

app-misc/banner/Manifest

@@ -1,3 +1 @@
 DIST BANNER_V1.3.5.tar.gz 135190 BLAKE2B 4accf00ad92f0351a1df49d3cb6451a71ee7f929fc6f2b25aee7fc6898780944b71cecf8070dc186888a9fb7580213ef2111a5086fc396f3c7e242e678cf8270 SHA512 6f2d79f1d76533fac920aa2984258e3f5278c40692d2b2dcae560734dcd5b06fcc8c99f266abdc91fb272eb291906bcea747f5ee53a67a4a5cb99179941897c3
-DIST banner-1.3.3.tar.gz 114237 BLAKE2B ea9773ce8b65ed7deb5ec377b53ab974bbb4760627788b461f5715b15f99bcde25e2f58f7fb69d937ede30de8f87be7eabb662a05c7d8c574df298446ba21649 SHA512 38f16f2a25bd7fb270056ebe43691c989a808891ecc75e4f794456d1752a07002efb7ba7b90a2000a40704e6b6f11760b47a3fe59deeb05ff3578f0d982f7d96
-DIST banner-1.3.4.tar.gz 120537 BLAKE2B c50952b7e4f73b896ef204914479ffe7c2ac2ec7a0d979f076a0134c3cc6280d01be448f08fe3914cca4b144798c1d9a68042826ec81f55353596be1c3420aa8 SHA512 c98b4b690e73d04fd9731a291e80e89b234f1af47541fbb2eb9edcb987a7c029485dedc1eef6a479fe4f876cfd4d41b090bf6c3685a8c54e4c658b76cc9cec20

app-misc/banner/banner-1.3.3.ebuild

@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="The well known banner program for Linux"
-HOMEPAGE="http://cedar-solutions.com"
-SRC_URI="http://cedar-solutions.com/ftp/software/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-DEPEND="!games-misc/bsd-games"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ctype.h.patch
-}

app-misc/banner/banner-1.3.4.ebuild

@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="The well known banner program for Linux"
-HOMEPAGE="http://cedar-solutions.com/"
-SRC_URI="http://cedar-solutions.com/ftp/software/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="!games-misc/bsd-games"
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.3-ctype.h.patch
-)

app-misc/banner/banner-1.3.5.ebuild

@@ -9,7 +9,7 @@ SRC_URI="https://github.com/pronovic/${PN}/archive/BANNER_V${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 S="${WORKDIR}/${PN}-${PN^^}_V${PV}"
 

app-misc/ca-certificates/ca-certificates-20210119.3.62.ebuild

@@ -50,7 +50,7 @@ fi
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 ${PRECOMPILED} || IUSE+=" cacert"
 

app-misc/rlwrap/rlwrap-0.43.ebuild

@@ -9,7 +9,7 @@ SRC_URI="https://github.com/hanslub42/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~mips ppc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="debug"
 
 RDEPEND="sys-libs/readline:0="

app-misc/wipe/files/wipe-2.3.1-musl-stdint.patch

@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/713622
+--- a/rand.h
++++ b/rand.h
+@@ -20,15 +20,9 @@
+     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+ 
+-#ifdef HAVE_STDINT_H
+-# include "stdint.h"
+-#else
+-# ifndef LINUX
+-#  define u_int32_t uint32_t
+-# endif
+-#endif
++#include <stdint.h>
+ 
+-typedef u_int32_t u_rand_t;
++typedef uint32_t u_rand_t;
+ 
+ #ifndef UINT32_MAX
+ # define UINT32_MAX ULONG_MAX

app-misc/wipe/wipe-2.3.1.ebuild

@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
@@ -12,12 +12,11 @@ SRC_URI="mirror://sourceforge/wipe/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ~ppc64 x86"
-IUSE=""
 
-DEPEND=""
+PATCHES=(
-RDEPEND="${DEPEND}"
+	"${FILESDIR}"/${P}-LDFLAGS.patch
-
+	"${FILESDIR}"/${PN}-2.3.1-musl-stdint.patch
-PATCHES=( "${FILESDIR}"/${P}-LDFLAGS.patch )
+)
 
 src_prepare() {
 	default

app-shells/pdsh/Manifest

@@ -1 +1,2 @@
 DIST pdsh-2.26.tar.bz2 490732 BLAKE2B 809a7ee0a1026e0cdaea8bf97c046a3a6e2994199dbbdb2cebe56de0393e8422a07e86f1ff60d6e750bf7279ccb43c03ea3aa4529b6fa6a34e3d77d90f0c3597 SHA512 3f15b3bb4fc2cff27a3b5d68de3e6cb74bb4001288a787763358a0641d0cc77c840b2c6641213ef31bc9d9d69cfe9531b25d7a9375630a5b008b1bcffbe95c0a
+DIST pdsh-2.34.tar.gz 215708 BLAKE2B dba626c66b9a17536fc02d8482b776d539ee680354326c821dc916735d1fc115226fcf22868407830245067cf45ddf9c997cd8c382b0dde0168d9ed6cb4fcc4d SHA512 2d4e090d97f6bad97ee1dbdf2ee29e4d9603edfd5c92a6935131ef7f7bbff797cceb8ad3a72e3d5995d3d5302eac985d129f4968e3fa6744785a3df2d0fda33c

app-shells/pdsh/files/pdsh-2.34-slibtool.patch

@@ -0,0 +1,20 @@
+https://github.com/chaos/pdsh/pull/130
+https://bugs.gentoo.org/775593
+From 258de95760a46c6d4c84e904823425aa1a180211 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Tue, 16 Mar 2021 13:25:52 -0700
+Subject: [PATCH] build: Use LDADD instead of LDFLAGS for libcommon.la.
+--- a/src/pdsh/Makefile.am
++++ b/src/pdsh/Makefile.am
+@@ -16,9 +16,9 @@ else
+ MODULE_FLAGS =             -export-dynamic $(AIX_PDSH_LDFLAGS) -ldl
+ endif
+ 
+-pdsh_LDADD =               $(READLINE_LIBS)
+-pdsh_LDFLAGS =             $(MODULE_LIBS) $(MODULE_FLAGS) \
++pdsh_LDADD =               $(READLINE_LIBS) \
+                            $(top_builddir)/src/common/libcommon.la
++pdsh_LDFLAGS =             $(MODULE_LIBS) $(MODULE_FLAGS)
+ 
+ pdsh_inst_LDADD =          $(pdsh_LDADD)
+ pdsh_inst_LDFLAGS =        $(pdsh_LDFLAGS)

app-shells/pdsh/metadata.xml

@@ -24,6 +24,7 @@
 		</flag>
 	</use>
 	<upstream>
+		<remote-id type="github">chaos/pdsh</remote-id>
 		<remote-id type="sourceforge">pdsh</remote-id>
 	</upstream>
 </pkgmetadata>

app-shells/pdsh/pdsh-2.34.ebuild

@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A high-performance, parallel remote shell utility"
+HOMEPAGE="https://github.com/chaos/pdsh"
+SRC_URI="https://github.com/chaos/pdsh/archive/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="crypt readline rsh test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	crypt? ( net-misc/openssh )
+	rsh? ( net-misc/netkit-rsh )
+	readline? ( sys-libs/readline:0= )"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( dev-util/dejagnu )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.34-slibtool.patch"
+)
+
+pkg_setup() {
+	PDSH_MODULE_LIST="${PDSH_MODULE_LIST:-netgroup}"
+	MODULE_CONFIG=""
+
+	local m
+	local valid_modules=":xcpu:ssh:exec:qshell:genders:nodeupdown:mrsh:mqshell:dshgroups:netgroup:"
+
+	for m in ${PDSH_MODULE_LIST}; do
+		if [[ "${valid_modules}" == *:${m}:* ]]; then
+			MODULE_CONFIG="${MODULE_CONFIG} --with-${m}"
+		fi
+	done
+
+	elog "Building ${PF} with the following modules:"
+	elog "  ${PDSH_MODULE_LIST}"
+	elog "This list can be changed in /etc/portage/make.conf by setting"
+	elog "PDSH_MODULE_LIST=\"module1 module2...\""
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf ${MODULE_CONFIG} \
+		--with-machines \
+		--enable-shared \
+		--disable-static \
+		$(use_with crypt ssh) \
+		$(use_with rsh) \
+		$(use_with readline)
+}

app-text/reed/reed-5.4.ebuild

@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
-inherit eutils toolchain-funcs
+
+inherit toolchain-funcs
 
 DESCRIPTION="This is a text pager (text file viewer), used to display etexts"
 # Homepage http://www.sacredchao.net/software/reed/index.shtml does not exist.
@@ -13,19 +14,25 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 x86"
 
+BDEPEND="virtual/pkgconfig"
 DEPEND="sys-libs/ncurses"
 RDEPEND="${DEPEND}"
 
 DOCS=( AUTHORS BUGS NEWS README )
 
 src_prepare() {
-	sed -e 's:-O2:$(CFLAGS) $(LDFLAGS):' \
+	default
+
+	sed -e 's;-O2;$(CFLAGS) $(LDFLAGS);' \
 		-e 's: wrap::' \
 		-e 's:-s reed:reed:' \
-		-e 's:-lcurses:$(shell ${PKG_CONFIG} --libs ncurses):g' \
+		-e "s:-lcurses:$($(tc-getPKG_CONFIG) --libs ncurses):g" \
 		-i Makefile.in || die
-	rm wrap.1 #Collision with talkfilters, bug #247396
+
-	tc-export CC PKG_CONFIG
+	# Collision with talkfilters, bug #247396
+	rm wrap.1 || die
+
+	tc-export CC
 }
 
 src_configure() {

app-text/scdoc/scdoc-9999.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -40,5 +40,5 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}" \
-	PCDIR="${ED}/usr/$(get_libdir)/pkgconfig" install
+	PCDIR="${EPREFIX}/usr/$(get_libdir)/pkgconfig" install
 }

dev-db/lmdb/lmdb-0.9.28.ebuild

@@ -12,7 +12,7 @@ SRC_URI="https://git.openldap.org/openldap/openldap/-/archive/${MY_P}/openldap-$
 
 LICENSE="OPENLDAP"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DEPEND=""

dev-db/mysql-connector-c/mysql-connector-c-8.0.23-r1.ebuild

@@ -11,11 +11,20 @@ MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config )
 
 DESCRIPTION="C client library for MariaDB/MySQL"
 HOMEPAGE="https://dev.mysql.com/downloads/"
-SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-boost-${PV}.tar.gz"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/mysql/mysql-server.git"
+
+	inherit git-r3
+else
+	SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-$(ver_cut 1-2)/mysql-boost-${PV}.tar.gz"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
+
+	S="${WORKDIR}/mysql-${PV}"
+fi
 
 LICENSE="GPL-2"
 SLOT="0/21"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
 IUSE="ldap libressl static-libs"
 
 RDEPEND="
@@ -39,8 +48,6 @@ RDEPEND+=" !<dev-db/percona-server-5.7.26.29-r1"
 
 DOCS=( README )
 
-S="${WORKDIR}/mysql-${PV}"
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-8.0.22-always-build-decompress-utilities.patch
 	"${FILESDIR}"/${PN}-8.0.19-do-not-install-comp_err.patch

dev-games/flatzebra/flatzebra-0.1.7.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="http://perso.b2b2c.ca/~sarrazip/dev/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="static-libs"
 
 RDEPEND="media-libs/libsdl[video]

dev-games/libmaitretarot/files/libmaitretarot-0.1.98-libdir.patch

@@ -0,0 +1,18 @@
+https://bugs.gentoo.org/729734
+
+--- a/libmaitretarot.m4
++++ b/libmaitretarot.m4
+@@ -9,10 +9,10 @@ AC_DEFUN([AM_LIB_MAITRETAROT],
+   --with-libmaitretarot   path to libmaitretarot libraries,
+       [ 
+       	LIBMT_CFLAGS="-I${withval}/include"
+-      	LIBMT_LIBS="-L${withval}/lib -lmaitretarot"
++      	LIBMT_LIBS="-L${withval}/${libdir} -lmaitretarot"
+ 	 ],[ 
+-      	LIBMT_CFLAGS="-I/usr/local/include -I/usr/include"
+-      	LIBMT_LIBS="-L/usr/local/lib -L/usr/lib -lmaitretarot"
++      	LIBMT_CFLAGS="-I/usr/include"
++      	LIBMT_LIBS="-L${libdir} -lmaitretarot"
+ 	 ])
+  ac_save_CPPFLAGS="$CPPFLAGS"
+  ac_save_CFLAGS="$CFLAGS"

dev-games/libmaitretarot/libmaitretarot-0.1.98-r2.ebuild

@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 DESCRIPTION="backend library for the maitretarot games"
 HOMEPAGE="http://www.nongnu.org/maitretarot/"
 SRC_URI="https://savannah.nongnu.org/download/maitretarot/${PN}.pkg/${PV}/${P}.tar.bz2"
@@ -10,10 +11,14 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="dev-libs/glib:2
 	dev-libs/libxml2"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
-	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.1.98-libdir.patch
+)
 
 src_configure() {
 	econf --disable-static
@@ -21,5 +26,11 @@ src_configure() {
 
 src_install() {
 	default
+
+	# Needed for consumers like dev-games/libmt_client
+	# bug #729734
+	insinto /usr/share/aclocal
+	doins libmaitretarot.m4
+
 	find "${ED}" -name '*.la' -delete || die
 }

dev-games/libmt_client/files/libmt_client-0.1.98-format.patch

@@ -1,5 +1,5 @@
---- src/mt_client_game.c.old	2015-12-22 08:51:19.858561807 +0100
+--- a/src/mt_client_game.c
-+++ src/mt_client_game.c	2015-12-22 08:52:48.934904973 +0100
++++ b/src/mt_client_game.c
 @@ -56,7 +56,7 @@
  	}
        else

dev-games/libmt_client/files/libmt_client-0.1.98-libdir.patch

@@ -0,0 +1,18 @@
+https://bugs.gentoo.org/729734
+
+--- a/libmt_client.m4
++++ b/libmt_client.m4
+@@ -9,10 +9,10 @@ AC_DEFUN([AM_LIB_MT_CLIENT],
+   --with-libmt_client   path to libmt_client libraries,
+       [ 
+       	LIBMT_CFLAGS="-I${withval}/include"
+-      	LIBMT_LIBS="-L${withval}/lib -lmt_client"
++      	LIBMT_LIBS="-L${withval}/${libdir} -lmt_client"
+ 	 ],[ 
+-      	LIBMT_CFLAGS="-I/usr/local/include -I/usr/include"
+-      	LIBMT_LIBS="-L/usr/local/lib -L/usr/lib -lmt_client"
++      	LIBMT_CFLAGS="-I/usr/include"
++      	LIBMT_LIBS="-L${libdir} -lmt_client"
+ 	 ])
+  ac_save_CPPFLAGS="$CPPFLAGS"
+  ac_save_CFLAGS="$CFLAGS"

dev-games/libmt_client/libmt_client-0.1.98-r1.ebuild

@@ -1,12 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils
+inherit autotools
 
 DESCRIPTION="backend library for the maitretarot clients"
 HOMEPAGE="http://www.nongnu.org/maitretarot/"
+
 SRC_URI="https://savannah.nongnu.org/download/maitretarot/${PN}.pkg/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
@@ -16,10 +17,20 @@ KEYWORDS="amd64 x86"
 DEPEND="dev-libs/glib:2
 	dev-libs/libxml2
 	dev-games/libmaitretarot"
-RDEPEND=${DEPEND}
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-format.patch
+	"${FILESDIR}"/${PN}-0.1.98-libdir.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-format.patch
+	default
+
+	mv configure.{in,ac} || die
+
+	# For the m4 libdir patch, bug #729734
+	eautoreconf
 }
 
 src_configure() {
@@ -28,5 +39,10 @@ src_configure() {
 
 src_install() {
 	default
+
+	# bug #716102
+	insinto /usr/share/aclocal
+	doins libmt_client.m4
+
 	find "${ED}" -name '*.la' -delete || die
 }

dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-as-needed.patch

@@ -1,4 +1,5 @@
-
+https://bugs.gentoo.org/622806
+https://sourceforge.net/p/wrapper/patches/25/
 --- src/c/Makefile-linux-armel-32.make.old	2014-07-21 10:48:31.000000000 +0200
 +++ src/c/Makefile-linux-armel-32.make	2014-07-21 10:50:11.000000000 +0200
 @@ -33,14 +33,14 @@

dev-java/jflex/jflex-1.6.1-r1.ebuild

@@ -23,8 +23,7 @@ RDEPEND=">=virtual/jre-1.8:*
 	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 	${CDEPEND}"
 
-DEPEND="dev-java/javacup:0
+DEPEND=">=virtual/jdk-1.8:*
-	>=virtual/jdk-1.8:*
 	test? ( dev-java/junit:4 )
 	${CDEPEND}"
 
@@ -34,8 +33,10 @@ S="${WORKDIR}/${P}"
 JAVA_SRC_DIR="src/main/java"
 
 src_prepare() {
+	eapply_user
+
 	# See below for details.
-	eapply_user "${FILESDIR}/icedtea-arm.patch"
+	eapply "${FILESDIR}/icedtea-arm.patch"
 
 	# We need the bundled jflex.jar.
 	rm -rv ${JAVA_SRC_DIR}/java_cup examples/pom.xml || die

dev-lang/mujs/mujs-1.0.9.ebuild

@@ -5,7 +5,7 @@ EAPI=7
 
 inherit flag-o-matic toolchain-funcs
 
-DESCRIPTION="An embeddable Javascript interpreter in C."
+DESCRIPTION="An embeddable JavaScript interpreter in C"
 HOMEPAGE="https://mujs.com/ https://github.com/ccxvii/mujs"
 SRC_URI="https://github.com/ccxvii/mujs/archive/${PV}.tar.gz -> ${P}.tar.gz"
 # Not available right now.

dev-lang/mujs/mujs-1.1.0.ebuild

@@ -5,7 +5,7 @@ EAPI=7
 
 inherit flag-o-matic toolchain-funcs
 
-DESCRIPTION="An embeddable Javascript interpreter in C."
+DESCRIPTION="An embeddable JavaScript interpreter in C"
 HOMEPAGE="https://mujs.com/ https://github.com/ccxvii/mujs"
 SRC_URI="https://github.com/ccxvii/mujs/archive/${PV}.tar.gz -> ${P}.tar.gz"
 # Not available right now.

dev-lang/python/python-2.7.18_p7.ebuild

@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="PSF-2"
 SLOT="${PYVER}"
 KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
-IUSE="-berkdb bluetooth build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
+IUSE="-berkdb bluetooth build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline +sqlite +ssl +threads tk +wide-unicode wininst +xml"
 
 # Do not add a dependency on dev-lang/python to this ebuild.
 # If you need to apply a patch which requires python for bootstrapping, please

dev-lang/python/python-3.10.0_alpha6-r2.ebuild

@@ -24,7 +24,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="PSF-2"
 SLOT="${PYVER}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
+IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline +sqlite +ssl test tk wininst +xml"
 RESTRICT="!test? ( test )"
 
 # Do not add a dependency on dev-lang/python to this ebuild.

dev-lang/python/python-3.6.13.ebuild

@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="PSF-2"
 SLOT="${PYVER}/${PYVER}m"
 KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
-IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml"
+IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline +sqlite +ssl test +threads tk wininst +xml"
 RESTRICT="!test? ( test )"
 
 # Do not add a dependency on dev-lang/python to this ebuild.

dev-lang/python/python-3.7.10.ebuild

@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="PSF-2"
 SLOT="${PYVER}/${PYVER}m"
 KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
+IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline +sqlite +ssl test tk wininst +xml"
 RESTRICT="!test? ( test )"
 
 # Do not add a dependency on dev-lang/python to this ebuild.

dev-lang/python/python-3.8.8.ebuild

@@ -24,7 +24,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="PSF-2"
 SLOT="${PYVER}"
 KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
+IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline +sqlite +ssl test tk wininst +xml"
 RESTRICT="!test? ( test )"
 
 # Do not add a dependency on dev-lang/python to this ebuild.

dev-lang/python/python-3.9.2.ebuild

@@ -24,7 +24,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="PSF-2"
 SLOT="${PYVER}"
 KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
+IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline +sqlite +ssl test tk wininst +xml"
 RESTRICT="!test? ( test )"
 
 # Do not add a dependency on dev-lang/python to this ebuild.

dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild

@@ -57,6 +57,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.1.27-doc_build_fix.patch"
 	"${FILESDIR}/${PN}-2.1.27-memmem.patch"
 	"${FILESDIR}/${PN}-2.1.27-CVE-2019-19906.patch"
+	"${FILESDIR}/${PN}-2.1.27-slibtool.patch"
 )
 
 pkg_setup() {

dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-slibtool.patch

@@ -0,0 +1,18 @@
+https://github.com/cyrusimap/cyrus-sasl/pull/623
+https://bugs.gentoo.org/775875
+
+From 5b8075eeba8d0334573689450b07610c176a2618 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Wed, 9 Sep 2020 07:29:38 -0700
+Subject: [PATCH] common: Define the missing crypto_compat_version version.
+
+--- a/common/Makefile.am
++++ b/common/Makefile.am
+@@ -46,6 +46,7 @@
+ # See <http://www.gnu.org/software/libtool/manual/libtool.html#Versioning>
+ # CURRENT:REVISION:AGE
+ plugin_common_version = 3:0:0
++crypto_compat_version = 0:0:0
+ 
+ AM_CPPFLAGS=-fPIC -I$(top_srcdir)/include -I$(top_builddir)/include
+ 

dev-libs/hyphen/hyphen-2.8.8-r1.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,5 +29,6 @@ src_install() {
 	dodoc doc/*.pdf
 
 	rm -r "${ED}"/usr/share/hyphen || die
-	rm "${ED}"/usr/lib*/libhyphen.la || die
+	# bug #775587
+	rm -f "${ED}/usr/$(get_libdir)/libhyphen.la" || die
 }

dev-libs/liblinear/Manifest

@@ -1 +1,2 @@
 DIST liblinear-242.tar.gz 561806 BLAKE2B 49c8f87909083addaf62666f34c008e6cf44240f28fdf2fbeca89862e9e19d451cc7ff51ce5b5da589cc701f70ce408c3eefb249f8585a8598e5ff3976177fe2 SHA512 fbcb219f7313b15898e55bd17c6b280007dd4feb913fafd2c3e10375b5a63b8bd274c9d52fd7b265a7575d4657cf4797b734e5793b18c758dfd9ab731fc0e904
+DIST liblinear-243.tar.gz 565437 BLAKE2B 6367cfbdc040b9183c4993f5340a4d74a8dde48da04ef07f725dc5735073e1b9a7440bad325e9f7527ad76d675dbf3bb47d1d43fc323e1e42ef360d679e816ff SHA512 a0cfa9803285cdfda54752e7addfb210a9ba8f7056cfc8aca13987db7f0bef5fe02d6179eadc829cb243670414da061e6c4cf3d50d682ce392778a0e8cb9e753