gentoo resync : 05.12.2021

4 files changed, 61 insertions, 5 deletions

diff --git a/dev-python/twine/Manifest b/dev-python/twine/Manifest
index ffc868ca8a0e..5d8882e05be4 100644
--- a/dev-python/twine/Manifest
+++ b/dev-python/twine/Manifest
@@ -1,5 +1,7 @@
 DIST twine-3.4.2.tar.gz 212266 BLAKE2B 602bb72f4be1c0d28341fb3378a5d55737c14555495640ae3414a1c8e7ca0c06b2c2ce3c358130251c02f0a51b61eb362a1e999c3945d4d1d7afd7bcd4d17807 SHA512 3f6d8992294a35e2a26be64f56c88d31af63b05f3f477d545bc82d928ca1b9939d23fa489eca5232502a49def77d489eaf6a29663d150f78b5cdb99749ff9b50
-DIST twine-3.5.0.tar.gz 211946 BLAKE2B 7ec2eb88a4496f7e750927c83b2e6d6ed39a08bb1775cda8df555ee6ce5244d721e8aaf2d983f983219b9445f56e2a830979a5e5e6165ab7e6ec12b2a0602842 SHA512 37219c1078bb7209123aee79c2d2bd73390c8ce4ab2bf6b5493a54e4ccb9c714a6422ee4a782b3c19d3a5344c1431285c666230729f44615b7761c7a5aff07d6
-EBUILD twine-3.4.2.ebuild 1773 BLAKE2B 21aaca1139f7e468da3f243c1fb055e9e43c81bafdb141c9985e7ad96986cd74fb2193db21cd6782a18decaf09fa8dff0a3225e4b70aa85e10b23337744ed7cb SHA512 b6075f4856158dc35ce7b956a363286c9705b8669bceb3389e59bab9a55a94f88e63a40f690565a140379ce24634f203c1c5027d2f1eefa4fade70535feac243
-EBUILD twine-3.5.0.ebuild 1781 BLAKE2B edea30cb0146b554237d7a8ccbceed3c670e3c4e1ddfc58c8ac2faa454e40efed6b87a5d5ddb3d8153d0b23da219b5fa13ed50a1267574b72261d0ae3ffe2b97 SHA512 9383f28afb2560e8723f262631be74106aa2319b47ef4a8bec385f1c3998b4f1ed9847483dd9cf409c183dfd185dada001e611b0431dcfba40dd6617068282a8
+DIST twine-3.6.0.tar.gz 211971 BLAKE2B 763f021e374c86749bca77ca67a5fe534acf333464d6cc2f978de4625abc09b7574aa31de927300983eb6feb801e77a169f11deb4edc5036df73943778f5844d SHA512 41da4d89ac69c692a98545aefffd9afd4c7b0287179807906504b4121bf9257095b227ec2966d98983939fa76fb8509f6ffa2577c0e7b4c7f43f614f44745460
+DIST twine-3.7.0.tar.gz 212591 BLAKE2B 116d96a058cb53e0626747aaeae40c63fd6ece4ed8ef537c3890f99226f34827b65e5e894f5f04a24999d5ca2bcf182505e08075c4ff8b979d7be71e05f645ef SHA512 d7ddfdfcbaa7a5e3eba3657a06da090eeecbf373646e64d659f420fae4ba10c16c2c02e85bdf9c1f050b86177f19c85aa20183ad9d546cb053a11d60db0851f3
+EBUILD twine-3.4.2.ebuild 1767 BLAKE2B 1bf746fae21322d48ebcce62504d08fbce09b53ec931ff3dac418bd299e520a2905e7bd632c1637b439eb41519b65a547ef738b5398d721d934c0c41616ee081 SHA512 ace4a3e189f455957e46a93344be356618a8af7f70c544e5e0094dc470b4f1146acbd80158c08cf23231e5f5fe0acb8150178e3a54da7fbf55ea5c173cdcc658
+EBUILD twine-3.6.0.ebuild 1775 BLAKE2B 53cadd8a8c1f46abec5d77888b681d823338f2de2135a19e9040c06e47dfe90bd8adb1fe6ea8bd6a9265e0f8704e2639b63388e0c05880bb558e26b7a7f4eece SHA512 fc28cf4d11af5f378a3ce7ca0df14088e4232ba3e4a0fe1cbf65c14137268b7e2ecb86c18b7848f03b570199b20c3056c611ff496025d7b668fc3cf1a273b5f5
+EBUILD twine-3.7.0.ebuild 1775 BLAKE2B 802a4285800cb8a6c3095b2b427e9aaff7b68c0e39d74aaf040ae7fc7675881c10f7f801f3969c71d1d8f1041a0d474635d27d99487773a9902105a4f07558a2 SHA512 bf5edf1439cf6ab850bc87913f06d281b44d50cea46ea7e4e412bd245f2155da5ee87ec3de858438a626a119bdef39404472ac9a68b8035a0f2050ade4c70ff1
 MISC metadata.xml 383 BLAKE2B e2a596604a2f3e40ddd0196ea79105e318f8a04d9e5a2c7e458d403d215af1371f2a526fa7d8cbc430f20747f7b65ed6c8546263fb8a54ddd8a6db487c358634 SHA512 cd5c1f1ed89dc5c314975fc5b503108d6828db37826ebba98d6edd580b72cd41867e19e65a9a022f8c07babadecd810f21febeb8a015c51eecec412b9df4f0d5
diff --git a/dev-python/twine/twine-3.4.2.ebuild b/dev-python/twine/twine-3.4.2.ebuild
index 15a5458a4761..6ec1e40a7ffa 100644
--- a/dev-python/twine/twine-3.4.2.ebuild
+++ b/dev-python/twine/twine-3.4.2.ebuild
@@ -13,7 +13,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 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
diff --git a/dev-python/twine/twine-3.5.0.ebuild b/dev-python/twine/twine-3.6.0.ebuild
index 97a82eff44d7..9b2c0e01151e 100644
--- a/dev-python/twine/twine-3.5.0.ebuild
+++ b/dev-python/twine/twine-3.6.0.ebuild
@@ -13,7 +13,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 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
diff --git a/dev-python/twine/twine-3.7.0.ebuild b/dev-python/twine/twine-3.7.0.ebuild
new file mode 100644
index 000000000000..9e3c290e3791
--- /dev/null
+++ b/dev-python/twine/twine-3.7.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+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 --install 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}
+}