gentoo new year resync : 01.01.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-01-01 21:06:00 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-01-01 21:06:00 +0000
commit: 129160ec854dca4c3fedb5bcfbcb56930371da0f (patch)
tree: 53bf797418ac5e9b99c41ca0382c87b82421e5de /dev-util
parent: 441d1370330332b7d78f238d2f5e13f7aed5e4e0 (diff)
197 files changed, 1268 insertions, 3269 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index aebead7d6c4a..bedfdbdfe331 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index c76b0f22f5e9..8787a0057831 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -10,12 +10,6 @@ DIST android-tools-6.0.1_r79-core.tar.gz 1186562 BLAKE2B 473454d340e65f98201508c
 DIST android-tools-6.0.1_r79-extras.tar.gz 648657 BLAKE2B 4582ddd57b729492e08987e17304c62778504ffc316ab26df8c83fff1aed33226106474131d5ad0e3e302b577c83a2b78d0be04fef9711e39861a223580ab1b9 SHA512 e10694737c518f591eff4e808bb826c83bf45dc44c5c1ee8a4082a6e0653350ffe2986e299348cb4a1219203192d01546a05e9354ce05e29897f856c147de8c3
 DIST android-tools-6.0.1_r79-f2fs-tools.tar.gz 70255 BLAKE2B ab9ce3efd33c28a1a0a9cb8a5415057498dd493e059183cc9d3fcc9de1b5ca4d7488c75695c94700fc6a4e5503beb8647576c7096fa50229f98485d2983ce152 SHA512 0871f99f78006028889b42668ec627b6515bb812ad3ec4a489f62187a79f64d2a74f66556698a5f05fc99932f75fefd8810dedceeab744b212beb764e97b82c8
 DIST android-tools-6.0.1_r79-libselinux.tar.gz 50814 BLAKE2B f09f26c801be83bc97f4b18606f513ce0fae791126a30c90067e3b2066c991fa1390ab2d0fac2475f755f3245179718204d5014f47ece46801dc0f80caf9758b SHA512 686557271271c4d59fb968c5aa76b433955009733f3151c4c86faa996ce846088d6632b0969b23699822b7a6f09eae60abedba6abb0edc9d444159bbdb5c6f91
-DIST android-tools-8.1.0_r1-arch.tar.gz 6250 BLAKE2B 65447517a33438c8531a9d707c6107703eaccb558e505e51a88ef51e70f83488620f76eb0240dc0899211cf120e9e1ffbea041086f1d8133f30b56358aba76d6 SHA512 5746e0b2f6aae37ebe60b7b1e939699a11de2f44286497f77d700c3896e02559d55002f036ecdc1c412844bfce4ab245b9086193dc982e6be74bcaea61010c5c
-DIST android-tools-8.1.0_r1-core.tar.gz 5227179 BLAKE2B afb280d67fe1b926e1f1ad68409584ad0209eb48921542e2bd490448c888cdf4bf6fb4c6f9552d580c7a396e79c2c85019e79a9a6c9881ea962c2f1064c33d82 SHA512 2c8e67232ca6348a4fd4b5d7077715491d2168c46fc8e336635a961bbbed156ef480718ee58393501196e9315c6c1bda807f8966944e3bc209dd5a0f7088642e
-DIST android-tools-8.1.0_r1-extras.tar.xz 275952 BLAKE2B 0fd3c536fee6ffbe2cdd4321604d32dc3a2b48a1b3edcb9121e83ceea760e491b47b301c3d8126565efd6b11adabd4f89c79bbe8731585660ce395af9e643fe7 SHA512 bfe3af89eadf38ce6805637e41f3fb15feb85455902f6a43e52a2f95dd1595cc896a9f46ccc82ab8db433f56a05f2f4c0ba85b77f40b03d5d69c8fec4082a2da
-DIST android-tools-8.1.0_r1-f2fs-tools.tar.xz 93924 BLAKE2B b8b6c7ba4c3f5309bfcfc91bd57d018d7af66f8dd25590207fd545f0dba02961826bf9963a56c7994feea5db8f9caedfe4fe62870420d9544283f87ec337cfb8 SHA512 de726be0691c58a5093098bd30cfc06c4312c44bec040cbecd594694cb7b38742dafd1f00b08c18f1b70abf56571738eb3e85e612f082e09e51a98980444e069
-DIST android-tools-8.1.0_r1-selinux.tar.xz 3188060 BLAKE2B 8c513d858e8dcaed705975ad61f362d7b1c2252685a63a1ad6035f36b0b402f1857ac5d2635d35ffa10f05b4a2605f30f27dcc5e9d91930eb0656f3ce2da036d SHA512 8799f10b4dba840ecea8f6abb8166c2e137eb3f0d9c5cfb132c661cf17800f2eeaafb1b4ec9e8974fc3324fae99e3654e52397c987faf1d48ab6148152d84f11
-DIST android-tools-8.1.0_r1.ninja.xz 2740 BLAKE2B 34473e33970cefdaf82bbe4524665fd50e6617cf867757ca07cdccc2e7356f43ef4bb455080ef4bac516ddba3c4e4120f0b27306e84725f8d5738a81800e3a53 SHA512 707e0e1c53832a42384e93d363f80007b76f18166b9f3f7d516431410b05319b1acc804daa1fddc218e11feb48de48683efb5203f4fa6d80646dcb1a2953139f
 DIST android-tools-9.0.0_p3-bug-706946-fno-common.patch.xz 2696 BLAKE2B de8083846d6cb24d2fcb12789b302f5df766753989e004154746d4402a5777bbabff2e9c67758e9185c0ea56dde7e647a8a15dd696671c28f2f708703bcad9f0 SHA512 e65818e9d06295f7de8f8bc52270054f9936659b2bf07f7abc15f2ea7b138536396a24c39bb6a260a931250396b04022170f2045336f0ba6444cd90fb0dfdbb0
 DIST android-tools-9.0.0_p3-fix-build-with-glibc-2.30.patch 1262 BLAKE2B fa2d3cd31e82dd3b17bb840096c6158f1b117cb12b8b3c6f6c604efd85f880346c04e8e98b17bebd68d56e06cdc126677ad96dbd6214175544a9b93020292956 SHA512 21c2501fa24f59489e656ac5122c906476ad573e63f6dcc88605dafde9d4b8927ea904708caaababd12155153d969d2480aff591d98057859e8b885e94aa126a
 DIST android-tools-9.0.0_r3-arch.tar.gz 8451 BLAKE2B b28649333aa0e5a6f4bc83f9e42e1749a4d138075d03559c5871a24f782bf8608bcf07a609bd791ee29afabcb4435ece2ed8f8abc171265ef9d67da231c8a29e SHA512 d3409f89d2c334b66e694fd77e068e2d863dc9a99b9ef332b0a08c9c186c26eb9d969ef5cde5aa6e28b866847b4a85a4d3a4c2b0951a37752510b2f3b41c5943
@@ -25,10 +19,8 @@ DIST android-tools-9.0.0_r3-extras.tar.xz 1653548 BLAKE2B 1a8c2ee2e564adc04d646a
 DIST android-tools-9.0.0_r3-f2fs-tools.tar.xz 212092 BLAKE2B 32775e5b049bd2ff2ce7c9ea3362a602dcda6328e39036902020bd372a812898d84912f686cf347b225af630c2dea81ce30b601ac968b1168e2851b94ac2da2e SHA512 4fac8f18533c5c2270aed6e60b21721c643a44a27b37482ff8fd8fa4d7c875eb8a626d544ec4e6efb89c7408ae97e66ffd123588e90b98312e5291575ca8baa6
 DIST android-tools-9.0.0_r3-selinux.tar.xz 3202332 BLAKE2B 60a884eb1bd34fe5796f8fb33e5aefd7f9ffc85ac91784e0a8f0ca663010cf2222c80f4c419019b5817f9cbd8037ab78914e42417193e1b802a2682bb82c0097 SHA512 f0a77dc0ac91d434573370110c70529caabfd5f036c02ae5f1a4b2097e48324198d03ecdc92a622e1590012dd3f20f103384fed468f5e27aebcaf9315bb87078
 DIST android-tools-9.0.0_r3.ninja.xz 4244 BLAKE2B 14cea7523f22a7f4e02e93c32e4d4684e057abbe8e2b537b7e942cc27c13ea2aa13bcdb5c3ccafc261b8d7fc4b4cd4b9394e0970734b36111ccffbacecc5cfb9 SHA512 46956a608d6a9b93f1a035d6b0e153c476b55d4f8a2db4915b18ac9904a6d07befcbceb8e2e50054e7dbe2970be8539243134cd9722d2f2ec8a36a3153e03c56
-DIST boringssl-14308731e5446a73ac2258688a9688b524483cb6.tar.gz 13030361 BLAKE2B 6982416b6e193e7faccd41fff3bd35f80b11d7495251d876e6b081bd94a887ec3c6bf5b7852d9595594fc2bdc57353f268272ef01fb79f7c93b52d46cbda69ac SHA512 171b524b0452a48853b2c8010ff5e14d5d720e69eeaf1d3b79f675838f3afa94aee9de2f47b37303feb2d92cbf77639efe585786625b7b37b8cc2ba727c37fdc
 DIST boringssl-45210dd4e21ace9d28cb76b3f83303fcdd2efcce.tar.gz 13581532 BLAKE2B ca2f6757807adc265314a7444605c6199a19847fb426384bafa201bf63f4e3c7c567fb8094b740b8a00caf0d106bb1efea2893b00d45c9772740a81dc0a186f3 SHA512 c6695d078ee7b3694898dfdc0ee3382d01f9bb592ea46eb64026c73565735fd7251bbb0fd3e8c8552394bcdad5717de7ee5106cf1ed91aacec05d779ad693f6a
 EBUILD android-tools-5.1.1_p13.ebuild 2077 BLAKE2B edb2e3a9f69c2c8a4f86170b39aedb1f44b173df943b2edcb96f7d90384658c6689925e06873c3d5331c20f360732860f70e0bfecdb0d5518dfbb9d90816b671 SHA512 3659aca002096aa11dc94631de73f1081cda5a5728f2842aa767844b6b3e12e0bdcdd0abbc2903efbb1d9f11666e7bd392be694910ffae58fce1e8b52a8cd090
 EBUILD android-tools-6.0.1_p79.ebuild 2820 BLAKE2B a87ef5bc6d814ef772c3fe4292563c73beabd59cacebae706721d4019059be8b2cf31e27594c473abe202ed1f4afb78993ae3e947ef7c21b5016245797f90b45 SHA512 ccdd6e4fbc6a98ca0e9cfd89618c6a13e11e174abd6c6b3dd1d1b8f7a592a4574cf83e0f4770750918ee481b129d01425ae56fd55ddc323b3409add6ddf10279
-EBUILD android-tools-8.1.0_p1.ebuild 3982 BLAKE2B 6b21b82b84a1d94bc3ccd1cd5827e88a1b7bfcfa1f50f6abb503a88e78e9c9e7f237e80b7fe45909666fab2fbaa640a6545ebb80bbbaa244c5909cb253a18051 SHA512 1f4f60511a2e1acf5144a5707078619b3921c71dd31f01152ffb71d1d4c3fa2fa0de1aaf9da632af7b77164f6d5df58d8f3e2954755f347327cf8d27f4f27eba
 EBUILD android-tools-9.0.0_p3-r1.ebuild 5079 BLAKE2B 880ee504792a04cf55953a2a0bed4873e5a981db982d4b95f322407ec05c065e69f16ae2b138ddd0db5ec78a612f217a689edb4a4218d72e7787559188775073 SHA512 310ae2e3db0ee92d8ff990ef315fc46fea60f987c538dc3cc6bacd21576851ec93bfef94dcb9f532e435503c85bdc603aac22d138d4b83de62b349acc2172b8e
 MISC metadata.xml 714 BLAKE2B 2ec2b24289241323b1844412e6e0d1edf642dc3391171b474848ea376c51d420c98a4a0c094afad2dc1c7cf55b0efb744ca6a92beeed770d015a6380b07b85b0 SHA512 720b38485a7c248e6a9d43a7056e33a384fe7e295fc843c69e59d48350bb10d7d4446e6cc52b7c87e2b0322733553e16c9dda4e37104753d5aaceec5adf859bd
diff --git a/dev-util/android-tools/android-tools-8.1.0_p1.ebuild b/dev-util/android-tools/android-tools-8.1.0_p1.ebuild
deleted file mode 100644
index 86a31b64479b..000000000000
--- a/dev-util/android-tools/android-tools-8.1.0_p1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_6 )
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit flag-o-matic bash-completion-r1 ninja-utils toolchain-funcs cmake-utils python-r1
-
-MY_PV="${PV/_p/_r}"
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)"
-HOMEPAGE="https://android.googlesource.com/platform/system/core.git/"
-# See helper scripts in files/ for creating these tarballs and getting this hash.
-BORINGSSL_SHA1="14308731e5446a73ac2258688a9688b524483cb6"
-# The ninja file was created by running the ruby script from archlinux by hand and fixing the build vars.
-# No point in depending on something large/uncommon like ruby just to generate a ninja file.
-SRC_URI="https://git.archlinux.org/svntogit/community.git/snapshot/community-2b7f9774cc468205fec145e64e9103aee8e5c6f9.tar.gz -> ${MY_P}-arch.tar.gz
-	https://github.com/android/platform_system_core/archive/android-${MY_PV}.tar.gz -> ${MY_P}-core.tar.gz
-	https://github.com/google/boringssl/archive/${BORINGSSL_SHA1}.tar.gz -> boringssl-${BORINGSSL_SHA1}.tar.gz
-	mirror://gentoo/${MY_P}-extras.tar.xz https://dev.gentoo.org/~vapier/dist/${MY_P}-extras.tar.xz
-	mirror://gentoo/${MY_P}-selinux.tar.xz https://dev.gentoo.org/~vapier/dist/${MY_P}-selinux.tar.xz
-	mirror://gentoo/${MY_P}-f2fs-tools.tar.xz https://dev.gentoo.org/~vapier/dist/${MY_P}-f2fs-tools.tar.xz
-	mirror://gentoo/${MY_P}.ninja.xz https://dev.gentoo.org/~vapier/dist/${MY_P}.ninja.xz"
-
-# The entire source code is Apache-2.0, except for fastboot which is BSD-2.
-LICENSE="Apache-2.0 BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~x86-linux"
-IUSE="python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="sys-libs/zlib:=
-	dev-libs/libpcre2:=
-	virtual/libusb:1="
-RDEPEND="${DEPEND}
-	python? ( ${PYTHON_DEPS} )"
-DEPEND+="
-	dev-lang/go"
-
-S=${WORKDIR}
-CMAKE_USE_DIR="${S}/boringssl"
-
-unpack_into() {
-	local archive="$1"
-	local dir="$2"
-
-	mkdir -p "${dir}"
-	pushd "${dir}" >/dev/null || die
-	unpack "${archive}"
-	if [[ ${dir} != ./* ]] ; then
-		mv */* ./ || die
-	fi
-	popd >/dev/null
-}
-
-src_unpack() {
-	unpack_into "${MY_P}-arch.tar.gz" arch
-	unpack_into "${MY_P}-core.tar.gz" core
-	unpack_into "${MY_P}-extras.tar.xz" extras
-	unpack_into "${MY_P}-f2fs-tools.tar.xz" ./f2fs-tools
-	unpack_into "${MY_P}-selinux.tar.xz" ./selinux
-	unpack_into boringssl-${BORINGSSL_SHA1}.tar.gz boringssl
-
-	unpack "${MY_P}.ninja.xz"
-	mv "${MY_P}.ninja" "build.ninja" || die
-
-	# Avoid depending on gtest just for its prod headers when boringssl bundles it.
-	ln -s ../../boringssl/third_party/googletest/include/gtest core/include/ || die
-}
-
-src_prepare() {
-	cd "${S}"/core
-	eapply "${WORKDIR}"/arch/trunk/fix_build_core.patch
-	eapply "${FILESDIR}"/${P}-build.patch
-	sed -i '1i#include <sys/sysmacros.h>' adb/client/usb_linux.cpp || die #616508
-
-	cd "${S}"/selinux
-	eapply "${WORKDIR}"/arch/trunk/fix_build_selinux.patch
-
-	cd "${S}"/extras
-	sed -e 's|^#include <sys/cdefs.h>$|/*\0*/|' \
-		-e 's|^__BEGIN_DECLS$|#ifdef __cplusplus\nextern "C" {\n#endif|' \
-		-e 's|^__END_DECLS$|#ifdef __cplusplus\n}\n#endif|' \
-		-i ext4_utils/sha1.{c,h} || die #580686
-
-	cd "${S}"
-	default
-
-	# The pregenerated ninja file expects the build/ dir.
-	BUILD_DIR="${CMAKE_USE_DIR}/build"
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	append-lfs-flags
-
-	cmake-utils_src_configure
-
-	sed -i \
-		-e "s|@CC@|$(tc-getCC)|g" \
-		-e "s|@CXX@|$(tc-getCXX)|g" \
-		-e "s|@CFLAGS@|${CFLAGS}|g" \
-		-e "s|@CPPFLAGS@|${CPPFLAGS}|g" \
-		-e "s|@CXXFLAGS@|${CXXFLAGS}|g" \
-		-e "s|@LDFLAGS@|${LDFLAGS}|g" \
-		-e "s|@PV@|${PV}|g" \
-		build.ninja || die
-}
-
-src_compile() {
-	# We only need a few libs from boringssl.
-	cmake-utils_src_compile libcrypto.a libssl.a
-
-	eninja
-}
-
-src_install() {
-	dobin adb fastboot
-	dodoc core/adb/*.{txt,TXT} core/fastboot/README.md
-	use python && python_foreach_impl python_doexe core/mkbootimg/mkbootimg
-	newbashcomp arch/trunk/bash_completion.fastboot fastboot
-}
diff --git a/dev-util/bitcoin-tx/Manifest b/dev-util/bitcoin-tx/Manifest
index d8506679ef1f..9a3cc1eaf107 100644
--- a/dev-util/bitcoin-tx/Manifest
+++ b/dev-util/bitcoin-tx/Manifest
@@ -10,5 +10,5 @@ DIST bitcoin-v0.20.1.tar.gz 6986090 BLAKE2B ef0e6c424bcb7ffe9a2461e60499cebdfcd1
 EBUILD bitcoin-tx-0.16.3.ebuild 2427 BLAKE2B c3410c5a84de81fcafedae1236e339f034938e7adf817a4dcdeed76f7ea64cc2c84e529785732de392bca904b34563cd80bf40f755a7f5f4d8afb92fcd97cc4d SHA512 0b277b10e5fd15866a07e06bb33f6f398b6fbf88fd4159ab50b33947f42e88870b67b9fc3e3375cf16dd15fe3828a550cb30067ca03eafcc9aa93fd1ad2bdccf
 EBUILD bitcoin-tx-0.19.1.ebuild 2533 BLAKE2B 88b2dfd6f40edb8e66cd9f92dae8cfb395e21e67cce278694395898079e48a7902f35e3f54d30e0f1fdd729f077da4e5de229f3781fc5e90e6eef7e84c566fc6 SHA512 f9b170301f82cf07436a30bb4ef911af0263c422866dd507673316725084c4f1f4782e8904be2d8d48d564b6bbde27e369a4309eeecddc5744b0864331fb1f54
 EBUILD bitcoin-tx-0.20.0.ebuild 2529 BLAKE2B 3b273c3e025eed28f0415d0864cd735ce34d0a2923cace7b4c2cad1d5ef58479a5e9762cc0912179e0ec1ea30116c04e9ebc605b78242529280ddc4dcdc91ee4 SHA512 77739c8c5e33e6a2afe92fd2c182c8470c7faa0dd907929b641de3a2aeaf0b01a321896302b246ef348a59bc8cb35b91adfce65148e10ac6aed9a5bd60d2d284
-EBUILD bitcoin-tx-0.20.1.ebuild 2438 BLAKE2B 22e6e37ca91de9a9690f88f0e7ed3b5ab59fbe5fdaf788865f6e9d27d6a647bf427aea8b046eaeac551b903c856efaa668a6a64770a046485cab7833d121d5ca SHA512 32441dd60d320a69873f369cb86fda61ba3983f3d6703d160a212d799a16defbbe9f15feeab58480808e58b9688a86256ddf6f9d9c1746f21e7c600258b2aaa5
+EBUILD bitcoin-tx-0.20.1.ebuild 2437 BLAKE2B c8074a6afe4498130392a0020577ca59f5f9d58dbe275744dad49d128a12a68a415901824ad7025d20f43ef1df92a6a51ecd9122a698ec4da3d67cf484aee454 SHA512 b1597b267c6507d513b1ad852b3d0249e1289fa9688093eb3dd1dc2a17d6556be47b2342b09450541c658c8d9d79ff82750075c89ebd8cae3fdea7d7ac911c44
 MISC metadata.xml 620 BLAKE2B e779b6a929a58fad28773a0aba3ef3112df14ce82ce62376b88cbc3519a857faaac6b580d2b5d866b0ec809062cf170e3c29324b03acc005246aea3cef9a0381 SHA512 c253ed29dff90ef2b9cd19b191ad870bd22cbdd371b2f353e724ba950735350225fe6d83c4ca8823ebb395dde9fb5004e781ff78987e2a30c0281ad5e0a4623a
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.20.1.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.20.1.ebuild
index 48114a6e5290..9fa58cb4a1b8 100644
--- a/dev-util/bitcoin-tx/bitcoin-tx-0.20.1.ebuild
+++ b/dev-util/bitcoin-tx/bitcoin-tx-0.20.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="knots"
 
 DEPEND="
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index 03edd4846bb8..9f3e89ba3496 100644
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -6,5 +6,7 @@ AUX boost-build-1.73.0-add-none-feature-options.patch 475 BLAKE2B 5211dbc9188056
 AUX boost-build-1.74.0-no-implicit-march-flags.patch 16904 BLAKE2B cd37f24ca075760dd220926b081ab898f0f61e9de22e1dbc119afd5d746f3a7d215065332c96af9f64299e9374d994655d196430ad7deac592a42e7d165b0bdf SHA512 d07b55530d26c63b7453d265e27ba6a1e902f67f2b74e581a0286f563e0b2afa833bbdeb625be1a0beec255ead811eecb10d3a6f45c27cb929dc224430c60a8c
 AUX site-config.jam 688 BLAKE2B e43a7ad1a94d113a7f890e8b634770f5c60556101d428d83f655bbbe72c46b587485886a9941d05a2ae4319fc325f1e0ecfb9b660158b81c5e9fd02e0b1c0530 SHA512 b65bf1be3133f9f66d3139b00f195a288591bb20a13ba35041507c2c33d7d2da6047c3b02dc27bc4eb21798b91e1262a60e294b7fd4af90808b9de0f5af517df
 DIST boost_1_74_0.tar.bz2 109600630 BLAKE2B 2982f64fccf6fdb3b4b74452e603f459242d7abb42df4162278d9b558b637786a2eb97442126967b19088d591777c64ced8f60a23e71eaa0b7545e80f800de63 SHA512 4ec9c1164ec9b95ce46ba1c073e586c94b3882dce5b7347ea14bbef0c1da230e12aa5328a501ce38cae1b1d7623daa3246325625899179b4cc309242540982a4
-EBUILD boost-build-1.74.0.ebuild 1970 BLAKE2B fe580d61fc9dc857728603a0736d300e879d1ebb67cceefd12658d4caf9aa3632dc18b48b6b58cc4483840bda0a14c72aed579163fe29749191d581e8e9f24fd SHA512 903cbcd060470d292fac6c19e4686bc52e33d3b5bf2f694bafe96221b7c58db0492742fd296346ad2485db2bdc728fba36931a93cb9f61a9d41804c9c69410ae
+DIST boost_1_75_0.tar.bz2 121849575 BLAKE2B ce7ecd8bcee518ce54f7e5302f202acbea60cedd6ae9248708c0bb5bbc2713607b2e1967a9e6f77cc20a4c008c1ee4db651def55937efc80407487a7a44fa8d6 SHA512 d86f060245e98dca5c7f3f831c98ea9ccbfa8310f20830dd913d9d4c939fbe7cb94accd35f1128e7c4faf6c27adb6f4bb54e5477a6bde983dfc7aa33c4eed03a
+EBUILD boost-build-1.74.0.ebuild 1961 BLAKE2B d64331c29bfc91853c23b28bd5c6ca9370e63250267c299ba8dfe5af8de815d51487f1a65d18c8950d291748e299108eb50a48415ab3ce30f374f84a5037f31c SHA512 96991c2021658412f421ccd6811bc5cc2f3c4193913cce4397b213deef2801b6ec8dc82ffecef46d8305eeab63d90e9e51ea14315b3920efb44ec4d9711f4712
+EBUILD boost-build-1.75.0.ebuild 2066 BLAKE2B d005e74572d73d1633356615312d91103d15e0887c556c9c6f3451709f1873ef2598faeadf0dbc72bca013a2396be86da8a1eec78a7c67ffab14923f12bd6cf1 SHA512 b1cdea0f568dfdbcd9d6c68cc40263c78ed8cd93fe4bd812477d0010e97de533d1a263758937558ca112a2fe249cd2b0af81713e901fe5d0f745f712a333f425
 MISC metadata.xml 329 BLAKE2B f492b1ba64c3f7bce1d3fb304bcff93357cc069dfd06b69c25cf26f4423ebea51ac4614a8d865635568f0e9db424a6904fc1edd5fa729243838e16e9887f4202 SHA512 57baf2d8e0a4c240d99f68ce122086a147d42145687b712609fdcd73b77fe3fdfecc1b078edb6a9c922213482fcc17c2fccb6762ec69890fbc9a912c4cb34827
diff --git a/dev-util/boost-build/boost-build-1.74.0.ebuild b/dev-util/boost-build/boost-build-1.74.0.ebuild
index 5074670c2b5d..696f4df0d5d8 100644
--- a/dev-util/boost-build/boost-build-1.74.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.74.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples"
 RESTRICT="test"
 
diff --git a/dev-util/boost-build/boost-build-1.75.0.ebuild b/dev-util/boost-build/boost-build-1.75.0.ebuild
new file mode 100644
index 000000000000..815dc83605be
--- /dev/null
+++ b/dev-util/boost-build/boost-build-1.75.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic prefix toolchain-funcs
+
+MY_PV="$(ver_rs 1- _)"
+
+DESCRIPTION="A system for large project software construction, simple to use and powerful"
+HOMEPAGE="https://boostorg.github.io/build/"
+SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar.bz2"
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="examples"
+RESTRICT="test"
+
+S="${WORKDIR}/boost_${MY_PV}/tools/build/src"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.71.0-disable_python_rpath.patch
+	"${FILESDIR}"/${PN}-1.71.0-darwin-gentoo-toolchain.patch
+	"${FILESDIR}"/${PN}-1.73.0-add-none-feature-options.patch
+	"${FILESDIR}"/${PN}-1.71.0-respect-c_ld-flags.patch
+	"${FILESDIR}"/${PN}-1.74.0-no-implicit-march-flags.patch
+)
+
+src_unpack() {
+	tar xojf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build || die "unpacking tar failed"
+}
+
+src_prepare() {
+	default
+
+	pushd .. >/dev/null || die
+	eapply "${FILESDIR}"/${PN}-1.71.0-fix-test.patch
+	popd >/dev/null || die
+}
+
+src_configure() {
+	tc-export CXX
+
+	# need to enable LFS explicitly for 64-bit offsets on 32-bit hosts (#761100)
+	append-lfs-flags
+}
+
+src_compile() {
+	cd engine || die
+	./build.sh cxx -d+2 --without-python || die "building bjam failed"
+}
+
+src_test() {
+	# Forget tests, bjam is a lost cause
+	:
+}
+
+src_install() {
+	dobin engine/{bjam,b2}
+
+	insinto /usr/share/boost-build
+	doins -r "${FILESDIR}/site-config.jam" \
+		../boost-build.jam bootstrap.jam build-system.jam ../example/user-config.jam *.py \
+		build kernel options tools util
+
+	find "${ED}"/usr/share/boost-build -iname '*.py' -delete || die
+
+	dodoc ../notes/{changes,release_procedure,build_dir_option,relative_source_paths}.txt
+
+	if use examples; then
+		docinto examples
+		dodoc -r ../example/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-util/bsdiff/Manifest b/dev-util/bsdiff/Manifest
index 2125e1dfef11..afd4e27db0ed 100644
--- a/dev-util/bsdiff/Manifest
+++ b/dev-util/bsdiff/Manifest
@@ -1,4 +1,4 @@
 AUX bsdiff-4.3-CVE-2014-9862.patch 304 BLAKE2B bf972f29b3ff36dad2fd656ddb9047ec0ef2b20d4d84f2e983d67478f471d1dcc82e6f577525549b7655c0f3608500dab172a39bced5cd4173fd83e05034bc22 SHA512 940c2cafc14e85a2cdd7f95d17de68f3a9d3e80828fcc302936e16a32733aa4a60d3ddb8fc9760e2fbd1fa626398669ef991688b26c23e8ff5c7e8d2612672ef
 DIST bsdiff-4.3.tar.gz 5740 BLAKE2B 869b957fac9de5977216b82ae46f5a291af4f64e8f4199b129b5e9963385e8f23d8593c307ddf953001fc54446ba66a0c57f9f9a841854afc3d32aee26fffc4e SHA512 bde46b393b74bcc9f05532ea4d45b12c104c4f182fdd49d4176aad5f02a2b357f435819f13a5a7ddefe27df0ca82980f06fad764094014a6d068622263e319c3
-EBUILD bsdiff-4.3-r4.ebuild 876 BLAKE2B b319605879842a0e6c34fed4c4d34f380cb2904e7841822c5516c504f2cce55a35b5015ba403ced81da8c30c0bdd2ccbee07b9595c3a468bf6e2ee9a8303b332 SHA512 3821af1a653d7d684d902f0e87b677032116a8ca7dca36d6f87a4cc376717aa4fc0ea078a2a262e3008ff501c1cb1111257cddffe28f189561ab6adb7024e8a1
+EBUILD bsdiff-4.3-r4.ebuild 877 BLAKE2B 9cc6a0989c62b4bcc6f8d1205b6f1fb0b7367c0143db53aa03f1dc575ae980966f3f9eea2444776306b62869770e0c928601359457ab32ace494a505abea94f4 SHA512 aec5380d82349b42ac618ee5f80382e1f2cf3f8983813b27cd78085f8fc6106da99042158084d6cba4f3898f800fcd9d236bc2ae7caa5b1501da24128971d0d5
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-util/bsdiff/bsdiff-4.3-r4.ebuild b/dev-util/bsdiff/bsdiff-4.3-r4.ebuild
index 0bda0b152631..08e45256bd2b 100644
--- a/dev-util/bsdiff/bsdiff-4.3-r4.ebuild
+++ b/dev-util/bsdiff/bsdiff-4.3-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.daemonology.net/bsdiff/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD-2"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="app-arch/bzip2"
 
diff --git a/dev-util/bustle/Manifest b/dev-util/bustle/Manifest
index b55afa2fe25b..fac14cf4e731 100644
--- a/dev-util/bustle/Manifest
+++ b/dev-util/bustle/Manifest
@@ -1,3 +1,3 @@
-DIST bustle-0.5.4.tar.gz 122720 BLAKE2B b5a2315919644ab5c7712f9e9bde1bdea226b4e8898981f7150558bde648a5c7965be6ad8484c09727665292e5fe3f0cb545544dbb27f2a2553e513910289620 SHA512 56eaeef831fb5929d57a008ae71d8409048ce5d12eaada98830ef742baf3479264203465d77591cb338374096eac2dc2b68b44f075b2761f16df63fad54b91fd
-EBUILD bustle-0.5.4.ebuild 1636 BLAKE2B 0c03d3dfb08c5b9b79b4df1685103cbfefb1c6dd3a2ac1b69fd0a5f026e847df00ea23278f308287624cb3a4212d17a430e525bb7bbb89eb48fc4184b66c36dd SHA512 c86f830a373349f256ab367617f0bd4ef460a843f6fc37f5ca8aa147921a45e211b3e2a025a23a2e43e2efcff278caed4e6335c2f2fdaf668d823e1a731cb264
-MISC metadata.xml 414 BLAKE2B 3a5af672c3f0594e7e2f3ee824e57f2c30fee5929dea367867e4a4e5cd8a3fd262ad1fc6f9b3af698f7e6bbe0d595cad7905ec161dd29dde679fc26d4066d2c9 SHA512 cf9665a6913dd717aee86974c51d519cc605a94de65c54cad33e00c8ef1cb7bf286ef081b0b0306a396f2122c7a16f7a93b9ce76e749b8b0bceacb7fcc92ab9a
+DIST bustle-0.8.0.tar.gz 101175 BLAKE2B 30359a51da16631eda8f74239de7955d5887e12e7e99853dd930b12b351a0dd56425487c339ddf297dae02b271019c11329130aa0caabc4bf0c87e21600b707b SHA512 92f4757c4ed9dd88bfa144a0626d7530b6a1f859a8069d8631a9990b6a523dbb59d573c6ba142614c371171ccf391a3e77d1e8ba0c2155ecf231f9e7aa735f72
+EBUILD bustle-0.8.0.ebuild 1503 BLAKE2B 5d8e656db77fbe5d4f480b3eb2c4d3bc250ec33f1ea88be44f9adb3bd770aeda50a81002432bc3f4a281228511739eb23801e6962334b154dd99f6d080c8c222 SHA512 294818518c6a600d12b38ac9b500ceb3db9f23bf61f1651a51a70e2a52bdc4c25364cd7e8b3fbec30c0f486f4a6da645bb3f6a05ffb8942234f83c26e3da1b1d
+MISC metadata.xml 883 BLAKE2B 20b27f6e236b75bc51e885700d41b3817b410d363a3fd35906e5403f805e167429227701a03ab40265199e3b436f814440ac5f6f5ccfbe9bc7d8bbada2ca0b24 SHA512 0cc6d7942fa68482f1bd72c33a4ace27b9f063a6c02be81f0e692b8372e9d8c8f683a5f1c6a858d85cd450089bfa38e23731c6befec9d29f9e875a26a39859cf
diff --git a/dev-util/bustle/bustle-0.5.4.ebuild b/dev-util/bustle/bustle-0.8.0.ebuild
index 6e92a1f7bcb4..cf60600336ea 100644
--- a/dev-util/bustle/bustle-0.5.4.ebuild
+++ b/dev-util/bustle/bustle-0.8.0.ebuild
@@ -1,42 +1,36 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-# ebuild generated by hackport 0.4.5.9999
+# ebuild generated by hackport 0.6.7.9999
+#hackport: flags: -hgettext
 
-CABAL_FEATURES="bin test-suite"
-inherit eutils haskell-cabal toolchain-funcs
+CABAL_FEATURES="test-suite"
+inherit haskell-cabal
 
 DESCRIPTION="Draw sequence diagrams of D-Bus traffic"
-HOMEPAGE="https://hackage.haskell.org/package/bustle"
+HOMEPAGE="https://gitlab.freedesktop.org/bustle/bustle#readme"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
-LICENSE="LGPL-2 GPL-2 GPL-3"
+LICENSE="LGPL-2.1 GPL-2 GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="interactivetests +threaded"
 
-RESTRICT=test # fails one propery test
-
 RDEPEND="dev-haskell/cairo:=
-	>=dev-haskell/dbus-0.10:=
 	dev-haskell/gio:=
 	dev-haskell/glib:=
-	>=dev-haskell/gtk3-0.13.7:0=
-	>=dev-haskell/hgettext-0.1.5:=
-	dev-haskell/mtl:=
+	dev-haskell/gtk3:=
+	>=dev-haskell/mtl-2.2.1:=
 	dev-haskell/pango:=
-	dev-haskell/parsec:=
-	dev-haskell/pcap:=
-	dev-haskell/setlocale:=
 	dev-haskell/text:=
-	>=dev-lang/ghc-7.4.1:=
+	>=dev-lang/ghc-8.4.3:=
 	dev-libs/glib:2
-	dev-perl/Locale-gettext
+	net-libs/libpcap
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
+	>=dev-haskell/cabal-2.2.0.1
 	virtual/pkgconfig
 	test? ( dev-haskell/hunit
 		dev-haskell/quickcheck
@@ -46,13 +40,14 @@ DEPEND="${RDEPEND}
 
 src_configure() {
 	haskell-cabal_src_configure \
+		--flag=-hgettext \
 		$(cabal_flag interactivetests interactivetests) \
 		$(cabal_flag threaded threaded)
 }
 
 src_compile() {
 	# compile haskell part
-	cabal_src_compile || die "could not build haskell parts"
+	haskell-cabal_src_compile || die "could not build haskell parts"
 
 	# compile C part
 	emake \
@@ -64,9 +59,9 @@ src_compile() {
 
 src_install() {
 	# install haskell part
-	cabal_src_install || die "could not install haskell parts"
+	haskell-cabal_src_install || die "could not install haskell parts"
 
 	dobin "${S}"/dist/build/bustle-pcap
 	doman bustle-pcap.1
-	dodoc README.md HACKING.md NEWS.md
+	dodoc README.md NEWS.md
 }
diff --git a/dev-util/bustle/metadata.xml b/dev-util/bustle/metadata.xml
index 00f0a89d7391..0941fe5a2e70 100644
--- a/dev-util/bustle/metadata.xml
+++ b/dev-util/bustle/metadata.xml
@@ -7,6 +7,9 @@
 	</maintainer>
 	<use>
 		<flag name="interactivetests">Build interactive test programs</flag>
-		<flag name="threaded">Build with support for multithreaded execution.</flag>
+		<flag name="threaded">Build with the multi-threaded runtime</flag>
 	</use>
+	<longdescription>
+		Bustle records and draws sequence diagrams of D-Bus activity, showing signal emissions, method calls and their corresponding returns, with timestamps for each individual event and the duration of each method call. This can help you check for unwanted D-Bus traffic, and pinpoint why your D-Bus-based application isn&#39;t performing as well as you like.  It also provides statistics like signal frequencies and average method call times.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-util/byacc/Manifest b/dev-util/byacc/Manifest
index 5aab5242a72b..cb6891a22f33 100644
--- a/dev-util/byacc/Manifest
+++ b/dev-util/byacc/Manifest
@@ -1,5 +1,5 @@
 DIST byacc-20200330.tgz 872217 BLAKE2B 870ac1eeb439c96875e343223925414115b500d5b22ccdae9d7b30830ff6805d18d5bc43ec6f7ae1237ec500cfa1693aefad6e9607cfcc74188b541abfd16595 SHA512 df8cc1aa550d633ab547a13a4f091d8c940a9a67b52dc5ecacad5b005fd54c3ceb1269593068c1a7949049e85b6e6eea20cffbbf4b408e049fde75c0ffe51f07
 DIST byacc-20200910.tgz 871242 BLAKE2B de0f63b9edfb9451e23d7693daaea59f2661305a6727cd8e986c2557e513ca5dda8f0008d05b5c8f35a153a309bc4b02ecd6f45219bb553f928c9da11b616130 SHA512 491bbde2d5b0fdf2ad57bec5080112ad7c12ce3830b5e14f2289092aad1addae6edd4698368a9c8d69219a95ae5fa47eb32a95a2625841915297972591bebea3
-EBUILD byacc-20200330.ebuild 615 BLAKE2B ab2446c14262888052f7d370a0c2c104eaa7430ef9b95a4c19087e3bf074b995261e5a9428c78e865a6e203cafeae1b747a60ecc4bb946418c4febd617f244de SHA512 4427ce8d462725709c15b6ee87fd47918ba76a71cffd2a74d531eafa5a57b90150820f67e400d17c5953a0872451a8e069a283705f7ee88ae3771cf90e4e8dcb
-EBUILD byacc-20200910.ebuild 624 BLAKE2B 8828020e31c2c22c33929d4c89d5d87fd8597b78835f12868e92cec5617e7c4ea56490a801f76494c6800e69da806f8ca19dc3f5f09bedc3924aa9abf15d7ec0 SHA512 ef316d3081e414c934fccc62c4d47da6950426484a16b7a283f2a59eaae38ab0e1e67dc5ca13a3f1bfea8844b3f70af9b7b188ae4fa8df21942ede1f6425fafc
+EBUILD byacc-20200330.ebuild 607 BLAKE2B 3d2556c9c9f4fafec8f8bc16a629c571c81a7f2d1c96dc02509e08aee418d2ddc7040e6dc9d2c182e5edc22c1f4145103dc0b324ec803d11fb97ec1d3c871bea SHA512 56a802bb5e0eeb14b5573f2f9e1a5762b9b3f2ac5ba924985d2d94fbb72513119f7ad5e51d43b5888d04038b7302b35413c5131b8e3b9f6acd28d263408ec7f8
+EBUILD byacc-20200910.ebuild 615 BLAKE2B 0cddb275379572a2a960c5f6dd1362e292761aae469f856c921a4306371829f35b0817f18b354b56c382473366d1ea317c3ad4dedee66fa7c151872c3a98ed82 SHA512 8e18e54e43ed2789c89f6e819980b9b0cc3c574cea00d929a1db0cb88b2c25184335ecc9336c61ba65da5b4df1a762bd23908b391921cc358648566917e2fd00
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-util/byacc/byacc-20200330.ebuild b/dev-util/byacc/byacc-20200330.ebuild
index 5a73d932b404..0c8d784cab36 100644
--- a/dev-util/byacc/byacc-20200330.ebuild
+++ b/dev-util/byacc/byacc-20200330.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://invisible-mirror.net/archives/byacc/${P}.tgz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
 
diff --git a/dev-util/byacc/byacc-20200910.ebuild b/dev-util/byacc/byacc-20200910.ebuild
index dd0f7b254f65..750133357411 100644
--- a/dev-util/byacc/byacc-20200910.ebuild
+++ b/dev-util/byacc/byacc-20200910.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://invisible-mirror.net/archives/byacc/${P}.tgz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
 
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index f98fca802fca..e029c5d13a59 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,6 +1,6 @@
 DIST catalyst-3.0.14.tar.bz2 621178 BLAKE2B 3fa87125f14661bb77432267f03c0966eff8f71f4ef334ce0a14218f7557dee270840afb79b6735a149851ed44b1ea2f6cf59d8274d74e049246d89874aa484b SHA512 938a63a83458fa5a26a4b4e62d18086ed813aec5638a9dd363ba553cb7aeb337c3b8ba0768f3b5a658aa54f2f375a7fe067279c739073d2420c3ad3a42830830
 DIST catalyst-3.0.15.tar.bz2 621366 BLAKE2B 890381a3ed53bd28eb110a95b98fbdac83d1ee72e935919a47a5bae29f672edb1943fdf5f259572ede578c0253e55a39f25fba88109e6d9bc5af0d3e344c2db2 SHA512 ed543b995664a5786790990cb4729e84a705820d1e72eefb432c3622bb2307646a0ee753eaaafac93bda04df130e83dd6db6b59052c4bae6347b77dabd67b2d5
-EBUILD catalyst-3.0.14.ebuild 1913 BLAKE2B 2db4135e9407c87207c82b1840730eaf99564804a85724e67c8d37c458538297915ef7f032477493bace51a49fc96e185b2d2a5894ed9757951c338cf29142c2 SHA512 ddec3a42d64f74b99c676a6a2c142e105e10f50930bae2309053c854607ea6d9ba11b1589cc172cf71a6a5c83319a6fac7344b549b4811db7aa7afcf53c87771
-EBUILD catalyst-3.0.15.ebuild 1911 BLAKE2B cb5cdf33e45e54e4da861722d1397e4f5fc668a46df2f468f970806d5269422a8202d6618c74f64c2e00628a290cde75732cc46d2deb9855f39485f576522a4a SHA512 37fcd1eb807a304b1f09e90fb396b4c6c0cf42605d3888523cde5a97469d794e3eb05be44ce660688fb1afa2ce81cd539a969d55d5733445ba12c0e5fa47188f
+EBUILD catalyst-3.0.14.ebuild 1914 BLAKE2B 34e4d2c846507c2d4d6526c6b422479ee69f4db1ee0c63a7e4cd387b6cbb917a8dbac625945cc9cd08153a080c1ee04f5e851a963b2c2f8abd23f88e24c600ba SHA512 5836e74f63ba608b54ddba3c55bb7edd440437e6e46d34be7ba245efc24acc28fe63a19ed67aa0521334026baff8d81f22abffff297651ffcd6c522ce1ae0158
+EBUILD catalyst-3.0.15.ebuild 1912 BLAKE2B 27c3d0a80d66e313dda8a8d92a3a512c84c3aa90e0dd28662e664ad38bcd00f5106da46719d1043c94e6624b453043a1900614d3a4bf96a0798bb0b783ef2d0a SHA512 da9417964fe21622b491cff94d1bb8727a57d63e552ed6bb7acd442ffc2b939e8beb2d2a949218305e7887f06b3888387922d1c168748340dcaac46fc6159580
 EBUILD catalyst-9999.ebuild 2324 BLAKE2B c32b5b5df4034b11e0c38c04aba755af3608500c07eccb866c9e147d52a533ccdd0b79596429be8077dff69d3fb637246b621bc676459a42a29f4af35d5df767 SHA512 11b29d6629f5c33546aa41a72b541a9efb99ef42c00bc6603f736e5ac5d70f23964678abf8103fb095ab07d695eab6ff008bf3d8c1c28c1781408a152f8a2082
 MISC metadata.xml 512 BLAKE2B 27e0e3638c330c780f163608e5e62b71ed636a2e26291f97465c4506ae1b99345d081046bcab70b1bf56e36c5b9a6b8220b94da8433f2b313235c784ad6b9b5f SHA512 7d6683e83df2d311f3210af91880486ede8f7ddea57044e765f29694eb3e1b8df6f3d22c9a729c480ae9d49ebe3778cfe7a6509365f59eaae34f8438afe97afd
diff --git a/dev-util/catalyst/catalyst-3.0.14.ebuild b/dev-util/catalyst/catalyst-3.0.14.ebuild
index 5294c9749a86..97a36ceb337e 100644
--- a/dev-util/catalyst/catalyst-3.0.14.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.14.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_BRANCH="master"
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
 fi
 
 PYTHON_COMPAT=( python3_{6,7,8} )
diff --git a/dev-util/catalyst/catalyst-3.0.15.ebuild b/dev-util/catalyst/catalyst-3.0.15.ebuild
index f1c19554ff9f..faee3ee3c2b4 100644
--- a/dev-util/catalyst/catalyst-3.0.15.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.15.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_BRANCH="master"
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
 fi
 
 PYTHON_COMPAT=( python3_{7,8} )
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 96b3ab10a55b..dd42465a02ba 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -5,6 +5,6 @@ AUX ccache-4.1-avoid-run-user.patch 557 BLAKE2B 956ac163da6c8acdefb5b39554906727
 AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b30c381b0df28be9c0ae7c0f1d7325282e97ca54881171846c13945b264bd4a793785ff1a19d0941669 SHA512 05d512b001b6a2fdc947d10d810c89683144080a060c24a37422e9b587594e1ee42fa1d7607461571f196819dae92146d861e8ae116e9226e1ff97ea035b3003
 DIST ccache-3.7.12.tar.xz 354684 BLAKE2B b0b1028ede8206622c4b563cdc1351bdbe49ac11aa92d405c778af91db5bac029f7331371ef0a55bc3b1c7a0b60fbc5711277e048481bf0f4ad4b1be8acd3495 SHA512 0eb47869f86d36b3e5fad0d5073973f0444f3efe23fd14469a9e05154ea219228443098b1c5e4a8a0c5c78b4bfa7623735b50ebd6b8b4d0626766061850d6a62
 DIST ccache-4.1.tar.xz 389240 BLAKE2B 265ed6cd9602a04db0fadf63266d0fe1e78a74c69a27f05854a287e4048934d6afd63e71987bc525217782075c1a158601c400f3418caa0eb9730f34275bd08c SHA512 e80075eeea3fef8215de0a793e02381bfb59d7e74237fa34a49306047c60f0de0e678396ad3a9e5d86d3ad2aa21bbe29c7f0055f06b3ba2470f6895ce2eedd7b
-EBUILD ccache-3.7.12.ebuild 1530 BLAKE2B 6ea1ab50007e06e65ec0a5115a05d052bd529ca672a7fa53661ff45b6c388f7b5807f2f2f2bd1ef93ee46668e6f31406aaee905a7c68afc6acc39352ebf2934e SHA512 e34c1ee340602cfdeb3e83d92a299af71a36c217037a8f703796b3595ab8c38ae84c63ba79117d583857a59b30218da7025f22469c7c52d4f06305b5542fd398
-EBUILD ccache-4.1.ebuild 1523 BLAKE2B 608a809f9286d85c9ef4fb45cd17c7c27f3e49f9740e674e2d0033c83d87b1a06fb80f36a5bcdcbc8d28261ac4ae56f9fc39a810bf8143d671633ed803200b99 SHA512 f21adb2004c0916331fb0d4ab9c08624a95be808ef94262af9758ce2b4041336213d0cfdd5034ad49e1416e16f639a61beb53a6446df3cdb2be623feaafbd00b
+EBUILD ccache-3.7.12.ebuild 1531 BLAKE2B 135f010762040f4a6141d67016db66e4e10dcda9bf7e6a25733e1bda77988a50bccd52afc647e3227e71b05373f12d4d1317692672a89a4f1e6e5b8b9eea9fec SHA512 8b0a26a598f3cd704527e6657cdc393a1e13ab4ab83bae67744e8439a71761b98fc727b11b65676c79f972d90979a2b027cb2fdcb4a00fc5e71dbf5537b012a6
+EBUILD ccache-4.1.ebuild 1732 BLAKE2B 13c1ca12df94e8381399b5eb10b776e2308e64f69d4f1432d52dc893276eaf2de9e216f440892cad9f9146240e0535df2827f67bd38708efe125edbb74c853f1 SHA512 6debc4cf4c087ad020879efaf1b0297b30f293f6b3d229db20318622ed3948cffd11830a859462baca58ccda851e4c34ee7240d654747bca30adf6778fb5aaa2
 MISC metadata.xml 445 BLAKE2B 8ef8f120989420428ea85108180c659c72a7553f3f20ab96597d26aa04b059f491aeae8c887697a214c437f2dba30fbb934cb47c1db93821eda7dd489e6cb693 SHA512 41ffcad23c9f0274c48a058090d6404cd782dea6674b81615a6b3b7fa272ff5df4c68404fb4dcdb9d2275c13fb137f21f0f65232d5fb1ef6152cc25213893249
diff --git a/dev-util/ccache/ccache-3.7.12.ebuild b/dev-util/ccache/ccache-3.7.12.ebuild
index 5dfae60d7ef7..5300a828d02a 100644
--- a/dev-util/ccache/ccache-3.7.12.ebuild
+++ b/dev-util/ccache/ccache-3.7.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.
 
 LICENSE="GPL-3"
 SLOT="0"
-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"
 IUSE="test"
 
 DEPEND="app-arch/xz-utils
diff --git a/dev-util/ccache/ccache-4.1.ebuild b/dev-util/ccache/ccache-4.1.ebuild
index 6e6b4021efcc..11644f232e31 100644
--- a/dev-util/ccache/ccache-4.1.ebuild
+++ b/dev-util/ccache/ccache-4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-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"
 IUSE="test"
 
 DEPEND=""
@@ -46,6 +46,14 @@ src_prepare() {
 		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
 		"${FILESDIR}"/ccache-config-3 > ccache-config || die
 
+	# Avoid non-ASCII double quotes as they fail on
+	# LANG=fr_FR.iso885915@euro: #762814.
+	sed \
+		-e 's/\xE2\x80\x99/'\''/g' \
+		-e 's/\xE2\x80\x9C/"/g' \
+		-e 's/\xE2\x80\x9D/"/g' \
+		-i doc/MANUAL.adoc || die
+
 	# mainly used in tests
 	tc-export CC OBJDUMP
 }
diff --git a/dev-util/ccls/Manifest b/dev-util/ccls/Manifest
index dd7e6882e4b4..d0539a8c6bae 100644
--- a/dev-util/ccls/Manifest
+++ b/dev-util/ccls/Manifest
@@ -1,9 +1,5 @@
 AUX ccls-0.20190823.6-cmake-support-CLANG_LINK_CLANG_DYLIB.patch 1197 BLAKE2B c15211d1c4a63c9c75aef0cd4cf1a545a6b9a81e48fce9363e20483a7cb8d28bfa2ef978c127c324b2e089eb78bea214bdd7277e75a1a099ea03deb6571c5023 SHA512 c2ea4edd9ba56262e8122c8e0da11210f0c2ca6bfe6f404b0d0e745d5927dacdb1ad11824b5c78e8ea326365b50f55d9a229b3c6055c8b529cea9d6c4fc5fa9f
-DIST ccls-0.20190823.6.tar.gz 158158 BLAKE2B f2957b310f1bddc17a498191d315327adbeed72ecf3a60f2abde2fe1af8341246670d779807dcfaf98217f648d4fbe5914e4f64108cfe7a3f68e62b00e96dcaa SHA512 c6df96e304f5b7381c67eda4c1bd05873a85fb0d0983b3abcc507987a402860aa6660079a0e7b125f5cda22047da936239480aa0b604cd2598f84a4b9e9c3bdd
-DIST ccls-0.20201025.tar.gz 160524 BLAKE2B e4819b465a862195921ac33bdfd844b1921887a4f7211b7d826b8e8e49394dcb598681ba57b5f8c2eb35d5910e3689619ecaaa1fe080d8088937b0eecc2487c9 SHA512 485a42671265a0f76e87f456c6c96137a2f17c60e0c1f45a1979342c9b9fd373303a017126c8bc4649b75225cec7bb3c759a78fecc42f7403e913c6121d1e948
 DIST ccls-0.20201219.tar.gz 160445 BLAKE2B 8d3f536ec13673e7251f09de992f24d88066787442940e3e0913ee201111e97c0d145d8a57b4fcdfeaa886fd5bf5e5be621ef54e307cd08cca8e516103a9c573 SHA512 fba8cc1ec50e55939b2deb167d9d32e946ccab4b322766191a787719b47a39e887afad26b7364dfb40c4a4f2522964af76fc7f51a5d84c10d2b0125f07a19c5e
-EBUILD ccls-0.20190823.6.ebuild 803 BLAKE2B 9e6bea6e9dca2320d3bd808aef146d2fde415c332557ef9f5a5aff8315805ab3cf62bde6f72c6dfb8d389d778f036882df66caeabfa0ecd7178c342895a7fd86 SHA512 a4435fbd148b5e35b61e51502a5705444c24ccaabd50e57a2cd0fa3fcdfa579f18afa78819a67e55e7332a09ce6287d7e9702b48ecb0cc8f69d7168f50cafd80
-EBUILD ccls-0.20201025.ebuild 727 BLAKE2B b5259dba8a7f535857c185da4bb53004ca3eabd8295ab4fc3f0b9843cb21abcfe31ef5db7436405811436bdb80698d75368d64c1a6f14d6a97bcb1bd8c11c5d9 SHA512 bd20ed44f154d1f0e2d7d11a7560c47a849ce8d47bf18662368526655f56e539cab795326617d83d58a25e5f634b8b874da6d06133514f18d664f9d4c16f715c
-EBUILD ccls-0.20201219.ebuild 727 BLAKE2B b5259dba8a7f535857c185da4bb53004ca3eabd8295ab4fc3f0b9843cb21abcfe31ef5db7436405811436bdb80698d75368d64c1a6f14d6a97bcb1bd8c11c5d9 SHA512 bd20ed44f154d1f0e2d7d11a7560c47a849ce8d47bf18662368526655f56e539cab795326617d83d58a25e5f634b8b874da6d06133514f18d664f9d4c16f715c
-EBUILD ccls-9999.ebuild 727 BLAKE2B b5259dba8a7f535857c185da4bb53004ca3eabd8295ab4fc3f0b9843cb21abcfe31ef5db7436405811436bdb80698d75368d64c1a6f14d6a97bcb1bd8c11c5d9 SHA512 bd20ed44f154d1f0e2d7d11a7560c47a849ce8d47bf18662368526655f56e539cab795326617d83d58a25e5f634b8b874da6d06133514f18d664f9d4c16f715c
+EBUILD ccls-0.20201219.ebuild 750 BLAKE2B b3389e27c7e55d4e29d71a363f1de355bde157d9e45d2c38cfc840ad9c5a3e5dfed6f463ffa52232957b2747297a8324b2440ec05fade52bd8e02f2438f925b7 SHA512 dfcfec985ed57785ae78c73828885e1077c3e2bf8c2033fee15b5ed94d1336970cf4be16799d5e2719cf7c7e02a70ebd85290c9fdd489852c57a947214740775
+EBUILD ccls-9999.ebuild 750 BLAKE2B b3389e27c7e55d4e29d71a363f1de355bde157d9e45d2c38cfc840ad9c5a3e5dfed6f463ffa52232957b2747297a8324b2440ec05fade52bd8e02f2438f925b7 SHA512 dfcfec985ed57785ae78c73828885e1077c3e2bf8c2033fee15b5ed94d1336970cf4be16799d5e2719cf7c7e02a70ebd85290c9fdd489852c57a947214740775
 MISC metadata.xml 323 BLAKE2B 0a85191d1996e2f30d149c30bb73ffc49f95600b8a08f5a8ee4a6aede0671d0b14f2de04173e4bb1ba0b9f6e09e79316d1f7de33b490d3ce815b8ab7b29f5f91 SHA512 da5bf276e9237df06298b14f68be2f57ef5ace58aea180623bc896a2f05dd5e6809b0409ac3ffba0e2c26d854b7d3b47f8e47caec0082e9397f5dc4037f549ad
diff --git a/dev-util/ccls/ccls-0.20190823.6.ebuild b/dev-util/ccls/ccls-0.20190823.6.ebuild
deleted file mode 100644
index 791e2522eef7..000000000000
--- a/dev-util/ccls/ccls-0.20190823.6.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_REPO_URI="https://github.com/MaskRay/${PN}"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-inherit cmake ${GIT_ECLASS}
-
-DESCRIPTION="C/C++/ObjC language server"
-HOMEPAGE="https://github.com/MaskRay/ccls"
-
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/MaskRay/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-libs/rapidjson
-	sys-devel/clang:=
-	sys-devel/llvm:=
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-cmake-support-CLANG_LINK_CLANG_DYLIB.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_SYSTEM_RAPIDJSON=ON
-		-DCLANG_LINK_CLANG_DYLIB=1
-	)
-	cmake_src_configure
-}
diff --git a/dev-util/ccls/ccls-0.20201025.ebuild b/dev-util/ccls/ccls-0.20201025.ebuild
deleted file mode 100644
index ac5830184a31..000000000000
--- a/dev-util/ccls/ccls-0.20201025.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_REPO_URI="https://github.com/MaskRay/${PN}"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-inherit cmake ${GIT_ECLASS}
-
-DESCRIPTION="C/C++/ObjC language server"
-HOMEPAGE="https://github.com/MaskRay/ccls"
-
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/MaskRay/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-libs/rapidjson
-	sys-devel/clang:=
-	sys-devel/llvm:=
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_SYSTEM_RAPIDJSON=ON
-		-DCLANG_LINK_CLANG_DYLIB=1
-	)
-	cmake_src_configure
-}
diff --git a/dev-util/ccls/ccls-0.20201219.ebuild b/dev-util/ccls/ccls-0.20201219.ebuild
index ac5830184a31..377cc36c8068 100644
--- a/dev-util/ccls/ccls-0.20201219.ebuild
+++ b/dev-util/ccls/ccls-0.20201219.ebuild
@@ -34,6 +34,7 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
+		-DCCLS_VERSION=${PV}
 		-DUSE_SYSTEM_RAPIDJSON=ON
 		-DCLANG_LINK_CLANG_DYLIB=1
 	)
diff --git a/dev-util/ccls/ccls-9999.ebuild b/dev-util/ccls/ccls-9999.ebuild
index ac5830184a31..377cc36c8068 100644
--- a/dev-util/ccls/ccls-9999.ebuild
+++ b/dev-util/ccls/ccls-9999.ebuild
@@ -34,6 +34,7 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
+		-DCCLS_VERSION=${PV}
 		-DUSE_SYSTEM_RAPIDJSON=ON
 		-DCLANG_LINK_CLANG_DYLIB=1
 	)
diff --git a/dev-util/cgvg/Manifest b/dev-util/cgvg/Manifest
index 18c15715ffb0..99ee14d8ed07 100644
--- a/dev-util/cgvg/Manifest
+++ b/dev-util/cgvg/Manifest
@@ -1,3 +1,3 @@
 DIST cgvg-1.6.3.tar.gz 42130 BLAKE2B e272a42cbc2c5edf08459273eb9f71036ec1afde4d20bb39593028eaf40026b83707b327ef8892a39b1e6f0f399dff3b52f9ff023e9092e26439d1e935da99d5 SHA512 9aeebd0952fc6a99ebeca54bbc54f9ff8858baed3b6c16ae391c033ba6ec6c411e34da88e25ec1208c8f0c536a47424ef09af15bf650485d54921b33c652e0ab
-EBUILD cgvg-1.6.3.ebuild 414 BLAKE2B 1fd0c6e1b45bb4ca90cd2711ff4f6453cf0cd5b20050b314bbfa914bab72a785c2f3015af6fa6d5851c24540200114483f7a3fdd6120335289ba73e7585d48e9 SHA512 8808b79c33b17d2de9212807b1e018e9fa0602172ce8bf979db50ade4f0ff4f9e18b998c4d3ca7bc442cdc789da4e65ef360a7e46045a8db4a520e5a7b3c4c48
+EBUILD cgvg-1.6.3.ebuild 415 BLAKE2B 7128e1306b6fe436c60293ba57ee7a0bcfdc6424712c6106bbb2a6c618c88725be8db47ae27141b36cffa0317d3c603bb1157889e9a93095c7000d5cd53873a9 SHA512 2b179dfb0ff21c004f8af119ad75bc2be9af38602396fdbdfa9f0edc2b7b4ae1f0898361a6700d69c2589384bcfa09f2ab3963ab3a43901ab2e0613f1b27341f
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-util/cgvg/cgvg-1.6.3.ebuild b/dev-util/cgvg/cgvg-1.6.3.ebuild
index 8bae6193b127..a65b759b2995 100644
--- a/dev-util/cgvg/cgvg-1.6.3.ebuild
+++ b/dev-util/cgvg/cgvg-1.6.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://uzix.org/cgvg/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 
 RDEPEND="dev-lang/perl"
 DEPEND="${RDEPEND}"
diff --git a/dev-util/checkbashisms/Manifest b/dev-util/checkbashisms/Manifest
index beb0c464618f..fc40bbaefb86 100644
--- a/dev-util/checkbashisms/Manifest
+++ b/dev-util/checkbashisms/Manifest
@@ -9,6 +9,6 @@ EBUILD checkbashisms-2.19.7.ebuild 842 BLAKE2B be6ec30a86a521baba5ffea3003dd5e77
 EBUILD checkbashisms-2.20.1.ebuild 844 BLAKE2B 32ae094871d3c8854b76228ff850385b7ad6ef8acc540adf30daec20890014ff3ce9c28ff60a36172293b9349b765bf8a88f98e36cc064282862e5ccca5d78bd SHA512 69ae2da6c4f081fc81fe7a216f0d3f852a68ceb6ff54c2041130008bdc9cd1ba7cfe639cf4cf15f867dc024507d8a57f92a9d126bd3e7caf754f2e55564e717a
 EBUILD checkbashisms-2.20.2.ebuild 844 BLAKE2B 32ae094871d3c8854b76228ff850385b7ad6ef8acc540adf30daec20890014ff3ce9c28ff60a36172293b9349b765bf8a88f98e36cc064282862e5ccca5d78bd SHA512 69ae2da6c4f081fc81fe7a216f0d3f852a68ceb6ff54c2041130008bdc9cd1ba7cfe639cf4cf15f867dc024507d8a57f92a9d126bd3e7caf754f2e55564e717a
 EBUILD checkbashisms-2.20.3.ebuild 787 BLAKE2B 6bda04ce6fdbdbade2d28bef48d153adb73aa5f385b6cbcbe83966240cbfb2576372d0fa1ba7acd2c977376129ab8b1c9d4691c0882467f96d949fcae1842fad SHA512 67e1df0ec01650605b34329d075db5fe3489cd6f6b9907f52f17583727d86e2aa743f4fc123328207194f8259e220a4caaa6ec7dbbabec58fb4965ce4becf251
-EBUILD checkbashisms-2.20.4.ebuild 787 BLAKE2B 6bda04ce6fdbdbade2d28bef48d153adb73aa5f385b6cbcbe83966240cbfb2576372d0fa1ba7acd2c977376129ab8b1c9d4691c0882467f96d949fcae1842fad SHA512 67e1df0ec01650605b34329d075db5fe3489cd6f6b9907f52f17583727d86e2aa743f4fc123328207194f8259e220a4caaa6ec7dbbabec58fb4965ce4becf251
+EBUILD checkbashisms-2.20.4.ebuild 786 BLAKE2B 1b93b8fb4986191e66feb616eb88b9f6a9abc947474c2dc31cbc808d158d70140e35de6a839c5c3fd4d938360c37264c0544ce886084fa4c200d265c3803688d SHA512 a1af19e547fa711d48fe4cae6202bccea9e39c29581c283e2c3b4f6aa6039dbb97b7545bc6a018948ac3808b7fb5788043a380eb235963d91ecc67999cc3e0f2
 EBUILD checkbashisms-2.20.5.ebuild 787 BLAKE2B 6bda04ce6fdbdbade2d28bef48d153adb73aa5f385b6cbcbe83966240cbfb2576372d0fa1ba7acd2c977376129ab8b1c9d4691c0882467f96d949fcae1842fad SHA512 67e1df0ec01650605b34329d075db5fe3489cd6f6b9907f52f17583727d86e2aa743f4fc123328207194f8259e220a4caaa6ec7dbbabec58fb4965ce4becf251
 MISC metadata.xml 433 BLAKE2B b54d1290789d3ce8931f832c8c1ca7a56fbdebe85c0a81c32a929168fdf2d5a7be0dea01881e8fcc583061db1a071d1787723c9342c77a5862e228f0203c178b SHA512 945c3b95a61d4219e98ce5be3aed255cb148867409aca572714e8679bf623ee0c3396966cd80d783ace60bae7e6c01b85fad6c7f7ac9056422d732ed07f54716
diff --git a/dev-util/checkbashisms/checkbashisms-2.20.4.ebuild b/dev-util/checkbashisms/checkbashisms-2.20.4.ebuild
index 1d567b48dc59..32be772e7f94 100644
--- a/dev-util/checkbashisms/checkbashisms-2.20.4.ebuild
+++ b/dev-util/checkbashisms/checkbashisms-2.20.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 # Requires python packages to check tools we don't need anyway
diff --git a/dev-util/clazy/Manifest b/dev-util/clazy/Manifest
index d146228f717e..984366198d8f 100644
--- a/dev-util/clazy/Manifest
+++ b/dev-util/clazy/Manifest
@@ -4,5 +4,5 @@ AUX clazy-1.7-llvm11-2.patch 1099 BLAKE2B edfb1cc1fe2cc864115772fc7e81b5e03a850a
 DIST clazy-1.7.tar.xz 371788 BLAKE2B 281acd0164cf76510e46883fff7269aa77e4b815d6d0ca5a54307165ff8f4355e095b82e0c41cdb0af391f4a15048a8d64b2a2a7b9dabc042b36ba1a380405cc SHA512 3dba993140f3d69aac8d9cf3fa49db990185928647193220b689773bbca70f9fd9ee7fc52022e6029b3c0c81800301a593bd79edee7e1fa6c5884782d390ced6
 DIST clazy-1.8.tar.xz 392328 BLAKE2B 9ece9d279b2bd7e4c15ad35d9943636a107abd47cf0ed0b20db305b1684610fb84c6f9c7f606f159f0b5a48b881506796f0addf12246f2e9929a08225fcc5c74 SHA512 c43a393721a5235ddcd653f9c322e0a215f86add3b1ce42f849677c108cd21209693c6e8f225171db88032c75596722109ee01bc53db4af90fe7652f27c1eba5
 EBUILD clazy-1.7-r1.ebuild 1078 BLAKE2B 5c83d2becd0459d44e5c979b55f34a774fc7186d2d1a2079926eb97e897f79e1e94f99e626b89c9bc6c5ce7f83147dd2f9715552f6093c9488ef586100f3817d SHA512 33e99ee100bf49ee03ee947b0ab17cdb0ca4e5cce46568e761ae298d6f46e8a71c997d25ab05352661b54584f89a256751c8b529ff71d20cd11df31e5e50f0e1
-EBUILD clazy-1.8.ebuild 1003 BLAKE2B 674376c6addfb20215e798f716fd224a0d66bd51e0b37fee6b7ad38d4f269b1b57d7d58dd9ebf2b118e13040639a6d03c83771d8d75650e692fe93b8fa0f87ba SHA512 90453e74bcc4ad088ffa7281f4f1381402671f56172970fe683385d67e5a3b374ebe7f8710209b48d9bdc0aaebe8306c29b388d75788380b9435aa24363b122e
+EBUILD clazy-1.8.ebuild 1001 BLAKE2B 92787899c7c66ac533cb68092bc82c385808654933d9a8e68182984580189507142a312f2bd0b261ef870908fbec67b4f928bb731e3702e07d8bfa443ddf386c SHA512 9df9c7e9ed9347527c5e590896ce3e781cfa3f3a814e742b2bc7db05c8ef2cf1c531e9ba2a6ffc6ddf616f746574c7b9cb67ae4a1d1dff6106ee6912e1c3cd81
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/clazy/clazy-1.8.ebuild b/dev-util/clazy/clazy-1.8.ebuild
index fdc21c991d41..3c4620309b42 100644
--- a/dev-util/clazy/clazy-1.8.ebuild
+++ b/dev-util/clazy/clazy-1.8.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-util/colm/Manifest b/dev-util/colm/Manifest
index c599c0105780..a6685a728d47 100644
--- a/dev-util/colm/Manifest
+++ b/dev-util/colm/Manifest
@@ -6,5 +6,5 @@ EBUILD colm-0.13.0.4.ebuild 369 BLAKE2B 14ff1f1c4734a24f425a509d5c052a9a1d8ec2ac
 EBUILD colm-0.13.0.5.ebuild 493 BLAKE2B 1db4cd9d96b82533efaf02912860354d02afadc9db9efcd753717fa8640c31fa23b375cdd6db8d87872accf1cf89931a73f76ec454fb435d2ac6c3aec08d5b1d SHA512 78358f795c3344b0705c9a50906696781dc835c8b600f8dc2fe3c64e5f3451329405dc3cd1496893059b2d09f9f49f261f497c370a674840713d7d7459a47793
 EBUILD colm-0.13.0.6-r1.ebuild 495 BLAKE2B da89d4c288e2fac01b749a1021722d1a8e20d9ab2d9665a34b88d3711d7adeb080e16e8dcbed189ebf61508ecf595b5cd01411febc652a79f2e2689280c3d701 SHA512 f041d1089febd167ea240289d0c8e1876a74093204d3a866310ec4547a274ba4015a04f8329fcaf0d7df9f10ae362badbe18f04858a0fffbf675fcf4fdae1b63
 EBUILD colm-0.13.0.6.ebuild 390 BLAKE2B cdc09b52c1787783cfe49fe1361559b0c5317d9ce9db7b0116f393fd818c17027b257685b15ee06e0cdc7fc3d9779e977dcd97d88ba63306c8cce5dd2bb1ca4d SHA512 1943cd5be8929df9a5c119a7cc9362ba1936440fc2fd77f3a80b1c94e5107709af590987dc32067cdfbea0daf9486e235bdbb3c7035c1bcdc2b57731a536302a
-EBUILD colm-0.13.0.7.ebuild 544 BLAKE2B 692afe01d09a7b165da07004e272ba82117b4784004763b5b12cd0af53839885c1d9911b9cdcb2ffa1f91e98709a95be817b1fcaebe3f2434df07ad6a3a0bbda SHA512 202e8e5621bff37ba41ce18f47c3f2cb4bdf2bcd1f4f737f1548b8f19a37c04b5d6ba03c22fe27b1bdcdf1c9a4582b38fab2a17b86e8f9cff9ce06e996fed709
+EBUILD colm-0.13.0.7.ebuild 541 BLAKE2B 23eeb84a992e4d0079f275026b95600dcfcdf7ce741a2ad77415158c1447067232e468fb637c4cb02f3e0821642df523d8973e1165b1509dc6cd99f20dfd954e SHA512 f265a7869018e3b86f4de6d301fd69b8f068180d851a467cbbfb425935feb734c76de28736eab1b028926736628fe863d5acde840557d12fbfeca096108ee020
 MISC metadata.xml 253 BLAKE2B 7dac7f77dcc8de31f439cc6d7770a503f95be9c2f8ae57df9e725df941e2b31a90a43664a485a5fad9510b9ae060ba7aaaddba29324338dd9eb07d88a63c7dce SHA512 303268e1f46e337e32c64b544c0962ecbe8de1799c42736b3c3515b6f31954a655830c402317bd0534cac12059e17eeb5f360d010432dff795a136662a5c10f1
diff --git a/dev-util/colm/colm-0.13.0.7.ebuild b/dev-util/colm/colm-0.13.0.7.ebuild
index 71615c0c0d25..82ac3f392b42 100644
--- a/dev-util/colm/colm-0.13.0.7.ebuild
+++ b/dev-util/colm/colm-0.13.0.7.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.colm.net/files/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 BDEPEND="app-text/asciidoc"
 
diff --git a/dev-util/colorgcc/Manifest b/dev-util/colorgcc/Manifest
index d965885403bf..8d989b0bedce 100644
--- a/dev-util/colorgcc/Manifest
+++ b/dev-util/colorgcc/Manifest
@@ -3,5 +3,5 @@ AUX colorgcc-1.3.2-gentoo-two.patch 1882 BLAKE2B 5b8b02733b59e90de12eaf5fcd1df77
 AUX colorgcc-1.3.2-nohang.patch 1675 BLAKE2B c31b8a3b64df47f4015d1ccff2e852993791197bd3076596c3f29b154c8f7e256e77278744306cafa9651ce3b253da21358fcee306c61dd6e8384705c594fbc6 SHA512 5842700ec869b1f066035b8facfce056a207e4a7aeb020c1ec3fa277be56f8c513dc5f86df79f73e00c6cde93cccfd1173c5572d3e02233fa2b0e86c2f17b249
 AUX colorgcc-1.3.2-note.patch 1845 BLAKE2B 0a33bf926eacd9b3ade3da542078d7b7738bf7086b7026873fc4e66dbeccbcd6d10f071e8e9c35cb20d7eb4f1752a6c87cbb3361d4714e401f9408fc9dfa9b2a SHA512 8d0a1a64a235c43b66c2813c3d7316f650c3160700d61acc2e1d6deff678da31832259fbc08da05108e42d780ba769b404881b65d0b68bc6c2ec6ebd25b78ae3
 DIST colorgcc-1.3.2.tar.gz 11076 BLAKE2B 80843c200157fea52cc9f0f7f3008a52860ab8e1256490126d499b34f6821957de92755cbda835806e2df83866ef11096d6d80a0739fb87ef7c348ccf58d76af SHA512 1f6031bcc0f6eb6bdaf0359debe13d1a6579c4f5bfb8dfeef79904a2ffcc94322f2c7f9948439c2975bd4ffed1ebaa085bd7ce338289bdf9c170cd40e1c1a448
-EBUILD colorgcc-1.3.2-r7.ebuild 1985 BLAKE2B 824980286bbc3e7b64959b03711f3ab76a67f05ae4735e4df01b3bea9f0537f1da2f191e134ae5e4cbf96553336745576100b1cadca1a7e0f439b11241391b7b SHA512 4f202286145f3ea53c2e988c462e82d6b3f5683c05cef2f24b8500d9867800417e088acaa93a72b8dde18edd80371ca17bee1471e033939c3da93be35843e389
+EBUILD colorgcc-1.3.2-r7.ebuild 1986 BLAKE2B f5a23b49d592bbab250b3e70a0b72b538586089d6354dd3fb06c14d3372762b5519001d654c67ba643f5f8415171b21e51f89b7f1c37c9898698704a5d098e37 SHA512 a41e1a4b5c23a667dcf526d6d12e30436f6ef50214be109fe3d34c4f82911fc93ad4b4745f94226627126c7fc2ba61b0fb74edcf11cb9e95aabd34d6d57fab21
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/dev-util/colorgcc/colorgcc-1.3.2-r7.ebuild b/dev-util/colorgcc/colorgcc-1.3.2-r7.ebuild
index 899387414cc4..7bf519948263 100644
--- a/dev-util/colorgcc/colorgcc-1.3.2-r7.ebuild
+++ b/dev-util/colorgcc/colorgcc-1.3.2-r7.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~mips ppc sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~hppa ~mips ppc sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 DEPEND="dev-lang/perl"
 RDEPEND="${DEPEND}"
diff --git a/dev-util/confix-wrapper/Manifest b/dev-util/confix-wrapper/Manifest
index fd50882b4506..1d4d708ff728 100644
--- a/dev-util/confix-wrapper/Manifest
+++ b/dev-util/confix-wrapper/Manifest
@@ -1,2 +1,2 @@
-EBUILD confix-wrapper-1.ebuild 681 BLAKE2B 80a47a9b0a83c64a4e63cd6284efc8a073545df1b0dd9ca1d5147189e7fdc49931881b9d151890de74504020344cb3824b40560390a8c75cf9b2f884c3107935 SHA512 c46355ac91b3908a20544f0310f9af2675a91080d0f3d153c5642198f36c69f22d85450a240c8e65f7f38277255677558b722bee94cd63cd33fd4969bffd3bb7
+EBUILD confix-wrapper-1.ebuild 672 BLAKE2B 9b89309df51d75be79b31f6ff85090d342bc6ae26db51a153c7097c649cfd08acf3c86ec1c4eacc118e9fcf04ac382c127fd4aa81d32b48c4215c2ef86fa1898 SHA512 94ce3f595cf84adab55f6fff9f5d7117b7ee800b7a82859810e211db2ce621ab07a947cd5f539cd60a4d0445c3b9eeb510b99c2479ff527d969ca5d6ea414303
 MISC metadata.xml 329 BLAKE2B ce9d264f3d40c4c4a7078cfed1f27f93c06420904a98051031a91bc600c33708c10291128b48be7065eb493866d4a15d9140b5933954eba9716a7dde376e001a SHA512 a2e7c1b3ef9b2228e2820c0aa46354d771b518e7a5f854f1f06850840929846b12125b4f526a7f0282b3e9545c5cf7ed670ef2f2047c7deb0c6de40b9667b321
diff --git a/dev-util/confix-wrapper/confix-wrapper-1.ebuild b/dev-util/confix-wrapper/confix-wrapper-1.ebuild
index 685b1b97161d..3e4e5617ea28 100644
--- a/dev-util/confix-wrapper/confix-wrapper-1.ebuild
+++ b/dev-util/confix-wrapper/confix-wrapper-1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ HOMEPAGE="http://confix.sourceforge.net"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE=""
 S=${WORKDIR}
 
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index 4c054f64f3a0..d3d1e158c686 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -2,6 +2,6 @@ AUX cppcheck-1.88-ldflags.patch 967 BLAKE2B c88cf4c199e686b6befe353c25d1507969c3
 AUX cppcheck-1.88-tinyxml2.patch 4689 BLAKE2B a4ad83cfa7e9edf7c52493ae78c72f730dea604be12ef8ae885c82b65fcbd5dc1a3b36c154da0c2c691a0f445b44a256f48de74f00daba7d544fd14d8237ee77 SHA512 2d8a90d2698607abfedcbeda806ad6e0589fd637c2b5b755cab2f6ba99f144ff11dce05162fa6a2b4b753f7814a3fc1cc83510bbbd5ed8811b6353ed30c27d5f
 DIST cppcheck-1.88.tar.gz 2364053 BLAKE2B b688974ff83019422cc5b2ec575d9838bdff4ada17d71fb3d436f07eea50429490c222659163b845667d98c0ec186b3288464827894e379fd017dd0c3fea645f SHA512 fa4ede0665546341af0ba3dae09a00b6efae09ec7838c616c580be01ff6902594d61168a059539779be0c78e1708d2bd9c8e7987dd0bb67dc8fa332a10d1de6a
 DIST cppcheck-2.2.tar.gz 3561406 BLAKE2B e436de4bec5412a18f013c8557a966c28c14edcd07fbb80eb53a897848d15f32afc180798ea1a074742f896b15d4020755c104b87dc8f82252121b58a92b92dc SHA512 d766187a69d6aa839e072e3c0ed44009621ca8492504257288ca2f49774f705a1ebcf2957f0801ac6eab2ffbdd845e9237f1213f85c6d0fcdbf16b1e7c690327
-EBUILD cppcheck-1.88.ebuild 2346 BLAKE2B b769d672abfaf0188b66f7b2dff0e1a58ddf2017939fb6f5375b181736a4986d6bed2038be80f4835a95ebb567fab91d4131e54ac09c246b5f43f88b115d1763 SHA512 f81d88c84326a950b4796f6a89873ad359386ba4866660f6f13c18d65852b3cf7b6e170278d346aaaa96bde4da71b563e0eb163fc073953bbe16415544cd11bb
+EBUILD cppcheck-1.88.ebuild 2347 BLAKE2B 5fbd7b4a99a60cbd45ca2e27fed034e18576884cdee1cb59dea76538beaa0e287dd90a9037cf1894e9cf5963900337918de8d1440c3549c0732d4d039e152154 SHA512 c96b5e2da088269321bef6c8aa5935b2b45b31d2d34e428789ee56a0ed60a4a1fd046789845b84f7cc03f051be03d8e3605c10f0ed6285ef0d5994b4b25c5eec
 EBUILD cppcheck-2.2.ebuild 1708 BLAKE2B b2000ee4ef2fa05db36d18637b86d9dda8da22dda3fa224387c69aa97e46c1a1c92fa5c1d8102c749c9fa74838e8d39adadea90c49d0108f22731d035d9eae68 SHA512 ab416a331de6ecea9a0a9fa0f6a42bab0d42e85488eb448ff29e0abe7f9b2ebff63e4ec7b6c11e25a3557d5f995d80bf2b306ab570e5da4750364a6c5b0245c1
 MISC metadata.xml 490 BLAKE2B 63b66d1ab0e87f0dd53dfaec62c4d17c1e806ddf2208df30b1a5fcc0f198ca343afa5a39ab55d92a3b4ac3b0143c24ec5c161afe23982c3c5eaca2050621c776 SHA512 1db095c4b258ccea938d6e4648aca9c3a165a123a703311de95f1743f641c5860cd1dd0369e6539efadd270b9f82f25694f504c34129cf55c74b323ffb3ac3c5
diff --git a/dev-util/cppcheck/cppcheck-1.88.ebuild b/dev-util/cppcheck/cppcheck-1.88.ebuild
index 20e3efce2c1a..29465473a748 100644
--- a/dev-util/cppcheck/cppcheck-1.88.ebuild
+++ b/dev-util/cppcheck/cppcheck-1.88.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/danmar/cppcheck/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 hppa ~ppc64 sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 sparc x86"
 IUSE="htmlreport pcre qt5"
 
 RDEPEND="
diff --git a/dev-util/cppunit/Manifest b/dev-util/cppunit/Manifest
index 5e8cedb09348..252dd66a013a 100644
--- a/dev-util/cppunit/Manifest
+++ b/dev-util/cppunit/Manifest
@@ -1,4 +1,4 @@
 DIST cppunit-1.14.0.tar.gz 959716 BLAKE2B 581e3b73d6d152c249005ddf267100443e6c9cba12c52c43e9d6f81096b9cd13c3686fa2f73ebaf28c31193e41dbfd5d919dfb0143b190881345da65a5b7f86d SHA512 4ea1da423c6f7ab37e4144689f593396829ce74d43872d6b10709c1ad5fbda4ee945842f7e9803592520ef81ac713e95a3fe130295bf048cd32a605d1959882e
-EBUILD cppunit-1.14.0.ebuild 1702 BLAKE2B 263a7e6e41417f164f42d23e619ce752b82c1c5e68f875f3469f55981a13a0620bcc508aa72f4d46871297f7ebcd6acadf8081f27424fef9dd017e1cc55d5aac SHA512 159fab9aafa466a1cee052c6284fd0c713b10e0c1d90e1784a9ef05c0695da461def6acd88e146a5fb10e6b0eebe8e0aa0b5831b1260a3f646c379b42057861b
+EBUILD cppunit-1.14.0.ebuild 1703 BLAKE2B 48713611db62bf49d1246d9a7155938733c8f5819d1aafbeaedb78d419aebe582356d64970043cde719f89224444f17c17e7fbb3226b514c04ce20ff23c63a94 SHA512 dc5b4d086d6ed003817090d8cc501530023645f5daf04114bdacdb59433cf3432a752c618e442c1295691fb165d136ef9140391002b9bfdfb928107bf596f73e
 EBUILD cppunit-9999.ebuild 1714 BLAKE2B 2d0395554a9ee2c68ff268ba98e33795bbfc9d8a0dd272f82c2477e3ac40840ff49aaf9aaab6d0006886a4a4f01a0f03f8fb771ac30d38d96ddb2095e7aba84c SHA512 6b8c7539bdf13f614797f5a1fecd15efcafaada6b36cbd2eddeafa7a05cfb95fbc47532027f72aea267b52efa356c21adf1ec192feb93e96d5593534fa16843e
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/cppunit/cppunit-1.14.0.ebuild b/dev-util/cppunit/cppunit-1.14.0.ebuild
index 9b642afa8c03..bdc5651ee6fd 100644
--- a/dev-util/cppunit/cppunit-1.14.0.ebuild
+++ b/dev-util/cppunit/cppunit-1.14.0.ebuild
@@ -15,7 +15,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 # Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
 [[ ${PV} = 9999 ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples static-libs"
 
 RDEPEND=""
diff --git a/dev-util/cpuinfo-collection/Manifest b/dev-util/cpuinfo-collection/Manifest
index 4874b1c54003..25d38868d0a7 100644
--- a/dev-util/cpuinfo-collection/Manifest
+++ b/dev-util/cpuinfo-collection/Manifest
@@ -1,3 +1,3 @@
 DIST test_proc-14November2010.tar.gz 95697 BLAKE2B 476cf9784d3718ca27f030bc85ca1f526db43cc740ae77fb7cd4b45fad13ead8645ab9a17fec1216d54da8390e04205960c543cf4205f9f6677afe38dafd054c SHA512 2f3b80d9b705b76911487b7349300b45622a3a49b9a3c2036d96220738e7fd525114b2523cc589b03d0fdf85ca4d35c28076ff193d1eb620d71765919058fdc6
-EBUILD cpuinfo-collection-20101114.ebuild 547 BLAKE2B 37a5b439fcefadff4da4d8a53baf6b854a39f0279e0057a34bf50c0a52e33a9efce882d047b1d57295b727ddeb714fef2d7e144c6784f04fde0de0bddbf86dc9 SHA512 af3af7c28015d2c40158321109d4eab96b7965e9df7e28087adb79ffe5ac053c78fc0bbd53363d15721801b4bf804d8dfe38b25f2046da7675eedbc4e134e235
+EBUILD cpuinfo-collection-20101114.ebuild 548 BLAKE2B 943ea50be0ae5b06065a223e66ae0398adb00bddebdc0a8d3e0ddc88299944c386d8076bf2a45f4aacc286f52eef81968a196320652b10eaf62cb96ebf45d191 SHA512 3a618e60651a149b5cb57b2e61f90a346890c2741c6b0d34acb4ac6ccd0890935747a5a0472cc34c2d1adf3335f4d150027d527bc4811029f6bb45b0913b4e9b
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-util/cpuinfo-collection/cpuinfo-collection-20101114.ebuild b/dev-util/cpuinfo-collection/cpuinfo-collection-20101114.ebuild
index 7d5d4e1cb445..d67758d2596a 100644
--- a/dev-util/cpuinfo-collection/cpuinfo-collection-20101114.ebuild
+++ b/dev-util/cpuinfo-collection/cpuinfo-collection-20101114.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.deater.net/weave/vmwprod/linux_logo/${MY_P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-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"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/dev-util/cscope/Manifest b/dev-util/cscope/Manifest
index 097ebdc5d047..707a7e4c1920 100644
--- a/dev-util/cscope/Manifest
+++ b/dev-util/cscope/Manifest
@@ -3,7 +3,7 @@ AUX cscope-15.6-darwin.patch 288 BLAKE2B 3426d3f3dcdd67764b8f3ee63bbf1ea6c457231
 AUX cscope-15.7a-ocs-sysdir.patch 582 BLAKE2B f9144657cb8d584f4d504481b986f68322d1a08b408e4f623db0ed3e22474895f4f8464e297a90e635a3dd3e71cb06f79b092a82ab8876d0ed308b71fa0d2812 SHA512 aa296d8839da73b6838c450dfabc9782940a2f9c9cfba2f738993c777c1d4096688d79205ccec58dbf931b2faf45a4c3850ddbd894c7b7e616d18a0014cacfdb
 DIST cscope-15.8a.tar.gz 601232 BLAKE2B 8c67311059a055af775ba3d42942a557b54c0214751d8756e6a5c19a7a271824004e72c533614015ddcb0ffa4c768f99eb736d441dc8467c5be4824cebf5c15e SHA512 bedba69820eca86420f6c975d1f267de67a457b182a3fe49720a2ae5ea48759c5b5b8db06ed5ffd85173ddf4a0f12ca722e87200dea4a2da7d43c8c711b00318
 DIST cscope-15.9.tar.gz 613948 BLAKE2B 66c0c85d0db810e8cd5a286925eeb1026fa4a9e9c3a5a9decd1412188fca43f831949c231acca428b5eeb476662b7ce9f81defcda81759c18027655535b855be SHA512 f3b95da5eb5c036cd39215785990c7cce7ce7b8eda4b18e60792e70d01ffb63809ce32ace310a9aefd88e6761c1609039ccfab0e8e49f81730bc1630babbcb80
-EBUILD cscope-15.8a-r1.ebuild 1376 BLAKE2B 520e3435544b1f05f971258ba1cd06665dc634d82652734f8a72ee00c3431f0f308a60d84b40130b92124368735e3f936dcdba9030947918c55472cc32576142 SHA512 51da9d24c3789b4deec298e9c0e7ab95e070264cce122fbd50adb143ea2290ff4dfb580a8c9c577eeca226d001695e4ba39da6deef55833d23822b3625bf9885
-EBUILD cscope-15.8a-r2.ebuild 1585 BLAKE2B 78ea1a0d32a2e4b5c0f5378b8fadc53f0f15a2077e65d7fefdda3153fcc874faba1f2941f3eb61599fabb20b4c244d77dcdc972f35d697d2c044867a5bc2373e SHA512 42d07ea5e193691138be4006bbb03a70445571290f05e923aea4709bb2a81bfc7d07c84eb9a60b37609f5ce8603716a6338f715decfd281ea0d43bbecca6d8cf
-EBUILD cscope-15.9.ebuild 1555 BLAKE2B c9681e327719b55b4d9b1985a11364eeec1da824e6f01048a4bea013d371e89834753dd69c3aa663b4f2b7e1a6260235536c6bb03f4094f8e10080bf33751dba SHA512 618304f3cc3f2c7a49c497099cfd8cdc53e06caefed4ecf6db6896fd58042bc84683ecded1d56e9ae9081de09b7eac0bedb5812c44dcd42b0d5ecd10765cb194
+EBUILD cscope-15.8a-r1.ebuild 1377 BLAKE2B 4f75ffac50f71d7fc3a4d1410bc9099ec5ff8359138a05409991d645ec368a182aecd5379ca35b6914ae1e0d2fc356cd95dbd80e40f19770ce3b177f4368065e SHA512 ce9af709d4ebd109aa576344887e6cdf4a96d968fe577401d5094f4f26b06331ee1eae0bc6e1f71fb0b77f3376cc652a006e1c2dfd89296ef25ec68d994fc97a
+EBUILD cscope-15.8a-r2.ebuild 1576 BLAKE2B a8f9b7a054445187570d8beb72e2a06f46be6bf70b264a5e2ed1245bda911a9d180173b76669abc9846ab021b1232300644d69a7dc9df5dc9f53cc21d80ce9ae SHA512 ddd9141290c5fe8c1d211a9b6f41c0390fa191ac8e0bb1c6ffd0cd04501ee5b863adb24957c5af6e4950b2c7d0b3819344ceb6f029025e60b6adb5434196d91b
+EBUILD cscope-15.9.ebuild 1546 BLAKE2B 32cd63b97abd24de05f046a5f02f537f6a1b915988d489041b9b7263b41dea2c32ec71ccbfcaa4941817063e09ac45d2c3e792fe5d30db89db8038f380af931a SHA512 0a610e56ccce9cd2d33d6ab00135e8d2606eb6ab69417997a9d936b7b1b0371d677f5ba0a8643b4647dfd4ce3b9cda1c9b1debed4f593bc99f5de952fd82b948
 MISC metadata.xml 1086 BLAKE2B 9fecf3d723e58a1235e3ae94b6a009c16cf91ecf0b27c32de7d8a8f96308e41908b9f2881083acfbf329685cce188b8ee0fb864333d566bc915e1ca2d572ac3f SHA512 a8ebddecfe959cb05a992749f12183baba41950b39e197bd1db0528969dd4e1814dc159555b2e24d85249373da4b60bf05a7d86aac2d7b8969d6d2bed2ab59e1
diff --git a/dev-util/cscope/cscope-15.8a-r1.ebuild b/dev-util/cscope/cscope-15.8a-r1.ebuild
index b1ae51bd71ef..1dc92f952e48 100644
--- a/dev-util/cscope/cscope-15.8a-r1.ebuild
+++ b/dev-util/cscope/cscope-15.8a-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/cscope/${P}.tar.gz"
 
 LICENSE="BSD GPL-2+"
 SLOT="0"
-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"
 IUSE="emacs"
 
 RDEPEND=">=sys-libs/ncurses-5.2:0=
diff --git a/dev-util/cscope/cscope-15.8a-r2.ebuild b/dev-util/cscope/cscope-15.8a-r2.ebuild
index c47d3feaa6c8..958277ead130 100644
--- a/dev-util/cscope/cscope-15.8a-r2.ebuild
+++ b/dev-util/cscope/cscope-15.8a-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/cscope/${P}.tar.gz"
 
 LICENSE="BSD GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="emacs"
 
 RDEPEND=">=sys-libs/ncurses-5.2:0=
diff --git a/dev-util/cscope/cscope-15.9.ebuild b/dev-util/cscope/cscope-15.9.ebuild
index c5b4b35ef25f..441c80b4e99b 100644
--- a/dev-util/cscope/cscope-15.9.ebuild
+++ b/dev-util/cscope/cscope-15.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/cscope/${P}.tar.gz"
 
 LICENSE="BSD GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="emacs"
 
 RDEPEND=">=sys-libs/ncurses-5.2:0=
diff --git a/dev-util/ctags/Manifest b/dev-util/ctags/Manifest
index 539916ec2df5..5fa15fed3d01 100644
--- a/dev-util/ctags/Manifest
+++ b/dev-util/ctags/Manifest
@@ -1,3 +1,3 @@
 DIST ctags-20190331.tar.gz 1537104 BLAKE2B 354ddf48cdc9421e70d9d37ec7251e51f7f78564dc4f6236d12e2e18519369c39c22585830fd301b7eff4898d550b824776541198b8c4a31425711776b14fde4 SHA512 414faef7628ecaa66fcd5f172781a32194e1d58637dded1f7e55c138239ad777796bb1510bd447af3ad8243b7178e6f4859139305b0c0efe298182408f34524c
-EBUILD ctags-20190331.ebuild 1824 BLAKE2B c1f96b3d0c12786a4b68783795dbaa5780969dfe4de326ed90f80bfab35f6e3c90552aae0af1290a75a123edb0b70072a1fe06853033c34537203622af5fe175 SHA512 af58a7ee7ccfc2c7385bd73f1488c92d092a19617baa7a93ed4a473d009135f4872d0d2d086d9030314d7166f6413f79f12747442eb370aeffe973587f36b253
+EBUILD ctags-20190331.ebuild 1805 BLAKE2B cb9555429437074acfca7d378a3922563c559934ab46d182a00f62b241c6291cc8a0987d551effd914ec748695ff52dfafbc83461d1c2ab505a42b7f64472a03 SHA512 6a5672e9b98c291a2657decc17c15a6a292d51537fdc24d4f47c734d5b77ef0398fd170341335f8f8b8dbbbeb0e77901340d16ead11f8ad44b522f36b6a724dd
 MISC metadata.xml 583 BLAKE2B 32e6225369d82b7aae04a238a314eb77911a38c2d670d4058260b75ced482199b343d1b5d7496bc3a6711b71a429b7205057ab66ed8369083b2533be5a7e0648 SHA512 df8ae31fbbb4546f21c3c06110bc6630f392cbbd937e2ccc3c504e08835e56ac2e7d8156686755217140906cc806001a18627778af0e09d753e50c9a47de28b5
diff --git a/dev-util/ctags/ctags-20190331.ebuild b/dev-util/ctags/ctags-20190331.ebuild
index 0416d1961e3d..5a233835aa5b 100644
--- a/dev-util/ctags/ctags-20190331.ebuild
+++ b/dev-util/ctags/ctags-20190331.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/universal-ctags/ctags/archive/${COMMITHASH}.tar.gz -
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 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 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="json xml yaml"
 
 CDEPEND="
diff --git a/dev-util/ddd/Manifest b/dev-util/ddd/Manifest
index d1c0f842c0c4..d6ec40944dbc 100644
--- a/dev-util/ddd/Manifest
+++ b/dev-util/ddd/Manifest
@@ -6,5 +6,5 @@ AUX ddd-3.3.12-man.patch 571 BLAKE2B 88f499833e47ae279beac8dbc4aadcfaa80e8c19f38
 AUX ddd-3.3.12-parallel.patch 621 BLAKE2B 57446f5c7e797d7ddab5ed6aca01a5ffdc6af314bb797d96cfb357e214f1cf49153387635f9b585c53ebbcf7b06dcd6119b6bb2cbcaffa7d4382c4fbe9fdd181 SHA512 1157bec9212ffd4cbf86e8d36f68c80e9170091d09318effd800ce154f2b738e730db95e1e954c632dc25390e78cf88a9f1f3d14426df4069c0e5523f2dc6646
 AUX ddd-3.3.12-tinfo.patch 330 BLAKE2B f0e29f408f1e5e7fa40e386ab2a1f6786a9a14dc6722aef3fc8132558b624c233102b4290c0ba0e5d55b27aa4b25e6bcdd6fcd1b4ae237540621f3961e92bffc SHA512 a3cd3d59bdcce6c106d4488ec9a6c32d8baea49963f61e8e493a01131fd604664dca2e9e548852ff4c538c7123f5c1572bc54d6143340167fcdfa754002eb224
 DIST ddd-3.3.12.tar.gz 5687115 BLAKE2B 52c448eda46bfdc4f5720abda569a0c70f3680c3fdd543f6101c9af8c4c448496414c1c2a7be91590d9f14d0c8c2bb053a234d179bf900ca52df0ea8c2642131 SHA512 1249e4f5f25335f8f2c3616470f7a8f36262c00b8ac12b79f2b2806228de2831ebeb780fe09490e5e8b5b1ca108fe936ae70856f6a6ec02876fc75c7b4a7dbf3
-EBUILD ddd-3.3.12-r4.ebuild 2377 BLAKE2B 1c7aa2049e8c647c9c920d6dfb17d3a032e697c6b3ec148eac1c060c152b2fce590f3d7cc1d27165e4b0681871d1c0c4c305da8e7a612084d6557e9fd5529d78 SHA512 81fdc265cac0ec216021eb785f61f37cc75ada599a5d44973a24cde296f61de1645235903970d399d89aed51f1a40db5c9814a8bb525c2ce21c416500195ab17
+EBUILD ddd-3.3.12-r4.ebuild 2368 BLAKE2B 111b6b82dadbc5c40a4bc0eb03108622f7c355bd9bdd3858e72984f8c060e5bb5a913539890661a0223785598c135907e22ea2f2ea7ae6a4cda93aa01df1c491 SHA512 f07f39d5ab6feac708af7ec15cfb1b3942088bc1b328d73dba63175ff77e8805b43b4f12b924b752311d4d1dca0c9c45068a3113ae61c6548ae694630cd4a772
 MISC metadata.xml 658 BLAKE2B f2b35a9e08da89197aa56157e5d3c9adbc991d888cf798849bf7edf33fe6d9fd7dab16e0ea3068d20a836f85d133a570f3bbbcb9e57399c095292fa3390f59bb SHA512 8b304bbca5e836ff3032079f5dd2afea432b8f48e2c57575644adbefba0ddc4f64e3682f35f53c2804c27e950785ae8040f8704c05162acf302c6fb61b70c51d
diff --git a/dev-util/ddd/ddd-3.3.12-r4.ebuild b/dev-util/ddd/ddd-3.3.12-r4.ebuild
index 5d5268c2c714..101061bf64f5 100644
--- a/dev-util/ddd/ddd-3.3.12-r4.ebuild
+++ b/dev-util/ddd/ddd-3.3.12-r4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/ddd"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3 FDL-1.1"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="readline"
 
diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest
index 47f8886d5583..5bdc55878f15 100644
--- a/dev-util/debhelper/Manifest
+++ b/dev-util/debhelper/Manifest
@@ -1,3 +1,3 @@
 DIST debhelper_13.2.1.tar.xz 541428 BLAKE2B eb377a09fe23aef159c6a8309c1a63df94be2a1dbf313af32868f9a01e394438c98f02cbd18077cf22998e693c171244e42d33fa503e591030f4fe4248bfbc53 SHA512 38b52b03b65832a33260a7b0d1f08e6079b60318964603ffa0729cb3f56adebe81dbfb82a1785b019100e697cc6b13c212518c4608c0bb2018500be328157b0c
-EBUILD debhelper-13.2.1.ebuild 1523 BLAKE2B ec3225c3e4d807f7b9c0bf3004794d65d3b2dd7cbdd9de07972c12539db9f5fd32c30353814d7a455efe3541571b7d859b8067226c4d39c914eace5c12d2d683 SHA512 584759d292055b2593ec600c15afbd8ab5425a5f3f88c38f0325ad63779bcd8ce468e7603b46b55e08c0dd0a0ad2d856dd07cff42254196c96bad7b56ae432f0
+EBUILD debhelper-13.2.1.ebuild 1524 BLAKE2B 26c0ec05171e41da67876ea27452d799f8be8540c0893beaade349bcaf447a2a3ecc4e9d97a97174c9eb04747b3d8948a6f2e07193c5e1ffd43f6389ed676044 SHA512 73016959d67d163b61d9af938b991df6388d1e23a0ef3debbd75d7d0fd101264805e31d4e29091debf8c65840631f9eab3af2a807090df4efedea05e6d2ebdc2
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/debhelper/debhelper-13.2.1.ebuild b/dev-util/debhelper/debhelper-13.2.1.ebuild
index f77d4a3b89c7..8b150d906aa6 100644
--- a/dev-util/debhelper/debhelper-13.2.1.ebuild
+++ b/dev-util/debhelper/debhelper-13.2.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 DH_LANGS=( de es fr )
diff --git a/dev-util/debootstrap/Manifest b/dev-util/debootstrap/Manifest
index 8fb756d17ef0..05d96c0b28d4 100644
--- a/dev-util/debootstrap/Manifest
+++ b/dev-util/debootstrap/Manifest
@@ -1,4 +1,4 @@
 DIST debootstrap_1.0.123.tar.gz 78175 BLAKE2B e507ee76817eef20cfea4e37eaf893f8e64acaa791806ebd55bec97b8e60eb3c59b68bfe5e6023dc6e73706bde2468db46b84f0176ec46d086c3ea9423a206c7 SHA512 3b23f61528d4993750ba22b8765c10cfb9695793177017d9e4faf546da076be6660c5d6e0d1bf30bafe14f6d70f886190d3ec42a0057b895f40e860475eea794
 DIST devices.tar.gz 47835 BLAKE2B 03bfe097fda12a7a0aa19d3308c0d44382ad945defea05a63b17a72e4051ef94f0e60e75bde35baeace81da59d9f04126f6e463163609475b9c0fdf518f533ef SHA512 994ec8d72e3d52d2d872f7ff0da2336e4cbd3a5fa73bb6cdb9e06f5e7f5b8c69cea639c738fdba1186f382d6dcf62e7746fface664bfbd744aac24b16f034432
-EBUILD debootstrap-1.0.123.ebuild 1194 BLAKE2B 06c3a88040d43367bc9aafc397b229b66631c37271be119296e3f28ce6f6df74ce4b1107bda675984600ccd500dbdbcc67b1530c5ae053fa67dd4b50dd1945a8 SHA512 ab3d4519277c356d21072a269e1a687a61c841ce920f25f6a6d0605d88500f5764b0b7195f8adf5ac1e34ec382ba175edba25781faa6b1e8ec24a9fe77ea7088
+EBUILD debootstrap-1.0.123.ebuild 1195 BLAKE2B 202abae3445993f91e8b7caf9dfd96ceaf9fe3b5feaa9db149c9cc371aafc1af753d1b2b51bed7040d60c1924a6d513e40825500189e276c58496b5959204efd SHA512 d421120353fbcbac8cd87dd341964d597238386352859bfcd9f07f44c3ddfb1644eff371f0382f4e17ba3fc02c0c8dfa587200d00e5b685bf94c2e0f24de046d
 MISC metadata.xml 251 BLAKE2B e9e9d48943645d8b737bc1f7ab0efb05db0f8eddad759c9bb40d07dc008fbfb8f5cca2020de71a9ff6945f5d66292ac02355773545010cd49c77fe6dd5ab7b40 SHA512 1b6a6955118c1a74cc89a77d6de9be8f4ff9c7137c186753462670a5b93457dfd034ad5d1f4d2507ac95cc149c2a042fa5324220b58702a56b09d91de40151c9
diff --git a/dev-util/debootstrap/debootstrap-1.0.123.ebuild b/dev-util/debootstrap/debootstrap-1.0.123.ebuild
index 20b3e32fc58f..612998309132 100644
--- a/dev-util/debootstrap/debootstrap-1.0.123.ebuild
+++ b/dev-util/debootstrap/debootstrap-1.0.123.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	app-arch/dpkg
diff --git a/dev-util/debugedit/Manifest b/dev-util/debugedit/Manifest
index 02fe10d0ea0b..71cb848064ea 100644
--- a/dev-util/debugedit/Manifest
+++ b/dev-util/debugedit/Manifest
@@ -1,7 +1,7 @@
 DIST rpm-4.16.0.tar.bz2 4341683 BLAKE2B 5161e5dcc6d9a1f1d4b8e44740fb368050b808fd9e8b8276fb17b530a4642e1b9ad104b5a30c0071215aef7f823eeab10988dd41f73af1c52d575529c374b5eb SHA512 177119c3ac3d48980db55bb4ba0fdbb2a911968e5efc690bfa8cc343f850fc90531cc0dee6dd8e45d2b14f0d951ced35bd8893d24011b7f270745d281ddf4e3d
 DIST rpm-4.16.1.2.tar.bz2 4346745 BLAKE2B 17485b1e73b30586acb8e9be53bfb0bd430fa05e826755729c68367c798e8cad039f091731b6effbe9fa9b7d6c4018abd6feec94f032230cbbd6068e9080573a SHA512 066b67838312f9ad076285fe8f43527aded694f5562ead4e90df48675f2e99c1f2d68693fd20b2037e2614b978ed94c417753e2dbd055a9869b45264cd932afc
 DIST rpm-4.16.1.tar.bz2 4348973 BLAKE2B 5f415099ed5b4f3425c1cbd02476c3066ef51e8efbe09829c0c7d9732cfdeed76ab0c5eed113a1b007d35bf5d5fb1c60543b7ef23319ba0f63550d598e98dcdd SHA512 cbce8381e7a0bdaf2c7529d0ac91fda15e663db7a76b02652d53327ebcd7d5b6b6154d5e88feeda87f71727a036e7a2afcd57c7dcddef610e32957b9e430d367
-EBUILD debugedit-4.16.0.ebuild 1765 BLAKE2B 463b1295cb2cf4d8fd4914546610844495065a62d164b099b3352761b2329cb016d9fa15a1cfab3d8f348a1d9c9392eb4debac627b58af9402cc01d99244eba1 SHA512 29e6a33ff92e86ba3c7eb52eb593c97af3ca52fdf9df999984cdbe7ea2c2a3039619738b0877af42ff1b77515fac2249d603827abbe7c9bba86368f959242a29
+EBUILD debugedit-4.16.0.ebuild 1766 BLAKE2B d1a689387d0286879fc063d4e1732f70204b990c293f3eba9b02dfa92879bf1547aa9a70241345c949d7b4261b75859b5bf90b7f101eb379189e605d41b78081 SHA512 dfcabd9331d4425fcb26f064c0ac942fb7ebe5da7026dd4db863906f66b0e153fc9bd6e73324d07251ed8a2ee579278e26cf1c984b82d3048716290141f9a872
 EBUILD debugedit-4.16.1.2.ebuild 1770 BLAKE2B 9657d25e12679c563a0dd2f6220a58844c043f28ead997e6add996cff70e78964f6f3b88afbb65e7c1a683b4d7250919ebbc822001744adcc46b4e1324300823 SHA512 86a515866fa7f33aeb896b9ee67451bdb8d2850a34fcfca719307bacc002e99039fb24e3d6c6f088da1a6e59ca6c71ae764baca4c875e076315852be9100f1b8
 EBUILD debugedit-4.16.1.ebuild 1770 BLAKE2B 9657d25e12679c563a0dd2f6220a58844c043f28ead997e6add996cff70e78964f6f3b88afbb65e7c1a683b4d7250919ebbc822001744adcc46b4e1324300823 SHA512 86a515866fa7f33aeb896b9ee67451bdb8d2850a34fcfca719307bacc002e99039fb24e3d6c6f088da1a6e59ca6c71ae764baca4c875e076315852be9100f1b8
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-util/debugedit/debugedit-4.16.0.ebuild b/dev-util/debugedit/debugedit-4.16.0.ebuild
index ffc8eec35d4e..dc3a711d8087 100644
--- a/dev-util/debugedit/debugedit-4.16.0.ebuild
+++ b/dev-util/debugedit/debugedit-4.16.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-util/dialog/Manifest b/dev-util/dialog/Manifest
index 550583a07ee4..acfe5800858b 100644
--- a/dev-util/dialog/Manifest
+++ b/dev-util/dialog/Manifest
@@ -1,7 +1,7 @@
 DIST dialog-1.3-20170131.tgz 507783 BLAKE2B a98c436eabc8d06619bd64a8b1d647a0712630f0f89565253636ef2f38333ca6926177aa0c2001305b0c06fc7a1f576cda87da493183402ef9ec3cdc3fa8be23 SHA512 818b4e9d0d5ee55377b78ccceacf59a78e5e6d6fbc09e24a19e62b4988ff8de32f3364132b9ee88c86e126114eda45c82d86397d5f26fae81a6bda91be979786
 DIST dialog-1.3-20200228.tar.gz 544523 BLAKE2B 18551ea08fc6ca8cce37604cc468143e57e562648b7c1b7eb8abc0157f69d7b279ea65aa81d8435fdbc60944dff15d3d716e769a1103b0abbd8f4acb7e5bc011 SHA512 c2454421d32a61c6618b0262154d770ad0d194dd3999c0a95d6f08b59527dcf3f9d2ddc082a52df9ae6e28154fde73884b3b957285ee9f765b4ed79d304ee49c
 DIST dialog-1.3-20200327.tar.gz 547962 BLAKE2B b335d8b57d9a9f3a7e303aa3b2c64736007b66618a79c79368d9dba20a8123813cdeb7d0643bf7c6d147314963ff469b6e41d2378fe9181081fa543f0aca50f2 SHA512 c8c7ccd86fa189a2b6739320f59f127512e53f908ed257280099f8c45754da98d2095835d0c14090cd071af0ed6e8ff95f9938f5ca8027b0b7001c7fd746fe59
-EBUILD dialog-1.3.20170131.ebuild 1222 BLAKE2B 90d747aafd4d02ff63aafe1db9baffab452b5ff5de89268a9c424c52c066df7eca6cca608d07db498fa8c1a5c8c0b0772936a51f53049a8e50aee65584da37e9 SHA512 ecf076dc1c237d77da2a012dc9ccaf54292e4921337840edac4fe6357ed3f77a048e43a1358a4a7651f7e13c25db0c38ae71ab0bc5ada90be01868dbdb2e1b67
+EBUILD dialog-1.3.20170131.ebuild 1223 BLAKE2B 93d0557200d624c90967e9468fcc80eb63808b6d001013906bf9845ac3ac5dfdb435e9a5d1a80347d3bf58647e6acd3372e8ff4502b782601bdde02e6a697b7c SHA512 b23ebcbbb9f20f071423ca911409a859fef481361c43ddeb13d4f73c872d86436f3a546888897c2ed8886b3b0270b4d01879c6d6c3ed19049be675e6449f67c8
 EBUILD dialog-1.3.20200228.ebuild 1187 BLAKE2B 70ccc9a8ede219b1697e80a1536f004d3ab39f1bbed7044304a80968817dad2517d476d3ef0749710d7478a01322c4639ea15cef8fb9bb086d5b890a393bca89 SHA512 72a7c529a10ad2806177ee0a01476d4cc34240f4d2acc6ef2a61760315742387b507969df6edd021390ef4d196b62bb1a4886199b843ab6ada1e7d2a0d96cdf5
-EBUILD dialog-1.3.20200327.ebuild 1181 BLAKE2B cbc160604a4ff983e32524784a1c68d6c6343750a92a828e58b41df9bdccee2d236dc6b759e791af30052e59ed2cbbb81183905462005ba05131dd57497748d5 SHA512 186b43be9cbab4e255b7c163abb3b95d92f753bd9f1a4992e98706c74e956f20eeaad5661a94c468ffff7b71276b89dcfb57bb70a7c9dd401939155a403accad
+EBUILD dialog-1.3.20200327.ebuild 1179 BLAKE2B c9ed0318696579f38d36a42c69b8d17797d89410a34946c21a92f8d33d53eb0ea3917f053894ccb5c01f6a502f1b3b838cd8bfad74e2b12f549625ba950bf31a SHA512 72f1a230e2d75b70dfb5f21637ab03300adb5ba5da83b5d47447984879cd0e4a5d48d9395442646854b30e52f2e31826aaea5348e583daa5fe8e3a4b6a4551c0
 MISC metadata.xml 351 BLAKE2B 7f75a5909f8c405476b601ef0074a04daf1d837279462addc59c9f6b2b1449e46fd1d09d6a43ab12a6b89a2bc34a08c0d39cd10b9ed33914ac0c3af918ff6614 SHA512 b4a6309807d74355be8a695b9882da53be8c90bca68c6bab292280341ada808b5c9ebbdc50ec7bb97f25e9467edab2a4dd83cee02e0e74a88ce342f760e91d6e
diff --git a/dev-util/dialog/dialog-1.3.20170131.ebuild b/dev-util/dialog/dialog-1.3.20170131.ebuild
index e77a403b7a80..db301d4e57c9 100644
--- a/dev-util/dialog/dialog-1.3.20170131.ebuild
+++ b/dev-util/dialog/dialog-1.3.20170131.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://invisible-island.net/${PN}/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0/14"
-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"
 IUSE="examples minimal nls static-libs unicode"
 
 RDEPEND="
diff --git a/dev-util/dialog/dialog-1.3.20200327.ebuild b/dev-util/dialog/dialog-1.3.20200327.ebuild
index f92394e65fdf..87b962bd543a 100644
--- a/dev-util/dialog/dialog-1.3.20200327.ebuild
+++ b/dev-util/dialog/dialog-1.3.20200327.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~jer/${DIA_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/15"
-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"
 IUSE="examples minimal nls static-libs unicode"
 
 RDEPEND="
diff --git a/dev-util/diffstat/Manifest b/dev-util/diffstat/Manifest
index 915d32909b82..f074a1d470c9 100644
--- a/dev-util/diffstat/Manifest
+++ b/dev-util/diffstat/Manifest
@@ -1,7 +1,7 @@
 DIST diffstat-1.60.tgz 255922 BLAKE2B 325be7c283580066cd5c2665078320d33f9a97761a641ce53e7a53200cfdd0d047adb3bec527a5c8489320a685bd43979066465886fefd7ce5a29926c43dd95b SHA512 6cbcff7dfe6d51583d59d2c9dfe4cb958202491ca3c4b1096616380564a1842065434d30858c55c3ddcfc76cd07b58dfc4c4cb6cfdcf6346af60998170f51bd2
 DIST diffstat-1.61.tgz 257242 BLAKE2B 8506944255991f3fb093c77e04d1c19e75cce5deffe7ade19f6917c9775e00d02cc8013fcd88440a9d116b66859ffebb0d1c92755ca0ebcca465dd0595fe4bd2 SHA512 48166e1241904b955c0f5543b1f11724a1a91516fcba5ad0603441d985728de3e0fca5f5212704dd0fc9a9e5062788b1b34062869137fd851932233d4abad114
 DIST diffstat-1.63.tgz 270855 BLAKE2B 01a54c49200396a102c42d982e952d38d23c78452ae467e799d29ae1199aa179927ff719955d700081c4b4f4296c0b73229fa35823e3e18f80b2edc51e3316e2 SHA512 e1319f95088e615d442b0b02af922605d0c76e15ba2f0e8cf8c4db56949ac63f4a6e3e42099254480b9aab388cbd6550f515ed4d4995c6723d24f392d1872b16
-EBUILD diffstat-1.60.ebuild 590 BLAKE2B e1b11056bd086402eaf1610d28c0d532c30e15d5c6211e1677a1d24ac04d43598b305fd3b7bed3370a5c47e1f2cca2692c144017597707fda999e552fcc4fdd0 SHA512 d36896c9011fd27f43cc590989b0e9f81fcb46b42bdc80a547be1f92ca38dff77a741df5c3c340adacaaf24a56b3cef1cc8304309eb3b960d4aaf42179179392
+EBUILD diffstat-1.60.ebuild 591 BLAKE2B 20079c2722839aae9cb088464dee90d85b963dcee63e86130e93a35a08f11a0728b0672829bb6d11610fdfdb13b76dcd68cfa4d42e56b90b3f0024b9599fd08f SHA512 8a5792dd130140341bda12a149497dd88e6f7e8b01577d51633fa2020882603db104dd34c180410c02d7979e74eda9ef54b0f440071b5b75b7ac0f1aabdb3e84
 EBUILD diffstat-1.61.ebuild 460 BLAKE2B 2241823a739a7cdd71eb9d18eff107f74f0e6a6b8bec3478d6e1136bd16fd3d668372fa27ecf4611296d5110b1539f6d4926ddf3eef9aa75a6723af55cdd36ae SHA512 69a76f60065b705edaf1b531961ee1b22d63b57fe3b9500cc77e64db8bd030d05d03f4f44fee789f85da90d3e532e24344eb782d1008089c1c5e820d3a50bb1a
-EBUILD diffstat-1.63.ebuild 468 BLAKE2B d5bf6bb0cf8289bd616a66608be8c93afedfd56d2a250bac4bf7f8bda452d09a21f3c9fce27ff4d6f9b7d8d415fb448ddb824e8f2aa9c0bdab3982ec1be7a0e0 SHA512 41c8b9953e20993488e0411c2848ed30671ca3c789a24a3b83f22a15f123191a441aeef4a1836258ad7e962bf7d68a474695cf6cb8f6b120143654fc96e7026b
+EBUILD diffstat-1.63.ebuild 463 BLAKE2B f5fc107f6d9ea304267d79eb44515a1a3f7c9cfd3b36fa7a3d9902520e975e68363563055f6defed189d948ed26f4f18bda2e6bd099c285de74f569ac32486ef SHA512 9879ae03881fcf1611684544b19b48c63b657c27db375636f307e0c96adab51e0ac1cc0a82f7bd7347575ebfaa849e2afc3def97f0f38e69301f9d59bca8454a
 MISC metadata.xml 371 BLAKE2B 2c3b630946c1fa3f6e48d84b71b09902f6bd1d325abf2addc77cf89347771b9de8851c918eb90268989c41f725ce8f44ff5383fd51b4a483e40e67fe7ee066c2 SHA512 612277ac37956a5eb62db296c83919d9b49125145a9e9408dd4cd65c4e38439ac70b965de73e8f975e0410d9b0bcdf8bf1fce6a93c4883cd806fd39c6f9ab549
diff --git a/dev-util/diffstat/diffstat-1.60.ebuild b/dev-util/diffstat/diffstat-1.60.ebuild
index 966f2ca240ac..284c210f9236 100644
--- a/dev-util/diffstat/diffstat-1.60.ebuild
+++ b/dev-util/diffstat/diffstat-1.60.ebuild
@@ -9,7 +9,7 @@ SRC_URI="ftp://invisible-island.net/diffstat/${P}.tgz"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 src_configure() {
diff --git a/dev-util/diffstat/diffstat-1.63.ebuild b/dev-util/diffstat/diffstat-1.63.ebuild
index 45af0bc677c2..67fb175949a3 100644
--- a/dev-util/diffstat/diffstat-1.63.ebuild
+++ b/dev-util/diffstat/diffstat-1.63.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,5 +9,5 @@ SRC_URI="https://invisible-mirror.net/archives/${PN}/${P}.tgz"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
diff --git a/dev-util/dwarves/Manifest b/dev-util/dwarves/Manifest
index 4c3bdfeb719e..092d6ba36f2f 100644
--- a/dev-util/dwarves/Manifest
+++ b/dev-util/dwarves/Manifest
@@ -5,5 +5,5 @@ DIST dwarves-1.19.tar.xz 686136 BLAKE2B f7fe50be30fa9b247bf0f35d5dec6aa8f1bed44e
 EBUILD dwarves-1.17-r1.ebuild 920 BLAKE2B 91acee3b36ffd28dbfaaded896eaaa359a449d35e7da153d522631f07c9b82b3a7b8ff62ed77c0da99e0acb59f291273ddf6c3b2f1b6bb8f871d59bc85437d94 SHA512 8b2170782552b168c7e0b6a2bdb4d406e9f4556a182141aadc3f0b090e889efb7791b12d595d13a4115c8c04d4ebff7cf306a68b0d83f4ff7b418a77503d4ce7
 EBUILD dwarves-1.17.ebuild 935 BLAKE2B fb1d1b416c9cc5796f128f8ba3e5f70b317e4897846df208937ce85d20ec571c973323a47d5e9f65bbf303fb9bd59ee47e37a14e468e11c2da282d596d9779ed SHA512 bd4893cfe8408cdfbd2c0201f6a085c745ab8a339158ffc4dbe1504d7747994ad89abf0dbd97bd384976481abc9c361309c953e67a586498864b6f490aed0582
 EBUILD dwarves-1.18.ebuild 920 BLAKE2B 91acee3b36ffd28dbfaaded896eaaa359a449d35e7da153d522631f07c9b82b3a7b8ff62ed77c0da99e0acb59f291273ddf6c3b2f1b6bb8f871d59bc85437d94 SHA512 8b2170782552b168c7e0b6a2bdb4d406e9f4556a182141aadc3f0b090e889efb7791b12d595d13a4115c8c04d4ebff7cf306a68b0d83f4ff7b418a77503d4ce7
-EBUILD dwarves-1.19.ebuild 920 BLAKE2B 91acee3b36ffd28dbfaaded896eaaa359a449d35e7da153d522631f07c9b82b3a7b8ff62ed77c0da99e0acb59f291273ddf6c3b2f1b6bb8f871d59bc85437d94 SHA512 8b2170782552b168c7e0b6a2bdb4d406e9f4556a182141aadc3f0b090e889efb7791b12d595d13a4115c8c04d4ebff7cf306a68b0d83f4ff7b418a77503d4ce7
+EBUILD dwarves-1.19.ebuild 932 BLAKE2B 8f80a3d679a2c217860b3e8b6bad846bc4422d13ba491e28147cf6cd3d981e3ea313f4160a4717a1741cb4d40dfa96e8ee5f5de95b4a71874afe79d4c9b38ae4 SHA512 eb9706fdc0619f0c0d32988d5f0510ff4fa5889619f1f32913f035f249ad19874e389a0ba30f8a3104749d61439440945f8462e4a3bbeb3aa2692b4eec0037ab
 MISC metadata.xml 671 BLAKE2B 78a2fa86c0acc136403b1477db4e2deb3bde1ceed636ced96705cdaccb7e42f76e8fbd202c3fa258c1f33b14827f95b5ce343f8f4df981be66e0ad3a8dd226b8 SHA512 0cdd2c3e4e76a9017120a409aec1f70327363ee146e5fb74684d0e08e2836f0079cb97be1c4874445b271b98c13daf04f75ee481ef21607aac8976a78437af11
diff --git a/dev-util/dwarves/dwarves-1.19.ebuild b/dev-util/dwarves/dwarves-1.19.ebuild
index 063b96dc5e59..2c8bff90efcb 100644
--- a/dev-util/dwarves/dwarves-1.19.ebuild
+++ b/dev-util/dwarves/dwarves-1.19.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
 
 LICENSE="GPL-2" # only
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="debug"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-util/dwdiff/Manifest b/dev-util/dwdiff/Manifest
index 885e5c578c18..53af1258d6a5 100644
--- a/dev-util/dwdiff/Manifest
+++ b/dev-util/dwdiff/Manifest
@@ -1,8 +1,6 @@
-AUX C99-fix.patch 581 BLAKE2B b32c33cf78b2cdd290b1c9f74425acf43b1000d235032a8286d6363e0305f7d9cc1f10fa8d18ea853b813b97de0763b51fca9c9c1493ac621091c37f4603bbaf SHA512 4bcef29b0f4ab5d7e575a7637a62bdb2309ee6e1ac6fd5d1402433c065f0495351b2f30258b0a7b6bb77c68ac18ab6e2c0d359c10d19562f6f08424aa2ca6eeb
+AUX dwdiff-2.1.3-C99-fix.patch 581 BLAKE2B b32c33cf78b2cdd290b1c9f74425acf43b1000d235032a8286d6363e0305f7d9cc1f10fa8d18ea853b813b97de0763b51fca9c9c1493ac621091c37f4603bbaf SHA512 4bcef29b0f4ab5d7e575a7637a62bdb2309ee6e1ac6fd5d1402433c065f0495351b2f30258b0a7b6bb77c68ac18ab6e2c0d359c10d19562f6f08424aa2ca6eeb
 DIST dwdiff-2.1.1.tar.bz2 79628 BLAKE2B eb024d9c0eff18de9eee4a0fcf2d6a9ef6b049286ebb7f9715ddf18d920cacaab2738f04607b358be784f9d3e1c25f279ede620d412fad026f3280b9f8ee471f SHA512 b3392ef01c0701ea7738f1b539dab81727735e5de8ea77b56feae4e2f64dbda0155b479d7be0eedb65fc56ebc8d1a22c1ca67075abdec54205ad9c305b3751b7
-DIST dwdiff-2.1.2.tar.bz2 79282 BLAKE2B c938c9684d6ee1abacd77c1570b88157548e217e1837758f6c45266e29abc3857c6d4275d72126c29cc361e484722fe1d8c85a3714ac909b35a06d8390fb6506 SHA512 e4897ec3990261ddadf1fd4287902dd74c8350d11448714be8ea4b7808fc7d419ca2fd7fe65f347f46fdb1090d2d116c180a53fde3ff095027765f40acaa1c91
 DIST dwdiff-2.1.3.tar.bz2 79862 BLAKE2B 72eb07071de413526b70ebfd30030394c8bc4958bd14128b9a8b87a76561e4bfbd61064def314a4b989da027664d999cfb9a4ac9ab6f1b06cbe3f38f271e538e SHA512 e4375658ddb919d763bedacd122e5597a4c3cd40ddff2c954c6cc88e5047d20d4d3b18eaf75c6835be21e1f72e2622e25b212ae9882d8eaa36874af3f6de4b3f
 EBUILD dwdiff-2.1.1.ebuild 826 BLAKE2B 56666408fce2fa065675d12e372b29601281b5c7ea1f7fa0a677ade24f843bdb863d5b5727cba9144352137e6007dde190702d67fb6822b69178ea79feeded01 SHA512 d3d7c79ead64fd11fa55a134d7027295bcabe0e5419c1fdad3c35c490d2f6dc9513cd40498db1e05dec6131d26ba44fbb8fa28f46c54f815fbdf827078292817
-EBUILD dwdiff-2.1.2.ebuild 898 BLAKE2B 3e5d049d08ea81929edf87fce2cef1dced4e121466d6b9b3edb3222d036e0c64001762b691dd800351df1fe643f3eb6b6501eb3d212de80d6c1a6134715291a9 SHA512 3103653d4df9ffeeeb31a86c2d9a2930297b036c87f8a8444ad43acf091a105f83b181d6421a9841cd38e85a5199b3ddad708167a78e592de18734b68ac55ebe
-EBUILD dwdiff-2.1.3.ebuild 896 BLAKE2B 39fa74da91142ba33468846731f4274a0df13177ea9f5fd8fff8bda1fb4c1b831ef7f2eed976e294cb69de3aefe2904f6890cfb3af52844114901cbc61eff254 SHA512 5c019fca8b0a81583c79d192c6d4e476af5930559bf3241b7088df9469671c2ae2678d80315877c698a8acbd81008062f637cea317d8ef96eba394b7a539791b
+EBUILD dwdiff-2.1.3.ebuild 773 BLAKE2B 5cde752bb3161f0e68e7615035fe8e3f2d3d94ad32bbf5caec79182044ee8208fe7f4206ceecb41073bd0e56c321a77f5e3608c968fdf8b7b1c04094f0284dbd SHA512 0eb14e8b0efa94d82cb6442870c4ab510ac7270493d975d3eee0b2b874a0ffbaf62f5dac5e65600e4c7f9626bbe9dbde411ccf7e4bbb91854ccd70c3bf2eae3f
 MISC metadata.xml 220 BLAKE2B eabf3517ba7e5b67320254eeb2b07adf1dbe0c3432b693973bc25a3e3dc8ed160b7313f9f8ae64d994ac272487b785f33202d9640bb5a7ace9f56ceb42978a19 SHA512 1db105eebacb6c7d44fd17746981e6e24badb2e81327410aa935a7603379cfcc8f3cf27dcf4e9d870cea2f73f6a15cf052e3e785205095ea9a93d72980ff71cc
diff --git a/dev-util/dwdiff/dwdiff-2.1.2.ebuild b/dev-util/dwdiff/dwdiff-2.1.2.ebuild
deleted file mode 100644
index 5c70c554fffb..000000000000
--- a/dev-util/dwdiff/dwdiff-2.1.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="diff-like program operating at word level instead of line level"
-HOMEPAGE="https://os.ghalkes.nl/dwdiff.html"
-SRC_URI="https://os.ghalkes.nl/dist/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="nls"
-
-CDEPEND="dev-libs/icu:="
-
-RDEPEND="
-	${CDEPEND}
-	sys-apps/diffutils"
-
-DEPEND="
-	${CDEPEND}
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}/C99-fix.patch"
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/INSTALL/s:COPYING::' \
-		Makefile.in || die
-}
-
-src_configure() {
-	./configure \
-		--prefix=/usr \
-		$(use_with nls gettext) || die "./configure error"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	emake prefix="${D}/usr" docdir="${D}/usr/share/doc/${PF}" install
-}
diff --git a/dev-util/dwdiff/dwdiff-2.1.3.ebuild b/dev-util/dwdiff/dwdiff-2.1.3.ebuild
index bb6ab9abc95d..973e44885e76 100644
--- a/dev-util/dwdiff/dwdiff-2.1.3.ebuild
+++ b/dev-util/dwdiff/dwdiff-2.1.3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="diff-like program operating at word level instead of line level"
 HOMEPAGE="https://os.ghalkes.nl/dwdiff.html"
@@ -11,41 +11,28 @@ SRC_URI="https://os.ghalkes.nl/dist/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 IUSE="nls"
 
-CDEPEND="dev-libs/icu:="
-
 RDEPEND="
-	${CDEPEND}
+	dev-libs/icu:=
 	sys-apps/diffutils"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
 
-DEPEND="
-	${CDEPEND}
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}/C99-fix.patch"
-)
+PATCHES=( "${FILESDIR}"/${P}-C99-fix.patch )
 
 src_prepare() {
 	default
-
-	sed -i \
-		-e '/INSTALL/s:COPYING::' \
-		Makefile.in || die
+	sed -i -e '/INSTALL/s:COPYING::' Makefile.in || die
 }
 
 src_configure() {
 	./configure \
-		--prefix=/usr \
-		$(use_with nls gettext) || die "./configure error"
+		--prefix="${EPREFIX}"/usr \
+		$(use_with nls gettext) || die
 }
 
 src_compile() {
 	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
 }
-
-src_install() {
-	emake prefix="${D}/usr" docdir="${D}/usr/share/doc/${PF}" install
-}
diff --git a/dev-util/dwdiff/files/C99-fix.patch b/dev-util/dwdiff/files/dwdiff-2.1.3-C99-fix.patch
index 9d6d9ae2bca5..9d6d9ae2bca5 100644
--- a/dev-util/dwdiff/files/C99-fix.patch
+++ b/dev-util/dwdiff/files/dwdiff-2.1.3-C99-fix.patch
diff --git a/dev-util/fix-la-relink-command/Manifest b/dev-util/fix-la-relink-command/Manifest
index 745596fc09d8..a9fd54086564 100644
--- a/dev-util/fix-la-relink-command/Manifest
+++ b/dev-util/fix-la-relink-command/Manifest
@@ -1,3 +1,3 @@
 DIST fix-la-relink-command-0.1.1.tar.xz 5072 BLAKE2B 6307e92fe27612fab088d54ec74809450dc1cac6a6ed86a4779b758c0cbd058239c9bb9151579d408efa354b32b82e5b1dc4bfd65cdacc8abf1ad2bcb84eca26 SHA512 3b3f7f467f932d7737ec1d2cc7d2a71c65d34da4fde3451d6ac8d3545adf564cb2b5c352d89bc580f5f9c19352bfa8eccbecf2eb7bf8b968579d4e4e3bd901bd
-EBUILD fix-la-relink-command-0.1.1.ebuild 705 BLAKE2B 6bf9df41c832a5640e2924d82c03ecd7dd41f413467547f97e032c8c16be90cdc33e73ac39373982b6a0652e313d5d1690d4a13585487148ebf4bcfba79e4762 SHA512 09dd77a5b916c47947e160459408118eb0f49d4b5765ad4570998db75732ab8e2e19191ce0f8a40c15ff34189318f16a3a1869c35b2adc16580f305371b47ad3
+EBUILD fix-la-relink-command-0.1.1.ebuild 706 BLAKE2B db2c79c265be79a5bc599efd4af84e91e9658c1010c20abd7d7101a0b7c6b0698c7f0b37a2d932508bce053bfc2725d7569a07e97eb18c72feab15535d4a0184 SHA512 a3624f9a535898e91a1aaea2f667bd7380bcdbe00e5cf645c4f4fb8abb2833e86f5977229449e171b884c3ead67962fa5d25e2c94e3c745475395919dd5d25f6
 MISC metadata.xml 247 BLAKE2B c244172cf21ef0085614acb7d2006a342cbb76f77b22de463ab9d9bd1fd8d034ca3c1c8c26aaa4277fecc17d3406d25fa4531d33b58c351ced84020f9df11588 SHA512 4263d2fe40531a2b7495e54d9bbd15557b1f8510a5926f07b1a5ad4446c6dd04f099b5f990483006e6327d7e673f752b4fe63cea60691ab7a3d8722e0f9a82c4
diff --git a/dev-util/fix-la-relink-command/fix-la-relink-command-0.1.1.ebuild b/dev-util/fix-la-relink-command/fix-la-relink-command-0.1.1.ebuild
index 8e221804e410..cbeb37c49014 100644
--- a/dev-util/fix-la-relink-command/fix-la-relink-command-0.1.1.ebuild
+++ b/dev-util/fix-la-relink-command/fix-la-relink-command-0.1.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}.tar.xz"
 
 LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/dev-util/ftjam/Manifest b/dev-util/ftjam/Manifest
index c824c41b5396..be788c5c23b0 100644
--- a/dev-util/ftjam/Manifest
+++ b/dev-util/ftjam/Manifest
@@ -2,5 +2,5 @@ AUX ftjam-2.5.3-false-flags.patch 1682 BLAKE2B 5b57ea37f2d99439e8ff550a6a8100922
 AUX ftjam-2.5.3-i-hate-yacc.patch 1756 BLAKE2B 26aefb56b2125b765eee2b6dc9a55fd0d3accc9244b8aa70dedca621a3ca69cb89218ba7920f2a47a4af6548b5343960fcde8701fc11c15c0ebe0bcd1f8ea452 SHA512 e02948ccccb963ddfeb777c217efafaf19239cacff80514c167166ec666a6301b90e1a86a2b97ab58fee006f509106cc0e3dacbbde822efd0db2b9f5f4645be8
 AUX ftjam-2.5.3-nostrip.patch 780 BLAKE2B 7299ec77c1ed3ccbc87669850ee54d6d61534983793f076e56d95ea83e9c8617c80ec08d84bad24bbf45f11b6e0275167f4454223366ef041a81a4360d1b1d09 SHA512 6d8b399f8a4047c34b1315a230cf47e8ab76c7fbad9089fd4c3c18b2ba7fbb2f3ecbcb2d3a1075f0d95d36e547490de345167ba55fed75221b2b8162796ccc25
 DIST ftjam-2.5.3rc2.tar.bz2 215963 BLAKE2B 77e92dba10dd2b99b53bea87dc47c7f1d5da2a39789cc938d8141debf3ba5d6e25ab4092e1a3b69266b3353866c76e72706d13d3751a321e42bc5aafdf87e8cd SHA512 18a40c6741493adf293f032d9c7a9ab419402505a37993fa859e36e7a1655ec9d3d07662e6ee242487b143aa7e0f6c46f253bc7e23c3162c7381aaced001bfcd
-EBUILD ftjam-2.5.3_rc2-r2.ebuild 820 BLAKE2B 827b71923e06e10a237dddcef36c6b32b0b825045b0cfd2b15c005b652b780b00e76d72bf806033a5936bb41b8148e5a48d294fa249800a9f2c5d788ca066e3d SHA512 002d9e21ecc3413d75fd227203da2553852202659a9846db6b60ba09478330b22022fbaead7ff0e3ce8efd7ea7139acd73f89b500c9d9360b550f058237d4b22
+EBUILD ftjam-2.5.3_rc2-r2.ebuild 821 BLAKE2B 4c808634b6277b317fa8290795303b48d5f6b875b181a881160bc7376e4845c8068757a973bdcc8c278050a8acbea1079fc274d4f61b92dfd1300021433e974e SHA512 443c9c0a741ca6d4f4019eb58746b177257cab0ad7d0011d5b201cd29c38f564107af86568efa6932b176b0cee0f12d26b4ae26dc1646533f9b884b25a3b973c
 MISC metadata.xml 243 BLAKE2B 08246d6c76c2720c2feb89cba6d9c817718a9910f19ae5b0e90da4c8bfe7fb25616e02b46c860fe81b93ce71a78c341093062cfcfddd449bdaba1aa4497fd9ab SHA512 2e71aa0db138811dd97cc5d3e5fcadc54dd877ee5adb9d8988c30680e55e764e1391b0628e8a298fb2679bee30061d7a0f9a4678d29ce248183d5b9a25f8a343
diff --git a/dev-util/ftjam/ftjam-2.5.3_rc2-r2.ebuild b/dev-util/ftjam/ftjam-2.5.3_rc2-r2.ebuild
index 80f5119ad4c6..5ebae4e40d2a 100644
--- a/dev-util/ftjam/ftjam-2.5.3_rc2-r2.ebuild
+++ b/dev-util/ftjam/ftjam-2.5.3_rc2-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://david.freetype.org/jam/ftjam-${MY_PV}.tar.bz2"
 
 LICENSE="perforce GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 BDEPEND="sys-devel/bison"
 
diff --git a/dev-util/git-delta/Manifest b/dev-util/git-delta/Manifest
index d50e48df95a8..71689299a2f4 100644
--- a/dev-util/git-delta/Manifest
+++ b/dev-util/git-delta/Manifest
@@ -19,15 +19,19 @@ DIST bytelines-2.2.2.crate 4218 BLAKE2B 48523123ac1b5b643666ccd466a9fb48c4aff77b
 DIST byteorder-1.3.2.crate 21596 BLAKE2B 2ac70cff46af36e96b8b41c3adf9e09134af4d3d5b17c14233047fc3b70c829bffe6c129def84f529c1017ab2882c1bb66e86eab7b749a0d40daf2650da85d0a SHA512 2ef6b986926a4671dd945583730b0bfd4bd5e75b62a8a70c2875328157ba95f2c1b17c534d905e9b287457bd34363c1a33fd3dee9217c371032393ebbe206a8f
 DIST cc-1.0.54.crate 51972 BLAKE2B f3760987ea93e71254939a42bc795cfd68b994494c2d5820fbd6bda29e31b3a28d55ed9aaddb35f720b26b1bfc01f3369af81990b68da06a7c46c17eb014636c SHA512 4562c89b52786cd16a66c1970a4005485299ff0c21c61fd22a08fada933e5ecf3fcc1686f6e4f5a8ec4827ac00ed24c1c4ab4931ec5e9a12d2e5c283f6096b77
 DIST cfg-if-0.1.9.crate 7353 BLAKE2B 5556f3fdbf49708e6e4f08f2c536ee093b5f04dcf1fe4f68355189d129c416c338820143b5cf5f215323b38175ee0fd34eef4b2ff58179b190a63a9728fe2839 SHA512 45f7322217d291b3905ffdc45cadd5a7a7baf440f9a82a5b5596192ed0ac54353a3ecae0326d5807aae99bc4d79e0406d71bd65745ec8d9f8815a7c9436d648c
+DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST chrono-0.4.11.crate 139811 BLAKE2B d327f6be0a890ed74f2a2330777dcefbcf87e0291e47ef9c63aea46050f38c89a9b2e7a4716ac92202fab66aedc98ae81e090f1921a1aa51fa7ba18cb1cf24a9 SHA512 bedb698ae2994fc6fcf858b86a122cdaccd150996eb3e4313f876599cfa2180c2f687cca78ba30860365e04b75911fcdb19b5930fc155d1c17f06ec8197d3da9
 DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
 DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
 DIST console-0.12.0.crate 21278 BLAKE2B ee79ab5478a6f49d4c42389f2e9d17a5fe97749728fa548330a49b0869e8d839576eb4fc3874c60b873a3de8be9bdb7f928da6303c2ab0e68e9381052abd9e82 SHA512 f35d40ef5f91d99eddaa498b8e043f884fd624afd39215a7f207ca79b99d9eb563b47595974af345ce68542d76d58da17c358ce60231bcb0a1dcb9da31f7c6c7
+DIST console-0.14.0.crate 22587 BLAKE2B 3e91af20994c45b503fa4187ca537fad18efb0b552e09a3cc8e97f84ae0b51309dc1bff91bb54d06412f4779bb218652d649936216bb24fba473b988f1191ad2 SHA512 d453e82559629f0a7516760c18ce28ad347b4016e02d0c4f1aa725b93000cabc41749ce0bbb43cc98d6f9b0b92bf6726a8a265369d86f54a41a0a3f4ff8dd4b1
 DIST constant_time_eq-0.1.4.crate 4654 BLAKE2B fbceff4653396f9ee4c6d184d60fe78b77acd9b90986e83183b25acbf44d92b6d936df8ccbb1e7aef5c7487703058b93078fd90cee5eab4d14796886e3c6a863 SHA512 65b72c522f7ff0abfe0e562476bbbcbeb1271bc9cf61f9663ea5c08730787242b30df472e7b74a2ea9979466c251030c35f36c916d20e0c6b99826fbecbd8f96
 DIST crc32fast-1.2.0.crate 39161 BLAKE2B f71c85801f945602d53f93ce251c978c91f63fcd92fecba5083fff0f06738697e99d92c17a824605d5d56b3224db224ff32e4b147b6f6af47ae714dcd511e7cd SHA512 2ee73e0642f83e28034c1baca65156e65d751214e83f2a4ce94b6add5ba11f74ffc80832a3348ece1c099367be2b11e820dfb349fae89fbced1b68bd6b0466f0
 DIST crossbeam-utils-0.6.6.crate 32836 BLAKE2B 48290733712549c46bcf99641ddff571cf2fff72b2a70e86a554899987fd71a61a8ab6a15c75e468164755fcc3218a1db54a4fa406f766f9a9f03bcb3d9bcd02 SHA512 771ac1a55a043600e7d8b720f9b5a32da2ec09efaa4dec4202f7b78a505eb391a842b7abc91516ccd287c3207c634b342b0bc8ebb3c0c7a0d73b7fb29badc9f5
 DIST dirs-3.0.1.crate 12245 BLAKE2B e58f9383d0bb78f27219337c83879ce355aa60290df659b9dc656e3febcc2577b8fd5234792fa354f1c7f2b651e590fe490384f79b0a8a332eff44e3b459d9cc SHA512 fe5eed57f7f3af0ebc53098f7d7295702a5339d7644d271a81bf5a966ae5b3e688eeabbf2b122e6e7daa1080dd30e48d8cbad969f6820b6cdb1680c84f0b9623
+DIST dirs-next-2.0.0.crate 11689 BLAKE2B f5022bc51dd50bad4ad0fd05b159a4117aca47afbea66dc42c8306ca58f3a550165afbcf9f5f721ef5ad8d357eaff305c6f6e42789354a910d5f1d05d3b7b7c6 SHA512 6ccb732da8ccf7bf35952c22a3b0caa8238319feb0a6cd3b0957e6be12548a2ce507c69cb6d3cbd2adfb37e13e6521c6229da5999edb0e47a292a41c3ea1a766
 DIST dirs-sys-0.3.5.crate 10643 BLAKE2B 8df1e6ca2c8e8560913bfb74e7bea1b12e1b13b6d337f3c76f517716622586cae8ff9999044e3265504a44f161526a79baffff2d123d3ea6c5cfebefcf498010 SHA512 ff7eb48943b61773dd2aa8dc10372186d613c225a2b39caf48966a1a5af087dd0177b8db80b1353a504af8aa1c8b4a0a849edf6c7e4389f6b753bfa3b7376833
+DIST dirs-sys-next-0.1.1.crate 10490 BLAKE2B a691f9603b649f648d410c7588a84c69adaff41179aa8eac899ed47082f171d765876864f08e3d0dbf3fa3798c1342b30e3bdf530ef06ed017c235a63b15d5a9 SHA512 e89af71b6bb4e23efb8ff189b42615672c2aa305fb8798393de2f9151c78cbfd5f3e45b066f5de64dfad69a84b15e72a1cdb4377f31ee9288018143017ed5730
 DIST either-1.5.3.crate 12278 BLAKE2B ffbe3878098daadcef9a554b60b2904d8d4814ea38cb915ee0003d3cd11243e04813dfb41384545e7b180f7d542c7aa2c0a351b736d4f449e70fa11d0a09cca1 SHA512 5e283412597bc3a1341d42c6cfe824606e056aaac82cbf3f662e7074ab74f1f80befe9de1b1011ce2dc970a0ec159ade5ed5b3e71c9984facee6314eac20d0f2
 DIST encode_unicode-0.3.5.crate 42677 BLAKE2B d8044f314f03f93965bc4de11c065f08112d33c4e1b42d9054476dd7ea925e22fb7b32fa855250be2053a00d877bbdb83a293c0aede3aa6e48d978b61f0f57df SHA512 e9849cffcffbf66e28b609e86b0d26b1267f6e2858c6564f93b071b1257aa505732dc3b7ae5bcb347874514fb8c21a606282bdcf69de842f8b96e79547f434a2
 DIST error-chain-0.12.4.crate 29274 BLAKE2B d082bcbce47411477e8b597cfcb76985cc7d6f1696926cb5314f4e84d2c8642939f5263e110aaef56353ec086a21874a8093bcea1d018be81c86ca42c2c30d71 SHA512 c0ee19a0ba2d79ff1843148d0a582045e68466a9dc429e5f3c8a3a75bc1b6e0d6de03ad69fce851bc0297e7db77b2c6817a13c37e1c3d4501ed41db8a454bf79
@@ -37,11 +41,14 @@ DIST flate2-1.0.12.crate 73844 BLAKE2B 46d0e592e68dae030c4e05aa073ac8940c8778e70
 DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
 DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
 DIST git-delta-0.4.4.tar.gz 1024790 BLAKE2B c0a74299196c4dde617db74832d4db906b8b3eab2a1b302ee81ce5a9fe2df4daf8306768d00d9914153159aa8fc0d5aaaebd9ddbeec3c79ce41bed8c92702308 SHA512 1d42f87efef0ba065860fd2c3d2db3cfc1e97580b4bd031e91393a21479ab61d5c7afc99eb232eb16bf8db6853072b714027c720fd2d452be74e0ef0a5d1dc34
+DIST git-delta-0.5.0.tar.gz 1053905 BLAKE2B f42269cb12367ac07761975f775c640dc5bfe30cac0cdd60c2e91f863e2de869364b0e1937a8f70012b0afaed3690f0013b0364847eee3ebb5b23264f403dfb2 SHA512 1431939ec5afb09b8586d974ea795c5a804307195010bf461f8651f8ad2eaa953bcdd8d6bad8186d982592857304f476cf3c14c0816bbcd82c84358b8db98ae1
 DIST git2-0.13.11.crate 173742 BLAKE2B c14fa5ff6c6d7dcb78a2c7abc3ac8254e50fdfc21926484596f6e259a8fee825b4b11b4a592e923a079cda019059c2feb787c82e4bc23e0de1c18a2b68f8d71e SHA512 2cacde47dfbf9df7a46d8d25fcd182f3ef239c4dd987e7f21b3e49e29671bcbae84f387014610559b2bacdad0708a9ec2804b67befb1ec139848a625508e93a9
+DIST git2-0.13.15.crate 180011 BLAKE2B c395900bbe65628ad8b0a51c99ddbc5b5d0b76240c0c030a1df08f18f0220515ac9e613a8d6eb7e71a64d303be843242c9dfe96c62ee8cf6a43b2369cccc15bc SHA512 c08ada81843f512cb855f5951c0fc97d4bb64af98f834bba30255b1ea70e4a7848ff018944a6c4a7d36fc480e631be4c40a5259e493258a6bdc1c233775cecb9
 DIST heck-0.3.1.crate 54666 BLAKE2B 99f7ceb44ea6af445749989730ce1e14156018ff046a136be2e6474b285088e1d90d6f8af9352affbbde5bac7e5a32971dd99f249f968105e9793b7de76def07 SHA512 134722192c46fd64b38d2fbec3a2511c560916e906491a72c4ec9d99b9f716dc58942fb99cac99b9a6ef2de5b5ad1d1c1155f292d091401b6873347d80c086d6
 DIST hermit-abi-0.1.12.crate 9217 BLAKE2B aecc8c743241596ef4dceaa61b4ac36ee0a2501e97eac976c733638cbc8a3c4926b9e231404a67a3687aae03049ad8ebb10fdba2d8c72002c0c08a2f8f76e3ec SHA512 7c2c7950f2b70dc64ef7c111b7790d7128b49c91aba9c063e11a3e09070b28171de6b77d1f31b4ca0c1642e61bf4b9d50e41d72b9c9228bdd1749347eb753df2
 DIST idna-0.2.0.crate 257203 BLAKE2B d26117124891f90b5e36af291c9038e2f4d46402c41380a6a89758459fd73839137e6faa401502be12dd81292cd9e12ec82fc611c0ff7a150510d19010767558 SHA512 375d6d73537a5c9cebfc850a2b561d57e748d80059ca27fe5e35c058cc12a5938cfbb39a76cfe57fbe589f7e36f89ccd91ccdb8899458c322e277c299293bc7d
 DIST indexmap-1.3.2.crate 47144 BLAKE2B 70330e3a7bca371051f871b029938c1c3d6507739cdfaf348347a811a69ee923ea9f5884b6375b0b95d7f06472e18be3652ce110ae91cf723d609a01cd4f9dde SHA512 f3a618bbc0274cc9c8e25183448b1f65db11107bc72debbeb178040ab3f5609e4771df00bcd0a9b8cd5f395b982f7d031dae7c3bb8ee71d7abba19fa21534dfb
+DIST itertools-0.10.0.crate 109656 BLAKE2B 73b65db4a9f02cd6940a81966ff433c5d9d82bda15b2250907728b2305451e2914e0211ed16e9755585d6a4ea67c3f2b1a5b1ca589afb60f20f23d1c1d31da7a SHA512 ecc194ded512a0979c4429c0395125e1d3968c61f673546b755c0a8bf2fa5a604690baf77e95dbb91dc26a3004b50a856a8aee0dae0e4c1bd83073e5e7cacefd
 DIST itertools-0.9.0.crate 96429 BLAKE2B 36d3b1dec7ece85639337f1a40a00330a5216ea8c460d13e52f0f9fea71bed5b3914cc4a7e05b407ed41e0dbc2292ae5873b3481297edcd92ec547866d044b8c SHA512 1c6650060750f3073140c4a77fc4d1acffa7d18320012807df0e20ab06ddb39afa7f086d89626e3909f89dc1f0408c9ccee4dd9454ca1f7a6a145bb213e7c5ce
 DIST itoa-0.4.4.crate 11147 BLAKE2B bb6f1caf1e58dc313bd3cfa2cf81252cb2ebc15e1f4c9adfcdedf46c5fa79811d5b0cbd58f1e91d1f62bf85d7b941b0dba535814fb43b5b70a38db791b45717c SHA512 f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d
 DIST jobserver-0.1.21.crate 21228 BLAKE2B ab1a6496d609e19235f022e920495e708571116e90f8c036edb5f7ba270c2ac938f7571e89f3fb714043c87623d4cbf1d404067ccac6a8b41e4a6768039cf02b SHA512 944249819e1e3dd09495ead941330e9abe439647c1e66ab7e2140c0c9e100b63f4f792fe06aa3c86f509f057df297ee2d35df0ccdfd4bd6a115b6a44076237ad
@@ -49,6 +56,7 @@ DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8
 DIST lazycell-1.2.1.crate 11691 BLAKE2B 9b1d6e9ced918aa94dd5dddcd3ffba59116dae922d264180ac36c288d8a6dd9244324a7c3050c5991b216a241e482ee17b2e6d27527b88339b606586128df1f5 SHA512 de74ccd6a3c32c360a12a51ba1d51d6530130396b37d63350a960956ae0ba13e9ac31e2bb70b61ddf055fdfbe7e559b20a38415cac3906839684905a01256ff2
 DIST libc-0.2.60.crate 409744 BLAKE2B 1d2dfb912a0a01d93ef10d57ee7d2259c0b82ec29b34a0f1c4065c6be080685f556407cee896bd74b01136a59d9c583258818118c81e9ecec5a6387569affe77 SHA512 649bb508f5e2800712618e76686c12dd3e7956ce2197d620b1b53427496296889f2743cf060e53400b33ea86982dff2c7d7c85b151fc1233895fb4c7f786b39c
 DIST libgit2-sys-0.12.13+1.0.1.crate 1555713 BLAKE2B 2b8455575182d4e56be1dfe392b4a55cb04b2d61c18982623dfec182ff348ac7ebe42cfce97bcf8e4f17cf55efb6a85b7e31553d4ccd1911c91748cbe8d0df6c SHA512 fc8a1e85ab4d23a408ff5f0af9cea16db6a9a30a68885340431ce7e26bc4e13ae50c96cd09485c9f3bc3f74ab57cc16e3b50f0a73ed8c67571afed289bbbd913
+DIST libgit2-sys-0.12.17+1.1.0.crate 1434697 BLAKE2B 864f59851b8d3aab35f520a5a5f726fbe3f97d36046e47fde7b237d01b9e40a03da0d0e08f241b08b4f53eba417795acfb80440e2870a5f473ba3e5f50409300 SHA512 a7232df268f091309c3405ff17833661ec5952404d7fe63a68c8ae98bf134ac49acfd4ec5bc3402382b07bcce529fb7140938fb150828a7d670bf164a73693eb
 DIST libz-sys-1.1.0.crate 1324239 BLAKE2B cab82119fdeed84c3c4d37080b2065002dfe9de7b9bfa63256a61ff98cf06fc08e9f1edf02288589085d0f7a400335338b50f9c5f7bca5d2c71fdad433e802a8 SHA512 2d7ca1dc376d77c8b4b764d02bb6371c72ab6f07def5f50b22d77d19631e5a1f67d2e1a51c4cf7766fb365cda2286692181c6a05f55126404033347f307b9283
 DIST line-wrap-0.1.1.crate 10010 BLAKE2B 8f64561931efdb39ef256b90ad12573df76449afadc11f38b5431c1fff73da3ef1dcf9ad8ba0c30cd1ef1b0a8d894a7b34327e4a5eccfea08051ae5abedb483e SHA512 31976e14355317bab470e6716542d3cfd59083a1808bb199dc2eddd51d05fab122ab054783d0996c1feb53bdb316e6fa24b34cae9ed8e8cdb2702bc43fd805eb
 DIST linked-hash-map-0.5.2.crate 16109 BLAKE2B e65a12161dd8b4c0ca49d25e20d0e5b68c411c349c00c6a1faa01f4db4b3f4c811bf9b64947922b8ab900a6bcc90db30e8a6d58ba9e384201879556408803e5e SHA512 74861f70ed09b119c6db1b0dc7f7c8c3483c2824955bf88ee892b3a3fa1a54e9bfcaf7fae0cbc4792762e330584dd347532532e1a0e8a8bca222b5cdb2c7cf94
@@ -76,7 +84,9 @@ DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613
 DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1
 DIST redox_users-0.3.1.crate 12557 BLAKE2B 42810692ff093b9ce056e5b539834ec3fcecdd5cea6a1ec750fa456c4293ce483a9de6105eeddc6b6f41c591c7f292b744b4f12de65eb634ac4b855e6fb450a6 SHA512 086a01e32fa5b5fbccd2d84e23141e3ee5a50e5ddd6135b579c75db5a0eb7df676dfaa8e2582038ef19c09d123fc68e9d0e99667d4ea46f5011d4e7fcf5692a5
 DIST regex-1.3.9.crate 236683 BLAKE2B 29bd39b138a8168015bb7a6b36bb5f7f9918b7c00bca28a720f3dffd5b805d3374a6648a04792585e85922e099faf547e5d02aeb23008b7802424351633ea23a SHA512 425713d3eeb4132d4056e6c1a08bc2fa5032b9971987c531b5707a9b5670ae15f037bd68921f1545580801957d1ea283eff87e533477364c7f76823800202f74
+DIST regex-1.4.2.crate 236931 BLAKE2B f316b777df1c97aef2994745e1fbd9ca676b0da6bf4ffad4e54aa11014d39aed343884ede3648b5fd676dcec5e4840e9d84f4a4faaeefaf5a2d772e2c5b9ebf6 SHA512 a9bc8061b7563b8494b21f35bf3c2af5f58dcc1b0df4e25ab8d3f99ba66527d5163e2c04b229b688fcb7934961f718fab72f22d66fef53562c5d96a2fb3887de
 DIST regex-syntax-0.6.18.crate 294440 BLAKE2B 355d6a2704e1267064719927269facce1f1c8897566d41e54741183969cde5e56c38d0c0b610b99dea3635de20fa00ebfb8748ceea331af6984198d927a93b73 SHA512 9cd999837890a87d0cc6bc351029a422bd52e5c621763e5c11ae9dcf1ba5edebabcd9e6d70db0b1656072a6109d439101412b3aab0d6ad357ae02ee7039a010e
+DIST regex-syntax-0.6.21.crate 293572 BLAKE2B 49c499ba1c03447fe7c90f27147dc5d96daf815e330a4073fe293d3be594fab1d798d35a5e49f6af43c71befd47528927246c4ebb24b6a6a141135484bbecd31 SHA512 56507f4432804ea30820984f6cff03c3514988bc3e406b3ba3a89c36c9c5d75951e4acd000ba85b95bb83d253898ce7d7d282ed930e811e12bb644c4a5ec84fa
 DIST rust-argon2-0.5.1.crate 27795 BLAKE2B ee178d0009a4c367d813e3e4a6c6f765334a0c366b8f0d98f40d55c6fdcfb64284cc7c490c6185d419430f702a4cd051971463c7994ea3323f331eb6c6eb0132 SHA512 80c1c48db1463e1506bbc8147c147c8e37a8cf26d6297399a8e645c8fe81b6ed9be9048a3b3dda67cbdbd505085e9ae79d50faa2a846021ba65f959160465f4c
 DIST rustc-demangle-0.1.16.crate 19137 BLAKE2B 04226ff97786b81c90130b48cf6542ea448661af9ea7afed179e71d04abf52cfd3c53fab26d4d35bdf2c1d5a735882da7703527aa48ba7b77f337599c2324150 SHA512 36a63a28a72c710d08524adbb7d11def37db23fe123fb6ea848623b4207c7f80d8415bbbe951488ceccfb8f4f1cdb66a8edfc4c0eecdaa62c87df9e032f4c063
 DIST ryu-1.0.0.crate 40170 BLAKE2B 5938a70fe991ac71974a38172acff9e559ec457aa12775ac53305742696a7ccf8f4619734b1d7b0e2db01b548ef2945aaebca605c186dd0b599f47dfb3fbf536 SHA512 b5dd360611fdf76ff13d377c1c79ce09a4fab90a8b7fc917a4424b8246c8a0da7d3ec515b8c69b695d936b1207072d173b9f40fd5cb218f1eab947862112caf0
@@ -89,19 +99,24 @@ DIST shell-words-1.0.0.crate 9798 BLAKE2B b2511d6a956842346f672edc9a3a3554af6d42
 DIST smallvec-1.4.0.crate 24645 BLAKE2B ff5102e2b3a03bf5a8e3e2325f93ffc96dccaf2a4c9ca50ccbe7837215eb356e21d2aa5c02e5130a657c166913e8c42cf9dfe50352b6301231b4bcd37225b6fb SHA512 32a56d7055655ee7d4a6556afd63db7200c269a109ec3bee29fefce8bc75363762c3cf625aa3edd3b06a93046b8c64fea2036403b63ac0e764e08af78c936a63
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
 DIST structopt-0.3.19.crate 50644 BLAKE2B caeb54d559de0830b10b8d20603f09c03da46a856041b470522a59a574e5f73177d4d180a1dda7525251a7b4f73f8b3fe0a96b90d7da3a97391f542d7bfa2fad SHA512 e97e81b936c7077bc2f58c3d65eda8fe3f235929a1f30e9ddcd4666e2ff0a4b24a9175e5beb0ff1414a55d2b6aadba54f762c4ad83ee5a6dbb4b272bd7d59c29
+DIST structopt-0.3.21.crate 50761 BLAKE2B e48bbec27a34ef80f28e21d42b5acc8b2cf012e1944a6b7f6395f4bd420281e18767dacabed0ca37d94ad26e73ed201c9df06d5cd781a4c107b5741eb0880e53 SHA512 df8592f10456a5b1a7bc7b290357c069ce4eba14d2558ecd6face231e49c748a8892c31ffad000b426e8180d3e4dd607329db91f4b5617e971b2edda5bab42f1
 DIST structopt-derive-0.4.12.crate 19742 BLAKE2B e1da17d19b5244ebc32522827e7acfe4133bb919374639f775864f7bd4b52fa16374640d4022f839ac682954cfd07c692d70329a347281d9dec4035bf89c7afa SHA512 ef65a34b9a9f23be853340413cd5847434b2c3279a401f938a0a82d5499f9c17968b85f13c60a058a69fbe78c7c24380fca31f0e7ef86d986fe15a082353d98b
+DIST structopt-derive-0.4.14.crate 20116 BLAKE2B cfeb48f5e4906ca24b61afc085a5dc41edc6f69c6060a1cd7e01b844b076928111e4be2f24b3cb28e7704c09bdbbb3c3a1b2f9012ae9e23cc5f795af91fb1245 SHA512 bc20dd9d10c6dc1f5975b074a63eb84b49385ad272b62d8526962e88b28cada3998c3944dedaf8560d6577871747b875cd399dfe06851472c0a1c81fced429a0
 DIST syn-0.15.43.crate 184065 BLAKE2B f0f1f97fecc71c91da6ef9d8c5be43f0a320fbf5d7ea6d1d6ec6743735790adea03b0058b8c544b1b06ad7618b7c7b56c64ceff5ccbfd2cc2240772cbd46e720 SHA512 b2b022706c802a601b92e21601113205b147c8129b9c0e6fa86d0c4f823fc3ac3c1bcb48f678fb2396c76759580254b16f10267d8d22a98a733dded34ebbadae
 DIST syn-1.0.11.crate 193782 BLAKE2B 17e0b40ee69575efea77249343af2fa67af0990f08ac8efced152ebb88ad1301211306a2317ec163219d485a097878f8552ca353f43f35ffd5d172e6c92da0df SHA512 6b361c6cb27aebb3da5e81db270e7cd0fe8bfb11289c25ce46127214e222c2b64f53164c8869de41b77e9b780f967454ed5d7c5b73442ae292eadc4dea77494c
 DIST syn-mid-0.5.0.crate 14149 BLAKE2B 87170d072ab6f5ffc6d7f4dc1a08869d4e5c0f505b9130d9b5778a55e206a488b048e47895a524e117ed58b3d45907c8877c897d1d88536a06c9319826b596e7 SHA512 759e29a2ca984eddae3c091be036ad630fb985408be31d838af3bb04fe1f26a3d2b7ef597c1ffb61a72c96383cbf39d8fe83cfe0d79ed4bc3250a585156e637b
 DIST synstructure-0.12.3.crate 17788 BLAKE2B cd122d9c374b59501efb3b38da1f867b86a41d5c7d3f2e854100297ebf193ecd3fb4a64a74f0fe186645de2ad2c95fbf6e96b4872b76f6140400307ab69d1196 SHA512 919f908c679439cb9c2e60ee8672484504f03781412fd13f5cbd745a86ed794691665bcd7ea995667e89344d0eab725125fb0027c60f240290b300d04be26a59
 DIST syntect-4.4.0.crate 751314 BLAKE2B 4d70ea137ba28e733e2bf505f547e1caa8a38dec33497e092d5efa77e321bc468ef955a0957ec949a0c68df31684e33234838f177f201e77d5e70aec8337829b SHA512 018fc26a99cad799446dfda0e406af87fb63e35cc5684fe2928f42f1b0a1199606a25b9ee4f1bd138abebc40f365c26407716856376f1ed6d3352c879a1689f4
+DIST syntect-4.5.0.crate 752883 BLAKE2B 9c9ff2cc63ea421c0b8928a0578b278883d0a86be7f7c256820120a858f8c02b1d292e2474e5f2b63486e45cf5387e1a8ba4db2a5c9e7a2b0cf4eb687b42ffad SHA512 17653ae9baa4da049c899820f6033b3e7d71b96ab70b9c12e57a1ab305d155b12acec470167be2a0a37ea9c89ec4d19850f72d456e6857a7cf4dee65fc288273
 DIST terminal_size-0.1.13.crate 8094 BLAKE2B b46de1f0dfdd6f4dd44c21a5cd7936cd9fef67d96be44775c29f3850e39b94f200c719bd0c0c31727725f1741ee9640a83c1f3083a45ed665db7f03e50793826 SHA512 75efac1092c6919efc7d427e3cf7d4c36a4d12b3d5c38ee35f94ddf2fb0efcc16fb92e608382905475d5de3078e9c64a29ec77816572797fdfb53a6708eaf266
+DIST terminal_size-0.1.15.crate 8795 BLAKE2B 2e7590a524bd8e439d385f925c3d5a3aadea20bb24b7fb5c52dedc4dccdd67f986b304208dc6d9cecf0e4b2c449dd980613b4e381603cad74fd9038420b289e2 SHA512 cf1612f46c8502e079b87a240ddecdc02be8481cb7b78115ba1550a9a732103bc19de11f46160dbc5af06f8576d3dc780ed0b199b7f24c92fc0734e0d07e484e
 DIST termios-0.3.1.crate 9541 BLAKE2B fb2862550920607bf7ab65157b25392ad67c486227a0298ad2b0b58ef2f2f240ed1b0a6b02bcb905078cd4721b2e56b76a9c1ace1fecdf15643f76d3c39da2c0 SHA512 5f4f423f7aa0ca7e25f1fb0727029e47fbae9024aae6e168b911ee036bd217084332707ae809b2713d0ae35fe6a7fd1d866fbd1f06bebead32c0c2534671b311
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST thread_local-1.0.1.crate 12609 BLAKE2B 34206b5232262cda9cc0fb970e20f154d43ff1c4477a5ad5ff9200e6d874a6c7b2bcd99a2dae75a984b54574281e049ad35307ace0dd188f44c9a95fa93139cf SHA512 f2bfca4eee32a8fc88a01ff5bf24518c12142228d95916d13aae35ed6addd0b7da2235359f15220049ef197555344ac31a8833775e7a5bd49144db9c54b3165b
 DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
 DIST unicode-normalization-0.1.12.crate 91057 BLAKE2B d5b8354990e1911e093d63d9b3b3adeacb38142ac68637fbfe59c0822f34c743e348cae9f535421c12cc6a56db2112dd5ec75f96c173b1f34a68db66c8ad8dd7 SHA512 0e095a59ff965499a5d2c79bfd4826b793103bebb4d2666c09e675110a50f79d985eb29565e4c40bd8fddc30237f874324d8a24786ead697ee0698ef8f79a1b6
 DIST unicode-segmentation-1.6.0.crate 90703 BLAKE2B b7d63bb8b62cabc604084957aaff021df24a1291f0ebdcddc424cceefe10ad399ed53152211c3e7557e39e21255166f922256f9f8e1fb488d3bae368b49a378e SHA512 80c6f92d9b39602a05809dc63a7cb05a305441689b6056801097a882a36c9795aabd660f884f707daa7e7fe6ad4983f6e245c226962cc982dbfeea2ddfddf41e
+DIST unicode-segmentation-1.7.1.crate 93066 BLAKE2B 80058a79c64972dfff897b08a24e9f18ae0fa312a50f86fc321961eeab83c5546bdbc30534315870d891e648bde1d7d77f459ec9744455bdebb94bf6e326f2ef SHA512 183ca68d456a8d53e6f255129e8fd07b87d8da23b8f18187231d6fa70dac80e4069eb6c501d45155d9f0050b6bd713964e55f0e4b25a40546c4d245a17fc8dc6
 DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
 DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
 DIST unicode-xid-0.2.0.crate 14994 BLAKE2B e66b4255798f0ef1c81fb852613fee396a042d780d2158a171dbb5e7dedad0b3d2522f5401ae5d215f89ab8be4f5c371b046e4845693a65554c2a6eedc5d1e28 SHA512 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359
@@ -111,6 +126,7 @@ DIST vcpkg-0.2.9.crate 11279 BLAKE2B fc36eff275a69d9dc959cefa730b8ad53f4f277391d
 DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
 DIST version_check-0.9.1.crate 11459 BLAKE2B 72f002c00504f635b7d2d7ee7137e07ba9c182d2e41d32a51851896f6bf6742c5524b7f66946437ba581ccf80b9c9a57280dd4b02df0918569ac710511940fc1 SHA512 b9cf363169df2022a961f5bed4fb7da07513e0283a85aa69752f6ac567e942611ed2216ac61799db1a199e2bdf0fd9b994e35d4a40c6cd80cd26b97cbfe977cf
 DIST vte-0.8.0.crate 23854 BLAKE2B 27fdd36358b5d10f2b30e2dd8d0f0f3201263ca86bb5e734966cc67099a125df91512c39ed8dc06206dd3db90f02cabf7ba85c6471c402999c7529c2d607031b SHA512 c4545c8e12bdb78674434eb8414dac9d2885c2547f302d19533eeb77dc2dc8d97f077ace4905f8f105269e68b808bd01a1a825ddb86fe5947c8a4acf18ea4ee7
+DIST vte-0.9.0.crate 24930 BLAKE2B 91b3c85493037d35563337e43ab64e14503e997b029bd2cc68e56a4e95cd25f1e65b9bbd24cde567e170f5744d55fa965f1b7abba407486cb44f84a21d0bedbf SHA512 ac7c947a01ec404132133740efbaba0bb7fe441fb97373c144dfe4f19a6e5d300657768c2a93fbc7be78247efffcf90257ac2373d5f1a283abd98a968f88b5c7
 DIST vte_generate_state_changes-0.1.1.crate 2422 BLAKE2B 6e8fb4ce0ca0fd6b9a4dcccdfb02445babbc13d47de5fae9bbb81e8c67ada8a40e8dc5e57c120c36876293b111ccc71e1069ea3fdabade6f9ba5ea2d44ff4632 SHA512 ba09352e037cbd279cbf5641c9783a24f76e54f1f09e13f0ab1ca99c9646c1e3c958e8e302d7cc88431073bad2e2d5619410f2f93f96f1db25f0f0ded0236f7e
 DIST walkdir-2.2.9.crate 22423 BLAKE2B 7c5f1aa4a2078d4821a1fffc57751950295c99706b48198c70556461aa42b2535d93fd95804a6c5003ea906848accee510fe5bc6148c4155e6de074ba324da2a SHA512 43b8f629a43195c8cd8ad6821b431dd3648a19e6abb83f78deaa3300e7dafa32b31b3c89a228499585e3da4520ca26d82dabf938c1204c8011e5516b3b82da7b
 DIST winapi-0.3.7.crate 1075776 BLAKE2B 694cea6d0d14fbe85ba718c0ca7b9db79ba8f943b44f4741d77000617de43314a2c657285736a032c138b5d2095b06146a2ac8d84b8efe2307ef44bb7073c604 SHA512 6871b93ad8d48e39b90cb7b31b3132f84665f965b4dfe06fcebdfb873e7d099007cf3d7a50e832a941c3425ad2f39c3ab48a77151e60863685b97fc05c71d134
@@ -120,4 +136,5 @@ DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e
 DIST xml-rs-0.8.0.crate 50974 BLAKE2B 47f5c663e0982b0ca6caa7aceb7029f2bdff948395ffe07da50fe021d7014ecee7c1d45ea9bf370da8ddbbac637bdbf39b9b829769041406958f069ce884e5e2 SHA512 94f0bc729d58564d63b4708518313e3dc7fe7c6ff9ac94019df1507d7ce7bd6428f2bc16fb116a9d676415a94812ce1e54e30b469a2a9b5fe29dc82486c536cd
 DIST yaml-rust-0.4.3.crate 45768 BLAKE2B 6af7374439000dc5e8795b26fccb1bc691040846f844e10765fe5df06237f5cf52752b0f9d25ed7c6f62337f628ee7be2e024f8aeb6b55a7c76f0d3b2ad0489c SHA512 31b0236fe041706befa938cdeb9c74940daccd2f80bdbd4e0e890901c868ecffc39367a41914c8bb98373d1002904f18b18ff13a08bbecd19dec634c08b7a7a3
 EBUILD git-delta-0.4.4.ebuild 3126 BLAKE2B a5c661998ff49b86949fa804c2daf8898c6bc53803c6cb73575dc67b73951347e1b5ea51132a4f57151c00f0d8ca96b508d51a934b79bfcdcb407a4601894ff4 SHA512 d5076097c1612941e1978a8c70d874413e3e790ec78e42910fbe3e5f308a30a12d11d99a359aab1928ea94649a99a273fee8806825c851cb33d456fe2afc7628
+EBUILD git-delta-0.5.0.ebuild 3136 BLAKE2B 83aa3e41b8d4a25bbf290336cd613e5cb427778f140dbee7c64ccd2375d392236f43c04becc4759888b2c664c87c200e2716ef0f3355b4b21168436e6cdfeebb SHA512 2c117322dda5baf6c9f3707def169d5f38861fde49f7757fbd8756fa2442dc7df8e85a3c9f79af89fc2f75d5871a26668b82994cb5763295924a3525133cc5d8
 MISC metadata.xml 330 BLAKE2B f09602a10d43f553a7dc36968f26f5f4a79d12aab213ea51b1b2e76eb2f5ba8b698147a9ab3db7b088ca42008045f1dd1a5447fe5d7d2ce46a61d1438c202185 SHA512 ca570caf0648315637beede9dfd9c124b7b313448f2929a86262b7fec90280bdf105b22ca112f7ddb2fe16ee4c6f242e7524041c14a692aa9155ad4ae432207b
diff --git a/dev-util/git-delta/git-delta-0.5.0.ebuild b/dev-util/git-delta/git-delta-0.5.0.ebuild
new file mode 100644
index 000000000000..fbc091d59d13
--- /dev/null
+++ b/dev-util/git-delta/git-delta-0.5.0.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+adler32-1.0.4
+aho-corasick-0.7.6
+ansi_colours-1.0.1
+ansi_term-0.11.0
+ansi_term-0.12.1
+arrayref-0.3.5
+arrayvec-0.5.1
+atty-0.2.14
+autocfg-1.0.0
+backtrace-0.3.40
+backtrace-sys-0.1.32
+base64-0.10.1
+base64-0.12.1
+bincode-1.2.1
+bitflags-1.2.1
+blake2b_simd-0.5.9
+box_drawing-0.1.2
+bytelines-2.2.2
+byteorder-1.3.2
+cc-1.0.54
+cfg-if-0.1.9
+cfg-if-1.0.0
+chrono-0.4.11
+clap-2.33.0
+cloudabi-0.0.3
+console-0.14.0
+constant_time_eq-0.1.4
+crc32fast-1.2.0
+crossbeam-utils-0.6.6
+dirs-next-2.0.0
+dirs-sys-next-0.1.1
+either-1.5.3
+encode_unicode-0.3.5
+error-chain-0.12.4
+failure-0.1.6
+failure_derive-0.1.6
+flate2-1.0.12
+fnv-1.0.6
+fuchsia-cprng-0.1.1
+git2-0.13.15
+heck-0.3.1
+hermit-abi-0.1.12
+idna-0.2.0
+indexmap-1.3.2
+itertools-0.10.0
+itoa-0.4.4
+jobserver-0.1.21
+lazycell-1.2.1
+lazy_static-1.4.0
+libc-0.2.60
+libgit2-sys-0.12.17+1.1.0
+libz-sys-1.1.0
+line-wrap-0.1.1
+linked-hash-map-0.5.2
+log-0.4.8
+matches-0.1.8
+memchr-2.2.1
+miniz_oxide-0.3.6
+num-integer-0.1.42
+num-traits-0.2.11
+onig-6.0.0
+onig_sys-69.5.0
+percent-encoding-2.1.0
+pkg-config-0.3.17
+plist-1.0.0
+proc-macro2-0.4.30
+proc-macro2-1.0.6
+proc-macro-error-1.0.2
+proc-macro-error-attr-1.0.2
+quote-0.6.13
+quote-1.0.2
+rand_core-0.3.1
+rand_core-0.4.2
+rand_os-0.1.3
+rdrand-0.4.0
+redox_syscall-0.1.56
+redox_users-0.3.1
+regex-1.4.2
+regex-syntax-0.6.21
+rust-argon2-0.5.1
+rustc-demangle-0.1.16
+ryu-1.0.0
+safemem-0.3.1
+same-file-1.0.5
+serde-1.0.98
+serde_derive-1.0.98
+serde_json-1.0.40
+shell-words-1.0.0
+smallvec-1.4.0
+strsim-0.8.0
+structopt-0.3.21
+structopt-derive-0.4.14
+syn-0.15.43
+syn-1.0.11
+syn-mid-0.5.0
+synstructure-0.12.3
+syntect-4.5.0
+terminal_size-0.1.15
+textwrap-0.11.0
+thread_local-1.0.1
+unicode-bidi-0.3.4
+unicode-normalization-0.1.12
+unicode-segmentation-1.7.1
+unicode-width-0.1.8
+unicode-xid-0.1.0
+unicode-xid-0.2.0
+url-2.1.1
+utf8parse-0.2.0
+vcpkg-0.2.9
+vec_map-0.8.1
+version_check-0.9.1
+vte-0.9.0
+vte_generate_state_changes-0.1.1
+walkdir-2.2.9
+winapi-0.3.7
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.4
+winapi-x86_64-pc-windows-gnu-0.4.0
+xml-rs-0.8.0
+yaml-rust-0.4.3
+"
+
+inherit bash-completion-r1 cargo
+
+DESCRIPTION="A syntax-highlighting pager for git"
+HOMEPAGE="https://github.com/dandavison/delta"
+SRC_URI="https://github.com/dandavison/delta/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" $(cargo_crate_uris ${CRATES})"
+S="${WORKDIR}/${P/git-/}"
+
+LICENSE="Apache-2.0 BSD-2 Boost-1.0 CC0-1.0 ISC LGPL-3+ MIT Unlicense ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	dev-libs/libgit2:=
+	dev-libs/oniguruma:=
+"
+RDEPEND="${DEPEND}
+	!app-text/delta
+"
+
+QA_FLAGS_IGNORED="/usr/bin/delta"
+
+src_configure() {
+	# Some crates will auto-build and statically link C libraries(!)
+	# Tracker bug #709568
+	export RUSTONIG_SYSTEM_LIBONIG=1
+	export LIBGIT2_SYS_USE_PKG_CONFIG=1
+	export PKG_CONFIG_ALLOW_CROSS=1
+}
+
+src_install() {
+	cargo_src_install
+
+	# No man page (yet?)
+
+	# Completions
+	newbashcomp "${S}/etc/completion/completion.bash" delta
+
+	insinto /usr/share/zsh/site-functions
+	newins "${S}/etc/completion/completion.zsh" _delta
+}
diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index c600c3ccd3a3..088938194d78 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -3,9 +3,9 @@ DIST glib-2.64.5.tar.xz 4778456 BLAKE2B 7fdee0e16a7ac820f4c4f7dc66d37add464d3005
 DIST glib-2.66.2.tar.xz 4836456 BLAKE2B 5484a7fe497dbe06df7ce11dbc8836c95dbb01e6e309516b82158f2915eeee36ccbe6e904cb6ae9a5a0223ccc0b52f6e64d61a418bf790538bc90388430977b2 SHA512 30278c066c6b209f45fcfdb9ffc4732236451464506b93c0fff0964ff8aac58c15be85c3793c686d4740d9d97857984bc0ab71e38d5da11c5fd860e569fb6cb9
 DIST glib-2.66.3.tar.xz 4837796 BLAKE2B 44632477b56bea5b6324deccc17e2d6b72e00dba518f9fc3ec5edad8b20df59f8bf9087e5de16b587b72c2f143d9ab650c478666132b1564da9bf333f380a4e3 SHA512 ab2670ae4eeb3b561c0e71ff9153908f450e430cd43771bfee09233a65826dc16462537ec64bdfcced867f4c8663341b6b9d17af5ba0fab8564b8f21b04a45d7
 DIST glib-2.66.4.tar.xz 4838124 BLAKE2B de2b8690c9ef9d66378b396ec0abe2bc83380654b3ca2e221678fb6dc9bf449c544a7e2b2a662739f7b400e9ce0a5a0af115ba2f06b8f5597967e518fdec4937 SHA512 b3bc3e6e5cca793139848940e5c0894f1c7e3bd3a770b213a1ea548ac54a2432aebb140ed54518712fb8af36382b3b13d5f7ffd3d87ff63cba9e2f55434f7260
-EBUILD glib-utils-2.62.6.ebuild 2390 BLAKE2B 6160cd993d8ea330b68812082a1e14c6d9c64e4adc2832bb68693e8a8eacc7598541f19e049a7601027b5fc1624485dcdc9745c7095b07d3b004a99a7f612d44 SHA512 4840e214e3283609722803ac6e52b015cce5e1f74168e318bf78bd0f0d2e7332f35063939c843ed39d03b0c9822a6aa738183bd0e0b6ea1067aae5c6b2a57a03
-EBUILD glib-utils-2.64.5.ebuild 2392 BLAKE2B 712bf35068847530523ade60b5d0943a5d8d28dcc0f4ac87d816245d924189716d2b97a73591a687092d99a7a704caea1e53b07abcdc989a70260a2655fca72c SHA512 495167c4c8b091b7f1ed5dfab873bac852d8a7056342c35ac18881ddc310f6ff8970e2625f5773ffa8c38b3a60e944452f8016d275d8296c856c5932559e777d
-EBUILD glib-utils-2.66.2.ebuild 2401 BLAKE2B 520f38ab480c4e463a1a6f141221556b6d20d0857b5c91525170bac962b268dd904f31bb42a60693dcde317ff30a18cbb12300aa027db4e333ea33445ee4e384 SHA512 42cc368b74c34714a28b9189f29cd7a891d0c5fe908f16c12683c0030d5e12724cf3cbdd7ada38d6b5512a0e982a7f44ccfcca0717a3bf250accdf62ef985776
-EBUILD glib-utils-2.66.3.ebuild 2401 BLAKE2B 520f38ab480c4e463a1a6f141221556b6d20d0857b5c91525170bac962b268dd904f31bb42a60693dcde317ff30a18cbb12300aa027db4e333ea33445ee4e384 SHA512 42cc368b74c34714a28b9189f29cd7a891d0c5fe908f16c12683c0030d5e12724cf3cbdd7ada38d6b5512a0e982a7f44ccfcca0717a3bf250accdf62ef985776
-EBUILD glib-utils-2.66.4.ebuild 2401 BLAKE2B 520f38ab480c4e463a1a6f141221556b6d20d0857b5c91525170bac962b268dd904f31bb42a60693dcde317ff30a18cbb12300aa027db4e333ea33445ee4e384 SHA512 42cc368b74c34714a28b9189f29cd7a891d0c5fe908f16c12683c0030d5e12724cf3cbdd7ada38d6b5512a0e982a7f44ccfcca0717a3bf250accdf62ef985776
+EBUILD glib-utils-2.62.6.ebuild 2370 BLAKE2B c6ec00be22812810397c7c8fc8185d3c766fbfc87bb794911dd87e7b95560cec817f11f25237f0621e4b245d049310f813e2651bf6c739ebc6580eb10322a468 SHA512 3f2ab99a6974d3cbd620e5011a07ae460d28873eb8381b2f3a65ee49eb97b9cd6fdd9cf83de3b3faf4d14e7739d6d7f17f2eb348a6665f9bc71183a71ccde98f
+EBUILD glib-utils-2.64.5.ebuild 2372 BLAKE2B 9175ac6803ba2db7a6e2bf6f88ab590a27f6cad244451b8faa55142d880abbcd946aba68b81d34c043f71679dc36819382caee2126371afbd672a1eeea11734a SHA512 1a27feb1ce79706e2308d96d31e0225dba208fa9379becee88a41d50034f6f81ba336fc975819d866bc1d63443f06a813574a26fa63764179170ccc7fe54ddf1
+EBUILD glib-utils-2.66.2.ebuild 2381 BLAKE2B 87e47770fe73cd9589258a0edac016f12d266fe8590c435578dd4a6e13fd5bbad7f4a3c804276c2303d2699b9c6b596b3631fd94be14c99b76e10e054e21cb1d SHA512 bf04b2da7793c16f26c6affe48468cae5103291c6b55612ab948a2ebd8b74afa34a347012349e4f6725838970ca5c42a9e9d308c0683f4de2bf9f3f210d74c41
+EBUILD glib-utils-2.66.3.ebuild 2381 BLAKE2B 87e47770fe73cd9589258a0edac016f12d266fe8590c435578dd4a6e13fd5bbad7f4a3c804276c2303d2699b9c6b596b3631fd94be14c99b76e10e054e21cb1d SHA512 bf04b2da7793c16f26c6affe48468cae5103291c6b55612ab948a2ebd8b74afa34a347012349e4f6725838970ca5c42a9e9d308c0683f4de2bf9f3f210d74c41
+EBUILD glib-utils-2.66.4.ebuild 2381 BLAKE2B 87e47770fe73cd9589258a0edac016f12d266fe8590c435578dd4a6e13fd5bbad7f4a3c804276c2303d2699b9c6b596b3631fd94be14c99b76e10e054e21cb1d SHA512 bf04b2da7793c16f26c6affe48468cae5103291c6b55612ab948a2ebd8b74afa34a347012349e4f6725838970ca5c42a9e9d308c0683f4de2bf9f3f210d74c41
 MISC metadata.xml 332 BLAKE2B 1e3c081ae9a2c8ae53cee6c3ae133cbd5e8543a68c03d4a4f7e164437502d996ea9364789e93114687271e1f472bcf13a418cca5b74ecb95a51849f0a5f3dafa SHA512 f7680d9be4071b841f50ece99b5041dc492901d84ae05383c1ff05b6a73bab804b153a50eb70f5417137f6e2041230c5ba8eaede10f7a0bf8a899508642588c6
diff --git a/dev-util/glib-utils/glib-utils-2.62.6.ebuild b/dev-util/glib-utils/glib-utils-2.62.6.ebuild
index 54ab4c4e5ef3..2d91fcf25ab9 100644
--- a/dev-util/glib-utils/glib-utils-2.62.6.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.62.6.ebuild
@@ -15,7 +15,7 @@ SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-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 ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="${PYTHON_DEPS}
 	!<dev-libs/glib-2.56.2:2
diff --git a/dev-util/glib-utils/glib-utils-2.64.5.ebuild b/dev-util/glib-utils/glib-utils-2.64.5.ebuild
index 56e015526f0b..0b8934a3b880 100644
--- a/dev-util/glib-utils/glib-utils-2.64.5.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.64.5.ebuild
@@ -15,7 +15,7 @@ SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-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 ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="${PYTHON_DEPS}
 	!<dev-libs/glib-2.56.2:2
diff --git a/dev-util/glib-utils/glib-utils-2.66.2.ebuild b/dev-util/glib-utils/glib-utils-2.66.2.ebuild
index 03ff214270c2..c9928c7498af 100644
--- a/dev-util/glib-utils/glib-utils-2.66.2.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.66.2.ebuild
@@ -15,7 +15,7 @@ SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-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 ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="${PYTHON_DEPS}
 	!<dev-libs/glib-2.56.2:2
diff --git a/dev-util/glib-utils/glib-utils-2.66.3.ebuild b/dev-util/glib-utils/glib-utils-2.66.3.ebuild
index 03ff214270c2..c9928c7498af 100644
--- a/dev-util/glib-utils/glib-utils-2.66.3.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.66.3.ebuild
@@ -15,7 +15,7 @@ SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-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 ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="${PYTHON_DEPS}
 	!<dev-libs/glib-2.56.2:2
diff --git a/dev-util/glib-utils/glib-utils-2.66.4.ebuild b/dev-util/glib-utils/glib-utils-2.66.4.ebuild
index 03ff214270c2..c9928c7498af 100644
--- a/dev-util/glib-utils/glib-utils-2.66.4.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.66.4.ebuild
@@ -15,7 +15,7 @@ SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-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 ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="${PYTHON_DEPS}
 	!<dev-libs/glib-2.56.2:2
diff --git a/dev-util/gob/Manifest b/dev-util/gob/Manifest
index ba5164f08f7e..2ab675281fff 100644
--- a/dev-util/gob/Manifest
+++ b/dev-util/gob/Manifest
@@ -1,3 +1,3 @@
 DIST gob2-2.0.20.tar.xz 202540 BLAKE2B 942fdaa77e660d3c8ea49e9b326ae8201893e01f335b2cb5c518597f4638058c7cb51e89061a6f707f39044a40c71cd1ec91b5fd514aa36904e91401abd9c9b1 SHA512 9d09692ef208f8d6422fd573aa1955ca5dcfc3feaf9e0fb64c27e52f4638fe19a5e08a7282f682ed5241a8fafce3852e4168ba4f3865890df972dad4ee342b7a
-EBUILD gob-2.0.20.ebuild 536 BLAKE2B fac05f9774fe44497532ff26cdff26666b4cf74bacf48b738d8b81eff43c0fc07e07d367d95946735d0006e8d1ffafde15eddae980497d5c029be5d553402656 SHA512 42c15d0a50f2d4f776788ac73d0788bc4bd7a73d91631ca2449d390803e734b49ac0219316c6cb6167b8e856ac20d8ab00c5f458324efa4b9d60d326f55dca0c
+EBUILD gob-2.0.20.ebuild 537 BLAKE2B 27e8fd2979011b5d0a9cf8cef19910020ab3b4a76458de7cc073d598e6461efe9d8ec152956bc82e0d67d937800c56e01cb6cac7b788a8349986ed3b95017fd0 SHA512 fb745e46939dafbccb11ff704bf503a0ebeec84a854e3b4de41ad18a5454b636d6856e5de48dd7e9083819e98f4884d33d04e17ab0ade0f2d196af828e7e4f90
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gob/gob-2.0.20.ebuild b/dev-util/gob/gob-2.0.20.ebuild
index 4a1b143cee87..1e11184047df 100644
--- a/dev-util/gob/gob-2.0.20.ebuild
+++ b/dev-util/gob/gob-2.0.20.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.jirka.org/gob.html"
 
 LICENSE="GPL-2+"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ppc ~ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ppc ~ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.4:2"
diff --git a/dev-util/gperf/Manifest b/dev-util/gperf/Manifest
index 6c133060e90b..8d0d335a306d 100644
--- a/dev-util/gperf/Manifest
+++ b/dev-util/gperf/Manifest
@@ -1,3 +1,3 @@
 DIST gperf-3.1.tar.gz 1215925 BLAKE2B bc4c54ade3f7dce484714d77cb5759dcc02b7a607d7b1aff6bdbcd06ee4c83e9449038a7217d5f25bcbef058ba56e1fce9383b9599de005154e5a9b566ac9c69 SHA512 855ebce5ff36753238a44f14c95be7afdc3990b085960345ca2caf1a2db884f7db74d406ce9eec2f4a52abb8a063d4ed000a36b317c9a353ef4e25e2cca9a3f4
-EBUILD gperf-3.1.ebuild 654 BLAKE2B 7a6486b2f82b61f199168cf608d525ff4499529715d3413e579f5fca1a9cdecf80ed261ac86e4682ba76d0fa7132a5c4627354e5791f5f665dad8804413869c5 SHA512 3d5a691903416b54c3a8629248d86239ba12f8168646f6f3ecfcb2eec458f819b0222d4cba5bf4deb4c5ca42ecf317a0aff973029cbbd81f4a3c721edb4f7610
+EBUILD gperf-3.1.ebuild 634 BLAKE2B d3dd8a75791f14d1427c3b42dcc3ade95c2d4923f2d327214f9eed06d217de78d78e03508faeb788df2c7254480480a251828adc472b5adcc5aa0bdb279f0ee4 SHA512 5ba26a1c019d8eff19d1845eb6b8112744cbd237d073e6f64a9f357eb4a8a696d0579818b512a65e124baf4b95c4cdcb4530956e69801719ba8c769d47964b8f
 MISC metadata.xml 219 BLAKE2B 0f485ab3a0acbd2d5cf0a8b2014662a56862057721a4bc34494c2dca52f97bba8d54994461ef33bc965d3470d3e733fec71ed60e9aa4f1b5c565c048d60865d8 SHA512 a1cca99a7d8d8ea9893e7147264184a1605ddbd61ba07971df5a2bd54d6d74ecec39145faa2b303132a31db8fa61484b9224a2748bff4da638b63f930bd394df
diff --git a/dev-util/gperf/gperf-3.1.ebuild b/dev-util/gperf/gperf-3.1.ebuild
index 563152cbc215..fdd81312e165 100644
--- a/dev-util/gperf/gperf-3.1.ebuild
+++ b/dev-util/gperf/gperf-3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gperf/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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 ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 src_prepare() {
diff --git a/dev-util/gtk-builder-convert/Manifest b/dev-util/gtk-builder-convert/Manifest
index 4f57fbdddf24..420fe9f83e8e 100644
--- a/dev-util/gtk-builder-convert/Manifest
+++ b/dev-util/gtk-builder-convert/Manifest
@@ -1,4 +1,4 @@
 AUX gtk-builder-convert-2.24.32-python3.patch 2165 BLAKE2B 2c70d438614cfbe09f5742fb6f0f8519831612058de36bd4173d4f8968ca6f5f546b6c212f6c54a997d43406a0bc787f9b0a5eb117c93d137861e39896a3b066 SHA512 9b52db1bff0a9cbebfac2d2d737c8a75e3ef704993e1bcc2117289b6bc05f1bf797da4763f50b9e9f2f2e93734c8cb747b301191842fee915232614347e7b26d
 DIST gtk+-2.24.32.tar.xz 12620860 BLAKE2B 03f4c0a8be98473f62bc8c86859937969c4169960a5f93d37ff6dcde00413215fa6c7125b15781bf50d67b40aa0056cb71b83fb50acb2c3467b5deb3c8d938f0 SHA512 8e8fd9ae32f1d6fb544da260f00599f0f05090d910d767b06ef086ab4f1f8373a29bb0da9767761c9b5f4cfd51b5c45d0fa5d39b0428c839ddf0a579df806696
-EBUILD gtk-builder-convert-2.24.32-r1.ebuild 1188 BLAKE2B 168692daf4e7f77ccc0445bd34e34319a7b5e9fcc8f68a0aa26316cfcc66b560db0899e4362c32bf0a64d71795aa91ad0e90500c56e6d8ea183a1648a7be1bbf SHA512 6c61eb0f5fdab93c62357a3c18068afad7354fa07a513b6dcc6baad9ce17f78b4e580b0cc4e62e2dcfb230d02302f8cdd5876de37a38f242ec463dd68d009cf2
+EBUILD gtk-builder-convert-2.24.32-r1.ebuild 1189 BLAKE2B da00f11110ac565cb48e270f6355fdf0c6a4e4ed1db85bef78e1e8e4600f5c68cf5d863db69f0ea7e22054eb02b745568de43130f2b6a9c6e6cceac99fe48517 SHA512 257eb3bdf595e8a8532b5d14051ffc848a4337fad164d46c5d2e2197308ebc6ca967fb0188402500c2fa7cf6a5bbad5d3459e5c2582ea87cadbc026be1240791
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32-r1.ebuild b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32-r1.ebuild
index 889c321a3bcd..6cd445d5f076 100644
--- a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32-r1.ebuild
+++ b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 COMMON_DEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/gtk-doc-am/Manifest b/dev-util/gtk-doc-am/Manifest
index a1d9141080f4..cb4cc682bfe4 100644
--- a/dev-util/gtk-doc-am/Manifest
+++ b/dev-util/gtk-doc-am/Manifest
@@ -1,5 +1,5 @@
 DIST gtk-doc-1.32.tar.xz 762000 BLAKE2B e87b0ed5dffd04acc7569171343839a742a874438248546b1b85ca71102d5a546f41b450c5cedf54ecab5b7b6585a4dac36d7600b21b5cce491470a50f82d3b0 SHA512 6d28395968c2951f1685570e5778b5add76d1b9cff8fcb8632b200b3ba251602a1ea59b1def84fc28560988b87fc0dbbc6947af88d268db6ff23e9c28aea3b28
 DIST gtk-doc-1.33.1.tar.xz 768896 BLAKE2B 0d6cc32611618669aac4045942497a404f4d3ed703341cce56efefba439eb8595877297b76085c6a57d3d76710257153040b8f895d6dd6381502e852e6b82e93 SHA512 18620f0164382849980938103a9243abc35ea5a2628258f00e096e16a698b598d0c7fe80a1739fc689217c59a648c728a014bc672a92346c65768ebf89675b90
-EBUILD gtk-doc-am-1.32.ebuild 845 BLAKE2B 044ea059ea4f541aec142d17fc65f30d6ed83fc3bceed2ad2025c02585d0e7f49787a78275ccdb3a90f3f067b71685e8e8717564cbc948d1a0213b9157f0d002 SHA512 734909caf4c8da99c292462b4360a14bb5af0665388465483f9619ebe79de3050f2e6ed0b12272be3e80b6ce2f6b300d9796804ba3143cfee37f5777f0120491
-EBUILD gtk-doc-am-1.33.1.ebuild 863 BLAKE2B 6909ae517b04aeb7e393fcc837a672fb9677af569856e47f7473428f2c24aa9bd5939e06b07d6579782a98329c43aad05496a69e18577164a82d42d5ca29d610 SHA512 657e11a668c1dafb36742f82a33523af980d5c9df9fb173fd8968326c3af75d5c1d536c51a8db409c281507c46ab4cf7c16e733f4f5186a83bd034906fdf8a1b
+EBUILD gtk-doc-am-1.32.ebuild 825 BLAKE2B 4d79d0951e73de1911a292a1b875e54e52f232c41d061d364f2f411ef35043a4962ec79bc325d7bc96c0a036e7ddf80cc1d04057e87b180148642a8cebcdc88e SHA512 b7022509a75483dad1da48ef138c43159e56bca4b32e7957d510a6aea33828c4aa67feeb23ecef135880955910634b4cc835f6dbc20d839b4062771033ee57c9
+EBUILD gtk-doc-am-1.33.1.ebuild 843 BLAKE2B ab3980362eea7fb756780bd9694921ba0d7b41d9dc88f0cb78198d2e6264a171624231a2cd3689facd06aacfa4ab6b728c51daa3af42c025bf66413a722264b5 SHA512 ae8dc6b5f470ef915cbe9d99a28131a08c5476e0c45a5fb746d3408fd79f7b4ade5274d58f4f021644127d546ec80c18eacfd5621b4f112495deaef7526cf510
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gtk-doc-am/gtk-doc-am-1.32.ebuild b/dev-util/gtk-doc-am/gtk-doc-am-1.32.ebuild
index 10c4538abc8a..8b5cd95d5ce5 100644
--- a/dev-util/gtk-doc-am/gtk-doc-am-1.32.ebuild
+++ b/dev-util/gtk-doc-am/gtk-doc-am-1.32.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtk.org/gtk-doc/"
 
 LICENSE="GPL-2 FDL-1.1"
 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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/dev-util/gtk-doc-am/gtk-doc-am-1.33.1.ebuild b/dev-util/gtk-doc-am/gtk-doc-am-1.33.1.ebuild
index 04df1f0818c7..1526cd78561b 100644
--- a/dev-util/gtk-doc-am/gtk-doc-am-1.33.1.ebuild
+++ b/dev-util/gtk-doc-am/gtk-doc-am-1.33.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/DocumentationProject/GtkDoc"
 
 LICENSE="GPL-2 FDL-1.1"
 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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="!<dev-util/gtk-doc-${GNOME_ORG_PVP}"
 PDEPEND="virtual/pkgconfig"
diff --git a/dev-util/gtk-update-icon-cache/Manifest b/dev-util/gtk-update-icon-cache/Manifest
index cbe96da42730..698661d5b62d 100644
--- a/dev-util/gtk-update-icon-cache/Manifest
+++ b/dev-util/gtk-update-icon-cache/Manifest
@@ -2,6 +2,6 @@ DIST gtk-update-icon-cache-3.24.20.tar.bz2 91769 BLAKE2B 4fb1d4e06117924377e2e3f
 DIST gtk-update-icon-cache-3.24.21.tar.bz2 91918 BLAKE2B b9cf0f944f13c3280ad615a6453e8fe80424b481d66af7bfd98826354f124f67c3a75afece07cd38cb8722eb1beeeb23b1cb7e23ae8d68f2dca195a155c69508 SHA512 207449dc92b029f735f40cf4e9cc59dd02103bab7c382a69feb7162873e2cf7b1fa6a7ce818533888305424667795da86be55e5befc89f8bfc8809d6aa6cd92a
 DIST gtk-update-icon-cache-3.24.24.tar.bz2 91902 BLAKE2B ed0ad6b501c31745eb40d56523ac78609d793d1389e4222a3e26c585d467aa57c17b188de8fd0c5847a7e773bcd174b25752a3b4c613c8f2a30e0d3237e9f484 SHA512 6dd7237d5f2e3bdbccafef2114c88aa4cfe6ba027f451791c981e8cb2cdd134ddc7bd20d2252d4605dab260567dbb78ba639f985baa2ae8ca8cf4c7d41deef26
 EBUILD gtk-update-icon-cache-3.24.20.ebuild 895 BLAKE2B eab694de369f6703304e6d838a1a73e0ddeb996253b65a8a14368e52919ae75c2ee040f261152b19040d71c23108ac027b7a6f6f0cbacc8cdd5325c2b5a66750 SHA512 3e228071261e416f164201cef33c5e68d8e8936ffb89985ab93614d2d325cf419dd2ab2f331225180258575581407b54c0caa47d263b45f631787db78898085f
-EBUILD gtk-update-icon-cache-3.24.21.ebuild 901 BLAKE2B e5133c22054152144502c7c63412f1e9e93762e92177b3ec198fc4e9097872c674d90fcfaa2edb6cf494e440588020384ad26c427015978dfbfd964f69350d15 SHA512 bf3eab7e6166482452a74d7366abd19e137fc5297be6ebb77bb3e8f82e75a8d08ab2cae932c896cc0f1019b31578d4bc9ea38ea53507c077b429f08cfb9296c8
+EBUILD gtk-update-icon-cache-3.24.21.ebuild 902 BLAKE2B 92b37db2980046a774b759048387ee9a9457a8c34ca1cef2bef02b883fbe0a252b121ec2a7ab1fb9bce30022780556d714dbeebbcae5ebc1b444a2cb0471eed7 SHA512 ed371e19e0deb81b50d357adfebcaebbd5fa049de32d491830a46e8d2aac2c2e091d4b7fe7a6ca63cb5e9196a077461f208da60aba68986d091600c2300ee745
 EBUILD gtk-update-icon-cache-3.24.24.ebuild 910 BLAKE2B 06309f11e67ee783cc31874f1f5f3aa5cdacfaafb0c80ce0d46d8d486fb8e92eb59ea0187b31df4e3041a4fcc0b3a114439c9c58d94a10c1889065e2e36bd90b SHA512 f1fd2192bcf446a371cf923164206991c5c864cbb4186f2a1333d0c85c4d8a9c225729d7202e0b3c5e7afcde5b9cfcacf666d6403e358d6d5b1ae166a8396a94
 MISC metadata.xml 647 BLAKE2B 2846e4ac0b5816fe7699b197958118535cac7092930d7b6ba63c23b126242102edd832d60b13baeed23bf8781babe1058f06fece732c4ecd58c9b01b621042ae SHA512 7301a9425528d65112ec9dd1eca7291473905493b1b550119c6984141b3b216c4f3825d3b2a395a8375aa8b481b29d841153bd279d593586d5ea7d77ce46d7d3
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.21.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.21.ebuild
index 74deb5dcb08f..7cd56f561083 100644
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.21.ebuild
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.21.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # man page was previously installed by gtk+:3 ebuild
 RDEPEND="
diff --git a/dev-util/hip/Manifest b/dev-util/hip/Manifest
new file mode 100644
index 000000000000..4f0e3eb82290
--- /dev/null
+++ b/dev-util/hip/Manifest
@@ -0,0 +1,9 @@
+AUX hip-3.5.1-config-cmake-in.patch 1227 BLAKE2B 5b85ff489232590aa9ddbf8bbf1d5730c8152626e221ce735afcc8b92c3a62e1b2805ed9f3709b3e97b67f787886fd36d685101ea5d3bb76f023dd668b0ebd3d SHA512 0a190ab213ec5ee626843b584c684913ff5cfe0864e443616da7f8f1cf848bc29e46cd7c2d2df6929058acf696f25420267ded69f03862a20b443d107867af74
+AUX hip-3.5.1-detect_offload-arch_for_clang-roc.patch 782 BLAKE2B f851798324799d53271db8149ce7538709435a12a607a352989f5ea816d183573cb21ba2c54d507ec8aad242ccbdb06f79113b48ac8d26f51f402066a124ca6a SHA512 bc60f252e5c1df1c453717f2565a41e05014fc259195a7d25db83bc37a52c33eea261a3afbf37b0afaf80d7b1ffbbe02d8f97967556667238929ea6e6df0108d
+AUX hip-3.5.1-hip_vector_types.patch 247 BLAKE2B 05d17292a61b8ecd6c6cc8bb8075d909885896f6183ffe84882e98066ef9d44d33431a2b12fcbc36db3f0b94713313d5b85918fe041b1102256ac523ac7f8782 SHA512 d02610b59336f332e9025d860977ad27c6d82c35577ecae9b89b253fc911aafc14553ccaa4b667befe4ea7dbe8c55298643dea5e163941c702d35a4f8a594c9d
+AUX hip-3.9.0-DisableTest.patch 4560 BLAKE2B ef1bf5fcd19d8c1db722206afaf5bf8197ef80ae84518197cabf56ffc8d8146315f174e118a300270d2e47da90140a6bc3e2544c13d100b9b62f043ad506039d SHA512 2d8da41e5c5a3f4f3a7acf91d180c931f456a04805526c82cfe7a1ec08faaea661a69dae88aaa026a10eba7fc099c22a49ff812b816541c33c418181ec53cbf7
+AUX hip-3.9.0-add-include-directories.patch 468 BLAKE2B 4c787a6ffe0beada2ab431b2262edc51b814e57d599f783b884da84a6f1b919ceeab561ee09eccd54338ae55118e2d45133b248fd20b5163eba548d49f79d1ca SHA512 1fe35858c526c891e5efd9ecf7a166c3a67d7a4874ab6f7eb34c6ed6652d0e21a7290829a3a5063682a7229af3ef63c180e198172c3bc69be6550547806249e3
+AUX hip-3.9.0-lpl_ca-add-include.patch 418 BLAKE2B 7d1439e51b1c5e20fcb1768c5f33b22d1d6bec5cf36242cbaf030a9a83bd404cb02c95d6ddba2ada6740bb2c1006da3c1507927ab561e29cd47f1a7e64aed1a4 SHA512 511684b5f0f70f67371e34674933dd4cf1992d11406a77a1aa695b68880a031812b8ba7e399abb61a84e8e07d8f814c93c412c51952d4c27443a01c3a62ce276
+DIST rocm-hip-4.0.0.tar.gz 1012154 BLAKE2B 02343239a5b27c42dafd241f2c9b6f5195c50f78bfd717ae72bcb16d384bd6cf97ff6f2b86bfcf323aaaf022d6897f46d0987826c80d6f6279be4cb4792e15be SHA512 cf840dbe28a9a15e3be14351bfa22d3c81e1654813a7aee55f53e71b2ee183f8dd0de14a79791617fabb5b357cadbf2ce2f476f78884b2843d30f206d65088f6
+EBUILD hip-4.0.0.ebuild 3451 BLAKE2B c219b26871ab9197ddd75a4d8e03bdb2d6f9c12cc9d8bd4b29e1babceb3572afb5f859288c395952befd8520fdf2875703566a4dd7280045f98f309af8c3756b SHA512 d7b82a954d9dfde559e48dcad266aa7d3cb204442045ea2c3eaeafa7513f0f549ca3a656d5d823e636600e3b9112fd276fbfb9e9ebac74f01024327de76276dd
+MISC metadata.xml 582 BLAKE2B 2b99c57a359c2ede87080fe4205b41092abedb50c63f4d6124c4741f765f8167322ce901f27db5a34fb9822852db043d13bbe0e5884916ce845a3337719b25f2 SHA512 da4a80f011b027d3a56743fe0196f5c85a79bd9a1bec6749ab908a8a372008ffd2b47198dc9913d5343e6c9ec7e7a05823727f6fae0608130542ffbb2fb3e357
diff --git a/dev-util/hip/files/hip-3.5.1-config-cmake-in.patch b/dev-util/hip/files/hip-3.5.1-config-cmake-in.patch
new file mode 100644
index 000000000000..f3b5ac9c19ef
--- /dev/null
+++ b/dev-util/hip/files/hip-3.5.1-config-cmake-in.patch
@@ -0,0 +1,28 @@
+--- a/hip-config.cmake.in	2020-06-21 21:17:35.576297760 +0200
++++ b/hip-config.cmake.in	2020-06-21 21:17:59.861296628 +0200
+@@ -123,8 +123,10 @@
+   )
+   set_target_properties(hip::device PROPERTIES
+     INTERFACE_COMPILE_DEFINITIONS "__HIP_ROCclr__=1"
+-    INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/../include"
+-    INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/../include"
++    INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
++    INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
++#    INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/../include"
++#    INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/../include"
+   )
+ else()
+   set_target_properties(hip::hip_hcc_static PROPERTIES
+@@ -156,9 +158,9 @@
+     INTERFACE_LINK_LIBRARIES --hip-device-lib-path=${AMD_DEVICE_LIBS_PREFIX}/lib --hip-link
+   )
+ 
+-  set_property(TARGET hip::device APPEND PROPERTY
+-    INTERFACE_INCLUDE_DIRECTORIES "${HIP_CLANG_INCLUDE_PATH}/.."
+-  )
++#  set_property(TARGET hip::device APPEND PROPERTY
++#    INTERFACE_INCLUDE_DIRECTORIES "${HIP_CLANG_INCLUDE_PATH}/.."
++#  )
+ 
+   set_property(TARGET hip::device APPEND PROPERTY
+     INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${HIP_CLANG_INCLUDE_PATH}/.."
diff --git a/dev-util/hip/files/hip-3.5.1-detect_offload-arch_for_clang-roc.patch b/dev-util/hip/files/hip-3.5.1-detect_offload-arch_for_clang-roc.patch
new file mode 100644
index 000000000000..7997e2929666
--- /dev/null
+++ b/dev-util/hip/files/hip-3.5.1-detect_offload-arch_for_clang-roc.patch
@@ -0,0 +1,21 @@
+diff -uprN HIP-rocm-3.5.1/bin/hipcc patched/bin/hipcc
+--- HIP-rocm-3.5.1/bin/hipcc	2020-07-21 14:29:11.625878447 +0800
++++ patched/bin/hipcc	2020-07-21 14:34:11.454395203 +0800
+@@ -675,7 +675,7 @@ foreach $arg (@ARGV)
+     $prevArg = $arg;
+ }
+ 
+-if($HIP_PLATFORM eq "hcc"){
++if($HIP_PLATFORM eq "hcc" || $HIP_PLATFORM eq "rocclr"){
+     # No AMDGPU target specified at commandline. So look for HCC_AMDGPU_TARGET
+     if($default_amdgpu_target eq 1) {
+         if (defined $ENV{HCC_AMDGPU_TARGET}) {
+@@ -694,6 +694,8 @@ if($HIP_PLATFORM eq "hcc"){
+ 
+     if($HIP_COMPILER eq "hcc") {
+         $GPU_ARCH_OPT = " --amdgpu-target=";
++    } elsif($HIP_COMPILER eq "clang") {
++        $GPU_ARCH_OPT = " --offload-arch=";
+     } else {
+         $GPU_ARCH_OPT = " --cuda-gpu-arch=";
+     }
diff --git a/dev-util/hip/files/hip-3.5.1-hip_vector_types.patch b/dev-util/hip/files/hip-3.5.1-hip_vector_types.patch
new file mode 100644
index 000000000000..382ed52f6923
--- /dev/null
+++ b/dev-util/hip/files/hip-3.5.1-hip_vector_types.patch
@@ -0,0 +1,10 @@
+--- a/include/hip/hcc_detail/hip_vector_types.h
++++ b/include/hip/hcc_detail/hip_vector_types.h
+@@ -42,6 +42,7 @@
+     #endif
+ 
+ #if defined(__cplusplus)
++    #include <new>
+     #include <array>
+     #include <iosfwd>
+     #include <type_traits>
diff --git a/dev-util/hip/files/hip-3.9.0-DisableTest.patch b/dev-util/hip/files/hip-3.9.0-DisableTest.patch
new file mode 100644
index 000000000000..3fc787a7354e
--- /dev/null
+++ b/dev-util/hip/files/hip-3.9.0-DisableTest.patch
@@ -0,0 +1,87 @@
+--- a/CMakeLists.txt	2020-11-15 11:26:09.747793881 +0100
++++ b/CMakeLists.txt	2020-11-15 11:28:45.289793287 +0100
+@@ -676,45 +676,45 @@
+ # Target: test
+ set(HIP_ROOT_DIR ${CMAKE_CURRENT_BINARY_DIR})
+ set(HIP_SRC_PATH ${CMAKE_CURRENT_SOURCE_DIR})
+-if(HIP_PLATFORM STREQUAL "nvcc")
+-	execute_process(COMMAND "${CMAKE_COMMAND}" -E copy_directory "${HIP_SRC_PATH}/include" "${CMAKE_CURRENT_BINARY_DIR}/include" RESULT_VARIABLE RUN_HIT ERROR_QUIET)
+-endif()
+-execute_process(COMMAND "${CMAKE_COMMAND}" -E copy_directory "${HIP_SRC_PATH}/cmake" "${HIP_ROOT_DIR}/cmake" RESULT_VARIABLE RUN_HIT ERROR_QUIET)
+-if(${RUN_HIT} EQUAL 0)
+-    execute_process(COMMAND "${CMAKE_COMMAND}" -E copy_directory "${HIP_SRC_PATH}/bin" "${HIP_ROOT_DIR}/bin" RESULT_VARIABLE RUN_HIT ERROR_QUIET)
+-endif()
+-if(${RUN_HIT} EQUAL 0)
+-    set(CMAKE_MODULE_PATH "${HIP_ROOT_DIR}/cmake" ${CMAKE_MODULE_PATH})
+-    include(${HIP_SRC_PATH}/tests/hit/HIT.cmake)
+-
+-    # Add tests
+-    include_directories(${HIP_SRC_PATH}/tests/src)
+-    hit_add_directory_recursive(${HIP_CTEST_CONFIG_DEFAULT} ${HIP_SRC_PATH}/tests/src "directed_tests")
+-
+-    # Add unit tests
+-    include_directories(${HIP_SRC_PATH}/tests/unit)
+-    hit_add_directory_recursive(${HIP_CTEST_CONFIG_DEFAULT} ${HIP_SRC_PATH}/tests/unit "unit_tests")
+-
+-    # Add performance tests
+-    include_directories(${HIP_SRC_PATH}/tests/performance)
+-    hit_add_directory_recursive(${HIP_CTEST_CONFIG_PERFORMANCE} ${HIP_SRC_PATH}/tests/performance "performance_tests")
+-
+-    # Add top-level tests to build_tests
+-    add_custom_target(build_tests DEPENDS directed_tests unit_tests)
+-
+-    # Add top-level tests to build performance_tests.
+-    # To build performance tests, just run "make build_perf"
+-    add_custom_target(build_perf DEPENDS performance_tests)
+-
+-    # Add custom target: perf.
+-    # To run performance tests, just run "make perf"
+-    add_custom_target(perf COMMAND "${CMAKE_CTEST_COMMAND}" -C "${HIP_CTEST_CONFIG_PERFORMANCE}" -R "performance_tests/" --verbose)
+-
+-    # Add custom target: check
+-    add_custom_target(check COMMAND "${CMAKE_COMMAND}" --build . --target test DEPENDS build_tests)
+-else()
+-    message(STATUS "Testing targets will not be available. To enable them please ensure that the HIP installation directory is writeable. Use -DCMAKE_INSTALL_PREFIX to specify a suitable location")
+-endif()
++#if(HIP_PLATFORM STREQUAL "nvcc")
++#	execute_process(COMMAND "${CMAKE_COMMAND}" -E copy_directory "${HIP_SRC_PATH}/include" "${CMAKE_CURRENT_BINARY_DIR}/include" RESULT_VARIABLE RUN_HIT ERROR_QUIET)
++#endif()
++#execute_process(COMMAND "${CMAKE_COMMAND}" -E copy_directory "${HIP_SRC_PATH}/cmake" "${HIP_ROOT_DIR}/cmake" RESULT_VARIABLE RUN_HIT ERROR_QUIET)
++#if(${RUN_HIT} EQUAL 0)
++#    execute_process(COMMAND "${CMAKE_COMMAND}" -E copy_directory "${HIP_SRC_PATH}/bin" "${HIP_ROOT_DIR}/bin" RESULT_VARIABLE RUN_HIT ERROR_QUIET)
++#endif()
++#if(${RUN_HIT} EQUAL 0)
++#    set(CMAKE_MODULE_PATH "${HIP_ROOT_DIR}/cmake" ${CMAKE_MODULE_PATH})
++#    include(${HIP_SRC_PATH}/tests/hit/HIT.cmake)
++#
++#   # Add tests
++#    include_directories(${HIP_SRC_PATH}/tests/src)
++#    hit_add_directory_recursive(${HIP_CTEST_CONFIG_DEFAULT} ${HIP_SRC_PATH}/tests/src "directed_tests")
++#
++#    # Add unit tests
++#    include_directories(${HIP_SRC_PATH}/tests/unit)
++#    hit_add_directory_recursive(${HIP_CTEST_CONFIG_DEFAULT} ${HIP_SRC_PATH}/tests/unit "unit_tests")
++#
++#    # Add performance tests
++#    include_directories(${HIP_SRC_PATH}/tests/performance)
++#    hit_add_directory_recursive(${HIP_CTEST_CONFIG_PERFORMANCE} ${HIP_SRC_PATH}/tests/performance "performance_tests")
++#
++#    # Add top-level tests to build_tests
++#    add_custom_target(build_tests DEPENDS directed_tests unit_tests)
++#
++#    # Add top-level tests to build performance_tests.
++#    # To build performance tests, just run "make build_perf"
++#    add_custom_target(build_perf DEPENDS performance_tests)
++#
++#    # Add custom target: perf.
++#    # To run performance tests, just run "make perf"
++#    add_custom_target(perf COMMAND "${CMAKE_CTEST_COMMAND}" -C "${HIP_CTEST_CONFIG_PERFORMANCE}" -R "performance_tests/" --verbose)
++#
++#    # Add custom target: check
++#    add_custom_target(check COMMAND "${CMAKE_COMMAND}" --build . --target test DEPENDS build_tests)
++#else()
++#    message(STATUS "Testing targets will not be available. To enable them please ensure that the HIP installation directory is writeable. Use -DCMAKE_INSTALL_PREFIX to specify a suitable location")
++#endif()
+ 
+ #############################
+ # Code analysis
diff --git a/dev-util/hip/files/hip-3.9.0-add-include-directories.patch b/dev-util/hip/files/hip-3.9.0-add-include-directories.patch
new file mode 100644
index 000000000000..42bd9736ee2c
--- /dev/null
+++ b/dev-util/hip/files/hip-3.9.0-add-include-directories.patch
@@ -0,0 +1,13 @@
+--- a/rocclr/CMakeLists.txt	2020-08-23 11:45:13.148817894 +0200
++++ b/rocclr/CMakeLists.txt	2020-08-23 11:50:12.409816752 +0200
+@@ -139,6 +139,10 @@
+   target_compile_definitions(hip64
+     PRIVATE
+       $<TARGET_PROPERTY:amdrocclr_static,INTERFACE_COMPILE_DEFINITIONS>)
++
++  include_directories(/usr/include/rocclr)
++  include_directories(/usr/include/rocclr/elf)
++  include_directories(/usr/include/rocclr/compiler/lib/include/)
+ endif()
+ 
+  # Enable profiling API
diff --git a/dev-util/hip/files/hip-3.9.0-lpl_ca-add-include.patch b/dev-util/hip/files/hip-3.9.0-lpl_ca-add-include.patch
new file mode 100644
index 000000000000..bebe6f0f4ecc
--- /dev/null
+++ b/dev-util/hip/files/hip-3.9.0-lpl_ca-add-include.patch
@@ -0,0 +1,10 @@
+--- a/lpl_ca/CMakeLists.txt	2020-11-15 11:47:55.091788901 +0100
++++ b/lpl_ca/CMakeLists.txt	2020-11-15 11:49:14.881788597 +0100
+@@ -17,6 +17,7 @@
+     ${PROJECT_SOURCE_DIR}/src
+   PRIVATE
+     $<TARGET_PROPERTY:amdrocclr_static,INTERFACE_INCLUDE_DIRECTORIES>)
++target_include_directories(lpl SYSTEM PUBLIC /usr/include/rocclr/elf)
+ 
+ target_compile_options(lpl PUBLIC -Wall)
+ target_link_libraries(lpl PUBLIC pthread)
diff --git a/dev-util/hip/hip-4.0.0.ebuild b/dev-util/hip/hip-4.0.0.ebuild
new file mode 100644
index 000000000000..ae96dbdc84e7
--- /dev/null
+++ b/dev-util/hip/hip-4.0.0.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake flag-o-matic prefix
+
+DESCRIPTION="C++ Heterogeneous-Compute Interface for Portability"
+HOMEPAGE="https://github.com/ROCm-Developer-Tools/HIP"
+SRC_URI="https://github.com/ROCm-Developer-Tools/HIP/archive/rocm-${PV}.tar.gz -> rocm-hip-${PV}.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+IUSE="debug profile"
+
+# Don't strip to prevent some tests from failing.
+RESTRICT="strip"
+
+DEPEND=">=dev-libs/rocclr-$(ver_cut 1-2)
+	>=dev-util/rocminfo-$(ver_cut 1-2)
+	=sys-devel/llvm-roc-${PV}*[runtime]"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.9.0-DisableTest.patch"
+	"${FILESDIR}/${PN}-3.9.0-add-include-directories.patch"
+	"${FILESDIR}/${PN}-3.5.1-config-cmake-in.patch"
+	"${FILESDIR}/${PN}-3.5.1-hip_vector_types.patch"
+	"${FILESDIR}/${PN}-3.5.1-detect_offload-arch_for_clang-roc.patch"
+	"${FILESDIR}/${PN}-3.9.0-lpl_ca-add-include.patch"
+)
+
+S="${WORKDIR}/HIP-rocm-${PV}"
+
+src_prepare() {
+	cmake_src_prepare
+	eapply_user
+
+	# disable PCH, because it results in a build error in ROCm 4.0.0
+	sed -e "s:option(__HIP_ENABLE_PCH:#option(__HIP_ENABLE_PCH:" -i "${S}/CMakeLists.txt" || die
+
+	# "hcc" is deprecated and not installed, new platform is "rocclr";
+	# Due to setting HAS_PATH to "/usr", this results in setting "-isystem /usr/include"
+	# which results in a e.g. "stdlib.h" not found when using "#include_next" in header files;
+	sed -e "s:\$HIP_PLATFORM eq \"hcc\" and \$HIP_COMPILER eq \"clang\":\$HIP_PLATFORM eq \"rocclr\" and \$HIP_COMPILER eq \"clang\":" \
+		-e "/FLAGS .= \" -isystem \$HSA_PATH/d" \
+		-e "s:\$ENV{'DEVICE_LIB_PATH'}:'/usr/lib/amdgcn/bitcode':" \
+		-i bin/hipcc || die
+
+	# change --hip-device-lib-path to "/usr/lib/amdgcn/bitcode", must align with "dev-libs/rocm-device-libs"
+	sed -e "s:\${AMD_DEVICE_LIBS_PREFIX}/lib:/usr/lib/amdgcn/bitcode:" \
+		-i "${S}/hip-config.cmake.in" || die
+
+	einfo "prefixing hipcc and its utils..."
+	hprefixify $(grep -rl --exclude-dir=build/ "/usr" "${S}")
+}
+
+src_configure() {
+	strip-flags
+	if ! use debug; then
+		append-cflags "-DNDEBUG"
+		append-cxxflags "-DNDEBUG"
+		buildtype="Release"
+	else
+		buildtype="Debug"
+	fi
+
+	# TODO: Currently a GENTOO configuration is build,
+	# this is also used in the cmake configuration files
+	# which will be installed to find HIP;
+	# Other ROCm packages expect a "RELEASE" configuration,
+	# see "hipBLAS"
+	local mycmakeargs=(
+		-DCMAKE_PREFIX_PATH="${EPREFIX}/usr/lib/llvm/roc"
+		-DCMAKE_BUILD_TYPE=${buildtype}
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/hip"
+		-DBUILD_HIPIFY_CLANG=OFF
+		-DHIP_PLATFORM=rocclr
+		-DHIP_RUNTIME=ROCclr
+		-DHIP_COMPILER=clang
+		-DROCM_PATH="${EPREFIX}/usr"
+		-DHSA_PATH="${EPREFIX}/usr"
+		-DUSE_PROF_API=$(usex profile 1 0)
+		-DROCclr_DIR="${EPREFIX}"/usr/include/rocclr
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	echo "HSA_PATH=${EPREFIX}/usr" > 99hip || die
+	echo "ROCM_PATH=${EPREFIX}/usr" >> 99hip || die
+	echo "HIP_PLATFORM=rocclr" >> 99hip || die
+	echo "HIP_RUNTIME=ROCclr" >> 99hip || die
+	echo "HIP_COMPILER=clang" >> 99hip || die
+	echo "HIP_CLANG_PATH=${EPREFIX}/usr/lib/llvm/roc/bin" >> 99hip || die
+
+	echo "PATH=${EPREFIX}/usr/lib/hip/bin" >> 99hip || die
+	echo "HIP_PATH=${EPREFIX}/usr/lib/hip" >> 99hip || die
+	echo "LDPATH=${EPREFIX}/usr/lib/hip/lib" >> 99hip || die
+	echo "ROOTPATH=${EPREFIX}/usr/lib/hip/bin" >> 99hip || die
+
+	doenvd 99hip
+
+	cmake_src_install
+}
diff --git a/dev-util/hip/metadata.xml b/dev-util/hip/metadata.xml
new file mode 100644
index 000000000000..db491e13a348
--- /dev/null
+++ b/dev-util/hip/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>candrews@gentoo.org</email>
+    <name>Craig Andrews</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>gentoo@holzke.net</email>
+    <name>Wilfried Holzke</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ROCm-Developer-Tools/HIP</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest
index fb1339b38e3b..1dfafdba387d 100644
--- a/dev-util/idea-community/Manifest
+++ b/dev-util/idea-community/Manifest
@@ -1,4 +1,5 @@
+AUX idea-community-jdk.patch 485 BLAKE2B 3ccbddf308b1cb1af020086e7568e05b4a60b28d77e995194e622aa229340b82069bcdce0e5f05152ce626cdd574c3d891f494fdead59354223e96b0347036a6 SHA512 156f05a7f78c48e9ef9d0ed991d1fb390c5d40f7b32f41c02f51805fa2a6f523a255576fa4033ec98192f8626edd31d20259b0a37660506331ea8060826ffd4b
 DIST ideaIC-3.0.203.5981.155.tar.gz 582023182 BLAKE2B 671fbba0c2173e3780a99d0d3b106af75c4ef6df4198ced3653c1b74a7bbb055a29b1fc31eb89823bfd56e6737c7788f78a90fe7ef46e52ab410c0dff18868e9 SHA512 35d569c5e13ec620d0a476cc52c005d29ea3c7c3c1ab0614a1a73255309635c84ee00820c50584ca19af634165138c77d8d712cfe0d367b9525956ad33aafe77
 DIST jbr-11_0_8-linux-x64-b1098.1.tar.gz 191689225 BLAKE2B 0da0f0e834709c89820f2e7e1c447dc33ea1c59c7dfb573aa47bc205f7920ccf485454f79931d42d4e6eb4de1017589bb908808d6a80cc586659757abc9958d3 SHA512 a455d8bd3332622592186cd7ae3995a9148a47717a81c274497f5408f1e89ef637c7478321b4ccd5dbe97c2e246a16ac8956c5ce475f8a4156232647f0ea7737
-EBUILD idea-community-2020.3.0.203.5981.155-r1.ebuild 3941 BLAKE2B 1c5eff3e15c0fa06e6562c8d7f8bb4b1f97e8c747621795f575c48eb5d2e8488b887b489df1dc9a8ec833126d9e90dca993dd6e23a545cdff1c2208386d50158 SHA512 64f71f6de6cd859a518ee066790221528988f45246bedc7b4d450fc4099961e3b67a0642b1fad8636ace5d411edfad88730d3696d33fe434bd4656a53ea83438
+EBUILD idea-community-2020.3.0.203.5981.155-r1.ebuild 4044 BLAKE2B eb38d68fe69748d403ae5bc113534420722931fcc6f39d2485f788909df8288906e1c1e12e258816e963f5853e08d51f37a6aac09aef76c01e161020e3e1c070 SHA512 8a7ea844919b0fb7bced8a576a752a8ea9114d6f941461a3bd1283da14e08c032157d47484ba914083d1b0dc945205425154207686498832fedd6247a102139a
 MISC metadata.xml 561 BLAKE2B 511df10fb880b655143aba1063715ffdaaadd232c97f3f957105c1526a7a25ab1019fb13d0d36212799050dda94c1040a82c5219f81e41c4202ba9ae417723d3 SHA512 f1c87b067dc5252c5a9a92070428971472c3bd8102ebaea048aff7eb2783ec4fe485a5a91be4463c808025ea5df150c0c28c34cf5b3094c1aa52f0dd3b9f1db6
diff --git a/dev-util/idea-community/files/idea-community-jdk.patch b/dev-util/idea-community/files/idea-community-jdk.patch
new file mode 100644
index 000000000000..b89e6773fd01
--- /dev/null
+++ b/dev-util/idea-community/files/idea-community-jdk.patch
@@ -0,0 +1,11 @@
+--- a/bin/idea.sh	2020-12-30 15:51:43.743936660 -0500
++++ b/bin/idea.sh	2020-12-30 17:58:16.759719538 -0500
+@@ -66,6 +66,8 @@ PATHS_SELECTOR="IdeaIC2020.3"
+ # shellcheck disable=SC2154
+ if [ -n "$IDEA_JDK" ] && [ -x "$IDEA_JDK/bin/java" ]; then
+   JDK="$IDEA_JDK"
++else
++  JDK="/opt/openjdk-bin-11" && [[ -d "/opt/openjdk-11" ]] && JDK="/usr/lib64/openjdk-bin-11"
+ fi
+ 
+ if [ -z "$JDK" ] && [ -s "${XDG_CONFIG_HOME:-$HOME/.config}/${PRODUCT_VENDOR}/${PATHS_SELECTOR}/idea.jdk" ]; then
diff --git a/dev-util/idea-community/idea-community-2020.3.0.203.5981.155-r1.ebuild b/dev-util/idea-community/idea-community-2020.3.0.203.5981.155-r1.ebuild
index 358d9caaec62..7c07043f326c 100644
--- a/dev-util/idea-community/idea-community-2020.3.0.203.5981.155-r1.ebuild
+++ b/dev-util/idea-community/idea-community-2020.3.0.203.5981.155-r1.ebuild
@@ -42,22 +42,32 @@ DEPEND="!dev-util/${PN}:14
 		dev-java/openjdk-bin:11
 	)"
 RDEPEND="${DEPEND}
-	>=virtual/jdk-1.7:*
 	dev-java/jansi-native
 	dev-libs/libdbusmenu
-	=dev-util/lldb-10*"
+	=dev-util/lldb-10*
+	|| (
+		dev-java/openjdk:11
+		dev-java/openjdk-bin:11
+	)"
 BDEPEND="dev-util/patchelf"
 RESTRICT="splitdebug"
 S="${WORKDIR}/${MY_PN}-IC-$(ver_cut 4-6)"
 
 QA_PREBUILT="opt/${PN}-${MY_PV}/*"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-jdk.patch"
+)
+
 src_unpack() {
 	default_src_unpack
 	mkdir jre64 && cd jre64 && unpack jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz
 }
 
 src_prepare() {
+
+	default_src_prepare
+
 	if use amd64; then
 		JRE_DIR=jre64
 	else
diff --git a/dev-util/indent/Manifest b/dev-util/indent/Manifest
index 5b03c9a9aaf4..2a77e9e6f7aa 100644
--- a/dev-util/indent/Manifest
+++ b/dev-util/indent/Manifest
@@ -1,3 +1,3 @@
 DIST indent-2.2.12.tar.xz 620280 BLAKE2B c3414ebe58d75b74356b5c37234639dc34998b73e45a4c28ee20ab2932c523b528d577c45c32db88f2ee4aed58d1dceeda2fe68b8975d211dc0dad4a3a20f7c7 SHA512 dbe73bd3729074825f9f5b4241a4c539ad32069df56511963417caf0351ff9ec5edd77e9580338301c8abf89ab9c0592bc7e82c14eec7450c496259d7e9045dd
-EBUILD indent-2.2.12.ebuild 1115 BLAKE2B 43b5323a79ba3aeccea9268f4a7f98cb821da986d7b98fb451f0d0f17f6a21c5065f9fff2e0248999d95a8fd6536169638d6ec4e324c90cc28f9e7730bbad5f6 SHA512 e3fb4a26f6ee896471b10edfbfae600d36c16e05c4ed45a9a3e43365a0e03a78b227e97d8cd053173b2d9fc25a7668aba18d126678013f54be791666de0bc0ed
+EBUILD indent-2.2.12.ebuild 1116 BLAKE2B 8a06875a4d6ef730ff939c11f16b7b6d7c500fb2859028dbc4bdf35c2e38955397bf233448d4e6f75d7a1fa752251cdc429a9c12e70592453ee3f682b5196bc8 SHA512 1a03c1c440cdf5642b7982ffb9d1b9b6f4754b60f4930d7ba237a4e385d1a021f145aa38c4ce3952850bc42f747d7bca9de12f77caef0b6a5c8237e813f0d78c
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/indent/indent-2.2.12.ebuild b/dev-util/indent/indent-2.2.12.ebuild
index d24c91e8ac8a..f147dca41c81 100644
--- a/dev-util/indent/indent-2.2.12.ebuild
+++ b/dev-util/indent/indent-2.2.12.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="nls"
 
 DEPEND="
diff --git a/dev-util/intltool/Manifest b/dev-util/intltool/Manifest
index 10ade56eb14a..8f56e989d241 100644
--- a/dev-util/intltool/Manifest
+++ b/dev-util/intltool/Manifest
@@ -2,5 +2,5 @@ AUX intltool-0.50.2-absolute-paths.patch 1798 BLAKE2B 9648c96b7f4a65a19e6e62ee5d
 AUX intltool-0.51.0-perl-5.22.patch 2184 BLAKE2B 8655ee9b830828a9a0fa8841b02f1c3d213331b11bae8724d5a6767b0c3cf157959e8efdc4fb62d4d4c2ca07c712ef8ac391463304ebdfd745c0e5891d7f3aa9 SHA512 ca125f5284bba789139d9733c79c077074cbeee7e263ce98953868590e50d32d80b94935eec7965f1c2817388e0fd8e1d5c87a9faac7936c9ee7e8d0b5758177
 AUX intltool-0.51.0-perl-5.26.patch 586 BLAKE2B bc79617f7cd22794a06c93a63a3fa9ef2e3337c8b1488207ed08e11e340a726f3979703450b580bee2f5b482366843f44fc0e4d710da2eb4fa4f98b60e3b2eaf SHA512 86fe1b795118975f1930535d9bb7d01564852546fb234bddadbc4a5ac66ccf6a43c9944ede1ea72dc6c4296dc8db3dfff4ebd1989dce57e623689be444c8e591
 DIST intltool-0.51.0.tar.gz 162286 BLAKE2B 98fe40e4d669fdf65a777152ddee0a9656412b9cf5d1e682d1b4b7bd666f3e5aa623a50481b6df47e16a935550836c66c666229b0bb7ef143f7cde6893b97a69 SHA512 4c93cb26592ed0b1622d3b7800b5d6622ffa36f58ac73f2ef0bddfab522565fdfb8fa73d81914b9a202f1d62bc995a08960f8adb9f62c86918e75498e85fbfdf
-EBUILD intltool-0.51.0-r2.ebuild 968 BLAKE2B 851c6c30bb23659c65f0ef6dd8d855227a2c67a45d0ee71bbee91a577c00233a72a0a20618e826a0ea03c90e9e74df6ec1f2fc8ca19aa17f0d36afe00f6ab81f SHA512 1b9ac0a070b00c667d5a84f6ec57129a00cbb9193dd8e1a2bdf8576948752e519b783fe519b533d35240ee03a0a01d778255bc51dcd3d94865ff1b36206065b8
+EBUILD intltool-0.51.0-r2.ebuild 948 BLAKE2B 26b47a087d723a62fb31464a5a872f1e3b2b75d1d2b28a8ec656d069b39c833ac5dfe47f02ec07c1072392cfa367c5d2a53f637f37b0e3f87149aca30c2060e9 SHA512 e582af4638fd0b0d06bb2564c1e47498ddd427dbbe2a1175f998efd73e1d3ca23c2378c44c5548ec92f23a98904cb519cfa85b1aefd3311318b546f86ad91ff6
 MISC metadata.xml 304 BLAKE2B 87e449f29a87153e258fe194afc64202ff133f6a8bdf333cee64d907246348f504133bc8195e005039647deb28680f5762068770bb09126328aa9d9b7e76bde9 SHA512 e9f0bede4c5ab13dda61ae7ea0f5d39988373388f78a05b08f4099204154160ab0d88d21989a8bf8249aa98448744969643e118883c418968c9030a6919a9727
diff --git a/dev-util/intltool/intltool-0.51.0-r2.ebuild b/dev-util/intltool/intltool-0.51.0-r2.ebuild
index 66c7df8f5517..96c942e1ae78 100644
--- a/dev-util/intltool/intltool-0.51.0-r2.ebuild
+++ b/dev-util/intltool/intltool-0.51.0-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
 
 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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="
diff --git a/dev-util/lttng-tools/Manifest b/dev-util/lttng-tools/Manifest
index 2915e14ab202..0882a298bd80 100644
--- a/dev-util/lttng-tools/Manifest
+++ b/dev-util/lttng-tools/Manifest
@@ -1,7 +1,5 @@
-DIST lttng-tools-2.10.9.tar.bz2 1254174 BLAKE2B 1666aab83bbdeb48a0c5764b359760346cfd9b55ee1677eac87a5d16f00c6c9e0f0952bf84486e0cbf9052ac1b485b276e230b36097b5366040db4e3112a3086 SHA512 2e390eb53bfbc874afd1c0c8273f9546fbe08da79fd2c9430eee8e348c05afba34bb6fe365165bf7468b284f7d88dcc16c37803d807109042c51cac1d8c2df1a
-DIST lttng-tools-2.11.0.tar.bz2 1479411 BLAKE2B 5abe2613c8a35b18587c75d75be8af85a37b52daa9ff36bf0126385e5f736f7084cac7815e858e48c26c1e3fe4bc9b00b8ebaf0ce339689bd9a0e177a518d51e SHA512 2b183296201cc62faa1f5afef3fdb67f089996479987d9e6e52e6286301f57a1015f017cc8b743496c30500579fcabde2945db3b7879ae5bd0a6723cfbdf99fb
+DIST lttng-tools-2.12.0.tar.bz2 1544515 BLAKE2B 642047348ef7bfe72c5ec718b4029c628fe2e23fd0a82517a8d5bb15a8cc3b84965d21b2f528a20530fb6ca8213e320d0dd6f36de09b34a53863c46ee272a470 SHA512 87613de34141c75b7ff0eb7b4292d26eea5381a7f298130cf5e802255aa7b0e55f43268dffed71b51d1e5dcd96b92cd517e13557fe64ee121bf1b419b2935a24
 DIST lttng-tools-2.7.1.tar.bz2 984351 BLAKE2B 51d61857c56c3bffcaec80d8b57c18c96c3125d56f7feaa70e3ad44d108987a663734c17cf2553b1979061ae400c1e5bd0a30de4bf3bf5af28846403a3e055c1 SHA512 b0cafa5b74182a077232dbe2b73ed4e2267a921a62163367f0e7e14463e176d4538fc6ec27b8737f55fc417734677e5d22efc65685f885fa5f892f7900ee0e2d
-EBUILD lttng-tools-2.10.9.ebuild 837 BLAKE2B 2c80d35cf14f5b0da95e80f16aba770d36d83650c5080ca02db65efafb212f816f38ac7f4b5b2870d2521ee506d36f3ff28b3edbefa79f0d5a2baa86a50eef98 SHA512 a0abd37b8c1e481da19ff553ed30eca7f9d55620d5eff55246d9b22e273c9bfd954e0b54a955dc12dcd08bc2977b6ef1576d55c95f488eb113fd0785a44c5589
-EBUILD lttng-tools-2.11.0.ebuild 837 BLAKE2B 2c80d35cf14f5b0da95e80f16aba770d36d83650c5080ca02db65efafb212f816f38ac7f4b5b2870d2521ee506d36f3ff28b3edbefa79f0d5a2baa86a50eef98 SHA512 a0abd37b8c1e481da19ff553ed30eca7f9d55620d5eff55246d9b22e273c9bfd954e0b54a955dc12dcd08bc2977b6ef1576d55c95f488eb113fd0785a44c5589
+EBUILD lttng-tools-2.12.0.ebuild 691 BLAKE2B c4fe28aedffa12cee98e2f7bbc10bff1ff66d3ddce6c4621cf230a25de43c3ea106a879a6d2384d2d05f75d3f5c253cc5f9f391abe7ef1693cb07d70fa8c249b SHA512 f3346a83dd5d2b092a17de4a0f46de72abcc1e42058121736af98636f7ebf38b8a72a197ba9076c923c3b3a7b14956615d9b8fff05560a47ef8fe17b51a0c017
 EBUILD lttng-tools-2.7.1.ebuild 860 BLAKE2B aa76843c0a61318a58347e3bbd2bec28ff1695d818198fc20d8220b710cbac8e98cf953ad3617ca86ef75e3b5d36548b325ffdaf717d7044602973160e59c42c SHA512 71dee4c72661c7b2caf941e2ed70858372b3cbed53e6c937ed746b825da912d3a3877c9e00c838500524249c4dfa87f61936a65c22b75a8c162d8fb2bd010586
 MISC metadata.xml 493 BLAKE2B 3b627bbc8927620ca6fd13d49c5cdf57999a84ad849d32c0303bd1d4409b9bbb511330b814e29fb626f85754c07ce0d08e9a8343d724650f2ff21f5d7462c81c SHA512 39a5a7c28b3471efe353af48d001726df67d061cf89a11c1a7f8f80309c9d591f594787968570af1af86d2f5ac2ddfcb9d81bd84604d2836d28b184c414af252
diff --git a/dev-util/lttng-tools/lttng-tools-2.11.0.ebuild b/dev-util/lttng-tools/lttng-tools-2.11.0.ebuild
deleted file mode 100644
index fb1f24e3f845..000000000000
--- a/dev-util/lttng-tools/lttng-tools-2.11.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info
-
-MY_P="${P/_rc/-rc}"
-MY_SLOT="$(ver_cut 1-2)"
-
-DESCRIPTION="Linux Trace Toolkit - next generation"
-HOMEPAGE="https://lttng.org"
-SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/${MY_SLOT}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+ust"
-
-DEPEND="dev-libs/userspace-rcu:=
-	dev-libs/popt
-	dev-libs/libxml2
-	ust? ( dev-util/lttng-ust:= )
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if kernel_is -lt 2 6 27; then
-		ewarn "${PN} require Linux kernel >= 2.6.27"
-		ewarn "   pipe2(), epoll_create1() and SOCK_CLOEXEC are needed to run"
-		ewarn "   the session daemon. There were introduce in the 2.6.27"
-	fi
-}
-
-src_configure() {
-	econf $(usex ust "" --without-lttng-ust)
-}
diff --git a/dev-util/lttng-tools/lttng-tools-2.10.9.ebuild b/dev-util/lttng-tools/lttng-tools-2.12.0.ebuild
index fb1f24e3f845..be88227c25ae 100644
--- a/dev-util/lttng-tools/lttng-tools-2.10.9.ebuild
+++ b/dev-util/lttng-tools/lttng-tools-2.12.0.ebuild
@@ -20,20 +20,17 @@ IUSE="+ust"
 DEPEND="dev-libs/userspace-rcu:=
 	dev-libs/popt
 	dev-libs/libxml2
-	ust? ( dev-util/lttng-ust:= )
+	ust? ( >=dev-util/lttng-ust-2.12.0:= )
 "
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
-pkg_pretend() {
-	if kernel_is -lt 2 6 27; then
-		ewarn "${PN} require Linux kernel >= 2.6.27"
-		ewarn "   pipe2(), epoll_create1() and SOCK_CLOEXEC are needed to run"
-		ewarn "   the session daemon. There were introduce in the 2.6.27"
-	fi
+src_configure() {
+	econf $(usex ust "" --without-lttng-ust) --disable-static
 }
 
-src_configure() {
-	econf $(usex ust "" --without-lttng-ust)
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-util/lttng-ust/Manifest b/dev-util/lttng-ust/Manifest
index db0cbd59cabf..31497ea90d77 100644
--- a/dev-util/lttng-ust/Manifest
+++ b/dev-util/lttng-ust/Manifest
@@ -1,10 +1,8 @@
 AUX lttng-ust-2.11.0-fno-common.patch 1620 BLAKE2B 8603834fa34cc8fdda200d9d6808d5c7983d46cce944d22c4ea3e4caf667cba9b2a735cf9d5bb363df88ce5b443aac5eb66a25eae81cad386128be81ac4d538c SHA512 dc46d9571afbe17707495ab34cdcb32224ec5380e982157d01c7aac57da3b5449ff594583d13e21659a56dc8e1161a360e07c73804bd20801962890d539fc754
-DIST lttng-ust-2.10.6.tar.bz2 804912 BLAKE2B e320cad821f143392a95e98cf99f5a23597c25f7d570ac5ce3206cb5b4b7bd931e5eb765a133e421e78307fbd882e33ba291cc2c19e37250a87844308d1af2f3 SHA512 a689838a621e99408bea0e5b6ccd4a930dc2103ecb05c8b472974eda9387b813b1b9e59d3aeb4d04434754cfab170723baf961cd5063116916da471c04165c50
 DIST lttng-ust-2.11.0.tar.bz2 824285 BLAKE2B 161d50282a95cce47ab3811216241ade73e2002d8f03aa2266b5add36d06552f5620b912eeecff1173f43eec107b385f1b93783905f36a42baf5a63c37ea35fc SHA512 fb7258961a7e913487806a7e0129c95becff8c631382b119ff1d78f95cdd7460ec24e62671642160fdb006a3a292b2b10f35c8424f0367ce7c6a41cbcca77a09
-DIST lttng-ust-2.7.1.tar.bz2 643906 BLAKE2B 2ef4be03ce3b2bcc8e781c2b6e798ee00bb85d7f7039ad34fc49b3bfda46142d65fc98d19fefefb3e375e6f0de95292a1e15de25318b2da62b51d9fb017b43a1 SHA512 80ba4b79df2a0ba0606a31145a427c8c5b30e2a4ace20f9e4602738ace99fe88146569de549288ff33c809a606b6973c17c3effcf9699b5dca3383b8da5b10ee
+DIST lttng-ust-2.12.0.tar.bz2 853127 BLAKE2B 6a6655a4aa33ec6318255d05d0e000c19fb66d4049873f091b8e19f3f9ea0c15731db70af77dbab1d597edcafcd745f1dae2670cd38759c9b54ea38b1135b590 SHA512 d69772170f57b9669b99cea372ca537777151a31b82002e1e5ec80da3ceb302c23f0f85d63a2c95c90a375b879e266aa5297e7d6444050dd40feb1253d863801
 DIST lttng-ust-2.8.1.tar.bz2 743271 BLAKE2B d6adac00525ab747306288dd71f27ce982dd93e4ff42b9938064ae1435ad1c0867acebe3030a33748dc9aa78b6200ba2c47631e4359a963772fc4685472d21ae SHA512 15c459620cb73ef5be8c7df2ef02663ef650555b973a3d1ed976ae38068b53a8c83143a611bcb53e91a3f211361c44cd2a331cb41dd53d28a69924f7ac44cc95
-EBUILD lttng-ust-2.10.6.ebuild 631 BLAKE2B 5152ec21ce38221c5ac845b5a5b7fe1d0408b2c84f564145b5b71fa868ec9c129bcd91868b138d9328e46e0ae3177b90678276b74bdcbdd07a37a463a8edb3a7 SHA512 ff342925629a70af6feb62eb11126f12f5c49d64d28ca98d26c2938d97c5187cfb2e05a7d7f60fc1c479ade9faa45f7b59d81eb867e52bb93b66cf0cd8e51e5e
 EBUILD lttng-ust-2.11.0.ebuild 773 BLAKE2B 8ab82f84b6e9a444e8e24f02d3c3ff51f9dc187f8e327f709f86126e4b770987ac45f29f0bf2a24e8c56affb1f7834769bf78800424d715b1ebbb8a661911541 SHA512 cf354f8e33cb778b58b8afdbd64720eea0a13afe4362641fa59057531f31f9279b927b4359b1f8da6f466eba0d7f31ccd5eec043eab6300e369e5686ee056233
-EBUILD lttng-ust-2.7.1.ebuild 633 BLAKE2B 646b4940625af6ab525b2b3e5cb1736f1235cc87d9aac55e36f2766922dc1d74cad537d74f203a343ac8378aad49dc2de63412cf253780a305f468fd65794787 SHA512 ab93a93b6f670d1e7d1d4f1def1ac3710b141167d62b0c450716cdab0a47b6cde6731ea3162c94a6d58399a6d7aa5afcde26c224d1faca3599e74a65ee700cd3
-EBUILD lttng-ust-2.8.1.ebuild 660 BLAKE2B 430d2052ce40c58a00a2b8b32cb43f793f9adc2488a90f073dcdfb1ee6daf1f575a398c08b6070ec7f7e94a776322cccefd69693ac25736a011a44c79f2ea240 SHA512 0dd349fb6bd5a1892e6bfa3c4436347250a2931b9390dcdc06bb121ce2dabf5b96c3fe88d13005acfd4ffa558248edd1426b25eeef310773249dcb76fb3f768c
+EBUILD lttng-ust-2.12.0.ebuild 793 BLAKE2B 78c843d79973eed4bc91ae0a291ab0a64282de8af37e9824c2e2a6df7720dd465bfd6c8f9bf82a704454e5f1270860e94e989c88687e8d76633ab7ede2645f44 SHA512 9a8cf5b2ca0665213e14ad1089edf03221febe643db26235e5f1c29c78837ecbd6b1a0226c46dedd046328208a48d628b5a4d0488f030bccb9f5416d9d0966b3
+EBUILD lttng-ust-2.8.1.ebuild 661 BLAKE2B e08924d8e984f5fcaf64e18254c3cb84e1595299c6657081250bcc7671568d61be48289f80200697a8e9a8bc592edacb71f45c5d490edeeb962d0a1deab64ab3 SHA512 ca86ec9950371c87faa5f84d16a3ad9778c80cbd2b896657f6f4481e6e2623d5ddc53bd15b3c5837f7a5320bcf41d3a96a5dbdf231d1dcd8e07bfdc5f7e080d8
 MISC metadata.xml 700 BLAKE2B 868502f60e5fe09cbd2a2abd0794920341ccb496eaf2b1bbeaf377c0d894b35e950f79636e334ec910dd3ea0e3f2a205eb849b3bb2eaf17c1b7851e630a186fe SHA512 dda0af06ba5f4c5cf8b01aa61989c910acb58ff96b0e50f23f43f8d1932194a954bd3e1ae38ef052e4ad4d32dd025a082fea1de739ca1d9e4a2f60bf8ecbcae4
diff --git a/dev-util/lttng-ust/lttng-ust-2.10.6.ebuild b/dev-util/lttng-ust/lttng-ust-2.12.0.ebuild
index 576350634db5..a0aab3946489 100644
--- a/dev-util/lttng-ust/lttng-ust-2.10.6.ebuild
+++ b/dev-util/lttng-ust/lttng-ust-2.12.0.ebuild
@@ -14,10 +14,12 @@ SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/${MY_SLOT}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="examples"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="examples numa"
 
-DEPEND="dev-libs/userspace-rcu:="
+DEPEND="
+	dev-libs/userspace-rcu:=
+	numa? ( sys-process/numactl )"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}"/${MY_P}
@@ -29,3 +31,12 @@ src_prepare() {
 	fi
 	eautoreconf
 }
+
+src_configure() {
+	econf $(use_enable numa)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-util/lttng-ust/lttng-ust-2.7.1.ebuild b/dev-util/lttng-ust/lttng-ust-2.7.1.ebuild
deleted file mode 100644
index c440ff6af2ce..000000000000
--- a/dev-util/lttng-ust/lttng-ust-2.7.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools versionator
-
-MY_P="${P/_rc/-rc}"
-MY_SLOT="$(get_version_component_range 1-2)"
-
-DESCRIPTION="Linux Trace Toolkit - UST library"
-HOMEPAGE="https://lttng.org"
-SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/${MY_SLOT}"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-IUSE="examples"
-
-DEPEND="dev-libs/userspace-rcu:="
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	if ! use examples; then
-		sed -i -e '/SUBDIRS/s:examples::' doc/Makefile.am || die
-	fi
-	eautoreconf
-}
diff --git a/dev-util/lttng-ust/lttng-ust-2.8.1.ebuild b/dev-util/lttng-ust/lttng-ust-2.8.1.ebuild
index 457768dbdee7..a09a68a5beaf 100644
--- a/dev-util/lttng-ust/lttng-ust-2.8.1.ebuild
+++ b/dev-util/lttng-ust/lttng-ust-2.8.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/${MY_SLOT}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="examples"
 
 DEPEND="dev-libs/userspace-rcu:="
diff --git a/dev-util/meson-format-array/Manifest b/dev-util/meson-format-array/Manifest
new file mode 100644
index 000000000000..0ca01513e8e7
--- /dev/null
+++ b/dev-util/meson-format-array/Manifest
@@ -0,0 +1,3 @@
+AUX meson-format-array 642 BLAKE2B 5daa5807f11f35c96d9451e5c6b7198950b4edf24119fa606620f00133075a6a830c98a05f1d3d2c7a5fac1f15107c571d6e8750a5790e3ab945cf8a07d2f51f SHA512 54c173f286cd0b98d6b69633d45b4d57dae26c561dd8c3f3bb2e6690773422c925e5f1d510d0a00f7723136b3f1ab51c5738d4bf207dcaad4d35ae6b8409cf8c
+EBUILD meson-format-array-0.ebuild 680 BLAKE2B eb674cb2feb9dd4f03f722e1f06c7f831fdaaeb9dbfce94222e11b67beff9c7a30738fcda05b08f53e80ce4f4d990cfd79d46f475fcb70648107889941ea694f SHA512 5e5c506627c780ed1ea565686efdab9864c9c80623456633b05cf12452290f4538d6b406e5eb99ac840b4a1f2fde9d6eb4da2b1141239c86affe635cee212b8a
+MISC metadata.xml 270 BLAKE2B bb57c2e4c881d5cbda7b683a40770581c9964db4bea37a1637551edd8b8c29c77a042de417fa7369332b16942bb8bca0c693a0dac25835867293c0504a0b0afa SHA512 6fa5c990f4ac4560cb43c3acf2412cd25876a0ba496a0619f541189a0d21b431f4418e3d0d9a6de2868159800243d07b79806f6a89fa1f2fad89703746c85985
diff --git a/dev-util/meson-format-array/files/meson-format-array b/dev-util/meson-format-array/files/meson-format-array
new file mode 100644
index 000000000000..d2bf49ba8e59
--- /dev/null
+++ b/dev-util/meson-format-array/files/meson-format-array
@@ -0,0 +1,26 @@
+#!/usr/bin/env python3
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+import itertools
+import shlex
+import sys
+
+def quote(s):
+    return "'" + s.replace("\\", "\\\\").replace("'", "\\'") + "'"
+
+def main(args):
+    # Split each argument according to shell rules
+    args = (shlex.split(x) for x in args)
+
+    # Flatten the resulting list of lists
+    args = itertools.chain.from_iterable(args)
+
+    # Add quotes and escape embedded quotes
+    args = (quote(x) for x in args)
+
+    # Format the result
+    print("[" + ", ".join(args) + "]")
+
+if __name__ == "__main__":
+    main(sys.argv[1:])
diff --git a/dev-util/meson-format-array/meson-format-array-0.ebuild b/dev-util/meson-format-array/meson-format-array-0.ebuild
new file mode 100644
index 000000000000..1d252e83121e
--- /dev/null
+++ b/dev-util/meson-format-array/meson-format-array-0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit python-r1
+
+DESCRIPTION="Format shell expressions into a meson array"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RDEPEND="${PYTHON_DEPS}"
+S="${WORKDIR}"
+
+src_install() {
+	python_foreach_impl python_doscript "${FILESDIR}"/meson-format-array
+}
diff --git a/dev-util/meson-format-array/metadata.xml b/dev-util/meson-format-array/metadata.xml
new file mode 100644
index 000000000000..d35a395549ee
--- /dev/null
+++ b/dev-util/meson-format-array/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>floppym@gentoo.org</email>
+		<name>Mike Gilbert</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/dev-util/netsurf-buildsystem/Manifest b/dev-util/netsurf-buildsystem/Manifest
index a975b31e4deb..4e424e678a11 100644
--- a/dev-util/netsurf-buildsystem/Manifest
+++ b/dev-util/netsurf-buildsystem/Manifest
@@ -2,6 +2,6 @@ AUX gentoo-helpers-r1.sh 384 BLAKE2B dc6440065bb1595fcc6844c041cd40b438ac1c899dc
 AUX gentoo-helpers-r2.sh 388 BLAKE2B 2e7f1fd1eb7d9366514ccad5cb356689005f7028a423b60600ab8297b053ce37b154de37258ef4bfe759bf2b2b4007c3e416eeb3dd9937f75c9c41ef93c1bfc5 SHA512 8aad232d938e4aaac424389833012eb0c29409b8d558cf4cc6e894b7e3baa23ba29364aa1b7a2872bab6b507d52436cd5ecf3d5b42ccc52bcbed2d2c78034b36
 DIST buildsystem-1.8.tar.gz 38617 BLAKE2B 0fd5539feae0b81828efe90c82baf6ce7fceec2f2189adddb0e32d2106f9263ebd14b32f3dce8daae13110f0e69801caed48ce81709ce09d809ba50041690cc7 SHA512 0f577f4867e5e12770f9b9c42ea55e884362180bc195b6ebf56e56305ce84e230407cd2ebb3b182cc03087ffef5f39187e52e2e2f8f2b86aa20a16fa33bdff8b
 DIST buildsystem-1.9.tar.gz 38723 BLAKE2B 0fc4aae4f9a21058c7e437170e74147f6b6dc20220d53986a212e717846d5738df2771081f000705cd69335fbe61653b24a3e86d454a53b24f9cadd5e7aaac97 SHA512 52d7181af56946b95f22d5cc8fb2c58287fe43c940d4104e4a05744cfe332d0e0ea6da76cb8d635eb34cac4d66f53dc01ac5f440b82a207265d39744f112a80d
-EBUILD netsurf-buildsystem-1.8-r1.ebuild 696 BLAKE2B 8800c0bddf0ff7efc2cb23680f312a1dd7c4bdeea6a41b52a2fac4bdda19e876d26ed793de9eecad1f3e665c96fb067fc7baf5f85c7453af2e76bd10924408d2 SHA512 10727448657df6e2b3f47e4fe0b067fdf7484d56c93115b3559e533216513c97e8c5b9e84fcc4ad52790d1e158267387dc390e81de5290d81481abda3af308b0
-EBUILD netsurf-buildsystem-1.9.ebuild 715 BLAKE2B 076adffafbee97c5e34bd4022514216b6e5dd21bb3e05f447d29e3cf25d53fbdd2554d3eb7b6bb044248a25fa61ebcfb240e2ead8648f1b04d8306a9fadb632c SHA512 326cd81138a70632840241801d81e5f2eff9d2737a768cda0d99d4cfc702c6d7997434623c698c7ba40c18fae8b568e255bd4b6e254b68ddd93d98c06ba51eba
+EBUILD netsurf-buildsystem-1.8-r1.ebuild 686 BLAKE2B 91a1629798de378e5cd1dbae5f1fe5fa50cb11efa82465853abeab06a12c0c50497a8f457a2e72ee4681bf95b3cba85a8213ed87b12bffa5227aa38c3d51803c SHA512 be01e9483ff835f7361b9fc9500ca0f1cf74fe893c6d4cb7a4179fcc98646fdb14a93a3defb309120602b04187dd0203165082a11c009266a8be46108d4ed96a
+EBUILD netsurf-buildsystem-1.9.ebuild 704 BLAKE2B 47a78968ce44e7dfc67d2c71f49872ca830d9a57d39c1ab9804a3f76068ae9b4eb848524af2d7b7027269f45d822df36242ba31d71008a6393b7f9c917445577 SHA512 0cfd2b1a8f46ee35d8d9feb40006dcfda0a8b63dbf692b89625167ece29dbcb5c70ed4e1a61cf95755616c6a498234f7f66871d879ab941c0fc8f0f260697b79
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.8-r1.ebuild b/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.8-r1.ebuild
index 43ec99bcda5a..a7c8e561fd64 100644
--- a/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.8-r1.ebuild
+++ b/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.8-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~m68k-mint"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.9.ebuild b/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.9.ebuild
index 70b4b63fad4f..5a3a72e3df6a 100644
--- a/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.9.ebuild
+++ b/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~m68k-mint"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-util/nvidia-cuda-sdk/Manifest b/dev-util/nvidia-cuda-sdk/Manifest
index 569290502358..425b82d93288 100644
--- a/dev-util/nvidia-cuda-sdk/Manifest
+++ b/dev-util/nvidia-cuda-sdk/Manifest
@@ -1,20 +1,7 @@
-DIST cuda_10.1.243_418.87.00_linux.run 2572375299 BLAKE2B df9cb4faeeeeecc536e72697c6c73d544219f1b23cacb7fed646b0908fc7e573e85920861d56f76776ba637d84964cd1c789a0fe0d6541a4e0adf618b6c74d3c SHA512 f92b19d0242969a65a6e6db43bc293e442abc07a9e168c9e995692e1a401679504598c782e511be3879e1650b90f71a50bbc63c9ee45654c26b5007cdf33c4fe
 DIST cuda_10.2.89_440.33.01_linux.run 2645419389 BLAKE2B 236aa70a7b45e3636c2c229fffa7d1ca0699ab4365865a73edab607a209c42c2899133dd6a83c61c5929fa754668ad15aec4d847639af1c00a8e6657c8487c77 SHA512 ad8da539ff5df7caf411d1e497ff3d6978cfa8a1fd9150fa4846089e92a604ea56be8631f3efdfe7229a655b8d2d28e6edb32f5731530a77d6f00241cc7aab6e
-DIST cuda_6.5.19_linux_32.run 81882112 BLAKE2B cf55ef7c969503c156431fc56301ed4e9a1234ae0cb867f12649636069f35e56bf6fc9df7482b6baade45d78c8baa2d98c41a28696da59294e0f575c4a0344ce SHA512 1ce9bd6b472b7e4f1fb181eb340dfcb757714d59a89aaa02146cfe1a97c8ccb7eb7699b4ec823276f277eb4d82d95050eaba17e7ed5fd2e47b9b5d78531c5d4e
-DIST cuda_6.5.19_linux_64.run 982446238 BLAKE2B 517ac07d4717f4f5d9427616a387dbe01fe35b7b6845b5d9e29aad18814243d38cc9a3cd0ff9042c027fcb056618e9a8535d560c16a6ac7998ff39fcf3ada654 SHA512 06854f020a5f72cf4bd714859e6966248ac2f589284113674e869fdaa1254cae27d4101940758ecda5df4724ad3e448a1f6d0c053b6cbc28107750872b6a5797
-DIST cuda_7.5.18_linux.run 1195424633 BLAKE2B 35933c3c3355231cd59e579e6ac6a30cca57ed0e3de26ce5cac368ff22595f39cb041c9696415d4d76a49e772b7828eacab24a3e581c1e9a8ef7981e1b044eee SHA512 97459dfd124060200f1c43f763e5bce0bea53e35ed4bef72bee6c8ba1c04ecffb8695af11755443513316f91fdb5cb4d35662f7b87bca7e3de85d562d4e49363
-DIST cuda_8.0.44_linux.run 1457082926 BLAKE2B a6408ddf8984dc4b0725cc4f53549c4d4fc4b3bd4de2771896953dbe023aa6d04ad38f5d6bf1ab3ff5752d2c18b400f478c9dbb263755267836c5de79e4f8f51 SHA512 1bf9d8e6b853c2a971b8d908a043adc5b11ec7033faed04a773c42680882753f98bc33b46f6b301c24c0f780f74bc237dce5766fc857f1a905e6c1f200728d86
 DIST cuda_8.0.61_375.26_linux.run 1465528129 BLAKE2B d52ddf1dcf5246f230f210d10d1f6e7b540c892dea5a8cd770f0d062b30b01f5c8467d930430b383464d40a9b4a14eaaf22a365e081955e4452ec4f55e08da0b SHA512 d22303719a9feff64f95bf6a966f1caa2bf0cf8c955e475ce08ce54faa5e098d336c2db223ef0185c1f23b9c52b7d2f81a63515485219cfc016d72bda979248b
-DIST cuda_9.0.176_384.81_linux.run 1643293725 BLAKE2B 4155de544f877f6c420c2463bc68679cc89774f0516d1885d5c3f483ad86e7f25ecf6042b8240431b814230136f3026196a013bb18184fa2ec9af555bb7ea723 SHA512 00e24638c02d049c575732dee5237db21f7c451b606f37cf95e44e89d47d0cb055255e9f70dc013298c9e0d224147f239488558904556b68572e3f31935489a9
-DIST cuda_9.1.85_387.26_linux.run 1639829845 BLAKE2B c9f6544893b8e4d0b4c51d66f1cf17a593e65af6e7748e2994abda8ffcb839a7bb19cb0eebfbc52347293296025f000241d1c9842af0c41d31928770c4639b79 SHA512 492a5fa58fc93ac718ca093f24bb5e74dd2586338c42f2e11e328c7f16756e3511a1c555b12cb1990bb782d0d1600976f4c9e5b3d4857e371b0431daf06b2827
 DIST cuda_9.2.88_396.26_linux.run 1758421686 BLAKE2B 5068b2dfae87e43c124a6a72ac98b7c562aebc7161e7c977cfba68342127e99705228be531aa5bb8af0318e17c4ef8fe36257452d0f507fc3b82e3fbd0184bdc SHA512 2d0d87926e11a1b21d6d3377138753df458a53ba9539d8399f9f252e0784cb41e2c63a5c724ca81ded82b9657b97fda51d812b467b0827e7d361aa2ad73b2dba
-EBUILD nvidia-cuda-sdk-10.1.243.ebuild 3855 BLAKE2B 38641a5f691355ddaf84b7e24800e4758245fb2237ca6589c0e589a674f1d0dbdf2ca4396cb61f0d6572374833c9756a751d7b79edb693bd14b1cbdf42d53f44 SHA512 6ec429c1d57814d98050040644aa407247ef0e47c2634fe7e4dd68d8e6c33fc0975ea4688418c07efbee109c3b16f69c08ef16a1812169bacef38307a41f32ee
 EBUILD nvidia-cuda-sdk-10.2.89.ebuild 3848 BLAKE2B 54e6e210099b41a583c7410a856a21a0f32a816f7282dae5361480e53fa0bbf61489dafe0ed5082992d8ac0e6a0f836ce5d0deaa6a9c6b2a0c20ffcc6a491eeb SHA512 c786a2001fc28583eb0c38290bef6b7a9167dd8b406e940f77f67a2c4a34ecb98849fa1e65e6d13cd540bcbad218a64a4ee64e3b67acde5949771f5fb90e5cee
-EBUILD nvidia-cuda-sdk-6.5.19.ebuild 3992 BLAKE2B 3cd45f806009b7ef888c59c566af037109d20a6a4f5306ff6a6187266cfba019575f94c35df3780377a437074d630edcc88e3c4c3510a2511a27808f4d7d1012 SHA512 367460c2bc89549774ead4cde22c875ed3df9f8002fdd6666289649c6749295389204a11cd0cd6ab201cb2eed1e43d1cda45aea42b9864c9a7fb5ba813aaa04e
-EBUILD nvidia-cuda-sdk-7.5.18.ebuild 3568 BLAKE2B 45c89d2ea4116aa687ea797997cdf03bd7f14626ef49e505144ef9864aa88c7130878dee1896e0b0fbffec5b7815a4f753c1b5a71e4582676efb03aa62c0663a SHA512 199004e748db588de447c71ac2bddb08fdfbbc099a335ecbcd7e57978cc3cbb9cfdd6a87765c6b315cfac067248c133eeff1a98fc2e9d331a138ccb5266a1f7e
-EBUILD nvidia-cuda-sdk-8.0.44-r1.ebuild 3757 BLAKE2B 2a63de4062e746841c0e975aa68a5e40b358267b7682ca54bcad4c4b97ca3a1ac463c98ce081138d56013945cd22e9ff818d9b4391f8f6e15c1ddb8f4813aa70 SHA512 b2270c56dc77e85db6963c01965afb4a85b7acf3790630d955adf0d64d2ca09203c9423285684c99432037c8378dd5856c5ccf4b91a0b364f54c282765c149d9
 EBUILD nvidia-cuda-sdk-8.0.61.ebuild 3803 BLAKE2B bb1f549d41e64984e8b3ae629461f3bc616bb776324fd2d29e529a66453bb2304c8ad6d397e7c5b790d759455869b88f9796bf12f760a2816e651caa85226480 SHA512 91ed589b1841b6069e24ea8fd12fc55d73c7bca0b33cd6b7b37746fbd3c896ce8224a5622b7750720595d1f36a7daecc3661612148f58e6e6e79028b2a0333fa
-EBUILD nvidia-cuda-sdk-9.0.176.ebuild 3802 BLAKE2B 721ae934544eec47b19fb1eaee6109fb9bd1ad8ee79a38ee4d9d28a6a00891badf8b2c24c11160c4803c0aa9ff375348fd897d3fb396355853013e03290b35c9 SHA512 ce2afcc297f62e9ef965ec0ad3344286a9df85ec84bc512872e5e7897c07993431ff21eb36e34aa2b5aed05f4a3f107f869e979bfa09cffda035de77c8d89983
-EBUILD nvidia-cuda-sdk-9.1.85.ebuild 3798 BLAKE2B c10c6cd7aaef1b99089f36d319f7f5375fb117c3f8840fc367c44368a7cac7366d54f377c9d775207dec61d0ca67885ef2ba61a70daee4d5326453dc7e831f71 SHA512 e5c37b2319ffd7d91b4d24721ffbd4617aec28924ebef86ffd44d7a3de2eeebf726a6bf518cad195261e485f7fc8d4850565ba83186026962ca9d49e49bfdddb
 EBUILD nvidia-cuda-sdk-9.2.88.ebuild 3791 BLAKE2B bd1fb4d0c9cc42767ac113097f768fc0e944eab1fa4ee8384bb5925abdad0d29b878abdf205c68216b3612451f6e627c40722013be4749c3ac9cc33314290860 SHA512 4ad0d53e6a7c33f578e5e5daef71f3bed147bf2083ee641f72baf62718655b54066088c2c371eb493924d996edbfd522feea3b8497adccdcef50a845c4c8b77a
 MISC metadata.xml 366 BLAKE2B 379204c3535fb9e98e2026ae695a62618006c42a590b13803db1990c07119a3a40e7bb4474c73f3717340987fc3ed2829dc9d6b0774103a2b4f6c0726bdf58d2 SHA512 174f0718320ba2b8c7b427d43ed2b35f781313cc97397958c5c4c49163ef6d02eae5658071238d764392905c403d13094c898f95f22e1a0360a24ae2a7d08459
diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-10.1.243.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-10.1.243.ebuild
deleted file mode 100644
index e63a0c26df91..000000000000
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-10.1.243.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cuda flag-o-matic portability toolchain-funcs unpacker
-
-MYD=$(ver_cut 1-2 ${PV})
-DRIVER_PV="418.87.00"
-
-DESCRIPTION="NVIDIA CUDA Software Development Kit"
-HOMEPAGE="https://developer.nvidia.com/cuda-zone"
-SRC_URI="https://developer.download.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_${DRIVER_PV}_linux.run -> cuda_${PV}_${DRIVER_PV}_linux.run"
-
-LICENSE="CUDPP"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~amd64-linux"
-IUSE="+cuda debug +doc +examples opencl mpi"
-
-RDEPEND="
-	~dev-util/nvidia-cuda-toolkit-${PV}
-	media-libs/freeglut
-	examples? (
-		media-libs/freeimage
-		media-libs/glew:0=
-		!prefix? ( >=x11-drivers/nvidia-drivers-${DRIVER_PV}[uvm] )
-		mpi? ( virtual/mpi )
-		)"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-S=${WORKDIR}/builds/cuda-samples
-
-QA_EXECSTACK=(
-	opt/cuda/sdk/0_Simple/cdpSimplePrint/cdpSimplePrint
-	opt/cuda/sdk/0_Simple/cdpSimpleQuicksort/cdpSimpleQuicksort
-	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimplePrint
-	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimpleQuicksort
-	)
-
-src_prepare() {
-	cuda_src_prepare
-
-	export RAWLDFLAGS="$(raw-ldflags)"
-#	epatch "${FILESDIR}"/${P}-asneeded.patch
-
-	local file
-	while IFS="" read -d $'\0' -r file; do
-		sed \
-			-e 's:-O[23]::g' \
-			-e "/LINK/s:gcc:$(tc-getCC) ${LDFLAGS}:g" \
-			-e "/LINK/s:g++:$(tc-getCXX) ${LDFLAGS}:g" \
-			-e "/CC/s:gcc:$(tc-getCC):g" \
-			-e "/GCC/s:g++:$(tc-getCXX):g" \
-			-e "/NVCC /s|\(:=\).*|:= ${EPREFIX}/opt/cuda/bin/nvcc|g" \
-			-e "/ CFLAGS/s|\(:=\)|\1 ${CFLAGS}|g" \
-			-e "/ CXXFLAGS/s|\(:=\)|\1 ${CXXFLAGS}|g" \
-			-e "/NVCCFLAGS/s|\(:=\)|\1 ${NVCCFLAGS} |g" \
-			-e 's:-Wimplicit::g' \
-			-e "s|../../common/lib/linux/\$(OS_ARCH)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
-			-e "s|../../common/lib/\$(OSLOWER)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
-			-e "s|../../common/lib/\$(OSLOWER)/\$(OS_ARCH)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
-			-i "${file}" || die
-			# -e "/ALL_LDFLAGS/s|:=|:= ${RAWLDFLAGS} |g" \
-	done < <(find . -type f -name 'Makefile' -print0)
-
-	rm -rf common/inc/GL || die
-	find . -type f -name '*.a' -delete || die
-
-	eapply_user
-}
-
-src_compile() {
-	use examples || return
-	local myopts=("verbose=1")
-	use debug && myopts+=("dbg=1")
-	export FAKEROOTKEY=1 # Workaround sandbox issue in #462602
-	emake \
-		cuda-install="${EPREFIX}/opt/cuda" \
-		CUDA_PATH="${EPREFIX}/opt/cuda/" \
-		MPI_GCC=10 \
-		"${myopts[@]}"
-}
-
-src_test() {
-	addwrite /dev/nvidiactl
-	addwrite /dev/nvidia0
-
-	local i
-	for i in {0..9}*/*; do
-		emake -C "${i}" run
-	done
-}
-
-src_install() {
-	local f t crap=( *.txt Samples.htm* )
-
-	if use doc; then
-		ebegin "Installing docs ..."
-			while IFS="" read -d $'\0' -r f; do
-				treecopy "${f}" "${ED}"/usr/share/doc/${PF}/
-			done < <(find -type f \( -name 'readme.txt' -o -name '*.pdf' \) -print0)
-
-			while IFS="" read -d $'\0' -r f; do
-				docompress -x "${f#${ED}}"
-			done < <(find "${ED}"/usr/share/doc/${PF}/ -type f -name 'readme.txt' -print0)
-		eend
-	fi
-
-	ebegin "Cleaning before installation..."
-		for f in "${crap[@]}"; do
-			rm -f "${f}" || die
-		done
-		find -type f \( -name '*.o' -o -name '*.pdf' -o -name 'readme.txt' \) -delete || die
-	eend
-
-	ebegin "Moving files..."
-		while IFS="" read -d $'\0' -r f; do
-			t="$(dirname ${f})"
-			if [[ ${t/obj\/} != ${t} || ${t##*.} == a ]]; then
-				continue
-			fi
-			if [[ -x ${f} ]]; then
-				exeinto /opt/cuda/sdk/"${t}"
-				doexe "${f}"
-			else
-				insinto /opt/cuda/sdk/"${t}"
-				doins "${f}"
-			fi
-		done < <(find . -type f -print0)
-	eend
-}
-
-pkg_postinst() {
-	if use examples && use prefix; then
-		ewarn "Gentoo Prefix does not manage kernel modules.  You need to make certain"
-		ewarn "the function counterpart to >=x11-drivers/nvidia-drivers-${DRIVER_PV}[uvm]"
-		ewarn "is available from the host"
-	fi
-}
diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.19.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.19.ebuild
deleted file mode 100644
index f48ac080ba5f..000000000000
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.19.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cuda eutils flag-o-matic portability toolchain-funcs unpacker versionator
-
-MYD=$(get_version_component_range 1)_$(get_version_component_range 2)
-
-DESCRIPTION="NVIDIA CUDA Software Development Kit"
-HOMEPAGE="http://developer.nvidia.com/cuda"
-CURI="http://developer.download.nvidia.com/compute/cuda/${MYD}/rel/installers"
-SRC_URI="
-	amd64? ( ${CURI}/cuda_${PV}_linux_64.run )
-	x86? ( ${CURI}/cuda_${PV}_linux_32.run )"
-
-LICENSE="CUDPP"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +doc +examples opencl +cuda"
-
-RDEPEND="
-	~dev-util/nvidia-cuda-toolkit-${PV}
-	media-libs/freeglut
-	examples? (
-		media-libs/freeimage
-		media-libs/glew:0=
-		virtual/mpi
-		>=x11-drivers/nvidia-drivers-340.32[uvm]
-		x86? ( <x11-drivers/nvidia-drivers-346.35[uvm] )
-		)"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-S=${WORKDIR}/cuda-samples
-
-QA_EXECSTACK=(
-	opt/cuda/sdk/0_Simple/cdpSimplePrint/cdpSimplePrint
-	opt/cuda/sdk/0_Simple/cdpSimpleQuicksort/cdpSimpleQuicksort
-	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimplePrint
-	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimpleQuicksort
-	)
-
-src_unpack() {
-	unpacker
-	unpacker run_files/cuda-samples*run
-}
-
-pkg_setup() {
-	if use cuda || use opencl; then
-		cuda_pkg_setup
-	fi
-
-	if use x86; then
-		ewarn "Starting with version 6.5 NVIDIA dropped more and more"
-		ewarn "the support for 32bit linux."
-		ewarn "Be aware that bugfixes and new features may not be available."
-		ewarn "https://dev.gentoo.org/~jlec/distfiles/CUDA_Toolkit_Release_Notes.pdf"
-	fi
-}
-
-src_prepare() {
-	export RAWLDFLAGS="$(raw-ldflags)"
-#	epatch "${FILESDIR}"/${P}-asneeded.patch
-
-	sed \
-		-e 's:-O2::g' \
-		-e 's:-O3::g' \
-		-e "/LINK/s:gcc:$(tc-getCC) ${LDFLAGS}:g" \
-		-e "/LINK/s:g++:$(tc-getCXX) ${LDFLAGS}:g" \
-		-e "/CC/s:gcc:$(tc-getCC):g" \
-		-e "/GCC/s:g++:$(tc-getCXX):g" \
-		-e "/NVCC /s|\(:=\).*|:= ${EPREFIX}/opt/cuda/bin/nvcc|g" \
-		-e "/ CFLAGS/s|\(:=\)|\1 ${CFLAGS}|g" \
-		-e "/ CXXFLAGS/s|\(:=\)|\1 ${CXXFLAGS}|g" \
-		-e "/NVCCFLAGS/s|\(:=\)|\1 ${NVCCFLAGS} |g" \
-		-e 's:-Wimplicit::g' \
-		-e "s|../../common/lib/linux/\$(OS_ARCH)/libGLEW.a|$(pkg-config --libs glew)|g" \
-		-e "s|../../common/lib/\$(OSLOWER)/libGLEW.a|$(pkg-config --libs glew)|g" \
-		-e "s|../../common/lib/\$(OSLOWER)/\$(OS_ARCH)/libGLEW.a|$(pkg-config --libs glew)|g" \
-		-i $(find . -type f -name "Makefile") || die
-
-#		-e "/ALL_LDFLAGS/s|:=|:= ${RAWLDFLAGS} |g" \
-	find common/inc/GL -delete || die
-	find . -type f -name "*\.a" -delete || die
-
-	eapply_user
-}
-
-src_compile() {
-	use examples || return
-	local myopts verbose="verbose=1"
-	use debug && myopts+=" dbg=1"
-	export FAKEROOTKEY=1 # Workaround sandbox issue in #462602
-	emake \
-		cuda-install="${EPREFIX}/opt/cuda" \
-		CUDA_PATH="${EPREFIX}/opt/cuda/" \
-		MPI_GCC=10 \
-		${myopts} ${verbose}
-}
-
-src_test() {
-	local _dir _subdir
-
-	addwrite /dev/nvidiactl
-	addwrite /dev/nvidia0
-
-	for _dir in {0..9}*; do
-		pushd ${_dir} > /dev/null
-		for _subdir in *; do
-			emake -C ${_subdir} run
-		done
-		popd > /dev/null
-	done
-}
-
-src_install() {
-	local i j f t crap=""
-
-	if use doc; then
-		ebegin "Installing docs ..."
-			treecopy $(find -type f \( -name readme.txt -o -name "*.pdf" \)) "${ED}"/usr/share/doc/${PF}/
-			docompress -x $(find "${ED}"/usr/share/doc/${PF}/ -type f -name readme.txt | sed -e "s:${ED}::")
-		eend
-	fi
-
-	crap+=" *.txt Samples.htm*"
-
-	ebegin "Cleaning before installation..."
-		for i in ${crap}; do
-			if [[ -e ${i} ]]; then
-				find ${i} -delete || die
-			fi
-		done
-		find -type f \( -name "*.o" -o -name "*.pdf" -o -name "readme.txt" \) -delete || die
-	eend
-
-	ebegin "Moving files..."
-		for f in $(find .); do
-			local t="$(dirname ${f})"
-			if [[ ${t/obj\/} != ${t} || ${t##*.} == a ]]; then
-				continue
-			fi
-			if [[ ! -d ${f} ]]; then
-				if [[ -x ${f} ]]; then
-					exeinto /opt/cuda/sdk/${t}
-					doexe ${f}
-				else
-					insinto /opt/cuda/sdk/${t}
-					doins ${f}
-				fi
-			fi
-	done
-	eend
-}
diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-7.5.18.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-7.5.18.ebuild
deleted file mode 100644
index f3d256ec6cd5..000000000000
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-7.5.18.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cuda eutils flag-o-matic portability toolchain-funcs unpacker versionator
-
-MYD=$(get_version_component_range 1-2)
-
-DESCRIPTION="NVIDIA CUDA Software Development Kit"
-HOMEPAGE="https://developer.nvidia.com/cuda-downloads"
-SRC_URI="http://developer.download.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_linux.run"
-
-LICENSE="CUDPP"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux"
-IUSE="debug +doc +examples opencl +cuda"
-
-RDEPEND="
-	~dev-util/nvidia-cuda-toolkit-${PV}
-	media-libs/freeglut
-	examples? (
-		media-libs/freeimage
-		media-libs/glew:0=
-		virtual/mpi
-		>=x11-drivers/nvidia-drivers-352.39[uvm]
-		)"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-S=${WORKDIR}/samples
-
-QA_EXECSTACK=(
-	opt/cuda/sdk/0_Simple/cdpSimplePrint/cdpSimplePrint
-	opt/cuda/sdk/0_Simple/cdpSimpleQuicksort/cdpSimpleQuicksort
-	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimplePrint
-	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimpleQuicksort
-	)
-
-src_unpack() {
-	unpacker
-	unpacker run_files/cuda-samples*run
-}
-
-pkg_setup() {
-	if use cuda || use opencl; then
-		cuda_pkg_setup
-	fi
-}
-
-src_prepare() {
-	export RAWLDFLAGS="$(raw-ldflags)"
-#	epatch "${FILESDIR}"/${P}-asneeded.patch
-
-	sed \
-		-e 's:-O2::g' \
-		-e 's:-O3::g' \
-		-e "/LINK/s:gcc:$(tc-getCC) ${LDFLAGS}:g" \
-		-e "/LINK/s:g++:$(tc-getCXX) ${LDFLAGS}:g" \
-		-e "/CC/s:gcc:$(tc-getCC):g" \
-		-e "/GCC/s:g++:$(tc-getCXX):g" \
-		-e "/NVCC /s|\(:=\).*|:= ${EPREFIX}/opt/cuda/bin/nvcc|g" \
-		-e "/ CFLAGS/s|\(:=\)|\1 ${CFLAGS}|g" \
-		-e "/ CXXFLAGS/s|\(:=\)|\1 ${CXXFLAGS}|g" \
-		-e "/NVCCFLAGS/s|\(:=\)|\1 ${NVCCFLAGS} |g" \
-		-e 's:-Wimplicit::g' \
-		-e "s|../../common/lib/linux/\$(OS_ARCH)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
-		-e "s|../../common/lib/\$(OSLOWER)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
-		-e "s|../../common/lib/\$(OSLOWER)/\$(OS_ARCH)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
-		-i $(find . -type f -name "Makefile") || die
-
-#		-e "/ALL_LDFLAGS/s|:=|:= ${RAWLDFLAGS} |g" \
-	find common/inc/GL -delete || die
-	find . -type f -name "*\.a" -delete || die
-}
-
-src_compile() {
-	use examples || return
-	local myopts verbose="verbose=1"
-	use debug && myopts+=" dbg=1"
-	export FAKEROOTKEY=1 # Workaround sandbox issue in #462602
-	emake \
-		cuda-install="${EPREFIX}/opt/cuda" \
-		CUDA_PATH="${EPREFIX}/opt/cuda/" \
-		MPI_GCC=10 \
-		${myopts} ${verbose}
-}
-
-src_test() {
-	local _dir _subdir
-
-	addwrite /dev/nvidiactl
-	addwrite /dev/nvidia0
-
-	for _dir in {0..9}*; do
-		pushd ${_dir} > /dev/null
-		for _subdir in *; do
-			emake -C ${_subdir} run
-		done
-		popd > /dev/null
-	done
-}
-
-src_install() {
-	local i j f t crap=""
-
-	if use doc; then
-		ebegin "Installing docs ..."
-			treecopy $(find -type f \( -name readme.txt -o -name "*.pdf" \)) "${ED}"/usr/share/doc/${PF}/
-			docompress -x $(find "${ED}"/usr/share/doc/${PF}/ -type f -name readme.txt | sed -e "s:${ED}::")
-		eend
-	fi
-
-	crap+=" *.txt Samples.htm*"
-
-	ebegin "Cleaning before installation..."
-		for i in ${crap}; do
-			if [[ -e ${i} ]]; then
-				find ${i} -delete || die
-			fi
-		done
-		find -type f \( -name "*.o" -o -name "*.pdf" -o -name "readme.txt" \) -delete || die
-	eend
-
-	ebegin "Moving files..."
-		for f in $(find .); do
-			local t="$(dirname ${f})"
-			if [[ ${t/obj\/} != ${t} || ${t##*.} == a ]]; then
-				continue
-			fi
-			if [[ ! -d ${f} ]]; then
-				if [[ -x ${f} ]]; then
-					exeinto /opt/cuda/sdk/${t}
-					doexe ${f}
-				else
-					insinto /opt/cuda/sdk/${t}
-					doins ${f}
-				fi
-			fi
-	done
-	eend
-}
diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-8.0.44-r1.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-8.0.44-r1.ebuild
deleted file mode 100644
index 4015cff5dca8..000000000000
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-8.0.44-r1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cuda eutils flag-o-matic portability toolchain-funcs unpacker versionator
-
-MYD=$(get_version_component_range 1-2)
-
-DESCRIPTION="NVIDIA CUDA Software Development Kit"
-HOMEPAGE="https://developer.nvidia.com/cuda-zone"
-SRC_URI="https://developer.nvidia.com/compute/cuda/${MYD}/prod/local_installers/cuda_${PV}_linux-run -> cuda_${PV}_linux.run"
-
-LICENSE="CUDPP"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux"
-IUSE="+cuda debug +doc +examples opencl mpi"
-
-RDEPEND="
-	~dev-util/nvidia-cuda-toolkit-${PV}
-	media-libs/freeglut
-	examples? (
-		media-libs/freeimage
-		media-libs/glew:0=
-		>=x11-drivers/nvidia-drivers-367.44[uvm]
-		mpi? ( virtual/mpi )
-		)"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-S=${WORKDIR}/samples
-
-QA_EXECSTACK=(
-	opt/cuda/sdk/0_Simple/cdpSimplePrint/cdpSimplePrint
-	opt/cuda/sdk/0_Simple/cdpSimpleQuicksort/cdpSimpleQuicksort
-	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimplePrint
-	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimpleQuicksort
-	)
-
-src_unpack() {
-	# We first need to unpack the cuda_${PV}_linux.run file
-	# which includes the cuda-samples*run file.
-	unpacker
-	unpacker run_files/cuda-samples*run
-}
-
-pkg_setup() {
-	if use cuda || use opencl; then
-		cuda_pkg_setup
-	fi
-}
-
-src_prepare() {
-	export RAWLDFLAGS="$(raw-ldflags)"
-#	epatch "${FILESDIR}"/${P}-asneeded.patch
-
-	local file
-	while IFS="" read -d $'\0' -r file; do
-		sed \
-			-e 's:-O[23]::g' \
-			-e "/LINK/s:gcc:$(tc-getCC) ${LDFLAGS}:g" \
-			-e "/LINK/s:g++:$(tc-getCXX) ${LDFLAGS}:g" \
-			-e "/CC/s:gcc:$(tc-getCC):g" \
-			-e "/GCC/s:g++:$(tc-getCXX):g" \
-			-e "/NVCC /s|\(:=\).*|:= ${EPREFIX}/opt/cuda/bin/nvcc|g" \
-			-e "/ CFLAGS/s|\(:=\)|\1 ${CFLAGS}|g" \
-			-e "/ CXXFLAGS/s|\(:=\)|\1 ${CXXFLAGS}|g" \
-			-e "/NVCCFLAGS/s|\(:=\)|\1 ${NVCCFLAGS} |g" \
-			-e 's:-Wimplicit::g' \
-			-e "s|../../common/lib/linux/\$(OS_ARCH)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
-			-e "s|../../common/lib/\$(OSLOWER)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
-			-e "s|../../common/lib/\$(OSLOWER)/\$(OS_ARCH)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
-			-i "${file}" || die
-			# -e "/ALL_LDFLAGS/s|:=|:= ${RAWLDFLAGS} |g" \
-	done < <(find . -type f -name 'Makefile' -print0)
-
-	rm -rf common/inc/GL || die
-	find . -type f -name '*.a' -delete || die
-
-	eapply_user
-}
-
-src_compile() {
-	use examples || return
-	local myopts=("verbose=1")
-	use debug && myopts+=("dbg=1")
-	export FAKEROOTKEY=1 # Workaround sandbox issue in #462602
-	emake \
-		cuda-install="${EPREFIX}/opt/cuda" \
-		CUDA_PATH="${EPREFIX}/opt/cuda/" \
-		MPI_GCC=10 \
-		"${myopts[@]}"
-}
-
-src_test() {
-	addwrite /dev/nvidiactl
-	addwrite /dev/nvidia0
-
-	local i
-	for i in {0..9}*/*; do
-		emake -C "${i}" run
-	done
-}
-
-src_install() {
-	local f t crap=( *.txt Samples.htm* )
-
-	if use doc; then
-		ebegin "Installing docs ..."
-			while IFS="" read -d $'\0' -r f; do
-				treecopy "${f}" "${ED%/}"/usr/share/doc/${PF}/
-			done < <(find -type f \( -name 'readme.txt' -o -name '*.pdf' \) -print0)
-
-			while IFS="" read -d $'\0' -r f; do
-				docompress -x "${f#${ED%/}}"
-			done < <(find "${ED%/}"/usr/share/doc/${PF}/ -type f -name 'readme.txt' -print0)
-		eend
-	fi
-
-	ebegin "Cleaning before installation..."
-		for f in "${crap[@]}"; do
-			rm -f "${f}" || die
-		done
-		find -type f \( -name '*.o' -o -name '*.pdf' -o -name 'readme.txt' \) -delete || die
-	eend
-
-	ebegin "Moving files..."
-		while IFS="" read -d $'\0' -r f; do
-			t="$(dirname ${f})"
-			if [[ ${t/obj\/} != ${t} || ${t##*.} == a ]]; then
-				continue
-			fi
-			if [[ -x ${f} ]]; then
-				exeinto /opt/cuda/sdk/"${t}"
-				doexe "${f}"
-			else
-				insinto /opt/cuda/sdk/"${t}"
-				doins "${f}"
-			fi
-		done < <(find . -type f -print0)
-	eend
-}
diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.0.176.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.0.176.ebuild
deleted file mode 100644
index d70ad3f42d8f..000000000000
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.0.176.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cuda eutils flag-o-matic portability toolchain-funcs unpacker versionator
-
-MYD=$(get_version_component_range 1-2)
-DRIVER_PV="384.81"
-
-DESCRIPTION="NVIDIA CUDA Software Development Kit"
-HOMEPAGE="https://developer.nvidia.com/cuda-zone"
-SRC_URI="https://developer.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_${DRIVER_PV}_linux-run -> cuda_${PV}_${DRIVER_PV}_linux.run"
-
-LICENSE="CUDPP"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux"
-IUSE="+cuda debug +doc +examples opencl mpi"
-
-RDEPEND="
-	~dev-util/nvidia-cuda-toolkit-${PV}
-	media-libs/freeglut
-	examples? (
-		media-libs/freeimage
-		media-libs/glew:0=
-		>=x11-drivers/nvidia-drivers-384.81[uvm]
-		mpi? ( virtual/mpi )
-		)"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-S=${WORKDIR}/samples
-
-QA_EXECSTACK=(
-	opt/cuda/sdk/0_Simple/cdpSimplePrint/cdpSimplePrint
-	opt/cuda/sdk/0_Simple/cdpSimpleQuicksort/cdpSimpleQuicksort
-	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimplePrint
-	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimpleQuicksort
-	)
-
-src_unpack() {
-	# We first need to unpack the cuda_${PV}_linux.run file
-	# which includes the cuda-samples*run file.
-	unpacker
-	unpacker run_files/cuda-samples*run
-}
-
-pkg_setup() {
-	if use cuda || use opencl; then
-		cuda_pkg_setup
-	fi
-}
-
-src_prepare() {
-	export RAWLDFLAGS="$(raw-ldflags)"
-#	epatch "${FILESDIR}"/${P}-asneeded.patch
-
-	local file
-	while IFS="" read -d $'\0' -r file; do
-		sed \
-			-e 's:-O[23]::g' \
-			-e "/LINK/s:gcc:$(tc-getCC) ${LDFLAGS}:g" \
-			-e "/LINK/s:g++:$(tc-getCXX) ${LDFLAGS}:g" \
-			-e "/CC/s:gcc:$(tc-getCC):g" \
-			-e "/GCC/s:g++:$(tc-getCXX):g" \
-			-e "/NVCC /s|\(:=\).*|:= ${EPREFIX}/opt/cuda/bin/nvcc|g" \
-			-e "/ CFLAGS/s|\(:=\)|\1 ${CFLAGS}|g" \
-			-e "/ CXXFLAGS/s|\(:=\)|\1 ${CXXFLAGS}|g" \
-			-e "/NVCCFLAGS/s|\(:=\)|\1 ${NVCCFLAGS} |g" \
-			-e 's:-Wimplicit::g' \
-			-e "s|../../common/lib/linux/\$(OS_ARCH)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
-			-e "s|../../common/lib/\$(OSLOWER)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
-			-e "s|../../common/lib/\$(OSLOWER)/\$(OS_ARCH)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
-			-i "${file}" || die
-			# -e "/ALL_LDFLAGS/s|:=|:= ${RAWLDFLAGS} |g" \
-	done < <(find . -type f -name 'Makefile' -print0)
-
-	rm -rf common/inc/GL || die
-	find . -type f -name '*.a' -delete || die
-
-	eapply_user
-}
-
-src_compile() {
-	use examples || return
-	local myopts=("verbose=1")
-	use debug && myopts+=("dbg=1")
-	export FAKEROOTKEY=1 # Workaround sandbox issue in #462602
-	emake \
-		cuda-install="${EPREFIX}/opt/cuda" \
-		CUDA_PATH="${EPREFIX}/opt/cuda/" \
-		MPI_GCC=10 \
-		"${myopts[@]}"
-}
-
-src_test() {
-	addwrite /dev/nvidiactl
-	addwrite /dev/nvidia0
-
-	local i
-	for i in {0..9}*/*; do
-		emake -C "${i}" run
-	done
-}
-
-src_install() {
-	local f t crap=( *.txt Samples.htm* )
-
-	if use doc; then
-		ebegin "Installing docs ..."
-			while IFS="" read -d $'\0' -r f; do
-				treecopy "${f}" "${ED%/}"/usr/share/doc/${PF}/
-			done < <(find -type f \( -name 'readme.txt' -o -name '*.pdf' \) -print0)
-
-			while IFS="" read -d $'\0' -r f; do
-				docompress -x "${f#${ED%/}}"
-			done < <(find "${ED%/}"/usr/share/doc/${PF}/ -type f -name 'readme.txt' -print0)
-		eend
-	fi
-
-	ebegin "Cleaning before installation..."
-		for f in "${crap[@]}"; do
-			rm -f "${f}" || die
-		done
-		find -type f \( -name '*.o' -o -name '*.pdf' -o -name 'readme.txt' \) -delete || die
-	eend
-
-	ebegin "Moving files..."
-		while IFS="" read -d $'\0' -r f; do
-			t="$(dirname ${f})"
-			if [[ ${t/obj\/} != ${t} || ${t##*.} == a ]]; then
-				continue
-			fi
-			if [[ -x ${f} ]]; then
-				exeinto /opt/cuda/sdk/"${t}"
-				doexe "${f}"
-			else
-				insinto /opt/cuda/sdk/"${t}"
-				doins "${f}"
-			fi
-		done < <(find . -type f -print0)
-	eend
-}
diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.1.85.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.1.85.ebuild
deleted file mode 100644
index 1f648f706dc4..000000000000
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.1.85.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cuda flag-o-matic portability toolchain-funcs unpacker versionator
-
-MYD=$(get_version_component_range 1-2)
-DRIVER_PV="387.26"
-
-DESCRIPTION="NVIDIA CUDA Software Development Kit"
-HOMEPAGE="https://developer.nvidia.com/cuda-zone"
-SRC_URI="https://developer.nvidia.com/compute/cuda/${MYD}/Prod2/local_installers/cuda_${PV}_${DRIVER_PV}_linux -> cuda_${PV}_${DRIVER_PV}_linux.run"
-
-LICENSE="CUDPP"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux"
-IUSE="+cuda debug +doc +examples opencl mpi"
-
-RDEPEND="
-	~dev-util/nvidia-cuda-toolkit-${PV}
-	media-libs/freeglut
-	examples? (
-		media-libs/freeimage
-		media-libs/glew:0=
-		>=x11-drivers/nvidia-drivers-${DRIVER_PV}[uvm]
-		mpi? ( virtual/mpi )
-		)"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-S=${WORKDIR}/samples
-
-QA_EXECSTACK=(
-	opt/cuda/sdk/0_Simple/cdpSimplePrint/cdpSimplePrint
-	opt/cuda/sdk/0_Simple/cdpSimpleQuicksort/cdpSimpleQuicksort
-	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimplePrint
-	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimpleQuicksort
-	)
-
-src_unpack() {
-	# We first need to unpack the cuda_${PV}_linux.run file
-	# which includes the cuda-samples*run file.
-	unpacker
-	unpacker run_files/cuda-samples*run
-}
-
-pkg_setup() {
-	if use cuda || use opencl; then
-		cuda_pkg_setup
-	fi
-}
-
-src_prepare() {
-	export RAWLDFLAGS="$(raw-ldflags)"
-#	epatch "${FILESDIR}"/${P}-asneeded.patch
-
-	local file
-	while IFS="" read -d $'\0' -r file; do
-		sed \
-			-e 's:-O[23]::g' \
-			-e "/LINK/s:gcc:$(tc-getCC) ${LDFLAGS}:g" \
-			-e "/LINK/s:g++:$(tc-getCXX) ${LDFLAGS}:g" \
-			-e "/CC/s:gcc:$(tc-getCC):g" \
-			-e "/GCC/s:g++:$(tc-getCXX):g" \
-			-e "/NVCC /s|\(:=\).*|:= ${EPREFIX}/opt/cuda/bin/nvcc|g" \
-			-e "/ CFLAGS/s|\(:=\)|\1 ${CFLAGS}|g" \
-			-e "/ CXXFLAGS/s|\(:=\)|\1 ${CXXFLAGS}|g" \
-			-e "/NVCCFLAGS/s|\(:=\)|\1 ${NVCCFLAGS} |g" \
-			-e 's:-Wimplicit::g' \
-			-e "s|../../common/lib/linux/\$(OS_ARCH)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
-			-e "s|../../common/lib/\$(OSLOWER)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
-			-e "s|../../common/lib/\$(OSLOWER)/\$(OS_ARCH)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
-			-i "${file}" || die
-			# -e "/ALL_LDFLAGS/s|:=|:= ${RAWLDFLAGS} |g" \
-	done < <(find . -type f -name 'Makefile' -print0)
-
-	rm -rf common/inc/GL || die
-	find . -type f -name '*.a' -delete || die
-
-	eapply_user
-}
-
-src_compile() {
-	use examples || return
-	local myopts=("verbose=1")
-	use debug && myopts+=("dbg=1")
-	export FAKEROOTKEY=1 # Workaround sandbox issue in #462602
-	emake \
-		cuda-install="${EPREFIX}/opt/cuda" \
-		CUDA_PATH="${EPREFIX}/opt/cuda/" \
-		MPI_GCC=10 \
-		"${myopts[@]}"
-}
-
-src_test() {
-	addwrite /dev/nvidiactl
-	addwrite /dev/nvidia0
-
-	local i
-	for i in {0..9}*/*; do
-		emake -C "${i}" run
-	done
-}
-
-src_install() {
-	local f t crap=( *.txt Samples.htm* )
-
-	if use doc; then
-		ebegin "Installing docs ..."
-			while IFS="" read -d $'\0' -r f; do
-				treecopy "${f}" "${ED%/}"/usr/share/doc/${PF}/
-			done < <(find -type f \( -name 'readme.txt' -o -name '*.pdf' \) -print0)
-
-			while IFS="" read -d $'\0' -r f; do
-				docompress -x "${f#${ED%/}}"
-			done < <(find "${ED%/}"/usr/share/doc/${PF}/ -type f -name 'readme.txt' -print0)
-		eend
-	fi
-
-	ebegin "Cleaning before installation..."
-		for f in "${crap[@]}"; do
-			rm -f "${f}" || die
-		done
-		find -type f \( -name '*.o' -o -name '*.pdf' -o -name 'readme.txt' \) -delete || die
-	eend
-
-	ebegin "Moving files..."
-		while IFS="" read -d $'\0' -r f; do
-			t="$(dirname ${f})"
-			if [[ ${t/obj\/} != ${t} || ${t##*.} == a ]]; then
-				continue
-			fi
-			if [[ -x ${f} ]]; then
-				exeinto /opt/cuda/sdk/"${t}"
-				doexe "${f}"
-			else
-				insinto /opt/cuda/sdk/"${t}"
-				doins "${f}"
-			fi
-		done < <(find . -type f -print0)
-	eend
-}
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index b918cba41f1d..07ad9383acab 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -1,36 +1,13 @@
 AUX cuda-config.in 406 BLAKE2B 1f1bb67d1f13da52821d640ac1875affb0ba1562df8c3eb6d2fed24c0639f8e6ff43428701c5a2d1538e444356db5e9854e6ea629a1e3b2e1399ebacef2ca388 SHA512 df6d16bd2e800868bdf8401b6f82a387b701ea297ddf6e8feb0daf5222e62a33f156e5f45cf1ee4e1aa51559dfbd56b897c257dae1bb9568e839bf806bfebd5b
-DIST cuda_10.0.130_410.48_linux.run 2020126691 BLAKE2B f784f41c06d81b6f89d07e756347fb94148f79e5fd50650fc340feb6b49dcc2bedd05cf4c7c2662da39955f9393efc048aa17fa921aad86e182186fb6d98ec50 SHA512 409ea4cc6aa0fe7063450e77c3b67b9b41aab1bbe556db673fb1a80610b20bd52e2020bf94034a92ab68c721d3d5739500bae4bd7a3558b2d8e73730a3b4ea25
-DIST cuda_10.1.105_418.39_linux.run 2423314285 BLAKE2B 924872eaaa4e8ecd6b81765c91d5e538d968e4fc88792a805339dd9cae15dd70372f310d39b9668d76cadbab875e3c4abcfca5a5cf71e4d83c9db056dc02f51c SHA512 07cdc053989758e4cdccaad566cae7127fa79780ad85033ea52d33cc4c43c9de08e88dd087390c58b542e51703f256859cdf51a018ee57e6a412f45fb9561622
-DIST cuda_10.1.168_418.67_linux.run 2526901749 BLAKE2B ed2207400730600c63895cc894e02a14dce59c6293f198ea2a94f6dd0fab25a005d4754f91376c267cb95f3fdc66ee08e4353ec17b69d28881c59190b9eb4746 SHA512 85635012ec7081e200fb46f973852939f9709e802f495c288d5f31ff1fbd283a578fdaca0afa8955e6e0c7ca6c4862428da5168e0938b48390952d8633350910
-DIST cuda_10.1.243_418.87.00_linux.run 2572375299 BLAKE2B df9cb4faeeeeecc536e72697c6c73d544219f1b23cacb7fed646b0908fc7e573e85920861d56f76776ba637d84964cd1c789a0fe0d6541a4e0adf618b6c74d3c SHA512 f92b19d0242969a65a6e6db43bc293e442abc07a9e168c9e995692e1a401679504598c782e511be3879e1650b90f71a50bbc63c9ee45654c26b5007cdf33c4fe
+AUX nvidia-cuda-toolkit-11.2.0-nsight-systems-launcher.patch 617 BLAKE2B b5e53c8eca4462c828e8e55d83ef4807416e5a1fdef79bdfbbbcf36f5b4957d3168c3bcb7adb6d485359df85c218f17af25f62cc119e76025edab46da6f0b890 SHA512 238595801bd1248c5c0caf860a8f641eaed4d2760a20c1a85c374f4475418cf915d4010b5c7c5db6c1a11abb50aa9606d291fab8de1b40fa3f834a7cd1a386f4
 DIST cuda_10.2.89_440.33.01_linux.run 2645419389 BLAKE2B 236aa70a7b45e3636c2c229fffa7d1ca0699ab4365865a73edab607a209c42c2899133dd6a83c61c5929fa754668ad15aec4d847639af1c00a8e6657c8487c77 SHA512 ad8da539ff5df7caf411d1e497ff3d6978cfa8a1fd9150fa4846089e92a604ea56be8631f3efdfe7229a655b8d2d28e6edb32f5731530a77d6f00241cc7aab6e
-DIST cuda_11.0.3_450.51.06_linux.run 3112522594 BLAKE2B f458aeebee3f7145f46c5607d1743d350ed96e9b8fd824fd94d2c998bcd8ccf3ef924cf37e95ce002ba92f464edd5004164497e820084953613ec2deb6edb144 SHA512 e7014c868c0bf40c000b1fd14d156265773a399782937cc85a2b09cd62abddcacdc20b412e1cc91c3877d01563cf054b1e021f047b32cfff4ab516e7167382dd
-DIST cuda_11.1.0_455.23.05_linux.run 3498245611 BLAKE2B 754d974acf309a0f2f969bb3312949aa5469b3ec6ebfc4a89f244420cecebc22dc19fb9f63ec7d5c177eeb533a8984cb6bfa8d271ba36d02aacce22d42442ba4 SHA512 b5d64f20dbb51f12c558be4a724c18ddcd6d18670036efb63d19bb8009300463b8051dd1a2d2d7768bf3076681954ea690af399651da832ba00867a3f4a9acdf
 DIST cuda_11.1.1_455.32.00_linux.run 3532172082 BLAKE2B f4af6bd87c419c002b4913ea7cfcbc84c78e3da485a7ac7dff0da483347cb38bde020e70c7352fe995a2efe0b8e97a156e0536f87aef69ff13fdf6e75fa634d1 SHA512 3da629e6f63548d06050a77d6ad2dbf314db33b2bf4e7d1659f039b3d9ad2ad3f87a6e506ec54db9ca2d21ac7b5ec576748082684bbab3b6642c03d2793d73a9
-DIST cuda_6.5.14_linux_32.run 76788277 BLAKE2B 75e79dce6cac5155bde8a3cafa945047c489b10272f8a3b94bf55d499df4b9c8b82506a81a20f9fd816bd4fd0514e515a6435399db1cb62b027c76490bd4dfae SHA512 89649ee0f4543b37037b7c8f5ed0b8bd502512afb4d93e3158b3df4786123be05a5288986b5abbfe15c14eb010777d2527b715225bea96a354a898c34e4a2fcc
-DIST cuda_6.5.14_linux_64.run 972320904 BLAKE2B 4a4361fb7a90989ec4b4aa433189e7b358e5a2272fb9b9c59429e0014ac14e3b8de1b247ee98dc30c3f3ee4cc009eca4fdd86027bd3b9527a683353d60bdf5c6 SHA512 fecca731b86955f5bc7b09d88b02951e3ee5d4b1f1cf5f92658227a029b87cd35d6ac22956a5fa0afe62dcdc57191f1d12bb08c9f7cc05128727cd8455947b1e
-DIST cuda_6.5.19_linux_32.run 81882112 BLAKE2B cf55ef7c969503c156431fc56301ed4e9a1234ae0cb867f12649636069f35e56bf6fc9df7482b6baade45d78c8baa2d98c41a28696da59294e0f575c4a0344ce SHA512 1ce9bd6b472b7e4f1fb181eb340dfcb757714d59a89aaa02146cfe1a97c8ccb7eb7699b4ec823276f277eb4d82d95050eaba17e7ed5fd2e47b9b5d78531c5d4e
-DIST cuda_6.5.19_linux_64.run 982446238 BLAKE2B 517ac07d4717f4f5d9427616a387dbe01fe35b7b6845b5d9e29aad18814243d38cc9a3cd0ff9042c027fcb056618e9a8535d560c16a6ac7998ff39fcf3ada654 SHA512 06854f020a5f72cf4bd714859e6966248ac2f589284113674e869fdaa1254cae27d4101940758ecda5df4724ad3e448a1f6d0c053b6cbc28107750872b6a5797
-DIST cuda_7.5.18_linux.run 1195424633 BLAKE2B 35933c3c3355231cd59e579e6ac6a30cca57ed0e3de26ce5cac368ff22595f39cb041c9696415d4d76a49e772b7828eacab24a3e581c1e9a8ef7981e1b044eee SHA512 97459dfd124060200f1c43f763e5bce0bea53e35ed4bef72bee6c8ba1c04ecffb8695af11755443513316f91fdb5cb4d35662f7b87bca7e3de85d562d4e49363
-DIST cuda_8.0.44_linux.run 1457082926 BLAKE2B a6408ddf8984dc4b0725cc4f53549c4d4fc4b3bd4de2771896953dbe023aa6d04ad38f5d6bf1ab3ff5752d2c18b400f478c9dbb263755267836c5de79e4f8f51 SHA512 1bf9d8e6b853c2a971b8d908a043adc5b11ec7033faed04a773c42680882753f98bc33b46f6b301c24c0f780f74bc237dce5766fc857f1a905e6c1f200728d86
+DIST cuda_11.2.0_460.27.04_linux.run 3046790184 BLAKE2B 5330bc2e12ff131eb993610c95b22e6358b11d6a7a952625a4e88ed856769256c02e165ac7bf6cc43236052c8427cee17bf1e7346995dc2eba84d93c5d444eb3 SHA512 0aa7390490b93be7f359327a8fe364a44b538e742c7ccd560e9bbb40ed8613539c37fcb4aa71a2fbfa0bfdb0416ab43bbdcc09cd0c81db3f1a07b37318d6b2b3
 DIST cuda_8.0.61_375.26_linux.run 1465528129 BLAKE2B d52ddf1dcf5246f230f210d10d1f6e7b540c892dea5a8cd770f0d062b30b01f5c8467d930430b383464d40a9b4a14eaaf22a365e081955e4452ec4f55e08da0b SHA512 d22303719a9feff64f95bf6a966f1caa2bf0cf8c955e475ce08ce54faa5e098d336c2db223ef0185c1f23b9c52b7d2f81a63515485219cfc016d72bda979248b
-DIST cuda_9.0.176_384.81_linux.run 1643293725 BLAKE2B 4155de544f877f6c420c2463bc68679cc89774f0516d1885d5c3f483ad86e7f25ecf6042b8240431b814230136f3026196a013bb18184fa2ec9af555bb7ea723 SHA512 00e24638c02d049c575732dee5237db21f7c451b606f37cf95e44e89d47d0cb055255e9f70dc013298c9e0d224147f239488558904556b68572e3f31935489a9
-DIST cuda_9.1.85_387.26_linux.run 1639829845 BLAKE2B c9f6544893b8e4d0b4c51d66f1cf17a593e65af6e7748e2994abda8ffcb839a7bb19cb0eebfbc52347293296025f000241d1c9842af0c41d31928770c4639b79 SHA512 492a5fa58fc93ac718ca093f24bb5e74dd2586338c42f2e11e328c7f16756e3511a1c555b12cb1990bb782d0d1600976f4c9e5b3d4857e371b0431daf06b2827
 DIST cuda_9.2.88_396.26_linux.run 1758421686 BLAKE2B 5068b2dfae87e43c124a6a72ac98b7c562aebc7161e7c977cfba68342127e99705228be531aa5bb8af0318e17c4ef8fe36257452d0f507fc3b82e3fbd0184bdc SHA512 2d0d87926e11a1b21d6d3377138753df458a53ba9539d8399f9f252e0784cb41e2c63a5c724ca81ded82b9657b97fda51d812b467b0827e7d361aa2ad73b2dba
-EBUILD nvidia-cuda-toolkit-10.0.130.ebuild 3420 BLAKE2B 5a3f19022476d35310212ca6950f0a57555caa8ea0af9e670f096eec342454b730323a856b129c20315ee9bd17f6576e4c132a7c8009ea0b999e532c35ce2949 SHA512 4d3a56c7b2319ee3fb00caccf21d7c173429f1e59a64be6c08a6eb35235e9eca4d9dc3f12e12ff6fb0d14d455fcc1c53220f7c356612a1b89c03cc9db92288d9
-EBUILD nvidia-cuda-toolkit-10.1.105-r3.ebuild 3925 BLAKE2B 6a5bef41d998a705c8abc75f4f19d5866063cf28f346c33833b698b3a55e942435c159d4c4a64314bbe78370f062c2f09db4becc28bd0059750ee1fb41eb314a SHA512 21cd3cdc06e4ca31cd3d4e279226c849849eb39f515612fcf2ea20110e333ff962960f3f6f4a8efa3344d58db8e6c241a8f74fb6d8e305ba045b4a6537856c2a
-EBUILD nvidia-cuda-toolkit-10.1.168-r2.ebuild 3925 BLAKE2B e43bab5926ca7649293281a6a964b93ee639da955519e616fe82b0d607c52874fa153f622496259d3848146ea08b4d447002714b10382ea417be26effe255746 SHA512 379e6ab18e78e5f66fdc9976556e3edc9b8937de57a7e582567e6237cfd5e412637ce0127e84504bb2b750f40062112488bd8a29faf0b8940a8f04d6e68ea1ee
-EBUILD nvidia-cuda-toolkit-10.1.243-r3.ebuild 4238 BLAKE2B 07fdf4e6eb0ac919a73b0f9d72e7859446f6c9a4f2500430537e79d8cb6f512659c2a56624bec7d7913723f9e6000ecf83746da30e745a43f7631a17648aecbb SHA512 3a5e9a96999c0f23b05f2b3c7452b0f662985e7e3a0ae94cf0619ffd12c96387d540fc2fa58ba2e69933f6fc046387668b06003a1e9d6efec127254ec3043d34
 EBUILD nvidia-cuda-toolkit-10.2.89-r2.ebuild 3992 BLAKE2B 858d1b4db64e393f061a36c3e8f22dfa83bb2e4d083ca5d987eb80b1e74ed2fb51923ecc49a4e32f52291d6ef84e1d82ab257bb345d11225e92be1368b5f4f9d SHA512 047735e7b92f12a7152b950c88d8c6b09da7772a31f4b133c8af5c8295f55d81b312b796b481dd7f6ae6767d3f2632a280533c6bcd5a22ec705dfcbd3933a94b
-EBUILD nvidia-cuda-toolkit-11.0.3.ebuild 6553 BLAKE2B dffab99d248356bc4d08f987901a0cad7941fa6b71eb684b9297a61637dfc8e964986d1dca719ae61fe2920265e5639f7afe559ac1f15cf919aeca01e37ced90 SHA512 f69720ca2b578e030a8c07b7663602aef82678274d0671d4dd1302d50ea177cd8ccd09963ff63f1e84c1f58cf5de5672e9d675c21db0b8a1500674bbd09595fb
-EBUILD nvidia-cuda-toolkit-11.1.0.ebuild 6333 BLAKE2B d436666ae256fc1256f87ca382a325df9d34cf2a0e74f1d867cc87449b0b0635eed7bb814bd079e832540f11fe4702749815f01235347e2e05a612aa6e2fe761 SHA512 2356fbfdc33d79ae3d9de86bd6e67dc2f79ed3d5b9debf26e2d090e6dcf62d72c48a804c0faa8f7627e78af1159aba9d2db837c78b91a696227756df39a13e74
 EBUILD nvidia-cuda-toolkit-11.1.1.ebuild 6333 BLAKE2B b689e1357c742fd40a01e648c5edb4fcd30a3a73a55f6f83a3b13bb4c508a097333f99b99c86f6e00c50b987541b23cee0edcd03b992ec730ecf08b771086e08 SHA512 e9c6c0f5811e137504dfe8744801511ec92aba144dbf5e0af88409ac7d069873d317b2b154fb62b30fea00239d7d0b26859b25525d785e9ff8bed3262f23a6a6
-EBUILD nvidia-cuda-toolkit-6.5.14.ebuild 3902 BLAKE2B fb559c6ca55638853cede289104f9528bc939f10c20b9c67d168caf6cc3962c06e56f25961a17acfef4c143a95648efbc7d37f2362ef4af3f40d9d289ef88dcf SHA512 c810885c9fd7747d61078fedcefe4180da8aaa4ee7fa8822908f7d8dc649fd488781ea570f9f078c6a91ac7949cef3f112e8fe8a6bca3bb0d662abbe0ba755e9
-EBUILD nvidia-cuda-toolkit-6.5.19-r1.ebuild 3928 BLAKE2B a3cc31983db891d496f5172bce661a5f1fd77a10afe0fb4ea1e243121530fc5560257c5846cc240da52986c7e6157feaace7047d0c675d0653144f5a42263a21 SHA512 9705c2ee7e76b5a66b20e08ca84c4ff998405a0816bbdd2e3d56eed21115ca154219d079943966525c71460baafdaf2858e2c7c6e08c44eff45db1be4d8c1f0f
-EBUILD nvidia-cuda-toolkit-7.5.18-r2.ebuild 3439 BLAKE2B d1f61624448cdcd69db1a592d6fa4a78004fa8021b591efaa64dcd46263a2803f4983782b87ec9a3a89834e4ed99ab26f7dd706dee2a631887b1ac96b2080d4d SHA512 0c191cb31f5349a7a09c88c1d06e52ce025421a61a2c2bfc925a058b33f855585ccf20d538943c8e7f4d77fd1bb926d16fed76efa467e0a4380ba4b7f93f2c7f
-EBUILD nvidia-cuda-toolkit-8.0.44.ebuild 3380 BLAKE2B b24971d859d08a3011f36751551b91fce3a39424bcbdd0dcdffa4eaa6a3f396f80397ea30e7233c28f2d04c6f22ad62d84ad25277e3d4840714e3b1c6fc4d77c SHA512 8779c0a248e9e6fe16e6eacd739f995c0d07f4d0d973487fe9c8faa64840df1df29ab925aaf940eb763e487f4e26869205dea93be7cf6ab31a240d33151783f5
+EBUILD nvidia-cuda-toolkit-11.2.0.ebuild 7358 BLAKE2B 536984c3b595de1527aa6575eb213eff61f50fcbc5f8309bec11e6e223f38ac3eacb93f061f00fd6478b484a43e08fec7e90c40633003cdfc4a8cf1aec94c6c5 SHA512 0d47606b21b6641c63ab4ae014a8f1486421bae484e03ac9ea23d6fed3c09b057b08362632d1089fbc2a3631571fb98c83901b83b5f1f36a1d841c6cc0d43b8e
 EBUILD nvidia-cuda-toolkit-8.0.61.ebuild 3435 BLAKE2B f404d22f374dad343031ed38a7223069e4e10c3b7f93122f415803bc3f6ec868f92bbcd3104b1e43899f77d990f429befcee77846e92c20830586b6e8c665e04 SHA512 1fa6bea7b82dd4264608ef3e73f589061617bd05c7c15e343a0f548c5f37845ea85ffdc4fe6151e7e798781beaeea015309f2cb42170a4991ca0db8f98ab6756
-EBUILD nvidia-cuda-toolkit-9.0.176.ebuild 3442 BLAKE2B da89d56a1c4e12b9048f3251464a21aa10b287c294f16e9e03d5182f4f7684efb05ab3c6f7fb0e1b7b326899405ce79f407468f00f04a5b12cfb6a4fcc4ceaca SHA512 469619f9ba3dac697353d0761b47e169833571bc20e3b7f59c124df3bc0237a9d1e8eaca74ffafa0fe615bbc0950cd829b358b10bf6939cd0236f7f37d22f6ff
-EBUILD nvidia-cuda-toolkit-9.1.85.ebuild 3418 BLAKE2B 27debd5814eb6814fbffdc2241015663643c5028d6144426bb530705f974383153c3a5a0480e8c3a837fb157811a44dfd3800c58a9e30ba919c91623b32d21a7 SHA512 4972987db01a4826a86386313caa11d27a6f3e7a5c0e87096a7a299a7a83314a10170e9d8f22c3d5dcda29c7ef000824226def568a968ebe668d437193d4f952
 EBUILD nvidia-cuda-toolkit-9.2.88.ebuild 3420 BLAKE2B c0b4f78b1a1947b8414ab2dd163365b189edf15b49465c24f104b424bc11b9b92bd36c633226f5b1a4c01b84721247e58b4501952f96f60531ed42b1eebff3f8 SHA512 c9e5bf620e9d29495d623c70a574e5f1847eef4464820229a77c6ceb25b150be5c8d0c2612193b2ba5fd1642d60d8d0a619f679825355cd7bd42cbaea03f1620
-MISC metadata.xml 725 BLAKE2B c1a42a486876a7d4c8c08f3ee49786941c4425be0dc9e0ae1c0e8de672b4512c365cab425e5a4c99cedd34dc559c63f9111f203e9afff0f9717d8cca368d8722 SHA512 de7189cd9928b3becc20a50bedb6ef9c0056815784d24f2f38662faf60d6d1550e2573c6896bedc51d4e365b669d10d460529de18d5c000140760eec8854c2c1
+MISC metadata.xml 724 BLAKE2B fd9e30ae430f56599bab7004b9cd46a79bd9b94e75b0a4574ae393d8979b5e40862bf30d110d5d47186d74e629f035f854cea720d8393709d95a9c14b1185a26 SHA512 3a77849ec1bf2e61da35ffd76c20464b5de745c73abd14ffcb7e7d3b2f52e7d114c7d4630292ea219a23e327f1b6a0a8ec488a8cbdaf763a73554f17f50c2f7f
diff --git a/dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-11.2.0-nsight-systems-launcher.patch b/dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-11.2.0-nsight-systems-launcher.patch
new file mode 100644
index 000000000000..721514729c5c
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-11.2.0-nsight-systems-launcher.patch
@@ -0,0 +1,12 @@
+--- a/builds/integration/nsight-systems/nsight-sys
++++ b/builds/integration/nsight-systems/nsight-sys
+@@ -24,7 +24,7 @@
+ 
+ DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+ CUDA_INSTALL_DIR=$(cd "$DIR/.." && pwd)
+-try_exec "$CUDA_INSTALL_DIR"/nsight-systems-2020.4.3/host-linux-x64/nsight-sys "$@"
+-try_exec /opt/nvidia/nsight-systems/2020.4.3/host-linux-x64/nsight-sys "$@"
++try_exec "$CUDA_INSTALL_DIR"/nsight-systems-2020.4.3/host-linux-x64/nsys-ui "$@"
++try_exec /opt/nvidia/nsight-systems/2020.4.3/host-linux-x64/nsys-ui "$@"
+ 
+ die "Error: Nsight Systems 2020.4.3 hasn't been installed with CUDA Toolkit 11.2"
diff --git a/dev-util/nvidia-cuda-toolkit/metadata.xml b/dev-util/nvidia-cuda-toolkit/metadata.xml
index 27507c5dec4a..e94f7577dd8c 100644
--- a/dev-util/nvidia-cuda-toolkit/metadata.xml
+++ b/dev-util/nvidia-cuda-toolkit/metadata.xml
@@ -10,7 +10,7 @@
 		<flag name="eclipse">Install Eclipse plugins</flag>
 		<flag name="nsight">Install profiling and optimizing tools (nsight-compute, nsight-systems)</flag>
 		<flag name="profiler">Install the NVIDIA CUDA profiler (nvprof) and the related libraries</flag>
-		<flag name="sanitizer">Install compute-sanitiazer tool</flag>
+		<flag name="sanitizer">Install compute-sanitizer tool</flag>
 		<flag name="vis-profiler">Install the NVIDIA CUDA visual profiler (nvvp)</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.0.130.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.0.130.ebuild
deleted file mode 100644
index 580358a10731..000000000000
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.0.130.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit check-reqs cuda eutils toolchain-funcs unpacker versionator
-
-MYD=$(get_version_component_range 1-2)
-DRIVER_PV="410.48"
-
-DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
-HOMEPAGE="https://developer.nvidia.com/cuda-zone"
-SRC_URI="https://developer.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_${DRIVER_PV}_linux -> cuda_${PV}_${DRIVER_PV}_linux.run"
-
-LICENSE="NVIDIA-CUDA"
-SLOT="0/${PV}"
-KEYWORDS="-* ~amd64 ~amd64-linux"
-IUSE="debugger doc eclipse profiler"
-RESTRICT="bindist mirror"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	<sys-devel/gcc-8[cxx]
-	>=x11-drivers/nvidia-drivers-396.24[X,uvm]
-	debugger? (
-		sys-libs/libtermcap-compat
-		sys-libs/ncurses-compat:5[tinfo]
-		)
-	eclipse? ( >=virtual/jre-1.6 )
-	profiler? ( >=virtual/jre-1.6 )"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="opt/cuda/*"
-
-CHECKREQS_DISK_BUILD="3500M"
-
-pkg_setup() {
-	# We don't like to run cuda_pkg_setup as it depends on us
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	unpacker
-	unpacker run_files/cuda-linux*.run
-}
-
-src_prepare() {
-	local cuda_supported_gcc
-
-	# ATTENTION: change requires revbump
-	cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4 6.3 6.4 7.2 7.3"
-
-	sed \
-		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
-		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
-
-	default
-}
-
-src_install() {
-	local i remove=( doc jre run_files install-linux.pl cuda-installer.pl )
-	local cudadir=/opt/cuda
-	local ecudadir="${EPREFIX}${cudadir}"
-
-	if use doc; then
-		DOCS+=( doc/pdf/. )
-		HTML_DOCS+=( doc/html/. )
-	fi
-	einstalldocs
-
-	mv doc/man/man3/{,cuda-}deprecated.3 || die
-	doman doc/man/man*/*
-
-	use debugger || remove+=( bin/cuda-gdb extras/Debugger extras/cuda-gdb-${PV}.src.tar.gz )
-
-	if use profiler; then
-		# hack found in install-linux.pl
-		for i in nvvp nsight; do
-			cat > bin/${i} <<- EOF || die
-				#!/usr/bin/env sh
-				LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
-					UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \
-					${ecudadir}/lib${i}/${i} -vm ${EPREFIX}/usr/bin/java
-			EOF
-			chmod a+x bin/${i} || die
-		done
-	else
-		use eclipse || remove+=( libnvvp libnsight )
-		remove+=( extras/CUPTI )
-	fi
-
-	for i in "${remove[@]}"; do
-		ebegin "Cleaning ${i}..."
-		rm -rf "${i}" || die
-		eend
-	done
-
-	dodir ${cudadir}
-	mv * "${ED%/}${cudadir}" || die
-
-	cat > "${T}"/99cuda <<- EOF || die
-		PATH=${ecudadir}/bin$(usex profiler ":${ecudadir}/libnvvp" "")
-		ROOTPATH=${ecudadir}/bin
-		LDPATH=${ecudadir}/lib64:${ecudadir}/lib:${ecudadir}/nvvm/lib64
-	EOF
-	doenvd "${T}"/99cuda
-
-	use profiler && \
-		make_wrapper nvprof "${ecudadir}/bin/nvprof" "." "${ecudadir}/lib64:${ecudadir}/lib"
-
-	dobin "${T}"/cuda-config
-}
-
-pkg_postinst_check() {
-	local a b
-	a="$(version_sort $(cuda-config -s))"; a=( $a )
-	# greatest supported version
-	b="${a[${#a[@]}-1]}"
-
-	# if gcc and if not gcc-version is at least greatest supported
-	if tc-is-gcc && \
-		! version_is_at_least gcc-version ${b}; then
-			ewarn ""
-			ewarn "gcc >= ${b} will not work with CUDA"
-			ewarn "Make sure you set an earlier version of gcc with gcc-config"
-			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
-			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
-			ewarn "to the nvcc compiler flags"
-			ewarn ""
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		pkg_postinst_check
-	fi
-}
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.105-r3.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.105-r3.ebuild
deleted file mode 100644
index 529ba9f63de0..000000000000
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.105-r3.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit check-reqs cuda toolchain-funcs unpacker
-
-MYD=$(ver_cut 1-2 ${PV})
-DRIVER_PV="418.39"
-
-DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
-HOMEPAGE="https://developer.nvidia.com/cuda-zone"
-SRC_URI="https://developer.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_${DRIVER_PV}_linux.run"
-
-LICENSE="NVIDIA-CUDA"
-SLOT="0/${PV}"
-KEYWORDS="-* ~amd64 ~amd64-linux"
-IUSE="debugger doc eclipse profiler"
-RESTRICT="bindist mirror"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	<sys-devel/gcc-9[cxx]
-	>=x11-drivers/nvidia-drivers-396.24[X,uvm]
-	debugger? (
-		sys-libs/libtermcap-compat
-		sys-libs/ncurses-compat:5[tinfo]
-		)
-	eclipse? ( >=virtual/jre-1.6 )
-	profiler? ( >=virtual/jre-1.6 )"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="opt/cuda/*"
-
-CHECKREQS_DISK_BUILD="6100M"
-
-pkg_setup() {
-	# We don't like to run cuda_pkg_setup as it depends on us
-	check-reqs_pkg_setup
-}
-
-src_prepare() {
-	local cuda_supported_gcc
-
-	# ATTENTION: change requires revbump
-	cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4 6.3 6.4 7.2 7.3 8.2 8.3 8.4"
-
-	sed \
-		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
-		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
-
-	default
-}
-
-src_install() {
-	local i remove=( doc jre run_files install-linux.pl cuda-installer.pl )
-	local cudadir=/opt/cuda
-	local ecudadir="${EPREFIX}${cudadir}"
-
-	cd builds/cuda-toolkit
-	if use doc; then
-		DOCS+=( doc/pdf/. )
-		HTML_DOCS+=( doc/html/. )
-	fi
-	einstalldocs
-
-	mv doc/man/man3/{,cuda-}deprecated.3 || die
-	doman doc/man/man*/*
-
-	use debugger || remove+=( bin/cuda-gdb bin/cuda-gdbserver extras/Debugger share/gdb extras/cuda-gdb-${PV}.src.tar.gz )
-
-	if use profiler; then
-		# hack found in install-linux.pl
-		for i in nvvp nsight; do
-			cat > bin/${i} <<- EOF || die
-				#!/usr/bin/env sh
-				LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
-					UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \
-					${ecudadir}/lib${i}/${i} -vm ${EPREFIX}/usr/bin/java
-			EOF
-			chmod a+x bin/${i} || die
-		done
-	else
-		use eclipse || remove+=( libnvvp libnsight nsightee_plugins NsightCompute-2019.1 NsightSystems-2018.3 bin/nsight bin/nsight_ee_plugins_manage.sh bin/nvvp bin/computeprof )
-		remove+=( extras/CUPTI bin/nvprof )
-	fi
-
-	for i in "${remove[@]}"; do
-		ebegin "Cleaning ${i}..."
-		rm -rf "${i}" || die
-		eend
-	done
-
-	dodir ${cudadir}
-	into ${cudadir}
-
-	# Install binaries separately to make sure the X permission is set
-	local bindirs=( bin nvvm/bin extras/demo_suite $(usex profiler "libnsight/nsight") )
-	for i in $(find "${bindirs[@]}" -maxdepth 1 -type f); do
-		exeinto ${cudadir}/${i%/*}
-		doexe ${i}
-		rm ${i} || die
-	done
-	exeinto ${cudadir}/bin
-	doexe "${T}"/cuda-config
-
-	# Install the rest
-	insinto ${cudadir}
-	doins -r *
-
-	cat > "${T}"/99cuda <<- EOF || die
-		PATH=${ecudadir}/bin$(usex profiler ":${ecudadir}/libnvvp" "")
-		ROOTPATH=${ecudadir}/bin
-		LDPATH=${ecudadir}/lib64:${ecudadir}/lib:${ecudadir}/nvvm/lib64
-	EOF
-	doenvd "${T}"/99cuda
-
-	#Cuda prepackages libraries, don't revdep-build on them
-	echo "SEARCH_DIRS_MASK=\"${ecudadir}\"" > "${T}/80${PN}" || die
-	insinto "/etc/revdep-rebuild"
-	doins "${T}/80${PN}"
-}
-
-pkg_postinst_check() {
-	local a b
-	a="$(${EROOT}/opt/cuda/bin/cuda-config -s)"
-	b="0.0"
-	for v in $a; do
-		if ver_test "${v}" -gt "${b}"; then
-			b="${v}"
-		fi
-	done
-
-	# if gcc and if not gcc-version is at least greatest supported
-	if tc-is-gcc && \
-		ver_test $(gcc-version) -gt ${b}; then
-			ewarn ""
-			ewarn "gcc >= ${b} will not work with CUDA"
-			ewarn "Make sure you set an earlier version of gcc with gcc-config"
-			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
-			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
-			ewarn "to the nvcc compiler flags"
-			ewarn ""
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		pkg_postinst_check
-	fi
-}
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.168-r2.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.168-r2.ebuild
deleted file mode 100644
index d9a0f446a8af..000000000000
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.168-r2.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit check-reqs cuda toolchain-funcs unpacker
-
-MYD=$(ver_cut 1-2 ${PV})
-DRIVER_PV="418.67"
-
-DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
-HOMEPAGE="https://developer.nvidia.com/cuda-zone"
-SRC_URI="https://developer.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_${DRIVER_PV}_linux.run"
-
-LICENSE="NVIDIA-CUDA"
-SLOT="0/${PV}"
-KEYWORDS="-* ~amd64 ~amd64-linux"
-IUSE="debugger doc eclipse profiler"
-RESTRICT="bindist mirror"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	<sys-devel/gcc-9[cxx]
-	>=x11-drivers/nvidia-drivers-396.24[X,uvm]
-	debugger? (
-		sys-libs/libtermcap-compat
-		sys-libs/ncurses-compat:5[tinfo]
-		)
-	eclipse? ( >=virtual/jre-1.6 )
-	profiler? ( >=virtual/jre-1.6 )"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="opt/cuda/*"
-
-CHECKREQS_DISK_BUILD="6100M"
-
-pkg_setup() {
-	# We don't like to run cuda_pkg_setup as it depends on us
-	check-reqs_pkg_setup
-}
-
-src_prepare() {
-	local cuda_supported_gcc
-
-	# ATTENTION: change requires revbump
-	cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4 6.3 6.4 7.2 7.3 8.2 8.3 8.4"
-
-	sed \
-		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
-		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
-
-	default
-}
-
-src_install() {
-	local i remove=( doc jre run_files install-linux.pl cuda-installer.pl )
-	local cudadir=/opt/cuda
-	local ecudadir="${EPREFIX}${cudadir}"
-
-	cd builds/cuda-toolkit
-	if use doc; then
-		DOCS+=( doc/pdf/. )
-		HTML_DOCS+=( doc/html/. )
-	fi
-	einstalldocs
-
-	mv doc/man/man3/{,cuda-}deprecated.3 || die
-	doman doc/man/man*/*
-
-	use debugger || remove+=( bin/cuda-gdb bin/cuda-gdbserver extras/Debugger share/gdb extras/cuda-gdb-${PV}.src.tar.gz )
-
-	if use profiler; then
-		# hack found in install-linux.pl
-		for i in nvvp nsight; do
-			cat > bin/${i} <<- EOF || die
-				#!/usr/bin/env sh
-				LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
-					UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \
-					${ecudadir}/lib${i}/${i} -vm ${EPREFIX}/usr/bin/java
-			EOF
-			chmod a+x bin/${i} || die
-		done
-	else
-		use eclipse || remove+=( libnvvp libnsight nsightee_plugins NsightCompute-2019.1 NsightSystems-2018.3 bin/nsight bin/nsight_ee_plugins_manage.sh bin/nvvp bin/computeprof )
-		remove+=( extras/CUPTI bin/nvprof )
-	fi
-
-	for i in "${remove[@]}"; do
-		ebegin "Cleaning ${i}..."
-		rm -rf "${i}" || die
-		eend
-	done
-
-	dodir ${cudadir}
-	into ${cudadir}
-
-	# Install binaries separately to make sure the X permission is set
-	local bindirs=( bin nvvm/bin extras/demo_suite $(usex profiler "libnsight/nsight") )
-	for i in $(find "${bindirs[@]}" -maxdepth 1 -type f); do
-		exeinto ${cudadir}/${i%/*}
-		doexe ${i}
-		rm ${i} || die
-	done
-	exeinto ${cudadir}/bin
-	doexe "${T}"/cuda-config
-
-	# Install the rest
-	insinto ${cudadir}
-	doins -r *
-
-	cat > "${T}"/99cuda <<- EOF || die
-		PATH=${ecudadir}/bin$(usex profiler ":${ecudadir}/libnvvp" "")
-		ROOTPATH=${ecudadir}/bin
-		LDPATH=${ecudadir}/lib64:${ecudadir}/lib:${ecudadir}/nvvm/lib64
-	EOF
-	doenvd "${T}"/99cuda
-
-	#Cuda prepackages libraries, don't revdep-build on them
-	echo "SEARCH_DIRS_MASK=\"${ecudadir}\"" > "${T}/80${PN}" || die
-	insinto "/etc/revdep-rebuild"
-	doins "${T}/80${PN}"
-}
-
-pkg_postinst_check() {
-	local a b
-	a="$(${EROOT}/opt/cuda/bin/cuda-config -s)"
-	b="0.0"
-	for v in $a; do
-		if ver_test "${v}" -gt "${b}"; then
-			b="${v}"
-		fi
-	done
-
-	# if gcc and if not gcc-version is at least greatest supported
-	if tc-is-gcc && \
-		ver_test $(gcc-version) -gt ${b}; then
-			ewarn ""
-			ewarn "gcc >= ${b} will not work with CUDA"
-			ewarn "Make sure you set an earlier version of gcc with gcc-config"
-			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
-			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
-			ewarn "to the nvcc compiler flags"
-			ewarn ""
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		pkg_postinst_check
-	fi
-}
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.243-r3.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.243-r3.ebuild
deleted file mode 100644
index 89bdb3d3e566..000000000000
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.243-r3.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit check-reqs cuda toolchain-funcs unpacker
-
-MYD=$(ver_cut 1-2 ${PV})
-DRIVER_PV="418.87.00"
-
-DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
-HOMEPAGE="https://developer.nvidia.com/cuda-zone"
-SRC_URI="https://developer.download.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_${DRIVER_PV}_linux.run"
-
-LICENSE="NVIDIA-CUDA"
-SLOT="0/${PV}"
-KEYWORDS="-* ~amd64 ~amd64-linux"
-IUSE="debugger doc eclipse profiler"
-RESTRICT="bindist mirror"
-
-BDEPEND=""
-RDEPEND="
-	<sys-devel/gcc-9[cxx]
-	!prefix? ( >=x11-drivers/nvidia-drivers-${DRIVER_PV}[X,uvm] )
-	debugger? (
-		dev-libs/openssl-compat:1.0.0
-		sys-libs/libtermcap-compat
-		sys-libs/ncurses-compat:5[tinfo]
-	)
-	eclipse? (
-		dev-libs/openssl-compat:1.0.0
-		>=virtual/jre-1.6
-	)
-	profiler? (
-		dev-libs/openssl-compat:1.0.0
-		>=virtual/jre-1.6
-	)"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="opt/cuda/*"
-
-CHECKREQS_DISK_BUILD="6800M"
-
-pkg_setup() {
-	# We don't like to run cuda_pkg_setup as it depends on us
-	check-reqs_pkg_setup
-}
-
-src_prepare() {
-	local cuda_supported_gcc
-
-	# ATTENTION: change requires revbump
-	cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4 6.3 6.4 7.2 7.3 8.2 8.3 8.4"
-
-	sed \
-		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
-		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
-
-	default
-}
-
-src_install() {
-	local i remove=( doc )
-	local cudadir=/opt/cuda
-	local ecudadir="${EPREFIX}${cudadir}"
-
-	cd builds/cuda-toolkit
-	if use doc; then
-		DOCS+=( doc/pdf/. )
-		HTML_DOCS+=( doc/html/. )
-	fi
-	einstalldocs
-
-	mv doc/man/man3/{,cuda-}deprecated.3 || die
-	doman doc/man/man*/*
-
-	use debugger || remove+=( bin/cuda-gdb bin/cuda-gdbserver extras/Debugger share/gdb extras/cuda-gdb-${PV}.src.tar.gz )
-
-	if use profiler; then
-		# hack found in install-linux.pl
-		for i in nvvp nsight; do
-			cat > bin/${i} <<- EOF || die
-				#!/usr/bin/env sh
-				LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
-					UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \
-					${ecudadir}/lib${i}/${i} -vm ${EPREFIX}/usr/bin/java
-			EOF
-			chmod a+x bin/${i} || die
-		done
-	else
-		use eclipse || remove+=( libnvvp libnsight nsightee_plugins nsight-compute-2019.4.0 nsight-systems-2019.3.7.5 bin/nsight bin/nsight_ee_plugins_manage.sh bin/nvvp bin/computeprof )
-		remove+=( extras/CUPTI bin/nvprof )
-	fi
-
-	for i in "${remove[@]}"; do
-		ebegin "Cleaning ${i}..."
-		rm -r "${i}" || die
-		eend
-	done
-
-	dodir ${cudadir}
-	into ${cudadir}
-
-	# Install binaries separately to make sure the X permission is set
-	local bindirs=( bin nvvm/bin extras/demo_suite $(usex profiler "libnsight/nsight") )
-	for i in $(find "${bindirs[@]}" -maxdepth 1 -type f); do
-		exeinto ${cudadir}/${i%/*}
-		doexe ${i}
-		rm ${i} || die
-	done
-	exeinto ${cudadir}/bin
-	doexe "${T}"/cuda-config
-
-	# Install the rest
-	insinto ${cudadir}
-	doins -r *
-
-	cat > "${T}"/99cuda <<- EOF || die
-		PATH=${ecudadir}/bin$(usex profiler ":${ecudadir}/libnvvp" "")
-		ROOTPATH=${ecudadir}/bin
-		LDPATH=${ecudadir}/lib64:${ecudadir}/lib:${ecudadir}/nvvm/lib64
-	EOF
-	doenvd "${T}"/99cuda
-
-	#Cuda prepackages libraries, don't revdep-build on them
-	echo "SEARCH_DIRS_MASK=\"${ecudadir}\"" > "${T}/80${PN}" || die
-	insinto "/etc/revdep-rebuild"
-	doins "${T}/80${PN}"
-}
-
-pkg_postinst_check() {
-	local a b
-	a="$(${EROOT}/opt/cuda/bin/cuda-config -s)"
-	b="0.0"
-	for v in $a; do
-		if ver_test "${v}" -gt "${b}"; then
-			b="${v}"
-		fi
-	done
-
-	# if gcc and if not gcc-version is at least greatest supported
-	if tc-is-gcc && \
-		ver_test $(gcc-version) -gt ${b}; then
-			ewarn ""
-			ewarn "gcc > ${b} will not work with CUDA"
-			ewarn "Make sure you set an earlier version of gcc with gcc-config"
-			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
-			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
-			ewarn "to the nvcc compiler flags"
-			ewarn ""
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		pkg_postinst_check
-	fi
-
-	if use prefix; then
-		ewarn "Gentoo Prefix does not manage kernel modules.  You need to make certain"
-		ewarn "the function counterpart to >=x11-drivers/nvidia-drivers-${DRIVER_PV}[X,uvm]"
-		ewarn "is available from the host"
-	fi
-}
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.0.3.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.0.3.ebuild
deleted file mode 100644
index f01bcb2da8a6..000000000000
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.0.3.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit check-reqs cuda toolchain-funcs unpacker
-
-DRIVER_PV="450.51.06"
-
-DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
-HOMEPAGE="https://developer.nvidia.com/cuda-zone"
-SRC_URI="https://developer.download.nvidia.com/compute/cuda/${PV}/local_installers/cuda_${PV}_${DRIVER_PV}_linux.run"
-
-LICENSE="NVIDIA-CUDA"
-SLOT="0/${PV}"
-KEYWORDS="-* ~amd64 ~amd64-linux"
-IUSE="debugger doc nsight profiler vis-profiler sanitizer"
-RESTRICT="bindist mirror"
-
-BDEPEND=""
-RDEPEND="
-	<sys-devel/gcc-10[cxx]
-	>=x11-drivers/nvidia-drivers-${DRIVER_PV}[X,uvm]
-	debugger? (
-		dev-libs/openssl-compat:1.0.0
-		sys-libs/libtermcap-compat
-		sys-libs/ncurses-compat:5[tinfo]
-	)
-	vis-profiler? (
-		dev-libs/openssl-compat:1.0.0
-		>=virtual/jre-1.6
-	)"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="opt/cuda/*"
-
-CHECKREQS_DISK_BUILD="6800M"
-
-pkg_setup() {
-	# We don't like to run cuda_pkg_setup as it depends on us
-	check-reqs_pkg_setup
-}
-
-src_prepare() {
-	local cuda_supported_gcc
-
-	# ATTENTION: change requires revbump
-	cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4 6.3 6.4 7.2 7.3 8.2 8.3 8.4 9.2 9.3"
-
-	sed \
-		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
-		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
-
-	default
-}
-
-src_install() {
-	# Install docs and man pages
-	pushd builds/cuda_documentation >/dev/null || die
-
-	if use doc; then
-		DOCS+=( doc/pdf/. )
-		HTML_DOCS+=( doc/html/. )
-	fi
-	einstalldocs
-
-	mv doc/man/man3/{,cuda-}deprecated.3 || die
-	doman doc/man/man*/*
-
-	popd >/dev/null || die
-
-	local cudadir=/opt/cuda
-	local ecudadir="${EPREFIX}${cudadir}"
-	dodir ${cudadir}
-	into ${cudadir}
-
-	# Install standard sub packages
-	local builddirs=(
-		builds/cuda_{cudart,cuobjdump,memcheck,nvcc,nvdisasm,nvml_dev,nvprune,nvrtc,nvtx}
-		builds/lib{cublas,cufft,curand,cusolver,cusparse,npp,nvjpeg}
-		$(usex profiler "builds/cuda_nvprof builds/cuda_cupti" "")
-		$(usex vis-profiler "builds/cuda_nvvp" "")
-		$(usex debugger "builds/cuda_gdb" "")
-	)
-
-	local d
-	for d in "${builddirs[@]}"; do
-		ebegin "Installing ${d}"
-		[[ -d ${d} ]] || die "Directory does not exist: ${d}"
-
-		if [[ -d ${d}/bin ]]; then
-			local f
-			for f in ${d}/bin/*; do
-				if [[ -f ${f} ]]; then
-					dobin "${f}"
-				else
-					insinto ${cudadir}/bin
-					doins -r "${f}"
-				fi
-			done
-		fi
-
-		insinto ${cudadir}
-		if [[ -d ${d}/targets ]]; then
-			doins -r "${d}"/targets
-		fi
-		if [[ -d ${d}/share ]]; then
-			doins -r "${d}"/share
-		fi
-		if [[ -d ${d}/extras ]]; then
-			doins -r "${d}"/extras
-		fi
-		eend
-	done
-	dobin "${T}"/cuda-config
-
-	doins builds/EULA.txt
-	# nvml and nvvm need special handling
-	ebegin "Installing nvvm"
-	doins -r builds/cuda_nvcc/nvvm
-	exeinto ${cudadir}/nvvm/bin
-	doexe builds/cuda_nvcc/nvvm/bin/cicc
-	eend
-
-	ebegin "Installing nvml"
-	doins -r builds/cuda_nvml_dev/nvml
-	eend
-
-	if use sanitizer; then
-		ebegin "Installing sanitizer"
-		dobin builds/integration/Sanitizer/compute-sanitizer
-		doins -r builds/cuda_sanitizer_api/Sanitizer
-		# special handling for the executable
-		exeinto ${cudadir}/Sanitizer
-		doexe builds/cuda_sanitizer_api/Sanitizer/compute-sanitizer
-		eend
-	fi
-
-	if use vis-profiler; then
-		ebegin "Installing libnvvp"
-		doins -r builds/cuda_nvvp/libnvvp
-		# special handling for the executable
-		exeinto ${cudadir}/libnvvp
-		doexe builds/cuda_nvvp/libnvvp/nvvp
-		eend
-	fi
-
-	if use nsight; then
-		local ncu_dir=$(grep -o 'nsight-compute-[0-9][0-9\.]*' -m1 manifests/cuda_x86_64.xml)
-		ebegin "Installing ${ncu_dir}"
-		mv builds/nsight_compute builds/${ncu_dir} || die
-		doins -r builds/${ncu_dir}
-
-		exeinto ${cudadir}/${ncu_dir}
-		doexe builds/${ncu_dir}/{ncu,ncu-ui,nv-nsight-cu,nv-nsight-cu-cli}
-
-		exeinto ${cudadir}/${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64
-		doexe builds/${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/{ncu-ui,ncu-ui.bin,CrashReporter}
-		dobin builds/integration/nsight-compute/{ncu,ncu-ui,nv-nsight-cu,nv-nsight-cu-cli}
-		eend
-
-		local nsys_dir=$(grep -o 'nsight-systems-[0-9][0-9\.]*' -m1 manifests/cuda_x86_64.xml)
-		ebegin "Installing ${nsys_dir}"
-		mv builds/nsight_systems builds/${nsys_dir} || die
-		doins -r builds/${nsys_dir}
-		exeinto ${cudadir}/${nsys_dir}/target-linux-x64
-		doexe builds/${nsys_dir}/target-linux-x64/nsys
-
-		exeinto ${cudadir}/${nsys_dir}/host-linux-x64
-		doexe builds/${nsys_dir}/host-linux-x64/{nsight-sys,nsight-sys.bin,nsys-ui,CrashReporter,ImportNvtxt,QdstrmImporter,ResolveSymbols}
-		dobin builds/integration/nsight-systems/{nsight-sys,nsys,nsys-exporter,nsys-ui}
-		eend
-		# TODO: unbundle qt5
-		# TODO: unbundle boost
-		# TODO: unbundle icu
-		# TODO: unbundle openssl
-		# TODO: unbundle mesa
-		# TODO: unbundle libz
-		# TODO: unbundle libstdc++
-		# TODO: unbundle libSshClient
-		# TODO: unbundle sqlite
-		# TODO: unbundle libpfm ?
-	fi
-
-	# Add include and lib symlinks
-	dosym "targets/x86_64-linux/include" ${cudadir}/include
-	dosym "targets/x86_64-linux/lib" ${cudadir}/lib64
-
-	newenvd - 99cuda <<-EOF
-		PATH=${ecudadir}/bin$(usex vis-profiler ":${ecudadir}/libnvvp" "")
-		ROOTPATH=${ecudadir}/bin
-		LDPATH=${ecudadir}/lib64:${ecudadir}/lib:${ecudadir}/nvvm/lib64
-	EOF
-
-	# Cuda prepackages libraries, don't revdep-build on them
-	insinto /etc/revdep-rebuild
-	newins - 80${PN} <<-EOF
-		SEARCH_DIRS_MASK="${ecudadir}"
-	EOF
-	# TODO: Find a better way to add +x permission to installed executables
-	# TODO: Add pkgconfig files for installed libraries
-}
-
-pkg_postinst_check() {
-	local a="$(${EROOT}/opt/cuda/bin/cuda-config -s)"
-	local b="0.0"
-	local v
-	for v in ${a}; do
-		ver_test "${v}" -gt "${b}" && b="${v}"
-	done
-
-	# if gcc and if not gcc-version is at least greatest supported
-	if tc-is-gcc && \
-		ver_test $(gcc-version) -gt "${b}"; then
-			ewarn
-			ewarn "gcc > ${b} will not work with CUDA"
-			ewarn "Make sure you set an earlier version of gcc with gcc-config"
-			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
-			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
-			ewarn "to the nvcc compiler flags"
-			ewarn
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		pkg_postinst_check
-	fi
-
-	if use profiler || use nsight; then
-		einfo
-		einfo "nvidia-drivers restrict access to performance counters."
-		einfo "You'll need to either run profiling tools (nvprof, nsight) "
-		einfo "using sudo (needs cap SYS_ADMIN) or add the following line to "
-		einfo "a modprobe configuration file "
-		einfo "(e.g. /etc/modprobe.d/nvidia-prof.conf): "
-		einfo
-		einfo "options nvidia NVreg_RestrictProfilingToAdminUsers=0"
-		einfo
-	fi
-}
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.1.0.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.2.0.ebuild
index 8f77d9e9c6eb..19d1374a0558 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.1.0.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.2.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit check-reqs cuda toolchain-funcs unpacker
 
-DRIVER_PV="455.23.05"
+DRIVER_PV="460.27.04"
 
 DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
 HOMEPAGE="https://developer.nvidia.com/cuda-zone"
@@ -34,9 +34,10 @@ RDEPEND="
 S="${WORKDIR}"
 
 QA_PREBUILT="opt/cuda/*"
-
 CHECKREQS_DISK_BUILD="6800M"
 
+PATCHES=( "${FILESDIR}"/${P}-nsight-systems-launcher.patch )
+
 pkg_setup() {
 	# We don't like to run cuda_pkg_setup as it depends on us
 	check-reqs_pkg_setup
@@ -58,6 +59,7 @@ src_prepare() {
 src_install() {
 	local cudadir=/opt/cuda
 	local ecudadir="${EPREFIX}${cudadir}"
+	local pathextradirs ldpathextradirs
 	dodir ${cudadir}
 	into ${cudadir}
 
@@ -70,13 +72,12 @@ src_install() {
 		$(usex debugger "builds/cuda_gdb" "")
 	)
 
-	local d
+	local d f
 	for d in "${builddirs[@]}"; do
 		ebegin "Installing ${d}"
 		[[ -d ${d} ]] || die "Directory does not exist: ${d}"
 
 		if [[ -d ${d}/bin ]]; then
-			local f
 			for f in ${d}/bin/*; do
 				if [[ -f ${f} ]]; then
 					dobin "${f}"
@@ -105,8 +106,7 @@ src_install() {
 	# nvml and nvvm need special handling
 	ebegin "Installing nvvm"
 	doins -r builds/cuda_nvcc/nvvm
-	exeinto ${cudadir}/nvvm/bin
-	doexe builds/cuda_nvcc/nvvm/bin/cicc
+	fperms +x ${cudadir}/nvvm/bin/cicc
 	eend
 
 	ebegin "Installing nvml"
@@ -116,20 +116,21 @@ src_install() {
 	if use sanitizer; then
 		ebegin "Installing sanitizer"
 		dobin builds/integration/Sanitizer/compute-sanitizer
-		doins -r builds/cuda_sanitizer_api/Sanitizer
+		doins -r builds/cuda_sanitizer_api/compute-sanitizer
 		# special handling for the executable
-		exeinto ${cudadir}/Sanitizer
-		doexe builds/cuda_sanitizer_api/Sanitizer/compute-sanitizer
+		fperms +x ${cudadir}/compute-sanitizer/compute-sanitizer
 		eend
 	fi
 
+	use profiler && ldpathextradirs+=":${ecudadir}/extras/CUPTI/lib64"
+
 	if use vis-profiler; then
 		ebegin "Installing libnvvp"
 		doins -r builds/cuda_nvvp/libnvvp
 		# special handling for the executable
-		exeinto ${cudadir}/libnvvp
-		doexe builds/cuda_nvvp/libnvvp/nvvp
+		fperms +x ${cudadir}/libnvvp/nvvp
 		eend
+		pathextradirs+=":${ecudadir}/libnvvp"
 	fi
 
 	if use nsight; then
@@ -138,11 +139,16 @@ src_install() {
 		mv builds/nsight_compute builds/${ncu_dir} || die
 		doins -r builds/${ncu_dir}
 
-		exeinto ${cudadir}/${ncu_dir}
-		doexe builds/${ncu_dir}/{ncu,ncu-ui,nv-nsight-cu,nv-nsight-cu-cli}
+		# check this list on every bump
+		local exes=(
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/libexec/QtWebEngineProcess
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/CrashReporter
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/ncu-ui.bin
+			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/TreeLauncherTargetLdPreloadHelper
+			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/TreeLauncherSubreaper
+			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/ncu
+		)
 
-		exeinto ${cudadir}/${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64
-		doexe builds/${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/{ncu-ui,ncu-ui.bin,CrashReporter}
 		dobin builds/integration/nsight-compute/{ncu,ncu-ui,nv-nsight-cu,nv-nsight-cu-cli}
 		eend
 
@@ -150,13 +156,38 @@ src_install() {
 		ebegin "Installing ${nsys_dir}"
 		mv builds/nsight_systems builds/${nsys_dir} || die
 		doins -r builds/${nsys_dir}
-		exeinto ${cudadir}/${nsys_dir}/target-linux-x64
-		doexe builds/${nsys_dir}/target-linux-x64/nsys
 
-		exeinto ${cudadir}/${nsys_dir}/host-linux-x64
-		doexe builds/${nsys_dir}/host-linux-x64/{nsight-sys,nsight-sys.bin,nsys-ui,CrashReporter,ImportNvtxt,QdstrmImporter,ResolveSymbols}
+		# check this list on every bump
+		exes+=(
+			${nsys_dir}/host-linux-x64/nsys-ui
+			${nsys_dir}/host-linux-x64/nsys-ui.bin
+			${nsys_dir}/host-linux-x64/ResolveSymbols
+			${nsys_dir}/host-linux-x64/ImportNvtxt
+			${nsys_dir}/host-linux-x64/CrashReporter
+			${nsys_dir}/host-linux-x64/QdstrmImporter
+			${nsys_dir}/host-linux-x64/libexec/QtWebEngineProcess
+			${nsys_dir}/target-linux-x64/nsys
+			${nsys_dir}/target-linux-x64/launcher
+			${nsys_dir}/target-linux-x64/nvgpucs
+			${nsys_dir}/target-linux-x64/nsys-launcher
+			${nsys_dir}/target-linux-x64/sqlite3
+			${nsys_dir}/target-linux-x64/python/bin/python
+		)
+
 		dobin builds/integration/nsight-systems/{nsight-sys,nsys,nsys-exporter,nsys-ui}
 		eend
+
+		# nsight scripts and binaries need to have their executable bit set, #691284
+		for f in "${exes[@]}"; do
+			fperms +x ${cudadir}/${f}
+		done
+
+		# remove foreign archs (triggers SONAME warning, #749903)
+		rm -r "${ED}"/${cudadir}/${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64 || die
+		rm -r "${ED}"/${cudadir}/${ncu_dir}/target/linux-desktop-glibc_2_19_0-ppc64le || die
+		rm -r "${ED}"/${cudadir}/${ncu_dir}/target/linux-desktop-t210-a64 || die
+		rm -r "${ED}"/${cudadir}/${nsys_dir}/target-linux-armv8 || die
+
 		# TODO: unbundle qt5
 		# TODO: unbundle boost
 		# TODO: unbundle icu
@@ -170,13 +201,13 @@ src_install() {
 	fi
 
 	# Add include and lib symlinks
-	dosym "targets/x86_64-linux/include" ${cudadir}/include
-	dosym "targets/x86_64-linux/lib" ${cudadir}/lib64
+	dosym targets/x86_64-linux/include ${cudadir}/include
+	dosym targets/x86_64-linux/lib ${cudadir}/lib64
 
 	newenvd - 99cuda <<-EOF
-		PATH=${ecudadir}/bin$(usex vis-profiler ":${ecudadir}/libnvvp" "")
+		PATH=${ecudadir}/bin${pathextradirs}
 		ROOTPATH=${ecudadir}/bin
-		LDPATH=${ecudadir}/lib64:${ecudadir}/nvvm/lib64$(usex profiler ":${ecudadir}/extras/CUPTI/lib64" "")
+		LDPATH=${ecudadir}/lib64:${ecudadir}/nvvm/lib64${ldpathextradirs}
 	EOF
 
 	# Cuda prepackages libraries, don't revdep-build on them
@@ -184,7 +215,6 @@ src_install() {
 	newins - 80${PN} <<-EOF
 		SEARCH_DIRS_MASK="${ecudadir}"
 	EOF
-	# TODO: Find a better way to add +x permission to installed executables
 	# TODO: Add pkgconfig files for installed libraries
 }
 
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.14.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.14.ebuild
deleted file mode 100644
index b69c486109c1..000000000000
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.14.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit check-reqs cuda eutils toolchain-funcs unpacker versionator
-
-MYD=$(get_version_component_range 1)_$(get_version_component_range 2)
-
-DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
-HOMEPAGE="http://developer.nvidia.com/cuda"
-CURI="http://developer.download.nvidia.com/compute/cuda/${MYD}/rel/installers"
-SRC_URI="
-	amd64? ( ${CURI}/cuda_${PV}_linux_64.run )
-	x86? ( ${CURI}/cuda_${PV}_linux_32.run )"
-
-SLOT="0/${PV}"
-LICENSE="NVIDIA-CUDA"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debugger doc eclipse profiler"
-RESTRICT="bindist mirror"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	<sys-devel/gcc-4.9[cxx]
-	debugger? (
-		sys-libs/libtermcap-compat
-		sys-libs/ncurses[tinfo]
-		)
-	eclipse? ( >=virtual/jre-1.6 )
-	profiler? ( >=virtual/jre-1.6 )
-	amd64? ( >=x11-drivers/nvidia-drivers-340.32[uvm] )
-	x86? ( <x11-drivers/nvidia-drivers-346.35[uvm] )
-	"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="opt/cuda/*"
-
-CHECKREQS_DISK_BUILD="1500M"
-
-pkg_setup() {
-	# We don't like to run cuda_pkg_setup as it depends on us
-	check-reqs_pkg_setup
-
-	if use x86; then
-		ewarn "Starting with version 6.5 NVIDIA dropped more and more"
-		ewarn "the support for 32bit linux."
-		ewarn "Be aware that bugfixes and new features may not be available."
-		ewarn "https://dev.gentoo.org/~jlec/distfiles/CUDA_Toolkit_Release_Notes.pdf"
-	fi
-}
-
-src_unpack() {
-	unpacker
-	unpacker run_files/cuda-linux*.run
-}
-
-src_prepare() {
-	local cuda_supported_gcc
-
-	# ATTENTION: change requires revbump
-	cuda_supported_gcc="4.7 4.8"
-
-	sed \
-		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
-		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
-}
-
-src_install() {
-	local i j
-	local remove="doc jre run_files install-linux.pl "
-	local cudadir=/opt/cuda
-	local ecudadir="${EPREFIX}"${cudadir}
-
-	# dodoc doc/*txt
-	if use doc; then
-		dodoc doc/pdf/*
-		dohtml -r doc/html/*
-	fi
-
-	if use amd64; then
-		mv doc/man/man3/{,cuda-}deprecated.3 || die
-		doman doc/man/man*/*
-	fi
-
-	use debugger || remove+=" bin/cuda-gdb extras/Debugger"
-	( use profiler || use eclipse ) || remove+=" libnsight"
-	use amd64 || remove+=" cuda-installer.pl"
-
-	if use profiler; then
-		# hack found in install-linux.pl
-		for j in nvvp nsight; do
-			cat > bin/${j} <<- EOF
-				#!${EPREFIX}/bin/sh
-				LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
-					UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \
-					${ecudadir}/lib${j}/${j} -vm ${EPREFIX}/usr/bin/java
-			EOF
-			chmod a+x bin/${j}
-		done
-	else
-		use eclipse || remove+=" libnvvp"
-		remove+=" extras/CUPTI"
-	fi
-
-	for i in ${remove}; do
-	ebegin "Cleaning ${i}..."
-		if [[ -e ${i} ]]; then
-			find ${i} -delete || die
-			eend
-		else
-			eend $1
-		fi
-	done
-
-	dodir ${cudadir}
-	mv * "${ED}"${cudadir} || die
-
-	cat > "${T}"/99cuda <<- EOF
-		PATH=${ecudadir}/bin$(use profiler && echo ":${ecudadir}/libnvvp")
-		ROOTPATH=${ecudadir}/bin
-		LDPATH=${ecudadir}/lib$(use amd64 && echo "64:${ecudadir}/lib")
-	EOF
-	doenvd "${T}"/99cuda
-
-	use profiler && \
-		make_wrapper nvprof "${EPREFIX}"${cudadir}/bin/nvprof "." ${ecudadir}/lib$(use amd64 && echo "64:${ecudadir}/lib")
-
-	dobin "${T}"/cuda-config
-}
-
-pkg_postinst_check() {
-	local a b
-	a="$(version_sort $(cuda-config -s))"; a=( $a )
-	# greatest supported version
-	b=${a[${#a[@]}-1]}
-
-	# if gcc and if not gcc-version is at least greatesst supported
-	if [[ $(tc-getCC) == *gcc* ]] && \
-		! version_is_at_least $(gcc-version) ${b}; then
-			echo
-			ewarn "gcc >= ${b} will not work with CUDA"
-			ewarn "Make sure you set an earlier version of gcc with gcc-config"
-			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
-			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
-			ewarn "to the nvcc compiler flags"
-			echo
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		pkg_postinst_check
-	fi
-}
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.19-r1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.19-r1.ebuild
deleted file mode 100644
index 3ff03afa853d..000000000000
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.19-r1.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit check-reqs cuda eutils toolchain-funcs unpacker versionator
-
-MYD=$(get_version_component_range 1)_$(get_version_component_range 2)
-
-DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
-HOMEPAGE="http://developer.nvidia.com/cuda"
-CURI="http://developer.download.nvidia.com/compute/cuda/${MYD}/rel/installers"
-SRC_URI="
-	amd64? ( ${CURI}/cuda_${PV}_linux_64.run )
-	x86? ( ${CURI}/cuda_${PV}_linux_32.run )"
-
-SLOT="0/${PV}"
-LICENSE="NVIDIA-CUDA"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debugger doc eclipse profiler"
-RESTRICT="bindist mirror"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	<sys-devel/gcc-4.9[cxx]
-	debugger? (
-		sys-libs/libtermcap-compat
-		sys-libs/ncurses[tinfo]
-		)
-	eclipse? ( >=virtual/jre-1.6 )
-	profiler? ( >=virtual/jre-1.6 )
-	amd64? ( >=x11-drivers/nvidia-drivers-343.22[uvm] )
-	x86? ( <x11-drivers/nvidia-drivers-346.35[uvm] )
-	"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="opt/cuda/*"
-
-CHECKREQS_DISK_BUILD="1500M"
-
-pkg_setup() {
-	# We don't like to run cuda_pkg_setup as it depends on us
-	check-reqs_pkg_setup
-
-	if use x86; then
-		ewarn "Starting with version 6.5 NVIDIA dropped more and more"
-		ewarn "the support for 32bit linux."
-		ewarn "Be aware that bugfixes and new features may not be available."
-		ewarn "https://dev.gentoo.org/~jlec/distfiles/CUDA_Toolkit_Release_Notes.pdf"
-	fi
-}
-
-src_unpack() {
-	unpacker
-	unpacker run_files/cuda-linux*.run
-}
-
-src_prepare() {
-	local cuda_supported_gcc
-
-	# ATTENTION: change requires revbump
-	cuda_supported_gcc="4.7 4.8"
-
-	sed \
-		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
-		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
-}
-
-src_install() {
-	local i j
-	local remove="doc jre run_files install-linux.pl "
-	local cudadir=/opt/cuda
-	local ecudadir="${EPREFIX}"${cudadir}
-
-	# dodoc doc/*txt
-	if use doc; then
-		dodoc doc/pdf/*
-		dohtml -r doc/html/*
-	fi
-
-	if use amd64; then
-		mv doc/man/man3/{,cuda-}deprecated.3 || die
-		doman doc/man/man*/*
-	fi
-
-	use debugger || remove+=" bin/cuda-gdb extras/Debugger"
-	( use profiler || use eclipse ) || remove+=" libnsight"
-	use amd64 || remove+=" cuda-installer.pl"
-
-	if use profiler; then
-		# hack found in install-linux.pl
-		for j in nvvp nsight; do
-			cat > bin/${j} <<- EOF
-				#!${EPREFIX}/bin/sh
-				LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
-					UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \
-					${ecudadir}/lib${j}/${j} -vm ${EPREFIX}/usr/bin/java
-			EOF
-			chmod a+x bin/${j}
-		done
-	else
-		use eclipse || remove+=" libnvvp"
-		remove+=" extras/CUPTI"
-	fi
-
-	for i in ${remove}; do
-	ebegin "Cleaning ${i}..."
-		if [[ -e ${i} ]]; then
-			find ${i} -delete || die
-			eend
-		else
-			eend $1
-		fi
-	done
-
-	ln -sf lib lib32 || die
-
-	dodir ${cudadir}
-	mv * "${ED}"${cudadir} || die
-
-	cat > "${T}"/99cuda <<- EOF
-		PATH=${ecudadir}/bin$(use profiler && echo ":${ecudadir}/libnvvp")
-		ROOTPATH=${ecudadir}/bin
-		LDPATH=${ecudadir}/lib$(use amd64 && echo "64:${ecudadir}/lib")
-	EOF
-	doenvd "${T}"/99cuda
-
-	use profiler && \
-		make_wrapper nvprof "${EPREFIX}"${cudadir}/bin/nvprof "." ${ecudadir}/lib$(use amd64 && echo "64:${ecudadir}/lib")
-
-	dobin "${T}"/cuda-config
-}
-
-pkg_postinst_check() {
-	local a b
-	a="$(version_sort $(cuda-config -s))"; a=( $a )
-	# greatest supported version
-	b=${a[${#a[@]}-1]}
-
-	# if gcc and if not gcc-version is at least greatesst supported
-	if [[ $(tc-getCC) == *gcc* ]] && \
-		! version_is_at_least $(gcc-version) ${b}; then
-			echo
-			ewarn "gcc >= ${b} will not work with CUDA"
-			ewarn "Make sure you set an earlier version of gcc with gcc-config"
-			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
-			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
-			ewarn "to the nvcc compiler flags"
-			echo
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		pkg_postinst_check
-	fi
-}
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.5.18-r2.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.5.18-r2.ebuild
deleted file mode 100644
index ee137a344a15..000000000000
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.5.18-r2.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit check-reqs cuda eutils toolchain-funcs unpacker versionator
-
-MYD=$(get_version_component_range 1-2)
-
-DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
-HOMEPAGE="http://developer.nvidia.com/cuda"
-SRC_URI="http://developer.download.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_linux.run"
-
-SLOT="0/${PV}"
-LICENSE="NVIDIA-CUDA"
-KEYWORDS="-* ~amd64 ~amd64-linux"
-IUSE="debugger doc eclipse profiler"
-RESTRICT="bindist mirror"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	>=sys-devel/gcc-4.7[cxx]
-	<sys-devel/gcc-5[cxx]
-	>=x11-drivers/nvidia-drivers-352.39[uvm]
-	debugger? (
-		sys-libs/libtermcap-compat
-		sys-libs/ncurses[tinfo]
-		)
-	eclipse? ( >=virtual/jre-1.6 )
-	profiler? ( >=virtual/jre-1.6 )"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="opt/cuda/*"
-
-CHECKREQS_DISK_BUILD="1500M"
-
-pkg_setup() {
-	# We don't like to run cuda_pkg_setup as it depends on us
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	unpacker
-	unpacker run_files/cuda-linux*.run
-}
-
-src_prepare() {
-	local cuda_supported_gcc
-
-	# ATTENTION: change requires revbump
-	cuda_supported_gcc="4.7 4.8 4.9"
-
-	sed \
-		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
-		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
-}
-
-src_install() {
-	local i j
-	local remove="doc jre run_files install-linux.pl "
-	local cudadir=/opt/cuda
-	local ecudadir="${EPREFIX}"${cudadir}
-
-	# dodoc doc/*txt
-	if use doc; then
-		dodoc doc/pdf/*
-		dohtml -r doc/html/*
-	fi
-
-	mv doc/man/man3/{,cuda-}deprecated.3 || die
-	doman doc/man/man*/*
-
-	use debugger || remove+=" bin/cuda-gdb extras/Debugger"
-	( use profiler || use eclipse ) || remove+=" libnsight"
-	remove+=" cuda-installer.pl"
-
-	if use profiler; then
-		# hack found in install-linux.pl
-		for j in nvvp nsight; do
-			cat > bin/${j} <<- EOF
-				#!${EPREFIX}/bin/sh
-				LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
-					UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \
-					${ecudadir}/lib${j}/${j} -vm ${EPREFIX}/usr/bin/java
-			EOF
-			chmod a+x bin/${j}
-		done
-	else
-		use eclipse || remove+=" libnvvp"
-		remove+=" extras/CUPTI"
-	fi
-
-	for i in ${remove}; do
-	ebegin "Cleaning ${i}..."
-		if [[ -e ${i} ]]; then
-			find ${i} -delete || die
-			eend
-		else
-			eend $1
-		fi
-	done
-
-	ln -sf lib lib32 || die
-
-	dodir ${cudadir}
-	mv * "${ED}"${cudadir} || die
-
-	cat > "${T}"/99cuda <<- EOF
-		PATH=${ecudadir}/bin$(use profiler && echo ":${ecudadir}/libnvvp")
-		ROOTPATH=${ecudadir}/bin
-		LDPATH=${ecudadir}/lib64:${ecudadir}/lib:${ecudadir}/nvvm/lib64
-	EOF
-	doenvd "${T}"/99cuda
-
-	use profiler && \
-		make_wrapper nvprof "${EPREFIX}"${cudadir}/bin/nvprof "." ${ecudadir}/lib64:${ecudadir}/lib
-
-	dobin "${T}"/cuda-config
-}
-
-pkg_postinst_check() {
-	local a b
-	a="$(version_sort $(cuda-config -s))"; a=( $a )
-	# greatest supported version
-	b=${a[${#a[@]}-1]}
-
-	# if gcc and if not gcc-version is at least greatesst supported
-	if [[ $(tc-getCC) == *gcc* ]] && \
-		! version_is_at_least $(gcc-version) ${b}; then
-			echo
-			ewarn "gcc >= ${b} will not work with CUDA"
-			ewarn "Make sure you set an earlier version of gcc with gcc-config"
-			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
-			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
-			ewarn "to the nvcc compiler flags"
-			echo
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		pkg_postinst_check
-	fi
-}
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.0.44.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.0.44.ebuild
deleted file mode 100644
index 94cf8df882e9..000000000000
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.0.44.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit check-reqs cuda eutils toolchain-funcs unpacker versionator
-
-MYD=$(get_version_component_range 1-2)
-
-DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
-HOMEPAGE="https://developer.nvidia.com/cuda-zone"
-SRC_URI="https://developer.nvidia.com/compute/cuda/${MYD}/prod/local_installers/cuda_${PV}_linux-run -> cuda_${PV}_linux.run"
-
-SLOT="0/${PV}"
-LICENSE="NVIDIA-CUDA"
-KEYWORDS="-* ~amd64 ~amd64-linux"
-IUSE="debugger doc eclipse profiler"
-RESTRICT="bindist mirror"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	>=sys-devel/gcc-4.7[cxx]
-	<sys-devel/gcc-6[cxx]
-	>=x11-drivers/nvidia-drivers-367.44[X,uvm]
-	debugger? (
-		sys-libs/libtermcap-compat
-		sys-libs/ncurses[tinfo]
-		)
-	eclipse? ( >=virtual/jre-1.6 )
-	profiler? ( >=virtual/jre-1.6 )"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="opt/cuda/*"
-
-CHECKREQS_DISK_BUILD="3500M"
-
-pkg_setup() {
-	# We don't like to run cuda_pkg_setup as it depends on us
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	unpacker
-	unpacker run_files/cuda-linux*.run
-}
-
-src_prepare() {
-	local cuda_supported_gcc
-
-	# ATTENTION: change requires revbump
-	cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4"
-
-	sed \
-		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
-		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
-
-	default
-}
-
-src_install() {
-	local i remove=( doc jre run_files install-linux.pl cuda-installer.pl )
-	local cudadir=/opt/cuda
-	local ecudadir="${EPREFIX}${cudadir}"
-
-	if use doc; then
-		DOCS+=( doc/pdf/. )
-		HTML_DOCS+=( doc/html/. )
-	fi
-	einstalldocs
-
-	mv doc/man/man3/{,cuda-}deprecated.3 || die
-	doman doc/man/man*/*
-
-	use debugger || remove+=( bin/cuda-gdb extras/Debugger extras/cuda-gdb-${PV}.src.tar.gz )
-
-	if use profiler; then
-		# hack found in install-linux.pl
-		for i in nvvp nsight; do
-			cat > bin/${i} <<- EOF || die
-				#!/usr/bin/env sh
-				LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
-					UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \
-					${ecudadir}/lib${i}/${i} -vm ${EPREFIX}/usr/bin/java
-			EOF
-			chmod a+x bin/${i} || die
-		done
-	else
-		use eclipse || remove+=( libnvvp libnsight )
-		remove+=( extras/CUPTI )
-	fi
-
-	for i in "${remove[@]}"; do
-		ebegin "Cleaning ${i}..."
-		rm -rf "${i}" || die
-		eend
-	done
-
-	dodir ${cudadir}
-	mv * "${ED%/}${cudadir}" || die
-
-	cat > "${T}"/99cuda <<- EOF || die
-		PATH=${ecudadir}/bin$(usex profiler ":${ecudadir}/libnvvp" "")
-		ROOTPATH=${ecudadir}/bin
-		LDPATH=${ecudadir}/lib64:${ecudadir}/lib:${ecudadir}/nvvm/lib64
-	EOF
-	doenvd "${T}"/99cuda
-
-	use profiler && \
-		make_wrapper nvprof "${ecudadir}/bin/nvprof" "." "${ecudadir}/lib64:${ecudadir}/lib"
-
-	dobin "${T}"/cuda-config
-}
-
-pkg_postinst_check() {
-	local a b
-	a="$(version_sort $(cuda-config -s))"; a=( $a )
-	# greatest supported version
-	b="${a[${#a[@]}-1]}"
-
-	# if gcc and if not gcc-version is at least greatest supported
-	if tc-is-gcc && \
-		! version_is_at_least gcc-version ${b}; then
-			ewarn ""
-			ewarn "gcc >= ${b} will not work with CUDA"
-			ewarn "Make sure you set an earlier version of gcc with gcc-config"
-			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
-			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
-			ewarn "to the nvcc compiler flags"
-			ewarn ""
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		pkg_postinst_check
-	fi
-}
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.0.176.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.0.176.ebuild
deleted file mode 100644
index e56db8e3b47d..000000000000
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.0.176.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit check-reqs cuda eutils toolchain-funcs unpacker versionator
-
-MYD=$(get_version_component_range 1-2)
-DRIVER_PV="384.81"
-
-DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
-HOMEPAGE="https://developer.nvidia.com/cuda-zone"
-SRC_URI="https://developer.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_${DRIVER_PV}_linux-run -> cuda_${PV}_${DRIVER_PV}_linux.run"
-
-LICENSE="NVIDIA-CUDA"
-SLOT="0/${PV}"
-KEYWORDS="-* ~amd64 ~amd64-linux"
-IUSE="debugger doc eclipse profiler"
-RESTRICT="bindist mirror"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	>=sys-devel/gcc-4.7[cxx]
-	<sys-devel/gcc-7[cxx]
-	>=x11-drivers/nvidia-drivers-384.81[X,uvm]
-	debugger? (
-		sys-libs/libtermcap-compat
-		sys-libs/ncurses-compat:5[tinfo]
-		)
-	eclipse? ( >=virtual/jre-1.6 )
-	profiler? ( >=virtual/jre-1.6 )"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="opt/cuda/*"
-
-CHECKREQS_DISK_BUILD="3500M"
-
-pkg_setup() {
-	# We don't like to run cuda_pkg_setup as it depends on us
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	unpacker
-	unpacker run_files/cuda-linux*.run
-}
-
-src_prepare() {
-	local cuda_supported_gcc
-
-	# ATTENTION: change requires revbump
-	cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4 6.3 6.4"
-
-	sed \
-		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
-		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
-
-	default
-}
-
-src_install() {
-	local i remove=( doc jre run_files install-linux.pl cuda-installer.pl )
-	local cudadir=/opt/cuda
-	local ecudadir="${EPREFIX}${cudadir}"
-
-	if use doc; then
-		DOCS+=( doc/pdf/. )
-		HTML_DOCS+=( doc/html/. )
-	fi
-	einstalldocs
-
-	mv doc/man/man3/{,cuda-}deprecated.3 || die
-	doman doc/man/man*/*
-
-	use debugger || remove+=( bin/cuda-gdb extras/Debugger extras/cuda-gdb-${PV}.src.tar.gz )
-
-	if use profiler; then
-		# hack found in install-linux.pl
-		for i in nvvp nsight; do
-			cat > bin/${i} <<- EOF || die
-				#!/usr/bin/env sh
-				LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
-					UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \
-					${ecudadir}/lib${i}/${i} -vm ${EPREFIX}/usr/bin/java
-			EOF
-			chmod a+x bin/${i} || die
-		done
-	else
-		use eclipse || remove+=( libnvvp libnsight )
-		remove+=( extras/CUPTI )
-	fi
-
-	for i in "${remove[@]}"; do
-		ebegin "Cleaning ${i}..."
-		rm -rf "${i}" || die
-		eend
-	done
-
-	dodir ${cudadir}
-	mv * "${ED%/}${cudadir}" || die
-
-	cat > "${T}"/99cuda <<- EOF || die
-		PATH=${ecudadir}/bin$(usex profiler ":${ecudadir}/libnvvp" "")
-		ROOTPATH=${ecudadir}/bin
-		LDPATH=${ecudadir}/lib64:${ecudadir}/lib:${ecudadir}/nvvm/lib64
-	EOF
-	doenvd "${T}"/99cuda
-
-	use profiler && \
-		make_wrapper nvprof "${ecudadir}/bin/nvprof" "." "${ecudadir}/lib64:${ecudadir}/lib"
-
-	dobin "${T}"/cuda-config
-}
-
-pkg_postinst_check() {
-	local a b
-	a="$(version_sort $(cuda-config -s))"; a=( $a )
-	# greatest supported version
-	b="${a[${#a[@]}-1]}"
-
-	# if gcc and if not gcc-version is at least greatest supported
-	if tc-is-gcc && \
-		! version_is_at_least gcc-version ${b}; then
-			ewarn ""
-			ewarn "gcc >= ${b} will not work with CUDA"
-			ewarn "Make sure you set an earlier version of gcc with gcc-config"
-			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
-			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
-			ewarn "to the nvcc compiler flags"
-			ewarn ""
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		pkg_postinst_check
-	fi
-}
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.1.85.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.1.85.ebuild
deleted file mode 100644
index 532275f52c64..000000000000
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.1.85.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit check-reqs cuda eutils toolchain-funcs unpacker versionator
-
-MYD=$(get_version_component_range 1-2)
-DRIVER_PV="387.26"
-
-DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
-HOMEPAGE="https://developer.nvidia.com/cuda-zone"
-SRC_URI="https://developer.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_${DRIVER_PV}_linux -> cuda_${PV}_${DRIVER_PV}_linux.run"
-
-LICENSE="NVIDIA-CUDA"
-SLOT="0/${PV}"
-KEYWORDS="-* ~amd64 ~amd64-linux"
-IUSE="debugger doc eclipse profiler"
-RESTRICT="bindist mirror"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	<sys-devel/gcc-7[cxx]
-	>=x11-drivers/nvidia-drivers-${DRIVER_PV}[X,uvm]
-	debugger? (
-		sys-libs/libtermcap-compat
-		sys-libs/ncurses-compat:5[tinfo]
-		)
-	eclipse? ( >=virtual/jre-1.6 )
-	profiler? ( >=virtual/jre-1.6 )"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="opt/cuda/*"
-
-CHECKREQS_DISK_BUILD="3500M"
-
-pkg_setup() {
-	# We don't like to run cuda_pkg_setup as it depends on us
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	unpacker
-	unpacker run_files/cuda-linux*.run
-}
-
-src_prepare() {
-	local cuda_supported_gcc
-
-	# ATTENTION: change requires revbump
-	cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4 6.3 6.4"
-
-	sed \
-		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
-		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
-
-	default
-}
-
-src_install() {
-	local i remove=( doc jre run_files install-linux.pl cuda-installer.pl )
-	local cudadir=/opt/cuda
-	local ecudadir="${EPREFIX}${cudadir}"
-
-	if use doc; then
-		DOCS+=( doc/pdf/. )
-		HTML_DOCS+=( doc/html/. )
-	fi
-	einstalldocs
-
-	mv doc/man/man3/{,cuda-}deprecated.3 || die
-	doman doc/man/man*/*
-
-	use debugger || remove+=( bin/cuda-gdb extras/Debugger extras/cuda-gdb-${PV}.src.tar.gz )
-
-	if use profiler; then
-		# hack found in install-linux.pl
-		for i in nvvp nsight; do
-			cat > bin/${i} <<- EOF || die
-				#!/usr/bin/env sh
-				LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
-					UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \
-					${ecudadir}/lib${i}/${i} -vm ${EPREFIX}/usr/bin/java
-			EOF
-			chmod a+x bin/${i} || die
-		done
-	else
-		use eclipse || remove+=( libnvvp libnsight )
-		remove+=( extras/CUPTI )
-	fi
-
-	for i in "${remove[@]}"; do
-		ebegin "Cleaning ${i}..."
-		rm -rf "${i}" || die
-		eend
-	done
-
-	dodir ${cudadir}
-	mv * "${ED%/}${cudadir}" || die
-
-	cat > "${T}"/99cuda <<- EOF || die
-		PATH=${ecudadir}/bin$(usex profiler ":${ecudadir}/libnvvp" "")
-		ROOTPATH=${ecudadir}/bin
-		LDPATH=${ecudadir}/lib64:${ecudadir}/lib:${ecudadir}/nvvm/lib64
-	EOF
-	doenvd "${T}"/99cuda
-
-	use profiler && \
-		make_wrapper nvprof "${ecudadir}/bin/nvprof" "." "${ecudadir}/lib64:${ecudadir}/lib"
-
-	dobin "${T}"/cuda-config
-}
-
-pkg_postinst_check() {
-	local a b
-	a="$(version_sort $(cuda-config -s))"; a=( $a )
-	# greatest supported version
-	b="${a[${#a[@]}-1]}"
-
-	# if gcc and if not gcc-version is at least greatest supported
-	if tc-is-gcc && \
-		! version_is_at_least gcc-version ${b}; then
-			ewarn ""
-			ewarn "gcc >= ${b} will not work with CUDA"
-			ewarn "Make sure you set an earlier version of gcc with gcc-config"
-			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
-			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
-			ewarn "to the nvcc compiler flags"
-			ewarn ""
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		pkg_postinst_check
-	fi
-}
diff --git a/dev-util/patchutils/Manifest b/dev-util/patchutils/Manifest
index 0f07d393410b..83c42cfeceef 100644
--- a/dev-util/patchutils/Manifest
+++ b/dev-util/patchutils/Manifest
@@ -1,6 +1,6 @@
 AUX patchutils-0.3.3-format-security.patch 715 BLAKE2B 48be5e5e0376b6520cd0baffca1cc385bf3a267c8443b4ec195d302da6b165604471b919c47104943c1ccdc01d3c9866d93d1d8730e1a8b6889f433f607fb73a SHA512 b98932e5e48dfefb2ef8550c7f212cb0bf7417b0ed42705e3ddd9164d522ebdb47a0610539769a49a19d10e6389eb9e764fc5ef7bdd03af9b29feeb76a51c8fa
 DIST patchutils-0.3.3.tar.xz 156328 BLAKE2B e7da090e1fc7f95f5c2e4c02828702b485dc92fa22a4f45d69f5d9f610fb5a5e3267794fa572cf3aa73be45a86a5c889776eeadf5cca98237d97e53cb1b9be91 SHA512 4ec085078e9ae2e878dc10fbfea5974d9772716aef5d8e130a0023ceaa26640bccfaf1022c8153923b38230b36c8d4dddf4aaa674076c733bb1277895b63a268
 DIST patchutils-0.3.4.tar.xz 166400 BLAKE2B 382be328bfd1ab848f38126ad7a41a4c953844956c181265953a7496c8de3df5d90d071a823b226ceeddd7321bd4ecae1e06c8583155b08826c97177efa9b68b SHA512 ede006122fad180b78feaf69294f1c40c0a764981fa581f1893abeeb0421f9d586fc33f79d065690a6bc6187a31f11311b086669879dde12c6e49c7c8a2aa440
-EBUILD patchutils-0.3.3.ebuild 768 BLAKE2B 46271a2a2dddb8e1148966e99eb18a02d561ac9c8958dab79a4c5f6948b15110333bd9671f647a6f4e52c4379b7fb479ef47344cac2388b3e4acc5490a83980c SHA512 2b39cbfa98aceecf65ae9aa83dca730d5183cac164b59fc9e611821221f6b7137ad6621b3ff3c8a398d653d635fd2f3c47b2186b311ad132375c752d1666e47b
-EBUILD patchutils-0.3.4.ebuild 804 BLAKE2B 9e4581d61c03d5b2276757492bf75e89600933ad2d1f12cae622250581e95312b16e05f156c4ba5292f95b007c6013c4a0351c52fb07eb63b70b88f47e15edce SHA512 6c1bbebcda5ea8bd6917ac59ab619d6b2deb2316c33f2eeb3a14ffb2fbcb9c9d9d578ebf58879be3a55991449da3b4b92ee590f42f9e8b925cd08ccd9de2cc06
+EBUILD patchutils-0.3.3.ebuild 760 BLAKE2B bb17e8079257a7563714ad8a98be78484f1a597bfeafb27fffa121a461168a7d5005b8137fba1ab24eb595e0167c74fbea92710b04b4fc11b5656d6e900dd1f2 SHA512 0696a77c8cacb731edb1b5860f7035743582024c935750f3f6e88552eab442f6e19742eed997846f59dc5524eaf0326fa78a39037eefe77640f1d93c3343fa11
+EBUILD patchutils-0.3.4.ebuild 796 BLAKE2B 16578df3e37f571861a73a5abde8b3968d235d00e0cc18d541f0ac5aa068406c0a22113a4b0261a821f04052758b2b7e86c38859274a1e38929ad0a211c56368 SHA512 78be52b5b9cb9db328f32fe5c02ce92cbafa89402b3ed98250a7e81bda08ee5a841e6d7d10cc18f6b7b120ce6f3dc2bd7a1aeb4f5e8a1b7fa05c3ac16a94eeb9
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/dev-util/patchutils/patchutils-0.3.3.ebuild b/dev-util/patchutils/patchutils-0.3.3.ebuild
index fd460136c17b..c0af0dcaa8ee 100644
--- a/dev-util/patchutils/patchutils-0.3.3.ebuild
+++ b/dev-util/patchutils/patchutils-0.3.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://cyberelk.net/tim/data/patchutils/stable/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/patchutils/patchutils-0.3.4.ebuild b/dev-util/patchutils/patchutils-0.3.4.ebuild
index f97fd4b806f0..3aa0b6a0d007 100644
--- a/dev-util/patchutils/patchutils-0.3.4.ebuild
+++ b/dev-util/patchutils/patchutils-0.3.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://cyberelk.net/tim/data/patchutils/stable/${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 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/pkgconfig/Manifest b/dev-util/pkgconfig/Manifest
index d72245f24f33..14f5c92bbc5a 100644
--- a/dev-util/pkgconfig/Manifest
+++ b/dev-util/pkgconfig/Manifest
@@ -3,9 +3,9 @@ AUX pkgconfig-0.28-strip_system_library_dirs_reliably.patch 777 BLAKE2B fab15ae7
 DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
 DIST pkg-config-0.29.1.tar.gz 2013454 BLAKE2B 5f33022b2df83de1c9202e090ea9be926d1f2b796152969d46ad45772ceb792c3f2bb95714cf1def28393b32db1b4052c3fdfe9f71076d130a57172987c04d0e SHA512 d2963355929d7aae0fbadad445d67b5c6762934fc4963a10a4b72ae90f7f6df4e6a38694884b924ff37eedaf636b49f3f521fe4eb3009e0322a402f330f1b4c2
 DIST pkg-config-0.29.2.tar.gz 2016830 BLAKE2B e8f0420033524ad768cac3c82138546e4cd76c47f5835b7b98662ab01eaf3feef08f495a69c04980d51b57935567ab1d465ef4e1d0529735ad0031c828585324 SHA512 4861ec6428fead416f5cbbbb0bbad10b9152967e481d4b0ff2eb396a9f297f552984c9bb72f6864a37dcd8fca1d9ccceda3ef18d8f121938dbe4fdf2b870fe75
-EBUILD pkgconfig-0.28-r2.ebuild 2881 BLAKE2B 8014e43e3449be2620bfae6674df57d5b413ab73eac3385ce68fb3652fe7d8942ff2ec9718f2568cea34d41f05d3bbf4fc5b826899bb092f13873edc9872f428 SHA512 7a16c2fdec93260cb730b66eb8285c09929be22e04184e50057e3335c8df41db01105a3f7612eff9d4264a7deb9f0fe34bee71e3a93e5173b90b0ebad7539eb1
-EBUILD pkgconfig-0.28-r3.ebuild 3400 BLAKE2B e182f6c4d85f0018865b32d89ec4e4884ddfb1f293665c2a71a8c2a41a72756b8074c775f61befecaebd3df8ab0a713a5a83085ce254a8421cd3105572abcdce SHA512 96da7a2c861d6775b89f9e73876bbf22972f508a2664df05c96a599992842e612da94ae863a87dfe0451b39ce898e17ac90f1b55440345d990fa5b1058bda40e
-EBUILD pkgconfig-0.29.1.ebuild 3764 BLAKE2B 9fadfa03b0d010b0edf9e862b2faef1fa7ca5db3f3d579b9e21ab7eea318e44d9cc724b84907a77cb0bc11e4e930b7cdd37728e599419e9ce59d547e49c337e4 SHA512 951d6c913c745ae31e55ba9008558b4bf91f0900f4066ca5f2ecf65323f0389004cad4326920ffae5c07c106be5f49a265b4be1c10144f80c362d1a90d6e704e
-EBUILD pkgconfig-0.29.2.ebuild 3762 BLAKE2B 2526c7c31500b087469b41e1a5a0d5e77c18dc1c6152353c0d1755f01bd1d605b424e6d954de9ca0e2af8b092db4f19a3333e7c9b7e9ad78d06ed63b87cd0d76 SHA512 4e0d753615f16081d0282d6ac43f4e0132955cf29fde60cf372905e22f7bb89d3f9de47df73cc7f914674d4f4d3a96740c3126bafd02160fb22813ad13f8bfa1
-EBUILD pkgconfig-9999.ebuild 3764 BLAKE2B 9fadfa03b0d010b0edf9e862b2faef1fa7ca5db3f3d579b9e21ab7eea318e44d9cc724b84907a77cb0bc11e4e930b7cdd37728e599419e9ce59d547e49c337e4 SHA512 951d6c913c745ae31e55ba9008558b4bf91f0900f4066ca5f2ecf65323f0389004cad4326920ffae5c07c106be5f49a265b4be1c10144f80c362d1a90d6e704e
+EBUILD pkgconfig-0.28-r2.ebuild 2826 BLAKE2B a528c2e684e201095a65c7077369699a961d48f2641175afd7a50abde25545b1be411a3652c8099581e85d355ad388670868163d443c9bccc2563626d0be5fe3 SHA512 7ae3e8a075fe81539a83b34aa86061d9e0d0fdd0d255da4c91385a57681f66415f4a266a4f6df059d97cd2647889e54a5eef1a92c728a3606463ed45412c0a7f
+EBUILD pkgconfig-0.28-r3.ebuild 3344 BLAKE2B c9552c71be357c50e4bbff61ad2b22cc60e5a1429362bea7a98ad1bac7b73c501877fd3dd45a963e59006efd2d72fecfc6ded5917f2dbab0209dcb4749291bb7 SHA512 b7795cd7d187a47ef6bbf1cb8ef0ca6220e4d6e8879f51a1cd936e5034407b214859d90c5ea5bc82d9507760b02c67ab5bd82658f1961412c3f0985bfccf9786
+EBUILD pkgconfig-0.29.1.ebuild 3708 BLAKE2B 3e31330703992283ba1879ee4b0d207e9c7ef959bba3c5f8f8d1e45ad333d3095f3125e82eb08a0697de4e3e7b8d3127507d58c79d28e88d8ef5b0321a7fc443 SHA512 649113e5a3b4b655465ec16bb3ca936ceb6198a3c9ff8441f2b38ab94b85f7161f4a18969b919475a86cd21e8948a25bfcda657dd9344411b02bcf021267963d
+EBUILD pkgconfig-0.29.2.ebuild 3707 BLAKE2B ac6551f444ca512f175b7f99929c9d1a66ff315b1f407907b13ef7558b2e57060448891bcf09f6ffe9c70caff1df0c1de42f673d135d283d7d68c3c1bea48483 SHA512 b1376c30c4219f9a2d304a23ec2cc159102510fdd856ad733324b0fe1d07aa3f399af2c7556d1d9b5f1c82fec3c8c95db52b593a7995d755e8cbc6f60cec03d7
+EBUILD pkgconfig-9999.ebuild 3708 BLAKE2B 3e31330703992283ba1879ee4b0d207e9c7ef959bba3c5f8f8d1e45ad333d3095f3125e82eb08a0697de4e3e7b8d3127507d58c79d28e88d8ef5b0321a7fc443 SHA512 649113e5a3b4b655465ec16bb3ca936ceb6198a3c9ff8441f2b38ab94b85f7161f4a18969b919475a86cd21e8948a25bfcda657dd9344411b02bcf021267963d
 MISC metadata.xml 325 BLAKE2B af0abf473903faa5ce1e6d1918fa87b558b99b82d95c7f95ecb596684f7f55ee365a10e943752d1f3c8b6b1684ac4e0985329b89a6f19de2c926bcc0c3127382 SHA512 0db9510bbe132efa03acbbb4fb31407188edd83a6ac5c1d84316fa682db9399879957e8cd4447c1cbde01638f6d220f9a30a17611cd31e35769e71e5d38287a4
diff --git a/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild b/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild
index eabba5a8f09f..78438930632a 100644
--- a/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://anongit.freedesktop.org/git/pkg-config.git"
 	inherit autotools git-2
 else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~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 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
 fi
 
@@ -42,7 +42,7 @@ src_prepare() {
 	if [[ ${PV} == *9999* ]]; then
 		eautoreconf
 	else
-		elibtoolize # Required for FreeMiNT wrt #333429
+		elibtoolize
 	fi
 }
 
diff --git a/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild b/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild
index 66e587988338..1befce397d23 100644
--- a/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
 	inherit autotools git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~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 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
 fi
 
@@ -52,7 +52,7 @@ src_prepare() {
 	if [[ ${PV} == *9999* ]]; then
 		eautoreconf
 	else
-		elibtoolize # Required for FreeMiNT wrt #333429
+		elibtoolize
 	fi
 }
 
diff --git a/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild b/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild
index 80dfe836e0a4..f5fbed01dd0e 100644
--- a/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
 	inherit autotools git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~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 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
 fi
 
@@ -46,7 +46,7 @@ src_prepare() {
 	if [[ ${PV} == *9999* ]]; then
 		eautoreconf
 	else
-		elibtoolize # Required for FreeMiNT wrt #333429
+		elibtoolize
 	fi
 
 	if [[ ${CHOST} == *-solaris* ]] ; then
diff --git a/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild b/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild
index 41c441193c98..980d368b7395 100644
--- a/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
 	inherit autotools git-r3
 else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
 fi
 
@@ -46,7 +46,7 @@ src_prepare() {
 	if [[ ${PV} == *9999* ]]; then
 		eautoreconf
 	else
-		elibtoolize # Required for FreeMiNT wrt #333429
+		elibtoolize
 	fi
 
 	if [[ ${CHOST} == *-solaris* ]] ; then
diff --git a/dev-util/pkgconfig/pkgconfig-9999.ebuild b/dev-util/pkgconfig/pkgconfig-9999.ebuild
index 80dfe836e0a4..f5fbed01dd0e 100644
--- a/dev-util/pkgconfig/pkgconfig-9999.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-9999.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
 	inherit autotools git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~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 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
 fi
 
@@ -46,7 +46,7 @@ src_prepare() {
 	if [[ ${PV} == *9999* ]]; then
 		eautoreconf
 	else
-		elibtoolize # Required for FreeMiNT wrt #333429
+		elibtoolize
 	fi
 
 	if [[ ${CHOST} == *-solaris* ]] ; then
diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index 215a5212737d..5df742846bc6 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,6 +1,8 @@
 AUX radare2-4.5.1-docdir.patch 627 BLAKE2B 08df5ec6965d61eeb5d22f1c50d6a63fd6ee5fff7f57d2dc1c46c6eff025ea2166498d0397a8443fdb8a3a109ac81605d63a1dafa0058846a483aa87cd1b018a SHA512 b8c3d3fb4a735b68953155dbb86256d315d2924d42cc707d5b8bc58babedd30308c9418618775b797845ffb139478d366593560133443a778e399331d90a9351
 DIST radare2-4.5.1.tar.gz 8266567 BLAKE2B 0d23c1d47dd79ffd9398ca7b2c8b383ba6a7e3ec662046d1111ab34cabcdaaf1fdd449686433b3229e3c22c31c705530b0a85bbd22b5fc79891a5ad292ba0ff1 SHA512 f08a4cd1e0d65643463d9f9dbb1aacfe793c7b411ec820a18b75a5975d265cfc2cf91e593522c8823aa369098ded21415939acb07c84d8acd102889bf5aed899
+DIST radare2-5.0.0.tar.gz 7897849 BLAKE2B be785b693e9de7264f21b857291286849e054e807d87b4c56a6177a132f9fa141c25661f9d28ea10b61fd298161693794f2ee70279cfd076a2b1a98c563dd2a9 SHA512 059bc341bc34c5f39ef7493af9e2d3b7e52667a2d16f12ef19c9c6ba83c911fd02e07cd527599caea503d5e81a5fedbd8ff343db4d41257e0f48ace9dd52f3ba
 EBUILD radare2-4.5.1-r1.ebuild 1700 BLAKE2B 71ba7c3ec35e8555ae9125e89c9b2b2b97bc6206d591b54ccb79151c195854cfc97b36725ee521cdd431d80214537dbd9c5b04cd418c7da7f222d1f11c744cda SHA512 2658993539d9e2631b83a6e6a52a1d363598f50656e254e21434c76b14e31b79da7c43388e72f77cd7010462982789251da93c02120f969c314dc4bb880b1705
 EBUILD radare2-4.5.1.ebuild 1478 BLAKE2B 73427252b80a87cb3effef53826478ce43d5e94809cf321a712c513a64b6f9df9250c6ab37658add505fc9481e3da62ac47097ad5834d3b595b097548e6cb7cf SHA512 ac3dce06f0dad3d383f33714d7615424ee6368be8cfa98dfc59d57a0a7a4cec6dee08fe3992a75bd7540833a340315b666d8bd3d3d351387210a9133e288c8d0
+EBUILD radare2-5.0.0.ebuild 1700 BLAKE2B 71ba7c3ec35e8555ae9125e89c9b2b2b97bc6206d591b54ccb79151c195854cfc97b36725ee521cdd431d80214537dbd9c5b04cd418c7da7f222d1f11c744cda SHA512 2658993539d9e2631b83a6e6a52a1d363598f50656e254e21434c76b14e31b79da7c43388e72f77cd7010462982789251da93c02120f969c314dc4bb880b1705
 EBUILD radare2-9999.ebuild 1700 BLAKE2B 71ba7c3ec35e8555ae9125e89c9b2b2b97bc6206d591b54ccb79151c195854cfc97b36725ee521cdd431d80214537dbd9c5b04cd418c7da7f222d1f11c744cda SHA512 2658993539d9e2631b83a6e6a52a1d363598f50656e254e21434c76b14e31b79da7c43388e72f77cd7010462982789251da93c02120f969c314dc4bb880b1705
 MISC metadata.xml 361 BLAKE2B f92dfa8905623cd3a34f0b61766ae071d09801460b8b2a13bf4c3bb0a4715446b61b79309101b032511851f9d7a15973bca97ce9d1ed667266e2d6a3485933a2 SHA512 fb01d7b5abd1966cf270227640d1e4197a09930afb6f03e18bf4f79ba74e73fd86782b99efbb710b697315c25b63e575ec6120fb1cedaa19d4562831f41f81a4
diff --git a/dev-util/radare2/radare2-5.0.0.ebuild b/dev-util/radare2/radare2-5.0.0.ebuild
new file mode 100644
index 000000000000..963c0b6b6e74
--- /dev/null
+++ b/dev-util/radare2/radare2-5.0.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 eutils toolchain-funcs
+
+DESCRIPTION="unix-like reverse engineering framework and commandline tools"
+HOMEPAGE="http://www.radare.org"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/radareorg/radare2"
+else
+	SRC_URI="https://github.com/radareorg/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ssl libressl"
+
+RDEPEND="
+	dev-libs/libzip
+	dev-libs/xxhash
+	sys-apps/file
+	sys-libs/zlib
+	dev-libs/capstone:0=
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	# Fix hardcoded docdir for fortunes
+	sed -i -e "/^#define R2_FORTUNES/s/radare2/$PF/" \
+		libr/include/r_userconf.h.acr
+	default
+}
+
+src_configure() {
+	# Ideally these should be set by ./configure
+	tc-export CC AR LD OBJCOPY RANLIB
+	export HOST_CC=${CC}
+
+	econf \
+		--without-libuv \
+		--with-syscapstone \
+		--with-sysmagic \
+		--with-sysxxhash \
+		--with-syszip \
+		$(use_with ssl openssl)
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/zsh/site-functions
+	doins doc/zsh/_*
+
+	newbashcomp doc/bash_autocompletion.sh "${PN}"
+	bashcomp_alias "${PN}" rafind2 r2 rabin2 rasm2 radiff2
+
+	# a workaround for unstable $(INSTALL) call, bug #574866
+	local d
+	for d in doc/*; do
+		if [[ -d $d ]]; then
+			rm -rfv "$d" || die "failed to delete '$d'"
+		fi
+	done
+
+	# These are not really docs. radare assumes
+	# uncompressed files: bug #761250
+	docompress -x /usr/share/doc/${PF}/fortunes.{creepy,fun,nsfw,tips}
+}
diff --git a/dev-util/ragel/Manifest b/dev-util/ragel/Manifest
index 509f001a8f89..96755f0873ca 100644
--- a/dev-util/ragel/Manifest
+++ b/dev-util/ragel/Manifest
@@ -3,10 +3,10 @@ DIST ragel-6.10.tar.gz 1232993 BLAKE2B 401e7a53b062ecd7ec98337866eb2dc0af0ac90e5
 DIST ragel-7.0.0.10.tar.gz 779503 BLAKE2B 2f7b8bb858555719b0c7afa8209be76fd07f9d06a8f75df723211c48d59f50c21f09a1f1fa031d53e434db933d1bc12299c75d8932485e5a43eccef7506667ad SHA512 2d1d4c469d8581239ec21f128e94ab452b398903302f82ef59ce03d6fb89bc89de6441dbe53ea99d7689866f7aec485ab1ec9c537908f21eb1394650b55413ba
 DIST ragel-7.0.0.12.tar.gz 1543127 BLAKE2B c3024c55eb5397f78159da83e318923529d3c1f10cc802564ac13c39b18c261166e27e4f315bbaa49e7eb9afa6840ca72aa62d7ae14d46f20865db64e3ab6759 SHA512 32ec90eddfd209e50995f21b9a5fcddd2b94279828227d367d990d7bfa8e4412682631d4e6ae5081871bac23d96153b96fb4494b991c70bf38df8cc0ddc8866d
 DIST ragel-7.0.0.9.tar.gz 850078 BLAKE2B 0e7d458e9f78fc7e0fb2e9a0c6fdd3f3789a9104f4441bc878ac64d077dee716e27d3a54c3898fcf1e4ba56b8d46d956a36b92258750f2541fd96f951038d852 SHA512 87de7d41af4a08f09d422a0e58820f9b5b1218acc4733c58690feea4f872790813b5f2d7505ce147a2a6e1bcd341926c35fed7c6b55f543bdf864b119868bcde
-EBUILD ragel-6.10.ebuild 928 BLAKE2B 3c6d2b9df8ec41596c730b85285d7598a05dfdfa758c4d7c1ebc51eb40550d608c222db968ce536c6fc0b1ba891351dfe0aad5215741c13cf55393ee37b547f7 SHA512 efb62282412b3723b117b237b7a22c786a571028dd479ae98eaa4f8dc940b7b492d456510e67e77902bf8aec48b4395f3426d07f032b0cfeca3531d56555bd3d
+EBUILD ragel-6.10.ebuild 917 BLAKE2B ad7df2c200bd64514836581923f57a4db32688139d9857a3df9023785a54e64f17e62850f00bb0def92035528f71212938f8027485ac57e0ae8fb05994793d6e SHA512 83d9b747515990386cc43ae42b69720c832372955efb56d16553ccbaa15ee954fa74e633bb98e9dc1cfd5ae28368853b915b754e4ae2228a7a6bd6b3837c72ad
 EBUILD ragel-7.0.0.10-r1.ebuild 758 BLAKE2B 362a2dee75eb9b744af7b0fca9f26175961029165988cf6a5f8f3aeab8d4e9a4264a553509211884c3bd7d6a7992b5fe0dee7b473f61831e6ab8dcfb1f94ba8b SHA512 12f9640eb0c51a497e274bf0d5dd7dadea78a1e21dba5d8a4a114066717badfa1de28116e133f7cc688fce02b7e2859f45479846f460865982c2ced0f4ea4fc8
 EBUILD ragel-7.0.0.10-r2.ebuild 790 BLAKE2B 83edd042aeea77d1dcc9cea68a5ae5a335b46d7411e47fbde10e6d1b0696ef248194993725aad4bc2e76d624c775b74be4c8cd968dd2d4cc5a2288be5f0c1123 SHA512 f1396bfa1bfcf74ccdcf01c8269ae2d37b06b62200e7417c129bd7fd1188ed9f838ad46f5528cb60c849c020b36f6e5c19d77b6cfd26f7c896b7807969f6d085
 EBUILD ragel-7.0.0.10.ebuild 622 BLAKE2B 4eb1438c8fd1c8e1a3f3f2a95589b719e7b1e07d0411ee0d68bbb0eb5d433471becffdc718593beed535a6f360a3bc63f5fafb058fe6d8c50a6163552ad9da99 SHA512 9f98a2fc800727b126d5db3914ebaf699b4a1095f334906d5809edd9f08b0b5c1d90699a145d303fc06a31d95e600d85aee4a7b5ebb98fd8cfd117f20ee10d2b
-EBUILD ragel-7.0.0.12.ebuild 780 BLAKE2B 71e8b2b282dee86b1c9aa88b911fbe2a11593abbbb7bc8a077be4481da6732b1de9559a8fedc4c484266d486c8435c8234b5f39e7fe247e8afcd8e50528324d5 SHA512 85e0753294b12b681cb69f13dc0c9ec5a1c55465b68954c54e5e679438ffde51fbb9f3d006f263d925aac2c8efa7bd1957cd395b550bba7040d59c7e1346cb6a
+EBUILD ragel-7.0.0.12.ebuild 777 BLAKE2B 938192c39c9ddf715519f82c2ffdf75b0071e2cb7debbb664e43a1b9af2a2aa6d6d40960f9a6b392675560126d23ce8bb1e1ec0dc33040d4295ac4e5dc43ec01 SHA512 8fe6510df4dd14b826203389a0d51e3b985e77d142d905658e4433cb1c303c5aabfc68e66909b5fe8faf17195b4c364de1f8b0fe688466dec9f9724cd66ec5b6
 EBUILD ragel-7.0.0.9.ebuild 627 BLAKE2B b1c47b5508878b7e13fb95333bb7158a85e4795decd4be8cfc82769934106a43878fb5c15d3df5e139a6af96df04614411ceeef20ff0c3bc695cfe424ae258d5 SHA512 1f88ee8f0bac60c073a2be525ea1dcc9128961d8383f36d992121064746d7c154b1338f4582797145fe782485c8d322119aa7ac8ee903315d056cf17a635a3c6
 MISC metadata.xml 222 BLAKE2B 1c7746701a7405c30d961a743df2c2b3b1c5f20c863057e76862844f34bcf701a01f5b31d6b6dc4b4c3192a0f833b783d0c1db3c79f25ea45b576e1c575b502f SHA512 f5b07576edb64cee121aab00dd2a5f0c080fa947e00b6ff6ad6c514a82c132230426ca81e3430d7785c212786f7ead5f6c3f48e58478507df7d96a4e734168ab
diff --git a/dev-util/ragel/ragel-6.10.ebuild b/dev-util/ragel/ragel-6.10.ebuild
index 2feb94382daa..031d855b5f57 100644
--- a/dev-util/ragel/ragel-6.10.ebuild
+++ b/dev-util/ragel/ragel-6.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.colm.net/files/ragel/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="vim-syntax"
 
 DEPEND=""
diff --git a/dev-util/ragel/ragel-7.0.0.12.ebuild b/dev-util/ragel/ragel-7.0.0.12.ebuild
index 2f0d0c5f9b78..2368568e54ed 100644
--- a/dev-util/ragel/ragel-7.0.0.12.ebuild
+++ b/dev-util/ragel/ragel-7.0.0.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.colm.net/files/ragel/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="vim-syntax"
 
 DEPEND="~dev-util/colm-0.13.0.7"
diff --git a/dev-util/rocm-smi/Manifest b/dev-util/rocm-smi/Manifest
new file mode 100644
index 000000000000..1c96a2ed04ae
--- /dev/null
+++ b/dev-util/rocm-smi/Manifest
@@ -0,0 +1,4 @@
+DIST rocm-smi-4.0.0.tar.gz 45065 BLAKE2B 90a28c162099deaa67c98701b79328c760973d88fa598f8a66116927483f25dbfd85366312c4c6e8e64fa2199dfb32fb661db04b464bd58cb39dea09a84ac51e SHA512 63c1274470df079320164d29cb4c009f52e59ffebdadfefe73cbe21238a70858fd5a86417b9f81ab2c405bc64707b02ddbf65e9d301f757f245b60152cd63dcf
+EBUILD rocm-smi-4.0.0.ebuild 769 BLAKE2B 0822728c7f8a1292e597c57a08ebb30609ed6db08325b4e53d17af62c5bf9222f4ec511d8cef18e59af1fba5d38325e6ea1419a649665ac6ddbf1079c488e21f SHA512 2386266a49e00422722d0ab98cabf215359e7ad881c5341b5df0a335082e73366ddcac99a8d77a21401d555284c8bac9377e5a74c84c0472c4ed398cad2d1f36
+EBUILD rocm-smi-9999.ebuild 769 BLAKE2B 0822728c7f8a1292e597c57a08ebb30609ed6db08325b4e53d17af62c5bf9222f4ec511d8cef18e59af1fba5d38325e6ea1419a649665ac6ddbf1079c488e21f SHA512 2386266a49e00422722d0ab98cabf215359e7ad881c5341b5df0a335082e73366ddcac99a8d77a21401d555284c8bac9377e5a74c84c0472c4ed398cad2d1f36
+MISC metadata.xml 630 BLAKE2B de855b379cdc08578676c7344606c42305f466d417558a6529f9c7a15679b2c4a71b7f460c0b553c99280524fe33e2951b2bd494c496ad4e4d7302c53aea7549 SHA512 6b59dc67647f0ce170b287fe9ed95d50deae676887874d02a713eef672c184e57e2da59fa917c36b3fdb0bc9cdebf7a4b0287ebffbbb698840d9e2e076b05913
diff --git a/dev-util/rocm-smi/metadata.xml b/dev-util/rocm-smi/metadata.xml
new file mode 100644
index 000000000000..c968d7fd87f4
--- /dev/null
+++ b/dev-util/rocm-smi/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>candrews@gentoo.org</email>
+        <name>Craig Andrews</name>
+    </maintainer>
+    <maintainer type="person">
+        <email>gentoo@holzke.net</email>
+        <name>Wilfried Holzke</name>
+    </maintainer>
+    <maintainer type="project">
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
+    <upstream>
+        <remote-id type="github">RadeonOpenCompute/ROC-smi</remote-id>
+    </upstream>
+</pkgmetadata>
diff --git a/dev-util/rocm-smi/rocm-smi-4.0.0.ebuild b/dev-util/rocm-smi/rocm-smi-4.0.0.ebuild
new file mode 100644
index 000000000000..3dd0188d8e67
--- /dev/null
+++ b/dev-util/rocm-smi/rocm-smi-4.0.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit python-single-r1
+
+DESCRIPTION="ROCm System Management Interface"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROC-smi"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROC-smi"
+	EGIT_BRANCH="master"
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROC-smi/archive/rocm-${PV}.tar.gz -> rocm-smi-${PV}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/ROC-smi-rocm-${PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND=""
+RDEPEND="${PYTHON_DEPS}"
+
+src_install() {
+	python_scriptinto /usr/bin
+	python_newscript rocm_smi.py rocm-smi
+}
diff --git a/dev-util/rocm-smi/rocm-smi-9999.ebuild b/dev-util/rocm-smi/rocm-smi-9999.ebuild
new file mode 100644
index 000000000000..3dd0188d8e67
--- /dev/null
+++ b/dev-util/rocm-smi/rocm-smi-9999.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit python-single-r1
+
+DESCRIPTION="ROCm System Management Interface"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROC-smi"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROC-smi"
+	EGIT_BRANCH="master"
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROC-smi/archive/rocm-${PV}.tar.gz -> rocm-smi-${PV}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/ROC-smi-rocm-${PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND=""
+RDEPEND="${PYTHON_DEPS}"
+
+src_install() {
+	python_scriptinto /usr/bin
+	python_newscript rocm_smi.py rocm-smi
+}
diff --git a/dev-util/rt-tests/Manifest b/dev-util/rt-tests/Manifest
index 9d07ff3cb391..753d1747c988 100644
--- a/dev-util/rt-tests/Manifest
+++ b/dev-util/rt-tests/Manifest
@@ -1,4 +1,4 @@
-AUX rt-tests-1.9-musl.patch 10822 BLAKE2B 144562d6dc921c8ae89e1ae017cc5bddb7aad7a4167194df1a8ae647678310da71b0c2df4cd18d9ba53fbbfccb5e6a92f2ec33ca055c9def592ca973a0bc0381 SHA512 56b538bc7ea327a5362d03b3207aa533ea4aa7067584335f7e92449869a37b355170520fa6b54e7aa175290bff718af6970c791884f9c2bc68ff624926ae22d0
-DIST rt-tests-1.9.tar.xz 112180 BLAKE2B fa9b7b70bd9ae5d5f5e1077ddbd916bc4556d079d4067f16289ab34fec16ed0c8074607a7a8e50ea7bad4df318a063074f1c0ec5c2e895851d3045d51a8ecd74 SHA512 66f086dbda31567e6dc5297424ec66b2c6bd7cb0e065c32e02c326f33967f3a301b1b34f9eb0dd0acd853279c64fb1c2bc271ac26648f4abc3f6090ba6484cfa
-EBUILD rt-tests-1.9.ebuild 923 BLAKE2B bd37db6fc2c3b1383cc8bd231d3ea46033b8dd5b133b227fc27b43b23b277cf74f4b9d222c05f4d0110346bb2b74213ae1e68460462c5ddfc89b46aa8042852b SHA512 1982e3f6a1970a3c1fa9cdcc14cc4ab647b278de78a07caefc5ecc3a96eb577555c4fa3d5cd88d746b20660910f2e87b10fe680a988cfb43079fde09cedd8314
+AUX rt-tests-1.10-musl.patch 10825 BLAKE2B 64195bfd2ca512721701613a1aa881e3d17290d75bc3ec991bdc8c7092b8cc9ba055fe86a5390350158c7b3a442bcd35f07a3eeb148fe6c701a4ada7840934cf SHA512 3a5c47315e3630c38600d359af4f4b9ef572c7db7ae550fa57512b72f50bb5d762933aba3594876b66ba37d85dfecc3ffd6c0172c951f8c48d4ff37620cee674
+DIST rt-tests-1.10.tar.xz 112300 BLAKE2B b38a7357b1402de94661014e71ed9fc48d9dde6cabbe72ed4031841b57f7fb76a01dda03c7888f11d8e5e9c11cda8281dae1b437f0d1ff971d2941547f659103 SHA512 9512419b364746ad490894c7184a391f0e8d571477ad636abff8ed473151c6f2c263475ca4aa7d498e81c18e17e42ae82260693b90bce4ef9889e0eaf0b77b58
+EBUILD rt-tests-1.10.ebuild 903 BLAKE2B 7c5eb3163b6fa132617f47043b0432ea0673a5b29c3b900f09d5cf372773445a5c4688498f15f732e6094c99173a612ac1a2735405dc991122fdecc0baf0f942 SHA512 0ab43ea8a5abf2d28324c0a1f61e00b65389a48a113daa7cac2c250a88b92e3eb1d28e1fc53ddaa90f0992b760f6cca55358256f21409a27f33dedad486907bc
 MISC metadata.xml 718 BLAKE2B e09ef2dd4bd98df6e36e684105242e579fd86dfa28fd02f6b04ea78f91dc2089485a54497edb0a9a1b3c36fe5033eb1e98b626735b82d2a765150812f724bb93 SHA512 8b7eb83545e11f2f5786f0e5fbc47ce15fbb9a364ad9fcf51a7c47e8a05e70d3d0c48c2f69b5f6abd4b839514bc2575a66a43202204340137ec3d8a9f41564e1
diff --git a/dev-util/rt-tests/files/rt-tests-1.9-musl.patch b/dev-util/rt-tests/files/rt-tests-1.10-musl.patch
index 0114cd004473..2dc17d504922 100644
--- a/dev-util/rt-tests/files/rt-tests-1.9-musl.patch
+++ b/dev-util/rt-tests/files/rt-tests-1.10-musl.patch
@@ -1,4 +1,4 @@
-From fd78f200ac8e9d1eb7579cd9e4adaaa1a4dc2d46 Mon Sep 17 00:00:00 2001
+From 0b7a1e0d3463aa8aa4b7dcad0ec154e658d68036 Mon Sep 17 00:00:00 2001
 From: Kurt Kanzenbach <kurt@kmk-computers.de>
 Date: Wed, 1 Apr 2020 20:15:24 +0200
 Subject: [PATCH] all: Fix musl build
@@ -16,7 +16,7 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
 ---
  Makefile                              |  5 --
  src/backfire/sendme.c                 |  1 +
- src/cyclictest/cyclictest.c           | 68 ++++-----------------------
+ src/cyclictest/cyclictest.c           | 70 ++++-----------------------
  src/hackbench/hackbench.c             |  4 +-
  src/include/musl.h                    | 28 +++++++++++
  src/lib/rt-utils.c                    |  1 +
@@ -26,11 +26,11 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
  src/ptsematest/ptsematest.c           |  1 +
  src/rt-migrate-test/rt-migrate-test.c |  1 +
  src/sched_deadline/cyclicdeadline.c   |  2 +
- 12 files changed, 50 insertions(+), 66 deletions(-)
+ 12 files changed, 51 insertions(+), 67 deletions(-)
  create mode 100644 src/include/musl.h
 
 diff --git a/Makefile b/Makefile
-index c3ebbd7b2a2e..8815c113c0df 100644
+index 636f1914a777..01732ee2647f 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -7,7 +7,6 @@ OBJDIR = bld
@@ -41,17 +41,17 @@ index c3ebbd7b2a2e..8815c113c0df 100644
  	  pmqtest.c \
  	  ptsematest.c \
  	  rt-migrate-test.c \
-@@ -36,7 +35,6 @@ LDFLAGS ?=
- PYLIB  ?= $(shell python3 -c 'import distutils.sysconfig;  print (distutils.sysconfig.get_python_lib())')
+@@ -42,7 +41,6 @@ ifeq (${PYLIB},)
+ endif
  
  MANPAGES = src/cyclictest/cyclictest.8 \
 -	   src/pi_tests/pi_stress.8 \
  	   src/ptsematest/ptsematest.8 \
  	   src/rt-migrate-test/rt-migrate-test.8 \
  	   src/sigwaittest/sigwaittest.8 \
-@@ -129,9 +127,6 @@ deadline_test: $(OBJDIR)/deadline_test.o $(OBJDIR)/librttest.a
- signaltest: $(OBJDIR)/signaltest.o $(OBJDIR)/librttest.a
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(RTTESTLIB)
+@@ -130,9 +128,6 @@ deadline_test: $(OBJDIR)/deadline_test.o $(OBJDIR)/librttest.a
+ signaltest: $(OBJDIR)/signaltest.o $(OBJDIR)/librttest.a $(OBJDIR)/librttestnuma.a
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(RTTESTLIB) $(RTTESTNUMA)
  
 -pi_stress: $(OBJDIR)/pi_stress.o $(OBJDIR)/librttest.a
 -	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(RTTESTLIB)
@@ -72,18 +72,18 @@ index d963723b1c93..b355bbbcfece 100644
  #include <utmpx.h>
  #include <sys/types.h>
 diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c
-index b41d42f13f24..56b27a4e0547 100644
+index f38c453f1975..b6b91218f756 100644
 --- a/src/cyclictest/cyclictest.c
 +++ b/src/cyclictest/cyclictest.c
-@@ -36,6 +36,7 @@
- #include "rt_numa.h"
+@@ -37,6 +37,7 @@
  
  #include "rt-utils.h"
+ #include "rt-numa.h"
 +#include "musl.h"
  
  #include <bionic.h>
  
-@@ -501,12 +502,8 @@ static void *timerthread(void *param)
+@@ -500,12 +501,8 @@ static void *timerthread(void *param)
  {
  	struct thread_param *par = param;
  	struct sched_param schedp;
@@ -96,7 +96,7 @@ index b41d42f13f24..56b27a4e0547 100644
  	struct thread_stat *stat = par->stats;
  	int stopped = 0;
  	cpu_set_t mask;
-@@ -537,14 +534,6 @@ static void *timerthread(void *param)
+@@ -536,14 +533,6 @@ static void *timerthread(void *param)
  	sigaddset(&sigset, par->signal);
  	sigprocmask(SIG_BLOCK, &sigset, NULL);
  
@@ -111,7 +111,7 @@ index b41d42f13f24..56b27a4e0547 100644
  	memset(&schedp, 0, sizeof(schedp));
  	schedp.sched_priority = par->prio;
  	if (setscheduler(0, par->policy, &schedp))
-@@ -599,20 +588,6 @@ static void *timerthread(void *param)
+@@ -598,20 +587,6 @@ static void *timerthread(void *param)
  		stop = now;
  		stop.tv_sec += duration;
  	}
@@ -132,7 +132,7 @@ index b41d42f13f24..56b27a4e0547 100644
  
  	stat->threadstarted++;
  
-@@ -620,16 +595,10 @@ static void *timerthread(void *param)
+@@ -619,16 +594,10 @@ static void *timerthread(void *param)
  
  		uint64_t diff;
  		unsigned long diff_smi = 0;
@@ -150,7 +150,7 @@ index b41d42f13f24..56b27a4e0547 100644
  		case MODE_CLOCK_NANOSLEEP:
  			if (par->timermode == TIMER_ABSTIME) {
  				ret = clock_nanosleep(par->clock, TIMER_ABSTIME,
-@@ -751,11 +720,6 @@ static void *timerthread(void *param)
+@@ -749,11 +718,6 @@ static void *timerthread(void *param)
  
  		next.tv_sec += interval.tv_sec;
  		next.tv_nsec += interval.tv_nsec;
@@ -162,7 +162,7 @@ index b41d42f13f24..56b27a4e0547 100644
  		tsnorm(&next);
  
  		while (tsgreater(&now, &next)) {
-@@ -780,17 +744,6 @@ out:
+@@ -778,17 +742,6 @@ out:
  		pthread_mutex_unlock(&refresh_on_max_lock);
  	}
  
@@ -180,7 +180,7 @@ index b41d42f13f24..56b27a4e0547 100644
  	/* close msr file */
  	if (smi)
  		close(par->msr_fd);
-@@ -1305,7 +1258,8 @@ static void process_options (int argc, char *argv[], int max_cpus)
+@@ -1159,7 +1112,8 @@ static void process_options(int argc, char *argv[], int max_cpus)
  		case OPT_VERBOSE: verbose = 1; break;
  		case 'x':
  		case OPT_POSIX_TIMERS:
@@ -190,7 +190,7 @@ index b41d42f13f24..56b27a4e0547 100644
  		case '?':
  		case OPT_HELP:
  			display_help(0); break;
-@@ -1338,13 +1292,6 @@ static void process_options (int argc, char *argv[], int max_cpus)
+@@ -1192,13 +1146,6 @@ static void process_options(int argc, char *argv[], int max_cpus)
  		}
  	}
  
@@ -203,8 +203,8 @@ index b41d42f13f24..56b27a4e0547 100644
 -
  	/* if smp wasn't requested, test for numa automatically */
  	if (!smp) {
- #ifdef NUMA
-@@ -2038,7 +1985,6 @@ int main(int argc, char **argv)
+ 		if (numa_initialize())
+@@ -1881,7 +1828,6 @@ int main(int argc, char **argv)
  
  	}
  
@@ -212,7 +212,7 @@ index b41d42f13f24..56b27a4e0547 100644
  	mode = use_nanosleep + use_system;
  
  	sigemptyset(&sigset);
-@@ -2088,16 +2034,18 @@ int main(int argc, char **argv)
+@@ -1931,16 +1877,18 @@ int main(int argc, char **argv)
  			void *stack;
  			void *currstk;
  			size_t stksize;
@@ -221,8 +221,9 @@ index b41d42f13f24..56b27a4e0547 100644
  			/* find the memory node associated with the cpu i */
  			node = rt_numa_numa_node_of_cpu(cpu);
  
- 			/* get the stack size set for for this thread */
+-			/* get the stack size set for this thread */
 -			if (pthread_attr_getstack(&attr, &currstk, &stksize))
++			/* get the stack size set for for this thread */
 +			err = pthread_attr_getstack(&attr, &currstk, &stksize);
 +			if (err != EINVAL)
  				fatal("failed to get stack size for thread %d\n", i);
@@ -234,7 +235,7 @@ index b41d42f13f24..56b27a4e0547 100644
  
  			/*  allocate memory for a stack on appropriate node */
 diff --git a/src/hackbench/hackbench.c b/src/hackbench/hackbench.c
-index 2cddff654df6..46f09fa9e7ba 100644
+index 268c23233004..bbbb29a3a430 100644
 --- a/src/hackbench/hackbench.c
 +++ b/src/hackbench/hackbench.c
 @@ -24,13 +24,15 @@
@@ -289,7 +290,7 @@ index 000000000000..ea5075e768c8
 +
 +#endif /* _MUSL_H_ */
 diff --git a/src/lib/rt-utils.c b/src/lib/rt-utils.c
-index f786588706cd..c1a55272dfdb 100644
+index 2d68d62cd875..529d427c8084 100644
 --- a/src/lib/rt-utils.c
 +++ b/src/lib/rt-utils.c
 @@ -23,6 +23,7 @@
@@ -327,7 +328,7 @@ index 97a345edd26e..1028d344edff 100644
  #define TIMEOUT 2
  
 diff --git a/src/pmqtest/pmqtest.c b/src/pmqtest/pmqtest.c
-index 5db8d348cdf8..2de6c1417e4a 100644
+index 5f7a24d55db6..555679cf36ef 100644
 --- a/src/pmqtest/pmqtest.c
 +++ b/src/pmqtest/pmqtest.c
 @@ -24,6 +24,7 @@
@@ -339,7 +340,7 @@ index 5db8d348cdf8..2de6c1417e4a 100644
  #include <pthread.h>
  
 diff --git a/src/ptsematest/ptsematest.c b/src/ptsematest/ptsematest.c
-index de8ea2fe1b0c..1568f3b78711 100644
+index 2e392299fdc4..b45d35755865 100644
 --- a/src/ptsematest/ptsematest.c
 +++ b/src/ptsematest/ptsematest.c
 @@ -22,6 +22,7 @@
@@ -351,7 +352,7 @@ index de8ea2fe1b0c..1568f3b78711 100644
  #include <pthread.h>
  
 diff --git a/src/rt-migrate-test/rt-migrate-test.c b/src/rt-migrate-test/rt-migrate-test.c
-index 4863238edeb4..9f1aba159dc7 100644
+index 9bf716c9178c..f51d388d9150 100644
 --- a/src/rt-migrate-test/rt-migrate-test.c
 +++ b/src/rt-migrate-test/rt-migrate-test.c
 @@ -25,6 +25,7 @@
@@ -363,12 +364,12 @@ index 4863238edeb4..9f1aba159dc7 100644
  int nr_tasks;
  int lfd;
 diff --git a/src/sched_deadline/cyclicdeadline.c b/src/sched_deadline/cyclicdeadline.c
-index a08e28e73c42..675a0ea1a162 100644
+index 98eb367248ac..45b27f72a5a7 100644
 --- a/src/sched_deadline/cyclicdeadline.c
 +++ b/src/sched_deadline/cyclicdeadline.c
-@@ -32,6 +32,8 @@
- #include <rt-utils.h>
+@@ -34,6 +34,8 @@
  #include <rt-sched.h>
+ #include <error.h>
  
 +#include "musl.h"
 +
diff --git a/dev-util/rt-tests/rt-tests-1.9.ebuild b/dev-util/rt-tests/rt-tests-1.10.ebuild
index cb4f2d293518..2a930acd4b6f 100644
--- a/dev-util/rt-tests/rt-tests-1.9.ebuild
+++ b/dev-util/rt-tests/rt-tests-1.10.ebuild
@@ -32,7 +32,7 @@ src_compile() {
 }
 
 src_install() {
-	emake prefix=/usr DESTDIR="${D}" MAN_COMPRESSION=none install
+	emake prefix=/usr DESTDIR="${ED}" install
 	python_fix_shebang "${ED}"
 	python_optimize
 }
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index 4c6c663233e4..7bcc1139227b 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -12,7 +12,7 @@ DIST scons-4.0.1-user.html 1415152 BLAKE2B 1a94b2ef5e076d883f2960825f055c7cc39cf
 DIST scons-4.0.1-user.pdf 2468804 BLAKE2B f0af6bc6b41d972b98e955ee3ccec908aa366eabe31bd01022abe1f6d3a94dd6d7da26f71de23a6dfbcbc7bb4e439463f69bb7e8a5780c1300e3ba508b9eb314 SHA512 0d2733e2f1391083522a64117bfd35a2160d1366382f6f630b26eba36fc12ce797467d5e16efeb3b7f58aa9d853f96ae0d50fe78f59e78d24642b146bc7e565d
 DIST scons-4.0.1.gh.tar.gz 5578800 BLAKE2B f9ece5eaf1b133219f975e484beb5df726560a38969b8e8ad829781b960b438458bfcd7971333da87560c957675b2a4f8675e757fb0a4268cc4ecf72bb60d45f SHA512 f23c5dfd3c236e9f9f85b986ca64a36dbd85e9f3383cb3577e082a7dea4b83283020fbf064c2d919ab116195c6708fc11f906fcf3b0bc0533a4bc49a4f7371c6
 DIST scons-4.0.1.tar.gz 2874481 BLAKE2B 98377e62ae31d32758a93c4e04c578b88ea541cc292af63c6ca43e2948745e416ee6d757d98129ee30d0e0bbab90664889441a5bb86d4c9dfc649ca1dbef7536 SHA512 400b11323d48f04395b519dfafb6fce15a6dea92013f599dc4895b112629c0a06c7d2806755c74047d001d60087b94f39a118f512b7ee8de6214a4ffc7310468
-EBUILD scons-3.1.1.ebuild 1569 BLAKE2B 316c0f94ab8e17d91245401d9b2cccd35908e67c71413e6778586e97c8618fac9a157cdb573b131793b5b57eab506d1535527ce0af2617e9eef1a2c5f16661cc SHA512 1ac845dab5fef8cf70cd2df90a91b7d762447eb50f56e47eaa9f88fb8ad9137c7d5089d789e1dff0814105792436d3e1471271bd6ccf645d9cc3b00a997d98e2
-EBUILD scons-3.1.2.ebuild 1693 BLAKE2B ec64a596efa07156828d5354fef08c3d0965a5cc022d3c704ef05ba0f2186da9784a740b10cee69dc69b7e9eb75fe8752d32fcab7fd8e10bfcb602eebf74cb7a SHA512 fa6168e8bc71108cd5231a2c51eb856919d798d78ed760cccd79c180610a438ae8be3a7ce68945edd76424a8152d44a5bd5d0f3b3a0c38f4c43c4c1963e9b81c
-EBUILD scons-4.0.1.ebuild 2874 BLAKE2B 4f465a56629c5d51c8e03ace75373c10de07a06278154c65441b03d3e97a010a7b91e861dc6a390878258eeb0d483220176bd662a38aba969b085c66cc9db0ab SHA512 ef66f20999891aa4e47bb267f9f44d568a61a07922a067cce3a89b9509a6be7e2ae580c9b564e53f3a05c4eeb8ec25f4ce24afaa3e58689cae610beeb5789c4b
+EBUILD scons-3.1.1.ebuild 1570 BLAKE2B b2da4462ce2b7ce0e4e0617e2e283bf4ae4665c24957c7d00f00e70c4227fda402ece29a3b541f42cc0c5a32c5cfbcf801a04e59af7b14784757da5126cbb7d1 SHA512 d20cc10aacc4225a530ce3275e4da19cef99a423db9008d89b95be3f8bf7778aab93d56f2b8da0c3b16c66445474cf9fc4b3de7c2501427c47ce176897b81db3
+EBUILD scons-3.1.2.ebuild 1694 BLAKE2B de1dbba6f008bd669e10145e22677eeea3df7cee4afd1c710a86d655806d92a3bfced4ca25ba2e85f37ffe2c288a7bac0e43017ee0d81efed20bf8ed1c938554 SHA512 c2a6bf9efb8000282482377d485b81376224f3f4d8da039e5764eb7514cdbebaebaf931b367655ca2d4fff73121125dd8e4c057219d9a60f3e1dd091b5bd5380
+EBUILD scons-4.0.1.ebuild 2875 BLAKE2B b53cc0cc3c91875552f6672c849340ec9a897c06b1392c75ada85085e49395e6f8f46598bbfe3607f520f1ec1d29646a10894219ae65f37c9d1210a1e49e9780 SHA512 69ca38406e85be9fb8ea6199c9b7efc9b725b4c6ee95dd05bb5d4c3be1cc2493641aae6e9d83e447b11142815e2f6a414a7e1c0aa4b0a4b70a9f46b5f28d8bd3
 MISC metadata.xml 704 BLAKE2B 448bfef70e4f230008c21d8e542618a52f9761295ed33f1c7385a2a678bcb29d1028792e221441f9ba61fecb34646f5ef0f04795e28b17e8d4aeacbabf8751f2 SHA512 62e5c8c23f1c67c218ff6b33c1f941ac3c258b39a5b2d799bedceb734aa5b2e29a718f90823ab5bf199e9d1eb8236aefaddcbff99c6d03f58987fb4936b10aa6
diff --git a/dev-util/scons/scons-3.1.1.ebuild b/dev-util/scons/scons-3.1.1.ebuild
index e802cfc3d555..f87b3b60ae1d 100644
--- a/dev-util/scons/scons-3.1.1.ebuild
+++ b/dev-util/scons/scons-3.1.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 RESTRICT="test"
 
diff --git a/dev-util/scons/scons-3.1.2.ebuild b/dev-util/scons/scons-3.1.2.ebuild
index c080cb8a5c1f..6c1602751304 100644
--- a/dev-util/scons/scons-3.1.2.ebuild
+++ b/dev-util/scons/scons-3.1.2.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 RESTRICT="test"
 
diff --git a/dev-util/scons/scons-4.0.1.ebuild b/dev-util/scons/scons-4.0.1.ebuild
index 410ffd8f581f..a87b6850ed95 100644
--- a/dev-util/scons/scons-4.0.1.ebuild
+++ b/dev-util/scons/scons-4.0.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/shadowman/Manifest b/dev-util/shadowman/Manifest
index 5a30c25d0082..e1ac4917fa28 100644
--- a/dev-util/shadowman/Manifest
+++ b/dev-util/shadowman/Manifest
@@ -1,4 +1,4 @@
 DIST shadowman-2.tar.gz 3349 BLAKE2B 2881c0487205c00114967be7600ef5483cc64c7ad5ed5cac60fe8bf2ca17e5b06d5df6e39148d90ff68a51d3e918ca616d0c5eedf11366df90c788a07e4c63b0 SHA512 eeb10248c7f76116352bffa671ab7c761b2f79cb943de20dba327b0d7bf1126d15021508c9e9389b9f0c37cf5049ad2c67bad93f6a03340fcfd27e03c4969110
-EBUILD shadowman-2.ebuild 670 BLAKE2B 9725aa2930deff527ba3094648edf814ae42933eeccbdddc52a34d484a5f3d98ce9cdddce134e102e25336e143356b0077484efea157989043c7dd6dc24636c7 SHA512 376608dd1cffded8e7e58e9ee9e2e79517c9b33c2ab07628449839b858492d065bb9370eab55ef7617deacab3033c2cacbd686a4c2d0c070c7d5e356d9e5b3df
+EBUILD shadowman-2.ebuild 671 BLAKE2B b9c05221df890fdf261dcd84d2005ca5726b824fe91ef8af7dafe97c6c6883d1322ca1117ab3a84116d21446dc9ba04791537109edfb4ddef56d93c5b2b1382e SHA512 81e0c0a7907868019e0c3e5138a93e18d07e42a269a51aee8bbb83f01cc08d46ce738694730eff1d3013cde5c942a6df4d836a4a4b90f3980191affc56ba9dec
 EBUILD shadowman-9999.ebuild 568 BLAKE2B 199779d69123dae88d3024a00370b24a898f40ce7aca43257e0dfd3a9747f5b969133cffce9aa70ff1fa0555a18442e4170829df7d27d397ea10b96136a76524 SHA512 4325db35429e59387690b10c09e86268e79e3a4a5e968075f36155fbcd5af7e0ec0a79b6a08b6e9e74ea5cad6727be0697abebcc63ba48c7449cd54141edd794
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-util/shadowman/shadowman-2.ebuild b/dev-util/shadowman/shadowman-2.ebuild
index f072c802effb..1f8ac445a79e 100644
--- a/dev-util/shadowman/shadowman-2.ebuild
+++ b/dev-util/shadowman/shadowman-2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mgorny/shadowman/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-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"
 IUSE=""
 
 RDEPEND="app-admin/eselect"
diff --git a/dev-util/shflags/Manifest b/dev-util/shflags/Manifest
index b4d0d336a2a9..11e2ab57a558 100644
--- a/dev-util/shflags/Manifest
+++ b/dev-util/shflags/Manifest
@@ -1,5 +1,5 @@
 DIST shflags-1.0.3.tgz 43549 BLAKE2B 2f5376dc9589eb63133857dd48fde5bd9aae48b31d1f94a97c1d9d3f505d48ee1586a2e6a6f7b44ae85be26b4e7643beee2cdc47a5f3c3ff1a69379f174d98eb SHA512 993f5b274855d5dea5d01d3a799cfd5ff6c5ff2bf153461983052a78d8a96f9b0ee44124b4c51977baa4905c86a3293778c5d7e154305ee051fcac03f6fe70cc
 DIST shflags-1.2.3.tgz 42253 BLAKE2B 4837d31762129790659b67d4025cf8627ca5db32225ac61b437a5ba6bf9f894c87976d06dd5e5039a5ad4b7a0b7b173cc7f96fc3a11dc3c2ac797de2c749a8ed SHA512 5bddebce14e516fe37b2b1631d5aec54651ee728e538dfb0fcc68d32b79d335c7b48f5ef5aab99dd730de3b8fd556a6640db9b9ae2a7753feb6aa1e0831b64af
-EBUILD shflags-1.0.3.ebuild 628 BLAKE2B 480e47ff6f6a76724df5ea404c95e8c02bd9120f50931b46d19c155321dd1963e1208ad64e8a33c97ddf61d852d6e1692c4a14904bbe2875c9c2d83e35f451f6 SHA512 e74ebbc0240e843f49e84b99bd518c296416c572f0bbe6e2d1166beda6c2dfce32aac652ad8ddd056368a9feb58da3d66a9e894b25f0a2c7ad989543d98fd99c
-EBUILD shflags-1.2.3.ebuild 581 BLAKE2B 00968d01ce894edb19a70ffe5e81a19cc9a1bfe3abcf4c729fdb14c0f7bfb29cfe6f30598916745ca8f830f6900ab91c404bc3bde8af1059519588ec73a99523 SHA512 4054721ce78c20c34a28e9e6c3c16160f4bf3bf85b5aa34156764b74458bcf97e57d6a68d7eadb363b257d4c5ee5988c8a6a7231b42db9df491fc08c826931c0
+EBUILD shflags-1.0.3.ebuild 629 BLAKE2B a95db6d24ea1fe4122ac77e3211dc8953fc9e6ee53fa9b9e285eb0ce7efd9eae96fa550c5d07be97a06401b43919a1d3852f8e925980d92832abd2505de1d40d SHA512 0619ffd35f51f038c3d1d0e00c75e7ac97c302c61e9dd3da3799b8f23f2772472445b26c9feff7dee1f901b7da4658b367f3b4e22bafe14aa70a1b50f2368bd2
+EBUILD shflags-1.2.3.ebuild 582 BLAKE2B de3030c851d9d84e74f94ec5b31e2e6643da2cb368bdaf2ed8d4a0bf5e3371e067cfbc9995d46541038392ff16fd009e0815c5f6f023242ea03ddb5540698a03 SHA512 52a462369358190db0890bc609e3dbdd764b1b63b74225a1c66f888b31cc9008be30be3632bfd107ad17e4d82f4e9122d96e88e97234c2c18bc32cbd2fe78774
 MISC metadata.xml 395 BLAKE2B 771aa58612fb4b5b7502bb3ce0b98eeea7449b3c56fe57b2de23cddec6c4041dea7d4f61cbf29f95bdfbd87c4b1bbb24eba62b255b7b4c7e05ff7710112e7dce SHA512 d5cec821871007bded7b69b96c3a36ff84b5756c97dc21d8e18af460e6218d176f019771843b9bb3e8cd940226c8d121057a3dcc1345bec0771ed301dac9bcc6
diff --git a/dev-util/shflags/shflags-1.0.3.ebuild b/dev-util/shflags/shflags-1.0.3.ebuild
index e3b2d116e4fa..b03ab47675da 100644
--- a/dev-util/shflags/shflags-1.0.3.ebuild
+++ b/dev-util/shflags/shflags-1.0.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/kward/shflags/archive/${PV}.tar.gz -> ${P}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-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"
 IUSE="examples"
 
 src_test() {
diff --git a/dev-util/shflags/shflags-1.2.3.ebuild b/dev-util/shflags/shflags-1.2.3.ebuild
index 90397e69e81e..87735aff81d9 100644
--- a/dev-util/shflags/shflags-1.2.3.ebuild
+++ b/dev-util/shflags/shflags-1.2.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/kward/shflags/archive/v${PV}.tar.gz -> ${P}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-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"
 IUSE="examples"
 
 src_test() {
diff --git a/dev-util/shtool/Manifest b/dev-util/shtool/Manifest
index de2c41240c4f..c9c6f838c204 100644
--- a/dev-util/shtool/Manifest
+++ b/dev-util/shtool/Manifest
@@ -1,3 +1,3 @@
 DIST shtool-2.0.8.tar.gz 97033 BLAKE2B 05096c0cf4a20ea86a77db59b4d4e0f8431d1cc331c3dbaeac089dc7fcf89cb1ad391b731dab8d31bf010dfe9129a2710f71657600953464b59e0062eb7a7254 SHA512 f0c9292e8d980323d587b70e582574ba1cfe3c26296a01d51a2068a7886e5b1f501e8c5dc37b5d4b0f7a34217c7ad7f6f3011969d9c2d65776fe66e8287c1758
-EBUILD shtool-2.0.8-r1.ebuild 487 BLAKE2B ebdc9879b9d173288ff2a96670b4eedb8f3fddbc5da57ec20fb0c182aab80d2145a00a787b28814db8a5a565868640d253766b1b9e1b18fa2835fbbbfb8160f1 SHA512 68e3fc58fef27446f31e6f9315ef9035c3952e61f64ca1ecf496fdb33cb49d536a6519dba75b82a7bb868357bb8c75abd6f644dd32aa8542ece4af1fc0d0a5a2
+EBUILD shtool-2.0.8-r1.ebuild 488 BLAKE2B 5f0ff691d749d931d31fb987983369b5993fa99ce673895b27be31e573ceaf0da51960a12a70251aecb12df7849fd2a9b160fe4c2147d286f6e597962b0b16d3 SHA512 95a2abc18796716296e5c700e3f55540d1220a4e174b4f6ba2efd7824776b5b267e55ebd5799f77c98da7efb9650fe47d84ef5d9b4c83fed108cfb7bdd86be9b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/shtool/shtool-2.0.8-r1.ebuild b/dev-util/shtool/shtool-2.0.8-r1.ebuild
index fc1deae5b6e4..993cd50fb8cd 100644
--- a/dev-util/shtool/shtool-2.0.8-r1.ebuild
+++ b/dev-util/shtool/shtool-2.0.8-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ~ia64 ppc s390 sparc x86"
+KEYWORDS="amd64 arm ~hppa ~ia64 ppc s390 sparc x86"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/dev-util/source-highlight/Manifest b/dev-util/source-highlight/Manifest
index d50152921654..448c068ac74b 100644
--- a/dev-util/source-highlight/Manifest
+++ b/dev-util/source-highlight/Manifest
@@ -1,5 +1,5 @@
 AUX source-highlight-3.1.9-test-clang-p1.patch 998 BLAKE2B 7867aff751170990c48343977f6d92380c1f84ad8f18d9def453b39c6e6a8b97f23727f6cb1419f0b9d82f0fc368517d19f321f23752410ba84fb1cf6335d5dd SHA512 b64f44a9f5c1fff05aaa1a6f025d61cc095e9f22944a1983aca457085f348535ad27a7b7f79ec6358f64fc72fa0869ee3c22659f44f1a0d105ef23d68f466c32
 AUX source-highlight-3.1.9-test-clang-p2.patch 1413 BLAKE2B f66b090bb5004cf4ee344868479b1a1999339d71799e6e6150104f99c0a8ea5ffebe836b8d185ecb52416aaed6da80e24c5870910274ce381cfab6ab3276035c SHA512 a6573d376753dda6e8f64dd9b81c4e8f209ea5cb3dee1dc9a495db6b671d88840baa2fd9c128085cb62d9acbc41e1f88d3a9e6a319b76199755b43008d7ab0de
 DIST source-highlight-3.1.9.tar.gz 1717234 BLAKE2B 6eb40b2274df0772c4a241504e5db5dfdaac600549e0b11aba726f7b4d5ab600c3849a8815bc782ad1bb1f99b69766527645dd202731bde4b2466c663842c47c SHA512 d8e154e9a5d62c77807e4e5d36c0faed5ce2964291be5f8b83e2968a6de52229503689a4ca2109a717ae2632a14b63ec937ca0430c91684c72063f6bc0294195
-EBUILD source-highlight-3.1.9.ebuild 1505 BLAKE2B a630a478ced8369ceb95e8b9cf8bd934444da64cc128079d6385c92fc329911e313deebf5d50bad1d5c4faacabef9a8501ec6859cff8e745e6b0f827a0f4853f SHA512 d59500bb398d6a2e89382c22514dd364af3f26bb698acd5392e14ecd966edbfb3bb2558295beaace6f1e7b279318194ac36c2a6fbf11bdbc5a4be5c34bbcb4db
+EBUILD source-highlight-3.1.9.ebuild 1506 BLAKE2B a648dea7d2e2b7c079fb44a5ceb6e6e4bcabb452857284fc0b290bd4a952c670b809a318da2ce02631cd9950ded3f33efbbc0b8f729644330b0998a4c9c25ced SHA512 f08711abe531da9e8d16a217838cbc73f06cdc3dfb10c5a05f9ecc8a133d13daa4ff27de8e138ee759a14f0f274345144ab701bb68198128741acfe94db725e6
 MISC metadata.xml 267 BLAKE2B 5267526ad53ec7bedfe46f8cba86c810629394fa4f3c59e1b69619b0a11a9edbb746ae6abf818182da7ade72c862360f43a19209007a23da9701df26b96f77dd SHA512 715bb37d958c1e508b2ef00711ab3a4abee982efe90867fd2bcf91fa91305d5a413a4f3d13d01ea6e27eb15f5f9dcb58fa13ecfed7025cae43745792ac1a105d
diff --git a/dev-util/source-highlight/source-highlight-3.1.9.ebuild b/dev-util/source-highlight/source-highlight-3.1.9.ebuild
index 3568b4c32e0d..b1c45796a647 100644
--- a/dev-util/source-highlight/source-highlight-3.1.9.ebuild
+++ b/dev-util/source-highlight/source-highlight-3.1.9.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Generate highlighted source code as an (x)html document"
 HOMEPAGE="https://www.gnu.org/software/src-highlite/source-highlight.html"
 SRC_URI="mirror://gnu/src-highlite/${P}.tar.gz"
 LICENSE="GPL-3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 SLOT="0"
 IUSE="doc static-libs"
 
diff --git a/dev-util/splint/Manifest b/dev-util/splint/Manifest
index e53eeebf3861..ea1679f7f33a 100644
--- a/dev-util/splint/Manifest
+++ b/dev-util/splint/Manifest
@@ -1,5 +1,5 @@
 AUX splint-3.1.2-musl.patch 232 BLAKE2B 1d802cba805a993ccec83b2beeefba3f7971fe31d4c20f03082538aa47ff3614fa8c270a6011c21745c85ad9325884d7447446dcc415995909bcedf1fcf10f9d SHA512 4e74cd5181848c3babf3a6d6687eb6d274be1549f26b7817b2c3fa4c0cee048c841d71a28931ae4db21c0c67154cff536218e7ace6d6e5ba4c7eccb7a800790f
 DIST splint-3.1.2.src.tgz 2284033 BLAKE2B b071092ddb82be76734e00cdc8f96b697c20d0beaeba921b74464ac0b1f727c396f8f15845cf8c6c20011186e4da00199411545e0e167fcb9ce4ef2b27efa975 SHA512 9bbf3f6575763c022940efde947f845f52095a1bcf645f7f4a98feb335b62d2bd50d78420e7fe95f81eb139b110d8fe48112b025deace45f7994360b20d47e0b
-EBUILD splint-3.1.2-r1.ebuild 1001 BLAKE2B c96b4fdeeba281d26aa346a77bfa091934421215add9b6c81a93cc820f3ae16c5a20e023774e38b88e81a888a7dc5ee1c0e33626f4ae93537505866f93b937ae SHA512 8e4f2feb30a17f713410328823e9c44af8bf7ca2df44fc1504314cebffad44e1395c1e2ad185f24ea846456b79278ded4cfd8f799f2defebaa2061edfb53533b
+EBUILD splint-3.1.2-r1.ebuild 1002 BLAKE2B 1245ae2889260c419c4438d5ae4782b46eee20b9955a9674b18b95e299ec050cee320aabf0b9c5edfea80ae5c9e0ce95122a7fdbd02e2e8c92da360ac20e9db7 SHA512 630a9f75a98652afee95b89ad820a02dd43808594fb90a011247e14d0ca4f53fc3555b84dcf4577c3384688a76682997b7122c613fed182577c84b0b5e1e3502
 EBUILD splint-3.1.2-r2.ebuild 1104 BLAKE2B 34018ff5595437b51568457c6432c556a34cf4b3b18ccc2e10e487d594e7f743bd7971ccbb60172772570d77b16f42fb53e6a69e42384117dd354d336fa48f2b SHA512 a1c3235f37727e8edc66b23ea6527996b5074adc9492b54b095583a37ae094d988064e8583ba38665c386a6029f956c0f737b8d782cef80a94d18097a024f77d
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/splint/splint-3.1.2-r1.ebuild b/dev-util/splint/splint-3.1.2-r1.ebuild
index 6b04a9b7874a..8607d4e30a59 100644
--- a/dev-util/splint/splint-3.1.2-r1.ebuild
+++ b/dev-util/splint/splint-3.1.2-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.splint.org/downloads/${P}.src.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86"
 
 DEPEND="
 	sys-devel/flex
diff --git a/dev-util/treecc/Manifest b/dev-util/treecc/Manifest
index 446bed7939d9..5efb0c7a2c07 100644
--- a/dev-util/treecc/Manifest
+++ b/dev-util/treecc/Manifest
@@ -1,3 +1,3 @@
 DIST treecc-0.3.10.tar.gz 375762 BLAKE2B 1d4fb6905226d79bef021808639f011731cd665b76db07efbf0ab4285c35986c1efa99381694ab5ddbb20131a8bef0d26b677d1b3e5311f2fe8fa99b1a575efb SHA512 426add1a96913a169a0f03a6e3247a8b48c9073335cf967ef05d4d4188fbe3b8ebc837b38b9a4de94ccdb13685ace47a91b185c75a845cf2670e929802774b73
-EBUILD treecc-0.3.10-r1.ebuild 996 BLAKE2B 377d87a4f61b844817152524ce63013588e0ebb34dd74cf8d785e2c4a8c27218270b9395ae86c168c9d1c3e70e12617696e1b310119683faa79cf78d3c85941d SHA512 6d5fe7205e90fe3ee6d2b25562746057de08c5d92f571179db1e1175b81f6f4318c1c7fa1a50b80b0293235613055a0708a7c3eedb68d6324201de5b142350e8
+EBUILD treecc-0.3.10-r1.ebuild 997 BLAKE2B 5ff09eed8888b2af5b76f62a7e832b98b68db6027667a507c88f0a958661986291856aa7f4380dfb1213b72bd138deb1afcd1dabd9097ed84718034a46f48a50 SHA512 9163c715f7abc0dbcd7ae5524a4cacacdb9d29c05012b04ca6419a69a51660f71920f11a8d26ffe05e6a8314939d0574029cb6f5cfe2df410f2a967d95ee5ce6
 MISC metadata.xml 251 BLAKE2B 102da490c04b5ec767aebd0f076ea9aa083ec51416f584daad83e4202bd51e7182e95b7c1c98125c2a9da29eaa6b97dd4d9825c9d72e9c89d85d209e89031f48 SHA512 9b3d8ef0e933c58ceeae768b5e07fec1aba98d2f0add71719bcdec0e571b503b102610c0c4cbc322cc15638547e2f26f149d80c1498edb10b16a874014ae20d0
diff --git a/dev-util/treecc/treecc-0.3.10-r1.ebuild b/dev-util/treecc/treecc-0.3.10-r1.ebuild
index b7f084dfe7cc..a543a684d021 100644
--- a/dev-util/treecc/treecc-0.3.10-r1.ebuild
+++ b/dev-util/treecc/treecc-0.3.10-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://download.savannah.gnu.org/releases/dotgnu-pnet/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="doc examples"
 
 DEPEND="doc? ( app-text/texi2html )"
diff --git a/dev-util/txt2regex/Manifest b/dev-util/txt2regex/Manifest
index 442b09a07de5..d8eb91b93c27 100644
--- a/dev-util/txt2regex/Manifest
+++ b/dev-util/txt2regex/Manifest
@@ -1,5 +1,5 @@
 AUX txt2regex-0.8-disable-nls.patch 696 BLAKE2B fc29bbb2320f81cece70e9425d21a49abe03e9395c881e70bd23509388535fd56bcb38e8bc2a401a231a6dfd2902a70e0aa3714108164186f30d159d785d6753 SHA512 8b3fb8e37695d44078325687e8b7d4ac929578a03a46693f2854445a798f1ecfeae60d2da5212c395d00dae53eca63043865c8ea4a04d26a620d20c3a4aa1c7a
 AUX txt2regex-0.8-textdomaindir.patch 729 BLAKE2B 41971294ef8a693c72f00db26bf27ac85acbf9f1fb44869176107f29dffce9070a0e4662b2d1366e5806a247b7c61c86cd22db4dd8a8b6d52ca0e4d34f5b17ce SHA512 85178d5cb8cdf9b8faf11c4b66247c8c5102b8035825cb08a4aaf0d8a5148965260e4df85bf1ab5e3aeaa20dad9bbb5d6fa5a6ddc1576c9949eb48bcb6844aa0
 DIST txt2regex-0.8.tgz 40514 BLAKE2B 938f8ec41ec1319d96928ed38985626d906788a8c2959661c2338104527a0ade3a72e4d7e13f17b2f6f9abc2589ff2aaf88dc99077bf2fd6a82a82d186efc580 SHA512 69d2a682471e3e35fbd0b2ad6f6ffab040803a17bda8082f3dd67baf3a03e7011cb20047940fb9403e180895a1258f720ca4d538187878c5989a1ec51168435f
-EBUILD txt2regex-0.8-r3.ebuild 857 BLAKE2B 22a3b59384eae93e829b02d449464f290006c21860cb9178e66d59fb628accb367a5dfb23ab736c8aa9b6ed2b795a8651efaa438ad390b83dbf12960b5de35b3 SHA512 1541f9be4541a2805e4f236b5b2810f86162e0746858b94670c8877e76673f64b3073b012508ef81ed1971af5b1db54280b2a7ffb2413e87078ea6d8a25d03f1
+EBUILD txt2regex-0.8-r3.ebuild 858 BLAKE2B 96c591bd2a4978ec4d679077a4e56a514e6cbab2ea0c9de0224b8016694fede16fd5f9305bca372c350918a8df7487acbea688b100483005d907f03219dcee57 SHA512 2c1e6fc22d5fe7db0c2eaafd4d144ab84e12986ce37fe848a8741d32011a41f4a3ca66ea114cdd2500d5a53f7a7f77c4f11cf46d08e3d36959060655652c47d7
 MISC metadata.xml 344 BLAKE2B 651b9be422dadc59659b2e27801d6413b181095d3921b086638765a965e0ca956cedf71e004dc63dd7d665f6e34fa2f627d69fc2bde658443ce6eaacc5750878 SHA512 b16ae2357ca3ea0aaa63733fc657cf348df2ff8dca5f4471c8a828c63b535f6c4b0b658935081e14c8e5f40affeea743e3c6028f8d673e1f037ab61e93278731
diff --git a/dev-util/txt2regex/txt2regex-0.8-r3.ebuild b/dev-util/txt2regex/txt2regex-0.8-r3.ebuild
index 8a9b6231b029..dfd304b2d980 100644
--- a/dev-util/txt2regex/txt2regex-0.8-r3.ebuild
+++ b/dev-util/txt2regex/txt2regex-0.8-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://txt2regex.sourceforge.net/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 sparc x86"
 IUSE="nls cjk"
 
 DEPEND="nls? ( sys-devel/gettext )"
diff --git a/dev-util/unifdef/Manifest b/dev-util/unifdef/Manifest
index cfd1ab8704a4..e7e54b3c0071 100644
--- a/dev-util/unifdef/Manifest
+++ b/dev-util/unifdef/Manifest
@@ -1,7 +1,7 @@
 DIST unifdef-2.10.tar.gz 73285 BLAKE2B e13b75afc9b8e514559b8a13e3069bfb1cb489d21ce4ac56134921e702666bd9b23dad36d251cb65535e5d6fe02bea0d21a5610c542d727dc5e90d7e1726e4dd SHA512 39d4551f43fa8eccaee8a9fc469b5ddc8ca8eb0e0ce46c17c3a8300f7e6960fbf0960f364a83df20059b4aa623edc7c3c16df1b7162f068332e6c066d7ffe9b3
 DIST unifdef-2.11.tar.gz 77947 BLAKE2B 2ddc1a300b329ae91f72f1a8dad86443ba36fc02c7205eacafe1ec3ef82467003bb855c32485e6ca92b61dc45d160990b8aad531ace60ba3e55967f900150af6 SHA512 948abf878852da321f15c6060dfe33a2ab38f1787b0a6096f10bb3828d0b4e50226643e9dbcb678a422868c215b5c4e981dc7da5244d38688e8e91287beb8845
 DIST unifdef-2.12.tar.gz 87091 BLAKE2B d14072f79b9d8b17a033c7068a3c6a423c2e66570aac6d232e387ffd256bc66ad3c4c1467b6f101124bf494f2c12c7b8d37c64104623b0022e435a7e5aa78d5a SHA512 9a00f69309578817af5b3a6cf45f293506e8326b520bed7c0ab2f66661e32a115b7f5aa9b0572cfbee5887044e5f0d70967904ec137172e67a1aab5abe09d3b5
-EBUILD unifdef-2.10.ebuild 551 BLAKE2B 52aaf8030dee7a4fccb6f83edae9f37b0fd7adaf21b86b63729a94b7827e48b3d2a95822a1dc086f47f898a6a7f0c35d152fa87ec535ba7308ba95c5c050dedc SHA512 0172ef5c6eb302414b72b6b46a78db39a5b9621d30f3f2ed2e86953b6e20f2c8a248a925231c67f7a26748a61e68131bc4677b9d795b66b3daffb59cc4971051
+EBUILD unifdef-2.10.ebuild 552 BLAKE2B 765da611b775e5d243e4634f42ceb583be26644b0e4db4ba892f546eab812a3250270cbdc4dcec12ee7c4c3cbdd14b39dbfa035ad861ca51a2022fcc62e57d04 SHA512 ef2f437bd87bc4ca42156694f44e2e4ec3887f7c6fa208a1abdcf7a1a581118013194e82cdf2e9f037c42739c79844fb44946bff1a8fae74aeaf7871b459712f
 EBUILD unifdef-2.11.ebuild 569 BLAKE2B 02870cff451d8cd6409099e4c79d3021e08489f2b818aaf4f932c6beacc7db258a370001861378e700188850dac29145b045e6aae3a6f0308c1f86b4554965ac SHA512 502d0aaa6c866b8a08121f6423ab51b399c8acb50e132a56c2d6fa0ea2646631074060229a5d04591f8edf2e874cb88f6363e8c191c64b85ae1bbdf2dbb39a38
 EBUILD unifdef-2.12.ebuild 569 BLAKE2B 02870cff451d8cd6409099e4c79d3021e08489f2b818aaf4f932c6beacc7db258a370001861378e700188850dac29145b045e6aae3a6f0308c1f86b4554965ac SHA512 502d0aaa6c866b8a08121f6423ab51b399c8acb50e132a56c2d6fa0ea2646631074060229a5d04591f8edf2e874cb88f6363e8c191c64b85ae1bbdf2dbb39a38
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-util/unifdef/unifdef-2.10.ebuild b/dev-util/unifdef/unifdef-2.10.ebuild
index e4d1dd5d88e4..d8af09ead551 100644
--- a/dev-util/unifdef/unifdef-2.10.ebuild
+++ b/dev-util/unifdef/unifdef-2.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dotat.at/prog/unifdef/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 
 DOCS=( README )
 
diff --git a/dev-util/wayland-scanner/Manifest b/dev-util/wayland-scanner/Manifest
new file mode 100644
index 000000000000..d349fc01183b
--- /dev/null
+++ b/dev-util/wayland-scanner/Manifest
@@ -0,0 +1,4 @@
+DIST wayland-1.18.91.tar.xz 453500 BLAKE2B 6e234fa637bf4329fcf37c7372e3d02a50742812e2f61477ce302da4c2a1b9377874b0e4e2da899c726ede417081c4d459e40863169352825dd38a8fe0dcf267 SHA512 5ab770c87507e8248aa5197a253f27f3cca984bf1a69c52b438e9aaf512e6b0d841321f81c20643a49ef62eeb6c8b3a6391eadfee5c8822c3cf0d63bb0a8e0f8
+EBUILD wayland-scanner-1.18.91.ebuild 1048 BLAKE2B a18ab822990665a586d1a6a61c6b2c458efb10a18993ea07b2ef654cad4c7f3101687dd83fb96c0fe3ef6c14c2b26f6ab9850a493dc2d770b321770de055c36c SHA512 4004be25df48935c51c70c6c403cfaa079123a054b28efe8c535008e5cee8b77abe19504681b7fdba2c80a7dc9eaa7cd1e9465196e1eccf7189521ccb57ee749
+EBUILD wayland-scanner-9999.ebuild 1048 BLAKE2B a18ab822990665a586d1a6a61c6b2c458efb10a18993ea07b2ef654cad4c7f3101687dd83fb96c0fe3ef6c14c2b26f6ab9850a493dc2d770b321770de055c36c SHA512 4004be25df48935c51c70c6c403cfaa079123a054b28efe8c535008e5cee8b77abe19504681b7fdba2c80a7dc9eaa7cd1e9465196e1eccf7189521ccb57ee749
+MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-util/wayland-scanner/metadata.xml b/dev-util/wayland-scanner/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/dev-util/wayland-scanner/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-util/wayland-scanner/wayland-scanner-1.18.91.ebuild b/dev-util/wayland-scanner/wayland-scanner-1.18.91.ebuild
new file mode 100644
index 000000000000..eeb424d9d3c1
--- /dev/null
+++ b/dev-util/wayland-scanner/wayland-scanner-1.18.91.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/wayland.git"
+	inherit git-r3
+else
+	SRC_URI="https://wayland.freedesktop.org/releases/wayland-${PV}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	S="${WORKDIR}/wayland-${PV}"
+fi
+inherit meson multilib-minimal
+
+DESCRIPTION="wayland-scanner tool"
+HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland"
+
+LICENSE="MIT"
+SLOT="0"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	!<dev-libs/wayland-${PV}
+	>=dev-libs/expat-2.1.0-r3:=[$MULTILIB_USEDEP]
+"
+DEPEND="${RDEPEND}"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Ddocumentation=false
+		-Ddtd_validation=false
+		-Dlibraries=false
+		-Dscanner=true
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+}
diff --git a/dev-util/wayland-scanner/wayland-scanner-9999.ebuild b/dev-util/wayland-scanner/wayland-scanner-9999.ebuild
new file mode 100644
index 000000000000..eeb424d9d3c1
--- /dev/null
+++ b/dev-util/wayland-scanner/wayland-scanner-9999.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/wayland.git"
+	inherit git-r3
+else
+	SRC_URI="https://wayland.freedesktop.org/releases/wayland-${PV}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	S="${WORKDIR}/wayland-${PV}"
+fi
+inherit meson multilib-minimal
+
+DESCRIPTION="wayland-scanner tool"
+HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland"
+
+LICENSE="MIT"
+SLOT="0"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	!<dev-libs/wayland-${PV}
+	>=dev-libs/expat-2.1.0-r3:=[$MULTILIB_USEDEP]
+"
+DEPEND="${RDEPEND}"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Ddocumentation=false
+		-Ddtd_validation=false
+		-Dlibraries=false
+		-Dscanner=true
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+}
diff --git a/dev-util/xdelta/Manifest b/dev-util/xdelta/Manifest
index ba92aa82b127..0ea38218f196 100644
--- a/dev-util/xdelta/Manifest
+++ b/dev-util/xdelta/Manifest
@@ -4,7 +4,7 @@ AUX xdelta-1.1.4-pkgconfig.patch 2551 BLAKE2B 606dd386fbfb768c931e2c08b5508f6bc3
 DIST xdelta-1.1.4.tar.gz 423529 BLAKE2B b565f82ba0504118b74127096939e5699ea312be5c6c8a345abfcf0fb01b45e759abe595b33619b2714671e2f0307d603366a1f7a6b1fb5a786378716a51df6b SHA512 eef45f7977e9a7f490b881f33ab8a948cc5eff9300ea850cc30062905c8e883c104961f075f56f7ce8e385142c35de168aef1e0b8169bda66786ea4bee33168b
 DIST xdelta3-3.0.11.tar.gz 683605 BLAKE2B bc33c9d6a3bb21bc52d72bba54f5e2b1058ea8d7cd7474aaf6dbdc27e165e0fbea644c584402f5bbc8ace7cd6a3aefae18588a659418f93eb041168545363bf4 SHA512 41c48e28f92ad50a737cf0acac150fe17d1132e9a652c482d751c8c4e745c6922d576a183eeabae343a1a238ed8c53353e537977628c86eb599ab3d1c01e7c52
 DIST xdelta3-3.1.0.tar.gz 727607 BLAKE2B 1dd7846dad0414071a8af172fc3b73a0321fc9c841786563fe92ebe5c53d80d3eb07cc553cb5a9813432d9df5aae51d5b4a4c32a8c06a34dace5868297b5a68b SHA512 848c90a28018ec3c541ec43be59ea90328142c4705d3b59907fd89e8f6ac2758e288b1a1112fea601884c50ef7f6cf2c1634f539a76bea65a2741d3bb0e9b990
-EBUILD xdelta-1.1.4-r3.ebuild 826 BLAKE2B f343b7544101220c0b46001ee153aa46dffcd80d6277fc987864b5cc9d421a3aa4cf24bfe2539e0f885ea04c83f6ac14930e6bcaa60eebb5e72f9326dfc8b1c7 SHA512 3b1432ada0657927ca43abfc466de768758bdea5f6673bfe2d038a2b5646f635c65d12b2531f633f5d22b31ff1b20b7a4e2b9dd5fa8a2dccc6c79ec3b22b1633
-EBUILD xdelta-3.0.11.ebuild 846 BLAKE2B 3ed842f8bebe0f0dcb508ef9877f2f31ce901e610b41384c747349e53038b91daec98ce0385e6b34edc3ccc92a261d817285ce48ca58a00b7b596dc918dc3a6c SHA512 e8f89ad1127af72a50a246998e43c8e04b748e8b0913f02950168d333c6a8458cad83ea05e2a956f32c1d5ffbb67168cdc2566534da855640c93a109e9264025
+EBUILD xdelta-1.1.4-r3.ebuild 827 BLAKE2B 18ea571fc899ed7c077bb5125eb8042231d501ef273d55c1c7e00ec483800dff7e1c0c462e0b9ebdb589cc3811459e35ca56e51c1a97f4a82c76689349b93449 SHA512 f60d7e1e5ab1bc2df8dabc9b280903870e833011257b70119a8679d8e7ac8b384ac4bd89747bce85c88bb59648faa36ffa758414ac7295e28801a5882d955925
+EBUILD xdelta-3.0.11.ebuild 847 BLAKE2B 7dc296de2e2bddc200f6574c81d08468f39cb185a17c7eb6e7b060b9cb48b3d7d529b339f83c42d4deaf836be2dbb7c0caf96b02e33567059d6ef62883ccec67 SHA512 3652fc8f00fb3d698b4c709aa2a7fbe3316ca10c960ede1a7ed08431b4a09f7ccab0215a6f8d9d4f827e205e555c46140d545fecbf5655c46b49d1e0f3b74eef
 EBUILD xdelta-3.1.0.ebuild 1184 BLAKE2B ff6e03acdd7eb903f550d968234cd8fb1c7adde38a60ca651298e0c3b7d284c96186a36ad35aee66dd18e12695cea5e49af4c77c0c4572f6d908e8484bccfd09 SHA512 326963dbcb9a0fc7eae4c6ff3441d96bde3e1f795464ab7174fd735ff372c62ccf296276bc4abdfbbf6daa501c139597213578c2ad33d8b6c98b2c6fc84603de
 MISC metadata.xml 381 BLAKE2B 1e67843f342c5d64a78b0ec5f6b20cb6c091f020be78355e83cc5ab8d53312fa97e025d9f819e73fd0c4fe936d15bf87600835bcf2d9040ba67dc740d270d2cf SHA512 2c439c35f726e18396d3a0f2e923cf2f2d0eb7a9798907fd0f039dddcc9fdbac95d6e89d113fc8a937ceb260c90901e0657ecdea2f0bf423ca9456627b2912d3
diff --git a/dev-util/xdelta/xdelta-1.1.4-r3.ebuild b/dev-util/xdelta/xdelta-1.1.4-r3.ebuild
index 13f4fe56b9fc..232594e88fae 100644
--- a/dev-util/xdelta/xdelta-1.1.4-r3.ebuild
+++ b/dev-util/xdelta/xdelta-1.1.4-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
 RDEPEND=">=dev-libs/glib-2
 	>=sys-libs/zlib-1.1.4:="
diff --git a/dev-util/xdelta/xdelta-3.0.11.ebuild b/dev-util/xdelta/xdelta-3.0.11.ebuild
index 12dd58fbb5c1..7a868f8dfe1a 100644
--- a/dev-util/xdelta/xdelta-3.0.11.ebuild
+++ b/dev-util/xdelta/xdelta-3.0.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jmacd/xdelta-gpl/releases/download/v${PV}/${MY_P}.ta
 
 LICENSE="GPL-2"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="examples lzma"
 
 RDEPEND="lzma? ( app-arch/xz-utils:= )"
diff --git a/dev-util/yacc/Manifest b/dev-util/yacc/Manifest
index dd2396e0cff3..08635de22250 100644
--- a/dev-util/yacc/Manifest
+++ b/dev-util/yacc/Manifest
@@ -2,5 +2,5 @@ AUX yacc-1.9.1-CVE-2008-3196.patch 1199 BLAKE2B 665c89923dd7e9860518cff582390b74
 AUX yacc-1.9.1-ia64.patch 504 BLAKE2B b9733e07639ce5bc456576237be7623cae2f488f13bbc203dd0f81e7174c4f51e23ae498d80278ff1fc7873af456844087c72096ec05d621598362c048c68357 SHA512 6525f6c3f9d0011fea00781a24fb0f2d4f80a13835746d8ea8b05a762d789d5f17984da04f32178dbdd73ab098be38fe044bf108ed2e145888cf5ebfe84bb1ec
 AUX yacc-1.9.1-mkstemp.patch 417 BLAKE2B 1413aab68d930593c707723683a1a7938b4bf9d09671cb3539785ec163aa09a0e0bbbd1fee0657e34a8ac03fb9d71a97f1d1dda1af7329f56cda79f93fcb6de2 SHA512 c36d07d4fafc363fcb0173fc17cf4e37dfe20fcfe7df7faaa11d5cc47f9b933a4f192c55f738d1cdcf7f87ddb07311bbc54aa502d8e68b8e7831bf1daba8da03
 DIST yacc-1.9.1.tar.Z 64805 BLAKE2B 3eeebea1dad52a26c8e90ae6aec99fe3643f040100af4516faed02295b203f717a41aec0231ecee97aa31b14c9c29cae6704e875a03e8b18a71255be9859dd09 SHA512 6adb51c5f07e8084a86688589f52d9eee0183fb4d77508e36621a6b0ba91a5c4195feb87db3401ec69560554f71f2f6984dec01266e41e0fd54fa72ef1780e80
-EBUILD yacc-1.9.1-r6.ebuild 1546 BLAKE2B e67aff3e9b55d3a4bab93488ccae75d72175e535f4ad18516f075f02d9659a8fb48fc1abf3cbec599159ca1f5fb769e0a8157627b35ce33c420764aacb992165 SHA512 6d94a30e8c7ab27c74a5ab5e644b34200716f13415c40fbee6621a681e2ffb145f827bdcc7458d6e43fd940e765f4cc2c96160eda82f3d6427a56c0a310fb4a6
+EBUILD yacc-1.9.1-r6.ebuild 1547 BLAKE2B f689b500b05d16be99a930b5f2b4fac0501f5e38a0cb31145db310b88ccf6b8bd43449446c7a27c256291e03177ff5da715e1fda7f7771ca243609747aac6b54 SHA512 5140c0bf27c4de0ce23a8256b4249f2b0df14be0803af05155d3ac2742f4ccc18060f18908e9cb8ac553cae4b41334cb6c54f705d4b3e738127ee1e24d07fcd2
 MISC metadata.xml 220 BLAKE2B eabf3517ba7e5b67320254eeb2b07adf1dbe0c3432b693973bc25a3e3dc8ed160b7313f9f8ae64d994ac272487b785f33202d9640bb5a7ace9f56ceb42978a19 SHA512 1db105eebacb6c7d44fd17746981e6e24badb2e81327410aa935a7603379cfcc8f3cf27dcf4e9d870cea2f73f6a15cf052e3e785205095ea9a93d72980ff71cc
diff --git a/dev-util/yacc/yacc-1.9.1-r6.ebuild b/dev-util/yacc/yacc-1.9.1-r6.ebuild
index 950fed79f349..02614959534b 100644
--- a/dev-util/yacc/yacc-1.9.1-r6.ebuild
+++ b/dev-util/yacc/yacc-1.9.1-r6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://metalab.unc.edu/pub/Linux/devel/compiler-tools/${P}.tar.Z"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 
 PATCHES=(
 	# mkstemp patch from byacc ebuild.
author	V3n3RiX <venerix@redcorelinux.org>	2021-01-01 21:06:00 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-01-01 21:06:00 +0000
commit	129160ec854dca4c3fedb5bcfbcb56930371da0f (patch)
tree	53bf797418ac5e9b99c41ca0382c87b82421e5de /dev-util
parent	441d1370330332b7d78f238d2f5e13f7aed5e4e0 (diff)