gentoo resync : 12.05.2022

3 files changed, 2 insertions, 59 deletions

diff --git a/dev-python/twine/Manifest b/dev-python/twine/Manifest
index 7027d78754eb..ac172e2e6e4c 100644
--- a/dev-python/twine/Manifest
+++ b/dev-python/twine/Manifest
@@ -1,5 +1,3 @@
-DIST twine-3.8.0.tar.gz 213157 BLAKE2B c7c013a01b0f1f5ec24c76ebfea2c645da07eae0bb816978a37ed95bca4a2193cea627bdddefcd4beaadbe4bd7ee51315b309fbf06555cc75d509bc61578ac7d SHA512 d6ede7241d4825665054811ad657916281426eda6ee88f0e83295b5498876830b6c69284056e409539c792c24ebeb5af2eedf45108261490a72812b9e86e08f2
 DIST twine-4.0.0.tar.gz 214420 BLAKE2B 0a1dc91ed9308252d5db3825c8b642e015720bfe7a95dd9a92ba347cbf1eedede85b18b9c310fe20322928db8e44f988bffb3845748ce9817ecbd5b521fb25c8 SHA512 c97a4315bd2a923979aa3a6cebf826ef022a9e510383f7f1debf941b6eedc47642c999702bdc3377a9740f381ed4dc442a542f02a44e521040cb67fb342e9b7e
-EBUILD twine-3.8.0.ebuild 1796 BLAKE2B 91ec25e976a59f265628e184440f38bb3bcf90392f201e251c2744be56dd5a5249afb0898ee44fd6ee75935fa1e4abcd48cc04dde2484c5e44ba2755d5c5e6f9 SHA512 1c40051f1a959d2057f68bb8da4bdf0a24518a1347984aef0f9d34cd34ac8d719474f2b4965fc7071c5ff65729af3e5e545a760976395109ab6c0c7af3d38f2d
-EBUILD twine-4.0.0.ebuild 1887 BLAKE2B 467e0e35fc4d3c6e55ea3f51618089e39895ecfda18f58fabea8ce4b473e93363ece03050205da471124472914c6dd02262e4752c045f30c178a8784e39a4521 SHA512 53805f98eaa6e6f92e7967420a4ca96a39421d19c0e82b9894a40bcf88b01d7d671f180118da8dd04ac3feca8017afe29d5a3f4777ddd37f54702b5e4e16b032
+EBUILD twine-4.0.0.ebuild 1898 BLAKE2B 51f3004c20742bdd889d30e09f4fcf814f886401169cce2a0474d00c02d1f5306db01c185339acc00b2d621673283996a4cc3530de45ba65b9c9ad3b22d05e99 SHA512 9508def7777185c777af9fb1c37a4ad2a577fc43f21cbb81b0c9553df0d7f658a1355d73da5bef0b4b10f29f1b3e30a23d4de9d7f5b79f794dba4676f934d5fe
 MISC metadata.xml 383 BLAKE2B e2a596604a2f3e40ddd0196ea79105e318f8a04d9e5a2c7e458d403d215af1371f2a526fa7d8cbc430f20747f7b65ed6c8546263fb8a54ddd8a6db487c358634 SHA512 cd5c1f1ed89dc5c314975fc5b503108d6828db37826ebba98d6edd580b72cd41867e19e65a9a022f8c07babadecd810f21febeb8a015c51eecec412b9df4f0d5
diff --git a/dev-python/twine/twine-3.8.0.ebuild b/dev-python/twine/twine-3.8.0.ebuild
deleted file mode 100644
index 184ff3b1d02c..000000000000
--- a/dev-python/twine/twine-3.8.0.ebuild
+++ /dev/null
@@ -1,55 +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}]
-	>=dev-python/urllib3-1.26.0[${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-4.0.0.ebuild b/dev-python/twine/twine-4.0.0.ebuild
index 04cf9838a2d1..61e10a8a17e5 100644
--- a/dev-python/twine/twine-4.0.0.ebuild
+++ b/dev-python/twine/twine-4.0.0.ebuild
@@ -17,7 +17,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 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]