gentoo resync : 16.04.2022

4 files changed, 54 insertions, 89 deletions

diff --git a/dev-python/zope-schema/Manifest b/dev-python/zope-schema/Manifest
index bd861d97bccc..0af2993cde9f 100644
--- a/dev-python/zope-schema/Manifest
+++ b/dev-python/zope-schema/Manifest
@@ -1,5 +1,3 @@
-DIST zope.schema-6.1.1.tar.gz 108603 BLAKE2B 9e2d4c48431408fd66c236fad44627f15443e29ff0c4af0a0734c3a1a9dfaee6c772463a7a121112b151699c184d39e307485a981ddb3e13f2f81c7c71543500 SHA512 af51f02818509eacdd558ee04c15bcf4e80321069b8c4a33636d520a8af7509e8d01b391fc1d327fc980ac27388f4e303a870afc5c4f9b5ff0770311a4f26978
 DIST zope.schema-6.2.0.tar.gz 104068 BLAKE2B 10d300b925f57a028b40bbcdfd7b0eb330815b63c86d6ded60fb594d549b1459cb67a99bd19e6d1782104a8bab204d8033ce422b5f9ebddb00e2fdfc1ab7d529 SHA512 f3083e4fc1dc54160c38cf7033519f9f37fef3e39f2f15b53fc4475d0989932448a018d77f8562870f4df85c5bf35bc756aec97868cd35ca07b733cf5796f00f
-EBUILD zope-schema-6.1.1.ebuild 983 BLAKE2B 4fc9c55a7c6fbf14c6abdf26a5e265be26a4fd4cd9ae3ccab76bf3efc0b18938140051a25ea804fd2b17a737153d78fbd4c1dd13b325389117226ae4f1f8df44 SHA512 d1d85052e09a1b8529175eaaedc3a445f089f494a10cd28de69f2d73fb795de0a2fc46a336ef286c772a03904aa67d38136d5701c762d67b502e784fca270fc0
-EBUILD zope-schema-6.2.0.ebuild 983 BLAKE2B 4fc9c55a7c6fbf14c6abdf26a5e265be26a4fd4cd9ae3ccab76bf3efc0b18938140051a25ea804fd2b17a737153d78fbd4c1dd13b325389117226ae4f1f8df44 SHA512 d1d85052e09a1b8529175eaaedc3a445f089f494a10cd28de69f2d73fb795de0a2fc46a336ef286c772a03904aa67d38136d5701c762d67b502e784fca270fc0
+EBUILD zope-schema-6.2.0-r1.ebuild 1140 BLAKE2B f2c260560d94b720e3049ca55912c4925ac3381f4e329bc3b2a5e9441d182380c180996e57dce83d5509227448aa64ab34cdd14d56c4e73e74f69324ebb5dbb7 SHA512 dc768f2270580127ee14ad48b352d050d7ccb4477bad7519d4bcc37d25e8ae880c4f7758b0567431dd3cbc32ecabe86bd601bb0dc109e9d69f8a8e3b6db7f59f
 MISC metadata.xml 498 BLAKE2B d5386b7a400de71c5c02d2b9788682d35dd34eaa6a132aea45432aa2d53ec47e54fee9f880cf6cc5abd8184e28cef0795fe2f58dfd47f619b4120ce914bd7c45 SHA512 5a8021ec0348af5929d3284f172f5b5fb26007df9064f5571a0cdb07c1259c24b9b352eb048811f5e4f68ab75b9fabeba49c93a0cdd6e8655b509a248447b794
diff --git a/dev-python/zope-schema/zope-schema-6.1.1.ebuild b/dev-python/zope-schema/zope-schema-6.1.1.ebuild
deleted file mode 100644
index 4f5e20c9cfe1..000000000000
--- a/dev-python/zope-schema/zope-schema-6.1.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Zope schema Architecture"
-HOMEPAGE="https://github.com/zopefoundation/zope.schema http://docs.zope.org/zope.schema/"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	dev-python/zope-event[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-5.0.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/zope-i18nmessageid[${PYTHON_USEDEP}]
-		dev-python/zope-testing[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
-
-python_test() {
-	eunittest src
-}
-
-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-schema/zope-schema-6.2.0-r1.ebuild b/dev-python/zope-schema/zope-schema-6.2.0-r1.ebuild
new file mode 100644
index 000000000000..3657288c1276
--- /dev/null
+++ b/dev-python/zope-schema/zope-schema-6.2.0-r1.ebuild
@@ -0,0 +1,53 @@
+# 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
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="Zope schema Architecture"
+HOMEPAGE="
+	https://pypi.org/project/zope.schema/
+	https://github.com/zopefoundation/zope.schema/
+"
+SRC_URI="mirror://pypi/${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/zope-event[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-5.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		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
+}
diff --git a/dev-python/zope-schema/zope-schema-6.2.0.ebuild b/dev-python/zope-schema/zope-schema-6.2.0.ebuild
deleted file mode 100644
index 4f5e20c9cfe1..000000000000
--- a/dev-python/zope-schema/zope-schema-6.2.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Zope schema Architecture"
-HOMEPAGE="https://github.com/zopefoundation/zope.schema http://docs.zope.org/zope.schema/"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	dev-python/zope-event[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-5.0.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/zope-i18nmessageid[${PYTHON_USEDEP}]
-		dev-python/zope-testing[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
-
-python_test() {
-	eunittest src
-}
-
-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
-}