gentoo resync : 11.07.2019

3 files changed, 64 insertions, 2 deletions

diff --git a/dev-python/jaraco-logging/Manifest b/dev-python/jaraco-logging/Manifest
index 654d8bf143f7..7e73b2a79c89 100644
--- a/dev-python/jaraco-logging/Manifest
+++ b/dev-python/jaraco-logging/Manifest
@@ -1,5 +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
-EBUILD jaraco-logging-1.5.2.ebuild 1356 BLAKE2B babb784b85c448b0f7a2d03ec7c3a8ca88e2959a7dd2320c4ca1bbe514938b12b1d65aa21691b5aa9a224d6951fe21bfac0a12f3071d1b5649b46af20f30d61b SHA512 d61e4bd9ad3af901a43c793e695a6b332288a90c44cef2158cd830030e48667ec995e7efcdbb7c0d2487f6095d51502d31cf6aea98508803056dd8e4b4309487
+DIST jaraco.logging-2.0.tar.gz 10356 BLAKE2B a7522fa9895784a68c8c0af265ad5a82ba27f69e90a17ba18b4a579e1ca5785ad11b7718273adb33661e45e780876b885b581af1b4518ef5322c077ed76242ba SHA512 9262575c3071f78ded2284ebef3a1a80c8ffd60addecf9b215db04471672bd892f6c6bd06a84f9a82e872adf31d45d4eb3faa2884815fcce608840821f49954e
+EBUILD jaraco-logging-1.5.2-r1.ebuild 1359 BLAKE2B fad22b9122ba166c87de312af48ddd2de975ba269b1ad1b48b8445b235373d893e76b95eb82f4da52df82884a068349068185681a5f989090b2431c11dcee974 SHA512 e0caed22a91ebc7d15c410355738bd63433b44409ce57eddd653862f76912463d7060af306bfbff5fd7299b0e831b488eeaa21adf33a3e143dc6b79479abbba1
 EBUILD jaraco-logging-1.5.ebuild 851 BLAKE2B 7768b77cabd46afa77f617e019217e5e14f5ea51a4ed0d1fadddaf499661e3af469d25b661af19cfed36e883c1f3e59f5f28c7d338045177fbbf0e1849b77586 SHA512 e3abe23b3d4d2a567b92c102a6de65a2f6300ec2cd59feca8004c04b9e7db082f52923575936063c4b54622c861e71570b56f059986769e6c83fa874b95092d3
+EBUILD jaraco-logging-2.0.ebuild 1544 BLAKE2B a32f079bfa9d860c33a15f2351dca6a62c0de833c7f179ce9687b313fdf63a9a171632e9206f727817f65ec228b39633035989d1b0028d7f448c4b29184bf8ba SHA512 0c6654cb26dc8c8b1b8351cfe4d0ae65386b1acfc3685c1796679d3a4a95570f7f093ba3632895a82084d58184d8f4652ee7f351fe2bfeca0f3c4f88e1457b8d
 MISC metadata.xml 452 BLAKE2B 6beacf543b6c6ba9482609f0374283438dab3bff1ba25c53f1ec6c6441ddd0e185336766eaaae3ef89277874c6f12652a68b79a934919c8fe70f8bee88872b43 SHA512 447053b09d211ddbe1b2e98f7c1379395291f1331c75837ba1dc036a3b5d1e05e1f78717c419c4dfdc7d687001992f4c926cfc61bf267aa925024180646a3296
diff --git a/dev-python/jaraco-logging/jaraco-logging-1.5.2.ebuild b/dev-python/jaraco-logging/jaraco-logging-1.5.2-r1.ebuild
index 34cdfb17674e..b2ba8ab3c09a 100644
--- a/dev-python/jaraco-logging/jaraco-logging-1.5.2.ebuild
+++ b/dev-python/jaraco-logging/jaraco-logging-1.5.2-r1.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 RDEPEND="
-	dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+	<dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/tempora[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/jaraco-logging/jaraco-logging-2.0.ebuild b/dev-python/jaraco-logging/jaraco-logging-2.0.ebuild
new file mode 100644
index 000000000000..391cef5963d8
--- /dev/null
+++ b/dev-python/jaraco-logging/jaraco-logging-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=( pypy3 python{2_7,3_{5,6,7}} )
+
+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-2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/tempora[${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
+		cd docs || die
+		sphinx-build . _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
+}