gentoo resync : 25.11.2020

4 files changed, 2 insertions, 75 deletions

diff --git a/dev-python/twine/Manifest b/dev-python/twine/Manifest
index 6b3137cfc043..e0dff8db5994 100644
--- a/dev-python/twine/Manifest
+++ b/dev-python/twine/Manifest
@@ -1,6 +1,3 @@
-AUX twine-1.15.0-tests.patch 731 BLAKE2B 8720a98cbcc69f20096aa0e7e19be78c6ebb842b36c0c5f24bb60f1c2425e555e0b775c9f3cc1b3df7efafa8c7938cc5d85aff5f2ea364734459be7090f1ab6a SHA512 c8388f642045030bdd381c9fc6924ee12ce173f886559161a5941cf343912c2a649bd47e190b031c25d1d73266f3e5b5a9aa740f0315b129d91a4708e77c4446
-DIST twine-1.15.0.tar.gz 135851 BLAKE2B 5e85c30e23615e9fa7e40ed767412560b29c42ec777afbb17850781a384bc2d3787534a8114a65ac2374ab80441eb2d3b6d75dcff400e7b47a42453a9210130d SHA512 e0eae05c108e1e766a0a8ec684e3423b0537c8aa671675f30403171fd4f48ec65666d407df53f6dd9eefa0b98e5fd2fdf7dbf1f0f9150686c499de131f6f2435
 DIST twine-3.2.0.tar.gz 145280 BLAKE2B b25fa984486a375e09705703a47994b529f6e5b48c6733c0a07b57bec6c0dfcdf4096d6ac6b0f9b7a7bfebfb32ea1cfb49c5de79f29495eb2a8fc59a5f8de4e5 SHA512 9959430913ea570d22f2d8b94e929af36b409b71691b3f66de8ddb77cfbfbe36590e21a6062db2a4a4f56ce2eb96984b0a474a93ea96b7734f53ada7a6411c28
-EBUILD twine-1.15.0.ebuild 1224 BLAKE2B 26ed3c59f0e1a4215ba1b8a9c63d22c227a18d9a5ddba92a109bfe3461cd13f4391017bfa56ea86cbf94f1bd90c2d95c22ef0be59774ff862c612075c9b24a0b SHA512 73cc966d65ca3fa0265235cdc8ab4e2177712541f77fb788f69f72f10e3d06be92a1590a6e7aeeb877cd3a599c883420aca6a21614bbd63430baa040e9b19092
-EBUILD twine-3.2.0.ebuild 1993 BLAKE2B ac9984f134f91fb6d3ed548226e663fd0b87d1fb5355907d4bcbe42c776717cee770a2d2794161acc0242b80ef670f6dac449ab08ef62279a94b8865f2480e93 SHA512 719f8085cc37668237b2e1a9cd0ad7f3ff63e3e6c8b9586204a89f9ed4a9b39e8134c45b02f247077b572354875b76b1c16934091416faa37d4a0d97dc6cfe42
+EBUILD twine-3.2.0.ebuild 1992 BLAKE2B eed30ccd5fdb3fcf3496e67bffaff114450f11b22450bee8251e0d69a0f6a068964062d10b58c067b97d89b8e08cc631a43b1c64cd440908d7603a2da195f4ad SHA512 e8a78e1c1edf5e0783bff309b8c0b82b09793e00a49469c39ad8883b626497ef1adaeceb8b500c17b81bcdd8fb3fc3a6ee66f089d08b557e15defaf06cd5227c
 MISC metadata.xml 382 BLAKE2B 7b1f58005d26a36c877707986c59a6ae3549b9e8118f01fc87aa05a1f7dfa4271ea2100663d49b7b5b8f278409e96b2dabcdb0d9a74809bba75d440fd42d88bd SHA512 c4ce9e0c6029c9efb8be9b36720281ed4ebf0d829e3d936d0a7a864d8f42b1f7c71dc8b605717547ac004bd94c7baebd5b2d2a224899fad0efa0747124ba5bfb
diff --git a/dev-python/twine/files/twine-1.15.0-tests.patch b/dev-python/twine/files/twine-1.15.0-tests.patch
deleted file mode 100644
index ce75469c091f..000000000000
--- a/dev-python/twine/files/twine-1.15.0-tests.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/tests/test_package.py b/tests/test_package.py
-index 8e4fbbb..35c9c52 100644
---- a/tests/test_package.py
-+++ b/tests/test_package.py
-@@ -214,11 +214,11 @@ TWINE_1_5_0_WHEEL_HEXDIGEST = package.Hexdigest(
-     'b657a4148d05bd0098c1d6d8cc4e14e766dbe93c3a5ab6723b969da27a87bac0',
- )
- 
--if platform.python_implementation().lower() == 'pypy':
--    # pyblake2 refuses to install on PyPy
--    TWINE_1_5_0_WHEEL_HEXDIGEST = TWINE_1_5_0_WHEEL_HEXDIGEST._replace(
--        blake2=None,
--    )
-+#if platform.python_implementation().lower() == 'pypy':
-+#    # pyblake2 refuses to install on PyPy
-+#    TWINE_1_5_0_WHEEL_HEXDIGEST = TWINE_1_5_0_WHEEL_HEXDIGEST._replace(
-+#        blake2=None,
-+#    )
- 
- 
- def test_hash_manager():
diff --git a/dev-python/twine/twine-1.15.0.ebuild b/dev-python/twine/twine-1.15.0.ebuild
deleted file mode 100644
index e281b95ed916..000000000000
--- a/dev-python/twine/twine-1.15.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of utilities for publishing packages on PyPI"
-HOMEPAGE="https://twine.readthedocs.io/ https://github.com/pypa/twine https://pypi.org/project/twine/"
-SRC_URI="https://github.com/pypa/twine/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/tqdm-4.14[${PYTHON_USEDEP}]
-	>=dev-python/pkginfo-1.4.2[${PYTHON_USEDEP}]
-	>=dev-python/readme_renderer-21.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-toolbelt-0.8.0[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}/twine-1.15.0-tests.patch"
-)
-
-python_prepare_all() {
-	# requires internet
-	rm -f tests/test_integration.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/twine/twine-3.2.0.ebuild b/dev-python/twine/twine-3.2.0.ebuild
index d3d319a5e3c8..0d274b54a4fa 100644
--- a/dev-python/twine/twine-3.2.0.ebuild
+++ b/dev-python/twine/twine-3.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pypa/twine/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"