gentoo resync : 20.03.2022

3 files changed, 5 insertions, 59 deletions

diff --git a/dev-python/twine/Manifest b/dev-python/twine/Manifest
index acca178a4169..643fdd0b064d 100644
--- a/dev-python/twine/Manifest
+++ b/dev-python/twine/Manifest
@@ -1,4 +1,3 @@
-DIST twine-3.7.0.tar.gz 212591 BLAKE2B 116d96a058cb53e0626747aaeae40c63fd6ece4ed8ef537c3890f99226f34827b65e5e894f5f04a24999d5ca2bcf182505e08075c4ff8b979d7be71e05f645ef SHA512 d7ddfdfcbaa7a5e3eba3657a06da090eeecbf373646e64d659f420fae4ba10c16c2c02e85bdf9c1f050b86177f19c85aa20183ad9d546cb053a11d60db0851f3
-EBUILD twine-3.7.0-r1.ebuild 1757 BLAKE2B f8f8ebb82a318a659a80b2a339584b8e751d356fff59e3cfeeeabd2ef9d95595bd74e643bccab19bbbdb7d465d5659ff6b25d4313261a557d6220ea9084f15f5 SHA512 8223ed4b19c29d80cf4cfbecc76666381da37ad8fbb5274e17e1f8c866e88bd4f4ccfd1db7f626564ff64ddf6b4823c48e337990d1232e3d6d473e7b6fef5e3e
-EBUILD twine-3.7.0.ebuild 1767 BLAKE2B 87db4d515683515ad17ca978683b5956b090d2d85969250e5d613d14ff0e22bd1cb9970a48e62b30357d992c9d8056a8e73e6a15097e4b82eb9eb55ffe659c3e SHA512 15dc16ae73ce5a205c4e678d249a8dd8767672fe4d558bdc0269b39221dbe8efa876237c8d962e2f50d7ebe7c078a4bd465c5cbee6401dc1af7cee57981a95a8
+DIST twine-3.8.0.tar.gz 213157 BLAKE2B c7c013a01b0f1f5ec24c76ebfea2c645da07eae0bb816978a37ed95bca4a2193cea627bdddefcd4beaadbe4bd7ee51315b309fbf06555cc75d509bc61578ac7d SHA512 d6ede7241d4825665054811ad657916281426eda6ee88f0e83295b5498876830b6c69284056e409539c792c24ebeb5af2eedf45108261490a72812b9e86e08f2
+EBUILD twine-3.8.0.ebuild 1796 BLAKE2B 91ec25e976a59f265628e184440f38bb3bcf90392f201e251c2744be56dd5a5249afb0898ee44fd6ee75935fa1e4abcd48cc04dde2484c5e44ba2755d5c5e6f9 SHA512 1c40051f1a959d2057f68bb8da4bdf0a24518a1347984aef0f9d34cd34ac8d719474f2b4965fc7071c5ff65729af3e5e545a760976395109ab6c0c7af3d38f2d
 MISC metadata.xml 383 BLAKE2B e2a596604a2f3e40ddd0196ea79105e318f8a04d9e5a2c7e458d403d215af1371f2a526fa7d8cbc430f20747f7b65ed6c8546263fb8a54ddd8a6db487c358634 SHA512 cd5c1f1ed89dc5c314975fc5b503108d6828db37826ebba98d6edd580b72cd41867e19e65a9a022f8c07babadecd810f21febeb8a015c51eecec412b9df4f0d5
diff --git a/dev-python/twine/twine-3.7.0-r1.ebuild b/dev-python/twine/twine-3.7.0-r1.ebuild
deleted file mode 100644
index 8566ac09bad8..000000000000
--- a/dev-python/twine/twine-3.7.0-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} 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 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
-	>=dev-python/importlib_metadata-3.6[${PYTHON_USEDEP}]
-	>=dev-python/keyring-15.1[${PYTHON_USEDEP}]
-	>=dev-python/pkginfo-1.8.1[${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}]
-	>=dev-python/rfc3986-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/tqdm-4.14[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	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}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# requires internet
-	rm -f tests/test_integration.py || die
-	# pytest-socket dep relevant only to test_integration, and upstream
-	# disables it anyway
-	sed -i -e '/--disable-socket/d' pytest.ini || die
-	sed -i -e '/--cov/d' pytest.ini || die
-
-	distutils-r1_python_prepare_all
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
diff --git a/dev-python/twine/twine-3.7.0.ebuild b/dev-python/twine/twine-3.8.0.ebuild
index 75214fef9457..184ff3b1d02c 100644
--- a/dev-python/twine/twine-3.7.0.ebuild
+++ b/dev-python/twine/twine-3.8.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
@@ -25,6 +25,7 @@ RDEPEND="
 	>=dev-python/requests-toolbelt-0.8.0[${PYTHON_USEDEP}]
 	>=dev-python/rfc3986-1.4.0[${PYTHON_USEDEP}]
 	>=dev-python/tqdm-4.14[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.26.0[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
@@ -39,7 +40,7 @@ BDEPEND="
 	)
 "
 
-distutils_enable_tests --install pytest
+distutils_enable_tests pytest
 
 python_prepare_all() {
 	# requires internet