gentoo resync : 22.10.2018

3 files changed, 61 insertions, 60 deletions

diff --git a/dev-python/jaraco-collections/Manifest b/dev-python/jaraco-collections/Manifest
index eef53fc59f12..50f4fb2b995b 100644
--- a/dev-python/jaraco-collections/Manifest
+++ b/dev-python/jaraco-collections/Manifest
@@ -1,5 +1,5 @@
 DIST jaraco.collections-1.5.3.tar.gz 11669 BLAKE2B 2dbcac99edf28f4544e354724f8d95c0cbcdd793b33bcf892b403e72410f3b5b72b6eae62a49f0e56991cfb19b4ad5da0e95a3327f11fe5ae885e9a0029a92be SHA512 6e1fa88b468b9d971a7a302ebfdf8b9762404c2fdc1b003eee6653704b9f385f0f2e0c84ac075bdc81f8693195781cc5532c4adb31bcabd87974624a14e287ed
-DIST jaraco.collections-1.5.tar.gz 10615 BLAKE2B 4331a1df4a1232817e5bde97ce22b019ecb50711c0f4dfd18d050233b820a51c420719ff2a0d013e60da4710a63ab34293ee15f091b86392ec0d5e36e8262880 SHA512 7e2d3849d26422d687cfeb560f8096fb099a9c7b99b3061a06f9ad7037c3805b577754f62e5d5ead3f6f89bcd7dbf574df2844aa3c28928941ea2c99d50fc161
+DIST jaraco.collections-1.6.0.tar.gz 11991 BLAKE2B 8f8b3da18641d6348a28ef3792afabd504771f31f1de17ebb621aff493cbb7357e11d49d8b3f4ab4fc7b9a662986d10a90d20734cd802c6d34be1d169390aa96 SHA512 9bd472b51668129f12fabb90b86ed929e135a17217bc850d67d945a786d1952cf1f11b0cd8f5d4ae16b3b19ac35cf87e0584df622877185362e93ba3915dbe6b
 EBUILD jaraco-collections-1.5.3.ebuild 1426 BLAKE2B ad973ab473d0cc84679f9338fcc5f1a3d0f30a29232c67d1e68353213d8fee7ae4ddd0d5625108540f4b9cb4260e4b81a94e769765bf97917571d1969b0e39e6 SHA512 1a57784f212c32a82cc16f748ecbf35b92e2e0b04c348f5003787a5040ec509d4f7714d15811a40941be73f4a24111fef16955be7d05284b6cc078d89d6f262d
-EBUILD jaraco-collections-1.5.ebuild 1402 BLAKE2B ea6bb23d97ca077a13ef637cb68af51d165b8f8b3319fa4d35c279413793e1aa3104fbee394f35b464ff39db264e94d63966e6ef3eaff1d369f9d02baef52666 SHA512 a48e9c9a8918ce2734bf0d2ad37e9ef85353bb502a057e3f3ce63d97ef0e9871fd086c36219452788c9bbcb29e4e0c90aa4094c4cca11360bc645e81c7c30fdd
+EBUILD jaraco-collections-1.6.0.ebuild 1425 BLAKE2B 4637fc3a51a5284dba54125afb0742c76ac6bb34d84280a8461d6015c01ea5993b329aceb2d2ab6081112ea603a8e391ca5d0a7310d399e7272f2bbb7b384f01 SHA512 d3c0610357fa18d0be4c242fd761923e2b44a59f5c484c3e770d5960568b2500622cb2b55e2648c4d42e4f2d603999961950e76adf7144af63ca48cf9ef70df9
 MISC metadata.xml 558 BLAKE2B 7952de571c053dd631177bfde7fa4904e4b37fc2a7ddeb3f17fb917d69d95b0103c9498f7f1e698bbfecba8c2df86616e0c7999b19e8c2af6ec83faf97fca8d1 SHA512 cf21f33decabe788873863bb42136123eb0dbf12527e75ebba2d06c4cb9a1b2b6d8e3def46829c1471e27a5e6b5d7e681272fae9fd58eed36294f90e21a92379
diff --git a/dev-python/jaraco-collections/jaraco-collections-1.5.ebuild b/dev-python/jaraco-collections/jaraco-collections-1.5.ebuild
deleted file mode 100644
index 708280d2b630..000000000000
--- a/dev-python/jaraco-collections/jaraco-collections-1.5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 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="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"
-
-PDEPEND="dev-python/jaraco-text[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/jaraco-classes[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/rst-linker[${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 "dev-python/jaraco-text"; then
-		die "Ensure dev-python/jaraco-text is installed or the" \
-			"test suite will fail"
-	fi
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	PYTHONPATH=. py.test || 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-collections/jaraco-collections-1.6.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-1.6.0.ebuild
new file mode 100644
index 000000000000..e604a649977d
--- /dev/null
+++ b/dev-python/jaraco-collections/jaraco-collections-1.6.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{4,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"
+
+PDEPEND="dev-python/jaraco-text[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+	dev-python/jaraco-classes[${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? (
+		${PDEPEND}
+		${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}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}