Updating liguros repo

48 files changed, 115 insertions, 20 deletions

diff --git a/dev-python/brotlicffi/brotlicffi-0.8.0.ebuild b/dev-python/brotlicffi/brotlicffi-0.8.0.ebuild
index b61e30459ddf..963f9abcde76 100644
--- a/dev-python/brotlicffi/brotlicffi-0.8.0.ebuild
+++ b/dev-python/brotlicffi/brotlicffi-0.8.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 
 RDEPEND="
 	app-arch/brotli:=
diff --git a/dev-python/fonttools/fonttools-4.1.0.ebuild b/dev-python/fonttools/fonttools-4.1.0.ebuild
index 0f28ffc369cc..c6fe1c9ac706 100644
--- a/dev-python/fonttools/fonttools-4.1.0.ebuild
+++ b/dev-python/fonttools/fonttools-4.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 RESTRICT="!test? ( test )"
 IUSE="test"
 
diff --git a/dev-python/fs/fs-2.4.11.ebuild b/dev-python/fs/fs-2.4.11.ebuild
index 5b8862193b9f..24727000b446 100644
--- a/dev-python/fs/fs-2.4.11.ebuild
+++ b/dev-python/fs/fs-2.4.11.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
diff --git a/dev-python/google-api-core/google-api-core-1.17.0-r1.ebuild b/dev-python/google-api-core/google-api-core-1.17.0.ebuild
index 9493353c96aa..8afc77715823 100644
--- a/dev-python/google-api-core/google-api-core-1.17.0-r1.ebuild
+++ b/dev-python/google-api-core/google-api-core-1.17.0.ebuild
@@ -17,6 +17,7 @@ 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-r1.ebuild b/dev-python/google-auth/google-auth-1.20.1.ebuild
index 89661feedb19..2065b5086983 100644
--- a/dev-python/google-auth/google-auth-1.20.1-r1.ebuild
+++ b/dev-python/google-auth/google-auth-1.20.1.ebuild
@@ -19,6 +19,7 @@ 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-r1.ebuild b/dev-python/googleapis-common-protos/googleapis-common-protos-1.51.0.ebuild
index 15b5431bf2e4..dc44072a5680 100644
--- a/dev-python/googleapis-common-protos/googleapis-common-protos-1.51.0-r1.ebuild
+++ b/dev-python/googleapis-common-protos/googleapis-common-protos-1.51.0.ebuild
@@ -15,6 +15,7 @@ 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/httpbin/httpbin-0.7.0-r2.ebuild b/dev-python/httpbin/httpbin-0.7.0-r2.ebuild
index 81cfaa993a7a..80179f61bd97 100644
--- a/dev-python/httpbin/httpbin-0.7.0-r2.ebuild
+++ b/dev-python/httpbin/httpbin-0.7.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	dev-python/brotlicffi[${PYTHON_USEDEP}]
diff --git a/dev-python/lit/lit-11.0.0.ebuild b/dev-python/lit/lit-11.0.0.ebuild
index 14fff54955a0..809d9c16210c 100644
--- a/dev-python/lit/lit-11.0.0.ebuild
+++ b/dev-python/lit/lit-11.0.0.ebuild
@@ -15,7 +15,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/mako/mako-1.1.3-r1.ebuild b/dev-python/mako/mako-1.1.3-r1.ebuild
index 69dccce3d684..9b9d88ec67a6 100644
--- a/dev-python/mako/mako-1.1.3-r1.ebuild
+++ b/dev-python/mako/mako-1.1.3-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 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="doc"
 
 RDEPEND=">=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]"
diff --git a/dev-python/paste/paste-3.5.0-r1.ebuild b/dev-python/paste/paste-3.5.0.ebuild
index c655a95420e8..44687dd38848 100644
--- a/dev-python/paste/paste-3.5.0-r1.ebuild
+++ b/dev-python/paste/paste-3.5.0.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="
+RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]"
 
 distutils_enable_tests pytest
diff --git a/dev-python/pastedeploy/pastedeploy-2.1.1-r1.ebuild b/dev-python/pastedeploy/pastedeploy-2.1.1.ebuild
index fcc807fba972..0c52b96cffbe 100644
--- a/dev-python/pastedeploy/pastedeploy-2.1.1-r1.ebuild
+++ b/dev-python/pastedeploy/pastedeploy-2.1.1.ebuild
@@ -21,6 +21,9 @@ 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/pathspec/Manifest b/dev-python/pathspec/Manifest
index e56b973c8b5e..2e6a6ca38c54 100644
--- a/dev-python/pathspec/Manifest
+++ b/dev-python/pathspec/Manifest
@@ -1 +1,2 @@
 DIST pathspec-0.8.0.tar.gz 26256 BLAKE2B 3d4f2238c515253d83bfd17a2f3319e38024d4fbb22fb0f078bbcca73d3aff45f246a35752c4039b0d88f204ae49b4467b2d9e3b9134e14a7a171895dac770be SHA512 e0cb1883d11506b3d11963397db98a0fd3411f56df7c3e2ab3ac44116ab53977112bb51d1918591afc48b9c08f9cf997d34beba373aafbfbca2aa8749ffaf6c8
+DIST pathspec-0.8.1.tar.gz 26644 BLAKE2B 3591aabbd62a0fa1908cef5478d74a6d3ba64333a540c124aa6e7d25fbc45d44faa83e0822fa776ccf787d72ec9c2a977daddefa07d5d6fea2c8c6345836350c SHA512 f793ecf9bfb6511420a37fefa5a9dbd79d8e7329c305d6f1ecb4ea90e322825471983b56722c680e418e0bab41204996075c83cfc8ba7c6a0e5e09b1d8fd1d2e
diff --git a/dev-python/pathspec/pathspec-0.8.1.ebuild b/dev-python/pathspec/pathspec-0.8.1.ebuild
new file mode 100644
index 000000000000..ee9e11813e55
--- /dev/null
+++ b/dev-python/pathspec/pathspec-0.8.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Utility library for gitignore style pattern matching of file paths."
+HOMEPAGE="https://github.com/cpburnz/python-path-specification https://pypi.org/project/pathspec/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+distutils_enable_tests setup.py
diff --git a/dev-python/protobuf-python/protobuf-python-3.12.2-r2.ebuild b/dev-python/protobuf-python/protobuf-python-3.12.2-r1.ebuild
index 1e11ceccf0ed..f5c431dec8cb 100644
--- a/dev-python/protobuf-python/protobuf-python-3.12.2-r2.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.12.2-r1.ebuild
@@ -29,6 +29,7 @@ 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-r2.ebuild b/dev-python/protobuf-python/protobuf-python-3.12.4-r1.ebuild
index 0f01c20ff234..754ffae59d5e 100644
--- a/dev-python/protobuf-python/protobuf-python-3.12.4-r2.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.12.4-r1.ebuild
@@ -29,6 +29,7 @@ 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-r2.ebuild b/dev-python/protobuf-python/protobuf-python-3.13.0-r1.ebuild
index a079a78e44ca..f29d29688f05 100644
--- a/dev-python/protobuf-python/protobuf-python-3.13.0-r2.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.13.0-r1.ebuild
@@ -29,6 +29,7 @@ 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-r1.ebuild b/dev-python/protobuf-python/protobuf-python-3.14.0.ebuild
index fa3039421024..68484e4d06d7 100644
--- a/dev-python/protobuf-python/protobuf-python-3.14.0-r1.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.14.0.ebuild
@@ -29,6 +29,7 @@ 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 453cffab05a6..cf83c9cb0fbd 100644
--- a/dev-python/protobuf-python/protobuf-python-9999.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-9999.ebuild
@@ -29,6 +29,7 @@ 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/pyftpdlib/pyftpdlib-1.5.6-r1.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.6-r1.ebuild
index c98a11ff0494..6b3a26921e63 100644
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.6-r1.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-1.5.6-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+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"
 IUSE="examples ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/repoze-lru/repoze-lru-0.7-r2.ebuild b/dev-python/repoze-lru/repoze-lru-0.7-r1.ebuild
index a74d934a6116..ae091ab6e129 100644
--- a/dev-python/repoze-lru/repoze-lru-0.7-r2.ebuild
+++ b/dev-python/repoze-lru/repoze-lru-0.7-r1.ebuild
@@ -11,13 +11,15 @@ MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="A tiny LRU cache implementation and decorator"
 HOMEPAGE="https://www.repoze.org"
-SRC_URI="https://github.com/repoze/repoze.lru/archive/${PV}.tar.gz -> ${P}-r1.tar.gz"
+SRC_URI="https://github.com/repoze/repoze.lru/archive/${PV}.tar.gz -> ${PN}-${PVR}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
 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-r1.ebuild b/dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.8.ebuild
index b3787c9b9f80..a88d4d2b5162 100644
--- a/dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.8-r1.ebuild
+++ b/dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.8.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,6 +26,16 @@ 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-r1.ebuild b/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2.ebuild
index 2ea1614d5402..50002f1c3585 100644
--- a/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2-r1.ebuild
+++ b/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2.ebuild
@@ -15,6 +15,7 @@ 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-r3.ebuild b/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild
index be30b381158a..8d4f9fe7ae3e 100644
--- a/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r3.ebuild
+++ b/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild
@@ -19,7 +19,8 @@ DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 "
-RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]
+	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
 
 python_compile_all() {
 	use doc && emake -C docs html
diff --git a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0-r1.ebuild b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild
index 690e2c9ec84a..1c1a2255e51f 100644
--- a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0-r1.ebuild
+++ b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild
@@ -28,6 +28,9 @@ 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-r1.ebuild b/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2.ebuild
index 33ad538f07d8..7d37d4ad9b48 100644
--- a/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2-r1.ebuild
+++ b/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2.ebuild
@@ -15,6 +15,7 @@ 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-htmlhelp/sphinxcontrib-htmlhelp-1.0.3-r1.ebuild b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.3.ebuild
index 8f55b7d88b88..5886f3675fb1 100644
--- a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.3-r1.ebuild
+++ b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.3.ebuild
@@ -15,6 +15,7 @@ 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-r1.ebuild b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.7.0.ebuild
index 5caa7b4e080b..212e88f90947 100644
--- a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.7.0-r1.ebuild
+++ b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.7.0.ebuild
@@ -18,6 +18,7 @@ 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-r1.ebuild b/dev-python/sphinxcontrib-httpexample/sphinxcontrib-httpexample-0.10.3.ebuild
index 203a18586e2a..de9c58b0f9af 100644
--- a/dev-python/sphinxcontrib-httpexample/sphinxcontrib-httpexample-0.10.3-r1.ebuild
+++ b/dev-python/sphinxcontrib-httpexample/sphinxcontrib-httpexample-0.10.3.ebuild
@@ -19,6 +19,7 @@ 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-jsmath/sphinxcontrib-jsmath-1.0.1-r2.ebuild b/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r1.ebuild
index 6fe7b1d3a8bf..98bd000e94e7 100644
--- a/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r2.ebuild
+++ b/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r1.ebuild
@@ -15,6 +15,7 @@ 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-r1.ebuild b/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
index ea7d505c4386..47939328fc3f 100644
--- a/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4-r1.ebuild
+++ b/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
@@ -16,7 +16,8 @@ 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}]"
+RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]
+	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
 
 python_install_all() {
 	distutils-r1_python_install_all
diff --git a/dev-python/sphinxcontrib-pretty-searchresults/sphinxcontrib-pretty-searchresults-0.3.5-r1.ebuild b/dev-python/sphinxcontrib-pretty-searchresults/sphinxcontrib-pretty-searchresults-0.3.5.ebuild
index fc41b577bb0f..8eb4bd3da402 100644
--- a/dev-python/sphinxcontrib-pretty-searchresults/sphinxcontrib-pretty-searchresults-0.3.5-r1.ebuild
+++ b/dev-python/sphinxcontrib-pretty-searchresults/sphinxcontrib-pretty-searchresults-0.3.5.ebuild
@@ -29,6 +29,7 @@ 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-r1.ebuild b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.16.ebuild
index 7d660d55a8d2..2fd676d481c1 100644
--- a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.16-r1.ebuild
+++ b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.16.ebuild
@@ -19,6 +19,7 @@ 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-r1.ebuild b/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3.ebuild
index ed3932810111..cd3a1d380adc 100644
--- a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3-r1.ebuild
+++ b/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3.ebuild
@@ -15,6 +15,7 @@ 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-r1.ebuild b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.4.ebuild
index 05b86f0f7848..ae249681edda 100644
--- a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.4-r1.ebuild
+++ b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.4.ebuild
@@ -15,6 +15,7 @@ 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-r1.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.3.0.ebuild
index 5f5eea2f24b0..0b13bdd34961 100644
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.3.0-r1.ebuild
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.3.0.ebuild
@@ -36,6 +36,10 @@ 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-r1.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.4.0.ebuild
index 48dacfb72606..99cb77a8e995 100644
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.4.0-r1.ebuild
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.4.0.ebuild
@@ -32,6 +32,13 @@ 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-r1.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.0.0.ebuild
index 281b4d885ff2..9d1c9f5ee433 100644
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.0.0-r1.ebuild
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.0.0.ebuild
@@ -32,6 +32,13 @@ 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-r1.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.0.1.ebuild
index 278ce9e39339..d977e6f11023 100644
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.1.0-r1.ebuild
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.0.1.ebuild
@@ -32,6 +32,13 @@ 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-r1.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.1.0.ebuild
index 278ce9e39339..d977e6f11023 100644
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.0.1-r1.ebuild
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.1.0.ebuild
@@ -32,6 +32,13 @@ 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-r1.ebuild b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4.ebuild
index 9feca1efbcb3..722a5975a568 100644
--- a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4-r1.ebuild
+++ b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4.ebuild
@@ -20,6 +20,7 @@ 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-r1.ebuild b/dev-python/zope-component/zope-component-4.4.1.ebuild
index e9cdf3166163..0b48e3a54c85 100644
--- a/dev-python/zope-component/zope-component-4.4.1-r1.ebuild
+++ b/dev-python/zope-component/zope-component-4.4.1.ebuild
@@ -20,7 +20,7 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="test"
 
-RDEPEND="
+RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]
 	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-r1.ebuild b/dev-python/zope-deprecation/zope-deprecation-4.4.0.ebuild
index ac7155d8d3bb..391393c530b0 100644
--- a/dev-python/zope-deprecation/zope-deprecation-4.4.0-r1.ebuild
+++ b/dev-python/zope-deprecation/zope-deprecation-4.4.0.ebuild
@@ -19,6 +19,8 @@ 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-r2.ebuild b/dev-python/zope-event/zope-event-4.5.0-r1.ebuild
index a7754cd6f477..9ce0cb9f83b9 100644
--- a/dev-python/zope-event/zope-event-4.5.0-r2.ebuild
+++ b/dev-python/zope-event/zope-event-4.5.0-r1.ebuild
@@ -20,6 +20,8 @@ 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-r1.ebuild b/dev-python/zope-exceptions/zope-exceptions-4.4.ebuild
index 090f4d384b05..15fb629d7735 100644
--- a/dev-python/zope-exceptions/zope-exceptions-4.4-r1.ebuild
+++ b/dev-python/zope-exceptions/zope-exceptions-4.4.ebuild
@@ -19,7 +19,7 @@ LICENSE="ZPL"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
-RDEPEND="
+RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]
 	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-r1.ebuild b/dev-python/zope-interface/zope-interface-5.1.2.ebuild
index 1ce170f944cf..389a06a33cab 100644
--- a/dev-python/zope-interface/zope-interface-5.1.2-r1.ebuild
+++ b/dev-python/zope-interface/zope-interface-5.1.2.ebuild
@@ -19,9 +19,8 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 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"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
+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-r1.ebuild b/dev-python/zope-interface/zope-interface-5.2.0.ebuild
index df41711e0955..7ad2ca50ef30 100644
--- a/dev-python/zope-interface/zope-interface-5.2.0-r1.ebuild
+++ b/dev-python/zope-interface/zope-interface-5.2.0.ebuild
@@ -19,9 +19,8 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 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"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
+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-r3.ebuild b/dev-python/zope-testing/zope-testing-4.7-r2.ebuild
index e78f0d3ca260..f0e55eeeb193 100644
--- a/dev-python/zope-testing/zope-testing-4.7-r3.ebuild
+++ b/dev-python/zope-testing/zope-testing-4.7-r2.ebuild
@@ -13,12 +13,16 @@ 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-r1.ebuild b/dev-python/zope-testrunner/zope-testrunner-5.2.ebuild
index f5c5f28543e6..bc01b0fb54d7 100644
--- a/dev-python/zope-testrunner/zope-testrunner-5.2-r1.ebuild
+++ b/dev-python/zope-testrunner/zope-testrunner-5.2.ebuild
@@ -21,7 +21,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 BDEPEND="test? ( dev-python/zope-testing[${PYTHON_USEDEP}] )"
-RDEPEND="
+RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/zope-exceptions[${PYTHON_USEDEP}]
 	dev-python/zope-interface[${PYTHON_USEDEP}]"