gentoo Easter resync : 12.04.2020

5 files changed, 6 insertions, 50 deletions

diff --git a/dev-python/more-itertools/Manifest b/dev-python/more-itertools/Manifest
index 6802365d43c5..b0bcb3380183 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -1,7 +1,5 @@
-DIST more-itertools-4.2.0.tar.gz 56871 BLAKE2B 48cdba3eebea94483c5cfd9530d4bd2cacd02e893b87482a01ff1fdf10336f3c2a40d32fbb935d38320c9c47a1fd1942a48ea12ff07ae56793ecc5870fef2452 SHA512 7e205a575fb1d17ed3be9225c5c60139db41cc4b866f6d6732c955536b1d606bb7ccd92ad77e41159965abbddec3a85761d3649c28f06d52afa8476160d70e77
 DIST more-itertools-5.0.0.tar.gz 67359 BLAKE2B a2448b218eea4442cc4739a4df414ba69e0530cd6206a13c5c017a13daa297d00c08a94cec8aec0639d8b03663f4b698702f5e700ae118ae9fb5854a6d105b36 SHA512 f72c8d6c75799c39708443ba75862801ddd3fc0382c9eee7ed24ecf04cbc7d9ff6a8e35b6fff1eaccf45ddd470c2cc8959532eca32c2ff50b0a12588727c68b4
 DIST more-itertools-7.0.0.tar.gz 70103 BLAKE2B fa7556019ad4c2e8905698c1295840176b763bf1b7356679eb3988112b962adfbdefa82e7ca7419d350b40186a3ec5015314cdd7229dee867bd03fba716165f5 SHA512 730add0e26d62abd2d5e49cb662d58db244a241e272e16d05c25c7bf2ebe8a2e28b2b2b5038082d5773358b50e05d5f9a93f88957dc1b13daf30686047f41bc5
-EBUILD more-itertools-4.2.0-r1.ebuild 1068 BLAKE2B 71681837817c7933889826817f6a870235d145d79788be9ea982fa0482e2725c6b8191cd5ad251f896d17dc0604f39fd82579c36fca7161529026062977b04fb SHA512 e1dad897ddca7430300bd6ae153855f839a67ff43b6767c46773137347da537a2baf9db4305534c813f312389f57be50d4c64b28314d62124ce56accf83e0252
-EBUILD more-itertools-5.0.0.ebuild 720 BLAKE2B d38695e00a0d31f0e6db08ab441d91baccbbf54057a9dcd483f99e71ebcd5967464ae5bfd772cd0155f8e0fd8c2024c6eab60d74a79ef97c60a377577e145e7f SHA512 5da4eefd8c2a282f60c1b9e156d0dcaea6af83811fb186c2b6396e2adfbb606182892e3d0483b5e10a7c31896b36364b2c17461d266fb1a322cb1cd5fd9b7f68
-EBUILD more-itertools-7.0.0.ebuild 667 BLAKE2B b92631361dae585dc017fd9af152c508f910a0477f1f0f9db781e7c856a6746a3d0e3e4b7fa6bb565b60a1fcb83093712ba09120c48801324684f4243c0ccfe4 SHA512 6f45f5f954c3e3830b8f9b0fb72cf715cf88ab08f44b70d5f2a5143d35940c82aab0c7ac898f9f6bb0b13f94f706394449a917719b9b07d6daf709f8557af12a
-MISC metadata.xml 451 BLAKE2B 22dc3c0fcc0e1061f4060b8456e7f8686f40d100af79b6bef394eb1e9111aaa9b7b5762c94bb3b27464739328388dd56f02cb9813860acf23067148f03ef2f66 SHA512 4a22e7394227ddac2669e188e6b77170d41c30054a388def0a4d8ff2ff27de676949f4b8932d8d1adeca6c8570be3733da9983e173dc620298ed0bf3ea365ddf
+EBUILD more-itertools-5.0.0.ebuild 712 BLAKE2B d604bece2ddc6affa14b22ba61a5e9458b2587b9f6288d06907cbc65f63a0451c63d30ff797a211c01e9415909ea7df807341ae81b3a5c4fc5dd59c7b897cddd SHA512 33f408fa03b2bd114f683883952b142360f8ddbd5d9f728846eb2e268851c41df500ef162045ca7a2f0ce4db36b0435beaf4976142ce9d841182e3a1152c6df4
+EBUILD more-itertools-7.0.0.ebuild 658 BLAKE2B 6f762d19c7cba71bb2732f3fe8c3e6733e096a74d8256fce381d782efc0d89620f12d5bb1ebe4b735171ee5333fbfc7bb2df33bdb9e742542077099b9dd6e683 SHA512 4651a8ede77e7054732ad58a0d20ffd79db442ec4fc82a529f8fd9fd6968a744e62a75dcf4e43974de080f176a756e5d9dab422b8d8289d5c5d74cfe1fa97b23
+MISC metadata.xml 475 BLAKE2B de5a09fa0987ae45ca73d94cdf2ecaaee8b0f697e1cc4e1b535fd16f50a10460cd5a3293bc1a0633ab099c3ef07fc1ae0d99a2faebfe4117f0a5ab53837ac94f SHA512 3cccec99e9f80ef9751d2e19fc196a177f62a6b72ada30859fb8cc577fd362cac9b8261869b59a85ff1e8b4d9716daaf190cc97b3733f63e014d2e2c838d00e4
diff --git a/dev-python/more-itertools/metadata.xml b/dev-python/more-itertools/metadata.xml
index af8b864b2887..5da8c1c29648 100644
--- a/dev-python/more-itertools/metadata.xml
+++ b/dev-python/more-itertools/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">more-itertools</remote-id>
 		<remote-id type="github">erikrose/more-itertools</remote-id>
diff --git a/dev-python/more-itertools/more-itertools-4.2.0-r1.ebuild b/dev-python/more-itertools/more-itertools-4.2.0-r1.ebuild
deleted file mode 100644
index 2c5bcb663bf6..000000000000
--- a/dev-python/more-itertools/more-itertools-4.2.0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="More routines for operating on iterables, beyond itertools"
-HOMEPAGE="https://pypi.org/project/more-itertools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="<dev-python/six-2.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs docs/_build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	# Avoid ImportMismatchError, see https://bugs.gentoo.org/661412
-	pytest -vv --doctest-modules "${BUILD_DIR}"/lib/more_itertools \
-		|| die "tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/more-itertools/more-itertools-5.0.0.ebuild b/dev-python/more-itertools/more-itertools-5.0.0.ebuild
index e2afa9d80093..0c2400ec8f8c 100644
--- a/dev-python/more-itertools/more-itertools-5.0.0.ebuild
+++ b/dev-python/more-itertools/more-itertools-5.0.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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="<dev-python/six-2.0[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/more-itertools/more-itertools-7.0.0.ebuild b/dev-python/more-itertools/more-itertools-7.0.0.ebuild
index 3299bd222c16..cc5cb557ca25 100644
--- a/dev-python/more-itertools/more-itertools-7.0.0.ebuild
+++ b/dev-python/more-itertools/more-itertools-7.0.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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]