gentoo Easter resync : 12.04.2020

5 files changed, 64 insertions, 6 deletions

diff --git a/dev-python/pytest-shutil/Manifest b/dev-python/pytest-shutil/Manifest
index b0ec1d5f210f..2ab602c46b31 100644
--- a/dev-python/pytest-shutil/Manifest
+++ b/dev-python/pytest-shutil/Manifest
@@ -1,5 +1,6 @@
 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 1042 BLAKE2B 16c3ce4f485cfc16d56a8f3bcfb89ebbd359a5c322c8336eca4d64ba8fd240f144a8009ff75fb60f3eaf548da1acfacdf56fa1fbc366cd8b18bd74c710e9d939 SHA512 c99be97b60006758c577b44304a127a57e0212e276943d8c9c2f496864107ff0ec2828bce09b04d7d1e81725fc02eb5b7fa62b2100149fd43d360a97fcc418ac
-EBUILD pytest-shutil-1.7.0.ebuild 1254 BLAKE2B 9a9ff6423a1d47aec927834e8eca7b025a5b60f0f1f3819e0aacbf5b83324d8de4e346d6d71882a8b1fbac309527c28a6bc58cc7ccde7abbd790de28767f047d SHA512 50af92f26344d099308fe00e4d7071f6adba58b4c35792fe72d8fce44bf33aeb9bbefb2bfecb64ddcbf8dd808658af1b6e6f1db33e7c21af51c21c27cd5a97b9
-MISC metadata.xml 632 BLAKE2B 120a7ca9aa183bf3d832638c09a1e83573af0a2b6313e1bbfc612d4dc82124574bef607ce2e3801bd6ee25196708e65902245838a5230d6e530fa7dd57c15664 SHA512 104cc71900f15c4983e3f3683b7dcc02670026908817064ca4611706bca03504e1e321e62d64bb47fe32d949792b1ed1bd586b3a03431433200e05c554eef770
+EBUILD pytest-shutil-1.2.11.ebuild 1043 BLAKE2B 05d5587a94e5e9c251ac56bad0b4654a67ea5c4c6d308681802a781e22f49eba9c317667373e7a7d0a200033fb1ac7c46068ebc4446630d97a75322fcbc882d7 SHA512 7b8a537af1125689ff9ae74ef81a5c2719ebad8b91dd6892b4100b48fefb74e6ee6484707fcdfebefed6c677363846a98cb59f55b46acb74afc8d491ece5f638
+EBUILD pytest-shutil-1.7.0-r1.ebuild 1325 BLAKE2B aecf24dce70c8693816512d692a7e44a555577ac1aed26dd853dfa4d85106ee7529d24688c0f0ab6a3d7a646c384a4b49f7c69856a59d0d46f910c1ffeb4f6a4 SHA512 7fb4a31790eda03a9913eac298c255758de4ec0eeb22c79f2018ae023cbab053464b6bfe412efd504f39facaab8ed1a393a5fce55e29efb59c2ea6dabc146d55
+EBUILD pytest-shutil-1.7.0.ebuild 1331 BLAKE2B 5e6ac27d8fcc8b66adf2a49aa8065fa128d85f2f7ce3f651f144edcbccb860354b7a52269dafc5640512936269cdbeb7b02b815cbe355825259e8ca95d4081be SHA512 95acb1af08ce0d31d91bbd52a97f04838b7905ff943f8ac6972715d5c49d9bba35f89b565a591f4f79e999c2fd6e2f8413251cd68736773d4f921acaddd3e566
+MISC metadata.xml 705 BLAKE2B 8e2b41e3cd3bca68e2c3ac155895005e53c8bcb7c3174214362cbb998922d76737de63345e86b39b50ff179b675aa44d47ace1267c5cfbcdbe06d54b632ed79f SHA512 4089110c45e9136e3fa9b7053f458d1c50252b7caab16bd2621570ef9736bdc0799899ac24f14510b526401ae5ecc5d7595eff8be5a7f643b3d28251114d0c87
diff --git a/dev-python/pytest-shutil/metadata.xml b/dev-python/pytest-shutil/metadata.xml
index 3c2b6c6516d0..ba66a4a08b73 100644
--- a/dev-python/pytest-shutil/metadata.xml
+++ b/dev-python/pytest-shutil/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<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
index 646870bf79fb..8d022a92899c 100644
--- a/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild
+++ b/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild
@@ -12,7 +12,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"
 
 RDEPEND="
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
new file mode 100644
index 000000000000..cb3daddd5278
--- /dev/null
+++ b/dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} 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 ~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}"
+}
diff --git a/dev-python/pytest-shutil/pytest-shutil-1.7.0.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.7.0.ebuild
index 85cde7b4aeb1..82325580eebd 100644
--- a/dev-python/pytest-shutil/pytest-shutil-1.7.0.ebuild
+++ b/dev-python/pytest-shutil/pytest-shutil-1.7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~mips ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -30,6 +30,7 @@ RDEPEND="
 
 BDEPEND="
 	${RDEPEND}
+	dev-python/setuptools-git[${PYTHON_USEDEP}]
 "
 
 python_prepare_all() {