gentoo resync : 15.01.2020

5 files changed, 60 insertions, 45 deletions

diff --git a/dev-python/jaraco-logging/Manifest b/dev-python/jaraco-logging/Manifest
index 22d1b3254900..780b74a9428c 100644
--- a/dev-python/jaraco-logging/Manifest
+++ b/dev-python/jaraco-logging/Manifest
@@ -1,7 +1,7 @@
 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
 DIST jaraco.logging-2.0.tar.gz 10356 BLAKE2B a7522fa9895784a68c8c0af265ad5a82ba27f69e90a17ba18b4a579e1ca5785ad11b7718273adb33661e45e780876b885b581af1b4518ef5322c077ed76242ba SHA512 9262575c3071f78ded2284ebef3a1a80c8ffd60addecf9b215db04471672bd892f6c6bd06a84f9a82e872adf31d45d4eb3faa2884815fcce608840821f49954e
-EBUILD jaraco-logging-1.5.2-r1.ebuild 1386 BLAKE2B 362629e91e1816ed16045b5ac3a8029cb705067f69cf4863fd56ebf410ccfa549862113c7b64aa0de324595b349cd1713b75dece8e05a62af53641cf378ee2c2 SHA512 69f962ff702c39e6510a11eeb4c0ea23c5247883472d4f8ab3615638e4b1a45d82be39bbc59031c6694e4199bf3a980c917f502a5ffb019d4b14a4e062eb293e
-EBUILD jaraco-logging-1.5.ebuild 878 BLAKE2B 2c9fd71c2d9601e9cb0275d62319d6861e92f1babf0b5794b727cde076f010ec0f52a4343c3129e3b9178bc11969eff2fb4db7e01c2ea586ed479c2a7e3599f4 SHA512 a6e6d8d93076712c950b7c64ecc7590f55e54712792f9732c9171d45b54342117f835bb7a8255d009f792e0e05cffa1797cfbdf6e48b656661ce9221bbafbf2c
-EBUILD jaraco-logging-2.0.ebuild 1571 BLAKE2B a2c73489c6e89f2114192f15f149734fb7f5a8c8c7a36b98fcc3b267d9f00eea9688336f4fddcc18bb2b5b712da0756e642384f595d54de181985ae7496908c2 SHA512 bfcac8aaf2a29dcefa08bb489f23b73b3095a7d4f3525d7bc59186fddf6bb839d8288c49e351bbda1cc961e00c52b9f1004c4321ddae4987f7ed779f98396ef0
+DIST jaraco.logging-3.0.0.tar.gz 10739 BLAKE2B c5cad0b6d7702a1216869dd0cd388d51a0a8e7bd24000108ef818623b54d23ce1adf0de2e017b869d764342484bf25d676ee18af9647b82964933ebb184cec0e SHA512 bc0edeef6223d0eb78110d51159a70afd16542e830e3cd37dec7628e582bce44218cd7669c03c41125db9824b6fc774f608dd7f6540224659f4dc2f1927d681c
+EBUILD jaraco-logging-1.5.2-r1.ebuild 1384 BLAKE2B 5e87332125522e8583b671b1a3f8a60a3f31044f49aaa0afbca09417311b482e7673e0f13c47b97161248549130d44d4f0c713b51289352d94e00ad34e1e9272 SHA512 fe4c5c76c3162a7b7f1de757cb7478a36a19987342444df848da6d1150aa48daf71203928f9e0aefbeb27bacb45f16bf1059f3503a088fb47ef142bd0702e3c8
+EBUILD jaraco-logging-2.0.ebuild 1569 BLAKE2B fd0950a3c3939ac044bbe7236b80680527f2283636af20a40aca8a9d4e713f44db3423641008eee2fe36e2622ccf1831a8f8804df1cea81c83574d12ffe32f3e SHA512 30c4372a90232f9a48730da57022cb1daafa9fc774df88be2cc9e8eaa189662d335eecbdcc9e692660f608d1f501f0224b7b582ff1cf0416c746971fd474036e
+EBUILD jaraco-logging-3.0.0-r1.ebuild 1402 BLAKE2B 54955bfa8cfc01e8d04e561e3db5ca8479801745b3eaea6906a0668d058d92727a66d742577b00fab483cacd8b8ca207611cab7af759b4e1f090dfc1dc3838e9 SHA512 057685a710de19477fcdfefd2be91bd71004985d060305a1365ce315adde539ba5fbda053aa9e8c9eb0bbb43b6420375fe8b9bf796a92be58e8ecb4235dcacbd
 MISC metadata.xml 452 BLAKE2B 6beacf543b6c6ba9482609f0374283438dab3bff1ba25c53f1ec6c6441ddd0e185336766eaaae3ef89277874c6f12652a68b79a934919c8fe70f8bee88872b43 SHA512 447053b09d211ddbe1b2e98f7c1379395291f1331c75837ba1dc036a3b5d1e05e1f78717c419c4dfdc7d687001992f4c926cfc61bf267aa925024180646a3296
diff --git a/dev-python/jaraco-logging/jaraco-logging-1.5.2-r1.ebuild b/dev-python/jaraco-logging/jaraco-logging-1.5.2-r1.ebuild
index 3d50cddc4334..ada9b1c5b8fc 100644
--- a/dev-python/jaraco-logging/jaraco-logging-1.5.2-r1.ebuild
+++ b/dev-python/jaraco-logging/jaraco-logging-1.5.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jaraco-logging/jaraco-logging-1.5.ebuild b/dev-python/jaraco-logging/jaraco-logging-1.5.ebuild
deleted file mode 100644
index d0254baf0f62..000000000000
--- a/dev-python/jaraco-logging/jaraco-logging-1.5.ebuild
+++ /dev/null
@@ -1,37 +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="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"
-RESTRICT="!test? ( 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_test() {
-	PYTHONPATH=. py.test || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/jaraco-logging/jaraco-logging-2.0.ebuild b/dev-python/jaraco-logging/jaraco-logging-2.0.ebuild
index d8619de4e9a9..64dc195c0301 100644
--- a/dev-python/jaraco-logging/jaraco-logging-2.0.ebuild
+++ b/dev-python/jaraco-logging/jaraco-logging-2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jaraco-logging/jaraco-logging-3.0.0-r1.ebuild b/dev-python/jaraco-logging/jaraco-logging-3.0.0-r1.ebuild
new file mode 100644
index 000000000000..f2dc6af3ffac
--- /dev/null
+++ b/dev-python/jaraco-logging/jaraco-logging-3.0.0-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+
+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"
+RESTRICT="!test? ( test )"
+
+# TODO: remove six
+# https://github.com/jaraco/jaraco.logging/pull/1
+RDEPEND="
+	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/tempora[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs '>=dev-python/jaraco-packaging-3.2' \
+	'>=dev-python/rst-linker-1.9'
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+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
+}