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

4 files changed, 2 insertions, 87 deletions

diff --git a/dev-python/zconfig/Manifest b/dev-python/zconfig/Manifest
index 75679ac009db..1f2f462c5c34 100644
--- a/dev-python/zconfig/Manifest
+++ b/dev-python/zconfig/Manifest
@@ -1,6 +1,3 @@
-AUX zconfig-4.0-py312.patch 1302 BLAKE2B 4489872e08000553dffc603a6f93b7b8abccc6e56f5fb727fbd1c52f71e78c0d93e6d8545acbb86658d2d7781cf677ed25e4e7b541dee46a1571ee20d0003959 SHA512 ea18d730b41765ce0d9585f97923d035bc1f1fe2dd77d4551e33d2923f3c79513b546a6ebc96b944ae1345ff76512d34f089f26bfa353c905bd8d6ce009c39dd
-DIST ZConfig-4.0.tar.gz 126072 BLAKE2B 7057151267f9b481d3cded72a22dc8fe505f1eac78d156595eb6ba5ff6217b57713ae2ef307358d86320986181bbbb3c1862901297e645bf69dc4893a3e60dbc SHA512 03e3c34f8af9de8bedd98bbdf0c968fdd2fb0c1bb8d62a73c286b804a8841e0e7d9b647f5f3bb37a6d52dc2a5cea7cdce21cd204536399d43203c18e0c204ca7
 DIST zconfig-4.1.tar.gz 146996 BLAKE2B fd4299121b418ba7517ef17c2f9be9e0f0a975199a0fb59bd45f54338becb921c2bf0fd87344e08b21734b80dc11abd64d7bef27d7d17313197d9c781b5e5017 SHA512 71dd5a9ce5f72eda76fde19fa2bec4aaf542ebe4b617753b14c07239366d934d9d635aa63407c76bc00edfb305c85c1cecdd187ee7f2b85f25acaa7682839363
-EBUILD zconfig-4.0.ebuild 991 BLAKE2B 837f9863b4eab0f3bd41d889a86f6615ab24680de2fc08936ec23c5f6dc39d9b7ecdfa778785920d7f8ffc9e635c33dc32947eabb845cb1e20636389e5628a19 SHA512 774b6601e202f957dcdab8659cfbf5645aef8785a9e356e1b74d26a18a78aa60105bd18170f2d1c144ebff2636181ff4c84dba1da4983b9c3d5db55fa2acddf8
-EBUILD zconfig-4.1.ebuild 833 BLAKE2B 0ca1d505f93426b0f7e5690de0a4741dacb6fe9ca290e9e9182186a22a8ad45248cbaac54cd9e9190872c154085981aed17fdede9b269500dcff93862e817575 SHA512 0b03a1962eeb8f73d9c25ebc0c796a80a55a4ad0164c9f4b5218dc4ac3887bedd768682e86dd44524d7a35c6713244c64259baad7e5d71f73d87fdc3b5a9b981
+EBUILD zconfig-4.1.ebuild 833 BLAKE2B f2eb0ababe7109da6143acdfb8f9e84781b7b3b93d990b8bf3efeaba5edfcdce1df1c12bf1e40f5135be757d9e2a5526c9ba9073d5d4b3f45a97bb8cf9b8e7d9 SHA512 eab6c7a85e1bc12c7193e51c052ddd00a06ea6ddc4a66c61e10e40d41f7829920b2c5fa22992ef34a30b9b4164c98f09db82d569e0c2734b33042c7d027c8d3f
 MISC metadata.xml 1382 BLAKE2B 217d504c7a0eb0298f70194d81723b0dfef3cfd366da12e715ef625f219dea3b29ee230c476c937318c3030912ee5727ae7945f594d088a2fd71aa9f4ccaba81 SHA512 150596d061f8723bcbff7ee7bb67c485a27baa91cce4b505283d7c0d53a59ac0a034d22333e9a4ab98cb1eae076bafce28dd7d24df1b89c2bbcc5cd844db8518
diff --git a/dev-python/zconfig/files/zconfig-4.0-py312.patch b/dev-python/zconfig/files/zconfig-4.0-py312.patch
deleted file mode 100644
index 6f8c53ed18a0..000000000000
--- a/dev-python/zconfig/files/zconfig-4.0-py312.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 390ce89cfd4bf1a60d8d67ee20106288cbfa0e51 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20Van=C4=9Bk?= <arkamar@atlas.cz>
-Date: Fri, 23 Jun 2023 08:10:09 +0200
-Subject: [PATCH] Fix tests for Python 3.12 (#91)
-
-In the tests, remove the assertRaisesRegexp method, deprecated since
-Python 3.2, to prevent test failures following the method's removal in
-Python 3.12.
----
- src/ZConfig/tests/support.py | 7 -------
- 1 file changed, 7 deletions(-)
-
-diff --git a/src/ZConfig/tests/support.py b/src/ZConfig/tests/support.py
-index 959f2b9..559c015 100644
---- a/src/ZConfig/tests/support.py
-+++ b/src/ZConfig/tests/support.py
-@@ -17,7 +17,6 @@
- import contextlib
- import os
- import sys
--import unittest
- from io import StringIO
- from urllib.request import pathname2url
- 
-@@ -79,12 +78,6 @@ def f2(self):
- class TestHelper:
-     """Utility methods which can be used with the schema support."""
- 
--    # Not derived from unittest.TestCase; some test runners seem to
--    # think that means this class contains tests.
--
--    assertRaisesRegex = getattr(unittest.TestCase, 'assertRaisesRegex',
--                                unittest.TestCase.assertRaisesRegexp)
--
-     def load_both(self, schema_url, conf_url):
-         schema = self.load_schema(schema_url)
-         conf = self.load_config(schema, conf_url)
diff --git a/dev-python/zconfig/zconfig-4.0.ebuild b/dev-python/zconfig/zconfig-4.0.ebuild
deleted file mode 100644
index e33522f6853f..000000000000
--- a/dev-python/zconfig/zconfig-4.0.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="ZConfig"
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Configuration library supporting a hierarchical schema-driven model"
-HOMEPAGE="
-	https://github.com/zopefoundation/ZConfig/
-	https://pypi.org/project/ZConfig/
-"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-BDEPEND="
-	test? (
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/manuel[${PYTHON_USEDEP}]
-		dev-python/zope-exceptions[${PYTHON_USEDEP}]
-		dev-python/zope-interface[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( CHANGES.rst README.rst )
-
-distutils_enable_tests unittest
-distutils_enable_sphinx docs \
-	dev-python/sphinxcontrib-programoutput
-
-PATCHES=(
-	# https://github.com/zopefoundation/ZConfig/commit/390ce89cfd4bf1a60d8d67ee20106288cbfa0e51
-	"${FILESDIR}/${P}-py312.patch"
-)
-
-python_test() {
-	eunittest -s src/ZConfig/tests
-}
diff --git a/dev-python/zconfig/zconfig-4.1.ebuild b/dev-python/zconfig/zconfig-4.1.ebuild
index 6fe23faf0c6a..3b8070cc1689 100644
--- a/dev-python/zconfig/zconfig-4.1.ebuild
+++ b/dev-python/zconfig/zconfig-4.1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYPI_PN="ZConfig"
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit distutils-r1 pypi