gentoo resync : 25.11.2020

6 files changed, 12 insertions, 138 deletions

diff --git a/dev-vcs/gitstats/Manifest b/dev-vcs/gitstats/Manifest
index 66191caf8521..8596d19ae6ac 100644
--- a/dev-vcs/gitstats/Manifest
+++ b/dev-vcs/gitstats/Manifest
@@ -1,8 +1,3 @@
-AUX gitstats-0_pre131024-filter-invalid-unicode.patch 601 BLAKE2B 29eb8156205a0003746e54211397befba17c8c289f0dbbac96c808790b8130fe66fd372d359d3ba832230a154ba8c1700247be6106d3709d10d43946fd335e98 SHA512 a1ce080e6a9aee89fc5cc3b5aca60628759a0ef9f0e8ad93dcd813aeecb8ae9bd016c945d31a0704a0c124ee72cd0e788f339caf5eef8c498903f75dc001a73a
-AUX gitstats-0_pre20151223-grep-force-text.patch 577 BLAKE2B 529322d860d9d015692de00cdcba373a475018e29f2692f97c7b415376faeb8dfb7acbd98a987846b3c40d4d3af3143688a9b5a61cef559a67772609ca5d4f36 SHA512 a61ab86a93fe4ea605b5fdcba891e5b754fe1b56a8d2e54af4dee164835cc43c8578843f44dc4d8e041b3236f2775d246f3ed6726a88422887dd308b5f3768a2
-DIST gitstats-0_pre131024.tar.xz 32104 BLAKE2B 87288f2e29fede41aaaf2ffdc69aa6993c753992a1c5494b0f16ae85fb7ccb8a6a2a83334e31fa2fea3d6169a6d3f236ac087f3080920ed223744e21ed2f01ad SHA512 a42c6ca37d39c24782c19a1157cc5aaf3a16e34c603c5fa3f91fcd5165e6f4788d5d75786b78f962ab81b3db66dd94f051dd929f02f4ffef845ec5b793feba53
-DIST gitstats-0_pre20151223.tar.xz 32236 BLAKE2B f2d3e52f7fa3777cdf8854940a1180a6203a77d16cc1b6910158332fdbdfbcf8e8cf0de15fe57b75284bb3334893db6920cacc35db8971c9b2e95f6bf8839d93 SHA512 ea9ae5be4d2654621493eb87ba112cf99f1f940ba547f7cc1facc8ec042cc91c37c9120098e6788ba98876f7cf0bdda78c263174402b05a279748064c6323f82
-EBUILD gitstats-0_pre131024.ebuild 905 BLAKE2B 40d09ad1dfdfec11eaedf0eda9ab211dce438c60999e1c5bbfdff8bb665b165733ec262deffcf0a0f2d810a67b3a0ad9f43d5d8be0b22611ed3133c065ef4b65 SHA512 e98842d050356646b49bc8bc03f90969b2a41af4ace1b96a12066c1032f077af99f06c4ec81c39d2374eab0a38e4a0bf653a4cdcf3aba635955ae606b1cb06b8
-EBUILD gitstats-0_pre20151223.ebuild 1165 BLAKE2B dd02429c58b04726fcd9bba5688db2ad259e25130265fec867bd6e96439db03355e95cd975367bf894832b333ead09bfbc51a7c71a422c56a6a925b496e05614 SHA512 743e32d8fb41ebda6478eb6878991b1ee2f061397ebdd319ab84f99b598dcdc0129046cce0a1f83d43e80f31d35811f4785291fee55d3a668c07ba519b09ae8a
-EBUILD gitstats-9999.ebuild 1116 BLAKE2B 823647e68007d86a21d4848120b9b6180099f160d188721c9d802ab1cdaad336762235f7796299af578c28fb4d8e0aa9fb150ed4c0ce90641720d6035c35717f SHA512 aeec58866f477999efec002d99d5e04ec49f9813abcb6e2f6bf42cce5a3e468cfa82135c5ae820644604a22b635687705c2b6bd0d271f1f9e6360492f409b59e
+DIST gitstats-0_pre20201124.tar.gz 37097 BLAKE2B 8ed3f7a157d3a1edbf6f880c491e8b4fec351a0dc3b7212e5bb0eb3e509ae4002fe407267da17bea775d154e38d8ca43eec00e504b614fd8a7d42b6151de43f2 SHA512 98c0a5a67d5daebf951f2e0568182ab65e1077026facc1eef38a35df8411b1356258034fea009c5a15b7e77d17240e02c5a565f0f39d497a45846d5a8cb570ae
+EBUILD gitstats-0_pre20201124.ebuild 1013 BLAKE2B 3562673d69e9cf04ea49e5baaecdce6170a285f8ffa3235ed51a924c234865e9e1fd9b7fb4c36ad9b367e7218d9d69b2fbbfac03a128ae2817b471ce8a24d3e2 SHA512 bbbad7bb2ff812d1432c9202c969d85078cb629fa5278e1fa49a5edff2230ad4e8350a990d3807dd394fa5d5f1f2e00afd84a647cd97c7df7181a29623678976
 MISC metadata.xml 547 BLAKE2B a9dcc6cb6f250ff1b58198ad68bddb57c0106eba500dc30c96b0eb2d600770e18615e6e6fe83274b2a2eb45d7841b6e7dadb4152d8c02d25dc7874ed91c2653f SHA512 cb86285a7dc9783e0301f4ba657cb78667ad4d2301569cb9704bcd4be5577e48aa5b415a39df9a206d574bf81c67c9ce5c5874bd2c1e94459a0f7d5e2421c238
diff --git a/dev-vcs/gitstats/files/gitstats-0_pre131024-filter-invalid-unicode.patch b/dev-vcs/gitstats/files/gitstats-0_pre131024-filter-invalid-unicode.patch
deleted file mode 100644
index 4af6f890ec40..000000000000
--- a/dev-vcs/gitstats/files/gitstats-0_pre131024-filter-invalid-unicode.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gitstats	2016-03-24 10:57:18.000000000 -0300
-+++ gitstats.mod	2016-03-24 10:57:11.355016439 -0300
-@@ -321,7 +321,7 @@
- 
- 		# Collect revision statistics
- 		# Outputs "<stamp> <date> <time> <timezone> <author> '<' <mail> '>'"
--		lines = getpipeoutput(['git rev-list --pretty=format:"%%at %%ai %%aN <%%aE>" %s' % getcommitrange('HEAD'), 'grep -v ^commit']).split('\n')
-+		lines = getpipeoutput(['git rev-list --pretty=format:"%%at %%ai %%aN <%%aE>" %s' % getcommitrange('HEAD'), 'grep -av ^commit | grep -ax \'.*\'']).split('\n')
- 		for line in lines:
- 			parts = line.split(' ', 4)
- 			author = ''
diff --git a/dev-vcs/gitstats/files/gitstats-0_pre20151223-grep-force-text.patch b/dev-vcs/gitstats/files/gitstats-0_pre20151223-grep-force-text.patch
deleted file mode 100644
index 9663afcd4f62..000000000000
--- a/dev-vcs/gitstats/files/gitstats-0_pre20151223-grep-force-text.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/gitstats	2016-04-01 09:46:31.000000000 -0300
-+++ b/gitstats	2016-04-01 09:46:18.458667610 -0300
-@@ -327,7 +327,7 @@
- 
- 		# Collect revision statistics
- 		# Outputs "<stamp> <date> <time> <timezone> <author> '<' <mail> '>'"
--		lines = getpipeoutput(['git rev-list --pretty=format:"%%at %%ai %%aN <%%aE>" %s' % getlogrange('HEAD'), 'grep -v ^commit']).split('\n')
-+		lines = getpipeoutput(['git rev-list --pretty=format:"%%at %%ai %%aN <%%aE>" %s' % getlogrange('HEAD'), 'grep -av ^commit']).split('\n')
- 		for line in lines:
- 			parts = line.split(' ', 4)
- 			author = ''
diff --git a/dev-vcs/gitstats/gitstats-0_pre131024.ebuild b/dev-vcs/gitstats/gitstats-0_pre131024.ebuild
deleted file mode 100644
index ec6665528e09..000000000000
--- a/dev-vcs/gitstats/gitstats-0_pre131024.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1
-
-DESCRIPTION="Statistics generator for git"
-HOMEPAGE="http://gitstats.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	sci-visualization/gnuplot[gd]
-	dev-vcs/git"
-
-src_prepare() {
-	sed \
-		-e "s:basedir = os.path.dirname(os.path.abspath(__file__)):basedir = '${EPREFIX}/usr/share/gitstats':g" \
-		-i gitstats || die "failed to fix static files path"
-	epatch "${FILESDIR}"/${P}-filter-invalid-unicode.patch
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	emake PREFIX="${D}"/usr VERSION="${PV}" install
-	dodoc doc/{README,*.txt}
-	python_replicate_script "${ED}"/usr/bin/${PN}
-}
diff --git a/dev-vcs/gitstats/gitstats-0_pre20151223.ebuild b/dev-vcs/gitstats/gitstats-0_pre20151223.ebuild
deleted file mode 100644
index f7f2ad6c28c6..000000000000
--- a/dev-vcs/gitstats/gitstats-0_pre20151223.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	KEYWORDS=""
-	EGIT_REPO_URI="https://github.com/hoxu/${PN}.git"
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://dev.gentoo.org/~np-hardass/distfiles/${PN}/${P}.tar.xz"
-fi
-
-DESCRIPTION="Statistics generator for git"
-HOMEPAGE="http://gitstats.sourceforge.net/"
-LICENSE="|| ( GPL-2 GPL-3 ) MIT"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	sci-visualization/gnuplot[gd]
-	dev-vcs/git"
-DEPEND="
-	${PYTHON_DEPS}
-	dev-lang/perl:*
-"
-
-DOCS=( doc/{AUTHOR,README,TODO.txt} )
-
-src_prepare() {
-	sed \
-		-e "s:basedirs = \[binarypath, secondarypath, '/usr/share/gitstats'\]:basedirs = \['${EPREFIX}/usr/share/gitstats'\]:g" \
-	-i gitstats || die "failed to fix static files path"
-	eapply "${FILESDIR}"/${P}-grep-force-text.patch
-	default
-}
-
-src_compile() {
-	emake VERSION="${PV}" man
-}
-
-src_install() {
-	emake PREFIX="${ED}"usr VERSION="${PV}" install
-	doman doc/${PN}.1
-	einstalldocs
-	python_replicate_script "${ED}"usr/bin/${PN}
-}
diff --git a/dev-vcs/gitstats/gitstats-9999.ebuild b/dev-vcs/gitstats/gitstats-0_pre20201124.ebuild
index 4cfb9dd321c0..0fa1ffbc9f80 100644
--- a/dev-vcs/gitstats/gitstats-9999.ebuild
+++ b/dev-vcs/gitstats/gitstats-0_pre20201124.ebuild
@@ -1,26 +1,19 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit python-r1
 
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	KEYWORDS=""
-	EGIT_REPO_URI="https://github.com/hoxu/${PN}.git"
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://dev.gentoo.org/~np-hardass/distfiles/${PN}/${P}.tar.xz"
-fi
-
 DESCRIPTION="Statistics generator for git"
 HOMEPAGE="http://gitstats.sourceforge.net/"
+SRC_URI="https://github.com/gktrk/gitstats/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
 LICENSE="|| ( GPL-2 GPL-3 ) MIT"
 SLOT="0"
-IUSE=""
+KEYWORDS="~amd64 ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
@@ -29,6 +22,8 @@ RDEPEND="
 	dev-vcs/git"
 DEPEND="
 	${PYTHON_DEPS}
+"
+BDEPEND="
 	dev-lang/perl:*
 "
 
@@ -46,8 +41,8 @@ src_compile() {
 }
 
 src_install() {
-	emake PREFIX="${ED}"usr VERSION="${PV}" install
+	emake PREFIX="${ED}"/usr VERSION="${PV}" install
 	doman doc/${PN}.1
 	einstalldocs
-	python_replicate_script "${ED}"usr/bin/${PN}
+	python_replicate_script "${ED}"/usr/bin/${PN}
 }