gentoo resync : 16.06.2018

3 files changed, 60 insertions, 43 deletions

diff --git a/dev-python/jaraco-classes/Manifest b/dev-python/jaraco-classes/Manifest
index 9546313a7256..21ef50c58138 100644
--- a/dev-python/jaraco-classes/Manifest
+++ b/dev-python/jaraco-classes/Manifest
@@ -1,5 +1,5 @@
-DIST jaraco.classes-1.3.tar.gz 4095 BLAKE2B eb53b494f528ff1aac1fae550ac0460cbddcfe2e4e599139c6800a589150015db7dfe5e8ff06ba1963e3a799bbd53588231c79d64ee4160335885b0c33a1e9b2 SHA512 abd60444066b39894f21032004010eea9b3b56718eaadffa1c66fc7d66d281d34d0ae76445dc6174e0a07e0d4dfca97e181048a4eea47ee20dae1d902265c32a
 DIST jaraco.classes-1.4.tar.gz 5171 BLAKE2B 193333a9a543328b6f781888ba7a6ae3cf0b1ae7cab078c9da65a1ed26cc71164aa06a31f2495b62c7d7a388b6fc075e97c7af58f7d67bc0ecc1785f9c7056dd SHA512 d434b470424c104f91e9a4a5e3a1f2109b919a35edf45540ad1ef8600f0b10864f32aefb411d747e13b5d99ba06601ea7abe5032e24e5dc6b25254b4e68f8a89
-EBUILD jaraco-classes-1.3.ebuild 975 BLAKE2B 4c5cf5506dfa95e919e6f1bd3600d8a18ae7a4d68c27463d99e98af5173542ed8f9c4bd162544fc16b665e0540ab16177d3a8d50f584da5c771e25bfe4caa172 SHA512 8ddcc1ec468b05ebfafbe9dd604e7a7e9f49faa79885062b40fabaa0e0b07718b1f63e57da32945418e0c475090beead76fe86801d5b898632155ab044ced44d
+DIST jaraco.classes-1.5.tar.gz 6710 BLAKE2B 884e756c7bff272a0b35d9ef8cd30538eba793e6d838b7bd409a59fde9539776906aeb95a456f7095178ce0623e20634fe1a09a8f3515d4b661bf702480cd934 SHA512 8fe3d40863424547e5396fd6a2b4ef3f27a92185ca82206bb88de2716419a9c2dc917fc945c732d5dab1a1795727a12014e0bbaceee7834896351de05491f99c
 EBUILD jaraco-classes-1.4.ebuild 1073 BLAKE2B 583bbfb1f6f7f4addf8eeceb599d2cfb625d95272f8ba0f2f4c46bde2730aee33cf166d575ca6aeb8af8b69b139ca0ea5ef62bd3adbbdccac34df4f5b83da495 SHA512 382382cc08370724725ad39d54919b58e53e52b1f4ae191fe90bf07a3a77c9755dd20c4e63f6d453a979251279d124bc67c882dc9e58c2383ab1d84c35be0524
+EBUILD jaraco-classes-1.5.ebuild 1325 BLAKE2B 4fbd588d4dab35c12d2d264ddcfaad459815b3ae0de76af656cf52e7d9c99ff4398a98a8b03d5e28d518e621d92f2f99d4286a46491c2854de17fd461821de2c SHA512 337891791d2124e4b1920a35368746302060860933986b3124e602348474871bab0ba17c727817e4b189be26b529bd854d020bf94cc13d53d8184031a782ca0e
 MISC metadata.xml 576 BLAKE2B 87bd2e393fabcbba8c6a9913ce1e57d6c4ac1c93fdaf8913ef3a073d600cfc45046037bb5ad66fcb16deb184c4867dd855818354188298a6acd95097d3320c63 SHA512 15421c155e166e85d127519a5b34c0dc5ec3b7709aeb55f7f10189d40e58669afb9e7d2f414cd9547b7f02c2e5daf9136eceff105b7cd01716ed7ef5d9398e3b
diff --git a/dev-python/jaraco-classes/jaraco-classes-1.3.ebuild b/dev-python/jaraco-classes/jaraco-classes-1.3.ebuild
deleted file mode 100644
index e7c012b3473f..000000000000
--- a/dev-python/jaraco-classes/jaraco-classes-1.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 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="Classes used by other projects by developer jaraco"
-HOMEPAGE="https://github.com/jaraco/jaraco.classes"
-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}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/hgtools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${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-classes/jaraco-classes-1.5.ebuild b/dev-python/jaraco-classes/jaraco-classes-1.5.ebuild
new file mode 100644
index 000000000000..a67ce26fd3b7
--- /dev/null
+++ b/dev-python/jaraco-classes/jaraco-classes-1.5.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
+PYTHON_COMPAT=( pypy3 python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Classes used by other projects by developer jaraco"
+HOMEPAGE="https://github.com/jaraco/jaraco.classes"
+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}]
+"
+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/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
+			cd docs || die
+			sphinx-build . _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
+}