gentoo auto-resync : 18:08:2022 - 02:33:40

3 files changed, 2 insertions, 71 deletions

diff --git a/dev-python/distlib/Manifest b/dev-python/distlib/Manifest
index 1b033a8c0807..55c1cfe7c51f 100644
--- a/dev-python/distlib/Manifest
+++ b/dev-python/distlib/Manifest
@@ -1,6 +1,4 @@
 AUX distlib-0.3.2-system-pypiserver.py 1294 BLAKE2B 87d419e5d9bd90715e43a125617bf12a2eaf16d114557a56fa0c6afb0fa83468960dcfdba3a3eff2ff136c5ef12ec04e71cea2a77a886854181dcdc64aee954e SHA512 08ee2bdc55b30ba770179c97a8dc7f702d72588b6f8bfd65feb47847ee4b41b97c0f31d37e1c4cfc2cff35ccb189abfc07590a175b7d2fd592beda8eb4a8b040
-DIST distlib-0.3.4.tar.bz2 1169083 BLAKE2B f1b5e5ca7d0155d204db177d9844cdff4d593be3d927bd5f9e8ad07065b52383527d3990b66c5868bb8377703d031958c5c88a9daf4f0b238903ddbea3ef6cf0 SHA512 24f8d6f5012c881ffa6bbdae7887ee5a7608ac36a83e2a96cb8a337d1ab6c896a4078028d0383165ff44be6b735aa31f7d199845d89899813be74ed00e1680e8
 DIST distlib-0.3.5.gh.tar.gz 1233989 BLAKE2B 616666e835aa201ceeeb423452a25adafab67dc20f99496b711e3ca6d4916f4e1dd39e444b1c8824e90559e898fc0588cd58d2d5be07af172d6b6ed3f3c7fe4c SHA512 927861d2e11785d8419c3125784f21ee052883c03d91d8893d2c77b47739e45cbca39e5d90446e906c71744bd57274192b28af86def239a16caeae4d3887d5a6
-EBUILD distlib-0.3.4-r2.ebuild 1879 BLAKE2B 6999737ca6dd33e102019b37b08b81af6cda9b629ca42896e94dd6539cf8349d2b7500ca89ee9d0aab36b21030ab0d3bb1306cedce71a763dbbe506903383254 SHA512 fc613bc6ad21b8a736488e3bfaf40d43cbb7535d35a69501be0a8760e3debea850536a05edf392d6a889ff0ece7570fee7cbedec088a2ea268db62e964a95f6d
-EBUILD distlib-0.3.5.ebuild 1848 BLAKE2B ebe2de7511c4610c38d651a9486310fe9d5194f2a797aa8b775cecc8793ea65b696a948e9a143b0249e7e561ca3fc60299ceb8b75bbc83cb94f2a6a54aabe656 SHA512 c729dbb079660c6e7e421e341ff11125f41b79af692f1adaa24cba7d74a24d58f7c622ec3c78f3ea61e85cf10f100e50a60bb1d2797a06f3375f514ad7411ea9
+EBUILD distlib-0.3.5.ebuild 1840 BLAKE2B 9ef601fc43aa276283fd7d730f129ef419e5209869121c3ec64fbd5477bdfbcc525406a09f86fc65e0d15425197742090f4bc0dee2125012a4c4ea6ac3ee5035 SHA512 e5b1d1cd3f9b1f9a7be68ba3707eb806c24cd0c56f39c3cc775a1f3da2040c9d288292d43fbcfa92b915b671a594f11ccb462b4a6996b43fa60c7c72b8bb36a6
 MISC metadata.xml 365 BLAKE2B 74d46041d58af096a40f55e08c48562eb11aa8349f2a5afeffad67182c65561b71e2723254df6176b77852f74fd569bb329e21bc8f4ba70828dc8fdb361bf518 SHA512 3d5da338be7508640eaff3ac9360387a6b98d40df477b81e9d4dd9b642e84c8d3fbdbf8c277dfaadc869bd733616329b02607fe56357139be4721d4cabb7996a
diff --git a/dev-python/distlib/distlib-0.3.4-r2.ebuild b/dev-python/distlib/distlib-0.3.4-r2.ebuild
deleted file mode 100644
index 60f51ce70857..000000000000
--- a/dev-python/distlib/distlib-0.3.4-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} 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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( 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 tests/pypi-server-standalone.py || die
-
-	# use system pypiserver instead of broken bundled one
-	eapply "${FILESDIR}"/distlib-0.3.2-system-pypiserver.py || die
-
-	# doesn't work with our patched pip
-	sed -i -e '/PIP_AVAIL/s:True:False:' tests/test_wheel.py || die
-
-	# broken with pypy3
-	sed -i -e 's:test_custom_shebang:_&:' tests/test_scripts.py || die
-	# broken with py3.11, doesn't look important
-	sed -i -e 's:test_sequencer_basic:_&:' tests/test_util.py || die
-	# https://bugs.gentoo.org/843839
-	sed -i -e 's:test_interpreter_args:_&:' tests/test_scripts.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.5.ebuild b/dev-python/distlib/distlib-0.3.5.ebuild
index b9e474a8db74..bacb469be379 100644
--- a/dev-python/distlib/distlib-0.3.5.ebuild
+++ b/dev-python/distlib/distlib-0.3.5.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"