gentoo resync : 16.02.1018

4 files changed, 43 insertions, 48 deletions

diff --git a/dev-python/more-itertools/Manifest b/dev-python/more-itertools/Manifest
index 62d2d140a8ee..5e9f139fb87d 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -1,7 +1,7 @@
-DIST more-itertools-3.0.0.tar.gz 37622 BLAKE2B dd1806f4359406ac0a57a8eefe8d6c31033177e3f1b4fd297dfcdb525df6bd5725ff16f25abb1957dcb1cacb21bf1d037a3c9def9e9469904efbe2fd336cf5b4 SHA512 575de991b6337e6416489d92b41201536397d84ff41030a2cf09ea57cc994e03dcb4dd19eda321243ceafd49c11271da43a4c4ed5a9261cf771f0b7f8e40345c
 DIST more-itertools-4.2.0.tar.gz 56871 BLAKE2B 48cdba3eebea94483c5cfd9530d4bd2cacd02e893b87482a01ff1fdf10336f3c2a40d32fbb935d38320c9c47a1fd1942a48ea12ff07ae56793ecc5870fef2452 SHA512 7e205a575fb1d17ed3be9225c5c60139db41cc4b866f6d6732c955536b1d606bb7ccd92ad77e41159965abbddec3a85761d3649c28f06d52afa8476160d70e77
-DIST more-itertools-4.3.0.tar.gz 63266 BLAKE2B fcad717550931f267594f0e338def6e8d6119f28452ed8654b9e3ca073c4219f78d58d691855c4f6b4817afbe94d176077c342fe9b57ae522bc113049da97b57 SHA512 5fee3d99fd796b0f0f6b5aa99a8db22e219d3dced71fef6f4b16286fe67061dce280389b3638c55c6e5f6c828ef1286cee845d76a6861d2af66d90e995d5aa4e
-EBUILD more-itertools-3.0.0.ebuild 943 BLAKE2B fee0e2ba67b0b5ae02665f090be10fe7f9a1610c72857b4ea56b44b4709e0af7f93ebb48b9d12279e9e9e77825868e4338d7e6724095ccdab7d17e49e88a3fd0 SHA512 7e3546efeadde855f65e9aa5b751e0186ee33125544d8a0683ebe5e3997bb00f1e150d35df184019e2df26230cb4b50562bd2b10d2d6745e202ab70957913167
+DIST more-itertools-5.0.0.tar.gz 67359 BLAKE2B a2448b218eea4442cc4739a4df414ba69e0530cd6206a13c5c017a13daa297d00c08a94cec8aec0639d8b03663f4b698702f5e700ae118ae9fb5854a6d105b36 SHA512 f72c8d6c75799c39708443ba75862801ddd3fc0382c9eee7ed24ecf04cbc7d9ff6a8e35b6fff1eaccf45ddd470c2cc8959532eca32c2ff50b0a12588727c68b4
+DIST more-itertools-6.0.0.tar.gz 68178 BLAKE2B 64a389cfd3449c4711228fcd3092f6d7f62968aeaf0574fcce4bc3223da8b7633d0cbdd727cf4d56f536aa925dbcf78b6b8c3a2a3ba3ef8a0b677811367d087a SHA512 68ac1829a1a27d3f1de1f95c33a9c3f236fe80f597b9183707de0d9cd193ca5a662080e64c54c376ae59fd0a3a224ac62a9d39be4d0ba425103c4fd6e93e61ac
 EBUILD more-itertools-4.2.0-r1.ebuild 1060 BLAKE2B 10360bca9acf96e9635f98f4aba1dd49b65b607cefcfd6eca8102069972093b638a46a4224c6b68420eb45d6a687f1e66fc8688a5857c72945186d826e23255f SHA512 cfcd1e13aea98418912ae9937a8edf3f7a10988ceb836dd0e251c0d274a8eee2826dafc53ec5d09eae089f0ae8cc852f5b7c64c9184654e89d2e365a0c014864
-EBUILD more-itertools-4.3.0.ebuild 973 BLAKE2B d23fe81c2d9f94021bafc39fbc82751cb1e5af4b913ea05b83eb93da66a3c65b6d7090d046c08f6d3f1ce00f96dd17e017a0d5c3fd1b314fd58dda8f10076505 SHA512 dbc0f68bda24d67d0ccdb8080c1c4d49769171ecc2759648075967a5dcee83a45d9c48a65c34804f6858dfd0032c64e7b4b61ef294cca0091ce5f49bf85245b2
+EBUILD more-itertools-5.0.0.ebuild 986 BLAKE2B ac405deb88b19349ec602cfff8a1cefbf4b06e3ad83ead10b11e3ba86919969eee2eb903228c07f197b42e30fc0bf9e117e379f151c824c2a11b5c54da6a5988 SHA512 eb79b70d2a551641fca10756514edd1b895b0572dd43272c674b0fca2a8148d63c89fdb93a16bd391dca9eb21781d0c5e9d157dcf14171fbff2ae0b4c8082ca9
+EBUILD more-itertools-6.0.0.ebuild 913 BLAKE2B 28b63906e3b8f643a4b527d854f4b27419916a58faa2386599e1a64089b078d350855f87b51affeaa43360ce490ee8c65915e92aeaa26d9ea07ed0249db5e269 SHA512 34473c3d501aa19f0a2abe45dabcaa8c4bb927be1b69b18ade98999eb4ffad82ae515a091cd3647747503fd8000f2476d3ecd30cc8a2751348795330b6a9c5c4
 MISC metadata.xml 451 BLAKE2B 22dc3c0fcc0e1061f4060b8456e7f8686f40d100af79b6bef394eb1e9111aaa9b7b5762c94bb3b27464739328388dd56f02cb9813860acf23067148f03ef2f66 SHA512 4a22e7394227ddac2669e188e6b77170d41c30054a388def0a4d8ff2ff27de676949f4b8932d8d1adeca6c8570be3733da9983e173dc620298ed0bf3ea365ddf
diff --git a/dev-python/more-itertools/more-itertools-3.0.0.ebuild b/dev-python/more-itertools/more-itertools-3.0.0.ebuild
deleted file mode 100644
index 337eb39858c8..000000000000
--- a/dev-python/more-itertools/more-itertools-3.0.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy{,3} )
-
-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="amd64 ~arm ~hppa ~ia64 ~ppc x86"
-IUSE="doc test"
-
-RDEPEND="<dev-python/six-2.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests -v -w "${BUILD_DIR}" more_itertools --with-doctest \
-		|| die "tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/more-itertools/more-itertools-4.3.0.ebuild b/dev-python/more-itertools/more-itertools-5.0.0.ebuild
index 4528d7a54516..2645ba7f5b53 100644
--- a/dev-python/more-itertools/more-itertools-4.3.0.ebuild
+++ b/dev-python/more-itertools/more-itertools-5.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 RDEPEND="<dev-python/six-2.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/more-itertools/more-itertools-6.0.0.ebuild b/dev-python/more-itertools/more-itertools-6.0.0.ebuild
new file mode 100644
index 000000000000..ba8a123f9b57
--- /dev/null
+++ b/dev-python/more-itertools/more-itertools-6.0.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{4,5,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 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc"
+
+RDEPEND=""
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+"
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs docs/_build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v || die "tests fail with ${EPYTHON}"
+}