gentoo resync : 29.01.2021

3 files changed, 3 insertions, 68 deletions

diff --git a/dev-python/twine/Manifest b/dev-python/twine/Manifest
index 9630afd9db72..c4d402112a3d 100644
--- a/dev-python/twine/Manifest
+++ b/dev-python/twine/Manifest
@@ -1,5 +1,3 @@
-DIST twine-3.2.0.tar.gz 145280 BLAKE2B b25fa984486a375e09705703a47994b529f6e5b48c6733c0a07b57bec6c0dfcdf4096d6ac6b0f9b7a7bfebfb32ea1cfb49c5de79f29495eb2a8fc59a5f8de4e5 SHA512 9959430913ea570d22f2d8b94e929af36b409b71691b3f66de8ddb77cfbfbe36590e21a6062db2a4a4f56ce2eb96984b0a474a93ea96b7734f53ada7a6411c28
 DIST twine-3.3.0.tar.gz 148996 BLAKE2B 60668acd0481534631ca0ecf3c755df7e9e46c6d183d0f1c73ed7467cfecc144878d6ccf7ef2ee62efa17eb5629f5ed74c77c8ae4d57ef16530fad31afe40d97 SHA512 94fc7a9b3f2b5fc7c06baf55debf4fd55f6a2b4c4321c9bff46b844166769ce8bdcab10355c4967998149b62e13b26e11a30ff66042bfdd5af24d448321fd291
-EBUILD twine-3.2.0.ebuild 2003 BLAKE2B 4392d3d204a839284e3c54ba56d10b51c75d6a2852cef8f49c5ac91c203846ed26da40b31feb7a28797d1e236f4e0a144573a7fe25a73e14f89aa279802be39d SHA512 950e8060810229d2fff8f0863689a2b5a94c92a73c676c327a2869d307c7e340b49f842ec1e4e763b0e49a967d262c7cb097ba8410dbe04c444d65a41ebdf1e5
-EBUILD twine-3.3.0.ebuild 2153 BLAKE2B 9edcabfe3ad010c3ee0e28649f8cb8e80ad1642b6ec8dd6579b940d22d6942b1ade66ccc2a2c885d4d22efc45cdaffae68a239d1739a994d90db16e72f3a1fb2 SHA512 d16bb16d0b59af486f9231937545c4f703e0708ec58f60940ab19b197947707e5f31f769334b9ed564e41fafc07df4cf88a41cfc12cefb63749533b8eed419df
+EBUILD twine-3.3.0.ebuild 2145 BLAKE2B 97587dd5bd01c43ff7c8381c640e9d208b12f5d98d1d05ead423442db6c06cd384ae065960cb7eb826fd182b650b5efd1d15103f059d7d3b5f084484856eb37a SHA512 795f0bd64ac0db66c141b53861df35c37b4f04657eb797bea6d6d563b427fa00853bd016fbfc397e8b7a2d1823c9e5c7b8b0ca1f2f3ddd441dcbb75a1e5bd605
 MISC metadata.xml 382 BLAKE2B 7b1f58005d26a36c877707986c59a6ae3549b9e8118f01fc87aa05a1f7dfa4271ea2100663d49b7b5b8f278409e96b2dabcdb0d9a74809bba75d440fd42d88bd SHA512 c4ce9e0c6029c9efb8be9b36720281ed4ebf0d829e3d936d0a7a864d8f42b1f7c71dc8b605717547ac004bd94c7baebd5b2d2a224899fad0efa0747124ba5bfb
diff --git a/dev-python/twine/twine-3.2.0.ebuild b/dev-python/twine/twine-3.2.0.ebuild
deleted file mode 100644
index a4ec13e3cc3c..000000000000
--- a/dev-python/twine/twine-3.2.0.ebuild
+++ /dev/null
@@ -1,63 +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 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/jaraco-envs[${PYTHON_USEDEP}]
-		dev-python/jaraco-functools[${PYTHON_USEDEP}]
-		dev-python/munch[${PYTHON_USEDEP}]
-		dev-python/portend[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pypiserver[${PYTHON_USEDEP}]
-		dev-python/pytest[${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.20.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-toolbelt-0.8.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' python3_{6,7} pypy{,3})
-	>=dev-python/keyring-15.1[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	# avoid a setuptools_scm dependency
-	sed -i "s:use_scm_version=True:version='${PV}',name='${PN//-/.}':" setup.py || die
-	sed -r -i "s:setuptools(_|-)scm[[:space:]]*([><=]{1,2}[[:space:]]*[0-9.a-zA-Z]+|)[[:space:]]*::" \
-		setup.cfg || die
-
-	# requires internet
-	sed -e 's:test_check_status_code_for_wrong_repo_url:_&:' \
-		-i tests/test_upload.py || die
-	rm -f tests/test_integration.py || die
-
-	sed -i -e '/--cov/d' pytest.ini || 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.3.0.ebuild b/dev-python/twine/twine-3.3.0.ebuild
index 6dc766493a09..fced01735bb0 100644
--- a/dev-python/twine/twine-3.3.0.ebuild
+++ b/dev-python/twine/twine-3.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"