gentoo Easter resync : 12.04.2020

5 files changed, 4 insertions, 80 deletions

diff --git a/dev-python/wheel/Manifest b/dev-python/wheel/Manifest
index 2761a39c095f..af9a36fff5f8 100644
--- a/dev-python/wheel/Manifest
+++ b/dev-python/wheel/Manifest
@@ -1,7 +1,3 @@
-DIST wheel-0.29.0.tar.gz 54143 BLAKE2B 8f29c81b9b3c8ee419c26f04e09f437a2113716f5096e1b6e21f23e6a7426e58b7ee00c0846cfcd816670bee4dd908ef577e4142fae546d4ea643af2c2612049 SHA512 b72dec3cf71e3d87c611ff41f1381ed7f2c654edb50c808fb4fd0f552bab3572434495bf18c36d2ecc7cb8b355782054d3d6dedd5589ffda15027e72cff24602
-DIST wheel-0.33.6.gh.tar.gz 50273 BLAKE2B bc315c87b83bed39ad4ec08dde31edd570e59b65ff28c64c89b1b5e1f2e526fd6035dbe9902dd9a3efd94b0c5584489f28ed895b36e4eb9dd1ddc225d7069275 SHA512 04edf619ee6fd06f1e4c8bc513c6e21ba91615eba42bca5473e60573e274133b1019774b8e3a960e05f5a69bb256508d0a8a31fd9ab91a28f1b87d1095b17b5e
 DIST wheel-0.34.2.gh.tar.gz 57175 BLAKE2B 4d06c411561f80e51c15422f2d3318efa565f9119e869a2f9284adb9bd3aff7bc104013a63fefae36742d7d87c8468b42292723ed031c2b109323a9141fd1cea SHA512 fcd02cf770382c26b5250aa48f60481ac868ff7e1b08245ed4616aaa7d6dc5e3280d9ab787c4d1690b11550de9f6160c0d31dd65b79554711ab5d02de479e1ab
-EBUILD wheel-0.29.0.ebuild 985 BLAKE2B b09b150ed7e600b6a6dacc71eb309c8f87e283f86df623fb83e7bbeede61c2b9940484edda64be1a34209001c150e02e33ff34f0cd70cded06b8b81dacbc14b7 SHA512 09d95e969da6a4d22aeafdabcf5af65cd662f29bd9c56559f6b2aefcf4d5c1217fb1df657ea62d94bd4242ebd411e7f65631489904c966facc543875ec8aab2f
-EBUILD wheel-0.33.6.ebuild 706 BLAKE2B 5289725ada2897ac5e7b3b6437f0dd01d4d629be215dafa9f54071c06b71c055b7edad7cddd05b5a60e41ea89e6fd0f74a3d09df8377418aadf9d74f89539e83 SHA512 e29e75b98534bee3ccde1658ad0b2157acfa3d450d6e5b226b198af058316d7cc482675e3de8e271bf6c2a0933694f12830e919266e4a3a83a2feea6692ccbde
-EBUILD wheel-0.34.2.ebuild 698 BLAKE2B 27f196f6c6131437b319970fd14c488482aadb3b57eebc9f56a75da3d4f69e1493eea1a69e8b111f19fff64bdb19eae71a6c772df5f8434569ff021a9e1eb3ce SHA512 7162c2ba7d4b557e0c8342ea8957500a2acaa054416b13daaca9ececc55526f58f007ff7b95ea286b02b177bebc0a3c67a71ffaca42045bad91658b5d3707eef
-MISC metadata.xml 308 BLAKE2B 32390fb7a1a3de815d3a791850d9f96d8092be48cf2ac61f8cebdf132e7d1c5c4cba95bac3edc3f2ebd6a2d9e9437e0c9187f9668ed95c4ddb4ee6072f496d46 SHA512 d5fdaba19a51f826d45ba93cc77a08fd4be563634f51236cec379763f066ed925869a57c94c75a34ed58302619d419f31dcad641d9e85c68d11d72ec53d2d45d
+EBUILD wheel-0.34.2.ebuild 684 BLAKE2B ce249847969441f6a1be5f80608e9dd8a045dba09451dbaa93a93619b2f7e28c0ec92fcd7f217ac888521c02d21c02c7b9fb8ce7ab6fd26c812417cd1eaf1607 SHA512 fc97d06def5e398da79dd2fff520b3a5c9056662fe1fcddd035a14673700c22be382e19fe51c8bcf4c66b233a095a89b88e13b961a0190ec508be58cb42db443
+MISC metadata.xml 332 BLAKE2B 6c674dc3f3401ae851af12ce14e50ddfe100ffcf26caf3bd49dd93a19433d8c190fe3aabbeba3280f4eb96fe1856d58ce2a5b7c24ee15dacc4593d0534fbac9d SHA512 f0e8a4870fdc46f2a8cdb719832a7d1e108283a35f8f1a2756259c8823480509f9fdfdafdb59d9f0ec2f38c2e78ea6e2937ef5a086408e5e7aeb43b951e0c9a0
diff --git a/dev-python/wheel/metadata.xml b/dev-python/wheel/metadata.xml
index 2808e69afc4d..29ab6e0ffa6c 100644
--- a/dev-python/wheel/metadata.xml
+++ b/dev-python/wheel/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">wheel</remote-id>
 	</upstream>
diff --git a/dev-python/wheel/wheel-0.29.0.ebuild b/dev-python/wheel/wheel-0.29.0.ebuild
deleted file mode 100644
index df43e94eed3d..000000000000
--- a/dev-python/wheel/wheel-0.29.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A built-package format for Python"
-HOMEPAGE="https://pypi.org/project/wheel/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="doc test"
-
-RDEPEND="dev-python/jsonschema[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-#	test? (
-#		dev-python/keyring
-#		dev-python/keyrings_alt
-#		dev-python/ed25519ll
-#		dev-python/pytest[${PYTHON_USEDEP}]
-#	)
-#"
-
-# Fails somehow
-RESTRICT=test
-
-python_test() {
-	sed \
-		-e 's:--cov=wheel::g' \
-		-i setup.cfg || die
-	py.test -v -v || die "testsuite failed under ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "Signature support" \
-		dev-python/keyring \
-		dev-python/keyrings_alt \
-		dev-python/ed25519ll
-}
diff --git a/dev-python/wheel/wheel-0.33.6.ebuild b/dev-python/wheel/wheel-0.33.6.ebuild
deleted file mode 100644
index b069f5e7a1a1..000000000000
--- a/dev-python/wheel/wheel-0.33.6.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A built-package format for Python"
-HOMEPAGE="https://pypi.org/project/wheel/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/pypa/wheel/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed \
-		-e 's:--cov=wheel::g' \
-		-i setup.cfg || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/wheel/wheel-0.34.2.ebuild b/dev-python/wheel/wheel-0.34.2.ebuild
index 3a1a9b2fd853..5215cfa0a935 100644
--- a/dev-python/wheel/wheel-0.34.2.ebuild
+++ b/dev-python/wheel/wheel-0.34.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/pypa/wheel/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
 
 distutils_enable_tests pytest