gentoo resync : 02.09.2020

32 files changed, 88 insertions, 661 deletions

diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 95da1ed767f7..278082eb51d9 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/autoconf/Manifest b/sys-devel/autoconf/Manifest
index 138054a6d86c..9b1a0a274404 100644
--- a/sys-devel/autoconf/Manifest
+++ b/sys-devel/autoconf/Manifest
@@ -4,6 +4,7 @@ AUX autoconf-2.13-perl-5.26.patch 387 BLAKE2B 21152b0df23fc2567b52a0f1afb27c85cc
 AUX autoconf-2.13-test-fixes.patch 547 BLAKE2B aa7509f3098da8e2723f835133e375d63896ea65b3030037d625361fa01a02e7e982920cedcbfdf1679783fd7a6a8f0b8476e583749419fd8d103735c0b98d2d SHA512 085e7525c66e710b42dcb068c8aeda89488d1e926e493bcab74e1a1440f53f67630d6998a2a9eff6dc65cf8f71cad19127d541422b51a2519163b51ba78ae592
 AUX autoconf-2.61-darwin.patch 454 BLAKE2B c98084d8109ead961c446aecd38d150b244a83a62870e6820c10024085c023ebcbc75d2c388e170c3bdbd562e3a2b795271c52c02b3245ccc30195443d82d89b SHA512 7d11430a596cfa8624380fa21cfee4f4684a0144d4a4f93218656cedc0aeba2e7bf85dd52f7cdad3ef2a9aa4d5213c318b6cde8a33c09690ea4dddc7d8057101
 AUX autoconf-2.69-fix-libtool-test.patch 1093 BLAKE2B e7b98ae1c84d6d0a41daa16c71cab644328c850c77214dd15c99c2b1ae2ee040ef3d75d4dbe3301992bdb9ad2f2b48f4a6363b14e9f6765863e57f0047b83f86 SHA512 38506631fdde1f80a3467673e6fb48d4751323462c1657c85e2b5289e1219ef236ed9af3a66906c8851a62c244c1ffed70537a5f1421539429a9aa04e929d727
+AUX autoconf-2.69-make-tests-bash5-compatible.patch 2275 BLAKE2B 17fd9702c37cc7686a232e0bb93e5fc04d11b65945f89d79673302bec393bd5572a961b0ecedd743b3336f2583534063b6dd9b3095d0cc6bbd4cf55a58145c54 SHA512 f2672e99afb69cf625097ba5e6d15356eec5c41e095ff60da33331184ecd635d97fa20f20a2db8cfdeb96fde14dca0cdee7081df3328e8032f66eeed58374e36
 AUX autoconf-2.69-perl-5.26-2.patch 1003 BLAKE2B e2a858f905f20d46a52ac7d78be63ef0ea5ce0b87a7059ea17317bed3b658c0eafe3f9d8b1b11f4d84d3160bfa3f504e980870fe562d7a1ba6da1c70177e49bb SHA512 b02086ac8a468a626d8b6506aa14e19ef10e4d33b91a7647f74d5746cce9f690d6cf5840ea81c593f63e8f94275974f31c8695065844380678e83153c1b547d0
 AUX autoconf-2.69-perl-5.26.patch 820 BLAKE2B 405d92044f338b8c7f0ebc6b0007938143c011eff116a65dd06a126a9ab3b127ee766c618e0d51caf88821d979632e7949c843ebad1c5c9e87ad066aa4a46376 SHA512 0202c099b85102dab18ad7d4268b836cadf587d0a48aefa386e70539b3b689fd580053d7287730f1d0a9cc97d6eeb41c1579a181a82a5cb2e04e436bb96d0b20
 DIST autoconf-2.13.tar.gz 443844 BLAKE2B ade10f9d4a0b1a0e8b752eee817cfe100d77b074192b9892330402ddc5b62dda1a3485ce0c36e72191daa9fd49382b99851cb6aa3a13aca8cf2ae6e884638fb6 SHA512 602584f4c77b7a554aaa068eda5409b68eb0b3229e9c224bffb91c83c4314d25de15bd560a323626ff78f6df339c79e1ef8938c54b78ecadf4dc75c5241290ad
@@ -13,6 +14,6 @@ DIST autoconf-2.69.tar.xz 1214744 BLAKE2B 71d33d72a06e9a05fbed0eda73bc9d8a3805c7
 EBUILD autoconf-2.13-r1.ebuild 1539 BLAKE2B 30a8d2ddaba7e878177c86ef825d41122c7c99f24ab77169833e0172bc3c3fb6f9879c3ad48863c4c0a2f305a9ce304f072b1afd02d3c01fa1ee5585dd14cf8c SHA512 033383d86e1b2097992a79e9078a931557041af2ddc09f02a3f256343a40ba5dc5ef5380232d1c88b6f0716936cb599ecb789a9a3b9af5be8bdd713f1b9b4ff9
 EBUILD autoconf-2.64-r1.ebuild 647 BLAKE2B 7af4ebd9fe46e9808285a02471375d268d8fb2e24f00d60a9aec1c962c6bacea1ae8f256b9decf22ffda6470bd3a44f43a89bb05bc91c667abd10bdceb171ece SHA512 abf831a67e7d72816a69ee00735a47e624fb74739ef4b3e8b901f660e2aaa285c44a5950fd29c19b27bc455466a27a654fa8472c958649178644b75f86001a89
 EBUILD autoconf-2.69-r4.ebuild 1331 BLAKE2B bfc38c5419976a69f7c8e80c26656760dfd2305f3fe6c18571cd9367017b5d564d761e314171da186b0f9e1a02a72b3287269f52fd9bada941f064b2da8dbdfc SHA512 77ea183450866b03f924af1455fd499c95e7db55493d457234d28966cae1edbaf267bdabd019d11b7260bb071a1f067aaaf6c5175aad3625119988148a3f5020
-EBUILD autoconf-2.69-r5.ebuild 1805 BLAKE2B 006a2fdbb1de006d068a5d32e0fc7ad287e489b5403fb372a6bbcffc5504b6b344cf52c5c1e2283dfcec3b430c2a4db89c9347cb1685df94c1aea940e9ea8494 SHA512 1b6d01f3be4f96d015d7d566766538c48929007105ac160ad95a5fec7ec8d91fe5f258d91132de299484df3839a2f8e81d84aca4f7af3f696f00f21262348a9d
+EBUILD autoconf-2.69-r5.ebuild 1853 BLAKE2B 5fc97c9166859167f707c7bf91715513ecbb849006415eb22a65410147a6ae4668454fa286c2fe7966aca0a6c0ed3a4feda078189ebfc2c8aec0badfb6fae99c SHA512 403483fc7ca30fa2cc0abe35bf4d549b3c2fc3852899ad7f48c9f889f123288b4b3a74778f0b0e878b546d76def3ce166d75de1063bb8755f74f82ca5d4d134d
 EBUILD autoconf-9999.ebuild 1201 BLAKE2B 54056afab7ae1d33423957ee088defa5210313283b1287dadacd86291e8029b2337707c75bc28cadb9c33c5933ac94142684ffed93112fffff5e59aa045a1cc2 SHA512 5fda1ae65b6831eaffbcb1ad1f63bfd0cbb98aabafa0abc183038e394931d7feeeba98a5d9824a54ca937aa9f62f332b3b363970b7a239c4a81faa0a3a22fb0e
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/autoconf/autoconf-2.69-r5.ebuild b/sys-devel/autoconf/autoconf-2.69-r5.ebuild
index 7694eca770a3..6201e196ab53 100644
--- a/sys-devel/autoconf/autoconf-2.69-r5.ebuild
+++ b/sys-devel/autoconf/autoconf-2.69-r5.ebuild
@@ -10,7 +10,7 @@ else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 		ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz
 		https://dev.gentoo.org/~polynomial-c/dist/${P}-runstatedir_patches.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 inherit toolchain-autoconf
@@ -34,6 +34,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.69-perl-5.26.patch
 	"${FILESDIR}"/${P}-fix-libtool-test.patch
 	"${FILESDIR}"/${PN}-2.69-perl-5.26-2.patch
+	"${FILESDIR}"/${P}-make-tests-bash5-compatible.patch
 
 	"${WORKDIR}"/patches/${P}-runstatedir.patch
 	"${WORKDIR}"/patches/${P}-texinfo.patch
diff --git a/sys-devel/autoconf/files/autoconf-2.69-make-tests-bash5-compatible.patch b/sys-devel/autoconf/files/autoconf-2.69-make-tests-bash5-compatible.patch
new file mode 100644
index 000000000000..1afcec15bb4f
--- /dev/null
+++ b/sys-devel/autoconf/files/autoconf-2.69-make-tests-bash5-compatible.patch
@@ -0,0 +1,63 @@
+From 5b9db67786a428164abafe626ab11a2754aad528 Mon Sep 17 00:00:00 2001
+From: Ondrej Dubaj <odubaj@redhat.com>
+Date: Wed, 28 Aug 2019 07:39:50 +0200
+Subject: Port tests to Bash 5
+
+* tests/local.at (AT_CHECK_ENV, AT_CONFIG_CMP):
+Add BASH_ARGC, BASH_ARGV to list of variables to be ignored when
+comparing variable space dumps.
+(AT_CONFIG_CMP): Also ignore LINENO.
+* tests/m4sh.at: Also unset LINENO in 'reference' and 'test/test-1'.
+---
+ tests/local.at | 5 ++++-
+ tests/m4sh.at  | 4 ++--
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/tests/local.at b/tests/local.at
+index a22958c0..852be285 100644
+--- a/tests/local.at
++++ b/tests/local.at
+@@ -325,7 +325,7 @@ if test -f state-env.before && test -f state-env.after; then
+       [AWK|LEX|LEXLIB|LEX_OUTPUT_ROOT|LN_S|M4|MKDIR_P|RANLIB|SET_MAKE|YACC],
+       [GREP|[EF]GREP|SED],
+       [[_@]|.[*#?$].],
+-      [argv|ARGC|LINENO|OLDPWD|PIPESTATUS|RANDOM|SECONDS]))=' \
++      [argv|ARGC|LINENO|BASH_ARGC|BASH_ARGV|OLDPWD|PIPESTATUS|RANDOM|SECONDS]))=' \
+      $act_file ||
+        test $? -eq 1 || echo failed >&2
+     ) 2>stderr-$act_file |
+@@ -382,6 +382,9 @@ do
+ 	/'\'\\\$\''=/ d
+ 	/^argv=/ d
+ 	/^ARGC=/ d
++	/^BASH_ARGC=/ d
++	/^BASH_ARGV=/ d
++	/^LINENO=/ d
+ 	' $act_file >at_config_vars-$act_file
+ done
+ AT_CMP([at_config_vars-$1], [at_config_vars-$2])[]dnl
+diff --git a/tests/m4sh.at b/tests/m4sh.at
+index e9d70b02..cbdfcb62 100644
+--- a/tests/m4sh.at
++++ b/tests/m4sh.at
+@@ -254,7 +254,7 @@ AT_CHECK([autom4te -l m4sh $1.as -o $1])
+ # `_oline_', once processed and ran, produces our reference.
+ # We check that we find ourselves by looking at a string which is
+ # available only in the original script: `_oline_'.
+-AT_DATA_LINENO([reference], [false], [__OLINE__], [_oline__])
++AT_DATA_LINENO([reference], [true], [__OLINE__], [_oline__])
+ AT_CHECK([./reference], 0, [stdout])
+ 
+ # The reference:
+@@ -264,7 +264,7 @@ mv stdout expout
+ # Be sure to be out of the PATH.
+ AT_CHECK([mkdir test || exit 77])
+ 
+-AT_DATA_LINENO([test/test-1], [false], [__LINENO__], [LINENO])
++AT_DATA_LINENO([test/test-1], [true], [__LINENO__], [LINENO])
+ AT_CHECK([./test/test-1],                          0, [expout])
+ AT_CHECK([(PATH=test$PATH_SEPARATOR$PATH; export PATH; exec test-1)],
+ 						   0, [expout])
+-- 
+cgit v1.2.1
+
diff --git a/sys-devel/bison/Manifest b/sys-devel/bison/Manifest
index baa158529795..290fc45aaa8a 100644
--- a/sys-devel/bison/Manifest
+++ b/sys-devel/bison/Manifest
@@ -7,7 +7,7 @@ DIST bison-3.7.1-patches-01.tar.xz 11072 BLAKE2B e68dc42fdeebd9c530d04ba906fb49d
 DIST bison-3.7.1.tar.xz 2605940 BLAKE2B a00e8af6a74100154d2dad1597c901f8473dbdcc57826eff947878c3568bfc9070d92857b3b3e349302e9fcfd67eb3287e7a04f6fcff3b897a6fecf43c1cd03d SHA512 9c4097b6ff26e819be14a9d4ef39f6f259c04627cd305e11da8e67897a369b2bba5ce96bf19fa5f6088670e90a9c5bc5c45172f8f482252aeec546b285dd0797
 DIST bison-3.7.tar.xz 2601220 BLAKE2B 3ac140048baacebce47a9090e916815e6c30d9c8b0f9fe61a3724b46fbfddf5b8bf94be2bc533a718d84bdc8c73d579b5e43d576efd488a6f5b52424883bc5cf SHA512 f6c8f1522849b65046844bd51953b4f1e2c32818d8bca0b8e4a1035e72d6731d8a66bc307d4b20d1a576cac6cbe10aa1c66829112327f37938ace165e154ba6a
 EBUILD bison-3.1.ebuild 2482 BLAKE2B 2595a1242d213c2839fd7cf1d3a069b666d3915d1e86a4903ee35136be9018bc5d0a960c9e4c24927c9f0573d76802a764ab8da9157ab399dd000238d196760c SHA512 97f27e6390787b602ad7aad377e1d8313d58036e7b3f3acb141b009bd8327839e2cac72ae3231d8ffed5fbaeb66298c356834956c8ea5665d1b0e674751457db
-EBUILD bison-3.6.4.ebuild 2485 BLAKE2B 2fd4e6ec10fdb4aec732845757719480565aee09c296d9cf94f668c52c07ded7070a48f04402cd65adca39afc09b4802bf8c62b37acc931bbe9839431ad4a3b7 SHA512 794c962dc66aee982d18711cf26a0383b54e3008e312a7bb32668644eb226cda855e3274bcc7e4c113832accb09fc976a045db94033381d9100800fc8338bf91
-EBUILD bison-3.7.1.ebuild 2493 BLAKE2B 333fd6ca75bf1d1e6993377c2a992cf8dbd8207877072791c4cb30dde13e18b401b59ff2943bce343f9ce9a8d762c77fcba03ccb966a74a8277b4310b7b7247c SHA512 f195fd212b6bbefd993f44210bcf38872b119a28c622217afa611f4176c0bcefaf0a6bb9d75e018168bd3b7e1aacdc9754579fd218891f2422615313b3e415cc
+EBUILD bison-3.6.4.ebuild 2484 BLAKE2B bd124013721e70456fa448f2e005a704e046d6290ef7f1eb42e848771f8f2390edfa6195b5be882104e390d1339fbb0d7e4474e7f9b189ab3b5809d29d16451a SHA512 6342a604c9644fb06c75bca03da99946b7d6eb2d8d25a96bc0e57a7de22af839075db0f7eaf64fc631d30467ba26c852317ed5c83791ecdf41adfa1f9c7d1375
+EBUILD bison-3.7.1.ebuild 2485 BLAKE2B 40ccdcdc669627ac881ac7d2a0247b47d075f075ae21f10849b1b3f1043523a960c31ec06e3d627eb7b7e7291edc8b417611cf26a4fc01476fb767d10783be3d SHA512 8f9bc46aac9ad5725dd434addc68f2e5146e8f89c4bfaf06ba6ad5687482d3401279a49f4f2ac1c350ef598b4f8185fa90cf0263b7ccaa5ab3f78a88683f486e
 EBUILD bison-3.7.ebuild 2489 BLAKE2B dd3eb51c04ccaf6026ec7398276ae99554f1eca449b96e6c17c62f89de289575e8335c8ddde720aecbb99cf2aca5366bfffea7b5327ac906567776dafe92dabd SHA512 c51de07a7fb665f09b7c88b19753bd3fb1c451840993ab067da2e506339f1b4d51e3157c5de863e06decc7b803a9500892b741b9829d9d3dc01aef28ae67607b
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/bison/bison-3.6.4.ebuild b/sys-devel/bison/bison-3.6.4.ebuild
index f28fd98ad0a8..471513e39d76 100644
--- a/sys-devel/bison/bison-3.6.4.ebuild
+++ b/sys-devel/bison/bison-3.6.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples nls static test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/bison/bison-3.7.1.ebuild b/sys-devel/bison/bison-3.7.1.ebuild
index 9628b05b123a..cb5ef2103848 100644
--- a/sys-devel/bison/bison-3.7.1.ebuild
+++ b/sys-devel/bison/bison-3.7.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples nls static test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index cd1e05a3a9b0..7d9b829fe65f 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -1,6 +1,6 @@
 DIST gcc-config-2.3.1.tar.xz 17368 BLAKE2B 59c77938b24cbbb548ef2f9e68be0de8c651f6beca74cf4e6007338f6217fa6e207c020f9a5e1c05c6abae24b9628fd193d0aeaaea28c6a1aac51e48b0145118 SHA512 7d7cdcd1aaaadb32e95227f61166b4390476d080e90387a167f031ef5c2c88dd3c785297946435500e39ed9bc31c0b5369cdacf1a12e75cd1786ba30bf7e407a
 DIST gcc-config-2.3.tar.xz 16736 BLAKE2B e8c22348d73ec756ebe377c3f9b0aca8e22b7ef53507bfa4dc0fbd459bca38ba6bea9dbb290b4d83239c21c913d12f8262a263e1c078a3997558a0b14fdf355d SHA512 4ce1e46bee6b2182c664746d939a7d843d5b4323c860ea3ee24e36aa629e65f3aa99da99905d4a7091ad0a3a37c14a6a56a0f79c76d6bc93fa0dad39552f221d
-EBUILD gcc-config-2.3.1.ebuild 1465 BLAKE2B 24902450f20d7246bfbbea7b3a4bca4e5983065df853d26e54768900f4f9e99c0aa32db25839d14436028ec643d42a769118478070f2846e11876313f89fc00b SHA512 c4a86c9f10b53b978a5282121d75999db0b9452dc2c7e546dabddb725f327d20f5ae6058c18fa6d26182158b99cbdf9fef76d7c154615f90f1eee99ee7ccd271
+EBUILD gcc-config-2.3.1.ebuild 1464 BLAKE2B e704335a980118a56839939d708b47b221b8919dd0baec30e1947114175cc716c3f674d7596f95246bec6a2498535054cd679e42993a9728150cc6d540e6f640 SHA512 2b94dac6455cadd9a9f502d9dc86df0ef9d13c03b5fa57668a5f8bf4fdfc904460df8ddfff42ba6614386ff088c20fe06ecdcb2c655632a21a487940fa2ec390
 EBUILD gcc-config-2.3.ebuild 1468 BLAKE2B 8e21f53264dd75d7a419e940457565a9243265115f56538512f8deeea2b14cf4a703ac5d22ce69d41c7d1d5d1bed5311dc3a0057cdc8fd1f7c96c82b3cf60435 SHA512 5c9bc2b111f1a0eadb1605021291ef0b3bc266102502ca42a823befa687f1f37a7b2b70d0316b058c9036e2df4a6b70748744a6e0cd76bde13c2f3ef94f228a5
 EBUILD gcc-config-9999.ebuild 1527 BLAKE2B 9d1206cbf2823cfce941012aed05e30b7a782c241039d10589a20c5cd3db454fc73ea16f788994f95ad07d8b3877fc41b9e9a5ffb55a0a1f39bcaaabbd69540c SHA512 3145defe6cefa8757b10408b11fab862e3be943accdb7bc0871c33bf39ff71cea92e15e60c75f36a2c75199f7bbab612790ac3f79decc4db2498729876ef112b
 MISC metadata.xml 532 BLAKE2B f2ce0b655376a7a6a31520f557917b4a6e2036ceec6726d869f795b6fff0a97fa27b7e13b7a41b6ea1b83ff67b9e3ef4ea12c0a8058911007da92f986c0f8265 SHA512 f2dc77e3d2301f3fadc24ceba33894ee8fd07831496b04e3513369906e101c155c7cb10cf81a4a08628514db5758368a64b0b4eb37c41f7f8fe4942f90b11935
diff --git a/sys-devel/gcc-config/gcc-config-2.3.1.ebuild b/sys-devel/gcc-config/gcc-config-2.3.1.ebuild
index e422852cc7cc..c3b7e7c683c4 100644
--- a/sys-devel/gcc-config/gcc-config-2.3.1.ebuild
+++ b/sys-devel/gcc-config/gcc-config-2.3.1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
-	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"
 fi
 
 DESCRIPTION="Utility to manage compilers"
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 410c7957df50..22424368d907 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -14,7 +14,7 @@ DIST ecj-4.5.jar 1470676 BLAKE2B 793c10ba09fd8040c0e1181204141aea16780c9c9088e07
 DIST gcc-10.2.0-patches-1.tar.bz2 14865 BLAKE2B 055ceac96a308081f395f12a970d6f5264d5dfac6defabb6baefafd6d584c03f2f968e0720448af5b6955e209c5d2220bc45854088347d7b438de9d716072804 SHA512 3583f51b2b80e1dab5ebda174c83054375a0c6601c6fca54a6991bbbbe5f335e30ee846fae57c0096ce28b23715fbfee8b560727c77cac263e83f44f03c6eda4
 DIST gcc-10.2.0-patches-2.tar.bz2 17701 BLAKE2B bed0cf2dcb6b2e35dbd86c43db617cfa0a0973b3d55bd6e12baf9e6495afd0fec855fefd223172c23f11449769996c18359abacfac36f62681310c861d5d2850 SHA512 6ebf5875ecc9f10dea67d4793fcc47178ddd6abe8959fc0390c6ff967fba7318013b4bf251abf451999b86697e97390c8698685b12086956c8e6bc2e97708bc9
 DIST gcc-10.2.0.tar.xz 75004144 BLAKE2B 1d79397330354e61439283cac96a109bf78ffc726265442e6d3ec131f107589ab7349d6612836edd8c8512f7bcc1d901a65a0d5d925d28a5bf3ef5cc3f9787ee SHA512 42ae38928bd2e8183af445da34220964eb690b675b1892bbeb7cd5bb62be499011ec9a93397dba5e2fb681afadfc6f2767d03b9035b44ba9be807187ae6dc65e
-DIST gcc-11.0.0-patches-3.tar.bz2 13329 BLAKE2B 2572605b14221412805d6a5b5e7d237eb2d547afbac0b8590d599b14042151d987d56bc1c702f38b9f05d38e3c08b7e842b6b154c5cfa378a423ff7998ff10d3 SHA512 4cf5168368f56a723c9d24c17ffb9931bbbce4fad04671705f3fdd3bc85a21447a7ead06d6ab32f2d27ad1733507f52d92e9ee5a1d8fa8a23e89e1457aea4226
+DIST gcc-11.0.0-patches-4.tar.bz2 12829 BLAKE2B d0e12c09268e096390c3841e466e35bcd66a735536287c80d9713335a65a82c55ade728b487ed549ba1bfa60c9dd95bcad5ae27a86619f2a7c3236fdf457b41b SHA512 010b90b63ac142efeabc1c51287727f472a469a7a25e0576f5bdc380206cf500ae78060da3e97fa46c3fa7288e6cb1b4a2b7b78d7c8704b6db05a23be902e649
 DIST gcc-4.4.3-specs-0.2.0.tar.bz2 2004 BLAKE2B 96f5ba2028bc6e0ef71e009857c37118a54d13d30de24d697c85e5772f9f2b7853615648cf2e4ee81d8385f6518c64588c0b56675c00f95ef39fca2a808f075e SHA512 779ecb0a064d2138b54569c8ae501975b8a6b72e5a3acbf8597619a8db77ee42ef9b0e62608d5192a15e4393e7dfc009bb50b994782236faa744b2c46b5fe517
 DIST gcc-4.9.4-patches-3.tar.bz2 27908 BLAKE2B d3dd297df864e2240e4b80b8c81266ae9a6c3acf97111a2a682c5e12df99719c57810f677ae9e8a6177c685aada7cc4cf48a2b493f3202a37cd3f36e96e3319c SHA512 8f2058b7effa8bbf5cbafd474a045763274d9cd70a381f3b163e06c3db7495a458565a94f63e8afe7640006986e787bdfcf2b36d1e3c8f4364969aaf6bc5eff3
 DIST gcc-4.9.4-piepatches-v2.tar.bz2 14237 BLAKE2B 60afc2b8f78838a5f444819401d79a3a48ad0ee2ddd09bf32da1b06dcc6f933be61951f7c6b53d8224319a5d42c6b79b299bc06930eea1ca31301a1bb0b88513 SHA512 fdca8ccc81bed856c4a2e0da7a8cf897ca9765f9b448595bbf0d5a93702d91cbf937b560ebff96e3cd820b7747dc60a6a490d78adbacca751ecc7351ada2c56d
@@ -36,11 +36,11 @@ DIST gcc-9.3.0.tar.xz 70533868 BLAKE2B 21efb1432aefad5ed9b9b395e88ef2adfda3a8ea6
 EBUILD gcc-10.2.0-r1.ebuild 290 BLAKE2B ad03863f65f96bfe59e86e10189ae666155341d4947d5043277d21c0021f1a879144b409e02ba7828f666dbe350612217298da45143ad1860ed4ef04e06645c9 SHA512 8c4561450bf7c416df2fcd0844c2e28b28172a948c2327c7680b6c5968d113dbb09a30be6e20168a3411140b2124e247f4ad22a5996668fb1098322fab3a2309
 EBUILD gcc-10.2.0.ebuild 290 BLAKE2B 02d5ac3a657382fa7a1146e5d504ddd4d3ab4caf55f6e4f114a3e5bae01a41055e8ee7421a7aaa241ceff332fafa44c1bebc5bfc77960ea27f204b4b9c467e18 SHA512 e95b6d2bfb0f1297c7bc2a7f2b2cc36a638b60f2aa66dbcd499d86d2e9c9e4e85e4927fadde94a80cc7cc4a1874bf03d4dc6fd2f770953d9cca2ad25afdcdaa5
 EBUILD gcc-10.2.1_pre9999.ebuild 405 BLAKE2B beae0b515345d9a5f9f8a54883b3bb9d218d2a17a706b06e651cb30ca1566fb429990deeec9a6e2dda91f9541306bb1c83e1b79316f0239715e0a244b3a3f3bf SHA512 cf28791a46432be4f633316d75aad68dcf130ab84a0c163bf538dcb698ccfbf852df87cb222e1f7db7902a1f2d9292312e536fc733f7b042182ee413fe52479b
-EBUILD gcc-11.0.0_pre9999.ebuild 367 BLAKE2B ea191a89a56082a98442ca6bf3de6b0517361c16614745e8731dedebea77fa1745a45728f69f491bd5eefc0ebc9743750d3455c6f9cd0a55f8c5dc618d33bc7d SHA512 3e0155eb9579c37299ed77bc045dfd2f1a91a38c7c02de5e2d0c821e430489396611cddb80bce7fa8310b01a72e727d23d316018af2c5576d002a81018f6b5f9
+EBUILD gcc-11.0.0_pre9999.ebuild 367 BLAKE2B afbad9255cf896f9015b8d6a0e21abf50e51c6f3ae636be1436f9908ec3517ed91ea0afd0d7ca85b032374f8260eee358120a63a8fe5be4c8ceb2a7bb50b50f0 SHA512 5c5d38a3b6312f1a7fd946580438c223a991e514f2b7be020f1f61234dc9921deb5de1a75db201ae2ad103aabf0d34a9c1431f2abfcfd0964f13f0a252a91f1c
 EBUILD gcc-4.9.4-r1.ebuild 1438 BLAKE2B 0cd42c3a15b80146943fedbee5cccb05ae3832b53fe674a43c85a7f87fca6c1ebaa7097687281dafe2dad993da78ef5c1bfc6e3176559031ac9ac9ffae0fc7f7 SHA512 0ae3fdba2aa7f2525c28c4b2a2dcd7db973b3efde3e8467f24515739c36dcc858cd95cded2e3bdecee92e87ba5f06ac1405613c67bca7cf9be19caec2531c136
 EBUILD gcc-5.5.0.ebuild 1253 BLAKE2B 977028492445b2a30a9c2477cef241ec5fd08fc0b7334d5b0f16d8ca8aaf90288bc336c5961760477ddca362db423b5d7481380c8b62ce068cc6c6d34aa1a642 SHA512 acfb8e42fe2748a30ef96d9a11785c266361d37a5348601f627ca4e942a98f3b797eebc92aca430352aa9d9f3cd65b208d5e8a8c0dc91e2471462638ad69e351
 EBUILD gcc-6.5.0-r2.ebuild 436 BLAKE2B f340e099406e6325e3ace5d179b01f1972acab4482be0af46017d1e55f5fd2a7bf1b8f7e7c7b493084bfbe4fd9c889d51f85d2ddd379f481181e9f645b4eebe7 SHA512 d5c9af31f338affd52e90651d2119bcc9f142d3699f83c5b14b095c8e05b9a1ffcb9d60f464567dee581ca26cf692bd0a611046e93ace8d85676ede02d9166c2
-EBUILD gcc-6.5.0-r3.ebuild 440 BLAKE2B 44856f0eee55921a65648bf49af7a3202ea0ae1bbc6ad21c583d0b4b44e9460d1efbc9c6a6a1cc0acfda618ffae2a27440019423cd5e67b105fee525fcef25e7 SHA512 16b1dda9439db496dc155aeb5304a686ee8696ba89c7b870bb8dc9eb6b26e540590d40915ee38040464226f1c8a599054580c9f33c941e7f597da301b95ab9a9
+EBUILD gcc-6.5.0-r3.ebuild 439 BLAKE2B 4c2b8283b6bd0b7104d1be4e11d65a5986e451c9d1f532001532b84538670e48b81f035e3af26e4333e071195ed66476a53439e20470971bef38739a8a7fd385 SHA512 c4b54e30604002d43e1369017fb592aae2668b3bc5b03a1390bb91e59fcc118a3b50f13bfa9f47e50a8ba85109eb2e90a00f652623733633c2d29a393eddd5eb
 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-9.3.0-r1.ebuild 443 BLAKE2B 0f43c582049ee55a5627d2a05e6dec513b4078d57e322fcadcc917056e840db4bd58dab264f068135569c0f06baf75e95d43302e89b2caf4bf4dac420e052872 SHA512 4efda3a2cbf371a688bfecb74369e7215dec1d5e8b72612f13a50644a884e738842f8ea25aa6800931c39bf0571c8f494972f413cc187b967f9b7a533a4237ad
diff --git a/sys-devel/gcc/gcc-11.0.0_pre9999.ebuild b/sys-devel/gcc/gcc-11.0.0_pre9999.ebuild
index f0fcb70cbab5..d3af1f28e50b 100644
--- a/sys-devel/gcc/gcc-11.0.0_pre9999.ebuild
+++ b/sys-devel/gcc/gcc-11.0.0_pre9999.ebuild
@@ -4,7 +4,7 @@
 EAPI="7"
 
 PATCH_GCC_VER="11.0.0"
-PATCH_VER="3"
+PATCH_VER="4"
 
 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 7d09b9ebd508..6ba0552a039f 100644
--- a/sys-devel/gcc/gcc-6.5.0-r3.ebuild
+++ b/sys-devel/gcc/gcc-6.5.0-r3.ebuild
@@ -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/gdb/Manifest b/sys-devel/gdb/Manifest
index a042e0c5315d..48daed5bdc8b 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -4,6 +4,6 @@ AUX gdb-9.2-sim-ppc-fno-common.patch 2581 BLAKE2B 56115a341ffefada00997bdba890dc
 DIST gdb-9.1.tar.xz 20980824 BLAKE2B b84b1dc627d7ba697dfd76ba7c0f4f88f1725e1e1b83134d08cf53bf867ebfa07e1d01eff2acd9a57d22a779077bf6ed95d6098e8a58c4d86eaed034ca62ac30 SHA512 84cdd408d80a3fc5779de459c5b26154d31b329ebde7e3aa78799fb1eb245d8b64b8c8ee7242382a1dbd95b4e6f9d84fef41d12a0646aa75d3dee4709ea1f6e7
 DIST gdb-9.2.tar.xz 20979436 BLAKE2B e83468f2d2fdcf4a7eb2943564750c7e9e9fa19b00bd832a9c149ad06b199cc7d6e7b8808d552e5f0e9e4f701a9262faf6b0b46ed4e0b4ecd3a0303d873d6d9a SHA512 73635f00f343117aa5e2436f1e1597099e2bfb31ef7bb162b273fa1ea282c3fa9b0f52762e70bfc7ad0334addb8d159e9ac7cbe5998ca4f755ea8cf90714d274
 EBUILD gdb-9.1.ebuild 7426 BLAKE2B 3e945db45755c81c0827b5ba88cd50a973a1b31b2fe1002c6952456305b23e74cf15b5883c66bad0b0dbe5a391cf339d5360a499783fece47a9a40d0b9b3149b SHA512 363f56c0cbcf235005ecfbe46c269bee068d99b75679c92d40e7608c631f0a51eedfd4163f865aae85749b9f994ca166535e711a5d5c7433b491091c6a3263ba
-EBUILD gdb-9.2.ebuild 7477 BLAKE2B 4d3d9eed05c70aec054fec73716d36c6b819cc6e90f45a9c537ec20f49adf37cf38bbe8f510c5b8b279c8350cb8d078c1a296ae41475f917d518ffbf1468f4ac SHA512 ec5405abba89586ddccbab8e7f8215fbb7a2e15968be03d0340fe66368c35fa900c5eb326728ef2ebe9d3469a77f5c70ef32b24f1dec54bda29f80e210e86111
+EBUILD gdb-9.2.ebuild 7476 BLAKE2B 7337ee3869be81b8e6f056080e5176a7a3556a7a7fe7991750e44c2106aa5c7fe919ba6bd967e0227412cda0813b6fb058fd24ed9fb87172b483396ea0d14bd2 SHA512 e16584e97ea10780177175179c12dcb1ad0551cb91a5e63a98524214fc0fbab43e3d95e01fefc41538202ebfdb6fe8c922f51cb0266fad360724201412701b61
 EBUILD gdb-9999.ebuild 7056 BLAKE2B 578a651d684da6f98fd6c0515863c1b90a4c32be826ed469490af1fb4d6b09f43d0a85bbc0bfe9b772e322bcf3598749c6b454d1868a3a6c02c30496995f9f39 SHA512 20277a9dfbf22c6fddf71924098fdb81eeb631bd574b33e674279dc1b13c66476b7cb63d552545a87ab7888473938684adf7ad200346244ba6aee5270bc1cf64
 MISC metadata.xml 1110 BLAKE2B 9958c755c2276b00b47550593e37bda9cdd5050834650654e796b9aca622fd4e7b094e80e2648b622fdb46943d3dca00208f11e1ea0c9bfdb32ad891b9acaad1 SHA512 f58a0166980a8ef71d36872736afc8f86ded7f731864cc3d302e84818c3afc01eca49748e4533bc305c2d3d73521a008260097b9533dd3392a451528f3794a0d
diff --git a/sys-devel/gdb/gdb-9.2.ebuild b/sys-devel/gdb/gdb-9.2.ebuild
index cc5393a18132..801765366beb 100644
--- a/sys-devel/gdb/gdb-9.2.ebuild
+++ b/sys-devel/gdb/gdb-9.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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 IUSE="+client 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 f3abe22e2f10..6d7d337b699d 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -7,5 +7,5 @@ DIST gettext-0.20.2.tar.gz 23717789 BLAKE2B f0db5eacc93501020f31d80e4b11df708d5c
 DIST gettext-0.21.tar.gz 24181849 BLAKE2B 2eae99d0916b00b2af6fbc6bf7e309076519a10fea16cd49e7aa29fe8aec1ee7c784c6277281b764dc4abacf400cd3fe461129586303c8cd337db15c76cb4b87 SHA512 bbe590c5dd3580c75bf30ff768da99a88eb8d466ec1ac9eea20be4cab4357ecf72448e6b81b47425e39d50fa6320ba426632914d7898dfebb4f159abc39c31d1
 EBUILD gettext-0.20.1.ebuild 4051 BLAKE2B 7cf8fff49475516e43f9e20e7338f9097fa78bf9814940ec61077af84d7410d38a68d7ca5e5abf665ac5bd9d80e87644209ff3f83cd55c3086799ae78cf848e5 SHA512 6750748e84cc0c8fb6f795083c8df9574957e688646227671928417d0eca990949a5a0c85a4f54867a8829082bea8c3918bf5c571da4d49774e2226cfa5aab86
 EBUILD gettext-0.20.2.ebuild 4055 BLAKE2B a0a734470025aa2672bb1d5e2512a9840de6f2ec6810218084dc9ffdd189f344dfe704540e12f3963077d1405b4a7bba95de90bd77f95af078118b2148187006 SHA512 b8f0e7f37f3504df76ca7d74a1adce503bd0e3f05a36b1087a623932392deb62325bb7b5838869182146f8b8fb3431f0ded741eb2012d2d11abab3957d1fa60b
-EBUILD gettext-0.21.ebuild 4184 BLAKE2B e26e4dcff3b20b349fa8d4d93be9eca758a3af6e721a8955816010793f051444d9d68ed1a232e15434f8fa6c78e26d34f396c2c633b02451f5b70e348443fe84 SHA512 cfa31d901b80dd375836ee010290e668874d62cb14faf7c42f1659a5983367384066873f23da3695454edb3d3d60f23885163e339df903f4285597da4fdcfd14
+EBUILD gettext-0.21.ebuild 4176 BLAKE2B b01a8b40b16e6ca158ab88761f36719fcdbaa12e853e6bf33e00282b89cbc1f50e5b6c2edbeee218a93d4e38a360c024702d5b89945cca9fa3dc979161fbdb85 SHA512 9f36ecef81aff935cf1c66ea5d5b85c898493932db45d8d59f0bbcf3c88b80a94ea5749a8cf6a497f463a0650bf16be228d45f504418b2ae48a6efd8dbfadf66
 MISC metadata.xml 707 BLAKE2B e0f7534d0a90939db1d5b7d0b837d9c0c4ba7cc17ece9dc90e7832580fe62a53ed306a77f86c3205bb96aa46d40834b03143d81076c531eabfc92da82d41e880 SHA512 1951f0165d110a484ed68f774106d6f76f5cad612eb74e0386e8ecbb4e71627668daeda48a779ee6b5daab8b2617145e50ecdb0429c34879278ca14868d40d28
diff --git a/sys-devel/gettext/gettext-0.21.ebuild b/sys-devel/gettext/gettext-0.21.ebuild
index 5904f3a059c7..07122723a586 100644
--- a/sys-devel/gettext/gettext-0.21.ebuild
+++ b/sys-devel/gettext/gettext-0.21.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == *_rc* ]] ; then
 	S="${WORKDIR}/${P/_/-}"
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-	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"
 fi
 # Only libasprintf is under the LGPL (and libintl is in a sep package),
 # so put that license behind USE=cxx.
diff --git a/sys-devel/gnuconfig/Manifest b/sys-devel/gnuconfig/Manifest
index df6c107e8d26..aa3c626c7958 100644
--- a/sys-devel/gnuconfig/Manifest
+++ b/sys-devel/gnuconfig/Manifest
@@ -1,7 +1,7 @@
 AUX 99999999/0001-add-ps2-targets-to-config.sub.patch 1736 BLAKE2B 291ba73c850f1a53cbb0f64da20447d6c9adb9652d994d50eb2052b385253b8d4083277f5b5aa70f9fba75aadc517755d7ef0c880d62cbb87032bae84d9760f7 SHA512 851d52019749cc8fe2c34a53326cd68acae2269274e283a96a4a90b0e630552c8f13b8199f74a8b26c62afabee7631eeed5f56381a84ec99980d59f443270b28
 DIST gnuconfig-20190912.tar.bz2 58742 BLAKE2B 2d5eba2d966d8b6bb18ba9340031c3f3b96fddad7cb156103620bc8fff3d4824b3acf63e0f9046f389cbd9ce2b88348bdddd123134ca910ce18641001943e9e7 SHA512 346ab0e8938052b66b733b0251c5e1cb8d7a61e89630cebcf0039295c5a3652db0798e62b3ec44743c0ccee72d75270dc82fec43e97912c140ac0267a81f6115
 DIST gnuconfig-20200621.tar.bz2 58729 BLAKE2B 8be2ff224620d0d93f676951ec8dcc7a4f1bfdfcb83e2e07371aa6fdf2f08a8d0e8503aecdd55954a0246f0d4119f31b24d60d461500db07757b061c89914df4 SHA512 25778100cb6b47a4ffa8a1875d3109a8b304bf3984549b53e2cbc1e31222aa9614ce01d34451cf6545af62b843378ab217d3396535ed4389ff3e8a7ddaa948ff
-EBUILD gnuconfig-20190912.ebuild 1523 BLAKE2B 9c554949eeb12824973093297ef62487a86b01dc221d758885a26d7d1d27b5d7e1f0f67bd98f870bd37fae2ec2a9edae408a689d0068da1edd5d0b11e202c8bf SHA512 1dfe87e69b584f5747732c4915e5c620b9082ba492bc0b306ba3ccc21ae603ce29ccb9e45192da015bb1f419ee247391ddb11b7025b590192010014956ced37c
-EBUILD gnuconfig-20200621.ebuild 1523 BLAKE2B 9c554949eeb12824973093297ef62487a86b01dc221d758885a26d7d1d27b5d7e1f0f67bd98f870bd37fae2ec2a9edae408a689d0068da1edd5d0b11e202c8bf SHA512 1dfe87e69b584f5747732c4915e5c620b9082ba492bc0b306ba3ccc21ae603ce29ccb9e45192da015bb1f419ee247391ddb11b7025b590192010014956ced37c
-EBUILD gnuconfig-99999999.ebuild 1532 BLAKE2B 6f8a2082af26b31813412daf18e78edcc64aa185f2b9deb19a5906bf256d33a1df8a92d478da45a7129423e09b9023fe18171aa048beb20b876b5c9fd974f9e2 SHA512 d6e48365fad60eb251a84c799edb780160e5257ec74b59d3ac6893ce3469f65ad9934d2618f9f59f017d2ba2345531e95f8d6bcc60e974e1de627828eca1414a
+EBUILD gnuconfig-20190912.ebuild 1548 BLAKE2B b44a18c7db697ac543a22a053f88795f7878197e7423fe7bd87f5251fb809adbb286ffd327bb80c31bc53e31d84c3b26fc538127b5e18beafbb2acee599c5b0e SHA512 201c163870303f9f69e36deb4cfa02245de71967db9dbb133b1e1896b79ba577735f33ba0cbde7de2521d0494ca9b180ea43d894accab4de62a37adde59a1eb4
+EBUILD gnuconfig-20200621.ebuild 1548 BLAKE2B b44a18c7db697ac543a22a053f88795f7878197e7423fe7bd87f5251fb809adbb286ffd327bb80c31bc53e31d84c3b26fc538127b5e18beafbb2acee599c5b0e SHA512 201c163870303f9f69e36deb4cfa02245de71967db9dbb133b1e1896b79ba577735f33ba0cbde7de2521d0494ca9b180ea43d894accab4de62a37adde59a1eb4
+EBUILD gnuconfig-99999999.ebuild 1557 BLAKE2B 82a3eaa40598939e87696d0d0f9fb093a503a510fe881a3c5ad02048f65abb10c8c635338da13bd1b6b73e3f27c3ee8807eb5440b93d10021c92ee1026d15674 SHA512 efe9a929a2b8600fd4f3a64cf3e49d82de304571fdda88265bfcca1461a8ae4c00af145848927539c899b1e4920b5ff1b50e05f03fa3522f149b9c6ce95bcce1
 MISC metadata.xml 415 BLAKE2B a819e3e381dc4030a05b96cb0cad5891b077180eed79ef29eba0b6809ac266e6f5f4f8aee0cd466b4e49ea273d106cdebf13853f52231cf31caac302a0de8ba3 SHA512 3e0196be1298b2ca2d65e8931caf9d8b9a28e38f0e0f27155d2e62d00c1c741032d34094e641438b6ffd69930263a530cafcf8c258bdca5cd7177e9e9f773569
diff --git a/sys-devel/gnuconfig/gnuconfig-20190912.ebuild b/sys-devel/gnuconfig/gnuconfig-20190912.ebuild
index d5bd2d2d2447..5f08bb075907 100644
--- a/sys-devel/gnuconfig/gnuconfig-20190912.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-20190912.ebuild
@@ -16,7 +16,7 @@ fi
 DESCRIPTION="Updated config.sub and config.guess file from GNU"
 HOMEPAGE="https://savannah.gnu.org/projects/config"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3+-with-autoconf-exception"
 SLOT="0"
 IUSE=""
 
diff --git a/sys-devel/gnuconfig/gnuconfig-20200621.ebuild b/sys-devel/gnuconfig/gnuconfig-20200621.ebuild
index d5bd2d2d2447..5f08bb075907 100644
--- a/sys-devel/gnuconfig/gnuconfig-20200621.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-20200621.ebuild
@@ -16,7 +16,7 @@ fi
 DESCRIPTION="Updated config.sub and config.guess file from GNU"
 HOMEPAGE="https://savannah.gnu.org/projects/config"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3+-with-autoconf-exception"
 SLOT="0"
 IUSE=""
 
diff --git a/sys-devel/gnuconfig/gnuconfig-99999999.ebuild b/sys-devel/gnuconfig/gnuconfig-99999999.ebuild
index 7eb2a8392c5e..ad59ded956e1 100644
--- a/sys-devel/gnuconfig/gnuconfig-99999999.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-99999999.ebuild
@@ -16,7 +16,7 @@ fi
 DESCRIPTION="Updated config.sub and config.guess file from GNU"
 HOMEPAGE="https://savannah.gnu.org/projects/config"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3+-with-autoconf-exception"
 SLOT="0"
 IUSE=""
 
diff --git a/sys-devel/llvm-roc/Manifest b/sys-devel/llvm-roc/Manifest
index 31e52423cca3..8a7f80f8b551 100644
--- a/sys-devel/llvm-roc/Manifest
+++ b/sys-devel/llvm-roc/Manifest
@@ -1,36 +1,4 @@
 AUX llvm-roc-3.0.0-add_libraries.patch 648 BLAKE2B a201718b8afdc1ba18ae5d7e85a73fde7ca2bb163eecabab33d37c5815ac6ab8c4f8d960ab40f95ad6df95da626a439fbda1d20c25abb9558a37bcdf64a77e64 SHA512 7a1892c8781146830aa5bf69db20bbe7329634f469aeef0946232b15138b55d332491092ed00a4cf698033f19d8f279f4a5b34f13168d5b9ff7eba4a229e82a0
-DIST clang-roc-2.10.0.tar.gz 19416958 BLAKE2B 2754326c21a7ddd77fc1b5fdd8cee9a16c226d6b23d0b14afc62e71d04b053bff94ab4326b13f837ce00267f889c1ba2f25daf036b12742af6b18fe7474398e0 SHA512 bbaad89d95f2fe261ffa4ff2941357dcd4954b111cec9a303a441295257d4090f69091ea5c31d4b605df500edd59bb058931b11b5a95a2af4fa2d48f18ea9ab4
-DIST clang-roc-2.6.0.tar.gz 18831605 BLAKE2B c54b811afc57d42b32e6c38ef219eb8a1bdba47f2a58505249bf5057708c6873b28387c1fa05a8a6c1bfb02cb71b4ca96e69a72d9f0cc03bb393fa1033d86a41 SHA512 41a3595961eb4b57ac8b2d7483f53628ffe5f064a40a7331fbfa1daad2f1491e1062a1189a15a00586341fdeb73978db67c058a23e00982d32b987cc41a63b43
-DIST clang-roc-2.7.0.tar.gz 19030674 BLAKE2B 10c1a3982382edd3515d1dc342d352af3ef0807c92ec2e51740c5e7053df56acc9c467a3e1efc587df4d17852d3e1a9f0d183a5bede54339c2a67ff894b106a2 SHA512 c32b716ef0ef7c8b775b8d1cc65bb4d1b2c9daf9da7dc6a587affa303411923fe955aa6d4355a5ed0adb2d347eb333cf009d02384b00dd4e329008f9a1ffd249
-DIST clang-roc-2.8.0.tar.gz 19169198 BLAKE2B 94056fc7cf0ee07f921b9f92bea2844409d4ebd5b6069320dc465ee626695f3bbdf5a7194ba562df8f1c69e2c95461eb6047a6d28e57f881bcaef4cde7a95eed SHA512 b8b7d2172d075298c44f238b26231b5744a9d303115e791f24eb273b719df54673e76dbafe596623d60d8a72a7d4b0f5ca7167f061c7e235f0ceb4b7e18bfb95
-DIST clang-roc-2.9.0.tar.gz 19168986 BLAKE2B 2a5a70d54ac468d979b5593dcff3e7d06376c7e56c20beff1c27c807057133d7de60908d404ebccc535a26eebccb3e95998b65e5ab08231b5b14f64e4a6c702d SHA512 b8220562a9f691293660c0e4c12073ba7e40a653b27ab8ab12bddda009e83a761fb3b911578c8955a8467d4647fd3b1e92c841f3efd412a1f06fd1746f045057
-DIST lld-roc-ocl-2.10.0.tar.gz 1574406 BLAKE2B dbd74ee19c51fbe4ed627fd13bb838c8772c549ea5dcb76a95d16a118ee174b903a162163f53a5c8c40ae4a590b3e93898e0f25fceb6470e484538cffc39128a SHA512 6b25cec6428f6c660777da389ce07589c268aa7126ca933ce130bae837801371932bf1e9f72528d1b81059631c5c3bdab1ac64b87db3d0471ef0b1cd45f2736a
-DIST lld-roc-ocl-2.6.0.tar.gz 1508227 BLAKE2B 39182669e38ec21cdd30f180981631abfa55c1ddc9f923e44f251a12e27da55409d7dfebd454b2706c88ebc0259455020fbe5db8d3543a353810bacde2396104 SHA512 19f300760be83c165a03ff2d48b014b3bcb3f7703c9430c3146b964e23ae30ea07ff579402bdce613e995004b063bced7329719e801c585e6e885b0ab473ce8a
-DIST lld-roc-ocl-2.7.0.tar.gz 1533671 BLAKE2B 089cfbc3b68bd6192d6672b60fdb499dd117beb2f407c3af0e979dd9a84203212a19b30c43ae3e495abba8c36f4c3f556af72464a75291484231d418bc7a2897 SHA512 ad880efcfc08f767fb86614d826b58ed575fdf173d7b809d31ea84a9abfd12f7f60da719b5ecb8461b792693d9c3d6cbfefe902f2d2e34d062c88d1b3b7d6c79
-DIST lld-roc-ocl-2.8.0.tar.gz 1542424 BLAKE2B 3c7e11c6de2a6915a975a9e370380e0812f1dd02230ce1c3035c4664e6a6bb8093c2ddc2c6878c75761060ee1e7d4e1f6f11c09a496482132352d4e4304ad1f5 SHA512 6f4a7b9786ff76bb054446d09835611927ce366d1d0e6bd037b3b373afaba2e26e743c1f6a99234474fcbe97fa1c5f5379fe887a5b0ce5b346ebd96ccd1d732a
-DIST lld-roc-ocl-2.9.0.tar.gz 1542469 BLAKE2B 15305d93e992381f82c30602d96ea356c215b420ae3ed690b6581d6139af3b5e507ee7a223b1bdee29ca78e09b57bbe0bb43b50ca94268cc8ab0e0f1832706d7 SHA512 b324adb532ab53c5ebb40c976b55332b41220c7b220c1b7fda656a8d56118a32acb25cd0949a84b08e8f8aaf7e159faea7c70c7f35fb2519834d9380d280e02d
-DIST llvm-roc-ocl-2.10.0.tar.gz 51741883 BLAKE2B a73e3a7804cf5eac5f1e7d66ae972a2cde21dfca9224ef16f13031b257edc6a23fa115bd7e5a0e840382b78828b38fc12b4c9a0f68cbe78f9c92f4f0754e7af0 SHA512 9d3f21de280f5bdb2126b572fb7a3bc6c38e7e0ab21715cba0b7bd129a447c11c27717e285fcbff592cbd2cebc7b10128bfe5bec022c9a325d0f6866fc920129
-DIST llvm-roc-ocl-2.6.0.tar.gz 48417665 BLAKE2B 9b7ff7cc57d98b2076994d3a5585563430fdad5975b89459aea34d585adf330d3d49d2ef611a70fd546878d84bc64d2c196dbf9f19e78ab2b4a5e63266ffb2d3 SHA512 89d5c97b8bf97242d72176768f8d12b218ab258fff9d154e3c3ff382b5563c2d6997ee5cf145e5f2c34e2cf4f9dd268906750a014a874a2038683ef5f173b872
-DIST llvm-roc-ocl-2.7.0.tar.gz 50008043 BLAKE2B 7cbb6f0e268991bbeae6dd5f38f00ee35a3d04f563212a6a3c32676574668ca84e44ae5acc14d1a77ea6985e70b47a0faff86d86521fb3a7375aa58a043d65ec SHA512 ae1547d1547345be56f547c59a6ddd09e68bb1eaea1f3c8eb4911dee1f2616b43384a296a2e2754bf2a833ef4906da4463820e4fe734c3bcfd7a602ef3c2de17
-DIST llvm-roc-ocl-2.8.0.tar.gz 50245388 BLAKE2B 29aa4fdb08b5c3ca1ec41f8948b48d4655768632cd07b217e742e32fcfe0e306130697cd18d4c481aec440686464271b380b5a1a7f02bba84ee8cb98c13d2a7f SHA512 51eb98160d556aa0b60fdce95af54f57529e218899874df0a59e583dad5a8fbcad822c3d778668ce0ec4897b28ff3423cde4d55e18719cf4edfb56735cb3d80b
-DIST llvm-roc-ocl-2.9.0.tar.gz 50246154 BLAKE2B 5ed8faf4582a41dac3bdc71a9fc6e12e3f70652fe80d4659315589e5c6f6326bc03853cea1d3e7acf6b210dd4c83056bae27aded3e173756d6f7c2c5694ae386 SHA512 e29767bb92bf719b7f3b6d2853dc61d6cb968e3f0dc54714ee6a78ff5340139935ce0d1cf3124c5757d96f93af01e0f9927e72d29a35b84229e44e7a69e6d391
-DIST llvm-roc-ocl-3.0.0.tar.gz 117363122 BLAKE2B a85e456e715629fbb3349e13e50a62aee7c82c6479127d7e46ff2de13f0eab108dd0332136aa736c30ed46c1563207b7ab22df0f7f53404315d51f0a172b5e86 SHA512 7d1281fc1628e4e88ddd740ccf03107cdccf86178046dfe79efd6b503193b3be4e23a67363f24f1d6250a156da86fe0d93933d9c67510b755d1e454e7bbedb68
-DIST llvm-roc-ocl-3.1.0.tar.gz 120981974 BLAKE2B cbefc7b087c8df81ee093aeebff292c652dc29f37ee5bcf9ef891130c52bf93b3b735f1aa746fd1ec5e5e86c879d73ffa6f9df074f27b31799ef701206a7ea32 SHA512 bc6eb441f655f3b9cb13161fb731e592295a156e7d7bd0a38e4d3017bac90852d2ef64980c70889939ae082c9d1523af25d82ec2221415bbae0d01201d20ec57
-DIST llvm-rocm-ocl-3.3.0.tar.gz 115703174 BLAKE2B 4695f07317d625bb285470cc906489f22a5eb023b4337945c1d7b4237509d3481b9f9369611dc57f4e8daa8a70c7cdd8a9b0df4842cc1424e301a5366f458727 SHA512 896afa458c7527de469e6ee891b22be6ef351858c5d0c3da57bcd6d1d85667256b3ab3fe64167cc26536dbcfd95e1146edff9c24daf5e1c966195555748d9278
-DIST llvm-rocm-ocl-3.5.0.tar.gz 116948115 BLAKE2B 067ce3cef03b714059e6720269c864d8cffa8687040ae9a8607c6207d00a6a4d8e31099aba7ff09144bf1ded809b842fe856103346b9b06eb9bcd393397fe63f SHA512 04808724c7ede3e21485153d3ccf8050b4f2ceae356c4c6451e36da714ed57ac3578f1485d922b747e3c1f654cc9f27544800f869bef24efa80f4e1b98afbbaf
-DIST llvm-rocm-ocl-3.5.1.tar.gz 116945831 BLAKE2B cab1023077a9425d158a4974b8b7baa12e15dd69ced4ea58a4f388c8057e9f6d57020e236c8f0903d5633fa73c799646f70493193cf36a760e8b658f9745ffb3 SHA512 cabc507d560c980e38214441f628e773d6621f72001fbc7d37516d1fa3d361f11919a8bf7903df60914e6f4ad6cf4993e44d121c5b6711b6ac69052d75974ab1
-DIST llvm-rocm-ocl-3.6.0.tar.gz 116957974 BLAKE2B b078af4a924525ff5654753a26f67168ff291cdcc3291b97a86a99975cb8ceaea44e1f25db917fc6e082337b16acd961818d59a3079dcb7353abed5f2ef17d1b SHA512 769f96869cd05f0b146422fc9b200cec08898a08d0d6032c1347720bb7dcee94600b1f8131b9e0e7e58943d0adfa6c02d214e100f2bc1f1937273c6861e43e92
 DIST llvm-rocm-ocl-3.7.0.tar.gz 116973132 BLAKE2B c1cc8a3b95292d726626d3cb59ec1b96549682bfcbec16030e47cf1318c6ea01bc76f3349f012ce4f1e4d8b9fe192c51a025c2d08cf593622c61fe7c61969ba6 SHA512 0626075bedb3898c96c0bb0be7a2aba4662050a1c738115f661bedc03d744ace7a4581b55c6325060740c13a0e50e72e09272bb02c1186c2c4a40fc9b961dcbe
-EBUILD llvm-roc-2.10.0.ebuild 1408 BLAKE2B 403c92548945befa4f863b45432096e19ce5e382a4f7b12ec8d178551e00e47e05d28ef46b8ad930fd01cfa3a052ca4947de59bb69ed3c54fdd76133c0e42fd2 SHA512 3fd04264ec0a05f28661cf63d7b2dd63824c41a9c4e8ed5b209f94ab1a816b8cf6968c1c70cad8dc4a2d34811baf8971116aa99aebe7f14481ee22ae5039ebfe
-EBUILD llvm-roc-2.6.0-r1.ebuild 1380 BLAKE2B 76af5352a82861b2ee0d95f1d3d2d8025af747523f36ef847bb03e77aa8b4aa3932dda9f57d525265eb39cfaafa9e8a7c5fe3b106875bfd3090f5627e7d55c96 SHA512 4fbb8add4966a700e31e4774665b4a8a583b5fb2a09bdac395ed0ccd19b4726d36e7c84a0d3bc571e846abdd282f7cd8b06c50a127a5d31346b99c689adcdd45
-EBUILD llvm-roc-2.7.0.ebuild 1408 BLAKE2B 403c92548945befa4f863b45432096e19ce5e382a4f7b12ec8d178551e00e47e05d28ef46b8ad930fd01cfa3a052ca4947de59bb69ed3c54fdd76133c0e42fd2 SHA512 3fd04264ec0a05f28661cf63d7b2dd63824c41a9c4e8ed5b209f94ab1a816b8cf6968c1c70cad8dc4a2d34811baf8971116aa99aebe7f14481ee22ae5039ebfe
-EBUILD llvm-roc-2.8.0.ebuild 1408 BLAKE2B 403c92548945befa4f863b45432096e19ce5e382a4f7b12ec8d178551e00e47e05d28ef46b8ad930fd01cfa3a052ca4947de59bb69ed3c54fdd76133c0e42fd2 SHA512 3fd04264ec0a05f28661cf63d7b2dd63824c41a9c4e8ed5b209f94ab1a816b8cf6968c1c70cad8dc4a2d34811baf8971116aa99aebe7f14481ee22ae5039ebfe
-EBUILD llvm-roc-2.9.0.ebuild 1408 BLAKE2B 403c92548945befa4f863b45432096e19ce5e382a4f7b12ec8d178551e00e47e05d28ef46b8ad930fd01cfa3a052ca4947de59bb69ed3c54fdd76133c0e42fd2 SHA512 3fd04264ec0a05f28661cf63d7b2dd63824c41a9c4e8ed5b209f94ab1a816b8cf6968c1c70cad8dc4a2d34811baf8971116aa99aebe7f14481ee22ae5039ebfe
-EBUILD llvm-roc-3.0.0.ebuild 1279 BLAKE2B 60660c178d5b92e46b877277552b4ba19d529949db56a5aa183d8dbe6686e9d5d51f6b69f0901670f9d6a87003d9650acd042d769b342b1c5066237e2c207327 SHA512 a5030ed80293ed444f5628d2148a49f239634e69913533813e71da0b61d3a876576cd13ce1bfc127d500e475c7961d8f9a6aca42a87589f6931fab028a3c7dc1
-EBUILD llvm-roc-3.1.0.ebuild 1286 BLAKE2B 9349a3432f62a8884ad2105cfd1e82b942239e69be369814447ae56a26b42f2893c915acdf020dabfb0c25df12f83bd52d81041ca1f58964f7328e01efbf4c8f SHA512 e9635742f05bb43a3aebf2b12c161c6beb18f727c9573fa7a32ccc39c7d977fe4a2c65e17e70ddb9699e89d5a5f10f301e8a984389eadb1aa431c72591d88c73
-EBUILD llvm-roc-3.3.0.ebuild 1289 BLAKE2B 569f17f1a4a97932a55e352a80fb6b8769809b1d05ecc52d25b262726382c68779dd2e2a2a4bea1c4b15bdafa36a0380dc99d6d3e250f79cf4f394ea4f83f75f SHA512 ec7822fc2774d905368c84c39bd9341f4df8706adf8c44afd26f9364d83ef0098d67d11b9075710c21355e60f6ca8470f3e6255db52b6e170342f3ae95350781
-EBUILD llvm-roc-3.5.0.ebuild 1284 BLAKE2B 00d1837eba74f2bae5e40c5a7cad49cbe41bcfa13a92005367916028ebb16516f39f3951426f17aa2db46b7a0dd663ca3dbb6dc7084c4bcb2e8ad708999b8d3f SHA512 23174cc206eddab27d9e180b479ee02ce355f996b0a954531192835b6a8fc5bf6ac7f0d82578e7eaece5553f5587309bdcc235ebb62ddd5b43826e7fe0a37d53
-EBUILD llvm-roc-3.5.1.ebuild 1284 BLAKE2B 00d1837eba74f2bae5e40c5a7cad49cbe41bcfa13a92005367916028ebb16516f39f3951426f17aa2db46b7a0dd663ca3dbb6dc7084c4bcb2e8ad708999b8d3f SHA512 23174cc206eddab27d9e180b479ee02ce355f996b0a954531192835b6a8fc5bf6ac7f0d82578e7eaece5553f5587309bdcc235ebb62ddd5b43826e7fe0a37d53
-EBUILD llvm-roc-3.6.0.ebuild 1284 BLAKE2B 00d1837eba74f2bae5e40c5a7cad49cbe41bcfa13a92005367916028ebb16516f39f3951426f17aa2db46b7a0dd663ca3dbb6dc7084c4bcb2e8ad708999b8d3f SHA512 23174cc206eddab27d9e180b479ee02ce355f996b0a954531192835b6a8fc5bf6ac7f0d82578e7eaece5553f5587309bdcc235ebb62ddd5b43826e7fe0a37d53
 EBUILD llvm-roc-3.7.0-r1.ebuild 1346 BLAKE2B 8094d7fe8a9f8a717d83b812d4323483e4bd8fc4f30b6ddeea84b10aad68cad10ae26289eda5038b71543db18bed37f8245e7383e7ef86d3dc3afd0507cc3093 SHA512 7dabd9d4e1fb15a26c6b010b15e68d6b6b37ec568bdbace9d57e31d8e53b2b528123f8dcc684c14b51899b05b8f0c00660a27efc0467dc1c3314dd83b1b2713d
 MISC metadata.xml 469 BLAKE2B f2b3af990bf9b130ed1be4ad2c4da5a97f6eae74d5feb43d81b4dc90ca1c5dcf896b293ad60d1c932d0c64773c203c52ccca8a6e0e5dd1d614f97b53113146db SHA512 e3783dde65d914cc272478c2d1823de27a2daaf8fa3aa2d281b98b0ed707c758bce1d52326dda577baed5b127293fca435211cfee17cc43553b9be424a4e2348
diff --git a/sys-devel/llvm-roc/llvm-roc-2.10.0.ebuild b/sys-devel/llvm-roc/llvm-roc-2.10.0.ebuild
deleted file mode 100644
index fc105c396a8b..000000000000
--- a/sys-devel/llvm-roc/llvm-roc-2.10.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Radeon Open Compute llvm,lld,clang"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm/"
-SRC_URI="https://github.com/RadeonOpenCompute/llvm/archive/roc-ocl-${PV}.tar.gz -> llvm-roc-ocl-${PV}.tar.gz
-	https://github.com/RadeonOpenCompute/clang/archive/roc-${PV}.tar.gz -> clang-roc-${PV}.tar.gz
-	https://github.com/RadeonOpenCompute/lld/archive/roc-ocl-${PV}.tar.gz -> lld-roc-ocl-${PV}.tar.gz"
-
-LICENSE="UoI-NCSA rc BSD public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="virtual/cblas
-	 dev-libs/rocr-runtime"
-DEPEND="${RDEPEND}"
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-S="${WORKDIR}/llvm-roc-ocl-${PV}"
-
-src_unpack() {
-	unpack ${A}
-	ln -s "${WORKDIR}/clang-roc-${PV}" "${WORKDIR}/llvm-roc-ocl-${PV}/tools/clang"
-	ln -s "${WORKDIR}/lld-roc-ocl-${PV}" "${WORKDIR}/llvm-roc-ocl-${PV}/tools/lld"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/roc"
-		-DLLVM_TARGETS_TO_BUILD="AMDGPU;X86" "${S}"
-		-DLLVM_BUILD_DOCS=NO
-		-DLLVM_ENABLE_OCAMLDOC=OFF
-		-DLLVM_ENABLE_SPHINX=NO
-		-DLLVM_ENABLE_DOXYGEN=OFF
-		-DLLVM_INSTALL_UTILS=ON
-		-DLLVM_VERSION_SUFFIX=roc
-		-DOCAMLFIND=NO
-	)
-	cmake_src_configure
-}
-src_install() {
-	cmake_src_install
-	cat > "99${PN}" <<-EOF
-		LDPATH="${EROOT}/usr/lib/llvm/roc/lib"
-	EOF
-	doenvd "99${PN}"
-}
diff --git a/sys-devel/llvm-roc/llvm-roc-2.6.0-r1.ebuild b/sys-devel/llvm-roc/llvm-roc-2.6.0-r1.ebuild
deleted file mode 100644
index 2ee101233e29..000000000000
--- a/sys-devel/llvm-roc/llvm-roc-2.6.0-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Radeon Open Compute llvm,lld,clang"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm/"
-SRC_URI="https://github.com/RadeonOpenCompute/llvm/archive/roc-ocl-${PV}.tar.gz -> llvm-roc-ocl-${PV}.tar.gz
-	https://github.com/RadeonOpenCompute/clang/archive/roc-${PV}.tar.gz -> clang-roc-${PV}.tar.gz
-	https://github.com/RadeonOpenCompute/lld/archive/roc-ocl-${PV}.tar.gz -> lld-roc-ocl-${PV}.tar.gz"
-
-LICENSE="UoI-NCSA rc BSD public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="virtual/cblas
-	 dev-libs/rocr-runtime"
-DEPEND="${RDEPEND}"
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-S="${WORKDIR}/llvm-roc-ocl-${PV}"
-
-src_unpack() {
-	unpack ${A}
-	ln -s "${WORKDIR}/clang-roc-${PV}" "${WORKDIR}/llvm-roc-ocl-${PV}/tools/clang"
-	ln -s "${WORKDIR}/lld-roc-ocl-${PV}" "${WORKDIR}/llvm-roc-ocl-${PV}/tools/lld"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/roc"
-		-DLLVM_TARGETS_TO_BUILD="AMDGPU;X86" "${S}"
-		-DLLVM_BUILD_DOCS=NO
-		-DLLVM_ENABLE_OCAMLDOC=OFF
-		-DLLVM_ENABLE_SPHINX=NO
-		-DLLVM_ENABLE_DOXYGEN=OFF
-		-DLLVM_INSTALL_UTILS=ON
-		-DOCAMLFIND=NO
-	)
-	cmake_src_configure
-}
-src_install() {
-	cmake_src_install
-	cat > "99${PN}" <<-EOF
-		LDPATH="${EROOT}/usr/lib/llvm/roc/lib"
-	EOF
-	doenvd "99${PN}"
-}
diff --git a/sys-devel/llvm-roc/llvm-roc-2.7.0.ebuild b/sys-devel/llvm-roc/llvm-roc-2.7.0.ebuild
deleted file mode 100644
index fc105c396a8b..000000000000
--- a/sys-devel/llvm-roc/llvm-roc-2.7.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Radeon Open Compute llvm,lld,clang"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm/"
-SRC_URI="https://github.com/RadeonOpenCompute/llvm/archive/roc-ocl-${PV}.tar.gz -> llvm-roc-ocl-${PV}.tar.gz
-	https://github.com/RadeonOpenCompute/clang/archive/roc-${PV}.tar.gz -> clang-roc-${PV}.tar.gz
-	https://github.com/RadeonOpenCompute/lld/archive/roc-ocl-${PV}.tar.gz -> lld-roc-ocl-${PV}.tar.gz"
-
-LICENSE="UoI-NCSA rc BSD public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="virtual/cblas
-	 dev-libs/rocr-runtime"
-DEPEND="${RDEPEND}"
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-S="${WORKDIR}/llvm-roc-ocl-${PV}"
-
-src_unpack() {
-	unpack ${A}
-	ln -s "${WORKDIR}/clang-roc-${PV}" "${WORKDIR}/llvm-roc-ocl-${PV}/tools/clang"
-	ln -s "${WORKDIR}/lld-roc-ocl-${PV}" "${WORKDIR}/llvm-roc-ocl-${PV}/tools/lld"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/roc"
-		-DLLVM_TARGETS_TO_BUILD="AMDGPU;X86" "${S}"
-		-DLLVM_BUILD_DOCS=NO
-		-DLLVM_ENABLE_OCAMLDOC=OFF
-		-DLLVM_ENABLE_SPHINX=NO
-		-DLLVM_ENABLE_DOXYGEN=OFF
-		-DLLVM_INSTALL_UTILS=ON
-		-DLLVM_VERSION_SUFFIX=roc
-		-DOCAMLFIND=NO
-	)
-	cmake_src_configure
-}
-src_install() {
-	cmake_src_install
-	cat > "99${PN}" <<-EOF
-		LDPATH="${EROOT}/usr/lib/llvm/roc/lib"
-	EOF
-	doenvd "99${PN}"
-}
diff --git a/sys-devel/llvm-roc/llvm-roc-2.8.0.ebuild b/sys-devel/llvm-roc/llvm-roc-2.8.0.ebuild
deleted file mode 100644
index fc105c396a8b..000000000000
--- a/sys-devel/llvm-roc/llvm-roc-2.8.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Radeon Open Compute llvm,lld,clang"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm/"
-SRC_URI="https://github.com/RadeonOpenCompute/llvm/archive/roc-ocl-${PV}.tar.gz -> llvm-roc-ocl-${PV}.tar.gz
-	https://github.com/RadeonOpenCompute/clang/archive/roc-${PV}.tar.gz -> clang-roc-${PV}.tar.gz
-	https://github.com/RadeonOpenCompute/lld/archive/roc-ocl-${PV}.tar.gz -> lld-roc-ocl-${PV}.tar.gz"
-
-LICENSE="UoI-NCSA rc BSD public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="virtual/cblas
-	 dev-libs/rocr-runtime"
-DEPEND="${RDEPEND}"
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-S="${WORKDIR}/llvm-roc-ocl-${PV}"
-
-src_unpack() {
-	unpack ${A}
-	ln -s "${WORKDIR}/clang-roc-${PV}" "${WORKDIR}/llvm-roc-ocl-${PV}/tools/clang"
-	ln -s "${WORKDIR}/lld-roc-ocl-${PV}" "${WORKDIR}/llvm-roc-ocl-${PV}/tools/lld"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/roc"
-		-DLLVM_TARGETS_TO_BUILD="AMDGPU;X86" "${S}"
-		-DLLVM_BUILD_DOCS=NO
-		-DLLVM_ENABLE_OCAMLDOC=OFF
-		-DLLVM_ENABLE_SPHINX=NO
-		-DLLVM_ENABLE_DOXYGEN=OFF
-		-DLLVM_INSTALL_UTILS=ON
-		-DLLVM_VERSION_SUFFIX=roc
-		-DOCAMLFIND=NO
-	)
-	cmake_src_configure
-}
-src_install() {
-	cmake_src_install
-	cat > "99${PN}" <<-EOF
-		LDPATH="${EROOT}/usr/lib/llvm/roc/lib"
-	EOF
-	doenvd "99${PN}"
-}
diff --git a/sys-devel/llvm-roc/llvm-roc-2.9.0.ebuild b/sys-devel/llvm-roc/llvm-roc-2.9.0.ebuild
deleted file mode 100644
index fc105c396a8b..000000000000
--- a/sys-devel/llvm-roc/llvm-roc-2.9.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Radeon Open Compute llvm,lld,clang"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm/"
-SRC_URI="https://github.com/RadeonOpenCompute/llvm/archive/roc-ocl-${PV}.tar.gz -> llvm-roc-ocl-${PV}.tar.gz
-	https://github.com/RadeonOpenCompute/clang/archive/roc-${PV}.tar.gz -> clang-roc-${PV}.tar.gz
-	https://github.com/RadeonOpenCompute/lld/archive/roc-ocl-${PV}.tar.gz -> lld-roc-ocl-${PV}.tar.gz"
-
-LICENSE="UoI-NCSA rc BSD public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="virtual/cblas
-	 dev-libs/rocr-runtime"
-DEPEND="${RDEPEND}"
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-S="${WORKDIR}/llvm-roc-ocl-${PV}"
-
-src_unpack() {
-	unpack ${A}
-	ln -s "${WORKDIR}/clang-roc-${PV}" "${WORKDIR}/llvm-roc-ocl-${PV}/tools/clang"
-	ln -s "${WORKDIR}/lld-roc-ocl-${PV}" "${WORKDIR}/llvm-roc-ocl-${PV}/tools/lld"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/roc"
-		-DLLVM_TARGETS_TO_BUILD="AMDGPU;X86" "${S}"
-		-DLLVM_BUILD_DOCS=NO
-		-DLLVM_ENABLE_OCAMLDOC=OFF
-		-DLLVM_ENABLE_SPHINX=NO
-		-DLLVM_ENABLE_DOXYGEN=OFF
-		-DLLVM_INSTALL_UTILS=ON
-		-DLLVM_VERSION_SUFFIX=roc
-		-DOCAMLFIND=NO
-	)
-	cmake_src_configure
-}
-src_install() {
-	cmake_src_install
-	cat > "99${PN}" <<-EOF
-		LDPATH="${EROOT}/usr/lib/llvm/roc/lib"
-	EOF
-	doenvd "99${PN}"
-}
diff --git a/sys-devel/llvm-roc/llvm-roc-3.0.0.ebuild b/sys-devel/llvm-roc/llvm-roc-3.0.0.ebuild
deleted file mode 100644
index 8035d829e5b1..000000000000
--- a/sys-devel/llvm-roc/llvm-roc-3.0.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Radeon Open Compute llvm,lld,clang"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm/"
-SRC_URI="https://github.com/RadeonOpenCompute/llvm-project/archive/roc-ocl-${PV}.tar.gz -> llvm-roc-ocl-${PV}.tar.gz"
-
-LICENSE="UoI-NCSA rc BSD public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug"
-
-RDEPEND="virtual/cblas
-	 dev-libs/rocr-runtime"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/llvm-project-roc-ocl-${PV}/llvm"
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-src_prepare() {
-	cd "${WORKDIR}/llvm-project-roc-ocl-${PV}"
-	eapply "${FILESDIR}/${P}-add_libraries.patch"
-	eapply_user
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/roc"
-		-DLLVM_ENABLE_PROJECTS="clang;lld"
-		-DLLVM_TARGETS_TO_BUILD="AMDGPU;X86"
-		-DLLVM_BUILD_DOCS=NO
-		-DLLVM_ENABLE_OCAMLDOC=OFF
-		-DLLVM_ENABLE_SPHINX=NO
-		-DLLVM_ENABLE_DOXYGEN=OFF
-		-DLLVM_INSTALL_UTILS=ON
-		-DLLVM_VERSION_SUFFIX=roc
-		-DOCAMLFIND=NO
-	)
-
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	cat > "99${PN}" <<-EOF
-		LDPATH="${EROOT}/usr/lib/llvm/roc/lib"
-	EOF
-	doenvd "99${PN}"
-}
diff --git a/sys-devel/llvm-roc/llvm-roc-3.1.0.ebuild b/sys-devel/llvm-roc/llvm-roc-3.1.0.ebuild
deleted file mode 100644
index 89f299744f5c..000000000000
--- a/sys-devel/llvm-roc/llvm-roc-3.1.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Radeon Open Compute llvm,lld,clang"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm/"
-SRC_URI="https://github.com/RadeonOpenCompute/llvm-project/archive/roc-ocl-${PV}.tar.gz -> llvm-roc-ocl-${PV}.tar.gz"
-
-LICENSE="UoI-NCSA rc BSD public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug"
-
-RDEPEND="virtual/cblas
-	 dev-libs/rocr-runtime"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/llvm-project-roc-ocl-${PV}/llvm"
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-src_prepare() {
-	cd "${WORKDIR}/llvm-project-roc-ocl-${PV}"
-	eapply "${FILESDIR}/${PN}-3.0.0-add_libraries.patch"
-	eapply_user
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/roc"
-		-DLLVM_ENABLE_PROJECTS="clang;lld"
-		-DLLVM_TARGETS_TO_BUILD="AMDGPU;X86"
-		-DLLVM_BUILD_DOCS=NO
-		-DLLVM_ENABLE_OCAMLDOC=OFF
-		-DLLVM_ENABLE_SPHINX=NO
-		-DLLVM_ENABLE_DOXYGEN=OFF
-		-DLLVM_INSTALL_UTILS=ON
-		-DLLVM_VERSION_SUFFIX=roc
-		-DOCAMLFIND=NO
-	)
-
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	cat > "99${PN}" <<-EOF
-		LDPATH="${EROOT}/usr/lib/llvm/roc/lib"
-	EOF
-	doenvd "99${PN}"
-}
diff --git a/sys-devel/llvm-roc/llvm-roc-3.3.0.ebuild b/sys-devel/llvm-roc/llvm-roc-3.3.0.ebuild
deleted file mode 100644
index 5282b7e0fe81..000000000000
--- a/sys-devel/llvm-roc/llvm-roc-3.3.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Radeon Open Compute llvm,lld,clang"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm/"
-SRC_URI="https://github.com/RadeonOpenCompute/llvm-project/archive/rocm-ocl-${PV}.tar.gz -> llvm-rocm-ocl-${PV}.tar.gz"
-
-LICENSE="UoI-NCSA rc BSD public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug"
-
-RDEPEND="virtual/cblas
-	dev-libs/rocr-runtime"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/llvm-project-rocm-ocl-${PV}/llvm"
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-src_prepare() {
-	cd "${WORKDIR}/llvm-project-rocm-ocl-${PV}"
-	eapply "${FILESDIR}/${PN}-3.0.0-add_libraries.patch"
-	eapply_user
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/roc"
-		-DLLVM_ENABLE_PROJECTS="clang;lld"
-		-DLLVM_TARGETS_TO_BUILD="AMDGPU;X86"
-		-DLLVM_BUILD_DOCS=NO
-		-DLLVM_ENABLE_OCAMLDOC=OFF
-		-DLLVM_ENABLE_SPHINX=NO
-		-DLLVM_ENABLE_DOXYGEN=OFF
-		-DLLVM_INSTALL_UTILS=ON
-		-DLLVM_VERSION_SUFFIX=roc
-		-DOCAMLFIND=NO
-	)
-
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	cat > "99${PN}" <<-EOF
-		LDPATH="${EROOT}/usr/lib/llvm/roc/lib"
-	EOF
-	doenvd "99${PN}"
-}
diff --git a/sys-devel/llvm-roc/llvm-roc-3.5.0.ebuild b/sys-devel/llvm-roc/llvm-roc-3.5.0.ebuild
deleted file mode 100644
index 616e05f5cb90..000000000000
--- a/sys-devel/llvm-roc/llvm-roc-3.5.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Radeon Open Compute llvm,lld,clang"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm/"
-SRC_URI="https://github.com/RadeonOpenCompute/llvm-project/archive/rocm-${PV}.tar.gz -> llvm-rocm-ocl-${PV}.tar.gz"
-
-LICENSE="UoI-NCSA rc BSD public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug"
-
-RDEPEND="virtual/cblas
-	dev-libs/rocr-runtime"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/llvm-project-rocm-${PV}/llvm"
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-src_prepare() {
-	cd "${WORKDIR}/llvm-project-rocm-${PV}" || die
-	eapply "${FILESDIR}/${PN}-3.0.0-add_libraries.patch"
-	eapply_user
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/roc"
-		-DLLVM_ENABLE_PROJECTS="clang;lld"
-		-DLLVM_TARGETS_TO_BUILD="AMDGPU;X86"
-		-DLLVM_BUILD_DOCS=NO
-		-DLLVM_ENABLE_OCAMLDOC=OFF
-		-DLLVM_ENABLE_SPHINX=NO
-		-DLLVM_ENABLE_DOXYGEN=OFF
-		-DLLVM_INSTALL_UTILS=ON
-		-DLLVM_VERSION_SUFFIX=roc
-		-DOCAMLFIND=NO
-	)
-
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	cat > "99${PN}" <<-EOF
-		LDPATH="${EROOT}/usr/lib/llvm/roc/lib"
-	EOF
-	doenvd "99${PN}"
-}
diff --git a/sys-devel/llvm-roc/llvm-roc-3.5.1.ebuild b/sys-devel/llvm-roc/llvm-roc-3.5.1.ebuild
deleted file mode 100644
index 616e05f5cb90..000000000000
--- a/sys-devel/llvm-roc/llvm-roc-3.5.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Radeon Open Compute llvm,lld,clang"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm/"
-SRC_URI="https://github.com/RadeonOpenCompute/llvm-project/archive/rocm-${PV}.tar.gz -> llvm-rocm-ocl-${PV}.tar.gz"
-
-LICENSE="UoI-NCSA rc BSD public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug"
-
-RDEPEND="virtual/cblas
-	dev-libs/rocr-runtime"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/llvm-project-rocm-${PV}/llvm"
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-src_prepare() {
-	cd "${WORKDIR}/llvm-project-rocm-${PV}" || die
-	eapply "${FILESDIR}/${PN}-3.0.0-add_libraries.patch"
-	eapply_user
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/roc"
-		-DLLVM_ENABLE_PROJECTS="clang;lld"
-		-DLLVM_TARGETS_TO_BUILD="AMDGPU;X86"
-		-DLLVM_BUILD_DOCS=NO
-		-DLLVM_ENABLE_OCAMLDOC=OFF
-		-DLLVM_ENABLE_SPHINX=NO
-		-DLLVM_ENABLE_DOXYGEN=OFF
-		-DLLVM_INSTALL_UTILS=ON
-		-DLLVM_VERSION_SUFFIX=roc
-		-DOCAMLFIND=NO
-	)
-
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	cat > "99${PN}" <<-EOF
-		LDPATH="${EROOT}/usr/lib/llvm/roc/lib"
-	EOF
-	doenvd "99${PN}"
-}
diff --git a/sys-devel/llvm-roc/llvm-roc-3.6.0.ebuild b/sys-devel/llvm-roc/llvm-roc-3.6.0.ebuild
deleted file mode 100644
index 616e05f5cb90..000000000000
--- a/sys-devel/llvm-roc/llvm-roc-3.6.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Radeon Open Compute llvm,lld,clang"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm/"
-SRC_URI="https://github.com/RadeonOpenCompute/llvm-project/archive/rocm-${PV}.tar.gz -> llvm-rocm-ocl-${PV}.tar.gz"
-
-LICENSE="UoI-NCSA rc BSD public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug"
-
-RDEPEND="virtual/cblas
-	dev-libs/rocr-runtime"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/llvm-project-rocm-${PV}/llvm"
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-src_prepare() {
-	cd "${WORKDIR}/llvm-project-rocm-${PV}" || die
-	eapply "${FILESDIR}/${PN}-3.0.0-add_libraries.patch"
-	eapply_user
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/roc"
-		-DLLVM_ENABLE_PROJECTS="clang;lld"
-		-DLLVM_TARGETS_TO_BUILD="AMDGPU;X86"
-		-DLLVM_BUILD_DOCS=NO
-		-DLLVM_ENABLE_OCAMLDOC=OFF
-		-DLLVM_ENABLE_SPHINX=NO
-		-DLLVM_ENABLE_DOXYGEN=OFF
-		-DLLVM_INSTALL_UTILS=ON
-		-DLLVM_VERSION_SUFFIX=roc
-		-DOCAMLFIND=NO
-	)
-
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	cat > "99${PN}" <<-EOF
-		LDPATH="${EROOT}/usr/lib/llvm/roc/lib"
-	EOF
-	doenvd "99${PN}"
-}