gentoo auto-resync : 24:12:2023 - 07:41:16

11 files changed, 84 insertions, 5 deletions

diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 8c185288795a..e79114ed90a6 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/autoconf-wrapper/Manifest b/sys-devel/autoconf-wrapper/Manifest
index fe190bb67f59..a5466a272d23 100644
--- a/sys-devel/autoconf-wrapper/Manifest
+++ b/sys-devel/autoconf-wrapper/Manifest
@@ -3,5 +3,5 @@ DIST autotools-wrappers-at-20231224.tar.gz 3645 BLAKE2B fbf414240fe3a4b5d2c24ea6
 EBUILD autoconf-wrapper-20221207-r1.ebuild 1194 BLAKE2B 86596d540b375e4b7e75bf7e6a28e43b471f9d7a053e1cf91e73521d92ace5e47fc04bfaf27968106d79cf06b1c32b8e458c43fac7464c69aa39f22fc51f1f19 SHA512 f2540eea9bfe89de49c41b5d35748696eb786f64601e304b659d7da252ef5e2a98fcc7b82af20dfe5f86885a6880dbcd4529dbf161cdfed03302f6c5933f9235
 EBUILD autoconf-wrapper-20221207.ebuild 1024 BLAKE2B 6bc00dfd4936efe1cbf77abe56423bbc4d82e90dfa671409778fc41d1fdb2582aed9d391167c4a96f419cbdcef49601bb44233e56fa0b0876997decc5d62820b SHA512 b592ebf31e139c37c074f60ce4b96052ac89ec7a5548420ba3e76014f438eb6624190b807b4b324447e19a237564ae85e45fa5a1f02dc5228d3944d782443712
 EBUILD autoconf-wrapper-20231224.ebuild 1276 BLAKE2B a008a9b5b5c30f87b63dcbc5a19f409c3a529d31efce17b2e16a916f6b2ca11d8d5a33b6c0735a1f8fa683b984ffef0e720ee697ba3a2ac091dc99993c8d5e4a SHA512 300bfddfd59c5d91dbf4f501585c98d1e9a8205b58b6a6f419045de36c58114cc298420748f7231242058a8c3a8e90c762e2a3c74bbcbfc6c559d08c16ec0795
-EBUILD autoconf-wrapper-99999999.ebuild 1202 BLAKE2B acddd203aeb1ac28f474b5d0b414db0f2a486fd0abf97b7b12d8e3fde4d351db106b4d4884472637b1aa87d1427445c3519bf92ed099c06e53c07ad21da09c00 SHA512 347c990481d24e892b4c775a181c04f2a0349de7a9b36970f74dbda45239e196168327c15db61e9fd32a8098195ebbc1b000740709cdb1b9332cb2a151ebc8a1
+EBUILD autoconf-wrapper-99999999.ebuild 1276 BLAKE2B a008a9b5b5c30f87b63dcbc5a19f409c3a529d31efce17b2e16a916f6b2ca11d8d5a33b6c0735a1f8fa683b984ffef0e720ee697ba3a2ac091dc99993c8d5e4a SHA512 300bfddfd59c5d91dbf4f501585c98d1e9a8205b58b6a6f419045de36c58114cc298420748f7231242058a8c3a8e90c762e2a3c74bbcbfc6c559d08c16ec0795
 MISC metadata.xml 435 BLAKE2B 006f03645ce3cb9a4f7cad6411f3487500f58f351bbacfb6e1e3de494214fccb8b478a2cea35d289ee0a487fa7eaf31ca444cbf82d1d9eeee1822928e223009b SHA512 3b699336ca3dbf40bcfddb1db91f8d3803574c9c6765b477b93e50d756ac3c441e5bedfbbc71fcbea697a2f31b9a41fcbbb01a38d5acc8d29b48779a405f8f6c
diff --git a/sys-devel/autoconf-wrapper/autoconf-wrapper-99999999.ebuild b/sys-devel/autoconf-wrapper/autoconf-wrapper-99999999.ebuild
index 91dc59284670..e7b7f3753112 100644
--- a/sys-devel/autoconf-wrapper/autoconf-wrapper-99999999.ebuild
+++ b/sys-devel/autoconf-wrapper/autoconf-wrapper-99999999.ebuild
@@ -5,6 +5,8 @@ EAPI=8
 
 MY_P="autotools-wrappers-at-${PV}"
 
+# Remember to modify LAST_KNOWN_VER 'upstream' on new autoconf releases!
+
 DESCRIPTION="Wrapper for autoconf to manage multiple autoconf versions"
 HOMEPAGE="https://gitweb.gentoo.org/proj/autotools-wrappers.git"
 
diff --git a/sys-devel/automake-wrapper/Manifest b/sys-devel/automake-wrapper/Manifest
index f37b71bbe770..329b7d8ead6b 100644
--- a/sys-devel/automake-wrapper/Manifest
+++ b/sys-devel/automake-wrapper/Manifest
@@ -1,4 +1,4 @@
 DIST autotools-wrappers-at-20221207.tar.gz 3646 BLAKE2B 82bec40e03ae5ec133252fd3c05c3fed537bb415e800918df9c9d783d48a9d76cbe60c53dd7daf6d94653d79fc52be8c089183dda996e8a72dd03ffa83098613 SHA512 12ea99721e6fc60a3ed7351d6c228aaf6e4eef0bd0444eda8cd742f74fa91150ef07bb52f6bcad4a350269e8032f5d4e204d2f2108b0d9c441ddd7f9755862b7
-EBUILD automake-wrapper-20221207.ebuild 1174 BLAKE2B 04bd478eb9f1f29b97a84aadc123c18f6d169279077f10b70d9d3579ca6edfd167b852d04883fdb8063887077ad2c153f8660d0b559ee0a3f48c67de99912cd7 SHA512 44fa264a8cd1e6053b2837dacf864521f93300f83abab10209a5d9916d85c0e03fc7092c5c1e831be2c536b52fd21e303c2d099d44bc19f0d4b3077308020717
-EBUILD automake-wrapper-99999999.ebuild 1182 BLAKE2B 8f8a4f35fef9018ff75b5298341a7cc29c78a61e748284233f63af0b13a43626e2d3821f092ec8b83de16d654ef70362549f7adf24fdfaf6f44794fab6ea432c SHA512 1022de22d041af3c92e677de58dceda4cba17ca91428eab73b76fe367bb97100c33cdbabb99e5059ef8a4ee16fc0447b5ff519449a38e7f9664c296e760e61f4
+EBUILD automake-wrapper-20221207.ebuild 1264 BLAKE2B a7759c102a4091c2f4507fc0c03c6b72d677816dbdaacd2c910331d75a95c7015aa9f956acbc5ed3711d325f5237db37c98080ecb60400feefc1a3578194eba6 SHA512 9e999bd6a64ee283fdd3143eb600afd188985b39a1a4e42c211709eced810d5f12e74c440969c875ad9d0cd1c6372fefc3d305626a0df319515b204bb01995df
+EBUILD automake-wrapper-99999999.ebuild 1272 BLAKE2B 3fa61fa90c49d06379a967096768dbe967d025dbe93e2b53c3bd39d38de577fe7c839d7a88fac98c603bccd072e05def9191dbd9660913217e71b92ae8ca524c SHA512 f9c0c8d0f42eb7167246555037d7ba66a01a0cf163ee2c549da72c58ec87d680d0a52195af9d78decf5abc8db9f38c14ade71745bfe3b2bf75e4ac04bf8cd9a3
 MISC metadata.xml 435 BLAKE2B 006f03645ce3cb9a4f7cad6411f3487500f58f351bbacfb6e1e3de494214fccb8b478a2cea35d289ee0a487fa7eaf31ca444cbf82d1d9eeee1822928e223009b SHA512 3b699336ca3dbf40bcfddb1db91f8d3803574c9c6765b477b93e50d756ac3c441e5bedfbbc71fcbea697a2f31b9a41fcbbb01a38d5acc8d29b48779a405f8f6c
diff --git a/sys-devel/automake-wrapper/automake-wrapper-20221207.ebuild b/sys-devel/automake-wrapper/automake-wrapper-20221207.ebuild
index 3d3779ad5bb0..6983b29ed534 100644
--- a/sys-devel/automake-wrapper/automake-wrapper-20221207.ebuild
+++ b/sys-devel/automake-wrapper/automake-wrapper-20221207.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+# Remember to modify LAST_KNOWN_AUTOAKE_VER 'upstream' on new automake (major) releases!
+
 MY_P="autotools-wrappers-at-${PV}"
 
 DESCRIPTION="Wrapper for automake to manage multiple automake versions"
diff --git a/sys-devel/automake-wrapper/automake-wrapper-99999999.ebuild b/sys-devel/automake-wrapper/automake-wrapper-99999999.ebuild
index aa02b4b70691..5cc8b5d149bf 100644
--- a/sys-devel/automake-wrapper/automake-wrapper-99999999.ebuild
+++ b/sys-devel/automake-wrapper/automake-wrapper-99999999.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+# Remember to modify LAST_KNOWN_AUTOAKE_VER 'upstream' on new automake (major) releases!
+
 MY_P="autotools-wrappers-at-${PV}"
 
 DESCRIPTION="Wrapper for automake to manage multiple automake versions"
diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index 9874f9bd1c2e..9e9296bc298b 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -9,6 +9,6 @@ AUX automake-1.16.5-py3-compile.patch 2517 BLAKE2B 35ba0af05e84c632b1e2b0e683763
 DIST automake-1.11.6.tar.xz 1092908 BLAKE2B 17254d81d6920c32aa877b6c892025de8e4060b8bcbe50fff841ada513dd462ddde8fc6838b4976098a812f8fda047e7186cb62cea8175df615dde75a9959144 SHA512 6e4cdf69f07734954f770fd4a7211a8c9dc69fe25a7746bd3c1e01d3139c94cab2900399e87371548833e99687e0d2b59c5e746ab2fdfbc7d47f2c1d439137ba
 DIST automake-1.16.5.tar.xz 1601740 BLAKE2B 87408abc57e1d4317a2b518fb3606d0f6d156522e7333016dd84747cd8922f27ef7fcc93220b11f794ce52bf8fd9a788d0166a4d1964d7c283905f269977ac7c SHA512 3084ae543aa3fb5a05104ffb2e66cfa9a53080f2343c44809707fd648516869511500dba50dae67ff10f92a1bf3b5a92b2a0fa01cda30adb69b9da03994d9d88
 EBUILD automake-1.11.6-r4.ebuild 2176 BLAKE2B 9785a8dad5f9c4a347e21b0f4cf0b0915110ae0435ca567bd1c55582111970799c584bdb933f302636360c7e4926601bf474c8a7cea991fc7bd3c0454a8ce6ef SHA512 c7c120b536fb1c37b5fd151b16173ac3c6deb8a4c6908f3907065237a9b31860e3dbbb9404b1d31dd2069beb44c9e380ac44dc70077f0d132a308edeb453db58
-EBUILD automake-1.16.5-r1.ebuild 3174 BLAKE2B 069776c1b8064eae8109a47cbe67ba92f0eca5833a96c3f040112d9420d1ed9f6d4a0fcffafb57026fb996c32b2d4caff7338077a0b0d55dda3e196ff07ccb90 SHA512 08252984ae42cfe8bb3a1c1fe2273665adf305b2a1793f804bba91bef60ef2cbd3df2bbee69ce59a69e754281da53396c93ab9334135f0d9aea53ea1ed6642bb
-EBUILD automake-9999.ebuild 2959 BLAKE2B b12b05d379c84b3fa24c8c8a9f29a8939886d39d57a454ba7157ac5035c6664d5f878a245d5d773405213288e226023712d0d37bf3d9a697d30d361bad40c9ca SHA512 812661059a3ebd1a2753165752e4a7481fae39bf2c2819a8a0450a1fc2f8aaddd63cc7ceac0fadf479e1f2cc7bdeafe1172db8fc40c15c8effadfe32b0482634
+EBUILD automake-1.16.5-r1.ebuild 3345 BLAKE2B e2cffbddf974cb49fe82be00e927d84b658d079ce7825bac42651e351fb2e57247e286cedea27e6f8bf5e1a6021b1dae38803f205a14b89a260e92750b65a1f7 SHA512 594377fd5542ec619d3a32fb2431feacd7323e9fcaff6a13698d8290d621c2888920b9d0218038e8f2aa0d84fe688ac0349392d8e1735383119f1ff860f23c11
+EBUILD automake-9999.ebuild 3130 BLAKE2B a890a0152ac86f2cda4a5f5efad24c325b0bc7916b33f7ce4891100d3e7f2a3bac4babe53a03ebfc9cd999b466df01be217cbbf52b3c3a27a7152220abe9818d SHA512 7a9ead5246d20af6d5b6b755eb00a9854396c05714ac525d6eee125c78ea3c73be37dfd2bbe2c8c40f050aa2622cf203508272ba65b63de9a82d79cc61c7fe43
 MISC metadata.xml 363 BLAKE2B 7cbff34d075f5fb5d8391bbc978f9236a6aa1903a697fac7bc52bdf98baebf7053ad4fb4231f4d2b327decce840e47fccf11a28411e9cd12647fa5ab7698f0f5 SHA512 c40b7d0d1986ac70deafd644669caa695279b4bba94b2bd5ab9a9dc8c14cb246b83dc6f19811210559fb9e0e85c7703a2599d910c8fe7a31bff01be10f6dfed7
diff --git a/sys-devel/automake/automake-1.16.5-r1.ebuild b/sys-devel/automake/automake-1.16.5-r1.ebuild
index 0e6ed8d0b1dc..e60ba0ec28ea 100644
--- a/sys-devel/automake/automake-1.16.5-r1.ebuild
+++ b/sys-devel/automake/automake-1.16.5-r1.ebuild
@@ -3,6 +3,9 @@
 
 EAPI=7
 
+# Remember to modify LAST_KNOWN_AUTOMAKE_VER 'upstream' in sys-devel/automake-wrapper
+# on new automake (major) releases, as well as the dependency in RDEPEND below too.
+
 PYTHON_COMPAT=( python3_{10..11} )
 
 inherit python-any-r1
diff --git a/sys-devel/automake/automake-9999.ebuild b/sys-devel/automake/automake-9999.ebuild
index 0c72cfe6e473..f0949c35b6bb 100644
--- a/sys-devel/automake/automake-9999.ebuild
+++ b/sys-devel/automake/automake-9999.ebuild
@@ -3,6 +3,9 @@
 
 EAPI=7
 
+# Remember to modify LAST_KNOWN_AUTOMAKE_VER 'upstream' in sys-devel/automake-wrapper
+# on new automake (major) releases, as well as the dependency in RDEPEND below too.
+
 PYTHON_COMPAT=( python3_{10..11} )
 
 inherit python-any-r1
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 08dce689f35b..cc0c05248428 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -32,6 +32,7 @@ DIST gcc-13-20231125.tar.xz 84338152 BLAKE2B 4951fd200fe5abd9ed2f6a9ece4637c3a05
 DIST gcc-13-20231202.tar.xz 84334144 BLAKE2B be5db65cfee37cfd0201ec1720722c113d1b3cb1b58cabd7a9b5f6d585c937ba3a8d60327b5593c576f8fe50d95b0fe7a44a0eafad2e68a03f3ac31a5b92780b SHA512 5a7ab2979bec60138c78e30c05a02143bb10abfcb7596743b00f741225b7fe53b2fc9a6343365965b927311b4c9049ab1e7cbe9492d92513dd34c84b38341d92
 DIST gcc-13-20231209.tar.xz 84386056 BLAKE2B 013f5bf0a22a3f9e99e28595de08b0742aa0630e64371f6ff30f1da184a45e1a1875401ca4e6cbfe09dfbe455c0beff54a0f80f1008a16ec8c67979f640a66f2 SHA512 1bba056f9912d125f0c97b3c9cf4b6e4ce714a131c8d8d412486dc004ea969a1d45ae82c9c717a48949d12e765d3a06cb55d826e081c87e1b1fd12b7863f9242
 DIST gcc-13-20231216.tar.xz 84341616 BLAKE2B 416ee94995b0812ac155ccfb9a5cad39529e0b437341eae65fdc75ba64bcdb453742e213f676a80d91615f1840e2e52488e4a8311588a2ed16fde7c176c5dd06 SHA512 66a72380db151355ede533541b2e77406925f2a0f941772018bf93f8a4c2b8eaeacc3f600985897f7d9868234bc250a7af82d27634ba170ab6dfb2a62c68c0ed
+DIST gcc-13-20231223.tar.xz 84352544 BLAKE2B 1ec97e3b60bbf49d2106e8158e1ff66eb2e2da7d3501e3046ce12a2728e070ea0d44eff42cb5f1765ade284515b2e3c9a24ef036482b6456d5623fff3ce68164 SHA512 f3b066b27003a7c3a83f71d1670f9d662e397388e299ec2e33d674bb1d15b2443fd1608d10052b897f5159584aa3116603da33ace7c906d16e50371af5f8a745
 DIST gcc-13.2.0-musl-patches-2.tar.xz 5292 BLAKE2B c057d6574d03c05854edaa9f3fd40e9149662b04f3ac7a7db3eb078d73a7b535726d1bf52e5b12736dedb2f9898ad731f2e48a6421fcfbf7b90f929dee072fcb SHA512 a691da0c87c443a5e9d23731f4005f27871c5b12bc9102873ffa24d374aa7b9fbd187c4f5635d23fa9ffb17e351e76173c2d3fdf40646e355c4cb314b538de69
 DIST gcc-13.2.0-patches-10.tar.xz 45860 BLAKE2B 3c4f8179fc27c31c117bf9260cebbab0805e0977cb41084f2df5c6664121ae67f83deb882572b0bce8d5f20c0ec927eeac43e60d69ce8d4d5a263c1dddedecaf SHA512 4088cc80278826043bc6a9819dfcfa09a251e256eca9a2654f1a83b9b54107ca08fbea0e9ab61593cb0b43fc42a3d87acbe095dc8f806c7010a3ac33148d5c9b
 DIST gcc-13.2.0-patches-11.tar.xz 46340 BLAKE2B c9f12ccbe7bb7ba3a2afec16695e69b062429779d544f5614e1ef0617751e54d77eb9bb6e19dc8c6132c57e630f0e77e2cc20cf2c77e0e79d03a6e57b9ba53c6 SHA512 a09801ecefccc66830607986a622bbcc5f217ba08da4ac9f68436e422b5a19042c60c7d5fcb75d4fe9ad9008ab06278382c9798b319ed9630c2e97fa09c3a344
@@ -74,6 +75,7 @@ EBUILD gcc-13.2.1_p20231125.ebuild 1681 BLAKE2B 3a0c49b010e490ffb64a63da3630c407
 EBUILD gcc-13.2.1_p20231202.ebuild 1681 BLAKE2B 60c4e7fc3a3aea345109fd1f8a988afacff8720369fe4989066914ea7d7875aa320f78bccb6ec2098710026347b4a57f3bfb0052c1b8f5e3185ee0128ba1b841 SHA512 2b85102f972612ee31b9910b95ed7a5f50fe463bf7d89bb21c2d8b29c755a8cb4dd2fc74adf386364f1b951e02e4cd1f6a219fc98331ba93f9aaa67beda98f6f
 EBUILD gcc-13.2.1_p20231209.ebuild 1681 BLAKE2B 60c4e7fc3a3aea345109fd1f8a988afacff8720369fe4989066914ea7d7875aa320f78bccb6ec2098710026347b4a57f3bfb0052c1b8f5e3185ee0128ba1b841 SHA512 2b85102f972612ee31b9910b95ed7a5f50fe463bf7d89bb21c2d8b29c755a8cb4dd2fc74adf386364f1b951e02e4cd1f6a219fc98331ba93f9aaa67beda98f6f
 EBUILD gcc-13.2.1_p20231216.ebuild 1680 BLAKE2B dd776c332de13307fefdd9ce3115e30e265d424841d014bb9b1ac85cea2f4d3ed7dc91905a93a9d257114a55010e2b325b52c1b422a97c7e24b13c9e3d72805b SHA512 6c581f635e072fc097844fba70c441ab8f57d801cc0d2d70b533b014410f0f573418ad62ec2ba4c70a82b805e8a316a498e68cabe6929898351be7236f37f18c
+EBUILD gcc-13.2.1_p20231223.ebuild 1681 BLAKE2B 60c4e7fc3a3aea345109fd1f8a988afacff8720369fe4989066914ea7d7875aa320f78bccb6ec2098710026347b4a57f3bfb0052c1b8f5e3185ee0128ba1b841 SHA512 2b85102f972612ee31b9910b95ed7a5f50fe463bf7d89bb21c2d8b29c755a8cb4dd2fc74adf386364f1b951e02e4cd1f6a219fc98331ba93f9aaa67beda98f6f
 EBUILD gcc-13.3.9999.ebuild 1589 BLAKE2B bf6463d9ba5db2a0d494941a33cc7a2be6fd01fc75222c1de50997555b70ebaf2a374dd9f61ffc3eafc1befe23ebedb36123e4f2366cb623b69f1ed566a1a3b1 SHA512 2138f692eca45b998e5675fde63a5b36dbc1dbdec36d2aecf5695c12c51caeaa578a443bc9e795de9e711a55bef79dbf5ce9751a151002bf1625df90b1bb9ca4
 EBUILD gcc-14.0.0.9999.ebuild 1568 BLAKE2B 02ff0ed9ee64898714a411d4d6dce9ab4ed30ec1f8dce58036da4cfdd033281868c82b1a9e6da669898e405194f84be3db34cbf7a8b0144d2049558f30370b90 SHA512 5aa6f2841a026a8b021f3fd0a6ff47f11f1a7039454cb95a8af148f247792c90d08d254b16c1369e0aabf83da53add611594632a951fa075c06daee837eb27c9
 EBUILD gcc-14.0.0_pre20231119.ebuild 1595 BLAKE2B 93754d4e2dcae64b6a47640e176af4eddfcb21ff0f18ec912a53a7631d6f60b850002a2e1b39eb1f090a589736a5ec133045793dfac68d16a6b9cabbee08ac37 SHA512 33f3a974d815655dafa35d83e537e2edc62efd402c2211cf621416fae763a52bc4503975e3448e25afc89490323690fc23b441d5e0c8d8fc0108b4cd11f00139
diff --git a/sys-devel/gcc/gcc-13.2.1_p20231223.ebuild b/sys-devel/gcc/gcc-13.2.1_p20231223.ebuild
new file mode 100644
index 000000000000..945d3a229424
--- /dev/null
+++ b/sys-devel/gcc/gcc-13.2.1_p20231223.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_GCC_VER="13.2.0"
+PATCH_VER="11"
+MUSL_VER="2"
+MUSL_GCC_VER="13.2.0"
+
+if [[ ${PV} == *.9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	MY_PV_3=1
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+		MY_PV_3=0
+	else
+		MY_PV_2=$((${MY_PV_2} - 1))
+	fi
+
+	# e.g. 12.2.9999 -> 12.1.1
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3}
+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="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
+	TOOLCHAIN_SET_S=no
+	S="${WORKDIR}"/${MY_P}
+fi
+
+inherit toolchain
+
+if tc_is_live ; then
+	# Needs to be after inherit (for now?), bug #830908
+	EGIT_BRANCH=releases/gcc-$(ver_cut 1)
+elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+	# Don't keyword live ebuilds
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	:;
+fi
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+	# Technically only if USE=hardened *too* right now, but no point in complicating it further.
+	# If GCC is enabling CET by default, we need glibc to be built with support for it.
+	# bug #830454
+	RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
+	DEPEND="${RDEPEND}"
+	BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+fi
+
+src_prepare() {
+	local p upstreamed_patches=(
+		# add them here
+	)
+	for p in "${upstreamed_patches[@]}"; do
+		rm -v "${WORKDIR}/patch/${p}" || die
+	done
+
+	toolchain_src_prepare
+
+	eapply "${FILESDIR}"/${PN}-13-fix-cross-fixincludes.patch
+	eapply_user
+}