Merge updates from master

46 files changed, 45 insertions, 555 deletions

diff --git a/dev-java/cortado/cortado-0.6.0-r2.ebuild b/dev-java/cortado/cortado-0.6.0-r2.ebuild
index fc6c3c123ab1..903bdfbfd5bf 100644
--- a/dev-java/cortado/cortado-0.6.0-r2.ebuild
+++ b/dev-java/cortado/cortado-0.6.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.xiph.org/releases/cortado/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 
 # Package 'sun.audio' seems to have moved to 'javax.sound'.
 # More work would be needed.  Presently we restrict to jdk:1.8
diff --git a/dev-lang/cxprolog/cxprolog-0.98.2.ebuild b/dev-lang/cxprolog/cxprolog-0.98.2.ebuild
index 77c3bde5c40b..24deb0a98e0e 100644
--- a/dev-lang/cxprolog/cxprolog-0.98.2.ebuild
+++ b/dev-lang/cxprolog/cxprolog-0.98.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -74,9 +74,9 @@ src_compile() {
 	emake lib \
 		PREFIX=/usr \
 		TMP_DIR="${S}/tmp" \
-		CC=$(tc-getCC) \
-		CPP=$(tc-getCXX) \
-		LD=$(tc-getLD) \
+		CC="$(tc-getCC)" \
+		CPP="$(tc-getCXX)" \
+		LD="$(tc-getLD)" \
 		CFLAGS="${CFLAGS}" \
 		LDFLAGS="${LDFLAGS}" \
 		EXT_DEFINES="${CX_EXT_DEFINES}" \
diff --git a/dev-python/autocommand/autocommand-2.2.1_p20211118.ebuild b/dev-python/autocommand/autocommand-2.2.1_p20211118.ebuild
index 53ad13a3a317..7607ae319c61 100644
--- a/dev-python/autocommand/autocommand-2.2.1_p20211118.ebuild
+++ b/dev-python/autocommand/autocommand-2.2.1_p20211118.ebuild
@@ -20,6 +20,6 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 8a052f8c189f..0042304351d7 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -1,4 +1 @@
-DIST cython-0.29.25.gh.tar.gz 2100012 BLAKE2B 497c2550c870c808f1c972d3e9ffedd6672544b9976653faac4a4125008e4472ae5a2e0db0510c8b2c5fd11f73a5885e0e4394bbce2f1327b7610bf59b64f640 SHA512 1d655bb4de8bd3480bcd579c32cd0e5bfc5cfc3d966d3d892b98cc86f59c9bd0522066c4c5dbc4c6abeb3ebe3fcd3f49ec873dd724f9ad04976635f652fdf9e3
-DIST cython-0.29.26.gh.tar.gz 2100616 BLAKE2B 9990d8fd14a8042b1a27a4f60fcc8f6d4be42a1e475f0e5d37bc6c60439ca00a1a70b49ab708ad2dfac5184a62c25d75f27ff158ef7f0df9132355c570a9aac6 SHA512 936449dd0031c2e2baeb4402a448d632324c1b66bf062ae0e632cf63dc27556607efb8446e8f913253b761627d3946283c2a60fdcad8c2434e1601fe4b0fb60e
-DIST cython-0.29.27.gh.tar.gz 2101169 BLAKE2B ebc56ced8fdf61b3be9f9abe44f71ce6b243e002ac4992dbf3a0f58331c00a0d18498190b50cba921351a38c27cf410bbc3e6b146ca3e73b829f0292fa87eebf SHA512 ca9ef31a662b6971c437a3e8c931d8e000fc6a55b3afbb317588944f365d903676b2a394ecfdb2da0190bdad84d1daf699662b95a68f4008e78e31bab4085b66
 DIST cython-0.29.28.gh.tar.gz 2101301 BLAKE2B 980c04545e935deb4b4b1653f167dcbc94b8e2b24bc8897b5cc996dfca977645f7475c32aa973251ffcbbb31e725e27693af61ceaf66f2332c9525b02653dc76 SHA512 52490d0b5355e13cbe586830f763173d7556cf3d79d79192ca75138b1190e7a4c1f3feeb0568349802ef3b97300c3805f54eef5ffd73a5180d68f023ac2a44cd
diff --git a/dev-python/cython/cython-0.29.25.ebuild b/dev-python/cython/cython-0.29.25.ebuild
deleted file mode 100644
index 13ce9563c542..000000000000
--- a/dev-python/cython/cython-0.29.25.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 toolchain-funcs elisp-common
-
-DESCRIPTION="A Python to C compiler"
-HOMEPAGE="https://cython.org https://pypi.org/project/Cython/
-	https://github.com/cython/cython"
-SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-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 ~x64-solaris ~x86-solaris"
-IUSE="emacs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	emacs? ( >=app-editors/emacs-23.1:* )
-"
-BDEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \
-			'python3*')
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.29.22-spawn-multiprocessing.patch"
-	"${FILESDIR}/${PN}-0.29.23-test_exceptions-py310.patch"
-)
-
-SITEFILE=50cython-gentoo.el
-
-distutils_enable_sphinx docs
-
-python_compile() {
-	# Python gets confused when it is in sys.path before build.
-	local -x PYTHONPATH=
-
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use emacs && elisp-compile Tools/cython-mode.el
-}
-
-python_test() {
-	tc-export CC
-	# https://github.com/cython/cython/issues/1911
-	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
-	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt )
-	distutils-r1_python_install_all
-
-	if use emacs; then
-		elisp-install ${PN} Tools/cython-mode.*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-python/cython/cython-0.29.26.ebuild b/dev-python/cython/cython-0.29.26.ebuild
deleted file mode 100644
index 13ce9563c542..000000000000
--- a/dev-python/cython/cython-0.29.26.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 toolchain-funcs elisp-common
-
-DESCRIPTION="A Python to C compiler"
-HOMEPAGE="https://cython.org https://pypi.org/project/Cython/
-	https://github.com/cython/cython"
-SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-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 ~x64-solaris ~x86-solaris"
-IUSE="emacs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	emacs? ( >=app-editors/emacs-23.1:* )
-"
-BDEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \
-			'python3*')
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.29.22-spawn-multiprocessing.patch"
-	"${FILESDIR}/${PN}-0.29.23-test_exceptions-py310.patch"
-)
-
-SITEFILE=50cython-gentoo.el
-
-distutils_enable_sphinx docs
-
-python_compile() {
-	# Python gets confused when it is in sys.path before build.
-	local -x PYTHONPATH=
-
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use emacs && elisp-compile Tools/cython-mode.el
-}
-
-python_test() {
-	tc-export CC
-	# https://github.com/cython/cython/issues/1911
-	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
-	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt )
-	distutils-r1_python_install_all
-
-	if use emacs; then
-		elisp-install ${PN} Tools/cython-mode.*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-python/cython/cython-0.29.27.ebuild b/dev-python/cython/cython-0.29.27.ebuild
deleted file mode 100644
index 727f6f9e3499..000000000000
--- a/dev-python/cython/cython-0.29.27.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 toolchain-funcs elisp-common
-
-DESCRIPTION="A Python to C compiler"
-HOMEPAGE="https://cython.org https://pypi.org/project/Cython/
-	https://github.com/cython/cython"
-SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-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 ~x64-solaris ~x86-solaris"
-IUSE="emacs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	emacs? ( >=app-editors/emacs-23.1:* )
-"
-BDEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \
-			'python3*')
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.29.22-spawn-multiprocessing.patch"
-	"${FILESDIR}/${PN}-0.29.23-test_exceptions-py310.patch"
-)
-
-SITEFILE=50cython-gentoo.el
-
-distutils_enable_sphinx docs
-
-python_compile() {
-	# Python gets confused when it is in sys.path before build.
-	local -x PYTHONPATH=
-
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use emacs && elisp-compile Tools/cython-mode.el
-}
-
-python_test() {
-	tc-export CC
-	# https://github.com/cython/cython/issues/1911
-	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
-	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt )
-	distutils-r1_python_install_all
-
-	if use emacs; then
-		elisp-install ${PN} Tools/cython-mode.*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-python/installer/Manifest b/dev-python/installer/Manifest
index c3a388cfad95..615052a2d874 100644
--- a/dev-python/installer/Manifest
+++ b/dev-python/installer/Manifest
@@ -1,4 +1,2 @@
-DIST installer-0.4.0-py2.py3-none-any.whl.zip 451433 BLAKE2B 933b7e63b3d0306213789d493d4df112df26b432d63ecd1f8f21449520c34bd2ad542aac25069043fbb535c44f988dca927625eafd0a5a20489fc3ce2bcf84a2 SHA512 cf303bb422e329a36007b361034144a232ba021d4013bb8678dc7c326544e74ec9a3b3fe8b9d3696433dbbe90d2ce4a0ae8967fb054bd5ed49321d470be729a8
-DIST installer-0.4.0_p20220124.gh.tar.gz 468296 BLAKE2B 44763fd05b9e3cc665871817f3a6a417ddc12274ae42989e96ad432af98d42c23ab9f1c1cc37e17d4b9ce06ead7ef0c8227b2b10fe5744c899a9e3ea347e4e33 SHA512 b25fa910e8a7d9a2757af4694bf12a64c8731213a5682ab02bbe472229c99dd9190b1e7663a7632d61cbf0585006b2d4de62115c40f9b132be2c70672e23726d
 DIST installer-0.5.0-py3-none-any.whl.zip 452177 BLAKE2B 41bb5929c1bc42afa1e09f366356aa441eb92d258da40421d7f46ceb466ee4604ed96fef0969dcd2fe28e8f4b06c741ac3108000f69ea42b6bb194890102ad71 SHA512 470c4fec8888114af6769db8b8cefa09a376bfcdf0d78320f884a7453a4991765cdf0b9122c74d8e147d193e75ab3e12cc24c3b93c0668956c17f52443833c4e
 DIST installer-0.5.0.gh.tar.gz 468351 BLAKE2B 6c258bdaae3351e87a88675fb813bb70611d9188ba16a09ba03de4caa3d79fe32544e229f880338304d00343c2b3121b1948bbef2e27c7255d231a3d5665aa5f SHA512 8731bbf8a51b1094dc87f84575eec07a650988bdeddf205d04cf80a5088eac0d8b2927022864f4011a9562fcaae9f511747e5672f94ec3cce1dccdfa833c4fce
diff --git a/dev-python/installer/installer-0.4.0_p20220124.ebuild b/dev-python/installer/installer-0.4.0_p20220124.ebuild
deleted file mode 100644
index 6dba1598032c..000000000000
--- a/dev-python/installer/installer-0.4.0_p20220124.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-EGIT_COMMIT="05855a926b2e6d9a1be6d567300883b7a6ff3ce7"
-DESCRIPTION="A library for installing Python wheels"
-HOMEPAGE="
-	https://pypi.org/project/installer/
-	https://github.com/pradyunsg/installer/
-	https://installer.readthedocs.io/en/latest/
-"
-# TODO: switch back to pradyunsg/ upstream when the CLI PR is merged
-# https://github.com/pradyunsg/installer/pull/94
-SRC_URI="
-	https://github.com/takluyver/installer/archive/${EGIT_COMMIT}.tar.gz
-		-> ${P}.gh.tar.gz
-	https://files.pythonhosted.org/packages/py2.py3/${PN::1}/${PN}/${P%_p*}-py2.py3-none-any.whl
-		-> ${P%_p*}-py2.py3-none-any.whl.zip
-"
-S=${WORKDIR}/${PN}-${EGIT_COMMIT}
-
-LICENSE="MIT"
-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"
-
-# NB: newer git doesn't use mock anymore
-BDEPEND="
-	app-arch/unzip
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-# do not use any build system to avoid circular deps
-python_compile() { :; }
-
-python_test() {
-	local -x PYTHONPATH=src
-	epytest
-}
-
-python_install() {
-	python_domodule src/installer "${WORKDIR}"/*.dist-info
-}
diff --git a/dev-python/installer/installer-0.5.0.ebuild b/dev-python/installer/installer-0.5.0.ebuild
index 1460b1996ea3..eaf0e45936ad 100644
--- a/dev-python/installer/installer-0.5.0.ebuild
+++ b/dev-python/installer/installer-0.5.0.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="MIT"
 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"
+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"
 
 BDEPEND="
 	app-arch/unzip
diff --git a/dev-python/itsdangerous/Manifest b/dev-python/itsdangerous/Manifest
index e94e196e212f..74fe3cb081da 100644
--- a/dev-python/itsdangerous/Manifest
+++ b/dev-python/itsdangerous/Manifest
@@ -1,4 +1,2 @@
 DIST itsdangerous-1.1.0.tar.gz 53219 BLAKE2B 6ad74dacb9728e77d57ac5e364e79e3cc749be206fa03e82a407cdd77b5b72ddb4861bf181772915e684539e6404c6a45f6081c7c8e17a33a2d532b4fc3fed80 SHA512 61bab3fce5f87a3b5fc8fad61e735a63df6aa039416ee3494e1c99a2a1162b4fb72793bc5dc949de0985724c40121810b159513606c4c3976a7666dba3a1b93d
-DIST itsdangerous-2.0.1.tar.gz 59336 BLAKE2B 53661c31c6ac8b3db68287f52367ecf53d871c2abd8bed077b5a2039b29da96cdb1b9c717d1382d831b63aa79c421fece1afd6799f31b85df46ed4627e69f792 SHA512 bc1e51eb861c13b4e3c4c1c655a3b6f28e326d70db23679269d2bea84f0f8f94afd4fccecb745cf40f5a5956a14a336dfa42f0f5149666ae43061feb1366302b
-DIST itsdangerous-2.1.0.tar.gz 56078 BLAKE2B b60e32d3199e3233e7a5686b3028d3f5ee49ae1a51dfbb1ead0f9d9c7e74a90945732ac86a44e4a53a285827189c60a012fc825cac74f28653e77fcefd4efd0e SHA512 f8b12b0cd1aa50d5fec8755125582598c467cd3f9bad5862718daf4a62395aaa0496247f29b7f492328c7f664f8c60926ca0eacb99f34559fe6a1424362faa44
 DIST itsdangerous-2.1.1.tar.gz 56217 BLAKE2B 8b35b32ce0d9a5432079199165f9d7a43dee80775737bfde637820a86c6c2c4cf122914958d4e88466446b75deaf4dfe995c9cda64c254793056e5773136d07d SHA512 54ec17e540fc7c39e5880c044c1ce222260b1141355cc341dc96eefbfd8f12e3018eadd531081a00aa719736b9af437bafe147dd5fee456d8b4478f7107aacdb
diff --git a/dev-python/itsdangerous/itsdangerous-2.0.1.ebuild b/dev-python/itsdangerous/itsdangerous-2.0.1.ebuild
deleted file mode 100644
index a30fc6ccd3df..000000000000
--- a/dev-python/itsdangerous/itsdangerous-2.0.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Various helpers to pass trusted data to untrusted environments and back"
-HOMEPAGE="https://pythonhosted.org/itsdangerous/ https://pypi.org/project/itsdangerous/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-BDEPEND="
-	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
diff --git a/dev-python/itsdangerous/itsdangerous-2.1.0.ebuild b/dev-python/itsdangerous/itsdangerous-2.1.0.ebuild
deleted file mode 100644
index e9e16768e94e..000000000000
--- a/dev-python/itsdangerous/itsdangerous-2.1.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Various helpers to pass trusted data to untrusted environments and back"
-HOMEPAGE="https://pythonhosted.org/itsdangerous/ https://pypi.org/project/itsdangerous/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-BDEPEND="
-	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
diff --git a/dev-python/itsdangerous/itsdangerous-2.1.1.ebuild b/dev-python/itsdangerous/itsdangerous-2.1.1.ebuild
index e9e16768e94e..3599f307595a 100644
--- a/dev-python/itsdangerous/itsdangerous-2.1.1.ebuild
+++ b/dev-python/itsdangerous/itsdangerous-2.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 BDEPEND="
 	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )"
diff --git a/dev-python/jaraco-context/jaraco-context-4.1.1-r2.ebuild b/dev-python/jaraco-context/jaraco-context-4.1.1-r2.ebuild
index a253d34788f1..67029c2cd032 100644
--- a/dev-python/jaraco-context/jaraco-context-4.1.1-r2.ebuild
+++ b/dev-python/jaraco-context/jaraco-context-4.1.1-r2.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/jaraco-packaging/Manifest b/dev-python/jaraco-packaging/Manifest
index 3cf5fe4c1228..ea4d256cac5b 100644
--- a/dev-python/jaraco-packaging/Manifest
+++ b/dev-python/jaraco-packaging/Manifest
@@ -1,2 +1 @@
 DIST jaraco.packaging-8.2.1.tar.gz 15393 BLAKE2B 8e30dcbb6c5dacf55fc62041e14c18ec852e39761ff5e00202bde89f6224eda8fbc090272d9470129be6014d8777b134908280dde10a0fce712b29167b122bb5 SHA512 3235756833bb4b0aff8dc832adb6e269bda622c5458493a302c6d487547ce224865aa367773f42bd456553c69cf451944d9b50d148761a40a775f59a398ec02c
-DIST jaraco.packaging-9.0.0.tar.gz 7917 BLAKE2B a975f1a4a024df8ec2ed56cd10cd574fa9bf1fd121b1d05fb71a72a944a07883539bb75d82894329cf2e845e996cf930a9010ca26952adff131bc9b3f51cfe60 SHA512 5968418251eeb7fa0f5657e8b8b4ead40f7f2b28fbaa8dc331a3bb0518d32b45646b85521e941e7c483ef8861d9a9cd47c45126cfdf2da708bd8f3b3514b47da
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-8.2.1-r1.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-8.2.1-r1.ebuild
index dee6fedf44c5..802e6482201d 100644
--- a/dev-python/jaraco-packaging/jaraco-packaging-8.2.1-r1.ebuild
+++ b/dev-python/jaraco-packaging/jaraco-packaging-8.2.1-r1.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-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"
 
 RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-8.2.1.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-8.2.1.ebuild
deleted file mode 100644
index e7d5b913e05c..000000000000
--- a/dev-python/jaraco-packaging/jaraco-packaging-8.2.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-MY_P=${P/-/.}
-DESCRIPTION="Tools to supplement packaging Python releases"
-HOMEPAGE="https://github.com/jaraco/jaraco.packaging"
-SRC_URI="mirror://pypi/${MY_P::1}/${PN/-/.}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs '>=dev-python/rst-linker-1.9'
-distutils_enable_tests pytest
-
-src_test() {
-	# create a pkgutil-style __init__.py in order to fix pytest's
-	# determination of package paths
-	# https://bugs.gentoo.org/832713
-	cat > jaraco/__init__.py <<-EOF || die
-		__path__ = __import__('pkgutil').extend_path(__path__, __name__)
-	EOF
-	distutils-r1_src_test
-	rm jaraco/__init__.py || die
-}
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-9.0.0.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-9.0.0.ebuild
deleted file mode 100644
index c4f2c74a95f4..000000000000
--- a/dev-python/jaraco-packaging/jaraco-packaging-9.0.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-MY_P=${P/-/.}
-DESCRIPTION="Tools to supplement packaging Python releases"
-HOMEPAGE="https://github.com/jaraco/jaraco.packaging"
-SRC_URI="mirror://pypi/${MY_P::1}/${PN/-/.}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/pep517[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs '>=dev-python/rst-linker-1.9'
diff --git a/dev-python/jaraco-text/jaraco-text-3.7.0-r2.ebuild b/dev-python/jaraco-text/jaraco-text-3.7.0-r2.ebuild
index feaf5fbece8b..46813048fae9 100644
--- a/dev-python/jaraco-text/jaraco-text-3.7.0-r2.ebuild
+++ b/dev-python/jaraco-text/jaraco-text-3.7.0-r2.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/jaraco-context-4.1.1-r1[${PYTHON_USEDEP}]
diff --git a/dev-python/lxml/lxml-4.8.0-r1.ebuild b/dev-python/lxml/lxml-4.8.0-r1.ebuild
index 62574e22e13f..dfb9b4b86330 100644
--- a/dev-python/lxml/lxml-4.8.0-r1.ebuild
+++ b/dev-python/lxml/lxml-4.8.0-r1.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/lxml-${P}
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 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 ~x64-solaris ~x86-solaris"
+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 ~x64-solaris ~x86-solaris"
 IUSE="doc examples +threads test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/markupsafe/markupsafe-2.1.1.ebuild b/dev-python/markupsafe/markupsafe-2.1.1.ebuild
index 29487b01ac74..ccc786dd9220 100644
--- a/dev-python/markupsafe/markupsafe-2.1.1.ebuild
+++ b/dev-python/markupsafe/markupsafe-2.1.1.ebuild
@@ -18,6 +18,6 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 
 distutils_enable_tests pytest
diff --git a/dev-python/nbclient/Manifest b/dev-python/nbclient/Manifest
index e019e92ef920..272647d2fdeb 100644
--- a/dev-python/nbclient/Manifest
+++ b/dev-python/nbclient/Manifest
@@ -1,3 +1 @@
-DIST nbclient-0.5.11.gh.tar.gz 75556 BLAKE2B 5c9e44ea1efc05457427ba6fb9bbb319efd5eb314ca4964e0df4b842faa3341f4f51ef74565434ddaf0dcf56c9e2a83ce7bd36ab6c50cc1d0349ecc50af75b51 SHA512 e4142dd28e21be7803651b8b7ed646e168a302edc2ec806b58fdd79454059fea3fedf270e1aaec6152433a15c2280bd38e4dfb0d740091a2ab2987530dbe3c6a
 DIST nbclient-0.5.13.gh.tar.gz 75335 BLAKE2B 02a1d7d84b51c3af81f4d511e3a68a94d28478d09241a174309d9338a10be9c2e7cc48601bfb844dcad979eca867890e96df47d0e2aa6d7f7881a2e899b79ab5 SHA512 cebb9c4216d4c1668908a0b332a32d63825e7c3cfcf78b3e918df16364a04a12c396646f4e0b215a9bbc40d1be907a361f90aff3721e299d17c852f8acec0d04
-DIST nbclient-0.5.5.gh.tar.gz 72661 BLAKE2B b2be54c03c12a2cdc641e329946bae37a7b8c1c4aee8ac686c6e3350f27cf7a0a2e64653afb8acac7e373f5cbbab05feba3c1c4d7e8856974621f0d1c96005df SHA512 3066f847c175ac26ab6918b71e84a8f87bc922f624011b707f8b0a6d872c123d7979a5ffec24a933b6f98a7f83bf530926ecccb5a1c6f24bd84b3fbda07fdf48
diff --git a/dev-python/nbclient/nbclient-0.5.11.ebuild b/dev-python/nbclient/nbclient-0.5.11.ebuild
deleted file mode 100644
index 3c26e9ba6a0e..000000000000
--- a/dev-python/nbclient/nbclient-0.5.11.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client library for executing Jupyter notebooks"
-HOMEPAGE="
-	https://nbclient.readthedocs.io/en/latest/
-	https://github.com/jupyter/nbclient/
-	https://pypi.org/project/nbclient/"
-SRC_URI="
-	https://github.com/jupyter/nbclient/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/jupyter_client-6.1.5[${PYTHON_USEDEP}]
-	>=dev-python/nbformat-5.0[${PYTHON_USEDEP}]
-	dev-python/nest_asyncio[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-		dev-python/xmltodict[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/nbclient/nbclient-0.5.13.ebuild b/dev-python/nbclient/nbclient-0.5.13.ebuild
index 08b83a96fbcc..958c41f4405c 100644
--- a/dev-python/nbclient/nbclient-0.5.13.ebuild
+++ b/dev-python/nbclient/nbclient-0.5.13.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 hppa ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/jupyter_client-6.1.5[${PYTHON_USEDEP}]
diff --git a/dev-python/nbclient/nbclient-0.5.5.ebuild b/dev-python/nbclient/nbclient-0.5.5.ebuild
deleted file mode 100644
index 842d2c36483a..000000000000
--- a/dev-python/nbclient/nbclient-0.5.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A client library for executing Jupyter notebooks"
-HOMEPAGE="
-	https://nbclient.readthedocs.io/en/latest/
-	https://github.com/jupyter/nbclient/
-	https://pypi.org/project/nbclient/"
-SRC_URI="
-	https://github.com/jupyter/nbclient/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 hppa ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/jupyter_client-6.1.5[${PYTHON_USEDEP}]
-	>=dev-python/nbformat-5.0[${PYTHON_USEDEP}]
-	dev-python/nest_asyncio[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-		dev-python/xmltodict[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/nbformat/nbformat-5.1.3-r1.ebuild b/dev-python/nbformat/nbformat-5.1.3-r1.ebuild
index e9c7277cbd9d..a3a30ece4f3f 100644
--- a/dev-python/nbformat/nbformat-5.1.3-r1.ebuild
+++ b/dev-python/nbformat/nbformat-5.1.3-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/nbformat/nbformat-5.1.3.ebuild b/dev-python/nbformat/nbformat-5.1.3.ebuild
deleted file mode 100644
index 798393d1db22..000000000000
--- a/dev-python/nbformat/nbformat-5.1.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE='sqlite'
-
-inherit distutils-r1
-
-DESCRIPTION="Reference implementation of the Jupyter Notebook format"
-HOMEPAGE="https://jupyter.org"
-# missing on pypi
-SRC_URI="
-	https://github.com/jupyter/nbformat/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.1[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	"
-BDEPEND="
-	test? (
-		dev-python/fastjsonschema[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-	"
-
-distutils_enable_sphinx docs \
-	dev-python/numpydoc
-distutils_enable_tests pytest
diff --git a/dev-python/nspektr/nspektr-0.3.0.ebuild b/dev-python/nspektr/nspektr-0.3.0.ebuild
index 4ce11a167e7e..3cb7845ac6c1 100644
--- a/dev-python/nspektr/nspektr-0.3.0.ebuild
+++ b/dev-python/nspektr/nspektr-0.3.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/jaraco-context-4.1.1-r2[${PYTHON_USEDEP}]
diff --git a/dev-python/pip-run/pip-run-8.8.0.ebuild b/dev-python/pip-run/pip-run-8.8.0.ebuild
index 5d9fcc277727..3b817fa4d1cb 100644
--- a/dev-python/pip-run/pip-run-8.8.0.ebuild
+++ b/dev-python/pip-run/pip-run-8.8.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/autocommand[${PYTHON_USEDEP}]
diff --git a/dev-python/pybind11/pybind11-2.9.1.ebuild b/dev-python/pybind11/pybind11-2.9.1.ebuild
index f93c74dafdd7..3dce07219271 100644
--- a/dev-python/pybind11/pybind11-2.9.1.ebuild
+++ b/dev-python/pybind11/pybind11-2.9.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pybind/pybind11/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="
 	dev-cpp/eigen:3
diff --git a/dev-python/setuptools/setuptools-60.10.0.ebuild b/dev-python/setuptools/setuptools-60.10.0.ebuild
index b0e0ee15c1d0..ebd05cb41e48 100644
--- a/dev-python/setuptools/setuptools-60.10.0.ebuild
+++ b/dev-python/setuptools/setuptools-60.10.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.3.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.3.ebuild
index f27f15cd9303..55425715a1ae 100644
--- a/net-analyzer/argus-clients/argus-clients-3.0.8.3.ebuild
+++ b/net-analyzer/argus-clients/argus-clients-3.0.8.3.ebuild
@@ -63,7 +63,7 @@ src_configure() {
 src_compile() {
 	emake \
 		CCOPT="${CFLAGS} ${LDFLAGS}" \
-		RANLIB=$(tc-getRANLIB) \
+		RANLIB="$(tc-getRANLIB)" \
 		CURSESLIB="$( $(tc-getPKG_CONFIG) --libs ncurses)"
 }
 
diff --git a/net-analyzer/hunt/hunt-1.5_p6_p1.ebuild b/net-analyzer/hunt/hunt-1.5_p6_p1.ebuild
index 3790bdef6529..b31b315b3758 100644
--- a/net-analyzer/hunt/hunt-1.5_p6_p1.ebuild
+++ b/net-analyzer/hunt/hunt-1.5_p6_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -31,7 +31,7 @@ src_configure() {
 src_compile() {
 	local target
 	for target in . tpserv; do
-		emake CC=$(tc-getCC) LDFLAGS="${CFLAGS} ${LDFLAGS}" -C "${target}"
+		emake CC="$(tc-getCC)" LDFLAGS="${CFLAGS} ${LDFLAGS}" -C "${target}"
 	done
 }
 
diff --git a/net-analyzer/ipguard/ipguard-1.04-r1.ebuild b/net-analyzer/ipguard/ipguard-1.04-r1.ebuild
index cbd0d12934c6..3677434a94be 100644
--- a/net-analyzer/ipguard/ipguard-1.04-r1.ebuild
+++ b/net-analyzer/ipguard/ipguard-1.04-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,7 +29,7 @@ PATCHES=(
 
 src_compile() {
 	emake \
-		CC=$(tc-getCC) \
+		CC="$(tc-getCC)" \
 		LIBNET_CONFIG="$(tc-getPKG_CONFIG) libnet" \
 		PREFIX=\"${EPREFIX:-/usr}\"
 }
diff --git a/net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild
index d868bf041bd4..da7044dcdd6a 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild
@@ -136,11 +136,11 @@ src_configure() {
 }
 
 src_compile() {
-	emake CC=$(tc-getCC) nagios
+	emake CC="$(tc-getCC)" nagios
 
 	if use web; then
 		# Only compile the CGIs/HTML when USE=web is set.
-		emake CC=$(tc-getCC) DESTDIR="${D}" cgis html
+		emake CC="$(tc-getCC)" DESTDIR="${D}" cgis html
 	fi
 }
 
diff --git a/net-analyzer/nagios-core/nagios-core-4.4.6-r3.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.6-r3.ebuild
index 2f3ebaec2193..e0583cea138b 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.6-r3.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.6-r3.ebuild
@@ -132,11 +132,11 @@ src_configure() {
 }
 
 src_compile() {
-	emake CC=$(tc-getCC) nagios
+	emake CC="$(tc-getCC)" nagios
 
 	if use web; then
 		# Only compile the CGIs/HTML when USE=web is set.
-		emake CC=$(tc-getCC) cgis html
+		emake CC="$(tc-getCC)" cgis html
 	fi
 }
 
diff --git a/net-analyzer/nmap/nmap-7.80-r2.ebuild b/net-analyzer/nmap/nmap-7.80-r2.ebuild
index 37d6bd0196ec..1734ec441e00 100644
--- a/net-analyzer/nmap/nmap-7.80-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.80-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -111,8 +111,8 @@ src_compile() {
 	done
 
 	emake \
-		AR=$(tc-getAR) \
-		RANLIB=$(tc-getRANLIB)
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)"
 }
 
 src_install() {
diff --git a/net-analyzer/nmap/nmap-7.91-r2.ebuild b/net-analyzer/nmap/nmap-7.91-r2.ebuild
index 7beabe6e0b00..1af1818ce083 100644
--- a/net-analyzer/nmap/nmap-7.91-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -117,8 +117,8 @@ src_compile() {
 	done
 
 	emake \
-		AR=$(tc-getAR) \
-		RANLIB=$(tc-getRANLIB)
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)"
 }
 
 src_install() {
diff --git a/net-analyzer/nmap/nmap-7.92.ebuild b/net-analyzer/nmap/nmap-7.92.ebuild
index 8578d039870f..8d80c56138aa 100644
--- a/net-analyzer/nmap/nmap-7.92.ebuild
+++ b/net-analyzer/nmap/nmap-7.92.ebuild
@@ -116,8 +116,8 @@ src_compile() {
 	done
 
 	emake \
-		AR=$(tc-getAR) \
-		RANLIB=$(tc-getRANLIB)
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)"
 }
 
 src_install() {
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index e04fab825e5c..2812d6599000 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -117,8 +117,8 @@ src_compile() {
 	done
 
 	emake \
-		AR=$(tc-getAR) \
-		RANLIB=$(tc-getRANLIB)
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)"
 }
 
 src_install() {
diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild
index 859270ce857d..70a973b584c8 100644
--- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild
+++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild
@@ -35,7 +35,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {
diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild
index 48dfecb119bd..c04edf0bb0da 100644
--- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild
+++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild
@@ -41,7 +41,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {
diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild
index 90851a6bcac9..d82b685da2a0 100644
--- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild
+++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild
@@ -35,7 +35,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {
diff --git a/net-analyzer/webfuzzer/webfuzzer-0.2.0-r2.ebuild b/net-analyzer/webfuzzer/webfuzzer-0.2.0-r2.ebuild
index 66622a2b52db..f0f3240d23e2 100644
--- a/net-analyzer/webfuzzer/webfuzzer-0.2.0-r2.ebuild
+++ b/net-analyzer/webfuzzer/webfuzzer-0.2.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ PATCHES=(
 )
 
 src_compile() {
-	emake CC=$(tc-getCC)
+	emake CC="$(tc-getCC)"
 }
 
 src_install() {
diff --git a/net-analyzer/zniper/zniper-1.0-r3.ebuild b/net-analyzer/zniper/zniper-1.0-r3.ebuild
index 0e1f35b7ba21..e9aa11ad3172 100644
--- a/net-analyzer/zniper/zniper-1.0-r3.ebuild
+++ b/net-analyzer/zniper/zniper-1.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -33,7 +33,7 @@ src_prepare() {
 
 src_compile() {
 	emake \
-		CC=$(tc-getCC) \
+		CC="$(tc-getCC)" \
 		CFLAGS="${CFLAGS}" \
 		linux_x86
 }