gentoo resync : 30.05.2020

4 files changed, 13 insertions, 34 deletions

diff --git a/dev-python/twine/Manifest b/dev-python/twine/Manifest
index 0d841a43f968..5c21ed1e0181 100644
--- a/dev-python/twine/Manifest
+++ b/dev-python/twine/Manifest
@@ -1,8 +1,7 @@
-AUX twine-1.11.0-tests.patch 432 BLAKE2B f912ae6e51652c299d4b99f2db69f6daa309f0a04e89205fa207e6ed8073c84b212ac6c24a344850b5d11e9a55eb0e6924c0c3306517726c262df1c298114c2e SHA512 a997ca1f2d077a3a23374bc816cc4d6d295c8912a3a28fa6bc404891fe6699e88d98febcf8867e137906b4e5994ab73ea0899fd5045768f30f482d845b295f6d
 AUX twine-1.15.0-tests.patch 731 BLAKE2B 8720a98cbcc69f20096aa0e7e19be78c6ebb842b36c0c5f24bb60f1c2425e555e0b775c9f3cc1b3df7efafa8c7938cc5d85aff5f2ea364734459be7090f1ab6a SHA512 c8388f642045030bdd381c9fc6924ee12ce173f886559161a5941cf343912c2a649bd47e190b031c25d1d73266f3e5b5a9aa740f0315b129d91a4708e77c4446
 AUX twine-3.0.0-tests.patch 595 BLAKE2B 839f6a17293c23e3cc01bb2497b9e8402bafc725db39dc5dd555b4f87b468110e72b6f899835cf1dc3a129762bf9d162cff98e7453814cf917562c401315df3e SHA512 a3ed4afa3c4b4137e953adba6fd8994f95fdd7b5dac67a57b8f75247a78c09f59699e37e43fe3d38e9440d3ba41dd0713f6bed539538e521cce5501a80ee6d81
 DIST twine-1.15.0.tar.gz 135851 BLAKE2B 5e85c30e23615e9fa7e40ed767412560b29c42ec777afbb17850781a384bc2d3787534a8114a65ac2374ab80441eb2d3b6d75dcff400e7b47a42453a9210130d SHA512 e0eae05c108e1e766a0a8ec684e3423b0537c8aa671675f30403171fd4f48ec65666d407df53f6dd9eefa0b98e5fd2fdf7dbf1f0f9150686c499de131f6f2435
 DIST twine-3.1.1.tar.gz 138692 BLAKE2B d96e207b5ef1314f547f5e8fbf36565d5cf29f0dd19438d41fcbb154a98b854c669740b533a28cd79501933f0cef57767e63a83f135fcdbc196df8865cfc4d8a SHA512 446b36a1816db6131e279bda26e62c58f9659d86178d498ebb9f7c5287b61cf969e625debe4b4cb1e32832e0eecbcedcf4913319ae0bf7eb287f56e550d33ed9
-EBUILD twine-1.15.0.ebuild 1329 BLAKE2B e42901aa6c3825161ab98602766125fa0bcd761a9cc568971777328172a5b8f6fd482d2f91bf16f0feda5c94e5981a61192e02f0f25607514468e492988f9a0a SHA512 a8049b5a1a23d13bc0be72378d3d57c2c63a9fc3db650def9e37ea5d03b2ffa7fca1addde0a6df8fb3dda71c879d4bd6ef8069ab1be94cf5fda8494888766a29
-EBUILD twine-3.1.1.ebuild 1823 BLAKE2B 154e1bbee8abd5eee506d191d5ebdcc78ebe69685255e6b2b2dccafa1880887a1dca414991e5f22835906e4d44abd6aacea0f7303cf4f7cd12dbc46d498c75d5 SHA512 4807a9b29b62c71a4291732a51f25a1d7ed4d7ceb18de395f28a2e908796035fd474ee8e96fd66657c5641c20c55ce21f04b089d11fac0bebc9a70282eb79d12
+EBUILD twine-1.15.0.ebuild 1293 BLAKE2B 4bbbc2f796e868998f0396ce15705832e279787d97bdf7d7cef7947567ae5c00a11409af19ae6321cc757a4eb6f128402c1a36e3635605485204e9294efc06b1 SHA512 7428100d995238985ccb2679aef51f9424836c74683eeb9ce46d99be1fc35ad7d8fbd70ff489967b39cc2c0438fbd057265af43dcf6355d83f25b9113dce4575
+EBUILD twine-3.1.1.ebuild 1794 BLAKE2B 5a31b59a7641cd38a10a648ab24e265d5fa20cad2231e5d2bdd5aadc5503692fd49b61c289038c7680c3a9fcafe7a53faeb6adbafeac05e3db06718206606dfe SHA512 f4b2037e8aa5be1b74399b9e27fcc8514d823870948d29fbc78db5a1881278dd0dc728e2ecad25c4bdbb0758dd9fba3272bd4d14bbe7a4cdb0b77e9251b71439
 MISC metadata.xml 358 BLAKE2B d4ec540be4b2496c1067200781bb8be0cc085bb4d85f922bd1bc66cd24e4514ba2ba7e8653e3c9dabe7295e24241e4de6c22701eb40328393ada4bcbfa7d77b7 SHA512 525abc4d0649347e2a0c121172aa16b94560d549a37d81712513e39e67046748d460bf07109baa373bc261938f79456ae81f361fa0d41915edb32382bc61de17
diff --git a/dev-python/twine/files/twine-1.11.0-tests.patch b/dev-python/twine/files/twine-1.11.0-tests.patch
deleted file mode 100644
index 386a4ebcf3ab..000000000000
--- a/dev-python/twine/files/twine-1.11.0-tests.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Check for python2 support first, then python3. This should help avoid importing
-the wrong module for python2 where the builtins module can be provided by the
-futures package.
-
---- twine-1.11.0/tests/test_utils.py
-+++ twine-1.11.0/tests/test_utils.py
-@@ -19,9 +19,9 @@
- import textwrap
- 
- try:
--    import builtins
--except ImportError:
-     import __builtin__ as builtins
-+except ImportError:
-+    import builtins
- 
- import pytest
- 
diff --git a/dev-python/twine/twine-1.15.0.ebuild b/dev-python/twine/twine-1.15.0.ebuild
index c306897ff28f..685e99a4a62d 100644
--- a/dev-python/twine/twine-1.15.0.ebuild
+++ b/dev-python/twine/twine-1.15.0.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 )
 
 inherit distutils-r1
 
@@ -15,15 +16,15 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm64 ~hppa ~sparc x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
+DEPEND="
 	test? (
 		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/pretend[${PYTHON_USEDEP}]
 	)
 "
-RDEPEND="${CDEPEND}
+RDEPEND="
 	>=dev-python/tqdm-4.14[${PYTHON_USEDEP}]
 	>=dev-python/pkginfo-1.4.2[${PYTHON_USEDEP}]
 	>=dev-python/readme_renderer-21.0[${PYTHON_USEDEP}]
@@ -32,8 +33,6 @@ RDEPEND="${CDEPEND}
 	$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_5})
 "
 
-RESTRICT="!test? ( test )"
-
 PATCHES=(
 	"${FILESDIR}/twine-1.15.0-tests.patch"
 )
diff --git a/dev-python/twine/twine-3.1.1.ebuild b/dev-python/twine/twine-3.1.1.ebuild
index 6b1e17bcd56a..e624686e3c04 100644
--- a/dev-python/twine/twine-3.1.1.ebuild
+++ b/dev-python/twine/twine-3.1.1.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
@@ -13,11 +14,11 @@ SRC_URI="https://github.com/pypa/twine/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 x86"
+KEYWORDS="~alpha amd64 ~arm64 ~sparc x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-BDEPEND="${CDEPEND}
+BDEPEND="
 	test? (
 		dev-python/jaraco-envs[${PYTHON_USEDEP}]
 		dev-python/jaraco-functools[${PYTHON_USEDEP}]
@@ -28,7 +29,7 @@ BDEPEND="${CDEPEND}
 		dev-python/pytest[${PYTHON_USEDEP}]
 	)
 "
-RDEPEND="${CDEPEND}
+RDEPEND="
 	>=dev-python/tqdm-4.14[${PYTHON_USEDEP}]
 	>=dev-python/pkginfo-1.4.2[${PYTHON_USEDEP}]
 	>=dev-python/readme_renderer-21.0[${PYTHON_USEDEP}]
@@ -38,8 +39,6 @@ RDEPEND="${CDEPEND}
 	>=dev-python/keyring-15.1[${PYTHON_USEDEP}]
 "
 
-RESTRICT="!test? ( test )"
-
 PATCHES=(
 	"${FILESDIR}/twine-3.0.0-tests.patch"
 )