gentoo resync : 15.01.2020

5 files changed, 21 insertions, 132 deletions

diff --git a/dev-python/jaraco-classes/Manifest b/dev-python/jaraco-classes/Manifest
index 0eea4562616a..d6fd55872799 100644
--- a/dev-python/jaraco-classes/Manifest
+++ b/dev-python/jaraco-classes/Manifest
@@ -1,8 +1,5 @@
-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 1093 BLAKE2B a49cd36cb00bb140fbd954698de12cf6e33f0e5dbdf9e3a5c810693280d3b26ca086f5ad9d312e219bb8ea551e1a202031beddc7e053b0f748191a966f3a705b SHA512 a190fbf0e54d7bc9db7edc8e030a3d8785499c89739035cbe7939da7692d3e6a9ecbc9ef8cb2e55bbd4f146eec4491de16749f83f2d05581a3a0eb9ee53e79cd
-EBUILD jaraco-classes-1.5-r1.ebuild 1393 BLAKE2B 307c9bf10b3edd80d082194897d3d58c0b3d04fef5f45e2ac197b76c84b2fed7b9e3d30cc34761f52642b1441648935eca42400beac5d6e9bdf876535b36109f SHA512 3eb1eccc36e937f87577163427e95dbb80e156032563a7c4fdcb133eec4ff605ea861ac3c648a172676d795bb9701f8fdd37e2db867242eb3d92eebeef17d1e2
-EBUILD jaraco-classes-2.0-r1.ebuild 1645 BLAKE2B 5ee07b052fe18149a3f50125f82dd7545e3a88ae11144a88d5596ad25f7664ebde1737fd2092c1a8392b7474c1d98273a7433d42712498cb120993c4fea48989 SHA512 f483b85e73c222dd56cdc9cb6b1bb2b1878d5df025bab5ca1e774bca7ad036af850ae4c0d7e7860749377deda916943a96524842165bf0caac5369e6930abb6e
-EBUILD jaraco-classes-2.0.ebuild 1583 BLAKE2B 120221858090c3998547bf8c08559c7b5b77177f645d9b02822b6e606a8bf483da06155a984fdef83444e1fea2fc83cf82daa5db265e8d32d97c7c081502bef1 SHA512 07238baa45fa598f74dcdec0fe59c7be182d18008c3f6bedca30512e62bfb3eee944315d871469daec8dc875b5f6629bf090c29238a9b6c96c458e2c8d94f437
+DIST jaraco.classes-3.1.0.tar.gz 11616 BLAKE2B 5b438f7582a9a93ca4fc97a71725c1fe3275e4bfb48f5e06b549f7ac8fb6900262165b1ad0638114d3a8d11c10f449b7930d4c2d66fa928665aaff820af88937 SHA512 697d892a01c4e8ad83f57e69dcd744f976cea67fa3efcd55b10eda02f6bf1916162c0fa952d0d711e62f62fdff62740ee55a93be9fc46ebd4ab22416092f0ff6
+EBUILD jaraco-classes-2.0-r1.ebuild 1642 BLAKE2B a87dbe02596455066b9c3b5693af53107a8b3109e95e743dbbe82b59fd3a10c01d951ccf83853e4871cdd670119e88d83b9cb8a5f9e27ff3bae38969acd558a2 SHA512 4f333d58699a384668472e3a00ec6b0175622141c13eaa7123e5f3f16193804bb1f87323f53fc7d6784e23e41044e4f7e99773ad27f1e04ad24b5957c2bafc95
+EBUILD jaraco-classes-3.1.0.ebuild 1644 BLAKE2B b9553c119981b5479e8d0675e905de540a62808ca0603fa59ff73e18e2332d450bb7651b2fec4d14a3453c5373ed8a53d9fb0a139ec2dd4984a27f72c5f6ad7d SHA512 357867a1bdbcfc549865a71199554419309581c6ad6cc351bc223fb41cbfb2323e54aab6fc1763694e7c5964d8b151616dbba121a60ade3de6765b1118a91523
 MISC metadata.xml 452 BLAKE2B 21134cdd1ed697f4c18617cf812678e3369ed58334419ce74ec5bc0956145cbd8080085d207d37d257d5ed480bd81670f98a38289c773ba7f8b905cbb49077d9 SHA512 0107c5f161fb935b84251fe078da9a6be29f4ab53fc16c8f9f4aecda8e8de3df00b396c54ae53461a76cf794f6bd0f96697ac1ecb2bc59d2cbdadc8a6fdfa2da
diff --git a/dev-python/jaraco-classes/jaraco-classes-1.4.ebuild b/dev-python/jaraco-classes/jaraco-classes-1.4.ebuild
deleted file mode 100644
index dd721310ef54..000000000000
--- a/dev-python/jaraco-classes/jaraco-classes-1.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,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="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/rst-linker[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	PYTHONPATH=. py.test || die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/jaraco-classes/jaraco-classes-1.5-r1.ebuild b/dev-python/jaraco-classes/jaraco-classes-1.5-r1.ebuild
deleted file mode 100644
index dc9fa4881702..000000000000
--- a/dev-python/jaraco-classes/jaraco-classes-1.5-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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"
-RESTRICT="!test? ( 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/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() {
-	# Avoid ImportMismatchError, override pytest options to skip flake8
-	pytest -vv "${BUILD_DIR}"/lib --override-ini="addopts=--doctest-modules" \
-		|| die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/jaraco-classes/jaraco-classes-2.0-r1.ebuild b/dev-python/jaraco-classes/jaraco-classes-2.0-r1.ebuild
index 229e130d8253..2bc0ef26fc64 100644
--- a/dev-python/jaraco-classes/jaraco-classes-2.0-r1.ebuild
+++ b/dev-python/jaraco-classes/jaraco-classes-2.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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,8}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
 
 inherit distutils-r1
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jaraco-classes/jaraco-classes-2.0.ebuild b/dev-python/jaraco-classes/jaraco-classes-3.1.0.ebuild
index 6754edb9c766..01a50f67c596 100644
--- a/dev-python/jaraco-classes/jaraco-classes-2.0.ebuild
+++ b/dev-python/jaraco-classes/jaraco-classes-3.1.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
 
 inherit distutils-r1
 
@@ -15,8 +15,8 @@ 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"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -25,12 +25,6 @@ RDEPEND="
 "
 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}]
@@ -39,12 +33,17 @@ DEPEND="
 
 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
+distutils_enable_sphinx docs \
+	">=dev-python/jaraco-packaging-3.2" \
+	">=dev-python/rst-linker-1.9"
+
+python_prepare_all() {
+	# avoid a setuptools_scm dependency
+	sed -i "s:use_scm_version=True:version='${PV}':" setup.py || die
+	sed -r -i "s:setuptools_scm[[:space:]]*([><=]{1,2}[[:space:]]*[0-9.a-zA-Z]+)[[:space:]]*::" \
+		setup.cfg || die
+
+	distutils-r1_python_prepare_all
 }
 
 python_test() {