gentoo auto-resync : 26:04:2023 - 18:15:30

5 files changed, 50 insertions, 25 deletions

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 2dc7fef8d357..d40b129ab8ec 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -1,3 +1,4 @@
+AUX gcc-13-fix-cross-fixincludes.patch 792 BLAKE2B f16dcfee5760380931642520bf7ae939a22131183dec4f9515cabeabaa2eafbc339d4f8bdc0605bda45d840876cb8720264c4612d99510b4d7a2e4132db2403e SHA512 d65061e07c5f3089a9d39edafed94c39082dbb254cfebb386fa2fce5374e54e3e1e15a84f0de96adbe1c5ebfc33a5dad10ecbd3db851f852ec1a7521b8940fc5
 AUX gcc-configure-LANG.patch 2052 BLAKE2B 28c36f4992e41305ee421dade5eaaac34e3bdc523665b03f360f2bc01e8f69e9dc48052edb80dece63ab561e80325b4f125502482eb16f7324f1c03670021550 SHA512 a694c7ac2f45cc657097ff5b0cf1356ac88a9c06035c9ba15167e9d444844d0d8a478eb1b9b62195dd063774f79697b9148b9cdb6c261640b472c291061b2129
 AUX gcc-configure-texinfo.patch 341 BLAKE2B d2ea3b2ea08f5d3a498ba27d0fb95e325097e2104e55caa28b66515cb48662649140d90b639369aedc54b2b1178fa4b49cda442f5f504e09d88a2efa45a5057c SHA512 e8d34c5077409df5495cf0c5fbf5e77f841c5698108fa6a5fde33eb28202c685603bdefd8368918e55f30c4b995e895d71d64c715c1ec2b017e09eb2c54c09ff
 DIST gcc-10-20230119.tar.xz 72112952 BLAKE2B 6e28cba9f6ff5c9f9231828bb400c82b8658a4f9c0166c28a6a12d71728d4460904152a8c84bbeff88c06b7f9378937b7b61bf4a871a10c56bd005170dc5fde2 SHA512 6cbb567ef1da1b6fa65892b6e71c3b7cd37e0c483e049720ea1987d444a0e7b4eb15d1e99f4e35995acdce560a811a779574eeba52bb252c61325accedd6a5c5
@@ -21,11 +22,11 @@ DIST gcc-12.2.0-musl-patches-7.tar.xz 3652 BLAKE2B 295ea907efea854a3c2447d472bed
 DIST gcc-12.2.0-patches-10.tar.xz 14252 BLAKE2B 99368db982227728a6a9e2b1f694999f041f38db4a3806b6a740c86218735f9b561197bc150423a3caad0b5fd335c95d1aca130a519754423cd44a083e655373 SHA512 f7f0d8185e908926046f579793dba5916dc27392b85bfe50a7e70c213c3ba29479dfdb1b27514765b76bc897c4dbb530680e59c4deca7a245a808ed566120e4c
 DIST gcc-12.2.0-patches-13.tar.xz 13756 BLAKE2B df0388a669458f2991951d2f4027badbff3f802e6a0422478206b5cdda76e70b531a474d2ac42817e9e7f8200e9ac35ca8276af539839b4ebb2e22903ec25a23 SHA512 2970de9d2806d59c5d0f77e66000860c816ebd674489db8114f48f6aa11575644154431480222580b520b9e312647b06f94ab38959a49a8cda818158d6babf1d
 DIST gcc-12.2.0-patches-15.tar.xz 15352 BLAKE2B 36e5a0fa40d1a202da02187bc752f20868375e5e2d95b88b2d5f90625da223286cd006f258d390a004d0fa9d019e04063bb79900590333854b5d668233c7a91c SHA512 150ec959d45c883bf15b9801baf53665b78d57aeb6fe135af6eadad5fff36fb38431e51f95e5e3bf4c43b54e873f16f26d7746bf4c81ac57fff7acbff0db342a
-DIST gcc-13-20230422.tar.xz 83937896 BLAKE2B b1643c351a9af6aac9718cde8606e19dc8845b179fa0b71caf7dfa3aba91692d5959733ebb27b714a0aa457944947b57575b669137af8629e6e4503ad64d94e8 SHA512 cfc67ce04ebc2b436ad555f3e0beb20235759d7d4b3a612ce2d7f1b82024b6af4b375cb191541ecfb95e7f8d7a624e53b7e6014f85505497d04ee42cf266bb9a
-DIST gcc-13.1.0-RC-20230421.tar.xz 91762984 BLAKE2B e939f1c9d672c32cbdfc9be12367265a9c4c68a7d7fa33c32e78b449504e2228158c27a6f37982ce5a8b5790fa0886676bab4c8528a6f0717b03122382334072 SHA512 bc0bb66d6ef875e5e36c9836ee0294af46e19d2d50eb85ec2a599d6e5e67bfd994f88067debc7c42ea63a64737a90aced44ec006b4d67a134260872128050c16
 DIST gcc-13.1.0-musl-patches-1.tar.xz 3528 BLAKE2B c572ab4a0fb929b16ec36b3a3616cdcccd62f7ee27ded8077008b9beb50539db64cc251ff8a3eade54e8ebfe1012f8f32d0802379bf8ffb0f1b8ce7c8457da37 SHA512 ffb7dfa54a9d23b5333664e915efd9f18a43cd696f4ff5669a8b072a0e9cf4978de53e315123542441a2533e4f269de0bb7d90ee7a37d3a7517b7cda6ea06681
 DIST gcc-13.1.0-patches-10.tar.xz 12444 BLAKE2B e9cf63925ee8fdc3381fa68b6827c835072e26a89c478b7e0f48c9fa91c3dc524116fab01597ad82c9867908cf39da5d1cea1add64318ce47a25094ffdd665fe SHA512 81401b288c66b19f493a8306820a07118b0052cf827d3fcee107192a05230d81fa130899053ef88a2ef453e9d5f24f2929e1d2f54a424fa97a82feef2499be24
-DIST gcc-13.1.0-patches-9.tar.xz 11720 BLAKE2B c26a2924fa8aab318a1f4a4974ca4aeba255f3605fa0cbf448a4e48b6f3e9359012aeae15726299059257b93043c5cdd86bf1b2f2fffd4b9a096ab411a0503ba SHA512 98e48abaa664ea18bf00ba7bdb29cc1e908cc55ba9d12d52061e86fc917753ade8e38a190c04d23c63102808ac5a9e8ecf085dcc29a1568a329ceb5d43cf0290
+DIST gcc-13.1.0.tar.xz 87451196 BLAKE2B b956a773cffe8b43bd6c9a99fe614f53f665438925a6b320975d301f547923e45d4d6fa577a143467fb03e0a9c1bab2b6719a1011d672367f3e644433a2d7606 SHA512 6cf06dfc48f57f5e67f7efe3248019329a14d690c728d9f2f7ef5fa0d58f1816f309586ba7ea2eac20d0b60a2d1b701f68392e9067dd46f827ba0efd7192db33
+DIST gcc-13.2.0-musl-patches-1.tar.xz 3572 BLAKE2B a5fd1dd6f94aa9f2b35815e193bdecb9c343874e5181761524abf9db6e796bad6b57eb7de9b7aa41b61c370df526f4fc2b56766eb4b2d430b10785e3c287d544 SHA512 d55f0097053ea38ec1e2880059407bf726c5f6282c2abe659646e3af7ac0844c80ffb06e9006f6320e8a19752d90a2b960403239f17f88bdb5ab43fb9d80c1d2
+DIST gcc-13.2.0-patches-1.tar.xz 15792 BLAKE2B 2ffa9ac013c0f9a91eb93e87e3bc6c378d02cca32ad3f8a84d1249e257eb02b206ec10fa425738a4bae2ffb7db8506afcee2a8dd855357e4b48636608aa24e50 SHA512 917ea178f3696724f9ec08aebb6976f03c5edf8ee21bb4bad7e2d820507452f6dace6e847c4f342a52870642550f34da0346ee635a60ba0c1bff667e0e31d195
 DIST gcc-14-20230423.tar.xz 83968044 BLAKE2B 0ea88ec50e20b6936b6fe56179b8cd254e739c61143b6d80dd6b10b2c063e89a9459bdf5371bf80fddd52dd2bafa79197bd4ccb0728d19382b70938ba87f7069 SHA512 ed5955316b2ed5df1300cb3526542cd6adaca0b99692f4dfb6b1c68b5e075b863599eb0ad43aca2b15b535be5a117f5be4ab7823bf810e0fdd8681faa8c7160d
 DIST gcc-14.0.0-musl-patches-1.tar.xz 3576 BLAKE2B 692baee8a7709905d53aeb150d73a3721c4ba47ee5f397cfb1b5be905cf003ca02b60c94ee294d90ac39645cd5cdf186c7a3aa950c47d8cf680c128ed705b807 SHA512 0592ab98a7142e404623a6511c67dff61e9ade32c3fb2c0e75b456306e0af3799ad13252b50b3d2fdd31e5815d7f0b16b0ad63ab8386fe4d78729fc9c182d617
 DIST gcc-14.0.0-patches-1.tar.xz 11612 BLAKE2B a3b0f3952cf7a6fb095817f4727ccb5cff24607a5c2bb67d280da4651177132ddcf398243998271c509ccaf3445d4843ff691a12d5c394dad8d9c70fc4a8120d SHA512 66701c2e4fd1a031ffcb353a3a9cd1fe25d3d62167065523097e41a3e48adf4218ecf08e382e3ea22014c561ba3a15681650c5538cda91d38c69cbbf04503a74
@@ -46,9 +47,9 @@ EBUILD gcc-12.2.1_p20230121-r1.ebuild 1476 BLAKE2B 108f19cabfc3a958c6d61ad2c8ad0
 EBUILD gcc-12.2.1_p20230304.ebuild 1481 BLAKE2B 49b5fb0c157e0edd792af216963b3318044c5e2fbafaede67738d96002e691db5ccc4f602cba4ac9589e6858fd58ec956ef0b0b82053f7312572d394b1e92b49 SHA512 a9c267a190cefa26e0fe6710a4243798faeeab3a37262c3663901ae32166b40ab53db59eb7eb232449832ebbf6ec291f723ae5fb9f6b15240e8fd22a7d5ab107
 EBUILD gcc-12.2.1_p20230421.ebuild 1486 BLAKE2B 516464c6dc34fb571f3de6f5c68b76dcdb47444ee7a97f6ca31824a0bf125ad70ec491600b211923b5b9611dfcafd85b749c01950f5a45db6acb54a780c9d4f1 SHA512 6ebef3954ddbba3d74e55ae70995f1c6108a52aed2066113cdf29b21e7eed8754d170377a5b4ae1ab3561b16964b9796b198cdfb9e40931d9529a27349cd342b
 EBUILD gcc-12.3.9999.ebuild 1593 BLAKE2B 0cac4b67933abbacf0037f3e89b4209ea2a8147b62d4c2b6e61701711ee421d240899c4c9bdb201cdfceef14125227109b4c5c3524256a06b206887a4d0f142e SHA512 ac75c2434ba6a36655749ed371b158360a7e05570ed41e39dac0a15ac6eb24810f2408a2d30e50206e4250c567123377e14317c07ab1e6b5771599a3b5e0ced0
-EBUILD gcc-13.0.1.9999.ebuild 1327 BLAKE2B ec9652e60d12944e328922bfbd8873ab2258e7f194c1d4aa5da5e8e7e090aca6d8e17d33e2b6b7397ad30e669c3ff072260a9de12a398b8ff7cc7ce533ca2f9a SHA512 62066f20c7861c90e567268fc327d4b8f59043e63df6bb4831e6e2538f91113ffb075eb1be13a8fc3a67a26c79681e06b84f2a9405286f99fc59eee3cea46222
-EBUILD gcc-13.0.1_pre20230421.ebuild 1585 BLAKE2B 19bb0458a8d44cc1995e7492a7008556de8616c6b7f464d4ed8760cc2bc0d234c5e46cf0d869406370ad6016aafcd0da65734218081b1d8c4b2716d14fe7bb26 SHA512 4b586a1cc0e92ba36d9a972584b6213ac1d3fda8a284461513fc39eb7542411ba48787d7d86c95722bbe02646b05dd9d720e5c7fbcee2575b75bec0bbe7c0ed1
-EBUILD gcc-13.0.1_pre20230422.ebuild 1567 BLAKE2B df0f89ed5309c36a5345c16e0a91c7de551014f9b09a676d9657a30118eaad5daa4268cb598fe5dae21d73b7737edfda5c1a41942e61d73f728215c6b7a2168b SHA512 e99289ce620cf0eb516bf8ec8d84218e557004dae8a2094fd83dceb7bcf8d9e9acfd69cc61c062a696100d43299c7b2f77768d17abbee6af83eecb9bf0e4e886
+EBUILD gcc-13.1.0-r1.ebuild 1664 BLAKE2B b6fd223eeee8e6b0b02a5d5eb33437b1ba036bdf09a13aaab95318682f83d8dd1a184eb6afd8bef2c34013bfd8d0f38a108f3db0d6fbfd565f29d363cba98d3f SHA512 7e8eb3791678e456bf2c7717a4b8c95322efcde8dc3030f035cb9577fbc416a2c8b567e588036f94bffa2dd83bd00ee98a797d50d65388a3fc022819e4ab2c2e
+EBUILD gcc-13.1.0.ebuild 1606 BLAKE2B 0149e66a73656ee07fb2e059d501b922ddab9f7e770151a160e824220e17fb0d5e46e8afebbdd344fa86d0ad5f8f34595cda54ea71e232c546c13262ab6ae992 SHA512 d30c7cc6f2a86a017a786bf7f3e0c417f9abcf8b131b3b681088176d8fc79b4b8d12be5a87e972b0fb033e98c0b796d380c5a0f49768f19feec44d1bd02eb1b5
+EBUILD gcc-13.2.9999.ebuild 1593 BLAKE2B 6ada03c3a63cbdb90a06954f02809b1f7aec31130c010981554ef8df4db41d79d856ee514694b9f900983e7649cc94929e3050764ff6fef5a8227701710d423a SHA512 89b624dc6f8a1187f3d36f9988409c27e1e2133889a1135be0ecaa3aaa7c381f780cc20aa8095be9bc31c4e16b96128ba50dc17431305bf3f334025956a95746
 EBUILD gcc-14.0.0.9999.ebuild 1591 BLAKE2B 8a463d1b3d812a22a29a4aec27504bc138a69939b328f6fecf4eecaa90aa51acdb2e53fdf5ca5d69c5159019c354ad9ecaff218181f06fbbd9a0da43fc70c962 SHA512 67e09c08daf026d9c61f8feeafcd595c37103c04879641f6d79ef7ceeb0d44d84dd81bc340e77d031c8675a4ac858ea5a555fe0dc76fcce57991361b2d09c1b5
 EBUILD gcc-14.0.0_pre20230423.ebuild 1622 BLAKE2B 459d438085fc5382680372ccbe7223f56906207667619a7788c5ff1c2b573c363481c9857f64aa17f5a67ddf35d5a4c79b559dad70b8bf2593710b610c19335a SHA512 fe6b9cf8dcee281c71ef30a28f5da38922f2be6671573545f3a7b3b1db9220aa6236f3441fe3ad2d31b389ef752dbe68f1b75f45532565fd20e0bd01ebcdf77e
 EBUILD gcc-8.5.0-r1.ebuild 498 BLAKE2B e24f62fdb50bf2e9957cbb85c72adc96d369938a7f552735772de964f7023b8b34bd11e7e544d268cc308e25272084a728bd061f37c568d42ea65d55bb2a2e93 SHA512 f35b353e9f54eb3e1c6f8e0ea262458b41da9bddb993793aff79f765c4d93811744979d34e50c6470a9b2cfb63b7006bd284d819b7a98e56a8b3a34ae570ae76
diff --git a/sys-devel/gcc/files/gcc-13-fix-cross-fixincludes.patch b/sys-devel/gcc/files/gcc-13-fix-cross-fixincludes.patch
new file mode 100644
index 000000000000..e4abe01a0830
--- /dev/null
+++ b/sys-devel/gcc/files/gcc-13-fix-cross-fixincludes.patch
@@ -0,0 +1,19 @@
+Revert of https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=59e4c98173a79fcaa2c33253261409f38856c384
+for now to fix cross fixincludes builds.
+
+https://bugs.gentoo.org/905118
+--- a/gcc/Makefile.in
++++ b/gcc/Makefile.in
+@@ -532,11 +532,7 @@ LINKER_PLUGIN_API_H = $(srcdir)/../include/plugin-api.h
+ # Default native SYSTEM_HEADER_DIR, to be overridden by targets.
+ NATIVE_SYSTEM_HEADER_DIR = @NATIVE_SYSTEM_HEADER_DIR@
+ # Default cross SYSTEM_HEADER_DIR, to be overridden by targets.
+-ifeq (@includedir@,$(prefix)/include)
+-  CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@
+-else
+-  CROSS_SYSTEM_HEADER_DIR = @includedir@
+-endif
++CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@
+ 
+ # autoconf sets SYSTEM_HEADER_DIR to one of the above.
+ # Purge it of unnecessary internal relative paths
diff --git a/sys-devel/gcc/gcc-13.0.1_pre20230421.ebuild b/sys-devel/gcc/gcc-13.1.0-r1.ebuild
index f0ad71e33ed5..195b306ad1d2 100644
--- a/sys-devel/gcc/gcc-13.0.1_pre20230421.ebuild
+++ b/sys-devel/gcc/gcc-13.1.0-r1.ebuild
@@ -3,25 +3,22 @@
 
 EAPI=8
 
-TOOLCHAIN_GCC_RC=1
 TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="9"
-PATCH_GCC_VER="13.1.0"
+PATCH_VER="1"
+PATCH_GCC_VER="13.2.0"
 MUSL_VER="1"
-MUSL_GCC_VER="13.1.0"
+MUSL_GCC_VER="13.2.0"
 
 if [[ $(ver_cut 3) == 9999 ]] ; then
 	MY_PV_2=$(ver_cut 2)
-	MY_PV_3=$(($(ver_cut 3) - 9998))
 	if [[ ${MY_PV_2} == 0 ]] ; then
 		MY_PV_2=0
-		MY_PV_3=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}.${MY_PV_3}
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
 elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
 	# Cheesy hack for RCs
 	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
@@ -33,10 +30,12 @@ fi
 
 inherit toolchain
 
+# Needs to be after inherit (for now?), bug #830908
+EGIT_BRANCH=releases/gcc-$(ver_cut 1)
+
 # Don't keyword live ebuilds
 if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-#	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	KEYWORDS="~loong"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 if [[ ${CATEGORY} != cross-* ]] ; then
@@ -58,5 +57,6 @@ src_prepare() {
 
 	toolchain_src_prepare
 
+	eapply "${FILESDIR}"/${PN}-13-fix-cross-fixincludes.patch
 	eapply_user
 }
diff --git a/sys-devel/gcc/gcc-13.0.1_pre20230422.ebuild b/sys-devel/gcc/gcc-13.1.0.ebuild
index def3a11ef482..2cc1ca13c4fe 100644
--- a/sys-devel/gcc/gcc-13.0.1_pre20230422.ebuild
+++ b/sys-devel/gcc/gcc-13.1.0.ebuild
@@ -11,16 +11,14 @@ MUSL_GCC_VER="13.1.0"
 
 if [[ $(ver_cut 3) == 9999 ]] ; then
 	MY_PV_2=$(ver_cut 2)
-	MY_PV_3=$(($(ver_cut 3) - 9998))
 	if [[ ${MY_PV_2} == 0 ]] ; then
 		MY_PV_2=0
-		MY_PV_3=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}.${MY_PV_3}
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
 elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
 	# Cheesy hack for RCs
 	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
@@ -32,10 +30,12 @@ fi
 
 inherit toolchain
 
+# Needs to be after inherit (for now?), bug #830908
+EGIT_BRANCH=releases/gcc-$(ver_cut 1)
+
 # Don't keyword live ebuilds
 if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-#	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	KEYWORDS="~loong"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 if [[ ${CATEGORY} != cross-* ]] ; then
diff --git a/sys-devel/gcc/gcc-13.0.1.9999.ebuild b/sys-devel/gcc/gcc-13.2.9999.ebuild
index 70b6d6a56728..94cabe9d1dda 100644
--- a/sys-devel/gcc/gcc-13.0.1.9999.ebuild
+++ b/sys-devel/gcc/gcc-13.2.9999.ebuild
@@ -4,21 +4,26 @@
 EAPI=8
 
 TOOLCHAIN_PATCH_DEV="sam"
-PATCH_GCC_VER="13.1.0"
-MUSL_GCC_VER="13.1.0"
+PATCH_GCC_VER="13.2.0"
+MUSL_GCC_VER="13.2.0"
 
 if [[ $(ver_cut 3) == 9999 ]] ; then
 	MY_PV_2=$(ver_cut 2)
-	MY_PV_3=$(($(ver_cut 3) - 9998))
 	if [[ ${MY_PV_2} == 0 ]] ; then
 		MY_PV_2=0
-		MY_PV_3=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}.${MY_PV_3}
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
+elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
+	# Cheesy hack for RCs
+	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
+	MY_P=${PN}-${MY_PV}
+	GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
+	TOOLCHAIN_SET_S=no
+	S="${WORKDIR}"/${MY_P}
 fi
 
 inherit toolchain