From 814f4cf860e299a046b649eaee5463427984c09c Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Thu, 8 Jul 2021 15:03:58 +0100
Subject: gentoo resync : 08.07.2021

---
 dev-python/distlib/Manifest                        |  5 +-
 dev-python/distlib/distlib-0.3.1-r1.ebuild         | 54 ----------------------
 dev-python/distlib/distlib-0.3.2.ebuild            |  2 +-
 .../files/distlib-0.3.1-system-pypiserver.py       | 37 ---------------
 4 files changed, 2 insertions(+), 96 deletions(-)
 delete mode 100644 dev-python/distlib/distlib-0.3.1-r1.ebuild
 delete mode 100644 dev-python/distlib/files/distlib-0.3.1-system-pypiserver.py

(limited to 'dev-python/distlib')

diff --git a/dev-python/distlib/Manifest b/dev-python/distlib/Manifest
index d2bcb938a6ff..3c96474962a0 100644
--- a/dev-python/distlib/Manifest
+++ b/dev-python/distlib/Manifest
@@ -1,8 +1,5 @@
-AUX distlib-0.3.1-system-pypiserver.py 1532 BLAKE2B 7bb2bbb2282bcaa943735804428b00f6c51fdb51c7acaec7efe653495acd9194a0544d5d49531a96ab269ab8a61ba87e3c35d4f30ce5275a0a284fadd88cc19f SHA512 b96579d450c5c33502edc57480d5bb00aa3b9b61333c43ab446a3cf7117934a6a14026b2061cbf28e69e88a515554f8a1aad732f685cb73f18686b1aba6379ab
 AUX distlib-0.3.2-py310.patch 1131 BLAKE2B d5f7dde9f3a23756d926ce39061ab1d168e3dcf1161b63eadcc2f639f58cb58d9e3dc4bf4738cd32a148fc649abd236230ea57353d851c1fd536c5fd2964c56e SHA512 d96f9ed3e023084103025650d34448cbddd301f7d43d65f565427e00976809d813730f5208dcae53969cfbe8f5eff054cd538141ff1e988dcb4396f8c94cd5ae
 AUX distlib-0.3.2-system-pypiserver.py 1294 BLAKE2B 87d419e5d9bd90715e43a125617bf12a2eaf16d114557a56fa0c6afb0fa83468960dcfdba3a3eff2ff136c5ef12ec04e71cea2a77a886854181dcdc64aee954e SHA512 08ee2bdc55b30ba770179c97a8dc7f702d72588b6f8bfd65feb47847ee4b41b97c0f31d37e1c4cfc2cff35ccb189abfc07590a175b7d2fd592beda8eb4a8b040
-DIST distlib-0.3.1.tar.bz2 1068500 BLAKE2B 52135869242f71cc6d6887da6d9e20ffc6b46c84d8146393961062d92d8c0bd68e1309277f64fdec0319ff3c503b1caaba3d5378f5c081dca79573c8d9c2e6f2 SHA512 f259299176c45be7024b80759015a2fad120ffdde55b6abea0f7fb0335cee90809b5daedcb88abdfb68fd496284b2e478df622004b3750327bfc86807581116c
 DIST distlib-0.3.2.tar.bz2 1075843 BLAKE2B 3595dc6af53beb7ff7dc49013e6c3db3453b501b56790a953c2cfea5a73aaca71fc69de68c8121ae92ffafd32a70ffa69d768cfd42844135fd5bd6647611e090 SHA512 e033ff2ff6b760f698a20103e01d63fa87bc1839bbf44fce252284c793e10a057dac645d818a4e0a2aa8be97bb85fcf9c8706b2399c505f12a093024d11be578
-EBUILD distlib-0.3.1-r1.ebuild 1468 BLAKE2B 4b154a1d890ac4d3b9e4062c08ff2919559d3895c3f447a348be68c9ecece8080f3c3c5ad65902d5c1ec7083387ac546e61de9ab28f11659de064eac8f2beed7 SHA512 61b9b0e5555ab60f61d96607aa354d7cd574069829595caaa04f6cae10cacb34a89660fea0b0d2970c3c1cd324b932d345d951b6df400695fd951f1ce36f5c1d
-EBUILD distlib-0.3.2.ebuild 1536 BLAKE2B 4ba01f3493512fc2225267fed74bd29d0e2b2ead0e53940aae177e23f0dd69091adc173dc3d5456ce8905eb79be55a53a8dfa7c2c94a568887e6ab99404254b2 SHA512 65e8640f9cadf3aedfef13ac24984b0a9e46dbf54655dc66b443c2aebba713dc797c7dcd0ad4e400680fd618ff453a61bd5b08a8939463fd31d49f5ade810a1a
+EBUILD distlib-0.3.2.ebuild 1533 BLAKE2B cd0de8e590780513724b7ea0eaa435f96fdc98cb100e1dcfd4db7a4d4491b4af8f3a7d0e6cb3b68c86598a4764f0ddbae70453e89c5dbfda55ae83674343c95e SHA512 ebeee4a11e1a99559a1efe4d1891d0fb95d3c4b2a1c721940c72a7b36ee95a2de86127c7add7cf89d074299a5e997c32586dbec883e17b53efee82e68cfce0d0
 MISC metadata.xml 288 BLAKE2B 865be58267f18634250b494dac795da10ca6daa5defa289003da9282f06eebdcc3a3369bb39b2a7ac216ec44134b29ec9052676637564974eafbbf4c270403d4 SHA512 2eb267e476064080a3e34b4f66af276666a30d37967298384f612c2fe9a73bd805b0ba72f6c4e2c1ca6d6bf737d8b3f5484b0c3f37f2ec1616f9017124c54cf1
diff --git a/dev-python/distlib/distlib-0.3.1-r1.ebuild b/dev-python/distlib/distlib-0.3.1-r1.ebuild
deleted file mode 100644
index ab98794d5345..000000000000
--- a/dev-python/distlib/distlib-0.3.1-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Low-level components of distutils2/packaging"
-HOMEPAGE="https://pypi.org/project/distlib/
-	https://bitbucket.org/pypa/distlib/"
-# pypi has zip only :-(
-SRC_URI="
-	https://bitbucket.org/pypa/distlib/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-# This package's tests are extremely fragile and tend to break or hang
-# when it doesn't like metadata of packages installed on the system.
-RESTRICT="test"
-
-# pypiserver is called as external executable
-# openpyxl installs invalid metadata that breaks distlib
-BDEPEND="
-	test? (
-		dev-python/pypiserver
-		!!<dev-python/openpyxl-3.0.3[${PYTHON_USEDEP}]
-	)"
-
-src_prepare() {
-	# make sure they're not used
-	rm -r tests/unittest2 || die
-	rm tests/pypi-server-standalone.py || die
-
-	# use system pypiserver instead of broken bundled one
-	eapply "${FILESDIR}"/distlib-0.3.1-system-pypiserver.py || die
-
-	# doesn't work with our patched pip
-	sed -e '/PIP_AVAIL/s:True:False:' \
-		-i tests/test_wheel.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x SKIP_ONLINE=1
-	local -x PYTHONHASHSEED=0
-	"${EPYTHON}" tests/test_all.py -v ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/distlib/distlib-0.3.2.ebuild b/dev-python/distlib/distlib-0.3.2.ebuild
index 36e8bd9017eb..1f5679c4c7f4 100644
--- a/dev-python/distlib/distlib-0.3.2.ebuild
+++ b/dev-python/distlib/distlib-0.3.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 # This package's tests are extremely fragile and tend to break or hang
 # when it doesn't like metadata of packages installed on the system.
diff --git a/dev-python/distlib/files/distlib-0.3.1-system-pypiserver.py b/dev-python/distlib/files/distlib-0.3.1-system-pypiserver.py
deleted file mode 100644
index beb0cd8dd925..000000000000
--- a/dev-python/distlib/files/distlib-0.3.1-system-pypiserver.py
+++ /dev/null
@@ -1,37 +0,0 @@
-From f30a24d3dffee78cf0581218d9cca0e395b75f6a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 8 Jul 2020 09:24:42 +0200
-Subject: [PATCH] Use system pypiserver
-
----
- tests/test_index.py | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/tests/test_index.py b/tests/test_index.py
-index bc24367..4971e3f 100644
---- a/tests/test_index.py
-+++ b/tests/test_index.py
-@@ -52,11 +52,6 @@ class PackageIndexTestCase(unittest.TestCase):
-     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:
-@@ -65,7 +60,7 @@ class PackageIndexTestCase(unittest.TestCase):
-             if not os.path.isdir(pkgdir):   # pragma: no cover
-                 os.mkdir(pkgdir)
-             cls.sink = sink = open(os.devnull, 'w')
--            cmd = [sys.executable, 'pypi-server-standalone.py',
-+            cmd = ['pypi-server',
-                    '-P', 'passwords', 'packages']
-             cls.server = subprocess.Popen(cmd, stdout=sink, stderr=sink,
-                                           cwd=HERE)
--- 
-2.27.0
-
-- 
cgit v1.2.3