gentoo resync : 05.02.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-02-05 18:44:56 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-02-05 18:44:56 +0000
commit: 29aabba0ea759c6a2864ff5631735b67ee38e5e0 (patch)
tree: ab466b4dfa7abecb401b2f8039d08af4689306bb /dev-util
parent: d42200bec37eef2a7478d88988ff00addd0a9202 (diff)
289 files changed, 1617 insertions, 1779 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 1cabbacac420..a3058b086cd5 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/aruba/Manifest b/dev-util/aruba/Manifest
index 0b5e15b2ab09..e09c6275f16a 100644
--- a/dev-util/aruba/Manifest
+++ b/dev-util/aruba/Manifest
@@ -2,6 +2,6 @@ DIST aruba-0.14.12.gem 172032 BLAKE2B be19078caef5e0d1c50d0f0da0efdbfb6cc128d406
 DIST aruba-0.6.2.gem 75776 BLAKE2B 569af009cc20b644878fda25b5e7f79bd2f7c6f5fa9ef2503a5e730b8eb5938872563dace27031d31847bacfbb7e4764079da74fa2a917cc3d98a596cf2248c7 SHA512 ad859aa34f6e6778d9eb92b7e8f298180250e0690b21285e48b85dda88c09c74437ed0dff4e07ea8a02e8c784841ef89504219aa844457273349b8072ebc761e
 DIST aruba-0.8.1.gem 121344 BLAKE2B 0b601a4d4bcd19159bb23b22b7975d1275ed2ab9c06e9ab550e11a151e953eba9ec4cc05280e69685a54b82996b4863b485a74f91d64270cc058f43272f6df6d SHA512 9d65778828ac1915c56862acb1db0faf6214b102eb892317b390f451aab55750067519fb6cf6e08c55f58b865eaaa78921402d745addf2d3b0038527eb5d898f
 EBUILD aruba-0.14.12.ebuild 1520 BLAKE2B 947a401829e02bc0b9aac249ebac01b06f8a80a2d1412a4b1886e89232b5ddc11b5c6899b77c7d95321a6ea71ddb54e02d7a8da7ef180d398649b0abaf35dd9e SHA512 2b105bb544644d01e88e6c6ce539b1bc91267ec1104be455585ddf47e3e775905883b29a0ea540dec9a436f8f77e2db754551b6b9ab8db8931d988635d667c80
-EBUILD aruba-0.6.2-r2.ebuild 999 BLAKE2B a8b57253f1a10650a3ae566abf5a844611d9b331b9482616dbfec4cd89fd402c4b243f2d3516b058cf98e722ace1d2794f7261d7a0e535da15818862175ff03c SHA512 d780d17941f81a10bc5986549b4ec867bb54a264cfa93a621122ec0abc8ec3b299e060b6649f89e62af04fcc13aa5ad2714bce64faac62d4bed11c2b8ce68df1
+EBUILD aruba-0.6.2-r2.ebuild 1000 BLAKE2B f0574100f619a0618cd24d9241ee29ee27bfb9831fc5fe7ca8b39eb6f2d7dec540fba490b344073c976f30137ba3f39cfeeccd5aa5bc20c917874ce2a169e929 SHA512 0dd980194ae534bb7f9b17343adc29e13d99d7c08a393032de14972a8c7860a21dc236a5c93383dea4386571ff2de451c279d909ba88454bea9c2e3dd919df20
 EBUILD aruba-0.8.1.ebuild 1672 BLAKE2B a01b44c435d4594b8f58c5a272c2443c40ff04d20fd186a51421dc4d11dfcb7a1d68ea96191dcf3772c8247635e4ee296101cdbc26e441d67127509574dfc827 SHA512 411dfa207e15afc3bf6d32a0bfd02c0cf2c2f1a054cedb90c768e0435890d590e5723d810884405e69697df84394a7a545bc8bc4628ac4f8ec3046d0bc99433f
 MISC metadata.xml 296 BLAKE2B 5d13c2f0fdb1a3a5e8278e93124af9b7f8e069ccca8ac9327132e8aea862aaee163d778260bd0ba6cd0d6488372b04b4330cc2838447fe2d075ec5fdcb28cadc SHA512 6add4a1a905857c1d96e347089fa8f47643f990a153f6457c4d424978bcf76b89607c89f60d3e312365525b1d0dbd17db62b4baf48ee3da9a0f2ab77435d68b4
diff --git a/dev-util/aruba/aruba-0.6.2-r2.ebuild b/dev-util/aruba/aruba-0.6.2-r2.ebuild
index 5dd95c482843..f3473613981e 100644
--- a/dev-util/aruba/aruba-0.6.2-r2.ebuild
+++ b/dev-util/aruba/aruba-0.6.2-r2.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Cucumber steps for driving out command line applications"
 HOMEPAGE="https://github.com/cucumber/aruba"
 LICENSE="MIT"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index b870dcfd4829..513a7faed487 100644
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -7,6 +7,6 @@ AUX boost-build-1.71.0-respect-c_ld-flags.patch 367 BLAKE2B fee2e2f2db024a1421ad
 AUX site-config.jam 688 BLAKE2B e43a7ad1a94d113a7f890e8b634770f5c60556101d428d83f655bbbe72c46b587485886a9941d05a2ae4319fc325f1e0ecfb9b660158b81c5e9fd02e0b1c0530 SHA512 b65bf1be3133f9f66d3139b00f195a288591bb20a13ba35041507c2c33d7d2da6047c3b02dc27bc4eb21798b91e1262a60e294b7fd4af90808b9de0f5af517df
 DIST boost_1_71_0.tar.bz2 100124647 BLAKE2B edf5a03d5a5a63ef5826ef3c19a5ee862a43eb93e8e3d76f8a0d1f2c23122f5a0535e045058110574cd19092f3199c28ab9dae53f9db05ffe8c0b0b8cdbe27a9 SHA512 b7937d50c4512cf13cadd0ca829de36cf2cbc6fb788f45b1d4565ad0753e2b206c545125a5862016c2f16016f2e4a6b687928963b466fff17c3e0a4437142c20
 DIST boost_1_72_0.tar.bz2 106907358 BLAKE2B ab270a0e3cb24da687d86785e2d2e6d7731b4dbc07bd839eadb642dfa5a428ad584acb1f3529661a8de9a986008ff3427491041059ea2b742348d02e00761cd8 SHA512 63bbd1743e7c904b2e69fdc2eafd1c2a8a30fd70d960dcd366059d0100f000cb605d56cbd9397bb18421631f1c9552a772c434d0f0caddbe56302273f51fd1f6
-EBUILD boost-build-1.71.0.ebuild 2666 BLAKE2B 44847ce5b01b52e5baff1e77e85892adaa97ebe20e1bf90d7908272f7475d780af5c19c6b2b213c54906343c69a46e32a2eef4ebd5498b9b0da3ece0c5e387cf SHA512 1a97524d7d1fd5504e0c76169291c1288612c68d11b74a1db2aa18f44d84fd9c36fe34ddf92e5db479c95a6ad0d6cfa44480e6f3f2d65c5f5c58215a4a0ca37c
-EBUILD boost-build-1.72.0.ebuild 1996 BLAKE2B 14e8f1586ee59c9511fd5bbd41c2d9b3a1907a98db2ce80efbfd33c17917b7d82b3f9eaaf82233a998d907e7594f0f856ea6e031bfb9881c61060e398761bb4e SHA512 5aca75b2286c9cf0a39df4cb2334ed3f29b662df7c147affcf6dd6f0afb0ec658c886c0506f5b66f1f439a070d3f7d840f749fbb9c8905260dab8dc1821bedf4
+EBUILD boost-build-1.71.0.ebuild 2667 BLAKE2B f1b655fa37c607a5831372e99d33de1e6af8e9f4d4300902d231f21549b19f9fc58828f98fd5db749f1f20ef990a80a4e331fbcd1309259e01aecb092b777726 SHA512 f3d24d9ae199192691fa928f58635c14e4af7f7d052d2a1337398d0d124730e34ee89e12d38852e697fd9c1621861af4c11e2d9137b2096ffa5e47bc01050071
+EBUILD boost-build-1.72.0.ebuild 1995 BLAKE2B e9e45eca81f2de18edca0ec61534a72ef20823995da71aa5ee52ef0ac61867a2247fdd8bc7145dbd942dccc1a2493dcc6673330a83fd0bc4dfdf3a11b853cb38 SHA512 b21d44e58a3be7bdd9cf0aa3e4e327adcd19a08c19f7defbfadbfa3742a8bc8c7d279770a8fcf010a605caa352e3cc5a1a06621a6181644f500e167bb677fa4e
 MISC metadata.xml 329 BLAKE2B f492b1ba64c3f7bce1d3fb304bcff93357cc069dfd06b69c25cf26f4423ebea51ac4614a8d865635568f0e9db424a6904fc1edd5fa729243838e16e9887f4202 SHA512 57baf2d8e0a4c240d99f68ce122086a147d42145687b712609fdcd73b77fe3fdfecc1b078edb6a9c922213482fcc17c2fccb6762ec69890fbc9a912c4cb34827
diff --git a/dev-util/boost-build/boost-build-1.71.0.ebuild b/dev-util/boost-build/boost-build-1.71.0.ebuild
index 3c8845c89132..721f88bcf9f6 100644
--- a/dev-util/boost-build/boost-build-1.71.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.71.0.ebuild
@@ -14,7 +14,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 s390 ~sh 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 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples python test"
 RESTRICT="test"
 
diff --git a/dev-util/boost-build/boost-build-1.72.0.ebuild b/dev-util/boost-build/boost-build-1.72.0.ebuild
index 74f8115f6398..8b9bce04fa9b 100644
--- a/dev-util/boost-build/boost-build-1.72.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.72.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 ~s390 ~sh 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 ~s390 ~sh sparc x86 ~ppc-aix ~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/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index ebec8b950f0f..aee6ce21555a 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1,9 +1,12 @@
 AUX bpftrace-0.10_pre20190614-install-libs.patch 4653 BLAKE2B 66229e4b3f7edc345eeac5f833348f7a434ee7f6c830c344b3c357fafec98b8cc8c725cf37ee01802d085cdbf9deb0fa13d9dd72161b230aff589c75b17890a3 SHA512 63f899bd119f86ee6e9bae0c2ef6e657a37a33c700414ea4757353f0637e89ef9ed3dbf1b70414eec1a5c2658451e8be3e7de1941a0796cac621361bcdd14537
 AUX bpftrace-0.9.3-install-libs.patch 5117 BLAKE2B 6cad778dd19ab040f3bd88390329cc49261c83dcc0ff97f9e663d5fb0d55da87d0e4c1efaabbd31b11e383ea0f904fdab8bd7f34fbdd0805abe20d623673c1fc SHA512 0842712b8d32ba4f7bc0767e3748ed4e8517187c9c75d426e1946aacce3a46fd5f7100d4cef0bed655a763d102cfeff160d549065f6b9c6000a7b3f496cb8b87
+AUX bpftrace-0.9.4-install-libs.patch 5481 BLAKE2B 96df784e95fc42e385dc3330d0ea074863a8ba3c3aeb8d7078b29e03708b2e46fccc30f097dbf2c347f0fb4afadee0d2b7cbb038b05a2d81fbd66e4e008302dc SHA512 e74994b020939035fb9a9b646f5572ae3f241f194e7f119c771d5391a651f27ab0733364a4ddcccd7759f5951141e61c4bf019f98a62a820577687109ca50854
 AUX bpftrace-mandir.patch 906 BLAKE2B d875e2523b7e719624d92c58a8f058cdd597da07bf6472d2e3dc05eb46be64718ed4056e15a93e4c22264fa35ceb6b79b428febade422ba435a2a2b9e17fb707 SHA512 11544e9e5892ae3657ff903fa2780e71223e380322b4059ddcea4a6edd80c5a7ab8d45188eb577127f64a6705a6ae41d53f3ba7e05bf450853b12a9ba3d84904
 DIST bpftrace-0.9.2.tar.gz 715019 BLAKE2B 1f20998bd379b91cb46d7e856a5d892e0de7ad6d9f85cb657fcf6a0c879167c0931d28c78e4be98adab349144fe0bc99871cf70556dd1998e5b8f918fa1702e3 SHA512 5c6ee5fec690a907c370ed0bed85906d304215d7f97b99a2cae90453061f522fa6369627c9524a5a24e97c6cbb595a880a2a1b1d71095fffb693a4cef172a6f0
 DIST bpftrace-0.9.3.tar.gz 743506 BLAKE2B d00708bcebaf7f039788dfc52f4a0bb501bb3c52e8b789060f824652b3917ea3950d77dbc7bee04da013f4b552338251bda9781d19a03ec227208b943fded232 SHA512 49b12735fe2fbf4f72d3d0c0372a7a570c7abc92d1f626624d591a863009c8bfabdf86825f133885800c7ea293773651be66e4c792f9cd397f82d250a7af83be
+DIST bpftrace-0.9.4.tar.gz 792253 BLAKE2B d34d390a612825141b86ba14482f06820c88bea76580c53c17d19a6480c0e2a5656531f39b79fbcea4e004ecd3eea36877560f22fac584f36a3dffa1e7fe96c5 SHA512 d2b32235fa81d6f06771df32877388a9105230adfc638b0d0ebf4f11a567246e8514d93c14da9c7008dbacd6b2c4108604fc5a2721ef831efa5c596cbe50b1da
 EBUILD bpftrace-0.9.2.ebuild 1402 BLAKE2B 539e79098fd31d8ade5449f53e9b63d4c8b3ecd3e2716eab76f8a7eab00e11480224502369899f68eb839c9cb48cebc1f5fd6d6c231f93a4a16d58e19e973171 SHA512 9021699f98686a48954e39d653797b10d68cc56b284bdc77a58778dec41c20617031b1ccf8e15283a6b630b366856f6ec0d1013c6150709cc37f25d786f289db
 EBUILD bpftrace-0.9.3.ebuild 1391 BLAKE2B db3f13374aeac65bc6bbaccc6ae187c6f601c753d7b426562dad7af055c1c4a32965abd1a4d8100eddf96cc6b5cac8c1d839cbc4c9cd2ba4822f83c23bcb6c2c SHA512 1fc37e191621ba5c63d43e55f772b505eddff423f37d3697061a4a03000a5bbc8086cb5e4df87c98d080317213581058128b4a5a40c807e5034e6786ca8d37ee
+EBUILD bpftrace-0.9.4.ebuild 1443 BLAKE2B bb82e30e721881ee3b9a73a80fbfada3c408f028a2ecdd44b467ad0bdd20386a36aaa57139b43a3111d8f7075dc5e83bc670c6acb7dbf79ca36e75b724861002 SHA512 6bf0353079eb2451301334942cfccfa89c866677ca7771fa6a2c191e3b758e0688e449cace67487fa8efb784669c65d6fdea7889f0a141b5d414b5d5bb55caeb
 EBUILD bpftrace-9999.ebuild 1339 BLAKE2B 89932b8689799d37f5730662705d644059796e27abbb187e57f741450dbf1034d5322f3e94a4a493f0341f939fcc3902e3173d8b2357c70695c3f3dd957d7db5 SHA512 b7df8cb8af0c74599fb87a32ff1efff499e3559682c72fea78ea5d53e9513f0738fff86acbc91c54b21e3b20ba0e0ccea8f559e7d80f359e45e8448a7fa94000
 MISC metadata.xml 308 BLAKE2B 5440fafa478bdbdf6906c74d697a9542deb8b13b76527a380df723562759d914d597dff029f93ba4567ce4e0f4723fded5a13ea7d2032752253bad1906e753dc SHA512 c27c2ef4795e9167ea133e0c0e2c6d67425d6db754bd563d9cb7a791b4a155ebe855ad0e67c2b29235a9b9761f29dbb14958b124c95a1aaddb97801c763914ba
diff --git a/dev-util/bpftrace/bpftrace-0.9.4.ebuild b/dev-util/bpftrace/bpftrace-0.9.4.ebuild
new file mode 100644
index 000000000000..0afc8a9890fa
--- /dev/null
+++ b/dev-util/bpftrace/bpftrace-0.9.4.ebuild
@@ -0,0 +1,75 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs linux-info cmake-utils
+
+DESCRIPTION="High-level tracing language for eBPF"
+HOMEPAGE="https://github.com/iovisor/bpftrace"
+
+if [[ ${PV} =~ 9{4,} ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/iovisor/${PN}"
+	BDEPEND=""
+else
+	MY_PV="${PV//_/}"
+	SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	BDEPEND="app-arch/xz-utils "
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+COMMON_DEPEND="dev-util/systemtap
+	sys-devel/clang:=
+	dev-libs/libbpf:=
+	>=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
+	>=dev-util/bcc-0.12.0:=
+	virtual/libelf"
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-cpp/gtest )"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND+="dev-util/cmake
+	sys-devel/flex
+	sys-devel/bison"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
+
+PATCHES=(
+	"${FILESDIR}/bpftrace-0.9.4-install-libs.patch"
+	"${FILESDIR}/bpftrace-mandir.patch"
+)
+
+# lots of fixing needed
+RESTRICT="test"
+
+pkg_pretend() {
+	local CONFIG_CHECK="
+		~BPF
+		~BPF_EVENTS
+		~BPF_JIT
+		~BPF_SYSCALL
+		~FTRACE_SYSCALLS
+		~HAVE_EBPF_JIT
+	"
+
+	check_extra_config
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local -a mycmakeargs
+	mycmakeargs=(
+		"-DSTATIC_LINKING:BOOL=OFF"
+		"-DBUILD_TESTING:BOOL=OFF"
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/dev-util/bpftrace/files/bpftrace-0.9.4-install-libs.patch b/dev-util/bpftrace/files/bpftrace-0.9.4-install-libs.patch
new file mode 100644
index 000000000000..fe3fc29fd9b4
--- /dev/null
+++ b/dev-util/bpftrace/files/bpftrace-0.9.4-install-libs.patch
@@ -0,0 +1,141 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2b214c1..a787d7d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -85,9 +85,10 @@ find_package(FLEX REQUIRED)
+ bison_target(bison_parser src/parser.yy ${CMAKE_BINARY_DIR}/parser.tab.cc VERBOSE)
+ flex_target(flex_lexer src/lexer.l ${CMAKE_BINARY_DIR}/lex.yy.cc)
+ add_flex_bison_dependency(flex_lexer bison_parser)
+-add_library(parser ${BISON_bison_parser_OUTPUTS} ${FLEX_flex_lexer_OUTPUTS})
+-target_compile_options(parser PRIVATE "-w")
+-target_include_directories(parser PUBLIC src src/ast ${CMAKE_BINARY_DIR})
++add_library(bpftraceparser ${BISON_bison_parser_OUTPUTS} ${FLEX_flex_lexer_OUTPUTS})
++target_compile_options(bpftraceparser PRIVATE "-w")
++target_include_directories(bpftraceparser PUBLIC src src/ast ${CMAKE_BINARY_DIR})
++install(TARGETS bpftraceparser LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ include(CheckSymbolExists)
+ set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
+diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
+index a95c60a..f5c4d67 100644
+--- a/resources/CMakeLists.txt
++++ b/resources/CMakeLists.txt
+@@ -1,6 +1,7 @@
+-add_library(resources headers.cpp)
++add_library(bpftraceresources headers.cpp)
+ 
+-target_include_directories(resources PUBLIC ../src)
++target_include_directories(bpftraceresources PUBLIC ../src)
++install(TARGETS bpftraceresources LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ function(embed_headers output)
+   file(WRITE ${output} "#include \"headers.h\"\n\nnamespace bpftrace {\n")
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 5b9a95d..b1ccf7a 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -68,7 +68,8 @@ if (ALLOW_UNSAFE_PROBE)
+   target_compile_definitions(bpftrace PRIVATE HAVE_UNSAFE_PROBE)
+ endif(ALLOW_UNSAFE_PROBE)
+ 
+-target_link_libraries(bpftrace arch ast parser resources)
++target_link_libraries(bpftrace bpftracearch bpftraceast bpftraceparser
++  bpftraceresources)
+ 
+ if(STATIC_LINKING)
+   target_link_libraries(bpftrace ${LIBBCC_LIBRARIES})
+diff --git a/src/arch/CMakeLists.txt b/src/arch/CMakeLists.txt
+index edb0654..e57c8c5 100644
+--- a/src/arch/CMakeLists.txt
++++ b/src/arch/CMakeLists.txt
+@@ -1,8 +1,10 @@
+ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
+-    add_library(arch aarch64.cpp)
++    add_library(bpftracearch aarch64.cpp)
+ elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64" OR
+        CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64le")
+-    add_library(arch ppc64.cpp)
++    add_library(bpftracearch ppc64.cpp)
+ else()
+-    add_library(arch x86_64.cpp)
++    add_library(bpftracearch x86_64.cpp)
+ endif()
++
++install(TARGETS bpftracearch LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+diff --git a/src/ast/CMakeLists.txt b/src/ast/CMakeLists.txt
+index f280f47..5db9246 100644
+--- a/src/ast/CMakeLists.txt
++++ b/src/ast/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-add_library(ast
++add_library(bpftraceast
+   ast.cpp
+   codegen_llvm.cpp
+   field_analyser.cpp
+@@ -7,12 +7,13 @@ add_library(ast
+   semantic_analyser.cpp
+ )
+ 
+-target_include_directories(ast PUBLIC ${CMAKE_SOURCE_DIR}/src)
+-target_include_directories(ast PUBLIC ${CMAKE_SOURCE_DIR}/src/ast)
+-target_include_directories(ast PUBLIC ${CMAKE_BINARY_DIR})
+-target_link_libraries(ast arch)
++target_include_directories(bpftraceast PUBLIC ${CMAKE_SOURCE_DIR}/src)
++target_include_directories(bpftraceast PUBLIC ${CMAKE_SOURCE_DIR}/src/ast)
++target_include_directories(bpftraceast PUBLIC ${CMAKE_BINARY_DIR})
++target_link_libraries(bpftraceast bpftracearch)
+ 
+-add_dependencies(ast parser)
++add_dependencies(bpftraceast bpftraceparser)
++install(TARGETS bpftraceast LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ if (STATIC_LINKING)
+   set(clang_libs
+@@ -36,26 +37,26 @@ if (STATIC_LINKING)
+     if(EMBED_LIBCLANG_ONLY)
+       unlink_transitive_dependency("${CLANG_EXPORTED_TARGETS}" "LLVM")
+     endif()
+-    target_link_libraries(ast ${CLANG_EMBEDDED_CMAKE_TARGETS})
++    target_link_libraries(bpftraceast ${CLANG_EMBEDDED_CMAKE_TARGETS})
+   else()
+     list(INSERT clang_libs 0 libclang.a)
+   endif()
+ 
+   if(EMBED_LLVM)
+-    target_link_libraries(ast ${LLVM_EMBEDDED_CMAKE_TARGETS})
++    target_link_libraries(bpftraceast ${LLVM_EMBEDDED_CMAKE_TARGETS})
+   else()
+     llvm_map_components_to_libnames(llvm_libs bpfcodegen ipo irreader mcjit orcjit ${LLVM_TARGETS_TO_BUILD})
+-    target_link_libraries(ast ${clang_libs})
+-    target_link_libraries(ast ${llvm_libs})
++    target_link_libraries(bpftraceast ${clang_libs})
++    target_link_libraries(bpftraceast ${llvm_libs})
+   endif()
+ else()
+   find_library(found_LLVM LLVM HINTS ${LLVM_LIBRARY_DIRS})
+   if(found_LLVM)
+-    target_link_libraries(ast LLVM)
++    target_link_libraries(bpftraceast LLVM)
+   else()
+     llvm_map_components_to_libnames(_llvm_libs bpfcodegen ipo irreader mcjit orcjit ${LLVM_TARGETS_TO_BUILD})
+     llvm_expand_dependencies(llvm_libs ${_llvm_libs})
+-    target_link_libraries(ast ${llvm_libs})
++    target_link_libraries(bpftraceast ${llvm_libs})
+   endif()
+-  target_link_libraries(ast libclang)
++  target_link_libraries(bpftraceast libclang)
+ endif()
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 211c47b..2fb73ef 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -88,7 +88,8 @@ if(HAVE_BFD_DISASM)
+   endif(STATIC_LINKING)
+ endif(HAVE_BFD_DISASM)
+ 
+-target_link_libraries(bpftrace_test arch ast parser resources)
++target_link_libraries(bpftrace_test bpftracearch bpftraceast bpftraceparser
++  bpftraceresources)
+ 
+ if (STATIC_LINKING)
+   if(EMBED_LLVM OR EMBED_CLANG)
diff --git a/dev-util/bsdiff/Manifest b/dev-util/bsdiff/Manifest
index e68005ad809d..a51b39dc2c70 100644
--- a/dev-util/bsdiff/Manifest
+++ b/dev-util/bsdiff/Manifest
@@ -1,3 +1,3 @@
 DIST bsdiff-4.3.tar.gz 5740 BLAKE2B 869b957fac9de5977216b82ae46f5a291af4f64e8f4199b129b5e9963385e8f23d8593c307ddf953001fc54446ba66a0c57f9f9a841854afc3d32aee26fffc4e SHA512 bde46b393b74bcc9f05532ea4d45b12c104c4f182fdd49d4176aad5f02a2b357f435819f13a5a7ddefe27df0ca82980f06fad764094014a6d068622263e319c3
-EBUILD bsdiff-4.3-r3.ebuild 880 BLAKE2B cd78e2738f947d2b4c0b9350b531b8148f91129809950c520cbd988527ab4dab5542d4ecd6b3ec8735d19174b7264cda31eb3250fd943edf9db7e9f770a8bd01 SHA512 1dc38b42bab1a469c87190b66a942775e6e4c8abbedf4a22f36f9310b2d4f4afd0523d9ae6bf21fcaf9545167d54d8a3d1a59b8bdb49446d16090ee3510f8a2f
+EBUILD bsdiff-4.3-r3.ebuild 881 BLAKE2B 11c5a1a124bdd4bd83ffc5e27d89cb4fb1e203bc7e9bb111ab85ef3a5cdce305a93ec79fd005a89f6ac3317dcd64c8ef8509dc14e099e937617aaa14d387e2e6 SHA512 886efea31a8e37240bfdacd20c2760cb705b53ceacf9cc2c9cde75bfebd677224842c6d3b93bec811afe8bcf291f2038f5f1bb8b5675c7a8d6098e46c23a6ae1
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-util/bsdiff/bsdiff-4.3-r3.ebuild b/dev-util/bsdiff/bsdiff-4.3-r3.ebuild
index 887613e48e6c..8f285e1d8762 100644
--- a/dev-util/bsdiff/bsdiff-4.3-r3.ebuild
+++ b/dev-util/bsdiff/bsdiff-4.3-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://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"
 
 DEPEND="app-arch/bzip2"
 RDEPEND="${DEPEND}"
diff --git a/dev-util/buildbot-console-view/Manifest b/dev-util/buildbot-console-view/Manifest
index a887c8b75848..8902115247c8 100644
--- a/dev-util/buildbot-console-view/Manifest
+++ b/dev-util/buildbot-console-view/Manifest
@@ -1,7 +1,7 @@
 DIST buildbot-console-view-0.9.12.tar.gz 640923 BLAKE2B cc0da84395aca571803e73260d826633553ed10ede6d66d112dfa8bcdc4f1bd376695ee0ee4a715f1fa3705329033044d9358731c0b807c54b40b4e32a04f565 SHA512 4a73994c29fe1f78c4432bdb42fe14106b8d7887bb35f2835b203f4818844d3e8d2ea308fc4fb2bd562de302bd7cf6612fe047476512feac068eca3891a49522
 DIST buildbot-console-view-1.1.2.tar.gz 640509 BLAKE2B 481b8049e606d47be8b171c24a210d6c95ce13ee4a4d46fd689ee836857e8d054f1799ce53de3931f820f02061cdd0c4a47686cd1724fe1c39ab33ca0f274d76 SHA512 23a14d3264802b2cf9a6a7cab0592c6391dc55a8805c17529c3279b129aaab1df97999ffd5fdc0927e7d5fb204e4114b4672018102381523599310cf7223950f
 DIST buildbot-console-view-1.3.0.tar.gz 640506 BLAKE2B bf68136edbe734514b662a580b9025626b6e0acd48f49ccee979c38d1a2eac13e8fd13bf4c9f62948694ed003de3ee6c44a9d734561a1b5ed4e1d9d330b39f3f SHA512 5b4fa27c8cca57df083c3044729bc6086086dabe819e215b02fe4fda0863b62658925433bbc90d9b38f4309af50b2312b3c9aaefff96a1f62b18d160ca66f205
-EBUILD buildbot-console-view-0.9.12.ebuild 1161 BLAKE2B a568fe6b3853310640178dfc53d64e841e2b4bf5cf757718c700ff31552252ae4e3b75cec8c37d052cf082a24805c588f2ff3441ff606db5a979092c2222296f SHA512 f2b488e5b49a09e712579902e58e6b745d66e80823341237687844182b9f36bbbd056a628a1bb38f57c521d2c27b3f484b5bff7f8ca4a79e9ee8de629efb7e98
-EBUILD buildbot-console-view-1.1.2.ebuild 1161 BLAKE2B a568fe6b3853310640178dfc53d64e841e2b4bf5cf757718c700ff31552252ae4e3b75cec8c37d052cf082a24805c588f2ff3441ff606db5a979092c2222296f SHA512 f2b488e5b49a09e712579902e58e6b745d66e80823341237687844182b9f36bbbd056a628a1bb38f57c521d2c27b3f484b5bff7f8ca4a79e9ee8de629efb7e98
-EBUILD buildbot-console-view-1.3.0.ebuild 1161 BLAKE2B a568fe6b3853310640178dfc53d64e841e2b4bf5cf757718c700ff31552252ae4e3b75cec8c37d052cf082a24805c588f2ff3441ff606db5a979092c2222296f SHA512 f2b488e5b49a09e712579902e58e6b745d66e80823341237687844182b9f36bbbd056a628a1bb38f57c521d2c27b3f484b5bff7f8ca4a79e9ee8de629efb7e98
+EBUILD buildbot-console-view-0.9.12.ebuild 1151 BLAKE2B d0813409b11727bad84a411242f056d2cfa315f740a0225b58f5344d882b56e1778b67b3d0253723b5412a69112fe5205352a4280b34ed41e52572ae592bc8bb SHA512 5511982e4980d118b31e7a25326d7158efa1eaf9e30ac05252fc08f282641ba13489fc8157f04bb94bae37bfba9db3577aa4abbf9887bf57378508956363f26e
+EBUILD buildbot-console-view-1.1.2.ebuild 1151 BLAKE2B d0813409b11727bad84a411242f056d2cfa315f740a0225b58f5344d882b56e1778b67b3d0253723b5412a69112fe5205352a4280b34ed41e52572ae592bc8bb SHA512 5511982e4980d118b31e7a25326d7158efa1eaf9e30ac05252fc08f282641ba13489fc8157f04bb94bae37bfba9db3577aa4abbf9887bf57378508956363f26e
+EBUILD buildbot-console-view-1.3.0.ebuild 1151 BLAKE2B d0813409b11727bad84a411242f056d2cfa315f740a0225b58f5344d882b56e1778b67b3d0253723b5412a69112fe5205352a4280b34ed41e52572ae592bc8bb SHA512 5511982e4980d118b31e7a25326d7158efa1eaf9e30ac05252fc08f282641ba13489fc8157f04bb94bae37bfba9db3577aa4abbf9887bf57378508956363f26e
 MISC metadata.xml 582 BLAKE2B 7b70e690ee782b2e32a79def5816c289e258339bd94aa5001297406ad9075e8dbf2623119c717a937a5dc42c034396700b1943e845cf7d7c4797714018280a56 SHA512 28aa58be60e1ce0675809fddfc84e864d801bc5438a9212b714a684cfbe97c9dcea40a74853656b5000de58e81c6babc5997ed3e354bc6d478071f968b379778
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-0.9.12.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-0.9.12.ebuild
index 49582ecd23fe..b78694b58091 100644
--- a/dev-util/buildbot-console-view/buildbot-console-view-0.9.12.ebuild
+++ b/dev-util/buildbot-console-view/buildbot-console-view-0.9.12.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-1.1.2.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-1.1.2.ebuild
index 49582ecd23fe..b78694b58091 100644
--- a/dev-util/buildbot-console-view/buildbot-console-view-1.1.2.ebuild
+++ b/dev-util/buildbot-console-view/buildbot-console-view-1.1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-1.3.0.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-1.3.0.ebuild
index 49582ecd23fe..b78694b58091 100644
--- a/dev-util/buildbot-console-view/buildbot-console-view-1.3.0.ebuild
+++ b/dev-util/buildbot-console-view/buildbot-console-view-1.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
diff --git a/dev-util/buildbot-grid-view/Manifest b/dev-util/buildbot-grid-view/Manifest
index d5cec72aa6de..b8f1f9a4423b 100644
--- a/dev-util/buildbot-grid-view/Manifest
+++ b/dev-util/buildbot-grid-view/Manifest
@@ -1,7 +1,7 @@
 DIST buildbot-grid-view-0.9.12.post1.tar.gz 638819 BLAKE2B 5e0bdc39ebe2b447b23abaddc414713c46e5544915d5564641a0534dfa9862f71d689c5df27a5f2a6ecbaa33c29ece5bc85e1c2d1f0a10b0f19273364699748f SHA512 3bc90dcee10781afa90a44d0ff57629f2fe8620fb1133a489282b3a69b884d33a7ad3cbf6e38f688755fcc2153c9ae1c0d48cd2797e33070f66a9093887179c6
 DIST buildbot-grid-view-1.1.2.tar.gz 638848 BLAKE2B c99e79af105cf07a6540c71fb7e604bca144ec5d462f6a38c50b525b2ba7bf9640b8d1d4e36e0beb121eafb042fefb67a8adb8b91d2ed8fca4daf982712fae45 SHA512 c2dddab25d1da173ae22d811a9c3261eaec6ac76389829cb1cfaa8b976573d6f12208541dce4065d45512c4c984d9a1d4c72f6e151ec3365ba1dca356ad0288d
 DIST buildbot-grid-view-1.3.0.tar.gz 638845 BLAKE2B fb52b8fccbce298cbaf715feb1d785856e879f9e9fe63add83c3b0b51df93417ef8b355b33569956e055771bc75a4b6ea318bd7bbcd157bce01f972730468b62 SHA512 f82316743c10c4fd2a509a754808535606bdfd114b86e5796887d47845b4ef83677c7af830b9e4c531a9857249a8b2de8411b30f2f5b2a617a54244658e4a528
-EBUILD buildbot-grid-view-0.9.12_p1.ebuild 1130 BLAKE2B d83bac0b7e466dec412875e43c686f08f04a9cc792b5c6d557479def168c44444c26d26d680647938d4af34dc20bdb8e1863fd808a52b2967c31cec82c9a9687 SHA512 b1549fcf9ec6af84f7d0fb22c46eef72639b670ad71d2b253c07bdc36e46af2e6e821b7be2326aa078243980e4ae41f8d046a1481d4552e08832ef98ac8cd92e
-EBUILD buildbot-grid-view-1.1.2.ebuild 1126 BLAKE2B a9ad8cc6906a13b42f49d8cc56e97d10afeaaad5930d3166a2d2c40a92d14a381f65636ca079043504685093250d8c67837b3785685c3bdfeb5621231609dc48 SHA512 1261824690741edb56f4e732eb95fe0ecf3507e6955c2db41e461fe91bddff7a205a58d86a4f407e33a6fc24cc60cb407e48a86ae704fe72839606c198a05556
-EBUILD buildbot-grid-view-1.3.0.ebuild 1126 BLAKE2B a9ad8cc6906a13b42f49d8cc56e97d10afeaaad5930d3166a2d2c40a92d14a381f65636ca079043504685093250d8c67837b3785685c3bdfeb5621231609dc48 SHA512 1261824690741edb56f4e732eb95fe0ecf3507e6955c2db41e461fe91bddff7a205a58d86a4f407e33a6fc24cc60cb407e48a86ae704fe72839606c198a05556
+EBUILD buildbot-grid-view-0.9.12_p1.ebuild 1120 BLAKE2B 7e8aa94b431619138e8a9868778b51b3048bb397082ba7c5647901e7ab23d7c8d5eed459582be1ae9b86b6588f2b3ad6bebb994c2d5d27dd29611655881978f2 SHA512 051c0d4d9717fcc337ed57d7ffc203785009bad76598fc50d157bb7ddfb0c8f96e8fb42205bae646aa247a0c62c2241a87e1b751e0e914541ae025b3882cebf9
+EBUILD buildbot-grid-view-1.1.2.ebuild 1116 BLAKE2B 89dc619bf4864378815f480186f9cdacca9a53faff1d61cb2d1ade34742e6eacdd311ed335b6cf121acdb815fda2e2d35f1e27025d19c9c6cbf7e884b6fe66ee SHA512 184864ec78acead7d6467e1397c1d7ce13b1eeba9f69b734f7457d1da9fe643146ab78b718d308017eb1583720942b7749826f90d9b170ca52b479bfd4a4e5d2
+EBUILD buildbot-grid-view-1.3.0.ebuild 1116 BLAKE2B 89dc619bf4864378815f480186f9cdacca9a53faff1d61cb2d1ade34742e6eacdd311ed335b6cf121acdb815fda2e2d35f1e27025d19c9c6cbf7e884b6fe66ee SHA512 184864ec78acead7d6467e1397c1d7ce13b1eeba9f69b734f7457d1da9fe643146ab78b718d308017eb1583720942b7749826f90d9b170ca52b479bfd4a4e5d2
 MISC metadata.xml 561 BLAKE2B be04eb0a5ba4b476810f1f53459ac6839ef9d83871c8e415ca09b3f6927aef34f6ebbcba8f67b6460b9ed940613fc9d754512e7e3d1deca401936c29a88856e2 SHA512 57e18994b8280d38538b93af66ecc756abbb8bbc70117cb1b89f0b30fde66fe5241faf9bad84cb2f8e11ee67d29ae30eeec435e0b6a9af7c178b2bf58d966b27
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.12_p1.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.12_p1.ebuild
index 10e9caae946f..f78bf0f289cc 100644
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.12_p1.ebuild
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.12_p1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-1.1.2.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-1.1.2.ebuild
index dbd0b9e1966d..1c040e8d6fc8 100644
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-1.1.2.ebuild
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-1.1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-1.3.0.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-1.3.0.ebuild
index dbd0b9e1966d..1c040e8d6fc8 100644
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-1.3.0.ebuild
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-1.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
diff --git a/dev-util/buildbot-pkg/Manifest b/dev-util/buildbot-pkg/Manifest
index 9a622854494d..036ea63b9041 100644
--- a/dev-util/buildbot-pkg/Manifest
+++ b/dev-util/buildbot-pkg/Manifest
@@ -2,7 +2,7 @@ AUX buildbot-pkg-0.9.15_p1-Removedevelopmentvirtualenvironmenthack.patch 959 BLA
 DIST buildbot-pkg-0.9.12.tar.gz 4446 BLAKE2B e8077d3b212c968694d2d9e5018c9c985acbff592dbccfeb59543a507f263133268dde57efcacfabb90ea61c3184d34dced21f8e269f619d505166e68c76d43e SHA512 5b9847747924b7e04ae7584f549fa498715e293c6dbdbfef1fe5896c8c96cd65471a908b48c46a32eddbcf8f7b3642402974b4ed3319cf42e90028e772b5e34b
 DIST buildbot-pkg-1.1.2.tar.gz 4838 BLAKE2B 437fd8c7d293622b8499c45072d03912cb196afa97f06220cd3279ad01d2426e399e9c95ee063146dd8713f0284981c8a42b79f44028aebd19cbd5a4fe518eff SHA512 11fcf96907274b699da23c667d7a634b1af3752b9edf651e3fd50f030bdd80d3170013ac2c789fc2943d2ca8a84cb02b5caaeb60e646a54cf8b89a5e701e21b5
 DIST buildbot-pkg-1.3.0.tar.gz 4835 BLAKE2B d035060ebf1e5823979adea8b7d31a13cc7bf3382eab571090d68db23b476e2fb959deaf249e6d4f2f3b44cf453c407dd0fd39e54a4e5a3d41462b125c573505 SHA512 b8e53de24cd41e31417a4259396fa080c7dad48b5ad2b15d5c9de9eb3fb35196a84f48ba589e8a077382e8a14d760f6148056bbe30972f0542512404e8efbefb
-EBUILD buildbot-pkg-0.9.12.ebuild 1061 BLAKE2B 5b2c43d74be3b1336fdf3435755b1710e6ab3eb097450ee2eac98a6651ad4db299f24d84ed782b1360b373a304d049a23249a09a499b0738cfaf15a1b5eeeb3c SHA512 024e10a49898a6f8edacb0980f2ab60635cb5e2977594b23731d567d28baee005e8529ace71cc8fcfe5f775f545a91ef2fe2c5fd974219f87f7fe29e47ae12be
-EBUILD buildbot-pkg-1.1.2.ebuild 1151 BLAKE2B 2bdcb99da67ebd1937c1704e4b61d9f6a66acb3bf9e03af2396fe6256139dbd48fc8c27067ee646f411597ec35452a5d66abd2699671529fb0922999d42426f1 SHA512 4da8961a4c4041efee2cb769771e5864be7f3769d4432bad3028a9187e4ebd65714b86ccf5089dea52c8bf149433b70526243ff45aa00d66b335b6066cd26188
-EBUILD buildbot-pkg-1.3.0.ebuild 1151 BLAKE2B 2bdcb99da67ebd1937c1704e4b61d9f6a66acb3bf9e03af2396fe6256139dbd48fc8c27067ee646f411597ec35452a5d66abd2699671529fb0922999d42426f1 SHA512 4da8961a4c4041efee2cb769771e5864be7f3769d4432bad3028a9187e4ebd65714b86ccf5089dea52c8bf149433b70526243ff45aa00d66b335b6066cd26188
+EBUILD buildbot-pkg-0.9.12.ebuild 1051 BLAKE2B a295298e0771cb5a82f0107ac3d30bfa7cf67b502320c71b15717a2518d505832e15d58af7f70b01862790d2b4f3f839cfa2b642d84ce2c1e16bee808fa78b7c SHA512 9615f3dc91bbea15a1f36ce8243b6acb80db72b5ca137b5b3a758026b5920231349e7890bee30869be1bd0f4558d13a7b208ed77c1b705770d357149826a30df
+EBUILD buildbot-pkg-1.1.2.ebuild 1141 BLAKE2B 8718d9771220d3d21749cd536f0f0f863a630819ea22632ed4d0837bccb3d240be140a3b01ab2bd76f1ca7fd663936e7f2604893eba1b0bc34742ccbcaf9c142 SHA512 48866e49fdfcd741993375af80d182e022d871ec04b7c5473614c854f6979276367ee0990fa4b140bb721b9b6066357c158d9430c49f0c7d0ac6def84a0ccd70
+EBUILD buildbot-pkg-1.3.0.ebuild 1141 BLAKE2B 8718d9771220d3d21749cd536f0f0f863a630819ea22632ed4d0837bccb3d240be140a3b01ab2bd76f1ca7fd663936e7f2604893eba1b0bc34742ccbcaf9c142 SHA512 48866e49fdfcd741993375af80d182e022d871ec04b7c5473614c854f6979276367ee0990fa4b140bb721b9b6066357c158d9430c49f0c7d0ac6def84a0ccd70
 MISC metadata.xml 1120 BLAKE2B 04e28b3993f21c0ec80375dc377079dadeb00e51e071958806505985bd3b10647e0a8396ff4a06f2f635f08d1cc802071b33ca1e6ffbadb712c0be49f81ef47f SHA512 f384c87c8bdc67372bad64103155dac6f7bf7d91b1f3f962e1b1c08cbfe648c8becc21e8af7d7b96c9096073215cb1bab87978132deafa94ce6370eaa027590c
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-0.9.12.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-0.9.12.ebuild
index b03d7a26b859..818b08480561 100644
--- a/dev-util/buildbot-pkg/buildbot-pkg-0.9.12.ebuild
+++ b/dev-util/buildbot-pkg/buildbot-pkg-0.9.12.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-1.1.2.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-1.1.2.ebuild
index 6f7a8920b7d6..2b270c46a06a 100644
--- a/dev-util/buildbot-pkg/buildbot-pkg-1.1.2.ebuild
+++ b/dev-util/buildbot-pkg/buildbot-pkg-1.1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-1.3.0.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-1.3.0.ebuild
index 6f7a8920b7d6..2b270c46a06a 100644
--- a/dev-util/buildbot-pkg/buildbot-pkg-1.3.0.ebuild
+++ b/dev-util/buildbot-pkg/buildbot-pkg-1.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
diff --git a/dev-util/buildbot-waterfall-view/Manifest b/dev-util/buildbot-waterfall-view/Manifest
index 7ad2c0e6f773..7ff184df11ba 100644
--- a/dev-util/buildbot-waterfall-view/Manifest
+++ b/dev-util/buildbot-waterfall-view/Manifest
@@ -1,7 +1,7 @@
 DIST buildbot-waterfall-view-0.9.12.tar.gz 714290 BLAKE2B 4867539275aa6c2b0ac149fe7f4a1f03f2c2593b89908fb0a8d748c32779b01b8d87327ec9a54e02561a40d273f03f46a8581cf224c333f1bbb3e14ba22a56ef SHA512 76abc01783c02980bc2d6e878536416aa046dce3259c65fa5c2f15d3f66d1b9b5e0bed2d4f6b9d6c338300637c6b91e9bdee3fca3e47022d2ea9b75ffa69eb99
 DIST buildbot-waterfall-view-1.1.2.tar.gz 713898 BLAKE2B 0873ca7d44a9da7ad260032a8153c45e864c605c79cbd826d4f5cb306dbcdcd1fd1e89fe59df57decdcd9ce94330d80ed20d8d7d95b4dc93d6d7cdf6340eb30f SHA512 cc14894281b712fe479ea19116948f69fb43a4cc8c7a0f159fcf97eed0c36a11cc967a0663042f34f64cc4d65468c58eb4398d66fb0d125cde6dec9ef7fc7e08
 DIST buildbot-waterfall-view-1.3.0.tar.gz 713879 BLAKE2B 42e838bfb5925850cfa679727a8f53a5a71c4b6ce9ad26b010480ba16e421f5eda0228d94f7efabb74f3493f868ef61274338f31e0ba6afa1fba4a3b533ac5d5 SHA512 4b8403f9f68ddc6fc980649cf26625834c6a271705e0b8396ab7c2fd739929c2878557df945a1d9c5411985b79f8b43d3fca2c7f74769e9e832b1a7c166f8a3f
-EBUILD buildbot-waterfall-view-0.9.12.ebuild 1165 BLAKE2B 7e93870e9546affa03c460c45c5346cd06287624a6585d3fed4839078573ffb54e3f2c4bf8a0686ccc45cb3e6350d96f2b69dbf571a7466910644e24b2ce1eae SHA512 99523f7ffa88f1339907e0af0456b2dfcbaa639b51f7878f06a397a2a893d95950ff12072ec15ae7d3a26fc8eb786e376d8477b9d8a042d62543ac11c1c65b7b
-EBUILD buildbot-waterfall-view-1.1.2.ebuild 1165 BLAKE2B 7e93870e9546affa03c460c45c5346cd06287624a6585d3fed4839078573ffb54e3f2c4bf8a0686ccc45cb3e6350d96f2b69dbf571a7466910644e24b2ce1eae SHA512 99523f7ffa88f1339907e0af0456b2dfcbaa639b51f7878f06a397a2a893d95950ff12072ec15ae7d3a26fc8eb786e376d8477b9d8a042d62543ac11c1c65b7b
-EBUILD buildbot-waterfall-view-1.3.0.ebuild 1165 BLAKE2B 7e93870e9546affa03c460c45c5346cd06287624a6585d3fed4839078573ffb54e3f2c4bf8a0686ccc45cb3e6350d96f2b69dbf571a7466910644e24b2ce1eae SHA512 99523f7ffa88f1339907e0af0456b2dfcbaa639b51f7878f06a397a2a893d95950ff12072ec15ae7d3a26fc8eb786e376d8477b9d8a042d62543ac11c1c65b7b
+EBUILD buildbot-waterfall-view-0.9.12.ebuild 1155 BLAKE2B b281f339d91148b1914a1a29b23e3de8c45cd60a73e648d0a88feb56c4b5d562e2a2522651dfa3e98baa3f231b28ac0180f139e26c115540323c8753926dc398 SHA512 d006570cfef39e9278cfb36441f09ba2caf658dd848b597805d8fa9a684e911776a28003682904e01eb2abb1549427a8c5362f14470e25859a508c8ee851fcec
+EBUILD buildbot-waterfall-view-1.1.2.ebuild 1155 BLAKE2B b281f339d91148b1914a1a29b23e3de8c45cd60a73e648d0a88feb56c4b5d562e2a2522651dfa3e98baa3f231b28ac0180f139e26c115540323c8753926dc398 SHA512 d006570cfef39e9278cfb36441f09ba2caf658dd848b597805d8fa9a684e911776a28003682904e01eb2abb1549427a8c5362f14470e25859a508c8ee851fcec
+EBUILD buildbot-waterfall-view-1.3.0.ebuild 1155 BLAKE2B b281f339d91148b1914a1a29b23e3de8c45cd60a73e648d0a88feb56c4b5d562e2a2522651dfa3e98baa3f231b28ac0180f139e26c115540323c8753926dc398 SHA512 d006570cfef39e9278cfb36441f09ba2caf658dd848b597805d8fa9a684e911776a28003682904e01eb2abb1549427a8c5362f14470e25859a508c8ee851fcec
 MISC metadata.xml 602 BLAKE2B 345536cb04360976a1851b9979c40c8b487b7fecea7936dda78fdecdddc6aadf454aacf83f41406ea031ed22e4243ada64847acdeb0e011a839bb7c8757c82c4 SHA512 218340a7d39d3a7a7f410d18911ebfc4412dcef9041db41160619c6c77c855abf56e877c1d7976329c3017ee4462922735a3e3aee329f23ab1b6e4b4a7c2ffd5
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.12.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.12.ebuild
index d85d68ec5e89..a41c9f0edf71 100644
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.12.ebuild
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.12.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.1.2.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.1.2.ebuild
index d85d68ec5e89..a41c9f0edf71 100644
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.1.2.ebuild
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.3.0.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.3.0.ebuild
index d85d68ec5e89..a41c9f0edf71 100644
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.3.0.ebuild
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest
index fc047a227789..c79cedb58a7e 100644
--- a/dev-util/buildbot-worker/Manifest
+++ b/dev-util/buildbot-worker/Manifest
@@ -4,8 +4,8 @@ AUX buildbot_worker.initd2 1640 BLAKE2B 17a40547260004b40d77219aefa70f08846741e3
 DIST buildbot-worker-0.9.12.tar.gz 101655 BLAKE2B a73f98ec56bd3ad6d19ad0b9dfa015869fd6115789a7ddcecdebdac8707850715c677ee248668f73035ea5656665973634829f2f97e3e75fe8e1515cb0838b88 SHA512 c2e86bd8818eddc2849626a0c7642169bc91fa2cc1d531977736e53c4ad3c87c3f0cb17d7b9acd137e783ae822f558a19f4668e3cd37e90a8435157485bd1d57
 DIST buildbot-worker-1.1.2.tar.gz 103013 BLAKE2B b44593b71e61fee4037911759fa4f686aaabf5ef4be9efaecd539e88c5fc2ed2059d8dd8d6d1c4b3ba57d3563f79aaa404176529622003070c136803c90beb10 SHA512 3dd3da7e87d667307fca264d91af4671f76c3aad93a0512ae5777bb2e3972efe349968cf72fa17b99e45f2d7cec1ec16b1180c48d296e2702c9548bf858951a7
 DIST buildbot-worker-1.3.0.tar.gz 103765 BLAKE2B a5f06ad6b87442292f9fe0c7935f791d2fdb450db09c9614324f8230d0bec408380a7b1637dc32806259c4de7699b164f20f76d959232a82253f7134749531d7 SHA512 5e59aab6cecf8dd932df0e8063c69fda5613b76a46df63479ff554085275d4a19fb1b5142034bd4245423e99f3e46d45e765b10c3c74a9f28b92b70119fab9e2
-EBUILD buildbot-worker-0.9.12.ebuild 4828 BLAKE2B 1b76bdce8838a81a03906637b70ac07de10059172597331dd70f4f902255fbfd6cf9654e009cd615e664c01841a314b961e09d5b353bc62f8763bc286cb32e71 SHA512 a1f8e8aa6461a9997a3f668ce5bef3eb250ec76fb072e8952dde61853a0da4114904aa79245663af0b46e29598cc2c760f9eea06af3dc6d2bae14ada4e2e83b8
-EBUILD buildbot-worker-1.1.2.ebuild 4833 BLAKE2B e8985356c55bca345014e9a461863ec9852a1032f3d3abc1aac01598b0c477130757ea373a3d9531e6664de4a1285ebf00615438af06cbac120ec993b83d7479 SHA512 5a9dcad57e0abf5ac106452de31f7462493cae47e153bd99f03fa8e8f230d5644dc28a94c58b2c83febd6e3726672c6ae9da2a609bdb428510377b656bbe5d34
-EBUILD buildbot-worker-1.3.0.ebuild 4833 BLAKE2B e8985356c55bca345014e9a461863ec9852a1032f3d3abc1aac01598b0c477130757ea373a3d9531e6664de4a1285ebf00615438af06cbac120ec993b83d7479 SHA512 5a9dcad57e0abf5ac106452de31f7462493cae47e153bd99f03fa8e8f230d5644dc28a94c58b2c83febd6e3726672c6ae9da2a609bdb428510377b656bbe5d34
-EBUILD buildbot-worker-9999.ebuild 4833 BLAKE2B e8985356c55bca345014e9a461863ec9852a1032f3d3abc1aac01598b0c477130757ea373a3d9531e6664de4a1285ebf00615438af06cbac120ec993b83d7479 SHA512 5a9dcad57e0abf5ac106452de31f7462493cae47e153bd99f03fa8e8f230d5644dc28a94c58b2c83febd6e3726672c6ae9da2a609bdb428510377b656bbe5d34
+EBUILD buildbot-worker-0.9.12.ebuild 4818 BLAKE2B b685b7deeb4fe497dac792fb308f334f8652462b4a16966700e5ad5dc676281e533e9be7e59f62cd70d7904b698d32961fd480aaa03460fad38c33e00a1857ec SHA512 632c8e4b67585278f26776d7f3501b741102b68471f7c0ffc01dc3e1da092fa04ae631ccd6215747bc2e82f6b88acafe7cf7c86a88841c928a712301c0ee42f6
+EBUILD buildbot-worker-1.1.2.ebuild 4823 BLAKE2B b47514c9c3b149cbab12af9223533c2255a8a08252df7b0830a8909f3bd2dd8361e2046dd56977ceb67106b66e9d7c51129fc4a1539c9638cd3d8cce3dcea48d SHA512 1860190cd09936cd96636c4e9b63a393dc6d1d09447aa9f8292a29634b71a1f7bf946776b17b10a1c417b76a1361936a587d0bd4966a6d6285f97cb7b5e4d30f
+EBUILD buildbot-worker-1.3.0.ebuild 4823 BLAKE2B b47514c9c3b149cbab12af9223533c2255a8a08252df7b0830a8909f3bd2dd8361e2046dd56977ceb67106b66e9d7c51129fc4a1539c9638cd3d8cce3dcea48d SHA512 1860190cd09936cd96636c4e9b63a393dc6d1d09447aa9f8292a29634b71a1f7bf946776b17b10a1c417b76a1361936a587d0bd4966a6d6285f97cb7b5e4d30f
+EBUILD buildbot-worker-9999.ebuild 4823 BLAKE2B b47514c9c3b149cbab12af9223533c2255a8a08252df7b0830a8909f3bd2dd8361e2046dd56977ceb67106b66e9d7c51129fc4a1539c9638cd3d8cce3dcea48d SHA512 1860190cd09936cd96636c4e9b63a393dc6d1d09447aa9f8292a29634b71a1f7bf946776b17b10a1c417b76a1361936a587d0bd4966a6d6285f97cb7b5e4d30f
 MISC metadata.xml 402 BLAKE2B 8ae4401e82aeac4b9e28c94cbfefaaf2f15d15dad0771fda3e1447dc98ef99fd4578b6dbc8e475eb3354ae781f481dd8c6422c06a67d0612ea89e7f39a1d33ab SHA512 a47717971189510d5781fa3ea41de026fe2518d32619eb6830cdc1cbad89182dc01dc2c57877c9689565fcea713ac08dd36af9f51ef47888319ea2380b488deb
diff --git a/dev-util/buildbot-worker/buildbot-worker-0.9.12.ebuild b/dev-util/buildbot-worker/buildbot-worker-0.9.12.ebuild
index 65fc5de22877..2fc5d7a0f231 100644
--- a/dev-util/buildbot-worker/buildbot-worker-0.9.12.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-0.9.12.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
diff --git a/dev-util/buildbot-worker/buildbot-worker-1.1.2.ebuild b/dev-util/buildbot-worker/buildbot-worker-1.1.2.ebuild
index d4c993247d75..a8ac9da44f52 100644
--- a/dev-util/buildbot-worker/buildbot-worker-1.1.2.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-1.1.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
diff --git a/dev-util/buildbot-worker/buildbot-worker-1.3.0.ebuild b/dev-util/buildbot-worker/buildbot-worker-1.3.0.ebuild
index d4c993247d75..a8ac9da44f52 100644
--- a/dev-util/buildbot-worker/buildbot-worker-1.3.0.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-1.3.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
diff --git a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
index d4c993247d75..a8ac9da44f52 100644
--- a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
diff --git a/dev-util/buildbot-wsgi-dashboards/Manifest b/dev-util/buildbot-wsgi-dashboards/Manifest
index 9fe64e5c543e..4d94abd07064 100644
--- a/dev-util/buildbot-wsgi-dashboards/Manifest
+++ b/dev-util/buildbot-wsgi-dashboards/Manifest
@@ -1,7 +1,7 @@
 DIST buildbot-wsgi-dashboards-0.9.12.tar.gz 627274 BLAKE2B 26632ddd1577e9c419d13c07958c203440ef875bc4a79be6b894d0cf4dc457423528b7ea34c830511a5ef5d7f645fde2f71ac08578e1de32687c8b1ae2864491 SHA512 113c1616b08feb64fd3d94c1186e3d7dd7ea93e563a96ddb802e6ff8135e194014464ef09a23004518451626584bc531fc17419188ebbdd388e9363541b80c3d
 DIST buildbot-wsgi-dashboards-1.1.2.tar.gz 626825 BLAKE2B 396fa858cafd6dc3958c37ea2e9e685357de2185ce0b73d946d3eb2e99472339e176de1b49d821337535904c521e8dbaa662217c568306e7b2d889d11fdeb5ed SHA512 1eee2a38b525145e50812dff421613291f6b0b6a80a531b54383d771393d2a12c1c7840e2dabf7949918ac3f31ce5f6bd9514c08dee8fe5900c99438e63d4ee2
 DIST buildbot-wsgi-dashboards-1.3.0.tar.gz 626828 BLAKE2B 9c44bca995a1849246c71cdf8ecca1a72ffdca9fb8e99db4e05dc529e0b188b85f45078c0f961c03eeb688fae08975dc438ba7c85bfcd3bebcc14a0d56a69f67 SHA512 97885bb26eb03c40b8424063333a9bbc80b5111ce82c79e0ca466f2f820622df43c6913b6b6f4f9ead2a47e09496ff9442df4a6a9a34041f6b9a127544413330
-EBUILD buildbot-wsgi-dashboards-0.9.12.ebuild 1170 BLAKE2B 5288ba9f6196759d2e58a21863dd3a1be2081752c186f201daa765235e76d2f0f68fa4302167af1b5c9230b6edc1c240977c7b6262e8c148d5f52e3f7eeeff76 SHA512 cba0374459c0a7398381d784502d7946ad477af028831915f077c5ef3a342c6018df132f09027a17a9f651829722edb407bb410ab3e6e83d584849d26e06792f
-EBUILD buildbot-wsgi-dashboards-1.1.2.ebuild 1170 BLAKE2B 2818702164af7f7ea6f0721f4dd5bf1b0650eec480ffd8608e18ede8dbe374a08d29921c8101a11b477a785a2df46fd8033c9fe9700c61135d1e8e77a2500ac3 SHA512 0e49a5c12448439384fb853375b8fdaf14ef3ed987ebcd6a1e904790a055749e22c6283a94c45e927eacbccb354cb9edc56f9b8f99562b5496e28ed4b5e5e539
-EBUILD buildbot-wsgi-dashboards-1.3.0.ebuild 1170 BLAKE2B 2818702164af7f7ea6f0721f4dd5bf1b0650eec480ffd8608e18ede8dbe374a08d29921c8101a11b477a785a2df46fd8033c9fe9700c61135d1e8e77a2500ac3 SHA512 0e49a5c12448439384fb853375b8fdaf14ef3ed987ebcd6a1e904790a055749e22c6283a94c45e927eacbccb354cb9edc56f9b8f99562b5496e28ed4b5e5e539
+EBUILD buildbot-wsgi-dashboards-0.9.12.ebuild 1160 BLAKE2B 8b11516a18c7ab3e00965878abb996b9f6e25726af62b9d7c6124efe2fa9891b5b5001d6c2a4cddb682eb996abcd92e767390decdc63302991c1f4b4d4ac0caa SHA512 8fdf990e134ec41009326fc97784097d6bf277c2d850738f1c883a880d41bbb22ce165fb4b71a8ccce11afe9fca6e72941556f5edefeb91b49652422227b1c28
+EBUILD buildbot-wsgi-dashboards-1.1.2.ebuild 1160 BLAKE2B 513b4f9caeb71b2b538d7b1bb7e4460b0c5dbd7fc59d2a9ded597fb72576c43a5ac458f4a3721ed6eb8d36786957c74e528df0cfe22adabb39d52c98b4c280d9 SHA512 ac771c690204607251b7f3dbdcd21439660a78c04744403fa7492619ab9074418d4810cd9c967845eddd5d328a54e145c940c829374d25850fb3457b507dae38
+EBUILD buildbot-wsgi-dashboards-1.3.0.ebuild 1160 BLAKE2B 513b4f9caeb71b2b538d7b1bb7e4460b0c5dbd7fc59d2a9ded597fb72576c43a5ac458f4a3721ed6eb8d36786957c74e528df0cfe22adabb39d52c98b4c280d9 SHA512 ac771c690204607251b7f3dbdcd21439660a78c04744403fa7492619ab9074418d4810cd9c967845eddd5d328a54e145c940c829374d25850fb3457b507dae38
 MISC metadata.xml 601 BLAKE2B eeb2a7e4d63561b48e7eb2e77fcae315008e4a567baff579bc086623118fba8675590e059ea3a6437d158e9e9992eea7ed8c0fa46a778d5dc333786dc70a58aa SHA512 2bd94cca6be055e75c5f772913570f01ef07eba909c8ab79c21df89a806548a8920016fb6fb139ddfc9c613101432e51bc9dd2600e3c6f01a6986d06107844b2
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.12.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.12.ebuild
index 514e8a93ce89..2cb6c6384660 100644
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.12.ebuild
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.12.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.1.2.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.1.2.ebuild
index 038efd4e9ac5..fdac2604e41f 100644
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.1.2.ebuild
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.3.0.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.3.0.ebuild
index 038efd4e9ac5..fdac2604e41f 100644
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.3.0.ebuild
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
diff --git a/dev-util/buildbot-www/Manifest b/dev-util/buildbot-www/Manifest
index b942a472c15e..488298b90b18 100644
--- a/dev-util/buildbot-www/Manifest
+++ b/dev-util/buildbot-www/Manifest
@@ -1,7 +1,7 @@
 DIST buildbot-www-0.9.12.tar.gz 691551 BLAKE2B 9bef044fe9e48e34d3e314d9c9b7446a1e295898c432da5c8915e36156f2f934fd065c8075dd55f68da7bc29a567c1ef276bc415df38911aff7c33de46fa7942 SHA512 6c525d32407be24aa728a0bd9c9a09c64bb4bef092ef9e5285475527f7fcbd89d516ea376d90b22aa24af384d73125bc886360cf992dfe3d01471838193f351a
 DIST buildbot-www-1.1.2.tar.gz 718705 BLAKE2B 009ae0dc07693f9eee4e3982ccbecb32d64e7d27e374f539cd541a5f80d9b9bf798e8836502cd26a5477b0ee842dbfae2308608fa3320e682afd0bcda2f89f1e SHA512 e4a0f7aee5e38d0522d39c819d4b9865966e020fd89b156e79807417fd7f82d497fbceafcc8a89e5beb6def1f42e4bfc595053581cbe2634520ad2c806ce3968
 DIST buildbot-www-1.3.0.tar.gz 717517 BLAKE2B 57b0ed7ef46fecb242562a0f93e234985c9cc0ea55d273c1c5de74753f6ea83d25d5017515afb6ad4b7bff4f80cdfb9a6daf937c5cd133c017c9bd6fa9d6d7ee SHA512 e01d1d3528ab1f29ff136321b25f45b01733a4f23cd9d637c9e3290b5301a8ac3dc545decb178c1332e58dc3e11065ef73df49fbb46fca6068acabdd40a8bff1
-EBUILD buildbot-www-0.9.12.ebuild 1202 BLAKE2B 4eb07467f37b463ed90ecee62c12bff70257bb7844c6b6d18a318901166d00056ca327916482f9806de03d9eb566af69b0549b5925f39bf1dcce1e6491a146b5 SHA512 19d7897dc686527a630ef0153716369347c4551c3a921abe7dac2dccf07d23e42379e3cee913c5422e16161716eb25756c702ba40bc8f807811dc51a81f20b53
-EBUILD buildbot-www-1.1.2.ebuild 1202 BLAKE2B 4eb07467f37b463ed90ecee62c12bff70257bb7844c6b6d18a318901166d00056ca327916482f9806de03d9eb566af69b0549b5925f39bf1dcce1e6491a146b5 SHA512 19d7897dc686527a630ef0153716369347c4551c3a921abe7dac2dccf07d23e42379e3cee913c5422e16161716eb25756c702ba40bc8f807811dc51a81f20b53
-EBUILD buildbot-www-1.3.0.ebuild 1202 BLAKE2B 4eb07467f37b463ed90ecee62c12bff70257bb7844c6b6d18a318901166d00056ca327916482f9806de03d9eb566af69b0549b5925f39bf1dcce1e6491a146b5 SHA512 19d7897dc686527a630ef0153716369347c4551c3a921abe7dac2dccf07d23e42379e3cee913c5422e16161716eb25756c702ba40bc8f807811dc51a81f20b53
+EBUILD buildbot-www-0.9.12.ebuild 1192 BLAKE2B 6b602e9ba06ca4f6db2645b30ad8379d30abdc47eb189ae16dbe33e241bec0b79eb0788be5dd64ded5898af8d106f2ab8c603c6bdd32fa02519e44ffca69ab8f SHA512 438b1c81a9449f841e7c1037ab5dddce11912c27028d247927dd2a9ac8ac99534254bdcfa539ba46809a6436ac04cef3f72b9a1d9d95f51bab5465ab4c6a1af4
+EBUILD buildbot-www-1.1.2.ebuild 1192 BLAKE2B 6b602e9ba06ca4f6db2645b30ad8379d30abdc47eb189ae16dbe33e241bec0b79eb0788be5dd64ded5898af8d106f2ab8c603c6bdd32fa02519e44ffca69ab8f SHA512 438b1c81a9449f841e7c1037ab5dddce11912c27028d247927dd2a9ac8ac99534254bdcfa539ba46809a6436ac04cef3f72b9a1d9d95f51bab5465ab4c6a1af4
+EBUILD buildbot-www-1.3.0.ebuild 1192 BLAKE2B 6b602e9ba06ca4f6db2645b30ad8379d30abdc47eb189ae16dbe33e241bec0b79eb0788be5dd64ded5898af8d106f2ab8c603c6bdd32fa02519e44ffca69ab8f SHA512 438b1c81a9449f841e7c1037ab5dddce11912c27028d247927dd2a9ac8ac99534254bdcfa539ba46809a6436ac04cef3f72b9a1d9d95f51bab5465ab4c6a1af4
 MISC metadata.xml 588 BLAKE2B b50149f2f21f5ddb5dfc4bbff2830c3a6f047ab04df1487fb1a462b403d6d4201eb7945a069ce662fb6682782e98720970c58fd3b27c4252d2b7843ae083599b SHA512 a215b7802240ef70f0c64e6fb511913aa83f514a79e79e24da98c36b68ed0105288f4515b0b016bda96ff3ce187694b41e508b4d22fa5a42ab57306fb8511491
diff --git a/dev-util/buildbot-www/buildbot-www-0.9.12.ebuild b/dev-util/buildbot-www/buildbot-www-0.9.12.ebuild
index 382d685f46e6..196516c17f9f 100644
--- a/dev-util/buildbot-www/buildbot-www-0.9.12.ebuild
+++ b/dev-util/buildbot-www/buildbot-www-0.9.12.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
diff --git a/dev-util/buildbot-www/buildbot-www-1.1.2.ebuild b/dev-util/buildbot-www/buildbot-www-1.1.2.ebuild
index 382d685f46e6..196516c17f9f 100644
--- a/dev-util/buildbot-www/buildbot-www-1.1.2.ebuild
+++ b/dev-util/buildbot-www/buildbot-www-1.1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
diff --git a/dev-util/buildbot-www/buildbot-www-1.3.0.ebuild b/dev-util/buildbot-www/buildbot-www-1.3.0.ebuild
index 382d685f46e6..196516c17f9f 100644
--- a/dev-util/buildbot-www/buildbot-www-1.3.0.ebuild
+++ b/dev-util/buildbot-www/buildbot-www-1.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index c9581d29440d..ae576936e19d 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -4,13 +4,11 @@ AUX buildmaster.initd 1654 BLAKE2B baec16ceb91386629cc9ea0b22118dd3dd76ec6f50a1c
 AUX buildmaster.target 138 BLAKE2B 7570fc327d2e002803f7d6691740f5885e6b54d3df2522c0439d551d0c01161fcd99779df0bff417dd66e1bacde2956bfa7b39f988f2fe204fb2abdb675adfe9 SHA512 c5f56688349af0adcfa644abc699445e2c61bb268d5407f8fc540ac80ea9be6aee615df16bbf0f41db272dd4159762d7be744b3116efc0f9bc7cb1d458edb050
 AUX buildmaster_at.service 375 BLAKE2B 1a4d829389298713bf66885a5bcd28202eec32b6356b43b9e0861b00052e3702593a2e2a4764246dd62e52805ba2f2e62a86d0ae8ec4cbed3df42400dc562f74 SHA512 c37f1c461a4c7ee741a839772a5feabf10103542e159c6ae4eddfa37a146732dfc23f91d867d69c3718a21714516a3847485ae4e6580c93a5aa94daec40dd093
 AUX buildmaster_at.service.conf 150 BLAKE2B c6931c3ebfd77553d52b650668c440ca17f37bf270ab807eb97702d23cc504c0a933453addeef4abd3ddb13e9441cd330dd4cff9dc9962bdabbed8f0fa6d892c SHA512 d533b95c5b180cda5aa73966c590b7828598d5b6bcd77147a88238941adaa4c3c78e5f17d771598f622212856b16ce4582ab915a4cb57f0dd633eb2ad6b4c10d
-DIST buildbot-0.8.12.tar.gz 4834352 BLAKE2B 16d06d6ccbbb90581471cf1727cc9cdd556ab1c0fa1433bbe76475513a7482619b05c28038e956e8724b99a806aec371961302914567fd36caccfe342daa6aaa SHA512 18c5144132fb033f3581d3c494d5e8ff35d3e8b1548764452ce9ae543d710e58a2c6e3e8e46a0ef237804f9a6a45485890ae4616ab655fb00d4ccf328d6f6645
 DIST buildbot-0.9.12.tar.gz 3057832 BLAKE2B 8e1748739bacc3c884f353b2a1c798575e3ce5f451a1711ecf88a7c7e517da86d2e791748d31468a2bb07369022e96cb568518b7a8ce1d9e1cece0b6ab77eec8 SHA512 62459918267297b31b2a6416f72794c7a4ebdcb60de04ece1681f6b8be9debf161716cc70ad843fd468b23e02c521c0a0783a5a1e119d75648e107691d6b908d
 DIST buildbot-1.1.2.tar.gz 3101168 BLAKE2B 35ec56440014015850a69324d475c4ca9555ad90da85b26a7a43eca74f08361137021aec72ddca37cbb24f21519ebf45948e66214291f356b4a1fbada7c0b3b8 SHA512 14c28d6fae18a10d89d41509635188d881ac76e7b61758481a9afbb22eb384d7ab5080383242e5850af13bfe46877985a91036270c3c4fbf01eafee5b7699815
 DIST buildbot-1.3.0.tar.gz 3119185 BLAKE2B d366b83baad7e865481535a2462ceb222aadce6c90a6229e82a72bf86518b8ebb0624d8ac8b64867783d58b6e9033b942a1ccd31fd6664a2b527eac9f11ab852 SHA512 e5ecf3eafe428a188c2410d270ee9bd5afc39122e62d35747288cf85347368ab4a94190b4ff6fe687269dc19cc7b91d33be8d3e3b637741e421a2cbd83572830
-EBUILD buildbot-0.8.12-r3.ebuild 5511 BLAKE2B a21ff7c34a35f810a90d9b28664c23f3c22fafbee7c6beb059dbd84a2b875991304648c4a1b71e1b82cd964bc9da7ec9727609c0ed316d143e1ade0c19f29128 SHA512 7b533e30b3359024029f6e379d41e63c9b0722fc8483c5c0badcff0050bd9c9b6451aa644db4aa0c02223d7041e530943432842ef7308d5d712e69cf0c3812a7
-EBUILD buildbot-0.9.12-r1.ebuild 6454 BLAKE2B 4a7e2f95cf3c4e173d958c55058256e548450c77ef89e49518768df12e449e3a1263181a37dbbe99ba6a7d3188b4a8bccc169271e61450950921dc05dd98c2c7 SHA512 044f8f41521bc6536466d7dfffdc3d63824de4047304d7d2952679fc117d1d92db7b23999220809769dee215f7dd83f90cf434f857023c319eb0a94fa8dcbcee
-EBUILD buildbot-1.1.2.ebuild 6568 BLAKE2B ce9a7d886eb84f904d7be4e7b6e31692afd8ca13d3ae6b3cb9ccd59736fa3768faf150d0b648b64eebfe452d08b7d202f126f651545ddedcd028046b068a2c04 SHA512 1d300338000695255f1cf89c48f914f2ff0f9f1ae897bc7afe3bf3baa5c97fc61ad555d3fd7570e2a42507fc87629b85b198ccbd5360bf8ff2d6388578db0f02
-EBUILD buildbot-1.3.0.ebuild 7221 BLAKE2B 2090fec727e4677e35bd1b2318319f869084de2b1ecb2b6f214ba1243ca2960cb6f131cec36f91745e5aa064a1d2b6e91a7ea504da462fcbe85332eaf87f6264 SHA512 7ef5c7c522ad4a710a7b4685250b602a07408443711d1ecf26f377566286f43bfbafc9f192e9b81cadacc7a105b45176b4a632d01e7ebcd032082f1b9f0dff53
-EBUILD buildbot-9999.ebuild 7221 BLAKE2B 2090fec727e4677e35bd1b2318319f869084de2b1ecb2b6f214ba1243ca2960cb6f131cec36f91745e5aa064a1d2b6e91a7ea504da462fcbe85332eaf87f6264 SHA512 7ef5c7c522ad4a710a7b4685250b602a07408443711d1ecf26f377566286f43bfbafc9f192e9b81cadacc7a105b45176b4a632d01e7ebcd032082f1b9f0dff53
-MISC metadata.xml 1427 BLAKE2B 61fb937ec5b16eccfbca293455b8f1dbc8b98f489eeb150a0209b32bf53d79b3ea12841a2bd2a39d9b120009e897469e40aaa189fab33e67e9ef6a396353acd9 SHA512 eec1f2c30d650ae90c80266ffac401e432c75605422110511d40162635da39f3428e33bb04ef58de8124830e34434d2e8b582600d75ffed0bfa8d8e25e2ad1a6
+EBUILD buildbot-0.9.12-r1.ebuild 6444 BLAKE2B ceacfcbc66a0fb1e927cacbd456ef023145c475ff42ff64eaa603e1db295bec38cb7939bf577410234f16e3a851c2a41d99863f4efdced715e7d2ebdd015e3ed SHA512 8857547742c7ebe0f8fd5a5919a0e1cb5fcfd34cc35f6fd5c56f7305fd2db9bc72e5d805077ae3f041dd1b16d8825c69cd0062c6dd181db5d781512269266f10
+EBUILD buildbot-1.1.2.ebuild 6558 BLAKE2B c20fe0973f6cec4336f3d60a2c94f71ccae7cc5cc819549bc0e84f748f307d4e2e0bc5dd864a612b6dfd4ae9b3ab3f7ca9693e407dca414882ecb1d20e15078a SHA512 477c80abc713c6e62754fae6f071eeb0401f719a72c491a3a5932be8364ccc80fb2c1fc47c8093f558974a00151b8db3bfa34f3c4a088dec75d5d59ff4e6e63a
+EBUILD buildbot-1.3.0.ebuild 7211 BLAKE2B 60ed79646218a10214ca297391319e5ba3f5124065883ba0e0a71cfb38eba76316554a6150c966ec83f09826430e2e83d28d1285e58dd75af731781121629549 SHA512 245c9956385d2752e5a54e880671a685d90d20f6854c4ffcb916b2d8f60b402c4490b2365f8cff2ab7c000b9e61065f142140c2a452f7cb9834b9744624179f9
+EBUILD buildbot-9999.ebuild 7211 BLAKE2B 60ed79646218a10214ca297391319e5ba3f5124065883ba0e0a71cfb38eba76316554a6150c966ec83f09826430e2e83d28d1285e58dd75af731781121629549 SHA512 245c9956385d2752e5a54e880671a685d90d20f6854c4ffcb916b2d8f60b402c4490b2365f8cff2ab7c000b9e61065f142140c2a452f7cb9834b9744624179f9
+MISC metadata.xml 1281 BLAKE2B df69e4162a683d530c69307ea6b29362ad99f6a54af5ff977f67268e580d95cfc1924fb236f61da1c2106246e42563f66c8605d0ef779952cce57e75326a3416 SHA512 b5b7d4e08078e2541ce37ce17623dec45819029081dc9108789e964c2575b5868ea27b2d5eaa13a96b038a8a667ce7ebf18df6e73fc54eeacd609f79df36b9bc
diff --git a/dev-util/buildbot/buildbot-0.8.12-r3.ebuild b/dev-util/buildbot/buildbot-0.8.12-r3.ebuild
deleted file mode 100644
index f4f29f9274c4..000000000000
--- a/dev-util/buildbot/buildbot-0.8.12-r3.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1 readme.gentoo systemd user
-
-MY_PV="${PV/_p/p}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot build automation system"
-HOMEPAGE="http://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-IUSE="doc examples irc mail manhole test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	dev-python/twisted-core[${PYTHON_USEDEP}]
-	dev-python/twisted-web[${PYTHON_USEDEP}]
-	<=dev-python/sqlalchemy-0.7.10-r999[${PYTHON_USEDEP}]
-	~dev-python/sqlalchemy-migrate-0.7.2[${PYTHON_USEDEP}]
-	irc? ( dev-python/twisted-words[${PYTHON_USEDEP}] )
-	mail? ( dev-python/twisted-mail[${PYTHON_USEDEP}] )
-	manhole? ( dev-python/twisted-conch[${PYTHON_USEDEP}] )"
-DEPEND="${DEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/twisted-mail[${PYTHON_USEDEP}]
-		dev-python/twisted-web[${PYTHON_USEDEP}]
-		dev-python/twisted-words[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewuser buildbot
-
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
-		to support starting buildbot through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		The scripts can	run as a different user if desired."
-}
-
-src_compile() {
-	distutils-r1_src_compile
-
-	if use doc; then
-		einfo "Generation of documentation"
-		pushd docs > /dev/null
-		#'man' target is currently broken
-		emake html
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	doman docs/buildbot.1
-
-	if use doc; then
-		dohtml -r docs/_build/html/
-		# TODO: install man pages
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r contrib docs/examples
-	fi
-
-	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
-	newinitd "${FILESDIR}/buildmaster.initd" buildmaster
-	systemd_dounit "${FILESDIR}/buildmaster.target"
-	systemd_newunit "${FILESDIR}/buildmaster_at.service" "buildmaster@.service"
-	systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" "buildmaster@.service"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "Starting with buildbot-0.8.12-r2, more than one instance of buildmaster"
-		ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildmaster instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildmaster /etc/init.d/buildmaster.myinstance"
-		ewarn "    rc-update add buildmaster.myinstance default"
-		ewarn "    /etc/init.d/buildmaster.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildmaster@myinstance.service"
-		ewarn "    systemctl enable buildmaster.target"
-		ewarn "    systemctl start buildmaster.target"
-		elog
-		elog "Upstream recommends the following when upgrading:"
-		elog "Each time you install a new version of Buildbot, you should run the"
-		elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters."
-		elog "This will add files and fix (or at least detect) incompatibilities between"
-		elog "your old config and the new code."
-	fi
-	elog
-	elog "In order to create a new instance of buildmaster, execute:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_config() {
-	local buildmaster_path="/var/lib/buildmaster"
-	einfo "This will prepare a new buildmaster instance in ${buildmaster_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildmaster_path}/${instance_name}"
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	local buildbot="/usr/bin/buildbot"
-	if [[ ! -d "${buildmaster_path}" ]]; then
-		mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}"
-	fi
-	"${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed"
-	chown --recursive buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	einfo "Successfully created a buildmaster instance at ${instance_path}."
-	einfo "To change the default settings edit the master.cfg file in this directory."
-}
diff --git a/dev-util/buildbot/buildbot-0.9.12-r1.ebuild b/dev-util/buildbot/buildbot-0.9.12-r1.ebuild
index e59e4df328db..c56a3675fcf9 100644
--- a/dev-util/buildbot/buildbot-0.9.12-r1.ebuild
+++ b/dev-util/buildbot/buildbot-0.9.12-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"
 
diff --git a/dev-util/buildbot/buildbot-1.1.2.ebuild b/dev-util/buildbot/buildbot-1.1.2.ebuild
index bdd4428972b3..38a9ae82e1e8 100644
--- a/dev-util/buildbot/buildbot-1.1.2.ebuild
+++ b/dev-util/buildbot/buildbot-1.1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"
 
diff --git a/dev-util/buildbot/buildbot-1.3.0.ebuild b/dev-util/buildbot/buildbot-1.3.0.ebuild
index 38b52878a2e9..d59c41b23e9b 100644
--- a/dev-util/buildbot/buildbot-1.3.0.ebuild
+++ b/dev-util/buildbot/buildbot-1.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"
 
diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild
index 38b52878a2e9..d59c41b23e9b 100644
--- a/dev-util/buildbot/buildbot-9999.ebuild
+++ b/dev-util/buildbot/buildbot-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"
 
diff --git a/dev-util/buildbot/metadata.xml b/dev-util/buildbot/metadata.xml
index 6bb44137e07a..16f4ac623ef9 100644
--- a/dev-util/buildbot/metadata.xml
+++ b/dev-util/buildbot/metadata.xml
@@ -19,8 +19,6 @@
 	<use>
 		<flag name="docker">Add support for worker docker command steps</flag>
 		<flag name="irc">Add support for status delivery through an ircbot.</flag>
-		<flag name="mail">Add support for watching a maildir for commits.</flag>
-		<flag name="manhole">Add support for manhole (debug over ssh)</flag>
 	</use>
 	<upstream>
 		<maintainer>
diff --git a/dev-util/byacc/Manifest b/dev-util/byacc/Manifest
index f648881a9533..1c954747ee62 100644
--- a/dev-util/byacc/Manifest
+++ b/dev-util/byacc/Manifest
@@ -1,5 +1,5 @@
 DIST byacc-20190617.tgz 799465 BLAKE2B 2baf34b20da049b3b1d2a569ec6b5470fe4935c9b13062fc58e6c73de6cbb1823736532686d4c9c083771432ce1caccc369c87070b27d59e9cb7c5c5bf1391c9 SHA512 79d04d7aa976e8b4e1bbd69f75ac1f0dbe005b1a7b072ce5ef75c877e8ece043e4adf48645c10ef036ee02de639b56b9befebb34f6e46cac1a59f8f641cc7cc8
 DIST byacc-20191125.tgz 871913 BLAKE2B b779fd05a98bc794544d84568720979ede374c7c821f3883e2568dd97bb2ded2dbc85471f5dadb7aa2953d9cc9665f4f1f18b77717aa63eae0786f70683fd9b7 SHA512 ef35ec6a294b07c71958dbd7106cc9b4a99d0eb45336d71c2763b3861a2cf97ed1de7f8c242a5eeb2841578711ed4a0bd874b7d6ac5e63db7f1d418847767c7f
-EBUILD byacc-20190617.ebuild 617 BLAKE2B 26899562d0ad3f35a7785cd320b5e22b29c81dd9a869f2a2c2e6978fcf77e6ef691bd91b39c9c8a9162a0f18c0118394098f1522f585b5ba03adde5cc3f2fe95 SHA512 b4439e20ad1b08a6464ce7a416633980694788145a71fb02bd6d5716895e918f99ebb9c4af808d51af89b7a293cc8cd16a08f8aba97a4e5ece2bd8d9ec03d524
+EBUILD byacc-20190617.ebuild 618 BLAKE2B 9a217fc420a9b9498c0f90869910f27a16d3314382d97af62ac0c12c08b92342644f76c3cb531fffbd1b441ed21edb97468359e3c39bcb757dad3b9794c61db4 SHA512 e8468fbcf70bf79cfb5d11547dc0c49b9d8bd0ea819b12aadf2c0a8c0c71e03605337d9117e9a6c763faed6e44ccc2b79297add68dc8d306ecfe139da58c77e6
 EBUILD byacc-20191125.ebuild 628 BLAKE2B 7f22364a3b39f7f0eefb08c1a46a59e7e6575b15f97fd635ef58d24550b525f9584955cceb19423332128b6781c61d2b28bff072064954a4c09b3d259e85a26a SHA512 69977bf34eca30e0bd311395d6c9a201de6fecfa24418c4f7cd4e1011b4c045931e08ef5f4e10077aa66ddff7a121def2abbd72e76be2383f57dcf6c7660f9c9
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-util/byacc/byacc-20190617.ebuild b/dev-util/byacc/byacc-20190617.ebuild
index ac1ff5ee28b5..2d2c0bf8a7b6 100644
--- a/dev-util/byacc/byacc-20190617.ebuild
+++ b/dev-util/byacc/byacc-20190617.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 ~sh 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 ~sh sparc x86 ~ppc-aix ~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/cargo-ebuild/Manifest b/dev-util/cargo-ebuild/Manifest
index b57d7d992662..c5635fff518b 100644
--- a/dev-util/cargo-ebuild/Manifest
+++ b/dev-util/cargo-ebuild/Manifest
@@ -1,6 +1,7 @@
 DIST adler32-1.0.4.crate 5105 BLAKE2B 344a5258e77328a24a545e32f9bc653fa25b7ea43803ed7861db261bce227aa1599520a42acea3de1f2acebb8fa9fad251e2688413b752eafe2401ca1a2ee34a SHA512 5990e1e277a1c3aae5adef5e4601b807a756a40e88578bb91f1c70d70babfa97fb3f2c1b963482ec8e18c16d5e722bf90fb42f9646c8dd840373f28965a2d123
 DIST aho-corasick-0.7.6.crate 108953 BLAKE2B d713366d0783e1ffbe65408e4d38ef9f12276f61043c768265de5d47e446a378306096a70252c9a49a6e7d3b97a09f30405a3d8df6b40dc2dfeb7407ed574c95 SHA512 120aa28e72279f561d7f51657aa0800dd46504cd92f758f848284e5f3695be6f5e24056a66b0f2d971c527277e92ae938e2357ade37b5cbe1c93913a5dc308b1
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
+DIST anyhow-1.0.26.crate 26024 BLAKE2B 09cdaf61531f3a36b186fbebc2c783d472b54494c1dbd0e2b808be332bfba5783f40d66e46b2148a677ec61ed89f73bf2db04ebb6d43c8b395162177181d2094 SHA512 362a22854f90032f407875ee3687287f2c9c87e3b462e808219e0fd4d3067ad245544d1b6f38b3130d824af77390a331ac0b5a918498ee6c6b401fc8d0292ccc
 DIST atty-0.2.13.crate 4764 BLAKE2B 673eea1d377fc3aca792a3a8bd2a5c058f3041abc76a8760dd6acab7f19fa610f812c57d81a4dbf773675cad3df483904c66e66b45d83393402f747c6db60d89 SHA512 4554ca7dedb4c2e8693e5847ef1fe66161ed4cb2c19156bb03f41ce7e7ea21838369dabaf447a60d1468de8bfbb7087438c12934c4569dde63df074f168569ad
 DIST autocfg-0.1.6.crate 11439 BLAKE2B e0eb7a3176bb5ac27b8de466c5fcdfedb9ad32f4d2b52c0385550902d59d01c716a53179708bdeb250a91690edeb70ab81d91090ff0fd89a731dd365621aa496 SHA512 ac7dd73b7c6b8b54c4fc98c3e75210eb59d46ab3447fca533763bfebfa87dba5e947829e3ba56a8eb3403f6d317065b7d674da883741e619f3866b12267801fe
 DIST backtrace-0.3.38.crate 68133 BLAKE2B 75794901cf8d322cb642672eaab9403b00f802a917f04505d8a4df1466d340f92f1824cd0cd501d5f6017ff98cf17e4ad61ce32fce07b061fbcdaecce5ac0c55 SHA512 a962b8ffd435691bf229f6db6cc86a0e9fabec1dea589824a85f11ee77e2c36458cdebd68acc0624d45195df27a9fb6dace0afb98a9fddc0291bae93928345fe
@@ -13,6 +14,8 @@ DIST bytesize-1.0.0.crate 7522 BLAKE2B cd4f9687753ec1ea4e7435f34b64afdf6e5534d33
 DIST c2-chacha-0.2.2.crate 13766 BLAKE2B 0b963b7a4ac64d71d75ab542a23585cd7bb99995b923c52edf99c49a76222978d0a96c020a5a1199c971133fc1f8629b562088b34fd283b7b5da7800848f85ab SHA512 d8edeff2f4eefb9504160d7f4d3c450661d10905c23cc4950736ab76e73bd1e88127c006bc762d63694847f2cc981ceeb0727ecf18e8fad7c89209d7a9e70f14
 DIST cargo-0.37.0.crate 1016321 BLAKE2B 7b47599dba5ab5662a24412f496f94b10af4636678f6e5521cfbc603188a768697ab4667e387286cab4f15b16facc71e49035f015c41796aaff1f6889828da5f SHA512 8ec554818e58e9c80740ad5130e65318836059944a1dc2dd9bcc74b2a51e69ad3d66d99669c0f497110daf92bf5215db963504e492f416d0addc545916b554b3
 DIST cargo-ebuild-0.2.0.crate 19731 BLAKE2B c72df800403dff677fd686997cebaa9d4b96802f8d64c1247883e9a6ffd84eab3b17406af22bc2e471b400634ec1d3b806d261c8318164d84ae3e9d9aa98ea3d SHA512 1baa0a7e8bcd91b0e2bd89b89efe1bdba62e28900d1e681b346550ae4826f6776de2ee4fb4a27e748710ee7cbfdfe586daa07265a203917313d6eb144bebaac3
+DIST cargo-ebuild-0.3.0.crate 12098 BLAKE2B caa4b194cd9ee6f9c11a1f953d4ef6f1bb0e646f4a6d0578b198789b9ed99e577b850847279585a01c824fad917867d8d19530bc854eda26edf1dfe9624f28b5 SHA512 ca3c77e0c19a72f8dbc6f238d9f38c8e11d5da05949e8dfa940982d1a59b0d89d80663725049fdfca5cfc7902eb1fe75f296be73021b274293bcffdcf0dd3a95
+DIST cargo_metadata-0.9.1.crate 14876 BLAKE2B ff4b404231831641826fd11e2c43c12a83f9fdc4277eac351a154db8df219b09f53fa97f2138b28e280215b52d167ea733134d12e932419a5b53e5167a102792 SHA512 d1c0ff7625d0479764305b33410d8c95d5dcb3c8154cf18f84c7d5b63809dcf6a998e3f511d8245f399701d08ea54864b1f976b40db968eeb094813ff473a01f
 DIST cc-1.0.45.crate 49112 BLAKE2B f24cd4aba8f84be490ee89f95c666e35156a9dfd745ba4b28a61130ec0c2ff2b8e7ebbb7363cbebe8e9fadcfcd8c1f7f72bbbcf834b146395840c5569e66bfcf SHA512 cd521fa11c0390cb7c71300ef77c5e27f10739345ff9c2d81c693191d602e8b54717237d1cfc325a39220f721df356e771c7a96885f77f43626d4e24d317434e
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
@@ -27,6 +30,7 @@ DIST crossbeam-utils-0.6.6.crate 32836 BLAKE2B 48290733712549c46bcf99641ddff571c
 DIST crypto-hash-0.3.4.crate 8102 BLAKE2B 8bcf39d195d40a2e6d899fa254c9f64e982d742fb304f4b271b75db305d5afa8ea5361c0b6adb23c0fbfd212f3c4601bc7476b4874eaac00a26c8a65b711b0ae SHA512 57d020650689c988859f51ec9252702a7e8510526364b00058b263f4decb249d7296811adf3b8c5e76f8aa744cd5e444aa198f3dfe134c98257b99cdeb824537
 DIST curl-0.4.25.crate 75171 BLAKE2B 8b9e10bd0690932dafbe49f825253ab4f0bfad79f7c32d093d31f831076de7a42d6f1944ff2352a71f3c6659203cf3fa5c050e864187e14ec70cc7d56490e52b SHA512 c42efa6bcb5989c4f3a91629d0a547448ccce7fc8556b802ed2bdd10941cae25bb1ad15cd914024f1fdb0d1799ac2345fdc649b985b86eb87074b2b80e7c80d3
 DIST curl-sys-0.4.23.crate 2935053 BLAKE2B a6230f0cec0d0d2ad59d0f29a1caeab178ddd8f1035a87fdb9979e41b873abe9e030b719c3b89004a620eeb562a212dfc7f90bab26dd81450609a2a95301a9e2 SHA512 67299a70b3e00a04e5de6370b2d2a04a8310ba6ba5d16f8072f47e4004430e2126759ce6fd746807904c3735c0e0775df55c23dddfd303fd47d73d66bc6e5f46
+DIST either-1.5.3.crate 12278 BLAKE2B ffbe3878098daadcef9a554b60b2904d8d4814ea38cb915ee0003d3cd11243e04813dfb41384545e7b180f7d542c7aa2c0a351b736d4f449e70fa11d0a09cca1 SHA512 5e283412597bc3a1341d42c6cfe824606e056aaac82cbf3f662e7074ab74f1f80befe9de1b1011ce2dc970a0ec159ade5ed5b3e71c9984facee6314eac20d0f2
 DIST env_logger-0.6.2.crate 31078 BLAKE2B c799e1be558ce1c2800aa6d2ca8f6de21b3fba48742495cea56baa16463e598feb200cba39d6725b7f447d4610135f6393f5c7f835a520d423f30f21e812686c SHA512 ec90dc0cee99a743d4cdc772fa66a9c4e81793e452000bc1432fb47436b62c6a02c36c40ea48550db493df65c4eb37e8a6d6d3b4011f00648294d745a200dafa
 DIST failure-0.1.5.crate 36749 BLAKE2B 97fb948770c3325862f449d5eafc07cfb170924b4a0efdf4e6d8902411eae6cade898c953a6b51a955838c359c670c1778b3a189c3e70152fe97e687df38a805 SHA512 8dcfff3b9f7ed03070cdd890e051bcd425535a4e18aec21d5a48383d2826528157ad51893cbaf320953d31752efb22f554ce974f8516706d87343537589433dc
 DIST failure_derive-0.1.5.crate 4884 BLAKE2B f09bc82f9fb489950d886ed1276ffefe06e916389d034aa3b82521445829e7fcee102e1c03030df9cc55e4b1f14c933ab83faee8be910037d33f15d15ef9c86e SHA512 c1a6896d986c126c35045c40a85b8cb8dd8842b9bd06918246205f2e79349e1df5dcdbe408024a0f9693d628e17bbd750a733a0a5cc24de4162b08790222729a
@@ -51,6 +55,7 @@ DIST idna-0.1.5.crate 258735 BLAKE2B 31f2506f76e9bbab68c0da6222db214865dc3799485
 DIST ignore-0.4.10.crate 49022 BLAKE2B 4e1fef531f800bf95bf1a601cb8f64d93ed46623217392368cd1f59fe6e353dae8e8e6d2a017c5b3bc89acf2a964eb682d30803f2d4ac3744935c4567d2675d1 SHA512 ef4b3f58bbdc3b5317a14244494ba9cad8e3d062f0c8e137dd2d33572dc8a06b20f59860aabafccb729dc682134aa4e2bdaea8c07b351aa73a8ebb00e361ceeb
 DIST im-rc-12.3.4.crate 124256 BLAKE2B 6ee5fe39142b8a6bb96c9a2f50206b67088377ecba753b92fde0211df409b82faeaa5a534016aa91a70aa5b93396af2247c2094d10a0dc136ad4319303e4a22c SHA512 bf85209dca389ec4681a53fec3d58a1f98f56a1821e916d95b152ed8a1eb7ca1fe704062c27a8af27c209da1bf84fda9f39f92202b4d810dac36ead4e225bce8
 DIST iovec-0.1.4.crate 8720 BLAKE2B aa1b4cd98ebe47901c0959cf1d8eb2586a803d0453e2a8bdd5c63442b32886dbcb37650aa218c748fd45c9fe3a7fdf20569eae5b19716487b139caae1526da4c SHA512 e23fcaac239807daea20ddcf2cdd4fb858ba1aa970ce6248f70f0fba5bff7ebdb27247c0997ac0ff2791178f86ff9657e473d8f64b86c644763e5b3474edd158
+DIST itertools-0.8.2.crate 89203 BLAKE2B bcf8c00da5033f36cc205708324fd8eff083d46313ee84f567e4f333d8ac1ebe44474d89835a312a5357a48659e2f51d34d2194d548256118943999a3da8ebaf SHA512 325d87a80c0b217469762ae958c46925d284b37ddd987c3ab977c864f426dc6e4515701864f12fafbe49289b45b1910906f0e7d884ba8aea217cac521c3d1ff3
 DIST itoa-0.4.4.crate 11147 BLAKE2B bb6f1caf1e58dc313bd3cfa2cf81252cb2ebc15e1f4c9adfcdedf46c5fa79811d5b0cbd58f1e91d1f62bf85d7b941b0dba535814fb43b5b70a38db791b45717c SHA512 f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d
 DIST jobserver-0.1.17.crate 19563 BLAKE2B 369af1c6ea420f3be059e7dec5e59d3634dbe0c7bd30e2067bad0ab7702b1643841943f72d8d8624d9b9b208f7e7c1480d2d2dadbadbe52855a6c08316ee1298 SHA512 14578203a000efe2cd88e9de96af216b5aec50f02aa2f33a884119d2edbad02626c05eae6f203ef92032f7d6f9ca58f427a368f843bd379e9e35b585d04fa161
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
@@ -137,4 +142,5 @@ DIST winapi-util-0.1.2.crate 7810 BLAKE2B 511f14b606b591da19159f0f49665846e55ef8
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST wincolor-1.0.2.crate 4821 BLAKE2B 14fec69f86d72f6664f7ada8dfa34cbb603f5ebd0de098db69c0bd0d193f49b4bb2ebdec40a962a44e9111f656f62d9d67135ae94147ada48440dd8cd7e615ee SHA512 b902c8985b3e341cd4728fa597528740bb3d95bdd3cdc4fd70867a41ab4d95cb64c4f20efa9a9a911c1905ac9e0adb4fadd13c126ae6a808caaafa23f47d7f10
 EBUILD cargo-ebuild-0.2.0.ebuild 2723 BLAKE2B 2c971c4e997c8dcdf14ac770b58172f509fb488cee9ce23599964725762d7f0dba7c435e3e0d5163e1c3448de83be949dcc2508deced0774b97713c4b1a62ce2 SHA512 ccef06000bcfb7b08ceed1edddb08945d36c04ecc5317543b8d3f83bcc7144afd2eafc8cc3b30f0808d27a819faf46df3892e0814bcdedabfdfb2c554015d6c1
+EBUILD cargo-ebuild-0.3.0.ebuild 1289 BLAKE2B 6132be438f20dd85f4695ec4b430b13b5c829dfd966f2dd5d354fca9dd9dee937425297e6c0e7e7561481d6f8b18d2c0043fcb1d04655337eeca9a54c7b99961 SHA512 50958b01331d557edf4883fad8eba8d3521d7553102dd19b799ba218c4592e35ff92fc0c07f7cc996895e5d54e3734ff7f74b1f1293d839a135cedf94f78c7d4
 MISC metadata.xml 331 BLAKE2B 1fafc9c1b14b8c365a91f02ff7941cffe5e7d97253f74160943a7fba64341f1399cd5daf1da8f3fd1d7a9dac3d0def483fbcaefd7c991ab64de7e4707e636f6c SHA512 e664485c069f1b2341376dee14c76e2ff99b2897837ef8242a9f76106ba4e4d5edc4e8a49b379dcb3848bd65560e68a0c881b005572d526f14234bbafd29dd14
diff --git a/dev-util/cargo-ebuild/cargo-ebuild-0.3.0.ebuild b/dev-util/cargo-ebuild/cargo-ebuild-0.3.0.ebuild
new file mode 100644
index 000000000000..9be58961c833
--- /dev/null
+++ b/dev-util/cargo-ebuild/cargo-ebuild-0.3.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 2017-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Auto-Generated by cargo-ebuild 0.3.0
+
+EAPI=7
+
+CRATES="
+ansi_term-0.11.0
+anyhow-1.0.26
+atty-0.2.13
+bitflags-1.2.0
+cargo-ebuild-0.3.0
+cargo_metadata-0.9.1
+clap-2.33.0
+either-1.5.3
+heck-0.3.1
+itertools-0.8.2
+itoa-0.4.4
+libc-0.2.62
+proc-macro-error-0.2.6
+proc-macro2-1.0.5
+quote-1.0.2
+redox_syscall-0.1.56
+ryu-1.0.0
+semver-0.9.0
+semver-parser-0.7.0
+serde-1.0.101
+serde_derive-1.0.101
+serde_json-1.0.41
+strsim-0.8.0
+structopt-0.3.3
+structopt-derive-0.3.3
+syn-1.0.5
+textwrap-0.11.0
+time-0.1.42
+unicode-segmentation-1.3.0
+unicode-width-0.1.6
+unicode-xid-0.2.0
+vec_map-0.8.1
+winapi-0.3.8
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit cargo
+
+DESCRIPTION="Generates an ebuild for a package using the in-tree eclasses."
+# Double check the homepage as the cargo_metadata crate
+# does not provide this value so instead repository is used
+HOMEPAGE="https://github.com/cardoe/cargo-ebuild"
+SRC_URI="$(cargo_crate_uris ${CRATES})"
+RESTRICT="mirror"
+# License set may be more restrictive as OR is not respected
+# use cargo-license for a more accurate license picture
+LICENSE="Apache-2.0 Boost-1.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index c413eb851ae3..2cdc34903753 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,4 +1,4 @@
 DIST catalyst-3.0.8.tar.bz2 873610 BLAKE2B af6fca5dd8dea377795d1b50b942773b0cb8383e1727ba547f1511f126ad4f1494d64ca3d4b3e479664de366e8ed2f8ad8c09c206bbd213d6f95aa51ae56ea8c SHA512 b00a31d9af9b3c1d220080eb6068c924f6ca9f4d574f4805f2b833e61e0fdb79290ec6f5b190c0c7501e015068eb756ede6aea7a959d2e22cef8a055968b7203
-EBUILD catalyst-3.0.8.ebuild 1885 BLAKE2B 32ce35e2ec842d1a503775a52a24d7dc32bd5b98892f51263a1601f478055edf47165e5002fc90714d73a8203c5e21e2f6bdc2c6547a90f37feca2ab088f2919 SHA512 f73a26108296f01b9993bbec5eae7d407fd331cca91dd01ffa8c930b75071a8885081486e8071d73f60aa84057655147a5fe07d03960a816c322999213648a40
+EBUILD catalyst-3.0.8.ebuild 1886 BLAKE2B 05d5e10409d4231123907594801cf74499053067ea5a37c151974647e941e62e6c75f950f92ea0a258ef9b051bcf196db9bd2a853840269878f5017c0b7e6b53 SHA512 df5b876ea7cf547cf28fd4a4a54660bef24e97a14127e1af5d0010e5142c7438b7a73e85d66b06b242a6b55e74e559bff0fdb4c28049cc610578f547c78e6482
 EBUILD catalyst-9999.ebuild 1897 BLAKE2B d3b994a4d569557fc56d9e94304c218aa8b6f9db7082076289e2d693ea7a8f68bac4633cac7a799a62a6eefd10d6f8db65b327c52971d799ac64b530309bf5c8 SHA512 a685312bf4cc4fb3924b9a03f88b03d92525e136553e7f381a8792398bca6b2a4f0a291188557ecb638ad64c1a539a0aafd07afd3484a661f56528730565d8d1
 MISC metadata.xml 634 BLAKE2B 2616a9220096593cc1cb863a560101bb97a1672ad84093f951968ef0482950b6c72f8226e66a4e0d8bcc30dad6db9cb3511581f5d9e2f7cbf7c1ba9e7b30dd70 SHA512 ac7464e724232bf7a9211ab3c845b5b7ead26d8ff750a249c4e7646683926e4659581d3783b4e2de9b9324b8df71a6791221900629e633038a6f6aa1c8b59b25
diff --git a/dev-util/catalyst/catalyst-3.0.8.ebuild b/dev-util/catalyst/catalyst-3.0.8.ebuild
index 06458c752dc9..f94e4f7fdbb8 100644
--- a/dev-util/catalyst/catalyst-3.0.8.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.8.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 sh sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sh sparc x86"
 fi
 
 PYTHON_COMPAT=( python3_{6,7,8} )
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 95e4ca92f127..586670b69acb 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -7,8 +7,8 @@ DIST ccache-3.7.4.tar.xz 351576 BLAKE2B fa2a9c051ff3f9c0550c6301e8d6c9e0eb7ac686
 DIST ccache-3.7.5.tar.xz 352440 BLAKE2B 6761d7a1a8c8086081fa46d50db1dce719856910da6324c9863a3f3731fdb0f5153e0d93a5c575074d1993650623e4e4b02d83dd3b656a31cb9be04ad6b58efa SHA512 d66eb9d923c3e4663242a034860bd198175e08274a295b6d5d94e6cd69fe32afa3fb8c228d64d5c5dda025e6f97d0aef0586ce4dbd66e8ce3a23093331f1841f
 DIST ccache-3.7.6.tar.xz 352692 BLAKE2B 97f6c3ea119b7f1f4fdab1dc88ac34a23bd8f893a1e399dd9f934b345ea27999b3750be6b474caf2bcaea77eb9281f99623312aa55dc5b5ffb7cf5e670b173f4 SHA512 c92a699b9761bbbde1666a9bc2718070a5beb24f7054d91226790c7903fe2e26a02d0782822bc811aaffcd88df3cd3e011a19061eb69569ed7140765cef8d6ba
 DIST ccache-3.7.7.tar.xz 351592 BLAKE2B 0b211cb77ceb42b7ee5dfcde98d9f53bf222cf18b8d38a7cf6fc9631c5e1c79ca82e6d0a0dbacfe2d5f61b2acefebe202e06fc3b8035f0f25a5f9954554a18cd SHA512 f93380aeb45e815964abc3b62f1963abafe22e0c6a7b61d039e710c7f935221e02678e21af65add4fd59fd5a141824ab95f4a7afc8dd557de36737c365cab816
-EBUILD ccache-3.7.2.ebuild 2124 BLAKE2B c61c9962801505c448c7e3a547f229414962f166d5d15637f454ab78b7947484f0b55ea08bab7514eeca2b7e1b7c3b8e946a106ad5a25c3d6fef613cab3443e6 SHA512 cea7f8af0eaf881926aafb8a7c12c359eb51a226b4e29ec20c37f233d09dd0bceb0ef27b7dd0354289c2b6b0e3b5ce70e46530a6abbe4c4f1882a4a0879386cd
-EBUILD ccache-3.7.4.ebuild 2196 BLAKE2B be9b00c6fd13b5619dc65103a0da6bb4086b9132b2d76345a3887a2b90c21e48dd77c6f92688d6c272749d19572eb2499e68e542b2ed6d1cae87d3d4bc0ee678 SHA512 9dc9b015dd8b5e91e5ba7a1b9888c39f3f408c35b34615ddc5111a09d781d7d91fe8c017a8cbdd589b4dce95711f4d9a06c93c50444b7070103a82e751d1066e
+EBUILD ccache-3.7.2.ebuild 2125 BLAKE2B 3b61ff26ee55e09fec83f38664cc0098238a37957cfddfa5ae5bd09ff247c0316c0bfbe065bbded3786db6a5fcd96a3a61613ed2fe7b6826546b80c048b0f15a SHA512 078791881d96c45c0312195c37ade4bf03f7dbb4a8b24342afe6b6ab74fd669b70a92f755fe5dc6c76fd0e41e5a45ba6d12595cc8a8396df153699e3748c2678
+EBUILD ccache-3.7.4.ebuild 2197 BLAKE2B 5c2b9b864b333e652a1d68b98a80894713f801aa9cfa5c21150148303a124969faa054b7b2885eb0cce5c13b21c83281b808dad0443755c24e2d3d261c0238a0 SHA512 a59e068097ffe06e7edd8e374c99e9794bb15b178f2268fa17849d34a295e40aa76113bc89a2ff2fa7b3de2f622ad1391a70c7717903d1b3a37796165d9b220d
 EBUILD ccache-3.7.5.ebuild 2207 BLAKE2B 00f468b17f0531f0ae2d3130027c0b8a9851ab2650076e708c9125f2a83af90301748a37005373b080d09931fa0de6ebd1eb8f1a95231fbf11c6f1d50286640e SHA512 e40eedd3ccf2f031902360d43b0d86a51140195acb5c19dad1e70f52aeab75759270d43263b0d60631be9b5475c72015d025a8e5dfe94d3c81f47faf90dddda3
 EBUILD ccache-3.7.6.ebuild 2199 BLAKE2B 4135d5996d89ca571779a21c066f8345e27bc2cfc3c8a4820887a6365f76f082f4699b8cd87c6f764e1b6c5b79f58ed3f51103228404dd19ebc7c2d20bad6524 SHA512 984ddd680b8a943ead93f6466dec4b6ec0a0ca6386473017b4856e0086f4268b9d237281c86dc1366cf8e8223cccea29497c6c405c188e63155797c97b25d056
 EBUILD ccache-3.7.7.ebuild 2207 BLAKE2B 79ad7ca08f4ca19b53e55f828b809e5cd3a49eead4b35e59febc7ba22d2beea74765fca4d80ea4338bc7edf4b9977a83f51cfac33dd5418ec4beba0174752b69 SHA512 9eec115911cd9b84668561f9bda15b311912b4f301c1739a4bde3fab0ee85a94a938259c5ec248b75aaabbef1c25e56cff79a0bebf979aeafd003f099241bc8a
diff --git a/dev-util/ccache/ccache-3.7.2.ebuild b/dev-util/ccache/ccache-3.7.2.ebuild
index b8fa403d10c2..3b90850ddc42 100644
--- a/dev-util/ccache/ccache-3.7.2.ebuild
+++ b/dev-util/ccache/ccache-3.7.2.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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/dev-util/ccache/ccache-3.7.4.ebuild b/dev-util/ccache/ccache-3.7.4.ebuild
index b25ec02bf79a..c437379d9dd4 100644
--- a/dev-util/ccache/ccache-3.7.4.ebuild
+++ b/dev-util/ccache/ccache-3.7.4.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 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
 IUSE="test"
 
 DEPEND="app-arch/xz-utils
diff --git a/dev-util/ccls/Manifest b/dev-util/ccls/Manifest
new file mode 100644
index 000000000000..82f325be113f
--- /dev/null
+++ b/dev-util/ccls/Manifest
@@ -0,0 +1,4 @@
+DIST ccls-0.20190823.5.tar.gz 158118 BLAKE2B 09b4a985a284fe74adc408eb9e86094aaf4ebfaf50de3238a17299efabe4749326b8239356c2808ca500a44bef664b2a654e9b16c83c3ef04cd7cf90c56fe3ef SHA512 3c4ecac663eb463870153734fa6206701ede9d72bae3b6eae9c26adab2979ad79d2ac860c1ffb07f8cfcea4aa63afed90510734d91f830c99a86b3811959583f
+EBUILD ccls-0.20190823.5.ebuild 698 BLAKE2B fe14be8fc89c8cbafc63848c833b95e78488c270371d7e82816f798375d77e4b4f4099d3f811e34ca9fa8b607958336e8c613d04afba10b9f59cda9730eccc16 SHA512 f8aee0dd366fbf705e445df84882b516dc6abd09267cdb189745f0f7c7127abd3a92d0a403c81f02b3d5eaa59601f514ba8f98cba274947c5620d9db8177d1be
+EBUILD ccls-9999.ebuild 698 BLAKE2B fe14be8fc89c8cbafc63848c833b95e78488c270371d7e82816f798375d77e4b4f4099d3f811e34ca9fa8b607958336e8c613d04afba10b9f59cda9730eccc16 SHA512 f8aee0dd366fbf705e445df84882b516dc6abd09267cdb189745f0f7c7127abd3a92d0a403c81f02b3d5eaa59601f514ba8f98cba274947c5620d9db8177d1be
+MISC metadata.xml 323 BLAKE2B 0a85191d1996e2f30d149c30bb73ffc49f95600b8a08f5a8ee4a6aede0671d0b14f2de04173e4bb1ba0b9f6e09e79316d1f7de33b490d3ce815b8ab7b29f5f91 SHA512 da5bf276e9237df06298b14f68be2f57ef5ace58aea180623bc896a2f05dd5e6809b0409ac3ffba0e2c26d854b7d3b47f8e47caec0082e9397f5dc4037f549ad
diff --git a/dev-util/ccls/ccls-0.20190823.5.ebuild b/dev-util/ccls/ccls-0.20190823.5.ebuild
new file mode 100644
index 000000000000..d959663fa6f0
--- /dev/null
+++ b/dev-util/ccls/ccls-0.20190823.5.ebuild
@@ -0,0 +1,40 @@
+# 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
+	)
+	cmake_src_configure
+}
diff --git a/dev-util/ccls/ccls-9999.ebuild b/dev-util/ccls/ccls-9999.ebuild
new file mode 100644
index 000000000000..d959663fa6f0
--- /dev/null
+++ b/dev-util/ccls/ccls-9999.ebuild
@@ -0,0 +1,40 @@
+# 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
+	)
+	cmake_src_configure
+}
diff --git a/dev-util/ccls/metadata.xml b/dev-util/ccls/metadata.xml
new file mode 100644
index 000000000000..73e87fe9d623
--- /dev/null
+++ b/dev-util/ccls/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mattst88@gentoo.org</email>
+		<name>Matt Turner</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">MaskRay/ccls</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/cgvg/Manifest b/dev-util/cgvg/Manifest
index 82b84f21f32c..afd8d7623c45 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 df9982dcc43da21e337dacc4eeed51072831ce8a5a7dd7759c3fc849b410192cc8e593ec8037e71192f84ac8538b91ac4cf900b7f191f8452cc93786041181e0 SHA512 7a7d69f9b5fca3ff911a726c6ad7a9e7e40806622bc8659fd21140b969b8b38a859aecb8b38c04975ecb9c4d961ac374bcd01f2c743ba5e4fd09d6d6a76ffaa3
+EBUILD cgvg-1.6.3.ebuild 415 BLAKE2B 87e1f3ed477b6e2e77ffcbfa657dff931a6aec941553c0c6843292d9ee9bc062023fd72631a0b1a6e4ac093b997bec3aa6fb4f6bd7209a7bc00846931f0ae35c SHA512 0e7bcccceab69c21882323274e5d05fac94d537b9fba13a1e0aad18b2d8f02fcfd12d5fccbcee59126c71bdaad36838e4b7d38272f5d68de8ce1c816371f3d78
 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 c055da97ee52..3e92be85622d 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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 
 RDEPEND="dev-lang/perl"
 DEPEND="${RDEPEND}"
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 713710d1ed72..42f62e11cbb1 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -19,7 +19,7 @@ DIST cmake-3.14.6.tar.gz 8861359 BLAKE2B 257a9a89fe880f8945f47a4bb1980e66f0f28ee
 DIST cmake-3.16.2.tar.gz 9109837 BLAKE2B a574325eb1f4c59a5745e3fe1def5ac53c36d4ce8dd74e051d8f4fbf41dab1d0134cf04541c1757df178def1eb65bd0536f1db132f5f9ca894870da1daf5901d SHA512 b5e68083713462400b38424bf1dbfe73d37a5fbe211fadac30c576246024a1d40f95fab7044804b7201a1bc2e7fd5b7093257e9534cd35538c8b274dc00f4b76
 DIST cmake-3.16.3.tar.gz 9111826 BLAKE2B 578c070457074a611504c0113b12bdfc8831c7e2cd523dfb038279404712456032646b107ca4d7d8dbff227e4f326ab053d90e3925a22a68a37d5c4e0d818bb2 SHA512 ca9e0a142369735ef6469afb97f4463c981404bd59c7d48c1ef454dd705460a31a5dcffa4949b84b1ac723f5b7e79d67b250126fb42e1f15dab0ac2a17603672
 EBUILD cmake-3.13.5.ebuild 6179 BLAKE2B 30b41df2a9bf9dea4a375693b5e8b3a8e1a925df878ec6a83cd198cc45c565b5da77aadc6ec8bed43799ab876a0ab34f4bcd6e9e20363a056b1f31173c2b17f2 SHA512 753b19e4a2ec07adf6ca1c519bcbea5a56b0447ad118bd9e8f42b317e51ea89a9d59d8870bd0dc7ca24ae54ed63ea5079c3f69249b94340f3f062ab29b029d28
-EBUILD cmake-3.14.6.ebuild 6233 BLAKE2B d54de0ee0da5fe6dca906105d37b55a90f68426b96766500fba7b8d847dbe8a357b8ce1153344e90962cc6938afe7b9d5e21c430fdb04dc9ae92d0270193e811 SHA512 12bc69453d0695734fe7d5266b8c66441aea2eace35f01f0e69c565f33bc518d6176f08220be6d0db9eaf75dd64e26c8221cf648a6c556847c35b659c6a7e4c3
+EBUILD cmake-3.14.6.ebuild 6234 BLAKE2B ff767804405e0b1213a1fd291f297e022113319cf741f9012df91d61e359d30587af59233deb1bf72441304c8555a9ebf783f6325e723b784d30555d8dcb7708 SHA512 b356436e7c66c88fae294561bd56264e4ea43d2454f711e499e33874c44af32405e38e9f0e63f2b681a1730aad08bbe97bb7344c49f465e68826ba81d59326bb
 EBUILD cmake-3.16.2-r1.ebuild 5849 BLAKE2B b6b96efe81e308591e77e943d0414f5f71656aa15e548cc6e7bf7000605b430d9459e69959665c82bb7a8a619ee1e719e68597527b06b6c1cf9841262e24b942 SHA512 295ee591dccc69ca1b0c1909ba9a4e7894f949a7040498a3f60d9564a650bc8e5c53534c14069098ea4a5719a2cf36f23ffb51d12986078f1ce108642c5f9ad8
 EBUILD cmake-3.16.3.ebuild 5849 BLAKE2B 4f7136200883703006f741dd569bceab5a18906e3a20cef4b2e0683135efe1990387ac19811041071bd54099cbeae396352fb6f4234b29e25bfb4a5b840362c8 SHA512 8f4734b1031084454487cf4b75c924bc5b68102860706354c8041c066d87d295120fcb5dbdffcae11f0d229137b155410b3fcbffb64b52c188be831468b6cd46
 MISC metadata.xml 372 BLAKE2B de2835a1f98bccd88e343ab7c058b40df0e9aa4afe938770d67a6e764ac85926b369b6d9ac4851d5deec3954436d3cb8a112b5543ac1debf74205f05641ed2ee SHA512 6c457abaf6c174d6d14b77af47c4fb65b26873cbb7a5a4fbafc558ff4c5c7c6cb0200c0f69e7a492007af4b402baeaf54177f6755c3e6da0ace149eb9bcfe69a
diff --git a/dev-util/cmake/cmake-3.14.6.ebuild b/dev-util/cmake/cmake-3.14.6.ebuild
index ee04242b9117..81506d785420 100644
--- a/dev-util/cmake/cmake-3.14.6.ebuild
+++ b/dev-util/cmake/cmake-3.14.6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
 LICENSE="CMake"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs system-jsoncpp ncurses qt5 test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/cmdtest/Manifest b/dev-util/cmdtest/Manifest
index 5caa7eca743a..f64987c526c9 100644
--- a/dev-util/cmdtest/Manifest
+++ b/dev-util/cmdtest/Manifest
@@ -1,5 +1,5 @@
 DIST cmdtest-0.32.tar.gz 48945 BLAKE2B 64c09a0f7dd66644d8ce785d633af2cc62ce0cba1a636cf18e650fdf0268987ad647509e17ed2c614b48164f9e9fbd6dcb64d6fa0a47ec6dcf24d82b69732857 SHA512 1d6d49f63067cd0343b0123eaa84326042a6382abccb624015ab5517809a11ad149f75fc48cdea87b608d4b8778903fe1a9e68b7942a45a6498bdf7e3dbe3216
 DIST cmdtest_0.30.orig.tar.xz 38508 BLAKE2B 7a27ed4930decdfbc49e922af9724ddba2daabc5af51faa6cafea1ca10dbf5137aa74ad9780156ff13f16e4c22fe5dba43401e22c6c2a7cabbd39d4139f4f515 SHA512 cbdebe175f09a99218d8ce0f2d1e49019f70b7f3ba112e2650e5a58e36a6f1d1b641c9aed5212e12023e956f999ef9cdba27aea7af9211f35a41874147a402af
-EBUILD cmdtest-0.30.ebuild 730 BLAKE2B 78a1bf7c8efcce4e7bf3ed269edb4480194aeb922297be6c28f0715bafbcc017da729a34198be13926de2383bce19ddd5b0a00db397ff39b977ee59c62412845 SHA512 91f157ec5fe7c2bd1c6c211423c1596fb8cd281d44acd6654606b12d577e278f2366beed7f413db7b340f42e05ff3b1792c8bf8299aec1f8217e39a6c07036a3
-EBUILD cmdtest-0.32.ebuild 708 BLAKE2B b50218081946cafcbec6be51cdae0ab4d4d2daa241c29be678ce5100da8b1af8d5863b1824b4294ad17f1bd080e6369e6733f234535d0020bab32d4e09b2f4a2 SHA512 0c6661c8ee0bb61ceffe4e3c02058282f793eda78f1d5c6b04811bcc3bf3639ecbfdeae384573b8840f98690d429e60400e26ff47e4f43c36bfe3dff55a48e32
+EBUILD cmdtest-0.30.ebuild 731 BLAKE2B 9d26e607adf830f78791d0ac80f0cd6c2475cf62dfdedfd65b7e3cda3f0ed9c4c01315f346f19aaf403fa438b8df818b5432118110b220d1a93fb7ac4b6816cb SHA512 a2bd1f2617f98f63fe6fba04762decb905af5caec0ca0751d1fd1a38e2759de435b35538671a39fb05339294cd222d285f05966996cd8ebe463af56f55c7365d
+EBUILD cmdtest-0.32.ebuild 709 BLAKE2B 7ff6b576ce0fa211e3c9228018b68a39134af665cb001d2a6af32760154dbcb5b3327a17cb0dd0896a205ecbe06e09b81818a5c7ee9bb7d0d6a3c6c375c5642a SHA512 044f54e568aa21fe53f2118077472733cc9c951b3cbc46d2eb3f62ed165a7650a08ead503d52a71d6f42450754b118ae3392305bc5c57d94874a4c3ec63264a1
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-util/cmdtest/cmdtest-0.30.ebuild b/dev-util/cmdtest/cmdtest-0.30.ebuild
index ae906d234378..7c7cba824aad 100644
--- a/dev-util/cmdtest/cmdtest-0.30.ebuild
+++ b/dev-util/cmdtest/cmdtest-0.30.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://code.liw.fi/debian/pool/main/c/${PN}/${PN}_${PV}.orig.tar.xz"
 
 LICENSE="GPL-3"
 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"
 
 RDEPEND="
 	dev-python/cliapp[${PYTHON_USEDEP}]
diff --git a/dev-util/cmdtest/cmdtest-0.32.ebuild b/dev-util/cmdtest/cmdtest-0.32.ebuild
index d89c4fbb9df7..4e3f006b5ca8 100644
--- a/dev-util/cmdtest/cmdtest-0.32.ebuild
+++ b/dev-util/cmdtest/cmdtest-0.32.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://git.liw.fi/${PN}/snapshot/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 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"
 
 DEPEND="
 	dev-python/cliapp[${PYTHON_USEDEP}]
diff --git a/dev-util/cmocka/Manifest b/dev-util/cmocka/Manifest
index 7ecd99137c9b..ebf11002ca5f 100644
--- a/dev-util/cmocka/Manifest
+++ b/dev-util/cmocka/Manifest
@@ -1,3 +1,3 @@
 DIST cmocka-1.1.5.tar.xz 81004 BLAKE2B 5625dc293ad481c654848f3de806ef88d1b651192c2461e52b54bf9d443b5e2ea5d2a685ab85b044685f57e5723ade6c4c17e38624f59c4eab240cb4feeaab1e SHA512 cad7f04757183d004f6eaad39036fc0e24c5e0e987f80e85bc43bc66dba22389cb02b08e25531cc28a541d0a24a86b29be134a2d6fc339128e87d66952f502bd
-EBUILD cmocka-1.1.5.ebuild 1071 BLAKE2B 900bf770202115debbf7f24715aab50fcd6376c75c699dc6ead2cdd85f2618ef0cbefc0b91c40acbc89aa1bd28935860314e471fa35a8dd4cdae792167085763 SHA512 11052508de71eefbff96ff765ff6824afb83d5bd874434187fa137d2bac147bb60d9c60cbde8aef2d10f5baaa4281f100305de345d750d983c9266898957dc6e
+EBUILD cmocka-1.1.5.ebuild 1072 BLAKE2B c1e390af25bb1791d7cb833d54b0df23a961fcbf9a0b26030e82c4e57a56f77d8b546a184aa3cfe4dd5fe5ed3ce08a3f64f8aded5893e3216f2d5e18f1e3a4bf SHA512 20345611d3928280cf6ea777e8ef8bec2d204841708e0ae03e3808a0905c52fd8ab959e563feaf7ba518e65f3e51917001a45351eb6e48b7da80716a054782d5
 MISC metadata.xml 259 BLAKE2B 3044f05d4962d450917bbf89d1e3d1f97146baaa2eaa09f3318909ac3b23095296b4ab60ea7009752d7210838912803240c61e0a13e8d0f228096c08de64d9c8 SHA512 68f65bd895ef024776c04553356a38903f55b2976923374cdc3b89455f6c4adad0f2be4f3eb0d12c43c08e2feee2abe9b83e2e8af0d27901b4cda32e9d821d41
diff --git a/dev-util/cmocka/cmocka-1.1.5.ebuild b/dev-util/cmocka/cmocka-1.1.5.ebuild
index 1d03a7176914..5038e68b7bb6 100644
--- a/dev-util/cmocka/cmocka-1.1.5.ebuild
+++ b/dev-util/cmocka/cmocka-1.1.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://cmocka.org/files/1.1/${P}.tar.xz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/colorgcc/Manifest b/dev-util/colorgcc/Manifest
index 0578bf46b30d..481c015d4acc 100644
--- a/dev-util/colorgcc/Manifest
+++ b/dev-util/colorgcc/Manifest
@@ -3,5 +3,5 @@ AUX colorgcc-1.3.2-gentoo-two.patch 1953 BLAKE2B d5f7c061674ac993c2228fe435b38c0
 AUX colorgcc-1.3.2-nohang.patch 1752 BLAKE2B 244d7e7480b148849516ac672a7d164c58c4b4dc500d13e03b0fa2626eeb7bd776eb31f3e982cb1255611057bc26810d468ff247f08a7f9d1aeab7dd7ac46e42 SHA512 4c345e7e21e6a53f16197ea64594ddef646045de2d3d4f1ad500f24c081d06490babc7b375d6e5b0968da73d8332da2590e7f6924d81c20fe8ca9d59949d0b22
 AUX colorgcc-1.3.2-note.patch 1922 BLAKE2B 79c2950839c25870bea70a8cb9636a6525283773d8a180a93491d1a93a7d90c2f80814f6f98c75a497eea9b008d10c65b7e872afab47a38484c021aad53c08c2 SHA512 8b9dfd8a3790178a245ffc40bd5631397b9d1acdb5fd06e7c768d9679414174f06036ed09d29b61fc349b9155f95a2505e2dda88736ca899f038b3ca17207a72
 DIST colorgcc-1.3.2.tar.gz 11076 BLAKE2B 80843c200157fea52cc9f0f7f3008a52860ab8e1256490126d499b34f6821957de92755cbda835806e2df83866ef11096d6d80a0739fb87ef7c348ccf58d76af SHA512 1f6031bcc0f6eb6bdaf0359debe13d1a6579c4f5bfb8dfeef79904a2ffcc94322f2c7f9948439c2975bd4ffed1ebaa085bd7ce338289bdf9c170cd40e1c1a448
-EBUILD colorgcc-1.3.2-r7.ebuild 2109 BLAKE2B 35a54cf4be04591bacada65d44b3d860c7cf6e445d5d28d8ba866ac342cf2be43b42c2cf43d9b18bf6d37676aa93af7881a8463f77384cfa7e366efc753a1bd3 SHA512 bdd1cf69e9212208263e6211a39b048d5a243b96f684da4b9d203949c314048c3e7c1410203880b09c69d52a61418cc376f6ce48f2e06d61b1e74a4833e5ad7c
+EBUILD colorgcc-1.3.2-r7.ebuild 2110 BLAKE2B 41185695aeea6f0fe03b95072c925be02fa03afb91fec5e07ca133dc97e6f909cb598d7c40f0bdc11812f912f00a89f6bc93f39515408d5ff5c76164940968f5 SHA512 52e28974e3c67f4083b979c6cf000d74c3eaa1e46b44541593ef06255acd2aaf4b4c73781a831fe8ebb69747b9e73fe981bb11e4b4b2baab44814dc004264345
 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 35ac497be836..60880cdc1e34 100644
--- a/dev-util/colorgcc/colorgcc-1.3.2-r7.ebuild
+++ b/dev-util/colorgcc/colorgcc-1.3.2-r7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-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"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/dev-util/conan/Manifest b/dev-util/conan/Manifest
index 57c2354cb4d4..4d09626f4cfd 100644
--- a/dev-util/conan/Manifest
+++ b/dev-util/conan/Manifest
@@ -1,5 +1,5 @@
 DIST conan-1.19.2.tar.gz 944360 BLAKE2B 190cc2a7dbe25420ae1a6b46705078301cdf1deea2b4be3d1244ade84d27250688e2c26cd5d172d4dab68557d758a2afcfebf37c323e42f0b4514455488903d8 SHA512 e9b868561465bda28314813d4114cb2b6b97440f7683c4c91911ed51b8cb06675b37807c28aaed62d5f7b470ce9040929ad61e0e148c04b0fdba7300cb633b5d
 DIST conan-1.21.1.tar.gz 989780 BLAKE2B 2869ff0ee5df78d8b503a3d19e5a9ad8f5ffade5cbebf45a2b494e79c2765214d917e26494fc4585f02a613df2c7cd6eba67e74615b43443340f4d2a9406435d SHA512 7afc9ef6f073d38ffbfd51914758673daa4836d66c8785af393f601a81985a852d0f65807dbe07d3d7e826c76f4e1d78bdd4c748891ec1ed415a4ccea06f5f22
 EBUILD conan-1.19.2.ebuild 2466 BLAKE2B a8e952d7cba17b9f45d6f5b27beb56ef9f2e56a78894d4e08683be7e31121b3fbcde8f942d8d23406aa77178d02783077e5c4e33f45458fb9e17a50a38f50f8e SHA512 6ad1610a5bf0d752abe69d627c30363fedf5ae4708b6fcf37dca85d4e94d1c94850b47fe8588455a83e90e6a9056a9c66c30ab8e371c861436d82e71511c1797
-EBUILD conan-1.21.1.ebuild 2390 BLAKE2B d9bf2bba639e159c2e89ad8ee6c51dfd28df0d9b5becb9de60a9026be6645df0ae26b2a724cb961691a1830ab3e230199d45ec4beacf2763d5c0c2496ba6461f SHA512 ccbff32a00f31050921a3fa50bc93aa11b6c94fca2dfbea008735aec37e226b96072872ad4740b56709cd44d995f0de245b168806810daedd33a170b6160d8f0
+EBUILD conan-1.21.1-r1.ebuild 2405 BLAKE2B 0920cba1e65a77f711bb0b6f3476fb9e385b814a9dfc730a051a8679ceac398d86e95c44b3c83d4346e1918d41261f56ebab0b4d9f4c715b549452a1b6977400 SHA512 24e0e52584af9f7e1cffb1674bf55c944780e9091fd07beac9078e2532dbe5999eadc78e8bc486db9e63de1d944614c261debcbbf3c7b1a1d52eaceb0f8eb676
 MISC metadata.xml 739 BLAKE2B 475521b92c84335a4ebda1d68dac1905a99f96b0fbecc8f06b6918e0c075648024ba3bebeaf85cb11ef0b96b917a2ebcf2a0146bd5b37c976d90cee08365c595 SHA512 27c7a3cea74ef2e22fd3dd238fa736efd1786fea4eaf01b9b51e07f7276101ddd7022ad7aedf767d1dbcdba2c29ddf48c07581e4fe5ec089d5e10c5b880c9970
diff --git a/dev-util/conan/conan-1.21.1.ebuild b/dev-util/conan/conan-1.21.1-r1.ebuild
index 4949de1d1b0f..c7272407e629 100644
--- a/dev-util/conan/conan-1.21.1.ebuild
+++ b/dev-util/conan/conan-1.21.1-r1.ebuild
@@ -38,7 +38,7 @@ RDEPEND="
 	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
-	<dev-python/six-1.13[${PYTHON_USEDEP}]
+	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
 	>=dev-python/tqdm-4.28.1[${PYTHON_USEDEP}]
 "
 BDEPEND="
@@ -58,9 +58,9 @@ src_prepare() {
 	default
 	# Fix strict dependencies
 	sed -i \
-		-e "s:patch==1.16:patch>=1.16:g" \
+		-e "s:patch-ng==1.17.2:patch-ng>=1.17.2:g" \
+		-e "s:six>=1.10.0,<1.13.0:six>=1.12.0:g" \
 		-e "s:node-semver==0.6.1:node-semver>=0.6.1:g" \
-		-e "s:future==0.16.0:future>=0.16.0:g" \
 		conans/requirements.txt || die
 }
 
diff --git a/dev-util/cookiecutter/Manifest b/dev-util/cookiecutter/Manifest
index 8dd7e7606c2d..63ffb34fa020 100644
--- a/dev-util/cookiecutter/Manifest
+++ b/dev-util/cookiecutter/Manifest
@@ -1,5 +1,5 @@
 DIST cookiecutter-1.6.0.tar.gz 255579 BLAKE2B 68d50bc51cc0fa2f7fa84bf77933ad27b4dbdd9c06ed459c5aad8d604256c205bad5434b19b1b93ee95fdf5bf211124558994a9204a79cdfc1e433576a0e7fba SHA512 0a06ae8fe7aceeeb0bcb98b5981d743b2e2e5d5f121c2e0703bb76399b0433816beaddb64c92f28d50f1781737db25907a10ec7b59f6c02c17171cfb56fb12f4
 DIST cookiecutter-1.7.0.tar.gz 249612 BLAKE2B 6ebf09d67640eead22da65d7226c20ebda9a38a36083f5c243e2594db228b21ac665fd7629be1440a78dd69116ba731b7f129489723c6826347acc01cb6eedfb SHA512 2840a3e4c3072f76f79965d29bf9774f79d9f641a1ee96e3b8fdb714f67fd2e1f34020e148767759a083bff67f31f7cab2de311eeaf8a816d12b128b40563c19
-EBUILD cookiecutter-1.6.0.ebuild 1250 BLAKE2B f4aa48cc7849634286e5bb56d9fe3e62eb238f7d89c76b37386349213f6bb001267be54d067c69e82b024370871e63810e987db0e2c89c04b79ae0839c5b16ce SHA512 28451cab6490d7f76ec4badecb05ab07635790031ea0c174715ee91dca1eec3b237abf1012aca198d710a39f8bc5bd57eb7019bc8cde420d1cc21064c70845f2
-EBUILD cookiecutter-1.7.0.ebuild 1248 BLAKE2B 016ff00829a07f54e5e32a5229790fe222f0190719d3c08bda602b8bf75ffe9758536af08200cb242c5151276402cb7166cbd035b4cd909effb170a38ca8dc76 SHA512 169a4d714aafe2af4fbe9ea42a32e9daa069d9bcc8240d9dd11ddc88a898aed3d91751e81fec8220741169d0fc75c082dda728f78ffa3a64ab7bbffc278b0960
+EBUILD cookiecutter-1.6.0.ebuild 1244 BLAKE2B aec48fcedf80ffba9d86564edb5b98bb36833c0fd14af2fc0804848f75e7a0301dc909b450070a5c727a04bd0ba861ae8d59dd67d4d9b1b5b3d20b4500728069 SHA512 97c8b61e19023b9561f2720525329aa051861a2605e8e15cca0a5e916ccada89f4dce13bfee54507f6e5bc69684048694659fab02d372243062e04b3c7e2143f
+EBUILD cookiecutter-1.7.0.ebuild 1242 BLAKE2B 11945a5af5229b8ffc67a740981d90110267b63ee2b004aea162d2d66302089bd09699cf41d09b650623092e501c351fda66b1a5067513ea76ae2110f4cb0c03 SHA512 cefbb208017393d207a8aefea7118a70086351851bee3b7708d46fc6d705839108d421d4dc36b33c0850ae0291d08e4dd1ba6e707a73376baf7e441f965786c6
 MISC metadata.xml 329 BLAKE2B 3030c112beee6c6e136abcd0390ad47553f874ba5ec6f5d19d87f84d5c9d930ac71d2219c064944601a09bce7c9b71ce1257d1664070f749f4447e2549521bee SHA512 4c36a71c316a8f5b946668fc160685a293c25a292917baad1345fdbafa5108166cf50343cd5fd3627447b5af5a1cf40848488eb0085708b0ca032ba7c44d4101
diff --git a/dev-util/cookiecutter/cookiecutter-1.6.0.ebuild b/dev-util/cookiecutter/cookiecutter-1.6.0.ebuild
index 50f38300a5a1..9f74aae46a14 100644
--- a/dev-util/cookiecutter/cookiecutter-1.6.0.ebuild
+++ b/dev-util/cookiecutter/cookiecutter-1.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-util/cookiecutter/cookiecutter-1.7.0.ebuild b/dev-util/cookiecutter/cookiecutter-1.7.0.ebuild
index 76f1d784ee90..13a0f94d191c 100644
--- a/dev-util/cookiecutter/cookiecutter-1.7.0.ebuild
+++ b/dev-util/cookiecutter/cookiecutter-1.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-util/cppi/Manifest b/dev-util/cppi/Manifest
index c9d5e4831a23..c6dff232117d 100644
--- a/dev-util/cppi/Manifest
+++ b/dev-util/cppi/Manifest
@@ -1,3 +1,3 @@
 DIST cppi-1.18.tar.xz 515664 BLAKE2B a9f354f4aca8e46f362c733a6fbfc5984bae369d0dde2b9aafbceae2ebb33d0ab2311479820c98c64406533494a1e201e704e763cb8df06e8fd1f11761684a8b SHA512 eec4f67d857680c763802b04c3964ad12505dcffe80f12567a729bea30fdd459f99af0e0f6a8179952bb356b5dd753d862782bb3950fa07e54ffe723565df7de
-EBUILD cppi-1.18.ebuild 454 BLAKE2B b279f616faaba95a5eb85c8fd0b34d6d734a7c8bd7e27fd760db25ddbe19f71a7327a8463b63acc39180241f8b933fcb725ba76a2e6c20e6a0f673119299df4e SHA512 220ea2f2d0d03b73b5590b701637c9c2c34378e158a8a1c7267630c40c562f46a032a002f3d1d0edb977cfaf27c2725594654093b08888dd92dacd6092475605
+EBUILD cppi-1.18.ebuild 451 BLAKE2B eb55ab0f811b84ba31f2b4e7c764f4aa7b257b7619143de93acddc2a1d9751607b1c887dd47ef89388d170363c93ff8c8899ce59d96ae7d573ab72a2322bb5bc SHA512 65e5cd52f4449e0d0d35d0938fa427f34e71ba53a117b46c5bdd453f83dec951f3104c82b007d2058707ba479f610c241b5679afc3bc9d87e37ec1bdb797d175
 MISC metadata.xml 240 BLAKE2B 64fe413f69832b5396b621f50bc6f618ddea15ddd4044ac76da4557d7dc0d963ce6ba36c0d1c0a8911af48fd71a6e84c4981f15ac7bad40bbd801e52b568a23b SHA512 25affa2d6d2fe48707ae81553343451aff9797885b4232e73973a29d4cc1d28a937d024cefca49f92383f01eb8cb811546cd2334cbb78f8e66f1db1f63ff4572
diff --git a/dev-util/cppi/cppi-1.18.ebuild b/dev-util/cppi/cppi-1.18.ebuild
index 386f67f693bf..6af3ba10cb21 100644
--- a/dev-util/cppi/cppi-1.18.ebuild
+++ b/dev-util/cppi/cppi-1.18.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 DESCRIPTION="a cpp directive indenter"
 HOMEPAGE="https://savannah.gnu.org/projects/cppi"
diff --git a/dev-util/cppunit/Manifest b/dev-util/cppunit/Manifest
index 688f83cdde2c..e777c5c08c35 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 1700 BLAKE2B 3d627a9b6a9dc8c73e0e173f09203ada5fbcaf1395c6711991e5a3eb6725e448d8d166138401aa39153d08cff70d09977bd55cb3a95484b92610b482102d5b55 SHA512 2017cb0697943683c6e64136d7375a181380de4abbd04bce60ed147a19e0814636885af140a2b82ea4ebf5cf1944b1ef85d2e8099d1071f597e81a0a5d9c642e
+EBUILD cppunit-1.14.0.ebuild 1701 BLAKE2B 6f330f4eb5d35e5fa43972f548c0ee4e9030694ea4108fa5c5d1a711b4c69434c5bb81a068b1f2b09b633e21edfd091bdf364c349191d0154af45007127050dc SHA512 a4e9f6813bbe6e2976d97ef388e4b57d26b8d1511807d15d69461eef9c95db4d8f181749690667b4dc00924aab912c0874b8c1d96798159851a6901f31f96bfb
 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 9f2e5561ac64..88fcced13308 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 747a1830b18e..9b253e29fe0a 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 9a2ac43f015a026b3bf2c8927bfff98dc7b942cb12196bd56b6f6a557a840c1b57bd8858632bcc9d407305beaef8d4fa4f862ce0097f1fceb28355110e086604 SHA512 8337fa55e57220667c71222d366d9c937d82661a189b23e4e377f0ff1286a986f562ccb089cc3add255a57ef7010d2816b25f1cc33bd292e89337f8184537c4f
+EBUILD cpuinfo-collection-20101114.ebuild 548 BLAKE2B b23e43b96c026e079813db17c8c3c9a931e1ee310d615db8901c266d0392963d505eb3ab8ff6c14273fd9c98f650d2dd3a2682f80ad92d5837fe6ae102b58117 SHA512 12ab7c530252aacd89af2732d3a2129862670bdedb240e2e0d043eb3dc74830bfde355a6d14640201bbcf4c8a0f492958fdbc1d47fac014d6a5b541ab73f98f5
 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 b2a1451e175e..5a45aa89b63c 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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/dev-util/cscope/Manifest b/dev-util/cscope/Manifest
index 2ba43993a7a1..0fce57f09acf 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 ee9064d7861b6d87453a057889440249c495719948039bfc89349e7f295c503a62c23b7f63416ab6c1b5db000e15011ce4ef71d593cfc0524cc10c8ceb4ccec2 SHA512 8479ea2973b5c3f1ff53ad407ee9a2b2bef69c8a962e221e73922056156016f8f40a37f8b81d0c08115b238536c411ef9ea9f008fbf507fc48f974c08c4c0618
+EBUILD cscope-15.8a-r1.ebuild 1377 BLAKE2B 6f4cb25e54488f021c17fa4ba0f39b2d06154672bc422783d88175af35829859db5f1d0e084fcdf3fbb7722b5563a655aa656f6ea21430ff4ba652c2118581cc SHA512 5f34061235b482eb623abe2d357e9ef6de2591963dbe324e784b43a29fe2f3c901e642b69e6cf9527fceec1f91837660ebe56879e7e2f3f7a096eb72ebf7c289
 EBUILD cscope-15.8a-r2.ebuild 1589 BLAKE2B 1e300f1f231129f1ef21ba12501ab286395c9d36bc517271aceb3b1dce9a7945182a6b2a2c583b5e33df38b4444448c9492fda1f0f534782657270c48db7b942 SHA512 d2e81a33ab5afbdeb16dc04dce5cfb9f501c18e175f282cc19431b07f6628592d8302a2e3b1deb26d945464f1a6b2c9aec11dcd691b98097bf8596f725eadb83
 EBUILD cscope-15.9.ebuild 1559 BLAKE2B 5f1bf9518bfc4c144d4331a4113ff06550bb3f8287ab2a5752c5cc22d20deedea57a976bd98eb35b7c9972767fdea6a859c8eb038538be21adef5fa017d395da SHA512 2ddc7e45b1b7c5bfa9118cb7e50bd8efa87c44b16e64f62c95a359217af13d837a2f94e62d5195ff638689ae2f8bba3249947d06d6266a553feb871cbcba83cd
 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 26ec444b64fb..9f5de600be6f 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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="emacs"
 
 RDEPEND=">=sys-libs/ncurses-5.2:0=
diff --git a/dev-util/ctags/Manifest b/dev-util/ctags/Manifest
index b139804f9dbc..2f3855c493d3 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 1826 BLAKE2B dce9a0eceb703bd698c8d396c066df4942781615e1923e994a6fb8e1f6d9076c207decf5e548c7b19a2bfa492e8597e4efb840f7a3799bc1689bb5d74e312aa5 SHA512 fb2521ec8f3f0cf82ebb15f6e648a5d90a71fec24f7f3ff165fb222a199b9ca4fcecf2b96bbd585296eaf1a3369015f823ed14698f2249774379c1f18d0d7d23
+EBUILD ctags-20190331.ebuild 1827 BLAKE2B 4a5b4afc5c377777e03337054609bf00bdb3e46d2b2f3f4b05fd4a92a8646c2b3e8ca2123133ecc1a2ccc3a045de54548dad04a08fe037418614edea0aebc8e7 SHA512 36a2af3e7f837fe9fc020f9a5879d34a352588d11cf8ad3ddba990f8b90360e49d25d8dedd2408c80db70cd2329a21aca50be176f6faea92ba5f24e19c24e299
 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 ac69fa87a8a9..17ad987014fa 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 ~sh 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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="json xml yaml"
 
 CDEPEND="
diff --git a/dev-util/cucumber-core/Manifest b/dev-util/cucumber-core/Manifest
index d982a0d02b81..e55173537c32 100644
--- a/dev-util/cucumber-core/Manifest
+++ b/dev-util/cucumber-core/Manifest
@@ -1,3 +1,3 @@
 DIST cucumber-core-3.2.1.tar.gz 49868 BLAKE2B e5d18797fb6821fa9c300898bc8c14d57559b790d77a191d7147a987e27893ce89076716f82fa2048632e1b033ad607c748fe29f6b8fc600abd523290c4a9f50 SHA512 ba45e804d8454a6ef306eb90f32e6cdf3ee25fdd6613e9ba8308ecfce4044f27ee3dc012ad7f9ca481e94fe5e1d9deb9e0c46ca811a8e25bb27981a78c528ddb
-EBUILD cucumber-core-3.2.1.ebuild 1005 BLAKE2B c872fa761d7970f8d708dfe10a04d1aea2e193159e7b6bd22e6d554f883618a8e28958ec3d735b54e3beae422e8c6d9791c734323f07d25b8e9baccf9105d449 SHA512 a08de3b7d23e9d8f68ad2f4b41525f0d5fe1470777f20ea4e8697e0b3a1447a8d6da77bc7ab452959cc16db46a57d9ec3514c0fc66df7302b92de8ec5dd22d23
+EBUILD cucumber-core-3.2.1.ebuild 1006 BLAKE2B 4fa0c1190821573735fced8a797f64ac545f8bb139b68e47170a6d0a44d4f1168bd8b5e6a976ea71538776c5d1c503a3d917bb2b30a26f2a01f392c027a95de4 SHA512 d492a5361951f19985d2f2844280a87622787667dcfdc4cb85b1c17a1cb8e8b598d80de15d64e11554268c4bc1baae8ebada6602666988efe7f4dbfe90f5f0c8
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber-core/cucumber-core-3.2.1.ebuild b/dev-util/cucumber-core/cucumber-core-3.2.1.ebuild
index c219f5100b2f..37760e835ad5 100644
--- a/dev-util/cucumber-core/cucumber-core-3.2.1.ebuild
+++ b/dev-util/cucumber-core/cucumber-core-3.2.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/cucumber/cucumber-ruby-core/archive/v${PV}.tar.gz ->
 RUBY_S="cucumber-ruby-core-${PV}"
 LICENSE="Ruby"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86"
 SLOT="$(ver_cut 1-2)"
 IUSE="test"
 
diff --git a/dev-util/cucumber-expressions/Manifest b/dev-util/cucumber-expressions/Manifest
index e46efa88a3ef..2c035756b3f3 100644
--- a/dev-util/cucumber-expressions/Manifest
+++ b/dev-util/cucumber-expressions/Manifest
@@ -1,3 +1,3 @@
 DIST cucumber-expressions-6.0.1.gem 18944 BLAKE2B a30127598ff26ea60477bbdad9fc621d0cb1ebb09af3f38d329a15430a207616b6421a127c302ba8470089c8ee0daeccc8f38d4f951b6edb320cff1cc16760b9 SHA512 d9c6371d499ffbe9105038396cde0786cd889def866bf56284a66be77230aac03a74f565b2c3adb966a8d2c67e631ff83eaf426e4bc4b022cd7742bb3a030137
-EBUILD cucumber-expressions-6.0.1.ebuild 500 BLAKE2B 25da5368feef9e49d38e2f41262eabe8d0e65a950a1737779c9a35a81022d94a3c25147befe5b703a1997264b7df67b33a570929753387fe0524799fc850540f SHA512 4585ee8580dfc7b4ac5cb575b86ea0e4793b8c2570e09859d3c72b15d34ff6453c709af47600f746703dc9a97f85cdcf0c803bcf49bab4fd696e718c6c43fb25
+EBUILD cucumber-expressions-6.0.1.ebuild 501 BLAKE2B a8d5326ff36dc2d533e0c1ddf616f76c61499425a1a6b337551ab72dce4d050f66882126baf3babb9497aa65a1168dc9d3fa41bd604686ceb1628d8f66e85031 SHA512 8b8d2daacd82ce6974420a6204af7f7c3d23e7050a6291d1864a2fb79fadf8ddf779b4193cc0954918da6a4c254544817d6f4c34f2d9f48c708b8321e8a152c8
 MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-expressions/cucumber-expressions-6.0.1.ebuild b/dev-util/cucumber-expressions/cucumber-expressions-6.0.1.ebuild
index 20c027fd8e2b..1c0115271b40 100644
--- a/dev-util/cucumber-expressions/cucumber-expressions-6.0.1.ebuild
+++ b/dev-util/cucumber-expressions/cucumber-expressions-6.0.1.ebuild
@@ -14,5 +14,5 @@ DESCRIPTION="a simpler alternative to Regular Expressions"
 HOMEPAGE="https://github.com/cucumber/cucumber-expressions-ruby#readme"
 LICENSE="MIT"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86"
 SLOT="6.0"
diff --git a/dev-util/cucumber-tag_expressions/Manifest b/dev-util/cucumber-tag_expressions/Manifest
index 59caddba0699..aaad9f7f1ff3 100644
--- a/dev-util/cucumber-tag_expressions/Manifest
+++ b/dev-util/cucumber-tag_expressions/Manifest
@@ -1,3 +1,3 @@
 DIST cucumber-tag_expressions-1.1.1.gem 7680 BLAKE2B 31e1f23c5fc008390c9221307473022107b109d409d8385a111f4fed1911fad15660faa824bee71cd87a2e183ec41a6ac9b5f7ecf5f1c417ed51d649c76712e8 SHA512 9b46d681be78b428c7cd29ca1cae21dbd410f7ca9844ec6f94368170c133f8de662a55e4f4440045704107e5428306ab81d2a90020c64102ef42f647cd8a66a6
-EBUILD cucumber-tag_expressions-1.1.1.ebuild 468 BLAKE2B 55938cef5761ed3c6c918423b2e9fc417cee23000d1898f2ea537aec8053eb4ceb05dc8d6109be45795582538e92c4d0a30f01b397e65ef74ebcb0bbda5fe8ac SHA512 961e0497b76022b8a676224ab46f14d6ff3d22be45e407e325ce6878d0f4b8f860e3d8001f4b84f3d7b68f61429095f54bd178bc855e94a79adcd5076e0e2b82
+EBUILD cucumber-tag_expressions-1.1.1.ebuild 469 BLAKE2B 6b4d02bd23d496d611e4f29ea307679c6ea4fbd1821d6828cf624772f42591dca1b39ea41e83c3a9a9b8e34169835ea02be0ea09ef85fe44cb910311baf11f90 SHA512 0c65195a25fd6335137054808867ff2b762f8d74ddf1c8c704befe84cc1b0d07f3b50b0b8c194425273332a1090d7830c078433800ce443ab041fdcc38c62e92
 MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild b/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild
index 8ab17c894df2..e84abff5d5ce 100644
--- a/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild
+++ b/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild
@@ -14,5 +14,5 @@ DESCRIPTION="Cucumber tag expressions for ruby"
 HOMEPAGE="https://docs.cucumber.io/tag-expressions/"
 LICENSE="MIT"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86"
 SLOT="1"
diff --git a/dev-util/cucumber-wire/Manifest b/dev-util/cucumber-wire/Manifest
index e6c4fa4cd4e7..1547cfe9a251 100644
--- a/dev-util/cucumber-wire/Manifest
+++ b/dev-util/cucumber-wire/Manifest
@@ -1,3 +1,3 @@
 DIST cucumber-wire-0.0.1.gem 16384 BLAKE2B c35f478bbc8a8bccfbe1022d5b687a85c087bcadd5f494b807fa530d20b7e14f327ca2ab377c3f9abc28df60c7986576b59a246e5fb7537daadb016bb21420b7 SHA512 c6bae727814f6a2d1dfa8cfee9bc9e63e3bfa755f6bb070f907a24d52009dd29652ab21ea7719527a5423ddf4471208f91a388ec53555d7021abac7769b2109a
-EBUILD cucumber-wire-0.0.1-r1.ebuild 530 BLAKE2B 5184481c806d733ddd5123ad34893999a6220d974c27be0644435f4ffb632dfbb6c2b767630224aca92b21819fdba50a6881d1e744dac5b2185402d0e8ca6ac2 SHA512 73dedafd2221dd38562d660e400de702a9c655b7a1a2a751c38518d9b9fe8fcdee6a7c0b7f298dfdd73be27b3528ecf8bbac3a28f7d144d8f86bc7ac0f71dce2
+EBUILD cucumber-wire-0.0.1-r1.ebuild 531 BLAKE2B 3d1bc39de0a7d746dfacf6a95ae654803113fd214ac0e6c96734ffa9c5fc6c2abfece5852cb34158fe8f1b46b64cd05325b3a00e1c43d50cfac2bfabebbd9aa7 SHA512 be0e0c61465e22c6d962bd9f45d7dd564892cf91ac1cc42a31d583a09e9ba6615f091f77e23a8a7b4f43a06562929f5bb0ae29fb09d675dcdde220e1ce98e174
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber-wire/cucumber-wire-0.0.1-r1.ebuild b/dev-util/cucumber-wire/cucumber-wire-0.0.1-r1.ebuild
index 8da48ce7023d..6e9de3a43c8f 100644
--- a/dev-util/cucumber-wire/cucumber-wire-0.0.1-r1.ebuild
+++ b/dev-util/cucumber-wire/cucumber-wire-0.0.1-r1.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Executable feature scenarios"
 HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
 LICENSE="Ruby"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86"
 SLOT="0"
 IUSE="test"
 
diff --git a/dev-util/cucumber/Manifest b/dev-util/cucumber/Manifest
index 83cdc31a0f91..7f736330c732 100644
--- a/dev-util/cucumber/Manifest
+++ b/dev-util/cucumber/Manifest
@@ -1,3 +1,3 @@
 DIST cucumber-3.1.2.tar.gz 267995 BLAKE2B a55d15d2c5746efd2e9f3518025b3b6d69e7712920b5731e1174ff429a9d6161d9aad7c0065c5ddf8b97fd87c9e658ff86b961b175db2c930bba52d1904d6b62 SHA512 abf0b562476653c393bc5a3c1f9669d91a2e312bcceb98bd20ac3771a61eeb696721cba76299d12871f7c61fdca176310e3a334b53d10c31ef3e201948c762d0
-EBUILD cucumber-3.1.2.ebuild 2760 BLAKE2B 2d133ffd62250ca9edef81e75fb13c5e994e504aac80118146fb95fe50738e135338e5be65c6421923ab8b718331cbcfe01f5743f798734b2c5248ba416a49cf SHA512 2bd1bf12b545cf05c250ae88ecaaf0c8e0905f369a271256de8c67769ac3f12029446bf0df130b169ae41a1615a5e47f5acdb5232207729c281d36618cdfc94b
+EBUILD cucumber-3.1.2.ebuild 2761 BLAKE2B 9368e755a971cfdbf498107432ea2f6fc91c616d301e095d00d0c5975114f98c4562362e5db1b0bc02cff3bad0a46df459b3ffe07a393372a9c062a05cd11679 SHA512 9f7170f6bd9968d51188ba880228209cb51094c50ee2486b9eee3e0df3943e0608365c57eb1ae4cb651a97899420cb5e708bef231f2adcb01f751039dda7ea9b
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber/cucumber-3.1.2.ebuild b/dev-util/cucumber/cucumber-3.1.2.ebuild
index baccf3dae716..37bf76a786cb 100644
--- a/dev-util/cucumber/cucumber-3.1.2.ebuild
+++ b/dev-util/cucumber/cucumber-3.1.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}
 RUBY_S="cucumber-ruby-${PV}"
 LICENSE="Ruby"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86"
 SLOT="0"
 IUSE="examples test"
 
diff --git a/dev-util/cunit/Manifest b/dev-util/cunit/Manifest
index f9b924b964fc..92919ecb3250 100644
--- a/dev-util/cunit/Manifest
+++ b/dev-util/cunit/Manifest
@@ -1,3 +1,3 @@
 DIST CUnit-2.1-3.tar.bz2 514500 BLAKE2B 919ff3345c06de44662deb3c43700dc14f3c6b0b1557e162f1f527b782874082bc866b3bbc3fd18869b975d7a0a6b4730eab87ed36847249ff8fa5cbede27797 SHA512 547b417109332446dfab8fda17bf4ccd2da841dc93f824dc90a20635bcf1fb80fb2176500d8a0906940f3f3d3e2f77b2d70a71090c9ab84ad9af43f3582bc487
-EBUILD cunit-2.1_p3.ebuild 1389 BLAKE2B 3b2b4e15a99521a3ad1f677097cc341336f74e12ae77f0a88eb2bbb729c67f1ab1593ea0d6d665f9d96bc6607c0612466b4c5db8e0c5f5470839064343dbb735 SHA512 e6b3c5eadf0ebf42c8033ffc80c5fc143dc67aeb8f76fa49ff57f565c6c3bc0af920f4f90552968da62ca0938dbe640c3f326e1bc5b23cb4cc5dfebe74a5b8be
+EBUILD cunit-2.1_p3.ebuild 1390 BLAKE2B 06c1e4f52feaada585d1fd1c20a5cb6a56ceeb5c5ad002931798514640a3b72318719850a49d73df4cb33aa8996d7028c93eedf0c9e9000cb79b6d5ead0c8b8d SHA512 0f74c12fd9cb03630a74ad0f6e4ab1939cf96cd09998ec2e165a053df2577c6e1aaec995d9035a7d5a476e1ae0125fce2fdb2cd0613c2f9a5bb2a06010f61a7d
 MISC metadata.xml 242 BLAKE2B c9bc0f1e188dab4f0b4f1027441888c15919ad52adb639905a71471645438c94957a45ec043038fc19a829a6ec6b236eeb026560728dc231e5aeb484a467177a SHA512 3171a680f18023cbeeb73331a33942ddf076e0b8abc2c40284e4a4cb1803ad7264f8e38ffaf182d1f38ba28ad60e65a0ddf96c66a60e0f9a935aa941c49df87d
diff --git a/dev-util/cunit/cunit-2.1_p3.ebuild b/dev-util/cunit/cunit-2.1_p3.ebuild
index ecd393dd6b87..b935f19959a7 100644
--- a/dev-util/cunit/cunit-2.1_p3.ebuild
+++ b/dev-util/cunit/cunit-2.1_p3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/cunit/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ncurses static-libs"
 
 RDEPEND="ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )"
diff --git a/dev-util/dbus-test-runner/Manifest b/dev-util/dbus-test-runner/Manifest
index b00267283aa8..6850cdd32b35 100644
--- a/dev-util/dbus-test-runner/Manifest
+++ b/dev-util/dbus-test-runner/Manifest
@@ -1,3 +1,3 @@
 DIST dbus-test-runner-19.04.0.tar.gz 444289 BLAKE2B dc3b11c8d376103b320d98d211bf1ace035a2de5a1caceadd946bfdc46a6aab3fcf69fae15c7142500b9487a9832275a6157f887c8efcbbb56d13c8841609dd0 SHA512 5906225f0ce429ea218d7eb4c67281b7ef368d6a173965b214f4f4501e729002ca3293a94fd8afd3002f301cd1f2208cba01c733f678c2d51661220e8a7ce971
-EBUILD dbus-test-runner-19.04.0.ebuild 1167 BLAKE2B f5e69b9a1a1b11929ef5c61dff60f084b4d9efb76f2954bd81dcff032992c4b4577a99353cbe07cf107f1ea400f303d6429fdc0fa82460ff0209f27a92fc3ce6 SHA512 afa8ba5e4f1fdc40626bb674c1c00bae4c4f0e920b1594ec923f0b6938cad6984cea64c7ff436f9538efadef9a48bfe772fe1b88f55391a313eb5cd94931dd29
+EBUILD dbus-test-runner-19.04.0.ebuild 1168 BLAKE2B 7c2a6bb7317ea115db62783e85c88ef9d65246bed1b56bb72684aab53aa3bc9ae61e91404e9eca020f43e81f943937758f6a1daf3cfdb90951386a510af182da SHA512 802d5da4fb805724b1984a412d29970250fbd055d6d8b9a69849b1255a9861a966b9a5dcd1957c756ecda4258dc75d1a9b0c4268377184ff88e11b2fab6c06e2
 MISC metadata.xml 333 BLAKE2B f89765af341d1a643d414c714839c000611842e3c5f5e6e1c2a23376fc08940dd9d791163fc409c0b28884145f6e616d6837100d0a1286e676769421ed81ca15 SHA512 49280112f98ca94c67ad00e21fcf02da3848ec391852dcfe5cc065404449339f5c1f6bfe01825e7da2f58e1134648df630f4c1c292b6169df23f017544bcd299
diff --git a/dev-util/dbus-test-runner/dbus-test-runner-19.04.0.ebuild b/dev-util/dbus-test-runner/dbus-test-runner-19.04.0.ebuild
index f1b34dbecc95..829f86ec19c3 100644
--- a/dev-util/dbus-test-runner/dbus-test-runner-19.04.0.ebuild
+++ b/dev-util/dbus-test-runner/dbus-test-runner-19.04.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://launchpad.net/${PN}/$(ver_cut 1-2)/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/ddd/Manifest b/dev-util/ddd/Manifest
index 95b45fc765c6..c2a72887bdb8 100644
--- a/dev-util/ddd/Manifest
+++ b/dev-util/ddd/Manifest
@@ -5,5 +5,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 2335 BLAKE2B 92099e6daa39cbdeb0ce1d1ecb03f3c08e0085873c5c0106bf26fad4a1f9080cfe0436be99b78edcf2348f8a1d7b3cb79aee1a524e5d79ae060194a87a2d24b5 SHA512 f2d4b15fac0fccd3438b8ecaad982187860a6e8a3012fae004fe605c0c185173606d36120ca164c7cff8e89ca042c5397f75c5a4a6db11be34178dcc42474ff7
+EBUILD ddd-3.3.12-r4.ebuild 2336 BLAKE2B 94eea98fd27f589ac7a6408beb38710409c8447704bf38b5dca213befc9a9ec7331b43c5b1a104abf611bc3d7717e8da174c85f776ab389286d4d82b0e03dbd4 SHA512 874066d7a7c07b7e89763249efe650b40204e843e17055a8b92cef780a37475b4b2b080d1e48d469a479f1c18ad8892501d2a7e62ff84c9e664731477e9b68c5
 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 2694f0cffacf..d95185c8e7e0 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 ~ppc-aix ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="readline"
 
diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest
index e6ee5ca8b1a4..e873d497bfdd 100644
--- a/dev-util/debhelper/Manifest
+++ b/dev-util/debhelper/Manifest
@@ -1,9 +1,7 @@
-DIST debhelper_12.7.2.tar.xz 511800 BLAKE2B e01bc5685c1e4803f2b1668973a6ee02c91dc6da0fd2c2ac1f1ddfce35531351ac38e8805667a23a4c63ea78403bf318957adad4c560771c58f4394fc691709c SHA512 b77b81a72d7c66f893fb6eae501c48fd80b49bdf19e691be74fdf8bcafd91a3f0d000c4ecd2aef80da18caaaa781eba9c8b37512ad260da708bc7b6ea3d7674d
-DIST debhelper_12.7.3.tar.xz 511396 BLAKE2B ac16bcb3aa6f3807ce29be4e1aa2db36e35fcbf0bfbe6b823bc8388cac8d0ecbba8062bd05a5c7a277a0e56f896923df78c9d6fe38b703b47e92a8901e63aab5 SHA512 802fccba95df5fcd04a5ec9d78610e77c2977d81e6b1e4eba6bb5d4f92e5943db2876e1b011d1822cbbc67c256895045408b7eaf285da2ac55bd8200b6c39fe3
 DIST debhelper_12.8.tar.xz 517508 BLAKE2B 2f72bde30638755787c93e2dabf5f60a013c58508c8872b2625e09c98dd64dca77b91063b24a5612ab7cd04ed0a94c533663cee1ef271783be5b27709008c9a3 SHA512 41c5f2e2362dc1b02c1ac60ec7c7b8e1826b9a5abd1a981f85bb90ef128362022228ba8778645492498d57676e5ba7a5563a8391ff5474065178f67f339bbb0e
+DIST debhelper_12.9.tar.xz 521116 BLAKE2B 287740877b2431082baec262af581c34a9c0f3388232f7866bc7629b893c6d1f23da8f8956de5aa66d33b43d6f31d8ea31c897d313423d829750f894e5a3aeab SHA512 c8ee3040119a91b7dd2447be5c5d6bbe56d13aa53bd5e3d97be3af7c0a087a57661b36ae4eb56b20b0574c0e8702166ab75c7ffdeb7279f8ef77cc0ea367a6e5
 DIST debhelper_9.20160814.tar.xz 344328 BLAKE2B 38791ab3dfb74d12e44226b79a377889911a08505cdb45cc0a6e653906edbafcac1038d1d9ff9f5fd9f714ed36681562ce7fb1c9c1109a8528523100128fced6 SHA512 63072ba35ec8c62ee4c4d44833712925264c808a91f1522ef6a73377f2da3d11b285a21ad39158fd44693c801916189261186c8c7b28096719328a81a0a65f62
-EBUILD debhelper-12.7.2.ebuild 1534 BLAKE2B ed0daa11059dec73fd59525a40652eec26e3e3ce3501419b5acaf0785f39a130d05f43bead9c4fe565b8ba94e7a5a1c92a40e42654753d3db30329c84f256cb8 SHA512 c0b55b8dc50568b5cccabc80993a807c203d0401d282d349285ce1d12d06ba965bb4834ff22fbd37abd741db050f67173094b1bfc9a151fd9b28c82fbb0227b2
-EBUILD debhelper-12.7.3.ebuild 1534 BLAKE2B ebc4b0a520e3707503e89e5a417ece103f999875dae2e9abb71d944c4def528c89d113d728ca28b5607047161aaab827162569652c3b016f29a46415312961a6 SHA512 6b3d81240a5c1eb5abb27a2aeb31d5d41c17d0c10326e28f3ec76f5b816a715f24859d383f496789ad92d3792c4179e817d3a6dccff538b45413ca44ef218e68
 EBUILD debhelper-12.8.ebuild 1534 BLAKE2B ebc4b0a520e3707503e89e5a417ece103f999875dae2e9abb71d944c4def528c89d113d728ca28b5607047161aaab827162569652c3b016f29a46415312961a6 SHA512 6b3d81240a5c1eb5abb27a2aeb31d5d41c17d0c10326e28f3ec76f5b816a715f24859d383f496789ad92d3792c4179e817d3a6dccff538b45413ca44ef218e68
-EBUILD debhelper-9.20160814.ebuild 1532 BLAKE2B 6b9b3e12e88aad1ac2550ca77d2e35cb43f4a756f5501e1de8a6114da409ee9f58e5e5feb68b6ac2c3541745ed96d0a6e526b0cdf72f358b92fb2ea7661b93da SHA512 cbc6d7e14f396d1d1c877a68e05b70b390a3018adb106fffe0b76250dde578b782a35b6fb33f8aa6bb98c90aeed04536f85f7bde5bef217caf615fcf6bdce6dd
+EBUILD debhelper-12.9.ebuild 1534 BLAKE2B ebc4b0a520e3707503e89e5a417ece103f999875dae2e9abb71d944c4def528c89d113d728ca28b5607047161aaab827162569652c3b016f29a46415312961a6 SHA512 6b3d81240a5c1eb5abb27a2aeb31d5d41c17d0c10326e28f3ec76f5b816a715f24859d383f496789ad92d3792c4179e817d3a6dccff538b45413ca44ef218e68
+EBUILD debhelper-9.20160814.ebuild 1533 BLAKE2B 10c076af8bd4199da2a763e51b0a77022612d2212b8792ef1495e756ec781883d1b7668d8ab43f746e02f2ef6e9b9ffed63bbe74e6c68cc3135479f48bff1095 SHA512 7ee101741d6520de1527ab47966d2819b5aae9a33a201ea319f529b742e4ae692550f99ed9e37c61ff9b4d6c66e274ece84056905ef43b236da92e074e231257
 MISC metadata.xml 260 BLAKE2B f88f6dac92c60982c9aa64365826d2bc8b5d1933190d4cdb44323f59c2a431add04feceb4e66470e9dd20ae0fab1ac1b5641c8bed429a2d6205b3c7acd6c7738 SHA512 b7f7421081083b48e0aa1d7cff7a776b18d670a32a2af64341332c39d0f531735f86857555e70327e257d51f6e0c97b3e293075bf59b9048ce0c0ec097c36735
diff --git a/dev-util/debhelper/debhelper-12.7.2.ebuild b/dev-util/debhelper/debhelper-12.7.2.ebuild
deleted file mode 100644
index 54960e54e86a..000000000000
--- a/dev-util/debhelper/debhelper-12.7.2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Collection of programs that can be used to automate common tasks in debian/rules"
-HOMEPAGE="https://tracker.debian.org/pkg/debhelper"
-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 ~sh ~sparc ~x86 ~amd64-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-DH_LANGS=( de es fr )
-IUSE+=" ${DH_LANGS[@]/#/l10n_}"
-
-NLS_DEPEND=$(
-	printf "l10n_%s? ( >=app-text/po4a-0.24 )\n" ${DH_LANGS[@]}
-)
-
-RDEPEND="
-	>=dev-lang/perl-5.10:=
-	>=app-arch/dpkg-1.17
-	dev-perl/TimeDate
-	virtual/perl-Getopt-Long
-"
-DEPEND="
-	${RDEPEND}
-	${NLS_DEPEND}
-	test? (
-		dev-perl/Test-Pod
-		sys-apps/fakeroot
-	)
-"
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
-	tc-export CC
-
-	local LANGS="" USE_NLS=no lang
-	for lang in ${DH_LANGS[@]}; do
-		if use l10n_${lang}; then
-			LANGS+=" ${lang}"
-			USE_NLS=yes
-		fi
-	done
-
-	emake USE_NLS="${USE_NLS}" LANGS="${LANGS}" build
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-	dodoc doc/* debian/changelog
-	docinto examples
-	dodoc examples/*
-	local lang
-	for manfile in *.1 *.7 ; do
-		for lang in ${DH_LANGS[@]}; do
-			case ${manfile} in
-				*.${lang}.?)
-					use l10n_${lang} \
-						&& cp ${manfile} "${T}"/${manfile/.${lang}/} \
-						&& doman -i18n=${lang} "${T}"/${manfile/.${lang}/}
-					;;
-				*)
-					doman ${manfile}
-					;;
-			esac
-		done
-	done
-}
diff --git a/dev-util/debhelper/debhelper-12.7.3.ebuild b/dev-util/debhelper/debhelper-12.9.ebuild
index f3567e709e9e..f3567e709e9e 100644
--- a/dev-util/debhelper/debhelper-12.7.3.ebuild
+++ b/dev-util/debhelper/debhelper-12.9.ebuild
diff --git a/dev-util/debhelper/debhelper-9.20160814.ebuild b/dev-util/debhelper/debhelper-9.20160814.ebuild
index 9da66079822e..54100d475126 100644
--- a/dev-util/debhelper/debhelper-9.20160814.ebuild
+++ b/dev-util/debhelper/debhelper-9.20160814.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 ~sh sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ppc ppc64 ~s390 ~sh 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 f3f51bed57f0..530d0896ec0f 100644
--- a/dev-util/debootstrap/Manifest
+++ b/dev-util/debootstrap/Manifest
@@ -1,6 +1,6 @@
 DIST debootstrap_1.0.115.tar.gz 75691 BLAKE2B ef2ddd8b76d7eafdf5be50e3cbb99725066562bc4a717ab42b436dcab3e5e3a2148c9e6eeaf7b6135e4bde836ee01101e7158ebc0472c08329ae0152d0845b8b SHA512 635e4feb1fb2bc247968127dc86bf0956243c8058f99e66ede177da84f0258cfc2de51873f347c099217b07e679527aeac08e7263d31b4112fb0708edb3deeb9
 DIST debootstrap_1.0.116.tar.gz 75723 BLAKE2B 3a48e0a51dcd6066af26d036df17e36bb901d7099dfa9521ca86cc1d2d70b8326ad068dd86130de1a2b686a44391d8fd0bcfb78f24cd558777b487f8bdbde699 SHA512 59ba44ecfa7c6bc3d81a814fe66a87223fa4bde24bd986f75875fe9077355a5f4268d822347f99402d4146e81b270a06f21111fb977729f4326bb5b8e017583c
 DIST devices.tar.gz 47835 BLAKE2B 03bfe097fda12a7a0aa19d3308c0d44382ad945defea05a63b17a72e4051ef94f0e60e75bde35baeace81da59d9f04126f6e463163609475b9c0fdf518f533ef SHA512 994ec8d72e3d52d2d872f7ff0da2336e4cbd3a5fa73bb6cdb9e06f5e7f5b8c69cea639c738fdba1186f382d6dcf62e7746fface664bfbd744aac24b16f034432
-EBUILD debootstrap-1.0.115.ebuild 1170 BLAKE2B 8ce1a0ce29d8a1a930348fa5ec8fb078868514eb478398c4dc7197f3d6b78f7682963783da86b3e2f5fd74a81534b72783c9ae3e7287a1a512c378e43aba3731 SHA512 a08ccf79356784effd1b02369dbd582369fb05c3dbb1b0ec932ebd38295dd3aafd2d65b88fb1997c60d40833aa34b7d84f02258737582968b98c2d3975d21957
+EBUILD debootstrap-1.0.115.ebuild 1171 BLAKE2B f657a145f8ddef1d3ece4383f2d385758d97296989ea68e87d2742dfbb8641cd3250ff3b51a0bc85d803922de982e23f7c7c3582e5a6158937563fa75e5c9e03 SHA512 7bb038e77158f5864cc955b8f2387806062127058a355aed9d75c070d32e780d6c9ac698c38312adb10679b05d1c6dd573b9abffa20ab0d325c6b582694373ab
 EBUILD debootstrap-1.0.116.ebuild 1179 BLAKE2B e668240a1e791eeac1ae105cd9f23a5b41be0232488364dd84bf719f5fa359d1e0feaff80ce0222a4a7af8bf5863a363bbff9d6f3a53f3d37d85241d41e30b1b SHA512 eb12d2206e869c0e88501317c41e6fe8b98c374de2b1facc345b8244778bc7d771424fadbe2a2fcfca1f8dd21562ea880c98e79acb0e49e5eb5254e6c0762b0d
 MISC metadata.xml 258 BLAKE2B c36fff5f8f795a075268afaf56f3ca4d8c75dc6997bd32bf2dade7b1903a27eb31a1f3c248b60fafcf77024a9300e8d0a6f8b5a6ace6aefbbec9374a295c430b SHA512 07739557f72a6f241bb1d2e4f61ca138e5dab6996ccaa4b4072057f0aa3ad2adfdfffe65683becd9d467729efc574bf158d846a8b3a7782cb180a13f0033b6b0
diff --git a/dev-util/debootstrap/debootstrap-1.0.115.ebuild b/dev-util/debootstrap/debootstrap-1.0.115.ebuild
index 505958f8b627..7a96b001601e 100644
--- a/dev-util/debootstrap/debootstrap-1.0.115.ebuild
+++ b/dev-util/debootstrap/debootstrap-1.0.115.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 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	app-arch/dpkg
diff --git a/dev-util/dejagnu/Manifest b/dev-util/dejagnu/Manifest
index 3fc6c937baa6..a89015f6dd2b 100644
--- a/dev-util/dejagnu/Manifest
+++ b/dev-util/dejagnu/Manifest
@@ -1,3 +1,3 @@
 DIST dejagnu-1.6.tar.gz 523969 BLAKE2B 1cc9498aacd681570cd8d8834cd2fe0594bb49e6664cfe934b824dba0bd4a6766f977de6a1dc4596095a11d68844873f5687000423f4928f0432981023d26451 SHA512 a494dd5cde8d275b397116049c93e183f5f1731d63660ee8d2f4263b099fc5be7fbddde927fab3ccd5f000c43d50242f94bbb4d95497b915ea53be418bc145bc
-EBUILD dejagnu-1.6.ebuild 716 BLAKE2B 4208edb2897ca3185ccf416b63376008fa2bdaf2c045b16a0251838d5ce2d2dc2d54b5b0d3505ce1056870d0ea110cfdea693c80b908979c8f3b17403e06bb0e SHA512 8d55673a83616b67df83f46c13a5cc769d8703e9b742ed6cc1bebe6692a6d6bdfa0e2e1e28f3e4fa515f7ecce52131f7c5cf507ee473bb0acd65e34e45c4f092
+EBUILD dejagnu-1.6.ebuild 717 BLAKE2B 54fa0a82961631bcb6a793b40237b2deedda17ab9c5fe5e837a0a9deb4e671049bc068986db2aa0b506b68f0c95e3a665ee8bc8fb8b882be007d0dd07d46e3b8 SHA512 824a4ebbe27416bc0f128396bb8e40ac26c3708308abdda2c6b94559ce59eb6a9ca541a7ce1f3d5dd3ffb53f6050ed6b091edfcc27c5742d398e9357636dcce9
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/dev-util/dejagnu/dejagnu-1.6.ebuild b/dev-util/dejagnu/dejagnu-1.6.ebuild
index c0275052316c..0349c63b6f4d 100644
--- a/dev-util/dejagnu/dejagnu-1.6.ebuild
+++ b/dev-util/dejagnu/dejagnu-1.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-lang/tcl
diff --git a/dev-util/desktop-file-utils/Manifest b/dev-util/desktop-file-utils/Manifest
index f7977e91c129..419c580c41c1 100644
--- a/dev-util/desktop-file-utils/Manifest
+++ b/dev-util/desktop-file-utils/Manifest
@@ -1,4 +1,4 @@
 AUX 50desktop-file-utils-gentoo.el 250 BLAKE2B 6778fd6faecc6afe376598cdab5d890364edc33f0a55983b9a1ae76bcaf78a784fae92eaa66dc24c270ecf160f747e848872fa17e9c331dce7ad2deb498492b1 SHA512 5fc03fb9c9eea7d4c19c9b263413fb4f7f247b6bd40a7452b26f7e175646dc9b3af945d25cafc42a01a8d95059324652c56baa4bb5768b62dbd58f3ae4f05fe3
 DIST desktop-file-utils-0.24.tar.xz 137424 BLAKE2B 3cce27caa14782ef10886fdc0602c0378c1bad0d49a4b99077436a9951f13ccdb539fdc2b9d27b54430fce94fb0ee0268746b216cc5d6c1b9ba517e1af81b4ce SHA512 b19d700d4403c8757c62e49bb7650e0138a85e799f79de07b0d0099a52398a3ead90c8125ccc883df6e2a3f8f5f97696009ebb7452dc7acc25afeef20e06fde0
-EBUILD desktop-file-utils-0.24.ebuild 1289 BLAKE2B e5f16c807234e47d2116263443082b36658b5a083a4047a9f72bf6b618fbc56399c929b0f8664edbbcccbffe7e8c4198a5e5ec77a06bc96f9ce31ad4ba68df99 SHA512 a4d864e5fbdfb90b11a7cb86f7f2dd896c60f8b08dd1c81e450271513081eacc702bbfcd6e54c616b356d6555f8d62e6b02017fc3ea21fb1daf8ed3acceac50c
+EBUILD desktop-file-utils-0.24.ebuild 1290 BLAKE2B fc71efd30b7ed9e5a735cdf9d9e0c7e617ecb0a21b1f3524127ff95cf58ead3ae7c72abd4f3bdf0cae81d0eca13f58b87a4f3488723e0407b966f3b9f488e407 SHA512 77044db9f0e3a966c84af46332b591469354c61563b92a46cd4cdb296222d3d49f1fe14d8d03b98421730fcbd6e9b4c3ff5724ca57a55444ddf6fef3f43625e3
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.24.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.24.ebuild
index 99072453e1ff..e4cff99a7dad 100644
--- a/dev-util/desktop-file-utils/desktop-file-utils-0.24.ebuild
+++ b/dev-util/desktop-file-utils/desktop-file-utils-0.24.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="emacs"
 
 RDEPEND=">=dev-libs/glib-2.12:2
diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
index 314a3ac47f78..c80d5cf8634e 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -1,5 +1,5 @@
 AUX 3.30.1-optional-gedit.patch 1259 BLAKE2B ccca312359fcf0105a3ae934e0b51582f597eb84b34ceb82967d5939c735537b261148202f6fb277ad102a1337794b2416dd158d7432a4d13159721c2bdf3abb SHA512 e7a0a659711063d0ac37814bed3c8e43cb1d7bddd313fa87b7cba2a1d2eaae45ad6fb430f247c190f0f4f15813135c572779f44dfad8bf223aead214f4e8566d
 AUX 3.30.1-optional-introspection.patch 1266 BLAKE2B 95bc2dece601e561c95d420e3bb564b318c7498ac67e30ae9f40909bd781445c4c8c2e1e1dbee2932c530d24f19357c49a7ba59caeffb767aec66b1feef6605e SHA512 959319c7e36f1dbe1dbfa858f53a91b6f6f1c4e469a7a3b237bd8ec96a7636fb719084f5bf9c0146b253eaf7f9512db4a077ec1e40065a827597131515d889e6
 DIST devhelp-3.30.1.tar.xz 317956 BLAKE2B 8646fb97f0649bc166c8a21472f4c638f37bdfdc9e34b7214f0e5bd32c1c78664cc320f978fb27e313de54e88cf31685596f4bf7f43235ae96345292db6a9fc1 SHA512 f6f028948edd4c6954eaeeb026bf69c11284d725925d354ef42ecc67275cdcac66e8d3657d95d50926350543489b2bb2fa3a194d99d01494bedac60d3a2b4bbc
-EBUILD devhelp-3.30.1.ebuild 1864 BLAKE2B cc9604cf6b2add2180bf16f78f238919d0b2479d722a82d8f9cfb4d0328974d787abd14fd1a4d618ba9ce59d9778148f905a630e9d8df2e0d32815f8910294b5 SHA512 213181f169942a3956e7af890e2d47a5a24f7c80863b2879fe9678470cf6b4b19abe8a1bbb9d8fcfe9d7950211863eff7bff5fc50a1d6212727a68249e5115d9
+EBUILD devhelp-3.30.1.ebuild 1818 BLAKE2B 7e946ea642db4476ccc165e26d7cc30c1b481216e9a43054aa14067845dbb45411d5c833d55f25d7ed519cbc47bf84811e031915b651821ef5bf4fc31453d5eb SHA512 b12542f04c3902f759a6dc1d291c2bb52acc914f48339b14bd63dca528f00adb9ea320cb7dab37eeeab51f4f1bdb54b5af2717fba4d2d42087cc5d96821c9a46
 MISC metadata.xml 337 BLAKE2B b031370d8a469a93790b021e5d5f1bbd368ad0c13b144e4fb593d0abbe04d2408f6a7083ae1a1580ef5fdeaf26c59bcbcfcc0d5731f2fd42bde769cf1fb1ece2 SHA512 76931a5e5bff4c6f32aa55e27ff6ef6e320f79c21f1e3c3b3af4733dc0c141a7b782dfa38227fca4d6d50b763dcc3fd191581862ada051951b3185c596ca6753
diff --git a/dev-util/devhelp/devhelp-3.30.1.ebuild b/dev-util/devhelp/devhelp-3.30.1.ebuild
index e00885f4d8ee..014be70449d8 100644
--- a/dev-util/devhelp/devhelp-3.30.1.ebuild
+++ b/dev-util/devhelp/devhelp-3.30.1.ebuild
@@ -2,9 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-# gedit-3.8 is python3 only, this also per:
-# https://bugzilla.redhat.com/show_bug.cgi?id=979450
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit gnome.org gnome2-utils meson python-single-r1 xdg
 
@@ -28,8 +26,11 @@ COMMON_DEPEND="
 RDEPEND="${COMMON_DEPEND}
 	gedit? (
 		${PYTHON_DEPS}
-		app-editors/gedit[introspection,python,${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}] )
+		$(python_gen_cond_dep '
+			app-editors/gedit[introspection,python,${PYTHON_SINGLE_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		')
+	)
 "
 # libxml2 required for glib-compile-resources
 DEPEND="${COMMON_DEPEND}
diff --git a/dev-util/dialog/Manifest b/dev-util/dialog/Manifest
index 821964078a3b..e4fc8a3d6dfa 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-20191110.tar.gz 540825 BLAKE2B 972d5b9d73c413274f09a590886838010feb55817ec94416dbf0da645824e92df9f7e02b9fbf22c226f2fa213876a6fa6de4f1af1ce94a93c53f22ede8d30926 SHA512 858a0cc095a4d52ce50bb77cc46a95ef64bcff1dc9526eb352b8d1d8884949186d1ea93af342eab8cf8a236efc9357bc5be2d1f1564a6f64536026bc1b894397
 DIST dialog-1.3-20191210.tar.gz 541569 BLAKE2B 358349c85afdbe9f1dc9c05b75337980c7ca3f7c6e9429314e8c24af722f696f12383b776828660441b5337c815fcf93b18076e0601e20dd940e0a8a304bb198 SHA512 4196287f26da2aab8376141a1442bccea52bcc6f7003042101df0c6a72aa3e25aa909d9fbcb937b047ab12a2e4349ec4b71b26f6e5cd4ba41cfd5665f732975d
-EBUILD dialog-1.3.20170131.ebuild 1255 BLAKE2B 831df9d13a2c298df0d1ce33df37e8afb19591cf414acd63ba69416fb8d64378ab5393f830700e4ac668866e15da8dcbd04f4a3f7195f4af6ed7ac59dc1e3e81 SHA512 7a0ffdd7014294752073462b59b1e0ff7fd0c4f3e35f7b92cadd434f623f7139b4f64d3438d8a7b4c4d37d470b6b788ac270d2101535e765746cc353a979e38f
+EBUILD dialog-1.3.20170131.ebuild 1256 BLAKE2B 537f29bc9541df308a3077c73a9fa03e09d6c1e862032d06601036be5a952523db9dbad78af642142baf0f471499a42836b6eff0275eba099fc14ac47e7ab614 SHA512 a718b05e13dfcf525e8e6b75b23d4b8fce8065f23d8ad6358f10e944467e156bce8d1d5bfce4520014431b2cce14eaf2291dc2ba8152d425d04bdec41145775c
 EBUILD dialog-1.3.20191110.ebuild 1230 BLAKE2B 0fb5f6b088617392e795d4743cb2a42ccedb5bf602cedb409e72fc33df6411e36e2885d63ab42e9fdcdc7f2c3b23f4a690126f9aac194ec0787fec459c9b44c1 SHA512 edd73cfbc608a1f7fe609c21bce4af53f63bbc0027e5ee700f0e32c3e899a6a2bab3bb74a1402fc4b4148b4e87616cb1c64c09d007ada7b1ab423bf9ff177196
 EBUILD dialog-1.3.20191210.ebuild 1230 BLAKE2B 0fb5f6b088617392e795d4743cb2a42ccedb5bf602cedb409e72fc33df6411e36e2885d63ab42e9fdcdc7f2c3b23f4a690126f9aac194ec0787fec459c9b44c1 SHA512 edd73cfbc608a1f7fe609c21bce4af53f63bbc0027e5ee700f0e32c3e899a6a2bab3bb74a1402fc4b4148b4e87616cb1c64c09d007ada7b1ab423bf9ff177196
 MISC metadata.xml 341 BLAKE2B 84cb58bb0ffe236825ae28f7f277c172eb8e8ec279aec915cdac1078342272a180aceb72400817be94b01568c24c4588d6423baa2be02c70a9971840a7e62650 SHA512 b194bfc5daa545724eaa7ec7dcc5618ec87249158d5e8fcb01a76375960b2d9dd012e596c0fc8e0d9c94eb39175a6b4424257cf0828cc73956c7a68ff4749da8
diff --git a/dev-util/dialog/dialog-1.3.20170131.ebuild b/dev-util/dialog/dialog-1.3.20170131.ebuild
index 8c4006ed28f5..1286a1647bd9 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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="examples minimal nls static-libs unicode"
 
 RDEPEND="
diff --git a/dev-util/diffball/Manifest b/dev-util/diffball/Manifest
index c2b9f386a27f..48fcef79e872 100644
--- a/dev-util/diffball/Manifest
+++ b/dev-util/diffball/Manifest
@@ -2,5 +2,5 @@ DIST diffball-1.0.1-bug_543310_stack_buffer_overflows.patch 2945 BLAKE2B 17aa01d
 DIST diffball-1.0.1.tar.bz2 387787 BLAKE2B e46dbf32b2ec9bece106ca90a6ae46bdfde8b83a5fd41e67f15c4bd25d7015327b4738ce3bfba71c92fd2baa94a5d3bc507dd0fad2b3451447a39a7fe058002e SHA512 1e01fff8bf7d993c828f195d974b7df1cd4fb056e9a51f9533bc8e01666a55e0d9467c799a005f58d7b4369bbf88fc9b716d0fb68ead6171d349e3c874bddb8c
 DIST diffball-1.0.1.tar.gz 86387 BLAKE2B 1e2c6d522b00a643666e88d19d2d6986ce02c7835378dfc9799e43fa291683bf08e129546a85c332b04ab549788ae4ac3b4d57fd6140a29a9556bece4293cbf9 SHA512 3344f03a65e2b44615eaf9210d26a4438712684c438fcea9caabe89688fe3b3d5436703f0ed63412a18a63acb49ca0dacff190fa002ea76b346bbccba3388ee4
 EBUILD diffball-1.0.1-r1.ebuild 1030 BLAKE2B 7af7578802bdd739f1245c8576c1b823493f79c0134b09d94e5eccc0ddc3c6a57990091d11578773f6c3d5aa8dc5e2884d95d9006a90bc8de98b9c68e702090f SHA512 5838dea4ec0f4a13c4838447f2bef461eee2bfa093e71439669a62c503725785e218c2e66fa2f4a1e17accf5fe697c0441d2562d8261a4ee43576b81fdf2e902
-EBUILD diffball-1.0.1.ebuild 867 BLAKE2B f16d8e5fdb56e87693d6c99f6724c58c8b452862d42812b6ee49ad566b3763fe49c23c2e8cf431eeab313483c56542943a670316d155cd10f120d6f282550635 SHA512 c28c7cc3318ead6ee3441e68d2d2e34f19f8dab5666f10602c33ab000a82f24210eb4f2810afad9e474f97c298f9ccb0a0c8ba35055afe7d5712ce8162e7db49
+EBUILD diffball-1.0.1.ebuild 868 BLAKE2B 6623438469419d464c155b2be4ad93701c662b7df6299c366e72c90cd6637964d39dfc6c1b5bdc51a289be35b98eb7a0b2a345cfc1ac318e488d3abf017a724e SHA512 df3bb20b2c8b668ab75b706d330f407fd8b30859aef28ccbcb9d93af13910208ef6986dcfbb91c561db458cc756b3a488b30b761fdb4d568714a0b9ea7eda47c
 MISC metadata.xml 325 BLAKE2B d2fe2133512a06976ca331af0d318fbe888fac115af9e2635a3f682eb1ffcc0c9088e87437c39803cfa5183aaa2a5df091113efa6f7259e91960340ce095717d SHA512 8c9cb7fc1861a080e525eed799e80650b9c8ec4b0416959c9b754099cec1c26651beb5364992b8a3c80ed3285bff74f0a0b72a4032e3b243cab0191d8fd8856a
diff --git a/dev-util/diffball/diffball-1.0.1.ebuild b/dev-util/diffball/diffball-1.0.1.ebuild
index c36e2a324798..98f7e891a94f 100644
--- a/dev-util/diffball/diffball-1.0.1.ebuild
+++ b/dev-util/diffball/diffball-1.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.go
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~hppa ia64 ~mips ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="debug"
 
 RDEPEND=">=sys-libs/zlib-1.1.4
diff --git a/dev-util/diffstat/Manifest b/dev-util/diffstat/Manifest
index 96cc904fdd5b..442f0633d183 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 593 BLAKE2B 463e0d361226e6c5c87afda492218ee2a75fd08bd9b28a21d834d24248ebdc5fc9b35fd87f3d7f5806a8df29d117f31ae0f90812b3f3af316bb06000d09aaa50 SHA512 7070d0efd7f66ef0a7618d3e4eb623cb0c792ce4a5a7b02e913b8354f285359c9d8c40a04fe7c75d2299f143665f936fca23633ffaf97256f7c8dbcd47ec5609
+EBUILD diffstat-1.60.ebuild 594 BLAKE2B 3b8f2d6e9cbfad10e1765656f96fabd8184eb665e04812aff8f960f5c45693c3523e0fee929decccaf127db2d3060493e7e1a2482b73dc49a8748e68f6340363 SHA512 2c0aef990e279b0018891a8f49505081753d040cf56351ea7081e637e9a30575e6e40538f1a4a37baa2e5cb4147357ec63b82db86be6d2b77c9ebd8800866b5c
 EBUILD diffstat-1.61.ebuild 466 BLAKE2B d746d080641ba2d19a7e0d82a45df147acc753741036e4719861850c3049f3591150ece544135868ac89efcbb62e9afece89113b8781ce1a7f1e5c3f128d31c3 SHA512 3c88b73434aadaadbd665709febdf0ed4eb9ecab0f9f850b6ff76a6ed2d6893803f71c3d629ef664197b363451deeb951c0bb873b5429f0ec23bcef8f3abb4f8
 EBUILD diffstat-1.63.ebuild 472 BLAKE2B 0c0e8c0f4ab8d1765baa7e098bacb12d9b61535d3fb4c1aa968cee4c406210ab7683bad53060cb10521d24fbf14827b0147967e066b471c6f44a3f013106e0e9 SHA512 43251d295d1e29aa18832b5bb0e8dd3ee15fd136d97595e76fefcd73eb49fc56446d0bd6cf0d4689e48c61b623da12c9add0c3e25faeaa905c63a13c86a93619
 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 a8dc8901cf0d..5f64e1e22ca3 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 sh 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 src_configure() {
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index ab26176c15d9..170744ce8e8f 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -1,5 +1,5 @@
 AUX gdbus-codegen-2.56.1-sitedir.patch 1898 BLAKE2B 2d3530f2c0e249254d170a7c0f1965cc9953af8b29a96bf7658a74595e740a4dc9b2dad804f16a855b2afa2f9a72eb02aabe42e1a94b166ecb43e0213125eeb1 SHA512 3983f2021da8045bb25a0f2e761a651d67d5b5f41e5d26ad3e5950f5e74587a6226ae5d1c21e6c7561b16d8cd6f17ca2a693369fc5b2cbb5d4d686a52b29942b
 AUX setup.py-2.32.4 192 BLAKE2B 574320d89095d1452a3eee4404b5ebb19fbed32febf2a15422d276bc8dfb6790c41b7214aad3f88ee4927b58de639146cbf633f735df693bd437ea19eae79435 SHA512 45e823f507db103543f024ad557d35f7c09fb51db8a78b978c762ca77d941cdecc5837d2b248fc2c5da6a93b56fe8ded359efd98fb0a74fdf9533783d8eebcfa
 DIST glib-2.60.7.tar.xz 4590568 BLAKE2B a3f2a3bd0443a27326e8359c2ad1e6022ca1634f5c7cb4502a8011fbe85df690fff7d67665cf160bf4ed426214b87f6501a69158fb1656bdb86cacdcf076ee15 SHA512 d56d805a5abf6f7aeb8bf5be06b60ad049177ee23f78eacef4ce2ea88a8be49966a95e48fed17c752649f6e80937fd0ebc8f959709f623ec1f2f43ffd42d078a
-EBUILD gdbus-codegen-2.60.7.ebuild 2017 BLAKE2B ca03b50c138accecc1304ae9e8ca7fffd897b14b7ae16e36b8e6e96cf8093abaa00ff492f7af651157ed4f32e7516e7b4d3434aa93327bbf27d04cd4d7fa9bd9 SHA512 8e26d6152aca9e9f89938cb3b6d12406892115bc652450842b619d58b5935f637a7a198b24283a01b32643cf26422e0573e5bc90066df8e202c084eda9c8fabc
+EBUILD gdbus-codegen-2.60.7.ebuild 2018 BLAKE2B 70174b965972fd7b0d41e8b8c5c0e5a43e49eb25be916885fba29953531feb16fe08401539e64b50709a4e29794afd976b711bbff990e0e3e90b4dbf7c9fd0f9 SHA512 2f4b4340b2864fb93c59b10c73af2e821311414cae49a565689ff3705ded42da7c80764788d7de70e9e8be0387bd9fc497aff3d0388315ed3bfac2558ab0702b
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.60.7.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.60.7.ebuild
index 2d7aeb06e80e..32d59a05616d 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.60.7.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.60.7.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/geany-plugins/Manifest b/dev-util/geany-plugins/Manifest
index 42ca1b8f6bf9..c0ba27e4dd45 100644
--- a/dev-util/geany-plugins/Manifest
+++ b/dev-util/geany-plugins/Manifest
@@ -2,8 +2,8 @@ DIST geany-plugins-1.30.tar.gz 4469990 BLAKE2B 3cb8434765667814dc95227a82bdf204b
 DIST geany-plugins-1.34.tar.gz 4640059 BLAKE2B f6a2e001db42e348c129b503fd969f142fecbaa06a10bd220d348f70e6af087a0a856a403bdf866f65fdff02889fa03a2f3a662be3efad0a17401266ab883bcf SHA512 31d25e9b0946b7feeae40b81c4e0c177568cc161c24bfa1c8271dda1c15a44e86f5de9b5992a4acde6cfafe2924a1cc22e95c7b6fb253e8a358931fa5f8ecca3
 DIST geany-plugins-1.35.tar.gz 4656963 BLAKE2B c7c96c7bbd1d17083f75a90eaa741277626db8aeb693cb78d3fcca57136923c58eba1755cc55263d431ff7a992e22b365f91be5e424b4f02eb25299ae3d3cd93 SHA512 9fedb4237096d939919fa40c39a7d19debb19211260a2797b5566c555052dcd8bf9a31a694d057f1dcded794bc75883d0007f8dd9427e3d899434fbf0e8a8e9f
 DIST geany-plugins-1.36.tar.gz 4693634 BLAKE2B a7c319a77cb92a55a0a53063ab75d9375f7d2a0e419eb3e0acd063b8fda4b4d9798c103ce53b80090c73bd86804c58f815aaf8d0eecc0d7fbf7ad1c8470cb9b5 SHA512 b3e58b42432d17c27289fa20d10b833a2d7f5d8c72b51abe5b1ebdabcb952b18e0984b15ef6ac9753102d839f3174f28798269e1e94bf032bdaa189e98d72b2d
-EBUILD geany-plugins-1.30.ebuild 3438 BLAKE2B a0cf586e95195375680bbde21c7de798fabd3ad944c9a7934ace91285a267436938b8bf158af9a6da5d55caa3b5c258218c0f5f3c44170a0c7384bc447cec0be SHA512 ab7193e7c89b6824c33d489e8bf0b6098b814c9bff52987af9c4ca5eb059902102f94e659b90e4ba1748f9242d7fbb3a3564bd88d0826c36f4b4a3807083eb99
-EBUILD geany-plugins-1.34.ebuild 3350 BLAKE2B e46889663dd862fc3df8751a21e16a23d9668136322cb42f03593ccf5a140c6e28714d84cee1e24da79f5ff76a394b60843ac098c0bbb60a4c52354b70017654 SHA512 507692e4a910032982aa1041de80128328c1f4ad3b86f8cbd8c18ed589fcd1a057d55311b42d5afe30a90df65b670f42fa883fc9e218522b27bb3cd7341bea1b
-EBUILD geany-plugins-1.35.ebuild 3318 BLAKE2B fa8b8919b8fafdb570e6dcc0fd951b5051fba7f3f02afd02f1fef4798edbba2f44e9e26df59569d877123f3cd4e2125ee6a91b0573001bf73a1f317393a07849 SHA512 8556d21fc5f1130c3ba4f98d1300232a1638c9874548b4787bc139997e07009f316d8ca682f01efbf185e72c8c838b28ce33b00f24c2f23d603cf82e5aadd21c
-EBUILD geany-plugins-1.36.ebuild 3383 BLAKE2B f81233e98fcdb8e00b2a99152b9c7241d270dfc00db71578361916fc7256173063c683597413262ed4b3cc5c9ce024d9b58d362f5fe193e1dd6146ebbc49c644 SHA512 40bf5d9dfa2ba2608a8279f904f760718108af3798e1cf060d3b659b31a7c5e590f8fc5945114628180db17375cb29814e43ffc58fd6d484a6c5902c316fd58e
+EBUILD geany-plugins-1.30.ebuild 3438 BLAKE2B 61a4d3d60156efad049b864f267b97b2349b1eb4bd873fa2975fa7e377a66327c4896692c8dc5de6e861873dbe88c0a287d15b639f97a6e0eb170d7eda1f9c6f SHA512 ab960ec6232fbc5b00b3a3eab9475e9d6d5d85219be73bd151ca008d0d2bfc95bac68ccf8f02f47406a701cfa922640315f5ac8d06c2b213abbfa8c5091229a6
+EBUILD geany-plugins-1.34.ebuild 3353 BLAKE2B 34f8a867bd36cf421f694f3ca49faf907b5af79c2ee5f8892d783dcc35fd20d2e2eea767a84c669a6cc770ef2a0b4f77611853f003e516c74900c87dc1bade69 SHA512 bde345d29949e24609328f0571f5ef9651df04b483d06d6349ceeb0db69da57f086c2bda6e52f4b7c9d6c73dccfe5c990dccd3494cd9b4a5cd64b45864118c3c
+EBUILD geany-plugins-1.35.ebuild 3320 BLAKE2B 7c45615b64fb07efddd969116849a251a5b9fb0883b8383719a3dcbc99021a9d059e52efd770e75d97d38911c46a1f2942ed945a46a0386ff2d8a8d9020b91e1 SHA512 7f884d9c6d78f87562e84f9ba582540ca58c604c4158c0c2168e5213e9baae38164ea05cb45ee5e00cd080bc4d65df4e164f02bd6fe632b41fb541292234f710
+EBUILD geany-plugins-1.36.ebuild 3385 BLAKE2B a9512e0e21dd6e5b2eebf44db0c51042d352cc7cccfd65116c4ec475bbd7da9bbd12956f5a31bd06693b991855728a66e6e94ee3b0400010f1340984d9e091b3 SHA512 c62c347df8846cf86f682454b09e3a1d1ed3ccd58c4f7e5087935ed6456ff9cf3f8e1d300aebc4e16ba1d53d709857344fc7cbce61a2baff9d344aa14e6150d2
 MISC metadata.xml 1647 BLAKE2B b46873a3918b3506a6331aecf522f78467c4ab88e3d9f1b3caa300afbb83986f377d193ed2da43246eacb3ea104396989569f3e8ea663ee766c580d6b96abac5 SHA512 0030c7fb50c9ed0da05c34ef122762c86a5b9f8345403e80cd2cdff0447a62980608ca7ee484520eb097907bc6d9dfe4b390b0d4888775e3b4125d3ccd198d94
diff --git a/dev-util/geany-plugins/geany-plugins-1.30.ebuild b/dev-util/geany-plugins/geany-plugins-1.30.ebuild
index 55544248d9e4..10881860323d 100644
--- a/dev-util/geany-plugins/geany-plugins-1.30.ebuild
+++ b/dev-util/geany-plugins/geany-plugins-1.30.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 sparc x86"
 
 IUSE="gtk3 +autoclose +automark +commander ctags debugger +defineformat enchant git gpg gtkspell lua multiterm nls +overview python scope soup"
 REQUIRED_USE="
@@ -33,7 +33,7 @@ COMMON_DEPEND="
 	ctags? ( dev-util/ctags )
 	debugger? ( x11-libs/vte:0 )
 	defineformat? ( ${GTK_COMMON_DEPEND} )
-	enchant? ( app-text/enchant )
+	enchant? ( app-text/enchant:0 )
 	git? ( dev-libs/libgit2:= )
 	gpg? ( app-crypt/gpgme:1= )
 	gtkspell? (
diff --git a/dev-util/geany-plugins/geany-plugins-1.34.ebuild b/dev-util/geany-plugins/geany-plugins-1.34.ebuild
index 8f38ec50b7a1..536edca351fb 100644
--- a/dev-util/geany-plugins/geany-plugins-1.34.ebuild
+++ b/dev-util/geany-plugins/geany-plugins-1.34.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
@@ -13,7 +13,7 @@ SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 sparc x86"
 
 IUSE="+gtk3 ctags debugger enchant git gpg gtkspell lua markdown multiterm nls pretty-printer python scope soup"
 REQUIRED_USE="
@@ -29,7 +29,7 @@ COMMON_DEPEND="
 	!gtk3? ( x11-libs/gtk+:2 )
 	ctags? ( dev-util/ctags )
 	debugger? ( x11-libs/vte:0 )
-	enchant? ( app-text/enchant )
+	enchant? ( app-text/enchant:= )
 	git? ( dev-libs/libgit2:= )
 	gpg? ( app-crypt/gpgme:1= )
 	gtkspell? (
diff --git a/dev-util/geany-plugins/geany-plugins-1.35.ebuild b/dev-util/geany-plugins/geany-plugins-1.35.ebuild
index 9733bb2f8275..c3025970983d 100644
--- a/dev-util/geany-plugins/geany-plugins-1.35.ebuild
+++ b/dev-util/geany-plugins/geany-plugins-1.35.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
@@ -29,7 +29,7 @@ DEPEND="
 	!gtk3? ( x11-libs/gtk+:2 )
 	ctags? ( dev-util/ctags )
 	debugger? ( x11-libs/vte:0 )
-	enchant? ( app-text/enchant )
+	enchant? ( app-text/enchant:= )
 	git? ( dev-libs/libgit2:= )
 	gpg? ( app-crypt/gpgme:1= )
 	gtkspell? (
diff --git a/dev-util/geany-plugins/geany-plugins-1.36.ebuild b/dev-util/geany-plugins/geany-plugins-1.36.ebuild
index e6b5ae9dc7fb..6df50af83e16 100644
--- a/dev-util/geany-plugins/geany-plugins-1.36.ebuild
+++ b/dev-util/geany-plugins/geany-plugins-1.36.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
@@ -32,7 +32,7 @@ DEPEND="
 		gtk3? ( x11-libs/vte:2.91 )
 		!gtk3? ( x11-libs/vte:0 )
 		)
-	enchant? ( app-text/enchant )
+	enchant? ( app-text/enchant:= )
 	git? ( dev-libs/libgit2:= )
 	gpg? ( app-crypt/gpgme:1= )
 	gtkspell? (
diff --git a/dev-util/geany/Manifest b/dev-util/geany/Manifest
index 09375ce42bfe..8319fd1fed81 100644
--- a/dev-util/geany/Manifest
+++ b/dev-util/geany/Manifest
@@ -2,8 +2,8 @@ DIST geany-1.30.1.tar.bz2 4352154 BLAKE2B 6efceb21e07aba3b0698196543746e926d6a73
 DIST geany-1.34.1.tar.bz2 4474211 BLAKE2B 25c9b3f752b0b19582120ea342d8029f811040ef433adb065aec028f0bcc0909ea1b0005445bae70a53cbb2b1d3bfe0c2dd9d9c25c5e3f89bcdedebc0a392301 SHA512 3e075b23b22682324e4a56046d238d9d0087d095a6157b98c342fbe40a2bfa7118f72cfe1f414d110fff1411e4cc9c33fff800e0a2e32f9f0e5fd7b6fb560c9a
 DIST geany-1.35.tar.bz2 4593705 BLAKE2B 1d411da04a82987abccb33385d3b50025078b68dc2cc4accfb7822000a786b97f613a35864fde2389d0525b9547972d0e56699b75aae40686f0ad7e6e2beb4a6 SHA512 9ae2f168b1b5e9fa9029a32f5d1e9b591e50ea4e79041760524a4389572400c6f8f56f1fd6973299f152f9fd653cf3d52ca50136f0bbdbc15d3395bcf7388ccf
 DIST geany-1.36.tar.bz2 4644521 BLAKE2B 80eeceee31a49e9728a358904ad40e353d3407a22492340e6aa9a82091d32fa004f4494d3ae027732174e7cf7f6fae620b511680e06e58c5b71dd259125900c4 SHA512 15005772b64e8321d7fa8552363df425eb25e9d7b0760c561c8fb3f34d7acae2bf25da8e04fda38a2a1b64cc31ff613b7ff2786d432ff014050c138c7473c810
-EBUILD geany-1.30.1.ebuild 1562 BLAKE2B c2df6ed87dc009a743022b751c01dacbf9d71a13ab365f5d880d959a61501feb91a7584d2e0e99fb30d2ddf6d7813879b43e378da5762b2917658ee41e859faa SHA512 ea58946bbe21fafc79acb47599a12fbdd5c8d069b5f78292570ac9b9ac0088f08db8d5a3f4c0a019678f185c117702464b39f553b2d97744457c439dd0a1fc39
-EBUILD geany-1.34.1.ebuild 1747 BLAKE2B e35bf705e1d09841fc7d7ff2db413d088cffb3ec282b47771e47c3ddc55cf37336ca7ba4a604b14f9b032b344b3c2412eda019b73dc59fcc4fee9b4bb1424cb9 SHA512 6141aa7b113cfc3acc0e2a929bced4ad93a2a4b2d8b64fe79aac88920f293dfdf361e6e5a1c10a9ad96898a429bd3877a99bb46016bc821d901b849916539c12
+EBUILD geany-1.30.1.ebuild 1563 BLAKE2B 0079457e7f891dc38e9e2836aa9763be0d0631c9d9265b882cb63895374ebc9070014af67b989166e3771236eab023cf123ca8b9d7647df3d96bf4af39bfc3d3 SHA512 223007894b1f1011244c0b9722aba83b32f20e33457f8b756047a1b02165ed64bf1333817f7c43533250b0c6fb153fb903f2850cf70fd6d09480c16d30c96f3c
+EBUILD geany-1.34.1.ebuild 1748 BLAKE2B 79893b09f3c38fdebdcb797a8dcea0ff2cc21d57198dd3d2e26a55d5d77d115ffd1d7b8ffff48f3329079a68fdc9712ac8996134b9b401997bd976a81bb11125 SHA512 07ab7fc7d60d56f3c09e4261e2c387d29a83245ebd4c26e294dd6e0b0442f959a3b9aa5f254d49db9b885a0895aa3ac292db334dedfcf321eca2f43831043310
 EBUILD geany-1.35.ebuild 1716 BLAKE2B fdd725de6e6346cc85fc021f289bc717b5d1a665b260a42c64e9fe9e31a2821242fc19e83f1fa69bc63f84fa468e8957aff2fc584bf94c168dc52fb74dc09961 SHA512 476b8e0d3083da8677dcf63453ed369a6a3f40ee83847873d06f238549d6a50ee5e1a4c00cfa8649661cdfb2f30de70d7e6b563d455a713cef8aba75c90fd643
 EBUILD geany-1.36.ebuild 1728 BLAKE2B c45634623adc46c21598b59812a3cc5ffe20dd2edb5a19a766bbc57c96a9fa197076c4be5ce6b3263b3f6b64f9cf73161e0ad660058e6610501b3c188bf6bd1d SHA512 d96e54bf3236d66f7bf1883739be215a532078975c2ba1b395335448f3fdb9feb379d98dcccd28343f08e69b42701805284ed434f27a7b4afba91b913af71ead
 EBUILD geany-9999.ebuild 1716 BLAKE2B fdd725de6e6346cc85fc021f289bc717b5d1a665b260a42c64e9fe9e31a2821242fc19e83f1fa69bc63f84fa468e8957aff2fc584bf94c168dc52fb74dc09961 SHA512 476b8e0d3083da8677dcf63453ed369a6a3f40ee83847873d06f238549d6a50ee5e1a4c00cfa8649661cdfb2f30de70d7e6b563d455a713cef8aba75c90fd643
diff --git a/dev-util/geany/geany-1.30.1.ebuild b/dev-util/geany/geany-1.30.1.ebuild
index 011757a46796..0e140ca2d927 100644
--- a/dev-util/geany/geany-1.30.1.ebuild
+++ b/dev-util/geany/geany-1.30.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.geany.org/${P}.tar.bz2"
 
 LICENSE="GPL-2+ HPND"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="gtk3 +vte"
 
 RDEPEND=">=dev-libs/glib-2.32:2
diff --git a/dev-util/geany/geany-1.34.1.ebuild b/dev-util/geany/geany-1.34.1.ebuild
index 89f73691a494..cbdab1bb2a5b 100644
--- a/dev-util/geany/geany-1.34.1.ebuild
+++ b/dev-util/geany/geany-1.34.1.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" = 9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/geany/geany.git"
 else
 	SRC_URI="https://download.geany.org/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 fi
 LICENSE="GPL-2+ HPND"
 SLOT="0"
diff --git a/dev-util/gertty/Manifest b/dev-util/gertty/Manifest
index 4d7f5112618e..0345190af973 100644
--- a/dev-util/gertty/Manifest
+++ b/dev-util/gertty/Manifest
@@ -1,10 +1,4 @@
-DIST gertty-1.3.2.tar.gz 92553 BLAKE2B 2e6771fcf044a8a46e91dbc6f34869be528e0aa4db8344aa26a999bfb9fe1a8e7b18346f1d90f06b7cb436c74a2c04c5528297d126e66b8f985bfc42483c53cc SHA512 b68acb801ceb225fe86d62015fd89bce7ebe34219dbb2f7fe10d991ff06b558a5ed3512e6435ef3ce13324841c473dbec565c7bef23e01567f5bdcbb6aba9136
-DIST gertty-1.4.0.tar.gz 115581 BLAKE2B af1a4ceac5b1e189305463e91d8d79246ccf16d5109b5100c0f928af42c39632d2c4b904c5586428c31d5d12985baf8ed2507c743364d6b26a4a02967b59dfc3 SHA512 9abba6271d3ec95938f07ab4ee76f0b539a7ce7f0bbf9c08509fe9516c14f99ccb7b439d29a30bff6dca99bf39788dc803cd8aed3cc03b531678225fa41102d9
-DIST gertty-1.5.0.tar.gz 119784 BLAKE2B bc563c10009c372de5a702b4ab33d9b6b26a898486fc5a1d840f298b50a779c36467ccf6600b6f29b61d3c15b1cc0bbfe960d0d6a1a71d3f8b8f75dc392ab0dc SHA512 bc47817a3ba9ccce298ee1a646cb43f8a57e9a57a40d898859836b3171abd0cf3c682a5f5811cf3d987a17dbf00dd6706a5dbc5a6a35f1d5ff3a217c68187cda
 DIST gertty-1.6.0.tar.gz 122570 BLAKE2B 8c3628f9b0b56aaff30f183a1ab0d852b8ee487927833f41b8aa61f94f8d14eaf3a8d515d5edcb3fa7dd18ca36f42a977d12790c52d6c629a720b4f29252b030 SHA512 0fe5224f5b4b06910bba0d19453ea0f273f6ea0688b9aa092e11f929b71801581f6d7cead1d64c00912ee3363b98d4b36e903fa992a7ce36f190a4f3c09375d2
-EBUILD gertty-1.3.2.ebuild 1142 BLAKE2B 7f5126a367e4fc5d077bad539a673004ad2b5499fd5ff8b5a55f96d0de915c8b36a6f187cc8e476f81e0364237c5d38070880c8a411ce16eff890add28071b99 SHA512 4ac2662a94f2b0937c4f49cc3423b421554457f48a157968741dd973cffa28931f8f88e5d01b3ccaaa6077401a1fe50120494432044f7e6973114bbff0f85253
-EBUILD gertty-1.4.0.ebuild 1142 BLAKE2B 7f5126a367e4fc5d077bad539a673004ad2b5499fd5ff8b5a55f96d0de915c8b36a6f187cc8e476f81e0364237c5d38070880c8a411ce16eff890add28071b99 SHA512 4ac2662a94f2b0937c4f49cc3423b421554457f48a157968741dd973cffa28931f8f88e5d01b3ccaaa6077401a1fe50120494432044f7e6973114bbff0f85253
-EBUILD gertty-1.5.0-r1.ebuild 1101 BLAKE2B 8e7238fbe92a974c677830f4eec2c4729c6c83963a6ee42bf8922c616ac440dc6faa87870904f8a27f5cb3c79331c35b884a3e47a0cd61dd7e09043931f4aa84 SHA512 2a6487d2dd3ffdc93938354231ee2977db12891ecebded07bdbca0818249a6d8a483773ce092dd7b37683d162d54c575ff58d51e11e7263cfc04a15d5f795585
-EBUILD gertty-1.6.0-r1.ebuild 1251 BLAKE2B c17cc9aa2ecff935423f5e53a2c14aae287ded4915f12c4b7454323586bc5a0c1799278fbe25d0a38d49953455e25a85328bcfe6f6ec9a9f9a2a94ec854046f1 SHA512 4ea9fb7114786389e629decad5a82c66a04bb70465bc46290ab5cb1c78b6f0c52ba9371614483709b4d84a9808994f1e58ffe36552c387a02b8bcd3422ec1e58
-EBUILD gertty-9999.ebuild 1253 BLAKE2B 1d821ec1cdb6ec17753fd9c4bbb3cf4c3834eac48f8a6a6f8e0a4b8a10f22d1ac4c7c17a381821b083563d1e0f1c23f6138e4ceb49776901ab3312c578bb5d78 SHA512 031d77ad4c0e5996af07b1f64477129bd8e13c8cc3b8eff015c3c8576e3f47fb227224d4ca8e30de9f37d8a1de20979239ba76a64f6994f7bcf617a66d0fd654
+EBUILD gertty-1.6.0-r1.ebuild 1241 BLAKE2B 13b30cecfec294f927e056ffbe24c8dd77adb7dd1d5259665d4ff5cca69695d780d2be82304e036df6eb33965043909167ade6ea25017d2ee635789e4365b2fc SHA512 ba57686647c57209560996843997be9f73fa3b1755f1ba5cd80656d891bf03a68e9d37ff5adb883beea7af91502a3c8c36d9ec16d0d0d66308cedbaf8310e10f
+EBUILD gertty-9999.ebuild 1243 BLAKE2B 887fb2e6773a5bbb1afb82f3003fbee37ef4df38bbae2919f1fa039170de20855d46956be9d6c118324eb17868bd17a7e8540e56855feb8bff06e5afaccd8aa7 SHA512 5039a851bc1d72fa716ea47f550ca6bf1b10fe1647a1859fbfffa779908d6b2d624cdcb043bea245dc3be1484aebe6860d917e3f325c43e8d030f5f73678d6fc
 MISC metadata.xml 500 BLAKE2B 0310d985bd0b3824fcf1522d04cbb253fcb3507b96a75073e0e37481cdc7aaf03da638a592bb1470d17e758f2fbcbd6c60d046a7f7ffa18d3c8a6aced2daa76b SHA512 8a39f2a1e526fa077354eacf6a318b4cb11b7a1ec37f2928578bfb13f7d509226a30c0b2b94e6da070e602e54e02fbce0b2129f9421db1f6981eed1e781493f3
diff --git a/dev-util/gertty/gertty-1.3.2.ebuild b/dev-util/gertty/gertty-1.3.2.ebuild
deleted file mode 100644
index 6157972f8d87..000000000000
--- a/dev-util/gertty/gertty-1.3.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Gertty is a console-based interface to the Gerrit Code Review system."
-HOMEPAGE="https://pypi.org/project/gertty/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-0.11[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/urwid-1.2.1[${PYTHON_USEDEP}]
-	!~dev-python/urwid-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/git-python-0.3.2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.3[${PYTHON_USEDEP}]
-	<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/alembic-0.6.4[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/voluptuous-0.7[${PYTHON_USEDEP}]
-	>=dev-python/ply-3.4[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-util/gertty/gertty-1.4.0.ebuild b/dev-util/gertty/gertty-1.4.0.ebuild
deleted file mode 100644
index 6157972f8d87..000000000000
--- a/dev-util/gertty/gertty-1.4.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Gertty is a console-based interface to the Gerrit Code Review system."
-HOMEPAGE="https://pypi.org/project/gertty/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-0.11[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/urwid-1.2.1[${PYTHON_USEDEP}]
-	!~dev-python/urwid-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/git-python-0.3.2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.3[${PYTHON_USEDEP}]
-	<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/alembic-0.6.4[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/voluptuous-0.7[${PYTHON_USEDEP}]
-	>=dev-python/ply-3.4[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-util/gertty/gertty-1.5.0-r1.ebuild b/dev-util/gertty/gertty-1.5.0-r1.ebuild
deleted file mode 100644
index c7152e1a9b5b..000000000000
--- a/dev-util/gertty/gertty-1.5.0-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Gertty is a console-based interface to the Gerrit Code Review system."
-HOMEPAGE="https://pypi.org/project/gertty/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-0.11[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/urwid-1.2.1[${PYTHON_USEDEP}]
-	!~dev-python/urwid-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/git-python-0.3.7[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.3[${PYTHON_USEDEP}]
-	<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/alembic-0.6.4[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/voluptuous-0.7[${PYTHON_USEDEP}]
-	>=dev-python/ply-3.4[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-util/gertty/gertty-1.6.0-r1.ebuild b/dev-util/gertty/gertty-1.6.0-r1.ebuild
index f25f90457452..cba65e08b2ed 100644
--- a/dev-util/gertty/gertty-1.6.0-r1.ebuild
+++ b/dev-util/gertty/gertty-1.6.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 
 inherit distutils-r1
 
diff --git a/dev-util/gertty/gertty-9999.ebuild b/dev-util/gertty/gertty-9999.ebuild
index 773f2d6e4dea..9cb8603575a9 100644
--- a/dev-util/gertty/gertty-9999.ebuild
+++ b/dev-util/gertty/gertty-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 
 inherit distutils-r1
 
diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest
index 9645ab73217b..5a900a6143e5 100644
--- a/dev-util/glade/Manifest
+++ b/dev-util/glade/Manifest
@@ -1,4 +1,4 @@
 AUX glade-3.14.1-doc-version.patch 853 BLAKE2B b7cad3cc9d49cfe24189ba21bffaec2c524d3c7953d722b3b03d57ad68297fee6757330c1a2d90f36bcfe52d1d9ef4d95b81eeb19109bc8957f671ac40d31573 SHA512 cc9aec06f6acdfdf538de7043f9f753768e0e4c26fa9eef7e52b4e42aa6fd3836185c18ffd51abfc2aa3e6f5b2472e68914112230d2b8856e8a3c61e9d865ecf
 DIST glade-3.22.1.tar.xz 3592952 BLAKE2B 53f769198a093ff5d4dc98bb4ea98c6e5195933caf24247a99db980312ae3398fca3abbd640d08c02e8fb5f8647ee3e4b18e65073b1500e9017ee0586993a331 SHA512 e1bdc49b89bc5010c0abf6357dbae05c921182655b2ee5a4b161af6adfd596cfbcd495c9851ba956abbf3d6156616a6c0e94640cd72cee11551ca388674ac908
-EBUILD glade-3.22.1.ebuild 2303 BLAKE2B c7d1710bce0cf28a8c2cc6b795a7eb19ac08537e9ae9cac004e7c40b69bbe8ca77a69e9d09f7d101767871aaf1df073e87fc7fe02f3757ec1733114a813aa9f4 SHA512 4f1125a7b2ff796834117eba9588697a6a9832f2a31363128f7d92066811fd380fc362515586cccc62eb4ba51c9f70ca887d0a5a623354ef5225fb99a8c2b786
+EBUILD glade-3.22.1.ebuild 2304 BLAKE2B dbdd31414bd310486cd4047440f6a04b69e03fb3a219b65533ae9d6e619b82fcbb7ed6c98fbcacacebe43cbe3248bb27f04d0b26e3f6f3c9bdd46605242e9e27 SHA512 2c7d9325d782774afa94a1030d128e352ebdbca462dc2ae696620d2440b73808fb17e6d9710518483cc46c819ec53831dc6dd70605fcc0bef46eda046ee2ec54
 MISC metadata.xml 358 BLAKE2B 33f3b46ab877b311931205095fb2b357fe7fe2da8820944d32e8a16f2dbcf99033f95a17f4cefa4aa6d0f731c72d0f65683a8cc3b947ebf09d084f92e796f887 SHA512 8840ebde12f26a2caf856e75f3f706e3c9a7a7a771d0deeae99ca6b16f4bbeaf119bae7776a8a0bef8b7422f52ebd6498a8b5e862af4548886249386dcb44480
diff --git a/dev-util/glade/glade-3.22.1.ebuild b/dev-util/glade/glade-3.22.1.ebuild
index b846c91ad27e..797621143e6a 100644
--- a/dev-util/glade/glade-3.22.1.ebuild
+++ b/dev-util/glade/glade-3.22.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://glade.gnome.org/"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="3.10/6" # subslot = suffix of libgladeui-2.so
-KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86"
 
 IUSE="debug +introspection python webkit"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index ef077753036b..2922ba9c82d8 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -1,3 +1,3 @@
 DIST glib-2.60.7.tar.xz 4590568 BLAKE2B a3f2a3bd0443a27326e8359c2ad1e6022ca1634f5c7cb4502a8011fbe85df690fff7d67665cf160bf4ed426214b87f6501a69158fb1656bdb86cacdcf076ee15 SHA512 d56d805a5abf6f7aeb8bf5be06b60ad049177ee23f78eacef4ce2ea88a8be49966a95e48fed17c752649f6e80937fd0ebc8f959709f623ec1f2f43ffd42d078a
-EBUILD glib-utils-2.60.7.ebuild 2392 BLAKE2B caf5222d39c3e116f7c03af6c5b7fde53ae0f76f7e11946fef898b937bd33b12c3d8a0eabec44f61118cb1282d5e276fba47b3b7f08418b370f04018757b5f75 SHA512 44b810cd7f4db72d7ee20ab8b9f18aa94c42772ca2d2abd365f12cff4a94d1bbfe7ca96654e07dccc48ca39d8982f493773a1dadd9874a4d47d14c40dcd01d42
+EBUILD glib-utils-2.60.7.ebuild 2393 BLAKE2B 1458fed297fa9b524efeddafe6a64e726d42c154990dbe881e0136eb26dac26029b67988e2b77d511de027f6810978ea58ab60af9d3333b9da5b9c365fbddbcd SHA512 a57be7ab562758d400b975bcd66b77b682f9ac81ec44a8266e4696d1ac22561dc39e81a4f41cbb4325b26749c177cd46f6d556d33991939bc6d33b557c8b237d
 MISC metadata.xml 332 BLAKE2B 1e3c081ae9a2c8ae53cee6c3ae133cbd5e8543a68c03d4a4f7e164437502d996ea9364789e93114687271e1f472bcf13a418cca5b74ecb95a51849f0a5f3dafa SHA512 f7680d9be4071b841f50ece99b5041dc492901d84ae05383c1ff05b6a73bab804b153a50eb70f5417137f6e2041230c5ba8eaede10f7a0bf8a899508642588c6
diff --git a/dev-util/glib-utils/glib-utils-2.60.7.ebuild b/dev-util/glib-utils/glib-utils-2.60.7.ebuild
index 8e1fc5cc7234..61433eead925 100644
--- a/dev-util/glib-utils/glib-utils-2.60.7.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.60.7.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 ~sh 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 ~sh 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"
 
 RDEPEND="${PYTHON_DEPS}
 	!<dev-libs/glib-2.56.2:2
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index 76fe81ff155a..fcdf5d6a74a0 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -1,9 +1,6 @@
 AUX glslang-7.12.3353_pre20191027-fix-relative-includes.patch 663 BLAKE2B 4d0e8efd9152610b16813d45251a83b8b685c07d3491c6bc1a1c2656ecabde2eed8840a53712bfd9aa9e6f047f332f56ead1e3c0d8185a81c4de0eb286f5d048 SHA512 db8bf5424aca0eb215db3059665eb7e6ffbbab029979de9f5b574e577274f6d0ca8a27acde10bd53769561eaae2996ec6da1a4916b2c39e82f343c33b120915f
 AUX glslang-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch 4974 BLAKE2B 9bb7807618a2dd6c322244557bf93809c21631be064bde4fc659724c45cb27d3e615fecde8692658edc1e3d229b4daadfa2b51732ebddb5d49f85abdb3af5399 SHA512 a07654d40172d6669d3ee3c3685463dbd58cc163ce726a20db18237ab710044b011e511defc8828f7ccd8b4fc128bb38f75669686085f7572ce8cc98887266d3
-DIST glslang-7.11.3114_pre20190415.tar.gz 2841827 BLAKE2B 7d1c46f05d0b5def4d9612f45d3c24b67a4497dc229bbaecdad8d2109ae17e5545a12dac04b42bf8102b8d2b3ca6919168d238da7c496a5713ece83a664101f8 SHA512 d75e5a7ceea305bacf489696c14a17209e9793ebc3efbacda8cc26b23fd7ff6c5d2b1b3348df108be6e9249862454e0584772f09f702d47374923c4cde491192
 DIST glslang-7.12.3353_pre20191027.tar.gz 3119760 BLAKE2B 4a7eda7bf89b1589cb8a712660589e2746ff13ce3cac589a5651486fbdaa149b0fd8fceb791af0e43c9342aa9ca31459f66d0236c31d22959e519e8eb4457018 SHA512 6f247dbf9a50cdfe7b6ffbf79f73c46c57f8f61ef10037e0775ddd6faf4c5fd4b9b6b6761ecf26cc71c3711a650ee8619e2f0a33dfcf8ca8dc2974e497a685a7
-EBUILD glslang-7.11.3114_pre20190415-r1.ebuild 556 BLAKE2B 77fea586cb6202d0c9ae2edbd398bfec0f5b8aff7db0bf405e8954be09cdc82cf393a1d0da6ecd67dd7c7e4448c89b6bf9e6504d85561f604336d750e2d0919a SHA512 c0994b38b8984c98ded133636e2c2d3d0502e7581f799b39e11487aeb52f26b7cdf57cb0a2923135493b81eafd21f2c7bdf8bbc32a164486318c3a72fd8e06f1
-EBUILD glslang-7.12.3353_pre20191027-r1.ebuild 760 BLAKE2B 69e0f48308884297c6e8098ce44679167b645350bd939b38ec69d0756069e5995f9eade2d3ae9a26a2e6b82ca8b3d81fb4631cd4dfcab1c41d7569231e93f92f SHA512 1f4452c0c9a918a82b0464bf43beb35a1106c39a0c022bd966b79b4fdd49141ceb013cb41dd02b69d9eb2471ae5b6933f50e0f79c3680949e0644b55997a0138
 EBUILD glslang-7.12.3353_pre20191027-r2.ebuild 841 BLAKE2B 09a09058c6c1801e195e6163c603a2c9d89da8711284e9e86f53738f8ce0ae1ac188674b016c7d2c3a6cca557181060ae6368f6dd20e90b939f77aa147ec56b0 SHA512 b9578e487982dd0b2bcbd5a53562f816e0694c8d614bfd4e8b9229631b18a3260ce3e4dfd53b63db07325fdcf07295cf4ae299abdbce21f1138d4aa5b720287d
 EBUILD glslang-9999.ebuild 617 BLAKE2B 30fd7c4245a34d125051b5f41cfe2aa37ba9fa3c921b464f5a6dca09af90a6dfffd13c0dc1551c0da2c56875842c08a2189243e4bd8009ec032d7b5d690d05fc SHA512 6b36df67fd05adc8e89af5da2775ccdd69b6c999b9c9f65808e3660e6d2eb089e52a841bf522d3647aeba7b617af0fcd08cc76b9c53f6d00e6de7e597f9fde9e
 MISC metadata.xml 425 BLAKE2B e1b34c7d88a8c0b001aa77a4ad4a1242e4d9ab45e98c0849cdff45a8cb6d1510e31e358c7e65c2a5d83bc8af7e3651532c69791146d92e4ff6a16ed823d142a0 SHA512 f13cc9858160b65a80fde54a9d3881a371225b1f15a15fe60b8ed066373e80c6e595f2e51fe38cc3d3b6f1f58968390ce419f810f66de8a3e5053d7fc8833b41
diff --git a/dev-util/glslang/glslang-7.11.3114_pre20190415-r1.ebuild b/dev-util/glslang/glslang-7.11.3114_pre20190415-r1.ebuild
deleted file mode 100644
index 5c09f581090a..000000000000
--- a/dev-util/glslang/glslang-7.11.3114_pre20190415-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib cmake-utils
-
-SNAPSHOT_COMMIT="0527c9db8148ce37442fa4a9c99a2a23ad50b0b7"
-SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64 x86"
-S="${WORKDIR}/glslang-${SNAPSHOT_COMMIT}"
-
-DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
-HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/"
-
-LICENSE="BSD"
-SLOT="0"
diff --git a/dev-util/glslang/glslang-7.12.3353_pre20191027-r1.ebuild b/dev-util/glslang/glslang-7.12.3353_pre20191027-r1.ebuild
deleted file mode 100644
index c44a7ad5833b..000000000000
--- a/dev-util/glslang/glslang-7.12.3353_pre20191027-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=(python{3_6,3_7})
-
-inherit cmake-multilib cmake-utils python-any-r1
-
-SNAPSHOT_COMMIT="b131630e7c749a5dc19faa458024260c71fb170f"
-SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-S="${WORKDIR}/glslang-${SNAPSHOT_COMMIT}"
-
-DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
-HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/"
-
-LICENSE="BSD"
-SLOT="0"
-
-PATCHES=( "${FILESDIR}/${P}-fix-relative-includes.patch" )
-
-RDEPEND="!<media-libs/shaderc-2019-r1"
-BDEPEND="${PYTHON_DEPS}"
-
-# Bug 698850
-RESTRICT="test"
diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest
index 07901769fc78..c017d97162d5 100644
--- a/dev-util/gnome-builder/Manifest
+++ b/dev-util/gnome-builder/Manifest
@@ -1,3 +1,7 @@
+AUX 3.32.4-optional-vala.patch 898 BLAKE2B ed1ed208eb7b38a2dacee42e0e699c605c8632e12ac1f48b0077a6af18725f8792653317f9c86580056f58e1de645b8b7320c30353fa0f1e3e126066e2afac66 SHA512 a848963d5f3680c995e5342900b987a6481ab26c2650fdd365a0a580814e821a914a10c4481df16f010940c51b0f72868dbb660be955d9a19aa7c7cfca1f7900
 DIST gnome-builder-3.30.3.tar.xz 9486164 BLAKE2B b983fd71b1bab31386ab8f4c3a6ff57b33afd2da5aff5e41e7d1cba388a9b6998a0f799c0843bde95f8ce0456fe46457d0c0c46622d59eeb7729d2e8868898f7 SHA512 468605dbd2bd712a76c333a974bb19ca889dfe8493c2e85101641034f3e2c8eba2c0ee2f98ad01f3466f0f42946f05790763ccfaf786d73da192d64360eec47f
+DIST gnome-builder-3.32.4-patchset.tar.xz 34740 BLAKE2B 6e29ce42b2b1878b5fcec7cf057bcdc015da8817d7f9209f4d03e02bb5837525e329d0627d4465123fb20a0a46415053d7e08b445634659123ebff12d2fb9d09 SHA512 494cf1ff370c7d86d42ec352966169e73b99556dc5a1be0bf0ec53cd78e8550897bb44187ae8f471fe3e10a85dc7d44d44c5edef0569b1d0a7dff7b5d78b1fa1
+DIST gnome-builder-3.32.4.tar.xz 11886980 BLAKE2B a7901566238dd39fe180d1e47089d7f99018be115f407d174472a8371374361fe50f2f15cb6d496a1afa3e30117d83788944636fb6a9487d4a719442ba6ae744 SHA512 a050161465edd448b0359ff781bf97b0cda6c184ea4f89193711a1bac3c7b79f76bac0d3600e3823a86aa19538228619b5d64aea94e8a67f480b5c1f79bc3b93
 EBUILD gnome-builder-3.30.3.ebuild 7046 BLAKE2B 80d59ad24c93ca52f81d316917a28a16561222731dabc20799b7eabd2a3fbe7168025f1d086debdd424e3bb81aac186d7ec0305b86669dbcabecbed84caa9445 SHA512 3ad4ed1153be299f3a23cf242afa859816e8ad27a18825881bc57cc4013d76fe92f917941818a268e6b10d24c1247d5a39a4384e5dff150998d8c70e2827b734
-MISC metadata.xml 1114 BLAKE2B 34d8dba8d48edca606ec56c996b93a6e47736e5d92aa20b71bf8f2a4c46cda82d3023b4c253357c7126e91ece1d12d9043cd020a2de2a5390ee984f97be4e552 SHA512 1882f56d3f5f88db34f37559f4f64bcab0f01e9496c4316358229e5662347f66ad2eb987571df8596b12a4170cf9ba5a2a41d39d82f1687d21753b1c5716c2a5
+EBUILD gnome-builder-3.32.4.ebuild 7120 BLAKE2B 2ea02b40860e0814ecbb1c97388f29fd847f4a22c964c80a16dcf11fcb2d6c3793acb9168d51bd1ae87e087b099275093beec58aa3c5c2b2589bf9a885b709e3 SHA512 1b06488c75070afd763fac541d0fda8fc8df49b849caae4ac80cd5164fb3de550b03101d5a34ab66952261b2a5422ba70e639c5f5610962e5dacd0fa82744e5a
+MISC metadata.xml 1212 BLAKE2B 83f431217b3d0b759597a250e40902979fde0a130e5666427824fe3d48fb05120dd596a8f0292ad23373c00bb8bd807cac667ae51f9a996b0275fbb6039084af SHA512 828803d2518b1684db6f0076e4aa851614682198722c67298ee8e73c29726fdae808d1ee17626d15559a9f6fd28d1abb6f651c39fc59de9c233081ba925d826d
diff --git a/dev-util/gnome-builder/files/3.32.4-optional-vala.patch b/dev-util/gnome-builder/files/3.32.4-optional-vala.patch
new file mode 100644
index 000000000000..b31ee886eae6
--- /dev/null
+++ b/dev-util/gnome-builder/files/3.32.4-optional-vala.patch
@@ -0,0 +1,29 @@
+diff --git a/meson_options.txt b/meson_options.txt
+index 36fcfc969..cef10804d 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -13,6 +13,7 @@ option('channel',
+ 
+ option('help', type: 'boolean', value: false)
+ option('docs', type: 'boolean', value: false)
++option('vapi', type: 'boolean')
+ 
+ option('network_tests', type: 'boolean', value: true, description: 'Allow networking in unit-tests')
+ 
+diff --git a/src/meson.build b/src/meson.build
+index bc7f91841..53d678297 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -124,6 +124,7 @@ configure_file(
+            copy: true,
+ )
+ 
++if get_option('vapi')
+ libide_vapi = gnome.generate_vapi('libide-' + libide_api_version,
+         sources: libide_gir[0],
+         install: true,
+@@ -141,3 +142,4 @@ libide_vapi = gnome.generate_vapi('libide-' + libide_api_version,
+ 
+ # Must be after vapi generation
+ subdir('plugins/vala-pack')
++endif
diff --git a/dev-util/gnome-builder/gnome-builder-3.32.4.ebuild b/dev-util/gnome-builder/gnome-builder-3.32.4.ebuild
new file mode 100644
index 000000000000..803ea084530b
--- /dev/null
+++ b/dev-util/gnome-builder/gnome-builder-3.32.4.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+VALA_MIN_API_VERSION="0.36"
+DISABLE_AUTOFORMATTING=1
+FORCE_PRINT_ELOG=1
+
+inherit gnome.org gnome2-utils llvm meson python-single-r1 readme.gentoo-r1 vala virtualx xdg
+
+DESCRIPTION="An IDE for writing GNOME-based software"
+HOMEPAGE="https://wiki.gnome.org/Apps/Builder"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
+
+# FIXME: Review licenses at some point
+LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="clang +devhelp doc +glade gtk-doc spell sysprof test vala"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# When bumping, pay attention to all the included plugins/*/meson.build (and other) build files and the requirements within.
+# `grep -rI dependency * --include='meson.build'` can give a good initial idea for external deps and their double checking.
+# The listed RDEPEND order shold roughly match that output as well, with toplevel one first then sorted by file path.
+# Most plugins have no extra requirements and default to enabled; we need to handle the ones with extra requirements. Many of
+# them have optional runtime dependencies, for which we try to at least notify the user via DOC_CONTENTS (but not all small
+# things); `grep -rI -e 'command-pattern.*=' -e 'push_arg'` can give a (spammy) idea, plus python imports in try/except.
+
+# FIXME: plugin_flatpak needs flatpak.pc >=0.8.0, ostree-1 and libsoup-2.4.pc >=2.52.0
+# Editorconfig needs old pcre, with vte migrating away, might want it optional or ported to pcre2?
+# An introspection USE flag of a dep is required if any introspection based language plugin wants to use it (grep for gi.repository). Last full check at 3.28.4
+
+# TODO: Handle llvm slots via llvm.eclass; see plugins/clang/meson.build
+RDEPEND="
+	>=dev-libs/libdazzle-3.31.90[introspection,vala?]
+	>=dev-libs/glib-2.59.0:2
+	>=x11-libs/gtk+-3.22.26:3[introspection]
+	>=x11-libs/gtksourceview-4.0.0:4[introspection]
+	>=dev-libs/json-glib-1.2.0
+	>=dev-libs/jsonrpc-glib-3.19.91[vala?]
+	>=x11-libs/pango-1.38.0
+	$(python_gen_cond_dep '>=dev-libs/libpeas-1.22.0[python,${PYTHON_SINGLE_USEDEP}]')
+	>=dev-libs/template-glib-3.28.0[introspection,vala?]
+	>=x11-libs/vte-0.40.2:2.91[introspection,vala?]
+	>=net-libs/webkit-gtk-2.12.0:4=[introspection]
+	>=dev-libs/libxml2-2.9.0
+	dev-libs/libgit2[ssh,threads]
+	>=dev-libs/libgit2-glib-0.28[ssh]
+	dev-libs/libpcre:3
+
+	>=dev-libs/gobject-introspection-1.54.0:=
+	>=dev-python/pygobject-3.22.0:3[${PYTHON_USEDEP}]
+	${PYTHON_DEPS}
+	clang? ( sys-devel/clang:= )
+	devhelp? ( >=dev-util/devhelp-3.25.1:= )
+	glade? ( >=dev-util/glade-3.22.0:3.10 )
+	spell? ( >=app-text/gspell-1.8:0=
+		app-text/enchant:2 )
+	sysprof? ( >=dev-util/sysprof-3.31.90[gtk] )
+	vala? (
+		dev-lang/vala:=
+		$(vala_depend)
+	)
+" # We use subslot operator dep on vala in addition to $(vala_depend), because we have _runtime_
+#   usage in vala-pack plugin and need it rebuilt before removing an older vala it was built against
+DEPEND="${RDEPEND}"
+# TODO: runtime ctags path finding..
+
+# desktop-file-utils required for tests, but we have it in deptree for xdg update-desktop-database anyway, so be explicit and unconditional
+# appstream-glib needed for validation with appstream-util with FEATURES=test
+BDEPEND="
+	doc? ( dev-python/sphinx )
+	test? (
+		dev-libs/appstream-glib
+		sys-apps/dbus )
+	dev-util/desktop-file-utils
+	dev-util/glib-utils
+	>=dev-util/meson-0.49.2
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+DOC_CONTENTS='gnome-builder can use various other dependencies on runtime to provide
+extra capabilities beyond these expressed via USE flags. Some of these
+that are currently available with packages include:
+
+* dev-util/uncrustify and dev-python/autopep8 for various Code Beautifier
+  plugin out of the box functionality.
+* dev-util/ctags with exuberant-ctags selected via "eselect ctags" for
+  C, C++, Python, JavaScript, CSS, HTML and Ruby autocompletion, semantic
+  highlighting and symbol resolving support.
+* dev-python/jedi and dev-python/lxml for more accurate Python
+  autocompletion support.
+* dev-util/valgrind for integration with valgrind.
+* dev-util/meson for integration with the Meson build system.
+* dev-util/cargo for integration with the Rust Cargo build system.
+* dev-util/cmake for integration with the CMake build system.
+* net-libs/nodejs[npm] for integration with the NPM package system.
+'
+# FIXME: Package gnome-code-assistance and mention here, or maybe USE flag and default enable because it's rather important
+# eslint for additional diagnostics in JavaScript files (what package has this? At least something via NPM..)
+# jhbuild support
+# rust language server via rls; Go via go-langserver
+# autotools stuff for autotools plugin; gtkmm/autoconf-archive for C++ template
+# gjs/gettext/mono/PHPize stuff, but most of these are probably installed for other reasons anyways, when needed inside IDE
+
+PATCHES=(
+	"${WORKDIR}/patches" # gnome-builder-3-32 branch 2020-01-14 (commit 325cfb6d9e4) + cherry-picked meson link_whole fixes
+	"${FILESDIR}"/${PV}-optional-vala.patch
+)
+
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	use clang && llvm_pkg_setup
+}
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dtracing=false
+		-Dprofiling=false # not passing -pg to CFLAGS
+		-Dfusermount_wrapper=false # meant for flatpak builds
+		-Dtcmalloc=false
+		-Dchannel=other
+
+		$(meson_use vala vapi) # TODO: doesn't work anymore; crude patch included
+		$(meson_use doc help)
+		$(meson_use gtk-doc docs)
+
+		-Dnetwork_tests=false
+		$(meson_use clang plugin_clang)
+		$(meson_use devhelp plugin_devhelp)
+		-Dplugin_deviced=false
+		-Dplugin_editorconfig=true # needs libpcre
+		-Dplugin_flatpak=false
+		-Dplugin_podman=false
+		$(meson_use glade plugin_glade)
+		-Dplugin_git=true
+		$(meson_use spell plugin_spellcheck)
+		$(meson_use sysprof plugin_sysprof)
+		$(meson_use vala plugin_vala)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_optimize
+	if use doc; then
+		rm "${ED}"/usr/share/doc/gnome-builder/en/.buildinfo || die
+		rm "${ED}"/usr/share/doc/gnome-builder/en/objects.inv || die
+		rm -r "${ED}"/usr/share/doc/gnome-builder/en/.doctrees || die
+		# custom docdir in build system, blocked by https://github.com/mesonbuild/meson/issues/825
+		mv "${ED}"/usr/share/doc/gnome-builder/en "${ED}"/usr/share/doc/${PF}/html || die
+		# _sources subdir left in on purpose, as HTML links to the rst files as "View page source". Additionally default docompress exclusion of /html/ already ensures they aren't compressed, thus linkable as-is.
+		rmdir "${ED}"/usr/share/doc/gnome-builder/ || die
+	fi
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
+
+src_test() {
+	# FIXME: can't run meson_src_test together with virtx or dbus-run-session
+	virtx dbus-run-session meson test -C "${BUILD_DIR}"
+}
diff --git a/dev-util/gnome-builder/metadata.xml b/dev-util/gnome-builder/metadata.xml
index 4eb8fba905da..efeddd2652d2 100644
--- a/dev-util/gnome-builder/metadata.xml
+++ b/dev-util/gnome-builder/metadata.xml
@@ -10,6 +10,7 @@
 	<flag name="devhelp">Provide API docs browsing and integration via <pkg>dev-util/devhelp</pkg></flag>
 	<flag name="git">Provide support for the Git version control system via <pkg>dev-libs/libgit2-glib</pkg>
 		(such as setup of Git for New Project, direct cloning for Open Project and changed lines indicators in the editor gutter)</flag>
+	<flag name="glade">Provide integration with <pkg>dev-util/glade</pkg> UI designer for Gtk</flag>
 	<flag name="sysprof">Provide an integrated profiler via <pkg>dev-util/sysprof</pkg></flag>
 	<flag name="vala">Provide an autoindenter, autocompletion, diagnostics, and symbol resolver for Vala</flag>
 	<flag name="webkit">Enable <pkg>net-libs/webkit-gtk</pkg> using plugins support and the HTML/Markdown previewer plugin</flag>
diff --git a/dev-util/gperf/Manifest b/dev-util/gperf/Manifest
index 37ebf9ea69eb..1197cb990a6d 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 727 BLAKE2B 3559dc4a03f9e332b17cab20fa46575784f9d5e44fb9418199c618ff3357b50194fc45aa46c3e4ebda971fa5490c4001ccff7702b8cc1d169e87e813f8b2647b SHA512 e2f3807f52c87784f282758355e5adcb5df5b8c4ecaf6d72c54fd089248e67fcaaea98551af1e59ef5bec0e6aeb9dc09f8de738c83cdfd8e7572380ea5a6cffe
+EBUILD gperf-3.1.ebuild 728 BLAKE2B 6f786c85c72174f938349f6347f4ba9f91bf0b4bbc536e03e4f2fd86eb69caf530e9f998f97667758d35861714f4a7ca547edb7a0278b3a3dd53201a247f1b00 SHA512 5519c66d73a5f9e37c050aa963def11db348a7bc335c74a5c86b0b1a3448944104a4e13f7249a4ffe4fc367ae9918f26ba1ca80265df0ae99afd46258a539a6d
 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 06d44c774f54..c31327072da1 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 sh 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 sh 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"
 IUSE=""
 
 src_prepare() {
diff --git a/dev-util/gtk-builder-convert/Manifest b/dev-util/gtk-builder-convert/Manifest
index 39544c0a211b..290a95ecd2f1 100644
--- a/dev-util/gtk-builder-convert/Manifest
+++ b/dev-util/gtk-builder-convert/Manifest
@@ -1,3 +1,3 @@
 DIST gtk+-2.24.32.tar.xz 12620860 BLAKE2B 03f4c0a8be98473f62bc8c86859937969c4169960a5f93d37ff6dcde00413215fa6c7125b15781bf50d67b40aa0056cb71b83fb50acb2c3467b5deb3c8d938f0 SHA512 8e8fd9ae32f1d6fb544da260f00599f0f05090d910d767b06ef086ab4f1f8373a29bb0da9767761c9b5f4cfd51b5c45d0fa5d39b0428c839ddf0a579df806696
-EBUILD gtk-builder-convert-2.24.32.ebuild 1130 BLAKE2B d872f55d5e2502d98cd7548aece43b740dbbf81d714ae1f8e15b644cb24272112b1ee305809c7155cce9093af138723caed805291c9efbf1e537454ce8d06f30 SHA512 ef50de57af5f8ee722a3516022ac90f8b75012be104ae255ad0e013b5d8b8a8d4c856fbf0074460da8421f9c5d8ec028995e506165ae36147354b9538e172cd9
+EBUILD gtk-builder-convert-2.24.32.ebuild 1131 BLAKE2B b829e639bd52305add8e45bc927b461148f468849bf5684a16fb6853360d182ad75ad5b4e029ce1a1c386d8e4c411a3d4d3f8c22b00356fdd068c99e495a8f51 SHA512 c9c4c3b66071728908a3754bfa6aef869fa694e9decf2172777dd62667fc194d560b17b477aa7e8efa15ab7516c01eec6e06e4549a758a2ad92ff7f127bbc819
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild
index 5526eaa3376f..7f9e7e17b70d 100644
--- a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild
+++ b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/gtk-doc-am/Manifest b/dev-util/gtk-doc-am/Manifest
index 27168238ffd5..a70117d882db 100644
--- a/dev-util/gtk-doc-am/Manifest
+++ b/dev-util/gtk-doc-am/Manifest
@@ -1,3 +1,5 @@
 DIST gtk-doc-1.25.tar.xz 673184 BLAKE2B 2468b70403c0334b52ce1bcb77d2015fe83e0af9fac861464db605de9744ec1c7300e9b9a4b4fe0a3641e016083df063d92e1b74e44771d7a88c66815a396765 SHA512 7ac8c73ab9f9ecb6a142bd2232450a6431c3e4fe2372ff40460145b5d0bcffa1953c8cf49436539db86c3a32461cbd4180c714cb19cdd68bfd557816b789339c
-EBUILD gtk-doc-am-1.25-r1.ebuild 1227 BLAKE2B 07fe226a04c0f5e5ffc10a314647beac2c397211bc8ccbec29bf84a302125208a8e11e2e4d55871282f154bc5fc59794e3f172ca464531f5ce0cd600f409d005 SHA512 c14da510e3f4041a6e15941e2cf37a5b5903f50f824b22c9487085ec5f685594bab0c88c8d5b9e63d195553f11ea2897a71506a67166b5057ee68972a0093c7c
+DIST gtk-doc-1.32.tar.xz 762000 BLAKE2B e87b0ed5dffd04acc7569171343839a742a874438248546b1b85ca71102d5a546f41b450c5cedf54ecab5b7b6585a4dac36d7600b21b5cce491470a50f82d3b0 SHA512 6d28395968c2951f1685570e5778b5add76d1b9cff8fcb8632b200b3ba251602a1ea59b1def84fc28560988b87fc0dbbc6947af88d268db6ff23e9c28aea3b28
+EBUILD gtk-doc-am-1.25-r1.ebuild 1228 BLAKE2B ddbfb799eacf4c3ab643d27772cf50798c1c9399e238a866e2f52adb643bd0c386a20b8887f998a2aa658164b4f41939d27a0c72d2a1b3582358a171752d4b10 SHA512 bcd548fec1d1ff4e5d78c470599544989c31f5ac1c04ea9df2b396244ef8692dc8ae7fc550a8a49901291e1b3458bee9c36608f76569d50bc810b305a4a62675
+EBUILD gtk-doc-am-1.32.ebuild 858 BLAKE2B e316968cd39867ddeb722a3201d0b1565d2cff80646226c79ac21008b3c0fc1ab204da677e665462c4fd457e29d564b0269ad366dde9d74a44d89cdd1f1709d9 SHA512 bdeb721234543b7c8a63c4653b36ef6e27c2ab737ce071114003c3162448b052d6c8ce9600cc0d111093f2ec5062c8d3005d01c907708212fa749df91f99139e
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gtk-doc-am/gtk-doc-am-1.25-r1.ebuild b/dev-util/gtk-doc-am/gtk-doc-am-1.25-r1.ebuild
index fef7abb6f161..647b5848312a 100644
--- a/dev-util/gtk-doc-am/gtk-doc-am-1.25-r1.ebuild
+++ b/dev-util/gtk-doc-am/gtk-doc-am-1.25-r1.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 sh 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 sh 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"
 
 RDEPEND=">=dev-lang/perl-5.18"
 DEPEND="${RDEPEND}
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
new file mode 100644
index 000000000000..b7417a1b6064
--- /dev/null
+++ b/dev-util/gtk-doc-am/gtk-doc-am-1.32.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="gtk-doc"
+
+inherit gnome.org
+
+DESCRIPTION="Automake files from gtk-doc"
+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 ~sh ~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"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	!<dev-util/gtk-doc-${GNOME_ORG_PVP}
+"
+# This ebuild doesn't even compile anything, causing tests to fail when updating (bug #316071)
+RESTRICT="test"
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	insinto /usr/share/aclocal
+	doins buildsystems/autotools/gtk-doc.m4
+}
diff --git a/dev-util/gtk-doc/Manifest b/dev-util/gtk-doc/Manifest
index 50bd4e04442b..4f17a15c4938 100644
--- a/dev-util/gtk-doc/Manifest
+++ b/dev-util/gtk-doc/Manifest
@@ -1,5 +1,7 @@
 AUX 61gtk-doc-gentoo.el 283 BLAKE2B 116d2b43d42b05130482c5bff7a10f13930a0d04f34874d25bfa6c61dc8920efe60ae615e6d54de1eeed87044a7232a992a37582d608b0756f0b099b5ee62d03 SHA512 d9e7c8bacd97a5147dbbe9ad568323356c9c38ad982ce88c63ef5f8e3955289274393a91e07d2159c082ac2a058455a1905c251ff3676f60bad596379fb12837
 AUX gtk-doc-1.8-emacs-keybindings.patch 582 BLAKE2B 9591f8f58dbd2c5897abf020f96a3ad8124830c274bfa581756ccaa43c67002264cc6d5a04c0316e4bb2dfa75a3cb08b5de6217a81a295b3a31e18dae8d1ad7d SHA512 360e97c0d2603c17dd1c1ca92739eb5ac229f3bcda6dc76267b95cac73db1008a52164ac9cba5a0e43f7b6359b5e6d3b242fde757fa1b7409051bade5f6f35a6
 DIST gtk-doc-1.25.tar.xz 673184 BLAKE2B 2468b70403c0334b52ce1bcb77d2015fe83e0af9fac861464db605de9744ec1c7300e9b9a4b4fe0a3641e016083df063d92e1b74e44771d7a88c66815a396765 SHA512 7ac8c73ab9f9ecb6a142bd2232450a6431c3e4fe2372ff40460145b5d0bcffa1953c8cf49436539db86c3a32461cbd4180c714cb19cdd68bfd557816b789339c
-EBUILD gtk-doc-1.25-r1.ebuild 2766 BLAKE2B 84b4780047e46433a2b121235179e64ddc4496513c9e2ed3d146b3b7829026293313ce2f86e54b5bf8dfb459379f50d84c5e965cf3d3ed30ca878bf19140eaf7 SHA512 7d534381af64e6c462eed663c1faf10a42171426a9983beccbf0a73ca8f5717ce2b510088b9a734a1cb95654a7ed4a2af2bada7e92e344400c3ac890340914d2
+DIST gtk-doc-1.32.tar.xz 762000 BLAKE2B e87b0ed5dffd04acc7569171343839a742a874438248546b1b85ca71102d5a546f41b450c5cedf54ecab5b7b6585a4dac36d7600b21b5cce491470a50f82d3b0 SHA512 6d28395968c2951f1685570e5778b5add76d1b9cff8fcb8632b200b3ba251602a1ea59b1def84fc28560988b87fc0dbbc6947af88d268db6ff23e9c28aea3b28
+EBUILD gtk-doc-1.25-r1.ebuild 2767 BLAKE2B 619837d6125ae5ff05c11c15f70ed72c9a5df1b00df0636772ed20cb07cf6d4d5a72c6c32393fb16d936f4ff3990aede8d8f87345ac0a60e2d5d1405ccbb3ffa SHA512 dc6719a0a9160c6aa63aaba4b05667e3cec887d7ace45be3abb1cec3ca27950e8f1c9bcfd5968fc8b6f41923587fe88cc43c36487234b0646274c73738a19e94
+EBUILD gtk-doc-1.32.ebuild 2317 BLAKE2B 751ce9cfd6efdf0e5dd8396c325418da032c243782c8415a3f81da4b8416e427490a61c7e6b69886ac5ba84f24f37f7df532e0b252169b35580b0f235c19df43 SHA512 71656f6840ce3fe8beeca5976b2d2b2c4af491425e28675f8b0aa55af690a13014ea58cb741b079dbda6cb9aa0acada5b2b43b2593551266c381805c880e654a
 MISC metadata.xml 659 BLAKE2B 8c57567cad76724388d746e74bd1056a062c7280552494d6265b5fa38be518983188f22948bdb389916ec6384c17308e1ec292ec36f633b6ecd6f27102f74f94 SHA512 4ffcd239d0a5788ed94a204395a51d8b706663ac69139965e7d28282c473b55cd006cf3786a3cfd60386439f9ffa5d9242ed43ba05783962cbac002f8a00539b
diff --git a/dev-util/gtk-doc/gtk-doc-1.25-r1.ebuild b/dev-util/gtk-doc/gtk-doc-1.25-r1.ebuild
index cb4cf718fec5..38bee826b3e0 100644
--- a/dev-util/gtk-doc/gtk-doc-1.25-r1.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.25-r1.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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 
 IUSE="debug doc emacs highlight test vim"
 RESTRICT="!test? ( test )"
diff --git a/dev-util/gtk-doc/gtk-doc-1.32.ebuild b/dev-util/gtk-doc/gtk-doc-1.32.ebuild
new file mode 100644
index 000000000000..e1f94f914082
--- /dev/null
+++ b/dev-util/gtk-doc/gtk-doc-1.32.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit eutils elisp-common gnome2 python-single-r1 readme.gentoo-r1
+
+DESCRIPTION="GTK+ Documentation Generator"
+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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+
+IUSE="debug doc emacs"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/glib-2.6:2
+	dev-libs/libxslt
+	>=dev-libs/libxml2-2.3.6:2
+	~app-text/docbook-xml-dtd-4.3
+	app-text/docbook-xsl-stylesheets
+	~app-text/docbook-sgml-dtd-3.0
+	>=app-text/docbook-dsssl-stylesheets-1.40
+	emacs? ( >=app-editors/emacs-23.1:* )
+	dev-python/pygments[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	~dev-util/gtk-doc-am-${PV}
+	dev-util/itstool
+	virtual/pkgconfig
+"
+
+# tests require unpackaged python module "anytree", and require java(fop) or tex(dblatex)
+RESTRICT="test"
+
+pkg_setup() {
+	DOC_CONTENTS="gtk-doc does no longer define global key bindings for Emacs.
+		You may set your own key bindings for \"gtk-doc-insert\" and
+		\"gtk-doc-insert-section\" in your ~/.emacs file."
+	SITEFILE=61${PN}-gentoo.el
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Remove global Emacs keybindings, bug #184588
+	eapply "${FILESDIR}"/${PN}-1.8-emacs-keybindings.patch
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
+		$(use_enable debug)
+}
+
+src_compile() {
+	gnome2_src_compile
+	use emacs && elisp-compile tools/gtk-doc.el
+}
+
+src_install() {
+	gnome2_src_install
+
+	python_fix_shebang "${ED}"/usr/bin/gtkdoc-depscan
+
+	# Don't install this file, it's in gtk-doc-am now
+	rm "${ED}"/usr/share/aclocal/gtk-doc.m4 || die "failed to remove gtk-doc.m4"
+
+	if use doc; then
+		docinto doc
+		dodoc doc/*
+		docinto examples
+		dodoc examples/*
+	fi
+
+	if use emacs; then
+		elisp-install ${PN} tools/gtk-doc.el*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+		readme.gentoo_create_doc
+	fi
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	if use emacs; then
+		elisp-site-regen
+		readme.gentoo_print_elog
+	fi
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/gtk-update-icon-cache/Manifest b/dev-util/gtk-update-icon-cache/Manifest
index 13aadc2fddff..6fbee7580d76 100644
--- a/dev-util/gtk-update-icon-cache/Manifest
+++ b/dev-util/gtk-update-icon-cache/Manifest
@@ -1,5 +1,5 @@
 DIST gtk-update-icon-cache-3.24.11.tar.bz2 91127 BLAKE2B 048e42e680e1d7b3697f6609205327c1aeded4cbde03350acc7c907bd781c4ded0c749d0375fb20919e5c3ccb45927dbc6fd7c521d59ddaf6b8c4c7b86a0b06c SHA512 40d8f415fcbfec2d7ba4bec94c92d16b40e5bb62ac3a31db1c3f05939336073e8dc376cc450b3649bc06b2ebbf7cf080f3139e5251a7b0707d306e23337b977d
 DIST gtk-update-icon-cache-3.24.13.tar.bz2 91090 BLAKE2B 26ba67b9b6660d20a4b321f74a43f586628317ef16280413c1c728d2f3d3703f77210e54c5e1a87f02e9bd5de32c54203d686341e19c216d807603fd117a5c4b SHA512 55513079d3da40c29fee5899631d21f699d5846ba3e7b028de3b5f49f200168eab60c96126309e29de6f520cdd7855cfb63b5a1aba3c1061f85d2322a117c6c5
-EBUILD gtk-update-icon-cache-3.24.11.ebuild 896 BLAKE2B 541d6127feb84ea69752a674cae6b6614112ffe96c40c69d78ec87cfa5b9289bc788123ebdfe0f0917b996e24f9d52fdeeb0240d96e04b0660f5c0a41a7094a3 SHA512 4936a0c188d14a2c81be7824a94bff9a2cff7f4125745cacd79d9ad865c504f4fd31002400ea68beb44ac85b34c62252e497175fdb87408b8489fdf81d424933
-EBUILD gtk-update-icon-cache-3.24.13.ebuild 907 BLAKE2B b9225d29c0da51cb7a133b610593009e450c07b634afe00250b19547f5c68988750628d52b3fb7ab8a7a5461b1a00deb8203b9a774e389a1ad0f6e786dc1dc7a SHA512 90cabc4894dc621a90f0a56688a004d418645904de51140e356a57d9979c84cf0d589723b9fb014b902620c871a6022ab58e4549d6e331e74adc3eb428d7ec2d
+EBUILD gtk-update-icon-cache-3.24.11.ebuild 897 BLAKE2B 673701ed3dad55e015b8f45dce011f476c15408e1723cc18e8b0f6689553a8cde27fb668c40cdf8ee2f1b0d7d9b013508afb333787629a13260a692c083bc10f SHA512 8b7797fbd6da8d487fa194231cc579b8bbc72636b843830511ff564b42568743633edd133f744e2518e873745b985b89ba0beda20fa51c3a497cd8a09a0dbaef
+EBUILD gtk-update-icon-cache-3.24.13.ebuild 901 BLAKE2B 7ab0d9a3a856da456b93c7cdf262d5a9f3d649e3094e50c183c89f106cd198a7e5375af25a82afc5475e89130979f17cebd403ffd64f0fc042551f9fab030e7f SHA512 2c75219ec17ef14ba641f2107f0b71c115e7f2c92fa5b40fb36734f96870dca80f8557d45236a8e8ca22761e76b62d7e94818cfea779a8f66d441e48e08d4d1d
 MISC metadata.xml 647 BLAKE2B 2846e4ac0b5816fe7699b197958118535cac7092930d7b6ba63c23b126242102edd832d60b13baeed23bf8781babe1058f06fece732c4ecd58c9b01b621042ae SHA512 7301a9425528d65112ec9dd1eca7291473905493b1b550119c6984141b3b216c4f3825d3b2a395a8375aa8b481b29d841153bd279d593586d5ea7d77ce46d7d3
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.11.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.11.ebuild
index 0f247563f2bf..0f373df6a8fd 100644
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.11.ebuild
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.11.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh 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 s390 ~sh 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/gtk-update-icon-cache/gtk-update-icon-cache-3.24.13.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.13.ebuild
index 7b3b5619d047..ac37ac105e4e 100644
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.13.ebuild
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.13.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=6
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~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 ~s390 ~sh 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/howdoi/Manifest b/dev-util/howdoi/Manifest
index 8191d7e4e510..be308ada4ecb 100644
--- a/dev-util/howdoi/Manifest
+++ b/dev-util/howdoi/Manifest
@@ -1,3 +1,3 @@
 DIST howdoi-1.2.1.tar.gz 13112 BLAKE2B 33492547fab53085aebff295202e8ad88d41850503155b944f38382137d6ec8fbcd4f6050583b16c01c3701683ccf18c6929c525b5d8f34bf6f2ed9410668f36 SHA512 83af30118087105392ddb95b05d9e7442f5ee5df981faa9143770dedb8927c164a4f30f37ccd219a826340f0f8cd81fc5eb9a3b12e5d3956786294699b6e2f9b
-EBUILD howdoi-1.2.1.ebuild 615 BLAKE2B ae1d440713d1d775ddeb19322b7a773855ef62860c3b40a00aed0e29db07ae32ad14c8967b667d060485a1299fffa6ae4464e8ed255ecdeadfbd510cf6f692d4 SHA512 7746494ba3cab173fae6582fb05f676f64e208ced613710afa797f665fd451673286b5b5941b4048e4c6eecde2cf91302a612a54cdc4d2d3c83874c411e86610
+EBUILD howdoi-1.2.1.ebuild 609 BLAKE2B 0346404da9cfb111371d1d225b6a0d84a63a3f93c69fe37edf8b78e636db28d40c81a55c2c41dc406e46e10f0342f63e4d774132233cb5206a9a4fde65d5b2e3 SHA512 4f3e77050027a8f899a98f0e804d56591b8ff96958d6fe0a1c385bb785553477ced3cae7334cb0f2176c7ed9da8fed3c171595499089f4bb86c97da39dc6494c
 MISC metadata.xml 343 BLAKE2B 34cc8c4f7372fc0492d8b328ccae1b94946bc5593d20a181d6e32d3fc8e79471f517eea7509cf32172ef55092d898ed65350167d465b22bf127f62fbab6dc1c5 SHA512 f83f432490f25508a138dfbce3a67a120937fa12fee712cbdda9302d238805f3bd18034cc52d473d28b990221bb73748c9305f31cdc9912aed91a79f86386efa
diff --git a/dev-util/howdoi/howdoi-1.2.1.ebuild b/dev-util/howdoi/howdoi-1.2.1.ebuild
index c9eaed1e6387..d15e587ffec4 100644
--- a/dev-util/howdoi/howdoi-1.2.1.ebuild
+++ b/dev-util/howdoi/howdoi-1.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="A code search tool"
diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest
index acd2666ffaef..14960a99334e 100644
--- a/dev-util/idea-community/Manifest
+++ b/dev-util/idea-community/Manifest
@@ -1,6 +1,6 @@
-DIST ideaIC-193.5233.102.tar.gz 551536829 BLAKE2B 9dac3f24235ab7bc10d440a43bd431b4823d8545a7d7e62c00a296540f007bac916199dacbd2906b4334b9759ce9beb7679abf3a3f672c17a83bf055614e7ce1 SHA512 fb8e3085c98529a746c7660b5ae685c4bf569177206f6bef74db2c14973f8527f8258819776edc2b5e15ac253c8450d82c6d4b7f374ffeedd7554988b6da3c67
+DIST ideaIC-3.2.193.6015.39.tar.gz 563811740 BLAKE2B 393adfb070e3cc41f290056cd4a55d676726dbf4ebcf2729cb25673a669c5f04185c267e64d687795e2555a543142d78f26c9ac83dab7415f3b9e3aa2136f2de SHA512 b71817d51ddac8f41e65d96ec8138d28d871465c52938f6cec837c9fdf5c16fb48bd0d08d3ee545aa3953516f2a56ee9faee0de3052361ad58685be26a15ee29
 DIST jbr-11_0_2-linux-x64-b164.tar.gz 131483925 BLAKE2B fb9c55094aeb4a9e6b89ef41699252355895fa4bf55eaa0d3c0a637b6485b5a91a0445b5f4af1872b62cd67b639f7354e05770970d41dcfa58ffeda7ae43c5b6 SHA512 4f32940166cc8ad5a138866e18d4cbfcd07f4326a85c051b7a622c9dcb8ee4b6d493331ef24d0c01999134fa2a9bad901f026982c16780fdc5e6b9308821db34
 DIST jbrx-8u202-linux-i586-b1483.37.tar.gz 80726147 BLAKE2B e4e5a076a541fd7153e861193ff4247c02ecbc144396ed28737afa7440f7771569b8d968b7c67b3dac333a89ff0b54cc9e5e76d1651b174cc7c0c21b1deb033c SHA512 53693f2ce994f4891807873ae3fe46ce60bee000b78be03c5d3df06b436328abe5b5d7e75d43e57f35f24187f49915187d034b39589e29806f55deeb14a029f2
 DIST jbrx-8u202-linux-x64-b1483.37.tar.gz 81812743 BLAKE2B 86ddf0c8dc992a27e680caa821f54fa4d647a8bff78b9fdbef82996bfbba828a2f68f1a00ed64bd92ce24a62bfc6c0240837c396644c6e91244cb0d980b6c704 SHA512 cd31a3c4da7b8c65e9ae89326c2c8b260b51890258d30f64b1e8a7c6c1442bb2cb68ea2aa80387ce0c1a8f50e3533e8231f72c5935b639e3cf82bc1ffedee8e9
-EBUILD idea-community-2019.3.193.5233.102-r1.ebuild 4051 BLAKE2B 2ecbc1d39642896e03609a6bbcbc68eded8fcabe4ded053ccccbe365ecaca999779518689722b2a22bfa8daa9608c72db6e331c6a4a978038b4b553b92f3bd99 SHA512 ff59a65eb104d5608a0b24d4abc9f64ebbe10bb440a379f6f89d84b78804e94be6660ccbbe9ece9e3f2ecbfd9f38fbdbdf71b6c26a22e9010f27907a29db9c64
+EBUILD idea-community-2019.3.2.193.6015.39.ebuild 4773 BLAKE2B 0ab6ddcee52c45bf03a46cf87750e4806ea7e46d0282aa1633743a6c7050ebb812a81071f6a30800938fcd85f4be427c33e46a1d7ccdea0be045482f4a52cb92 SHA512 f2c1c618f195424680801ddc730661ed821c3d97b29c37b01e6d05384e70b49ac2cbc46bb0e05e47e0d9c1284d93099118a130775a678ebbb2d86fef0b95abbf
 MISC metadata.xml 758 BLAKE2B 2009b0e669ca0b3cdaee71ac45bf1bbddf940ae8130b0b5c275fa825781dd71aa1c522307ee44cbcf75dde0796f6f2f77a7f4226917e5da52020cde563f4951b SHA512 9a2dfb6862b8f49de5680af6a8ee703c0e6687b5cd312cf304a60547075ee9e1f888516e2172ff54172f89524bf5bdc33d53848b6fbdb708bbea320b804de591
diff --git a/dev-util/idea-community/idea-community-2019.3.193.5233.102-r1.ebuild b/dev-util/idea-community/idea-community-2019.3.2.193.6015.39.ebuild
index bf5c5606c6a9..b33ce52f9b75 100644
--- a/dev-util/idea-community/idea-community-2019.3.193.5233.102-r1.ebuild
+++ b/dev-util/idea-community/idea-community-2019.3.2.193.6015.39.ebuild
@@ -5,8 +5,8 @@ EAPI=7
 inherit eutils desktop
 
 SLOT="0"
-PV_STRING="$(ver_cut 3-6)"
-MY_PV="$(ver_cut 1-2)"
+PV_STRING="$(ver_cut 2-6)"
+MY_PV="$(ver_cut 1-3)"
 MY_PN="idea"
 # Using the most recent Jetbrains Runtime binaries available at the time of writing
 # As the exact bundled versions ( jre 11 build 159.30 and jre 8 build 1483.39 ) aren't
@@ -49,14 +49,21 @@ REQUIRED_USE="jbr8? ( !jbr11 )"
 DEPEND="!dev-util/${PN}:14
 	!dev-util/${PN}:15"
 RDEPEND="${DEPEND}
-	>=virtual/jdk-1.7:*"
+	>=virtual/jdk-1.7:*
+	dev-java/jansi-native
+	dev-libs/libdbusmenu
+	dev-util/lldb"
+BDEPEND="dev-util/patchelf"
 RESTRICT="splitdebug"
-S="${WORKDIR}/${MY_PN}-IC-${PV_STRING}"
+S="${WORKDIR}/${MY_PN}-IC-$(ver_cut 4-6)"
 
 QA_PREBUILT="opt/${PN}-${MY_PV}/*"
 
 # jbr11 binary doesn't unpack nicely into a single folder
 src_unpack() {
+	echo "S is ${S}"
+	echo "SRC_URI is ${SRC_URI}"
+	echo "unpack ${MY_PN}IC-${PV_STRING}.tar.gz"
 	if use !jbr11 ; then
 		default_src_unpack
 	else
@@ -77,6 +84,20 @@ src_prepare() {
 			mv "${WORKDIR}/jre" ./"${JRE_DIR}"
 	fi
 
+	rm -vf "${S}"/"${JRE_DIR}"/lib/*/libavplugin* || die
+	rm -vf "${S}"/plugins/maven/lib/maven3/lib/jansi-native/*/libjansi* || die
+	rm -vrf "${S}"/lib/pty4j-native/linux/ppc64le || die
+	rm -vf "${S}"/bin/libdbm64* || die
+
+	if [[ -f "${JRE_DIR}" ]]; then
+		for file in "${S}"/"${JRE_DIR}"/lib/amd64/{libfxplugins.so,libjfxmedia.so}
+		do
+			patchelf --set-rpath '$ORIGIN' $file || die
+		done
+	fi
+
+	patchelf --replace-needed liblldb.so liblldb.so.9 "${S}"/plugins/Kotlin/bin/linux/LLDBFrontend || die "Unable to patch LLDBFrontend for lldb"
+
 	sed -i \
 		-e "\$a\\\\" \
 		-e "\$a#-----------------------------------------------------------------------" \
diff --git a/dev-util/indent/Manifest b/dev-util/indent/Manifest
index 13f6efe824ac..9084e97756b3 100644
--- a/dev-util/indent/Manifest
+++ b/dev-util/indent/Manifest
@@ -5,7 +5,7 @@ AUX indent-2.2.11-texi2html-5.patch 2666 BLAKE2B a92ecd54bead00609c45f3193b3c022
 DIST indent-2.2.11.tar.gz 778563 BLAKE2B 8fe0f245fb852613587da8355a4aa8962e09e1614faf61cf7cea62d6922054547d0739cd1373298af08e4e0cca8d5f4bfc654e03d859c0fe560d0ddb0f63a298 SHA512 f5670e5edc76b9d599ef9e8cc498e13ac15e10eb6a8d674e1612918c4b67ffb15c94d73b9590434e0cdea6ead4b8d1f5bcda1c2f3838acbdeb4d732a0bea89be
 DIST indent-2.2.12.tar.xz 620280 BLAKE2B c3414ebe58d75b74356b5c37234639dc34998b73e45a4c28ee20ab2932c523b528d577c45c32db88f2ee4aed58d1dceeda2fe68b8975d211dc0dad4a3a20f7c7 SHA512 dbe73bd3729074825f9f5b4241a4c539ad32069df56511963417caf0351ff9ec5edd77e9580338301c8abf89ab9c0592bc7e82c14eec7450c496259d7e9045dd
 DIST indent_2.2.11-5.debian.tar.xz 6540 BLAKE2B c4d0805f39e1af503bcfcc49a8e9e679fb0df1021de9952af5a80c81f0c36c70e8dd6609b7e7ec5e36596f974d9c9ac31a7cad831a431cd9401758981d46a7ec SHA512 f89f04bb3b9772c5428ef6df939b5cbe92761f3a39869020dad4f98a5e48c57c34de526803141258c9d55ba6edaedf05127009530aa09b1a54cfa15c8a421a31
-EBUILD indent-2.2.11-r1.ebuild 1218 BLAKE2B 7127d515b0f633c6b071a2fbff01d78fff8fa8af5c501511b4e8e74c6b0dba57a2416ed5c7846d4c5d95037ed0f029d25ab9cdc31b70614302f1aef0c3fdd49e SHA512 5e229883fe09c8168f88834f98d92caa1d4460c8be8f91541d3824973b45d1723c989bc81bb66832d996916b414db488ecce814315ab471cc8f8778cec8a38d1
+EBUILD indent-2.2.11-r1.ebuild 1219 BLAKE2B 08dc6047a43752e345e39bb3899f062e26331f62c901417dc72462a45b989a4b8ed7ca7ed3f54dba4bea5a104c382b0548d51f5356948eadb0a0aa7cf5ffc6f2 SHA512 51cbdbfe8871f948b0ac4e97e93ffcea4e20dd99f34f613e731fc35c505567ddc48be9faeb3aeb6ade7bb0f00ef109e9e34c2b438abd789b0a82af618ce8b938
 EBUILD indent-2.2.11_p5.ebuild 1382 BLAKE2B 47c045271db8ee765f5516b8b333c81d6bfbe1847c06904244759aaadd730f3bd94c6101df1d8607a3f8f2ab309be4a143a1478700f5d558df921d9524de35ea SHA512 a2db1fd8937a8608d588304731244824d437d3bf90053897c02dec1defdf7f913dfd9c34600b124d7d93b3b3009c7649065726b1f0c1450a339b9baba8e8208d
 EBUILD indent-2.2.12.ebuild 1127 BLAKE2B 7e38608fb850a2249c1fe44edeebc7fb6c875be53120037df3cf173dcf9df45bf312a3f8a7dcbf327436f71a35667234dd50a132509028f517156ac4aadfdd89 SHA512 546599303c7ce7bff6586756a81df6890af9a711a45d1857d37d3e0417a7bb552392dd40fd108d7b84fc6d51867bdb7a6de58ad2b71e280f8b621ed55b395dac
 MISC metadata.xml 371 BLAKE2B f331934c0c8063b13ae4e4290894da6faa7e6f135d1684b7a621b4199b13304496866e7eea31a158a2a0f36ae29da184bca16020425799a6542dd6d213e1b36c SHA512 c3859c430b4d976869789476e59c66bd2967802748abc9a3f53395d170114c21ca11e81c6046fa160ad31d422188dc92f63c9df947ac75ef31bcb1965a7f5dd8
diff --git a/dev-util/indent/indent-2.2.11-r1.ebuild b/dev-util/indent/indent-2.2.11-r1.ebuild
index 864253061b4a..b10e30e9d3e8 100644
--- a/dev-util/indent/indent-2.2.11-r1.ebuild
+++ b/dev-util/indent/indent-2.2.11-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="nls"
 
 DEPEND="
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index b3053416db75..65188847ab26 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1,6 +1,8 @@
 AUX intel-graphics-compiler-1.0.9-no_Werror.patch 272 BLAKE2B 079fe334413dfddb7681940f2a8920a365e8e72526cfc09ea1c7d218e8b19468f80ea9a215be125b441ee5238d7856b8dec02ebfc4bfd76b1850aa9917da35ef SHA512 d3d27943e84e228b480172b4fe91ba9aed8bb1c98700eb8c8beebafb7f1cc6265279031f56181e67eff74f55e1bbc8ee24bdc4d14fc1200c5aff670ef019410d
 DIST intel-graphics-compiler-1.0.2878.tar.gz 5920418 BLAKE2B 99522118d08183836c6e62f80c98b2cc716dd22d7dc82d05841e87e42f10025508c6254cebe2f886da8454cc4cc4b3a9ee06ce5a3bc04246c88f499f63f8f1ae SHA512 3b6dc9b945fddb3d0bc716f4598c4dacb6431c342b580c90f7e9ff8682bdcbde410a960adbfd9e67601d121adc70d2cf23de01bc99c1d0cb86d14b4db77afde5
 DIST intel-graphics-compiler-1.0.2990.tar.gz 5930890 BLAKE2B 038761e74dde52de53eed511a74a39d9b4c69a510ef289d2941b859aea018d6776b5179d2be006b12d3245ffe43a06bfacd9d03ee2d227c2ba2ea39805bf40d2 SHA512 65287348e98f09096418afa02262ad6ce07dd918aa040ac1fb49f7176545c0a6449e68c5e74a11c41641d90495edc7be8e24b32e68d798df906ea3b16e675827
+DIST intel-graphics-compiler-1.0.3151.tar.gz 5950502 BLAKE2B 8ccbfc5d3cd6307eb5db602822d42e8744e6ca7696494a0dd349847aff0defde2434b9192f17645f1fcbf732ec98a66dbdcc7d03eed48702d90911f912135fc1 SHA512 a6e04a3a90aae9046f2698bf15d5f60862c93e7a87a6e4ae6b6c43c65490583608f201e94a2ef32fc2f72e9fa0da7d6c202f64ef610f03a81384ac537541df14
 EBUILD intel-graphics-compiler-1.0.2878.ebuild 875 BLAKE2B 197981d2f6605e23d85f45cf804e3772c54561f1b6813c3593db7f025b89d370390034c195e5a91af4e9c218ddafecb51b77c77afb8bf23deaef0e7fa8c9dfdd SHA512 b6f6cb8d65aab2eda3822add23647126d0e9e39f5f291640beed4c22dbfbb4df63821319feacb6cf917e7334a1e30e74de01eb49d6e643857de93895553e7119
 EBUILD intel-graphics-compiler-1.0.2990.ebuild 875 BLAKE2B 197981d2f6605e23d85f45cf804e3772c54561f1b6813c3593db7f025b89d370390034c195e5a91af4e9c218ddafecb51b77c77afb8bf23deaef0e7fa8c9dfdd SHA512 b6f6cb8d65aab2eda3822add23647126d0e9e39f5f291640beed4c22dbfbb4df63821319feacb6cf917e7334a1e30e74de01eb49d6e643857de93895553e7119
+EBUILD intel-graphics-compiler-1.0.3151.ebuild 895 BLAKE2B 9924a3f7db2a7a8e75bdbdbe3d50f42b60c5265ae6e2cb50df52ed860c2178f6a2f00bcac075d5914f47d5e2abd8b7f4fb8e7d2fd06a7aa6d3dcb5d90f91dd6f SHA512 e5d68db8303f165259c399e2d786991ace0628aac5667ac28200d9ba9952c16c23cfb872914cc6e6e4dc00cb9b7bd11b023627f62de5aca661d8bc3de8ecd782
 MISC metadata.xml 340 BLAKE2B 6c0e5d932084dffd300a1dc70b29eb0871dfe2187ed8591a5a2f8cba001bf681e908c58a6f9471f7b08842ff538365258305da91004ed63ff97314a07fda529f SHA512 d24016b4ae0ffb05be475f86bb8d72ab4a85475655f409b8826dcd69726e048aa048e321f26ac36f2f52aec40abbfa66a95354a711332df94dc3e57e6c396a0c
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.3151.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.3151.ebuild
new file mode 100644
index 000000000000..b6771efb82c8
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.3151.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib llvm
+
+DESCRIPTION="LLVM-based OpenCL compiler targetting Intel Gen graphics hardware"
+HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
+SRC_URI="https://github.com/intel/${PN}/archive/igc-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+COMMON="sys-devel/llvm:8=[${MULTILIB_USEDEP}]
+	dev-libs/opencl-clang:8=[${MULTILIB_USEDEP}]"
+DEPEND="${COMMON}"
+RDEPEND="${COMMON}"
+
+LLVM_MAX_SLOT=8
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.9-no_Werror.patch
+)
+
+S="${WORKDIR}"/${PN}-igc-${PV}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_LIBRARY_PATH=$(get_llvm_prefix ${LLVM_MAX_SLOT})/$(get_libdir)
+		-DIGC_OPTION__FORCE_SYSTEM_LLVM=ON
+		-DIGC_PREFERRED_LLVM_VERSION=${LLVM_MAX_SLOT}
+	)
+	cmake_src_configure
+}
diff --git a/dev-util/intltool/Manifest b/dev-util/intltool/Manifest
index f48fa279298c..d168cb21d86a 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 ab9badaf4aba9a3d8db1f1a5439ded340c6bcbc771fa84ec931f6de7d981f7583d1136464fd6968b98e765cb0fc60bbaa4ffafc3a1f40b1701698b2a1dce386e SHA512 d3fc79bdcc7cb48de4e91b69ba63505f9d442b0091ba8366956b53275af032ac034c76497c3cbe499ed654c60e181b9db4324bbc1ff6c768a07ff9e30c61cff5
+EBUILD intltool-0.51.0-r2.ebuild 969 BLAKE2B 392bfb93195b1791a6f913d44c82131f10d88e21afcc2b8dd73c783897ef6c87488987d446448e86b87ec14058f52b55462672ff7943eb72f4509a15160af59e SHA512 14ad00ad522860df53b098f47382dc634393cd16c71c4f66b9be386c85100d39c635c4a9e7fdd4d39c2fb07a89a387f85957b9509ef4f3e78054e884acb82b47
 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 3c7b3e82b060..0c7482df95b6 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 sh 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="
diff --git a/dev-util/itstool/Manifest b/dev-util/itstool/Manifest
index 83013bd64d6a..5414da70088b 100644
--- a/dev-util/itstool/Manifest
+++ b/dev-util/itstool/Manifest
@@ -1,5 +1,5 @@
 DIST itstool-2.0.2.tar.bz2 96748 BLAKE2B 7eb8f52c233878a35c01b7eea51c46f9700e9de827d38df41bb3ea78ca4ef284ab59c423aaf9876fceef023cb9d13d2d50c9ab57caff9e5fad217363412cf472 SHA512 b7915c4d463fe5969e282029c2080730c78e18d2d5878da53c6a370f471056b51a7b3f3c08417b801212ba674f55548a112a12a9d81634f60d1e52a8a47a4aa2
 DIST itstool-2.0.6.tar.bz2 103067 BLAKE2B 72d3254cb88ef9d02f9b3509a46c2208e98bf6327f139e5d29b99cc6d80651bd41ea3bfb78e48e23cf7c217770cd8c6c74b00946ad9d2608a92925e43457edf0 SHA512 51058bdcb208f6fb84810f71f9bf67e42b00bf157a9756be45f060849c0aff36f695f4403404193720d4446818fa77de61fa94eed9e8789d26c07a2926072eb7
-EBUILD itstool-2.0.2.ebuild 836 BLAKE2B 9c83e097e2e201d434041502e38919c9eb55164d6b5e0f55ec6a32335d9bec181847c2ba65618e32b8ffae4f01b230b188ae44ab88d282f8ae83dae594359997 SHA512 347daaa09aef5501f3f5fa34b3127608b8d09135f0b12c5d47c2d714480063701225656892ec10ca4ee6a8213f71151becb790bc74f1e359e3b5c0595034e47d
+EBUILD itstool-2.0.2.ebuild 837 BLAKE2B 1ad56589c59923aa45eede3ce55a1a1085c86fa4d3892ca785176f0bc6211be339eff7d4401f31f1fcebabf2ba2856f403f88a7fcb71a6f687cd92efa72dd17f SHA512 271397921b8ced79de20f73cd3c8abaa8ef9b1815b2f09c6ec0a7446019acc02d587928df02dd73e151207897f0c5abbc891c955ad9f1b476c8f7d28cc9e0f53
 EBUILD itstool-2.0.6.ebuild 879 BLAKE2B 4812c5bbf36c3de33bd36e4bc2396f09df39e1f09305e92372e0a5378ed432bfe24d6d5995bd5806f0539e1e78752afe341382ce6d12c6cde713b0f631764142 SHA512 b1ea4b7ff3607f6d05a3a1a58a8273c8018603fe7acbfa017c168d6e255e1f1a95b02c8096aa172b1998a4d7d0ec8df6b57052d16213c6a36fbae7f9047c2f83
 MISC metadata.xml 525 BLAKE2B a7e426bd9dd273bed10ad74315547eb758df04ceb7ee6ef66f643ba23e60ad8b9c80aa344688e4af7a16fd699a500cf7ceb9d24eb94a930eebf1637e09919a5f SHA512 ad9928fa0359257e3418c0fb6bba6c416fc4505911f35e97377ef7c1426e228b34312fc3156e98f3657974f1156ee2bdc58bbb4b51903bb40b10c97b0714b39b
diff --git a/dev-util/itstool/itstool-2.0.2.ebuild b/dev-util/itstool/itstool-2.0.2.ebuild
index d0acbca3b434..c970a0e502df 100644
--- a/dev-util/itstool/itstool-2.0.2.ebuild
+++ b/dev-util/itstool/itstool-2.0.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://files.itstool.org/itstool/${P}.tar.bz2"
 # files in /usr/share/itstool/its are HPND/as-is || GPL-3
 LICENSE="GPL-3+ || ( HPND GPL-3+ )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-linux"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index abe679e6d8c7..0579ab74eb8c 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -3,14 +3,12 @@ AUX jenkins-bin.confd 998 BLAKE2B 5c44e37118e15fdd76fc7eb0e10e06683828d3efe08687
 AUX jenkins-bin.init2 1782 BLAKE2B 25c78b64308be71d605f3c4f2d33c5cf1074ab431e23a170f7d36002d668def7dbd56b0b45590692047d7d88c6884ec1cc40cb4f077f7edcb853300301805002 SHA512 e0fd85f653bbf5ac80dc929cb265ac86a08047f9102d57f2ac6194cd31794310a3c062824423552a3ee65e298506332436fca037f96963358dc511982f900be8
 AUX jenkins-bin.service 499 BLAKE2B 28a90d5cf40e46880570e87acbc6d78766460faebc6e9a79b8c446fc05babf1de405cf79e29f527f0e9e0bf91093836fb6a50c7040320f59e78bf1971cd14ed3 SHA512 4ede5e0d55bf9d53239a1b8c152d1a3e38510982d6ff01c9c4288d63b8312ab7412979e0af3466638c7ef2803b711d49344692c14e72baa85d8eb4caa15f7506
 AUX jenkins-bin.service2 566 BLAKE2B 38511fddc783a70ae3deab70526c737a883ef090bcfb20216658b0775667022782f3ee8a6638515b46e6a4df96228fb2368521c74a0ddca2f121e9170549df8e SHA512 87b59349edcb1503e6c91440327092732f0dddb8cc35e4576c81da55e08a2ad67d462a4d871c46da4f3ed037de8b9109d766ba36ca9acf244506d129766ed5cb
-DIST jenkins-bin-2.190.1.war 78245883 BLAKE2B 6c80eaebc6fe34e2c889c78a34dfc3e105a9bd9b92d79d8a9cfe76bfdf66a851afca2a5a2b7373b437deed663fde3cfeac1646f317a9c052d2d09d01d82aeccb SHA512 db27957452b5e57666a1bbce43547e8cfd8f95cc557b43e5162a033779f0cd68d8fd1fc880b563000927f3a71e79385f583d18c21ad06575b192e4d8e47a8c8d
-DIST jenkins-bin-2.190.2.war 78243424 BLAKE2B 7a6bd4cf1c070ce3a09fb84b3dbe7e87f474f4254dd4b4fcffdd7dedf7d4c2ba91d8783e7273214aaaa39bfeb02da721e4d539cba76312c21b523a9bf336a964 SHA512 b1f59ef10dfdfda06bedbf9a40a9e83e159b44b2b5574cba4d62547294386224f64d856490fd4477fb3300a4119d17fc284819719218dfcf32d3dc20ce468847
 DIST jenkins-bin-2.190.3.war 78247363 BLAKE2B 99d4c13236b4b4f7308c7993033d1e5f9dd2fd9926febf52ffdacea595fecaba0d0eb8962761d8a6f983eaf9738f8be1ba4df785bb2fe6b613ac8cadcc618e23 SHA512 4ffa2ce3be4d55f0df8021026115d9ce8f1d0f4faa16eaf9f327ce17105f61731730c2a0124fb9af5d8c16c8fee9200f9b785b23856896e292a19f5404a9d2c2
-DIST jenkins-bin-2.197.war 78309466 BLAKE2B c3d34c6fc40a82148eafa978c8787375ece6522d0d936b42f0296ee13cd084669bfa31975c0ad27816bdd4c1266cb066c0909774199a1373661a7ec524c06e91 SHA512 3b6a00dee5aeb8a94c8f75323c2469b54fe96d90bf8371898e41dc5bdecaa472f112bff1466481c66c9c7a07b22cbe799a08e45ac486d68fd5bdc7c20d43d722
+DIST jenkins-bin-2.204.2.war 63422555 BLAKE2B b39c46c81bfc1f6cfbf930fef0125d7a335784a8c4638d54b76986369c17e9308dcd023782cdee414c2302fdf2b002c24731d8f9eb36ce24196887bdcf054916 SHA512 923ae49caf5b3d2054cf698badb31ea2c4dd4420d6c6488b389a6c62b9fc6d841e672d71cdc8b0c6152ef5ea9b921570a32d0466a423d76d83eeb96effeb0998
 DIST jenkins-bin-2.205.war 62738246 BLAKE2B de350469e3a6e0d93f6d05c38f7669ce630f01a0284db83a0ba002e15ef712b4dddca6dcac804ab45c898f5c73cdac99bfe9b9bb99f6534c1446d8f4545660ec SHA512 1c0b12cdf7dadaba8d81ede769f76b059c7869732610353658cc928dd8c4943f8cf8beb15498a0dd4e064688cfdb7f88faaa9165c6da97c20d5e99080a12f413
-EBUILD jenkins-bin-2.190.1.ebuild 1105 BLAKE2B f7a952c5ee25eb45ece299eef7ff68bda7794af0b353cbaa870397f80bf018ac17b9bff1795278b3786bcbc4b0010b0fb6bbac62c7c78b939ef0d6617bab06a0 SHA512 23407545cfce8da7faef840493908e1eadbbbbca816de39766623b140743592d9aa9d7b0aaee886f3c92fa4ccf0a7e4e65f8bc901df2203402030fedf69c3cec
-EBUILD jenkins-bin-2.190.2.ebuild 1105 BLAKE2B f7a952c5ee25eb45ece299eef7ff68bda7794af0b353cbaa870397f80bf018ac17b9bff1795278b3786bcbc4b0010b0fb6bbac62c7c78b939ef0d6617bab06a0 SHA512 23407545cfce8da7faef840493908e1eadbbbbca816de39766623b140743592d9aa9d7b0aaee886f3c92fa4ccf0a7e4e65f8bc901df2203402030fedf69c3cec
+DIST jenkins-bin-2.219.war 66378696 BLAKE2B 82fd19d4dc00d81d1b9798c795ab4ce9f0d3c6d36f1e048edd1aae41d9e239a260aa56f116e478dc13abbdc59e1c72e4f3072628e17e0d0280ddc7bd0efca919 SHA512 f3cd84fa3e99c291d0af0b80de0f43e41d762b1b1a2133dcd589694fa6e1a2a13a5d82992c06fce7a41952db2f8b553a822cac79f7ee9f7e646c9640a428d753
 EBUILD jenkins-bin-2.190.3.ebuild 1105 BLAKE2B f7a952c5ee25eb45ece299eef7ff68bda7794af0b353cbaa870397f80bf018ac17b9bff1795278b3786bcbc4b0010b0fb6bbac62c7c78b939ef0d6617bab06a0 SHA512 23407545cfce8da7faef840493908e1eadbbbbca816de39766623b140743592d9aa9d7b0aaee886f3c92fa4ccf0a7e4e65f8bc901df2203402030fedf69c3cec
-EBUILD jenkins-bin-2.197.ebuild 1098 BLAKE2B 2f3db1567a93bd44e04e1441a0275204c628e4e197100362aa9f3705b3bbe911d4e34e19d1c40dc934df1ca7f8d865e339593d8ee4d13b7220f89aaca8d3f6ec SHA512 7f02c505993ea3293284583f07ffdcf1a47331fcb8b8505da9b40b5d18ef81baee7cbc0eb750f95acb01e8680a62ec96547e8a36b8adc0d812d67e64bfa2960a
+EBUILD jenkins-bin-2.204.2.ebuild 1105 BLAKE2B 161bf3f0ad77e74702cfdd1db69cfaa54f6e267e814b358d3fdcac2ca5c7210410d1cf87d03a9e6f987d2ede8459d37f6bf352bc2a7fcd7f2167edf81542aff9 SHA512 d86e52237449bda33bc052d7b1dd3bc15306c4b771c485d34843973a7a7df6c0d0593ab156837cc64a018466222fd0c09bb331bb5c820807f5038300517e2283
 EBUILD jenkins-bin-2.205.ebuild 1098 BLAKE2B 2f3db1567a93bd44e04e1441a0275204c628e4e197100362aa9f3705b3bbe911d4e34e19d1c40dc934df1ca7f8d865e339593d8ee4d13b7220f89aaca8d3f6ec SHA512 7f02c505993ea3293284583f07ffdcf1a47331fcb8b8505da9b40b5d18ef81baee7cbc0eb750f95acb01e8680a62ec96547e8a36b8adc0d812d67e64bfa2960a
+EBUILD jenkins-bin-2.219.ebuild 1098 BLAKE2B 0bfaac37afbe842e4e1a5572a0f56a77b4bc5915be4cb9a79cd7a56105562e8877c9686a2963c347c2feb06dea8e4aad271bcda9a9e50f17433485f189d39981 SHA512 381e5dd3c921892b0df7497fa6028ced0df8c84a2a0731142c01023cf2d63d60233f24f19e62d40699c606ea162210f54641b6742ad63d6a6c99bd29b24c0835
 MISC metadata.xml 397 BLAKE2B b1a7fd87c8d5857ab102ec3d3bf5830c26c6988bb97caf89018b05e159f038c9c3a092b4f35788929d05042ac5cfd694bd03a8381686b9472880d0d205a451cd SHA512 4087fd799f4019f09103fb32d7f120e74d94715205bcc66858d11b9457774acaed37f3ad97ca0328f4ec28230a409dcfb0cbaceec142eb0a5fd3241ca35f8810
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.190.1.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.190.1.ebuild
deleted file mode 100644
index 323b88955105..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.190.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit user systemd
-
-DESCRIPTION="Extensible continuous integration server"
-HOMEPAGE="https://jenkins.io/"
-LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
-RESTRICT="mirror"
-SLOT="lts"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND="media-fonts/dejavu
-	media-libs/freetype
-	!dev-util/jenkins-bin:0
-	>=virtual/jre-1.8.0"
-
-S=${WORKDIR}
-
-JENKINS_DIR=/var/lib/jenkins
-
-pkg_setup() {
-	enewgroup jenkins
-	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
-}
-
-src_install() {
-	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
-	insinto /opt/jenkins
-	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
-
-	newinitd "${FILESDIR}"/${PN}.init2 jenkins
-	newconfd "${FILESDIR}"/${PN}.confd jenkins
-
-	systemd_newunit "${FILESDIR}"/${PN}.service2 jenkins.service
-
-	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.190.2.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.204.2.ebuild
index 323b88955105..8ab8d5db213a 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.190.2.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.204.2.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
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.197.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.219.ebuild
index 7d232cbccacd..e3e0cd1a4eda 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.197.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.219.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
diff --git a/dev-util/kdevelop-clang-tidy/Manifest b/dev-util/kdevelop-clang-tidy/Manifest
deleted file mode 100644
index db1252381480..000000000000
--- a/dev-util/kdevelop-clang-tidy/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST kdev-clang-tidy-0.3.3.tar.xz 55804 BLAKE2B 30ec12d5a2bc7d8b5d111374c8954a65bebe89a4a192d6ecfde7065b54fcfb41e46137a328cd172a06ef3e00cbee42581b1ce7561b2b2a43430b33aebd70fa0d SHA512 448cc8e30cb6e237c43eb52f4694327900558a34a707d15195c2ad460f48e405315b5a667cfcf7a402dc6d9c2861594912159f63ac4cf61546a3ddf8777be489
-EBUILD kdevelop-clang-tidy-0.3.3-r1.ebuild 1057 BLAKE2B a53e6cde4f9728f5f19b0153f6072d03feb7f7f0bef98a5a4e5fca4ad6454e7d124fd9884142da79fd5a8807161ee176c7dfc05b71532858625d104a6f44ad71 SHA512 f1a85ba903ed54ac183ddaca351d378bf88d2e243feacb8245a1f72952f60ee4b1de72038abca39b874fc89bdbbbff39220c1edfceee707ff4c518c032acdf86
-MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-clang-tidy/kdevelop-clang-tidy-0.3.3-r1.ebuild b/dev-util/kdevelop-clang-tidy/kdevelop-clang-tidy-0.3.3-r1.ebuild
deleted file mode 100644
index c7bc44d08c47..000000000000
--- a/dev-util/kdevelop-clang-tidy/kdevelop-clang-tidy-0.3.3-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="true"
-KMNAME="kdev-clang-tidy"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${KMNAME}/${PV}/src/${KMNAME}-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="KDevelop plugin for clang-tidy static analysis support"
-HOMEPAGE="https://www.kdevelop.org/"
-LICENSE="GPL-2+"
-IUSE=""
-
-BDEPEND="
-	dev-util/kdevelop:5[test?]
-"
-COMMON_DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	>=dev-util/kdevelop-5.2.3:5
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-"
-RDEPEND="${COMMON_DEPEND}
-	sys-devel/clang:*
-"
-
-src_prepare() {
-	kde5_src_prepare
-	sed -e "/KF_ADDITIONAL_REQ_COMPONENTS/d" -i CMakeLists.txt || die
-}
diff --git a/dev-util/kdevelop-clang-tidy/metadata.xml b/dev-util/kdevelop-clang-tidy/metadata.xml
deleted file mode 100644
index 2fdbf33d963d..000000000000
--- a/dev-util/kdevelop-clang-tidy/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/kdevelop-pg-qt/Manifest b/dev-util/kdevelop-pg-qt/Manifest
index f6cffd501909..3e4991a4133a 100644
--- a/dev-util/kdevelop-pg-qt/Manifest
+++ b/dev-util/kdevelop-pg-qt/Manifest
@@ -1,4 +1,6 @@
 AUX kdevelop-pg-qt-2.2.0-qt-5.14.patch 1988 BLAKE2B cffef4d7f61981b3f8e236e225e54b9ccb1964b1648c78b506678a76c0082f4e9ad8b6f1b68ff5d7e7a6f2413c7589513bf0db288d57cbc176d37a3b5959d7c9 SHA512 6b4429de2c8770c869e821a1a196cafdb52c6aa350c8d0dffd9d232fb1cb1ca3ef1da01fee70195b7344685ee82b735f9baea6e1365e58a98b52dbb4d29fdf2d
 DIST kdevelop-pg-qt-2.2.0.tar.xz 660284 BLAKE2B 103572038bc3c3c43eecd3ff9411e2d28aeabf60bfc0bb91c6056d05901711f2dfe03ba098c658000b1a68998644efe34cede2857b3131e2a59f4accf8cecbf2 SHA512 a34bbdbf6e99d3b004c8a1d925fa5d45d9084b1542551f71de6a79c7ef851ca7057593f09c8824ae7961072c9f5e16199d7c4d7a037174f81163f669c96970f4
+DIST kdevelop-pg-qt-2.2.1.tar.xz 660904 BLAKE2B b3874ee4f36d43f6d39a28a79f4638601340ce0545c2fe965393e9fe266a960e904ce5cd3215a7903f7b011f2e138d3be8999563366ce796f50524084a36192b SHA512 0ef3daba60ee6c7d4602b31610bdc68709a730d4c3443770eac1aa1d298fc03e10b38bc0d2e34dd44df5bba1c3af945c87e80d8aaa818e0b1787121f056c78a9
 EBUILD kdevelop-pg-qt-2.2.0.ebuild 531 BLAKE2B 00ef3f6743a06fd8fd3a7c2bc3e1a8f0bf49110b6c75908d935924930420ec7ae886b3473f062a3358b7e59e9b4803dd9d7b1a30879e484497741fa446c6bcc9 SHA512 920d51678d03733ba0a2cac526fc84f6ef1456e1353127a0f30f13201bb148253c5a6df42f9ccd53bea7539a96fed794cd039277262e9abd976cd501e5641cbb
+EBUILD kdevelop-pg-qt-2.2.1.ebuild 487 BLAKE2B a30356b9a57e77ee23e65069124d6107e8156f02e092aae1433b01dc2978e2e4bf2162c629756f46a9df6dce2d5e4295d0a9166e55ed114bf0f43f6b7a0b2316 SHA512 bb00af3119fdfa1045e722e092a90bb32d5d39048cd72cd892a04e356605dc11d675d0da930834e23191a286ce1caf03fd7686c873bfe3ddffdb71d36ace9ca3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.1.ebuild b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.1.ebuild
new file mode 100644
index 000000000000..a5929c543c5c
--- /dev/null
+++ b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+inherit ecm kde.org
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="LL(1) parser generator used mainly by KDevelop language plugins"
+HOMEPAGE="https://www.kdevelop.org/"
+
+LICENSE="LGPL-2+ LGPL-2.1+"
+SLOT="5"
+IUSE=""
+
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+"
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index 9593a6689f3d..d97a54a4212f 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1,5 +1,7 @@
 DIST kdev-php-5.4.5.tar.xz 1045544 BLAKE2B 3b003b24637493a49b8a4416510c324fe9b588a890b692de0414e2e3595c565a9c19018137ee85a97175f7f1d9c4d1b79b5fc7817cb8ebf7f0741e1c6a6851b1 SHA512 f6432671d46c197648049310a246baa1b7ac03582cef72006c31766ece7d3a42f28809e3ce1831d2fd66c7df524817b360e806d9f53c5954dac2cabf0ad14aeb
 DIST kdev-php-5.4.6.tar.xz 1046776 BLAKE2B b69539971ed666c7887e1aed0998da59c887000c785e965d2220e829e485f46c28e12e04b3c084681dd2a96dae1d4d5fa73bd2501359de8960f8bca0e64a1968 SHA512 6711dd9034054ce2bfd684d7fabb3349436a4a8ae0924b8a6ae56a8b39aa83d4501fec389cb73d3c4c20abcfcf8c5f7dd04f63e059b987adc7991806c7eee252
+DIST kdev-php-5.5.0.tar.xz 1050144 BLAKE2B 3db5b426503b05237484ec50a5a6afe4b970e7eea36b1ad921c530c3e10848fe7a367a093cb41adf8030963c76c93e7889662eb1c8e99e58bf8ada57fc10a1b9 SHA512 2df777ff1446d5c0ae75a6f2e4d7ef50aed8c752acef0dd7f60d66b41df582d2f3c012b470e6db8aac412ab72ecdc6753c3d817652bde0ffa6ff347e3a1fef16
 EBUILD kdevelop-php-5.4.5.ebuild 1237 BLAKE2B ae25bed02dd98e93b441ceb983dd48dfee27823b2f02b689fa4b1b232823998b7e0768c601dcf3f61b63f1ce66ed1b20e00138f494dca5afef3a393a9a09ad65 SHA512 256e896c11d6ce4d63debb844328371497fdb989dfc1c0c8051f481dd8c5a495f0daa6cf053e38eba87ec412c9e5a27744b7b065de07bbe0037042c764991425
 EBUILD kdevelop-php-5.4.6.ebuild 1239 BLAKE2B 3b5d44fc31da740ff5043c38251e67daf7cd061415502f3ad2ee423148ce5b47c6a6361e2bc44797230bb721fc610f7c07dc040757523a17dd41cc668185ea3e SHA512 795ed215b6749694961c4ce157a791149274bb8ab927105a63428bde8680efe8165a3d212d38f3852887a1a3d2c3c10ad2e03d4959e28c70fe66a17103ee3471
+EBUILD kdevelop-php-5.5.0.ebuild 1239 BLAKE2B 3b5d44fc31da740ff5043c38251e67daf7cd061415502f3ad2ee423148ce5b47c6a6361e2bc44797230bb721fc610f7c07dc040757523a17dd41cc668185ea3e SHA512 795ed215b6749694961c4ce157a791149274bb8ab927105a63428bde8680efe8165a3d212d38f3852887a1a3d2c3c10ad2e03d4959e28c70fe66a17103ee3471
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.5.0.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.5.0.ebuild
new file mode 100644
index 000000000000..c5e4f236e045
--- /dev/null
+++ b/dev-util/kdevelop-php/kdevelop-php-5.5.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_HANDBOOK_DIR="docs"
+ECM_TEST="true"
+KDE_ORG_NAME="kdev-php"
+KFMIN=5.60.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="PHP plugin for KDevelop"
+HOMEPAGE="https://www.kdevelop.org/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="5"
+IUSE=""
+
+BDEPEND="
+	test? ( dev-util/kdevelop:5[test] )
+"
+DEPEND="
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/threadweaver-${KFMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	dev-util/kdevelop-pg-qt:5
+	dev-util/kdevelop:5=
+"
+RDEPEND="${DEPEND}"
+
+# remaining tests fail for some, bug 668530
+RESTRICT+=" test"
+
+src_test() {
+	# tests hang, bug 667922
+	local myctestargs=(
+		-E "(completionbenchmark|duchain_multiplefiles)"
+	)
+	ecm_src_test
+}
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index b78a7042fbdf..2cc6ff80fffd 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1,5 +1,7 @@
 DIST kdev-python-5.4.5.tar.xz 1072356 BLAKE2B 5ad613c5a32d1fd8661a007f96aac228aeaf0b6b3baa33d2234672e13e70b70adab40f78b914c6b4ce5592e3a90e7e12442c988cc577ac103ca3fc51c2dc6d74 SHA512 d21a4032304b742885718d52bc3ea36885f48ef3f778a1b36b2d75a007cd7a84941a764950d3b2510060809e5c56e541a6216faab723b9c6334331c2c39eb5a1
 DIST kdev-python-5.4.6.tar.xz 1072228 BLAKE2B 199b8f1b0f6a4f072f2fdafa25b2653cfe855c10d601f3be7f47db84140aea84987cf1ae5f0ae19e08af5b3092cfab16aac0704f20ed46c6d872345482a663f3 SHA512 116b5649f59c2ec46aba083f9e0edebfb481c86d7677ce08fe69e161e344addbd6b4f9c955ebc2866ea118d3139377c59315c46b9e7defec119a47ff50bdd2ac
+DIST kdev-python-5.5.0.tar.xz 1073728 BLAKE2B 44a2d2ab47dced0c3c2b91a6bb269ff84e022bd4ae1036358bb7586baf8116432944363ea540ee90b22ff2bddd2cf1047c838a2404f31d6206779c53b35cf721 SHA512 6fde0221de7407a12d29c4a1df8d0d6e965613956d1b5a7fd375f4dd8ab34784b92e5b22dc523c8ce6a4aca80dc3dad16b3e549c0569959b35023b18434add26
 EBUILD kdevelop-python-5.4.5.ebuild 1212 BLAKE2B e4ba668c7c59787d17812a647b41a284221cac3b56d98c8dfa1fe7a00b5af9f245fcc7bd11026cde8f8e1c78cb6754640b9a224fc9009ca51305bd6a9b48ba88 SHA512 d1d585ec58bc73a0bec5e8ed7b964cd74622973ae98f398bfd36a6b93128bee77f6db82a0d294982b406553ef751359d676d61f5e3493e5e5e7ad6d40ae9baa8
 EBUILD kdevelop-python-5.4.6.ebuild 1214 BLAKE2B fc23d22751f44d85e546d3ef3d729e0f65fc1cd2b3dc61be1cbf9831118efef0cf6a3722c3080ddc5981201266f52b8347bd762a8ccd851f116146ff06af9f7e SHA512 7ea709ab6cb2e40482904634b574e8ff79e468c998a60b0845e974c6dc7e95813606a4f0a96af85175724f78077744268ff1feb40a7819058180eee17a174ae6
+EBUILD kdevelop-python-5.5.0.ebuild 1214 BLAKE2B fc23d22751f44d85e546d3ef3d729e0f65fc1cd2b3dc61be1cbf9831118efef0cf6a3722c3080ddc5981201266f52b8347bd762a8ccd851f116146ff06af9f7e SHA512 7ea709ab6cb2e40482904634b574e8ff79e468c998a60b0845e974c6dc7e95813606a4f0a96af85175724f78077744268ff1feb40a7819058180eee17a174ae6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.5.0.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.5.0.ebuild
new file mode 100644
index 000000000000..b91e2c1036fe
--- /dev/null
+++ b/dev-util/kdevelop-python/kdevelop-python-5.5.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+KDE_ORG_NAME="kdev-python"
+PYTHON_COMPAT=( python3_{6,7,8} )
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org python-single-r1
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Python plugin for KDevelop"
+HOMEPAGE="https://www.kdevelop.org/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/threadweaver-${KFMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	dev-util/kdevelop:5=
+"
+RDEPEND="${DEPEND}
+	dev-python/pycodestyle[${PYTHON_USEDEP}]
+"
+
+RESTRICT+=" test"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ecm_pkg_setup
+}
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 492f2f77c565..0ccf9de4b8f3 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,5 +1,7 @@
 DIST kdevelop-5.4.5.tar.xz 7011816 BLAKE2B d067b0b034014b2f3ef7e177b59bde7c86672e8718d6860c5945ad8c8df7531cb427bed1f96b8a8d470da5a51e32134c389df53386a5c4a635825e6892cb060d SHA512 9c795402e10fceda63d0847260018f73d0318ea23a8b67db5c369259b79906a0877f1c43cdaccd5d6a456fef6bc06157dddc99bddc0b742c686057690656d5f5
 DIST kdevelop-5.4.6.tar.xz 7011868 BLAKE2B f8dc80e88592aaff6c2cc90667006a235cb4930aa6249558ee69feee8180b012b3ca6ad39bf553743a3b35bdd2c40754dd1f6081d3630566cad1d71ec75e42f2 SHA512 bcc7ee982f48982c63dbe8ac3dcfc9bdb4dda855d0d8b82740e12a616eaca71fe9e2f4a39626d70ce28d09c5f805a462ade06829f04db682fde72a2594ea4234
+DIST kdevelop-5.5.0.tar.xz 7018184 BLAKE2B 165c54ffe021c420cb688180c44a856b620248180611356429e6a98523afef3d3ea5d7edaed10cee232e614bdb470246f3c9e7b46d3bfbb288efb9e04f6258fd SHA512 6dcce4c9b124fffbd278279e6b5b9f90dff8b2f90faacd8208256951dcf7ac1ab5ae21610347ab508d3e5df49df3096a6c049271f30b1ed84b0f8401e760380f
 EBUILD kdevelop-5.4.5.ebuild 4206 BLAKE2B 9ebbdfe406c2c7dd9543b9ca59c117dd070fa1b8043dcc3d924c4539e93b9bc7947b9c80e37982c1588e8069b9472edb8bbc18a16f958d6f94af17ee40736592 SHA512 269a12d204a1a3090ad1fd0812472e3b420f5153deb0cda68aa0bb5be60ce44dba35f938655d66d922def5e385eb16e07ffe2c44252f2adddee2f87e75ff6871
 EBUILD kdevelop-5.4.6.ebuild 4208 BLAKE2B f584a1f7d51b64d779ca1637fce0444e143b7dc019b647452a8bbbc0646bbc01edd849abea187e97f1a43614e424addc588b3c3bb4be61aff21f23c6fcfc5db9 SHA512 6dd6e298ff879fd5fe0783528f03e8462856dcc6f39ffb678f5cfcce6b416049bb0c99e85899c5309c8250d1fbe3639963674a10fbf87cc1194edff6cb761f17
+EBUILD kdevelop-5.5.0.ebuild 4208 BLAKE2B e14dfa7ebc945c6d80b38689904e063d67099d4b8c9cf3db8e9b6691bd297752409c28d09c5f384b241074ceb656b89ec427a65f1501487b886b4156cfc70dcf SHA512 fa5fad18258608652ec70fec83dfdbaacc9aa70c20507a1d2421ddc85a3999efc7450b0eaf020b045e883ec70c1184649ba60ea205ae8e5968596bbd4976381e
 MISC metadata.xml 698 BLAKE2B edf6f5784cae9be6ea0013e2f4b85234c748ff5b716511cea8b401e7267178a821d27bbd5b66d38833e018c6a90855ed28390be385818e67f25105674b73aacd SHA512 62228270953a089d69530e11f5dd9a55c86f9758d6d86f9a3eb46a1a6e3efaca38c066bacff5b5f49a409d6c65be96e84f1be63cf6aa3fc7bc04706b674501f0
diff --git a/dev-util/kdevelop/kdevelop-5.5.0.ebuild b/dev-util/kdevelop/kdevelop-5.5.0.ebuild
new file mode 100644
index 000000000000..97d8be27a258
--- /dev/null
+++ b/dev-util/kdevelop/kdevelop-5.5.0.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KDE_APPS_MINIMAL=19.04.3
+KFMIN=5.60.0
+QTMIN=5.12.3
+VIRTUALDBUS_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
+HOMEPAGE="https://www.kdevelop.org/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="5/55" # look at KDEVELOP_SOVERSION inside CMakeLists.txt
+IUSE="+gdbui hex +plasma +qmake reviewboard subversion webkit"
+
+COMMON_DEPEND="
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	>=kde-frameworks/threadweaver-${KFMIN}:5
+	>=kde-apps/libkomparediff2-${KDE_APPS_MINIMAL}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qthelp-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qttest-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	dev-libs/grantlee:5
+	>=dev-util/astyle-3.1:=
+	>=sys-devel/clang-3.8.0:=
+	gdbui? ( >=kde-plasma/libksysguard-5.16.5:5 )
+	hex? ( app-editors/okteta:5 )
+	plasma? (
+		>=kde-frameworks/krunner-${KFMIN}:5
+		>=kde-frameworks/plasma-${KFMIN}:5
+	)
+	qmake? ( dev-util/kdevelop-pg-qt:5 )
+	reviewboard? ( >=kde-frameworks/purpose-${KFMIN}:5 )
+	subversion? (
+		dev-libs/apr:1
+		dev-libs/apr-util:1
+		dev-vcs/subversion
+	)
+	webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
+	!webkit? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+"
+RDEPEND="${COMMON_DEPEND}
+	>=kde-apps/kapptemplate-${KDE_APPS_MINIMAL}:5
+	>=kde-apps/kio-extras-${KDE_APPS_MINIMAL}:5
+	>=dev-qt/qdbus-${QTMIN}:5
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	dev-util/ninja
+	>=sys-devel/gdb-7.0[python]
+	reviewboard? ( >=kde-apps/ktp-accounts-kcm-${KDE_APPS_MINIMAL}:5 )
+	!dev-util/kdevelop-clang-tidy
+	!dev-util/kdevplatform
+"
+
+RESTRICT+=" test"
+# see bug 366471
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package gdbui KF5SysGuard)
+		-DBUILD_executeplasmoid=$(usex plasma)
+		$(cmake_use_find_package plasma KF5Plasma)
+		$(cmake_use_find_package hex OktetaKastenControllers)
+		$(cmake_use_find_package qmake KDevelop-PG-Qt)
+		$(cmake_use_find_package reviewboard KF5Purpose)
+		$(cmake_use_find_package subversion SubversionLibrary)
+		$(cmake_use_find_package !webkit Qt5WebEngineWidgets)
+	)
+
+	use reviewboard || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON )
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+
+	if ! has_version "kde-apps/konsole" ; then
+		elog "For konsole view, please install kde-apps/konsole"
+	fi
+
+	if ! has_version "dev-util/cppcheck" ; then
+		elog "For static C/C++ code analysis support, please install dev-util/cppcheck"
+	fi
+
+	if ! has_version "dev-util/heaptrack[qt5]" ; then
+		elog "For heap memory profiling support, please install dev-util/heaptrack"
+	fi
+
+	if ! has_version "dev-util/clazy" ; then
+		elog "For static C++ Qt code analysis support, please install dev-util/clazy"
+	fi
+}
diff --git a/dev-util/kyua/Manifest b/dev-util/kyua/Manifest
index cac9b22fd51a..449eacf5bc8d 100644
--- a/dev-util/kyua/Manifest
+++ b/dev-util/kyua/Manifest
@@ -1,3 +1,3 @@
 DIST kyua-0.13.tar.gz 663776 BLAKE2B 5bb6b2a7723567395baeace0b70085a631856ac98ddb304bb5300f26bc89a1a1add589486cd08f1569ca9c7534fd5071a62cdcbb519a10d59221df63c0aef932 SHA512 80ecf4fd888d4759122f3c1d1d5b06a19135e06f7bca1ef8458c7a5e78c1b6baff54969c863c93f11c40611ca256fc0334402531397b16788fb3ec701dd278ae
-EBUILD kyua-0.13-r2.ebuild 622 BLAKE2B 5ca382b2fea9f44a9ff851a9a1896614ea99e79c84272dba65b79c9e62de8d1c0a45f65776be4f647c8b214fd1dae7c96e1286e6812f56a600eef0336601300e SHA512 b76aed26f918a42f6cd1631950c9940b5f61db0c7a50cb21d6f8703b6678814935ac18c985d9863ed5e35524d6ed6ab592e955cffa32e40f765e49461d173c56
+EBUILD kyua-0.13-r2.ebuild 623 BLAKE2B 6f485fd94e0db9fd4f33a6b36743b087f4dc8817ddee9d21fca473a3cf6d6b1b9c269df2c1021102c6130925c04ae6277e869c41350428dfbec12014baf7ab21 SHA512 868112bebd0e6db76910fabbe76ca6da556fcba0a225a7e0e90c9718ba5b41588bfa3089cac8a0f58e534e7f6c4482ea1d7866712bb76226aa9419d775dc87ce
 MISC metadata.xml 246 BLAKE2B f94a229d0ffd7220f14c23ca2b0b6b84128338b5af27cd18ddb0c9e2f95f51c943fdfbc368c03b4a87d7bb381c668158fdc169fd067cc0cd8cd35852acc29d62 SHA512 b6df287a6e1f18bf267a05d8eb6dea788ae7ec74de31d9cea76fea038e4090c6a83d62221505d280d55e9b314d059c409e442951d78eb3a58928307ff118147b
diff --git a/dev-util/kyua/kyua-0.13-r2.ebuild b/dev-util/kyua/kyua-0.13-r2.ebuild
index 5d331171f773..2bc7debc076b 100644
--- a/dev-util/kyua/kyua-0.13-r2.ebuild
+++ b/dev-util/kyua/kyua-0.13-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/jmmv/kyua/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="test"
 
 # Tests fail
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 8b59e9659672..4f126f6849cb 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -2,10 +2,12 @@ DIST lldb-7.1.0.src.tar.xz 19384976 BLAKE2B a1d5afea255f06221516e21e80120cb35d87
 DIST lldb-8.0.1.src.tar.xz 19586288 BLAKE2B afb20a8303dcbdaf76ef1d78aa3165f87713f1c16121905d7a5f71e770ceafdff40d9d19e0a983d9290da2d4eb3acd0987d50607bea17efdb7dc0127d7f5cf8a SHA512 eb031985ad4d08226ec47a90fe32c1e6d070948971ca5235fd431cf7d5b7ea20f5d5131237bf83a6419773d18c339590bf9672e7b4f884304497e63c1030988f
 DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
+DIST llvmorg-10.0.0-rc1.tar.gz 120755822 BLAKE2B a729d37d96ba498cb865c6f708734dccb796b2caabb69167b9aa3b0e12c788f2a5980a048b99d5603da3d26af909fb31f406b4f4743cabae56c45f829a7bf695 SHA512 27137fc700971147c00ded6787eaae9f0bcf98c938fe227a5a559b38d983736f3d086f4ff6772d802c5f48a7d97a97c293261e4af88fcb5a720693b9cb5a4f02
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD lldb-10.0.0.9999.ebuild 2432 BLAKE2B 8f37d1c268866deaf96fae901539abfd99cc9c606c0debeb90029d096c65c5184d839c048fab8c9997cf990d1c63d78e5f7de1d60806b528bbc01f8bf1e051ee SHA512 f19fe7f0f3231de291b7b4aa826136662fa186cd8508213b51585ab895d164c08a1b5d0ef73c05497cd0384eaa5a894e0cab80134c0519b00e7821f0407857eb
-EBUILD lldb-11.0.0.9999.ebuild 2432 BLAKE2B 8f37d1c268866deaf96fae901539abfd99cc9c606c0debeb90029d096c65c5184d839c048fab8c9997cf990d1c63d78e5f7de1d60806b528bbc01f8bf1e051ee SHA512 f19fe7f0f3231de291b7b4aa826136662fa186cd8508213b51585ab895d164c08a1b5d0ef73c05497cd0384eaa5a894e0cab80134c0519b00e7821f0407857eb
+EBUILD lldb-10.0.0.9999.ebuild 2382 BLAKE2B 5daf2ebbcac5611bc6c4f3532de45717dcbada6938d5be50fd993288dac115009258c43cf42523dec4db1b54927c12aaf49802a223d4f761cf20d7877f314678 SHA512 5e558304588a243f9618055778e5398c7a78a5e718ff2671df68f949d3cb17d2cac722f5c50353a6fcd6dcad4d69463d83cdf648a1f13f015d23a0e3058ad667
+EBUILD lldb-10.0.0_rc1.ebuild 2382 BLAKE2B 5daf2ebbcac5611bc6c4f3532de45717dcbada6938d5be50fd993288dac115009258c43cf42523dec4db1b54927c12aaf49802a223d4f761cf20d7877f314678 SHA512 5e558304588a243f9618055778e5398c7a78a5e718ff2671df68f949d3cb17d2cac722f5c50353a6fcd6dcad4d69463d83cdf648a1f13f015d23a0e3058ad667
+EBUILD lldb-11.0.0.9999.ebuild 2382 BLAKE2B 5daf2ebbcac5611bc6c4f3532de45717dcbada6938d5be50fd993288dac115009258c43cf42523dec4db1b54927c12aaf49802a223d4f761cf20d7877f314678 SHA512 5e558304588a243f9618055778e5398c7a78a5e718ff2671df68f949d3cb17d2cac722f5c50353a6fcd6dcad4d69463d83cdf648a1f13f015d23a0e3058ad667
 EBUILD lldb-7.1.0.ebuild 3088 BLAKE2B 246fc131cd7b629ffe3e541c8f108f3f0ef63b28e68c887c503b2bf55987ccd4ec8dfc4a13763ff42a0a237487d2aee58cba7a72471d2f55359c0514e9f24cdf SHA512 52de6ecdfe24cea6f24f78f7d279ccce295189209b1d99a8bf6fb656f7f2a4c8284a03745f0bdf18bb061bd7eea82afe20d93b926e819b2bbd2f64f89e636db0
 EBUILD lldb-8.0.1.ebuild 3078 BLAKE2B ab71eaa79f68bb2023b3a1376920fb423e9ecd643bdd9421924889ceb370c549fea57f6d8513e2b41305729f0380d62940656023f098c4773f834fb41d591ed9 SHA512 0d78eaadb05dccb38a8e02ddd9b0c7740be3438f65d17766cea26112d74c91ecc204d4eba80eb39a80009276d8baf8166e59987eebe13674eafe5794381d3189
-EBUILD lldb-9.0.1.ebuild 2319 BLAKE2B 6d9cdb1639a29f215070b58324f62ded2163f0e3b3347d58850a44ff7fafa9c729421364d8ae481222e4bac2dad635b001892b994dba4450b8150c933ed3332c SHA512 10695980c13edc1e294d9f4f34df9e1d31937d3329da52605b09fe39af4492372e649e885df7611670456f63a3fe01ccb9e2031363a4602fe25fbaedebecdae7
+EBUILD lldb-9.0.1.ebuild 2318 BLAKE2B 74047aad559a58ece8df8682d9f237e1a1e4b655869ba78a5d2379cf5ef16429058d0728fe6851666c79cab9bcc90319a6f5b3366da4e085267af17c644f6c50 SHA512 1e24bb6c916bd2e85aac3d83c687532a063fe70f9c4b327e42877dca0606ecbfaed34bb7359114ae896693f5e21542c317403e0c8e3b0af4e880ab151519a8fa
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-util/lldb/lldb-10.0.0.9999.ebuild b/dev-util/lldb/lldb-10.0.0.9999.ebuild
index de7777bae713..332d07439b76 100644
--- a/dev-util/lldb/lldb-10.0.0.9999.ebuild
+++ b/dev-util/lldb/lldb-10.0.0.9999.ebuild
@@ -70,8 +70,7 @@ src_configure() {
 	use test && mycmakeargs+=(
 		-DLLVM_BUILD_TESTS=$(usex test)
 		# compilers for lit tests
-		-DLLDB_TEST_C_COMPILER="$(type -P clang)"
-		-DLLDB_TEST_CXX_COMPILER="$(type -P clang++)"
+		-DLLDB_TEST_COMPILER="$(type -P clang)"
 
 		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
 		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
diff --git a/dev-util/lldb/lldb-10.0.0_rc1.ebuild b/dev-util/lldb/lldb-10.0.0_rc1.ebuild
new file mode 100644
index 000000000000..332d07439b76
--- /dev/null
+++ b/dev-util/lldb/lldb-10.0.0_rc1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+inherit cmake-utils llvm llvm.org multiprocessing python-single-r1 \
+	toolchain-funcs
+
+DESCRIPTION="The LLVM debugger"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( lldb )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="libedit lzma ncurses +python test"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	libedit? ( dev-libs/libedit:0= )
+	lzma? ( app-arch/xz-utils:= )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+	python? ( dev-python/six[${PYTHON_USEDEP}]
+		${PYTHON_DEPS} )
+	~sys-devel/clang-${PV}[xml]
+	~sys-devel/llvm-${PV}
+	!<sys-devel/llvm-4.0"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	python? ( >=dev-lang/swig-3.0.11 )
+	test? (
+		~dev-python/lit-${PV}[${PYTHON_USEDEP}]
+		sys-devel/lld )
+	${PYTHON_DEPS}"
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLDB_ENABLE_CURSES=$(usex ncurses)
+		-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLDB_ENABLE_PYTHON=$(usex python)
+		-DLLDB_ENABLE_LZMA=$(usex lzma)
+		-DLLDB_USE_SYSTEM_SIX=1
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+
+		-DLLDB_INCLUDE_TESTS=$(usex test)
+
+		-DCLANG_LINK_CLANG_DYLIB=ON
+		# TODO: fix upstream to detect this properly
+		-DHAVE_LIBDL=ON
+		-DHAVE_LIBPTHREAD=ON
+
+		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
+		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
+		# ncurses with complete library set (including autodetection
+		# of -ltinfo)
+		-DCURSES_NEED_NCURSES=ON
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_BUILD_TESTS=$(usex test)
+		# compilers for lit tests
+		-DLLDB_TEST_COMPILER="$(type -P clang)"
+
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake-utils_src_make check-lldb-lit
+	use python && cmake-utils_src_make check-lldb
+}
+
+src_install() {
+	cmake-utils_src_install
+	find "${D}" -name '*.a' -delete || die
+
+	use python && python_optimize
+}
diff --git a/dev-util/lldb/lldb-11.0.0.9999.ebuild b/dev-util/lldb/lldb-11.0.0.9999.ebuild
index de7777bae713..332d07439b76 100644
--- a/dev-util/lldb/lldb-11.0.0.9999.ebuild
+++ b/dev-util/lldb/lldb-11.0.0.9999.ebuild
@@ -70,8 +70,7 @@ src_configure() {
 	use test && mycmakeargs+=(
 		-DLLVM_BUILD_TESTS=$(usex test)
 		# compilers for lit tests
-		-DLLDB_TEST_C_COMPILER="$(type -P clang)"
-		-DLLDB_TEST_CXX_COMPILER="$(type -P clang++)"
+		-DLLDB_TEST_COMPILER="$(type -P clang)"
 
 		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
 		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
diff --git a/dev-util/lldb/lldb-9.0.1.ebuild b/dev-util/lldb/lldb-9.0.1.ebuild
index 2c745d19c7c4..20d744e17b96 100644
--- a/dev-util/lldb/lldb-9.0.1.ebuild
+++ b/dev-util/lldb/lldb-9.0.1.ebuild
@@ -15,7 +15,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 arm ~arm64 x86"
 IUSE="libedit ncurses +python test"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RESTRICT="!test? ( test )"
diff --git a/dev-util/makepp/Manifest b/dev-util/makepp/Manifest
index 2fbed5a768d2..4b35f8898052 100644
--- a/dev-util/makepp/Manifest
+++ b/dev-util/makepp/Manifest
@@ -1,5 +1,5 @@
 DIST makepp-2.0.99.1.txz 532784 BLAKE2B e69495f0ffece81e7b15b668eea8bf4f9a26a36332bd1644594d697dd2301bea4bb2340fcd2805a33c44824113149fc617db610e6624900ec9d0d77054658d8c SHA512 457d64a2e9d2860dc2f7ad1bd4ef7df9fcd1563878dcd7b63e6f1d3fd6c03cdb89aab68faa018b3ef6b3009733a365fadbb49ad6c8a03ffe6eafcf867b765213
 DIST makepp-2.0.99.2.txz 528968 BLAKE2B e39c5fa515a1579ef5a568385550e8baf9176eac4a1871cdb7971ca8d3f92bfda73e5f27f4cf00c148a2c5c9622dd8253ebba0f555c6d46ce8c3581678bf8e68 SHA512 5aa8d255e545705802fec6ca304b2c672dfb9c59f7a064a5e9c4ef98f52d7dd5628023fe2a2449126ac1f9cc6ba7bac98233e3e4f07dd8a0559fd8aea7fd24a4
-EBUILD makepp-2.0.99.1.ebuild 956 BLAKE2B 271c4ab70048e97b3af955bae431aaa1887ed2e085c9f30d5ae5638a6e230d0665c59fc28401c282f33225d27627f87f9e3d1d0028332b51d73f1bd172006eb6 SHA512 3de74875fa845a954a481850ab32015affdac1f9ca6764dbfd1143ef9435db3845731953f586b9c6cedc3e50acacf6730117495d776dd73510136e08f09da670
+EBUILD makepp-2.0.99.1.ebuild 957 BLAKE2B c515df0a863109bbf5ccdb90bb110faed698517b33d3ce57a76686e8250c221576ef5ba4f33ed27225f9995b957d9e8da8b5dca6e8f7f51c001173febac8d1b0 SHA512 2172c34461777f3ecde95e01e6dbd53a9d20fd41eeb1bb1f3bed86f6fd08762e595a203c3158917d55acca04177eaf089ecfbb967f28bc14c43c00b95baeda62
 EBUILD makepp-2.0.99.2.ebuild 1018 BLAKE2B 131975a8dcbe6b7ea2e514765c1d46ce61c58f70071aaa38d73bca6e3d8b23b4821a620be37dbb0a821fecc3ce8930453797476a225cb017ee2c8ffa010f9c9c SHA512 4d8c3b7f521fe3f0b0a2c8049852372545f4ff3f1413bab752ee974f43c0f6a0910a351ddb88a81a93b817c7fddc8161256d23bba635ecd370c9e5be017e982c
 MISC metadata.xml 333 BLAKE2B 58a25c0c361e93a28731379d14b028724a0fc6bb06087f34cef9aa0aa657a5de28af68287034d0c6dcb50312f264f607fe727992d15ab503cc245d31d35443d4 SHA512 a4d44741093e730e73c16da4aef90a745a8f4a3e3f844e0b68e168788d934126faf29d598a17dc1c185a97d8a9611525e7ae0f1bab17ed20e25aa7f0e466ea41
diff --git a/dev-util/makepp/makepp-2.0.99.1.ebuild b/dev-util/makepp/makepp-2.0.99.1.ebuild
index 1e24eea8bbaf..673b76c61cd9 100644
--- a/dev-util/makepp/makepp-2.0.99.1.ebuild
+++ b/dev-util/makepp/makepp-2.0.99.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/2.1/${MY_P}.txz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~ppc ~sparc ~x86 ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-linux ~ppc-macos"
 IUSE=""
 
 DEPEND="dev-lang/perl:="
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 467896576bc6..7f7aeaec0947 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,7 +1,7 @@
 AUX 0.52.1-test_pkgconfig_gen_deps.patch 1688 BLAKE2B f228e1d721449611799606cfb3aabcd3f347b0776a0f25dcf3b1abcfa6b5eb0506cb9e5b4069dfd9008a0c11569db9a50885c9edf59e1f4a129e6f571921bbed SHA512 4720834226b88661d7b631f1739c6ae48ebabd1604081380e143ab420e78236db7bc3141f5adc68aa03c6c074d1ed415ac515b351bd34c1d4dbbdbf1492cd5ef
 DIST meson-0.52.1.tar.gz 1507764 BLAKE2B 8daf43d84186905d5c32629ab6a250955bdffda502d2d79f991111d0ae7e3a21b3f9bc09ef5258f709eee4e17b09c6f09e7685a72153efcf8daaaec2645eef8a SHA512 fea3e85191782999de3a9431ec1d2cfacea32cf9598205443855042dca50ddac92eb3e74be4dd6a62bd80a606b73e76a04877b2c8efb275d9de5f87e3f9f8f41
 DIST meson-0.53.0.tar.gz 1548138 BLAKE2B 42340645f3417930856e05da9b479e9352e1fe3ea567929215f433a04fe3b0216d6de8693428be058048d2bd9c8d21031b19d0d5599a99e8f61aa9b6da689bf7 SHA512 e79a093aba5df137d463ac1334199833b8374689b2aba1cfd935fc484fff524d84bf6c2b3fcd9371b67daade0e18d1fe5e47dccdb7cf416932e86b83f49fec73
-EBUILD meson-0.52.1.ebuild 2100 BLAKE2B d91311e2d5e9706f178d600af549e755d4f4720c7d26cf65744167218e8c16a2595f20efd7a8ddad4fc7933443123b39ce0d8ba778e315679dde25ef3e84fe4c SHA512 88b28b61a791359bedce515c818c1539aefc4aa1b13a55cc385926ebca609db70bc374d613d0a3d0f06cbf580362e3f6532b9e53f9d0cd8af87c546e812a9b30
+EBUILD meson-0.52.1.ebuild 2101 BLAKE2B 28e4a775dfda6eca957f883e8d21edecea83b46fbe9c0f16f0f967a41f80a4a6aa05196c51f23910d7ea19b4f985888a30d62a147279834a4d06d132a0eb1790 SHA512 043c7b168433388c1ec86b20767bdc533e5cbe7ac1a8786ea604091836dfbc84f1f5b2584d06d2f10f129558ff0ea869e4eabc363cee6416a1d71cd3d58f531b
 EBUILD meson-0.53.0.ebuild 2113 BLAKE2B 7852e6dd0459f26beaa4f9e121578d6cd44281ead0984f577d16c38b93aa6b03d6ddf4a9401f983c996342c2a937bc3e1b856696bbfc022e5398766cee535a3d SHA512 af11e0bcb5b4858c93ae40c0df410f99e8cd7c4be32404d1c22afabf7e792530ec1939baa1ccccef3bcd06fd7313eb8523465c24ef9cf4e116190ba86be48edc
 EBUILD meson-9999.ebuild 2039 BLAKE2B 7c795a9c84ad0aca3651cb0c16202208603fb0edd017a8d689c69f8980da35a9e73679b6d00d9cd249f3b23610e237770ef8cab2ba5af5a9499c08af5b55646a SHA512 4b96bf71cafcbb1c3f6327a2221f9f89a12088920b3f16c65631a6e19f46c58e39184a2d7277c645990b9fc4d533c8cb825d440581026669de03555198341b0b
 MISC metadata.xml 423 BLAKE2B 3dc99d370f7c1f4e9d9e47b3e472c1cb26ffedf4dacf20d84a27c4bddb9a47aa09849cdb4d1307f6980cf63511584f71dc3c1c9f20debb32134e004bd57130fe SHA512 417736194719d102e906ae6efcfa37930d4706a8a1e94b09a266e044ee806ef25ded2f935fed76a2d29f6443c0387b2ebd37f9d084887bce30a7079e2ff76467
diff --git a/dev-util/meson/meson-0.52.1.ebuild b/dev-util/meson/meson-0.52.1.ebuild
index c46bf9a69551..f4c8341e4700 100644
--- a/dev-util/meson/meson-0.52.1.ebuild
+++ b/dev-util/meson/meson-0.52.1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 fi
 
 inherit distutils-r1 toolchain-funcs
diff --git a/dev-util/mingw64-runtime/Manifest b/dev-util/mingw64-runtime/Manifest
index 71146c760210..79fcf975c5a4 100644
--- a/dev-util/mingw64-runtime/Manifest
+++ b/dev-util/mingw64-runtime/Manifest
@@ -1,5 +1,7 @@
+AUX mingw64-runtime-7.0.0-fortify-only-ssp.patch 637 BLAKE2B 3a8eff14b3150446da51354324a3b29e327982fd586339e5f8df4309de2bbdb2722773e0d145d87363183ff70fd02fcdcbc46c560bef9a5111dc33ee8105bede SHA512 991d4294d81a05bfa86d2bed102b3f5bf58435ef02b0a38abe905cc4a0416896b01ffc3a2fe64e78d44e78c9c65051428426b7d19561bd337a229bf7281c7040
 DIST mingw-w64-v6.0.0.tar.bz2 9045653 BLAKE2B 8a54dca2d06c92ab968a93240996d07ab3b1ed4652555a48b7581c477856d5784ed192c578d78186e171e400bd18b4de3c6cafbdd96109367ad13c37792015c1 SHA512 e3d3663e0cb33a16f90b1a33e81b5a30d26f7e34270b14e865c10068f2a2d32da9ef8cbbb0c3fed9c71429ae11c82152ff3b87d81558929b2a4993dc99cfc11e
 DIST mingw-w64-v7.0.0.tar.bz2 9071231 BLAKE2B da00794ec456ede5913a565248c79255407c058469cb7338cf81b8d03c1e39f4189016b01734b786c0ad8f18166a24fdb95ca72edc954f31151e5d3aa2b2a899 SHA512 30e5b2824a24eeb99ab519e3fc134cc9a7f04ee8b853bc8d66a13d1ab74144bf78b93e162bfe6de2a5e61f63c0e620a933b260b02d019cd68cc4b78bd36c67fd
 EBUILD mingw64-runtime-6.0.0-r3.ebuild 2958 BLAKE2B 8f91f93b5cf45c52dd8750eacf640a76d56115710a5e58930a6176db7c54a67a42ad59ad74c5503235fa946473bb8c1bbba68b5fd939640768e22375f95696b8 SHA512 30cc5cb2e975a0048007734836b8ef0052ea9470622d71fcc4c2e343996f564b9f402fc273a8bdd03961148a8156c6e38fd8eff6b26c1d830d47d6c619a81bbd
+EBUILD mingw64-runtime-7.0.0-r1.ebuild 2973 BLAKE2B ed88e0b84beaddf41c8464897af520f5cd10af2680953935a4b088c67e5d355f57187f6f6d9cd22327493a33e37c6a27f4afb74e86ecb42f7ded830af5ce3969 SHA512 f9387e967090fd8b40f88c1733c3f2e8b1ff5bf60b142986074f3f4186247e83d63dd2765c296981b14aae60772b29cc5d6a382d542477a59766d4e07f2ec54f
 EBUILD mingw64-runtime-7.0.0.ebuild 2917 BLAKE2B ff108cced053a135936dd0deea64c585a010831b002118de38cd7b816decf3daded03cabe6caaee684930e73c32a71731690eb8be4dc0f8398cbce978fe104af SHA512 ef52c741f89719f7284a516b4b4651a0ea0d8aafade99153e5e5d7541a8d12b083f9b5458450cae66f617a0890c052a50869b22c7a35112b086459c3acd0f623
 MISC metadata.xml 643 BLAKE2B a66741716a2729da314650e4435c616a0a3912cedcc142f23ce74b23c59e21b8a456697a7d38880c1b7d876909ba4b3617a0c72c9f054fcbcbe68841d76c5903 SHA512 fd9528a194bcda889d719ba7f4759414b86cc0d75d9790a9478c46e2abf62b01355e4e01b8e05b7accda0ff0dab94607182671f367cf600e47443b0d4a0bcd53
diff --git a/dev-util/mingw64-runtime/files/mingw64-runtime-7.0.0-fortify-only-ssp.patch b/dev-util/mingw64-runtime/files/mingw64-runtime-7.0.0-fortify-only-ssp.patch
new file mode 100644
index 000000000000..72ddd775a2ea
--- /dev/null
+++ b/dev-util/mingw64-runtime/files/mingw64-runtime-7.0.0-fortify-only-ssp.patch
@@ -0,0 +1,16 @@
+--- a/mingw-w64-headers/crt/_mingw_mac.h
++++ b/mingw-w64-headers/crt/_mingw_mac.h
+@@ -301,7 +301,12 @@
+ #  define __mingw_attribute_artificial
+ #endif
+ 
+-#if _FORTIFY_SOURCE > 0 && __OPTIMIZE__ > 0 && __MINGW_GNUC_PREREQ(4, 1)
++/* __SSP__ is a workaround to avoid reference to libssp when user did not request it:
++ *     https://sourceforge.net/p/mingw-w64/bugs/818/
++ * Otherwise it breaks both USE=ssp gcc bootstrap and projects that happen to use
++ * strcpy/memcpy.
++ */
++#if _FORTIFY_SOURCE > 0 && __OPTIMIZE__ > 0 && __MINGW_GNUC_PREREQ(4, 1) && __SSP__ > 0
+ #  if _FORTIFY_SOURCE > 1
+ #    define __MINGW_FORTIFY_LEVEL 2
+ #  else
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-7.0.0-r1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-7.0.0-r1.ebuild
new file mode 100644
index 000000000000..82f85e2e5435
--- /dev/null
+++ b/dev-util/mingw64-runtime/mingw64-runtime-7.0.0-r1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+inherit autotools flag-o-matic eutils
+
+DESCRIPTION="Free Win64 runtime and import library definitions"
+HOMEPAGE="http://mingw-w64.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# USE=libraries needs working stage2 compiler: bug #665512
+IUSE="headers-only idl libraries tools"
+RESTRICT="strip"
+
+S="${WORKDIR}/mingw-w64-v${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fortify-only-ssp.patch
+)
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+just_headers() {
+	use headers-only
+}
+alt_prefix() {
+	is_crosscompile && echo /usr/${CTARGET}
+}
+crt_with() {
+	just_headers && echo --without-$1 || echo --with-$1
+}
+crt_use_enable() {
+	just_headers && echo --without-$2 || use_enable "$@"
+}
+crt_use_with() {
+	just_headers && echo --without-$2 || use_with "$@"
+}
+
+pkg_setup() {
+	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
+		die "Invalid configuration"
+	fi
+}
+
+src_configure() {
+	CHOST=${CTARGET} strip-unsupported-flags
+	# Normally mingw-64 does not use dynamic linker.
+	# But at configure time it uses $LDFLAGS.
+	# When default -Wl,--hash-style=gnu is passed
+	# __CTORS_LIST__ / __DTORS_LIST__ is mis-detected
+	# for target ld and binaries crash at shutdown.
+	filter-ldflags '-Wl,--hash-style=*'
+
+	if ! just_headers; then
+		mkdir "${WORKDIR}/headers"
+		pushd "${WORKDIR}/headers" > /dev/null
+		CHOST=${CTARGET} "${S}/configure" \
+			--prefix="${T}/tmproot" \
+			--with-headers \
+			--without-crt \
+			|| die
+		popd > /dev/null
+		append-cppflags "-I${T}/tmproot/include"
+	fi
+
+	# By default configure tries to set --sysroot=${prefix}. We disable
+	# this behaviour with --with-sysroot=no to use gcc's sysroot default.
+	# That way we can cross-build mingw64-runtime with cross-emerge.
+	local prefix="${EPREFIX}"$(alt_prefix)/usr
+	CHOST=${CTARGET} econf \
+		--with-sysroot=no \
+		--prefix="${prefix}" \
+		--libdir="${prefix}"/lib \
+		--with-headers \
+		--enable-sdk \
+		$(crt_with crt) \
+		$(crt_use_enable idl idl) \
+		$(crt_use_with libraries libraries) \
+		$(crt_use_with tools tools) \
+		$(
+			$(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \
+				&& echo --disable-lib32 --enable-lib64 \
+				|| echo --enable-lib32 --disable-lib64
+		)
+}
+
+src_compile() {
+	if ! just_headers; then
+		emake -C "${WORKDIR}/headers" install
+	fi
+	default
+}
+
+src_install() {
+	default
+
+	if is_crosscompile ; then
+		# gcc is configured to look at specific hard-coded paths for mingw #419601
+		dosym usr /usr/${CTARGET}/mingw
+		dosym usr /usr/${CTARGET}/${CTARGET}
+		dosym usr/include /usr/${CTARGET}/sys-include
+	fi
+
+	rm -rf "${ED}/usr/share"
+}
diff --git a/dev-util/netsurf-buildsystem/Manifest b/dev-util/netsurf-buildsystem/Manifest
index 50655fdd35a3..7c995f6ee3a8 100644
--- a/dev-util/netsurf-buildsystem/Manifest
+++ b/dev-util/netsurf-buildsystem/Manifest
@@ -3,6 +3,6 @@ AUX gentoo-helpers.sh 286 BLAKE2B 8f8ed2932cb2a0c954851804f727f1099bf3f0acd4b2ec
 DIST buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
 DIST buildsystem-1.8.tar.gz 38617 BLAKE2B 0fd5539feae0b81828efe90c82baf6ce7fceec2f2189adddb0e32d2106f9263ebd14b32f3dce8daae13110f0e69801caed48ce81709ce09d809ba50041690cc7 SHA512 0f577f4867e5e12770f9b9c42ea55e884362180bc195b6ebf56e56305ce84e230407cd2ebb3b182cc03087ffef5f39187e52e2e2f8f2b86aa20a16fa33bdff8b
 EBUILD netsurf-buildsystem-1.7-r1.ebuild 703 BLAKE2B e899d1dabcffcb2de57ebfc6cf9cc3881293eb6ec8f326ecd0bb2cbb67cfaa259f5f5b0e2171a87cafb3028618053066b4b377b947f8c16e17625ea6658d44da SHA512 0c3ae21fed977aec71868fbcf65592d07e53d54ceceaf0403be67da250c1579aebd1180cfdaebabeeaa2034b5ad3612ef5ae68c41402daecc431ae30da00e9ba
-EBUILD netsurf-buildsystem-1.7.ebuild 666 BLAKE2B 7e640a421bb041b10a220cad42afa9b6835b65fe0b39b8cdfc63c8e99129c6396bb8247e7f8a280c62276d41b041892e2162126412aad6c35f3ac39fbe7971b2 SHA512 0818bb0dd1f2eac87fcb5da10128d392fdfe274d9594c910a1bfe14f8221716193bff0fbf514dbe9b8cb10117347f04f63dcfad4772074bca4971e28a9af0af9
-EBUILD netsurf-buildsystem-1.8.ebuild 704 BLAKE2B 127aa49ecdbbfee4cfd40bf5dba8d53c58cf6f64c26b826a5470fe6ce8c3fb7bc1ee16cb94fe6748aa55e0b74c64cfb7a72165d60d102c4eda4846d0cd8719e6 SHA512 f9a64ca494d8f1271a05b22ccd0969f2db9bd914eab1e3bcbf858d125412ef17042dd614e1fabb40857ba0c4484c6596df425c672561ec606a246e43d68e0960
+EBUILD netsurf-buildsystem-1.7.ebuild 667 BLAKE2B 5ee9fa5f299be918fbb2a0a0d1b6ea7d9ba59f46a33b7adcfc79f983be441716f7fd5daeb958b77bc24e24134e750c1f1cfe90a433061d1e20c9ba86bbf852ad SHA512 6f1d11399681e786a997efd6cbfbaf7f393c919626f681f9360ace98a6b7233210053d6e5109311dbd4b3edf0d6327d0aa1c7f736eb8ada9bcc4d4f204865c20
+EBUILD netsurf-buildsystem-1.8.ebuild 698 BLAKE2B c6023d4d2d4ff1ed48b07cb6409f4b775f17a128e4829234911a626a7902be4a0726068ecd136c0a672205fbc6c261a9f8d3801ad0896d31dded415ad5983cf0 SHA512 948d75658a74188ab56f74462f45f8fd8e1120e604ca6ad0fb4343ff6baa6ccfc65f3ffa5fe6ca18939e439698a964b50fa4fde6c26aac0be730f01d45c79b9e
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.7.ebuild b/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.7.ebuild
index 96a869ef6d7b..08b41db4146e 100644
--- a/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.7.ebuild
+++ b/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.7.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 hppa ia64 ppc ppc64 sparc x86 ~m68k-mint"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~m68k-mint"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.8.ebuild b/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.8.ebuild
index 501f05fcff97..8ce86e785d65 100644
--- a/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.8.ebuild
+++ b/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.8.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
@@ -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 ~m68k-mint"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest
index 0e9f4640a045..3b8d8fae8a4d 100644
--- a/dev-util/ninja/Manifest
+++ b/dev-util/ninja/Manifest
@@ -5,7 +5,7 @@ DIST ninja-1.8.2.tar.gz 185226 BLAKE2B c464c50829a0e9f0f6fd4b860946b14bf07f752ad
 DIST ninja-1.9.0.g99df1.kitware.dyndep-1.jobserver-1.tar.gz 213767 BLAKE2B bb6abbed155d39fe65a3a4bbbba3e577e4a13dfd1ccb9e018084153b0dd6928753be9d8c10a2c4c2ab6a2000c5292f912353f2234b01613f46bfa49d13aabd7a SHA512 6c3aaf8decfd792ce6b035dacb87f978f1052d13e5ceac9ce63bc7051fad0eed83cc530d2cf22649ff4186416b0478bb3eb0507c56fec2848061cdad7a0aa812
 EBUILD ninja-1.8.2-r1.ebuild 2700 BLAKE2B cd4447774a0d216c683a50f4e8da0e929819906357d1cc5d523024e26a3c58da448dec07118958b15e4fad058189d3c07bd8857645c23db4ab76882b2d9635ff SHA512 1ffd863f81980669ab90f003e46fa7447357a7d41a53cb7414fcc7c1006095d78ed28d535797059523235cf11acec49e4dc666855f9f933a0bdf86539347977f
 EBUILD ninja-1.8.2-r2.ebuild 2700 BLAKE2B 2c34df96e0b655a249a1e6c01e5429101c212a0658332daee1befcaa1ff14af5397ba19eb2703ff1c37c73942347a6a455c5c5bcd8d5f125b326cfd3ed69f5b8 SHA512 00d767a58867ffd834c4c775dbf573dfd276c563be166f660139f51dc99b1d1848112f600624f7221c01bdca3649b713ba84b5dc91246c4eaebb1fd7f818b497
-EBUILD ninja-1.8.2.ebuild 2557 BLAKE2B 004add966245c638468d9445b23d7c0f69731cc7ac0d46b4b3413d58e881642056074e282ba67fd2bc9b8589fb811abe4f80ec3bc0f982cdb136ec38f008ad74 SHA512 923ca88d7f607b0f5adb02c59110badac26a08ed65ab485d2a90647931cbb06b72dd5c8e835bc19d92d84103139a3cb25b85ef3a6f90343c269d6c0fa5249979
+EBUILD ninja-1.8.2.ebuild 2558 BLAKE2B 3e1fb8f8376723ee47c59fbd94ab80a877d0105fc5437f419ddaf630079d43c08e93fa973b200585c6de361e0b383c8b59e792bf198aaa32108c6fd70e5f550b SHA512 e620286445437b8bd3d3963aa209e0d1662802e5e710830bba156912a2bf62b656ef9ad1c1a94d6332b22ea7875a4093653dd1193d798ddf74270fbc480f1906
 EBUILD ninja-1.9.0.ebuild 2762 BLAKE2B 84a230be226d88b6a421cb287e283d4d5b5a8fcaa17a3b90efa99daa9541fc5608f051612b433273274a59a7d864a44d18e6513859200a1696d3e9aea953d750 SHA512 1b8d72ae9da50bc0b9573bac266ca9b96272fcb9672b2a171d806fcb3b7955a23b12e465c667c006be5e8c605a09eb9a3862d73403df97893c75d3196e48dba9
 EBUILD ninja-9999.ebuild 2711 BLAKE2B 999158f073e0e89d4ac3448d50a775a4b055c9a9524aa92cd8e0f3c9b0591aa798e9fcb5649ef26c9316686e4a3eccdb998834834686ec64243441f094c75cf7 SHA512 781697bd6aca1615c37eb3b3baa68f92ce3a157f3f9a8a7baf76d97902824b0b35a7513638577c54183dda83a00632fe4bd9cb55602d67c262d23d4896180134
 MISC metadata.xml 340 BLAKE2B 7cf71b1a09f74328ea74362db4250bf038c0455dcd5f65676ceb5d80a61b5c2923696ecfeccf9d6cd264633e7dc00daa80bf960cc67e5b889d18d487d8e89b97 SHA512 4b78365b98eb9b8a1ef27115261dbf426942cccb7be03c8264e2728e60dedfec8fa51ee3f43488043be5af21b28a74c1c81f4767bcc58574873c2223172447b2
diff --git a/dev-util/ninja/ninja-1.8.2.ebuild b/dev-util/ninja/ninja-1.8.2.ebuild
index 99d58c0c9f41..939c76c4ab26 100644
--- a/dev-util/ninja/ninja-1.8.2.ebuild
+++ b/dev-util/ninja/ninja-1.8.2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
 else
 	SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 fi
 
 DESCRIPTION="A small build system similar to make"
diff --git a/dev-util/oprofile/Manifest b/dev-util/oprofile/Manifest
index e0870036e0e5..686ea8d202d3 100644
--- a/dev-util/oprofile/Manifest
+++ b/dev-util/oprofile/Manifest
@@ -1,3 +1,3 @@
 DIST oprofile-1.3.0.tar.gz 1547258 BLAKE2B d8777e41856dc2f082570a1542609bd730fd7076000443f2e17c77eaf75df7a7a772ebb49d82ee657f563797858cecb4c23b130b0174d154c54d5619b8528ad1 SHA512 02a940cd8d38834dca2a97c8ac0fff04ef95b3819cfdf74a462b9326c7abbf2dc55d2a9b9d1fbefc7f455465bf85516be2b879d7daf1861ba2c4af51214377ba
-EBUILD oprofile-1.3.0.ebuild 1597 BLAKE2B 6d3b3c4c102433439e2fc219450e086ebfcd915aade0f9355953a7135eb58da20fe292dfee15d3988e6af0807b662544c290fbbc57f41eedcd36e3aab8540e5e SHA512 818b3957a0c9a2996423daec53addbbbc64c6ad2c5b945b27716146eb4d31b5eb374655931c194ad8f5dfa4b2c2375ff4f046bf9bb38664aa14625c54c27ffef
+EBUILD oprofile-1.3.0.ebuild 1598 BLAKE2B 6d4fe85720cc626c4a30128b7b786a08e2ea8d0fb4a1b28c0ccbee15cc8ad8077fccdc5976e3271a274654d27a91b4e97d5ae7dbad107a07e7a814bdb6f33399 SHA512 03cb287cd16d2cd2a34ba486f31c91fb97baa85e45fbe459af6b4a059721ebefd8ce1e54a3e22054a6f131c4c45405a7dc467afa8961857b110aab23c1380583
 MISC metadata.xml 423 BLAKE2B f94e15abeacab93798df7566bd1dc4d8e820aa57ddd71c2e5bfcf0c983bce5961a7c8bffb4f0ebdd92785002745314feece144e29000dd38f29426d2b35b8897 SHA512 01f96b806fca3e20eb84908a1cd77edbe11291be0098aff2e4d20f0fbf86ea0ef9972c7148c791bc826152a109d16903781cc2f2f367a2ac8b8fb7e5efee378a
diff --git a/dev-util/oprofile/oprofile-1.3.0.ebuild b/dev-util/oprofile/oprofile-1.3.0.ebuild
index 0fcb76dbcf11..416560213d31 100644
--- a/dev-util/oprofile/oprofile-1.3.0.ebuild
+++ b/dev-util/oprofile/oprofile-1.3.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~sparc x86"
 IUSE="java pch"
 
 RDEPEND=">=dev-libs/popt-1.7-r1
diff --git a/dev-util/patchutils/Manifest b/dev-util/patchutils/Manifest
index 6ddcfb392fa7..497746be59a9 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 f9ddbc70b3fa713ba51b85b72f1324de989f704feadd9fcc8ea47d33fa54f5e35a93d8adbfff47ed2be8d626159c3a7ed72fa01502be09cc52b8a67b301f8c11 SHA512 e850247884f0716afa8748319b35323ed520f42a48f72ad540114fd4a8cb838e34d4072a76bc1e56f1abd8764b00d6e821d847301496ce4ea9277b0dd87519c5
-EBUILD patchutils-0.3.4.ebuild 807 BLAKE2B e00dfe5f2e37af73e1b4dd88b5629fb6dbdac3da7ef474637dad9f6a81dee8fa54f07fe4cd0269839ddd251baae44b195c4ad8e2880786184a61168d305d7040 SHA512 299fb22683bcad01b01418871bdbfdddab566dc9c39247d4b0e41cd69f5ce7a69d935e948375b094c62006547242448cdf806c2512ff5bccb4cbebc665b5c4fd
+EBUILD patchutils-0.3.3.ebuild 769 BLAKE2B 37c70e1dccbf9c8e97f111d531047b685df3ffda7d2c8cd3cbd32447cf69140d38f7c9bfaec559e047e1825f0528a52f820fca1838f4779a64b62613cb8bf1fa SHA512 f4a6e15e14f398f8a35fd6a6a5775c5b674a1c2b12afc220cc3d57a58cf9d9189101958b0d1fd882a4bdc32b8e60115204929c9dec9293a358919e41b4eabb8c
+EBUILD patchutils-0.3.4.ebuild 808 BLAKE2B cfcc4cd7904943c3c3c5645e16658fc566b87156199299e968f2654deca44dcd15ce053fffeb4cf0b05ec33bb242207ac3c12c45257be9f3cb365aef77bff924 SHA512 938b0c29e3bada32b739e4d52b06e75a5921f980ce67ce78658ba38d4817892d1cc44f400515f1a809c9c8d6594ff2e8a8ff9a7d4f3d3b7186a94b9d40610430
 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 c6c38eac90d8..9df571af1581 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 sh 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 sh sparc x86 ~ppc-aix ~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 e008ce9b9d5c..da99fa15d4df 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 ~sh 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 3b9e02002210..f76ecce4a914 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -1,6 +1,6 @@
-DIST pkgcheck-0.7.3.tar.gz 221266 BLAKE2B f4633a3c115913d8973b82f8ab6a4550334f5091fcf02d4557932e903e984fe659e75fc581a6ab10775630045c8d912bb34b098ffe75c563e338453d90e30b2e SHA512 2f2ec7ab8a43840e9e1ed419564835384419c87aa71f45f233714ddea0f66c837769e47502b3f12cd3cae4107c81e14b483f36c070da59964c0a9274965e0fa1
 DIST pkgcheck-0.7.4.tar.gz 222384 BLAKE2B 4461a4b01755a6e1095c4a80c001381807e7b153ecc1b7770b0b58e2f4aebc2db35cbe4f37354424ecb8c7d139cc2258568df28c00f0a0c082dec8831161c885 SHA512 11ba1ea9e40d56fb24c136296b8ff06643d3519e330421fd0ec336ff5d9fb079f9e04269cb1521a60e6d68fa5cd7c03e0c595a042d7f9ec77944a30e399abe74
-EBUILD pkgcheck-0.7.3.ebuild 1318 BLAKE2B 2c937d6a7b13c51a1a260e36042caa38db07e1267dc820fdd2be880f78a09b4e814ab8872fe930a1d95afd8983450a8ab6b6d7cafcd46ab8d8beb4d62d635ca5 SHA512 dbd792542bfa92a7b28cef7633fc9618e95c84ed940a6a5701f145e05e1752478f9c763c68f4914bfd6cc2309fcdb42e1b3c6eb124ed09d6429de5a07446e1ba
+DIST pkgcheck-0.7.5.tar.gz 229979 BLAKE2B 134a67e139fed22f70fc5af5a1644df17ac46ca093b47cae0d362702ff33be320b838ac7c3c6e6d3c309644f7399ff0c33d6e6152d385be8312311b760d636d8 SHA512 eb46847ad5293e5cd6043e5f1edbb4307bf41593bc19a44c73ccb67590545055ce9fd3cddc25e4cc693bb2666aaf24944070796546743e0d7417f8e47cd516d0
 EBUILD pkgcheck-0.7.4.ebuild 1318 BLAKE2B 9373935373bbb8d12d78e6ee7a3e179e0c2adb1987e1fb22f379352d62486806010ff0d9136a37eb051d29487968eddcaae7b1e0045eea8c30e088cdf463dd18 SHA512 6b5ab1b5492d99685e041a6f78960bf5f0fd23dea682ceb94bf080409dbba5aa3c7cdfc18796ca1a30ea8e7ddfde9fabc92394610a7cef7276e1690adaefd5b6
-EBUILD pkgcheck-9999.ebuild 1310 BLAKE2B fcc38dd1cf741fac1161f31b3c24b005f96f2cc9007d47272f132dbc52f6dc933f10312ca15d31218d7212beaceb97e196ea487dac8738d89abd35b591504213 SHA512 66300bb991470e73d030d54eb6d88680bfa9bf993b4deea62b641ce1ac7fb0b7c97b2fa5d5f57da8ea617db488f336452c8d4d5222acdc9a1b068ec0928222e8
+EBUILD pkgcheck-0.7.5.ebuild 1328 BLAKE2B de00cf2b30071fd2f9ae0dfe001cd1b42a41f77fba341ab06e0f2f623fd8ac10fd56593ab228d37b53e588fa79c5161eafa08c853842bf6255ec9bb7a9a8af4b SHA512 900be48478f2a12947263464f937c3f1b2868744ffbbee755c35fb08e1d982ab62ed165b4cb0d8cb11dbd3902a965691705885cb6e6ced6e6e481d96a54d4fc3
+EBUILD pkgcheck-9999.ebuild 1328 BLAKE2B de00cf2b30071fd2f9ae0dfe001cd1b42a41f77fba341ab06e0f2f623fd8ac10fd56593ab228d37b53e588fa79c5161eafa08c853842bf6255ec9bb7a9a8af4b SHA512 900be48478f2a12947263464f937c3f1b2868744ffbbee755c35fb08e1d982ab62ed165b4cb0d8cb11dbd3902a965691705885cb6e6ced6e6e481d96a54d4fc3
 MISC metadata.xml 658 BLAKE2B a3140b5593fe37271a936139ddb1d0d0155213476353176837cc8587d0da787f99fbe568ff81c88abd4e20638c62527abeb0267404eae03125f11711d52c38e9 SHA512 3854c339a8b6f209f52782225ab37f76333f023db3d6bd7ed927b79aecc79837918b6af1cf0bfecdb7bb9d64bab5fa47dc287b30eab2508fd3df0bb26ac55cb0
diff --git a/dev-util/pkgcheck/pkgcheck-0.7.3.ebuild b/dev-util/pkgcheck/pkgcheck-0.7.5.ebuild
index 4626c74a350b..61ffc645f69f 100644
--- a/dev-util/pkgcheck/pkgcheck-0.7.3.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.7.5.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=6
@@ -14,7 +14,7 @@ else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
-DESCRIPTION="pkgcore-based QA utility"
+DESCRIPTION="pkgcore-based QA utility for ebuild repos"
 HOMEPAGE="https://github.com/pkgcore/pkgcheck"
 
 LICENSE="BSD"
@@ -28,8 +28,8 @@ if [[ ${PV} == *9999 ]]; then
 		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
 else
 	RDEPEND="
-		>=dev-python/snakeoil-0.8.5[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.10.9[${PYTHON_USEDEP}]"
+		>=dev-python/snakeoil-0.8.7[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.10.11[${PYTHON_USEDEP}]"
 fi
 RDEPEND+="
 	dev-python/chardet[${PYTHON_USEDEP}]
@@ -48,7 +48,7 @@ python_test() {
 }
 
 python_install_all() {
-	local DOCS=( AUTHORS NEWS.rst )
+	local DOCS=( NEWS.rst )
 	[[ ${PV} == *9999 ]] || doman man/*
 	distutils-r1_python_install_all
 }
diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild
index cf118f1367de..61ffc645f69f 100644
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild
@@ -14,7 +14,7 @@ else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
-DESCRIPTION="pkgcore-based QA utility"
+DESCRIPTION="pkgcore-based QA utility for ebuild repos"
 HOMEPAGE="https://github.com/pkgcore/pkgcheck"
 
 LICENSE="BSD"
@@ -28,8 +28,8 @@ if [[ ${PV} == *9999 ]]; then
 		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
 else
 	RDEPEND="
-		>=dev-python/snakeoil-0.8.5[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.10.9[${PYTHON_USEDEP}]"
+		>=dev-python/snakeoil-0.8.7[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.10.11[${PYTHON_USEDEP}]"
 fi
 RDEPEND+="
 	dev-python/chardet[${PYTHON_USEDEP}]
diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
index 701d89a8afd6..c98ee7516764 100644
--- a/dev-util/pkgconf/Manifest
+++ b/dev-util/pkgconf/Manifest
@@ -1,4 +1,4 @@
 DIST pkgconf-1.6.3.tar.xz 291216 BLAKE2B 04bf58590e2f0b37bac7b24b3d595ad08680e85647548cbd642495398d95706f9f738af5c6f9b9ad8801567caa20ade85d4c4d74179f08313420683cb1b34263 SHA512 437c5a5c9866e2047e62e0592639930b2420d4afd41d98cef51f3475165418a39e916477860025314828a6ee0a4eefc10fdf26bda66f80c291f324d9674fa5c1
-EBUILD pkgconf-1.6.3.ebuild 1591 BLAKE2B c9f771bd5ba7eecb705cafa5fa0328e9269c696841bd97d138c69200e817b52fcaa9a4addd5c40fa48a60edb05326e8e114d3c37c6cb8bbc7688081d3360f677 SHA512 8607a4dc3fa5804113d36011053572a1d825081ac16af4d798d8c2c805c6354ecd4b5fd4aee9157986a3687b70e5aac3c1c85ed7dcb9ee5c066e1e8348517abb
+EBUILD pkgconf-1.6.3.ebuild 1592 BLAKE2B 0dff1ca5ec302dc66f04fe2fb295730f0d2f1a4ba2afd5826df1246adeb011a385ce223be65e67a37d0ddb65bea66005b86ad8d2860c3de6ae102613530b7d7d SHA512 09f80786140e8019c458df0c22a4c3e82f67ecaf91a65528b4e81f18c2c54bc075c793c9e51fc77cceb79a04517a9db889ab1f585cbc510a45035245ec7f9ffe
 EBUILD pkgconf-9999.ebuild 1602 BLAKE2B 1ba7450e57f37336244018485b633c33362dd1bd6416ce35e796277e0bedc151ec52d05a44775c1cfb397d0b46449396f618b67f6d2394a771067ebfdbc16263 SHA512 71bcf548c986c23df8828dd7cadbad978eb38a0b2d894b818fdf23d8fe471d6fa71770bc975ec8be7e59f198ba17324f52ceb5d9fa5899d782451f66ba52ad88
 MISC metadata.xml 605 BLAKE2B 316f82c4daabf91792e48e82973daaf0b0af972f7760636990e64c94e5e68b41b7cf65fa5d15387ce81a25926a5ffea19519ffe29a1ae487046d973708495b75 SHA512 68a71f55636e987c721da3c54451c75068e3261a0b462189fed45309bb4c286d0ec00a8a29962969b54ac8e31a13a34167cfc3fd44f5da8b84e4ce36eb5b4b10
diff --git a/dev-util/pkgconf/pkgconf-1.6.3.ebuild b/dev-util/pkgconf/pkgconf-1.6.3.ebuild
index 6168c2b91e2d..5139a7fa44c9 100644
--- a/dev-util/pkgconf/pkgconf-1.6.3.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.6.3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://git.sr.ht/~kaniini/pkgconf"
 else
 	SRC_URI="http://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
 fi
 
 DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
diff --git a/dev-util/pkgconfig/Manifest b/dev-util/pkgconfig/Manifest
index 4055455faf03..2acc04dfbf72 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 2884 BLAKE2B d024e6529e8e5ec34f9a0b87cf670c3a61e58430c8b335f183594a0f5f36afe2f9b72d38e58490b17751aa79f537b40fd193198a4b10470ad535371b1801caa9 SHA512 7eecb0dd1bff91c0833b85db3783ae48e13dcea9938c10508362b5032dc5e5c0cd801a0e4e4e3a2d0e67a9aefb74ca26a33c5671ded54795cb36a33ddc62957c
+EBUILD pkgconfig-0.28-r2.ebuild 2885 BLAKE2B 604eff7ba183b8350b29d3265b75866fdb86d1e4b54961d6aa0fe1329390d59b17aa94e3e45d69616659f9c6564b153ac464ae7445a6787e5833de177a2de683 SHA512 81695c9ad21293244912f6cbd215e106513075e5668a25622b52aa7caaeb9209b67ff451e9728bc6f8aec006039352cb728a2c2a493cbd05bd25f926390349c1
 EBUILD pkgconfig-0.28-r3.ebuild 3407 BLAKE2B fe8af7216656d1b541e2d90cf3f0fbc8f14f57ba44f20ecde0e0e0c107c685ee17bd710b31b9bb87d0d4d955c5f1e118b332fe2409b5c09cc648686e9b143064 SHA512 c426d31cf521c00edfa554fe8b1cdc4f1588f3e804af228d168f6a729ca45206b8d4f8c96a0e7f8af331cca7ebb379b7f37c514ccd70fe582e7f2df0511a80ba
 EBUILD pkgconfig-0.29.1.ebuild 3771 BLAKE2B a86d9a18a4d9509816fe4332f3d9558cde720438dae73e5e7ecf3abd78a0c8f999abf7923fbf63eb40e6a19e83911fe139cfc8903fe518c7f479964aac643e78 SHA512 e5b8ce820b4d1ee9db40ad8248ebac2050e3af964916464b3484855787e7a56c8bf16974c30ea79ed9362c39fc058d7cb3ebf81e9c4e9e3ef69f79b854af01e3
-EBUILD pkgconfig-0.29.2.ebuild 3762 BLAKE2B 034bd9bc76c8f41ed2c49e645dea9b6b3abb78803517139036f87d65fc1c8770fbfa36aa4531d74e2e0bb7a071eee5964c558ef454d02bfc6aa14e6e89e76ba8 SHA512 ce6de7b5c146c46313edc4e716a8cc37928ee3b26e5282d658a330a7641eb59b9bb254a4a58be4361ba47854fed9299d7f6716ae5272037b9b1dbc0baf143ee6
+EBUILD pkgconfig-0.29.2.ebuild 3763 BLAKE2B f6ed3305ac08a7367a9397551cafa11d3e65647d44a4b18e082c27d89905ec2cfc175ec29c24e0ed046e8f660a086a0f585dd693696887fc4ddea3052b42f1cd SHA512 78f5d24496f6cf130b6588197d751946139767e21efb3164f6460c7fd7f1d1bb9ff47726bcaa93dd8f37220f6b15d6ebbfc8120b84b302d4ef49490781e99c27
 EBUILD pkgconfig-9999.ebuild 3771 BLAKE2B a86d9a18a4d9509816fe4332f3d9558cde720438dae73e5e7ecf3abd78a0c8f999abf7923fbf63eb40e6a19e83911fe139cfc8903fe518c7f479964aac643e78 SHA512 e5b8ce820b4d1ee9db40ad8248ebac2050e3af964916464b3484855787e7a56c8bf16974c30ea79ed9362c39fc058d7cb3ebf81e9c4e9e3ef69f79b854af01e3
 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 cb52ca9d7d5c..ffa0e0977fd6 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 sh 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 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
 fi
 
diff --git a/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild b/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild
index 614a58376914..4a986a433676 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 sh 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 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
 fi
 
diff --git a/dev-util/pycharm-community/Manifest b/dev-util/pycharm-community/Manifest
index 4d00a43e545d..5b0f7c7e2b64 100644
--- a/dev-util/pycharm-community/Manifest
+++ b/dev-util/pycharm-community/Manifest
@@ -1,12 +1,6 @@
 AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73156f63892b1e126ac068d5b2f271d1b71a77486205848cce72452d671692418b6e09e8e25da60e SHA512 a0254552b98b6ec8dadd91ed7df35bf990d08025d8352366f58ecabe94cdde2df64d8665447d0a2ffc1edacdeb05124c2a82722d5ad70b614d90bb0ae38544d2
-DIST pycharm-community-2019.2.3.tar.gz 360509772 BLAKE2B 8924e6b5e2823c26a96531d14bc60f01f0849a5cca3c87bdff7c23c304081e668aecb1b2c681622c472cacf4b2e1f58c5fa4e42624f204491d27e37785146fd3 SHA512 65f834ba20cddb93533d596430f8b537167f32e99d224758d9fd4407f95304609912dec7f11cf61f9edf2e30722f1624250f44765c0f83dcbf6815bb8c35d9d9
-DIST pycharm-community-2019.2.4.tar.gz 363680469 BLAKE2B d550dc8144746c0b4bcff408531eba289896dc325eea99a2d2a4363cfaca00de55045cff54a3163acd15105b0705dc48ac28374831bd6f0f6842823cdf4b5ceb SHA512 f7d12ccd8309bf547d1f37853977772d7ab023ebebcc71c6f09f71a21ae9bfceb8718d9ebf77a7717e1b145f56ea902d8d02d573d658b7db540696fb9630b0d3
-DIST pycharm-community-2019.2.5.tar.gz 363809835 BLAKE2B 12310ca0c5a497d70f644d7eaf0b2de2ebe3c6bbaa30727df3fb7381e063facf3ee256af0a8636317559dab2573092e482dfa5baccfc9bef20cafd12e9c28734 SHA512 9054c6a9e48e609b45d786b66db045457d33f916248e949a8d6997e53e4a3b5fe0da00757f13c3cb48ab5f074c971e200d42b14f7941a7d91e1c903f3b5e244a
 DIST pycharm-community-2019.3.1.tar.gz 389620376 BLAKE2B a780ab27feef9747539d9cd607b67c7e047d0a7c1eb6b090a63c4f1c11c80c49e5091a29d80ea249ace1f16acdcd418f0a4901e10c2c623e792da9d7d0e7c9d6 SHA512 4bfa78a5f3993e85ad5ba624ed9e586d195b9f4bffa8bd764e8dba27edc1cdc0bd2b3bba86135156c1f306601db290703e61e7561badc7dcb634dc5826134b1f
-DIST pycharm-community-2019.3.tar.gz 385414079 BLAKE2B 6a3a4393ba6ef84a7ec09c2f6ea0ce631ea1d4a004686beeedbee91ee2d3de6273455ef1e8e9f8f0f42360f9b4e42741d81a11825fd9c53e2ed90a987661ba20 SHA512 371619a5716de4df1fd68307f87c877eb435b30f797f06305b228566380f658a18f25022deaa581af9653a5745f2cee0157a9ae83b7be9b97f80aea8b4889496
-EBUILD pycharm-community-2019.2.3.ebuild 1081 BLAKE2B 67dcc04b86db58f962198ff8209e602ecfb355f59b465d343071f1ee55894561c0ec19c3e58a8512d4812f4c28f8506bf5266ecd536dc2ebfeb023228acb45b8 SHA512 f3c51c3027b8c0975ed94d3b25a2ba5d1bdd512e9d0b2236b534ad88776aeccfb4c9313bcb616eafb06bacde6d6845a5b9fa01e7998f5828141b06af23ca31d3
-EBUILD pycharm-community-2019.2.4.ebuild 1083 BLAKE2B f2c2ec95fd92da8e5fd64406cc2383e1debf43622b09ff827f7f6297615063743bea010787c81d02f8528f5e13d4a46f7ae9e9e340fd8b5ee15d0694c8812af5 SHA512 e0849f4780b1a50af59a3e5195e28654d6d0bc589022c59430d37666bc1aa7579223a312e82638d5d76051b8aebe6f52459d224dd0dd386ec2105b06801af722
-EBUILD pycharm-community-2019.2.5.ebuild 1083 BLAKE2B f2c2ec95fd92da8e5fd64406cc2383e1debf43622b09ff827f7f6297615063743bea010787c81d02f8528f5e13d4a46f7ae9e9e340fd8b5ee15d0694c8812af5 SHA512 e0849f4780b1a50af59a3e5195e28654d6d0bc589022c59430d37666bc1aa7579223a312e82638d5d76051b8aebe6f52459d224dd0dd386ec2105b06801af722
-EBUILD pycharm-community-2019.3.1.ebuild 1083 BLAKE2B f2c2ec95fd92da8e5fd64406cc2383e1debf43622b09ff827f7f6297615063743bea010787c81d02f8528f5e13d4a46f7ae9e9e340fd8b5ee15d0694c8812af5 SHA512 e0849f4780b1a50af59a3e5195e28654d6d0bc589022c59430d37666bc1aa7579223a312e82638d5d76051b8aebe6f52459d224dd0dd386ec2105b06801af722
-EBUILD pycharm-community-2019.3.ebuild 1083 BLAKE2B f2c2ec95fd92da8e5fd64406cc2383e1debf43622b09ff827f7f6297615063743bea010787c81d02f8528f5e13d4a46f7ae9e9e340fd8b5ee15d0694c8812af5 SHA512 e0849f4780b1a50af59a3e5195e28654d6d0bc589022c59430d37666bc1aa7579223a312e82638d5d76051b8aebe6f52459d224dd0dd386ec2105b06801af722
+DIST pycharm-community-2019.3.2.tar.gz 391689310 BLAKE2B 11627839e823e2d6c946f5fa25df28cb919960300c51dcc2883989341228604dad9ebf365ffc055809bf3768d757b40cb059a7b5cc492935733c5576ff3f9933 SHA512 6c9e607d938a23be78b4acb5aa39e6276720347aac6fadfbaf456e4f05af4b55ef24f4a97f3aca91b6f09d68af7ec834a5af5e08b775d1439d573cff6c6d3e7c
+EBUILD pycharm-community-2019.3.1.ebuild 1081 BLAKE2B d49f11879fd7738cc89bb207314120b1b4348085253d5cb6d125501e287f4ea30cfa0599d37eeec7ddff905f97786cb6a171c394ea352ebbac5d47d13e231396 SHA512 c67c25fc781b5219231b48aec8ddcd8051c23de6c4766b80d511d363c44cff1a5aaccea98d716ecb7ae4360c419bb9ea390d396704f1da11fb5c2de0ad6674ef
+EBUILD pycharm-community-2019.3.2.ebuild 1083 BLAKE2B 057214393559bdc2d33c91678fbb068fafde2ab6add11db7b70206df9c89c2645e74b85bc11b864140a92fd41c6681fd33f9bc5105e6971b4a7e4b0697b5cc5e SHA512 d698a7a3ff14fc505f3a340607c78ee5c2df2054e140a8f265ac5a9a84c6f8f12c33bee2ff063fc00c59b3df612cab0eeb4cee19db04a9efbb03e7f4242a144f
 MISC metadata.xml 243 BLAKE2B cb7dd17733891ded65a8bf58abb3bdbdf30cd714d8dfd0cc9f83c6a53e979dca2cf2b1a31e3dbb2610df6000ef9c774f1840e9f453855c286687649a01984225 SHA512 0d6cf75e47bf075548f8c3e929caad7d6db621737788cbaadcf00e761a6b5ca50341db48171e6a16e905c91bcb9af57f6a98acfbf3d127dcdf84c17a4c4821e8
diff --git a/dev-util/pycharm-community/pycharm-community-2019.2.3.ebuild b/dev-util/pycharm-community/pycharm-community-2019.2.3.ebuild
deleted file mode 100644
index 92e344b69eaa..000000000000
--- a/dev-util/pycharm-community/pycharm-community-2019.2.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=virtual/jre-1.8
-	dev-libs/libdbusmenu
-	dev-python/pip"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm"
-
-MY_PN=${PN/-community/}
-
-src_prepare() {
-	default
-
-	rm -rf jre || die
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/pycharm-community/pycharm-community-2019.2.5.ebuild b/dev-util/pycharm-community/pycharm-community-2019.2.5.ebuild
deleted file mode 100644
index 3bd1b2cb4101..000000000000
--- a/dev-util/pycharm-community/pycharm-community-2019.2.5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=virtual/jre-1.8
-	dev-libs/libdbusmenu
-	dev-python/pip"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm"
-
-MY_PN=${PN/-community/}
-
-src_prepare() {
-	default
-
-	rm -rf jre || die
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/pycharm-community/pycharm-community-2019.3.1.ebuild b/dev-util/pycharm-community/pycharm-community-2019.3.1.ebuild
index 3bd1b2cb4101..1a25b87bcd87 100644
--- a/dev-util/pycharm-community/pycharm-community-2019.3.1.ebuild
+++ b/dev-util/pycharm-community/pycharm-community-2019.3.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=6
@@ -11,7 +11,7 @@ SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
 
 LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=virtual/jre-1.8
 	dev-libs/libdbusmenu
diff --git a/dev-util/pycharm-community/pycharm-community-2019.2.4.ebuild b/dev-util/pycharm-community/pycharm-community-2019.3.2.ebuild
index 3bd1b2cb4101..0600c9803a8d 100644
--- a/dev-util/pycharm-community/pycharm-community-2019.2.4.ebuild
+++ b/dev-util/pycharm-community/pycharm-community-2019.3.2.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=6
diff --git a/dev-util/pycharm-community/pycharm-community-2019.3.ebuild b/dev-util/pycharm-community/pycharm-community-2019.3.ebuild
deleted file mode 100644
index 3bd1b2cb4101..000000000000
--- a/dev-util/pycharm-community/pycharm-community-2019.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=virtual/jre-1.8
-	dev-libs/libdbusmenu
-	dev-python/pip"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm"
-
-MY_PN=${PN/-community/}
-
-src_prepare() {
-	default
-
-	rm -rf jre || die
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/pycharm-professional/Manifest b/dev-util/pycharm-professional/Manifest
index ad5a6cc51d73..f87c912833fa 100644
--- a/dev-util/pycharm-professional/Manifest
+++ b/dev-util/pycharm-professional/Manifest
@@ -1,12 +1,6 @@
 AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73156f63892b1e126ac068d5b2f271d1b71a77486205848cce72452d671692418b6e09e8e25da60e SHA512 a0254552b98b6ec8dadd91ed7df35bf990d08025d8352366f58ecabe94cdde2df64d8665447d0a2ffc1edacdeb05124c2a82722d5ad70b614d90bb0ae38544d2
-DIST pycharm-professional-2019.2.3.tar.gz 482051405 BLAKE2B e299c2d545b808ed15b4775acb003137467694f528a088cd84d7055a9c15ead96a9e0ac6599374faf60fab3c2ca72a390157130411f4b15bc2b7e3f4b41f0c8e SHA512 4474a74d2762b202100ddbcdfa3807a8136bd392200c79b795cee34a843716218ac21d1d7ed3ac7df9b3c6241f77658a535274759473871cd23a4cc4cfafcfdf
-DIST pycharm-professional-2019.2.4.tar.gz 485589877 BLAKE2B c2af015129eec902927ac1b33860ff696e7e3f994a1c827b6e31c84a87a6163262c95a579ec2d4d3c801612af8f8f23b23b432db470f30b199ddca7c6874a37a SHA512 c4fa438ee4ef1de66839a225f61e2b8ecb6e49f41da4099fe0ed8da4840c72c34886a76e090e47fc5ad9f7112b339fec01f5617935e490314d7e73a4585f4ce9
-DIST pycharm-professional-2019.2.5.tar.gz 485853232 BLAKE2B 3bb3576dc8919bdab511a1003353fc910ace2a3553fa7fdb116545c3eceebafc28804abacb88af06ca9c399a0a9c75244fd624d0a84e6db91a56c4ca00398fa8 SHA512 f35d49a0df01431aa72af225e09dfdf2b4f535b342ce3ab4725853a02b524a19a9da89dabdd72a08e294fce5387067ee5a7cc005c28c29717771867ca3377848
 DIST pycharm-professional-2019.3.1.tar.gz 509724729 BLAKE2B cd466d9c2b0f9be8442c719066d5647f0b9631dde38b782d23250207760247380419d7470826da2d5c4203dbca2742aa8fcd1987a4204d229cd700ac6f6a68f2 SHA512 3c3ad0546926dac4a0e336e04a16bb5f630066c7b2abeb16eda698fcc92dd0c165237bb3ad9b6382b38b989e67b8c3a4649bf8361421c7da6916a99eb3ea4633
-DIST pycharm-professional-2019.3.tar.gz 503439093 BLAKE2B 9d28800534320986cd513fa48cd5f39ea5bb848cd947fdece0289d3c41d5198f3487e453296fcc718057a05d8d0077bc25e209b955dd59ad3bcfa76d1cf94966 SHA512 ec81f418ffd22a8911050a51eeb01c853ded55c528856a4b39b3402cb52ec8b3ab3517a8a4f2b90872437a2740a189d40bc322ee78231cdeb102f1ae60607fa6
-EBUILD pycharm-professional-2019.2.3.ebuild 1225 BLAKE2B bffb2416b7700db9acedd379c865121ee37ca5c7452fa64968f8aed6351646d904e0d3e148ca66381f02e3fdb0892e7b9401c59df24813a29c15d7bd95f8ef49 SHA512 d040e96a09e91f41db9ada5372166721831b03ddb6068f45ee068c6ad5613a818487cd4274986ff4003624641a6c5634301b6e1f9b38641ffee05c75cf7a086e
-EBUILD pycharm-professional-2019.2.4.ebuild 1227 BLAKE2B dd334c694c3c63674c201433681e3479933eadf1cd820caad7517d1537a48a9946be51008df2e7706b3555bfd37e1f8c098fb602e61e0158fb5c2a5b0c5138a1 SHA512 e7a78b065d06590bd0e7cf3b569984016c8f28e0758b61805fc151582faf70d85085876e2917cf09eec16a642f08168cdf9284283c01b74bde6fcd8172b7cd35
-EBUILD pycharm-professional-2019.2.5.ebuild 1227 BLAKE2B dd334c694c3c63674c201433681e3479933eadf1cd820caad7517d1537a48a9946be51008df2e7706b3555bfd37e1f8c098fb602e61e0158fb5c2a5b0c5138a1 SHA512 e7a78b065d06590bd0e7cf3b569984016c8f28e0758b61805fc151582faf70d85085876e2917cf09eec16a642f08168cdf9284283c01b74bde6fcd8172b7cd35
-EBUILD pycharm-professional-2019.3.1.ebuild 1227 BLAKE2B dd334c694c3c63674c201433681e3479933eadf1cd820caad7517d1537a48a9946be51008df2e7706b3555bfd37e1f8c098fb602e61e0158fb5c2a5b0c5138a1 SHA512 e7a78b065d06590bd0e7cf3b569984016c8f28e0758b61805fc151582faf70d85085876e2917cf09eec16a642f08168cdf9284283c01b74bde6fcd8172b7cd35
-EBUILD pycharm-professional-2019.3.ebuild 1227 BLAKE2B dd334c694c3c63674c201433681e3479933eadf1cd820caad7517d1537a48a9946be51008df2e7706b3555bfd37e1f8c098fb602e61e0158fb5c2a5b0c5138a1 SHA512 e7a78b065d06590bd0e7cf3b569984016c8f28e0758b61805fc151582faf70d85085876e2917cf09eec16a642f08168cdf9284283c01b74bde6fcd8172b7cd35
+DIST pycharm-professional-2019.3.2.tar.gz 513486485 BLAKE2B eba9f0adb8f289f42ee2f50df506dfe628e3b835aedd7a8c0c03da39e5bc5921a6600ea7194c81674a5aad50cbc2f2afb0387dcc88a037e1a92a4fa0f2f3984b SHA512 e3a0e750c821ebd6736e39641d635db1c0a3aa00592d7ede204ce547fc12d69209a253caa4284f76607543f08da594f29ca38c3f8b586848c5b2277ae7227b8a
+EBUILD pycharm-professional-2019.3.1.ebuild 1225 BLAKE2B f391b217ab5e079cea973682a259b5c9e2a538f81536c6d52134b6316239e11bee5badf789db2850c6241b448691c8101b44d5d1b562c8c27e2cc67902b8b203 SHA512 5fa13adbab2a9e321d955dd66fd3788a3a27dcb40a8214ebb100d6fc71abc357cbd1c10b0dd5468dbfef5a4c19c61779fd9e1e26e9c6face057e25d9ffedcc0b
+EBUILD pycharm-professional-2019.3.2.ebuild 1227 BLAKE2B 32b33249906a636ce0a79164c09470c742bb7a207300c347b9fcd4c5ef660b917e58df07adfed39f8cd3d44a9905eecddb96969cb2860b9acbdd1c743fb15613 SHA512 185ca8aa08be3fefb66efd0e8e8d0fa6ca3b7f363fee26c5d152f66b29ac08fc2dbb9b99f0ce611237c5e76f33be8fba61354eb607825a4c8801b18cb9abce51
 MISC metadata.xml 243 BLAKE2B cb7dd17733891ded65a8bf58abb3bdbdf30cd714d8dfd0cc9f83c6a53e979dca2cf2b1a31e3dbb2610df6000ef9c774f1840e9f453855c286687649a01984225 SHA512 0d6cf75e47bf075548f8c3e929caad7d6db621737788cbaadcf00e761a6b5ca50341db48171e6a16e905c91bcb9af57f6a98acfbf3d127dcdf84c17a4c4821e8
diff --git a/dev-util/pycharm-professional/pycharm-professional-2019.2.3.ebuild b/dev-util/pycharm-professional/pycharm-professional-2019.2.3.ebuild
deleted file mode 100644
index 0f418726afde..000000000000
--- a/dev-util/pycharm-professional/pycharm-professional-2019.2.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=virtual/jre-1.8
-	dev-libs/libdbusmenu
-	dev-python/pip"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm
-	opt/${PN}/bin/libyjpagent-linux.so
-	opt/${PN}/bin/libyjpagent-linux64.so"
-
-MY_PN=${PN/-professional/}
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	default
-
-	rm -rf jre || die
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/pycharm-professional/pycharm-professional-2019.2.5.ebuild b/dev-util/pycharm-professional/pycharm-professional-2019.2.5.ebuild
deleted file mode 100644
index 9196130c9fd9..000000000000
--- a/dev-util/pycharm-professional/pycharm-professional-2019.2.5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=virtual/jre-1.8
-	dev-libs/libdbusmenu
-	dev-python/pip"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm
-	opt/${PN}/bin/libyjpagent-linux.so
-	opt/${PN}/bin/libyjpagent-linux64.so"
-
-MY_PN=${PN/-professional/}
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	default
-
-	rm -rf jre || die
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/pycharm-professional/pycharm-professional-2019.3.1.ebuild b/dev-util/pycharm-professional/pycharm-professional-2019.3.1.ebuild
index 9196130c9fd9..849067cbac14 100644
--- a/dev-util/pycharm-professional/pycharm-professional-2019.3.1.ebuild
+++ b/dev-util/pycharm-professional/pycharm-professional-2019.3.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=6
@@ -11,7 +11,7 @@ SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
 
 LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=virtual/jre-1.8
 	dev-libs/libdbusmenu
diff --git a/dev-util/pycharm-professional/pycharm-professional-2019.2.4.ebuild b/dev-util/pycharm-professional/pycharm-professional-2019.3.2.ebuild
index 9196130c9fd9..bb09db041ff9 100644
--- a/dev-util/pycharm-professional/pycharm-professional-2019.2.4.ebuild
+++ b/dev-util/pycharm-professional/pycharm-professional-2019.3.2.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=6
diff --git a/dev-util/pycharm-professional/pycharm-professional-2019.3.ebuild b/dev-util/pycharm-professional/pycharm-professional-2019.3.ebuild
deleted file mode 100644
index 9196130c9fd9..000000000000
--- a/dev-util/pycharm-professional/pycharm-professional-2019.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=virtual/jre-1.8
-	dev-libs/libdbusmenu
-	dev-python/pip"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm
-	opt/${PN}/bin/libyjpagent-linux.so
-	opt/${PN}/bin/libyjpagent-linux64.so"
-
-MY_PN=${PN/-professional/}
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	default
-
-	rm -rf jre || die
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index 6ee009aaa3be..69fe0fa8fbd8 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,12 +1,8 @@
-DIST radare2-3.7.1.tar.gz 7481103 BLAKE2B 4bae07dad298a45704ee45740bc3376902dfa35631efc94874666ead0b9c3dbb407558f4c02283d0909970247bc7730754cad9c6b6859a23ab40f408eff9102e SHA512 972c137e20d73a4cc8001c6d3e3b0c68874ed4a837d2ec20f26bc164a5451dbd46264471adc93332eecadd86d8023579fa69b42fce0291f49979b451118c7673
-DIST radare2-3.8.0.tar.gz 7510078 BLAKE2B c3dcc28c0cda8c7c5f8dbc6d35c3d15fa73fec8402acfd5de0b3ea85ef0295608d2332efbb29a41e75239acafb66b1c3b946f58523d9e5bb605b70ddce3ce38d SHA512 c9a1a4e7743b54026990d7473f05fb8eb25d7a7f0fd985172587ce82b8f6fefb53dd181b0bdb8463d2460c71e4a9eb377ead4ef7379615c90aa858d8fcadeadb
-DIST radare2-3.9.0.tar.gz 7519146 BLAKE2B cc64567c3ce4c0c764f288fcd8110a7ce25cc15fb6a977fc489ce7ad9b697d628d87ff9280601fd00a53a79fb8de3b7fdc83dff56463addfa80f3528ccb733ab SHA512 7198c6fb35778d93fdbba5dd3dceddb7af21d555fb42f22752c8898ccba44fdcba92a6c502ddc8bdda71b883df392168ece807325b53cf75537b4ec59d86e42a
 DIST radare2-4.0.0.tar.gz 7558070 BLAKE2B 9c7cb4492832c97c4f71c9583ecd78af843551fa0d02a07b29cf76c04062ce9e71e8d8fd72e87260311896f61ec709e577b328215c69d52598218d566f98d543 SHA512 3877088f61d8fac6a8fa12a35ef895904473e1db7e7428961eb06822ff1218338cd5b9ab16f78773413b31fec7463963b0cc3f801c661ce17cd40c8ddd423d76
 DIST radare2-4.2.0.tar.gz 8074915 BLAKE2B c82bae7eff90a1436ce0963141ba631e8d23f66fbbba3afd52001ab83ef84162dc5e92d251bd47a2670c470efe6dd269357ce020b86d437bb9ffb605a2d59f3a SHA512 e1e3f825f1faa1df035bf4658b4dbfb03a148353c7d74bf444e96912751eedf5d3d564b3fd5dd60667cac347710e56db149bf0987ee1ea26fafbc5c4ddb56dc1
-EBUILD radare2-3.7.1.ebuild 1153 BLAKE2B 1cc298178177ac134372b197db6eb55f771a109b471691e70bcf0568ca390372774304a48610afb60a3dea1f351c9364a401783c63a7a8787591310284712aa5 SHA512 14e492a96c651ee9b48ac9b2add74f1559dbcc32dac568c9273f1609188d86eb54a032ab174e476ee5e1451120ffbf88c1a5d0cfad17ebb55223e5383cb64797
-EBUILD radare2-3.8.0.ebuild 1153 BLAKE2B 1cc298178177ac134372b197db6eb55f771a109b471691e70bcf0568ca390372774304a48610afb60a3dea1f351c9364a401783c63a7a8787591310284712aa5 SHA512 14e492a96c651ee9b48ac9b2add74f1559dbcc32dac568c9273f1609188d86eb54a032ab174e476ee5e1451120ffbf88c1a5d0cfad17ebb55223e5383cb64797
-EBUILD radare2-3.9.0.ebuild 1153 BLAKE2B 1cc298178177ac134372b197db6eb55f771a109b471691e70bcf0568ca390372774304a48610afb60a3dea1f351c9364a401783c63a7a8787591310284712aa5 SHA512 14e492a96c651ee9b48ac9b2add74f1559dbcc32dac568c9273f1609188d86eb54a032ab174e476ee5e1451120ffbf88c1a5d0cfad17ebb55223e5383cb64797
+DIST radare2-4.2.1.tar.gz 8077107 BLAKE2B 490b063d7340b60cec1f77577985818c9dec34dd9206ce7d9db29f5d1836d515044e67d143f81fd7f6c58269f6f62f0bd87adcdb7cfb2cca5c0120d98ea29fd3 SHA512 aed37f6ff7ae3a25e809e8fbab3ef1c370dba80b7b8ef440a025edfbda23314ce20990b3e89589fe6bee427b2beebabd67a9e1def603e53ca5078bf32bdc4e6c
 EBUILD radare2-4.0.0.ebuild 1159 BLAKE2B 60bd15815bc419615783ddd99a7a606c38cacc1c1727a32c1ab6c327172af4922dd1a67c226ad91877fe6a288b4a3240665e8832faa26aed06e18f6ed3577c84 SHA512 656e5f0b705f533d34ebbae4e43943c55d1b6fc8cb7abb808a1be8576719687993ef64aca6c134bd84fe611037d61bc985cfe5bc8c3074e7a93536d4f4721eab
 EBUILD radare2-4.2.0.ebuild 1159 BLAKE2B 979869367436022a049bff280f0c2fb72d61ec24546c2aaac9ff588b5677d1feae9f0a60559f7b488ac2c2c0d955e7de4d399b27a9f275918c08118bee020213 SHA512 014d8eb9417ac50fa56161bd1fc48b375126d5090ac2165b940a246756ec58a1bc84f3f5be70756194a602077091543a642e17b141f91dadc72cc8068f723e55
+EBUILD radare2-4.2.1.ebuild 1159 BLAKE2B 979869367436022a049bff280f0c2fb72d61ec24546c2aaac9ff588b5677d1feae9f0a60559f7b488ac2c2c0d955e7de4d399b27a9f275918c08118bee020213 SHA512 014d8eb9417ac50fa56161bd1fc48b375126d5090ac2165b940a246756ec58a1bc84f3f5be70756194a602077091543a642e17b141f91dadc72cc8068f723e55
 EBUILD radare2-9999.ebuild 1159 BLAKE2B 60bd15815bc419615783ddd99a7a606c38cacc1c1727a32c1ab6c327172af4922dd1a67c226ad91877fe6a288b4a3240665e8832faa26aed06e18f6ed3577c84 SHA512 656e5f0b705f533d34ebbae4e43943c55d1b6fc8cb7abb808a1be8576719687993ef64aca6c134bd84fe611037d61bc985cfe5bc8c3074e7a93536d4f4721eab
 MISC metadata.xml 361 BLAKE2B f92dfa8905623cd3a34f0b61766ae071d09801460b8b2a13bf4c3bb0a4715446b61b79309101b032511851f9d7a15973bca97ce9d1ed667266e2d6a3485933a2 SHA512 fb01d7b5abd1966cf270227640d1e4197a09930afb6f03e18bf4f79ba74e73fd86782b99efbb710b697315c25b63e575ec6120fb1cedaa19d4562831f41f81a4
diff --git a/dev-util/radare2/radare2-3.8.0.ebuild b/dev-util/radare2/radare2-3.8.0.ebuild
deleted file mode 100644
index 0b3f4cfb432b..000000000000
--- a/dev-util/radare2/radare2-3.8.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 eutils
-
-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/radare/radare2"
-else
-	SRC_URI="https://github.com/radare/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/capstone:0=
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		--without-libuv \
-		--with-syscapstone \
-		$(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
-}
diff --git a/dev-util/radare2/radare2-3.9.0.ebuild b/dev-util/radare2/radare2-3.9.0.ebuild
deleted file mode 100644
index 0b3f4cfb432b..000000000000
--- a/dev-util/radare2/radare2-3.9.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 eutils
-
-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/radare/radare2"
-else
-	SRC_URI="https://github.com/radare/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/capstone:0=
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		--without-libuv \
-		--with-syscapstone \
-		$(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
-}
diff --git a/dev-util/radare2/radare2-3.7.1.ebuild b/dev-util/radare2/radare2-4.2.1.ebuild
index 0b3f4cfb432b..c3c2387a8dcf 100644
--- a/dev-util/radare2/radare2-3.7.1.ebuild
+++ b/dev-util/radare2/radare2-4.2.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
@@ -10,9 +10,9 @@ HOMEPAGE="http://www.radare.org"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/radare/radare2"
+	EGIT_REPO_URI="https://github.com/radareorg/radare2"
 else
-	SRC_URI="https://github.com/radare/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/radareorg/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
diff --git a/dev-util/ragel/Manifest b/dev-util/ragel/Manifest
index 01f0a4662195..35fdafae7382 100644
--- a/dev-util/ragel/Manifest
+++ b/dev-util/ragel/Manifest
@@ -8,8 +8,8 @@ DIST ragel-6.8.tar.gz 1211146 BLAKE2B 41d3feecb461cede104182d918e1f052256daa292e
 DIST ragel-6.9.tar.gz 1226871 BLAKE2B c6edc63eaa21a1529c5600d8491fdce39cff5180fa132046f48c32971e1698fea820c41735f4d74b332de657fdd4c81aecda71beb9d5cef71c27246d606b6b72 SHA512 46886a37fa0b785574c03ba6581d99bbeaa11ca65cf4fdc37ceef42f4869bd695694cd69b4b974a25cf539f004cb106e3debda17fc26e1a9a6a4295992733dbd
 DIST ragel-7.0.0.10.tar.gz 779503 BLAKE2B 2f7b8bb858555719b0c7afa8209be76fd07f9d06a8f75df723211c48d59f50c21f09a1f1fa031d53e434db933d1bc12299c75d8932485e5a43eccef7506667ad SHA512 2d1d4c469d8581239ec21f128e94ab452b398903302f82ef59ce03d6fb89bc89de6441dbe53ea99d7689866f7aec485ab1ec9c537908f21eb1394650b55413ba
 DIST ragel-7.0.0.9.tar.gz 850078 BLAKE2B 0e7d458e9f78fc7e0fb2e9a0c6fdd3f3789a9104f4441bc878ac64d077dee716e27d3a54c3898fcf1e4ba56b8d46d956a36b92258750f2541fd96f951038d852 SHA512 87de7d41af4a08f09d422a0e58820f9b5b1218acc4733c58690feea4f872790813b5f2d7505ce147a2a6e1bcd341926c35fed7c6b55f543bdf864b119868bcde
-EBUILD ragel-6.10.ebuild 930 BLAKE2B ad400ece265f290ebb1fad3a6a5ecc83a88780a5ae0f6edc9f418730455d4b73c671c03e280adbac65ee6e270aab37827baae4bee3ee6b48e63b70c7ae6403ef SHA512 a6bb234dcb8527dec749965fd76cb0ab8c9de62152d1cc0e76379b2224960ff663b37253be3779c16241316c88bc764d5bd6fd0035b13b3343217923e2745b2c
-EBUILD ragel-6.7-r1.ebuild 1130 BLAKE2B 6f6480f6191cda811cabf2fd45875c376f617faad742f49aa51cc0c4b5e8c83752b93c08aba17ec05cd58981d952b5f02df0e78872655962808fb4f08b1fe3b4 SHA512 25461f40bae5fdbe10ad5a57f57bc4a6c60c9d37739c5dd23e003d0bacb5c596360926529f7b5d249fb343ba1729785c639a64a3f4c0970efd55b609f62d8b06
+EBUILD ragel-6.10.ebuild 931 BLAKE2B 848bba39a409b486addd653f6bc30b7984d053588480db15d531aa49cbd68c4937ed84ebaa5acb82ade021a3bdd76c554cb523d6d4ad14077cd062214f74c593 SHA512 8cddb0d2a58502b8c5acaeec5d7dba402ccb361e99ed0b0002671b0c49f85732b139a29b1578bbdc66b129ef3716866f097f0849ef50c03830d32eeb4f4afb53
+EBUILD ragel-6.7-r1.ebuild 1131 BLAKE2B 7bcbcab1cc0e8d378c6c188b27acd926f8861fed763e276e6f0e80cb6864163ae49d3f6f98b04df17547fe4d5743b289da236009d979000f65256fd950010964 SHA512 9cb9b035be697203ea93d74f250e766142e096570e924f4d1420ba951840ff3a6194882f686d1ef3518fd500be0128e34174dab6bceaf80246be78230ca0a174
 EBUILD ragel-6.8.ebuild 1072 BLAKE2B 879c499b08c93ae6c01d42b1801b2f6b1d7f2bb608ddc099a8731a702c47216605a783b9bd95f108e155c1b341e8e60907ca11c88735be4e51f95ffd94392c28 SHA512 8ee237bb58d6eaeafd7b71c3f807d2399deb739e95b90e5cddca6ad33c76deb3fd7f0f276abf03ec51058e4fae4a0b77e2150e70642ea5538d83eab458eb7382
 EBUILD ragel-6.9.ebuild 986 BLAKE2B 40271635fabfc45f7fb1020b8636f6461ce4d09954090ca388bf8d70b7b7d2fc7b7897874bf0f18cd323ce1ba451ad63e937f019f65ab57022a198ae46878ebb SHA512 8855488a58b252768ff9eb61fbd757ba33f8dc6b02ba4631d7affeac45880a3d0382ba196246fba592f811363230c6c899859f2c9c77191edb36912e87c3443a
 EBUILD ragel-7.0.0.10-r1.ebuild 758 BLAKE2B 362a2dee75eb9b744af7b0fca9f26175961029165988cf6a5f8f3aeab8d4e9a4264a553509211884c3bd7d6a7992b5fe0dee7b473f61831e6ab8dcfb1f94ba8b SHA512 12f9640eb0c51a497e274bf0d5dd7dadea78a1e21dba5d8a4a114066717badfa1de28116e133f7cc688fce02b7e2859f45479846f460865982c2ced0f4ea4fc8
diff --git a/dev-util/ragel/ragel-6.10.ebuild b/dev-util/ragel/ragel-6.10.ebuild
index b491e22cf4ec..d1c351367503 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 ~sh 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="vim-syntax"
 
 DEPEND=""
diff --git a/dev-util/ragel/ragel-6.7-r1.ebuild b/dev-util/ragel/ragel-6.7-r1.ebuild
index faf01ed1d027..f37016c22cad 100644
--- a/dev-util/ragel/ragel-6.7-r1.ebuild
+++ b/dev-util/ragel/ragel-6.7-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.complang.org/ragel/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="vim-syntax"
 
 DEPEND=""
diff --git a/dev-util/rbtools/Manifest b/dev-util/rbtools/Manifest
index ec8b62dec5e4..e7300a6bd351 100644
--- a/dev-util/rbtools/Manifest
+++ b/dev-util/rbtools/Manifest
@@ -1,7 +1,5 @@
-DIST RBTools-0.7.10.tar.gz 171957 BLAKE2B c92c02d2aa9598e063098316440b85842a2c31e5d32894c01b2345a49662b9f1091bb20077c6533c78618fc888f78f447f39580de64d4f48308e4c4aac5c6ecd SHA512 d4495cc73315e10d31d9b6c1517734fc58cc8b795a2d5eb32c9900b7108c57ad5b5f559e0fc7b13de0b00997f014a8f832183da46376f1480abaa5ebf5eb4866
 DIST RBTools-0.7.11.tar.gz 171777 BLAKE2B 67a0cf7d2f1e019a6b5b280a6448747037abb70d498c15b3bb2b0a415a1234e25e159929fc66484f56ad27acdbfe6bcf7bea9adb7042addbd96b88e4a9150ecc SHA512 ea02fbf02f7972d73a90097bc763549e54d130dc81e6325f0b65906d9e03819d4a9202b1e286a04bad5a17c2440b5e84fb9abe447f2b7717acc0f2c46de783cb
 DIST RBTools-1.0.2.tar.gz 199085 BLAKE2B 469bc0a4d440437126af936c370d40eefa4c59717a955cd1853a1fc437554c251508fabc797b8c6631327fd14d43545cab3710fdbe50b1ad87d4df41d6cc96ba SHA512 2b05c310b877ad57589dedbad638956b81cc539bc793ccbe6f17608f6b979a0f2767998b1e941ef826a435cf0b034cbb2b7fdb6b937d83d5bb2fa9d2f45f70a1
-EBUILD rbtools-0.7.10.ebuild 688 BLAKE2B 2769d766e8c88a8f736195a24e14db5be723a96ab9206ba7bf4ee88cdf8138439eabdf4766b75d486a53e904c45d4c00a50735ff3e3966e25d71afea70ab6778 SHA512 e24d2dfef42e07e14e1b6fbb6eb8751fdd9cbe25348a04eb6e21a6bf677c3c9db0d92f0365d33d3bce5e9b68f06f625815f50794ca7b29de0b624eaa0d794118
 EBUILD rbtools-0.7.11.ebuild 685 BLAKE2B 23a2124dfd97d3aeea04869713e3fb123965f499f4ee93cc9ded5f480cfa6b671c78eb0944e9d3bd76cfd2d7cff66b1c202a8e351d788734227f70b975644f79 SHA512 cab62b1a9c2f832b08c3c493e6cd343bfe56a287f45b43c4c32483e2e143612877ab6b67e8a36c3ea759510b0263953d6f165887749f519a61b13ead3bb079ef
-EBUILD rbtools-1.0.2.ebuild 744 BLAKE2B 55824dcd7d36e82e8e56ed378a496d03853418e795167a5c4e99652bc0bd8bcd68e76311102a090bbf990591b0361225c607144e2ca93859093d64587b590b39 SHA512 03b0a0f74eaf23a3dde6e7a901494b4d92d63bb3cfdaa3b3b72c69630999b64a724c25b930557d239efc6d7d8deb2a96e356c63378a9e978914e7bbf2814ce68
+EBUILD rbtools-1.0.2.ebuild 740 BLAKE2B ea50076ab8d4d9e7d7d9dfa56459a158473eada076aca8a501cf24006374df591c2d7acf71b32eabb6ac0a847d877f8f0e11cf839d5ebbf4bca81c4beb1b3ca8 SHA512 be87550734fec846648fe0922c4351fc7b9638ff1d3fba7440dc3f8841c8b58037262801bc17edce14edb262e7cc2cf2cb244579f85c67ae0592ac50f6ba3963
 MISC metadata.xml 217 BLAKE2B 92b85ca7d657eea200ee74bdafd4df6885c04b125bfdfb86650e2e1066c858aa8623f8b2a362780a200d7e33076129c9aab38a12f189c82d5ce1a9ae81257195 SHA512 1b17a615b7471a1e46b4c291aa7ff84348628ec0c3603e21db1994eb1e82ae28dc7e97321de022ccb7e4d2f411f4e7bcef5a79e93a4229126b9b58fb5d503478
diff --git a/dev-util/rbtools/rbtools-0.7.10.ebuild b/dev-util/rbtools/rbtools-0.7.10.ebuild
deleted file mode 100644
index 4ef8e4c719f2..000000000000
--- a/dev-util/rbtools/rbtools-0.7.10.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 versionator
-
-MY_PN="RBTools"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Command line tools for use with Review Board"
-HOMEPAGE="https://www.reviewboard.org/"
-SRC_URI="https://downloads.reviewboard.org/releases/${MY_PN}/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/six-1.8.0[${PYTHON_USEDEP}]
-	dev-python/tqdm[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-DOCS=( AUTHORS NEWS README.md )
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-util/rbtools/rbtools-1.0.2.ebuild b/dev-util/rbtools/rbtools-1.0.2.ebuild
index bf0b1a6a5f45..06ee7e70ea7a 100644
--- a/dev-util/rbtools/rbtools-1.0.2.ebuild
+++ b/dev-util/rbtools/rbtools-1.0.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-util/re2c/Manifest b/dev-util/re2c/Manifest
index e37aace24c45..cedd7b2b34ac 100644
--- a/dev-util/re2c/Manifest
+++ b/dev-util/re2c/Manifest
@@ -2,7 +2,7 @@ DIST re2c-1.1.1.tar.gz 5907416 BLAKE2B da2544573de0dbca94db8a8e2112de5549ffbbad9
 DIST re2c-1.2.1.tar.xz 2059304 BLAKE2B b05c41112654cd4c7f15ad70229cde02efc4b04ffc63f964ab69e376964a8a952f2c617859b056998127ca9adfd72f7a16e673dd3134ab8244b14b84e023d510 SHA512 c90f45ae435968e950d2340b540269a042201f1f53d7ea067b6d3d9feec063f66559ba970d404d82bfa7b75b9a074328caaa62304d4d876af7c12740d100ef58
 DIST re2c-1.2.tar.xz 2064236 BLAKE2B ebc721de4fe1588a3043bb05298324b61214e074154ebc2adff19c6e5a3cc6a94314216a20020e88069d89768c31ae5c3f09b18176cd241d7aa10aa7b2daf183 SHA512 d029abc3493a26761eaa911cf73961f5b8ec2e00958c97740e73f568fc72b02b5f56d80e09657a95dcf2e7767f3e5085775bb78f0f5bc472d506682a3a7fc278
 DIST re2c-1.3.tar.xz 1239280 BLAKE2B ae2a8fc323408dd31d39c352bd622d89d19178b7993618ea043bbfd32509fb7573d2b5b50663e100d24fc275fa479982cb1f66ed49638edca61f551fb653176d SHA512 c7084ab2399fb6b96cef74c1393715d90830f43b82b96af46feb71ef008c0215381c3dbea0b003ff810d869db6021e28001b9d588ad55c616642244b2da09c0e
-EBUILD re2c-1.1.1.ebuild 763 BLAKE2B c4bfb586f9fe4422863067466fbeecf17711eaded507eb65e1dfeb5581fe4ec3eeb39567217cd8a1bc1291c7fbaaa0131af6406d38d958d04a337d3a78767a6a SHA512 f6c5caf64a09257bf360c9ac6aa743e9ed511170a62569d36d4b661e20b6bebaea6fefd8a823a2273373b045a7f149bf4310f6a29403642824a82bd1374db356
+EBUILD re2c-1.1.1.ebuild 764 BLAKE2B e5ec3c2114ea391a21512b8970040f8afc7b20a926f2a55d6667e1a1490ffefbfd11e450e99dbb30abc25c5686eb4c0d5d609c21e4202ff1cac60f0ffbdade0e SHA512 b1da1bb78a5b581927dd5c4b347bc92b110a8399f0ef41e189acf60734b7e450c09a528c366f244858c00cfb0bac6a10595e05d0d00d214c036f858ebdeb8e66
 EBUILD re2c-1.2.1.ebuild 724 BLAKE2B fb7f8df52e886a9b13062ec02728b4446d209c5cf8730861fb2cfa13b03e10231997e72c19684097c57e57063f10080d32603fbf2da79716e6653116ed17c47b SHA512 ad17c13302bf7ed3bf1c8bd27cc56e3c3f4a86f29089b3a7db9eee17cb05c3220596e77d435004683746c9424f441f4454a88f6ac93870e7c51a2cb06e380f3d
 EBUILD re2c-1.2.ebuild 734 BLAKE2B ae1254e3bb13bf09360cb7be05e525d6100895824e6b392441e2ec89ca3b5d650b488dfb78778b511dd6666b51e9c5f34321c80ee4a7a8cb5eb1c58ea525c2e4 SHA512 0d74f84dbc380442277d38e7e13bf6326997e57fcbe9aeec7e58e6fbaa427f19aebbc64aefae8ffc42cedc731af1fa6322608a0b4fd0f5ba832400f125a0de52
 EBUILD re2c-1.3.ebuild 734 BLAKE2B ae1254e3bb13bf09360cb7be05e525d6100895824e6b392441e2ec89ca3b5d650b488dfb78778b511dd6666b51e9c5f34321c80ee4a7a8cb5eb1c58ea525c2e4 SHA512 0d74f84dbc380442277d38e7e13bf6326997e57fcbe9aeec7e58e6fbaa427f19aebbc64aefae8ffc42cedc731af1fa6322608a0b4fd0f5ba832400f125a0de52
diff --git a/dev-util/re2c/re2c-1.1.1.ebuild b/dev-util/re2c/re2c-1.1.1.ebuild
index cb1427a4df50..542d0638350a 100644
--- a/dev-util/re2c/re2c-1.1.1.ebuild
+++ b/dev-util/re2c/re2c-1.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 src_prepare() {
 	default
diff --git a/dev-util/reswrap/Manifest b/dev-util/reswrap/Manifest
deleted file mode 100644
index 6b6ce2061bd7..000000000000
--- a/dev-util/reswrap/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fox-1.6.57.tar.gz 4284018 BLAKE2B 3efbc6188225f9444fbd347359e8b4041a08fe654acb99c48e4966e501a2f72a44863f2e9b60ae810a259951f89cfc27b9a8b6341e029627066712e0dbf20e40 SHA512 e7b91054a9ea674818803415284cb61572935d22466e446cb37ef68344e2684e8acd567f7c8a6912f939dcbcc37455119ad6a01ac30513f460d0b3937b7e6087
-EBUILD reswrap-4.0.0.ebuild 586 BLAKE2B e9306540faa5b9f94f42257e5efb9e8ac895ae1766232738665c21b815e5af8da487d77e184de507fdd4b5f17385d1e02707286ee9a89766d13413ecd289a007 SHA512 026ae1c4ed2640390605ae03e108288a2349e26978139fd2c83b9100d212f5e5b7e7ca68095f65e7c920f51c83f095f9c19e953835cfb0efbf7eca30c9a41371
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-util/reswrap/metadata.xml b/dev-util/reswrap/metadata.xml
deleted file mode 100644
index 7a38bb900964..000000000000
--- a/dev-util/reswrap/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-util/reswrap/reswrap-4.0.0.ebuild b/dev-util/reswrap/reswrap-4.0.0.ebuild
deleted file mode 100644
index eaf511e523d1..000000000000
--- a/dev-util/reswrap/reswrap-4.0.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-FOX_COMPONENT="utils"
-FOX_PV="1.6.57"
-
-inherit fox
-
-DESCRIPTION="Utility to wrap icon resources into C++ code, from the FOX Toolkit"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=""
-
-FOXCONF="--disable-bz2lib \
-	--disable-jpeg \
-	--without-opengl \
-	--disable-png \
-	--without-shape \
-	--disable-tiff \
-	--without-x \
-	--without-xcursor \
-	--without-xrandr \
-	--without-xshm \
-	--without-xft \
-	--disable-zlib"
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index fa97e4feb49e..89954bd15190 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -8,6 +8,6 @@ DIST scons-3.1.2-user.html 1126908 BLAKE2B 38e7695b6ef1e79b3eed4455fbe84ec1587be
 DIST scons-3.1.2-user.pdf 2557502 BLAKE2B 1c89d845d23c4e434c9db11d8730121f0b8dc6f2fca21dabe3e7204373cdf743d831a1835731332e39ccd7f3f49da068ba34a33a2937e9dd205e38d9c8b2b321 SHA512 9da887c157cb95f7802cb4b96080b0e56f2ad7663021b8be0839e71d473422fe9dd0dadf0ad1b067160c39511e91c6b3d9aaff8e238bb46b10a03ae89b12e169
 DIST scons-3.1.2.gh.tar.gz 5534888 BLAKE2B 63e8b069cfddfed6a2ce8bcb7816b51b1881ca7a1a3e552f2eec5ecd1deae80720b0acfb711ab17067efdc9d0e4aea696e9f4eee6b374071bfc60e7bb79cc58a SHA512 b096501ea37e62f596f16b46b4022ad7979f359b10849d4c5fa17731a6c3ec34e0890374de175a8aa7539ae677777142ccf5dfae39a74696efcdbcc00e89bccf
 DIST scons-3.1.2.tar.gz 668298 BLAKE2B 14251e2bab425dfc31d1d6d9325a67725dae42576d2a5c204f0ff7948aa2da5aadd3fdf03bbbccd615757520fedee5e18ca2ba13aaf07a4ddfec330db4221203 SHA512 bfc0d58d33408a03eb37c1eff166af8139078026e6b43d6274afceac889d0a6743e359e89ad9a30be5ca43aeed26fba92fa4732854750b7d53091ef3e99b3d33
-EBUILD scons-3.1.1.ebuild 2631 BLAKE2B be8064d70cc66ca5365f35ff219a2ae9cfa19b1388bcd7acfdf1960e8174fde42bcd616f763722304fb1ebbb865fc438a901e5b687391cb212033095a6a4fbf5 SHA512 bfb40c1a8b05ef701e8898426a6997bf1b5b7e8a83913dedcba1215b58868e02fb64855221706115a56afbd374a0fb2f6bec7536bab9e1c4fbdf1a0d80410a83
+EBUILD scons-3.1.1.ebuild 2632 BLAKE2B 84b677283328a4d13ecab6bbf6663c0004d143b6efde959c874a12933eeec017f3c71c735eb292cf4139d92f4942da2c707c896d5047181a6c9b0686363ca72c SHA512 e18511c04fd53472ef2ffd6753cabb9bab0dd80cf8756769e0174b06deabecc1092ada411e67f085c09e638b0de9e782e69dc5369368788ff5a30693206324c9
 EBUILD scons-3.1.2.ebuild 2710 BLAKE2B 4d12988ec715903909614b9159b7d10d249bd88cf10667349ce3b77afbb1aff78aab272f2077786fb5cd5c8960d6790cc195bcb420b4ee5fabaac576bf5a6d00 SHA512 8644c357e42df186a2709c0c90a550fd2c678cc7508e81c3380d8c2effae7f2a05e3284a1ba6a03caec0afef7b01c8eb667f15477040438207d92a39a42b2629
 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 e98a6472fbb1..3bfbf5c1bd43 100644
--- a/dev-util/scons/scons-3.1.1.ebuild
+++ b/dev-util/scons/scons-3.1.1.ebuild
@@ -18,7 +18,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 ~sh 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 ~sh 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 9b909bf668a1..464680bc0595 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 e226fa32615278b40925ef28e2eab42e208f693b73cb1c5b6e093ea97db6ba92d8bf0d436233fdee71e753c383b84b93f75d82aaaa120fdc663b98a467b23e11 SHA512 a3c6aef7944c36dd229a2c2e33043a97c6ee6efbc64efe99b28b943758b9b3966de4ca251164cd50302d9e19f8a7095ae686ae047904e2835cb62625c0d33008
+EBUILD shadowman-2.ebuild 671 BLAKE2B 1b0351a7ab0ee9393d73cf3e8897679015ffdd6ccf5a252653baeaa6c525eddacb79774e8f13671a95acd9ab09e021a11ea9a00fd52fcb02375ca2abafbcc425 SHA512 e021bec610f52241f514aaaf24f1e505ea96767450153b62b0e0434c1efba9965b2069e4e7618a1fc02cf3fac0a367f550936256206cfcb7d381aae1199a6cfb
 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 39d4d31f4fae..b1af2404ac3d 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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
 IUSE=""
 
 RDEPEND="app-admin/eselect"
diff --git a/dev-util/shflags/Manifest b/dev-util/shflags/Manifest
index 98b0fd8b6a90..e60fb418b04d 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 631 BLAKE2B 157620c3114e257478721a5ed30158286022f2accc33e33fa3dda01f48949b510295133b6db28e31eec260bafd773ebea2ff92e7a173c8c4cf75a3b3525fbe96 SHA512 e9cc2545163784ea9d1c9a1d6cddb3a0988a339d15090ad668156c4c398f35c1f699f8f3b34a1db8b29d16511ca661160f07b5ed58d58397a29ccf9afcdf5793
+EBUILD shflags-1.0.3.ebuild 632 BLAKE2B e9024de774ea36f4c03ba31250a2c6f828c4ab52bdad1cf9fc7453376e932ff247c65614a2ed15722f867de9560299e5ce5e472979970ae135b932f8a4c96ad6 SHA512 1d5546675769a061bd8ca65e4bfe64afd620ba8f57240aba9982bb6cd80e31c9d9d4dfebb97e2bfffdca53ccd6894a79606b78a6b415006418c9e7ee1ef119a9
 EBUILD shflags-1.2.3.ebuild 597 BLAKE2B cc2407aca276508f5002671fe37e923797145857afb80051494ee72314e032257a6a5ae3e738873f9e4e5235c65447eb027fb8e79879b83595e9fab2006281fd SHA512 bfd4133012e6228857f353d06024abbb288e102a7e393600e033e74fd446f0f93c56962bc110849695f06e52302c554a4913a40d46582b238700b3cd9e32dabd
 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 a1bba5a8346f..552035ca04ba 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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="examples"
 
 src_test() {
diff --git a/dev-util/source-highlight/Manifest b/dev-util/source-highlight/Manifest
index 7ebb552d2187..6d986f2b418b 100644
--- a/dev-util/source-highlight/Manifest
+++ b/dev-util/source-highlight/Manifest
@@ -2,6 +2,6 @@ AUX source-highlight-3.1.8-no-black.patch 416 BLAKE2B d53c85b52a04118b613f7683e0
 DIST source-highlight-3.1.8.tar.gz 1648351 BLAKE2B 1ce1590c86f7aed9d27bb21bce6b0869828b28068d71404410e080b85f6354eb6f520cec8c81d1e9170dd90b158dc4536e5287a04bf2d271fa26354fb853ea32 SHA512 00a49ab180460750614b38be9a569478d1d34d01f601ebc7452a4fee8475a19faf9bb9fb2f256c6b40d43fbc3d34962a77ba8b9833483345c4e4a42faad6976c
 DIST source-highlight-3.1.9.tar.gz 1717234 BLAKE2B 6eb40b2274df0772c4a241504e5db5dfdaac600549e0b11aba726f7b4d5ab600c3849a8815bc782ad1bb1f99b69766527645dd202731bde4b2466c663842c47c SHA512 d8e154e9a5d62c77807e4e5d36c0faed5ce2964291be5f8b83e2968a6de52229503689a4ca2109a717ae2632a14b63ec937ca0430c91684c72063f6bc0294195
 EBUILD source-highlight-3.1.8-r1.ebuild 1460 BLAKE2B fbb8ed50f5a2bfd4017e9842fd06f634ffb8b8b17ff6c1366f7348bd1728a7df7210b4276f8d1bcb37346bee4c06a6f5b59983179e4a6dde0ffaa95103fad1cb SHA512 61cc96bfe1cac828529a70ecfd6443a844c3853814382a81ff859842a1091dc84ed6d17c547e1c427cca93d675065e45b4eb7299090672faff37bcb5e25bcd76
-EBUILD source-highlight-3.1.8.ebuild 1392 BLAKE2B 45db34bf15ead4b78e274bf596d92a24eff056a53c8673e6f6043ef4e06a26e1c6fa89f455444b28ba40d53adb22e75f439bcef82ce1f10d62bbab6cf8363110 SHA512 3532b6c13ba761cbe0c735724f5741fc9ab5269c6e5694a8219297c97c1e02a54e89812966be0b3397dcbea985d2e945e64d5662b34d59d09e57d97baddc7830
+EBUILD source-highlight-3.1.8.ebuild 1393 BLAKE2B a64bff60fe328a5db1fc7e46d438e972a2c6478ff04a0b61e7689d82143b6ff56c68e13a8c5ecf626ed770b27b87bd0fca3a239ee59bec2cd64c251a107fb964 SHA512 f0294eec342fa9b089aa96a04ed50bc515c25e4f64645732b047f95829456106b5a94d854ac386aa66a5d2ec3d4a5a68ed8c08af0c55d75bfea644793f5e0531
 EBUILD source-highlight-3.1.9.ebuild 1411 BLAKE2B 7f00a0f76e2efe69aabf5aa6d417a15a87bcc59a11e4f9dbba696af52946573c47779c1966bfb747a642c62ff9406c62838c4ca2651e6fe7cf77c134f0be08f6 SHA512 a32dbb62bdead42712707d40147a55a485335554a39b78161d0631554746610d764f4849fc5e6006bbae4f9d297c195bad46c4f3e72b11d49dcbd7ea96c76c8a
 MISC metadata.xml 267 BLAKE2B 5267526ad53ec7bedfe46f8cba86c810629394fa4f3c59e1b69619b0a11a9edbb746ae6abf818182da7ade72c862360f43a19209007a23da9701df26b96f77dd SHA512 715bb37d958c1e508b2ef00711ab3a4abee982efe90867fd2bcf91fa91305d5a413a4f3d13d01ea6e27eb15f5f9dcb58fa13ecfed7025cae43745792ac1a105d
diff --git a/dev-util/source-highlight/source-highlight-3.1.8.ebuild b/dev-util/source-highlight/source-highlight-3.1.8.ebuild
index 73000e024a1b..78be43bfa364 100644
--- a/dev-util/source-highlight/source-highlight-3.1.8.ebuild
+++ b/dev-util/source-highlight/source-highlight-3.1.8.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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 SLOT="0"
 IUSE="doc static-libs"
 
diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest
index c3deac090575..62fbed0c3adc 100644
--- a/dev-util/spirv-headers/Manifest
+++ b/dev-util/spirv-headers/Manifest
@@ -1,6 +1,4 @@
-DIST spirv-headers-1.3.4_pre20190302.tar.gz 333676 BLAKE2B 7ac46ed9d369164d187564e12438001ebc77c912385b4ef8a5de4ff26942f27ce88486f980b69111e804c6aad5a7f4724913833f0dfd6246bf070dc5023df7df SHA512 d1e6ce59764ad03228cc12fedb1e16fca8c3ab5827882e1f3dec9c3d735125dddbd06fa4955ac3358bec2de8211164511e2d16205f175484e070b2bd87262c51
 DIST spirv-headers-1.5.1.tar.gz 369998 BLAKE2B 7ad91a93d2704baeff9d8dd32c67f4a7d428bc174122a37e1a405865ca8f1d9dfbf6b1d096092f8b2e83610679ddb8d311fb7823411548976c9fef3929449df4 SHA512 6ed09d1b825ad921bb988f260a236c82e9755ca3904a2ac130cf82d876a0de087d8d5f6eba01e923fe565c93a8e3eb46346bba21c64a664598a43063e5e5108c
-EBUILD spirv-headers-1.3.4_pre20190302.ebuild 493 BLAKE2B 855f966aa9be178e9c388a89d6cb7dddd27e398736013a3614c8b2737c3f6261afcf679c1288e92b67b3aef06d35ebb8ca08e455168056dc6b31f41d04e5c693 SHA512 d5a29abfd52149e6e07527055aaad89b879eb91b82c2333ee0b0f05da31c229893487d0de07a012dd487f370de45c34a410db328408e67b039ba4e5071e37fda
 EBUILD spirv-headers-1.5.1.ebuild 493 BLAKE2B 11ce425013c40fca04d20bceb1fd89d125b1530d4865dd7a70e892ac435efb0975473d2921816f3c765192ebdd7d0804d8f8101460fc8adc0c61deeef38d1dde SHA512 d5d5d75cfa975432a5536ad0620a2f5cafecdd47545690541cd243caffc25ae99ea3c0d4d066a86d83a5220aef9b33fbd673d875464f8d8ac01195a3b30a0a72
 EBUILD spirv-headers-9999.ebuild 355 BLAKE2B 087edb2619bceba7e57db82dac834c8d04c2718e81c2fdb56a501f64b21329e66b4e73928b56f21cf705c1abe8627db4b757bee5e6da9faf7998935acf3c84d1 SHA512 b92a326f90e77d1da661f0107c9b5acec51bc14553dc8a8512c6b44345231db97765a40c0b41002952788e1691a8280b5fc898f3d0fe718375522fc182b8abb6
 MISC metadata.xml 431 BLAKE2B 2a03bfd5ff92d23da598ab731032790658e828cfc16c1bb1bcaed0e8e8aeba5d76ca97d5b52f5433bae5391e5f50d2d1028c49689114da7d4fc9703e40f964d6 SHA512 a770e25b42892a5062dc35739c6776d1e8baa22ee4ac9c745b0283fdb3322ae4f6549693045f9125b6a604f4f103c34e52bc069c11f47394373400c522a877c5
diff --git a/dev-util/spirv-headers/spirv-headers-1.3.4_pre20190302.ebuild b/dev-util/spirv-headers/spirv-headers-1.3.4_pre20190302.ebuild
deleted file mode 100644
index 7e11adbefdf4..000000000000
--- a/dev-util/spirv-headers/spirv-headers-1.3.4_pre20190302.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Machine-readable files for the SPIR-V Registry"
-HOMEPAGE="https://www.khronos.org/registry/spir-v/"
-EGIT_COMMIT="d3752ea20886d2fceb6cecda3c2b146a8f22d214"
-SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"
diff --git a/dev-util/spirv-llvm-translator/Manifest b/dev-util/spirv-llvm-translator/Manifest
index 4b6494c806cd..07f1add00fe8 100644
--- a/dev-util/spirv-llvm-translator/Manifest
+++ b/dev-util/spirv-llvm-translator/Manifest
@@ -2,5 +2,5 @@ AUX spirv-llvm-translator-8.0.0.1-no_pkgconfig_files.patch 533 BLAKE2B 4d0d1b4c6
 DIST spirv-llvm-translator-8.0.1.2.tar.gz 461803 BLAKE2B 58814d88bfa555f0deab8d072ecd0b54c1ee22c4f6464a9988d18dad2c99d25a5ed49e506644d01455fb92f476536148e0e0cce2eaca22b4b1c88220724f8d40 SHA512 954d4600f680d3325d4f7ea80551f814f2cee486254227609fc0354c1b112d4dea387736d601750587369a7c4f1c2a528a19f8a969df433649731efdd5ba4c23
 DIST spirv-llvm-translator-9.0.0.1.tar.gz 491089 BLAKE2B ebdab77316608c4a4a48e778abc749ac347d0ee4441c8cb152b303e99cf5c16bd4f883dad519f5d4a96b6d05975a56e8d2fa5b6fa403dedc163cc3611b905d13 SHA512 ad0e9a49440f8dc0a9c973c74245640c8392c8ae85431eb5e0ca6ea98e603cb6fcbfcaa8fa3d455df2f53537c7f61915a557f12744c39a9c9f9e1c400ddd74ad
 EBUILD spirv-llvm-translator-8.0.1.2-r1.ebuild 1296 BLAKE2B 90b984d769ffc6ffb5df8d36670511872a628b1106637bc8a4c10b32f25d67e7fb3f3e7f7ca4cbecadb8aea1de3243436370ea92d79bad4031e52bdb3d1a573a SHA512 a63e034215979d0e5381c236237febe34749d1d9b8fede39d32efc70c4b994f56166b166eb5f6f6b3d78abaca744d2503472a515a6e1769a99863957d63c31ba
-EBUILD spirv-llvm-translator-9.0.0.1.ebuild 1284 BLAKE2B f0fc9ca7c17c49310b2b8a4e72a9dc7a86d49b2774fde1712aaf23f2b735fd84410ce1587f780c4ad3abc549b988b136f7b6ba4281768ae67a6a5f2b49f3e80f SHA512 6f2fbf5a2832147d26b7d78c6f42247c66afcaf6f635f486f8f3b013c7679e2cff67302aeefa14c38dbecd4f3d9e631d7124b38f213da061c08a9fe708c43dfc
+EBUILD spirv-llvm-translator-9.0.0.1.ebuild 1291 BLAKE2B 22fd214fa80e3331da17994058a0861b5f0a3f3d12b558cba329e6e8d3cd34020bd2d5f489ea89e2916e73aca2a45446cb3c36aba203b5fa3425984a486b140f SHA512 9a7e64db4abbae7d694c17935707fa5a1a79ecd0c454e12f35dfab369bc0d5158118c010629dd4b2fc8ea418c2ed8d0342bcbb0903328b394e6d8354b6c4f30c
 MISC metadata.xml 442 BLAKE2B c63b20489865e563e064525b8df310eca993f15ff03cd533458729e5d6611b678e2f797d6efbe177e1bdeaed84e9bcf63921cb67318e948d579b57cc7f1cd28c SHA512 b036abe761b1aeb68ce5668eb3d501d2e5530be3456e85f51bee15c0aa8387a8be89c212308d7997a5f60bb0301bcdd22a7cb44a27324c05533aed94215b4721
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-9.0.0.1.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-9.0.0.1.ebuild
index dd616822e690..4feef376c920 100644
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-9.0.0.1.ebuild
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-9.0.0.1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib flag-o-matic llvm
 
 MY_PN="SPIRV-LLVM-Translator"
@@ -37,7 +38,7 @@ PATCHES=(
 
 src_prepare() {
 	append-flags -fPIC
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 multilib_src_configure() {
@@ -46,7 +47,7 @@ multilib_src_configure() {
 		-DLLVM_BUILD_TOOLS=$(usex tools "ON" "OFF")
 		$(usex test "-DLLVM_INCLUDE_TESTS=ON" "")
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 multilib_src_test() {
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index cb6f386e8872..2709135526b3 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,9 +1,5 @@
-AUX spirv-tools-2019.1-Fix-vertex-instrumentation.patch 4948 BLAKE2B 72df8f60ee84d3b129803e1ac2c2befa59392bd9cde51070155798f12e3d72bb5de0bfb93117599f315e6f106c6f9852dbad4d1ce0d9b4f3831a5af3844ef0c6 SHA512 9f1fe685e9205e848cc931802c003529b885c1f409a12e6bf118269a3073be8535ab3431cfcea9d89e8d78b55205795861d47e94f9728153541efe9354564003
 AUX spirv-tools-2019.10_pre20191027-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch 711 BLAKE2B faed59dc76f9320972bdc7966c757df76a1353ccefe9f6dacbf473a8f576eb222d0b4ceaa97a641b41c6c520a6a21149956aeab88b840124caaac08b7a27d66e SHA512 b12004d2e5d6b058549c4e12abcea531e4b8113beabc2264161197b247209168affa0aae529f5ac122b3aa7ece6f4000d877bd5fa4a230f44cb6e9a08ea22661
-DIST spirv-tools-2019.1.tar.gz 1493682 BLAKE2B 823b6435fd59a732075073bcecfbfa3081248a2fff21a1375502b812b30a1f988bb32afc41d2f6a6244b4bf37aa9fee2fab710f2cf6d051170e3622d8adf632f SHA512 c528046e1495d58ff0aca773b3b8fa091f943414853cf0344d8e690d868e0df5b1aa66bddbab245c5e52cc2fbaf0a2032a3be518fb8ada7f89b8023fa89776b4
 DIST spirv-tools-2019.10_pre20191027.tar.gz 1848978 BLAKE2B 174482c7186569878ec6f3409a68a3e11013b12798ffbbfb94c66ae6cd338a3375330908cfebf0cd3c67901bf9c2459c6e586cf95bbf4fee399504aa9958da66 SHA512 d26480b6c70acbdf63e36fb5ed11ce422b976d48ef85e2be263c3897a4d5181c31fb94c087fa7b20f84446f0059c3bb7eac872a6d1b15a599fdeb2a7924232e4
-EBUILD spirv-tools-2019.1-r2.ebuild 1227 BLAKE2B 6a072ed2374b461b452a03e42788b49c14f115e1078f998da4ccbbbadec5c0e6d5d382f069a9ace5aca4f1f476403864b6242bf6bcfb9202d7a29daf5591bb7f SHA512 83616b6255abcca571256073584c34bc88034b45166a2439ab4f3eb2c4b09b2e3b04c9ef5b1ff6b856b0f1cb33cd87bf005cd72653e7fe9503e6421a1e691c82
 EBUILD spirv-tools-2019.10_pre20191027-r1.ebuild 1252 BLAKE2B 854ad0a061de98d4a072eac34d2247fa2e1fae6a8136c3654538780124044b97a50ce89bea04dfc2dac86ba9b3b30b98aa290d0a9ac010b8560e4ce3b37987d4 SHA512 e434df1d41e0ab3ee2184ed19aebc2c429ff107f1fcd170945f0d16027c0a5acadb1d190b04d001229d236e8d0fbd246bac81786e985e548169949687fc996ff
-EBUILD spirv-tools-2019.10_pre20191027.ebuild 1162 BLAKE2B 7b634ddccc286df56f6eb592ba83b2459faff9844658f18dbe39c5dc1116372fffbf1e648663105d8a2dc727a254d52d55dc4dca72a7f8cc8aaa49e3af54ccc6 SHA512 779a439855055b5eb594b48f32da06905ef5bc762aca1322fca0f5c9043c68602397b6df341bbaec2efe8cbd0cf624617e569b4cb169cb5557d63ccac7cc2ae3
 EBUILD spirv-tools-9999.ebuild 1098 BLAKE2B 3c609f34d268c8f31b10757825c002c4aa35ee97446ae8b83a603b08b29c425ae4604ab916173beb3afaca464621c75edc24013a55964b2b6c36a2e50ef447d0 SHA512 75b5ec8960a1e056757f574a3a676ac725f5fba39c74ed05e6e985f1aeeb4aacdc32bbc64bb3777cc279f76353f0876269fa4904094570e7c339f8fe8cec5200
 MISC metadata.xml 429 BLAKE2B 84129eb27ea4a745c90ed7eab09723b41b45a696375c41458c45a6163dc00cd15d208d6858ea4fd92280e3ff3bb385f340ec3684c980a97ea5fd46fdc4c24001 SHA512 13b340b0e43ba726370f3b013759adab727fc37e251ec5777d10541976843e3e575be23ee015af83dd2e98a1917f4d2511467a38afd064cef025ab4700f005a6
diff --git a/dev-util/spirv-tools/files/spirv-tools-2019.1-Fix-vertex-instrumentation.patch b/dev-util/spirv-tools/files/spirv-tools-2019.1-Fix-vertex-instrumentation.patch
deleted file mode 100644
index 4ca2c53969a3..000000000000
--- a/dev-util/spirv-tools/files/spirv-tools-2019.1-Fix-vertex-instrumentation.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From 8d2d66f30c5c25029ac029af2bc9c4aa6979e5bc Mon Sep 17 00:00:00 2001
-From: greg-lunarg <greg@lunarg.com>
-Date: Wed, 16 Jan 2019 16:02:07 -0700
-Subject: [PATCH] Fix vertex instrumentation to use VertexIndex and
- InstanceIndex (#2294)
-
-...instead of VertexId and InstanceId
----
- include/spirv-tools/instrument.hpp    |  4 ++--
- source/opt/instrument_pass.cpp        |  8 ++++----
- source/opt/ir_context.cpp             |  4 ++--
- test/opt/inst_bindless_check_test.cpp | 14 +++++++-------
- 4 files changed, 15 insertions(+), 15 deletions(-)
-
-diff --git a/include/spirv-tools/instrument.hpp b/include/spirv-tools/instrument.hpp
-index 69d1ad259..f8068099c 100644
---- a/include/spirv-tools/instrument.hpp
-+++ b/include/spirv-tools/instrument.hpp
-@@ -75,8 +75,8 @@ static const int kInstCommonOutCnt = 4;
- // error.
- //
- // Vertex Shader Output Record Offsets
--static const int kInstVertOutVertexId = kInstCommonOutCnt;
--static const int kInstVertOutInstanceId = kInstCommonOutCnt + 1;
-+static const int kInstVertOutVertexIndex = kInstCommonOutCnt;
-+static const int kInstVertOutInstanceIndex = kInstCommonOutCnt + 1;
- 
- // Frag Shader Output Record Offsets
- static const int kInstFragOutFragCoordX = kInstCommonOutCnt;
-diff --git a/source/opt/instrument_pass.cpp b/source/opt/instrument_pass.cpp
-index 8ba8ce504..6935a43dc 100644
---- a/source/opt/instrument_pass.cpp
-+++ b/source/opt/instrument_pass.cpp
-@@ -168,10 +168,10 @@ void InstrumentPass::GenStageStreamWriteCode(uint32_t stage_idx,
-   switch (stage_idx) {
-     case SpvExecutionModelVertex: {
-       // Load and store VertexId and InstanceId
--      GenBuiltinOutputCode(context()->GetBuiltinVarId(SpvBuiltInVertexId),
--                           kInstVertOutVertexId, base_offset_id, builder);
--      GenBuiltinOutputCode(context()->GetBuiltinVarId(SpvBuiltInInstanceId),
--                           kInstVertOutInstanceId, base_offset_id, builder);
-+      GenBuiltinOutputCode(context()->GetBuiltinVarId(SpvBuiltInVertexIndex),
-+                           kInstVertOutVertexIndex, base_offset_id, builder);
-+      GenBuiltinOutputCode(context()->GetBuiltinVarId(SpvBuiltInInstanceIndex),
-+                           kInstVertOutInstanceIndex, base_offset_id, builder);
-     } break;
-     case SpvExecutionModelGLCompute: {
-       // Load and store GlobalInvocationId. Second word is unused; store zero.
-diff --git a/source/opt/ir_context.cpp b/source/opt/ir_context.cpp
-index a2f207c0c..fe69027f8 100644
---- a/source/opt/ir_context.cpp
-+++ b/source/opt/ir_context.cpp
-@@ -669,8 +669,8 @@ uint32_t IRContext::GetBuiltinVarId(uint32_t builtin) {
-         reg_type = type_mgr->GetRegisteredType(&v4float_ty);
-         break;
-       }
--      case SpvBuiltInVertexId:
--      case SpvBuiltInInstanceId:
-+      case SpvBuiltInVertexIndex:
-+      case SpvBuiltInInstanceIndex:
-       case SpvBuiltInPrimitiveId:
-       case SpvBuiltInInvocationId:
-       case SpvBuiltInGlobalInvocationId: {
-diff --git a/test/opt/inst_bindless_check_test.cpp b/test/opt/inst_bindless_check_test.cpp
-index ddafb3dc2..a426ce04c 100644
---- a/test/opt/inst_bindless_check_test.cpp
-+++ b/test/opt/inst_bindless_check_test.cpp
-@@ -1650,7 +1650,7 @@ OpCapability Sampled1D
- OpExtension "SPV_KHR_storage_buffer_storage_class"
- %1 = OpExtInstImport "GLSL.std.450"
- OpMemoryModel Logical GLSL450
--OpEntryPoint Vertex %main "main" %_ %coords2D %gl_VertexID %gl_InstanceID
-+OpEntryPoint Vertex %main "main" %_ %coords2D %gl_VertexIndex %gl_InstanceIndex
- OpSource GLSL 450
- OpName %main "main"
- OpName %lod "lod"
-@@ -1684,8 +1684,8 @@ OpMemberDecorate %_struct_61 0 Offset 0
- OpMemberDecorate %_struct_61 1 Offset 4
- OpDecorate %63 DescriptorSet 7
- OpDecorate %63 Binding 0
--OpDecorate %gl_VertexID BuiltIn VertexId
--OpDecorate %gl_InstanceID BuiltIn InstanceId
-+OpDecorate %gl_VertexIndex BuiltIn VertexIndex
-+OpDecorate %gl_InstanceIndex BuiltIn InstanceIndex
- %void = OpTypeVoid
- %12 = OpTypeFunction %void
- %float = OpTypeFloat 32
-@@ -1730,8 +1730,8 @@ OpDecorate %gl_InstanceID BuiltIn InstanceId
- %uint_2 = OpConstant %uint 2
- %uint_3 = OpConstant %uint 3
- %_ptr_Input_uint = OpTypePointer Input %uint
--%gl_VertexID = OpVariable %_ptr_Input_uint Input
--%gl_InstanceID = OpVariable %_ptr_Input_uint Input
-+%gl_VertexIndex = OpVariable %_ptr_Input_uint Input
-+%gl_InstanceIndex = OpVariable %_ptr_Input_uint Input
- %uint_5 = OpConstant %uint 5
- %uint_6 = OpConstant %uint 6
- %uint_7 = OpConstant %uint 7
-@@ -1819,11 +1819,11 @@ OpStore %81 %55
- %83 = OpIAdd %uint %68 %uint_3
- %84 = OpAccessChain %_ptr_StorageBuffer_uint %63 %uint_1 %83
- OpStore %84 %uint_0
--%87 = OpLoad %uint %gl_VertexID
-+%87 = OpLoad %uint %gl_VertexIndex
- %88 = OpIAdd %uint %68 %uint_4
- %89 = OpAccessChain %_ptr_StorageBuffer_uint %63 %uint_1 %88
- OpStore %89 %87
--%91 = OpLoad %uint %gl_InstanceID
-+%91 = OpLoad %uint %gl_InstanceIndex
- %93 = OpIAdd %uint %68 %uint_5
- %94 = OpAccessChain %_ptr_StorageBuffer_uint %63 %uint_1 %93
- OpStore %94 %91
-
diff --git a/dev-util/spirv-tools/spirv-tools-2019.1-r2.ebuild b/dev-util/spirv-tools/spirv-tools-2019.1-r2.ebuild
deleted file mode 100644
index 9c2530ee05d7..000000000000
--- a/dev-util/spirv-tools/spirv-tools-2019.1-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit cmake-multilib cmake-utils python-any-r1
-
-DESCRIPTION="Provides an API and commands for processing SPIR-V modules"
-HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools"
-SRC_URI="https://github.com/KhronosGroup/SPIRV-Tools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-# Tests fail upon finding symbols that do not match a regular expression
-# in the generated library. Easily hit with non-standard compiler flags
-RESTRICT="test"
-
-COMMON_DEPEND=">=dev-util/spirv-headers-1.3.4_pre20190302"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND=""
-BDEPEND="${PYTHON_DEPS}
-	${COMMON_DEPEND}"
-
-EGIT_COMMIT="2297d4a3dfcbfd2a8b4312fab055ae26e3289fd3"
-S="${WORKDIR}/SPIRV-Tools-${PV}"
-PATCHES=( "${FILESDIR}"/${PN}-2019.1-Fix-vertex-instrumentation.patch )
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		"-DSPIRV-Headers_SOURCE_DIR=/usr/"
-		"-DSPIRV_WERROR=OFF"
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-	echo "${EGIT_COMMIT}" > "${PN}-commit.h" || die
-	insinto /usr/include/"${PN}"
-	doins  "${PN}-commit.h"
-}
diff --git a/dev-util/spirv-tools/spirv-tools-2019.10_pre20191027.ebuild b/dev-util/spirv-tools/spirv-tools-2019.10_pre20191027.ebuild
deleted file mode 100644
index 4706f482cc77..000000000000
--- a/dev-util/spirv-tools/spirv-tools-2019.10_pre20191027.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit cmake-multilib cmake-utils python-any-r1
-
-DESCRIPTION="Provides an API and commands for processing SPIR-V modules"
-HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools"
-EGIT_COMMIT="ec12de9131244a076c34ddca2e8d7451288be7e1"
-SRC_URI="https://github.com/KhronosGroup/SPIRV-Tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# Tests fail upon finding symbols that do not match a regular expression
-# in the generated library. Easily hit with non-standard compiler flags
-RESTRICT="test"
-
-COMMON_DEPEND=">=dev-util/spirv-headers-1.5.1"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND=""
-BDEPEND="${PYTHON_DEPS}
-	${COMMON_DEPEND}"
-
-S="${WORKDIR}/SPIRV-Tools-${EGIT_COMMIT}"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		"-DSPIRV-Headers_SOURCE_DIR=/usr/"
-		"-DSPIRV_WERROR=OFF"
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-	echo "${EGIT_COMMIT}" > "${PN}-commit.h" || die
-	insinto /usr/include/"${PN}"
-	doins  "${PN}-commit.h"
-}
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index ed7a6e6d591b..784e2884d9b7 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -4,7 +4,7 @@ DIST strace-4.26.tar.xz 1444216 BLAKE2B ea8ff5f863afa29a3a40e8d89ff5c3835c64adf7
 DIST strace-5.2.tar.xz 1515544 BLAKE2B 919a689741eabd843a43fdb557953ee6095a4d1abea808d7c35049b93afd338e0df7c69014486dfb88d22dd7cdb2f74b939ed55f08e85cdb9793d8150d08bde0 SHA512 41bea20215fa80ad90a5d49c41944e02774e715efda5e563b3714e5800933a5fca4a2392634193cf49c0752321a39e0c185bdbc9cfb8ee053b09a6bd5723da35
 DIST strace-5.3.tar.xz 1572708 BLAKE2B 808bc7afc6c70137c44d0f5a47706953bc7c0214348cda2ae45e10876bd6e118c103f15abffdfe0d7fdb01d8d3de163b9c7de3970d9cd07c88ceca11a99dc7f9 SHA512 02b80a8abedb14e40235709733953005210cd328daba59cb594745e7ed3851d155546ccccdb3e43835aa75eee89f023324e542e15154bbc3269e37fd23433e2a
 DIST strace-5.4.tar.xz 1599396 BLAKE2B 0a7fd9600488f5f07042ead8123151cf0113f82329c3cc786c8f3ffb8673f73eaaa1a489f1f27c47800a20e5b6327f1bf5fb09a5b798156908f9e10374a04970 SHA512 4ddba2ec4457a2257c18b26dca851e49a275813c4eb3069379a93fcc60228f9b63a3dee9e3719ae606a7cc61d55ab21ce147327223903c302c061e381097a8d7
-EBUILD strace-4.26.ebuild 2288 BLAKE2B e39d94b807ba5ce91458dda8447ae2b755a5a61b0ad651632e7fde3c755dfe7c0737815f6f40a9cd13e0aeffae1fa55c386a0ff9326d25440f04be487f4d7d02 SHA512 8af2410ba171659feb8495c769c7143d29a1c4c39fa1a3de04c4be9b712663089edfb1c3d811a0fd8d2b039e88cc7f71c73155e46c04a1873ff0072bf829a8f2
+EBUILD strace-4.26.ebuild 2289 BLAKE2B 9401f15b3cca328531c2ed600f7da2d85fda262482afccea2ac04a2e1f0d0c9fa0de8811e249902584b1efbe53b7f0e7c54ba05180981886778fd3794607655f SHA512 2471e36a14163e1129f7cdbb154d202bc0f4eea63bcaa462ecc4785114878045e62d682cbfb912e105f492cf18b0bc8bd8842842e32c61f04ccc87358e8a0274
 EBUILD strace-5.2.ebuild 2391 BLAKE2B 903f519f389605b6aae22b20609070ae0b2703cdee5952aeb5e153cfea38ed01dfc8721ab40e121bdb40c835fb8d4d053fb8867cef6a3ec3fd86e638a591aaa0 SHA512 489e8ac527c80af548ea5bd0d895f658c6b4f9c0976879e4b5f2aa96b1a4686f81d8548f980a5a6b110d6c790a68fb95cee8ef584076fe76bc026d35ab794b4c
 EBUILD strace-5.3.ebuild 2326 BLAKE2B aa1914d8379ed519685b8b779c62e52c2e260fd409163eb7c774d9858f2be592298ce7990d146851aa3fd2082d34499afad6d2d960eee473200c6bc32bfa3dcb SHA512 c25c7cf8caed9df280f1c2a29258d8c983d6e034bf4fb3e8d55c30f312f72e76b6151663b8991c4cb949eee17e809f37aacd65c56da406f4dc40cf5f534db398
 EBUILD strace-5.4.ebuild 2528 BLAKE2B ea885a47f547887f21633fa50c1834800749df4f822d22c36d2b71a17d7410ab2e3e446699af6e9eb9d436ed6580fa89019a2934f3c6e68432e5732bc850bf1f SHA512 cfed508fcfa5dff270c8d038a8dfeaf10d60ad366d7fee0854bd294b7a06d2411fa2a56965b8f4734d14d5571e391f32fadae25ba40a9e8c8c96a6a991e32b3b
diff --git a/dev-util/strace/strace-4.26.ebuild b/dev-util/strace/strace-4.26.ebuild
index 89d8011c17c8..c7e479701dd1 100644
--- a/dev-util/strace/strace-4.26.ebuild
+++ b/dev-util/strace/strace-4.26.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
diff --git a/dev-util/systemtap/Manifest b/dev-util/systemtap/Manifest
index f1f1f0e6b440..a2ee461f0766 100644
--- a/dev-util/systemtap/Manifest
+++ b/dev-util/systemtap/Manifest
@@ -2,7 +2,7 @@ AUX systemtap-3.1-ia64.patch 885 BLAKE2B e26c60e4549f95f0db3e128cd535f923f03dc45
 DIST systemtap-2.4.tar.gz 2664988 BLAKE2B 194ad2489482eb926188fde700f43a35301214cf062ebd4d101776f09a23cbaf502f592ce0eecb297d1ffe9bf0ecf103c29b55a8a1afa84b56b9b5a0a4dd0cfd SHA512 40c30942eb50948f11f06f9f37c76d96f5ebc8eb6d164c9af5d54845b3f43f38594ddebf5f0d42ac4704b0a2563cd23edf818c196ee1330db00011a85ae11b0c
 DIST systemtap-3.1.tar.gz 4885480 BLAKE2B 39352f7507eb924fdb79bbedcdad6c200abbb18b6a9da030adca94405880fb52ff6ddbb62b01ae7acafa03e39a1ef5f0a7c3659300518412d8eee0c57d01b433 SHA512 07b322d5745f570296e287db80f1e370da87eb65073815cf24d532827900453c1cb9ee74b5496b4f3919d176b960caad4479edc2dadf27b5c58898fb7398264d
 DIST systemtap-4.0.tar.gz 5282312 BLAKE2B 9eac1cf9c9f13255ac12642c910b5591b0f5380b2a6337dedcb3d20785c0416900b9bee05f239632f7c548812be35ae90b24f524ab6f5c0c6ef474cf5de834a1 SHA512 66b5ba1902ed974101429dce9fee849273d3dc64e862c057177d158c5f284cc93299819ee8ee49d4bd3b7ff47a3512b1c68b74cad374147ce67fa406c7518c79
-EBUILD systemtap-2.4-r1.ebuild 1982 BLAKE2B cbe92a7d59e7d59a835260c180fc7040058860f4270b88d7cd62a5db74b46a0d5ab462b2bfece63e355882a4b8bb58145fcce4d05610f1702b19cbe9c34e7620 SHA512 fa2e0db9552365f2645d4c46adc66bd835e964aba86818e9e136e32b5ef1e1d02bf00cfbe23955630b266b836efb2cb15a36cfbd4779f7c5df452417686c9be9
-EBUILD systemtap-3.1-r1.ebuild 2203 BLAKE2B e2683da59a09e3de875911e9e034eadd33b1727e417017a0db2021ba04be93a191051d59be33258a849cd207274c6fa8faaa36350e3682e326e0e0bc4a503880 SHA512 18a941078d6de47680554ea2fcb46f65115d6e0e7c63ae6c261dbaff7b2910be6759b20b5a8bec2a8597cb99784491eb2f33cba62fb593b4e5da672c504ecaae
-EBUILD systemtap-4.0-r1.ebuild 2636 BLAKE2B c968d9e81e25b531c7832038bafd61dfa6ad3ef569f27c2b0b2bd51939f315de8183e7e280f9e946ba1b6c56bc4a6894197ce6ee089e21e68ba3518e04565ef8 SHA512 f693fcb7df968a5c0ac4745a9483fc33aa22fa754e875fd123225f1fa40b1fa5c1eca8c6674513bd21c86a8b289c30027332d59d9f618bb43d0eeea8ac4a563f
+EBUILD systemtap-2.4-r1.ebuild 1983 BLAKE2B 1a71057a37021759cfea490129bdafe069b3f3636427242f44853457a1b98779321eb815786168e58cfde77477b811b7e37563e9129e13626c9cf4b8b7ffa0d9 SHA512 95cf3a6decfc6e6e76276e3c3ef3851c4c0080eff70f57f42b28445047503e817e187b63071830a2aaa2605c35c2b8a1787c78a733ad2eca9f437629d2f86fd3
+EBUILD systemtap-3.1-r1.ebuild 2204 BLAKE2B 1895909b5a0416dd857feb79b385c5bed2b6a361249c8fdeb8d603b1991d2b7957f19b74ce58b33840522c73f67409797f29f3c295a9e6b8c4c2b88f9404485e SHA512 2302d8fd5bdee28917c7fa5e81cb5bf974abaf5f1fc69ecd7283573f30270d53ebcbf8cc241d3af4483cbce46be63d35ae226a24daba7a0d54cee938ed8f4f09
+EBUILD systemtap-4.0-r1.ebuild 2637 BLAKE2B aa7cfe0603a437e356fe9cb806db9c3de2a5cb9da705369c90d132b1eebc6c8776492c5f85ae4e9f13727757456bb41122319bfda6dabfd23dd61d0bfebdda8d SHA512 9e9763dd1be41636d9890a36fa4a1cb631fed4786ba4ea46230366a95a39d26ffade78ced9d70b7e97c45436bb109414a2f347ee4d77c0a494ea00a63fae9d82
 MISC metadata.xml 302 BLAKE2B 1118f1c8c5cb76bb140947afd86eefece0251d75fd99bf58decced339e68a700f140b30d7d7f77f8c89fdcd468e79906574ced8c9339498078e6cc9edab83922 SHA512 4db366a3c2ff95cd2cfe271cf4a50fa2d5189985620d3b9e51708f2811609e53eec2656589ff754731d018bf1c184a1bab662be8683c714a8621e9296eacd9a9
diff --git a/dev-util/systemtap/systemtap-2.4-r1.ebuild b/dev-util/systemtap/systemtap-2.4-r1.ebuild
index 330261410f40..8aabb3093f73 100644
--- a/dev-util/systemtap/systemtap-2.4-r1.ebuild
+++ b/dev-util/systemtap/systemtap-2.4-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.sourceware.org/${PN}/ftp/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="sqlite"
 
 RDEPEND=">=dev-libs/elfutils-0.142
diff --git a/dev-util/systemtap/systemtap-3.1-r1.ebuild b/dev-util/systemtap/systemtap-3.1-r1.ebuild
index 66b6c5bb8752..5e301e189c93 100644
--- a/dev-util/systemtap/systemtap-3.1-r1.ebuild
+++ b/dev-util/systemtap/systemtap-3.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.sourceware.org/${PN}/ftp/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 s390 ~sparc x86"
 IUSE="libvirt sqlite"
 
 RDEPEND=">=dev-libs/elfutils-0.142
diff --git a/dev-util/systemtap/systemtap-4.0-r1.ebuild b/dev-util/systemtap/systemtap-4.0-r1.ebuild
index 2a7d055dc2b0..4130583b5b76 100644
--- a/dev-util/systemtap/systemtap-4.0-r1.ebuild
+++ b/dev-util/systemtap/systemtap-4.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.sourceware.org/${PN}/ftp/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="libvirt selinux sqlite +ssl zeroconf"
 
 RDEPEND=">=dev-libs/elfutils-0.142
diff --git a/dev-util/treecc/Manifest b/dev-util/treecc/Manifest
index dd0fbf47e6c2..446b347e7b28 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 994 BLAKE2B 572f1917e89d52e18a9f9bcd4245834de8205dcf4d9d609bdae27600fb06084628242fd6319251201d624617a6a021ef7cc1edafc25856fbee7d975358895de3 SHA512 e0c7da354850a4f214879b375c9c03e9c2923ed7b91942f3abe9d31ebbd8e31fc7efb1f0ad2700ede93bdb76d2418aa249c60f11735d2333dbece4c904dd0535
+EBUILD treecc-0.3.10-r1.ebuild 995 BLAKE2B 12aabd7d10d36a5431d73d186c69544c6a19d1db2993ac2953e64f0320687123f4a2fd2787d51eca7fdb096b29662e1a0f45167ce8fa5c2b39c6b2952c1f43dd SHA512 1b42ff22550be0ebceb9ce7150ea6b48cef17475dc8f04dba4156a14929438b074f80cdb747b99823a55a9bcda4c4d853ec26eebf873a4a0bc35c7355617f310
 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 fb7f9b99e165..68bfba64cabc 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 1c7ab0c73e76..17f9010d5e2d 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 859 BLAKE2B b930a20755e952a9a2d7b6fbdb5970d8f9919344fec3e86c4ac7a96c2558f350d2c4476d3d0b0230b01ac79337a987c7d421f6e96f472d2447fe76eff8da2d09 SHA512 dc79e8737f3736b765915965d8e754d7d936c6b07e1836d2d55c173c3f73ded6776f7d2758bccda77a045e9565dedbabe08b6a933e6ba70f2a4d70bba988f622
+EBUILD txt2regex-0.8-r3.ebuild 860 BLAKE2B 8c93d1724949d5c890a54d4dfefdf97bce79d0cdbd017e23d1c1e124b996f23cde9703eabd066248a6689811f7da945dad3163466abc4d5547d20a3b797114b8 SHA512 01af1f362bb311eb3ed1ffd0ab9f163ef61e5d65db55817d734c66617495f192c4c3dcb6dca3d9824db15c0172806766b60e4f574fd63f508c70e3fda398eb20
 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 4eba479be662..b02381485650 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 167886972ccd..ce6d05f8de64 100644
--- a/dev-util/unifdef/Manifest
+++ b/dev-util/unifdef/Manifest
@@ -1,5 +1,5 @@
 DIST unifdef-2.10.tar.gz 73285 BLAKE2B e13b75afc9b8e514559b8a13e3069bfb1cb489d21ce4ac56134921e702666bd9b23dad36d251cb65535e5d6fe02bea0d21a5610c542d727dc5e90d7e1726e4dd SHA512 39d4551f43fa8eccaee8a9fc469b5ddc8ca8eb0e0ce46c17c3a8300f7e6960fbf0960f364a83df20059b4aa623edc7c3c16df1b7162f068332e6c066d7ffe9b3
 DIST unifdef-2.11.tar.gz 77947 BLAKE2B 2ddc1a300b329ae91f72f1a8dad86443ba36fc02c7205eacafe1ec3ef82467003bb855c32485e6ca92b61dc45d160990b8aad531ace60ba3e55967f900150af6 SHA512 948abf878852da321f15c6060dfe33a2ab38f1787b0a6096f10bb3828d0b4e50226643e9dbcb678a422868c215b5c4e981dc7da5244d38688e8e91287beb8845
-EBUILD unifdef-2.10.ebuild 554 BLAKE2B b9ff25849a16f20be133acd1b68d5868df2fbd8f352da2fb726ef8e3b7afc0d68b5184fed285b1a88bdfd35a507ab768ebf63a61c1526a6f6aa63eab88b319ef SHA512 08055bcb1d2802ff68faae83e9ba7c1210fcc2ef808f126da2d87eb5dbf8ecb485f7b999d380cc2d42208205dbe8666e1e7f3e9b137c4f301ec154b0e6de0011
+EBUILD unifdef-2.10.ebuild 555 BLAKE2B 103bab230bd054c9177bb8b6806249ab15e33daa4e86e851d86bc9b7950e54153030bc653db9c1cc805f3642a62cb75955fc3ebc092cbcb26ef71fc850bc671e SHA512 39a660ad866fc81c3702688230f2aff1ddfa40263192727742f9799a78416a341bac966d227ba1604990175bd02caca6fdfbb5f4a157b35ba5f1673d207f763c
 EBUILD unifdef-2.11.ebuild 576 BLAKE2B 2e9b5e695f99ae2204016461fa70eba340a58453888fed5df40913d480dc08168dcbbfb470af3fc3a27d3d1871c3c630a830a4c1961727a5f3c930c01d784dc5 SHA512 1d8b5c4848da4a3ae48d151624f7ebf3e98939740cef5387242f09464cdd815ad8297578ad9a27ae62fd8a92f1163e574ce967a5647122c00f703c0abd677ea4
 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 7cafc8e46a09..f4bce36687e4 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 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 
 DOCS=( README )
 
diff --git a/dev-util/vint/Manifest b/dev-util/vint/Manifest
index 9f2385ad69ee..f28a06f8f25c 100644
--- a/dev-util/vint/Manifest
+++ b/dev-util/vint/Manifest
@@ -1,5 +1,5 @@
 DIST vint-0.3.18.tar.gz 95865 BLAKE2B 0f7e61b720aa0998091b9b40118b199392fbf1aeace8801d683e8249179cd3d792e15b42df6d34c567c4df1830629a80e6043e87092f37dc46a0e57c6a56cf53 SHA512 1d3e04527a8f5ffae29395010a88258c1771aff2798143eff6572400eaf96323cad04353a7fcee68d9407afde5808446f515fd3d7e8e62de4bef28edf214ebdd
 DIST vint-0.3.19.tar.gz 96755 BLAKE2B 0b03807a4286b3e030e00c112dd0e879fa39e0d2333d46ea159555de50b30098d9a8b2345da8e18b7e1e5c814f10678df2e64398a615bf381186faa0036939f5 SHA512 b9024ed1cd8a18a916798e691ba0db31985034b2420e33c094459a48254c7c8f6fe89a1a64858a67ff95b0b48e67a780cf975940646af2685d2b95640e8121f9
-EBUILD vint-0.3.18.ebuild 1338 BLAKE2B 750be9348f76ca1df4376b40f778f9c049fe5c15bef2625d434eeb7f7426296677c0569ab8d15ef4b4c79fa837f4266c2293b805f46c4c877359e889087c82ca SHA512 8c921ced87aa1173ba61da4c9885654652b053d8d0880818c3cd515321b067c84f947879d1fe85c2a7c57f59e3ebdc6b1aba8e2696e671ec848d2c6490dfd5e0
-EBUILD vint-0.3.19.ebuild 1004 BLAKE2B b7e151566e3939d1c9deff717ae243676c38000ac07f71b5bd252ee97389a08ae38cb421f15503d1388946221a1872fe9d9b449617e37f6a53f849ad600b46b3 SHA512 2e832b6d523c3f2fcbce88cc8363e4fbf857a493263d0913a5030412d525d784e0f9ae31ac3db39bd0c8b6e00cad11c666424775d78b2849061cd648ea6d2dfe
+EBUILD vint-0.3.18.ebuild 1332 BLAKE2B 7c3dfd1254b5928e4d23d03db492911ce72b7cb22d78bc3754b1c3cf3e67c2c25b6b43d860a40b19601ca6c6387439474179b919ae2d0ca5ff1e20314023b97c SHA512 19a9e76f6dd1253eb3069ff296bd444e73697a3b83103e3cc8d0508c1d1e5503a46d12e99a513ce4f3c17fde32f74d7b0300078db0eb4b9258596330366de2ab
+EBUILD vint-0.3.19.ebuild 919 BLAKE2B 8d6a40a265227d2a98ec8e0e73985e8c9fbaf432a82bf50f942321fb10f5d38459fdff5138466311935cceae8c437fb85473305218aac83a6de5b7978eb9101a SHA512 ccd7f66e347c96d5b69d57a52e7865ad7f2fdea5d885cd6f40ff23ac454e7eecfefbcde57a55236b2b66bfa63052d04804ee77a5cb4683ec5b5f1b569585a444
 MISC metadata.xml 356 BLAKE2B 2e20ccc80c3828e2dd47f3b073ed3925fd37c010197284dd2b917b01ad365fa7556562a19f5aab16f4e8bb0e43850354075c1802703ecc1e9f43739451247c42 SHA512 3deb46a147db24fd9858b4f4cdc6f864d303ffe2b2989bac8fd6039bbdc7e9e4d06db96a4cdb2441753d103c86523cac48743ecf803d5b0c2f85d0b211052dd3
diff --git a/dev-util/vint/vint-0.3.18.ebuild b/dev-util/vint/vint-0.3.18.ebuild
index 31bbe3b8b535..a8842c4b1623 100644
--- a/dev-util/vint/vint-0.3.18.ebuild
+++ b/dev-util/vint/vint-0.3.18.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-util/vint/vint-0.3.19.ebuild b/dev-util/vint/vint-0.3.19.ebuild
index b91fdf6bce9e..37d2eeb1dbc6 100644
--- a/dev-util/vint/vint-0.3.19.ebuild
+++ b/dev-util/vint/vint-0.3.19.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
@@ -29,7 +29,6 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	test? (
 		>=dev-python/pytest-3.3.2[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' python2_7)
 	)
 "
 
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index 7989ad45874d..96d3fa42ef29 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,6 +1,4 @@
-DIST vulkan-headers-1.1.114.tar.gz 596033 BLAKE2B 707b820ab37e7de92540196c181dea7a0ef1461e15f2b39f4a8355f265ec8d422e69987f3e49f210b8e9f8ebe20f99a682805b2c9b94755f94d2a1b2213b67d5 SHA512 6da91d7207575437f4322ddcacda25f85910266012625a2485124d8dc7d91d88386cc8d93ae5ded4f9e7d862b7139573118df550022ec912a5b2685048cbc6ce
 DIST vulkan-headers-1.1.125.tar.gz 662594 BLAKE2B 7cd18b74ff804ed02df3378485f0783332bd09bf898769c48ded20f7a6495b5208cfae3616de401e17ffcec30421b48222520dcd90b03ad83b548405fd8a656c SHA512 355df13347aaa3b32ad62185810c20d1b2f358525d9d8036f6bc7643e7505a25c087a51e05fa7b0758e4ee63221bb39d01d6e14bfb7f99a53cb2127ca5db5d67
-EBUILD vulkan-headers-1.1.114.ebuild 627 BLAKE2B f3f2eb31d94953b415ae94c4ca5ba2b45eb65d348645c66f55c8e00473f861a30e85779d27f3413fc9fa4ab59048f7ca0f9aec958c8551b3980f30099e72fd7a SHA512 bcb14b626aae1c5264ac3eb708ed4baf62a591b55ba97a24308dee64b19517b7fb197b978b84f9cc7eaeaf48078b37c6b30b3800298895f999c27b3a676194c4
 EBUILD vulkan-headers-1.1.125.ebuild 782 BLAKE2B 49f320ea70410aa14a127d2666749db5e7ee263431365c71443c2b6ff4a76e9e18b2cbc455b3b1f2f3b52410580aecf3137f4f9f8584a8503a83a3d4a876a345 SHA512 a1f6a9439e3f602f63086cb7bd27e81e31b936d43e1bae276dcbed822d22be9c524409b80141245ad2e248dd6ddc58199d7a6b43ecf29a46801c4684d00761be
 EBUILD vulkan-headers-9999.ebuild 784 BLAKE2B c47201396af371bc6882a6159441906242ea78af661f237c6267fb830d48c4a6ff63f129e94d979dc727778a0517c9b648fc2b79a7bacd6aeaeeb746762520c9 SHA512 e9a29f6b59b818b9fc2645a7cdce3703622aaf1e7791b9c9b83946bf7d9f95d262f94b56e095528c5a101f854e190677e0c0f2a1cb595e926a5de24be34da5c9
 MISC metadata.xml 432 BLAKE2B e6c1f4f34e41862d3739bad772b910b21348dce97dbde38cc7fbc9cb42993a493881dd100a0c21be3615805f27d3987259233ae5830ef56e2d1dd928c285c09f SHA512 f4f93b16ad29f813a2c0397ec46c6decf7c9bdb3f4a376e1f24a29724c136feabd230d0558d37a502f2795f71c959833a662e6d2544a78704408b3be9be314fc
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.1.114.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.1.114.ebuild
deleted file mode 100644
index 2207a814a523..000000000000
--- a/dev-util/vulkan-headers/vulkan-headers-1.1.114.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Headers.git"
-	inherit git-r3
-else
-	EGIT_COMMIT="e3f96a9ccab9397481eb81c4d9bce4ea7590dc33"
-	KEYWORDS="amd64 x86"
-	SRC_URI="https://github.com/KhronosGroup/Vulkan-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/Vulkan-Headers-${EGIT_COMMIT}"
-fi
-
-DESCRIPTION="Vulkan Header files and API registry"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index 4d8ac639ed91..0bdf2ab532b3 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,7 +1,4 @@
-DIST vulkan-tools-1.1.106.tar.gz 611700 BLAKE2B 510ec1f759ae9657a57f641f3a74c87d82c181f6c328a2b682c89cf3a676ae03c59e4be96747b64f29be9ff3f7c5e00eb9ce7cd59d49ab2c8c3bc5e52f1915f1 SHA512 7ce80fe42032058fc7cf2462d2afe49e843f58c412c39338862805b3bcfadf5abef85043e2b21df92662c619bcd34271e2dda5ec9ed8ff9a4dcd74deedfa4c82
 DIST vulkan-tools-1.1.124.tar.gz 691639 BLAKE2B 6c40d8fd9498205bac9eedfc97486a0567f503847f5efff7d2e36563f72862b9a74e7d5b8c61e7d92822a4fbb91c24ee72614f7efb85aff68d4dbda42e09c422 SHA512 9f1f5dad1a5a847dc2fcc43382ee86f19a4c4b97c300f096b3cb33852378fcb260c33e6e920e9b70839a726bd6473ccceb8ef7504a530a3553dcb30c3ac74421
-EBUILD vulkan-tools-1.1.106-r1.ebuild 2233 BLAKE2B 5f374ad56b29a3b977bc4e785796dacd12c805053aa559ef0e46e4da0129cf68b619c1baa1f57a70a6abed1e733edad923cae0f4c2b9c9982d81b7bac830eb88 SHA512 ea189ce1558337126fea2474f200e6ca687f5ce67603b8dd99207d7c570adb2a4ac80c6564fd646c60067f34af4cb784d81a205d9b925be3492ab40ea82cb6f7
-EBUILD vulkan-tools-1.1.106-r2.ebuild 2268 BLAKE2B 0ca22e0f63996d1a4a73d8245f8e9e215ef65186f9a080fdc9b52c05d69f996e9236d0a26f62e956a81bbc99596f95870a1bfa1dcf68edf675b49ddbdb35e3df SHA512 e2c59a8b2c43f3ad1525862ee6cf1eb527e24362822eab64bf4cd1ffeefd5da9af4140f90ef00ac7281ce51d9e7c3bb079192548699bbb5aa904a7033da27a98
 EBUILD vulkan-tools-1.1.124.ebuild 2282 BLAKE2B 83f4dbb765d99ffcdc07387616afe11d942ee5b0baff8a148b64053b5127abb3802b5541fc785de0dd7b4027d387bf1964142c6cee69813ee590342210c3d124 SHA512 64a3f7984743bdd39bfc96c3176d653fe62dd76f4bb487d06393d2f6db5c493a5999dc982059eb786bbf1d71875e93acf3399376b0642e883e54d9c42d14e8ed
 EBUILD vulkan-tools-9999.ebuild 2283 BLAKE2B d3e5280ed64717625c861e32f363cafc628a09895922984a66fc715c9d8d8c5ef7e8a973229e2f17c1d86de86a2ba880c18481426518aee2fee3cdbb085fd035 SHA512 27f44d573ad6e67db4dec9145b4ea1f982a2f6332ee0a0b82da66d93031d4d91fc5c4e5f0b1383a4406654c47bef18f5de2b201916f9a50885bb6cffaee1f2d5
 MISC metadata.xml 562 BLAKE2B 0d3fae7aac348ecb5252688443f81be2cd97c5872c9b81cd11a730fc643d4e650132e318311c40b6448ce6dc22f27a4075a0d454e3dde8b05e16aeac4fd06329 SHA512 4e4b8dbb4ddefaf21606746c958b4054340897f5e8cafab65b2ee272b01c03ef642b1000fff33c8a046afb1eb82b2cd7400348b9b284ee0f1eea48e856eee854
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.1.106-r1.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.1.106-r1.ebuild
deleted file mode 100644
index 228672c2ae9c..000000000000
--- a/dev-util/vulkan-tools/vulkan-tools-1.1.106-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Tools.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	EGIT_COMMIT="2abb69904b9ad017d39d3da1e7fc3dec1a584cd8"
-	KEYWORDS="amd64"
-	SRC_URI="https://github.com/KhronosGroup/Vulkan-Tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/Vulkan-Tools-${EGIT_COMMIT}"
-fi
-
-inherit python-any-r1 cmake-multilib
-
-DESCRIPTION="Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+cube +vulkaninfo +X wayland"
-COMMON_DEPEND="media-libs/vulkan-loader:=[${MULTILIB_USEDEP},wayland?,X?]
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)"
-
-BDEPEND="${PYTHON_DEPS}
-	cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-# Vulkaninfo does not support wayland
-REQUIRED_USE="|| ( X wayland )
-			vulkaninfo? ( X )"
-
-pkg_setup() {
-	MULTILIB_CHOST_TOOLS=()
-
-	if use vulkaninfo; then
-		MULTILIB_CHOST_TOOLS+=( /usr/bin/vulkaninfo )
-	fi
-
-	if use cube; then
-		MULTILIB_CHOST_TOOLS+=(
-			/usr/bin/vkcube
-			/usr/bin/vkcubepp
-		)
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=True
-		-DBUILD_CUBE=$(usex cube)
-		-DBUILD_VULKANINFO=$(usex vulkaninfo)
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DGLSLANG_INSTALL_DIR="/usr"
-		-DVULKAN_HEADERS_INSTALL_DIR="/usr"
-	)
-
-	# Upstream only supports one window system at a time
-	# If X is set at all, even if wayland is set, use X
-	#
-	# If -cube and/or -vulkaninfo is set, the flags we set
-	# are ignored, so we don't need to consider that
-	if use X; then
-		mycmakeargs+=(
-			-DCUBE_WSI_SELECTION="XCB"
-		)
-	fi
-
-	if ! use X && use wayland; then
-		mycmakeargs+=(
-			-DCUBE_WSI_SELECTION="WAYLAND"
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-}
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.1.106-r2.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.1.106-r2.ebuild
deleted file mode 100644
index 3b24b766484d..000000000000
--- a/dev-util/vulkan-tools/vulkan-tools-1.1.106-r2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Tools.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	EGIT_COMMIT="2abb69904b9ad017d39d3da1e7fc3dec1a584cd8"
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/KhronosGroup/Vulkan-Tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/Vulkan-Tools-${EGIT_COMMIT}"
-fi
-
-inherit python-any-r1 cmake-multilib
-
-DESCRIPTION="Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+cube +vulkaninfo +X wayland"
-COMMON_DEPEND="media-libs/vulkan-loader:=[${MULTILIB_USEDEP},wayland?,X?]
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)"
-
-BDEPEND="${PYTHON_DEPS}
-	cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )"
-DEPEND="<dev-util/vulkan-headers-1.1.125
-	${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-# Vulkaninfo does not support wayland
-REQUIRED_USE="|| ( X wayland )
-			vulkaninfo? ( X )"
-
-pkg_setup() {
-	MULTILIB_CHOST_TOOLS=()
-
-	if use vulkaninfo; then
-		MULTILIB_CHOST_TOOLS+=( /usr/bin/vulkaninfo )
-	fi
-
-	if use cube; then
-		MULTILIB_CHOST_TOOLS+=(
-			/usr/bin/vkcube
-			/usr/bin/vkcubepp
-		)
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=True
-		-DBUILD_CUBE=$(usex cube)
-		-DBUILD_VULKANINFO=$(usex vulkaninfo)
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DGLSLANG_INSTALL_DIR="/usr"
-		-DVULKAN_HEADERS_INSTALL_DIR="/usr"
-	)
-
-	# Upstream only supports one window system at a time
-	# If X is set at all, even if wayland is set, use X
-	#
-	# If -cube and/or -vulkaninfo is set, the flags we set
-	# are ignored, so we don't need to consider that
-	if use X; then
-		mycmakeargs+=(
-			-DCUBE_WSI_SELECTION="XCB"
-		)
-	fi
-
-	if ! use X && use wayland; then
-		mycmakeargs+=(
-			-DCUBE_WSI_SELECTION="WAYLAND"
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-}
diff --git a/dev-util/xdelta/Manifest b/dev-util/xdelta/Manifest
index 93ba7214e5df..a8ab7273daa8 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-r2.ebuild 715 BLAKE2B 43a5cd6a8946072fc8345e44680263eb497b5477a5e733ea0784b3cc212cf5a5d06df445438ac2b454ba4c281cbac5cfbfd0c478ad756620b62c4c93c59478d0 SHA512 3cf9a526dbce42aa870704e9fa4d8435dd0f756bc920ac11b9f5e5779000b0d2dceb8907986bf94a41b2bd2855ef7b3b8a00a03f57e02786f593749bc4608215
-EBUILD xdelta-3.0.11.ebuild 837 BLAKE2B f6d575a2bbc1091c0565225bfee15f2ace5c1b308e6970acd8d6755df3b92633ea9b4685a0d51b20ec5ea2cff25f9dc76011e8966ac4ef57435ebc86a5ae229c SHA512 864c62d7307064f7ff8b7c827ec98759a375684e596efdc729b332dafbe22943584c09c2d4cc5391f7e4f4adff358f1d98d1252980222c048602bea83182c819
+EBUILD xdelta-1.1.4-r2.ebuild 716 BLAKE2B 825334ea6d3fd7d8a230fa08f290c40512f22849db556986050ee46b714fd5a5aeeeef780159c42deb6de9ee04492ae0b8d9e3ee085a77310ce708e98a7e645f SHA512 718d7542948a50f75f50daabc8b75c28a91be07d19c2d2adcbd650c63553ecb908f5ae0d79804a8dea370443b9cda718a893dd7b5d8630b2459e3eb51bb4501f
+EBUILD xdelta-3.0.11.ebuild 838 BLAKE2B b00560ef4f53308ac513eb765575e4651ce9756d3936ef059bb959794ace8e86eff1a65082088fcc984303ba1c69a32da9a5a8bd7a9a14f042d0483c8fdc3a23 SHA512 69c3a1b1b9fc99c6e937a83126f9f17eacf38253cfe6c13e3c84a44893756418bdee729022e9cab8d8c08089d168cff64b9552fcc0c709998de67f3a3095137f
 EBUILD xdelta-3.1.0.ebuild 1146 BLAKE2B 214a9cd0019516af48e204567cba7d68cd370896622ffbf2e86c518ef3ac66d2900174a6fa34034e9788dafaf8d20816120e594f157470839ef6394c5433c9c3 SHA512 1e767dc1456bb84b68866d511423d916fbf1593a68d3a34ec3c863769f37442390f4a96388848e653997ae8cd81b1e12d81926580dc7fd9ee64728ed3ed7b6ce
 MISC metadata.xml 381 BLAKE2B 1e67843f342c5d64a78b0ec5f6b20cb6c091f020be78355e83cc5ab8d53312fa97e025d9f819e73fd0c4fe936d15bf87600835bcf2d9040ba67dc740d270d2cf SHA512 2c439c35f726e18396d3a0f2e923cf2f2d0eb7a9798907fd0f039dddcc9fdbac95d6e89d113fc8a937ceb260c90901e0657ecdea2f0bf423ca9456627b2912d3
diff --git a/dev-util/xdelta/xdelta-1.1.4-r2.ebuild b/dev-util/xdelta/xdelta-1.1.4-r2.ebuild
index 557a3160b095..edee4480d178 100644
--- a/dev-util/xdelta/xdelta-1.1.4-r2.ebuild
+++ b/dev-util/xdelta/xdelta-1.1.4-r2.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"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2
diff --git a/dev-util/xdelta/xdelta-3.0.11.ebuild b/dev-util/xdelta/xdelta-3.0.11.ebuild
index c68012e99fee..73e6e565b6e6 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 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="examples lzma"
 
 RDEPEND="lzma? ( app-arch/xz-utils:= )"
diff --git a/dev-util/xfce4-dev-tools/Manifest b/dev-util/xfce4-dev-tools/Manifest
index 8a6fa241cb9c..2205b0a9003d 100644
--- a/dev-util/xfce4-dev-tools/Manifest
+++ b/dev-util/xfce4-dev-tools/Manifest
@@ -1,3 +1,3 @@
 DIST xfce4-dev-tools-4.14.0.tar.bz2 292275 BLAKE2B 18f28394ded038a7bcf0e754ebb359464358df245903a0c4441df2845e57c9059de6e6775a90c0e6c3cde4936a847ddf26ae88ff61fe7612fc2626b00f1d56a7 SHA512 e22b139ff7516ec0e510f882cc6a9e8e8b2b7bd41093c8e67e5ef11eb6c2c2848637513369d652f7238f10b5005c5483a938d3348020b48a4c1fadadd6d635f8
-EBUILD xfce4-dev-tools-4.14.0.ebuild 577 BLAKE2B 0ed29c8e1ed9b465bce7038ee5a44431e7b922a0f893e760a854eb73a430d3ebd46cedcd499b852dcf9023a00c7004ac78d5b3251d373b05a759c188b543d6f5 SHA512 774f086181479a4663fc2894d023a00d8d277765f97b74f472c1d374deadc4a63b9698e370e3ee800ba6c9867daf3ec32c82f546c0ff0294e00b1140c3d023ec
+EBUILD xfce4-dev-tools-4.14.0.ebuild 578 BLAKE2B 7591fc024f986cbfac5ecbc113d43ccb3f3a1c90a5d7e41c3e09f29e67f75a05014e4665ca2ec48f07babcec9966df18472dc3ae64005b61c4f04de2f4bc7c0e SHA512 bdcd10793605d8e79f0c07bf2c670bde24c5c434161152d284fef085c9b3285ef9036d25aa841ea63679216f3b71234e570e3091b50422805b6c3e998f025256
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.14.0.ebuild b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.14.0.ebuild
index 7224de308444..130d021eb5f5 100644
--- a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.14.0.ebuild
+++ b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.14.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.42"
diff --git a/dev-util/yacc/Manifest b/dev-util/yacc/Manifest
index 4431f3cfd38b..74aa75979713 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 1550 BLAKE2B 74ae2b08beff20bd7bc5732b4b4f0b0418c3d017ba7d525745c55dabfb91aef2d9d7662efb5fac40b8ef285763b2ddee85c387f131a39ddd20158329ef3f55bf SHA512 b3beb6e9a2fc0d09044bcf4cd4b22ac4496659e518633a0ca7caaec91f933405fbb06c0571ecd557fc8496e4940ef6f09b4b1368775210e4d3e7d53e9fee6af6
+EBUILD yacc-1.9.1-r6.ebuild 1551 BLAKE2B 25793bf7608d9291f532d140ebe94530d6c27e7be5089acb96ba3da98a129094914afed251edb56e14194af7780c1bee0f713c3f1ed192384e1ac9f4912e4409 SHA512 7bb621524819bd761067896ab24afc093d5792aa70a0366ba66ab34e9703192ee342476d43462af633e513371284e507d3f6cec43b6d09c69cfed05d51c865c4
 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 0462eee56053..1583203dd3e5 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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 
 PATCHES=(
 	# mkstemp patch from byacc ebuild.
author	V3n3RiX <venerix@redcorelinux.org>	2020-02-05 18:44:56 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-02-05 18:44:56 +0000
commit	29aabba0ea759c6a2864ff5631735b67ee38e5e0 (patch)
tree	ab466b4dfa7abecb401b2f8039d08af4689306bb /dev-util
parent	d42200bec37eef2a7478d88988ff00addd0a9202 (diff)