gentoo resync : 28.04.2021

13 files changed, 100 insertions, 34 deletions

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 8ed4c9cc6ce2..4e6ed90a1bad 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -1,10 +1,13 @@
 AUX gcc-configure-LANG.patch 2052 BLAKE2B 28c36f4992e41305ee421dade5eaaac34e3bdc523665b03f360f2bc01e8f69e9dc48052edb80dece63ab561e80325b4f125502482eb16f7324f1c03670021550 SHA512 a694c7ac2f45cc657097ff5b0cf1356ac88a9c06035c9ba15167e9d444844d0d8a478eb1b9b62195dd063774f79697b9148b9cdb6c261640b472c291061b2129
 AUX gcc-configure-texinfo.patch 341 BLAKE2B d2ea3b2ea08f5d3a498ba27d0fb95e325097e2104e55caa28b66515cb48662649140d90b639369aedc54b2b1178fa4b49cda442f5f504e09d88a2efa45a5057c SHA512 e8d34c5077409df5495cf0c5fbf5e77f841c5698108fa6a5fde33eb28202c685603bdefd8368918e55f30c4b995e895d71d64c715c1ec2b017e09eb2c54c09ff
 DIST ecj-4.5.jar 1470676 BLAKE2B 793c10ba09fd8040c0e1181204141aea16780c9c9088e07126e00da2b510af2ad6f58d876357d7e98cbb02d783a3be434469d5de1df134ccb8cc508e45028d80 SHA512 d4e1bf7538ace56e3d69fa91da5bbd16c272923b4de0a9d8dee23ea2b75f9f38c603de72fc4061df49285c450b63f3df211cee5270e9fffc5447445d1a9c9e4e
-DIST gcc-10.2.0-patches-2.tar.bz2 17701 BLAKE2B bed0cf2dcb6b2e35dbd86c43db617cfa0a0973b3d55bd6e12baf9e6495afd0fec855fefd223172c23f11449769996c18359abacfac36f62681310c861d5d2850 SHA512 6ebf5875ecc9f10dea67d4793fcc47178ddd6abe8959fc0390c6ff967fba7318013b4bf251abf451999b86697e97390c8698685b12086956c8e6bc2e97708bc9
 DIST gcc-10.2.0-patches-6.tar.bz2 24103 BLAKE2B f719012f86136ad9c4ea1397548caca6e69687534599a88cc25fe0e4f83dd7fd34c07375fa6e612e2b430e078c1a59913160cce07312e94fa1ce575a33e5457b SHA512 61d97dba29024c7a22806689ebf33f5cb9ce099230bcc344f2865b976c3fdfd8ebec5962eaffd0156de75eca58499ba785867bd4a4ac92c6f799ab1bee8844a1
 DIST gcc-10.2.0.tar.xz 75004144 BLAKE2B 1d79397330354e61439283cac96a109bf78ffc726265442e6d3ec131f107589ab7349d6612836edd8c8512f7bcc1d901a65a0d5d925d28a5bf3ef5cc3f9787ee SHA512 42ae38928bd2e8183af445da34220964eb690b675b1892bbeb7cd5bb62be499011ec9a93397dba5e2fb681afadfc6f2767d03b9035b44ba9be807187ae6dc65e
-DIST gcc-11.0.0-patches-6.tar.bz2 12744 BLAKE2B 05e8d8b87cd1069bc6c03a6cbd61e5414148b7c6467e5b2ebf03af1493075280d8f1a5a123148f786724e3f813ef7fbb5f2728598ab4ab7879b4e649f592156b SHA512 9e873a40eca07e471a9832ed062575063144554ca306b60a9b5f7da61fa1f148a13fd5ea933c852d105931e452de1c6ab3cd7baf4f80da17b9d81eeb36c5b3fd
+DIST gcc-10.3.0-patches-1.tar.bz2 15282 BLAKE2B ef283e8b108af9bfd3324fabb95c835374113c6ff2cf1430a5568b3d1b27183e6de6751367c1e5720c85ac4c45132848888d5510c63f95e88a1f623b6bcf4000 SHA512 6dc435c8619a1532000fae843b9964d0d1e28d3cc9cc1962ab7391570a0cf1135424ea5c0b0d3d5ec5ea863f02e963be2ec4c94822f217fc692a1d808325404e
+DIST gcc-10.3.0.tar.xz 76692288 BLAKE2B ac7898f5eb8a7c5f151a526d1bb38913a68b50a65e4d010ac09fa20b6c801c671c790d780f23ccb8e4ecdfc686f4aa588082ccc9eb5c80c7b0e30788f824c1eb SHA512 2b2dd7453d48a398c29eaebd1422b70341001b8c90a62aee51e83344e7fdd8a8e45f82a4a9165bd7edc76dada912c932f4b6632c5636760fec4c5d7e402b3f86
+DIST gcc-11.1.0-patches-1.tar.bz2 12130 BLAKE2B 4d763b83dba7875bbbe8bbb9b6c392791ba97037d17347548604ffa7c70b32fdafcd45b0722ae40aa3aa8cbb34b9f3e3aa399d0096e35e74f75b174aad0c032e SHA512 e4e363c6a81bbc423ec36b6c57801ea2a70961ee7d7d0333924c7012b2b6fd4008f53e9208b5d1f6025f9e74a95d46c121b4b8909827070b46091228688996a4
+DIST gcc-11.1.0.tar.xz 78877216 BLAKE2B fe617e776b0270d11adea21b5c37d889de90865c19ab82d1c37bbd5c5b9c583a98c174606c4f893ca4950a4233e2a58aae93ad6aa7ad33d4e78a31c72371c1ed SHA512 fd6bba0f67ff48069d03073d1a9b5e896383b1cfc9dde008e868e60a9ec5014a837d56af0ecbf467b3fb9b37ec74a676e819a18b44393a0a3c4280175b5d7ad8
+DIST gcc-12.0.0-patches-1.tar.bz2 12137 BLAKE2B 1b5a07c4e0996b559cc5d57c5a0ade76983d80f3dc8f87e67b95b54114f7adcf3a78bd409123e7f414e33cf3114da9fab3491fd7cb39e337a22c1d6b562842e5 SHA512 fb5464a0b55446b2c99b6cb50e70404a723925b6bea322855ed4d2f66bdff70aab22e93d1e6d7d72d8a1451cac919d0d07b2a6caf0d953fa1692fb3422b2528c
 DIST gcc-6.5.0-patches-5.tar.bz2 13723 BLAKE2B db0170d6db74dcb6dc3ec937379c188814cfe88b5204aa0c1cc925083d8f178be4896e98ff44fe224060e4e1fea98ef3c90aa8339b2cf78d33cd2dc8b94e3bdc SHA512 d79cf975157c5285faa893da0259b0013df66b01ad597322f05ece0343dd7912d8d793663448c04f37be93092e2fde06f84374e142cb81b12ba5964b37b0de89
 DIST gcc-6.5.0.tar.xz 74355588 BLAKE2B 538595d32000b15a53577f0dc6b164d75791a8ccdf90500d5f667ff78378ef4ab9bedb8a590848907caf863bf1165ebe108b5e81eb4b54e85ced4002affde693 SHA512 ce046f9a50050fd54b870aab764f7db187fe7ea92eb4aaffb7c3689ca623755604e231f2af97ef795f41c406bb80c797dd69957cfdd51dfa2ba60813f72b7eac
 DIST gcc-7.5.0-patches-3.tar.bz2 11613 BLAKE2B 84d59103bffaec8fc57e69dbb17f53882935b20c23d54db5f805e8270fa16d8e572ee4a369ecc82d2279cf66a71d1eb2a7f0c9792d4495d2f68946d6b6403f15 SHA512 6e5bea150c56ce3d43c9b0878691ed54ecc5d2a12482e99261efa74af7f1d59ec94c2d0c363792d99e0d3a0abd739d5d06b861da4dea2c1676e5d498b5815d55
@@ -15,13 +18,16 @@ DIST gcc-8.4.0.tar.xz 63713440 BLAKE2B e536b7d1da5942a522f4ccce489882dcd5aefb1c7
 DIST gcc-9.3.0-patches-3.tar.bz2 14193 BLAKE2B 4863fec1af41a8cdb2c24479b28812df36c1f71ab71d267ff0efc467cfb8ce99ed77714ceaedfb08b0d1eb0eb9316758cc7cbc5a8ad0bb582050690935e64b46 SHA512 8b90a5826df64e6f74e4f6c0e5acead695b38f671e26485b110d5b341daaad4ac21aabb04baae9ad457408eed274888b7f785bbc782611acfc7261e6a315d110
 DIST gcc-9.3.0-patches-4.tar.bz2 15474 BLAKE2B b06fdfce4402850bb1c6c211ace4c3a07ad2114ffa48eac58d1624124d5d1bddd6d2b4faa18be3291a340272c022bea26dfcaf17929828ceb6474a5211401389 SHA512 54904a4a1c4a784f1a707cbdd9f6f498457e4aa550dc6f3d6eff71ed05a75685e23e6b71c2a614b1dea7e506b9f42fb0109ecfde00ef00373275bbc0409cb7e0
 DIST gcc-9.3.0.tar.xz 70533868 BLAKE2B 21efb1432aefad5ed9b9b395e88ef2adfda3a8ea6e3e808cd151da6e66df9fed1bafdc8b8ff055d4b2272ac786d8b7ddc4293bb6b51c55c40a261a0eda0e7cb4 SHA512 4b9e3639eef6e623747a22c37a904b4750c93b6da77cf3958d5047e9b5ebddb7eebe091cc16ca0a227c0ecbd2bf3b984b221130f269a97ee4cc18f9cf6c444de
-EBUILD gcc-10.2.0-r5.ebuild 430 BLAKE2B 6939c3259edefa84bef2f62d59a144142a399fc9e333e8ea55d2db532a446cb19135468b3ed4709a07754c66dec68927eff3d03b2a79ef90aeb22beac70520fc SHA512 1996f19f856a2ee515088a775b089fba0f8196c7b6ec6282348bb38aa683db77353a7971d687682a8a8d42103956d38571aaf32398736d0044b2a498e46dbed0
-EBUILD gcc-10.2.1_pre9999.ebuild 807 BLAKE2B 08c2172ac50d043050dcfb3d69c138c51fb8d58f2601c14bcbaa4df5d9e844639f0bd345b14a702a86cebb7c420ca4cd831e0b8a995b036e7fd261963663e331 SHA512 0c05fc611f569a49d95d766048f6a1f3972108f7cbf2d03d5dc9a0f0ad29bf1ce4dd2269edabb0912628c9d5e8e377e9be586dbd07f182ebadbe7721a7cd5108
-EBUILD gcc-11.0.1_pre9999.ebuild 511 BLAKE2B 3c298f291708ab37ce458c5950295fb37953067621d50f9aa038918ebf3bf4cd9f2caaaec5e76138f4d9fb71a9da5e1c7a5abe23014ebd3d16c12bf2bd37d1ad SHA512 c127c94447bfabb4471d21a89b04330e0bd619a6e91be4b5c55bf40b39a51dd8123cdbfd70e65d676bb98f361c441db6f5364ebd241f1e8fa87420a4cf4bfd11
-EBUILD gcc-6.5.0-r3.ebuild 436 BLAKE2B 8b219613160b1d152efeebae97d56e1110473c31949b6c09b9f721afc36c765a8a499fe1ab43ec5e115197f4b9ec3f73cd6cff2d7716993a93353b8556bb5115 SHA512 b83c39a6a99971a0bc4f3ab57b5bc8c5477a1da8fb82a6b56a0dec1e0225761dbdd080606e6abf4b06d56a9b39e766ebac8b347ae56c535f7bf2a381212530ba
-EBUILD gcc-7.5.0-r1.ebuild 447 BLAKE2B b7465ed897cd3f2c0716e7fc1fe384dd93de4f29a090948857af9cbb04af1acee54557a2185e08852efb63ece42f72bf0c6289ac63f059d31bf32936bcb3dead SHA512 73b7cd1af8c1a45e0303085b95f8fa25831af50ad9999d7268847c970af9ece183dd68334bb0b57a153c8e4ed4ca3baa93c61a4ee6376bbaa944dfd529dd9bdd
-EBUILD gcc-8.4.0-r1.ebuild 443 BLAKE2B 7263728f3a730bcba73bb779ab11b4951f1171be0a0c0f2dc0efa3299e33cb0880c33d53672d369c2266816aa8f165b0d0295fa66c7fd92779ab80846428640a SHA512 2ea31641f37460d7951767780868c7e4b582531f7e0a0a732f5ce4d981a559b3f0750dd51c8dfc91154da9e4205114353ad883df35b9910d361bccaceaeb5711
-EBUILD gcc-8.4.0-r2.ebuild 448 BLAKE2B 4dd38148a900104f7fc36a4a42b446cc2c856951bfbea9bc98a447f199a4b805dd4ff2f2313a76aa2c445568f93d8c16c11c84075ade7f8fb0ff03d5299c159e SHA512 fa6b450bec067772bdb9373ae4cca1990996e78863a630d3cf0ddd90f5a56a5aee70bb1c475723f6aa7e2cab98f0c07d3fc7543dfee138c89b1f33bd981a5764
-EBUILD gcc-9.3.0-r1.ebuild 443 BLAKE2B 0f43c582049ee55a5627d2a05e6dec513b4078d57e322fcadcc917056e840db4bd58dab264f068135569c0f06baf75e95d43302e89b2caf4bf4dac420e052872 SHA512 4efda3a2cbf371a688bfecb74369e7215dec1d5e8b72612f13a50644a884e738842f8ea25aa6800931c39bf0571c8f494972f413cc187b967f9b7a533a4237ad
-EBUILD gcc-9.3.0-r2.ebuild 447 BLAKE2B 21486596a97d2b46ac76e3f669927fc6ab936fd1ef7ba90b6eeae67880ea68f9fecb19b6fdf8c1e8f8fbcfd7df7c8a6f7e3c353ec3160bbdbcec48cdcf2406e2 SHA512 edc497faaa3e5793e7a90b2e3561b56dd9f60bd5bf742d36154b374755db45667b42e000d37cb62df792bd1586ed309fe42197bb43b2a48043d654ccfa635e99
+EBUILD gcc-10.2.0-r5.ebuild 427 BLAKE2B 8f9c6d4dfbf4e9a2fe94d7ac927481d92fa9b63518df05c34249ba875d25ddd7e8856e759031746c991202e25f6c49cd9f93266e27ab16a87d2c1a66db43b482 SHA512 46026cb09d9f7133ca11baf414c71a6e31c92265593e1360ef02044a2391cd15f137241edc4fedaf23c95631de5e518a3bae326214a464c7685a3737787c9db3
+EBUILD gcc-10.3.0.ebuild 434 BLAKE2B 63d1eae368bcbfff7654e8deccae22e7198a925d0e90d7855894499296601eb62b25e5ce8ba7edbef51312756e5da3811d19a96c6337341923da5a58241051b7 SHA512 757ce3a9c6d0fdc5bb0077687c1afcab192331d526d95cc226c26973b5dd952ff59a7a332ab4ee77f946ca05b415ca557f2a27c88f5795997437ffd4f43ece35
+EBUILD gcc-10.3.1_pre9999.ebuild 630 BLAKE2B d6e24757bef8014ffe073f7c92a8fab54aa024d98b8af517e19670bdb72d33136c73395d2821404f32e5674a54a1142d8fbe88cfcaca516322ffc6b81ffd5aa7 SHA512 dd6f2179ee3f22f301a255622e8109519d1d55feb7a39c7bb351c679b31fc7354d8c8a09d1d1be3d8b29f01c3b73565c2e94039dd937687c62bbb7db82830c60
+EBUILD gcc-11.1.0.ebuild 434 BLAKE2B 63d1eae368bcbfff7654e8deccae22e7198a925d0e90d7855894499296601eb62b25e5ce8ba7edbef51312756e5da3811d19a96c6337341923da5a58241051b7 SHA512 757ce3a9c6d0fdc5bb0077687c1afcab192331d526d95cc226c26973b5dd952ff59a7a332ab4ee77f946ca05b415ca557f2a27c88f5795997437ffd4f43ece35
+EBUILD gcc-11.1.1_pre9999.ebuild 630 BLAKE2B 30a84011ca5e4f75befa64f2129da5940f7e09a16e2bdb1e129c191f964c6d1059702147d2307b61d6e49aba4d3c990500590148feb81127d10f96755e9239ac SHA512 fb7651b4928e1647a7fc5c8dd1b43d3791c3cbd98e7093f9134a4272fd7be03f1303be1e522bc4816de0e49e5849b3e515c7331408854225cde971b0d873c99f
+EBUILD gcc-12.0.0_pre9999.ebuild 511 BLAKE2B 93d81191fa7666847fd31d272e053d00ee17c51fe9ed4392d007add8e500267fbe4df1bdc28bf6da90ba4c238701d8e38a617b23ad3c4f4ea6f9ff41288e9c2b SHA512 32071d1a3f1bc2561108cd1009d85d20af95fb4fe5e3a133bae915528e12e350f64ec10883d6a29cd77934e6da2c2ef8853d471e7eec17fca46769c14b04ad55
+EBUILD gcc-6.5.0-r3.ebuild 437 BLAKE2B 876f078017272532c785511ad26ee578a8a9f2a2f3af8513a736d2953f673fe9a6b14636a82e265dbe5ff0658a692557fb4bdffb4bbe434337711fd1db4d5b1b SHA512 6a18a2130439fa89e1589046759b3dff1b2631cce4be607b221b5d5ea1c3a90815ab5fb0988a4297a1d3b0478a993830e18d2571dc3357bfc15483c0d5a569ed
+EBUILD gcc-7.5.0-r1.ebuild 448 BLAKE2B 23ddd9c8e9948b14c1dcb2d7c859bc552393ac164a94c9c13db396bfcd4a2acca197859c4c0b5680ed8b1b484db3547f952b3a8a4562945ab7a1940df0ca6776 SHA512 b5a4bb11218b847a95e40775bfd5cccd04e6a4e9d3ae9bbc225c6d19d0ed7dced9500d4cf3318b91b3499d40e3d134bc9e5bf658f9492a4ecc0060a3b7dbe69c
+EBUILD gcc-8.4.0-r1.ebuild 444 BLAKE2B 9ccc45a2aee8c0a692f7b56efbdd817d5a9202a531de95dfc09a283dc67494df97843146bca9aca701522c22932036a9236ea678f3d643d049faa05bec53ae22 SHA512 d2fefd74e875ce17e2f4bf8e4135bb36a45cfbb1ab7c7ff4847eaf53a368656c8e5a1eba039a909623cc4bd4f4905249da6b291c7327b791a25dbab0008c4f5c
+EBUILD gcc-8.4.0-r2.ebuild 448 BLAKE2B adc372f9af103f7b72a2bf9a02db681c1ef611c6c93bb7865a51a6ece89561d5caa5fb2f648e2f86ef682df2b37d8a96ab3dddc0ae184614c712ae02595d11de SHA512 59306091299716ea0febf667fba7bb86de00c5dc53389125e7743f5b1c097345a2c165881a8c540ef01cc3ee32d81a4c968c2be470f7308e0b719e1707c1b3bb
+EBUILD gcc-9.3.0-r1.ebuild 444 BLAKE2B c685901b60756470f23e04507cff20f5318c08a53aada84f45ffb597b9ad4e73f2c8cbfec46eba9e7bbc5dd79df128da1348e42b5dfcb31f45d79df000546ccd SHA512 798982969ce659602d05ac1b29e68900502384cf76d9ed1c1b1867e6ed0329045e11c1d1f6895e659d2175feb27e12388f4ab27ace6e6c978a57905bd95a9874
+EBUILD gcc-9.3.0-r2.ebuild 445 BLAKE2B a64400ef8197562d691c905b9cb999c6725bc803b3cc544d14bfe14fb73b24d1c8fca8a896d4baec35d5b7b8ac070bbe73b7453146ebb35f37792ac11c32490c SHA512 4e7424149d44b289f4cbe53418cd93d76d3209291d98615d41460665eb884eb54389ec75da24362587811baedc5a3cea4ecf710f03358e15ef2068b4b5565f55
 MISC metadata.xml 2704 BLAKE2B 3e64655ebe03af9038fa2087b8d929e05136f833fe8667d2e1452a5f5140a1ffa64e39eb7e8e26859cf390d3a2b32842e41fa492697acd8cdac1336a34bba33e SHA512 dc9ec372f6feb99232ab0599351430440b4ddc71e2bf2be1ca4cf235337acfef5443e3ca44f12438f1b0f654b8eaaae66622728f6bcd8f15d3db78374ab781df
diff --git a/sys-devel/gcc/gcc-10.2.0-r5.ebuild b/sys-devel/gcc/gcc-10.2.0-r5.ebuild
index afafaf3ef9b8..21baa1ac7b19 100644
--- a/sys-devel/gcc/gcc-10.2.0-r5.ebuild
+++ b/sys-devel/gcc/gcc-10.2.0-r5.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="6"
 
 inherit toolchain
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND=""
 BDEPEND="${CATEGORY}/binutils"
diff --git a/sys-devel/gcc/gcc-10.3.0.ebuild b/sys-devel/gcc/gcc-10.3.0.ebuild
new file mode 100644
index 000000000000..8cb8a15d5118
--- /dev/null
+++ b/sys-devel/gcc/gcc-10.3.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PATCH_VER="1"
+
+inherit toolchain
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND=""
+BDEPEND="${CATEGORY}/binutils"
+
+src_prepare() {
+	has_version '>=sys-libs/glibc-2.32-r1' && rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch"
+	toolchain_src_prepare
+}
diff --git a/sys-devel/gcc/gcc-10.2.1_pre9999.ebuild b/sys-devel/gcc/gcc-10.3.1_pre9999.ebuild
index c185e457003a..d15d241413c5 100644
--- a/sys-devel/gcc/gcc-10.2.1_pre9999.ebuild
+++ b/sys-devel/gcc/gcc-10.3.1_pre9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PATCH_GCC_VER="10.2.0" # reuse subset of patches for latest for live ebuilds gcc
-PATCH_VER="2"
+PATCH_GCC_VER="10.3.0"
+PATCH_VER="1"
 
 inherit toolchain
 
@@ -16,14 +16,10 @@ BDEPEND="${CATEGORY}/binutils"
 
 src_prepare() {
 	local p upstreamed_patches=(
-		32_all_sparc_pie_TEXTREL.patch
-		33_all_lto-O0-mix-ICE-ipa-PR96291.patch
-		35_all_ipa-fix-bit-CP.patch
-		36_all_ipa-fix-bit-CP-p2.patch
+		# add them here
 	)
-
 	for p in "${upstreamed_patches[@]}"; do
-		rm -v "${WORKDIR}/patch/$p" || die
+		rm -v "${WORKDIR}/patch/${p}" || die
 	done
 
 	has_version '>=sys-libs/glibc-2.32-r1' && rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch"
diff --git a/sys-devel/gcc/gcc-11.1.0.ebuild b/sys-devel/gcc/gcc-11.1.0.ebuild
new file mode 100644
index 000000000000..8cb8a15d5118
--- /dev/null
+++ b/sys-devel/gcc/gcc-11.1.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PATCH_VER="1"
+
+inherit toolchain
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND=""
+BDEPEND="${CATEGORY}/binutils"
+
+src_prepare() {
+	has_version '>=sys-libs/glibc-2.32-r1' && rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch"
+	toolchain_src_prepare
+}
diff --git a/sys-devel/gcc/gcc-11.1.1_pre9999.ebuild b/sys-devel/gcc/gcc-11.1.1_pre9999.ebuild
new file mode 100644
index 000000000000..1bce503b6a8a
--- /dev/null
+++ b/sys-devel/gcc/gcc-11.1.1_pre9999.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PATCH_GCC_VER="11.1.0"
+PATCH_VER="1"
+
+inherit toolchain
+
+# Don't keyword live ebuilds
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+
+RDEPEND=""
+BDEPEND="${CATEGORY}/binutils"
+
+src_prepare() {
+	local p upstreamed_patches=(
+		# add them here
+	)
+	for p in "${upstreamed_patches[@]}"; do
+		rm -v "${WORKDIR}/patch/${p}" || die
+	done
+
+	has_version '>=sys-libs/glibc-2.32-r1' && rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch"
+
+	toolchain_src_prepare
+}
diff --git a/sys-devel/gcc/gcc-11.0.1_pre9999.ebuild b/sys-devel/gcc/gcc-12.0.0_pre9999.ebuild
index 7734b7517cc4..20155ba01b9a 100644
--- a/sys-devel/gcc/gcc-11.0.1_pre9999.ebuild
+++ b/sys-devel/gcc/gcc-12.0.0_pre9999.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="7"
 
-PATCH_GCC_VER="11.0.0"
-PATCH_VER="6"
+PATCH_GCC_VER="12.0.0"
+PATCH_VER="1"
 
 inherit toolchain
 
diff --git a/sys-devel/gcc/gcc-6.5.0-r3.ebuild b/sys-devel/gcc/gcc-6.5.0-r3.ebuild
index 1f5abdd961ef..9cea619a7e52 100644
--- a/sys-devel/gcc/gcc-6.5.0-r3.ebuild
+++ b/sys-devel/gcc/gcc-6.5.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -7,7 +7,7 @@ PATCH_VER="5"
 
 inherit toolchain
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-7.5.0-r1.ebuild b/sys-devel/gcc/gcc-7.5.0-r1.ebuild
index 2dbab112f4b6..689958930bd1 100644
--- a/sys-devel/gcc/gcc-7.5.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-7.5.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -7,7 +7,7 @@ PATCH_VER="3"
 
 inherit toolchain
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-8.4.0-r1.ebuild b/sys-devel/gcc/gcc-8.4.0-r1.ebuild
index 39a1e242e776..e5b72b981c98 100644
--- a/sys-devel/gcc/gcc-8.4.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-8.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -7,7 +7,7 @@ PATCH_VER="2"
 
 inherit toolchain
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-8.4.0-r2.ebuild b/sys-devel/gcc/gcc-8.4.0-r2.ebuild
index 34dbebcc7b00..1a3c971222b7 100644
--- a/sys-devel/gcc/gcc-8.4.0-r2.ebuild
+++ b/sys-devel/gcc/gcc-8.4.0-r2.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="3"
 
 inherit toolchain
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-9.3.0-r1.ebuild b/sys-devel/gcc/gcc-9.3.0-r1.ebuild
index c08d53c6cb79..7c475bdd0eb2 100644
--- a/sys-devel/gcc/gcc-9.3.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-9.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -7,7 +7,7 @@ PATCH_VER="3"
 
 inherit toolchain
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-9.3.0-r2.ebuild b/sys-devel/gcc/gcc-9.3.0-r2.ebuild
index 775f1c3be30b..d955f1876654 100644
--- a/sys-devel/gcc/gcc-9.3.0-r2.ebuild
+++ b/sys-devel/gcc/gcc-9.3.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -7,7 +7,7 @@ PATCH_VER="4"
 
 inherit toolchain
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}