gentoo resync : 11.07.2019

4 files changed, 66 insertions, 4 deletions

diff --git a/dev-python/jaraco-collections/Manifest b/dev-python/jaraco-collections/Manifest
index 60b5420a516d..de6b644849e6 100644
--- a/dev-python/jaraco-collections/Manifest
+++ b/dev-python/jaraco-collections/Manifest
@@ -1,5 +1,7 @@
 DIST jaraco.collections-1.5.3.tar.gz 11669 BLAKE2B 2dbcac99edf28f4544e354724f8d95c0cbcdd793b33bcf892b403e72410f3b5b72b6eae62a49f0e56991cfb19b4ad5da0e95a3327f11fe5ae885e9a0029a92be SHA512 6e1fa88b468b9d971a7a302ebfdf8b9762404c2fdc1b003eee6653704b9f385f0f2e0c84ac075bdc81f8693195781cc5532c4adb31bcabd87974624a14e287ed
 DIST jaraco.collections-1.6.0.tar.gz 11991 BLAKE2B 8f8b3da18641d6348a28ef3792afabd504771f31f1de17ebb621aff493cbb7357e11d49d8b3f4ab4fc7b9a662986d10a90d20734cd802c6d34be1d169390aa96 SHA512 9bd472b51668129f12fabb90b86ed929e135a17217bc850d67d945a786d1952cf1f11b0cd8f5d4ae16b3b19ac35cf87e0584df622877185362e93ba3915dbe6b
-EBUILD jaraco-collections-1.5.3.ebuild 1421 BLAKE2B 02b251a9d017823e5eba7278c1ca431fc685bf0ebe47216e4f1ce7ddfef0d5322488366337e3e79d37cb03fc8fe5d34de443627897764f19581b97f444c30293 SHA512 d6b8e77789101a43e8eeaf69e3ad069417a4005f21876a0fe0cfca4ea77f93f7ec9fe4d8be11c5dce67081b7e17e1f705adc95c772223a0607570ea300c80aac
-EBUILD jaraco-collections-1.6.0.ebuild 1423 BLAKE2B c25dd98b082297d35ee27ef47dbf8a081f6092f0ef1aac729f13ca40f2b38b22ce252dc2610b02e43d1be5aa1f50b273dbfc7e7da119d1568eadf02cd4bc2f6d SHA512 c948e38b5011ea0da8bc522b2434b5a1cfac56c8af79a8cda7f3f45936950ad25a636bd604451e85caef04d81a683525ddffc67e4fdd124b3e8bb8e19b957881
+DIST jaraco.collections-2.0.tar.gz 15102 BLAKE2B 61fa35070b2342f95b3e6e571417ab2cd62be439250d8f2077b379316488a4af62d943248bad80d0a72d9aab3010c6982fb4a51fa4ddc574ab72943e37ddeb6b SHA512 1cc3482bddf6647b7fd183f091db7fe89e9ad1ac416716a918626134835837c2ed29d533bc00052a514d64c94343a070b9b501984b3dcc5caac87066d9c335cf
+EBUILD jaraco-collections-1.5.3-r1.ebuild 1424 BLAKE2B 68756c48406db2d8eac445dcf29eb0b2697594d2868f5ce80864b0ee6542cc8cb80c705121e2460f8bde9db98be307d898edfec85840c42c976a217411161938 SHA512 c2be6e3d2ac5910ad1bda0da81403c31427e48383d6b32359525a2cd96ef61d766ca60d49ed80b10407964e49a56456bc2fb706ed934221471e1bb6be4cda8b6
+EBUILD jaraco-collections-1.6.0-r1.ebuild 1426 BLAKE2B 83ffd2b9c2a1638493655eace431cbc773701f73ff0863d489c6cee3fe66fb539d6de47441ed05979ff0ae2ce3665d56fc3bfb9be6e2b27781d99d13b8b4d8f3 SHA512 e26eeade216241cf611df10cb76ad8063f963e48c858e927577046dfb3d4d3ec053bd5c88c376a16db7f5e1522ad66e8d757472c72f7bbacd3d90bf5f9ae48e5
+EBUILD jaraco-collections-2.0.ebuild 1586 BLAKE2B e888ff4d24ff5541ed77a1cd480049a9ed9bd56fd4bea9e4ce5fa0e71811c41f6b00b04149bc37a3047ee4756bf749cb1488138e6cf7380fe9500acdb4d7741d SHA512 420cb499a3cdd767c025034aac18b1f4edff3d6c9b31a22cdbb2a78f4c7671947fb43bbb08cbc58658f1e29a0efc7b7229f7153c02695b578bf7fc0192eddcfd
 MISC metadata.xml 558 BLAKE2B 7952de571c053dd631177bfde7fa4904e4b37fc2a7ddeb3f17fb917d69d95b0103c9498f7f1e698bbfecba8c2df86616e0c7999b19e8c2af6ec83faf97fca8d1 SHA512 cf21f33decabe788873863bb42136123eb0dbf12527e75ebba2d06c4cb9a1b2b6d8e3def46829c1471e27a5e6b5d7e681272fae9fd58eed36294f90e21a92379
diff --git a/dev-python/jaraco-collections/jaraco-collections-1.5.3.ebuild b/dev-python/jaraco-collections/jaraco-collections-1.5.3-r1.ebuild
index c1d401f3dfde..d634de30137b 100644
--- a/dev-python/jaraco-collections/jaraco-collections-1.5.3.ebuild
+++ b/dev-python/jaraco-collections/jaraco-collections-1.5.3-r1.ebuild
@@ -19,7 +19,7 @@ IUSE="doc test"
 
 PDEPEND="dev-python/jaraco-text[${PYTHON_USEDEP}]"
 RDEPEND="
-	dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+	<dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 	dev-python/jaraco-classes[${PYTHON_USEDEP}]
 	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/jaraco-collections/jaraco-collections-1.6.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-1.6.0-r1.ebuild
index 5bfd4a68210a..b9c0016ba406 100644
--- a/dev-python/jaraco-collections/jaraco-collections-1.6.0.ebuild
+++ b/dev-python/jaraco-collections/jaraco-collections-1.6.0-r1.ebuild
@@ -19,7 +19,7 @@ IUSE="doc test"
 
 PDEPEND="dev-python/jaraco-text[${PYTHON_USEDEP}]"
 RDEPEND="
-	dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+	<dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 	dev-python/jaraco-classes[${PYTHON_USEDEP}]
 	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/jaraco-collections/jaraco-collections-2.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-2.0.ebuild
new file mode 100644
index 000000000000..d8aefffd0776
--- /dev/null
+++ b/dev-python/jaraco-collections/jaraco-collections-2.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Models and classes to supplement the stdlib collections module"
+HOMEPAGE="https://github.com/jaraco/jaraco.collections"
+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/jaraco-classes[${PYTHON_USEDEP}]
+	dev-python/jaraco-text[${PYTHON_USEDEP}]
+	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
+		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
+		dev-python/sphinx[${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=. pytest -vv --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
+}