gentoo resync : 11.07.2019

3 files changed, 64 insertions, 2 deletions

diff --git a/dev-python/jaraco-classes/Manifest b/dev-python/jaraco-classes/Manifest
index 64afebe1e28c..159e20229627 100644
--- a/dev-python/jaraco-classes/Manifest
+++ b/dev-python/jaraco-classes/Manifest
@@ -1,5 +1,7 @@
 DIST jaraco.classes-1.4.tar.gz 5171 BLAKE2B 193333a9a543328b6f781888ba7a6ae3cf0b1ae7cab078c9da65a1ed26cc71164aa06a31f2495b62c7d7a388b6fc075e97c7af58f7d67bc0ecc1785f9c7056dd SHA512 d434b470424c104f91e9a4a5e3a1f2109b919a35edf45540ad1ef8600f0b10864f32aefb411d747e13b5d99ba06601ea7abe5032e24e5dc6b25254b4e68f8a89
 DIST jaraco.classes-1.5.tar.gz 6710 BLAKE2B 884e756c7bff272a0b35d9ef8cd30538eba793e6d838b7bd409a59fde9539776906aeb95a456f7095178ce0623e20634fe1a09a8f3515d4b661bf702480cd934 SHA512 8fe3d40863424547e5396fd6a2b4ef3f27a92185ca82206bb88de2716419a9c2dc917fc945c732d5dab1a1795727a12014e0bbaceee7834896351de05491f99c
+DIST jaraco.classes-2.0.tar.gz 9911 BLAKE2B aa5e5c90f16c9536239ed61e6dccbc426244c98a33a944de32239bd42a0a4944e5df3529cfd525e05cf276a4a4b028edcec734006b549053ac8817032f52b2ea SHA512 83c9a570f951ef6c3708243dce6397cfbfe963db5920550ac807878a69860b34831af5f277f956fd0b327d85462676fd6386a22d6d97c7616e01ca81d7ace694
 EBUILD jaraco-classes-1.4.ebuild 1066 BLAKE2B 93e3d5ea21ddeb38cf35d76870c4ee277fd09dc71ba6a92f1b2fd3ccb8abb45646d2523ea8f1ab37a2534c1e4666e04ef18fecdbba4ef964d02997ebb959e9b6 SHA512 d7587d6bc716abbfb1fc28d3f5555aeb63bd147a85e2b3adcd2fa40bcdf9b508de4866c50e2c16b1e3a676e794ee8095ae7ca36b275a49255e89de1d3847ddda
-EBUILD jaraco-classes-1.5.ebuild 1363 BLAKE2B 105a4f0d9a1a5b6b57d0bd1125b5e59ad0a85729d505a3ceda0c00d1f1a67e76ad6ab7780e7c154d719b327b0045ac317d1174c510f448b37cbd37bd7f6189b2 SHA512 21b1be757ff780d7c2418d5bb1d336339021e9300319ada8f75438e086d2b388499a96c9f22362bf5cecfcea1bccb80f56783a005c8a41876229a584aef8ad91
+EBUILD jaraco-classes-1.5-r1.ebuild 1366 BLAKE2B 7c4898a599dda459f356f8095b1708d9678f866a7e3d83b99d9ebdab43bc674f3cbba5eebe95d52c36dff47d1c3f5cf6840e10b301840fc32a748fe9e007cf5e SHA512 3c2286f9438cd6be509f4c9c17e745e518edea18a6548cfa708e99f1392564013be56f75ba714fd31d8318cb4c5018fb1b22c6647db489922e4e2f3a47d6504b
+EBUILD jaraco-classes-2.0.ebuild 1556 BLAKE2B c172a70894b7869a8ddeb42317cf2e20285920719ef2f4d600c7ebf22db02e9f94cf37a9c00bb00b249bafcd17c89e8fa6692703d6ceff13acd992a596829e7f SHA512 d838b9db15df7e92c9e4b7f8b7d11a865ccb27b4ab5c3fb6c3dfe547e1dbdfefc0f97d544325461e4811a6dd46d27e6bc7f2c973dda2e65a42443bd9687bdb79
 MISC metadata.xml 452 BLAKE2B 21134cdd1ed697f4c18617cf812678e3369ed58334419ce74ec5bc0956145cbd8080085d207d37d257d5ed480bd81670f98a38289c773ba7f8b905cbb49077d9 SHA512 0107c5f161fb935b84251fe078da9a6be29f4ab53fc16c8f9f4aecda8e8de3df00b396c54ae53461a76cf794f6bd0f96697ac1ecb2bc59d2cbdadc8a6fdfa2da
diff --git a/dev-python/jaraco-classes/jaraco-classes-1.5.ebuild b/dev-python/jaraco-classes/jaraco-classes-1.5-r1.ebuild
index 8eee44f2f2c4..53def5d54190 100644
--- a/dev-python/jaraco-classes/jaraco-classes-1.5.ebuild
+++ b/dev-python/jaraco-classes/jaraco-classes-1.5-r1.ebuild
@@ -19,7 +19,7 @@ KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc test"
 
 RDEPEND="
-	dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+	<dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 "
 DEPEND="
diff --git a/dev-python/jaraco-classes/jaraco-classes-2.0.ebuild b/dev-python/jaraco-classes/jaraco-classes-2.0.ebuild
new file mode 100644
index 000000000000..dfe803bba472
--- /dev/null
+++ b/dev-python/jaraco-classes/jaraco-classes-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
+
+# Tests fail with pypy
+PYTHON_COMPAT=( pypy3 python{2_7,3_{5,6,7}} )
+
+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 ~arm64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/namespace-jaraco-2[${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/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() {
+	# Avoid ImportMismatchError, override pytest options to skip flake8
+	pytest -vv "${BUILD_DIR}"/lib --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
+}