gentoo Easter resync : 12.04.2020

3 files changed, 5 insertions, 37 deletions

diff --git a/dev-python/python-ctags/Manifest b/dev-python/python-ctags/Manifest
index 658280a6fcb2..1ade0c76aed9 100644
--- a/dev-python/python-ctags/Manifest
+++ b/dev-python/python-ctags/Manifest
@@ -1,5 +1,3 @@
-DIST python-ctags3-1.2.4.tar.gz 47774 BLAKE2B 4b1844a6a0d6d89e014206b728e1f1d8b964db2b85afe599cfc254b68f663052d7d1169c257378243e22929297bd254e23ce4c21e1ea1c9a60d7007727c322bf SHA512 db6be08164da71b17de1a7fa46aaa60a5b83784f18ca4e2314e3b9954abe8996d5e07ed98aa024f70899fe87cf53d37671c9f42e567766b4a8af0f728df2bcfb
 DIST python-ctags3-1.3.0.tar.gz 54615 BLAKE2B b334b834cefb01bdbf2c061d44ef6e38070c2b3e5da6de25beb09d24bc9d5891a6892a4b0c9e8fa8f8168bf344c10880ac987e263844cb3dd21303f8c2d105e6 SHA512 3ad4433d69bd159879ff4eface5150acc8c0f609cc7597885824056ce4ec148e55ad234dffa53f07977aa3ace24846e180adce5316a2950ac8d4ff58ad128b68
-EBUILD python-ctags-1.2.4.ebuild 553 BLAKE2B dd6d63c3216151b71dab7663f05b911fa884289f005e12ae686745a673e120106317247a7cac8243b5ed38235dc80d567f085ae8440b684d0308995ec22da5e9 SHA512 32746b3eef62c4184189b6dc80c0f42f34990ce89067011ccd4f2958baeb17813a8c33619f7115e4deca961bb77a7c861400832018d4730f403f99262f0e3df7
-EBUILD python-ctags-1.3.0.ebuild 558 BLAKE2B d74e005df3385c2211ecc45ac40090e25258fafbcebb01cee02cf8cd77335f3ff123dc5aa54318bc33b19b1b59d2ea4c439ea2440b775e1dfe7d25f7ca2159aa SHA512 addaf3b7f9cec4ffecb6bf231653aa57c2d66149ae883014a5ced89ea398ddf87b734eede02b3517f53399fb09da6a8a18ef7aaac12522212637c7f7b2302c96
+EBUILD python-ctags-1.3.0-r1.ebuild 509 BLAKE2B 286f221226367204d9d03b25e7cfad3e0ec2e049f38568d8f171c60f3a33ebae22cca3fef898e2a92a10d7f94b70de958fdc8e54e88e9723aed28ff109bc4b05 SHA512 4998aaad7c7b4c7ea182bf34021c1141c2616fc96b5112b10f1962df5f5294393e7aa1355cae82f32519a1f893fed172e9a7c583ab6bd5cbb7a7687880aa8677
 MISC metadata.xml 455 BLAKE2B af37b4a79a49f4128c7ed43a10ba5a384d5d6d4a33912cf74fb59ddbddd155184f1e47161519649ddac98556ad17cee495913321632f30a629704eabf7fc5d11 SHA512 480ef8e0ccfb6e278348ed31be811e51ec6a845c984c92d9d215d0375305278639dda7e409b66f18860ea980de149656b0dfd8111d26aaf79787e3c7a34ce848
diff --git a/dev-python/python-ctags/python-ctags-1.2.4.ebuild b/dev-python/python-ctags/python-ctags-1.2.4.ebuild
deleted file mode 100644
index c9fc195cd9fe..000000000000
--- a/dev-python/python-ctags/python-ctags-1.2.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-MY_PN="${PN}3"
-DESCRIPTION="Exuberant Ctags indexing python bindings"
-HOMEPAGE="https://github.com/jonashaag/python-ctags3"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-util/ctags"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/python-ctags/python-ctags-1.3.0.ebuild b/dev-python/python-ctags/python-ctags-1.3.0-r1.ebuild
index b7aa5a9ff131..9a1bda48341b 100644
--- a/dev-python/python-ctags/python-ctags-1.3.0.ebuild
+++ b/dev-python/python-ctags/python-ctags-1.3.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{6,7} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
 
 inherit distutils-r1
 
@@ -11,16 +11,12 @@ MY_PN="${PN}3"
 DESCRIPTION="Exuberant Ctags indexing python bindings"
 HOMEPAGE="https://github.com/jonashaag/python-ctags3"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="dev-util/ctags"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
+RDEPEND="dev-util/ctags:="
 
-python_test() {
-	esetup.py test
-}
+distutils_enable_tests setup.py