gentoo auto-resync : 27:10:2024 - 03:04:35

5 files changed, 2 insertions, 110 deletions

diff --git a/dev-python/distlib/Manifest b/dev-python/distlib/Manifest
index f1950d6fe008..0b3ffb3e2888 100644
--- a/dev-python/distlib/Manifest
+++ b/dev-python/distlib/Manifest
@@ -1,8 +1,4 @@
-AUX distlib-0.3.2-system-pypiserver.py 1294 BLAKE2B 87d419e5d9bd90715e43a125617bf12a2eaf16d114557a56fa0c6afb0fa83468960dcfdba3a3eff2ff136c5ef12ec04e71cea2a77a886854181dcdc64aee954e SHA512 08ee2bdc55b30ba770179c97a8dc7f702d72588b6f8bfd65feb47847ee4b41b97c0f31d37e1c4cfc2cff35ccb189abfc07590a175b7d2fd592beda8eb4a8b040
-AUX distlib-0.3.8-py313.patch 909 BLAKE2B d1d897a8a73a7348b7ed618cdd488d6d6280cb87d3fca8141fd61cb2592807628ca6d7ba8b690ac9b7f228fb0b1278ab426a8b9c9b49158a8ababdc5a1f17aca SHA512 10e1d960b13c45efac3c82541fb0c59ff1267496952a7f45e48f03327b92747f358616180f0da5d3d590cb7baef5306ee699de9a9060c4e5b06add7a87070fb6
 AUX distlib-0.3.9-system-pypiserver.py 1243 BLAKE2B 6d455d22f60010b2f5993b6fb56e7cabc113e2d9043f3029e2e28205a7ec301c3c8a54031afbece9904750a583af423aefe421b30f8088ebedb891e3a7733353 SHA512 38a8503e002ffe07eee486446cc4579ddebf676ebcf04631dbe36c023114123c87ecfaa2a710455446cd195b780eb46649dae4b8023384037c1128e7f918bbe6
-DIST distlib-0.3.8.gh.tar.gz 1240659 BLAKE2B 5d14440bd6886a37e80323ea35370f306135f5b15544180b072ed42c6e7b00799dc4b5fe207adb31eee7234d4f291420bd289b5430bbf38ff0468b29af2ca621 SHA512 98dc6459f54783598aad8ee3b8d80c0092a5d08d4272ad212faeef5e30cf9029b718231681f39d26e48588bb676bae7919f1431ddb51eb3917725f99a5c90457
 DIST distlib-0.3.9.gh.tar.gz 1244538 BLAKE2B 08f5257f5a1125c1c76a23b9a78ded6a08f26d2f1491be9b104ab1e02a9737ae49f3750a607d3c7c744397879aeb3cd1a94a355743c95c702eec8a3cfebd70cb SHA512 d89b3ae450a02f634db10baef8d2ff445afa99cd69377f40ef07d591b4bbb2e24fff43c92eeeb93628eaee292fa1e8324eb1a842cf9401feb1f309dbb6f20a25
-EBUILD distlib-0.3.8.ebuild 1435 BLAKE2B 0fe21d213a3e89f567012aac95444049d0d76c5d7abc4675934bc9265819d27178123b2b5863f5b67c988c550c42301e3db62683ec4d4badd0546f72d4720e8e SHA512 6d2f3e0ecbfab2e7aa83301f7bc63979a356bb8b3f945996992d9d808eeb4ddd8bba49fcd00f8ffc3ede6b672defd2b4b365899cdb4804d0341913efceefb3c4
-EBUILD distlib-0.3.9.ebuild 1326 BLAKE2B 37674f380c4d553e1b07b72d7ddf13b8dec8a3aa2a4edbdd5abfcb9a551546f62bc9262f27e56cf656ab52cf25c7494367308e905c727d7afc8645cc95eee137 SHA512 c279737286e1322732e1dcc7b6eafd804692dfd3faa7111e54e4b2dbc338c270e9dfa6d57e2e8ce9840a520e23a41276183a16c171e076f35db720ce17105e69
+EBUILD distlib-0.3.9.ebuild 1318 BLAKE2B 6200709a308d768b9c69441f96cf6090441e240fad0c037a9251ecbcadfaec3d2c81bd173b827667de55e74aa265a5e370fc22546c71cbbc73e081e3e0974630 SHA512 e3ca8cf8fa6c85f9a8bfa86fab348be3e9287074c34b1ec2e6d727f570c91d26d9f996e2de9edd84f80027fb61a4c6f12815799dad7f0d93d759f13435a31959
 MISC metadata.xml 365 BLAKE2B 74d46041d58af096a40f55e08c48562eb11aa8349f2a5afeffad67182c65561b71e2723254df6176b77852f74fd569bb329e21bc8f4ba70828dc8fdb361bf518 SHA512 3d5da338be7508640eaff3ac9360387a6b98d40df477b81e9d4dd9b642e84c8d3fbdbf8c277dfaadc869bd733616329b02607fe56357139be4721d4cabb7996a
diff --git a/dev-python/distlib/distlib-0.3.8.ebuild b/dev-python/distlib/distlib-0.3.8.ebuild
deleted file mode 100644
index 62e85882b1da..000000000000
--- a/dev-python/distlib/distlib-0.3.8.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level components of distutils2/packaging"
-HOMEPAGE="
-	https://pypi.org/project/distlib/
-	https://github.com/pypa/distlib
-"
-SRC_URI="
-	https://github.com/pypa/distlib/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# pypiserver is called as external executable
-BDEPEND="
-	test? (
-		dev-python/pypiserver
-	)
-"
-
-src_prepare() {
-	local PATCHES=(
-		# use system pypiserver instead of bundled one
-		"${FILESDIR}"/distlib-0.3.2-system-pypiserver.py
-		# https://github.com/pypa/distlib/commit/1c08845b05d022692252ed45cb07e9cb9647caac
-		"${FILESDIR}"/${P}-py313.patch
-	)
-
-	# make sure it's not used
-	rm tests/pypi-server-standalone.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x SKIP_ONLINE=1
-	local -x PYTHONHASHSEED=0
-
-	# disable system-site-packages -- distlib has no deps, and is very
-	# fragile to packages actually installed on the system
-	sed -i -e '/system-site-packages/s:true:false:' \
-		"${BUILD_DIR}/install${EPREFIX}/usr/bin/pyvenv.cfg" || die
-
-	"${EPYTHON}" tests/test_all.py -v -x ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/distlib/distlib-0.3.9.ebuild b/dev-python/distlib/distlib-0.3.9.ebuild
index 825f53931847..9065fd726a98 100644
--- a/dev-python/distlib/distlib-0.3.9.ebuild
+++ b/dev-python/distlib/distlib-0.3.9.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/distlib/files/distlib-0.3.2-system-pypiserver.py b/dev-python/distlib/files/distlib-0.3.2-system-pypiserver.py
deleted file mode 100644
index 386ad05da578..000000000000
--- a/dev-python/distlib/files/distlib-0.3.2-system-pypiserver.py
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -dupr a/tests/test_index.py b/tests/test_index.py
---- a/tests/test_index.py	2021-05-29 17:42:08.015558305 +0200
-+++ b/tests/test_index.py	2021-05-29 17:42:56.949966576 +0200
-@@ -57,11 +57,6 @@ class PackageIndexTestCase(DistlibTestCa
-     def setUpClass(cls):
-         if cls.run_test_server:
-             cls.server = None
--            server_script = os.path.join(HERE, 'pypi-server-standalone.py')
--            if not os.path.exists(server_script):
--                logger.debug('test server not available - some tests '
--                             'will be skipped.')
--                return
-             pwdfn = os.path.join(HERE, 'passwords')
-             if not os.path.exists(pwdfn):   # pragma: no cover
-                 with open(pwdfn, 'w') as f:
-@@ -72,7 +67,7 @@ class PackageIndexTestCase(DistlibTestCa
-             fd, cls.sinkfile = tempfile.mkstemp(suffix='.log', prefix='distlib-pypi-')
-             os.close(fd)
-             cls.sink = sink = open(cls.sinkfile, 'w')
--            cmd = [sys.executable, 'pypi-server-standalone.py',
-+            cmd = ['pypi-server',
-                    '--interface', '127.0.0.1', '--port', TEST_SERVER_PORT,
-                    '-P', 'passwords', 'packages']
-             cls.server = subprocess.Popen(cmd, stdout=sink, stderr=sink,
diff --git a/dev-python/distlib/files/distlib-0.3.8-py313.patch b/dev-python/distlib/files/distlib-0.3.8-py313.patch
deleted file mode 100644
index d47be4f566bd..000000000000
--- a/dev-python/distlib/files/distlib-0.3.8-py313.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 1c08845b05d022692252ed45cb07e9cb9647caac Mon Sep 17 00:00:00 2001
-From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
-Date: Wed, 14 Feb 2024 14:46:14 +0000
-Subject: [PATCH] Fix #214: Update representation of interpreter in test.
-
----
- tests/test_scripts.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/test_scripts.py b/tests/test_scripts.py
-index 5c38687..74ee647 100644
---- a/tests/test_scripts.py
-+++ b/tests/test_scripts.py
-@@ -340,7 +340,7 @@ def test_script_run(self):
-             self.assertIn(b'<H3>Current Working Directory:</H3>', stdout)
-             self.assertIn(os.getcwd().encode('utf-8'), stdout)
-         else:
--            self.assertIn(b'[Interpreter(id=0, isolated=None)]', stderr)
-+            self.assertIn(b'[Interpreter(0)]', stderr)
-             self.assertEqual(p.returncode, 1)
- 
-     @unittest.skipUnless(os.name == 'posix', 'Test only valid for POSIX')