gentoo Easter resync : 12.04.2020

6 files changed, 4 insertions, 96 deletions

diff --git a/dev-python/six/Manifest b/dev-python/six/Manifest
index ab60a69a4883..e687d5188f60 100644
--- a/dev-python/six/Manifest
+++ b/dev-python/six/Manifest
@@ -1,8 +1,3 @@
-AUX 1.9.0-mapping.patch 561 BLAKE2B 281a893fa6d0d589eb768c595e8931e4d743be9bc7eb288d87628f6a38c14a220f965430c0a480aecf0652c09155359aff9dff11449e2de3c55d7ef00f2527d3 SHA512 92d5bb1643264a04d5faf36bed16379e8844648a31739921bd97e2dd88e34a9b302c37a12a15a64aceb3d26c53f7cdbcbde2ce8d289a7a43f692af47bf05f58c
-DIST six-1.12.0.tar.gz 32725 BLAKE2B f40621076a7bb2b3b86d9f6ee49056a598e4853c6150952902053b8cfde86e562a7656b6ca3c3108f407d392cf7c1164a61b36142efd565eda909b8733c0bedb SHA512 937728372edf1e0ac13bbd706723d0de35e015c30d0ae41f789c5ed2e3669bb0db70cdc6e036ec2d437a6c4aa0d5d1e727b6d09ac34cca7e4e92e5d3b4775151
-DIST six-1.13.0.tar.gz 33726 BLAKE2B 9910a72eea4adc030710b67252d01fd74ce4205bd4e0ccf662bb2bce8837853cf341c765e4f9ba2db3aaeca050dd2b1ccabefacf5c71383dad1d275326313ef6 SHA512 55eb8e23e529cb0d2ab9e7c85868e695f36c8235e914b1548eb4b9fd561e4237266bf1839457f15a9513d57a343cbf8ab809d6187499300791fd9356854fcb00
 DIST six-1.14.0.tar.gz 33857 BLAKE2B 711ef5b79118c1280c9868688869cc475668c248e6b0c2061145818842d5b4c28809d86b1388709af24f6e92fe5926ea6261f1b85c62db749f79664cbad93e4d SHA512 4dea0f4e7961e8b582d665501c65852dc3b73516a0b6f78b0888c8670f1450df58bd3eea418777f41080b842ab6c3d8633be1034bcf920192e5590d5316e2c9e
-EBUILD six-1.12.0.ebuild 1077 BLAKE2B b9f55350fa8a7c250a6d31293a7ba36638e7f4c95c560a47ad2f0cc5ae3fc590da13e739f924e3e8269340e462cd0954ca825dfb3b8599b91b8f00832112a40f SHA512 3cdd27d6648823c666870ceb9827a692b4af56384544194f4567b452924b367263f934dab2b1754d8e5445cd6b427e6335af5a9dd3fdc352ddc118f436f7fd63
-EBUILD six-1.13.0.ebuild 965 BLAKE2B b17cced2a16ca0172e4895df375638e24f22d920c191eb4af89680f522da2e09eb6ffe03cbc007a8f065c86a1133f2afb2212a4d0f618e97019802455a483269 SHA512 79178727a2f1b4dfa42d90f6cbb53693a8ee176550956638339cf723447710ff3017fee46a214832f029151ee45f2a4ac67d90a4fb3cb22a0ddf4411f1e04c93
-EBUILD six-1.14.0.ebuild 689 BLAKE2B 4335b911f57b5c84894f26e97e329919d82d17cccd7547a646f603b2fb56beb304c8019388a62ae700bdc55ebbc78422cd8309dec992b69fccf53835b9aed812 SHA512 76e1a6398ee5dcc1971a6d101860a83d4c14af2ced60b34602fc2e1753ec7429fefab944a36f7cd2dbed74de7943461f94ec30f24bb9a939ed769bc0a102aaa2
-MISC metadata.xml 371 BLAKE2B 475b717d4c4bced0454ee0244b5d30f178098ff45b2fc7d168b41f446c4e8f3f2dc022ccadb953d6f4e905f95e38769657d42fb4d80157c816d6e7b5eddb33c2 SHA512 8171125815ab60f7c9a2756367ee6532fd862c5f411ff828b6555e4e21e6d43672f2c764f92134f6625abb161380bdbb739af259ba88c974cf3583f35af76a91
+EBUILD six-1.14.0.ebuild 675 BLAKE2B d077a1013ce7c571ea6345147cfe1b0127419c3ea678266538fcdf280fdb9c0fc5cdcec5415a1b1886b8b8d7d242161eed9b6db91560d51d02554d47891aabf0 SHA512 5a70f3a248ad11ab41e48a4f0b352a3f2e6e9fea45cad891dcd5a28f9097723bb0e7084d93e8cc22ebf33bd5afe2c3b7cecc4d7a84f153347502ab96bf5dda18
+MISC metadata.xml 396 BLAKE2B 4b08f7faa6e73dee9d4f39caebc0eef9901f408c1cdfe5d883b350af406de2731e654c2a1c266daf07299451f57b8a717214ca1716463f7f43b376a51b4f6c2c SHA512 03881122a5eae7539c27d078eaf69f34e121f3a8a43c7e0ca9470c0ec6863ea268b5facc64e0ab100cc6b8c00473f784042047f077ceaa7f13d70d71dce03391
diff --git a/dev-python/six/files/1.9.0-mapping.patch b/dev-python/six/files/1.9.0-mapping.patch
deleted file mode 100644
index 4423eacbbba3..000000000000
--- a/dev-python/six/files/1.9.0-mapping.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Patch prevents downloading non essential .inv files during the doc build
-diff -ur six-1.5.2.orig/documentation/conf.py six-1.5.2/documentation/conf.py
---- a/documentation/conf.py	2013-09-15 21:52:34.000000000 +0800
-+++ b/documentation/conf.py	2014-01-07 18:19:24.958916446 +0800
-@@ -211,7 +211,3 @@
-      [u"Benjamin Peterson"], 1)
- ]
- 
--# -- Intersphinx ---------------------------------------------------------------
--
--intersphinx_mapping = {"py2" : ("https://docs.python.org/2/", None),
--                       "py3" : ("https://docs.python.org/3/", None)}
diff --git a/dev-python/six/metadata.xml b/dev-python/six/metadata.xml
index 2d3e4a72698e..a82f927395e5 100644
--- a/dev-python/six/metadata.xml
+++ b/dev-python/six/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">six</remote-id>
     <remote-id type="github">benjaminp/six</remote-id>
diff --git a/dev-python/six/six-1.12.0.ebuild b/dev-python/six/six-1.12.0.ebuild
deleted file mode 100644
index 14e8298f9cad..000000000000
--- a/dev-python/six/six-1.12.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python 2 and 3 compatibility library"
-HOMEPAGE="https://github.com/benjaminp/six https://pypi.org/project/six/"
-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 )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx )
-	test? ( >=dev-python/pytest-2.2.0[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}"/1.9.0-mapping.patch
-)
-
-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
-}
diff --git a/dev-python/six/six-1.13.0.ebuild b/dev-python/six/six-1.13.0.ebuild
deleted file mode 100644
index cd119c861f9a..000000000000
--- a/dev-python/six/six-1.13.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python 2 and 3 compatibility library"
-HOMEPAGE="https://github.com/benjaminp/six https://pypi.org/project/six/"
-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"
-
-BDEPEND="
-	dev-python/setuptools[${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_install_all() {
-	use doc && local HTML_DOCS=( documentation/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/six/six-1.14.0.ebuild b/dev-python/six/six-1.14.0.ebuild
index 5b72b414e38a..ab28d375e40a 100644
--- a/dev-python/six/six-1.14.0.ebuild
+++ b/dev-python/six/six-1.14.0.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 distutils_enable_sphinx documentation