gentoo auto-resync : 19:06:2024 - 00:09:54

4 files changed, 32 insertions, 49 deletions

diff --git a/dev-python/zope-exceptions/Manifest b/dev-python/zope-exceptions/Manifest
index ab50b88800b7..a7ef11bd1f7f 100644
--- a/dev-python/zope-exceptions/Manifest
+++ b/dev-python/zope-exceptions/Manifest
@@ -1,5 +1,4 @@
-DIST zope.exceptions-5.0.1.tar.gz 30435 BLAKE2B 66775ace483da20614aa4db31d106f70af5a118cd7b5f3cc3458515cf443cd6c6e0bda26b0817adf063c52ded25ffcc09b722840e90f4975976e54c48763bbf1 SHA512 46ab45feb81682b62f4ab0df31e39b8b438af593d8880eb095fb2994ce6aced5aceb2cb08973234077d9c3846adc57658e06e04aecf55443bf3af691d728291a
+AUX zope-exceptions-5.1-py313.patch 1063 BLAKE2B 525a71dbe86618a93848c332b90645a6dd7d800a85a7bee7c02a70f97e718232907dbe5e8aeba3fc41fa99df129bc9dcfa447e3ce0fdb41b01249c4dfaa843e4 SHA512 e440a9546990345d9b380958fbe8791fe2985e418cb9179cbc1a2afd3eaf96368418903b0383b34ea1e3d252942d2d2659d679125e750ffa6c6918816955b5a9
 DIST zope.exceptions-5.1.tar.gz 31416 BLAKE2B 62e5ddc72f36349a6e4810ee6932dbe9e80fb3c3ac5171cebcb4433832d593bf01edfbd573a5f2dc7546599d018144d28a2968598c3c43e72e3b7639e96f13bf SHA512 08e0b3b895089b35805519002f11302e6529d12257a5582f682257c4b5313c4e183d2b06241729fe542fcd407b1f29fbd6798605930b759daca335ed3df84652
-EBUILD zope-exceptions-5.0.1.ebuild 949 BLAKE2B 71640d4e0d292d96979af26d4f45797115d8c32810f8ca3161a97673655a0acd9ce4db591483afa5b87cf59b8e0d22143bf36a617bf8c9dc5290329b1e0bb00b SHA512 bd3b648b01e67be3b12a1e6585fa01fd99d1de607e1ac4e921bf8e9e8e9de6fef5217891a032de100c3e5bf9f24b68a911b1c03a7b64072faa2e3b037461d832
-EBUILD zope-exceptions-5.1.ebuild 949 BLAKE2B 7e399f52cddd428d1b73ed57cab90813b36731f23d380780fb9877a80b1827a56b3ae57074a50c15a9e8919c41e0f2dfa8c30ef35c64dff0615b2dc2e485a1b0 SHA512 741fb733dabc8d5f512c1c5541b575dc2fab3973a86db6cda256a496b7f3cfad1575593b74ffcabda73e59a003ff11e48a1318926470b7073ab7e096796fa369
+EBUILD zope-exceptions-5.1.ebuild 1067 BLAKE2B 5976b06992122dbfc2c6ef2d8472aa103855a94362a8f1e27b7af12031460bc879951645338385df6af6b9ccab346e5385c46b92fc5609ec6c3fc39afb3017c4 SHA512 f93e36b1f6a4cc9f0c0d1473e34961a32332312107b5655190c58419cd02147c59ba0a5dd765abf4ee30d08321ee0ff079b2552c39595dbf7aa8d85db98b64a7
 MISC metadata.xml 413 BLAKE2B 3bed6e3e8732f8e04efffe7ea279eaedbfef2fa2d011f1881fdfa814406b0ed5e5a926eeb1a0e66858c1f0524d5c1d1948313c50c53d9fce6cc4596ddea9f87f SHA512 ec4b63a6791605b6c66649026a10d0bc445849b801e9e6350c1bb06b7a244c86aa558830ba39dc1a3d35b3dc2d650d1a52cbe7f84c912f5f7711fe6ec6bf55c4
diff --git a/dev-python/zope-exceptions/files/zope-exceptions-5.1-py313.patch b/dev-python/zope-exceptions/files/zope-exceptions-5.1-py313.patch
new file mode 100644
index 000000000000..623b53b32376
--- /dev/null
+++ b/dev-python/zope-exceptions/files/zope-exceptions-5.1-py313.patch
@@ -0,0 +1,24 @@
+diff --git a/src/zope/exceptions/tests/test_exceptionformatter.py b/src/zope/exceptions/tests/test_exceptionformatter.py
+index 92ea79a..0e18d8d 100644
+--- a/src/zope/exceptions/tests/test_exceptionformatter.py
++++ b/src/zope/exceptions/tests/test_exceptionformatter.py
+@@ -24,6 +24,7 @@ from urllib.error import HTTPError
+ 
+ 
+ IS_PY39_OR_GREATER = sys.version_info >= (3, 9)
++IS_PY313_OR_GREATER = sys.version_info >= (3, 13)
+ 
+ 
+ class TextExceptionFormatterTests(unittest.TestCase):
+@@ -763,8 +764,10 @@ class Test_format_exception(unittest.TestCase):
+             </ul><p>  File "&lt;string&gt;", line 1<br />
+                 import<br />
+                      ^<br />
+-            SyntaxError: invalid syntax<br />
++            SyntaxError: {error}<br />
+             </p>""").format(
++                error="Expected one or more names after 'import'"
++                      if IS_PY313_OR_GREATER else 'invalid syntax',
+                 module='zope.exceptions.tests.test_exceptionformatter',
+                 fn='test_format_exception_as_html',
+         )
diff --git a/dev-python/zope-exceptions/zope-exceptions-5.0.1.ebuild b/dev-python/zope-exceptions/zope-exceptions-5.0.1.ebuild
deleted file mode 100644
index 7ec748a89678..000000000000
--- a/dev-python/zope-exceptions/zope-exceptions-5.0.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="General purpose exceptions for Zope packages"
-HOMEPAGE="
-	https://pypi.org/project/zope.exceptions/
-	https://github.com/zopefoundation/zope.exceptions/
-"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-	!dev-python/namespace-zope
-"
-
-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-exceptions/zope-exceptions-5.1.ebuild b/dev-python/zope-exceptions/zope-exceptions-5.1.ebuild
index 7bf7eb05d7af..956910d21e15 100644
--- a/dev-python/zope-exceptions/zope-exceptions-5.1.ebuild
+++ b/dev-python/zope-exceptions/zope-exceptions-5.1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYPI_NO_NORMALIZE=1
 PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
 
 inherit distutils-r1 pypi
 
@@ -28,6 +28,11 @@ RDEPEND="
 distutils_enable_tests unittest
 
 src_prepare() {
+	local PATCHES=(
+		# https://github.com/zopefoundation/zope.exceptions/issues/34
+		"${FILESDIR}/${P}-py313.patch"
+	)
+
 	# strip rdep specific to namespaces
 	sed -i -e "/'setuptools'/d" setup.py || die
 	distutils-r1_src_prepare