Merge updates from master

74 files changed, 45 insertions, 134 deletions

diff --git a/app-editors/neovim/neovim-0.4.4.ebuild b/app-editors/neovim/neovim-0.4.4.ebuild
index d10522f3c6b7..f65995c6aa2f 100644
--- a/app-editors/neovim/neovim-0.4.4.ebuild
+++ b/app-editors/neovim/neovim-0.4.4.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
 else
 	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0 vim"
diff --git a/dev-db/pgcli/pgcli-3.0.0.ebuild b/dev-db/pgcli/pgcli-3.0.0.ebuild
index ea2e13b936ea..b5da66f7a3dd 100644
--- a/dev-db/pgcli/pgcli-3.0.0.ebuild
+++ b/dev-db/pgcli/pgcli-3.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/dbcli/pgcli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 RDEPEND="
 	>=dev-python/prompt_toolkit-3.0.0[${PYTHON_USEDEP}]
diff --git a/dev-libs/libconfig/libconfig-1.7.2.ebuild b/dev-libs/libconfig/libconfig-1.7.2.ebuild
index b200d6654c11..ce641e131a6e 100644
--- a/dev-libs/libconfig/libconfig-1.7.2.ebuild
+++ b/dev-libs/libconfig/libconfig-1.7.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/hyperrealm/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-2.1"
 SLOT="0/11"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-linux"
 IUSE="+cxx static-libs"
 
 DEPEND="
diff --git a/dev-perl/Readonly-XS/Readonly-XS-1.50.0-r1.ebuild b/dev-perl/Readonly-XS/Readonly-XS-1.50.0-r1.ebuild
index 6b1843ed652e..9df0a8ba16ce 100644
--- a/dev-perl/Readonly-XS/Readonly-XS-1.50.0-r1.ebuild
+++ b/dev-perl/Readonly-XS/Readonly-XS-1.50.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Companion module for Readonly.pm, to speed up read-only scalar variables"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
 IUSE=""
 
 RDEPEND="dev-perl/Readonly"
diff --git a/dev-python/backports-tempfile/backports-tempfile-1.0.ebuild b/dev-python/backports-tempfile/backports-tempfile-1.0-r1.ebuild
index 7a1f774c2f86..f96bb176e088 100644
--- a/dev-python/backports-tempfile/backports-tempfile-1.0.ebuild
+++ b/dev-python/backports-tempfile/backports-tempfile-1.0-r1.ebuild
@@ -17,7 +17,7 @@ LICENSE="PSF-2.3"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
-RDEPEND="dev-python/backports[${PYTHON_USEDEP}]
+RDEPEND="
 	dev-python/backports-weakref[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
@@ -37,7 +37,7 @@ python_test() {
 }
 
 python_install() {
-	# avoid a collision with dev-python/backports
+	# avoid collisions due to namespaces
 	rm "${BUILD_DIR}"/lib/backports/__init__.py || die
 	distutils-r1_python_install --skip-build
 }
diff --git a/dev-python/backports-weakref/backports-weakref-1.0_p1.ebuild b/dev-python/backports-weakref/backports-weakref-1.0_p1-r1.ebuild
index 41ffcc609078..01b87fb525e8 100644
--- a/dev-python/backports-weakref/backports-weakref-1.0_p1.ebuild
+++ b/dev-python/backports-weakref/backports-weakref-1.0_p1-r1.ebuild
@@ -12,17 +12,14 @@ MY_P=${MY_PN}-${PV/_p/.post}
 DESCRIPTION="Backport of new features in Python's weakref module"
 HOMEPAGE="https://github.com/PiDelport/backports.weakref https://pypi.org/project/backports.weakref/"
 SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2.3"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
-RDEPEND="dev-python/backports[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
 # Tests require backports.test.support
 RESTRICT="test"
-S="${WORKDIR}/${MY_P}"
 
 python_prepare_all() {
 	sed -e "s|'setuptools_scm'||" \
@@ -36,7 +33,7 @@ python_test() {
 }
 
 python_install() {
-	# avoid a collision with dev-python/backports
+	# avoid collisions due to namespace
 	rm "${BUILD_DIR}"/lib/backports/__init__.py || die
 	distutils-r1_python_install --skip-build
 }
diff --git a/dev-python/cli_helpers/cli_helpers-2.1.0.ebuild b/dev-python/cli_helpers/cli_helpers-2.1.0.ebuild
index 8e70cb86e447..bb84eca13ff0 100644
--- a/dev-python/cli_helpers/cli_helpers-2.1.0.ebuild
+++ b/dev-python/cli_helpers/cli_helpers-2.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/dbcli/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 RDEPEND="
 	>=dev-python/configobj-5.0.5[${PYTHON_USEDEP}]
diff --git a/dev-python/google-api-core/google-api-core-1.17.0.ebuild b/dev-python/google-api-core/google-api-core-1.17.0-r1.ebuild
index 90d3c1017854..117a8236e679 100644
--- a/dev-python/google-api-core/google-api-core-1.17.0.ebuild
+++ b/dev-python/google-api-core/google-api-core-1.17.0-r1.ebuild
@@ -17,7 +17,6 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
-	dev-python/namespace-google[${PYTHON_USEDEP}]
 	dev-python/protobuf-python[${PYTHON_USEDEP}]
 	dev-python/googleapis-common-protos[${PYTHON_USEDEP}]
 	>=dev-python/google-auth-1.14.0[${PYTHON_USEDEP}]
diff --git a/dev-python/google-auth/google-auth-1.20.1.ebuild b/dev-python/google-auth/google-auth-1.20.1-r1.ebuild
index 371c951a2d52..693d980564d0 100644
--- a/dev-python/google-auth/google-auth-1.20.1.ebuild
+++ b/dev-python/google-auth/google-auth-1.20.1-r1.ebuild
@@ -19,7 +19,6 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	dev-python/namespace-google[${PYTHON_USEDEP}]
 	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
 	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
 	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
diff --git a/dev-python/googleapis-common-protos/googleapis-common-protos-1.51.0.ebuild b/dev-python/googleapis-common-protos/googleapis-common-protos-1.51.0-r1.ebuild
index cb0e7ec78b9e..f975ad90e4eb 100644
--- a/dev-python/googleapis-common-protos/googleapis-common-protos-1.51.0.ebuild
+++ b/dev-python/googleapis-common-protos/googleapis-common-protos-1.51.0-r1.ebuild
@@ -15,7 +15,6 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
-	dev-python/namespace-google[${PYTHON_USEDEP}]
 	dev-python/protobuf-python[${PYTHON_USEDEP}]
 "
 
diff --git a/dev-python/jaraco-classes/jaraco-classes-3.1.0.ebuild b/dev-python/jaraco-classes/jaraco-classes-3.1.0-r1.ebuild
index 8b8c724c4ef1..3c40afa14813 100644
--- a/dev-python/jaraco-classes/jaraco-classes-3.1.0.ebuild
+++ b/dev-python/jaraco-classes/jaraco-classes-3.1.0-r1.ebuild
@@ -20,7 +20,6 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 "
 DEPEND="
diff --git a/dev-python/jaraco-collections/jaraco-collections-3.0.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-3.0.0-r1.ebuild
index 6c4405351517..7b1da731a63f 100644
--- a/dev-python/jaraco-collections/jaraco-collections-3.0.0.ebuild
+++ b/dev-python/jaraco-collections/jaraco-collections-3.0.0-r1.ebuild
@@ -20,7 +20,6 @@ RESTRICT="!test? ( test )"
 # TODO: remove six when the following PR is merged:
 # https://github.com/jaraco/jaraco.collections/pull/5
 RDEPEND="
-	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 	dev-python/jaraco-classes[${PYTHON_USEDEP}]
 	dev-python/jaraco-text[${PYTHON_USEDEP}]
 	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-context/jaraco-context-3.0.0.ebuild b/dev-python/jaraco-context/jaraco-context-3.0.0-r1.ebuild
index 37dff8f76a75..9b28336a584e 100644
--- a/dev-python/jaraco-context/jaraco-context-3.0.0.ebuild
+++ b/dev-python/jaraco-context/jaraco-context-3.0.0-r1.ebuild
@@ -17,9 +17,6 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 x86"
 
-RDEPEND="
-	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
-"
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/jaraco-envs/jaraco-envs-2.0.0.ebuild b/dev-python/jaraco-envs/jaraco-envs-2.0.0-r1.ebuild
index 5e0418fa03c5..ed385575c2d9 100644
--- a/dev-python/jaraco-envs/jaraco-envs-2.0.0.ebuild
+++ b/dev-python/jaraco-envs/jaraco-envs-2.0.0-r1.ebuild
@@ -17,7 +17,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 
-RDEPEND="dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+RDEPEND="
 	dev-python/path-py[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep 'dev-python/contextlib2[${PYTHON_USEDEP}]' 'python3_[67]')"
 # toml is required by setuptools_scm
diff --git a/dev-python/jaraco-functools/jaraco-functools-3.0.1.ebuild b/dev-python/jaraco-functools/jaraco-functools-3.0.1-r1.ebuild
index 95877b4e1d17..92ec34693964 100644
--- a/dev-python/jaraco-functools/jaraco-functools-3.0.1.ebuild
+++ b/dev-python/jaraco-functools/jaraco-functools-3.0.1-r1.ebuild
@@ -20,7 +20,6 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 	dev-python/more-itertools[${PYTHON_USEDEP}]
 "
 BDEPEND="
diff --git a/dev-python/jaraco-itertools/jaraco-itertools-5.0.0.ebuild b/dev-python/jaraco-itertools/jaraco-itertools-5.0.0-r1.ebuild
index 4b4b9f83e466..a39a0c4dbf98 100644
--- a/dev-python/jaraco-itertools/jaraco-itertools-5.0.0.ebuild
+++ b/dev-python/jaraco-itertools/jaraco-itertools-5.0.0-r1.ebuild
@@ -21,7 +21,6 @@ RESTRICT="!test? ( test )"
 # TODO: remove six
 # https://github.com/jaraco/jaraco.itertools/pull/6
 RDEPEND="
-	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/inflect[${PYTHON_USEDEP}]
 	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-logging/jaraco-logging-3.0.0-r1.ebuild b/dev-python/jaraco-logging/jaraco-logging-3.0.0-r2.ebuild
index e90771dce5f8..2d2fc9b1d226 100644
--- a/dev-python/jaraco-logging/jaraco-logging-3.0.0-r1.ebuild
+++ b/dev-python/jaraco-logging/jaraco-logging-3.0.0-r2.ebuild
@@ -21,7 +21,6 @@ RESTRICT="!test? ( test )"
 # TODO: remove six
 # https://github.com/jaraco/jaraco.logging/pull/1
 RDEPEND="
-	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/tempora[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-8.1.0-r1.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-8.1.0-r2.ebuild
index 2e4dfe36ae73..f4d1e11c9cfd 100644
--- a/dev-python/jaraco-packaging/jaraco-packaging-8.1.0-r1.ebuild
+++ b/dev-python/jaraco-packaging/jaraco-packaging-8.1.0-r2.ebuild
@@ -22,7 +22,6 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3 python3_{6,7})
-	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4[${PYTHON_USEDEP}]
 "
 DEPEND="
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-8.1.1.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-8.1.1-r1.ebuild
index 3562cc7c22a5..22ffbf992716 100644
--- a/dev-python/jaraco-packaging/jaraco-packaging-8.1.1.ebuild
+++ b/dev-python/jaraco-packaging/jaraco-packaging-8.1.1-r1.ebuild
@@ -20,7 +20,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~
 
 RDEPEND="
 	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3 python3_{6,7})
-	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 "
 DEPEND="
 	dev-python/toml[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-stream/jaraco-stream-3.0.0.ebuild b/dev-python/jaraco-stream/jaraco-stream-3.0.0-r1.ebuild
index c50cc19bb17a..010491d75d8b 100644
--- a/dev-python/jaraco-stream/jaraco-stream-3.0.0.ebuild
+++ b/dev-python/jaraco-stream/jaraco-stream-3.0.0-r1.ebuild
@@ -18,11 +18,9 @@ KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND=">=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]"
 BDEPEND="
 	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
 	test? (
-		${RDEPEND}
 		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
 		dev-python/more-itertools[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild b/dev-python/jaraco-text/jaraco-text-3.2.0-r1.ebuild
index 1084d2d49d18..f3ca6a7ac900 100644
--- a/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild
+++ b/dev-python/jaraco-text/jaraco-text-3.2.0-r1.ebuild
@@ -21,7 +21,6 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	dev-python/jaraco-functools[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_6)
 "
 BDEPEND="
diff --git a/dev-python/keep/keep-2.10.ebuild b/dev-python/keep/keep-2.10.ebuild
index 3c23b66c1e61..4017856890fa 100644
--- a/dev-python/keep/keep-2.10.ebuild
+++ b/dev-python/keep/keep-2.10.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/paste/paste-3.5.0.ebuild b/dev-python/paste/paste-3.5.0-r1.ebuild
index ceb33d7884b9..340a03c44027 100644
--- a/dev-python/paste/paste-3.5.0.ebuild
+++ b/dev-python/paste/paste-3.5.0-r1.ebuild
@@ -18,7 +18,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris"
 
-RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]
+RDEPEND="
 	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]"
 
 distutils_enable_tests pytest
diff --git a/dev-python/pastedeploy/pastedeploy-2.1.1.ebuild b/dev-python/pastedeploy/pastedeploy-2.1.1-r1.ebuild
index 5296ae59182c..0545bd0a010a 100644
--- a/dev-python/pastedeploy/pastedeploy-2.1.1.ebuild
+++ b/dev-python/pastedeploy/pastedeploy-2.1.1-r1.ebuild
@@ -21,9 +21,6 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="doc"
 
-RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}"
-
 distutils_enable_tests pytest
 
 python_prepare_all() {
diff --git a/dev-python/protobuf-python/protobuf-python-3.12.2-r1.ebuild b/dev-python/protobuf-python/protobuf-python-3.12.2-r2.ebuild
index 460e7a0e25cd..ab0359dc6a85 100644
--- a/dev-python/protobuf-python/protobuf-python-3.12.2-r1.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.12.2-r2.ebuild
@@ -29,7 +29,6 @@ IUSE=""
 
 BDEPEND="${PYTHON_DEPS}
 	~dev-libs/protobuf-${PV}
-	dev-python/namespace-google[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]"
 DEPEND="${PYTHON_DEPS}
 	~dev-libs/protobuf-${PV}"
diff --git a/dev-python/protobuf-python/protobuf-python-3.12.4-r1.ebuild b/dev-python/protobuf-python/protobuf-python-3.12.4-r2.ebuild
index 754ffae59d5e..0f01c20ff234 100644
--- a/dev-python/protobuf-python/protobuf-python-3.12.4-r1.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.12.4-r2.ebuild
@@ -29,7 +29,6 @@ IUSE=""
 
 BDEPEND="${PYTHON_DEPS}
 	~dev-libs/protobuf-${PV}
-	dev-python/namespace-google[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]"
 DEPEND="${PYTHON_DEPS}
 	~dev-libs/protobuf-${PV}"
diff --git a/dev-python/protobuf-python/protobuf-python-3.13.0-r1.ebuild b/dev-python/protobuf-python/protobuf-python-3.13.0-r2.ebuild
index f29d29688f05..a079a78e44ca 100644
--- a/dev-python/protobuf-python/protobuf-python-3.13.0-r1.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.13.0-r2.ebuild
@@ -29,7 +29,6 @@ IUSE=""
 
 BDEPEND="${PYTHON_DEPS}
 	~dev-libs/protobuf-${PV}
-	dev-python/namespace-google[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]"
 DEPEND="${PYTHON_DEPS}
 	~dev-libs/protobuf-${PV}"
diff --git a/dev-python/protobuf-python/protobuf-python-3.14.0.ebuild b/dev-python/protobuf-python/protobuf-python-3.14.0-r1.ebuild
index 68484e4d06d7..fa3039421024 100644
--- a/dev-python/protobuf-python/protobuf-python-3.14.0.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.14.0-r1.ebuild
@@ -29,7 +29,6 @@ IUSE=""
 
 BDEPEND="${PYTHON_DEPS}
 	~dev-libs/protobuf-${PV}
-	dev-python/namespace-google[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]"
 DEPEND="${PYTHON_DEPS}
 	~dev-libs/protobuf-${PV}"
diff --git a/dev-python/protobuf-python/protobuf-python-9999.ebuild b/dev-python/protobuf-python/protobuf-python-9999.ebuild
index cf83c9cb0fbd..453cffab05a6 100644
--- a/dev-python/protobuf-python/protobuf-python-9999.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-9999.ebuild
@@ -29,7 +29,6 @@ IUSE=""
 
 BDEPEND="${PYTHON_DEPS}
 	~dev-libs/protobuf-${PV}
-	dev-python/namespace-google[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]"
 DEPEND="${PYTHON_DEPS}
 	~dev-libs/protobuf-${PV}"
diff --git a/dev-python/pyvirtualdisplay/pyvirtualdisplay-1.3.2.ebuild b/dev-python/pyvirtualdisplay/pyvirtualdisplay-1.3.2.ebuild
index 51c1c3aa0d2b..293aff4cf873 100644
--- a/dev-python/pyvirtualdisplay/pyvirtualdisplay-1.3.2.ebuild
+++ b/dev-python/pyvirtualdisplay/pyvirtualdisplay-1.3.2.ebuild
@@ -16,7 +16,6 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 
 BDEPEND="test? (
-	dev-python/backports[${PYTHON_USEDEP}]
 	dev-python/backports-tempfile[${PYTHON_USEDEP}]
 	dev-python/entrypoint2[${PYTHON_USEDEP}]
 	dev-python/path-py[${PYTHON_USEDEP}]
diff --git a/dev-python/repoze-lru/repoze-lru-0.7-r1.ebuild b/dev-python/repoze-lru/repoze-lru-0.7-r2.ebuild
index 8427a6dce803..2d3af56e6773 100644
--- a/dev-python/repoze-lru/repoze-lru-0.7-r1.ebuild
+++ b/dev-python/repoze-lru/repoze-lru-0.7-r2.ebuild
@@ -18,8 +18,6 @@ LICENSE="repoze"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 x86"
 
-RDEPEND="dev-python/namespace-repoze[${PYTHON_USEDEP}]"
-
 distutils_enable_tests unittest
 
 python_install_all() {
diff --git a/dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.8.ebuild b/dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.8-r1.ebuild
index 02e4c048c909..3423ea0ea701 100644
--- a/dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.8.ebuild
+++ b/dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.8-r1.ebuild
@@ -12,13 +12,13 @@ MY_P=${MY_PN}-${PV}
 DESCRIPTION="Sphinx extension: auto-generates API docs from Zope interfaces"
 HOMEPAGE="https://pypi.org/project/repoze.sphinx.autointerface/"
 SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="repoze"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
 
 RDEPEND="
-	dev-python/namespace-repoze[${PYTHON_USEDEP}]
 	dev-python/sphinx[${PYTHON_USEDEP}]
 	dev-python/zope-interface[${PYTHON_USEDEP}]
 "
@@ -26,16 +26,6 @@ DEPEND="
 	${RDEPEND}
 "
 
-S=${WORKDIR}/${MY_P}
-
-python_install() {
-	distutils-r1_python_install
-
-	# install the namespace (it's the only subpackage)
-	python_moduleinto repoze.sphinx
-	python_domodule repoze/sphinx/__init__.py
-}
-
 python_install_all() {
 	distutils-r1_python_install_all
 
diff --git a/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2.ebuild b/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2-r1.ebuild
index 0859b6da9b4b..d3bc11934e2a 100644
--- a/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2.ebuild
+++ b/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2-r1.ebuild
@@ -15,7 +15,6 @@ LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 
-RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
 PDEPEND="
 	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild b/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r3.ebuild
index bedbad8a4532..a456720dd8f0 100644
--- a/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild
+++ b/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r3.ebuild
@@ -19,8 +19,7 @@ DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 "
-RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]
-	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
 
 python_compile_all() {
 	use doc && emake -C docs html
diff --git a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0-r1.ebuild
index f8344500c4fd..b6ab2b90ce59 100644
--- a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild
+++ b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0-r1.ebuild
@@ -28,9 +28,6 @@ BDEPEND="
 
 distutils_enable_tests nose
 
-RDEPEND+="
-	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
-
 python_prepare_all() {
 	sed -i -e /build-base/d setup.cfg || die
 	# Those tests are known-broken upstream
diff --git a/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2.ebuild b/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2-r1.ebuild
index c4b852f22d8f..24a5248dfdff 100644
--- a/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2.ebuild
+++ b/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2-r1.ebuild
@@ -15,7 +15,6 @@ LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 
-RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
 PDEPEND="
 	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.6.1.ebuild b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.6.1-r1.ebuild
index 83c37cd9d47f..1428cbaada1b 100644
--- a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.6.1.ebuild
+++ b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.6.1-r1.ebuild
@@ -16,11 +16,9 @@ KEYWORDS="amd64 ~arm arm64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/sphinx-1.0[${PYTHON_USEDEP}]
-	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
 	dev-python/pyparsing[${PYTHON_USEDEP}]
 "
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
 
 python_install_all() {
 	distutils-r1_python_install_all
diff --git a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.3.ebuild b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.3-r1.ebuild
index 279be33ea211..0ed21f8f1b89 100644
--- a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.3.ebuild
+++ b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.3-r1.ebuild
@@ -15,7 +15,6 @@ LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 
-RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
 PDEPEND="
 	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.7.0.ebuild b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.7.0-r1.ebuild
index 7db673b1b09d..214ff81d3be1 100644
--- a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.7.0.ebuild
+++ b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.7.0-r1.ebuild
@@ -18,7 +18,6 @@ KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/sphinx[${PYTHON_USEDEP}]
-	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 "
 BDEPEND="
diff --git a/dev-python/sphinxcontrib-httpexample/sphinxcontrib-httpexample-0.10.3.ebuild b/dev-python/sphinxcontrib-httpexample/sphinxcontrib-httpexample-0.10.3-r1.ebuild
index 62cfbf4fe443..d302b27f20c9 100644
--- a/dev-python/sphinxcontrib-httpexample/sphinxcontrib-httpexample-0.10.3.ebuild
+++ b/dev-python/sphinxcontrib-httpexample/sphinxcontrib-httpexample-0.10.3-r1.ebuild
@@ -19,7 +19,6 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	dev-python/astunparse[${PYTHON_USEDEP}]
 	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
 	dev-python/sphinx[${PYTHON_USEDEP}]
 	dev-python/sphinxcontrib-httpdomain[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r2.ebuild b/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r3.ebuild
index a9f2c5d53aec..eb21e91eac5f 100644
--- a/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r2.ebuild
+++ b/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r3.ebuild
@@ -19,7 +19,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc ~x86 ~amd64
 RESTRICT="test"
 
 RDEPEND="
-	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/sphinx[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r1.ebuild b/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r2.ebuild
index 277beabc2e4a..fa7fd701b6a2 100644
--- a/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r1.ebuild
+++ b/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r2.ebuild
@@ -15,7 +15,6 @@ LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 
-RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
 PDEPEND="
 	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild b/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4-r1.ebuild
index f590afa8dbf8..e4299247b654 100644
--- a/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
+++ b/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4-r1.ebuild
@@ -16,8 +16,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-li
 IUSE="examples"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]
-	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
 
 python_install_all() {
 	distutils-r1_python_install_all
diff --git a/dev-python/sphinxcontrib-pretty-searchresults/sphinxcontrib-pretty-searchresults-0.3.5.ebuild b/dev-python/sphinxcontrib-pretty-searchresults/sphinxcontrib-pretty-searchresults-0.3.5-r1.ebuild
index 394b9756c615..1386ce1d01b5 100644
--- a/dev-python/sphinxcontrib-pretty-searchresults/sphinxcontrib-pretty-searchresults-0.3.5.ebuild
+++ b/dev-python/sphinxcontrib-pretty-searchresults/sphinxcontrib-pretty-searchresults-0.3.5-r1.ebuild
@@ -29,7 +29,6 @@ BDEPEND="
 "
 DEPEND="
 	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
 	dev-python/sphinx[${PYTHON_USEDEP}]
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.16.ebuild b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.16-r1.ebuild
index e2f5a3d4e624..13af30b5feb4 100644
--- a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.16.ebuild
+++ b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.16-r1.ebuild
@@ -19,7 +19,6 @@ SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
-	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
 	dev-python/sphinx[${PYTHON_USEDEP}]
 "
 DEPEND="
diff --git a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3.ebuild b/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3-r1.ebuild
index 0d952312a5e3..bdfe9bda059b 100644
--- a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3.ebuild
+++ b/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3-r1.ebuild
@@ -15,7 +15,6 @@ LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 
-RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
 PDEPEND="
 	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.4.ebuild b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.4-r1.ebuild
index 26f8ad75b6af..71cf3c2f5b77 100644
--- a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.4.ebuild
+++ b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.4-r1.ebuild
@@ -15,7 +15,6 @@ LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 
-RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
 PDEPEND="
 	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.3.0.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.3.0-r1.ebuild
index f253d611a1a7..e3d8971839e9 100644
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.3.0.ebuild
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.3.0-r1.ebuild
@@ -36,10 +36,6 @@ BDEPEND="
 # The doc can only be built from a git repository
 distutils_enable_tests pytest
 
-RDEPEND+="
-	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
-"
-
 python_install_all() {
 	distutils-r1_python_install_all
 	find "${ED}" -name '*.pth' -delete || die
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.4.0.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.4.0-r1.ebuild
index 83138a10134a..a46e8b513101 100644
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.4.0.ebuild
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.4.0-r1.ebuild
@@ -32,13 +32,6 @@ BDEPEND="
 # The doc can only be built from a git repository
 distutils_enable_tests pytest
 
-# We don't want distutils_enable_tests to add the namespace
-# package to BDEPEND under "test?". Therefore we add it to RDEPEND
-# after running distutils_enable_tests.
-RDEPEND+="
-	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
-"
-
 python_prepare_all() {
 	# Needs to be run from a git repository
 	sed -i 's/test_contributors/_&/' \
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.0.0.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.0.0-r1.ebuild
index 4422a57b4a11..d2ce9b4ddc17 100644
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.0.0.ebuild
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.0.0-r1.ebuild
@@ -32,13 +32,6 @@ BDEPEND="
 # The doc can only be built from a git repository
 distutils_enable_tests pytest
 
-# We don't want distutils_enable_tests to add the namespace
-# package to BDEPEND under "test?". Therefore we add it to RDEPEND
-# after running distutils_enable_tests.
-RDEPEND+="
-	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
-"
-
 python_prepare_all() {
 	# Needs to be run from a git repository
 	sed -i 's/test_contributors/_&/' \
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.0.1.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.0.1-r1.ebuild
index 6819f5557b23..e2795baa8cd3 100644
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.0.1.ebuild
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.0.1-r1.ebuild
@@ -32,13 +32,6 @@ BDEPEND="
 # The doc can only be built from a git repository
 distutils_enable_tests pytest
 
-# We don't want distutils_enable_tests to add the namespace
-# package to BDEPEND under "test?". Therefore we add it to RDEPEND
-# after running distutils_enable_tests.
-RDEPEND+="
-	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
-"
-
 python_prepare_all() {
 	# Needs to be run from a git repository
 	sed -i 's/test_contributors/_&/' \
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.1.0.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.1.0-r1.ebuild
index 6819f5557b23..e2795baa8cd3 100644
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.1.0.ebuild
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.1.0-r1.ebuild
@@ -32,13 +32,6 @@ BDEPEND="
 # The doc can only be built from a git repository
 distutils_enable_tests pytest
 
-# We don't want distutils_enable_tests to add the namespace
-# package to BDEPEND under "test?". Therefore we add it to RDEPEND
-# after running distutils_enable_tests.
-RDEPEND+="
-	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
-"
-
 python_prepare_all() {
 	# Needs to be run from a git repository
 	sed -i 's/test_contributors/_&/' \
diff --git a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4.ebuild b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4-r1.ebuild
index 2e1f735ee425..1e35920dee44 100644
--- a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4.ebuild
+++ b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4-r1.ebuild
@@ -20,7 +20,6 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd6
 
 RDEPEND="
 	>=dev-python/six-1.5[${PYTHON_USEDEP}]
-	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
 	dev-python/sphinxcontrib-serializinghtml[${PYTHON_USEDEP}]"
 # avoid circular dependency with sphinx
 PDEPEND="
diff --git a/dev-python/zope-component/zope-component-4.4.1.ebuild b/dev-python/zope-component/zope-component-4.4.1-r1.ebuild
index 9b491905618b..21a896311c12 100644
--- a/dev-python/zope-component/zope-component-4.4.1.ebuild
+++ b/dev-python/zope-component/zope-component-4.4.1-r1.ebuild
@@ -20,7 +20,7 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="test"
 
-RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]
+RDEPEND="
 	dev-python/zope-event[${PYTHON_USEDEP}]
 	>=dev-python/zope-interface-4.1.0[${PYTHON_USEDEP}]"
 DEPEND="test? ( ${RDEPEND}
diff --git a/dev-python/zope-deprecation/zope-deprecation-4.4.0.ebuild b/dev-python/zope-deprecation/zope-deprecation-4.4.0-r1.ebuild
index e0d43587ae93..269ec08ac9e3 100644
--- a/dev-python/zope-deprecation/zope-deprecation-4.4.0.ebuild
+++ b/dev-python/zope-deprecation/zope-deprecation-4.4.0-r1.ebuild
@@ -19,8 +19,6 @@ LICENSE="ZPL"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
-
 S="${WORKDIR}/${MY_P}"
 
 distutils_enable_tests setup.py
diff --git a/dev-python/zope-event/zope-event-4.5.0-r1.ebuild b/dev-python/zope-event/zope-event-4.5.0-r2.ebuild
index 2ad5ae9beeb5..7bdfefccf3a5 100644
--- a/dev-python/zope-event/zope-event-4.5.0-r1.ebuild
+++ b/dev-python/zope-event/zope-event-4.5.0-r2.ebuild
@@ -20,8 +20,6 @@ LICENSE="ZPL"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
-RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
-
 distutils_enable_tests nose
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/zope-exceptions/zope-exceptions-4.4.ebuild b/dev-python/zope-exceptions/zope-exceptions-4.4-r1.ebuild
index a8f296dc7410..e56663440075 100644
--- a/dev-python/zope-exceptions/zope-exceptions-4.4.ebuild
+++ b/dev-python/zope-exceptions/zope-exceptions-4.4-r1.ebuild
@@ -19,7 +19,7 @@ LICENSE="ZPL"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
-RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]
+RDEPEND="
 	dev-python/zope-interface[${PYTHON_USEDEP}]"
 BDEPEND="test? ( dev-python/zope-testrunner[${PYTHON_USEDEP}] )"
 
diff --git a/dev-python/zope-interface/zope-interface-5.1.2.ebuild b/dev-python/zope-interface/zope-interface-5.1.2-r1.ebuild
index 421644d854c4..adb8a0095716 100644
--- a/dev-python/zope-interface/zope-interface-5.1.2.ebuild
+++ b/dev-python/zope-interface/zope-interface-5.1.2-r1.ebuild
@@ -20,7 +20,6 @@ LICENSE="ZPL"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
-RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
 BDEPEND="
 	test? (
 		dev-python/zope-event[${PYTHON_USEDEP}]
diff --git a/dev-python/zope-interface/zope-interface-5.2.0.ebuild b/dev-python/zope-interface/zope-interface-5.2.0-r1.ebuild
index 5de915fb7e90..a80ee94db6dd 100644
--- a/dev-python/zope-interface/zope-interface-5.2.0.ebuild
+++ b/dev-python/zope-interface/zope-interface-5.2.0-r1.ebuild
@@ -20,7 +20,6 @@ LICENSE="ZPL"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
-RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
 BDEPEND="
 	test? (
 		dev-python/zope-event[${PYTHON_USEDEP}]
diff --git a/dev-python/zope-testing/zope-testing-4.7-r2.ebuild b/dev-python/zope-testing/zope-testing-4.7-r3.ebuild
index b9e49909f326..ded12a5e5a0a 100644
--- a/dev-python/zope-testing/zope-testing-4.7-r2.ebuild
+++ b/dev-python/zope-testing/zope-testing-4.7-r3.ebuild
@@ -13,16 +13,12 @@ MY_P=${MY_PN}-${PV}
 DESCRIPTION="Zope testing helpers"
 HOMEPAGE="https://pypi.org/project/zope.testing/ https://github.com/zopefoundation/zope.testing"
 SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="ZPL"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
-DEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
 distutils_enable_tests setup.py
 
 python_install_all() {
diff --git a/dev-python/zope-testrunner/zope-testrunner-5.2.ebuild b/dev-python/zope-testrunner/zope-testrunner-5.2-r1.ebuild
index 04312331c57f..18a82e6a49bd 100644
--- a/dev-python/zope-testrunner/zope-testrunner-5.2.ebuild
+++ b/dev-python/zope-testrunner/zope-testrunner-5.2-r1.ebuild
@@ -21,7 +21,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 BDEPEND="test? ( dev-python/zope-testing[${PYTHON_USEDEP}] )"
-RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]
+RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/zope-exceptions[${PYTHON_USEDEP}]
 	dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/dev-util/howdoi/howdoi-2.0.7.ebuild b/dev-util/howdoi/howdoi-2.0.7.ebuild
index a9a2eb1a0456..ef6d331c9143 100644
--- a/dev-util/howdoi/howdoi-2.0.7.ebuild
+++ b/dev-util/howdoi/howdoi-2.0.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/mate-extra/caja-dropbox/caja-dropbox-1.24.0-r1.ebuild b/mate-extra/caja-dropbox/caja-dropbox-1.24.0-r1.ebuild
index d923e7532a7b..f679068055dc 100644
--- a/mate-extra/caja-dropbox/caja-dropbox-1.24.0-r1.ebuild
+++ b/mate-extra/caja-dropbox/caja-dropbox-1.24.0-r1.ebuild
@@ -9,7 +9,7 @@ MATE_LA_PUNT="yes"
 inherit eapi7-ver mate python-single-r1 linux-info
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Store, Sync and Share Files Online"
diff --git a/media-libs/speex/speex-1.2.0-r2.ebuild b/media-libs/speex/speex-1.2.0-r2.ebuild
index a1aeaecbc054..d789bf893b68 100644
--- a/media-libs/speex/speex-1.2.0-r2.ebuild
+++ b/media-libs/speex/speex-1.2.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_arm_v4 cpu_flags_arm_v5 cpu_flags_arm_v6 cpu_flags_x86_sse utils +vbr"
 
 RDEPEND="
diff --git a/media-libs/speexdsp/speexdsp-1.2_rc3-r3.ebuild b/media-libs/speexdsp/speexdsp-1.2_rc3-r3.ebuild
index 4e88346d0619..41b8a417e1b9 100644
--- a/media-libs/speexdsp/speexdsp-1.2_rc3-r3.ebuild
+++ b/media-libs/speexdsp/speexdsp-1.2_rc3-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_arm_neon"
 
 RDEPEND="!<media-libs/speex-1.2.0"
diff --git a/net-analyzer/driftnet/driftnet-1.3.0.ebuild b/net-analyzer/driftnet/driftnet-1.3.0.ebuild
index b20c9b846b70..dd093b2fb892 100644
--- a/net-analyzer/driftnet/driftnet-1.3.0.ebuild
+++ b/net-analyzer/driftnet/driftnet-1.3.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.ex-parrot.com/~chris/driftnet/"
 SRC_URI="https://github.com/deiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc -sparc ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc -sparc x86"
 SLOT="0"
 IUSE="debug gtk suid test"
 
diff --git a/net-firewall/nfacct/nfacct-1.0.2.ebuild b/net-firewall/nfacct/nfacct-1.0.2.ebuild
index 2cbf8860d4ea..7d2cc356313d 100644
--- a/net-firewall/nfacct/nfacct-1.0.2.ebuild
+++ b/net-firewall/nfacct/nfacct-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm x86"
 
 RDEPEND="
 	net-libs/libmnl
diff --git a/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.3.ebuild b/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.3.ebuild
index 1d5ac92d8978..846b7d7c3a65 100644
--- a/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.3.ebuild
+++ b/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 x86 ~amd64-linux"
 IUSE="examples"
 
 RDEPEND="
diff --git a/net-mail/imapsync/imapsync-1.882.ebuild b/net-mail/imapsync/imapsync-1.882.ebuild
index fd46531dcda1..62e411916915 100644
--- a/net-mail/imapsync/imapsync-1.882.ebuild
+++ b/net-mail/imapsync/imapsync-1.882.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
 
 LICENSE="WTFPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 # ppc dropped pending keywording of:
 # dev-perl/App-cpanminus
 # dev-perl/Data-Uniqid
diff --git a/net-print/gutenprint/gutenprint-5.3.3-r2.ebuild b/net-print/gutenprint/gutenprint-5.3.3-r2.ebuild
index 2c2cceda92e9..6f6000cfbcfd 100644
--- a/net-print/gutenprint/gutenprint-5.3.3-r2.ebuild
+++ b/net-print/gutenprint/gutenprint-5.3.3-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/gimp-print/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 IUSE="cups gimp gtk nls readline ppds static-libs"
 REQUIRED_USE="gimp? ( gtk )"
diff --git a/profiles/package.mask b/profiles/package.mask
index d345d74c985c..5edd318c2ef7 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,18 @@
 
 #--- END OF EXAMPLES ---
 
+# Michał Górny <mgorny@gentoo.org> (2020-12-03)
+# Explicit namespace support was necessary for Python 2 only.  Empty
+# directories work best for Python 3.
+# Removal in 14 days.
+dev-python/backports
+dev-python/namespace-google
+dev-python/namespace-jaraco
+dev-python/namespace-paste
+dev-python/namespace-repoze
+dev-python/namespace-sphinxcontrib
+dev-python/namespace-zope
+
 # Aaron Bauman <bman@gentoo.org> (2020-12-02)
 # Deprecated. Functionality is native to dev-python/pytest now
 # Removal in 14 days
diff --git a/sys-cluster/keepalived/keepalived-2.1.5.ebuild b/sys-cluster/keepalived/keepalived-2.1.5.ebuild
index 12763f521185..d408e92b16a4 100644
--- a/sys-cluster/keepalived/keepalived-2.1.5.ebuild
+++ b/sys-cluster/keepalived/keepalived-2.1.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.keepalived.org/software/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
 IUSE="+bfd dbus -json regex snmp"
 
 RDEPEND="dev-libs/libnl:=
diff --git a/sys-cluster/nova/nova-22.0.1.ebuild b/sys-cluster/nova/nova-22.0.1.ebuild
index 477beb8d3b0d..ba69c65d6da4 100644
--- a/sys-cluster/nova/nova-22.0.1.ebuild
+++ b/sys-cluster/nova/nova-22.0.1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == *9999 ]];then
 else
 	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/victoria/nova.conf.sample -> nova.conf.sample-${PV}
 	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.4.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.4.1.ebuild
index f20f3fcae63f..9b2a580e3367 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.4.1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.4.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit bash-completion-r1 python-single-r1