[gentoo-commits] repo/gentoo:master commit in: dev-util/ctags/

["Sam James" <sam@gentoo.org>]

commit:     6753527aaef1c0925a945e3123f202eb0b93b86c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  8 06:45:31 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun  8 06:45:31 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6753527a

dev-util/ctags: add 6.2.0

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/ctags/Manifest                            |  1 +
 .../{ctags-9999.ebuild => ctags-6.2.0.ebuild}      | 33 +++++++++++++---------
 dev-util/ctags/ctags-9999.ebuild                   | 33 +++++++++++++---------
 3 files changed, 41 insertions(+), 26 deletions(-)

diff --git a/dev-util/ctags/Manifest b/dev-util/ctags/Manifest
index 706c889ea55a..c4a4f3d25b8d 100644
--- a/dev-util/ctags/Manifest
+++ b/dev-util/ctags/Manifest
@@ -1,2 +1,3 @@
 DIST ctags-6.0_p20230423_p0.tar.gz 3038197 BLAKE2B 4b6114526e9dc94c95dcf1b27136fe1fde185aadcd3f880459314b6567f4ec935da10f87aaad590f4c16999adea8b15b3a153f4e80b3b9e57d9a04ecee377a09 SHA512 7a4b3ffcc4906765dda381ad637981f5ce8c6fc24d4141b8b0e9997b71767dda307dab4d2c2aa0e5ba003774c100d8f85e494e368cedbef12c8f415a13b85554
 DIST ctags-6.1_p20240609_p0.tar.gz 3158634 BLAKE2B fe662dc0c48a0ac484bf3fc7ba7d0a31285398cd5da111a96f14b3637045fa0b0245119da034ab467e43b776849f47891e829af86a1889548f410070df6395d4 SHA512 60ebc506a04aabd7ada13801ab3ac662a9798960cf2aaa90270e6d5df82850b4e709a15a7523eb2e1e347a08b458ff2b85a99c787ab08b3c2599232492ef0ebc
+DIST universal-ctags-6.2.0.tar.gz 3203203 BLAKE2B 396cb48a5ebedabd3a3cbfac6d1308af0dcce952c7a5693936363b1e4228bdb47addc69012ce0091a7c65557baa4e5b555b27e02e92db5a5b68517bc4b480a07 SHA512 a27c3d9b8b3edf9aaf16e5525a61998b2afb0d4905200f1fda421bf7844aba9604ecdfa1bd329d39b729c42d70a78413cec955fc38b112d3d47bd3f3c96aa559

diff --git a/dev-util/ctags/ctags-9999.ebuild b/dev-util/ctags/ctags-6.2.0.ebuild
similarity index 86%
copy from dev-util/ctags/ctags-9999.ebuild
copy to dev-util/ctags/ctags-6.2.0.ebuild
index a72ff60888fa..e65f8e1e4e1c 100644
--- a/dev-util/ctags/ctags-9999.ebuild
+++ b/dev-util/ctags/ctags-6.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{11..14} )
 inherit autotools python-any-r1
 
 DESCRIPTION="Exuberant Ctags creates tags files for code browsing in editors"
@@ -12,7 +12,7 @@ HOMEPAGE="https://ctags.io/ https://github.com/universal-ctags/ctags"
 if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/universal-ctags/ctags"
 	inherit git-r3
-else
+elif [[ ${PV} == *.*_p*_p* ]] ; then
 	# 6.0_p20230423_p0
 	#
 	# 6.0
@@ -30,13 +30,17 @@ else
 
 	SRC_URI="https://github.com/universal-ctags/ctags/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}"/${MY_P}
-
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+else
+	SRC_URI="https://github.com/universal-ctags/ctags/releases/download/v${PV}/universal-${P}.tar.gz"
+	S="${WORKDIR}"/universal-${P}
 fi
 
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="json pcre seccomp test xml yaml"
+if [[ ${PV} != 9999 ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+fi
 RESTRICT="!test? ( test )"
 
 DEPEND="
@@ -65,11 +69,11 @@ pkg_setup() {
 }
 
 src_prepare() {
+	default
+
 	# Ignore check-genfile test (calls git which errors out)
 	sed -i 's/man-test check-genfile/man-test/' makefiles/testing.mak || die
 
-	default
-
 	# Don't automagically use Valgrind
 	sed -i -e '/if type valgrind/s:valgrind:valgrind-falseified:' Tmain/optscript.d/run.sh || die
 	#./misc/dist-test-cases > makefiles/test-cases.mak || die
@@ -78,14 +82,17 @@ src_prepare() {
 }
 
 src_configure() {
-	econf \
-		$(use_enable json) \
-		$(use_enable pcre pcre2) \
-		$(use_enable seccomp) \
-		$(use_enable xml) \
-		$(use_enable yaml) \
-		--disable-etags \
+	local myeconfargs=(
+		$(use_enable json)
+		$(use_enable pcre pcre2)
+		$(use_enable seccomp)
+		$(use_enable xml)
+		$(use_enable yaml)
+		--disable-etags
 		--enable-tmpdir="${EPREFIX}"/tmp
+	)
+
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {

diff --git a/dev-util/ctags/ctags-9999.ebuild b/dev-util/ctags/ctags-9999.ebuild
index a72ff60888fa..e65f8e1e4e1c 100644
--- a/dev-util/ctags/ctags-9999.ebuild
+++ b/dev-util/ctags/ctags-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{11..14} )
 inherit autotools python-any-r1
 
 DESCRIPTION="Exuberant Ctags creates tags files for code browsing in editors"
@@ -12,7 +12,7 @@ HOMEPAGE="https://ctags.io/ https://github.com/universal-ctags/ctags"
 if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/universal-ctags/ctags"
 	inherit git-r3
-else
+elif [[ ${PV} == *.*_p*_p* ]] ; then
 	# 6.0_p20230423_p0
 	#
 	# 6.0
@@ -30,13 +30,17 @@ else
 
 	SRC_URI="https://github.com/universal-ctags/ctags/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}"/${MY_P}
-
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+else
+	SRC_URI="https://github.com/universal-ctags/ctags/releases/download/v${PV}/universal-${P}.tar.gz"
+	S="${WORKDIR}"/universal-${P}
 fi
 
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="json pcre seccomp test xml yaml"
+if [[ ${PV} != 9999 ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+fi
 RESTRICT="!test? ( test )"
 
 DEPEND="
@@ -65,11 +69,11 @@ pkg_setup() {
 }
 
 src_prepare() {
+	default
+
 	# Ignore check-genfile test (calls git which errors out)
 	sed -i 's/man-test check-genfile/man-test/' makefiles/testing.mak || die
 
-	default
-
 	# Don't automagically use Valgrind
 	sed -i -e '/if type valgrind/s:valgrind:valgrind-falseified:' Tmain/optscript.d/run.sh || die
 	#./misc/dist-test-cases > makefiles/test-cases.mak || die
@@ -78,14 +82,17 @@ src_prepare() {
 }
 
 src_configure() {
-	econf \
-		$(use_enable json) \
-		$(use_enable pcre pcre2) \
-		$(use_enable seccomp) \
-		$(use_enable xml) \
-		$(use_enable yaml) \
-		--disable-etags \
+	local myeconfargs=(
+		$(use_enable json)
+		$(use_enable pcre pcre2)
+		$(use_enable seccomp)
+		$(use_enable xml)
+		$(use_enable yaml)
+		--disable-etags
 		--enable-tmpdir="${EPREFIX}"/tmp
+	)
+
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {