gentoo resync : 25.11.2020

3 files changed, 8 insertions, 80 deletions

diff --git a/dev-python/testfixtures/Manifest b/dev-python/testfixtures/Manifest
index cd227675804b..9f3a79ace80f 100644
--- a/dev-python/testfixtures/Manifest
+++ b/dev-python/testfixtures/Manifest
@@ -1,5 +1,3 @@
-DIST testfixtures-6.14.1.tar.gz 114969 BLAKE2B 21e6b377e24240cb275feed2e160da256ca75884c5a6dc842364986031c3cd21fb1b5bc13f3e8780354d47179e6c038cb461a39a04d34bfc8beebbf9809d6431 SHA512 0da31d5e382984c22ada846c07570d4a179ba819005dd29891e551b99190fabaaf17174456f7ed4864e9c4aa25f7d5d8b86aa123b4628328610d6930c9c5d6bd
-DIST testfixtures-6.14.2.tar.gz 115229 BLAKE2B 311ef13cc6f596aa9d4c54c0cc02e25c412704eefa3474c3a078f4f50ba556e9872d3ecff3d122443986f0917b2e1c6fff8315d20bd319dec1148fd9851321ba SHA512 fbaeefc439a755d9f9e5ee223c6ce00288adfc2d12c9bef70ab06ea7bc4e9757d7a2429ac8046f7171aca1ac7d667f8a26168cd711f1cc4c719d66bbe8210cc6
-EBUILD testfixtures-6.14.1.ebuild 1497 BLAKE2B c70168019185c9e49824e4e3cffb3f45fe28ab3a8782bb35f7b7aa4089b824b62fb05c5041bd0bddc3507adc2b4863a5d15901599ee4e0a21386907a8406568d SHA512 4b0f50aecf8a3da34701e52f7b3009df706f5beb69624748d32309868a77e767b31c119db501a37b550f2459708aa4167b19719b2815d3c910b94f9d7ca2411b
-EBUILD testfixtures-6.14.2.ebuild 1499 BLAKE2B 0b2bdf8ea2c2b75d1a0e45f160c51ae2fa9e3c969241ab8f58b6967295e06561f902624b91c8a2e9c330e89680788b7f40303b49a4c68dfb6898dfbedf9d9fc6 SHA512 20d27749bf48dd38b979015c9360592c3bf4e49bf726f4b99e268530c6ac4fcaf6668c0b8b658481c1a4a4f3c452e8dd3cd96da07e8e958f576ebac504ea12c5
+DIST testfixtures-6.15.0.tar.gz 116119 BLAKE2B cc0e351bd6778393cf061b741d7d593f56bc1b6a3d53d2e34baa006f7edd718c86f1b16c094e42cf116805a5c6652ac6827f71c1ebbb160d48c071317603c151 SHA512 34b9f1b9a5e76c5e20acf9abae2961694817de3822361cd5afc4a405ccdbcf26c617a01fbd8d2d977c2a0bc696232c2363df4a9fb7ba9187e0743cf2a6fe98e1
+EBUILD testfixtures-6.15.0.ebuild 1056 BLAKE2B 4d3587c3d3ad6acb348ed76c4831442aa0fa5930c7bbe6b5a24393a3df6b264af41b16bf93532044832eb2d884a424166cd238ceda70c9486f95f3fe60ab943d SHA512 2e4f58775521fec11cfab422c1dcd50dfca685c989f3d642bddc688f3e473ee43ae1278ddda696c50f368c97f1e450c4fdccb6d5797daab18f33305543df23d0
 MISC metadata.xml 415 BLAKE2B d3e133602f86d013faf5998b2e52256dca88ed9593b9ea26bed0277b70823eda4dd27deca7488a7f66fac2f77e3312cddf833a4b865cf400c7e78a4d267a4c5b SHA512 78fd16b4fd4e8ea3f244b3d8fcce8451a38713d0374df3d2661453f2ad06af587b4613c9119b11bf4cfe3d226fd04620bfa74f58f2660e44ba7e84b93c99c20e
diff --git a/dev-python/testfixtures/testfixtures-6.14.2.ebuild b/dev-python/testfixtures/testfixtures-6.14.2.ebuild
deleted file mode 100644
index e5277b293383..000000000000
--- a/dev-python/testfixtures/testfixtures-6.14.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A collection of helpers and mock objects for unit tests and doc tests"
-HOMEPAGE="https://pypi.org/project/testfixtures/ https://github.com/Simplistix/testfixtures"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/django[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-		dev-python/sybil[${PYTHON_USEDEP}]
-		>=dev-python/twisted-18[${PYTHON_USEDEP}]
-		dev-python/zope-component[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	# Prevent un-needed download during build, fix Makefile for doc build
-	sed -e '/'sphinx.ext.intersphinx'/d' -i docs/conf.py || die
-
-	# remove test that tests the stripped zope-component test_components.ComponentsTests
-	rm -f testfixtures/tests/test_components.py docs/components.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	PYTHONPATH="." \
-	DJANGO_SETTINGS_MODULE=testfixtures.tests.test_django.settings \
-	pytest -vv || die
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/testfixtures/testfixtures-6.14.1.ebuild b/dev-python/testfixtures/testfixtures-6.15.0.ebuild
index 1c445c878270..8d3e4174528d 100644
--- a/dev-python/testfixtures/testfixtures-6.14.1.ebuild
+++ b/dev-python/testfixtures/testfixtures-6.15.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -14,43 +14,29 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 SLOT="0"
 LICENSE="MIT"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
 
 BDEPEND="
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
 	test? (
 		$(python_gen_impl_dep sqlite)
 		dev-python/django[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/pytest-django[${PYTHON_USEDEP}]
 		dev-python/sybil[${PYTHON_USEDEP}]
 		>=dev-python/twisted-18[${PYTHON_USEDEP}]
 		dev-python/zope-component[${PYTHON_USEDEP}]
 	)"
 
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
 python_prepare_all() {
-	# Prevent un-needed download during build, fix Makefile for doc build
-	sed -e '/'sphinx.ext.intersphinx'/d' -i docs/conf.py || die
+	# kill weird way of declaring build deps
+	sed -e '/build=/d' -i setup.py || die
 
-	# remove test that tests the stripped zope-component test_components.ComponentsTests
-	rm -f testfixtures/tests/test_components.py docs/components.txt || die
 	distutils-r1_python_prepare_all
 }
 
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
 python_test() {
 	PYTHONPATH="." \
 	DJANGO_SETTINGS_MODULE=testfixtures.tests.test_django.settings \
 	pytest -vv || die
 }
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}