gentoo resync : 09.06.2018

3 files changed, 60 insertions, 45 deletions

diff --git a/dev-python/jaraco-logging/Manifest b/dev-python/jaraco-logging/Manifest
index ccff6b39593b..5776897bcf02 100644
--- a/dev-python/jaraco-logging/Manifest
+++ b/dev-python/jaraco-logging/Manifest
@@ -1,5 +1,5 @@
-DIST jaraco.logging-1.3.1.tar.gz 4589 BLAKE2B 7e0e410df62926f7f7bff9327d29d9e5ab02eb22855d07e9d3c13be655b1060eb0316cbae9018dd1fb34128308be039c05b0e9d6d6a435e5c86baca99584c6e9 SHA512 aaa2b29551a13358887e0747acb47ca2a6611ce1bfb08259bc70c7908929c4d2c45eefd7738e808b7b2404d723425efd69f9cb9601e0fb0c08f611bcf744ceae
+DIST jaraco.logging-1.5.2.tar.gz 7135 BLAKE2B 5235566df80008270f2f28101ab5df1d7fbc1446f138eb4cb851c9bb464b741c0ebb8528d3502130b5c557f30214ec27ce1ea563e09e78776e22d37811da21b5 SHA512 3299adc9c9ca6113198cddbc34147afe1bf453edee16a2d6bfcce64e63deeaff7f87beb74ff44f092435f3433a921b19167fb45778dce444512807357bce1661
 DIST jaraco.logging-1.5.tar.gz 5707 BLAKE2B 853d2747ab92754de4480871355180a33a7a6cbf69fc3d32ba489ecac27dc55ad92d94bfb84e411ee13400d82d162ea400be1027c3002f317a97e00b849484ec SHA512 18f267bd0c764f38ff5223d4fd6e08d7d9fa568691db285155d7b955c71439474fd84edd61b20d57f6eac77394d4b3ddf9b35d8e6ba08a2db5dd4b2ada6e0d68
-EBUILD jaraco-logging-1.3.1.ebuild 1049 BLAKE2B 5ba31c54343a76f46353e0f2e31c7a4c08451b2cc24bff3f36a398f2e03c52877b37cc9ab0c3ed9b4ef9e08b0736aaa088d2758b005accff136cdd30410dcaf4 SHA512 d6594e11324ddca1a0815e011b3f28fe5e4121eeac88b104ff3835d832434d4a072e6a8fa09c18e49dfa1218d3cc152a53a660b97676942c4042dc5ae28c4291
+EBUILD jaraco-logging-1.5.2.ebuild 1357 BLAKE2B 4410f834553bddfbb33251d14b01073d6d75b7c9b89aeba688b2045c5fcd22f2a5ee393a9a5855e7c7d681a5114acdc882a9944d425e95d40c8df024dddb8589 SHA512 9d07db885a3cc02496a4b2825961a5ad6ad3235296cc73c1b3db238f325fab7653bdab530b6faee7dda9eedd189c2f9582cb169c2fdb72ff8abab3f8853dd2d8
 EBUILD jaraco-logging-1.5.ebuild 858 BLAKE2B b3570b11464d1059a6e6c58ce8a0b73a59bceb2021f6f2e3011899b19ae9beaa4de057e47fb90150d21a0d085d1334863091ca8a8b988d7e619f63e60974d375 SHA512 72c358214ae4e6938551a57b808ca2b9c4f7f5c2cb184a53715882b80b5d6721765ea5ad7d0962076e0aeb66f082f61a26498f882f00de5740f21abc97663464
 MISC metadata.xml 576 BLAKE2B 54ebb6bc0dd498b193d88d7bbf58085f45b4a294c659a9736818bedc227a5770a97c7f01a185fb4bc0ea560c8761467d1815e0a45a380cc328bbb898f45c7dd4 SHA512 75626a3525ba84f6e657f2d05a442726c938baf4c1f356cabc935624bdd382b4a6c97a679464fdba11057da34f23a46037f215a781912fd66a11c37dd1d1a81c
diff --git a/dev-python/jaraco-logging/jaraco-logging-1.3.1.ebuild b/dev-python/jaraco-logging/jaraco-logging-1.3.1.ebuild
deleted file mode 100644
index 818e606076d6..000000000000
--- a/dev-python/jaraco-logging/jaraco-logging-1.3.1.ebuild
+++ /dev/null
@@ -1,43 +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="Additional facilities to supplement Python's stdlib logging module"
-HOMEPAGE="https://github.com/jaraco/jaraco.logging"
-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/tempora[${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-logging/jaraco-logging-1.5.2.ebuild b/dev-python/jaraco-logging/jaraco-logging-1.5.2.ebuild
new file mode 100644
index 000000000000..8cc0be38d7f0
--- /dev/null
+++ b/dev-python/jaraco-logging/jaraco-logging-1.5.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy{,3} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Additional facilities to supplement Python's stdlib logging module"
+HOMEPAGE="https://github.com/jaraco/jaraco.logging"
+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/tempora[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.9[${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
+		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
+}