gentoo resync : 18.12.2020

5 files changed, 7 insertions, 68 deletions

diff --git a/dev-python/versioneer/Manifest b/dev-python/versioneer/Manifest
index 38218cca261d..08e7762552bc 100644
--- a/dev-python/versioneer/Manifest
+++ b/dev-python/versioneer/Manifest
@@ -1,6 +1,3 @@
-AUX versioneer-0.18-fix_test_git.patch 788 BLAKE2B e910a651eec861ee5fffd9f7f05860b468154fe741f1b04504221149f48ca8bc241ba383fabafce6199387839daf7373aa9912456ce9ac688db295ebe7d437d7 SHA512 44ff35bad67b41c7be786a9d8f3b6958fffb71d598eb17ce172defbf1dbda9ac40ecbfeb790900a4a8052905fc510ee5b640039fa0fcaf408ef73c3e01eea57b
-DIST versioneer-0.18.tar.gz 40552 BLAKE2B 640c010958a0178ec5ec5f06c986d83e3bc2f49df95583c4c90d3058449dcca5c7b5421ee5f2f56905b1d949bfe3bfbd87fb23ebc868ede591d078d811ccc2b3 SHA512 8d4522932b1f6aa1c13211008a57a572d54ea677cbdecd7d563ef8f77c76ed5d59f58f2e3be38a01e8cd102c264baf5c8949e9c17ea98d686ac497f8ad8b0011
 DIST versioneer-0.19.tar.gz 47005 BLAKE2B cd4ce82bdb17cd10b628cf6013d1be171cc21115d9a065b845227fd6e5d1e988f8ab6fb001e2eeb6c1bfeda8a4afc8420937b0ec7437554d87e207713ccef381 SHA512 919c2e52e32b2fa1661ab2e10e3a698eb3f7c5102e66175d465d1a29237b86efa1520435ca581e321802cffeaa0ccd21fb66ba66946d72a05d13743c87a3e333
-EBUILD versioneer-0.18-r1.ebuild 932 BLAKE2B 64b1f8ff43a37265442a77d82d342c172c926cb1e45db95902dcb5ba4fb8de9df067f156c41c7e64471ec2f59e5e39d4d794633e276432003bdedec32752d4fa SHA512 50a4aa5ebca587bad112a7983f1e24c5b0976df5bc47be9388edd764c4952fb077838495dc9ffd63bcd0f74815a3997656bde72d374a1f53a0aaf5b295314d3f
-EBUILD versioneer-0.19.ebuild 878 BLAKE2B b4a1ecfd076c964ae42e8df40badbd984859eb530bebd5fc92ef5fb2bc5de29741dab650b9b496b9b82652ad01c033020e95fe7bceba8ac852e7826ae6282821 SHA512 81fa5aaef32c15e23929fa8079ef3a8864ea04c97722166ff455f8d3829bf4d6115e67c0bfe044413cd02e887a09c1338963ce8ed23824231607e8b349778ab5
-MISC metadata.xml 414 BLAKE2B 409cab20af609a75c5795436650c1c5f83715a9f966a243089fc54fee8b726705e90a220193cfa0a61ee947599377853edd245384423bef20a925e60ea99f65d SHA512 000b7ccae83bf3951a36e8c5743759c7f02d812ed808bacb4365bbb317c16475c1b443b22b174b3411243603bbf53844cfec67aebc61350e82261cc98a99f7d0
+EBUILD versioneer-0.19.ebuild 889 BLAKE2B 4b1f5d65ae4548c301b572d2e90267bde6176f15bde5d7ce7c9a107981c853a84f0668c31ede15d9d986030cfaca1532748e17aa7376b0f22a5b668ece455f26 SHA512 502ea228f9c0e7066a556b2ad4e6c392b59acbe94231963d9d78dcc6ffca60884a418498283b3c6f6ce01604930888c11f93b1bd6c1e71be4252804defefee68
+MISC metadata.xml 425 BLAKE2B 70d2a29bcd352f61add9b6ec9f302712d3f14556c3827c55273b4b2525c7f1b36c4ae2b2e4056aff955e864128d9e106b1c0a0424129818082047af19d8bb03d SHA512 4e2f07cd10a1dceebd43c8bdfda3c546a924b5283bd31417cecfe5b5af6b5868915f9e3343694a503c51bbe71fc9644c39f9335471b0ec98fcf780caa20f49c3
diff --git a/dev-python/versioneer/files/versioneer-0.18-fix_test_git.patch b/dev-python/versioneer/files/versioneer-0.18-fix_test_git.patch
deleted file mode 100644
index 35c45979e6f1..000000000000
--- a/dev-python/versioneer/files/versioneer-0.18-fix_test_git.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/test/git/test_git.py 	2020-04-11 23:36:18.858361255 -0700
-+++ b/test/git/test_git.py	2020-04-11 23:47:01.929316371 -0700
-@@ -8,7 +8,8 @@
- import tempfile
- 
- 
--from pkg_resources import parse_version, SetuptoolsLegacyVersion
-+from pkg_resources import parse_version
-+from packaging.version import LegacyVersion
- 
- sys.path.insert(0, "src")
- import common
-@@ -590,7 +591,7 @@
-     def assertPEP440(self, got, state, tree, runtime):
-         where = "/".join([state, tree, runtime])
-         pv = parse_version(got)
--        self.assertFalse(isinstance(pv, SetuptoolsLegacyVersion),
-+        self.assertFalse(isinstance(pv, LegacyVersion),
-                          "%s: '%s' was not pep440-compatible"
-                          % (where, got))
-         self.assertEqual(str(pv), got,
diff --git a/dev-python/versioneer/metadata.xml b/dev-python/versioneer/metadata.xml
index eba03f3f6be6..eb3cfbacbaf2 100644
--- a/dev-python/versioneer/metadata.xml
+++ b/dev-python/versioneer/metadata.xml
@@ -7,7 +7,7 @@
   </maintainer>
   <stabilize-allarches/>
   <upstream>
-    <remote-id type="github">warner/python-versioneer</remote-id>
+    <remote-id type="github">python-versioneer/python-versioneer</remote-id>
     <remote-id type="pypi">versioneer</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/versioneer/versioneer-0.18-r1.ebuild b/dev-python/versioneer/versioneer-0.18-r1.ebuild
deleted file mode 100644
index 38d6b48aa164..000000000000
--- a/dev-python/versioneer/versioneer-0.18-r1.ebuild
+++ /dev/null
@@ -1,39 +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=( python3_{6..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Easy VCS-based management of project version strings"
-HOMEPAGE="https://pypi.org/project/versioneer/ https://github.com/warner/python-versioneer"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="public-domain"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.18-fix_test_git.patch"
-)
-
-python_test() {
-	esetup.py make_versioneer
-
-	git config --global user.email "you@example.com" || die
-	git config --global user.name "Your Name" || die
-
-	${PYTHON} test/git/test_git.py -v || die
-}
diff --git a/dev-python/versioneer/versioneer-0.19.ebuild b/dev-python/versioneer/versioneer-0.19.ebuild
index 124411ff7b67..a72e22ae29b6 100644
--- a/dev-python/versioneer/versioneer-0.19.ebuild
+++ b/dev-python/versioneer/versioneer-0.19.ebuild
@@ -9,12 +9,14 @@ PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1
 
 DESCRIPTION="Easy VCS-based management of project version strings"
-HOMEPAGE="https://pypi.org/project/versioneer/ https://github.com/warner/python-versioneer"
+HOMEPAGE="
+	https://pypi.org/project/versioneer/
+	https://github.com/python-versioneer/python-versioneer/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"