gentoo resync : 15.01.2020

5 files changed, 10 insertions, 88 deletions

diff --git a/dev-python/pytest-shutil/Manifest b/dev-python/pytest-shutil/Manifest
index 58d8a4afd690..5ad2346d7e8d 100644
--- a/dev-python/pytest-shutil/Manifest
+++ b/dev-python/pytest-shutil/Manifest
@@ -1,9 +1,5 @@
 DIST pytest-shutil-1.2.11.tar.gz 18310 BLAKE2B a85f50a8a0e98de6dd71af0b27f76181b1ff80b518877155122998c3f8992c2749ebcc837d630dc19d60d988410eba8dc77b1be7faff7cf27003ebbba9194bcc SHA512 2a998218bb997a6ceb277965e2f150b2d7722ba518f579154f804568f552e2c41ced9a491c1745382dc119d0b92f3ea993ae77a61851809aae59a1e17501bde8
-DIST pytest-shutil-1.2.4.tar.gz 16327 BLAKE2B eb5bb96c78be5b91de29f6c30634cb56a69e30b5ebee9b43a0e970691a7094dfefb83ea741650e0732ff60b9d08cc8ad94d80bb95f1222ba8670402c1fb1d5ab SHA512 9ec6baa3cf53bb80103b1dfbf6c26794090c26dd74b29cd19e76b1037c6939538c7b05ea16368a76cce6969216c291e27b00833a990268239bfd2222f69ddfb4
-DIST pytest-shutil-1.2.8.tar.gz 17051 BLAKE2B 9006ccd51bce6e5035ed93a330e460666bd0782fe56ef400f66de174914aa89b49d6684d1a3a2d2d69b308c4d8466db83eb0865ad20649106dac735b9d1e6772 SHA512 de73b2c350709e356810f58d2a8a4c7668144701639c45a0690081e707e7147762f650af2e9f826429d0488655dae0e3366611da5e8e3ecd0c6382e215170b2d
 DIST pytest-shutil-1.7.0.tar.gz 23497 BLAKE2B e13641491fb4bd448973b8004ac9ded2f9b7c412ea93af7f9206e5fc38ea7554073374116eeefc529d2ae35e8a25e678fef5a27089af89026077a72d11d6016d SHA512 3746c08b17834621a7142ed9d5915b5c348c13367f5b423b258d3471bcb9c9e983c61c25ca936f879b8b82f80512512b7f3ade5555c24a790c72b502e3f3d144
-EBUILD pytest-shutil-1.2.11.ebuild 1046 BLAKE2B 32686340418a8ea74975a9416516e1bc23438e299d61b5a137307a295d933d7ee9febd4cede33b135810f5378fab14f43be6d9332f759f275f503930e82d9e76 SHA512 a173daa7c6bc1cdf5a700d140582c50612ec70cd065fc53565f3764ce35f7379594f9694a340315eb2c8d1bbe039dccded25bfb59c77fbd9b1b9f5d9e6028efb
-EBUILD pytest-shutil-1.2.4.ebuild 889 BLAKE2B e81cc0cc82105af67a76cadb84e9d0a7e792994a44fa67e14b42e22e2d9832a2b6bb630350a9186beaa0ff8f21cd2bd40558a505a5ef347bf8099a2316f70aab SHA512 9db91ec18e66d32653010d2431e7ed4cfdb5b6001f79d81efe72602a9dcc32f3da8021ab89fd350e7ad4abcb8a7a485ea8f4b910e13cb3a69760f54d7de0e1f3
-EBUILD pytest-shutil-1.2.8.ebuild 890 BLAKE2B c19f1eb46c619673bdb33cc9b5523b798aa663eb279c8a824a986bc1a2c33f3df395d2def8fc2938c657ffa09b8cb1cc93d5f420b37fa05a4f10bcd6cb716d21 SHA512 cf2b5118f58838a1e7b546c7e629e90d3c1b9f36f009084c53fceee6c5ebce8124e8e600effe24fd85e4cec9400d5c6450bdb990e751c6668e99e46427d1af5a
-EBUILD pytest-shutil-1.7.0.ebuild 1223 BLAKE2B 44d35e321a4e96318627f0ac4b40dcb745a9301c67cc52e502adaf5c180872c8bb1b7fb09bc179880a5b6de09c17b532733cdfdbc75a2b06aac4ec4d1a3955d8 SHA512 b9f63f2b6c2f7de3bde519645e10490355b99ffa547e31d4e9c1ab173723de93169b8d4f636978f60761453ac8c780760857bdce23a15dc8196be37ae2fd765c
+EBUILD pytest-shutil-1.2.11.ebuild 1041 BLAKE2B 6f3b9c87573bfee8b9ef034761934797d9c239620e7eed9971855ef74972ec2c7ed2540f5c979101aac726a1971180874fc41e18fef6efa791afc18cfebb1376 SHA512 9e86d7b2a7a92cc6973f8aa18b550b70692bd258ff91e73a4e50565010c68668b8824b9fc3bd47afa9208e0d40e30cee5fc6bbcf94a45065b5979a97bf2f0baf
+EBUILD pytest-shutil-1.7.0.ebuild 1254 BLAKE2B 9a9ff6423a1d47aec927834e8eca7b025a5b60f0f1f3819e0aacbf5b83324d8de4e346d6d71882a8b1fbac309527c28a6bc58cc7ccde7abbd790de28767f047d SHA512 50af92f26344d099308fe00e4d7071f6adba58b4c35792fe72d8fce44bf33aeb9bbefb2bfecb64ddcbf8dd808658af1b6e6f1db33e7c21af51c21c27cd5a97b9
 MISC metadata.xml 632 BLAKE2B 120a7ca9aa183bf3d832638c09a1e83573af0a2b6313e1bbfc612d4dc82124574bef607ce2e3801bd6ee25196708e65902245838a5230d6e530fa7dd57c15664 SHA512 104cc71900f15c4983e3f3683b7dcc02670026908817064ca4611706bca03504e1e321e62d64bb47fe32d949792b1ed1bd586b3a03431433200e05c554eef770
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 10ae8992e31c..2a57a34b426f 100644
--- a/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild
+++ b/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-shutil/pytest-shutil-1.2.4.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.2.4.ebuild
deleted file mode 100644
index f7965032f9f1..000000000000
--- a/dev-python/pytest-shutil/pytest-shutil-1.2.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="A goodie-bag of unix shell and environment tools for py.test"
-HOMEPAGE="https://github.com/manahl/pytest-plugins https://pypi.org/project/pytest-shutil/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/setuptools-git[${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}]
-"
-
-DEPEND="
-	${RDEPEND}
-"
-RESTRICT="!test? ( test )"
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pytest-shutil/pytest-shutil-1.2.8.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.2.8.ebuild
deleted file mode 100644
index 63b0189b886a..000000000000
--- a/dev-python/pytest-shutil/pytest-shutil-1.2.8.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="A goodie-bag of unix shell and environment tools for py.test"
-HOMEPAGE="https://github.com/manahl/pytest-plugins https://pypi.org/project/pytest-shutil/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/setuptools-git[${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}]
-"
-
-DEPEND="
-	${RDEPEND}
-"
-
-RESTRICT="!test? ( test )"
-
-python_test() {
-	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 d7a72037c4a9..85cde7b4aeb1 100644
--- a/dev-python/pytest-shutil/pytest-shutil-1.7.0.ebuild
+++ b/dev-python/pytest-shutil/pytest-shutil-1.7.0.ebuild
@@ -1,19 +1,22 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
 
 DESCRIPTION="A goodie-bag of unix shell and environment tools for py.test"
-HOMEPAGE="https://github.com/manahl/pytest-plugins https://pypi.org/project/pytest-shutil/"
+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="~amd64 ~hppa ~mips ~s390 ~sparc ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
@@ -29,8 +32,6 @@ BDEPEND="
 	${RDEPEND}
 "
 
-RESTRICT="!test? ( test )"
-
 python_prepare_all() {
 	# keeps trying to install this in tests
 	sed -i 's:path.py::' setup.py || die