[gentoo-commits] repo/gentoo:master commit in: sys-devel/gcc/

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

commit:     0ce8588aad2c917eba7faed7183a3eea4389a0c1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun May 22 15:37:22 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May 22 18:37:19 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ce8588a

sys-devel/gcc: rename GCC live ebuilds

Now live ebuilds are always newer than snapshots etc.

For example: 12.1.9999 > 12.1.1_pre20220521 > 12.1.1_pre9999

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

 sys-devel/gcc/Manifest                                 |  3 ++-
 ...{gcc-10.3.1_pre9999.ebuild => gcc-10.4.9999.ebuild} | 14 ++++++++++++++
 ...{gcc-11.3.1_pre9999.ebuild => gcc-11.4.9999.ebuild} | 18 ++++++++++++++++--
 ...{gcc-12.1.1_pre9999.ebuild => gcc-12.2.9999.ebuild} | 14 +++++++++++++-
 ...{gcc-13.0.0_pre9999.ebuild => gcc-13.0.9999.ebuild} | 12 ++++++++++++
 .../{gcc-9.4.1_pre9999.ebuild => gcc-9.5.9999.ebuild}  | 16 +++++++++++++++-
 6 files changed, 72 insertions(+), 5 deletions(-)

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index f1857381dfcb..f6d75ed2b874 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -9,8 +9,9 @@ DIST gcc-11.2.0-musl-patches-1.tar.bz2 2999 BLAKE2B 3e36bbf2f93fdce15e20f807fa26
 DIST gcc-11.2.0-patches-1.tar.bz2 11537 BLAKE2B 9dd791ada244c9b70b8b99f9f305a688c248134715ed1b26d406e53b114983faae6873cdc521497164388d24d5f61c199e98df146bc02f5578e877295bcf5c82 SHA512 6539efc60c656d0798a5896dc1b944ed69914b815102c7a1c10bdba4ef935abd326b01309f38316e121f1ed90ceb2abcaf65df6af116892daad829ac2623cefc
 DIST gcc-11.2.0.tar.xz 80888824 BLAKE2B 69b61234ac436edfea2933df68c434a2ce7aa4454ef4da573e82587e1a42dc420189e949cfdadaf4cb37fc0de9674822210a95b77ff03aca0dbedfe67df19cc6 SHA512 d53a0a966230895c54f01aea38696f818817b505f1e2bfa65e508753fcd01b2aedb4a61434f41f3a2ddbbd9f41384b96153c684ded3f0fa97c82758d9de5c7cf
 DIST gcc-11.3.0-musl-patches-1.tar.bz2 3997 BLAKE2B 5ca064cc78b067f4a7822fa0341c37ae03c8024f871d2e274e481a583afa96c36e291be93fbdd633f203260ae2ea9ac1d45f666d134bac75bc9a715a369d7374 SHA512 0ab239c66cf62a737266377c19b8dda6af6df56380f6731c2c17f3e82778e7e023a68d31728490eea3ad946f4b71d4cab363a75548f74b4b7f653972469d9e91
-DIST gcc-11.3.0-patches-3.tar.bz2 13567 BLAKE2B dba270d74b7a598e0108be0be7ff8cf01899d044ca4be9938cd5324465dc00c9e5cac4ffb4b6c1bdcdb824d75a7577eed63ae724c7e2887a19708992aca10f26 SHA512 7919b37900bbc2493564bc70f7911cf03efb857ff09c2b13280018fb54c48d8be42e35b649e69594a3ce61d51de847a8d4f75f794ce1dc50db3a700831b6a1e7
+DIST gcc-11.3.0-musl-patches-1.tar.xz 3768 BLAKE2B c591bc66f9d2e97d1b2450001dda15e9fc5b9b933cb52661815dd4a12db7973adb8d05b42a9c90badc29f06be690d98fc7fdeb3f3177497241560ed1211835ab SHA512 ca7b1e2351b2b6b4dbc19a04ca79e37d229498b3e61715e9c72abc83357dce056b37c4a31fe92497a37eb4ffbfebf13d38c2cfda81b97c1b825f99a692cd6d31
 DIST gcc-11.3.0-patches-4.tar.bz2 14030 BLAKE2B cdd555f329c7c0b993cd3527489681bfcc2162db0997611b66337e6b287356761c7deccd3b9f9bb8980a32df0574017a52c5e445e24db746757d87ffccb1ea89 SHA512 cb227599d01734ae9f9fc7ae2c8dd4cae1da80d6ab398ec6f112535239ac76ce8e91fbac88e19c2f75cb08ab75f966c1d1ad4af80ede67e953fbbafc7baefa58
+DIST gcc-11.3.0-patches-4.tar.xz 13304 BLAKE2B 2b529c5005133acd41bcc013d134fccb1011a3dea9565537ef9c7aa229005831d298fa1f8ece62ae402a0c0db174ae3851461e47140375d3dd20cebb9e6163ec SHA512 4c0b3f057d895bd8882edb21d14a5fd126c8174969fbc7a4664c62abc8f2f19ca50389295e55ea78694d4720e577464b1a3bb53a0bfb39105b50f08e0a52afe3
 DIST gcc-11.3.0.tar.xz 81141364 BLAKE2B 7e562d25446ca4ab9fe8cdb714866f66aba3744d78bf84f31bfb097c1a981e4c7f990cb1e6bcfec5ae6671836a4984e2b70eb8fed81dcef5e244f88da8623469 SHA512 f0be5ad705c73b84477128a69c047f57dd47002f375eb60e1e842e08cf2009a509e92152bca345823926d550b7395ae6d4de7db51d1ee371c2dc37313881fca7
 DIST gcc-12-20220514.tar.xz 79083160 BLAKE2B aeb6002f1137413564d24e65f4e6c79f8c2e12225ecaaf1cee601f4a584f3778b6cfc98b519d731ccf811075a7ec3e469128dd8a5e1885f480261b08c03c7a47 SHA512 15af7d5dcddd91bda7db7855956ba85983d95c63a6193785f4c5e8827f120352c731b9652d814bc461aecb9ae8b609689b500e6c8265594b31e5ec962256bee0
 DIST gcc-12-20220521.tar.xz 79087572 BLAKE2B 835b5b28c9e29fc3ab94ee732188325f216b4b54285a62c602280d2c3b0bcaaf779d2874402268b49a0aa57f0a23783e0b71fa4e37c1da05eedb5aa91f782ef3 SHA512 92f6c7cbe3b301ed7361c097dd37e11df8d504bcb0c62a363d710eb09091248a43db3466ae6d61042ce3733714efb81eec80f2e50d8761fc7a742be2c8bb5f53

diff --git a/sys-devel/gcc/gcc-10.3.1_pre9999.ebuild b/sys-devel/gcc/gcc-10.4.9999.ebuild
similarity index 65%
rename from sys-devel/gcc/gcc-10.3.1_pre9999.ebuild
rename to sys-devel/gcc/gcc-10.4.9999.ebuild
index b9f40e39b02d..b0608be1b9f1 100644
--- a/sys-devel/gcc/gcc-10.3.1_pre9999.ebuild
+++ b/sys-devel/gcc/gcc-10.4.9999.ebuild
@@ -6,7 +6,21 @@ EAPI="7"
 PATCH_GCC_VER="10.3.0"
 PATCH_VER="1"
 
+if [[ $(ver_cut 3) == 9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+	else
+		MY_PV_2=$(($(ver_cut 2) - 1))
+	fi
+
+	# e.g. 12.2.9999 -> 12.1.1
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
+fi
+
 inherit toolchain
+# Needs to be after inherit (for now?), bug #830908
+EGIT_BRANCH=releases/gcc-$(ver_cut 1)
 
 # Don't keyword live ebuilds
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"

diff --git a/sys-devel/gcc/gcc-11.3.1_pre9999.ebuild b/sys-devel/gcc/gcc-11.4.9999.ebuild
similarity index 67%
rename from sys-devel/gcc/gcc-11.3.1_pre9999.ebuild
rename to sys-devel/gcc/gcc-11.4.9999.ebuild
index 68a2294f2ab2..d7284b8d5153 100644
--- a/sys-devel/gcc/gcc-11.3.1_pre9999.ebuild
+++ b/sys-devel/gcc/gcc-11.4.9999.ebuild
@@ -3,12 +3,26 @@
 
 EAPI=7
 
-PATCH_VER="3"
+PATCH_VER="4"
 PATCH_GCC_VER="11.3.0"
 MUSL_VER="1"
-MUSL_GCC_VER="11.2.0"
+MUSL_GCC_VER="11.3.0"
+
+if [[ $(ver_cut 3) == 9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+	else
+		MY_PV_2=$(($(ver_cut 2) - 1))
+	fi
+
+	# e.g. 12.2.9999 -> 12.1.1
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
+fi
 
 inherit toolchain
+# Needs to be after inherit (for now?), bug #830908
+EGIT_BRANCH=releases/gcc-$(ver_cut 1)
 
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 

diff --git a/sys-devel/gcc/gcc-12.1.1_pre9999.ebuild b/sys-devel/gcc/gcc-12.2.9999.ebuild
similarity index 75%
rename from sys-devel/gcc/gcc-12.1.1_pre9999.ebuild
rename to sys-devel/gcc/gcc-12.2.9999.ebuild
index 8504e4c09af8..51ad0b55ab65 100644
--- a/sys-devel/gcc/gcc-12.1.1_pre9999.ebuild
+++ b/sys-devel/gcc/gcc-12.2.9999.ebuild
@@ -8,9 +8,21 @@ PATCH_GCC_VER="12.0.0"
 MUSL_VER="4"
 MUSL_GCC_VER="12.0.0"
 
+if [[ $(ver_cut 3) == 9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+	else
+		MY_PV_2=$(($(ver_cut 2) - 1))
+	fi
+
+	# e.g. 12.2.9999 -> 12.1.1
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
+fi
+
 inherit toolchain
 # Needs to be after inherit (for now?), bug #830908
-EGIT_BRANCH=releases/gcc-12
+EGIT_BRANCH=releases/gcc-$(ver_cut 1)
 
 # Don't keyword live ebuilds
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"

diff --git a/sys-devel/gcc/gcc-13.0.0_pre9999.ebuild b/sys-devel/gcc/gcc-13.0.9999.ebuild
similarity index 79%
rename from sys-devel/gcc/gcc-13.0.0_pre9999.ebuild
rename to sys-devel/gcc/gcc-13.0.9999.ebuild
index c3692a55cf5a..f14db93b3ffa 100644
--- a/sys-devel/gcc/gcc-13.0.0_pre9999.ebuild
+++ b/sys-devel/gcc/gcc-13.0.9999.ebuild
@@ -10,6 +10,18 @@ PATCH_GCC_VER="12.0.0"
 MUSL_VER="4"
 MUSL_GCC_VER="12.0.0"
 
+if [[ $(ver_cut 3) == 9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+	else
+		MY_PV_2=$(($(ver_cut 2) - 1))
+	fi
+
+	# e.g. 12.2.9999 -> 12.1.1
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
+fi
+
 inherit toolchain
 # Needs to be after inherit (for now?), bug #830908
 EGIT_BRANCH=master

diff --git a/sys-devel/gcc/gcc-9.4.1_pre9999.ebuild b/sys-devel/gcc/gcc-9.5.9999.ebuild
similarity index 56%
rename from sys-devel/gcc/gcc-9.4.1_pre9999.ebuild
rename to sys-devel/gcc/gcc-9.5.9999.ebuild
index 8c31f450a34c..471a68b351e1 100644
--- a/sys-devel/gcc/gcc-9.4.1_pre9999.ebuild
+++ b/sys-devel/gcc/gcc-9.5.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -6,7 +6,21 @@ EAPI="7"
 PATCH_GCC_VER="9.4.0"
 PATCH_VER="1"
 
+if [[ $(ver_cut 3) == 9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+	else
+		MY_PV_2=$(($(ver_cut 2) - 1))
+	fi
+
+	# e.g. 12.2.9999 -> 12.1.1
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
+fi
+
 inherit toolchain
+# Needs to be after inherit (for now?), bug #830908
+EGIT_BRANCH=releases/gcc-$(ver_cut 1)
 
 # Don't keyword live ebuilds
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"