gentoo resync : 12.05.2022

4 files changed, 61 insertions, 40 deletions

diff --git a/dev-python/zope-component/Manifest b/dev-python/zope-component/Manifest
index 0e86d206a033..a1cc605bea7f 100644
--- a/dev-python/zope-component/Manifest
+++ b/dev-python/zope-component/Manifest
@@ -1,4 +1,5 @@
 DIST zope.component-4.4.1.tar.gz 84745 BLAKE2B 3b8a58bdaf1de1bc57e9642bf76100bd8aa0bbccfc8d6682e7f78363f08f13ac98c7ff37d4892c3558e26537294dd184b75810afaf95c6f8d6a529c9938ea8dc SHA512 dc9f6a725cc49ac94a164d11786ef977e94e1c9a7c88de4aaeb0f62621cfe00284007ae44937ec92ae6cffc5b16ab4af1548db2237b0ba4b818e2c8f6355ecbd
-EBUILD zope-component-4.4.1-r1.ebuild 1199 BLAKE2B 4c004b34496ce9576146cdff3f179e66255ffbed1633d789e3808092fba5934deb0878afe287808f1e0345ad70153d00e877146671e7477f22edb1e5d0eb7077 SHA512 5605f5a3da4e0a2e42840e08b0425bd14c6ebdb09453414a7c325c46d550e7d15d20bc7124cacf10c3e73f2ab0776a3814464d826bf47b1bd248cfc1c9ce6886
-EBUILD zope-component-4.4.1.ebuild 957 BLAKE2B 6cb4f035be65f170338d739fd57e283cc803bcc3613011935f15c5ddb8c058e7b23b9a83c5e07a99f2b653700d1d5b94fa584b035fd2b55264d865557f1fc86c SHA512 f67061657b965d6a33d3f4b3286f92c5b6d54c7b256ce23cb957d19192b1833ec1319edbd963b3a9573e15775ba9bf9366a5f8a6edc278eaec89e7a35eeb37b9
+DIST zope.component-5.0.1.tar.gz 91130 BLAKE2B 4dbd78b003ba3688c0468573f4552c87333fd5fb7e0cd89d4844633f28c19443b3ea884438ff7f7ba8b056790f008c246c1e7ad52403d7b72b146d0d53edd8ad SHA512 fad011816fe5bb869bb2e43e11a66841a6be2abf9002e41207ef1dfe69b1afb5ca486d275daeddf71d2a0e79e1a9c839c4735190dddcd118b675a976bde07a64
+EBUILD zope-component-4.4.1-r2.ebuild 1224 BLAKE2B b9e1b8010bcdaf9c0ef54751c812439887fa86649af66065cb6f51f6710f1c9b8c100c55a72318e1a31a3a28621bbfad7454311caafae5a3e19f5a332f7b61b7 SHA512 73a3b1173a18d61ada6dc728ba4f8755c4b4fc0de97f6ad5b5047fcc834ba564041038127e6687a4ca1c437d2ae84d3a4229e81b4d2a9448a0a9beb3f1af415f
+EBUILD zope-component-5.0.1.ebuild 1262 BLAKE2B 7e475e088c1955e597317b7d1dce3d3b49b64327b8bc4f0228b75f4ce7569d56ad10b2b359f1483e523cbd2903f72c15e4745b42fb1de5d35e2b7f48d4da54b3 SHA512 9e6c208c59ed7ef6cbcf467e55d09390aef9424575e133795c9644aa7bb98b6db8bf61bab6293fc87a3da4ef952d24ee1232647c45999f61f69720a2d88aaa6f
 MISC metadata.xml 411 BLAKE2B a02a8232c9878cc8c569bf818b81e1b0c2d3cd5e18386f14d8fa228a12c9745a68644e362189ccca52673ca6071f196ebd4603d6f12d6de7839e732f63e4d2ef SHA512 ce4f88684c8c16affe79487c03e5ff4d06fa26c27dc6dc4ffebae514bf498b1f794fbe86f038ea342f08e6ec62eb3722ed118134bca27b0110ef43b155c4cadf
diff --git a/dev-python/zope-component/zope-component-4.4.1-r1.ebuild b/dev-python/zope-component/zope-component-4.4.1-r2.ebuild
index acb95d8facf8..2edeb4128626 100644
--- a/dev-python/zope-component/zope-component-4.4.1-r1.ebuild
+++ b/dev-python/zope-component/zope-component-4.4.1-r2.ebuild
@@ -20,11 +20,12 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/zope-event[${PYTHON_USEDEP}]
 	>=dev-python/zope-interface-4.1.0[${PYTHON_USEDEP}]
+	!dev-python/namespace-zope
 "
 BDEPEND="
 	test? (
diff --git a/dev-python/zope-component/zope-component-4.4.1.ebuild b/dev-python/zope-component/zope-component-4.4.1.ebuild
deleted file mode 100644
index 022b12cfdefc..000000000000
--- a/dev-python/zope-component/zope-component-4.4.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
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-MY_PN=zope.component
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Zope Component Architecture"
-HOMEPAGE="https://github.com/zopefoundation/zope.component
-	https://docs.zope.org/zope.component/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]
-	dev-python/zope-event[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.1.0[${PYTHON_USEDEP}]"
-
-# Uses multiple new dependencies, which isn't worth it
-RESTRICT="test"
-
-distutils_enable_tests nose
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	# remove .pth files since dev-python/namespace-zope handles the ns
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/zope-component/zope-component-5.0.1.ebuild b/dev-python/zope-component/zope-component-5.0.1.ebuild
new file mode 100644
index 000000000000..aea2e49928de
--- /dev/null
+++ b/dev-python/zope-component/zope-component-5.0.1.ebuild
@@ -0,0 +1,56 @@
+# 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} )
+
+inherit distutils-r1
+
+MY_PN=zope.component
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="Zope Component Architecture"
+HOMEPAGE="
+	https://pypi.org/project/zope.component/
+	https://github.com/zopefoundation/zope.component/
+"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~riscv"
+
+RDEPEND="
+	dev-python/zope-event[${PYTHON_USEDEP}]
+	>=dev-python/zope-hookable-4.2.0[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-5.3.0[${PYTHON_USEDEP}]
+	!dev-python/namespace-zope
+"
+BDEPEND="
+	test? (
+		dev-python/zope-configuration[${PYTHON_USEDEP}]
+		dev-python/zope-i18nmessageid[${PYTHON_USEDEP}]
+		dev-python/zope-testing[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# strip rdep specific to namespaces
+	sed -i -e "/'setuptools'/d" setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+python_test() {
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	distutils_write_namespace zope
+	eunittest
+}