gentoo Easter resync : 12.04.2020

5 files changed, 6 insertions, 61 deletions

diff --git a/dev-python/mccabe/Manifest b/dev-python/mccabe/Manifest
index 7245e53d3c11..eb90ccf17f4b 100644
--- a/dev-python/mccabe/Manifest
+++ b/dev-python/mccabe/Manifest
@@ -1,6 +1,3 @@
-DIST mccabe-0.2.1.tar.gz 5031 BLAKE2B 6f52106337ed534933de0c98fc103cfe209bddb30623a3b710681f4f0615a964c4d0472d4dc56f1ea4e60dda695eee540f9f9b441111808684f09fc8207b69d0 SHA512 7155e52063e786c140c541f1410d0c319387b4b5f24ec3c60ba3d5a963a92d0ee545254559941ac0dbe961f46750c0e61271fbe82653c6b1465c0a13b31ec325
 DIST mccabe-0.6.1.tar.gz 8612 BLAKE2B 6828dfd852cf9b47de10bd889dd4c32dc1ee95910fbd27e0921cd7d9975a0831b1c2763eda5b2d77d7e4b44b5a9d0e89f0818cab71de655954cc87cacfe8d382 SHA512 d8fc251a29790887c14c5932c5172b4cd578cd37ccf14cb96e80f0b97f27023427ea032d14e1e2a99d72627b055eb285f60db69e679ecd79d90a34b0255703d8
-EBUILD mccabe-0.2.1.ebuild 554 BLAKE2B 4942fe0213628484c4a64472eea68011b852b2d5bc28d538944027b79b2ef6f6f5151c8582460d3dfef26b76409634490cbe9c045052f76763b28c3563695d0a SHA512 a3facdfb706808c816d6779d4025cb4d5f2b716dc77f1be9ee76f2f447c32c569debf46c440760b95476f0ad6b778900f44da114ccb67a7bb6640475f404843e
-EBUILD mccabe-0.6.1-r1.ebuild 773 BLAKE2B 18b22c4728189b7e37d73132624e7948f7968170e8b8acaccdc2184590ad7ee6eaf28eca55217e6798b6537d9f138e5dbafc5add572a4490c58b2626521170e6 SHA512 25f5654fded997ec021698f0849154fcf183b1a955a00d5d5ae3a1430695c6967b868438512fca5c634ea3cf8a648ef1ceadffde3426be8d8fbf0403879b6854
-EBUILD mccabe-0.6.1.ebuild 896 BLAKE2B b367b3def7da4536ac8729b49a8dfa4eed1ac75b4724032fa0e6f865aaf8f4f6fb7fead7bdbb38bd08752a95f139c82c431dd62a40194a8743ed0250e80babbe SHA512 0d827467c6362413ff845d62a7023447f16f6107374d639394340137e71f30df30fbb67bc6664916d5c08ec079156422251fef97fd703e89c512bbc57560baaa
-MISC metadata.xml 373 BLAKE2B 0a0d03ce9752401f11326bd24a760ee9f18b792e6d6cb6f229513eff68f35acc943dde6b9b842a508e7bd7344c13e1b8d74b38ef1ef1401823ee106573502412 SHA512 9672aa38d9c5e31835bd0b7b1d3463f2e625ff71b4ee79d39b939cbae4df67241ba64f17cfa928aeb6fbcd0bc787c076dc078b56c92bcc1a46ea26f873472fc1
+EBUILD mccabe-0.6.1-r1.ebuild 746 BLAKE2B 633237e22e2fd9516d06d076a2308c9acd4b1cdad7feadd446f4ffc78957675ef7ed6fd902c672bc1df0a4ba79c172fa61bcf92bfa47b00882d51fca532dd761 SHA512 b6476932275c77cadc7f5875c6eef4347bd161ff5e9a237f985263bbf3bed787f93646e7d036f9f432f9456a02cc1ac456dd093d26f5db1d8c0198a34bdf1cbd
+MISC metadata.xml 398 BLAKE2B 868cbcff67488d329190b54ddbb2fcf9d7be6c3ed535d8437161b6ac35f067d8585d8de67874ae87615656073ab113f0bb10ecd164d32f92844cb489489085dd SHA512 a23a9f2c7bbdfee2547cba6c99cc8112d900297c76a6e2ff739177e32a1877156379f341b6c2d3565e4e503f3999f51317ea35b1ac620e8c18911c1c1e0d1b40
diff --git a/dev-python/mccabe/mccabe-0.2.1.ebuild b/dev-python/mccabe/mccabe-0.2.1.ebuild
deleted file mode 100644
index ab34e980fc9f..000000000000
--- a/dev-python/mccabe/mccabe-0.2.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A plugin for flake8"
-HOMEPAGE="https://github.com/flintwork/mccabe"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86"
-IUSE=""
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/pep8-1.4.3[${PYTHON_USEDEP}]
-	dev-python/flake8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/mccabe/mccabe-0.6.1-r1.ebuild b/dev-python/mccabe/mccabe-0.6.1-r1.ebuild
index a77d3f980406..fdc9be8ec553 100644
--- a/dev-python/mccabe/mccabe-0.6.1-r1.ebuild
+++ b/dev-python/mccabe/mccabe-0.6.1-r1.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
@@ -11,12 +12,11 @@ DESCRIPTION="flake8 plugin: McCabe complexity checker"
 HOMEPAGE="https://github.com/PyCQA/mccabe"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 LICENSE="MIT"
 SLOT="0"
 
 RDEPEND="dev-python/flake8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/mccabe/mccabe-0.6.1.ebuild b/dev-python/mccabe/mccabe-0.6.1.ebuild
deleted file mode 100644
index 7e24f6298219..000000000000
--- a/dev-python/mccabe/mccabe-0.6.1.ebuild
+++ /dev/null
@@ -1,31 +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="flake8 plugin: McCabe complexity checker"
-HOMEPAGE="https://github.com/PyCQA/mccabe"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="dev-python/flake8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	sed -i -e '/pytest-runner/d' setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -v || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/mccabe/metadata.xml b/dev-python/mccabe/metadata.xml
index 4e8535188806..f769e867ee46 100644
--- a/dev-python/mccabe/metadata.xml
+++ b/dev-python/mccabe/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">mccabe</remote-id>
     <remote-id type="github">PyCQA/mccabe</remote-id>