gentoo resync : 11.07.2019

4 files changed, 65 insertions, 53 deletions

diff --git a/dev-python/jaraco-stream/Manifest b/dev-python/jaraco-stream/Manifest
index ec5b4a3b9933..b69ec2788d5c 100644
--- a/dev-python/jaraco-stream/Manifest
+++ b/dev-python/jaraco-stream/Manifest
@@ -1,7 +1,7 @@
 DIST jaraco.stream-1.1.1.tar.gz 6115 BLAKE2B 0994abe3c9688722c76e656e87166fa60d4bf45fb22ccc826227629bffb60fe0be78bb7a5f9f00b8766b5ce26d641d4b347d6c0fc73c426b424c230cb7d625b6 SHA512 65c8d1652a0d63506cc3cadee590664e6a99e2f770d26f0cea1dce07c54ffe308e1df8619bc728ea81c5ac43c9c6731fe9f71e5d38d2674c4e0d63d635bb5112
-DIST jaraco.stream-1.1.tar.gz 4887 BLAKE2B 6942db399e3821b176e5c966647aa9337e31dbfe533cbd790b9531fb943b1e5fdb05fa350e9dabdff00817e59b434a0770de32f871176dea34042acf6e2f368a SHA512 5af385084623fbdfe86e9fb620f49b097dee164638bc99622ba557a26cda591e856f1fc4134bc7b73b8f7b61afaf2607686fe20c59c582324a65c22f39d74a13
 DIST jaraco.stream-1.2.tar.gz 7696 BLAKE2B fcc1aa8d26da17635b9ee7c68c278ae572cbe36a108cb30f5eb98c7ebfd2255aad499bed38ea044b28e820646b92e64602db0e2cdfc430169035882f7b6abe9b SHA512 47a96c1de12eb64e250c85d97429218606dc9bb212cf7b97e579763dd901ee063711c00307b7442be400856d3fd4e5994afbe1cb91a99e233541ffd7ff4024b9
+DIST jaraco.stream-2.0.tar.gz 11061 BLAKE2B 86cc9958e11421fe839551e029f839c16a12b80d329466b44224d145be6c2a15a63d03f426a9b8d1510249ea6c129e892dcfec41a32dd5c3c3a3b66acc21030f SHA512 d379d07772d739abb275cfc8ed7809583c728af695294b9d12ae1276add360b9559de64104cd20d05d82a3250237ae1f6eb23420970a95e9fdf6346ef9312331
 EBUILD jaraco-stream-1.1.1.ebuild 1192 BLAKE2B 71d085e24d805d97caf77849d62b10b0e7f4f2556cda473b634f641f090aaccc25f3d30a3e8c490203261ae4dc2fdc86063c838c0140222c5615b96db895fbe7 SHA512 88a64fa37c0746fc097baa1648ddafb6a3db67932d501bcb9589843da6ed45a9bd0a404241c87ba8de764bec54fc28bb414c8944208f606310abacc24f0a1a5e
-EBUILD jaraco-stream-1.1.ebuild 1133 BLAKE2B 4e1b92869d7f6c6428b814982d88f1036f11b524a4b3249c06f39f1e5e93c33bfce207692681f20b1377551097bb11b3ab5357e1dbfe657e8682f55098abc1eb SHA512 16105edc8afa22ce6247bb5273613e0a8bf7700a7a10517e9a32c2a441503df5665ac7405f86b38f60c1b347c07b6bfc13929426660119c39004a35fb44d9872
-EBUILD jaraco-stream-1.2.ebuild 1410 BLAKE2B 01f12b34b211840e4dc21053e580ec907b5280231f326d5863691d75913b913e0e59fc69ef84d922c794ddb06e113649f10d26b737cf11f48288bb033f28dd33 SHA512 4d2f6161ded7347d5de963030da1487ee8dbe0a577ccc9a73c33813e0c297568eda2eeea08fdef8a443857c7b61dc1b7aed218e7733c2952f52e1b8d11faa776
+EBUILD jaraco-stream-1.2-r1.ebuild 1413 BLAKE2B ef4acb8ab97076a43f45876a442a729f84ec3743fb65c7c33c563bdba823dda0201cccd0b727925f7f5f275ded18ead25c78afb2650f0c7e1b311c9382984dc4 SHA512 1fcce9e3739cceb36cae502562afec74460f45dcf15d669af22f6aa81ae298547c0b791a90177e64ede1d2d9fb8217727752ffaa493ae98d377fe8a3f201f14c
+EBUILD jaraco-stream-2.0-r1.ebuild 1602 BLAKE2B 1764bf7db45a5a5af609f680e9c8a9c7beadb516f19b988a319b63a14c87cb86e18e2af7d1845a151147a7e4d13cf3b427cd97ca58e09e652b5bec8d752dd131 SHA512 db96e6822783569dbbe3fa2d7af8c24abaa233097596e03b0dbb60f8d70472a657e7adca4a918a07aef822f48c7b60bef0102aa1e11d9ee8b2d6ca0287dcf290
 MISC metadata.xml 602 BLAKE2B 3875bfb93914028b263ef5b6f7af81ee9f3fc08f1217537363a02b12e69f273ad9344c5078ea284ed5edfee1389bace975f2745379c3b4b17db4fbeee4045494 SHA512 3a6635e6f38260c76979248878ff326451273bab021f3e85c23a0ae7e29d71daa53ccfa319c8d8457faa00c6fdf5ad3dc68e0693e951ecdd419182f1861a36c0
diff --git a/dev-python/jaraco-stream/jaraco-stream-1.1.ebuild b/dev-python/jaraco-stream/jaraco-stream-1.1.ebuild
deleted file mode 100644
index e4a73334710f..000000000000
--- a/dev-python/jaraco-stream/jaraco-stream-1.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Routines for handling streaming data"
-HOMEPAGE="https://github.com/jaraco/jaraco.stream"
-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/six[${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}]
-	)
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/rst-linker[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	# Skip one test which requires network access
-	py.test --ignore=jaraco/stream/test_gzip.py \
-		|| die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/jaraco-stream/jaraco-stream-1.2.ebuild b/dev-python/jaraco-stream/jaraco-stream-1.2-r1.ebuild
index e3f8538a0b9c..6e61e406dd65 100644
--- a/dev-python/jaraco-stream/jaraco-stream-1.2.ebuild
+++ b/dev-python/jaraco-stream/jaraco-stream-1.2-r1.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 RDEPEND="
-	dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+	<dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 "
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-stream/jaraco-stream-2.0-r1.ebuild b/dev-python/jaraco-stream/jaraco-stream-2.0-r1.ebuild
new file mode 100644
index 000000000000..76b658301038
--- /dev/null
+++ b/dev-python/jaraco-stream/jaraco-stream-2.0-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Routines for handling streaming data"
+HOMEPAGE="https://github.com/jaraco/jaraco.stream"
+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-2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/more-itertools[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
+		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
+		dev-python/sphinx[${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() {
+	# Skip one test which requires network access
+	# Override pytest options to skip flake8
+	PYTHONPATH=. pytest -vv --ignore=jaraco/stream/test_gzip.py \
+		--override-ini="addopts=--doctest-modules" \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+# https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages#File_collisions_between_pkgutil-style_packages
+python_install() {
+	rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die
+	# note: eclass may default to --skip-build in the future
+	distutils-r1_python_install --skip-build
+}