gentoo resync : 07.08.2021

50 files changed, 167 insertions, 915 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 134b62c4bfe6..f73119033c2f 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/dleyna-server/Manifest b/net-misc/dleyna-server/Manifest
index 2c8ab98c475c..8591e9cdd395 100644
--- a/net-misc/dleyna-server/Manifest
+++ b/net-misc/dleyna-server/Manifest
@@ -1,5 +1,5 @@
 DIST dleyna-server-0.7.0-r1-patchset.tar.xz 1680 BLAKE2B fd6494dc04bb0fc20e677c69b360df30c89b35b6a990a2ce78e87101291307c485a5cb133152eabbd117691eff4d738fa2e33303128c4305a0c1e5137c67781d SHA512 7f37ba456f84bd9e45b732d40467e08ba5ce775c0f1d30011157e10a6f3010b904fc52a4d699a211dd66b66c54ff6e98b109aa5ba9c04112f81de1529d55c425
 DIST dleyna-server-0.7.0.tar.gz 105020 BLAKE2B 01e4459631fef66e88aabcadfd85a4b01a5b95d33b5c1734decd1b0667876d7e5834bf23f754361772faebd7daf63d5f37cff9cb9bd11ff47c62aeb7afdb4969 SHA512 16bcab369a4d4624f75ed5d40bb5a06cafa1907b3ceceeb0de95f9f00750c257b69202f29f9c2d1ebcd61c541ee930d7a2747dab979e15a74e9a6e109eae6800
-EBUILD dleyna-server-0.7.0-r1.ebuild 786 BLAKE2B 271e0cd33a23386a110cd5d91198a3dd16daa084f7f694895dbfddb6381be27faf618e2b4da042bfc6b84ac360c7a87c77bf447fb81b5744c4b451c63614cecd SHA512 3cf7e358c1226c172b97afd85236391ac26b6a5ebfeb02089ba5942d0d2aa4c62b468fb33b7228263076a85515d5867086e8be8dff08ad54d0bb5feac21e457e
+EBUILD dleyna-server-0.7.0-r1.ebuild 789 BLAKE2B d097deaacff505423a55787c74218964ca12b9a867ae29c1337653d0ee6666e7f34b30b7d8c939c352fa51bdc0612f9f6df49daad67e81a132797aba9a1ef2ac SHA512 b2c0f2a894558dc8c9be937a7f658ffbfee1c9f7fa83409d145048363a542aad0b074e69dc21c7ed224b156faa82b4884f562bc9420635caf2b5d7bdd7f52589
 EBUILD dleyna-server-0.7.0.ebuild 674 BLAKE2B 61ff666be0dd8d68a5ccb443f08e7597c2cf196c8de5db2c018bf88b574a982a677f51cbb4e09e18e022c562911194d27b39aa2ca7cf7fe04e582edce63c1a55 SHA512 64b58c5e4285d80b3e55a16b60a15e1ca531cc96ab84ea599839c2f206dc9d3a85441ffbc3ba0ed640a3ab17171a45722fc1ea99778c3e2fa686ffd9646c75f9
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-misc/dleyna-server/dleyna-server-0.7.0-r1.ebuild b/net-misc/dleyna-server/dleyna-server-0.7.0-r1.ebuild
index 0c97205a63ef..b63a1e717fd1 100644
--- a/net-misc/dleyna-server/dleyna-server-0.7.0-r1.ebuild
+++ b/net-misc/dleyna-server/dleyna-server-0.7.0-r1.ebuild
@@ -18,8 +18,8 @@ RDEPEND="
 	>=dev-libs/glib-2.36:2
 	>=net-libs/gssdp-1.2:0=
 	>=net-libs/gupnp-1.2:0=
-	>=net-libs/gupnp-av-0.11.5
-	>=media-libs/gupnp-dlna-0.9.4:2.0
+	>=net-libs/gupnp-av-0.11.5:=
+	>=media-libs/gupnp-dlna-0.9.4:2.0=
 	>=net-libs/libsoup-2.28.2:2.4
 	>=net-libs/dleyna-core-0.6.0:1.0=
 "
diff --git a/net-misc/econnman/Manifest b/net-misc/econnman/Manifest
index cefb065075af..0759c0b2167a 100644
--- a/net-misc/econnman/Manifest
+++ b/net-misc/econnman/Manifest
@@ -1,3 +1,3 @@
 DIST econnman-1.1.tar.xz 108100 BLAKE2B 85a0a38847955c5338f95ae8b1144231d4d2b05b10cc3056af798a7a49658b1e042acad2570d5d0fea181a6bacfc565ac974fd2af78a057c95939292a288c8ce SHA512 8a20d2d5387f9a2eae552178eb2c399ff0c0952c1591f63ca0865f016240ebec6608795c4a722b84c0d703434f70d97d561b95174ed9c08d3a855cd0e9d0929b
-EBUILD econnman-1.1-r2.ebuild 861 BLAKE2B b12d76caae9b8188441a4cc36e0c1b0a13a3ca1c32e1b22df59ab0614ed8b130952422f90795468ea7c3bda839c39822ea3a88a5d8e43eb4b1569615957e5bd9 SHA512 50a97526f3aa8efa57b74d6e2f51ef38a15684a21d4a6dfd6025e439b1ddef34b68995b967d692ce0df0064a56a8b40fa5ff1886dd59f2abd789c14544419aec
+EBUILD econnman-1.1-r2.ebuild 868 BLAKE2B e7fda84fe81a76306006310768da2babde38fcdf492ec0c93acc86ab04ca0bbaaa8e23c9c5a79039060eb5b75f13fc81704a2ec859c0847fcdf8e410779d6253 SHA512 b99a9baedc815e63a74ddecb97ba8d6b5dd7205b3e74afff823cf65368a5cf48ff4c52a11978240649b40db69fdf9da390d0537af71a150351903ac37f1d4644
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/net-misc/econnman/econnman-1.1-r2.ebuild b/net-misc/econnman/econnman-1.1-r2.ebuild
index 8ea76419802b..9e8ccac3016b 100644
--- a/net-misc/econnman/econnman-1.1-r2.ebuild
+++ b/net-misc/econnman/econnman-1.1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index cedcd8cf2824..012d45c4c16b 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -1,11 +1,5 @@
 AUX 3.1.2-no-user-root.patch 847 BLAKE2B 7c682268f4f76884b364fad9dfef63931ffb694c529b3fb17d6c579bf908872b4bfcca6edbe1aa30b93475aa4891283c196cd803579654988d1a1a73d42f1afa SHA512 e4d94693f4a01577b9c4e1e1ce8ef71e9d2ae74edb4c1cad11c6c5615ed50df3ed5f785ff69ff869f534cb4887e21c1cc263fa94972bebc31b5421e0b7be4173
 AUX 3.3.2-desktop.patch 685 BLAKE2B b946f95ad017048e957e8567b7ce52ed085bb15daa155509ab08c447eb32d3d984696d636dbe46456a09dfb3ca93b1619bb6a4d90654ee46f43c662661debafe SHA512 a7c826e736f1661821d846ff8443dedeaa49a82f7e7a1a8f23924dbc1c9c12d71f5d8056e592ff8c6d44fc8bf4483f09e3b8d1e262b3ef408991f01ca1a283ff
-DIST electrum-4.1.2.gh.tar.gz 4926068 BLAKE2B e5d543c963cfec523e80e2de8b6a44c1845bdee23524c182e86efb7ff41caeaccebbefab2b8dda9c1e027410809d42be30db6dbc20fd877f3c749619478a6977 SHA512 4db8f8061ae149a5d9770b8c30676aa85ee66eb71052763e29d551317484b597628aad702370486b466c981688488f5a4592ae30a426e5fcd9250bc1a69a890a
-DIST electrum-4.1.3.gh.tar.gz 4958955 BLAKE2B 0d338261ada16d5f1a9b01532fd976094ed7105204f45997c789c01c757d85e7d8a47d20935f848a7e52db1755f953d999e974500cb016f34088642f046c6637 SHA512 af74cfd5ef3f5bc8a788a55b3459029fec7a08b693a3e58133b74a5ad782d4a716061e8619bef633fcfee8a9d1989980c1e8e8e314cea2431e473745660e773e
-DIST electrum-4.1.4.gh.tar.gz 4959040 BLAKE2B ac17588f542bde4d368065815688c36afac2c5d0ace849a7dfe997113d2c0d6c23512c8091d039a73436709f7104fb0c86aabe1a81448ae0d26644343c4cc588 SHA512 e6e0d01f1f32389da95c3fa131c8aaaeeaf38af1203cddbd06cbfb1b09070cc89fcd30a9c9979f5b06d4ba40001d046690aea6501342ce1669271c6646717be9
 DIST electrum-4.1.5.gh.tar.gz 4998188 BLAKE2B c33f1a8fa2af68370319a4f4fefe4d1814a20870114f4929d53bf90eca6bbb555cf9e52681f329d18dec32642ee21ee0e32558ec817936291296ce8e196c8fb1 SHA512 9430dfde6d6e78bb71db416cd35f474b44e234d69421b370dc7e4b09584ad86e095051dcf1366c142d5e6c3029aca617b4fb383f50904fc43d2f7f99053b1c92
-EBUILD electrum-4.1.2-r1.ebuild 2427 BLAKE2B b3f6b497dc1598fffda1d3a33cde9ccaac99a7b1a1eb91a8fa8cdf4e4da102626bb1b4d0895ce9d72857204405432ef11b8a80d46022028e622517e058786513 SHA512 ffa7139cb2eb713a4fe637ff741f4823f52527fcd0524d88f8288dbd669760f8472ae12779e4d593d4300c2e1d6f5a30a83e82d990d0085b9d74279618f38b7d
-EBUILD electrum-4.1.3.ebuild 2429 BLAKE2B 776cf7736027c4c4469a43abefd667ebdc3de053b5ef7f33b7a6b7e8fa864ee6bf1ec9418302a7ef8e33d223dd93103841591dc6ee626e8213aa242432b44a1f SHA512 9ea0993e5f6b4197d75e770748ee4fcaa69f3cb2ae7445d5d5237873c8730defa5f07806e1d7ff99976a38973d02a3f4cbbd68ff50be0fcd2b130a9e8da6c0ed
-EBUILD electrum-4.1.4.ebuild 2429 BLAKE2B 776cf7736027c4c4469a43abefd667ebdc3de053b5ef7f33b7a6b7e8fa864ee6bf1ec9418302a7ef8e33d223dd93103841591dc6ee626e8213aa242432b44a1f SHA512 9ea0993e5f6b4197d75e770748ee4fcaa69f3cb2ae7445d5d5237873c8730defa5f07806e1d7ff99976a38973d02a3f4cbbd68ff50be0fcd2b130a9e8da6c0ed
-EBUILD electrum-4.1.5.ebuild 2429 BLAKE2B 776cf7736027c4c4469a43abefd667ebdc3de053b5ef7f33b7a6b7e8fa864ee6bf1ec9418302a7ef8e33d223dd93103841591dc6ee626e8213aa242432b44a1f SHA512 9ea0993e5f6b4197d75e770748ee4fcaa69f3cb2ae7445d5d5237873c8730defa5f07806e1d7ff99976a38973d02a3f4cbbd68ff50be0fcd2b130a9e8da6c0ed
+EBUILD electrum-4.1.5.ebuild 2427 BLAKE2B b3f6b497dc1598fffda1d3a33cde9ccaac99a7b1a1eb91a8fa8cdf4e4da102626bb1b4d0895ce9d72857204405432ef11b8a80d46022028e622517e058786513 SHA512 ffa7139cb2eb713a4fe637ff741f4823f52527fcd0524d88f8288dbd669760f8472ae12779e4d593d4300c2e1d6f5a30a83e82d990d0085b9d74279618f38b7d
 MISC metadata.xml 667 BLAKE2B 4532c27bf060a5d6708cd7cbd350a30765778cf197221c6c0a4ce3d6db04f22b57f2c2836010fffb26f2b165b4df4e07652bb64addda4c9c982b80810c064d71 SHA512 ac74b8fab1cc0ca770d0f07b422cdf46af8a845ce49e00bb7b8eb5135b68408482689210025f6be087c997e9154e0d7366b1361d31e22653b872f5638abcea56
diff --git a/net-misc/electrum/electrum-4.1.2-r1.ebuild b/net-misc/electrum/electrum-4.1.2-r1.ebuild
deleted file mode 100644
index 1efda47c7185..000000000000
--- a/net-misc/electrum/electrum-4.1.2-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="ncurses?"
-
-inherit desktop distutils-r1 xdg-utils
-
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="https://electrum.org/"
-SRC_URI="
-	https://github.com/spesmilo/electrum/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cli ncurses qrcode +qt5"
-REQUIRED_USE="|| ( cli ncurses qt5 )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/libsecp256k1
-	>=dev-python/aiohttp-socks-0.3[${PYTHON_USEDEP}]
-	=dev-python/aiorpcX-0.19*[${PYTHON_USEDEP}]
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	dev-python/bitstring[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	>=dev-python/dnspython-2[${PYTHON_USEDEP}]
-	dev-python/pbkdf2[${PYTHON_USEDEP}]
-	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/qrcode[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-3.12[${PYTHON_USEDEP}]
-	qrcode? ( media-gfx/zbar[v4l] )
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	ncurses? ( $(python_gen_impl_dep 'ncurses') )
-"
-BDEPEND="
-	test? (
-		dev-python/pyaes[${PYTHON_USEDEP}]
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	eapply "${FILESDIR}/3.1.2-no-user-root.patch"
-	eapply "${FILESDIR}/3.3.2-desktop.patch"
-
-	# unbind aiorpcX dep
-	sed -e '/aiorpcx/s:,<0.19::' \
-		-i contrib/requirements/requirements.txt || die
-	sed -e '/aiorpcx/s:raise.*:pass:' \
-		-i run_electrum || die
-
-	# Prevent icon from being installed in the wrong location
-	sed -i '/icons_dirname/d' setup.py || die
-
-	# use backwards-compatible cryptodome API
-	sed -i -e 's:Cryptodome:Crypto:' electrum/crypto.py || die
-
-	local bestgui
-	if use qt5; then
-		bestgui=qt
-	elif use ncurses; then
-		bestgui=text
-	else
-		bestgui=stdio
-	fi
-	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die
-
-	eapply_user
-
-	xdg_environment_reset
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	doicon -s 128 electrum/gui/icons/${PN}.png
-	dodoc RELEASE-NOTES
-	distutils-r1_src_install
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-misc/electrum/electrum-4.1.3.ebuild b/net-misc/electrum/electrum-4.1.3.ebuild
deleted file mode 100644
index a8c551d5f9bb..000000000000
--- a/net-misc/electrum/electrum-4.1.3.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="ncurses?"
-
-inherit desktop distutils-r1 xdg-utils
-
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="https://electrum.org/"
-SRC_URI="
-	https://github.com/spesmilo/electrum/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cli ncurses qrcode +qt5"
-REQUIRED_USE="|| ( cli ncurses qt5 )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/libsecp256k1
-	>=dev-python/aiohttp-socks-0.3[${PYTHON_USEDEP}]
-	=dev-python/aiorpcX-0.19*[${PYTHON_USEDEP}]
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	dev-python/bitstring[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	>=dev-python/dnspython-2[${PYTHON_USEDEP}]
-	dev-python/pbkdf2[${PYTHON_USEDEP}]
-	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/qrcode[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-3.12[${PYTHON_USEDEP}]
-	qrcode? ( media-gfx/zbar[v4l] )
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	ncurses? ( $(python_gen_impl_dep 'ncurses') )
-"
-BDEPEND="
-	test? (
-		dev-python/pyaes[${PYTHON_USEDEP}]
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	eapply "${FILESDIR}/3.1.2-no-user-root.patch"
-	eapply "${FILESDIR}/3.3.2-desktop.patch"
-
-	# unbind aiorpcX dep
-	sed -e '/aiorpcx/s:,<0.19::' \
-		-i contrib/requirements/requirements.txt || die
-	sed -e '/aiorpcx/s:raise.*:pass:' \
-		-i run_electrum || die
-
-	# Prevent icon from being installed in the wrong location
-	sed -i '/icons_dirname/d' setup.py || die
-
-	# use backwards-compatible cryptodome API
-	sed -i -e 's:Cryptodome:Crypto:' electrum/crypto.py || die
-
-	local bestgui
-	if use qt5; then
-		bestgui=qt
-	elif use ncurses; then
-		bestgui=text
-	else
-		bestgui=stdio
-	fi
-	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die
-
-	eapply_user
-
-	xdg_environment_reset
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	doicon -s 128 electrum/gui/icons/${PN}.png
-	dodoc RELEASE-NOTES
-	distutils-r1_src_install
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-misc/electrum/electrum-4.1.4.ebuild b/net-misc/electrum/electrum-4.1.4.ebuild
deleted file mode 100644
index a8c551d5f9bb..000000000000
--- a/net-misc/electrum/electrum-4.1.4.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="ncurses?"
-
-inherit desktop distutils-r1 xdg-utils
-
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="https://electrum.org/"
-SRC_URI="
-	https://github.com/spesmilo/electrum/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cli ncurses qrcode +qt5"
-REQUIRED_USE="|| ( cli ncurses qt5 )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/libsecp256k1
-	>=dev-python/aiohttp-socks-0.3[${PYTHON_USEDEP}]
-	=dev-python/aiorpcX-0.19*[${PYTHON_USEDEP}]
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	dev-python/bitstring[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	>=dev-python/dnspython-2[${PYTHON_USEDEP}]
-	dev-python/pbkdf2[${PYTHON_USEDEP}]
-	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/qrcode[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-3.12[${PYTHON_USEDEP}]
-	qrcode? ( media-gfx/zbar[v4l] )
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	ncurses? ( $(python_gen_impl_dep 'ncurses') )
-"
-BDEPEND="
-	test? (
-		dev-python/pyaes[${PYTHON_USEDEP}]
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	eapply "${FILESDIR}/3.1.2-no-user-root.patch"
-	eapply "${FILESDIR}/3.3.2-desktop.patch"
-
-	# unbind aiorpcX dep
-	sed -e '/aiorpcx/s:,<0.19::' \
-		-i contrib/requirements/requirements.txt || die
-	sed -e '/aiorpcx/s:raise.*:pass:' \
-		-i run_electrum || die
-
-	# Prevent icon from being installed in the wrong location
-	sed -i '/icons_dirname/d' setup.py || die
-
-	# use backwards-compatible cryptodome API
-	sed -i -e 's:Cryptodome:Crypto:' electrum/crypto.py || die
-
-	local bestgui
-	if use qt5; then
-		bestgui=qt
-	elif use ncurses; then
-		bestgui=text
-	else
-		bestgui=stdio
-	fi
-	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die
-
-	eapply_user
-
-	xdg_environment_reset
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	doicon -s 128 electrum/gui/icons/${PN}.png
-	dodoc RELEASE-NOTES
-	distutils-r1_src_install
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-misc/electrum/electrum-4.1.5.ebuild b/net-misc/electrum/electrum-4.1.5.ebuild
index a8c551d5f9bb..1efda47c7185 100644
--- a/net-misc/electrum/electrum-4.1.5.ebuild
+++ b/net-misc/electrum/electrum-4.1.5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="cli ncurses qrcode +qt5"
 REQUIRED_USE="|| ( cli ncurses qt5 )"
 
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index d78936a52553..7e1130106946 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -3,8 +3,8 @@ DIST freerdp-2.2.0.tar.gz 6878427 BLAKE2B 0a2a4e4724e9875ce5d975b2c9a0b89ce9467e
 DIST freerdp-2.3.2.tar.gz 7284490 BLAKE2B f6017752993fcd9213117016825344953872b3ad6b6717039ba78555bbeeb276eb548c2c097c5df46d25d19678b8e275ac25a4c62e212c087e1b52d9ce672de9 SHA512 b8502d34c73113a42bf2dc240431967829064d68f507cc42ff06432a784213eee4a2c001b174f1b970545aec75b3caf21ba5f4ee1ca8c07c7ef834131413204b
 DIST freerdp-2.4.0.tar.gz 7244549 BLAKE2B a48c48ca7af044a8421d15b7cae971e3f568b55b26b2bc44c99dfb5cbcd7558fe73ae8b59ee127f40cfafa30fc26fc45bf34cc86ae71cba9b3b9c450c88b131d SHA512 5dc34e66ae7185393981ae33676d689e3e3e8d7f738b37d53675ab991a762a42450d02d738166fc49f196d32453249eb36e35728f86edae6ddec866a913551f3
 EBUILD freerdp-2.2.0.ebuild 2805 BLAKE2B f351598a209d0c2fb18c711e9f76e9d26325d31605cb6ceb1f06d0508030cd6c127384794b03e5156fb866841a8e27915be0e5edc0e84d66c77b671f4c0639c1 SHA512 452305faf9d31e27b6571f1ada542bfac588b6491e6d451a35b132b816e74e25d8cc88b1abfeeb485989fd96eed79e030f68686b6502295b3895453c1b96dab4
-EBUILD freerdp-2.3.2.ebuild 2867 BLAKE2B 67d97e3b81703d0d8be132acfdeade9cc0c08b6861fae2d74d45bfa970c5c22d16683dfef7728f5d5acd71338da6ecbd2bde0d1bbac14ab81730456ecbe50875 SHA512 0f8706eefbd4671c800363ca8bac3443b0c860115f263bc075d39c15414faca4320a0fb27f47a131ae4665dd2049bcb890169b182e2f8a4d1b17c303d3cd064c
+EBUILD freerdp-2.3.2.ebuild 2863 BLAKE2B 54a2dc510e6b8042447f871a813b568460f33a13f0bd5b3dfff6de1e2e86ded42ae3d3ac9a5ed635c5ad8d1b706333677f2aba23c75ffab29d523f8c57ea647f SHA512 4b02f0bdff3bcb80c374c77e53c4550e3db2f31fbbe60520b838e4bc5d803104fd0748b504164f59695455bd0123353c53cb50b7f9bce04b79019472c020f25b
 EBUILD freerdp-2.4.0.ebuild 2867 BLAKE2B 67d97e3b81703d0d8be132acfdeade9cc0c08b6861fae2d74d45bfa970c5c22d16683dfef7728f5d5acd71338da6ecbd2bde0d1bbac14ab81730456ecbe50875 SHA512 0f8706eefbd4671c800363ca8bac3443b0c860115f263bc075d39c15414faca4320a0fb27f47a131ae4665dd2049bcb890169b182e2f8a4d1b17c303d3cd064c
-EBUILD freerdp-2.9999.ebuild 2867 BLAKE2B 67d97e3b81703d0d8be132acfdeade9cc0c08b6861fae2d74d45bfa970c5c22d16683dfef7728f5d5acd71338da6ecbd2bde0d1bbac14ab81730456ecbe50875 SHA512 0f8706eefbd4671c800363ca8bac3443b0c860115f263bc075d39c15414faca4320a0fb27f47a131ae4665dd2049bcb890169b182e2f8a4d1b17c303d3cd064c
+EBUILD freerdp-2.9999.ebuild 2811 BLAKE2B 71ecfc100f2dc04e368e8561fb06c0799e1aa68d9ec64144958d4ba60af70961e66c3f6ac46da48ebd07ffc9e02869d8bb0699bec778b68600332c181aa1ccc3 SHA512 4312971f4594c7c5f966bdc505e5d3483392a1e0289fb84790550d7f270e1a84502c1a89cc3c779675eddf593eda0b6fa15a72280db6442e1cfd286af651c3ff
 EBUILD freerdp-9999.ebuild 2811 BLAKE2B 71ecfc100f2dc04e368e8561fb06c0799e1aa68d9ec64144958d4ba60af70961e66c3f6ac46da48ebd07ffc9e02869d8bb0699bec778b68600332c181aa1ccc3 SHA512 4312971f4594c7c5f966bdc505e5d3483392a1e0289fb84790550d7f270e1a84502c1a89cc3c779675eddf593eda0b6fa15a72280db6442e1cfd286af651c3ff
 MISC metadata.xml 481 BLAKE2B b7102d2ff331d4c991dbd2d20b3bd33d375fe5f332ab48f2c3401a579e584cdc4c84795a286c18536b82cd88b7b9991b3559774a937ac59ad8ccc21b91241f60 SHA512 47db413f3b78632acc874d8e67ef8231551a6074cb2269760fb780f1a86dc334bf7675550fed7a95e98a92470e3d70cfedb10f98f6ec686e785dd67615e93db7
diff --git a/net-misc/freerdp/freerdp-2.3.2.ebuild b/net-misc/freerdp/freerdp-2.3.2.ebuild
index c08a85f6d05a..2aa7099751a7 100644
--- a/net-misc/freerdp/freerdp-2.3.2.ebuild
+++ b/net-misc/freerdp/freerdp-2.3.2.ebuild
@@ -15,7 +15,7 @@ else
 	MY_P=${P/_/-}
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~ppc ~ppc64 x86"
 fi
 
 DESCRIPTION="Free implementation of the Remote Desktop Protocol"
diff --git a/net-misc/freerdp/freerdp-2.9999.ebuild b/net-misc/freerdp/freerdp-2.9999.ebuild
index c08a85f6d05a..50350a7d1f9e 100644
--- a/net-misc/freerdp/freerdp-2.9999.ebuild
+++ b/net-misc/freerdp/freerdp-2.9999.ebuild
@@ -88,10 +88,6 @@ BDEPEND="
 	) )
 "
 
-PATCHES=(
-	"${FILESDIR}/freerdp-2-openssl-3.0.patch"
-)
-
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_TESTING=$(usex test ON OFF)
diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
index fd77338382a9..bfa0e9b5a1bb 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -9,7 +9,7 @@ DIST iperf-3.10.1.tar.gz 636957 BLAKE2B 8390b4fb0d4c6590bf73e46d55fbe100f1c9832b
 DIST iperf-3.9.tar.gz 627100 BLAKE2B c09018dc066612c61076ed4c53dd93b4dba766fbcbc359eb402055dcaa90af63e2df2b6c67ba8a0a72a17648014240dc5b355084e69550afed4d59257a224de8 SHA512 3da0939bed576a7c14baa03c996e6f407f20bfe58c4b3a36a66e74f41bd5442c0b23ab18c8eb1f2f37fd47449af533b61b658d810c68707b2b06d28894ac2035
 EBUILD iperf-2.0.14a.ebuild 856 BLAKE2B d75c7d282707edad5bcf7b8304c1820beb7dbe082f8a0203dd75857ab9ab80a741049acb671bd3383aafa936a51fcaf4cee19e98de64e71456332d6cd676e8b9 SHA512 2dfca97c4d60f56a8977279dd947fc35f0c30d8bc3c36fe308bb72de8287b5975ea20be2b11aaf1b2d858b1e3543ef759a94419e90a9ae0a304e8f852e9a1d34
 EBUILD iperf-2.99999.99999.ebuild 670 BLAKE2B 753dbd819ad867ee52dcdb9af069667d78053826f0028257eaee9fa13b6fab31cb27e5d419baa4c038a3346f607cd06639ed4dcc8fabbee6af943de336e9c45d SHA512 37d2329648792714b13e5fcdd2709b181d1cf32aa159aa39d8e3a1b922a01ef47e13ea340bef966991b7321d93bf9a41e7d2e824204f6770610eb71afeec6f13
-EBUILD iperf-3.10.1.ebuild 963 BLAKE2B 764cb543a68c77e73935a735c99adf6a8706b2f23f759878051977086a2a2bfbf24073872b2a65ef0e2574b6c33ddd5cb82b8717ce654e1907f43c8f52410f11 SHA512 042fa29144e1d4d5d7d6a0d8dc5b5ab4c6f798011ec17917694657407640aa626ba8bddeddde8fe2aad4e8b2a6189502ef00b7bd625ffdb60115b5befe67d3b3
-EBUILD iperf-3.9-r1.ebuild 908 BLAKE2B 2e607818df5e0058b450da97c0f2e86595835362dc3207b8b936723e5d1f3da2d842195d87d4fa088e23d16660de2770ac4d3acae2315f6402ded93034fc0ae8 SHA512 58b9b928cc6aa02b9219701cd4a152e0b96891f6dae85a2c82d41867fe84539b37604c93f52ee166aed2993f27931880bb0f8f8fc830e2c828045834b63071f3
+EBUILD iperf-3.10.1.ebuild 959 BLAKE2B 8c3c92b165177d9b64e53b254bd5b0255263da0c5133a9d042685e09bf645c199ad971a9cfd6c04c9ec10814319b61c2343a3a778c3b593c08b3424af38c8766 SHA512 628b069ed6c2b92b3ba0227da347faedf8800f5ade836569f86cf869192dc588edfeaa59fe555be3c44c6d627dfbdd4b3a7a5cbc2cd83072efb2d77a9c442e4a
+EBUILD iperf-3.9-r1.ebuild 907 BLAKE2B 1657b6f91e6592920f7134e262fe8bb6c5e8d3369b722f134463645f00fbba39404f26798eb54c34230131b582f1f7d29e0eba090c4d4ff4c66470476953f6c6 SHA512 0486535a43e0973e7bbd0dd842796492a07c9c0bc398d95100b1f4ddeea516f4dc60cd7ba4afaeb5f7da65b3d2c49c015cdb6e4c2ecc05aa6f13582448274cb4
 EBUILD iperf-3.99999.99999.ebuild 722 BLAKE2B 3e048d5eb49365b5c5f89e4072de496e908269c1dcf754f54810671d6ee66c08c814278be899060a7ac97a04464da4ddcbb9a93e79f5cbc6fa195eed584ea71d SHA512 b47ee419c1d04829ccb9a5a4225d58bb15f723a0f297b01c99f194ec662bba4200371aa0e084e737af0f9ccbbccb656c4e0dd680830fc9af11dc1be342bcd64c
 MISC metadata.xml 569 BLAKE2B 66b45104e695c19a4c0e9bb804e75c2f5236d7b9e6b6741df3ab40669c79374a7b01b080c3d99b21f522fd48554713cc44af543c661168aaa0a0989c8dbffeab SHA512 5c67ca8f97c48097ff3e1f8c2a738deebf2357c15f82e19f9b695da6892240a78e3fd2af265b9ebaa2f706e46d09bfc99401f0538ceebef448a911db3197b4ab
diff --git a/net-misc/iperf/iperf-3.10.1.ebuild b/net-misc/iperf/iperf-3.10.1.ebuild
index 0b042e730826..556e31ed3add 100644
--- a/net-misc/iperf/iperf-3.10.1.ebuild
+++ b/net-misc/iperf/iperf-3.10.1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P/_/}"
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="sctp"
 
 DEPEND="
diff --git a/net-misc/iperf/iperf-3.9-r1.ebuild b/net-misc/iperf/iperf-3.9-r1.ebuild
index 1dbcdb0f1507..6e77ed4440e0 100644
--- a/net-misc/iperf/iperf-3.9-r1.ebuild
+++ b/net-misc/iperf/iperf-3.9-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P/_/}"
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="sctp static-libs"
 
 DEPEND="
diff --git a/net-misc/mobile-broadband-provider-info/Manifest b/net-misc/mobile-broadband-provider-info/Manifest
index d71d9813186f..9c6d8cae0431 100644
--- a/net-misc/mobile-broadband-provider-info/Manifest
+++ b/net-misc/mobile-broadband-provider-info/Manifest
@@ -1,3 +1,5 @@
 DIST mobile-broadband-provider-info-20201225.tar.xz 83052 BLAKE2B 53f37e1d5796350a9ddd1ecf7de491a365baa854d5021c45e9359ff51cd0e545867858ef172eeccf81f0df072b207c6dce8024ca805921b69f0c50d3febfcc0b SHA512 26064451f43494e4895b65912e3dd06a62ca8afbe3334f09ca8428c1812318f7dac4accbd1c3aa9e83fcc1ee177fb187cb6fe77fab56608abd28c5f5ec3499cd
+DIST mobile-broadband-provider-info-20210805.tar.xz 83756 BLAKE2B c7872a4bbb9c0ed2a36c374210e57cdd6a1346772c7f1c06a273e753606f70fe5d911eb6b11c6779382e2fc8a7bfa99ce216522807c6be60ed1719d05b7b452b SHA512 d3166484792aa0d97d7a094ecac309062fa1bf07c50c5b9bcc827e45c0a4d005a1131a589af1ec9920f373346d9ccb27bea6c019bad39c633998c00df92a5356
 EBUILD mobile-broadband-provider-info-20201225.ebuild 481 BLAKE2B c3c19e8e6fe775978d4d6e6f711263a79cb5b1e4021db4134fd7605b09dbb4bcd2f99dfc19a189c492f1bc5b9ca0f996283d4c28b72cdee87ed48f04efd992a4 SHA512 584d39732abe9789cf94ec2f0a74c769e4119b9660685ae078b337dc5fe67cd580a55f6580d34546e846d6113cf06017b3ad641afb1cafad4a1ef8c4189b246f
+EBUILD mobile-broadband-provider-info-20210805.ebuild 488 BLAKE2B 36e1e582f872239dcfbddac0ef4f35bea00496f186c8f28b6ab13a93dbcf005ba4384d370daf5d81c5e626b849a20e79b4f6de5703f5f742b7e3618cc0aad048 SHA512 cd5ded90122c411840968ec862cb833a74d73a83acf48403f0ee784ea7c13ffdeb1ad82ff32fcd3b48847e2321840c13e80fcdfeab08c7e3980474475cd41796
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20210805.ebuild b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20210805.ebuild
new file mode 100644
index 000000000000..583d882d3fd2
--- /dev/null
+++ b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20210805.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org
+
+DESCRIPTION="Database of mobile broadband service providers"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband"
+
+LICENSE="CC-PD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-libs/libxslt
+	test? ( dev-libs/libxml2 )
+"
+
+DOCS=( README )
diff --git a/net-misc/ndisc6/Manifest b/net-misc/ndisc6/Manifest
index c4c87cc600f8..ef35d41aac67 100644
--- a/net-misc/ndisc6/Manifest
+++ b/net-misc/ndisc6/Manifest
@@ -4,5 +4,5 @@ AUX rdnssd.rc-1 502 BLAKE2B 39875eee2e81627e0e603bc01e552622e219af3bb18fede1d6b8
 AUX resolvconf 148 BLAKE2B 7e11d5f6d87fdf2e60ebb2b308663c51d4683cc389ba9640cd026da5ac99dcdd196c9e7dc4733b77da58285fe3fd6a0eab9d0a6b9695eeb8b7cf54aa17c560c8 SHA512 ba04b2ae327a1136122bf68929fee7946bc2938ce335cfe3c982ccb5bc4d53a66154dad65d79eeb47fd3b306cf203e69aa0197f6751ae5b0e021aff6d7f01ecf
 AUX resolvconf-1 152 BLAKE2B 1219e02e170a1cf279a1497e12269061659af7c61d662adb9beab39e772068d597a5f63b6c1f39efa5001c5f8d1014cd2f265cb3e49c3163ff38d9205126dbcd SHA512 cdba5bbfa69a8288696f14d1f7798445769bf37c6363cf0bdeb2aa162ff5c83728f513917c7649e3f6493bfc9cf437e0c08e460a87b80604fa31dd599441ef83
 DIST ndisc6-1.0.3.tar.bz2 260294 BLAKE2B cb9f302bd4d4f15effc8165dfdc686b2eda7543dd745cae43a24fea49086e3b5c58cc5b4eb14bc1a46657a15f6bd11322d5629570461f68743619deb9cd10004 SHA512 11dc9833edfc76650b46977d653686ed800dc1cc1dd069051410570f522d538ea9297b013a8d16b94aac3ebf33043cafdaee9fdccb5c02cc08b4c29ceaa96a54
-EBUILD ndisc6-1.0.3.ebuild 715 BLAKE2B d40b3c4d80d5de95a303fd5a45e169a723fbaa41e6ef8f47ddd402553b950dedfba4e590699bd6e13ac13e1c61487c3bff7b971e4e25a274bc25dea3136182f6 SHA512 f4eba43964119817149e49fa90a23dd42197ffb4d983a3d4edf1b1437f85767097c0ca51afaf5c52f7a38d7c7229831b821f622958cb09f31da20ff4dbdc18b9
+EBUILD ndisc6-1.0.3.ebuild 714 BLAKE2B 36f429d37af7fec788201473ddd22f2c2f038223f0c47e33a1413b9b43b5e5b08c27176183e64583bb92d8052f3f04a9ba8bc764271b98a24f5991b880bf16a3 SHA512 064d54c64e2a29c6f6385e828612eca5f1cee2d68df4b68b132852d1644638ad8197116ce1f6554cdd2dd00e6e547e7014b5fc019567a2707195858bcff94965
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/ndisc6/ndisc6-1.0.3.ebuild b/net-misc/ndisc6/ndisc6-1.0.3.ebuild
index e0f6fa4c1838..3ff6ac986a70 100644
--- a/net-misc/ndisc6/ndisc6-1.0.3.ebuild
+++ b/net-misc/ndisc6/ndisc6-1.0.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.remlab.net/files/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 x86 ~x64-macos"
 IUSE="debug"
 
 DEPEND="dev-lang/perl
diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest
index 3b481e656bc9..5ba8c8f3f314 100644
--- a/net-misc/oidc-agent/Manifest
+++ b/net-misc/oidc-agent/Manifest
@@ -4,7 +4,7 @@ AUX oidc-agent-4.0.2_makefile-toolchain-vars.patch 1214 BLAKE2B 2e2c78973049160a
 AUX oidc-agent-4.1.0_install-perms.patch 1911 BLAKE2B a74915c1ea19c4d8fcfc09b30c60259e361776c458d0f52885ba4399f0599a8094caced14f59cd024331a4d09efe9298061b914faf4e74a700975e2afb7890df SHA512 9390b4ee8a5baccd8de0f5b22c18ea6d2c0a3c83e70b3e3f44af87cf563ec332ce40c6f5cb4f0f7065cb6b17317442daa22de125139823b4b99428c0624fa08d
 AUX oidc-agent-4.1.0_makefile-toolchain-vars.patch 1439 BLAKE2B 9e3477c1eb3303cfbf66f99f8a3fb71966c78c2af2922219efe6684c2fc572fafd8c5d9e93c70cc05aabeed3a53d97a592f3e22d9a0aa6931ce436946fc194c7 SHA512 e96d88784bc55095308fc40da8c969da1068ec6c2ca62ed34fa455785c28f1e4373c49a8023f2ca77fa64cacdb27481972eae014e66315b30c9de2a76651749f
 DIST oidc-agent-4.0.2.tar.gz 802872 BLAKE2B bbee872f0b029f4289a4805d1a5f8fe2fe2b8c297a918cf7821aec6bf4dbe634882425c888cb0e784778b56754af1c8b5a34d5282f84090cccf6315897ccb461 SHA512 fef440cd4b72055d8175f9f33c735235bb87bfca38b53bc4e049b1644f74f6a683d312297efa04cbacfe55190c5d6b588fa37475e5a55acff540909865389037
-DIST oidc-agent-4.1.0.tar.gz 800972 BLAKE2B b3dd30e886dea9bf1731fc770047904f6f8e1a67b723fba496e69c55c7d5d1e18bbfd3f0f3ba4c1a42fe3d8cfadc79c2bd64183afc2eb9cdd6ee1446b62a2486 SHA512 81e5dbac389da342db788aa65f8c10d97f1179322259de2dc379cee38e2f6ac1317ef48ee4c91cbabe363ae54cc9596ddf260591526c7524c78ba02b5d3961cc
+DIST oidc-agent-4.1.1.tar.gz 801103 BLAKE2B dcb82a537787ae6ced577843c67acdd4e3fa315d017222067b2914837dfffccae27ddbdeeeaf4e8ca70c7e2744e03df5964d3ba318efd4460c73252bfd3f8e95 SHA512 e383e054623dc3b8fe73ec02df44faa05d4b69aaed47c7925f6f92d25cbc5301173fbc607b6198bc70f99e634e582fbae7c5570812086a8e5694d40ce6d2c2d1
 EBUILD oidc-agent-4.0.2.ebuild 2130 BLAKE2B 32d3eb8dfca12421f40b086dd79cce36ccf3c2b45c003a4642369245e28270cf1df8d9e7b8f870d6c606e11a19a59d1f0d78e111cc6f9e458289808ebbe6f314 SHA512 5915027ae1d15ee1394af98780133b18a0b20a0c9a6f372a138c4aea1083596d807b3426c5b42932c5ecfbd0a35f0b6cf4ebc9f8c15cf1d6a666654ab572f2b4
-EBUILD oidc-agent-4.1.0.ebuild 2134 BLAKE2B 7fa9b7d1a62c7ca9ac148895f7a98e5ae0fa1e788c858ac5f65e30e434ef7f77affcf16626298c003f5c56984907def89904b4cc92c819afc547b0952327e1f5 SHA512 e26b7ce146a929498fcae4a75d95e5ac12277cf665ea3ccf0ecfc453a9ec31f7f4811ba4faf8defa4e704e60cdc25f8be54af5a59eaa9b09b2aac43187ff9226
+EBUILD oidc-agent-4.1.1.ebuild 2134 BLAKE2B 7fa9b7d1a62c7ca9ac148895f7a98e5ae0fa1e788c858ac5f65e30e434ef7f77affcf16626298c003f5c56984907def89904b4cc92c819afc547b0952327e1f5 SHA512 e26b7ce146a929498fcae4a75d95e5ac12277cf665ea3ccf0ecfc453a9ec31f7f4811ba4faf8defa4e704e60cdc25f8be54af5a59eaa9b09b2aac43187ff9226
 MISC metadata.xml 779 BLAKE2B ef7a040559363a8012380b3f8568f963a612078c2d5e5129f54db724d414d6c7864e79e480eba5574fd36847caa13a09a7ac7013f5ceb406d83e3be5ebdb47e9 SHA512 f9465b4e88418ec276071683b5abbe8f7601e54daf0cb74da2d24d142e2307b1bb994ee4191eee48ed1b3fef724ad49b548cef12cc4c77088c2f2d07e1b8a776
diff --git a/net-misc/oidc-agent/oidc-agent-4.1.0.ebuild b/net-misc/oidc-agent/oidc-agent-4.1.1.ebuild
index e433d2b45353..e433d2b45353 100644
--- a/net-misc/oidc-agent/oidc-agent-4.1.0.ebuild
+++ b/net-misc/oidc-agent/oidc-agent-4.1.1.ebuild
diff --git a/net-misc/rdate/Manifest b/net-misc/rdate/Manifest
index d17e872d9727..8266424720be 100644
--- a/net-misc/rdate/Manifest
+++ b/net-misc/rdate/Manifest
@@ -2,6 +2,6 @@ AUX rdate-confd 509 BLAKE2B 92826ed23b867063c8cf1145e7a2f62fe6a904593eca1add0597
 AUX rdate-initd-1.4-r3 525 BLAKE2B 8533f2b589aa860d88a7cdf18931b2a5800a1d82a78db576dfb12189f4b3391535bff5896ef75d6b3ef7373e1ad86c86a82f7422f4c404af8b9b3e414aaad59c SHA512 8563dedff5b2188d5176a882e36d4c8cdab4709ca40e86eb9c76e30f91c3eb78d1da8f971d2c2f4189ef801413e173367d2a8a2b9b37608ef6a84a0e73e39157
 DIST rdate-1.10.tar.gz 19159 BLAKE2B 71c858b5eb10b07a2974fcb463a91808fc59582dfce786dc936370b3fc2122bfe72cc32cb3635a1e77ec663fd44712852ab85d8ba46702d1e222ec63ad46f3bb SHA512 7a7647102b5663218fff6c1364b83250a199a0169adf40db87a49709aa24c3b1fae5acf01732d5432fcb2883d29a24b2ae38cf5333ff75075e5d7a6fd90e7146
 DIST rdate-1.4.tar.gz 11500 BLAKE2B 705324648f30685135d3ba3936b05a82bc6a027d3d1c407950cb7631858f6d9dba34f97f065482988caf4a68addc3ba122fe475cfd1684c526f5224113657ac3 SHA512 ea9d62af3aa58fb7bb2bdce257cc23758f103ac056e4d6a8b44be0e41c44dff49e78bdb03789e3bf2957e74997c2f1c0376fdc659b4f39d89e43ef139a51f996
-EBUILD rdate-1.10.ebuild 745 BLAKE2B 05e00c3d4f382ff8e73af94a6c35fa34e3643100db083fb7a1f9c7f1900bedc30e5dc5f4a295161ce0a693f4f1c36fb053a75927d150479706e0e7f532058b4c SHA512 755efa36e446f5ac05bab5099633d56027a53365399c71e8fb924c1b46164210c01c0f1291b1becd8619abb0ee6bcf0b4efd3495e583c7c5d5430f32322a0950
+EBUILD rdate-1.10.ebuild 744 BLAKE2B 0abcf56513a377a525356f61fb1cdb75067e9e258625fb8b2a2640a8aefbfc138e2ded225016c08fd717cd6ed56d8a995d47ecb80149114b73c96d6cf12a7d2d SHA512 a51f39d3890da382e25f3f5c93f793ebd760deb9ed510e809cd2cfaf12939c3f9b85f6da97793239c194b075942d40993272e05be984f5db99ecb8e4e5d32cc5
 EBUILD rdate-1.4-r4.ebuild 830 BLAKE2B 1a8a3f303d06b50a53cd86bf2f8973b269824b91db1f01dff92f9bd9be59c2e3fe7adb229edce00f36be62ed2fc1594b259a07fb7d82ca9198f777086df504de SHA512 b7924e5b106f30b6df99c0ced3dd37e6e3834ce7407bd46ef62de66c2ddf5e1c955690bbb3af0de9059e0c37398f09b78225189d8c4495fa107e79b474027d50
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/net-misc/rdate/rdate-1.10.ebuild b/net-misc/rdate/rdate-1.10.ebuild
index 0703f2150756..2a7e8d09bc57 100644
--- a/net-misc/rdate/rdate-1.10.ebuild
+++ b/net-misc/rdate/rdate-1.10.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
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/resurrecting-open-source-projects/${MY_P}/archive/${
 
 LICENSE="BSD-4"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="dev-libs/libbsd"
diff --git a/net-misc/rygel/Manifest b/net-misc/rygel/Manifest
index f05a73c90800..f3e834d03e22 100644
--- a/net-misc/rygel/Manifest
+++ b/net-misc/rygel/Manifest
@@ -1,3 +1,3 @@
 DIST rygel-0.40.1.tar.xz 1693996 BLAKE2B 505b96152c0b73bda2b7c81cb742f48cfea86738ea965f07afc1532a77e2262a5c0050eab185a33a831d57fc2f3c85247bc2a02bf73eab5d0be35817e8f00aac SHA512 180f143f394d7a2697c888eef7e7c2bdb5077b4ad289eb6e3f832cc1efde5147248b46e5ad9e77615d7976de7e7d3e68d737732bf7f91f01c42e18e06d8f89bb
-EBUILD rygel-0.40.1.ebuild 2195 BLAKE2B 622a36e1b407b1a7d596b41f54a7bf9f22bfe01253c3aa73c6c316c3552a41232e4afbc001961f63ea47af89f3175011ec3e274e1329fc513652863efd9150e7 SHA512 4b665f5d653d7645255f0276627f4c732c8820ad69e7150126a58f89f455881457a92266fff5dbc092bd1fe2d3fa8038bf5a842f2008f88c896a484c353035f1
+EBUILD rygel-0.40.1.ebuild 2198 BLAKE2B ef3f3b236482562b9394f8fccdbcaba8f42f5f1b4c3b45db32d99a47e1b3e1fe47c49cd82584760fe51cb907436035a23e730c8605f269a76720fd7e6ec4e36a SHA512 5516705acef67f4da77d2f94a158b8299dd5255268f1ad623527906b6ba92ee5cbd91066e7a455c581462632299b29e1f7f333b171d50c4e14cc8e45726359f5
 MISC metadata.xml 431 BLAKE2B 26d8bc725f5e93f39bbc4f3dde70de841cc0cfd407f1c37be3934f25fed17e1d30e1509859e18786baf4af1f502ab420774d6fec95117bba1832f116d1b93274 SHA512 61bc8e851d50b1d47ee5f286aa76e69a9d345514b0a94d643cb6bfc0fe5072f272d0aebcdaa9389734080ef8eda0cbd3a616d90860c88c6ab59309ec05cdc0ce
diff --git a/net-misc/rygel/rygel-0.40.1.ebuild b/net-misc/rygel/rygel-0.40.1.ebuild
index b6b7bad539db..882ffb84994e 100644
--- a/net-misc/rygel/rygel-0.40.1.ebuild
+++ b/net-misc/rygel/rygel-0.40.1.ebuild
@@ -21,12 +21,12 @@ DEPEND="
 	>=media-libs/gstreamer-1.12:1.0
 	>=media-libs/gst-plugins-base-1.12:1.0
 	media-libs/gstreamer-editing-services:1.0
-	>=media-libs/gupnp-dlna-0.9.4:2.0
+	>=media-libs/gupnp-dlna-0.9.4:2.0=
 	>=media-libs/libmediaart-0.7:2.0[vala]
 	media-plugins/gst-plugins-soup:1.0
 	>=net-libs/gssdp-1.1.0:0=[vala]
 	>=net-libs/gupnp-1.1.0:0=[vala]
-	>=net-libs/gupnp-av-0.12.8
+	>=net-libs/gupnp-av-0.12.8:=
 	>=net-libs/libsoup-2.44:2.4
 	>=sys-apps/util-linux-2.20
 	x11-misc/shared-mime-info
diff --git a/net-misc/seafile/Manifest b/net-misc/seafile/Manifest
index 9bd89361a934..87a42b62a0a6 100644
--- a/net-misc/seafile/Manifest
+++ b/net-misc/seafile/Manifest
@@ -1,7 +1,7 @@
 DIST seafile-8.0.1.tar.gz 731105 BLAKE2B ac4b79112e40196cce2dbc64bb94a852b3f81ea08e0a833d45a297c02f5f66432345647b9a34aef67d8108d16eb5e3648002a070bb556a70be63b8c0314af9bb SHA512 dd6366c06bfa25f16f5d3b2ef83b39b5886e834697891c274a3b4eafec3aabf72858dd4d341452e8d4fb8cd1166d30bb8a783dddb4370c02526e3a00ed9fdb3c
 DIST seafile-8.0.2.tar.gz 732341 BLAKE2B 29bf3187a37c0f01261d3afba996e1165ddebe05a36f734fd3d7ee5d0368ae2f94b70cd9251799ddeeea2318c510094b7b2fe917ce06a6328aca00f378dcb9ae SHA512 772dfb060e381eb2395b7ab094e11865f13e71f8c767d31e4ca8b48eaadf74d5d447298ea261f9cd48ff126828829c8d258ca943b01890f72072a36753d8333b
 DIST seafile-8.0.3.tar.gz 738066 BLAKE2B 302de3b5a4f465429955d2819c7b43ddb305cccc76cc7cf67885a75747ec5dcad85d17f94975abdd3b3d54d49a5d9ea05ab7947c3a2b84764b50fe5fb10e7636 SHA512 c51edfc094aa509c730b1b3f4ceb911461081689c8cc2564fb866cddaa54c445d9ad12ca9e4e90e98b771eafc6b6e1496e052538a2475a03642cdceb9212115a
-EBUILD seafile-8.0.1.ebuild 1116 BLAKE2B 400d7aecebbfbac00ce0719f885b2ecb112c2395ed2494f09022d8108c1ab65d2b0a1e39bb232657f00c617d981a6ebfbc213a127661b2e47252dc413f004aa4 SHA512 4c491f150b09de1aba11d81a1ba6315d2e29912e77f6a9687606fcd2f6e75abe0af9734e265700ced828e9d7fa644430d53e15344eef2169c488dadf4e007612
-EBUILD seafile-8.0.2.ebuild 1226 BLAKE2B b8fb80a1a5fbe79b5e899f034d4eadddc9b18054e4b238f2269ecbef7c33e371f4deddd5d78844fcedeef9fadd285e2602b1ac0334d56b6552791f0cd155bd17 SHA512 82ed8ca384274d88273f570d43299e59f3b7be276f17f6f9ebf3526a41543d9a66532546dfe2954ed8fc1a417d0989cbdfa85984b2b1232ff0544cc41740e5db
-EBUILD seafile-8.0.3.ebuild 1262 BLAKE2B ff12fcdc9fb2ab47e9fa782200ec12a8b33c91852fc687e1b363aff43ccb5932da97f946b164d8e3812aa76831bbdb336882808ab6fbbe8d7372b085ada8a793 SHA512 244ebd2de200707b0e80e36f3e2b9d23c0b584e0d4727a0b320127b44d6930da7b6d377137a301b944f63b1bad750bc7dddadfd689ade0be2c12b6d78471d546
+EBUILD seafile-8.0.1.ebuild 1099 BLAKE2B 10520d7558ad9d4869e834229b127599fd06b260fc11d424442624dd0dde771dc4717826e47521c3953afcdf8dbdfb571341645a270442acb4ae35bcfedea2ae SHA512 f0b72a44a089f7f6ae27202ad92c58df9489213408f14ed94fb1a9227f157d9c74fb2b7b895ea11b46ba435ff8a3d4ba654f3790f021a2963055bbb76ac7d483
+EBUILD seafile-8.0.2.ebuild 1209 BLAKE2B b3e2aea2bd855c3d3b71c8d1b053ee19f07f1bedb97d27a64c4d9ee0bc691517b3314bd692825a29367ee38fe02178954847a196aff1aa203971e5c7fd862b3c SHA512 ea30081b9f03da98eab313a444fdc0ae7543ebdf4adeddec0943f94c7ef60c289d8b19f6e58d8ff752824d8a2b8614b1febb21b18145320f6e7a64e55159f1c3
+EBUILD seafile-8.0.3.ebuild 1265 BLAKE2B 9fd65afff11d3ab56a4e16a796caf48e0c3b2bfa1a88a3a996b1725f44379f2113e39e7ca112724c04c5a1777341a53af9f3b479eb14d0108e14ac2339bcbe86 SHA512 a17c6815c36e2b172755ede64d3f9749ed126484244f863d3683178aab00120517c5f75e049e2abb755a395c9d6c5a272efaba18db959a0ad0c493c2561cb8bc
 MISC metadata.xml 477 BLAKE2B 6491e1ec0cb07251b6bbbeeff7e9b04ece552e19d922f7db44866e323f17b14839a165e5c6ac77ab0327daef328aa701e338f2c9620188bfab8833b9497bd187 SHA512 012355a4c6b2c9fff5f4d1d2202dfc377c718f6b8d96e5474b5650894ef6e5dd0a97a927174b0bd492bfb72af0323a4a8bdca3b9c928f01d664c1f196fb861df
diff --git a/net-misc/seafile/seafile-8.0.1.ebuild b/net-misc/seafile/seafile-8.0.1.ebuild
index ffc82290de46..ddbfc88b379b 100644
--- a/net-misc/seafile/seafile-8.0.1.ebuild
+++ b/net-misc/seafile/seafile-8.0.1.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=(python3_{8,9})
-
-WANT_AUTOMAKE=1.16
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit autotools python-single-r1 vala
 
diff --git a/net-misc/seafile/seafile-8.0.2.ebuild b/net-misc/seafile/seafile-8.0.2.ebuild
index 53ed66a1dc80..80abc7522a43 100644
--- a/net-misc/seafile/seafile-8.0.2.ebuild
+++ b/net-misc/seafile/seafile-8.0.2.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=(python3_{8,9})
-
-WANT_AUTOMAKE=1.16
+PYTHON_COMPAT=( python3_{8..9} )
 
 RELEASE_COMMIT="2493113afb174b1a0e6f860512922b69c05cee69"
 
diff --git a/net-misc/seafile/seafile-8.0.3.ebuild b/net-misc/seafile/seafile-8.0.3.ebuild
index e9ac6acd1fa8..3e0048280aff 100644
--- a/net-misc/seafile/seafile-8.0.3.ebuild
+++ b/net-misc/seafile/seafile-8.0.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=(python3_{8,9})
+PYTHON_COMPAT=( python3_{8..9} )
 
 RELEASE_COMMIT="303080b54859d0fc55ce693902c95f9620876c1b"
 
diff --git a/net-misc/shigofumi/Manifest b/net-misc/shigofumi/Manifest
index 1f216e96ecdd..d5fe9e302c52 100644
--- a/net-misc/shigofumi/Manifest
+++ b/net-misc/shigofumi/Manifest
@@ -1,5 +1,4 @@
-AUX shigofumi-0.3-gcc-10.patch 185 BLAKE2B 72c6ad40b843e62433bc6a31323a72a30b6760deb81b123d22d60c005eef959013d7781796b1b3abf10b8edf9b4c6739f5406cd049098a2dd3a0fbec7000b52c SHA512 39341603a5ccf74757cf410ba4d11b6e3f288ac5609ee67f30906d5fc8db095136856b87ad0d709a18eb77020a95997dd57fefedb7a0efcab05dbbb137307528
-DIST shigofumi-0.3.tar.bz2 312184 BLAKE2B ebf8c0c4a7a347bd1b2c11fae9e8f0da46cad21e2b25e875e94a60a7be00a79c1737ac39754a8a230705a44a812e5f00268b528480f5e33e734e4ce5dfdbea34 SHA512 ef7b2894cfa217b713865c4fe24cc985b4ff963df4a5005bda06f03b3c7f358b318e68a136328787fe2dfbb8b1623fe2b2ceb9fbbd20be7f243fa79ace1b0210
-EBUILD shigofumi-0.3-r1.ebuild 996 BLAKE2B 4b8abdca8bea66797d0279bdf2e785cd66ae046642018bb38e082ed8f41858f0203df762af3a362705b14694e3590a9a44bd4ddc46e9d3f55dd0eac92d9182aa SHA512 6b0bff0bfd7bf29702184f29d4038e385c515dab46de1b01ac34dfe8056ec72f0d9cf0991054148fc0c59fca13403b935850d7d0fdcecfca7b443407976e0c1a
-EBUILD shigofumi-9999.ebuild 950 BLAKE2B ea253d16ffdc9299b509e94b82d704b8f7ac0215a4d7a6b1cf70f30b174cb4ee65c23e98af28a0ea00f1201136d5f2632362232a9ecd561c96d6c1ef190afba9 SHA512 edd2141c636497ac23d702adb0c1a06454eb2e51602144fc4682c03d276d05554dae422f07c7bf73de714c1dd4acee96bb1a269b6ce10a14ce9ecb23ec87fa10
+DIST shigofumi-0.9.tar.bz2 346010 BLAKE2B a8014b6d2db3bc5ffc7656331704fd8a5a81b3f9e3b60e1f96a01ae05f98754df0f2ae76008696c0d01d567eaeffc483a4d688e3c74aec26e2bf95d1eea8e649 SHA512 8deee080d701393cce516ce7e904e24d7d42317e6b4921097b879947ee87391806595ac66e9460887607be19903d91a6eebf197833cf12795161424760bb403b
+EBUILD shigofumi-0.9.ebuild 1090 BLAKE2B b17df509c9db5698487ad478efa40e6411b517cfff3555a9d029e1629a742ee50a06630c5851bbbb8425bdd9499ee3afd46f5320b4da36f4534ed31745a5eeca SHA512 8a023542dfd576d0a8590797681bdc3f8e74f917afc0c342b5d7a7a52be117262a3678e00adbb416b212f47a033914897270926acb087c7ec09e4686c6cb197c
+EBUILD shigofumi-9999.ebuild 1090 BLAKE2B b17df509c9db5698487ad478efa40e6411b517cfff3555a9d029e1629a742ee50a06630c5851bbbb8425bdd9499ee3afd46f5320b4da36f4534ed31745a5eeca SHA512 8a023542dfd576d0a8590797681bdc3f8e74f917afc0c342b5d7a7a52be117262a3678e00adbb416b212f47a033914897270926acb087c7ec09e4686c6cb197c
 MISC metadata.xml 350 BLAKE2B ddf2f81b2030cfe858cff49c0605390ef0f4b7542118a1d91801978537b00e40554ba0311cf6dd0495433ba879f810e4408b53d051f6d8e1b61c3fdf1570f5d5 SHA512 6e0cfef97580b12bf5fa6ccf822b9983fd0ec4170f4b25a011a9a17e7398bdeb1aa9726351dc4fd0bb0d3f981a76aa644d316ab5c01d302639d6ba144394b59c
diff --git a/net-misc/shigofumi/files/shigofumi-0.3-gcc-10.patch b/net-misc/shigofumi/files/shigofumi-0.3-gcc-10.patch
deleted file mode 100644
index 52688ff1d194..000000000000
--- a/net-misc/shigofumi/files/shigofumi-0.3-gcc-10.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/shigofumi.h
-+++ b/src/shigofumi.h
-@@ -16,7 +16,7 @@
- extern shi_state state;*/
- 
- /* UI */
--FILE *output;
-+extern FILE *output;
- 
- /* Data */
- extern struct isds_list *boxes;
diff --git a/net-misc/shigofumi/shigofumi-0.3-r1.ebuild b/net-misc/shigofumi/shigofumi-0.3-r1.ebuild
deleted file mode 100644
index a5dcea0425c7..000000000000
--- a/net-misc/shigofumi/shigofumi-0.3-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WANT_AUTOMAKE="1.11"
-inherit autotools
-
-DESCRIPTION="Command line client for ISDS"
-HOMEPAGE="http://xpisar.wz.cz/shigofumi/"
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI='https://repo.or.cz/shigofumi.git'
-	inherit git-r3
-else
-	SRC_URI="http://xpisar.wz.cz/${PN}/dist/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~mips ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug doc nls xattr"
-
-RDEPEND="
-	dev-libs/confuse:0=
-	dev-libs/libxml2:2
-	sys-libs/readline:0=
-	>=net-libs/libisds-0.7
-	xattr? ( sys-apps/attr )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt
-	)
-	nls? ( sys-devel/gettext )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc-10.patch
-)
-
-src_prepare() {
-	default
-	[[ ${PV} = 9999* ]] && eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-fatalwarnings \
-		$(use_enable debug) \
-		$(use_enable doc) \
-		$(use_enable nls) \
-		$(use_enable xattr)
-}
diff --git a/net-misc/shigofumi/shigofumi-0.9.ebuild b/net-misc/shigofumi/shigofumi-0.9.ebuild
new file mode 100644
index 000000000000..398763fed882
--- /dev/null
+++ b/net-misc/shigofumi/shigofumi-0.9.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Command line client for ISDS"
+HOMEPAGE="http://xpisar.wz.cz/shigofumi/"
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI='https://repo.or.cz/shigofumi.git'
+	inherit autotools git-r3
+else
+	SRC_URI="http://xpisar.wz.cz/${PN}/dist/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~mips ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="debug nls xattr"
+
+RDEPEND="
+	dev-libs/confuse:=
+	dev-libs/libxml2:2
+	net-libs/libisds
+	sys-apps/file
+	sys-libs/readline:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+[[ ${PV} == *9999 ]] && BDEPEND+="
+	app-text/docbook-xsl-stylesheets
+	app-text/po4a
+	dev-libs/libxslt"
+
+src_prepare() {
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-fatalwarnings
+		--enable-doc
+		--without-docbook-xsl-stylesheets
+		$(use_enable debug)
+		$(use_enable nls)
+		$(use_enable xattr)
+	)
+	[[ ${PV} == *9999 ]] && myeconfargs+=(
+		--with-docbook-xsl-stylesheets
+	)
+
+	econf "${myeconfargs[@]}"
+}
diff --git a/net-misc/shigofumi/shigofumi-9999.ebuild b/net-misc/shigofumi/shigofumi-9999.ebuild
index 8667bb035c0c..398763fed882 100644
--- a/net-misc/shigofumi/shigofumi-9999.ebuild
+++ b/net-misc/shigofumi/shigofumi-9999.ebuild
@@ -1,16 +1,14 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-WANT_AUTOMAKE="1.11"
-inherit autotools
+EAPI=8
 
 DESCRIPTION="Command line client for ISDS"
 HOMEPAGE="http://xpisar.wz.cz/shigofumi/"
-if [[ ${PV} = 9999* ]]; then
+
+if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI='https://repo.or.cz/shigofumi.git'
-	inherit git-r3
+	inherit autotools git-r3
 else
 	SRC_URI="http://xpisar.wz.cz/${PN}/dist/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~mips ~x86"
@@ -18,34 +16,41 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="debug doc nls xattr"
+IUSE="debug nls xattr"
 
 RDEPEND="
-	dev-libs/confuse:0=
+	dev-libs/confuse:=
 	dev-libs/libxml2:2
-	sys-libs/readline:0=
-	>=net-libs/libisds-0.7
-	xattr? ( sys-apps/attr )
-"
-DEPEND="${RDEPEND}
+	net-libs/libisds
+	sys-apps/file
+	sys-libs/readline:="
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
-	doc? (
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt
-	)
-	nls? ( sys-devel/gettext )
-"
+	nls? ( sys-devel/gettext )"
+
+[[ ${PV} == *9999 ]] && BDEPEND+="
+	app-text/docbook-xsl-stylesheets
+	app-text/po4a
+	dev-libs/libxslt"
 
 src_prepare() {
 	default
-	[[ ${PV} = 9999* ]] && eautoreconf
+	[[ ${PV} == *9999 ]] && eautoreconf
 }
 
 src_configure() {
-	econf \
-		--disable-fatalwarnings \
-		$(use_enable debug) \
-		$(use_enable doc) \
-		$(use_enable nls) \
+	local myeconfargs=(
+		--disable-fatalwarnings
+		--enable-doc
+		--without-docbook-xsl-stylesheets
+		$(use_enable debug)
+		$(use_enable nls)
 		$(use_enable xattr)
+	)
+	[[ ${PV} == *9999 ]] && myeconfargs+=(
+		--with-docbook-xsl-stylesheets
+	)
+
+	econf "${myeconfargs[@]}"
 }
diff --git a/net-misc/smb4k/Manifest b/net-misc/smb4k/Manifest
index f3473995f933..a61f33db2037 100644
--- a/net-misc/smb4k/Manifest
+++ b/net-misc/smb4k/Manifest
@@ -1,5 +1,3 @@
-DIST smb4k-3.0.6.tar.xz 3842424 BLAKE2B 7c42007a00b3da07bdc1629360bb8640c66ac7332fefca82698664cf197d4061d6c4419ab99ebd29e6515dace194973be2c179fa3c422820716fc5e5e1b8591f SHA512 993f669c12db30dd78f9f6cc694dfe563958407582f65ff64b6ada36cf4372ad6bb5addecc93970ce6750d031bf4ee9dfefa362e13100d2ce8d3e848a0d89382
 DIST smb4k-3.1.0.tar.xz 3177236 BLAKE2B 17d1fb32acbadd3af2447aab1c1e49c40c1a1b25204f31e366831e380e2a16f4b637f242afd5dfa41cc991e76570bdc0f8a804b1374290c44c417ed07f33f4ba SHA512 b12d054ccd4d8fdf3d975503c07b4c17321201651f68be03be6384e9c2ff127384737d0d5bdcb8d845c6edc21e20d7fd6a06cfe60af31ea6bc0373159771b5d1
-EBUILD smb4k-3.0.6.ebuild 1861 BLAKE2B 4361e390e11a5b3b3821b9300d6f5bd46c1f37460c325d7793f93b32d6228daef0db6eafdaffe75a7e192d6bb4c6737ee46a89750755eb3a560cd18c1b678d58 SHA512 a60dbf1b19f7a0d6a8d8d0198203a6d285187d8fdf55bec1cbcbb1fc7e729476c8c74992a5bf20599b2f00ce267c53928bd21cc9cd311adc20a4095df69a74c5
-EBUILD smb4k-3.1.0.ebuild 2035 BLAKE2B 41e2c505db211256a3f25fca23e6827c100c6991b92bbc0e4986bbcbd0c543f36e670382a8dde4c5a717a6227b3e6d181d8ca5ef63486e9f85b7b9edfdb2b989 SHA512 1a2bb7eca89ffc8f232655fef757b5f9b4142e02b81f52df3944be3eb123606f806f7d181762bc7f3ebdc4abdf39263b478a9cd2af5171e984673768b0793983
+EBUILD smb4k-3.1.0.ebuild 2033 BLAKE2B 78645a0f69655b4023cb6e8e2d7372c0521c55ba3a2f65ba11f3ae66d6b7a81311dd6bd3df775d21ec522a8d216968b063f8d9877dbb67027a69818625b8b1e4 SHA512 f00862ed637a232ccfdd78fd24d4af9e0a768d3269bf9fa7268b6375f7bb1e1bff54f2f9553f4e9893f4e39b3c431076ef84dda18a2fe50b40f04f417f3264e4
 MISC metadata.xml 472 BLAKE2B 408bc0b971e4ab55cc7de279ae23f4cdf8a9385f0d5c9120421b17c032708b0bb967c82d81d4f74e5f8dbd969c2892c0884e7ca4f97aafd31ffe95bbd17716d0 SHA512 055513ca41ae499d8ffc1ed75353a5b1f7da8df91d6e2b5998d101fe1c3a7be96b45bb63f114fd844b335d272722433feb4f81a07d60b25415802f4044abdac2
diff --git a/net-misc/smb4k/smb4k-3.0.6.ebuild b/net-misc/smb4k/smb4k-3.0.6.ebuild
deleted file mode 100644
index 0466ede258ea..000000000000
--- a/net-misc/smb4k/smb4k-3.0.6.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Advanced network neighborhood browser"
-HOMEPAGE="https://apps.kde.org/smb4k/
-https://sourceforge.net/p/smb4k/home/Home/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="plasma"
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qttest-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	net-fs/samba[cups]
-"
-RDEPEND="${DEPEND}
-	plasma? (
-		>=dev-qt/qtquickcontrols2-${QTMIN}:5
-		>=kde-frameworks/plasma-${KFMIN}:5
-	)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_PLASMOID=$(usex plasma)
-	)
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	elog "Users of Samba 4.7 and above please note that for the time being,"
-	elog "the following setting has to be added to or changed in the [global]"
-	elog "section of the smb.conf file:"
-	elog
-	elog "[global]"
-	elog "client max protocol = NT1"
-}
diff --git a/net-misc/smb4k/smb4k-3.1.0.ebuild b/net-misc/smb4k/smb4k-3.1.0.ebuild
index e82ccc21919f..8b9bf80d294e 100644
--- a/net-misc/smb4k/smb4k-3.1.0.ebuild
+++ b/net-misc/smb4k/smb4k-3.1.0.ebuild
@@ -14,7 +14,7 @@ https://sourceforge.net/p/smb4k/home/Home/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-misc/sslh/Manifest b/net-misc/sslh/Manifest
index 93cfe04b8a07..e0deaa2c3ba7 100644
--- a/net-misc/sslh/Manifest
+++ b/net-misc/sslh/Manifest
@@ -4,9 +4,9 @@ DIST sslh-1.21.tar.gz 111298 BLAKE2B 46003021292436023c7f2e0d9cbfb283f4ca7497f5d
 DIST sslh-1.21b.tar.gz 111740 BLAKE2B 5d42eab551e05ac1367da9ae85eac945657e086672712c148ee07c78af5c2a546e696d77081c7282e77c8bef535c186f89d541489f07153bd7ca2d338b341a48 SHA512 59bd33b47b70f82ae1ba3d6ffac3d54897dc6b7343d0d9e3bb8384adc30ac8a44a64e71590a7eecc5a83c2f70712bd79c0eb4ea8eef15ae770633dead9888c5f
 DIST sslh-1.21c.tar.gz 111895 BLAKE2B 3ec7a4a4f8eb7ec3d22e9630070037ebef7df2cbe3657a38234573ecf4eb9f331914858f703690b094ddc1977cd80b3a5760b94004f35a2ec2c59761f6cd142e SHA512 9446c6afe965684c5d6406ac8917338f57d95f8fbfacd7a51193dd5dbac77e1ed5e39eb8e2575e7025a8612b25e9fba7e64832a48c999f366875217b9328da22
 DIST sslh-v1.20.tar.gz 60459 BLAKE2B fafb1876df54edce99473db9305eaad77e2b726904724c9c74b3eb2fe8666c219c48b49888b05cc52f993104b69a263ba3c8a271efd1217ba6f73258caa83249 SHA512 eccaddd5a4299206f195c2f7a78840b2f76f8a0cf10a715b5c72f959ed5d3259fc5ea3db8d398b33f0d556d71268b15c870999d742f83383a9d49120e476770a
-EBUILD sslh-1.20-r1.ebuild 1929 BLAKE2B eba93f9518e5dff10b6cf1e41922457f3527a8c2c8b00170125166fdfae56839a0a24c93c83c2e1a0a8b23f294c312d493a1bd821362a8f5ad535e277057c50c SHA512 1d1734e8b1dce6c26c619402a7194e3386130c48f5392b785f0eef43b80f24f344acb2eaab43fb4b495980e94383c1ced53f4d88027f09c6c3d35d32b95fb1f1
-EBUILD sslh-1.21-r1.ebuild 1927 BLAKE2B 3a0a8bb7733eaf9b89f2ca0d26ac61c9e729f30924ca8544aaac1dbb95f2e29eb6978c06b72a7e125366cc5175d036f30eed9b296a16eb83200405668a1e77da SHA512 a458923fc4a157ee506ef578d9155b46b709b47ac6c79b2a08c85c374826968b38bb746784b563535f1222f397eddcdf72bca4e832d5333cd0a1b227be389829
-EBUILD sslh-1.21b-r1.ebuild 1927 BLAKE2B 3a0a8bb7733eaf9b89f2ca0d26ac61c9e729f30924ca8544aaac1dbb95f2e29eb6978c06b72a7e125366cc5175d036f30eed9b296a16eb83200405668a1e77da SHA512 a458923fc4a157ee506ef578d9155b46b709b47ac6c79b2a08c85c374826968b38bb746784b563535f1222f397eddcdf72bca4e832d5333cd0a1b227be389829
-EBUILD sslh-1.21c-r1.ebuild 1927 BLAKE2B 3a0a8bb7733eaf9b89f2ca0d26ac61c9e729f30924ca8544aaac1dbb95f2e29eb6978c06b72a7e125366cc5175d036f30eed9b296a16eb83200405668a1e77da SHA512 a458923fc4a157ee506ef578d9155b46b709b47ac6c79b2a08c85c374826968b38bb746784b563535f1222f397eddcdf72bca4e832d5333cd0a1b227be389829
-EBUILD sslh-9999.ebuild 1949 BLAKE2B 79a3ece7a5661b89708ac99bca1ad206bd5ca7e997551fd1393f4c75510fe7ce73e2196093fa25dfad3a324285925a2b32a26f34fc35cdad02789a5a92b823fa SHA512 55998165014dc2ce31124206fc9248bfbfdb1bc5ed0f4c66d78bad67fa51591780ac6c2face08bc0f3ef31bb628f945b69e714abee27ce9aed9ffee1f47a3834
+EBUILD sslh-1.20-r2.ebuild 1929 BLAKE2B 1cc0b4554e89aee8e7cde80da933824674a4ebf926bbc7fbf94186cb06e367ba4422949e20bb90f4dab2d85ad1ad59b613507b37b47df9d905254bdc0f80dea5 SHA512 4a9288d4dea17c0dd6ffab5ea1219b37f77c61675ca61a4baf443119c0543b3fae48c48923fc3b75653ffc01d340c302059d88abd96ae6aa89c3984fdb0d662f
+EBUILD sslh-1.21-r2.ebuild 1927 BLAKE2B 06fa388b50cf3be10daa60552a92fca375b10ff0a63acef5725e945423e365e9c8827173398cd1eb766ec3c145f967852b1e162a5e7906a7e4b75a60c4f3fbb2 SHA512 fd51f1353e53206b28336f9faee1d97de876dc72259ca866b466175d42841ff59ed52bd654a964c05f078bbb0de0d11ab7e1bd3a0626c235084273fd7e136dcf
+EBUILD sslh-1.21b-r2.ebuild 1927 BLAKE2B 06fa388b50cf3be10daa60552a92fca375b10ff0a63acef5725e945423e365e9c8827173398cd1eb766ec3c145f967852b1e162a5e7906a7e4b75a60c4f3fbb2 SHA512 fd51f1353e53206b28336f9faee1d97de876dc72259ca866b466175d42841ff59ed52bd654a964c05f078bbb0de0d11ab7e1bd3a0626c235084273fd7e136dcf
+EBUILD sslh-1.21c-r2.ebuild 1927 BLAKE2B 06fa388b50cf3be10daa60552a92fca375b10ff0a63acef5725e945423e365e9c8827173398cd1eb766ec3c145f967852b1e162a5e7906a7e4b75a60c4f3fbb2 SHA512 fd51f1353e53206b28336f9faee1d97de876dc72259ca866b466175d42841ff59ed52bd654a964c05f078bbb0de0d11ab7e1bd3a0626c235084273fd7e136dcf
+EBUILD sslh-9999.ebuild 1907 BLAKE2B b162585a30d535683f62186a3347496908b8593afc64e97ccf2503cfa2f3683c6dbe7567e31285fd5696e70d72c1395d3ee949afbc199f8577b6df1a9ea6ea39 SHA512 822016551a1f66789e1d76e2f5b71f2fed705d03711251564568577791d24617a7fc852eb27d38ea674d38ff30d7bcdd5caa543a251d7d52029f509c85bab514
 MISC metadata.xml 409 BLAKE2B fefa58b2c38adf947e859893979931726dba91e4b30c6f7ae4e5343fb7e7a513a3b86c88ff6854df60ba92ef169beb4e22c7ad3a01ba69aea582765f13f82509 SHA512 373b7ca5bce7d2b680a7ccfdc4af15514365cf26824487baf2232608a6f29a5d1d338146c7f70841e7b03255527ec16967afc7a3fad3ef6d26fb2ab86fe8a3da
diff --git a/net-misc/sslh/sslh-1.20-r1.ebuild b/net-misc/sslh/sslh-1.20-r2.ebuild
index 55f5f8809262..f9a1e233c7eb 100644
--- a/net-misc/sslh/sslh-1.20-r1.ebuild
+++ b/net-misc/sslh/sslh-1.20-r2.ebuild
@@ -22,12 +22,12 @@ SLOT="0"
 IUSE="caps pcre systemd tcpd"
 
 RDEPEND="caps? ( sys-libs/libcap )
+	pcre? ( dev-libs/libpcre:= )
 	systemd? ( sys-apps/systemd:= )
 	tcpd? ( sys-apps/tcp-wrappers )
 	>=dev-libs/libconfig-1.5:="
 DEPEND="${RDEPEND}
-	dev-lang/perl
-	pcre? ( dev-libs/libpcre:= )"
+	dev-lang/perl"
 
 RESTRICT="test"
 
diff --git a/net-misc/sslh/sslh-1.21-r1.ebuild b/net-misc/sslh/sslh-1.21-r2.ebuild
index db0cf15ce9e6..fa5062502fa5 100644
--- a/net-misc/sslh/sslh-1.21-r1.ebuild
+++ b/net-misc/sslh/sslh-1.21-r2.ebuild
@@ -21,12 +21,12 @@ SLOT="0"
 IUSE="caps pcre systemd tcpd"
 
 RDEPEND="caps? ( sys-libs/libcap )
+	pcre? ( dev-libs/libpcre:= )
 	systemd? ( sys-apps/systemd:= )
 	tcpd? ( sys-apps/tcp-wrappers )
 	>=dev-libs/libconfig-1.5:="
 DEPEND="${RDEPEND}
-	dev-lang/perl
-	pcre? ( dev-libs/libpcre:= )"
+	dev-lang/perl"
 
 RESTRICT="test"
 
diff --git a/net-misc/sslh/sslh-1.21b-r1.ebuild b/net-misc/sslh/sslh-1.21b-r2.ebuild
index db0cf15ce9e6..fa5062502fa5 100644
--- a/net-misc/sslh/sslh-1.21b-r1.ebuild
+++ b/net-misc/sslh/sslh-1.21b-r2.ebuild
@@ -21,12 +21,12 @@ SLOT="0"
 IUSE="caps pcre systemd tcpd"
 
 RDEPEND="caps? ( sys-libs/libcap )
+	pcre? ( dev-libs/libpcre:= )
 	systemd? ( sys-apps/systemd:= )
 	tcpd? ( sys-apps/tcp-wrappers )
 	>=dev-libs/libconfig-1.5:="
 DEPEND="${RDEPEND}
-	dev-lang/perl
-	pcre? ( dev-libs/libpcre:= )"
+	dev-lang/perl"
 
 RESTRICT="test"
 
diff --git a/net-misc/sslh/sslh-1.21c-r1.ebuild b/net-misc/sslh/sslh-1.21c-r2.ebuild
index db0cf15ce9e6..fa5062502fa5 100644
--- a/net-misc/sslh/sslh-1.21c-r1.ebuild
+++ b/net-misc/sslh/sslh-1.21c-r2.ebuild
@@ -21,12 +21,12 @@ SLOT="0"
 IUSE="caps pcre systemd tcpd"
 
 RDEPEND="caps? ( sys-libs/libcap )
+	pcre? ( dev-libs/libpcre:= )
 	systemd? ( sys-apps/systemd:= )
 	tcpd? ( sys-apps/tcp-wrappers )
 	>=dev-libs/libconfig-1.5:="
 DEPEND="${RDEPEND}
-	dev-lang/perl
-	pcre? ( dev-libs/libpcre:= )"
+	dev-lang/perl"
 
 RESTRICT="test"
 
diff --git a/net-misc/sslh/sslh-9999.ebuild b/net-misc/sslh/sslh-9999.ebuild
index 81bb80b2588f..d0a8689cff13 100644
--- a/net-misc/sslh/sslh-9999.ebuild
+++ b/net-misc/sslh/sslh-9999.ebuild
@@ -18,16 +18,16 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="caps pcre systemd tcpd"
+IUSE="caps systemd tcpd"
 
 RDEPEND="caps? ( sys-libs/libcap )
 	systemd? ( sys-apps/systemd:= )
 	tcpd? ( sys-apps/tcp-wrappers )
-	>=dev-libs/libconfig-1.5:="
+	>=dev-libs/libconfig-1.5:=
+	dev-libs/libpcre2:="
 DEPEND="${RDEPEND}
 	dev-util/conf2struct
-	dev-lang/perl
-	pcre? ( dev-libs/libpcre:= )"
+	dev-lang/perl"
 
 RESTRICT="test"
 
@@ -49,7 +49,6 @@ src_compile() {
 
 	emake \
 		CC="$(tc-getCC)" \
-		USELIBPCRE=$(usev pcre) \
 		USELIBCAP=$(usev caps) \
 		USELIBWRAP=$(usev tcpd) \
 		USESYSTEMD=$(usev systemd)
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 4a60a20412ae..e2d7d81451c8 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -7,8 +7,6 @@ AUX xserver120.patch 3699 BLAKE2B f85933c025dc0347040261710e820232fbb21a572cf311
 DIST tigervnc-1.11.0.tar.gz 1346992 BLAKE2B 4935f78154ea1567d58f542962f1a87688cd195e9d1aff8295e99aedc91a87cea7b686e9ef34e68f4abb1e3ce7a93122baff1d6f3564e4cc60b967a7bca6f8ac SHA512 262676f065de6dfb72b1482c0ef1e6d8b764f53360ae6114debbe0986eede45d27e283e1452a72cb9b7540657ab347fd36df5b30b72d6db4a0f8cbea5b591025
 DIST tigervnc-1.9.0.tar.gz 1506520 BLAKE2B 292c2e5fb9ffe2573e216257e889d259abfdca5964559492c318e24ea00563211e7477a4f1b2b09d0e962343d4aeb2c12dcfdd6857a3282882ee9f91fdf8103a SHA512 333910f567e6b5e4a5a22d898b2d4c3f4b834cb4cc8fc13ff55d31401894c0d5122a127692ec5eb51e412c945ff3ea5b8146f9ab22cbe1e47541e09239ec8c9d
 DIST xorg-server-1.20.0.tar.bz2 6096838 BLAKE2B 34ee6d6dbbde54d54e082a0791e85ad52d728e239a7d8fadb75ebcbdbaab8752b90ca6d075f096d971db7ec68ce4ecac5c70fcf536ce23c20b8dce8f32e2c046 SHA512 1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde
-EBUILD tigervnc-1.11.0-r2.ebuild 4119 BLAKE2B 4391703cb314cf923b455ba36270f7a12f5f8d89f441d9cacc57d8b2a9e5b73c6b087941ec4238f61d937b8fd193a9324d3820942bc7b57140d826fe2427cbab SHA512 6c7d465314a4b12699cbfd68e9ec07a84d719f25c57b5f97cceb8f15ab44c2b1dda1bce4243520422ffcf177c1773bd0c8310acdf214042dea51e15df4bdc70a
 EBUILD tigervnc-1.11.0-r3.ebuild 4113 BLAKE2B 09995fb98a43899b50d2f6ca7051d713fb0c76593c405d1b36c5f5b37b23513493bd9ee67eda9704a2ac44ec394dfab9ae1d6889778c254f14ca8759ec9f04f7 SHA512 7ec990a1747655c78051c782034bde44bb2cf89b3c7a4e521b38cb085a8f4ba480415f6f32590f2b6cbaaa083c9c728243e7f3191e30a2eb804880dd06735283
-EBUILD tigervnc-1.9.0-r1.ebuild 4488 BLAKE2B 43b4cfaee8dd183e5b5591c2b20248f79503770c5ba2ef69e64f7defad9a3534265dffb12b17700f52dbee1bcad144be1d9df82115a728fd931c979ee64385e8 SHA512 5428d3bc4828e04fb6919b5818b72d73f7f6e2d66179e6b1ca94c742d7826d20545d40f0cf88af5d81543d06af75fc1198b66ada3fd2322db9225774efc57b6c
-EBUILD tigervnc-1.9.0-r2.ebuild 4446 BLAKE2B 5804fffa0eecc1cb0327d715a4cd86293c879a5e2098aeb50df71a5a2f7e0e31ec8ccf01ef9657c53862688db2bde59a4f12a9b0d7d43c1bfebcb86970f61bd9 SHA512 5930af12c2fee57a14706cc28afeea3837229676a0912423297113100a40af258c7ad56f48788784581e4ba79e67e42bf03f7becc4f54f5ab5b4bc45d1135a68
+EBUILD tigervnc-1.9.0-r2.ebuild 4441 BLAKE2B 382a526908be00b9950ea532acf9333fc02a7cc54a73fc69842fb8277fdcc2cadc68e5a7db062336be6c0f0597ed2de7501cae83b3574fed55cd401e209b6a2d SHA512 86f4e20b142df805a4a9d3d509065bdd1679e64e456437d26d88aa0c84c24cbcab142015aafa7d195b31bcc40d4090da18a874b43875b4eb499a23c3cd0c859d
 MISC metadata.xml 470 BLAKE2B de3d7d8fab83908aa664760afe1d401f016be431c67eee547127f3ee94f290d0127cc972e2d27f31b9adc0d48786f755a94ac8d1e605ce3e8e02fcf7144b7af3 SHA512 b31d1126757d68a177817cfa7069e07277742222c02dbb0e0a26ed5a144f68eeda94db5cdaec760a2b8abb491fe420867dbf06d89b6a4c1a3edfdbb1461999c3
diff --git a/net-misc/tigervnc/tigervnc-1.11.0-r2.ebuild b/net-misc/tigervnc/tigervnc-1.11.0-r2.ebuild
deleted file mode 100644
index 6b3e1e476600..000000000000
--- a/net-misc/tigervnc/tigervnc-1.11.0-r2.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CMAKE_IN_SOURCE_BUILD=1
-
-inherit autotools cmake flag-o-matic java-pkg-opt-2 systemd xdg
-
-XSERVER_VERSION="1.20.0"
-
-DESCRIPTION="Remote desktop viewer display system"
-HOMEPAGE="http://www.tigervnc.org"
-SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2	)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="dri3 +drm gnutls java nls +opengl pam server xinerama +xorgmodule"
-
-CDEPEND="
-	virtual/jpeg:0
-	sys-libs/zlib:=
-	>=x11-libs/fltk-1.3.1
-	gnutls? ( net-libs/gnutls:= )
-	nls? ( virtual/libiconv )
-	pam? ( sys-libs/pam )
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/pixman
-	server? (
-		x11-libs/libXau
-		x11-libs/libXdamage
-		x11-libs/libXdmcp
-		x11-libs/libXfont2
-		x11-libs/libXtst
-		>=x11-libs/pixman-0.27.2
-		>=x11-apps/xauth-1.0.3
-		x11-apps/xsetroot
-		>=x11-misc/xkeyboard-config-2.4.1-r3
-		xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
-		drm? ( x11-libs/libdrm )
-		dev-libs/openssl:0=
-	)
-	xinerama? ( x11-libs/libXinerama )
-	"
-
-RDEPEND="${CDEPEND}
-	!net-misc/tightvnc
-	!net-misc/vnc
-	!net-misc/xf4vnc
-	java? ( >=virtual/jre-1.5:* )"
-
-DEPEND="${CDEPEND}
-	nls? ( sys-devel/gettext )
-	java? ( >=virtual/jdk-1.5 )
-	x11-base/xorg-proto
-	media-libs/fontconfig
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXcursor
-	x11-libs/libXfixes
-	x11-libs/libXft
-	x11-libs/libXi
-	server? (
-		dev-libs/libbsd
-		x11-libs/libxkbfile
-		x11-libs/libxshmfence
-		virtual/pkgconfig
-		media-fonts/font-util
-		x11-misc/util-macros
-		>=x11-libs/xtrans-1.3.3
-		opengl? ( >=media-libs/mesa-10.3.4-r1 )
-	)"
-
-src_prepare() {
-	if use server; then
-		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
-	fi
-
-	cmake_src_prepare
-
-	if use server; then
-		cd unix/xserver || die
-		eapply "${FILESDIR}"/xserver120.patch
-		eapply "${FILESDIR}"/xserver120-drmfourcc-header.patch
-		sed -i -e 's/"gl >= .*"/"gl"/' configure.ac || die
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	if use arm || use hppa; then
-		append-flags "-fPIC"
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_GNUTLS=$(usex gnutls)
-		-DENABLE_NLS=$(usex nls)
-		-DENABLE_PAM=$(usex pam)
-		-DBUILD_JAVA=$(usex java)
-	)
-
-	cmake_src_configure
-
-	if use server; then
-		cd unix/xserver || die
-		econf \
-			$(use_enable opengl glx) \
-			$(use_enable drm libdrm) \
-			--disable-config-hal \
-			--disable-config-udev \
-			--disable-devel-docs \
-			--disable-dmx \
-			--disable-dri \
-			$(use_enable dri3) \
-			--disable-glamor \
-			--disable-kdrive \
-			--disable-libunwind \
-			--disable-linux-acpi \
-			--disable-record \
-			--disable-selective-werror \
-			--disable-static \
-			--disable-unit-tests \
-			--disable-xephyr \
-			$(use_enable xinerama) \
-			--disable-xnest \
-			--disable-xorg \
-			--disable-xvfb \
-			--disable-xwin \
-			--disable-xwayland \
-			--enable-dri2 \
-			--with-pic \
-			--without-dtrace \
-			--disable-present \
-			--with-sha1=libcrypto
-	fi
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use server; then
-		# deps of the vnc module and the module itself
-		local d subdirs=(
-			fb xfixes Xext dbe $(usex opengl glx "") $(usev dri3) randr render
-			damageext miext Xi xkb composite dix mi os hw/vnc
-		)
-		for d in "${subdirs[@]}"; do
-			emake -C unix/xserver/"${d}"
-		done
-	fi
-}
-
-src_install() {
-	cmake_src_install
-
-	if use server; then
-		emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
-		if ! use xorgmodule; then
-			rm -rv "${ED}"/usr/$(get_libdir)/xorg || die
-		else
-			rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
-		fi
-
-		newconfd "${FILESDIR}"/${PN}.confd ${PN}
-		newinitd "${FILESDIR}"/${PN}.initd ${PN}
-
-		systemd_douserunit unix/vncserver/vncserver@.service
-	else
-		local f
-		for f in x0vncserver vncconfig; do
-			rm "${ED}"/usr/bin/${f} || die
-			rm "${ED}"/usr/share/man/man1/${f}.1 || die
-		done
-		rm -r "${ED}"/usr/{sbin,libexec} || die
-		rm -r "${ED}"/usr/share/man/man8 || die
-	fi
-}
diff --git a/net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild b/net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild
deleted file mode 100644
index f455a2bea0dd..000000000000
--- a/net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_IN_SOURCE_BUILD=1
-
-inherit autotools cmake-utils eutils flag-o-matic java-pkg-opt-2 systemd xdg-utils gnome2-utils
-
-XSERVER_VERSION="1.20.0"
-
-DESCRIPTION="Remote desktop viewer display system"
-HOMEPAGE="http://www.tigervnc.org"
-SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2	)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
-IUSE="dri3 +drm gnutls java nls +opengl pam server xinerama +xorgmodule"
-
-CDEPEND="
-	virtual/jpeg:0
-	sys-libs/zlib:=
-	>=x11-libs/fltk-1.3.1
-	gnutls? ( net-libs/gnutls:= )
-	nls? ( virtual/libiconv )
-	pam? ( sys-libs/pam )
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	server? (
-		x11-libs/libXau
-		x11-libs/libXdamage
-		x11-libs/libXdmcp
-		x11-libs/libXfont2
-		x11-libs/libXtst
-		>=x11-libs/pixman-0.27.2
-		>=x11-apps/xauth-1.0.3
-		x11-apps/xsetroot
-		>=x11-misc/xkeyboard-config-2.4.1-r3
-		xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
-		drm? ( x11-libs/libdrm )
-		dev-libs/openssl:0=
-	)
-	xinerama? ( x11-libs/libXinerama )
-	"
-
-RDEPEND="${CDEPEND}
-	!net-misc/tightvnc
-	!net-misc/vnc
-	!net-misc/xf4vnc
-	java? ( >=virtual/jre-1.5:* )"
-
-DEPEND="${CDEPEND}
-	nls? ( sys-devel/gettext )
-	java? ( >=virtual/jdk-1.5 )
-	x11-base/xorg-proto
-	media-libs/fontconfig
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXcursor
-	x11-libs/libXfixes
-	x11-libs/libXft
-	x11-libs/libXi
-	server? (
-		dev-libs/libbsd
-		x11-libs/libxkbfile
-		x11-libs/libxshmfence
-		virtual/pkgconfig
-		media-fonts/font-util
-		x11-misc/util-macros
-		>=x11-libs/xtrans-1.3.3
-		opengl? ( >=media-libs/mesa-10.3.4-r1 )
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-030_manpages.patch
-	"${FILESDIR}"/${P}-055_xstartup.patch
-)
-
-src_prepare() {
-	if use server ; then
-		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
-	fi
-
-	# do not rely on the build system to install docs
-	sed -i 's:^\(install(.* DESTINATION ${DOC_DIR})\):#\1:' \
-		cmake/BuildPackages.cmake || die
-
-	cmake-utils_src_prepare
-
-	if use server ; then
-		cd unix/xserver || die
-		eapply "${FILESDIR}"/xserver120.patch
-		eapply "${FILESDIR}"/xserver120-drmfourcc-header.patch
-		sed -i -e 's/"gl >= .*"/"gl"/' configure.ac || die
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	if use arm || use hppa ; then
-		append-flags "-fPIC"
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_GNUTLS=$(usex gnutls)
-		-DENABLE_NLS=$(usex nls)
-		-DENABLE_PAM=$(usex pam)
-		-DBUILD_JAVA=$(usex java)
-	)
-
-	cmake-utils_src_configure
-
-	if use server ; then
-		cd unix/xserver || die
-		econf \
-			$(use_enable opengl glx) \
-			$(use_enable drm libdrm) \
-			--disable-config-hal \
-			--disable-config-udev \
-			--disable-devel-docs \
-			--disable-dmx \
-			--disable-dri \
-			$(use_enable dri3) \
-			--disable-glamor \
-			--disable-kdrive \
-			--disable-libunwind \
-			--disable-linux-acpi \
-			--disable-record \
-			--disable-selective-werror \
-			--disable-static \
-			--disable-unit-tests \
-			--disable-xephyr \
-			$(use_enable xinerama) \
-			--disable-xnest \
-			--disable-xorg \
-			--disable-xvfb \
-			--disable-xwin \
-			--disable-xwayland \
-			--enable-dri2 \
-			--with-pic \
-			--without-dtrace \
-			--disable-present \
-			--with-sha1=libcrypto
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use server ; then
-		# deps of the vnc module and the module itself
-		local d subdirs=(
-			fb xfixes Xext dbe $(usex opengl glx "") $(usev dri3) randr render damageext miext Xi xkb
-			composite dix mi os hw/vnc
-		)
-		for d in "${subdirs[@]}"; do
-			emake -C unix/xserver/"${d}"
-		done
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use server ; then
-		emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
-		if ! use xorgmodule; then
-			rm -rv "${ED%/}"/usr/$(get_libdir)/xorg || die
-		else
-			rm -v "${ED%/}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
-		fi
-
-		newconfd "${FILESDIR}"/${PN}.confd ${PN}
-		newinitd "${FILESDIR}"/${PN}.initd ${PN}
-
-		systemd_douserunit contrib/systemd/user/vncserver@.service
-	else
-		local f
-		cd "${ED}" || die
-		for f in vncserver x0vncserver vncconfig; do
-			rm usr/bin/$f || die
-			rm usr/share/man/man1/$f.1 || die
-		done
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild b/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild
index d437a75767e6..099a5b57f34a 100644
--- a/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="dri3 +drm gnutls java nls +opengl pam server xinerama +xorgmodule"
 
 CDEPEND="
diff --git a/net-misc/xmrig/Manifest b/net-misc/xmrig/Manifest
index e13dfb118c5c..f731321f5b41 100644
--- a/net-misc/xmrig/Manifest
+++ b/net-misc/xmrig/Manifest
@@ -3,7 +3,7 @@ AUX xmrig.service 835 BLAKE2B 96a6d52cae6730a08d06563cac47f054b86e8bd78972ab3535
 DIST xmrig-6.12.2.tar.gz 1628708 BLAKE2B 4fca418c7e0d6df25c84609d657a050f7df6383d0a5ee3a4ebf87ff26805d4f445d6c184df1651813e21ac4c972e0681d37ccb45a493cb4d1e199a6ba5e707c5 SHA512 a1e8d37955177f0988b0683c9b92dc6eef4bcaea68b3c1411917929a0573119cd13107e5a68a2a7971ec45bf2554aed5fc7d82c11d49e7411e95d9b81fe1a911
 DIST xmrig-6.13.0.tar.gz 1694984 BLAKE2B 6449df3fe7a42c5caa9050d0e7ef8723cb36175d6e624dae04f0c7d68670a41f705e8676acb6a377c35d7d572ca6e42ae0833bbf8fcb84ebdefa7a50027b0151 SHA512 49e55aef9c316b14b5974f58c3083486f097c1d2bfec10b0e615efcfb642b0186f2de866b5b88eb9fe2ee0153dd3ff7749936d142825928c68e96595478b9dc8
 DIST xmrig-6.13.1.tar.gz 1695005 BLAKE2B 8094a7f247d1b1f714a22fcdddcbede0d859f4883c6fcb1789ce134bdae31875da434679bdb141cd332a575ca0e4fa80b8ca96e603e8c381e9073c58394abe71 SHA512 f1a4e11f6e13bd275f2d867f1a4826cb244bdc9d157e590870ebc4dcd3cafc522bf7f46cfb4eb81e129fc3f9dbef59219288088c42e8f6b876ac16b5b6224323
-EBUILD xmrig-6.12.2.ebuild 1285 BLAKE2B f15b873ba2ccd6b9d3ec6e62caaa5bc42a1f8aec5fcd34125a7fa342a581189665e61dbe76f58942e6c016f17f27cdef772abbe874a72ce15a103075a1472437 SHA512 4de94d4676131fad47a5f5cfd43822f210895cb55b724d7ead73c075af5dcc892e1abd896e230be5b063965df207e6617e34cc7cfe695723820ea2a78763fd52
+EBUILD xmrig-6.12.2.ebuild 1284 BLAKE2B ad14cf0ce42c072c6a640e32927035704a2144f76462d98fe108aae7b970ae27304abdb0600561a159ddd22874c08a19e4d42b308b1fdd6b1f9049c0f13d1c03 SHA512 87d2e6897670dd2d43383f305718536ed6769482556d8b3e88988521b4434cd635f4c5b5f0e59f59638e0851135cbf226492837e30ef96c650a1b7f71305c201
 EBUILD xmrig-6.13.0.ebuild 1286 BLAKE2B 5bdf3a943db95f04cc89874e01da31da394afdb598201a80d2f0a96f5a673aa0d487d25fcaad3399f6e2d159998575eec0685168c29d6338af40efde76d22b66 SHA512 1d2fbd241abbd39eea115a0c13741be5e57a2ce70f76a0fc1ec7f14e12182522c0e887a9a265943ace2b7b58e3732782de6053783b31202c64cdf6aacec11c15
 EBUILD xmrig-6.13.1.ebuild 1286 BLAKE2B 5bdf3a943db95f04cc89874e01da31da394afdb598201a80d2f0a96f5a673aa0d487d25fcaad3399f6e2d159998575eec0685168c29d6338af40efde76d22b66 SHA512 1d2fbd241abbd39eea115a0c13741be5e57a2ce70f76a0fc1ec7f14e12182522c0e887a9a265943ace2b7b58e3732782de6053783b31202c64cdf6aacec11c15
 EBUILD xmrig-9999.ebuild 1286 BLAKE2B 5bdf3a943db95f04cc89874e01da31da394afdb598201a80d2f0a96f5a673aa0d487d25fcaad3399f6e2d159998575eec0685168c29d6338af40efde76d22b66 SHA512 1d2fbd241abbd39eea115a0c13741be5e57a2ce70f76a0fc1ec7f14e12182522c0e887a9a265943ace2b7b58e3732782de6053783b31202c64cdf6aacec11c15
diff --git a/net-misc/xmrig/xmrig-6.12.2.ebuild b/net-misc/xmrig/xmrig-6.12.2.ebuild
index 81cbcc47b6f9..809b9c2c5aa0 100644
--- a/net-misc/xmrig/xmrig-6.12.2.ebuild
+++ b/net-misc/xmrig/xmrig-6.12.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/xmrig/xmrig/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64"
+	KEYWORDS="amd64 arm64"
 fi
 
 LICENSE="Apache-2.0 GPL-3+ MIT"