gentoo resync : 30.06.2018

4 files changed, 63 insertions, 48 deletions

diff --git a/dev-python/jaraco-itertools/Manifest b/dev-python/jaraco-itertools/Manifest
index 73ac0b96f69e..cdcb39d8d8fc 100644
--- a/dev-python/jaraco-itertools/Manifest
+++ b/dev-python/jaraco-itertools/Manifest
@@ -1,5 +1,5 @@
-DIST jaraco.itertools-1.7.1.tar.gz 10224 BLAKE2B 11f22156736f283604d75aaf48975a483be972ac3b1feabead224c4a323575c3978429638ada7c82037f9cbf9ce3a966a535acbdffdfdf880ebb8db152506cf4 SHA512 e149de3368137db4379d02858be0cbb3b6dc1e81cc06eb0f53064a55c8e25fb09b2b4387035dda29928bdf54e22d28c9d9744dfbd82a6cf4e4c90b5d42b31dfb
 DIST jaraco.itertools-2.0.tar.gz 11158 BLAKE2B 4fe42711819e5aca6a8995037ba05f4858e14cb55ed0fc2d54d805e00b5c12229cb2148d515179e4b7c14cdfe64e4162b1891481b0906fb96d832c155af758a3 SHA512 56877e141da1c79499dee2e3cfd15a81f07d6cf6fa1ee88f4ae387423d91106f41c1787fecc194755fddc521d6284763cba93083904e67d548c053d1584a4438
-EBUILD jaraco-itertools-1.7.1.ebuild 1090 BLAKE2B 0c6c4bf63752f38f799eeb220e5d06119d1b75a864b2dcd15bed5eb0a47aaed6b651c12aee76ec76b3326b2f170c96ff43db6a9564e4156f69f15cd51efa39b5 SHA512 91fb4ccb095c07117d75693cfaab37bd92fc8dcd371233b9eea4635800b18027d41277c19dd4eaf3ad5d48452d4ed138d6e37c2a01822c46ff1e6de5c1388ef7
-EBUILD jaraco-itertools-2.0.ebuild 1182 BLAKE2B 896434a9dd7300f34357b0b545529e7e78c33be0cf3a8f6bf1df82f6c192d538aeba3a7a97f95b05e207c7a69207ebbda129315cf9d50d6d3c30520d690ad22b SHA512 768bb6ab73af637d0afc0ad8fd4c9b335060193980d0b1abac9989328ab1630e48c1b2d1d31a323cff474174097ec9e0fbb9be893c31cca00e26b8c806122674
+DIST jaraco.itertools-2.3.tar.gz 12857 BLAKE2B 714b123965af3ff593205aab373f3097709729377cd867ca2a7ccbb7795b1818f47b0b316d4c927c9aec4eb66fe1da63b44c1d60db310dd97b5444b01f7db04d SHA512 070a442531fd079fefcb61bbbdb0cc98bc88cbc5f23f6cb40ee1fafbc9a259c69e0a373e949ab54d22836f54b0de41e1b09d10692f92d18030825ca09345be48
+EBUILD jaraco-itertools-2.0.ebuild 1193 BLAKE2B 111e94c946da7087a7a1b5c3ecb83e8d9df1ab0f6390e10a99f720028295103c8b6133681b1b82e92c106c2f7a7b53ec9927b0a1ec2696173b0cf3f2bd7004b5 SHA512 490183efc353196436f30c3900e37587c1027395a3831e052ce7fd66f95f654e9352ab08aacc69011e4ae0be3a79361c3b6b6ff5ce426affa73c959e80ddc980
+EBUILD jaraco-itertools-2.3.ebuild 1379 BLAKE2B b39cd7ab1498d29c82fad5dcded173edd67f6558e43a2dda7c1cc08b88272c9cdc0674357b89b8ea6e660c0264550214d4bba12446bd1aeb0c8ded05c4945b62 SHA512 a6639595b6e83be1e8e8df346b47d2c365e344e7e6d6a78214e213cc2dec8b8b48c66ed294d95024a9cf541bff26967ef64b7eb707b38639af0c5d9695bb6da0
 MISC metadata.xml 550 BLAKE2B 9a0db00bf8d20a8942cc362092d64aad0a91d47e54fc5a7c3a6d444defb32a1045f0993d3ad2c61f6edbf059c633388ff4109e71af3454824631e79388bcc5ed SHA512 f60f044460ba89008629bbde7c052af0159ad7044124606a7cddbba403c9a20bae9b91839ab76e48e1b0481f2a6cabdbc4ca0e00e636955e2149f5ebddfd964c
diff --git a/dev-python/jaraco-itertools/jaraco-itertools-1.7.1.ebuild b/dev-python/jaraco-itertools/jaraco-itertools-1.7.1.ebuild
deleted file mode 100644
index 885d69ea24af..000000000000
--- a/dev-python/jaraco-itertools/jaraco-itertools-1.7.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Additional functions used by other projects by developer jaraco"
-HOMEPAGE="https://github.com/jaraco/jaraco.itertools"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]
-dev-python/inflect[${PYTHON_USEDEP}]
-dev-python/more-itertools[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_prepare_all() {
-	if use test && has_version "${CATEGORY}/${PN}"; then
-		die "Ensure $PN is not already installed or the test suite will fail"
-	fi
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	PYTHONPATH=. py.test || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/jaraco-itertools/jaraco-itertools-2.0.ebuild b/dev-python/jaraco-itertools/jaraco-itertools-2.0.ebuild
index 7c1d7c48359e..e75c202a52be 100644
--- a/dev-python/jaraco-itertools/jaraco-itertools-2.0.ebuild
+++ b/dev-python/jaraco-itertools/jaraco-itertools-2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 
 MY_PN="${PN/-/.}"
-DESCRIPTION="Additional functions used by other projects by developer jaraco"
+DESCRIPTION="Tools for working with iterables. Complements itertools and more_itertools"
 HOMEPAGE="https://github.com/jaraco/jaraco.itertools"
 SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
diff --git a/dev-python/jaraco-itertools/jaraco-itertools-2.3.ebuild b/dev-python/jaraco-itertools/jaraco-itertools-2.3.ebuild
new file mode 100644
index 000000000000..5b41f37dad65
--- /dev/null
+++ b/dev-python/jaraco-itertools/jaraco-itertools-2.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Tests fail with PyPy and PyPy 3
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Tools for working with iterables. Complements itertools and more_itertools"
+HOMEPAGE="https://github.com/jaraco/jaraco.itertools"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/inflect[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/rst-linker[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs docs/_build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	# Override pytest options to skip flake8
+	PYTHONPATH=. py.test --override-ini="addopts=--doctest-modules" \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}