commit:     672cdf491e3cca3c8a5c98fa5e479f302def955a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  8 05:57:45 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun  8 06:35:10 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=672cdf49

dev-util/ctags: rename versions

Move away from the strange/unconventional snapshot scheme introduced
in 6635a8c6cb2423209613660b53d8360ebe621a75 towards the traditional
scheme we use for snapshots (LAST_VERSION_pXYZ). Prompted by upstream
tagging 6.2.0 so we need this for things sort correctly.

I thought I'd remarked on this in a commit message before but decided
not to fix it up at the time (it was pre-existing) but I can't find that.

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

 dev-util/ctags/Manifest                            |  4 ++--
 ...-r1.ebuild => ctags-6.0_p20230423_p0-r1.ebuild} | 23 ++++++++++++++++++----
 ...0609.0.ebuild => ctags-6.1_p20240609_p0.ebuild} | 21 +++++++++++++++++---
 .../{ctags-99999999.ebuild => ctags-9999.ebuild}   | 21 +++++++++++++++++---
 4 files changed, 57 insertions(+), 12 deletions(-)

diff --git a/dev-util/ctags/Manifest b/dev-util/ctags/Manifest
index 50e34f487056..706c889ea55a 100644
--- a/dev-util/ctags/Manifest
+++ b/dev-util/ctags/Manifest
@@ -1,2 +1,2 @@
-DIST ctags-20230423.0.tar.gz 3038197 BLAKE2B 
4b6114526e9dc94c95dcf1b27136fe1fde185aadcd3f880459314b6567f4ec935da10f87aaad590f4c16999adea8b15b3a153f4e80b3b9e57d9a04ecee377a09
 SHA512 
7a4b3ffcc4906765dda381ad637981f5ce8c6fc24d4141b8b0e9997b71767dda307dab4d2c2aa0e5ba003774c100d8f85e494e368cedbef12c8f415a13b85554
-DIST ctags-20240609.0.tar.gz 3158634 BLAKE2B 
fe662dc0c48a0ac484bf3fc7ba7d0a31285398cd5da111a96f14b3637045fa0b0245119da034ab467e43b776849f47891e829af86a1889548f410070df6395d4
 SHA512 
60ebc506a04aabd7ada13801ab3ac662a9798960cf2aaa90270e6d5df82850b4e709a15a7523eb2e1e347a08b458ff2b85a99c787ab08b3c2599232492ef0ebc
+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

diff --git a/dev-util/ctags/ctags-20230423.0-r1.ebuild 
b/dev-util/ctags/ctags-6.0_p20230423_p0-r1.ebuild
similarity index 83%
rename from dev-util/ctags/ctags-20230423.0-r1.ebuild
rename to dev-util/ctags/ctags-6.0_p20230423_p0-r1.ebuild
index 326138815af0..1473d36af211 100644
--- a/dev-util/ctags/ctags-20230423.0-r1.ebuild
+++ b/dev-util/ctags/ctags-6.0_p20230423_p0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,12 +9,27 @@ inherit autotools python-any-r1
 DESCRIPTION="Exuberant Ctags creates tags files for code browsing in editors"
 HOMEPAGE="https://ctags.io/ https://github.com/universal-ctags/ctags";
 
-if [[ ${PV} == *99999999* ]] ; then
+if [[ ${PV} == 9999 ]] ; then
        EGIT_REPO_URI="https://github.com/universal-ctags/ctags";
        inherit git-r3
 else
-       
SRC_URI="https://github.com/universal-ctags/ctags/archive/refs/tags/p6.0.${PV}.tar.gz
 -> ${P}.tar.gz"
-       S="${WORKDIR}"/${PN}-p6.0.${PV}
+       # 6.0_p20230423_p0
+       #
+       # 6.0
+       MY_PV_BASE=${PV/_p/.}
+       MY_PV_BASE=${MY_PV_BASE%*.*}
+       # 20230423_p0
+       MY_PV_PATCH=${PV#*_p}
+       # 20230423
+       MY_PV_PATCH_DATE=${MY_PV_PATCH%_p*}
+       # 0
+       MY_PV_PATCH_DATE_SUFFIX=${MY_PV_PATCH##*_p}
+       # p6.0.20230423.0
+       MY_PV=p${MY_PV_BASE}.${MY_PV_PATCH_DATE}.${MY_PV_PATCH_DATE_SUFFIX}
+       MY_P=${PN}-${MY_PV}
+
+       
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"
 fi

diff --git a/dev-util/ctags/ctags-20240609.0.ebuild 
b/dev-util/ctags/ctags-6.1_p20240609_p0.ebuild
similarity index 85%
rename from dev-util/ctags/ctags-20240609.0.ebuild
rename to dev-util/ctags/ctags-6.1_p20240609_p0.ebuild
index 8297e0548743..b5937756e0f3 100644
--- a/dev-util/ctags/ctags-20240609.0.ebuild
+++ b/dev-util/ctags/ctags-6.1_p20240609_p0.ebuild
@@ -9,12 +9,27 @@ inherit autotools python-any-r1
 DESCRIPTION="Exuberant Ctags creates tags files for code browsing in editors"
 HOMEPAGE="https://ctags.io/ https://github.com/universal-ctags/ctags";
 
-if [[ ${PV} == *99999999* ]] ; then
+if [[ ${PV} == 9999 ]] ; then
        EGIT_REPO_URI="https://github.com/universal-ctags/ctags";
        inherit git-r3
 else
-       
SRC_URI="https://github.com/universal-ctags/ctags/archive/refs/tags/p6.1.${PV}.tar.gz
 -> ${P}.tar.gz"
-       S="${WORKDIR}"/${PN}-p6.1.${PV}
+       # 6.0_p20230423_p0
+       #
+       # 6.0
+       MY_PV_BASE=${PV/_p/.}
+       MY_PV_BASE=${MY_PV_BASE%*.*}
+       # 20230423_p0
+       MY_PV_PATCH=${PV#*_p}
+       # 20230423
+       MY_PV_PATCH_DATE=${MY_PV_PATCH%_p*}
+       # 0
+       MY_PV_PATCH_DATE_SUFFIX=${MY_PV_PATCH##*_p}
+       # p6.0.20230423.0
+       MY_PV=p${MY_PV_BASE}.${MY_PV_PATCH_DATE}.${MY_PV_PATCH_DATE_SUFFIX}
+       MY_P=${PN}-${MY_PV}
+
+       
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"
 fi

diff --git a/dev-util/ctags/ctags-99999999.ebuild 
b/dev-util/ctags/ctags-9999.ebuild
similarity index 85%
rename from dev-util/ctags/ctags-99999999.ebuild
rename to dev-util/ctags/ctags-9999.ebuild
index d7133379a221..a72ff60888fa 100644
--- a/dev-util/ctags/ctags-99999999.ebuild
+++ b/dev-util/ctags/ctags-9999.ebuild
@@ -9,12 +9,27 @@ inherit autotools python-any-r1
 DESCRIPTION="Exuberant Ctags creates tags files for code browsing in editors"
 HOMEPAGE="https://ctags.io/ https://github.com/universal-ctags/ctags";
 
-if [[ ${PV} == *99999999* ]] ; then
+if [[ ${PV} == 9999 ]] ; then
        EGIT_REPO_URI="https://github.com/universal-ctags/ctags";
        inherit git-r3
 else
-       
SRC_URI="https://github.com/universal-ctags/ctags/archive/refs/tags/p6.1.${PV}.tar.gz
 -> ${P}.tar.gz"
-       S="${WORKDIR}"/${PN}-p6.1.${PV}
+       # 6.0_p20230423_p0
+       #
+       # 6.0
+       MY_PV_BASE=${PV/_p/.}
+       MY_PV_BASE=${MY_PV_BASE%*.*}
+       # 20230423_p0
+       MY_PV_PATCH=${PV#*_p}
+       # 20230423
+       MY_PV_PATCH_DATE=${MY_PV_PATCH%_p*}
+       # 0
+       MY_PV_PATCH_DATE_SUFFIX=${MY_PV_PATCH##*_p}
+       # p6.0.20230423.0
+       MY_PV=p${MY_PV_BASE}.${MY_PV_PATCH_DATE}.${MY_PV_PATCH_DATE_SUFFIX}
+       MY_P=${PN}-${MY_PV}
+
+       
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"
 fi

Reply via email to