[gentoo-commits] repo/gentoo:master commit in: dev-vcs/gitstats/files/, dev-vcs/gitstats/

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/gitstats/files/, dev-vcs/gitstats/

[Göktürk Yüksek]

commit:     42c388fe9005c5962166bafcc286565b873d423d
Author:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 24 22:23:33 2020 +0000
Commit:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 02:29:15 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42c388fe

dev-vcs/gitstats: remove old python2 versions

Bug: https://bugs.gentoo.org/735338
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Göktürk Yüksek <gokturk <AT> gentoo.org>

 dev-vcs/gitstats/Manifest                          |  2 -
 ...tstats-0_pre131024-filter-invalid-unicode.patch | 11 -----
 .../gitstats-0_pre20151223-grep-force-text.patch   | 11 -----
 dev-vcs/gitstats/gitstats-0_pre131024.ebuild       | 40 ----------------
 dev-vcs/gitstats/gitstats-0_pre20151223.ebuild     | 54 ----------------------
 5 files changed, 118 deletions(-)

diff --git a/dev-vcs/gitstats/Manifest b/dev-vcs/gitstats/Manifest
index 387fff8993c..897d687297b 100644
--- a/dev-vcs/gitstats/Manifest
+++ b/dev-vcs/gitstats/Manifest
@@ -1,3 +1 @@
-DIST gitstats-0_pre131024.tar.xz 32104 BLAKE2B 87288f2e29fede41aaaf2ffdc69aa6993c753992a1c5494b0f16ae85fb7ccb8a6a2a83334e31fa2fea3d6169a6d3f236ac087f3080920ed223744e21ed2f01ad SHA512 a42c6ca37d39c24782c19a1157cc5aaf3a16e34c603c5fa3f91fcd5165e6f4788d5d75786b78f962ab81b3db66dd94f051dd929f02f4ffef845ec5b793feba53
-DIST gitstats-0_pre20151223.tar.xz 32236 BLAKE2B f2d3e52f7fa3777cdf8854940a1180a6203a77d16cc1b6910158332fdbdfbcf8e8cf0de15fe57b75284bb3334893db6920cacc35db8971c9b2e95f6bf8839d93 SHA512 ea9ae5be4d2654621493eb87ba112cf99f1f940ba547f7cc1facc8ec042cc91c37c9120098e6788ba98876f7cf0bdda78c263174402b05a279748064c6323f82
 DIST gitstats-0_pre20201124.tar.gz 37097 BLAKE2B 8ed3f7a157d3a1edbf6f880c491e8b4fec351a0dc3b7212e5bb0eb3e509ae4002fe407267da17bea775d154e38d8ca43eec00e504b614fd8a7d42b6151de43f2 SHA512 98c0a5a67d5daebf951f2e0568182ab65e1077026facc1eef38a35df8411b1356258034fea009c5a15b7e77d17240e02c5a565f0f39d497a45846d5a8cb570ae

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 4af6f890ec4..00000000000
--- 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 9663afcd4f6..00000000000
--- 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 ec6665528e0..00000000000
--- 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 f7f2ad6c28c..00000000000
--- 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}
-}

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/gitstats/files/, dev-vcs/gitstats/

[Pacho Ramos]

commit:     486c55ba97a201f95a09739806289129a076eb88
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 30 08:26:34 2024 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Tue Jul 30 08:48:02 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=486c55ba

dev-vcs/gitstats: Support python 3.12

Thanks-to: Khumba
Closes: https://bugs.gentoo.org/929561
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 .../files/gitstats-0_pre20201124-py312.patch       | 44 ++++++++++++++++++++++
 dev-vcs/gitstats/gitstats-0_pre20201124.ebuild     |  9 +++--
 2 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/dev-vcs/gitstats/files/gitstats-0_pre20201124-py312.patch b/dev-vcs/gitstats/files/gitstats-0_pre20201124-py312.patch
new file mode 100644
index 000000000000..3896fd87e937
--- /dev/null
+++ b/dev-vcs/gitstats/files/gitstats-0_pre20201124-py312.patch
@@ -0,0 +1,44 @@
+From 4743c3fe184ce6e10d145c536af5b3689b069fc2 Mon Sep 17 00:00:00 2001
+From: Bryan Gardiner <bog@khumba.net>
+Date: Fri, 14 Jun 2024 19:13:32 -0700
+Subject: [PATCH] Use raw strings for regexs to fix new SyntaxWarnings in
+ Python 3.12.
+
+---
+ gitstats | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/gitstats b/gitstats
+index 9f14a0f..37005f3 100755
+--- a/gitstats
++++ b/gitstats
+@@ -96,7 +96,7 @@ def getkeyssortedbyvaluekey(d, key):
+ 	return [el[1] for el in sorted([(d[el][key], el) for el in list(d.keys())])]
+ 
+ def getstatsummarycounts(line):
+-	numbers = re.findall('\d+', line)
++	numbers = re.findall(r'\d+', line)
+ 	if   len(numbers) == 1:
+ 		# neither insertions nor deletions: may probably only happen for "0 files changed"
+ 		numbers.append(0);
+@@ -322,7 +322,7 @@ class GitDataCollector(DataCollector):
+ 				continue
+ 			prev = tag
+ 			for line in output.split('\n'):
+-				parts = re.split('\s+', line, 2)
++				parts = re.split(r'\s+', line, 2)
+ 				commits = int(parts[1])
+ 				author = parts[2]
+ 				self.tags[tag]['commits'] += commits
+@@ -485,7 +485,7 @@ class GitDataCollector(DataCollector):
+ 		for line in lines:
+ 			if len(line) == 0:
+ 				continue
+-			parts = re.split('\s+', line, 4)
++			parts = re.split(r'\s+', line, 4)
+ 			if parts[0] == '160000' and parts[3] == '-':
+ 				# skip submodules
+ 				continue
+-- 
+2.44.2
+

diff --git a/dev-vcs/gitstats/gitstats-0_pre20201124.ebuild b/dev-vcs/gitstats/gitstats-0_pre20201124.ebuild
index 9dfd0467a905..ce08093e401a 100644
--- a/dev-vcs/gitstats/gitstats-0_pre20201124.ebuild
+++ b/dev-vcs/gitstats/gitstats-0_pre20201124.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit python-r1
 
@@ -30,9 +30,12 @@ BDEPEND="
 DOCS=( doc/{AUTHOR,README,TODO.txt} )
 
 src_prepare() {
+	eapply "${FILESDIR}/${P}-py312.patch"
+
 	sed \
 		-e "s:basedirs = \[binarypath, secondarypath, '/usr/share/gitstats'\]:basedirs = \['${EPREFIX}/usr/share/gitstats'\]:g" \
 	-i gitstats || die "failed to fix static files path"
+
 	default
 }