gentoo resync : 18.11.2019

5 files changed, 13 insertions, 14 deletions

diff --git a/dev-python/six/Manifest b/dev-python/six/Manifest
index 874767d99de8..32fa0b50f6d7 100644
--- a/dev-python/six/Manifest
+++ b/dev-python/six/Manifest
@@ -4,8 +4,8 @@ DIST six-1.10.0.tar.gz 29630 BLAKE2B 1f380dbc7a9e746b4a7909de54a58a008a73d7b6c58
 DIST six-1.11.0.tar.gz 29860 BLAKE2B de4886ad9af7aa906f9eac213544c99323d74c1988d9abff96ce6fc3eea4464e577511f7c52328cbd9e6989db2128fa8d1ee57f9ce7bfc36b83ff655691b46c9 SHA512 33f246a2e987141e17e5edad9d3537cf3aba0cbdd0bc2a907ea52ce0d674b1474f29c3dd5cc26605fd960396054b189ca5f501708333cad234c223131483fe24
 DIST six-1.12.0.tar.gz 32725 BLAKE2B f40621076a7bb2b3b86d9f6ee49056a598e4853c6150952902053b8cfde86e562a7656b6ca3c3108f407d392cf7c1164a61b36142efd565eda909b8733c0bedb SHA512 937728372edf1e0ac13bbd706723d0de35e015c30d0ae41f789c5ed2e3669bb0db70cdc6e036ec2d437a6c4aa0d5d1e727b6d09ac34cca7e4e92e5d3b4775151
 DIST six-1.13.0.tar.gz 33726 BLAKE2B 9910a72eea4adc030710b67252d01fd74ce4205bd4e0ccf662bb2bce8837853cf341c765e4f9ba2db3aaeca050dd2b1ccabefacf5c71383dad1d275326313ef6 SHA512 55eb8e23e529cb0d2ab9e7c85868e695f36c8235e914b1548eb4b9fd561e4237266bf1839457f15a9513d57a343cbf8ab809d6187499300791fd9356854fcb00
-EBUILD six-1.10.0.ebuild 1790 BLAKE2B 6a65aca8d3ebf72591fa2195d986d9a3a88c46b6d08d2700cc80fbc8c2f1d28004f56a1ac715c6415b085a6a70ad55295bed6b1ed1b50e0dd9f62f0bff5c1be0 SHA512 925fda6e0e1da4566e89c4a8b78962a1d043b5639a36e6433cd4f2c55aa90750139bab8ef376fa85b9277b2eae85aab0dcd007d09a3296d8ff45a940d86b1b73
-EBUILD six-1.11.0.ebuild 1054 BLAKE2B b9132fa3c45dda3702e13d39de4a17415c634eb4ce5b8530b38c9eb4a656d94f4a0f900996178160dab532f2c2e2a12814ba530d751dbc496a0953f4a89a15fa SHA512 2002bd4217389a2f5b13fb90afbceecba7a1152cd8604739a1d62f927dfa3f1c5229b3a8d584fdcf72ab210201e5551be08554250bac6240f71f8160f8886ace
-EBUILD six-1.12.0.ebuild 1054 BLAKE2B 6a299eb827241e210d8bfe13d19f71d10d4eb39b02d38a68202dbc99704e8ed6f5cc72ad9572a5a528d4585e8accf881ebe16764b1aa4f70a715869320ea1586 SHA512 648e5fb86fe1e6eb6c7a35211f1099a88623f566fc9c0280e4c3dd814adb7c8e978cfa45c4cd417d5597cd41910c8d7c4b5fbdd3007558e12bdb7a99695ea5d1
-EBUILD six-1.13.0.ebuild 1094 BLAKE2B 9ada3798d2b0b42ccb325de407ebd3798a4ad5952fd271b7b9f511ec645e639cca2a4d5e14632228e16d3ca69c0ce24994915a93fe767531e7f92b6ea25a1075 SHA512 9044271a3aaa1676d85748e5ce4b27ef2f1ac34a17ce48d046f2053460336096499a600e5816069b9f187cae0f75c9af06c59eec0d49a522f67871c6f38c470a
+EBUILD six-1.10.0.ebuild 1817 BLAKE2B 7443de4831c75bfd5ce1a856d9f0d198ed1f9d31a920cdefd269169cd4d77b0be751fb399838a6955476a1b111a01c28a9d0565c99f7ab87cd226514c18a4a64 SHA512 b6445d44d055372cb8ef80c388a264d69dea07d35ceef38c59a0209b341dc7909b418c3e9031c699cb85bfadd0ecf7b19b5a0a2269852198fd6e761728a7c1aa
+EBUILD six-1.11.0.ebuild 1081 BLAKE2B 021bf40e06a696a942d17cb55ae695f91b5d2c2fb77cba644cc4718ad48dc0a3b159489fc0d57fad278965d7875bd739d53309de433b6ff53e2f3c64181a4a49 SHA512 6ea68f2540f037b31877d4b24fba3f75f6c67088943599e5b8bedfb7f62c48240ed3ac56005541b9c8931a82206a74d5face3fa173d5393735b596fcca9b3de0
+EBUILD six-1.12.0.ebuild 1081 BLAKE2B f7f65cb2f3f2a60b0f28f6d3e26cbcfee37b025860f43d8d8536f710e4a63997c10c176c4215b21236bc461a038c8b27fc5fe0b84c69183c74f9059d357ac1a0 SHA512 70451b867e4c5be35f22d3a10b0b34d87fc64769a5af332802b03335a3e58f0a8be9209f814ef83c30620cd2c6ce48f10aab5e8cb55f41a3b4b3a084e93b1d5a
+EBUILD six-1.13.0.ebuild 970 BLAKE2B 39047611afb72a627d1211f07db4c15725cd693806d0082eaa0394521c632b279281e7d87d97aa848d1a066f9cb0ed7d973c71850cc34265b66b030041039010 SHA512 7cb3e1d3325b1006b0b0bd1bf688dc09e7f951bb41c9fa471c81dc3ec5a8cc2a11f05c4eead2871ed14797f756c295dfe7efd6f9f496e7de47f8efbd6f8b1bc2
 MISC metadata.xml 371 BLAKE2B 475b717d4c4bced0454ee0244b5d30f178098ff45b2fc7d168b41f446c4e8f3f2dc022ccadb953d6f4e905f95e38769657d42fb4d80157c816d6e7b5eddb33c2 SHA512 8171125815ab60f7c9a2756367ee6532fd862c5f411ff828b6555e4e21e6d43672f2c764f92134f6625abb161380bdbb739af259ba88c974cf3583f35af76a91
diff --git a/dev-python/six/six-1.10.0.ebuild b/dev-python/six/six-1.10.0.ebuild
index 2663ac4765e5..7090da247874 100644
--- a/dev-python/six/six-1.10.0.ebuild
+++ b/dev-python/six/six-1.10.0.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	doc? ( dev-python/sphinx )
diff --git a/dev-python/six/six-1.11.0.ebuild b/dev-python/six/six-1.11.0.ebuild
index 0167375db63b..1ee693a812e8 100644
--- a/dev-python/six/six-1.11.0.ebuild
+++ b/dev-python/six/six-1.11.0.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/six/six-1.12.0.ebuild b/dev-python/six/six-1.12.0.ebuild
index ffc74485eb06..a1e28891ddc5 100644
--- a/dev-python/six/six-1.12.0.ebuild
+++ b/dev-python/six/six-1.12.0.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/six/six-1.13.0.ebuild b/dev-python/six/six-1.13.0.ebuild
index 9a10d29473c0..68e1c52e8f8d 100644
--- a/dev-python/six/six-1.13.0.ebuild
+++ b/dev-python/six/six-1.13.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
 
 inherit distutils-r1
 
@@ -14,26 +14,22 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
+IUSE="doc"
 
-DEPEND="
+BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx )
-	test? ( >=dev-python/pytest-2.2.0[${PYTHON_USEDEP}] )"
+	doc? ( dev-python/sphinx )"
 
 PATCHES=(
 	"${FILESDIR}"/1.9.0-mapping.patch
 )
 
+distutils_enable_tests pytest
+
 python_compile_all() {
 	use doc && emake -C documentation html
 }
 
-python_test() {
-	pytest -vv || die "Testing failed with ${EPYTHON}"
-}
-
 python_install_all() {
 	use doc && local HTML_DOCS=( documentation/_build/html/. )
 	distutils-r1_python_install_all