gentoo resync : 15.06.2021

24 files changed, 453 insertions, 55 deletions

diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 0cd48d0a7c3e..4d2650047153 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index a88069ab6d98..92daeed3093a 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -11,8 +11,8 @@ DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be
 DIST llvmorg-12.0.1-rc1.tar.gz 134261735 BLAKE2B d29510495641c06e6d7a5ac165e6d34e0ba15d1a5b786534e186e341e3a0550cdd3d8a2b61deb3e2bf44c0b0ff8561224bf7f8cebc2ce9415639cb67ceae289e SHA512 4595a26df56eed7d5941240fe92116ad2f1c61639f0f464697c2c530a601347032fbad6802d1fa915ced8574c7b30ef05bc8c0be737784c844d3860892817e6e
 EBUILD clang-10.0.1.ebuild 11494 BLAKE2B 0e3a04d4d8f6db728703cac19b8bc0a07e3e9644651986969e9422515eb5037ac2107ae90e5b6fc3cf8d3c549cfb6e21b918bf193f275f18efbb46b0e7da4464 SHA512 05df3ae5d3bd93f55dd572b5e524f4e8f1bcd155228d480bcdafb5db29613edf8d8d98a02183260091bfccb61636612355b387e53c8e0c1bb9612a5a4f9fb148
 EBUILD clang-11.1.0.ebuild 11852 BLAKE2B f2c36f5206bc0995a921a583beb85ba6430ba74ff62409f238b36dadcd20b3092abdbd1f4143a6a1a6de1f6b82a24cbaff481ea0483e30240e4d8788c8294a07 SHA512 3833b2597f3cf7d6887e151a95e6e81bab8b8c4f964ab08e4ea2bedd4a7b22e7efc12ce2ba15ba02c6dd6997801a81a9b905f2bbedc1611d8e78bde05c192278
-EBUILD clang-12.0.0-r1.ebuild 11836 BLAKE2B dba283c5cc46fb579f523a4760e915483a2f9f14d9189f62ee44d16a36792e592db0655b2ba2be4624e63678c5454b9016c67b4928264387ef1130e7411fcbc1 SHA512 6c1916ebb1b539a3afa17ca2c38018d32d871629e507c5362c03dd4c792eac79c974676edf9ef1cafc26592f2c189da0de1dee4b1b828908ce4b8bc62fedaf7a
-EBUILD clang-12.0.1.9999.ebuild 11754 BLAKE2B 4c76c33e3154a77af98e5697e2f794661f8258b3c3a5ba6bba456410676ef813affe5e3787dbfd013ec4e1818eb36a553ed098be89250e5d84d42bd9d8302eb3 SHA512 c380f0a733fb464d472f61794189e766bf78a0f5083ec60dad9102f65e18ff33e7af880f3c0d4d2f226b48ccd62c8e40fe86573f529e6ffde0c2d6fc8a812bec
-EBUILD clang-12.0.1_rc1.ebuild 11754 BLAKE2B 4c76c33e3154a77af98e5697e2f794661f8258b3c3a5ba6bba456410676ef813affe5e3787dbfd013ec4e1818eb36a553ed098be89250e5d84d42bd9d8302eb3 SHA512 c380f0a733fb464d472f61794189e766bf78a0f5083ec60dad9102f65e18ff33e7af880f3c0d4d2f226b48ccd62c8e40fe86573f529e6ffde0c2d6fc8a812bec
-EBUILD clang-13.0.0.9999.ebuild 11759 BLAKE2B b9847a18bac11485769e3164bb39000f005d6819ed59e2f1a4633674705cdad0c832531804e43a0d8139fb482d1cd6547db2e0db49e1915b97df0ee50a9fa95d SHA512 c270b9fdfe9ee3b56c07b4131cf94bf0e6ce857364b81bdf3ec9d412efa402715b0918fe0b98f3c62b1da84e28933c3b09c0766d24d4d163738e049745659689
+EBUILD clang-12.0.0-r1.ebuild 12011 BLAKE2B 210b822fc13f4f0d7c31bf47ac92b18f65f5f16797ba2086f2ae96b826f31082778b8fd4a148f405727276d4806c4a93535b4645afed3490e2644cb640b6f9ec SHA512 2b7e4d6761f871f05a4093c678ed51bc18e77f703974abee795e4424a83e1a1815d5184bcb7b0e6ea69da7d35c5422a91e6f388e770a3dbc3e57056ffeb9b8cb
+EBUILD clang-12.0.1.9999.ebuild 11929 BLAKE2B a50416061d5492e6486e5f781346e07076ce8f2c1c8ad88731eb1c16d7262df758bcda963687de9b393f3f5390425abe926e06a0211a504d2bfa039734712435 SHA512 39fdfcfdc7d821da5b3af7cefb14cc3f2026518a57622db1af4ea55a4bf111bcfdd3c9aaf7f8521ed7d5616fa691101e332bc8f58def77767d5632486c5fc9ef
+EBUILD clang-12.0.1_rc1.ebuild 11929 BLAKE2B a50416061d5492e6486e5f781346e07076ce8f2c1c8ad88731eb1c16d7262df758bcda963687de9b393f3f5390425abe926e06a0211a504d2bfa039734712435 SHA512 39fdfcfdc7d821da5b3af7cefb14cc3f2026518a57622db1af4ea55a4bf111bcfdd3c9aaf7f8521ed7d5616fa691101e332bc8f58def77767d5632486c5fc9ef
+EBUILD clang-13.0.0.9999.ebuild 11934 BLAKE2B 5adfc101d37f764fa5c6a67ac0ebf875ef4c36c38f354e0bd0552156787c2ee57026cbb02582759e392c400e9c4f4c0a540858a6973fa3e27e9b514bf30ed3fa SHA512 67a0b3eae36efc240dda48324e92fb90e2d46f9170c0f340f6b571d3abfcdb0b185f0ccb9573b39e87d2b9c551328b379822b611c851f930fa7ed6224d0be02f
 MISC metadata.xml 1336 BLAKE2B aaddc1c1193323466a545df21dfa53b637c3edff4f61cd55037d8327273457cf8d35cad7b92a2eef31acfb055a3e1ed93cb53a913b01eddf43b7b3dc6de880c4 SHA512 0538198df449cdf4d0cd00cb50d7c6883b06524419a29c4376cdcaed440fb84cfbd4983a1a025ae9a6e2fc5d91a4870bfcde587c493d8b617baec2214705601c
diff --git a/sys-devel/clang/clang-12.0.0-r1.ebuild b/sys-devel/clang/clang-12.0.0-r1.ebuild
index a7dae80a319a..c7e07fa36cf5 100644
--- a/sys-devel/clang/clang-12.0.0-r1.ebuild
+++ b/sys-devel/clang/clang-12.0.0-r1.ebuild
@@ -24,7 +24,7 @@ LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
 SLOT="$(ver_cut 1)"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x64-macos"
 IUSE="debug default-compiler-rt default-libcxx default-lld
-	doc +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
+	doc llvm-libunwind +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	|| ( ${ALL_LLVM_TARGETS[*]} )"
 RESTRICT="!test? ( test )"
@@ -52,7 +52,11 @@ RDEPEND="${RDEPEND}
 PDEPEND="
 	sys-devel/clang-common
 	~sys-devel/clang-runtime-${PV}
-	default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* )
+	default-compiler-rt? (
+		=sys-libs/compiler-rt-${PV%_*}*
+		llvm-libunwind? ( sys-libs/llvm-libunwind )
+		!llvm-libunwind? ( sys-libs/libunwind )
+	)
 	default-libcxx? ( >=sys-libs/libcxx-${PV} )
 	default-lld? ( sys-devel/lld )"
 
@@ -262,6 +266,7 @@ multilib_src_configure() {
 		-DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "")
 		-DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "")
 		-DCLANG_DEFAULT_LINKER=$(usex default-lld lld "")
+		-DCLANG_DEFAULT_UNWINDLIB=$(usex default-compiler-rt libunwind "")
 
 		-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
 		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
diff --git a/sys-devel/clang/clang-12.0.1.9999.ebuild b/sys-devel/clang/clang-12.0.1.9999.ebuild
index 74d03d6bde4f..79cb7d851883 100644
--- a/sys-devel/clang/clang-12.0.1.9999.ebuild
+++ b/sys-devel/clang/clang-12.0.1.9999.ebuild
@@ -24,7 +24,7 @@ LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
 SLOT="$(ver_cut 1)"
 KEYWORDS=""
 IUSE="debug default-compiler-rt default-libcxx default-lld
-	doc +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
+	doc llvm-libunwind +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	|| ( ${ALL_LLVM_TARGETS[*]} )"
 RESTRICT="!test? ( test )"
@@ -52,7 +52,11 @@ RDEPEND="${RDEPEND}
 PDEPEND="
 	sys-devel/clang-common
 	~sys-devel/clang-runtime-${PV}
-	default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* )
+	default-compiler-rt? (
+		=sys-libs/compiler-rt-${PV%_*}*
+		llvm-libunwind? ( sys-libs/llvm-libunwind )
+		!llvm-libunwind? ( sys-libs/libunwind )
+	)
 	default-libcxx? ( >=sys-libs/libcxx-${PV} )
 	default-lld? ( sys-devel/lld )"
 
@@ -262,6 +266,7 @@ multilib_src_configure() {
 		-DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "")
 		-DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "")
 		-DCLANG_DEFAULT_LINKER=$(usex default-lld lld "")
+		-DCLANG_DEFAULT_UNWINDLIB=$(usex default-compiler-rt libunwind "")
 
 		-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
 		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
diff --git a/sys-devel/clang/clang-12.0.1_rc1.ebuild b/sys-devel/clang/clang-12.0.1_rc1.ebuild
index 74d03d6bde4f..79cb7d851883 100644
--- a/sys-devel/clang/clang-12.0.1_rc1.ebuild
+++ b/sys-devel/clang/clang-12.0.1_rc1.ebuild
@@ -24,7 +24,7 @@ LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
 SLOT="$(ver_cut 1)"
 KEYWORDS=""
 IUSE="debug default-compiler-rt default-libcxx default-lld
-	doc +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
+	doc llvm-libunwind +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	|| ( ${ALL_LLVM_TARGETS[*]} )"
 RESTRICT="!test? ( test )"
@@ -52,7 +52,11 @@ RDEPEND="${RDEPEND}
 PDEPEND="
 	sys-devel/clang-common
 	~sys-devel/clang-runtime-${PV}
-	default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* )
+	default-compiler-rt? (
+		=sys-libs/compiler-rt-${PV%_*}*
+		llvm-libunwind? ( sys-libs/llvm-libunwind )
+		!llvm-libunwind? ( sys-libs/libunwind )
+	)
 	default-libcxx? ( >=sys-libs/libcxx-${PV} )
 	default-lld? ( sys-devel/lld )"
 
@@ -262,6 +266,7 @@ multilib_src_configure() {
 		-DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "")
 		-DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "")
 		-DCLANG_DEFAULT_LINKER=$(usex default-lld lld "")
+		-DCLANG_DEFAULT_UNWINDLIB=$(usex default-compiler-rt libunwind "")
 
 		-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
 		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
diff --git a/sys-devel/clang/clang-13.0.0.9999.ebuild b/sys-devel/clang/clang-13.0.0.9999.ebuild
index 94348bbca42d..b8af2ee1b5e6 100644
--- a/sys-devel/clang/clang-13.0.0.9999.ebuild
+++ b/sys-devel/clang/clang-13.0.0.9999.ebuild
@@ -24,7 +24,7 @@ LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
 SLOT="$(ver_cut 1)"
 KEYWORDS=""
 IUSE="debug default-compiler-rt default-libcxx default-lld
-	doc +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
+	doc llvm-libunwind +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	|| ( ${ALL_LLVM_TARGETS[*]} )"
 RESTRICT="!test? ( test )"
@@ -52,7 +52,11 @@ RDEPEND="${RDEPEND}
 PDEPEND="
 	sys-devel/clang-common
 	~sys-devel/clang-runtime-${PV}
-	default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* )
+	default-compiler-rt? (
+		=sys-libs/compiler-rt-${PV%_*}*
+		llvm-libunwind? ( sys-libs/llvm-libunwind )
+		!llvm-libunwind? ( sys-libs/libunwind )
+	)
 	default-libcxx? ( >=sys-libs/libcxx-${PV} )
 	default-lld? ( sys-devel/lld )"
 
@@ -262,6 +266,7 @@ multilib_src_configure() {
 		-DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "")
 		-DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "")
 		-DCLANG_DEFAULT_LINKER=$(usex default-lld lld "")
+		-DCLANG_DEFAULT_UNWINDLIB=$(usex default-compiler-rt libunwind "")
 
 		-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
 		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 2e599fac0207..8eb5d5796b8e 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -4,8 +4,10 @@ DIST ecj-4.5.jar 1470676 BLAKE2B 793c10ba09fd8040c0e1181204141aea16780c9c9088e07
 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-10.3.0-patches-1.tar.bz2 15282 BLAKE2B ef283e8b108af9bfd3324fabb95c835374113c6ff2cf1430a5568b3d1b27183e6de6751367c1e5720c85ac4c45132848888d5510c63f95e88a1f623b6bcf4000 SHA512 6dc435c8619a1532000fae843b9964d0d1e28d3cc9cc1962ab7391570a0cf1135424ea5c0b0d3d5ec5ea863f02e963be2ec4c94822f217fc692a1d808325404e
+DIST gcc-10.3.0-patches-2.tar.bz2 17688 BLAKE2B 8dc949208e0a4a3f0f106fabb9eb6e6787b1a829f9cfed6009d1328220e71926489b4f82a270cabcfa64af46e9892e72f5af2ce991c209055fcfab103cdfdde8 SHA512 053e67f778105062f1246cc09f6f8973d663855ab6d0ba976575e4b8f62e667dc05c058d4b3ae33c135292533c8f9a44b6f7a71f14435962b4becaf49848dc80
 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-patches-2.tar.bz2 18492 BLAKE2B 37ffb2b2a92287c434d3730772b73b88926788db8b609611447318a28fd43963fa04ee664bb1c83815ee80742457ab703f7bc2d1e6d700e342760b1d9cd13867 SHA512 62297a37b0f1ff48858c59f761291f0fc4efe14bd471d53763899c2f272cc21764d4521682219a57857118e846766dcb9e24646f749d735acd58bb2d7b8b05d6
 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
@@ -20,9 +22,13 @@ DIST gcc-8.5.0.tar.xz 63841008 BLAKE2B aa81a1a730fd7371360f6abed6ba78b5843fd18c5
 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
+DIST gcc-9.4.0-patches-1.tar.bz2 14012 BLAKE2B d5fbfd73d9c3a5b66be5b124d981fe5a7468363c83784989a50731f87931435f4b6302e4c20a64b20680581ed40005eff7bdd5855526a093f73a04c3c1ddab31 SHA512 b84884c7d2197cb14229d3321b98cd66c783cf9ebf7e5d1b1186e6cf32ee9e47d004ebad26118f9c848f9bc0a3783ceb23d9b65101d98c3bfa99874e66ee7cbc
+DIST gcc-9.4.0.tar.xz 72411232 BLAKE2B 4bb000d33d6bd2d6cc91c040713f27f79dcf726ef8ab1542c711e0c25651507628510b1373bc73aef71ffb660afddb2eb8d8c8540f5f1498ee243cfff6c0be67 SHA512 dfd3500bf21784b8351a522d53463cf362ede66b0bc302edf350bb44e94418497a8b4b797b6af8ca9b2eeb746b3b115d9c3698381b989546e9151b4496415624
 EBUILD gcc-10.2.0-r5.ebuild 446 BLAKE2B 457a8d7dffd7b9e2838578b22e8aa3e1be75f93124ef0a018df1820970fa3fa11fa55b0c2d0c4819f6a7c407563163558ac8716bd468805fb17b91fb7b2fcbce SHA512 1223c8c71f1a6bb7f5d0862071593279708904e0c377134090c3ce3883e40471b49111f8740bb2042c38759c811cfda8b64250901a58a9246ad182d96ec293bf
-EBUILD gcc-10.3.0.ebuild 454 BLAKE2B ac0aa3d75a7442617f60f44e3c10e23e65cec07f210ca185feed06a31dc30632c5eb2ef2520ec9aa370fc51c0154b3aa139e3d9c644d210c0336733fea2f9274 SHA512 301bf900a82bfb9a59d0de6d87c7668c54b16dbf4a74d716513e2ecc5d7dc4ef7121d76483a283809f9c21143ad3195b4b9dfbcd0002dce2d0dd60c48e05d2f6
+EBUILD gcc-10.3.0-r1.ebuild 454 BLAKE2B 6cb8cc3e6a257bae91290eb1935fc4c4fd28649618ffbaddb3d9ff747b5164341f984c56ce6923619fc8446f0b2b72e38e649ea5f49fae26d07d2543b3450c36 SHA512 bd72b5c6384f272aca7481e16a1084091885ad1dfb310af9ce626bfd89eb5fd9398bacece73948a653df0589ba5f698ce086bae7f8d33f2b83379c3c8493d88f
+EBUILD gcc-10.3.0.ebuild 447 BLAKE2B ea4aa1b2beea36b702347947e95094e936c687404d7ae42061bb739a449f65acc887a2a57349cf21f470c856759523912751a32fe28bd2da84169ee12ab1ebce SHA512 b39876cce4822b1199ee4f62d2583e37f051f9d9b2d95e236076263399b07cf899cfc3b5e65218a8fe0e1bda13d9e0c26013986eb96d335b1026921fe20f7f1a
 EBUILD gcc-10.3.1_pre9999.ebuild 649 BLAKE2B 7c2d1e2d939433104d3fb01de2dbdb12b6022a503d2252d8371f699577eb289276897440113bc70745deb7057819d63890be8c0fd0022c02cc6d565fb1c1307e SHA512 eaca9dd9ac89a354beae99d38d7df2004289d281236f4a41457afbba563dcc8f6c1bfe24e8ea9219019c2b7e1c9abb67f428c96389fc9f6b8263db2af66ff3ef
+EBUILD gcc-11.1.0-r1.ebuild 454 BLAKE2B 6b8367c626296ed37660438eb4447698b053617ea4663d1b34f30559d6b1e42944b330492f69d66b13042440674a785c5410a2b7b19d0b857b8a9574a88a8ffd SHA512 136b2c2654ad8f799c65ebc880f3597c79e30f6a1eabf66484eeef5dc1e0c5961d1053dd245858bde0a985b14e74dad3990427011d2e8c222290e409e7aa3e3d
 EBUILD gcc-11.1.0.ebuild 454 BLAKE2B fbe3eddd0a4daac59ae8dc821ffbf6fad2ce6cc84a2eb534c7ea3fd1cef6bd28e4c5e4b6fa30028e2a10daf18ef63046b8865f527c021fff5d7a2a57fb93daf6 SHA512 ef018491e72a13e18b28ab878c28db23a5c91af6b86102cc325651ecc20f27b840dbfb367b643c1203ef1f2ccdbe7a7fa84aff225c8b0b974c0321ce256f8fbd
 EBUILD gcc-11.1.1_pre9999.ebuild 649 BLAKE2B de4b651b108ff8d9923e377295d1fc5338bb86305200766e3ba922cc0266e14904feeeadd534ea953c8771bed0fe74dafb4a1b31fd0789d143b355def18ee0c4 SHA512 7ae3da7bc046186cebebf2e2217db6ea594a5b43af5cb201eecb754a64f324f7da7c0b99cc3696bf8ba8ffacad8dd7f813150d43d1b247d3f62b842efd3e9d0c
 EBUILD gcc-12.0.0_pre9999.ebuild 530 BLAKE2B 6711f72065debe067dac4ba251854dbb9199fc2a763b0b9a016aa8444446ffb9df57a9b94f6d4cb3126defcedbcfc6680f8012dccbb98e4252f7f9e665593c0b SHA512 8392389fd8a3ef951b2d5522df365c6e43fc6737b0a973be59633a2ac303dd962cf953ee7d6cc7604aeb98642f8e676cc60231aab207cd127879a1dd30c0b8f0
@@ -33,4 +39,5 @@ EBUILD gcc-8.4.0-r2.ebuild 447 BLAKE2B 38562604ff977f16e9f200489128f5ed3b331ddf6
 EBUILD gcc-8.5.0.ebuild 452 BLAKE2B 94265b9746e2533e21004f7266b6d07189e0b32d156442a65eed4fcc3e305336b7bdf17619ab88212d182b90c5ef778c6d20e6491111462341256b849cff2bf9 SHA512 a6e77935805026f043441ce854c4820954dd08e2314d8ba88f4d81e3031bdad0bee4d1c0eb2b28a3338547070a07f08bc4b361ee2080cdbdc263f687b0584849
 EBUILD gcc-9.3.0-r1.ebuild 444 BLAKE2B c685901b60756470f23e04507cff20f5318c08a53aada84f45ffb597b9ad4e73f2c8cbfec46eba9e7bbc5dd79df128da1348e42b5dfcb31f45d79df000546ccd SHA512 798982969ce659602d05ac1b29e68900502384cf76d9ed1c1b1867e6ed0329045e11c1d1f6895e659d2175feb27e12388f4ab27ace6e6c978a57905bd95a9874
 EBUILD gcc-9.3.0-r2.ebuild 445 BLAKE2B a64400ef8197562d691c905b9cb999c6725bc803b3cc544d14bfe14fb73b24d1c8fca8a896d4baec35d5b7b8ac070bbe73b7453146ebb35f37792ac11c32490c SHA512 4e7424149d44b289f4cbe53418cd93d76d3209291d98615d41460665eb884eb54389ec75da24362587811baedc5a3cea4ecf710f03358e15ef2068b4b5565f55
+EBUILD gcc-9.4.0.ebuild 452 BLAKE2B 94265b9746e2533e21004f7266b6d07189e0b32d156442a65eed4fcc3e305336b7bdf17619ab88212d182b90c5ef778c6d20e6491111462341256b849cff2bf9 SHA512 a6e77935805026f043441ce854c4820954dd08e2314d8ba88f4d81e3031bdad0bee4d1c0eb2b28a3338547070a07f08bc4b361ee2080cdbdc263f687b0584849
 MISC metadata.xml 2704 BLAKE2B 3e64655ebe03af9038fa2087b8d929e05136f833fe8667d2e1452a5f5140a1ffa64e39eb7e8e26859cf390d3a2b32842e41fa492697acd8cdac1336a34bba33e SHA512 dc9ec372f6feb99232ab0599351430440b4ddc71e2bf2be1ca4cf235337acfef5443e3ca44f12438f1b0f654b8eaaae66622728f6bcd8f15d3db78374ab781df
diff --git a/sys-devel/gcc/gcc-10.3.0-r1.ebuild b/sys-devel/gcc/gcc-10.3.0-r1.ebuild
new file mode 100644
index 000000000000..d5f3fa84bd97
--- /dev/null
+++ b/sys-devel/gcc/gcc-10.3.0-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PATCH_VER="2"
+
+inherit toolchain
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND=""
+BDEPEND="${CATEGORY}/binutils"
+
+src_prepare() {
+	if has_version '>=sys-libs/glibc-2.32-r1'; then
+		rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch" || die
+	fi
+
+	toolchain_src_prepare
+}
diff --git a/sys-devel/gcc/gcc-10.3.0.ebuild b/sys-devel/gcc/gcc-10.3.0.ebuild
index d262b1b0f2be..2d3e37390aa4 100644
--- a/sys-devel/gcc/gcc-10.3.0.ebuild
+++ b/sys-devel/gcc/gcc-10.3.0.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="1"
 
 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-11.1.0-r1.ebuild b/sys-devel/gcc/gcc-11.1.0-r1.ebuild
new file mode 100644
index 000000000000..8249dc84117d
--- /dev/null
+++ b/sys-devel/gcc/gcc-11.1.0-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PATCH_VER="2"
+
+inherit toolchain
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND=""
+BDEPEND="${CATEGORY}/binutils"
+
+src_prepare() {
+	if has_version '>=sys-libs/glibc-2.32-r1'; then
+		rm -v "${WORKDIR}/patch/21_all_disable-riscv32-ABIs.patch" || die
+	fi
+
+	toolchain_src_prepare
+}
diff --git a/sys-devel/gcc/gcc-9.4.0.ebuild b/sys-devel/gcc/gcc-9.4.0.ebuild
new file mode 100644
index 000000000000..360fbf747f08
--- /dev/null
+++ b/sys-devel/gcc/gcc-9.4.0.ebuild
@@ -0,0 +1,19 @@
+# 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=""
+DEPEND="${RDEPEND}
+	elibc_glibc? ( >=sys-libs/glibc-2.13 )
+	>=${CATEGORY}/binutils-2.20"
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
+fi
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index 0f6b78b458b9..fe066d1a6014 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -4,6 +4,6 @@ AUX gdb-8.3.1-verbose-build.patch 395 BLAKE2B e2e82307ceae64d16aa9b57a5e639eb5d2
 DIST gdb-10.1.tar.xz 21507112 BLAKE2B 69d79cd667ecb6e936b41a03817ade5dd9b761f97bc123d668b5f968d123c37d048fc8ec1289151e989f01bb01a43cc3d8b5b54f1807f1e3eb5f43e6bf0aa55b SHA512 0dc54380435c6853db60f1e388b94836d294dfa9ad7f518385a27db4edd03cb970f8717d5f1e9c9a0d4a33d7fcf91bc2e5d6c9cf9e4b561dcc74e65b806c1537
 DIST gdb-10.2.tar.xz 21518900 BLAKE2B c5d31d80d2b454767d6f844e8471b012ad437c3872391b618fd7b14c5cf251b78e55d28c12e81382fd600f67e2f618ff5dbe3a7b737a5d5161ceb3542afbb90b SHA512 3653762ac008e065c37cd641653184c9ff7ce51ee2222ade1122bec9d6cc64dffd4fb74888ef11ac1942064a08910e96b7865112ad37f4602eb0a16bed074caa
 EBUILD gdb-10.1.ebuild 7019 BLAKE2B 34dd10dad9c958e960775dbaa65e941448c096f52bd59dd16f214922f2b81fea84c80196cc59660fdc59a60297b23e5aae8de3d6b0453b7ab636862a9c760604 SHA512 7c132c6ee9aad5d683646b8bd9ed9179fcb3c59c40bd049745d4bde6366c4f75c36faa9184e72a5e82954e84a10fae049b907cdfcf4a55671b126f53d2322dc4
-EBUILD gdb-10.2.ebuild 7068 BLAKE2B 3c04b76d681b92d8a81457acd8a91b7b55a8239ccbf9bb8dabe6f733f00c73a695af90c4fc8368d084d84dbe7f931c1bf544399e57e6c976af077b5b97668e6d SHA512 50d6063b0c7d2a59aeeaa44780e1ab3ff97433ba70915fea9825ae70bad765cb981093bae5d86d6622fa7c58764b7e950617cc8ea7a7effceed9b38132b9d027
+EBUILD gdb-10.2.ebuild 7063 BLAKE2B 93bacd2f7e3f45c17d01f12a0302d9cf070a65ea4dc00c6c0d47a93b1a0e19ff2d092dd38b813bb43a405f58028f4c43be7e4fb3b1b9bc13d57d5b59aa1db643 SHA512 2ec5d372037d0d98d50d58f5bba03fda00d06fd46e7d11280e4b17a91435086ef288c46cbc5157a3ca4bbc288d4ff679845878e457c8e9e631fde606a85c741a
 EBUILD gdb-9999.ebuild 6990 BLAKE2B 4b35c8d7d109a74e98ca5bc9e6c7967f1f3a9d8ff508f14cd15bf752df8117f3355562bacb2a8bff4ccffe28971e428d9a209df83cb3dd6006d97489259686de SHA512 dbba8eb4feea97afd7ca3d90a9e48209facc426e4227792eb57dc3124ef64979440409382f0ad2ab9f05792ca5661505c46f0f563126bc33d05793af04d74357
 MISC metadata.xml 1102 BLAKE2B 76a586ca542d54f382f13416d53729e9a26f05d8ee2e592cf0b0aa1851d0a9546b20d2058107ca250986682c5f4f86c38939f4cd627f36d9223be3589337caad SHA512 047a745a15e2fd6ecbf22d52e3771e0982a10ed2eb41513e30946574e5b6e813088a31bb3c32832181f19fbd4f5061575389723f66b1821e75839a863e422c0e
diff --git a/sys-devel/gdb/gdb-10.2.ebuild b/sys-devel/gdb/gdb-10.2.ebuild
index 8b515ba573ac..9968e1b3e6af 100644
--- a/sys-devel/gdb/gdb-10.2.ebuild
+++ b/sys-devel/gdb/gdb-10.2.ebuild
@@ -44,7 +44,7 @@ SRC_URI="${SRC_URI}
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 IUSE="cet lzma multitarget nls +python +server source-highlight test vanilla xml xxhash"
 REQUIRED_USE="
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index efcb3f848551..bb262d86d7d2 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -1,6 +1,7 @@
 AUX gettext-0.19.7-disable-libintl.patch 1307 BLAKE2B fb3d4d95ffbe57b0d1d6e8ede596ca9d7d8587d9c883fa2fc54b8d1109210ac2b435b4709a16c2043cef6cc8d5448dc58adab74aa2e8ce834abdee51163d8c51 SHA512 7887d2fbf4b9d9677688e6d8d785b6c10c76bc330cb7b40da432e0a1ff0f7fc1355bf8f671041a37477baa6c8508b6e39f90ead468674febd62777506badc227
 AUX gettext-0.20-parallel_install.patch 1494 BLAKE2B 58bd84878c351e29acac861f29854eeb442179a415b5b3cab554b3aa4e2e3b06dabaa3e78ab506bb3b88b55a3fe4d53f1e43718bc6935a84dd477320c9349b70 SHA512 a15e8c415facd7b36761a747da9a0dfc47588d253a84b693c7f1f6e6334c6db5350af41f4c6c1dd83ae61695b2f761cc3b24339d7bb8f4dce972a672312ad942
+AUX gettext-0.21-CVE-2020-12825.patch 14074 BLAKE2B 67da10f81edf92004b8d1f4099c73c14b0e18471033eca17f63fffd05ee2a46d4cdd3bf165b6b7228f4dc9c475985ba69f7ba13e1a03eb84c7a8b74e003223e8 SHA512 92e9a6eeb1c9a697c1724785a9996da27ca2c08db69becb592eb1d42d9ec0e261591a5c6a2a04e010f8b6f5df7ef4cd94b2d0d4fcc0e98d2433519c1875be191
 AUX gettext-0.21_rc1-avoid_eautomake.patch 1362 BLAKE2B eed15ecde829aa63859dc196052f97abc0386e6c496b7d7e073769e0ad6208623cc1fb6322ff422647f3a55aac6453bd6390432d707d179da7cfc820d487c23a SHA512 5089af3dabb2459345aec6196de70591dafabfc292495f052dd67ce3d2566c4b62a8554eb11db7499378e16a8d11953f044fcfd23c77a71ad01feec4c0c41956
 DIST gettext-0.21.tar.gz 24181849 BLAKE2B 2eae99d0916b00b2af6fbc6bf7e309076519a10fea16cd49e7aa29fe8aec1ee7c784c6277281b764dc4abacf400cd3fe461129586303c8cd337db15c76cb4b87 SHA512 bbe590c5dd3580c75bf30ff768da99a88eb8d466ec1ac9eea20be4cab4357ecf72448e6b81b47425e39d50fa6320ba426632914d7898dfebb4f159abc39c31d1
-EBUILD gettext-0.21.ebuild 4310 BLAKE2B e3750a82fcfd94522e6cd9cc1688afdb355b8c945f6f3eef82d875c8957b856691749f87162800ffc6fc244a38b94ca76ca9650333a7892c75e51aa06546876f SHA512 3f7c61a2b80aa7a39eb00c9fc85030f125f13cfabe4a1dd4ffabee00c1b714bd782ef6b8d6e85cd6b201aa8fe512b87073339764a73d3963a942427c2fa2ed74
+EBUILD gettext-0.21-r1.ebuild 4356 BLAKE2B 83bef2cbe146212672edf99aae200c36ab08cf907692b62f2afbd1f0c4a5061cc5fc1415d2c4ddea9c1f218823fadfc9b532c910fcf0933b793e6bd5a83582db SHA512 5cd16ca7c7a3d03ebeb2bcb75b761e71c2e6add284fbcaaec11d0e38676ec4c5b02d40c64927e7300da3edfc6a5981d325d5fcba20c4a7ba2b2df5c0f3a114c3
 MISC metadata.xml 707 BLAKE2B e0f7534d0a90939db1d5b7d0b837d9c0c4ba7cc17ece9dc90e7832580fe62a53ed306a77f86c3205bb96aa46d40834b03143d81076c531eabfc92da82d41e880 SHA512 1951f0165d110a484ed68f774106d6f76f5cad612eb74e0386e8ecbb4e71627668daeda48a779ee6b5daab8b2617145e50ecdb0429c34879278ca14868d40d28
diff --git a/sys-devel/gettext/files/gettext-0.21-CVE-2020-12825.patch b/sys-devel/gettext/files/gettext-0.21-CVE-2020-12825.patch
new file mode 100644
index 000000000000..6b4c463b4118
--- /dev/null
+++ b/sys-devel/gettext/files/gettext-0.21-CVE-2020-12825.patch
@@ -0,0 +1,335 @@
+https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/44cbd1e718d6a08e59b9300280c340218a84e089
+
+--- a/libtextstyle/gnulib-local/lib/libcroco/cr-parser.c
++++ b/libtextstyle/gnulib-local/lib/libcroco/cr-parser.c
+@@ -146,6 +146,8 @@ struct _CRParserPriv {
+ 
+ #define CHARS_TAB_SIZE 12
+ 
++#define RECURSIVE_CALLERS_LIMIT 100
++
+ /**
+  * IS_NUM:
+  *@a_char: the char to test.
+@@ -354,9 +356,11 @@ static enum CRStatus cr_parser_parse_selector_core (CRParser * a_this);
+ 
+ static enum CRStatus cr_parser_parse_declaration_core (CRParser * a_this);
+ 
+-static enum CRStatus cr_parser_parse_any_core (CRParser * a_this);
++static enum CRStatus cr_parser_parse_any_core (CRParser * a_this,
++                                               guint      n_calls);
+ 
+-static enum CRStatus cr_parser_parse_block_core (CRParser * a_this);
++static enum CRStatus cr_parser_parse_block_core (CRParser * a_this,
++                                                 guint      n_calls);
+ 
+ static enum CRStatus cr_parser_parse_value_core (CRParser * a_this);
+ 
+@@ -794,7 +798,7 @@ cr_parser_parse_atrule_core (CRParser * a_this)
+         cr_parser_try_to_skip_spaces_and_comments (a_this);
+ 
+         do {
+-                status = cr_parser_parse_any_core (a_this);
++                status = cr_parser_parse_any_core (a_this, 0);
+         } while (status == CR_OK);
+ 
+         status = cr_tknzr_get_next_token (PRIVATE (a_this)->tknzr,
+@@ -805,7 +809,7 @@ cr_parser_parse_atrule_core (CRParser * a_this)
+                 cr_tknzr_unget_token (PRIVATE (a_this)->tknzr, 
+                                       token);
+                 token = NULL;
+-                status = cr_parser_parse_block_core (a_this);
++                status = cr_parser_parse_block_core (a_this, 0);
+                 CHECK_PARSING_STATUS (status,
+                                       FALSE);
+                 goto done;
+@@ -940,11 +944,11 @@ cr_parser_parse_selector_core (CRParser * a_this)
+ 
+         RECORD_INITIAL_POS (a_this, &init_pos);
+ 
+-        status = cr_parser_parse_any_core (a_this);
++        status = cr_parser_parse_any_core (a_this, 0);
+         CHECK_PARSING_STATUS (status, FALSE);
+ 
+         do {
+-                status = cr_parser_parse_any_core (a_this);
++                status = cr_parser_parse_any_core (a_this, 0);
+ 
+         } while (status == CR_OK);
+ 
+@@ -966,10 +970,12 @@ cr_parser_parse_selector_core (CRParser * a_this)
+  *in chapter 4.1 of the css2 spec.
+  *block ::= '{' S* [ any | block | ATKEYWORD S* | ';' ]* '}' S*;
+  *@param a_this the current instance of #CRParser.
++ *@param n_calls used to limit recursion depth
+  *FIXME: code this function.
+  */
+ static enum CRStatus
+-cr_parser_parse_block_core (CRParser * a_this)
++cr_parser_parse_block_core (CRParser * a_this,
++                            guint      n_calls)
+ {
+         CRToken *token = NULL;
+         CRInputPos init_pos;
+@@ -977,6 +983,9 @@ cr_parser_parse_block_core (CRParser * a_this)
+ 
+         g_return_val_if_fail (a_this && PRIVATE (a_this), CR_BAD_PARAM_ERROR);
+ 
++        if (n_calls > RECURSIVE_CALLERS_LIMIT)
++                return CR_ERROR;
++
+         RECORD_INITIAL_POS (a_this, &init_pos);
+ 
+         status = cr_tknzr_get_next_token (PRIVATE (a_this)->tknzr, &token);
+@@ -1006,13 +1015,13 @@ cr_parser_parse_block_core (CRParser * a_this)
+         } else if (token->type == CBO_TK) {
+                 cr_tknzr_unget_token (PRIVATE (a_this)->tknzr, token);
+                 token = NULL;
+-                status = cr_parser_parse_block_core (a_this);
++                status = cr_parser_parse_block_core (a_this, n_calls + 1);
+                 CHECK_PARSING_STATUS (status, FALSE);
+                 goto parse_block_content;
+         } else {
+                 cr_tknzr_unget_token (PRIVATE (a_this)->tknzr, token);
+                 token = NULL;
+-                status = cr_parser_parse_any_core (a_this);
++                status = cr_parser_parse_any_core (a_this, n_calls + 1);
+                 CHECK_PARSING_STATUS (status, FALSE);
+                 goto parse_block_content;
+         }
+@@ -1119,7 +1128,7 @@ cr_parser_parse_value_core (CRParser * a_this)
+                 status = cr_tknzr_unget_token (PRIVATE (a_this)->tknzr,
+                                                token);
+                 token = NULL;
+-                status = cr_parser_parse_block_core (a_this);
++                status = cr_parser_parse_block_core (a_this, 0);
+                 CHECK_PARSING_STATUS (status, FALSE);
+                 ref++;
+                 goto continue_parsing;
+@@ -1133,7 +1142,7 @@ cr_parser_parse_value_core (CRParser * a_this)
+                 status = cr_tknzr_unget_token (PRIVATE (a_this)->tknzr,
+                                                token);
+                 token = NULL;
+-                status = cr_parser_parse_any_core (a_this);
++                status = cr_parser_parse_any_core (a_this, 0);
+                 if (status == CR_OK) {
+                         ref++;
+                         goto continue_parsing;
+@@ -1172,10 +1181,12 @@ cr_parser_parse_value_core (CRParser * a_this)
+  *        | FUNCTION | DASHMATCH | '(' any* ')' | '[' any* ']' ] S*;
+  *
+  *@param a_this the current instance of #CRParser.
++ *@param n_calls used to limit recursion depth
+  *@return CR_OK upon successfull completion, an error code otherwise.
+  */
+ static enum CRStatus
+-cr_parser_parse_any_core (CRParser * a_this)
++cr_parser_parse_any_core (CRParser * a_this,
++                          guint      n_calls)
+ {
+         CRToken *token1 = NULL,
+                 *token2 = NULL;
+@@ -1184,6 +1195,9 @@ cr_parser_parse_any_core (CRParser * a_this)
+ 
+         g_return_val_if_fail (a_this, CR_BAD_PARAM_ERROR);
+ 
++        if (n_calls > RECURSIVE_CALLERS_LIMIT)
++                return CR_ERROR;
++
+         RECORD_INITIAL_POS (a_this, &init_pos);
+ 
+         status = cr_tknzr_get_next_token (PRIVATE (a_this)->tknzr, &token1);
+@@ -1222,7 +1236,7 @@ cr_parser_parse_any_core (CRParser * a_this)
+                  *We consider parameter as being an "any*" production.
+                  */
+                 do {
+-                        status = cr_parser_parse_any_core (a_this);
++                        status = cr_parser_parse_any_core (a_this, n_calls + 1);
+                 } while (status == CR_OK);
+ 
+                 ENSURE_PARSING_COND (status == CR_PARSING_ERROR);
+@@ -1247,7 +1261,7 @@ cr_parser_parse_any_core (CRParser * a_this)
+                 }
+ 
+                 do {
+-                        status = cr_parser_parse_any_core (a_this);
++                        status = cr_parser_parse_any_core (a_this, n_calls + 1);
+                 } while (status == CR_OK);
+ 
+                 ENSURE_PARSING_COND (status == CR_PARSING_ERROR);
+@@ -1275,7 +1289,7 @@ cr_parser_parse_any_core (CRParser * a_this)
+                 }
+ 
+                 do {
+-                        status = cr_parser_parse_any_core (a_this);
++                        status = cr_parser_parse_any_core (a_this, n_calls + 1);
+                 } while (status == CR_OK);
+ 
+                 ENSURE_PARSING_COND (status == CR_PARSING_ERROR);
+--- a/libtextstyle/lib/libcroco/cr-parser.c
++++ b/libtextstyle/lib/libcroco/cr-parser.c
+@@ -146,6 +146,8 @@ struct _CRParserPriv {
+ 
+ #define CHARS_TAB_SIZE 12
+ 
++#define RECURSIVE_CALLERS_LIMIT 100
++
+ /**
+  * IS_NUM:
+  *@a_char: the char to test.
+@@ -354,9 +356,11 @@ static enum CRStatus cr_parser_parse_selector_core (CRParser * a_this);
+ 
+ static enum CRStatus cr_parser_parse_declaration_core (CRParser * a_this);
+ 
+-static enum CRStatus cr_parser_parse_any_core (CRParser * a_this);
++static enum CRStatus cr_parser_parse_any_core (CRParser * a_this,
++                                               guint      n_calls);
+ 
+-static enum CRStatus cr_parser_parse_block_core (CRParser * a_this);
++static enum CRStatus cr_parser_parse_block_core (CRParser * a_this,
++                                                 guint      n_calls);
+ 
+ static enum CRStatus cr_parser_parse_value_core (CRParser * a_this);
+ 
+@@ -794,7 +798,7 @@ cr_parser_parse_atrule_core (CRParser * a_this)
+         cr_parser_try_to_skip_spaces_and_comments (a_this);
+ 
+         do {
+-                status = cr_parser_parse_any_core (a_this);
++                status = cr_parser_parse_any_core (a_this, 0);
+         } while (status == CR_OK);
+ 
+         status = cr_tknzr_get_next_token (PRIVATE (a_this)->tknzr,
+@@ -805,7 +809,7 @@ cr_parser_parse_atrule_core (CRParser * a_this)
+                 cr_tknzr_unget_token (PRIVATE (a_this)->tknzr, 
+                                       token);
+                 token = NULL;
+-                status = cr_parser_parse_block_core (a_this);
++                status = cr_parser_parse_block_core (a_this, 0);
+                 CHECK_PARSING_STATUS (status,
+                                       FALSE);
+                 goto done;
+@@ -940,11 +944,11 @@ cr_parser_parse_selector_core (CRParser * a_this)
+ 
+         RECORD_INITIAL_POS (a_this, &init_pos);
+ 
+-        status = cr_parser_parse_any_core (a_this);
++        status = cr_parser_parse_any_core (a_this, 0);
+         CHECK_PARSING_STATUS (status, FALSE);
+ 
+         do {
+-                status = cr_parser_parse_any_core (a_this);
++                status = cr_parser_parse_any_core (a_this, 0);
+ 
+         } while (status == CR_OK);
+ 
+@@ -966,10 +970,12 @@ cr_parser_parse_selector_core (CRParser * a_this)
+  *in chapter 4.1 of the css2 spec.
+  *block ::= '{' S* [ any | block | ATKEYWORD S* | ';' ]* '}' S*;
+  *@param a_this the current instance of #CRParser.
++ *@param n_calls used to limit recursion depth
+  *FIXME: code this function.
+  */
+ static enum CRStatus
+-cr_parser_parse_block_core (CRParser * a_this)
++cr_parser_parse_block_core (CRParser * a_this,
++                            guint      n_calls)
+ {
+         CRToken *token = NULL;
+         CRInputPos init_pos;
+@@ -977,6 +983,9 @@ cr_parser_parse_block_core (CRParser * a_this)
+ 
+         g_return_val_if_fail (a_this && PRIVATE (a_this), CR_BAD_PARAM_ERROR);
+ 
++        if (n_calls > RECURSIVE_CALLERS_LIMIT)
++                return CR_ERROR;
++
+         RECORD_INITIAL_POS (a_this, &init_pos);
+ 
+         status = cr_tknzr_get_next_token (PRIVATE (a_this)->tknzr, &token);
+@@ -1006,13 +1015,13 @@ cr_parser_parse_block_core (CRParser * a_this)
+         } else if (token->type == CBO_TK) {
+                 cr_tknzr_unget_token (PRIVATE (a_this)->tknzr, token);
+                 token = NULL;
+-                status = cr_parser_parse_block_core (a_this);
++                status = cr_parser_parse_block_core (a_this, n_calls + 1);
+                 CHECK_PARSING_STATUS (status, FALSE);
+                 goto parse_block_content;
+         } else {
+                 cr_tknzr_unget_token (PRIVATE (a_this)->tknzr, token);
+                 token = NULL;
+-                status = cr_parser_parse_any_core (a_this);
++                status = cr_parser_parse_any_core (a_this, n_calls + 1);
+                 CHECK_PARSING_STATUS (status, FALSE);
+                 goto parse_block_content;
+         }
+@@ -1119,7 +1128,7 @@ cr_parser_parse_value_core (CRParser * a_this)
+                 status = cr_tknzr_unget_token (PRIVATE (a_this)->tknzr,
+                                                token);
+                 token = NULL;
+-                status = cr_parser_parse_block_core (a_this);
++                status = cr_parser_parse_block_core (a_this, 0);
+                 CHECK_PARSING_STATUS (status, FALSE);
+                 ref++;
+                 goto continue_parsing;
+@@ -1133,7 +1142,7 @@ cr_parser_parse_value_core (CRParser * a_this)
+                 status = cr_tknzr_unget_token (PRIVATE (a_this)->tknzr,
+                                                token);
+                 token = NULL;
+-                status = cr_parser_parse_any_core (a_this);
++                status = cr_parser_parse_any_core (a_this, 0);
+                 if (status == CR_OK) {
+                         ref++;
+                         goto continue_parsing;
+@@ -1172,10 +1181,12 @@ cr_parser_parse_value_core (CRParser * a_this)
+  *        | FUNCTION | DASHMATCH | '(' any* ')' | '[' any* ']' ] S*;
+  *
+  *@param a_this the current instance of #CRParser.
++ *@param n_calls used to limit recursion depth
+  *@return CR_OK upon successfull completion, an error code otherwise.
+  */
+ static enum CRStatus
+-cr_parser_parse_any_core (CRParser * a_this)
++cr_parser_parse_any_core (CRParser * a_this,
++                          guint      n_calls)
+ {
+         CRToken *token1 = NULL,
+                 *token2 = NULL;
+@@ -1184,6 +1195,9 @@ cr_parser_parse_any_core (CRParser * a_this)
+ 
+         g_return_val_if_fail (a_this, CR_BAD_PARAM_ERROR);
+ 
++        if (n_calls > RECURSIVE_CALLERS_LIMIT)
++                return CR_ERROR;
++
+         RECORD_INITIAL_POS (a_this, &init_pos);
+ 
+         status = cr_tknzr_get_next_token (PRIVATE (a_this)->tknzr, &token1);
+@@ -1222,7 +1236,7 @@ cr_parser_parse_any_core (CRParser * a_this)
+                  *We consider parameter as being an "any*" production.
+                  */
+                 do {
+-                        status = cr_parser_parse_any_core (a_this);
++                        status = cr_parser_parse_any_core (a_this, n_calls + 1);
+                 } while (status == CR_OK);
+ 
+                 ENSURE_PARSING_COND (status == CR_PARSING_ERROR);
+@@ -1247,7 +1261,7 @@ cr_parser_parse_any_core (CRParser * a_this)
+                 }
+ 
+                 do {
+-                        status = cr_parser_parse_any_core (a_this);
++                        status = cr_parser_parse_any_core (a_this, n_calls + 1);
+                 } while (status == CR_OK);
+ 
+                 ENSURE_PARSING_COND (status == CR_PARSING_ERROR);
+@@ -1275,7 +1289,7 @@ cr_parser_parse_any_core (CRParser * a_this)
+                 }
+ 
+                 do {
+-                        status = cr_parser_parse_any_core (a_this);
++                        status = cr_parser_parse_any_core (a_this, n_calls + 1);
+                 } while (status == CR_OK);
+ 
+                 ENSURE_PARSING_COND (status == CR_PARSING_ERROR);
+ 
diff --git a/sys-devel/gettext/gettext-0.21.ebuild b/sys-devel/gettext/gettext-0.21-r1.ebuild
index f16b3d86e91f..40031f2f5a3d 100644
--- a/sys-devel/gettext/gettext-0.21.ebuild
+++ b/sys-devel/gettext/gettext-0.21-r1.ebuild
@@ -20,7 +20,7 @@ fi
 # so put that license behind USE=cxx.
 LICENSE="GPL-3+ cxx? ( LGPL-2.1+ )"
 SLOT="0"
-IUSE="acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs"
+IUSE="acl cvs +cxx doc emacs git java ncurses nls openmp static-libs"
 
 # only runtime goes multilib
 # Note: The version of libxml2 corresponds to the version bundled via gnulib.
@@ -35,11 +35,11 @@ DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
 	dev-libs/expat
 	acl? ( virtual/acl )
 	ncurses? ( sys-libs/ncurses:0= )
-	java? ( >=virtual/jdk-1.4:= )"
+	java? ( >=virtual/jdk-1.8:= )"
 RDEPEND="${DEPEND}
 	!git? ( cvs? ( dev-vcs/cvs ) )
 	git? ( dev-vcs/git )
-	java? ( >=virtual/jre-1.4 )"
+	java? ( >=virtual/jre-1.8 )"
 BDEPEND="
 	git? ( dev-vcs/git )
 "
@@ -60,6 +60,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-0.19.7-disable-libintl.patch #564168
 	"${FILESDIR}"/${PN}-0.20-parallel_install.patch #685530
 	"${FILESDIR}"/${PN}-0.21_rc1-avoid_eautomake.patch
+	"${FILESDIR}"/${PN}-0.21-CVE-2020-12825.patch
 )
 
 QA_SONAME_NO_SYMLINK=".*/preloadable_libintl.so"
diff --git a/sys-devel/kgcc64/Manifest b/sys-devel/kgcc64/Manifest
index 84ba832b7f6c..91c05a95beae 100644
--- a/sys-devel/kgcc64/Manifest
+++ b/sys-devel/kgcc64/Manifest
@@ -7,7 +7,7 @@ DIST gcc-11.1.0-patches-1.tar.bz2 12130 BLAKE2B 4d763b83dba7875bbbe8bbb9b6c39279
 DIST gcc-11.1.0.tar.xz 78877216 BLAKE2B fe617e776b0270d11adea21b5c37d889de90865c19ab82d1c37bbd5c5b9c583a98c174606c4f893ca4950a4233e2a58aae93ad6aa7ad33d4e78a31c72371c1ed SHA512 fd6bba0f67ff48069d03073d1a9b5e896383b1cfc9dde008e868e60a9ec5014a837d56af0ecbf467b3fb9b37ec74a676e819a18b44393a0a3c4280175b5d7ad8
 DIST gcc-9.3.0-patches-3.tar.bz2 14193 BLAKE2B 4863fec1af41a8cdb2c24479b28812df36c1f71ab71d267ff0efc467cfb8ce99ed77714ceaedfb08b0d1eb0eb9316758cc7cbc5a8ad0bb582050690935e64b46 SHA512 8b90a5826df64e6f74e4f6c0e5acead695b38f671e26485b110d5b341daaad4ac21aabb04baae9ad457408eed274888b7f785bbc782611acfc7261e6a315d110
 DIST gcc-9.3.0.tar.xz 70533868 BLAKE2B 21efb1432aefad5ed9b9b395e88ef2adfda3a8ea6e3e808cd151da6e66df9fed1bafdc8b8ff055d4b2272ac786d8b7ddc4293bb6b51c55c40a261a0eda0e7cb4 SHA512 4b9e3639eef6e623747a22c37a904b4750c93b6da77cf3958d5047e9b5ebddb7eebe091cc16ca0a227c0ecbd2bf3b984b221130f269a97ee4cc18f9cf6c444de
-EBUILD kgcc64-10.3.0.ebuild 978 BLAKE2B 75121733c67b2e4a0d81e9617fee0df121608a26523e2febc6b1629d25db3cb42123ea785d9598c6522561b309345fcc939207dc2fb8c07d925d57bc0a53ecb9 SHA512 2248d8c7fc7905ac60fb542416a03d13106135f51244b303b43bcdb8577bf65fca8c50347ad64d2db0b5e5b580e44e68e9c2c7e73adc4f8c40ecdda5c931b8d2
+EBUILD kgcc64-10.3.0.ebuild 977 BLAKE2B 3aaeff6ba1015f1b59edb16080d21dac13f6714a62747e2b9dee4883899134fe6b7c4b64addc4c04b89c17ccfca093e8d713c5c13bd90c26987b3634d085b2af SHA512 f06028f32cb4febfb78d567c8070648d8f511ee5f3f68a5e0a38830aaab24c9c6cc60a406b7ff797f26536dd58f2fe5089ab1d8382e855fab83be1ffcb44416e
 EBUILD kgcc64-11.1.0.ebuild 978 BLAKE2B 75121733c67b2e4a0d81e9617fee0df121608a26523e2febc6b1629d25db3cb42123ea785d9598c6522561b309345fcc939207dc2fb8c07d925d57bc0a53ecb9 SHA512 2248d8c7fc7905ac60fb542416a03d13106135f51244b303b43bcdb8577bf65fca8c50347ad64d2db0b5e5b580e44e68e9c2c7e73adc4f8c40ecdda5c931b8d2
 EBUILD kgcc64-9.3.0-r2.ebuild 977 BLAKE2B 2e96cd95ee42508f3b2889fdf679233523897c1800c8a64eaccb1bf2fe9a600d585b78d9f1b4dd225a083923e1f90f208e6eff82475ce2a0da3ef792be5a9d18 SHA512 ff5328502339d065bf38686cd77506e654819331d4c59eb84e8d46d0d9c0a1abd2c024b9e2e908da1552931b21cc04dbce8ea9fc1d1ba0de5e6d1a5573ac378c
 MISC metadata.xml 267 BLAKE2B 5267526ad53ec7bedfe46f8cba86c810629394fa4f3c59e1b69619b0a11a9edbb746ae6abf818182da7ade72c862360f43a19209007a23da9701df26b96f77dd SHA512 715bb37d958c1e508b2ef00711ab3a4abee982efe90867fd2bcf91fa91305d5a413a4f3d13d01ea6e27eb15f5f9dcb58fa13ecfed7025cae43745792ac1a105d
diff --git a/sys-devel/kgcc64/kgcc64-10.3.0.ebuild b/sys-devel/kgcc64/kgcc64-10.3.0.ebuild
index c8abbd9325b8..e05d42e06fa3 100644
--- a/sys-devel/kgcc64/kgcc64-10.3.0.ebuild
+++ b/sys-devel/kgcc64/kgcc64-10.3.0.ebuild
@@ -21,7 +21,7 @@ inherit toolchain
 DESCRIPTION="64bit kernel compiler"
 
 # Works on hppa and mips; all other archs, refer to bug #228115
-KEYWORDS="~hppa"
+KEYWORDS="hppa"
 
 # unlike every other target, hppa has not unified the 32/64 bit
 # ports in binutils yet
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index d19adf37c188..3247c65325c2 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -2,9 +2,9 @@ DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
 DIST llvmorg-12.0.1-rc1.tar.gz 134261735 BLAKE2B d29510495641c06e6d7a5ac165e6d34e0ba15d1a5b786534e186e341e3a0550cdd3d8a2b61deb3e2bf44c0b0ff8561224bf7f8cebc2ce9415639cb67ceae289e SHA512 4595a26df56eed7d5941240fe92116ad2f1c61639f0f464697c2c530a601347032fbad6802d1fa915ced8574c7b30ef05bc8c0be737784c844d3860892817e6e
-EBUILD lld-10.0.1-r1.ebuild 1180 BLAKE2B 57351da8e2caf83758a607b1517a29e1d7ea0887d5ba6d58bb93da8208abf458c4c6185e7673a4da98a798cee82ed778a77c481f0eafcb866393ef0c0fac1851 SHA512 7435597d89ca5327f9aa80fff2874c9a86f8d8b8bbe33bb1f043ff4a0c73c0244249bb58285134e705a648223ba1ec4d35f79b6f81bb4430040ed439a8137011
+EBUILD lld-10.0.1-r1.ebuild 1179 BLAKE2B 5525df9462b93004d5fad0c45bb5f675447d4901dc354479e101c205ca7831cf53cf217ecace5a6aab18007abc06b41c35bdc60232601476741ff3ce72879e72 SHA512 c01e31c227974bc666711a69a1d9edc7652d7b003360aac57f39a644b996538cd6add10d2f0bf4cfee13f384600e8cf8ef8a7f343f809746fdd89ac4939e212e
 EBUILD lld-10.0.1.ebuild 1327 BLAKE2B c1933a141d5460f94cee3bdeac644760aec6d8e5906e3202e54a7a9da441a57d2de33b77d906dea4dcf6d7bac0bef97edd29c0a8d756093e9b56f81fbec07e01 SHA512 5901b7d0f5b2d07234d3287ab003e68b032a42e0887ab0d76fdd7a7af12feaea97a3ce07f06f3f1c428f7b5b4fa7f98daddf0909c8e3c0bf7ab2adc75363ed95
-EBUILD lld-11.1.0-r1.ebuild 1252 BLAKE2B 80f3bbdb8355e697eeb5951a76c67b04313aae078a80c40de22f2e2bb928501549ddbfe85a526e0c50f0a176c813f1362de3d1bf0a042da7fa7623696aa75a8b SHA512 e39de371e3a445fb99bb72f9841633d71ab4021d4a4b532f47d43c72379703025ac1dce06359e524788b00b8ded54d3718843bc72c2355a7c668e8ecbfe9241c
+EBUILD lld-11.1.0-r1.ebuild 1251 BLAKE2B ddc390d7bdd3bcc4b47bbad6f8a9c480c1b4d5f47cd6e03a269d2d52148d53bc139cb1f3db08745a1f7819bc1e2948dc2e7cc3cb14da10cbae2084a1b7fcffaf SHA512 70b81c9036411d376b8fa561fdcc58dbddb2b3f552aa7df93e70789f2e2d387ab57a49780f0ed60a7a6dc46401d897c653f122e7623f3aff76fad2e29c982227
 EBUILD lld-11.1.0.ebuild 1399 BLAKE2B bfa3538e4bd9492e94547f4ed304d75ff5da1e58c1d1a3e044be9da0c77a6ac71fce301ef3e6970cc520cb0c31abd9a81a668998b9c808852b157c91c3e398f4 SHA512 2ae031e69815ad5711567fc0ff5a7aa20d1cd49bb29dadb03f9754bc69da89d309d57996f3a67157be55c87c75cac7ab00ec53deb9b579ed74901c1789f7cf5b
 EBUILD lld-12.0.0.ebuild 1670 BLAKE2B 09569b42f03e6fe3bd962f8c951400f129acd9c6e080e74a0155bc3167a28976d5aa4428fe06654d34c49c8d96a11a94f2ff8cf7fc3f084a7a8482aad935a52b SHA512 08d5b7521b967233eaccd324607d97d41062dc424c2e659ffb8bb2ef60695962d9d32888d29c8dc0628b6b77f5cc0d932fd7d9394bc799107f5f24cf4de65814
 EBUILD lld-12.0.1.9999.ebuild 1628 BLAKE2B 0287a5e68645f48b08189ef850705bb3e161f42a384efad389ed7915f575f60e850c73087a4833257683e34d9acf2b4c7e930c02ef0cc34a6a1591454927cd2c SHA512 006e8a213d2517483a8c719c6634dcf1fe21281159737b40c4f50a2da51a730fe37e44b4d3b3f4fec0cff8c2055b57f49e94666180c7fd61046e8b60784d0e24
diff --git a/sys-devel/lld/lld-10.0.1-r1.ebuild b/sys-devel/lld/lld-10.0.1-r1.ebuild
index 3c3d5b7c1d14..c10cea125358 100644
--- a/sys-devel/lld/lld-10.0.1-r1.ebuild
+++ b/sys-devel/lld/lld-10.0.1-r1.ebuild
@@ -14,7 +14,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/lld/lld-11.1.0-r1.ebuild b/sys-devel/lld/lld-11.1.0-r1.ebuild
index 710816f6d3d9..0f4726dda542 100644
--- a/sys-devel/lld/lld-11.1.0-r1.ebuild
+++ b/sys-devel/lld/lld-11.1.0-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/ucpp/Manifest b/sys-devel/ucpp/Manifest
index 61e97ff39dba..8393f00a457b 100644
--- a/sys-devel/ucpp/Manifest
+++ b/sys-devel/ucpp/Manifest
@@ -1,5 +1,3 @@
-DIST ucpp-1.3.4.tar.xz 274488 BLAKE2B be43b8c88de2cd32514ecf7dc429c0ca5e88150594c9868fd6d8c3d90a0aabfc6e0f0741d75e4f558de426df7d6c54a3bc7e8e362c5066672f5fe9096cbedc18 SHA512 f9ea88e8f53e728a5b0fcb9084d6d6e140737b00fe350a9c6bc53ef2bb5f7b09d3c9d9a4a2147f635d796247e1b920fd3fea0cdce3ec3f4578694162c2f4c2a6
 DIST ucpp-1.3.5.tar.xz 289468 BLAKE2B 6a038cc5d02f080747a321a55af66f2072503a5c0a554492ea8aed34ff9c3b7b85e3778114e18c3e09f06f1472a1479f39c96997404e0345153a1f84e3f9daee SHA512 3ded8f7bc2b238adb6e7f4162aee48e039dfe7cee31b700c38e8f147634d47cd1ceaf39c343549b0d4a58358e6b9743f7e84f87b253dc19c05e543d68ade24ce
-EBUILD ucpp-1.3.4.ebuild 574 BLAKE2B 2002a1b0705e980708737550da4a722e8519ddf1c832a7decc7e7e898d66026e36bb24d0ed991b21e7f3fa12f968461e46756016372f56889ebccc4dfc837bd4 SHA512 2ba8452a39a918af48768c515f11510a8db1eab4881357625efba8349776e1b4a276e814dd78602b0c0e2f982a4d65d0a478220483600383e2a377a1e09b6fb1
-EBUILD ucpp-1.3.5.ebuild 578 BLAKE2B ee28da66763c74804b8440604303ca5ade79b3020b5bba63d898504c26c9e6333dc915bfa6bff6aa4402eed9e0a364038c929c039b9cad170315fe3c674d41e5 SHA512 7b6813c5ffad2e9dc35af0bd9ebe76f554706092117869ab9268602bf9b7f0f9a00c48c20f6b5a9cb41385d8f828714a5fd0395f0f7796e826b4e07d414d1b30
+EBUILD ucpp-1.3.5.ebuild 574 BLAKE2B 40d609ef0a9d9ccc7a6e9ac23407c7bc2b4215b26830b8af903d349c27b96a46316918cebfa645892ed8069e7e8ec8228b02a315e89a4f69b3ddaa2faf191b7c SHA512 e8a04efe96f168c88bf35dc332eca96e7bcd4498d421bacd29762de94aab86da9c361eac94ed0e3c96024efc9abc43af3368b1215950c8830016c7975c2cb333
 MISC metadata.xml 450 BLAKE2B 0fba16b58542fffb8e1e99af14e6d4b1f24cd4d689e1a31e1cd513794f1f4c5c14eb7b4a39eab5e8c2a9d13433d670778171b6ac73be66e577798149a93db818 SHA512 6e19033ae2cbfe1a02e6fee2ed078600593e3cdbcccd4b86ec4ccb5283e3b3ad300d6bc9b9803b0b1f6a7e5cc49c8a0d955170e1fc7ba1f26ce0a26e3c0bdf48
diff --git a/sys-devel/ucpp/ucpp-1.3.4.ebuild b/sys-devel/ucpp/ucpp-1.3.4.ebuild
deleted file mode 100644
index febb7024590c..000000000000
--- a/sys-devel/ucpp/ucpp-1.3.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Library for preprocessing C compliant to ISO-C99"
-HOMEPAGE="https://gitlab.com/scarabeusiv/ucpp"
-SRC_URI="http://dev.gentooexperimental.org/~scarabeus/${P}.tar.xz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 x86 ~amd64-linux"
-IUSE="static-libs"
-
-src_configure() {
-	econf \
-		--disable-werror \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sys-devel/ucpp/ucpp-1.3.5.ebuild b/sys-devel/ucpp/ucpp-1.3.5.ebuild
index 858f87bb784f..b82c336b6ab7 100644
--- a/sys-devel/ucpp/ucpp-1.3.5.ebuild
+++ b/sys-devel/ucpp/ucpp-1.3.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://gitlab.com/scarabeusiv/${PN}/uploads/79f08e39c676f15ed8a59335f6
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 x86 ~amd64-linux"
 
 src_configure() {
 	econf \