gentoo resync : 25.08.2020

5 files changed, 4 insertions, 104 deletions

diff --git a/dev-python/pytest-shutil/Manifest b/dev-python/pytest-shutil/Manifest
index 9c62c697d079..f57cca20016d 100644
--- a/dev-python/pytest-shutil/Manifest
+++ b/dev-python/pytest-shutil/Manifest
@@ -1,6 +1,3 @@
-DIST pytest-shutil-1.2.11.tar.gz 18310 BLAKE2B a85f50a8a0e98de6dd71af0b27f76181b1ff80b518877155122998c3f8992c2749ebcc837d630dc19d60d988410eba8dc77b1be7faff7cf27003ebbba9194bcc SHA512 2a998218bb997a6ceb277965e2f150b2d7722ba518f579154f804568f552e2c41ced9a491c1745382dc119d0b92f3ea993ae77a61851809aae59a1e17501bde8
 DIST pytest-shutil-1.7.0.tar.gz 23497 BLAKE2B e13641491fb4bd448973b8004ac9ded2f9b7c412ea93af7f9206e5fc38ea7554073374116eeefc529d2ae35e8a25e678fef5a27089af89026077a72d11d6016d SHA512 3746c08b17834621a7142ed9d5915b5c348c13367f5b423b258d3471bcb9c9e983c61c25ca936f879b8b82f80512512b7f3ade5555c24a790c72b502e3f3d144
-EBUILD pytest-shutil-1.2.11.ebuild 1046 BLAKE2B 13bc77397a8c9c3b90d8c170d151f5f92cef32e60c5ee814351d29baa3098ece9e84a345c417bf9719efa10e975bb2038e8d02fc36fc70aa952912e64ffc7ace SHA512 fc3eba98d9e9e770944baf8e06c4f3927973727a7989313b927785bb6b7a73ac35e1792ebd4a62f3a652a1e373410dec1ea608c8df92173dc0716104f6b269f5
-EBUILD pytest-shutil-1.7.0-r1.ebuild 1473 BLAKE2B 2cf57d7ff7e038578fb8a82f4fcc6474b5456dc8fd3a70c8781b46befcdc1daa9d9715a97bd1e949b6a71d7c3b338a0ae32d71189ee674a1a8861c777cafaf41 SHA512 8caf7ca31564b1047cd66a0a2e7b1cc446657d8445595da41a6f4b3a9fe56b197eb4ef31199224309e4ecdfffadd0933047f5a717f706826fa24114e4b5f113d
-EBUILD pytest-shutil-1.7.0.ebuild 1331 BLAKE2B c10ec9a16b2a2e36fe3caef51240ae25817dcdad17b49b352c6d5f8e772d69676e31d095f31d56d98349a0e4a190de0a8f75f890a7729e188ad7dcee0dfb2213 SHA512 1d256181917ec67f49c71df1a1a099511dd31ed8e59413e58a4a357cd093f9abc238246a9c4e46e449b1cb03c80b7b3e7db56d7d5d6a112b88bc6117b040b789
-MISC metadata.xml 708 BLAKE2B b8d9f61638c355a67e3f59b91a61190f334a8cb38e16cec988b54cced0028a4b7d730575eed93a0f562b3d86a4e5610fc750734746b7f86ad685e957703c4121 SHA512 ae58ff809ae82cde03544ccabbff1e866dedaa777afa74ff50d757babd8d95da0f7448e15b53f7754c182b8dc62e17e0fa8bfdc2e6664c8b6c2481b77d59ab48
+EBUILD pytest-shutil-1.7.0-r1.ebuild 1304 BLAKE2B e2094a01efea9283b5dfaa557787f82ea85962a36f7935b234a4ea41b4a25eca4fe0ea0a0f40105424de86dbe141d3a16b00cb3a9128a755e4ae7410ea25b3ac SHA512 6fa465467cacd88b4c30b3245fd9c9faa2c812c7980f54f60f9d8914dcef3d6be2f24116af4f4228f61db3bfc0bc53b6af87e525e57ed277da3093361c20dd19
+MISC metadata.xml 732 BLAKE2B afaff2db22c6de29920621f7684dd9cf3a6a070e7d40c2a6ed56fef507fb6dd1ca1b1ac51f106a49c38a556f2c0be244df5c8bae90e71d3ab7d7e1556725d87d SHA512 27c9d4196ec0cad1aa20d3d04c47cc791c9ff19189fd7facf844067c2f81a9c1e00aeeafe2fc65e231fd7039c41eea16c67f6d0f0dcf06386f402ebde03e03ef
diff --git a/dev-python/pytest-shutil/metadata.xml b/dev-python/pytest-shutil/metadata.xml
index 5b33c8e6cf95..67b2d829ae84 100644
--- a/dev-python/pytest-shutil/metadata.xml
+++ b/dev-python/pytest-shutil/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<maintainer>
 			<email>eeaston@gmail.com</email>
diff --git a/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild
deleted file mode 100644
index b4eecc6c24f3..000000000000
--- a/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A goodie-bag of unix shell and environment tools for py.test"
-HOMEPAGE="https://github.com/man-group/pytest-plugins https://pypi.org/project/pytest-shutil/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/execnet[${PYTHON_USEDEP}]
-	dev-python/contextlib2[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/path-py[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools-git[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND} )
-"
-RESTRICT="!test? ( test )"
-
-python_test() {
-	# various pickling errors, but code works to run pytest-virtualenv tests
-	[[ ${EPYTHON} == pypy ]] && return
-
-	esetup.py test
-}
diff --git a/dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild
index 668d150c5535..0e2c74cc89c3 100644
--- a/dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild
+++ b/dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -45,12 +45,6 @@ python_prepare_all() {
 }
 
 python_test() {
-	# at this point let's not fix python2 stuff
-	if ! python_is_python3; then
-		ewarn "Tests broken on python2, not runninge tests for ${EPYTHON}"
-		return 0
-	fi
-
 	distutils_install_for_testing
 
 	esetup.py test || die "Tests failed under ${EPYTHON}"
diff --git a/dev-python/pytest-shutil/pytest-shutil-1.7.0.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.7.0.ebuild
deleted file mode 100644
index d7793ef0daaa..000000000000
--- a/dev-python/pytest-shutil/pytest-shutil-1.7.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A goodie-bag of unix shell and environment tools for py.test"
-HOMEPAGE="https://github.com/man-group/pytest-plugins https://pypi.org/project/pytest-shutil/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/contextlib2[${PYTHON_USEDEP}]
-	dev-python/execnet[${PYTHON_USEDEP}]
-	dev-python/path-py[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/termcolor[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	${RDEPEND}
-	dev-python/setuptools-git[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	# keeps trying to install this in tests
-	sed -i 's:path.py::' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# at this point let's not fix python2 stuff
-	if ! python_is_python3; then
-		ewarn "Tests broken on python2, not runninge tests for ${EPYTHON}"
-		return 0
-	fi
-
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}