gentoo resync : 16.04.2022

4 files changed, 20 insertions, 75 deletions

diff --git a/dev-python/zope-exceptions/Manifest b/dev-python/zope-exceptions/Manifest
index 5baab066a80d..88ddcb12555a 100644
--- a/dev-python/zope-exceptions/Manifest
+++ b/dev-python/zope-exceptions/Manifest
@@ -1,6 +1,3 @@
-AUX zope-exceptions-4.4-fix-test-py3.10.patch 1087 BLAKE2B f5cadad133bde4818e03ac3bf971c093813b3ff48bcde18ad1431038fa8bb1b9b978ffae710d5812c963f0ad6d09f3396b86257e4debd23f3ea293b1eb80ac74 SHA512 681b4aa0d9ae0848ba4101db11942fe8b305aee1941e3c6bbf9c7a4bffe92783eaa1393e9131a25ab1ce7b1f91ca8e0907cbec85e6598907059650314208ca7b
-DIST zope.exceptions-4.4.tar.gz 28243 BLAKE2B 9af0b99826d574218c149c5a378886d3b3ec16935c0b6b883c0e048b22ba5ffee8408597f612a668eb18fc855a236e3810d6320c984faca4b7c5dfb4c76b303b SHA512 6ef175271ad1d62b450533e4c7d8f7380ffac519be5c48be084be297ad21d21fd8be380d9b5e221a8dac6a4c792bab14abc707331415c2df88208cac9c34013e
 DIST zope.exceptions-4.5.tar.gz 29609 BLAKE2B 63c853105d3a588418f79e877aeedf0b001bbe52eb3e6c82687127a8cc0b8e424143e75c7a77b224ede31c5db0efb1bbc126e851dbc8bef5b856615b0717f6ea SHA512 f3f75b2f9ecfe74d3bb081904750769bf331fb594d266907782b7ce7f9d062c261b2f95a50ce21cf8917c56a25899274dae466a5b59afa5ec66480182df55bd2
-EBUILD zope-exceptions-4.4.ebuild 980 BLAKE2B 9182f4b231f3434b4a0ad1c3692cf9eed4d8a3eda7d48ae5ee9e0f9f10b7fa7e29b1881232a7fd73f28dade999b69cfacaf62e7ef834fb32a9b4f5d79cf5f3c1 SHA512 09d62bca36e2db56346327fedbc1b98d50b2eb696dfa89bbec34cfb51183d9dc9288e782038d21aa22cfdbc16898b6458af8fd3c0d4fd061cfea1caa0cb3ffa8
-EBUILD zope-exceptions-4.5.ebuild 907 BLAKE2B a7fc71a982af132b4813954d1f5c77dcb0c6c75cf08ac137d9e8647191daca8fbf40a2099fbc426cb7279529f21a313e6536b5cb5509a6adb5809d16120bdb5d SHA512 3ec3c4fcfbaa3178581b29a73be42b79b9b14d087aaeb651de971abc83bf16509fccea609f1988f7315edff5b593dafac034ae5633cf9bed6ca7caa60d67280d
+EBUILD zope-exceptions-4.5.ebuild 972 BLAKE2B 7a70f6eaee65a7a196ff4b3b105042a4d32df58ec0dc7d6000fac64c39e85ee5e4c93569b6432462ace10492fcf52081a796c85b431fe193d5f51f8f668acd35 SHA512 e8e26673dcb6ea6de4e86bdf7af7adab49896e86f72b84efda131436a11a474e64b70bdf1af28854db5d0f28b3892b7445e010f36ff6df3533cf5633dc02b585
 MISC metadata.xml 413 BLAKE2B 3bed6e3e8732f8e04efffe7ea279eaedbfef2fa2d011f1881fdfa814406b0ed5e5a926eeb1a0e66858c1f0524d5c1d1948313c50c53d9fce6cc4596ddea9f87f SHA512 ec4b63a6791605b6c66649026a10d0bc445849b801e9e6350c1bb06b7a244c86aa558830ba39dc1a3d35b3dc2d650d1a52cbe7f84c912f5f7711fe6ec6bf55c4
diff --git a/dev-python/zope-exceptions/files/zope-exceptions-4.4-fix-test-py3.10.patch b/dev-python/zope-exceptions/files/zope-exceptions-4.4-fix-test-py3.10.patch
deleted file mode 100644
index a218797b25a2..000000000000
--- a/dev-python/zope-exceptions/files/zope-exceptions-4.4-fix-test-py3.10.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 71be9d0724f087c99857edeef514d0b99e429cc9 Mon Sep 17 00:00:00 2001
-From: Zamarin Arthur <arthurzam@gmail.com>
-Date: Mon, 31 May 2021 12:14:30 +0300
-Subject: [PATCH] Adapt to python 3.10 SyntaxError messages
-
-Signed-off-by: Zamarin Arthur <arthurzam@gmail.com>
----
- src/zope/exceptions/tests/test_exceptionformatter.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/zope/exceptions/tests/test_exceptionformatter.py b/src/zope/exceptions/tests/test_exceptionformatter.py
-index 64729b1..0f5ee8c 100644
---- a/src/zope/exceptions/tests/test_exceptionformatter.py
-+++ b/src/zope/exceptions/tests/test_exceptionformatter.py
-@@ -668,7 +668,7 @@ def test_multiline_exception(self):
-         self.assertEqual(lines[0], '    syntax error')
-         # PyPy has a shorter prefix
-         self.assertTrue(lines[1].endswith('    ^'))
--        self.assertEqual(lines[2], 'SyntaxError: invalid syntax')
-+        self.assertRegex(lines[2], '^SyntaxError: invalid syntax')
- 
-     def test_traceback_info_non_ascii(self):
-         __traceback_info__ = u"Have a Snowman: \u2603"
diff --git a/dev-python/zope-exceptions/zope-exceptions-4.4.ebuild b/dev-python/zope-exceptions/zope-exceptions-4.4.ebuild
deleted file mode 100644
index e3e9b985874f..000000000000
--- a/dev-python/zope-exceptions/zope-exceptions-4.4.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=rdepend
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="General purpose exceptions for Zope packages"
-HOMEPAGE="https://pypi.org/project/zope.exceptions/ https://github.com/zopefoundation/zope.exceptions"
-SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-BDEPEND="test? ( dev-python/zope-testrunner[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-test-py3.10.patch"
-)
-
-distutils_enable_tests setup.py
-
-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-exceptions/zope-exceptions-4.5.ebuild b/dev-python/zope-exceptions/zope-exceptions-4.5.ebuild
index 8d9aedf70fd5..912c26d00ee7 100644
--- a/dev-python/zope-exceptions/zope-exceptions-4.5.ebuild
+++ b/dev-python/zope-exceptions/zope-exceptions-4.5.ebuild
@@ -12,7 +12,8 @@ MY_P=${P/-/.}
 DESCRIPTION="General purpose exceptions for Zope packages"
 HOMEPAGE="
 	https://pypi.org/project/zope.exceptions/
-	https://github.com/zopefoundation/zope.exceptions/"
+	https://github.com/zopefoundation/zope.exceptions/
+"
 SRC_URI="mirror://pypi/${PN::1}/${PN/-/.}/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
@@ -21,16 +22,24 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 RDEPEND="
-	dev-python/namespace-zope[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? ( dev-python/zope-testrunner[${PYTHON_USEDEP}] )"
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+"
 
-distutils_enable_tests setup.py
+distutils_enable_tests unittest
 
-python_install_all() {
-	distutils-r1_python_install_all
+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
+}
 
-	# remove .pth files since dev-python/namespace-zope handles the ns
-	find "${D}" -name '*.pth' -delete || die
+python_test() {
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	distutils_write_namespace zope
+	eunittest
 }