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

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

commit:     6a57e9564140ad377454ea6f6be9369ac05c0732
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  3 02:10:51 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul  3 02:10:51 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a57e956

sys-devel/gcc: fix USE=nls w/ newer GCC for 11.{3,4}.0

Bug: https://bugs.gentoo.org/843119
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-devel/gcc/Manifest                                       | 2 ++
 sys-devel/gcc/gcc-11.3.0.ebuild                              | 2 +-
 sys-devel/gcc/gcc-11.3.1_p20220701.ebuild                    | 2 +-
 sys-devel/gcc/{gcc-11.4.9999.ebuild => gcc-11.3.9999.ebuild} | 0
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index d36099309f0b..7cd355811bda 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -17,9 +17,11 @@ DIST gcc-11.2.0-patches-1.tar.bz2 11537 BLAKE2B 9dd791ada244c9b70b8b99f9f305a688
 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-4.tar.bz2 14030 BLAKE2B cdd555f329c7c0b993cd3527489681bfcc2162db0997611b66337e6b287356761c7deccd3b9f9bb8980a32df0574017a52c5e445e24db746757d87ffccb1ea89 SHA512 cb227599d01734ae9f9fc7ae2c8dd4cae1da80d6ab398ec6f112535239ac76ce8e91fbac88e19c2f75cb08ab75f966c1d1ad4af80ede67e953fbbafc7baefa58
+DIST gcc-11.3.0-patches-5.tar.bz2 14575 BLAKE2B 55ff9558f3ffe89d511663f12477e72ed1bc29d4fa8f1bc58b9c52d28838716ba9b8291ede7b86e28c3bee0633c34763f611779fe46531bd75d8aa7661b46118 SHA512 65bf4c0d1d43923298efd527a5f4da2a10d88a383d2eef72e6a25ce37964ddaf27c49545915228347e8320f905afcdfe1275d98e8458993a7229425f74ae41bd
 DIST gcc-11.3.0.tar.xz 81141364 BLAKE2B 7e562d25446ca4ab9fe8cdb714866f66aba3744d78bf84f31bfb097c1a981e4c7f990cb1e6bcfec5ae6671836a4984e2b70eb8fed81dcef5e244f88da8623469 SHA512 f0be5ad705c73b84477128a69c047f57dd47002f375eb60e1e842e08cf2009a509e92152bca345823926d550b7395ae6d4de7db51d1ee371c2dc37313881fca7
 DIST gcc-11.4.0-musl-patches-0.tar.xz 3844 BLAKE2B f3f1be6718e3cf08e553a1a2319a85e13368279849f6f3ab89ad7abe505316afacf5084846c0cb133bdcb5c918244644242c194e6ce55455a26e67b3983d73ef SHA512 a81db52d21de364137461dcff7e1af696df4a02fa26452f90439ae4af14ccbffe68eb4ee93ae56257490ab8aa36b4bff37c4e1f2cf4dd4624b3a6fb4cb50b7ac
 DIST gcc-11.4.0-patches-0.tar.xz 13404 BLAKE2B a384e6604befe306e6ee444b886c1aed1ef469299f5c7903da8314d73fd06463fb4f24be24d3d03df4883eaa8eb24beb477d881c5a1886d5913fee110b11a35c SHA512 f46f971f87deceaa8bc60eaa815aa1625f1cae01d2cccaeb6ff87f518198a756a1f7b496bd5bad004d713a4e8e6138f0b9a832e4df344fcb3009def840f9f6b9
+DIST gcc-11.4.0-patches-1.tar.xz 13956 BLAKE2B ff6ee1b81ad214e74a49c00b15767086c6b12b1566b42c4fb88778bfae3a8e319e42ffbcd8aa7f717b6f32bd966dc0da08be3a57a27992d9b90368622e7e2ff0 SHA512 3b9b641bb00b85fa88c87d8923ebcfb844125ff6149b998c565006173f4d68b0ccf8c1fec2c7bac0684584c61176346cee7373b165587a092bcd92ccb96c61db
 DIST gcc-12-20220528.tar.xz 79096228 BLAKE2B 9c06ce85c6302bd43e06d35d5d5cc9e81268d368484bd60af707e6dbbe791d85ec2a177fe7deae1379d313269fcaea2ff5245e20e54ca667f452c27efb738c13 SHA512 498be61fcae7e4ec55e1f270e1d02fadfe9069692afab6442dac0b7ab480ad7112121f4728a9f99c7868e7373b2c770ad4833a3b4a1a8a43b3417e79f286c28c
 DIST gcc-12-20220625.tar.xz 79092788 BLAKE2B 491da523abc0a63bbceaa6c76b251a5b6c224e1684b5db4e6155fdcab4b0d8d505376d30a13e1b0331f37558aac311477bbb3179b63da850acae436b642c9ee1 SHA512 0527c6d69cd53e8aba3464746b7989e3128af74818864a2e5b4be66313203d32a84201440a254da8de72842b0ebbbccf1ec14c6a121cb09f9454358b0a37b8f9
 DIST gcc-12-20220702.tar.xz 79091468 BLAKE2B a15363dbab5f331b2e5ee6362ef6701307513bca211cacdee2bf17cf50cf88a019110c2b2412939b614c3346b5ec3823ee5b1bca19db526693149a163e5b98fe SHA512 e5ab44e79f641ace6d9d77ffb176f3309d35e8f36b6bdd42f09e29fcc82766933e0fb8f86be84bf7419fe9918c554544d34c448b706ec0cb052e738e5594683c

diff --git a/sys-devel/gcc/gcc-11.3.0.ebuild b/sys-devel/gcc/gcc-11.3.0.ebuild
index f98df193692e..b02633ee3060 100644
--- a/sys-devel/gcc/gcc-11.3.0.ebuild
+++ b/sys-devel/gcc/gcc-11.3.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="4"
+PATCH_VER="5"
 PATCH_GCC_VER="11.3.0"
 MUSL_VER="1"
 MUSL_GCC_VER="11.3.0"

diff --git a/sys-devel/gcc/gcc-11.3.1_p20220701.ebuild b/sys-devel/gcc/gcc-11.3.1_p20220701.ebuild
index 4fd674ce0658..fec8a9f96524 100644
--- a/sys-devel/gcc/gcc-11.3.1_p20220701.ebuild
+++ b/sys-devel/gcc/gcc-11.3.1_p20220701.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 TOOLCHAIN_PATCH_SUFFIX="xz"
 TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="0"
+PATCH_VER="1"
 PATCH_GCC_VER="11.4.0"
 MUSL_VER="0"
 MUSL_GCC_VER="11.4.0"

diff --git a/sys-devel/gcc/gcc-11.4.9999.ebuild b/sys-devel/gcc/gcc-11.3.9999.ebuild
similarity index 100%
rename from sys-devel/gcc/gcc-11.4.9999.ebuild
rename to sys-devel/gcc/gcc-11.3.9999.ebuild