gentoo resync : 25.04.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-04-25 11:37:10 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-04-25 11:37:10 +0100
commit: 38423c67c8a23f6a1bc42038193182e2da3116eb (patch)
tree: 04e2cf4bd43601b77daa79fe654e409187093c5e /dev-util
parent: 623ee73d661e5ed8475cb264511f683407d87365 (diff)
168 files changed, 1269 insertions, 2002 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index b7d0b2924c48..e70547d6501f 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/aruba/Manifest b/dev-util/aruba/Manifest
index 1053b329c3b8..57c6b490448c 100644
--- a/dev-util/aruba/Manifest
+++ b/dev-util/aruba/Manifest
@@ -4,6 +4,6 @@ DIST aruba-0.6.2.gem 75776 BLAKE2B 569af009cc20b644878fda25b5e7f79bd2f7c6f5fa9ef
 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.14.14.ebuild 1520 BLAKE2B f30a8e3eb009dc14ed00cdb71decf87f46c34d3c98246adf58b3edf916d08de616135246e8968eef870d47a6f4fe85dbf37fa9d263fd5bfd1ec73665a65c9e3e SHA512 27b7f88ef244634ff9c1aca29f3c11c1cab9b5829f614c0a4450aec415b5d61e399c62bda3db9e6a5733b9639329e7f67b5c6a2773ca5382ccc2caebfc59b46e
-EBUILD aruba-0.6.2-r2.ebuild 994 BLAKE2B cf032592cf6b490a05587c74c15f1f1fe5f6d549cf6b17e4f0ec6153a528e7cc8472af57d44773bd4e82885391ee96aef4843c3543d4baeb15437b3dea4dd83b SHA512 97d040c90e2db2b79d725c94f73ab9c3d0884e0eddb372a47407133109401e5931ed6b153510a41f35e7cc9dcfb75e6287293de2e2eebf22dbbb5ff025165d63
-EBUILD aruba-0.8.1.ebuild 1662 BLAKE2B 343d4a5bba75f4b2f13e95486d1acace2be65ac851b24b5a7dddb102ee8c56a1d3239dd9a0ee31a430d14adf098569b5fa959636c0ed628fa009ef0ede05b8b5 SHA512 8dc0ed9d126dcf912612c5b54b8c56a9b94bfdbe51e3162a9071c68f6e2b6a1b576692ef1ba9f9381f967feda9c5c757922e25953f1013728dd5b30294ec4c5b
+EBUILD aruba-0.6.2-r2.ebuild 988 BLAKE2B bf2e43c4a655e129fe796c6c4453394c6efac353c5979fd3b2837b4c122ff02d92999d1f3b15e6f566a05bda770216b8c89156197fbdd8d08fbdd071f50ecc79 SHA512 1e85cac5483b8c1bf49dc5079f4dccd98c7c7bc8072d7a2f21fc2e290c23563b50fd25fb60b7f19bb1a9b6ab7dabb299a06ff9542d9c8235855bfbdafcf97327
+EBUILD aruba-0.8.1.ebuild 1656 BLAKE2B ef3ec6ebbc1562ad42fc9902e8c3635a92ec6bb597233752e8a32ec9750abd0ca54ff74ae0ac65bc91b008dca695372fbf9e3f8727e3c357ff9183b22a55aca3 SHA512 b4cdf943c0ee9f1d6d0c197faccfd1d9d0846775e04425e74c25f65900e9435af7b104b353c667debf495f1f6c9d5068eb4f1cdd9f44d43c8939622655a2e120
 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 d7adcdce378d..67baaa3b42d8 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="amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 s390 sparc x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-util/aruba/aruba-0.8.1.ebuild b/dev-util/aruba/aruba-0.8.1.ebuild
index 0c9d1822ade5..3d38cb5eb78c 100644
--- a/dev-util/aruba/aruba-0.8.1.ebuild
+++ b/dev-util/aruba/aruba-0.8.1.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Cucumber steps for driving out command line applications"
 HOMEPAGE="https://github.com/cucumber/aruba"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest
index c7b7ef4bf544..867575e976dc 100644
--- a/dev-util/bcc/Manifest
+++ b/dev-util/bcc/Manifest
@@ -1,11 +1,15 @@
+AUX bcc-0.14.0-cmakelists.patch 444 BLAKE2B 3832bdfe3fdb3946889fb614c3f89220dae7b319329ad45649edda0f7c9cbd8c8e90ce200c6f7df4913c3eceb0cc729e83d90b7dcc8af991e3f59b5a772f9cc8 SHA512 05f2c50e7daabe9118ea4e6dfd6d8dc155bb0311fbb2fbc491c2740d6f5081cc95ec7cb8faf19751eb161bcf60d30be87e0b6c88d032bf88ecae48af5119e0df
 AUX bcc-0.9.0-no-luajit-automagic-dep.patch 463 BLAKE2B 286ed298055cbdb22d9c3f3f064c77da685cf75cc8c0ab0cad4d4b473f0eac0b1533ca8eb7e6159108d184d16db7a264b0ea9d30ccdc3d988d88bab28be7310d SHA512 6e5c20de22547410ffa566cb8226a47ee0e8c91183bc5b70eb22637a08fe55cfc96fde169ef3ab8d6e8d7c9e356c35e61b164b3ad675835d3ea8d5239a448979
 DIST bcc-0.11.0.tar.gz 2611511 BLAKE2B db12e10a3da11b1d3691ca5e0e036f56af4c5765d49e2edefc3e30bc90036a5f521d196db797e3725e618efa68ba2550848b3dc044015f6aea6b2da6ca2a34f5 SHA512 4854a5a15a89a8bd3a10daa6f0e831428316751280902cbdc74f3c6f78263ee1c58521ae9125804e72fec6482702818a5fec781436400640627e4b7c2fc189fb
 DIST bcc-0.12.0.tar.gz 2627075 BLAKE2B 44c435eaaf6233ad24249cf5da4e778cd31e41573199ded97d1f411c7424128fb11f838c55fa48c692b4d5f267ea594d6cab9992dc76137da1b41453285c98c5 SHA512 db3ea929b1296f4d9d82d2a11e89e11a1c31512d3f7f935475a7613e0128a5cf9441f3138969535ef41de0c0f677c7446f62f1c64575d41a9896e5339f3f112b
 DIST bcc-0.13.0.tar.gz 3928016 BLAKE2B ecaf2dc077a5e0b808ea1d588a89793291ed56de8747e1cb59f0e841b70e4a4f0333e2941ee2b42b5b9a570cd8d4f9941be772e7790186be156e452a416d40bb SHA512 7c82007979814ac11d1dfc81fe8e00d988f518f7fbba3e115851e17500c22eca23b33b84f9053acc10aefda0ee3b80429f8daf1389590c2d3686ee8d7ced72cb
+DIST bcc-0.14.0.tar.gz 4021098 BLAKE2B 2c66c82e14ee7f858f2e4ff8aa158d03c1580686f4023e920f643454283ed26265ec1e122695a308c4e570c369a0f66e6b0a9347fd9046f2eeb6cd4b536e4dc6 SHA512 216033a6944134c9f9b03a254c83236ff49b02c87808d2719a51a5ebe3b2e3f6b283e905cfbbc85084eab60cf8ef89c3135b4e07ddb9bd83348c69f6e49a84b8
 DIST libbpf-0.0.5.tar.gz 160335 BLAKE2B 2cf4a3e6edc002b3a32f9d08bb22a07863d8f6f90472e9593a9e9a93b08a00f0557d5a59fa841325b947e6f7b129232e7cd1fdc906f45de57b0dbe594548f1c2 SHA512 e42f6cc8f834f2d3cf9138d655bd3727ffffb2693850f7f6409ec4d536336bc5fa479a64eefc802a5915e333677eca843f8f1bd0132589bba10bdc89064eee0c
 DIST libbpf-0.0.6.tar.gz 213791 BLAKE2B 9f0a08cc7bae41f7fa93d5ba2f535f76ce47fe691efb6bac6257b88a5607deb62fa53f59984d83b6070ccd573c902899f7528b376d9acbfd77317659de6ab061 SHA512 1678133d9a2bd1cf13d4d1f9b83bb3f0642de91e3e3c8d785e2993257035573aff39b9a1a457e73d9c4c1c66b6a52544a8ad06ac560766d335428bb3fc421e71
 DIST libbpf-0.0.7.tar.gz 262068 BLAKE2B e77ff25449274881ddb9d32f25cd6ad8988e4524102bd109049ee6cfce3e2753fd99ebe2a080f809a4c5422dbf6b17633e4b0cea156f289bf95b92f8375a273c SHA512 c2cbc869b7e11339deab3152a6e2d0b3bba25da513d18d77fb0a698cbe61d6bd48175a58e7dd7a3695fbf27faf48b4f517ac5d3a3c66c086df2e5d1b73a2595d
+DIST libbpf-0.0.8.tar.gz 262519 BLAKE2B 2a3620c97834cc23e716476b6966c1c65c1c82064b3ba1ae4ab4906ae362a777d9aa7ae40620f9a259fe969a5a897e97c14d97f627f39c47fa28c89abb1efa9a SHA512 1074fb52b7a158e4e2713c4c7083528ccf2d99b899853078f230234ba112071bfa66e174d8800d36516e26d5bf06da44d100a5b2f866d267f62c9308f431220c
 EBUILD bcc-0.11.0.ebuild 1862 BLAKE2B ed50015774cd375e2bbbf7a5be10ddc53c7864314fbb839027952860e25fafd5bcace7a42936ee316db1e18c13082be994a9b1084d94468f8293b1b780dcb978 SHA512 9701b5a605c19d4fe78ccb68477be41aac1b9fbc9990932e25d28b8e074cc528746893dc7fd70d919366d3b94e83d2b45cf806da94e793b683d07f8611b4d09c
 EBUILD bcc-0.12.0-r1.ebuild 1886 BLAKE2B f3879a2437abbfc99b87ad1a3a5c1b8b600a9e0213be90ee17ecba036b76798529de61b159dd7af7ce56000e071d44923f2707d366383c5f6ed228fb78b10858 SHA512 492110b8a4dd64c30bf8d8f5af5dce183976ee31d3ee5652efe61e7734c779b8a08d9334fdb2c4c0aa4a90df71a5a1d5374677eb9c9566ce534ee760b135caf5
 EBUILD bcc-0.13.0.ebuild 1925 BLAKE2B 4cf4fcfd74ca4a941be56ec92c003be585b81105dc0986e0a63cdcafbb0a9c22f7803aded42ff0214338312463019f6ba7938775dcd6538afd80d85a92b0d523 SHA512 69e3e78d7f6ead73c007e821f5ea2a6e3f5244cf716703b763427bb49e89f5012ec0327fdf142dee93b6c9091c572985a8cc3738b6b238e19e9ceef0a4a9e0d6
+EBUILD bcc-0.14.0.ebuild 1968 BLAKE2B 00d8a66ef59c00a518ee27211236327d883972d4d71eeb9906c0fc20e1eb764dccadaf807937b8c15b67fba45c881f04b6cf8ef866bb24817506d39a2b7bd1e4 SHA512 4620985b4d093c7f436f9d9a7e10f5077afff49f21bf4664bb55c8eb41f2dbac8d9b70ccc91ae6d852f8cabe65e0056540894ea1ba7659e7df7aa691fe75170c
 MISC metadata.xml 386 BLAKE2B 73062e6902dd7d7f9afb988cce26a8aa5a66e1252652ae364f2295b0a5e77013eec682b36ab65c93772843ad0ec8c7187cd29d8308a3ba17dbacd1ef193f03ae SHA512 6529fa57011cd17b9892e1b8f05e063ae6314f85665a30881335efa80e9b9238a7b61d1f732316e45496707bf350d03149e7ec5efdf1a0fee6d5a788b58a7e70
diff --git a/dev-util/bcc/bcc-0.14.0.ebuild b/dev-util/bcc/bcc-0.14.0.ebuild
new file mode 100644
index 000000000000..5b4acaeb9b3b
--- /dev/null
+++ b/dev-util/bcc/bcc-0.14.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit cmake-utils linux-info llvm python-single-r1
+
+EGIT_COMMIT="v${PV}"
+LIBBPF_VER="0.0.8"
+
+DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
+HOMEPAGE="https://iovisor.github.io/bcc/"
+
+# This bundles libbpf, I tried to unbundle it, but I am not good enough
+# with cmake to do it. Patches accepted...
+SRC_URI="https://github.com/iovisor/bcc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
+	https://github.com/libbpf/libbpf/archive/v${LIBBPF_VER}.tar.gz -> libbpf-${LIBBPF_VER}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+luajit test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	>=sys-kernel/linux-headers-4.14
+	>=dev-libs/elfutils-0.166:=
+	<sys-devel/clang-10:=
+	<sys-devel/llvm-10:=[llvm_targets_BPF(+)]
+	luajit? ( dev-lang/luajit )
+	${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}
+	test? (
+		|| (
+			net-misc/iputils[arping]
+			net-analyzer/arping
+		)
+		net-analyzer/netperf
+		net-misc/iperf:*
+	)
+"
+BDEPEND="
+	dev-util/cmake
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${PN}-${EGIT_COMMIT#v}
+
+PATCHES=(
+	"${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch"
+	"${FILESDIR}/bcc-0.14.0-cmakelists.patch"
+)
+
+# tests need root access
+RESTRICT="test"
+
+pkg_pretend() {
+	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
+		~BPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL
+		~KPROBES"
+
+	check_extra_config
+}
+
+pkg_setup() {
+	LLVM_MAX_SLOT=9 llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	rmdir src/cc/libbpf || die
+	mv "${WORKDIR}"/libbpf-${LIBBPF_VER} src/cc/libbpf || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DREVISION=${PV%%_*}
+		$(usex luajit '-DWITH_LUAJIT=1' '' '' '')
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	python_fix_shebang "${ED}"
+	python_optimize
+}
diff --git a/dev-util/bcc/files/bcc-0.14.0-cmakelists.patch b/dev-util/bcc/files/bcc-0.14.0-cmakelists.patch
new file mode 100644
index 000000000000..3155e3cee96e
--- /dev/null
+++ b/dev-util/bcc/files/bcc-0.14.0-cmakelists.patch
@@ -0,0 +1,19 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 65e78ffe..837b4939 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -3,14 +3,6 @@
+ cmake_minimum_required(VERSION 2.8.7)
+ 
+ project(bcc)
+-if(NOT CMAKE_BUILD_TYPE)
+-  set(CMAKE_BUILD_TYPE Release)
+-endif()
+-
+-if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+-  set(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "path to install" FORCE)
+-endif()
+-
+ enable_testing()
+ 
+ # populate submodules (libbpf)
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index ded215c8ba13..093497a48cfb 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1,11 +1,15 @@
+AUX bpftrace-0.10.0-dont-compress-man.patch 722 BLAKE2B 583969e9f4457a49f17f33d984ab2585ec2e6f6976846af4d39084ce41bf334892b0971d1a1571e9495d4a05eea680412899d1fb23a8eb25a9b9cab84c3b101b SHA512 1f588dd589933c2fbb0ca79a5782c542cb137e748a442b9904153f76d142ae117755e1c24acfc50947e6040afbad78f31ef0c181082695f63ebb61b3acbe4b6a
+AUX bpftrace-0.10.0-install-libs.patch 5790 BLAKE2B 93f12b430f8ba5772423fc0350c59d0f43b9de05fbbc03c4ef46c113886b74a330c397122daa6a423f4a6111b1d113679503b06d7e507f23a837dc06a4c662ca SHA512 585b1128e1a7d4cb92a38eb4043ff824179aed5767f9884d54714dbcc5148d95ca1e95b1fadbde520f57be60501d850c217204f7aed1c556ea5924e422c661bd
 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-0.9.4-llvm-10.patch 7123 BLAKE2B 61fe740aae135de1c039e73b3c4e8bd79a8a7412c3d06ad7a8ab3d8d3c0ec825053b4e6b1fcd208a7847cf8f0ff8436ed988aa403485f90755c0e59d5c2a5c8c SHA512 eaba150ea6dafb9e7ab13f1f23246ce064241369882b16bf7eb3a9dc74545064c604e4435c6567c6f0a0df9ac939120c5b3ac5ee95bdc669f9d0e82ededc9c95
 AUX bpftrace-mandir.patch 906 BLAKE2B d875e2523b7e719624d92c58a8f058cdd597da07bf6472d2e3dc05eb46be64718ed4056e15a93e4c22264fa35ceb6b79b428febade422ba435a2a2b9e17fb707 SHA512 11544e9e5892ae3657ff903fa2780e71223e380322b4059ddcea4a6edd80c5a7ab8d45188eb577127f64a6705a6ae41d53f3ba7e05bf450853b12a9ba3d84904
+DIST bpftrace-0.10.0.tar.gz 835854 BLAKE2B 623369bb2a2ad8d5eec364afa98bdae3fbe5e66182d8f1187fe86a8bd70ee357a554eb063fdbe5476eab23912adf2cf027092cac3e6989d8f716e91aa5d01212 SHA512 da400efe78cea505a32deead594b047ec4394d3eefe86e7b6853fe2dc715c5847a3abcbd26c1fac39d0a534f1e57d6c0bc3625e0c3f1054b0d84b7b1d6eb69b9
 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.10.0.ebuild 1462 BLAKE2B 79df1f16f7fc2f969fb266a5a7492ba4af1611d96c84076e9501b74924b83a5ec825ee5398a0a440f1925b9ed025cd6abdc0ea2fda30716417a190727e50b96b SHA512 4b4e0dbf7961ea973ceedb50d411b82f725e52dca84111f0626c5b6cbd7b132f0d5df9201c58e3811d38bb3bcecef2db0473771c13650a34187f75c7faadac7f
 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 1487 BLAKE2B 1003d7865410fb246ac9aa58adafa018e3979a331543dffd7fdce772517875043f6602d7d2856aecf7eb76094d7bf6531f9cbd5e3f296c98f8e0e55178c069b7 SHA512 e122a7c9ab7db361447eb3a7ce79b416ede14b0eebe5ea0b507344fd4203f9e0cf9c9375f526494c4ec1f5c4bafc3153a97dc6bc8554001aac3e609f0f7b233e
diff --git a/dev-util/bpftrace/bpftrace-0.10.0.ebuild b/dev-util/bpftrace/bpftrace-0.10.0.ebuild
new file mode 100644
index 000000000000..3070afa1505c
--- /dev/null
+++ b/dev-util/bpftrace/bpftrace-0.10.0.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.10.0-install-libs.patch"
+	"${FILESDIR}/bpftrace-0.10.0-dont-compress-man.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.10.0-dont-compress-man.patch b/dev-util/bpftrace/files/bpftrace-0.10.0-dont-compress-man.patch
new file mode 100644
index 000000000000..750ed4f712a3
--- /dev/null
+++ b/dev-util/bpftrace/files/bpftrace-0.10.0-dont-compress-man.patch
@@ -0,0 +1,18 @@
+diff --git a/man/man8/CMakeLists.txt b/man/man8/CMakeLists.txt
+index f1fc334..7ee58ed 100644
+--- a/man/man8/CMakeLists.txt
++++ b/man/man8/CMakeLists.txt
+@@ -1,12 +1,3 @@
+-find_program(GZIP gzip)
+ file(GLOB FILES *.8)
+-set(GZFILES "")
+-foreach(FIL ${FILES})
+-  get_filename_component(NAME ${FIL} NAME)
+-  add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.gz
+-    COMMAND ${GZIP} -c ${FIL} > ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.gz
+-    DEPENDS ${FIL})
+-  list(APPEND GZFILES "${CMAKE_CURRENT_BINARY_DIR}/${NAME}.gz")
+-endforeach()
+ add_custom_target(man ALL DEPENDS ${GZFILES})
+-install(FILES ${GZFILES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man8)
++install(FILES ${FILES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man8)
diff --git a/dev-util/bpftrace/files/bpftrace-0.10.0-install-libs.patch b/dev-util/bpftrace/files/bpftrace-0.10.0-install-libs.patch
new file mode 100644
index 000000000000..cf5ed9d76b96
--- /dev/null
+++ b/dev-util/bpftrace/files/bpftrace-0.10.0-install-libs.patch
@@ -0,0 +1,148 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e89a6a9..efa2ff3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -90,9 +90,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 4fa0418..4d0c2a9 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -75,7 +75,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)
+ 
+ target_link_libraries(bpftrace ${LIBBCC_LIBRARIES})
+ if(STATIC_LINKING)
+diff --git a/src/arch/CMakeLists.txt b/src/arch/CMakeLists.txt
+index 7156276..32faeae 100644
+--- a/src/arch/CMakeLists.txt
++++ b/src/arch/CMakeLists.txt
+@@ -1,10 +1,12 @@
+ 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)
+ elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+-    add_library(arch x86_64.cpp)
++    add_library(bpftracearch x86_64.cpp)
+ else()
+   message(FATAL_ERROR "Unsupported architecture: {CMAKE_SYSTEM_PROCESSOR}")
+ endif()
++
++install(TARGETS bpftracearch LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+diff --git a/src/ast/CMakeLists.txt b/src/ast/CMakeLists.txt
+index 0d58cd9..e33d585 100644
+--- a/src/ast/CMakeLists.txt
++++ b/src/ast/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-add_library(ast
++add_library(bpftraceast
+   ast.cpp
+   attachpoint_parser.cpp
+   codegen_llvm.cpp
+@@ -8,16 +8,17 @@ 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)
++install(TARGETS bpftraceast LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ if (HAVE_KFUNC)
+-  target_compile_definitions(ast PRIVATE HAVE_KFUNC)
++  target_compile_definitions(bpftraceast PRIVATE HAVE_KFUNC)
+ endif(HAVE_KFUNC)
+ 
+-add_dependencies(ast parser)
++add_dependencies(bpftraceast bpftraceparser)
+ 
+ if (STATIC_LINKING)
+   set(clang_libs
+@@ -41,26 +42,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 56bcb4a..3f874f8 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -93,7 +93,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)
+ 
+ target_link_libraries(bpftrace_test ${LIBBCC_LIBRARIES})
+ if (STATIC_LINKING)
diff --git a/dev-util/bustle/Manifest b/dev-util/bustle/Manifest
index 84ce06e4be43..4b1da95ed914 100644
--- a/dev-util/bustle/Manifest
+++ b/dev-util/bustle/Manifest
@@ -4,7 +4,7 @@ DIST bustle-0.4.0-tests.tar.gz 8340 BLAKE2B 0c0cf10a87c1fea6100828139e9781ff867e
 DIST bustle-0.4.2.tar.gz 95707 BLAKE2B 12d8c08c7a3f71684831bc27c027db33902cc727d216801448e67ed18b717796038390ee7c63f2faea6e26ad677e618c51f9ad1353d3f54bd334d49fff621b7c SHA512 8a6c1860cb655fc9bd7d42d130d87416c74b988b81749ec8cc1c25cacd3dd4516f59f5cb5954b473c3f6ac32b11853e9bc8881708962144067a0325845dd8562
 DIST bustle-0.4.7.tar.gz 114231 BLAKE2B b783f4363171cab96463519806d18113012da3bdb9040a2394f5ad9cc1c7cfab7030b99ee71f1a5bd4bcd6906ef53f2fbc1eb8c504f3b4a526a9d55e27f2f6ab SHA512 c9b93ffda797a87342f5ba506db3c892bff8084fa0ec5897d676bef5e8367507970ae3e09555cda9b4de0c7b175dc396f2ccfb394d224e64225c0e7ded2164fd
 DIST bustle-0.5.4.tar.gz 122720 BLAKE2B b5a2315919644ab5c7712f9e9bde1bdea226b4e8898981f7150558bde648a5c7965be6ad8484c09727665292e5fe3f0cb545544dbb27f2a2553e513910289620 SHA512 56eaeef831fb5929d57a008ae71d8409048ce5d12eaada98830ef742baf3479264203465d77591cb338374096eac2dc2b68b44f075b2761f16df63fad54b91fd
-EBUILD bustle-0.4.2-r1.ebuild 1563 BLAKE2B b68b73ea23aaf0db3a47c5165e55996254da67836b124af160d8c746456d9b6f42d2faf2a6ac7ddcc6f6a5bab8b6b3e54bbca27457ccbf2f8a52ccb383e3738d SHA512 1cc80c9c753e24963967331b64dd9ab0110e8e0f763c4b9725f415fc66e4949b429eb89c320de0a3391db5b7905ac8ecd207e3494565388423c555433bdf1789
+EBUILD bustle-0.4.2-r1.ebuild 1561 BLAKE2B 751abf9ca416371fd796a7dd362777780d3b92671d598b5a9da4f15583cad8b02fd9e2133e5a0bb1d89582ff09c36ab6a0698bd027983a6ff579eaac05da5dc9 SHA512 663114e86e31457b71880735a4d82a4cd587b05723b56779cb21c102a21ab405b925c873273fd57517a51fc3a4e47afedb452aaf63a0edf099d1fe4484bba67c
 EBUILD bustle-0.4.7-r1.ebuild 1512 BLAKE2B 210fd9295693ce97923fab2dfabb187c1e6a1b2b6927fd6249f728ed93d54bffa70e8dc06991aa3e63c7694b175816fab9421a0d32c0720bebb0cf69c49c8222 SHA512 60530014106fa0283cf54ecdd6cc26702e6dd9c05777d8ecbb75c61ce200f0c41cfd5540ffd46ed1f9f7233362abb8a0820aee0e70541e4030ebed3966c21f68
-EBUILD bustle-0.5.4.ebuild 1633 BLAKE2B d5c9a5d66f44b1177df25d274c7ad75ebe2e49840d87f9a0c6e3be86a820077c2fa60860b51c34d9537ed8e523d5472bb732805eb95a87f723c8741bf80c96e5 SHA512 2d6f38210385c708c9318f66c0026bfaf4c12c77a6ef32260e5e8f924fd3458a031c2dd2e989980fe9b71d5ee57986268ee092bc28146b3fe811bb6111590bc1
+EBUILD bustle-0.5.4.ebuild 1635 BLAKE2B 4e3e075dc2d7ca51a77112a26c86e975681d35f6ba41b5cf2d3b2d074b1d2d5be59f2bb63c713dfa5fbe5c8f6145c87388159060995897062e37de910d00e348 SHA512 f8b263727d6c917fa5a76f6f4462c07310181bac753763ffb44f5633fbdf7b63580f99eae5268e5f29c83df048ae5dfb37bd5aa49984bd6fefcd95e8f9b84af2
 MISC metadata.xml 502 BLAKE2B 3ab482910acd7936501b8c519d2da5c286d493a04afc6d5302989ca5662a4f166d84142489789cd5f5ea4071b5a5e54bc9d0586e6e6fe273f3f2f6f4c44149b8 SHA512 834e9820081006344e30580673ccb789750d1af67807f908b21fc5fe0cf1b8554b32b446aa592c52a1dd26e4d36f2f91c3cff569b8c4797ded9c5c6ea1bfa65d
diff --git a/dev-util/bustle/bustle-0.4.2-r1.ebuild b/dev-util/bustle/bustle-0.4.2-r1.ebuild
index 69821eeaea16..18e9dda482c3 100644
--- a/dev-util/bustle/bustle-0.4.2-r1.ebuild
+++ b/dev-util/bustle/bustle-0.4.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://willthompson.co.uk/${PN}/releases/${PV}/${P}.tar.gz https://dev.
 
 LICENSE="LGPL-2 GPL-2" # bustle-dbus-monitor.c is GPL-2, rest is LGPL-2
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="dev-libs/glib:2
diff --git a/dev-util/bustle/bustle-0.5.4.ebuild b/dev-util/bustle/bustle-0.5.4.ebuild
index 79a27f23e784..3c422fff02f7 100644
--- a/dev-util/bustle/bustle-0.5.4.ebuild
+++ b/dev-util/bustle/bustle-0.5.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="LGPL-2 GPL-2 GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="interactivetests +threaded"
 
 RESTRICT=test # fails one propery test
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index ce50ae3364b9..05d071efec57 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,6 +1,4 @@
-DIST catalyst-3.0.8.tar.bz2 873610 BLAKE2B af6fca5dd8dea377795d1b50b942773b0cb8383e1727ba547f1511f126ad4f1494d64ca3d4b3e479664de366e8ed2f8ad8c09c206bbd213d6f95aa51ae56ea8c SHA512 b00a31d9af9b3c1d220080eb6068c924f6ca9f4d574f4805f2b833e61e0fdb79290ec6f5b190c0c7501e015068eb756ede6aea7a959d2e22cef8a055968b7203
 DIST catalyst-3.0.9.tar.bz2 873866 BLAKE2B 293a4d52c57e73269f1f82fed8ea72934a0f939b3b9d4fb9943f4971fd4155edecc6cf0170b917eba16f0125aac9861041b7e10f85f6110a35659a2f85fd3665 SHA512 c8c25ad1c76b0040bd84b491909d364306746c660afbbb8c6a074911779aabe89b60a12cc3ac5b9cd3398bdf8986b50d24d9979c3d12d2fa9de66ebf62ded309
-EBUILD catalyst-3.0.8.ebuild 1884 BLAKE2B 9178f000151591fd90e3af46781eb5542c38bb3808c2b260bba48c0ff0877cc90a977d1e125ea3641ef9f590d8e1e0dae235a81f9229d9c409cc1619949ba89b SHA512 2252f340e107687adc3b6ec10535aecad5886d9fc21fbb619d6ca1a4be9e237076bf4c2f8847b23357ae37909f4f4518e66379c1861c1f22397b51e3d4a9bfb9
-EBUILD catalyst-3.0.9.ebuild 1893 BLAKE2B 12181979e89486f1f8e88756a1a9274ea55dc6a157591d85784a8483578f6c7d677e1c46846bd850c4a7a370e8d62f6cbe85c4e4e64c9cdc01d779e0c3c97a65 SHA512 fc73d9c32144ac93c2db9c981ec53b7cfe99edbdcf4c59c5d7088c94c842244fa1c6f4850e88a8e44ae56b2d543a3496dcbeffb34b52ea1009c446d76bbd2251
-EBUILD catalyst-9999.ebuild 1893 BLAKE2B 12181979e89486f1f8e88756a1a9274ea55dc6a157591d85784a8483578f6c7d677e1c46846bd850c4a7a370e8d62f6cbe85c4e4e64c9cdc01d779e0c3c97a65 SHA512 fc73d9c32144ac93c2db9c981ec53b7cfe99edbdcf4c59c5d7088c94c842244fa1c6f4850e88a8e44ae56b2d543a3496dcbeffb34b52ea1009c446d76bbd2251
+EBUILD catalyst-3.0.9.ebuild 1912 BLAKE2B f136ef07278a13065b7df59cd1917d5b4075cb4dc4ea17d28ea8c402d25c4061feb334c59f99741ec9edf0370bfe4debd4fc6e57dc0287c2c19e65b0b4c2aea5 SHA512 298b705f37e8edd9bfd45e690793ee0c6b608ada57ca2d1510e61fe7882abe4f8ae380c6fdcff1b4c3fa9b687fa87b97722471145afbfbb8374dcca94e96c408
+EBUILD catalyst-9999.ebuild 2212 BLAKE2B e1a4a73daca1ced17410bb085ccce87eb9beff96f8a33711427206ccca95725aa3f30834b6c34a4bf8dcdf1f197cbc8710f206c7b60742f83b630a70654d146c SHA512 7eaf48a7631a02e8af91a6d52f7594dacf8ea23a3b75de033fb0facbb1d0da5fd082dd876b718db737d430d4c9200426c8d86e05dd954f798e49d19d5b654662
 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
deleted file mode 100644
index 38f72b6a4c22..000000000000
--- a/dev-util/catalyst/catalyst-3.0.8.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == *9999* ]]; then
-	SRC_ECLASS="git-r3"
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git"
-	EGIT_BRANCH="master"
-else
-	SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
-fi
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1 ${SRC_ECLASS}
-
-DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ccache doc +iso kernel_linux system-bootloader"
-
-DEPEND="
-	app-text/asciidoc
-	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-	>=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
-	app-arch/lbzip2
-	app-crypt/shash
-	sys-fs/dosfstools
-	!kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
-	kernel_FreeBSD? ( app-arch/libarchive[xattr] )
-	amd64? ( >=sys-boot/syslinux-3.72 )
-	x86? ( >=sys-boot/syslinux-3.72 )
-	ccache? ( dev-util/ccache )
-	iso? ( virtual/cdrtools )
-	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
-"
-PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4
-				sys-boot/grub:2
-				amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] )
-				x86? ( sys-boot/grub[grub_platforms_efi-32] )
-				sys-boot/syslinux
-				sys-boot/shim )"
-
-python_prepare_all() {
-	python_setup
-	echo VERSION="${PV}" "${PYTHON}" setup.py set_version
-	VERSION="${PV}" "${PYTHON}" setup.py set_version || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# build the man pages and docs
-	emake
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use doc; then
-		dodoc files/HOWTO.html files/docbook-xsl.css
-	fi
-}
diff --git a/dev-util/catalyst/catalyst-3.0.9.ebuild b/dev-util/catalyst/catalyst-3.0.9.ebuild
index 9b107bd9beb5..39bbd3250f4c 100644
--- a/dev-util/catalyst/catalyst-3.0.9.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.9.ebuild
@@ -9,10 +9,11 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_BRANCH="master"
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
 fi
 
 PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 ${SRC_ECLASS}
 
diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 9b107bd9beb5..a9b0c858e543 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -13,6 +13,7 @@ else
 fi
 
 PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 ${SRC_ECLASS}
 
@@ -23,30 +24,63 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="ccache doc +iso kernel_linux system-bootloader"
 
+COMMON_DEPEND="
+	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+"
 DEPEND="
+	${COMMON_DEPEND}
 	app-text/asciidoc
-	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
 "
 RDEPEND="
-	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+	${COMMON_DEPEND}
 	>=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
 	app-arch/lbzip2
-	app-crypt/shash
+	app-arch/tar[xattr]
+	app-misc/zisofs-tools
 	sys-fs/dosfstools
-	!kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
-	kernel_FreeBSD? ( app-arch/libarchive[xattr] )
-	amd64? ( >=sys-boot/syslinux-3.72 )
-	x86? ( >=sys-boot/syslinux-3.72 )
+	>=sys-fs/squashfs-tools-2.1
 	ccache? ( dev-util/ccache )
-	iso? ( virtual/cdrtools )
-	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
+
+	iso? (
+		virtual/cdrtools
+
+		alpha? (
+			dev-libs/libisoburn
+		)
+		ia64?  (
+			dev-libs/libisoburn
+			sys-boot/grub[grub_platforms_efi-64]
+			sys-fs/mtools
+		)
+		ppc?   (
+			dev-libs/libisoburn
+			sys-boot/grub:2[grub_platforms_ieee1275]
+		)
+		ppc64? (
+			dev-libs/libisoburn
+			sys-boot/grub:2[grub_platforms_ieee1275]
+		)
+		sparc? (
+			dev-libs/libisoburn
+			sys-boot/grub:2[grub_platforms_ieee1275]
+		)
+	)
+
+	amd64? ( >=sys-boot/syslinux-3.72 )
+	x86?   ( >=sys-boot/syslinux-3.72 )
+"
+PDEPEND="
+	system-bootloader? (
+		>=sys-apps/memtest86+-5.01-r4
+		sys-boot/grub:2
+		sys-boot/shim
+		sys-boot/syslinux
+
+		amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] )
+		x86?   ( sys-boot/grub[grub_platforms_efi-32] )
+	)
 "
-PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4
-				sys-boot/grub:2
-				amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] )
-				x86? ( sys-boot/grub[grub_platforms_efi-32] )
-				sys-boot/syslinux
-				sys-boot/shim )"
 
 python_prepare_all() {
 	python_setup
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index b5dcfe0bc804..207038369144 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -8,7 +8,7 @@ DIST ccache-3.7.6.tar.xz 352692 BLAKE2B 97f6c3ea119b7f1f4fdab1dc88ac34a23bd8f893
 DIST ccache-3.7.7.tar.xz 351592 BLAKE2B 0b211cb77ceb42b7ee5dfcde98d9f53bf222cf18b8d38a7cf6fc9631c5e1c79ca82e6d0a0dbacfe2d5f61b2acefebe202e06fc3b8035f0f25a5f9954554a18cd SHA512 f93380aeb45e815964abc3b62f1963abafe22e0c6a7b61d039e710c7f935221e02678e21af65add4fd59fd5a141824ab95f4a7afc8dd557de36737c365cab816
 DIST ccache-3.7.8.tar.xz 352528 BLAKE2B 8d8896b100c43a3e9a60445c95369cd8898fdbf653fc4d5791b8e1abc0191882319078d619429213a5f6968a1dbc639808037459c80514cea775d261c83b949a SHA512 dc8cc9cd5f6f054421f0ecb50f66e0af85222c347d59fecd4555dfe1d8d6cbdca304818de8bc8a39fc1a1225567c141ce104ac315369bf6c307e9da67e14b51c
 DIST ccache-3.7.9.tar.xz 352948 BLAKE2B 791491c3f9da58f06bb0a58e411d9a7b3e39e460102793ef736820913d43d488ce7daffba572c21f507ea78d8da04edc3aaa47eb1a0fbec8cb35461a60b770e9 SHA512 5d39baeb66265451b0e9cef250f6d9c5f6869cd87e27c108c9a50bef80050122ed4280ff662a81bba8d1d1311f2004bcaf9ada6b783a42eedc67ca01ebc48bb4
-EBUILD ccache-3.7.2.ebuild 2123 BLAKE2B 9e8a30d3a311ffb521290f359f86f373722a3ed713e785dbe83b129f8807f4ff94533841f9da24e8f9d998407dc3b476d758b65f26c226a77f5e1ef29e421d43 SHA512 38aa9e79d78cc3443df189f86d6887af8bf7d753fd51e22de76fd734a8329e5111da12871344a5b5a5966be8c50927732620b2253c701a88795f0c6dfd72bc82
+EBUILD ccache-3.7.2.ebuild 2124 BLAKE2B f5b45838863629b0706eef8da70d3c94318b61ad7f8b4dafa63d805794d001ec32894830538021a55d1c6af88a8e5fb76a699bb5bb9cdca970f48f10d4436a1a SHA512 b15f8d43d7e4487abdacc31bdfa4a87746d528e2760111087507b71d54fca1806c17f102ef9b4e8d4e9f613265d44a9ca056d57374fecb1ad286123d2c8dc456
 EBUILD ccache-3.7.6.ebuild 2194 BLAKE2B bcb4d276405b962fefedbff9509071c00b5e5a3712514b3dca773f7710fd8ce9f3d8da24231068ff46579e58a77989d21e75c9f94e5b3ab37d1f54ba76268362 SHA512 0a8bf30ea68543c490a2c7b9e343e6c1ec4dd4487cf92ccb2eaf461102d9bd80b67164f74b99ce54fb1158738c4d34884151809d5a23b69ba47d09ceab503219
 EBUILD ccache-3.7.7-r1.ebuild 2204 BLAKE2B 168006b6402a929a5c4367d98fafcfac1f6bb0a4ae11c2aa495cc6c326a7ff21cedc81204451ffa592b1b6f04150aa7923f0eff851ad502496bc101641f7ae0c SHA512 f60bdfe797f15da5ce90a784029dce92971bd15b90e91d1503ff2da78d8ef6d57a9b98ffa75c1f9565f4e5a71bc09e0be58946a0613d3fe2fdbb20d1797c8ccf
 EBUILD ccache-3.7.7.ebuild 2195 BLAKE2B 75e92e265e3daf5d40d1d32b226ae9009bdc0848611c7594441280ddc76cec3986aaa1fb48692a6d2dcf796fda4deaccad28d9a76847072a2eb8a0f71ca54df0 SHA512 530953304727f3385e2c9998181709d273ee56e3d471ad569b8b4a8ababdb6eff1c3b47e1130ae7087e72fa4f9c1783e3851bba72a4308be7ab627a2a1f7dbef
diff --git a/dev-util/ccache/ccache-3.7.2.ebuild b/dev-util/ccache/ccache-3.7.2.ebuild
index bcce80b853ca..77db723bad24 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 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/dev-util/ccls/Manifest b/dev-util/ccls/Manifest
index 82f325be113f..422a282fae87 100644
--- a/dev-util/ccls/Manifest
+++ b/dev-util/ccls/Manifest
@@ -1,4 +1,6 @@
 DIST ccls-0.20190823.5.tar.gz 158118 BLAKE2B 09b4a985a284fe74adc408eb9e86094aaf4ebfaf50de3238a17299efabe4749326b8239356c2808ca500a44bef664b2a654e9b16c83c3ef04cd7cf90c56fe3ef SHA512 3c4ecac663eb463870153734fa6206701ede9d72bae3b6eae9c26adab2979ad79d2ac860c1ffb07f8cfcea4aa63afed90510734d91f830c99a86b3811959583f
+DIST ccls-0.20190823.6.tar.gz 158158 BLAKE2B f2957b310f1bddc17a498191d315327adbeed72ecf3a60f2abde2fe1af8341246670d779807dcfaf98217f648d4fbe5914e4f64108cfe7a3f68e62b00e96dcaa SHA512 c6df96e304f5b7381c67eda4c1bd05873a85fb0d0983b3abcc507987a402860aa6660079a0e7b125f5cda22047da936239480aa0b604cd2598f84a4b9e9c3bdd
 EBUILD ccls-0.20190823.5.ebuild 698 BLAKE2B fe14be8fc89c8cbafc63848c833b95e78488c270371d7e82816f798375d77e4b4f4099d3f811e34ca9fa8b607958336e8c613d04afba10b9f59cda9730eccc16 SHA512 f8aee0dd366fbf705e445df84882b516dc6abd09267cdb189745f0f7c7127abd3a92d0a403c81f02b3d5eaa59601f514ba8f98cba274947c5620d9db8177d1be
-EBUILD ccls-9999.ebuild 698 BLAKE2B fe14be8fc89c8cbafc63848c833b95e78488c270371d7e82816f798375d77e4b4f4099d3f811e34ca9fa8b607958336e8c613d04afba10b9f59cda9730eccc16 SHA512 f8aee0dd366fbf705e445df84882b516dc6abd09267cdb189745f0f7c7127abd3a92d0a403c81f02b3d5eaa59601f514ba8f98cba274947c5620d9db8177d1be
+EBUILD ccls-0.20190823.6.ebuild 727 BLAKE2B b5259dba8a7f535857c185da4bb53004ca3eabd8295ab4fc3f0b9843cb21abcfe31ef5db7436405811436bdb80698d75368d64c1a6f14d6a97bcb1bd8c11c5d9 SHA512 bd20ed44f154d1f0e2d7d11a7560c47a849ce8d47bf18662368526655f56e539cab795326617d83d58a25e5f634b8b874da6d06133514f18d664f9d4c16f715c
+EBUILD ccls-9999.ebuild 727 BLAKE2B b5259dba8a7f535857c185da4bb53004ca3eabd8295ab4fc3f0b9843cb21abcfe31ef5db7436405811436bdb80698d75368d64c1a6f14d6a97bcb1bd8c11c5d9 SHA512 bd20ed44f154d1f0e2d7d11a7560c47a849ce8d47bf18662368526655f56e539cab795326617d83d58a25e5f634b8b874da6d06133514f18d664f9d4c16f715c
 MISC metadata.xml 323 BLAKE2B 0a85191d1996e2f30d149c30bb73ffc49f95600b8a08f5a8ee4a6aede0671d0b14f2de04173e4bb1ba0b9f6e09e79316d1f7de33b490d3ce815b8ab7b29f5f91 SHA512 da5bf276e9237df06298b14f68be2f57ef5ace58aea180623bc896a2f05dd5e6809b0409ac3ffba0e2c26d854b7d3b47f8e47caec0082e9397f5dc4037f549ad
diff --git a/dev-util/ccls/ccls-0.20190823.6.ebuild b/dev-util/ccls/ccls-0.20190823.6.ebuild
new file mode 100644
index 000000000000..ac5830184a31
--- /dev/null
+++ b/dev-util/ccls/ccls-0.20190823.6.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_REPO_URI="https://github.com/MaskRay/${PN}"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+fi
+
+inherit cmake ${GIT_ECLASS}
+
+DESCRIPTION="C/C++/ObjC language server"
+HOMEPAGE="https://github.com/MaskRay/ccls"
+
+if [[ ${PV} == *9999 ]] ; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/MaskRay/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	dev-libs/rapidjson
+	sys-devel/clang:=
+	sys-devel/llvm:=
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_SYSTEM_RAPIDJSON=ON
+		-DCLANG_LINK_CLANG_DYLIB=1
+	)
+	cmake_src_configure
+}
diff --git a/dev-util/ccls/ccls-9999.ebuild b/dev-util/ccls/ccls-9999.ebuild
index d959663fa6f0..ac5830184a31 100644
--- a/dev-util/ccls/ccls-9999.ebuild
+++ b/dev-util/ccls/ccls-9999.ebuild
@@ -35,6 +35,7 @@ RDEPEND="${DEPEND}"
 src_configure() {
 	local mycmakeargs=(
 		-DUSE_SYSTEM_RAPIDJSON=ON
+		-DCLANG_LINK_CLANG_DYLIB=1
 	)
 	cmake_src_configure
 }
diff --git a/dev-util/cgvg/Manifest b/dev-util/cgvg/Manifest
index 3b826dc2f28a..18c15715ffb0 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 413 BLAKE2B a4fdac05d5e5ea7b6188a1d1136bfc094aca049ea65e60a37e556bb9f26892d4768b117f0b8f6d734defc67b8609af8c63ce2951e9c2cea556fba08e8dec231d SHA512 b7330d543449276b981fbcd7c69ae1a266edd6c8b8d251a66c819b889126b57f2b5fda213d101982d019afdfc15f04301723a6832cc250a3019f1c03f6c691a7
+EBUILD cgvg-1.6.3.ebuild 414 BLAKE2B 1fd0c6e1b45bb4ca90cd2711ff4f6453cf0cd5b20050b314bbfa914bab72a785c2f3015af6fa6d5851c24540200114483f7a3fdd6120335289ba73e7585d48e9 SHA512 8808b79c33b17d2de9212807b1e018e9fa0602172ce8bf979db50ade4f0ff4f9e18b998c4d3ca7bc442cdc789da4e65ef360a7e46045a8db4a520e5a7b3c4c48
 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 5a558f2026bb..8bae6193b127 100644
--- a/dev-util/cgvg/cgvg-1.6.3.ebuild
+++ b/dev-util/cgvg/cgvg-1.6.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://uzix.org/cgvg/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 
 RDEPEND="dev-lang/perl"
 DEPEND="${RDEPEND}"
diff --git a/dev-util/clion/Manifest b/dev-util/clion/Manifest
index 8d70b8621c25..2909b2d0e660 100644
--- a/dev-util/clion/Manifest
+++ b/dev-util/clion/Manifest
@@ -1,3 +1,3 @@
-DIST clion-2019.3.5.tar.gz 509223445 BLAKE2B 94429d0f1d32185ca8d172cdfe7583e6042a5c24b10387ef265ddafbb19e3dc379589a3992b306dfc225449b8a781be996c0d4d4308252c60dc74fa20ffebab7 SHA512 9522209ecef2b025e818ac488c7c842c7170629a8fb38e6efa578cdd6973004da5ee423ea5913e6a61595fea653facaf741f513e2b47701e78749f8188c45583
-EBUILD clion-2019.3.5.ebuild 2179 BLAKE2B 198748c33f57fedf4153c6f1d5f3982a901cc951d95e9b9e8c49d716e5ced2cbbac6bae3f186d76b84e3ea5d4f4c4ee33c3ea657c6d4b936120d66d08fbd2252 SHA512 0c223ad5cd9536eaf96b3ff9ad7deabe9f04124cf1b66b009168f676907da8c0e9d5939e428bb9f8baf1d26b48bc0c810f8b1e5abf3b4c3691f02a74116356d3
+DIST clion-2020.1.tar.gz 510270266 BLAKE2B 4231737d972a8cde9a84db9c9c3a6478a7bba1eb3df11066b2808a016bfda47b4a4d22cee465d628ab03e4656acc087bcd31733112fa5a79807de6ddee5475bb SHA512 eb0d04646df482c7b42bdbc1df6cfbe46ddae6c98f73b1a9d5ad2560efb25a088be2a95eebd1e21981490b79600705c36f723310b7dedc89531296268acd24f6
+EBUILD clion-2020.1.ebuild 2179 BLAKE2B 198748c33f57fedf4153c6f1d5f3982a901cc951d95e9b9e8c49d716e5ced2cbbac6bae3f186d76b84e3ea5d4f4c4ee33c3ea657c6d4b936120d66d08fbd2252 SHA512 0c223ad5cd9536eaf96b3ff9ad7deabe9f04124cf1b66b009168f676907da8c0e9d5939e428bb9f8baf1d26b48bc0c810f8b1e5abf3b4c3691f02a74116356d3
 MISC metadata.xml 458 BLAKE2B 1393fb2b8c1487a670f3c2fc7c2fe9246d8f18bc7d33e2d494f0ffc3a3492285dab041f3cf810d16e78a312dd3936eb9bad0838ff9a8c3b6a4b7d80b90764fc4 SHA512 c00a66b6722a62222d06c325df55a3d946267ce7a4a452855933d721b936cd05aae5e9acdb784fc8e97235ead35e6625522c579397f43e9755619b1a8dcaccc7
diff --git a/dev-util/clion/clion-2019.3.5.ebuild b/dev-util/clion/clion-2020.1.ebuild
index d50ca20ce175..d50ca20ce175 100644
--- a/dev-util/clion/clion-2019.3.5.ebuild
+++ b/dev-util/clion/clion-2020.1.ebuild
diff --git a/dev-util/conan/Manifest b/dev-util/conan/Manifest
index b637cad0adae..f2488da5745c 100644
--- a/dev-util/conan/Manifest
+++ b/dev-util/conan/Manifest
@@ -1,3 +1,5 @@
 DIST conan-1.23.0.tar.gz 1024905 BLAKE2B cfa3e130be13ee175b1dc167b6d61666eddaf588b5954d9889c2d167806e8fb115290257ca839f6de407c87079472dba912b730e01a232d70375f2fe63ce7c28 SHA512 fa2b1b726e29ef553774267b50b0ace4f39a30bdf0a6d0e051576bc9b0e6cd1ed6cb166101c446d15734ebef9e89e17a101c10c0ead91c15de5aa1ebb102d0a8
+DIST conan-1.24.1.tar.gz 1043698 BLAKE2B 33e5aaa975a9819d0808c90ad97260b00aab6f4ae8ba6feb7d2c53622f0e72b87cc469c7c21994e2c228819bd364dc9b20822134c10665978bf996b653c014b9 SHA512 ab6e15c4291862d9d68661682ec9da8c126193ddb00b800e3d8f9dba07a516db307d22e590324ae3f059e39e897bc6bf590e53cc82d69431ce287031be7fe820
 EBUILD conan-1.23.0.ebuild 2405 BLAKE2B 0920cba1e65a77f711bb0b6f3476fb9e385b814a9dfc730a051a8679ceac398d86e95c44b3c83d4346e1918d41261f56ebab0b4d9f4c715b549452a1b6977400 SHA512 24e0e52584af9f7e1cffb1674bf55c944780e9091fd07beac9078e2532dbe5999eadc78e8bc486db9e63de1d944614c261debcbbf3c7b1a1d52eaceb0f8eb676
+EBUILD conan-1.24.1.ebuild 2347 BLAKE2B d1de907aec75daae75f3b5f06b227a6ba4983ff632c23551bead61caecac0a5f5b45e03451cae278d2e9202b785e7e0780e67d1755a9cced494928f92f8b8095 SHA512 331d6ee2a7d3fc563d9d3a4eb17392a46863164b57562b28f881616b78cea9a20e979e958c242226a95283baf1b5145d0affd20024be693ee04c06b93e98c3cd
 MISC metadata.xml 739 BLAKE2B 475521b92c84335a4ebda1d68dac1905a99f96b0fbecc8f06b6918e0c075648024ba3bebeaf85cb11ef0b96b917a2ebcf2a0146bd5b37c976d90cee08365c595 SHA512 27c7a3cea74ef2e22fd3dd238fa736efd1786fea4eaf01b9b51e07f7276101ddd7022ad7aedf767d1dbcdba2c29ddf48c07581e4fe5ec089d5e10c5b880c9970
diff --git a/dev-util/conan/conan-1.24.1.ebuild b/dev-util/conan/conan-1.24.1.ebuild
new file mode 100644
index 000000000000..5cedb0a5c462
--- /dev/null
+++ b/dev-util/conan/conan-1.24.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Distributed C/C++ package manager"
+HOMEPAGE="https://conan.io/"
+SRC_URI="https://github.com/conan-io/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+# overly strict requirements?
+# https://github.com/conan-io/conan/blob/develop/conans/requirements.txt
+# https://github.com/conan-io/conan/blob/develop/conans/requirements_server.txt
+RDEPEND="
+	>=dev-python/bottle-0.12.8[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.3.3[${PYTHON_USEDEP}]
+	>=dev-python/deprecation-2.0[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.0.2[${PYTHON_USEDEP}]
+	>=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}]
+	>=dev-python/future-0.16.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/node-semver-0.6.1[${PYTHON_USEDEP}]
+	>=dev-python/patch-ng-1.17.4[${PYTHON_USEDEP}]
+	>=dev-python/pluginbase-0.5[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyjwt-1.4[${PYTHON_USEDEP}]
+	>=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.12.0[${PYTHON_USEDEP}]
+	>=dev-python/tqdm-4.28.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests nose
+DEPEND+="
+	test? (
+		dev-lang/go
+		dev-vcs/git
+		dev-vcs/subversion
+		>=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/nose-1.3.7[${PYTHON_USEDEP}]
+		>=dev-python/parameterized-0.6.3[${PYTHON_USEDEP}]
+		>=dev-python/webtest-2.0.18[${PYTHON_USEDEP}]
+		dev-util/cmake
+	)
+"
+
+src_prepare() {
+	default
+	# Fix strict dependencies
+	sed -i \
+		-e "s:six>=1.10.0,<1.14.0:six>=1.12.0:g" \
+		-e "s:node-semver==0.6.1:node-semver>=0.6.1:g" \
+		conans/requirements.txt || die
+}
+
+python_test() {
+	nosetests -v conans.test \
+		-e test_ftp.* -e modify_values_test.* -e test_pkg_config_path.* \
+		-e rpath_optin_test -e test_variables -e system_package_tool_installed_test \
+		-e virtualbuildenv_test -e scm_test -e test_git_shallow -e tools_test \
+		-e test_environment_nested -e devflow_test -e shared_chain_test \
+		-e virtualenv_test \
+		-A "not rest_api and not local_bottle" || die
+}
diff --git a/dev-util/cpuinfo-collection/Manifest b/dev-util/cpuinfo-collection/Manifest
index 84bc7b8aa358..4874b1c54003 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 546 BLAKE2B 32343311fd813df7226ecc380c6e8f67907c17a39c7eafb69e7b9c2b993809d469538c5c685b9a1bb101a1269b6a57a0cbacf14c80f71173411ddd897e74cbb3 SHA512 a8d41bd6639820d5ef8844e7eb9e0a6a528445cb126c7f1d1ade121d34769a0b129576d31c9b65c87e651db2e9686e45e2de28da2cb2e42e0f746c2907c29430
+EBUILD cpuinfo-collection-20101114.ebuild 547 BLAKE2B 37a5b439fcefadff4da4d8a53baf6b854a39f0279e0057a34bf50c0a52e33a9efce882d047b1d57295b727ddeb714fef2d7e144c6784f04fde0de0bddbf86dc9 SHA512 af3af7c28015d2c40158321109d4eab96b7965e9df7e28087adb79ffe5ac053c78fc0bbd53363d15721801b4bf804d8dfe38b25f2046da7675eedbc4e134e235
 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 1a62a4b3f647..7d5d4e1cb445 100644
--- a/dev-util/cpuinfo-collection/cpuinfo-collection-20101114.ebuild
+++ b/dev-util/cpuinfo-collection/cpuinfo-collection-20101114.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.deater.net/weave/vmwprod/linux_logo/${MY_P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/dev-util/cscope/Manifest b/dev-util/cscope/Manifest
index 99a1ebf2f829..097ebdc5d047 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 1375 BLAKE2B e1b216b69dc1795d202122f1053c148803af387c71cf959b0406d6ca6bb5063887a853ac1b0abcd5e6c9b36956d82e09d918fcd225e4ce02f0016471fec4928d SHA512 477e52fbb01ee7f4345cadb382b8fad60e38484097f793d330fcfe1606438b85a9c700e1ecfd97910d49a2c6de4e9d29e2d894cf9cd709a5d59f0da2b4fb16c0
+EBUILD cscope-15.8a-r1.ebuild 1376 BLAKE2B 520e3435544b1f05f971258ba1cd06665dc634d82652734f8a72ee00c3431f0f308a60d84b40130b92124368735e3f936dcdba9030947918c55472cc32576142 SHA512 51da9d24c3789b4deec298e9c0e7ab95e070264cce122fbd50adb143ea2290ff4dfb580a8c9c577eeca226d001695e4ba39da6deef55833d23822b3625bf9885
 EBUILD cscope-15.8a-r2.ebuild 1585 BLAKE2B 78ea1a0d32a2e4b5c0f5378b8fadc53f0f15a2077e65d7fefdda3153fcc874faba1f2941f3eb61599fabb20b4c244d77dcdc972f35d697d2c044867a5bc2373e SHA512 42d07ea5e193691138be4006bbb03a70445571290f05e923aea4709bb2a81bfc7d07c84eb9a60b37609f5ce8603716a6338f715decfd281ea0d43bbecca6d8cf
 EBUILD cscope-15.9.ebuild 1555 BLAKE2B c9681e327719b55b4d9b1985a11364eeec1da824e6f01048a4bea013d371e89834753dd69c3aa663b4f2b7e1a6260235536c6bb03f4094f8e10080bf33751dba SHA512 618304f3cc3f2c7a49c497099cfd8cdc53e06caefed4ecf6db6896fd58042bc84683ecded1d56e9ae9081de09b7eac0bedb5812c44dcd42b0d5ecd10765cb194
 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 b8bcfad183af..b1ae51bd71ef 100644
--- a/dev-util/cscope/cscope-15.8a-r1.ebuild
+++ b/dev-util/cscope/cscope-15.8a-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/cscope/${P}.tar.gz"
 
 LICENSE="BSD GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="emacs"
 
 RDEPEND=">=sys-libs/ncurses-5.2:0=
diff --git a/dev-util/cucumber-core/Manifest b/dev-util/cucumber-core/Manifest
index 8ce4504b7b59..7e14ef62c879 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 1000 BLAKE2B 13c5d453eb6fc8228a5c5ac1669f84968caf0ef124195fb56314e96d6d6e3ac7b793ee73a4855955d51014cf263cb3e465aec7900cf23f4e307eaeca8812770b SHA512 8dd2d8849e2785ff03ed3130f550c510ee0e795b2567952c52c39155fec669767824450bf7684ab5685f13df9b1a95c71e23ac7f3de144f98644c81f6fdd2164
+EBUILD cucumber-core-3.2.1.ebuild 994 BLAKE2B 881e8bec9db7ae780c1d00f4766c82f663ef333e4758481e2601fa40d8711aa74c1476f5a836819bb23c0c285f67555d888c8f7aee46a19b9de1400c1371cda7 SHA512 37fdf76493665f61fb4dc701b2cf0a6d88e93f179d834627a65a6258015eb3daf0df673e831b2a8f14b9c6f4912e86fe9a123c2e5680f926bf561e9632918dc7
 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 c7d72e8bb552..9df694e4baae 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="amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="amd64 arm ~arm64 hppa 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 bed6b11e3e41..d6755a742399 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 502 BLAKE2B cacecf1acd7c0fdaab8ee35957d1a139fa573aca69fb205beb30dfbed548b67f1e9c6fcc1f50ffff8153d7fe14354ea751c6c144ca4d6515b9cb1d3303785f49 SHA512 4574b7fcc8a13504147ed65abfaf2268ca9243b4c5dd58e339e6a9188cdd9429177c011e1795c2816b9082d1ded1ff41a7b83a7ca3356c7781d5cf1c81aba0be
+EBUILD cucumber-expressions-6.0.1.ebuild 496 BLAKE2B 6913a6ec67836b41ec7e21ed66d6019496744410479514be0deab2b658317c6066fdde1040a6e1655fda44215c16d116be212baeff0f54654802258b03e06e89 SHA512 a2b6bb493d64023689d0b1f24b1685e39ada8292a734adc349632bbead0e37dc113ffb6bf164e6bd0f5930eca47ef82de970c049df69e078480a001af1038156
 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 df698884dcf5..4b02192d8c33 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 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 6cd8cd55cb11..4d89b495ba6a 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 470 BLAKE2B e9620fad4f2530a1cde61152dd5f1a0b330a3106eac573ea0c28a66229274fd6fc3800181a632a51ea60cf1b5d6c25998e596a4d1dedbbd883700121057de556 SHA512 c42792d24d958a284912e9c1acbfa3826d80524755df5b9aed900475c9ba60c9a26823db6549d201e5bb5812a1d4090ef4a5431e5deff18715e455b970215b5f
+EBUILD cucumber-tag_expressions-1.1.1.ebuild 464 BLAKE2B 2c61d877ac6cf821e272d3cfeb9d42b5db61287ea50296a7dbf28656a0816764324ff829924992615c34976717a253ad940164d692ace7f3adb6002f4754956f SHA512 486b6dd09a85e80c524ba94911ab445c87d1aaca2d806a1c6e7478520d42e7574b0a44150bb2e877b40856cce79c714612566715af2b4354d7769e1374e1afc8
 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 fcf95fc7bf2d..280ef3ff03fa 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 ppc ppc64 s390 sparc x86"
 SLOT="1"
diff --git a/dev-util/cucumber-wire/Manifest b/dev-util/cucumber-wire/Manifest
index 711e199d1c3c..22fd43df5313 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 525 BLAKE2B 36348d4e3c2be24800799e014c6f556a6f6cc5675bc7b9f7e59a8782decfb9dc6d25c4633a71dcbfc47ff33048e6ded9a4dc655e054c409539414689ddc15904 SHA512 00a3074653d100909a7975e31d377a5247ca4a45259f77770ee8973a50e105502fbec2c00093f41363970acb7f0f87bccdffbecc857e4a3909a317f9f6ab181a
+EBUILD cucumber-wire-0.0.1-r1.ebuild 519 BLAKE2B 372553be72b92ed8b1a1a914365b58b1a02209a1008496ce9ceb43e7f5293ebe9b25fe3a5fc594b2cf94807edcf5070646ba0780572402f2dc9024698a5eb573 SHA512 58bcb7a1e540358898672d14bc0929528ebb79f14cc49ec607a662b2906c9f7c080757780608f7b42b9d49fca490f8540e7ac636383e09310ece1e805790fe89
 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 8bdeb95eb37b..1c387211d172 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="amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 s390 sparc x86"
 SLOT="0"
 IUSE="test"
 
diff --git a/dev-util/cucumber/Manifest b/dev-util/cucumber/Manifest
index 388b773a4344..aaca8356da85 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 2755 BLAKE2B 858f7863d14af59ceb147c992a898a9dcd260d1abdd10abc81b29f49e59ffaa4d29160d38b7bed367318d36d602666327a2a94d352f0bc8d00f04e7447e97e44 SHA512 d5e4a8a5151fd78792929007ab7c7818334716ee6a33a426269fc86c66b6191e8206f0db314b8581cc25ca30d4230b3a01c854f76fd667f53bc93716aa259574
+EBUILD cucumber-3.1.2.ebuild 2749 BLAKE2B b77ae4ba191999be873d92ae9a3dbcd6e52151662f4579aa4a96c7c5444a4a03604cb054b555e4ddfa06a7795c5eefbdb8677648c2129221073354afb3fa35da SHA512 01528a0c4707e239bd19fe5ccf49847192b569d3d7d33e4c906be552a3b53d5ef5320cb8863dae0aa524aea30f3225351e66ae5f81f49e88c68d274c402636aa
 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 50f428a688c6..ae95a5270878 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="amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 s390 sparc x86"
 SLOT="0"
 IUSE="examples test"
 
diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest
index 394a8ad89f56..3dabf9b5e1dd 100644
--- a/dev-util/debhelper/Manifest
+++ b/dev-util/debhelper/Manifest
@@ -1,7 +1,9 @@
 DIST debhelper_12.10.tar.xz 525416 BLAKE2B ce3a2116d9793eeda0df851047c0bed710ae6f948b6de268788e7991d683951f0eaf1a7a7a00d9195f1fbb008d21772f9a372f20d25c809fe07ef36ac91ca7e9 SHA512 79903492994a71a57a420207f3cde3fc1bef7645b9e7cf8d10b915cb52d325f947ae9f5130e28e88c3d357089fe35356aa2935480a333bc47352f6ced719a348
 DIST debhelper_12.9.tar.xz 521116 BLAKE2B 287740877b2431082baec262af581c34a9c0f3388232f7866bc7629b893c6d1f23da8f8956de5aa66d33b43d6f31d8ea31c897d313423d829750f894e5a3aeab SHA512 c8ee3040119a91b7dd2447be5c5d6bbe56d13aa53bd5e3d97be3af7c0a087a57661b36ae4eb56b20b0574c0e8702166ab75c7ffdeb7279f8ef77cc0ea367a6e5
+DIST debhelper_13.tar.xz 526028 BLAKE2B cc6e5f7b2eee7822088e326c3bd3930c3da60a5942c3dc3732a787428bf43c985a2f2be681b6d85c88767e3b1cde3871db1be5b912ab35260b776924c54acfb7 SHA512 17e131fba58057383e7824cd93a27b9d7eed0a2191bc6499c4bc412b47889a91d53a6ad5ac8c637166748bd728f10fd5d3a83bd0d2626e491a8481fe5c1193e9
 DIST debhelper_9.20160814.tar.xz 344328 BLAKE2B 38791ab3dfb74d12e44226b79a377889911a08505cdb45cc0a6e653906edbafcac1038d1d9ff9f5fd9f714ed36681562ce7fb1c9c1109a8528523100128fced6 SHA512 63072ba35ec8c62ee4c4d44833712925264c808a91f1522ef6a73377f2da3d11b285a21ad39158fd44693c801916189261186c8c7b28096719328a81a0a65f62
 EBUILD debhelper-12.10.ebuild 1530 BLAKE2B 39d9f9b5772bc7806940fe0bf8f14e265ecbe9fa1a9a68e09394ad1ea6396a14b9562346f79a340c7ed3d21e54a9245720ddcd102449958554ac1e2d86f4e28a SHA512 b838f7546ecddbbecf8f07c11f0f7a92c69069297173c080a2fce21fcb06d525e0d54900698b005fc2f5f0b819ed5808f71d2ce1d4a16c66adbee7eb43cc6d7e
 EBUILD debhelper-12.9.ebuild 1530 BLAKE2B 39d9f9b5772bc7806940fe0bf8f14e265ecbe9fa1a9a68e09394ad1ea6396a14b9562346f79a340c7ed3d21e54a9245720ddcd102449958554ac1e2d86f4e28a SHA512 b838f7546ecddbbecf8f07c11f0f7a92c69069297173c080a2fce21fcb06d525e0d54900698b005fc2f5f0b819ed5808f71d2ce1d4a16c66adbee7eb43cc6d7e
+EBUILD debhelper-13.ebuild 1530 BLAKE2B 39d9f9b5772bc7806940fe0bf8f14e265ecbe9fa1a9a68e09394ad1ea6396a14b9562346f79a340c7ed3d21e54a9245720ddcd102449958554ac1e2d86f4e28a SHA512 b838f7546ecddbbecf8f07c11f0f7a92c69069297173c080a2fce21fcb06d525e0d54900698b005fc2f5f0b819ed5808f71d2ce1d4a16c66adbee7eb43cc6d7e
 EBUILD debhelper-9.20160814.ebuild 1530 BLAKE2B 8a4529891546c0553fc545b41c0721ab899ff6f62ca5b71e8950c306bc5bdb6f9971fec6534c3b4aa03270154290e6e41b91916deb67a58f6a5fce24c57cca9e SHA512 b466001b990d497caccfdbbd88cd6e28e2e55e399923b33d1050bf667d7a050ccede8c4c2bf2df7460177d4a2094247e2ffcfd34c29d580f40ab432e89a96525
 MISC metadata.xml 260 BLAKE2B f88f6dac92c60982c9aa64365826d2bc8b5d1933190d4cdb44323f59c2a431add04feceb4e66470e9dd20ae0fab1ac1b5641c8bed429a2d6205b3c7acd6c7738 SHA512 b7f7421081083b48e0aa1d7cff7a776b18d670a32a2af64341332c39d0f531735f86857555e70327e257d51f6e0c97b3e293075bf59b9048ce0c0ec097c36735
diff --git a/dev-util/debhelper/debhelper-13.ebuild b/dev-util/debhelper/debhelper-13.ebuild
new file mode 100644
index 000000000000..99dca21e93e2
--- /dev/null
+++ b/dev-util/debhelper/debhelper-13.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 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 ~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/dejagnu/Manifest b/dev-util/dejagnu/Manifest
index 41416d77a6ce..ba3a3aa61cca 100644
--- a/dev-util/dejagnu/Manifest
+++ b/dev-util/dejagnu/Manifest
@@ -1,5 +1,5 @@
 DIST dejagnu-1.6.2.tar.gz 525879 BLAKE2B 1a4cf8bea350d7fca8983fe9f5f77756746e9ef81a06e2bc733a9fa32f54e3c791f28d80ab563306df4082f2d5f9f30b87f1380b57b15213bf401783e5384dde SHA512 ae527ce245871d49b84773d0d14b1ea6b2316c88097eeb84091a3aa885ff007eeaa1cd9c5b002d94a956d218451079b5e170561ffa43a291d9d82283aa834042
 DIST dejagnu-1.6.tar.gz 523969 BLAKE2B 1cc9498aacd681570cd8d8834cd2fe0594bb49e6664cfe934b824dba0bd4a6766f977de6a1dc4596095a11d68844873f5687000423f4928f0432981023d26451 SHA512 a494dd5cde8d275b397116049c93e183f5f1731d63660ee8d2f4263b099fc5be7fbddde927fab3ccd5f000c43d50242f94bbb4d95497b915ea53be418bc145bc
 EBUILD dejagnu-1.6.2.ebuild 509 BLAKE2B 556079a425d5f7d5b875baf02c79950c1ef1ff8d0d030b4a18055d1d9c9c56583989fcc2e3d01bdbe3c01bae2c125e0e77455717f4d514a6b1284ea936568195 SHA512 9e371c5da0a0d8c9bdaab698bc2ff17e3bd815bcab7470351084f9a1e0edf84670e6488d5e9088db8229872737e542779bd3d14988d4f648e7aa2342ea7d2812
-EBUILD dejagnu-1.6.ebuild 715 BLAKE2B 8acd7a493f1eba5b0645f48e47a3e90e7662fef43e8138c9b68c7c5a36fb808c64732ffb4cd326920e7af01452202504cf1ceb35e47d827d8f1d4cd314370d14 SHA512 eb72e606dfb9af144313af3d1e6e11fd3cbe29fcf7a95d5d72154889e17fb5d25a0c1799919ca62afb02b8f7df20b0fb13550aedad33886965166ac1925f5387
+EBUILD dejagnu-1.6.ebuild 716 BLAKE2B 9c340eb716f73cb9d7387867dbe330dd6673f9e4ce0140ee3446e6acc01f960e8c589281480b22c99744c60c9e378b1b0c83cdded35844c758f306f31a882b5d SHA512 28faea8246eb42c74e33d65036234643b4fdf647ffbe57d10bb3c5225721afbf35de20a7f2dc9ef621a7861d8965dfb437c5b6b9f6c622fec633ea06e58780cf
 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 e6fe023e9a7d..3d7081ad4691 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 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 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-lang/tcl
diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
index c80d5cf8634e..230f9bb82fb0 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 1818 BLAKE2B 7e946ea642db4476ccc165e26d7cc30c1b481216e9a43054aa14067845dbb45411d5c833d55f25d7ed519cbc47bf84811e031915b651821ef5bf4fc31453d5eb SHA512 b12542f04c3902f759a6dc1d291c2bb52acc914f48339b14bd63dca528f00adb9ea320cb7dab37eeeab51f4f1bdb54b5af2717fba4d2d42087cc5d96821c9a46
+EBUILD devhelp-3.30.1.ebuild 1812 BLAKE2B c91d39303521e9713889b705880ccf73844d384ef862ac44bc27da7dd89642330a53f1895c987c130d9a045f338f7a2e21556f71a1c52f74fd662c451bd91387 SHA512 7bbf8b15ed05ba91002737ade2f2bafd818c20a94237f7816e538aa9f5103d18968be82f1105e333e1b4cb50c8024c72e832775431aff18e892dd369dae54f1e
 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 014be70449d8..f953d1ca536a 100644
--- a/dev-util/devhelp/devhelp-3.30.1.ebuild
+++ b/dev-util/devhelp/devhelp-3.30.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Devhelp"
 
 LICENSE="GPL-3+"
 SLOT="0/3-6" # subslot = 3-(libdevhelp-3 soname version)
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~sparc x86"
 IUSE="gedit gtk-doc +introspection"
 REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-util/dialog/Manifest b/dev-util/dialog/Manifest
index cebe91180411..59ebff54ebcf 100644
--- a/dev-util/dialog/Manifest
+++ b/dev-util/dialog/Manifest
@@ -1,7 +1,7 @@
 DIST dialog-1.3-20170131.tgz 507783 BLAKE2B a98c436eabc8d06619bd64a8b1d647a0712630f0f89565253636ef2f38333ca6926177aa0c2001305b0c06fc7a1f576cda87da493183402ef9ec3cdc3fa8be23 SHA512 818b4e9d0d5ee55377b78ccceacf59a78e5e6d6fbc09e24a19e62b4988ff8de32f3364132b9ee88c86e126114eda45c82d86397d5f26fae81a6bda91be979786
 DIST dialog-1.3-20200228.tar.gz 544523 BLAKE2B 18551ea08fc6ca8cce37604cc468143e57e562648b7c1b7eb8abc0157f69d7b279ea65aa81d8435fdbc60944dff15d3d716e769a1103b0abbd8f4acb7e5bc011 SHA512 c2454421d32a61c6618b0262154d770ad0d194dd3999c0a95d6f08b59527dcf3f9d2ddc082a52df9ae6e28154fde73884b3b957285ee9f765b4ed79d304ee49c
 DIST dialog-1.3-20200327.tar.gz 547962 BLAKE2B b335d8b57d9a9f3a7e303aa3b2c64736007b66618a79c79368d9dba20a8123813cdeb7d0643bf7c6d147314963ff469b6e41d2378fe9181081fa543f0aca50f2 SHA512 c8c7ccd86fa189a2b6739320f59f127512e53f908ed257280099f8c45754da98d2095835d0c14090cd071af0ed6e8ff95f9938f5ca8027b0b7001c7fd746fe59
-EBUILD dialog-1.3.20170131.ebuild 1220 BLAKE2B 68e1d0083e8888e7aaf42fd549a285a8deef84e1040d0fc49d670f69fb39acc8a5c25eff0f1dfe8882e9743f063d047359a537534a8dc1d88e7e57efc98bbd33 SHA512 2637d50b8d802002ba8de067234cfd1b56d36eb763d9ab444ce220d2ad5d9b79d3be7957cc7b69af506213579a4c482e0d5f02b2d13becc9a61016517db19479
+EBUILD dialog-1.3.20170131.ebuild 1221 BLAKE2B 43b60560f93e7a82d88d96975821a15582fbcc55b88f50c430ef16c5fdf8529bd69b282fd5531211190c8484db11f2d904413f9652621209f111cdde4797b46e SHA512 f471c42611841b47e3f9cee388cab40b44010c9ce4435bbd30e15d6c772f52d8df2e7525b33fda30b2f792ac221c9e84a05ca3df550363da6c1c34704a262194
 EBUILD dialog-1.3.20200228.ebuild 1187 BLAKE2B 70ccc9a8ede219b1697e80a1536f004d3ab39f1bbed7044304a80968817dad2517d476d3ef0749710d7478a01322c4639ea15cef8fb9bb086d5b890a393bca89 SHA512 72a7c529a10ad2806177ee0a01476d4cc34240f4d2acc6ef2a61760315742387b507969df6edd021390ef4d196b62bb1a4886199b843ab6ada1e7d2a0d96cdf5
 EBUILD dialog-1.3.20200327.ebuild 1187 BLAKE2B 70ccc9a8ede219b1697e80a1536f004d3ab39f1bbed7044304a80968817dad2517d476d3ef0749710d7478a01322c4639ea15cef8fb9bb086d5b890a393bca89 SHA512 72a7c529a10ad2806177ee0a01476d4cc34240f4d2acc6ef2a61760315742387b507969df6edd021390ef4d196b62bb1a4886199b843ab6ada1e7d2a0d96cdf5
 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 3ecb50050a9b..800f61976b5a 100644
--- a/dev-util/dialog/dialog-1.3.20170131.ebuild
+++ b/dev-util/dialog/dialog-1.3.20170131.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://invisible-island.net/${PN}/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0/14"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="examples minimal nls static-libs unicode"
 
 RDEPEND="
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 32440f9418e9..53582c87b3d8 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,7 +1,5 @@
-DIST diffoscope-137.tar.gz 1557283 BLAKE2B d4b59174eec5919ade87fa04878c469a87bb31407c35eac9a21b13b36fd7b15ca0cb5cdf38dd25c1e964db1987579c74b595b4fd38d2f3e5a028f64176f73202 SHA512 6faa0675cd203e3320071dbf60a14110cb3674984bce9edab40e28b17769cb847179973fe55e0f9a78a3d6bf903e259c432225ae31e7e4f60ece252ac9cac20c
-DIST diffoscope-138.tar.gz 1567753 BLAKE2B 078a61eea53e0d0a66a862ac2c86889ddb95ddb8ccdb2b58b6a8b7e9ab1a3d5550511f73e7187a0539a974f257db6da79ad02b96e179952663f11e50cef23f12 SHA512 7dbc80d9135aba48e4f83b968e39f26e39f701b1ac1e6aaa2d9a6e18f24c1387b49d46067d2b2f2a76421752a8ac06d070cf660afb4a88db79f19339b327c485
-DIST diffoscope-139.tar.gz 1567732 BLAKE2B 14c8715612849e3bbf6590f8ada7c322aa73d9c24c4de5287f5d1f10f5a51b2ee04c8f6d388a8b54a409ddb8fca52d8663b5cd53f301878a94bb302d16874f3e SHA512 cd70a041b3738f7c09c719a17c3b933741b149a9aaee1c8fcb6bae0edd99f63d24b51cf55abdb8b5eb2ec6824fe6dee1a721974f1cf8b62604f26d46d9927d53
-EBUILD diffoscope-137.ebuild 1912 BLAKE2B ec1e126fcf54b48d60a15a9807ee0ff5a94961527e6ce135c0bdefcce77c621437a16a5b46e7d03a245c0911a1a199025ac119dfc1bad6b82687ca1210ae866a SHA512 55747e556c637d812582fb374c126dcfe254dac6a1c665bace0671a279147658e5d338eb228802182917044464eecd48153bf11f5d7b70fade7f037fe9f3cc19
-EBUILD diffoscope-138.ebuild 1986 BLAKE2B 6b1d5eb357a036a5ccdd278ff4b64f4c2d079deaed88a377cee2d87f1ba0ccc1532633478221a9db26caeb9a58bb6a9eaea1b6561ac11df80c9730d3239f81b3 SHA512 1728a19c6a64097116616a4293b2a4b7eb00d1ca92bd86133c4b228162ec21d0ac93d833ef8f2409c6a9840deeb997da3791df3ae9c85007b06919bad61a8e7e
-EBUILD diffoscope-139.ebuild 1986 BLAKE2B 6b1d5eb357a036a5ccdd278ff4b64f4c2d079deaed88a377cee2d87f1ba0ccc1532633478221a9db26caeb9a58bb6a9eaea1b6561ac11df80c9730d3239f81b3 SHA512 1728a19c6a64097116616a4293b2a4b7eb00d1ca92bd86133c4b228162ec21d0ac93d833ef8f2409c6a9840deeb997da3791df3ae9c85007b06919bad61a8e7e
-MISC metadata.xml 2081 BLAKE2B 5675b792346a4864e40f5d8b2181867065d8dac0d3fb17f4d82536aca7fc453490ddf32ae39bbe16514caac81d042adfa0f151e355ec60f27bc9bdda770ccb6b SHA512 c75fe757c122bc8db219013a5c46fa8ab5d23da2dfbf873d6af61e19a92a8c8d4ab9027b105e7757da5dd8caabf33de1b82605d7f8c2efa8095a7be0bd9117d7
+DIST diffoscope-141.tar.gz 1575158 BLAKE2B 56560be430cbb670c5595b57bbc36c09a0b9b2f1d3d0b0c19a27abd77392169bc5136a23a754ef2ec62c91606a54a254a2bf55110bf0981d8176fc94efb87d6d SHA512 bafe5200654362d12818ccd45c07e41c0ecd5430696172e88e323f635bc32c830a042429e792abaf5ddedf0fc7932d1c656699351cc805e76233affc8a762894
+DIST diffoscope-142.tar.gz 1568533 BLAKE2B da16f4bce6fd659bdb581709b10d20611add4bbd3d7bff66183b04b2205efc41a934888cb2a3c865dc6a3b644ac79b8cb3fbd46387d6217e86a8a92060dfe15b SHA512 f0bf339e58d1f77c936f5ef2ad1d45cdfe2d8ef236fe50f8ab2db16918bb8d56c9231f7ea7bbde68999ffde8901003d8bdf0b98e1a3e474252ca49cb83eb3664
+EBUILD diffoscope-141.ebuild 2161 BLAKE2B 9ef4a812c5fec5a923b0b796814052c00842cd36a447832fe65aed32c341454538ddccce2baac0b038d8bf02cbed98a2023eeba33e8a7868f34a882331098c34 SHA512 e508fee8307b2e634ec33877124156fcb8afd43307747b1f61e18ecfeaac00c1140c1906ef87015f3b76f70ac5679c28fed47539e52ce0adc29c6257ad6deacb
+EBUILD diffoscope-142.ebuild 2161 BLAKE2B 9ef4a812c5fec5a923b0b796814052c00842cd36a447832fe65aed32c341454538ddccce2baac0b038d8bf02cbed98a2023eeba33e8a7868f34a882331098c34 SHA512 e508fee8307b2e634ec33877124156fcb8afd43307747b1f61e18ecfeaac00c1140c1906ef87015f3b76f70ac5679c28fed47539e52ce0adc29c6257ad6deacb
+MISC metadata.xml 2137 BLAKE2B 6ff55f85ebf3f769c10c3e17a69900918abe142e491b7b8460bed8fe6a036763a743324bf1a10e7a3772761b38c9632ff1352e9c6677ef691f81acc29dc321e9 SHA512 e782e12dc91d86612768a2e0c498f54a9728691a76008ee1e6cdbc4d8719c2593344f6c37786982abb0de7b85d743d7614652a2e8c9cd9fef053c3a32e1e484c
diff --git a/dev-util/diffoscope/diffoscope-137.ebuild b/dev-util/diffoscope/diffoscope-137.ebuild
deleted file mode 100644
index 12fff8c883c4..000000000000
--- a/dev-util/diffoscope/diffoscope-137.ebuild
+++ /dev/null
@@ -1,62 +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 distutils-r1
-
-DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
-HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
-find gettext gif gpg gzip haskell hex imagemagick iso java llvm
-mono opendocument pascal pdf postscript R rpm sqlite squashfs
-ssh tar tcpdump xz zip zstd"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
-	dev-python/libarchive-c[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	acl? ( sys-apps/acl )
-	binutils? ( sys-devel/binutils )
-	bzip2? ( app-arch/bzip2 )
-	libcaca? ( media-libs/libcaca )
-	colord? ( x11-misc/colord )
-	cpio? ( app-arch/cpio )
-	diff? ( sys-apps/diffutils )
-	docx? ( app-text/docx2txt )
-	dtc? ( sys-apps/dtc )
-	e2fsprogs? ( sys-fs/e2fsprogs )
-	file? ( sys-apps/file )
-	find? ( sys-apps/findutils )
-	gettext? ( sys-devel/gettext )
-	gif? ( media-libs/giflib )
-	gpg? ( app-crypt/gnupg )
-	gzip? ( app-arch/gzip )
-	haskell? ( dev-lang/ghc )
-	hex? ( app-editors/vim-core )
-	imagemagick? ( media-gfx/imagemagick )
-	iso? ( virtual/cdrtools )
-	java? ( virtual/jdk )
-	llvm? ( sys-devel/llvm )
-	mono? ( dev-lang/mono )
-	opendocument? ( app-text/odt2txt )
-	pascal? ( dev-lang/fpc )
-	pdf? (
-		app-text/pdftk
-		app-text/poppler
-	)
-	postscript? ( app-text/ghostscript-gpl )
-	R? ( dev-lang/R )
-	rpm? ( app-arch/rpm )
-	sqlite? ( dev-db/sqlite:3 )
-	squashfs? ( sys-fs/squashfs-tools )
-	ssh? ( net-misc/openssh )
-	tar? ( app-arch/tar )
-	tcpdump? ( net-analyzer/tcpdump )
-	xz? ( app-arch/xz-utils )
-	zip? ( app-arch/unzip )
-	zstd? ( app-arch/zstd )
-"
diff --git a/dev-util/diffoscope/diffoscope-139.ebuild b/dev-util/diffoscope/diffoscope-141.ebuild
index a677a10243ad..63058ee2f20a 100644
--- a/dev-util/diffoscope/diffoscope-139.ebuild
+++ b/dev-util/diffoscope/diffoscope-141.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
-find gettext gif gpg gzip haskell hex imagemagick iso java llvm
+find gettext gif gpg gzip haskell hdf5 hex imagemagick iso java llvm
 mono opendocument pascal pdf postscript R rpm sqlite squashfs
 ssh tar tcpdump xz zip zstd"
 
@@ -40,6 +40,7 @@ RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
 	gpg? ( app-crypt/gnupg )
 	gzip? ( app-arch/gzip )
 	haskell? ( dev-lang/ghc )
+	hdf5? ( sci-libs/hdf5 )
 	hex? ( app-editors/vim-core )
 	imagemagick? ( media-gfx/imagemagick )
 	iso? ( virtual/cdrtools )
@@ -65,3 +66,6 @@ RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
 	zip? ( app-arch/unzip )
 	zstd? ( app-arch/zstd )
 "
+# Presence if filemagic's magic.py breaks imports
+# of dev-python/python-magic: https://bugs.gentoo.org/716482
+RDEPEND+=" !dev-python/filemagic"
diff --git a/dev-util/diffoscope/diffoscope-138.ebuild b/dev-util/diffoscope/diffoscope-142.ebuild
index a677a10243ad..63058ee2f20a 100644
--- a/dev-util/diffoscope/diffoscope-138.ebuild
+++ b/dev-util/diffoscope/diffoscope-142.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
-find gettext gif gpg gzip haskell hex imagemagick iso java llvm
+find gettext gif gpg gzip haskell hdf5 hex imagemagick iso java llvm
 mono opendocument pascal pdf postscript R rpm sqlite squashfs
 ssh tar tcpdump xz zip zstd"
 
@@ -40,6 +40,7 @@ RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
 	gpg? ( app-crypt/gnupg )
 	gzip? ( app-arch/gzip )
 	haskell? ( dev-lang/ghc )
+	hdf5? ( sci-libs/hdf5 )
 	hex? ( app-editors/vim-core )
 	imagemagick? ( media-gfx/imagemagick )
 	iso? ( virtual/cdrtools )
@@ -65,3 +66,6 @@ RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
 	zip? ( app-arch/unzip )
 	zstd? ( app-arch/zstd )
 "
+# Presence if filemagic's magic.py breaks imports
+# of dev-python/python-magic: https://bugs.gentoo.org/716482
+RDEPEND+=" !dev-python/filemagic"
diff --git a/dev-util/diffoscope/metadata.xml b/dev-util/diffoscope/metadata.xml
index 6d4d5794e456..86628d987731 100644
--- a/dev-util/diffoscope/metadata.xml
+++ b/dev-util/diffoscope/metadata.xml
@@ -23,6 +23,7 @@
   <flag name="gettext">Use <pkg>sys-devel/gettext</pkg></flag>
   <flag name="gpg">Use <pkg>app-crypt/gnupg</pkg></flag>
   <flag name="haskell">Use <pkg>dev-lang/ghc</pkg></flag>
+  <flag name="hdf5">Use <pkg>sci-libs/hdf5</pkg></flag>
   <flag name="hex">Use <pkg>app-editors/vim-core</pkg></flag>
   <flag name="iso">Use <pkg>virtual/cdrtools</pkg></flag>
   <flag name="llvm">Use <pkg>sys-devel/llvm</pkg></flag>
diff --git a/dev-util/dogtail/Manifest b/dev-util/dogtail/Manifest
index 3a72b0eda64b..3425810ec746 100644
--- a/dev-util/dogtail/Manifest
+++ b/dev-util/dogtail/Manifest
@@ -1,4 +1,6 @@
 AUX dogtail-0.9.10-gentoo-paths.patch 2705 BLAKE2B 6a3d9b7a7ced2388bea7216c4a6f95e531247b5d5f7316b64375215ea5a7e0e1a8deb974115bd613baf6d22c7af502efce01f00412cb8ff101042d08cfb9fe1d SHA512 ce792bf24713c8b2948874faa11ee53d341d4d1d25bba95cd11f9a31e2e76e813a20b0d9932268a2110c990de1fdf15382fa1867f02e31ea1d25349e48bb42c1
 DIST dogtail-0.9.10.tar.gz 125995 BLAKE2B e28e9a6330cefc8746b850501a5beba07e18f1e5d5f935ce182103a9ea4ffc95483b3530a705565cbfae1bff24da57839f7e7b6939f42821e31b287150e33b4d SHA512 08ce4ad6e5e492ab04be9964cc6583d96d2d8a707a49721c1bca9248e5c56702fe5d0d84dd992023f731fe87016c88e21929319baff561aa113c6e101343fc3e
+DIST dogtail-0.9.11.tar.gz 132832 BLAKE2B 9004216a3d96714e9bd524e6ffaad7892a3630c97b61293d9784bc04df353f3c09e6226f92329103768a38c55b7eecc5f23a1aec0e6cd4baf8012892bb7d5cb7 SHA512 b5880386d9952b3aceac95d8b7a4f5e8293b29a629019e7cc3aa57e13b35a9cfbd0fd2a9db5fed80b2ebf7225a1a05c7388a67da91b310434833b4c6efd02278
 EBUILD dogtail-0.9.10.ebuild 1470 BLAKE2B 39fd580e47697e0314d442a74c2c4283563eba00ff6d45cb6d41d14cf78a873977ab4960f9d467a600ece36346b4c66fd6f7fa4e0e46901a4e2024984dcfac97 SHA512 e9849d0f93a60d7f95079d9972aa6690c6c6c0d93d436b1f6da7d70b4a2c2fe57f8e81a2aea66d121fafe72bef94f73ea05f3f2d650ae0da3bbd5db981fc1b52
+EBUILD dogtail-0.9.11.ebuild 1344 BLAKE2B 79d1eee360748ec972f2c3ff1e914fb07a29a4d63323e7afc09cb2cb88173dc39c275cc4f39ddcf74228ec0fb3d3d7110452b214177f9463daec5547cc76792e SHA512 7629359214799eecf0458c13f1140a6e9c9f6630c3d753c857d411f5a6f9726d867c7028f8ee147e7b53ee589bdd63dbc0a42980628785885917f984ff4703d1
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/dev-util/dogtail/dogtail-0.9.11.ebuild b/dev-util/dogtail/dogtail-0.9.11.ebuild
new file mode 100644
index 000000000000..b457e48c7e3c
--- /dev/null
+++ b/dev-util/dogtail/dogtail-0.9.11.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1 gnome2-utils xdg
+
+DESCRIPTION="GUI test tool and automation framework using accessibility framework"
+HOMEPAGE="https://gitlab.com/dogtail/dogtail/commits/master"
+SRC_URI="https://gitlab.com/${PN}/${PN}/raw/released/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/gobject-introspection
+	dev-python/pyatspi[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	x11-libs/gdk-pixbuf:2[introspection]
+	x11-libs/gtk+:3[introspection]
+	x11-libs/libwnck:3[introspection]
+	x11-base/xorg-server[xvfb]
+	x11-apps/xinit
+"
+DEPEND=""
+BDEPEND=""
+
+# Tests require org.gnome.desktop.interface toolkit-accessibility
+#distutils_enable_tests nose
+
+src_prepare() {
+	# Install docs in one place
+	sed "s:doc/${PN}:doc/${PF}:" -i setup.py || die
+
+	# Upstream loads resources relative to __file__, which doesn't work with
+	# gentoo's dev-lang/python-exec. So we need to add hard-coded paths.
+	eapply "${FILESDIR}"/${PN}-0.9.10-gentoo-paths.patch
+	sed -e "s:@EPREFIX_USR@:'${EPREFIX}/usr':" -i sniff/sniff || die "sed failed"
+
+	xdg_src_prepare
+	distutils-r1_src_prepare
+}
diff --git a/dev-util/edb-debugger/Manifest b/dev-util/edb-debugger/Manifest
index be862215dcf9..aa0e086ef581 100644
--- a/dev-util/edb-debugger/Manifest
+++ b/dev-util/edb-debugger/Manifest
@@ -3,4 +3,4 @@ DIST edb-debugger-1.2.0.tgz 608773 BLAKE2B d67136b3bfb153f0e5ba0aef514756f39d636
 EBUILD edb-debugger-1.1.0-r1.ebuild 1126 BLAKE2B c9b9391d5d06b797c3ad0e8eadab04ca983a7c344c179ded66357a99f13e26b7cb0b6fefc0d972f62b61f2599bc499243c35fd8ba77e443dd5da34d4b6cb4e95 SHA512 272eecf3dd7d6c386fbe5143a9c84baf429ae45f1c53312386567c44a4f48b472542d9f406844f015a16141066180c4c2636530b2ae8edc9b977362e52ffd0ea
 EBUILD edb-debugger-1.2.0.ebuild 1126 BLAKE2B c9b9391d5d06b797c3ad0e8eadab04ca983a7c344c179ded66357a99f13e26b7cb0b6fefc0d972f62b61f2599bc499243c35fd8ba77e443dd5da34d4b6cb4e95 SHA512 272eecf3dd7d6c386fbe5143a9c84baf429ae45f1c53312386567c44a4f48b472542d9f406844f015a16141066180c4c2636530b2ae8edc9b977362e52ffd0ea
 EBUILD edb-debugger-9999.ebuild 932 BLAKE2B 060e1be8043c1fd6f12684b197f60cd88de8f8d35c1227246de4bba18546b23f16ddcd60cdf92a54a48cda5ab1640e9e199a1429edf52bdf935ebf18f120df19 SHA512 1c09eaaecff1866de7307512ced499f0eb10f1f3defc8663111d9cfa64f6a7ef3b846365f8e9e18e14d19fde18909e1a5bbbdc60a674f1918f0476316399d929
-MISC metadata.xml 580 BLAKE2B ca6847b4ec53715b5d408e36acf6753a8da4bfb7f8da771bab017daaa92c6b7d34e9100662e209626d49e9a45d1b0624015f46ef83aac0db1b23902521731aaf SHA512 75333f5eba045b2a70efd901680f80781291e85ee3498fb65e9ac8eabf6ba466525eb0f87093d1f173742b01e53d50a8bc874a2a83689c2ae62e90a7dbcbe077
+MISC metadata.xml 358 BLAKE2B eae911d14bc54d81aaf32eee088708b75027fe67c1dd9458ffeb1af3ecc429bbfa51805aab9a3ecbf8bfbc8e221b6411423852fc2fc61381ca381a61869521be SHA512 da7c4e88f58521bf9521b060b328498aa8e30be151671f5d81bbc15695e23b9a0bd75f7a98cee91866ccc4347d0fc18dd76259a8ac244bf5d0e9826b6cb8ca1e
diff --git a/dev-util/edb-debugger/metadata.xml b/dev-util/edb-debugger/metadata.xml
index 6506dc772361..3bc6d7a6ce34 100644
--- a/dev-util/edb-debugger/metadata.xml
+++ b/dev-util/edb-debugger/metadata.xml
@@ -2,14 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>petross404@gmail.com</email>
-		<name>Petros S</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>slyfox@gentoo.org</email>
 		<name>Sergei Trofimovich</name>
 	</maintainer>
diff --git a/dev-util/flawfinder/Manifest b/dev-util/flawfinder/Manifest
index c3f2e63c05f3..1536f20d835a 100644
--- a/dev-util/flawfinder/Manifest
+++ b/dev-util/flawfinder/Manifest
@@ -1,9 +1,11 @@
 DIST flawfinder-1.31.tar.gz 174148 BLAKE2B f545a9d4dc8c0a9d7ae34fb5b26e06eb7c40a916155fdd738e4d56b6fccee4af1941935b6847d5f6c8f968ba45e95a8e9b44e5723b11a9c47fce725d1c27dcf1 SHA512 880919a05dbf0e29055f052b88c8bbfd403105504749bc65fb17675e6ebe0d84f9cd367e7a6efc68dc0d9209e0938185da4718b70f484007c507fe96b83e0355
 DIST flawfinder-2.0.10.tar.gz 252772 BLAKE2B 9647bb4258f6a7fcfa84aa119b2b714dbf6239c0869a7a0c3b6cb50264c5872d18bd6d8bd48fef5030cdc72f38b945e71d6bccb2c861e922212566326263a2ee SHA512 4bf24f4b84fc17d1cecda7686259efdd4d36afc267a315be147545518ba965929f3a58d13f534aec4c1816e55cfb854ec647d09e170bb5f5eccfb4dc3469acd0
+DIST flawfinder-2.0.11.tar.gz 256777 BLAKE2B e2aa109a0cc435da7a8ba5f40b5dc6474e27ec340785c0070fce4a648fb5a186f6f0f5ab4e53c8e06c91fb1cb15179ecdb605a7f7477968e4d5595fc46cbd7c8 SHA512 4236da49914fa6317eb2fae1b3fd7ba08aa96a34bc5245bfd15b6532049193cbd0367bb3620e32252ce71cdd1128bec4b20c0e88b02c55d0ede1bb5bb091ddeb
 DIST flawfinder-2.0.7.tar.gz 249177 BLAKE2B 35dc5796ca7ecf456bf623247c7fb3944e05864bb714900a386f3e39eed81695409b44b9684365e4b172feb938a7c781c831856a8a94826c48b1027698b0967a SHA512 ecfe98c58e253b1d90b833747d69c41597ab7b4c82286e5f45dff45de90056216c25d2c9626540aebfc1e475882a04c3cfa3c0cb3ee242f498f5cdfe188d761f
 DIST flawfinder-2.0.8.tar.gz 251546 BLAKE2B 4817d3f529c27f0e969754fab08d1323b5fd778e4914882bdd4a61a96301ded287e2899016e609f658d9fee5dc76c1013e535a32120831cd166bb3f24c443e8f SHA512 9346c60808087ddf28f433067691c662beb0c36375903fdd0b4dbe3e53fe92b3893e38b13ecb0fe134586cf680fc554d33c92ff910dbd1cd4c3cbeab946038f4
 EBUILD flawfinder-1.31.ebuild 724 BLAKE2B 4441a55be26ce38da31944675d0203dac0028b27acbf99dadc1e733114d8e6a80500aa0c90a592f89b188831faa1ffc1160a7f11e96a7b940f9af01f518e164b SHA512 d4730fd182db2bcd39ff3b44c0036fa4dfd00d26b98ff5732c03d89980de5ced3a9a955d926dcf40f1afb829839f5aab0f635d4a60464d15fb603bc7190eba39
 EBUILD flawfinder-2.0.10.ebuild 802 BLAKE2B c99ed692efa9d226f89ae584874d4b2bb46619d56b1e8452e2080814edb6891564207b4902dd77e8cafda587b476ce9c36167a82c5a21c14bd09e0617ac9a0a1 SHA512 e0b060165a052105baf0addc99f7dbd77e71058615e03189ca39569163ab49f66f790f70cbf85fad14cdb822596c36dc99e03ac4c307bb18f6e1486fccc4a637
+EBUILD flawfinder-2.0.11.ebuild 796 BLAKE2B 512d9cd25b84b610b8ad070589b2a1fc5fe196a2059f3bf72e4741c3ddd69b0460b6345e4b7bf746781ec7a3fd7342adcb4464c1c9be7c00182f814263374ffe SHA512 bea7195f052f83f353e7a3d27ff86b76e8a512d9169a2847d561c6cf3bf78dfa45ac50dd72404d0fded84e6fee6eee528c94a38a85f45bc98b8bf1077a57ae38
 EBUILD flawfinder-2.0.7.ebuild 802 BLAKE2B c99ed692efa9d226f89ae584874d4b2bb46619d56b1e8452e2080814edb6891564207b4902dd77e8cafda587b476ce9c36167a82c5a21c14bd09e0617ac9a0a1 SHA512 e0b060165a052105baf0addc99f7dbd77e71058615e03189ca39569163ab49f66f790f70cbf85fad14cdb822596c36dc99e03ac4c307bb18f6e1486fccc4a637
 EBUILD flawfinder-2.0.8.ebuild 802 BLAKE2B c99ed692efa9d226f89ae584874d4b2bb46619d56b1e8452e2080814edb6891564207b4902dd77e8cafda587b476ce9c36167a82c5a21c14bd09e0617ac9a0a1 SHA512 e0b060165a052105baf0addc99f7dbd77e71058615e03189ca39569163ab49f66f790f70cbf85fad14cdb822596c36dc99e03ac4c307bb18f6e1486fccc4a637
 MISC metadata.xml 622 BLAKE2B b86d650364e1cd87b7fadc99bfc02e6acb360147c849846bfc94b3e827042aca129c745240ef8e04e3270ec6468dd5654ef9dbc55eeeb59d0251a73ab9d5f888 SHA512 5eda245e47619da4309fe11fd709daf8aedfefe97624ffcdd898bb4915c29e8dbf07b25543071ea9fe15af604a96f030ba816e26580c7166fd9689a1062e8e2b
diff --git a/dev-util/flawfinder/flawfinder-2.0.11.ebuild b/dev-util/flawfinder/flawfinder-2.0.11.ebuild
new file mode 100644
index 000000000000..2ad2225b2016
--- /dev/null
+++ b/dev-util/flawfinder/flawfinder-2.0.11.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Examines C/C++ source code for security flaws"
+HOMEPAGE="https://www.dwheeler.com/flawfinder/"
+SRC_URI="https://www.dwheeler.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -i "s/${PN}.1.gz/${PN}.1/g" setup.py || die 'sed failed.'
+	default
+}
+
+python_test() {
+	emake test
+}
+
+python_install_all() {
+	local DOCS=( announcement ChangeLog README.md ${PN}.pdf )
+	distutils-r1_python_install_all
+}
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 9c61d6acbd08..c1996b78ca75 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -6,6 +6,6 @@ DIST glib-2.62.6.tar.xz 4703424 BLAKE2B 0a27245be2575c574dcc730dd051a8c284f421db
 DIST glib-2.64.1.tar.xz 4758548 BLAKE2B 5585d23fee28d7c32b1bb9e1defbc31ba469aa259e3c328760d1e702d98706cf251bfb50b5e2aed37b2cdfa6ab4319372ddcd0a9937c97a2614741b504af17a5 SHA512 1cefe49a42233f24ac6bd09c134ceea7119f4f74f42204a731be56100a180eec69c8224674f0b08d1538ad0859896ed08260a6af0fed469c7d10b4508116a6bc
 EBUILD gdbus-codegen-2.60.7.ebuild 2015 BLAKE2B 2753c57ee4842a4ca3867e041d1767ababce6f569a0214a8f04df6963783ac297ccbac768a08b82cb9ea6ca9e9ba609b36b6ac818b311ef8a998d927648815b8 SHA512 a6771f6323bfc1e0fb7d117e940b5b48f02170861c337c24ca1cac0a13e1fca0200257d484ad7e22e46c19ee1b3b3c38469b4a0be5dd6b4b7379a8fb11c4827c
 EBUILD gdbus-codegen-2.62.5.ebuild 2052 BLAKE2B 4448c882cdb2b9673d18f7d5ee4c16e1a390fda6c84b0424c2eaf9f0a57b7f91078f7ba162c78f81f5c7fcc8c8ee3dfbedadadc98c8fe394312ebb37342990f1 SHA512 de6f2070c3ba0082ad0c1ccff51afd65e55d84447cc1a1dc9f0bed85596baeb2417598967c2357702825c2c7e0606752d98529cb98cc6a63a6ef493967e28a72
-EBUILD gdbus-codegen-2.62.6.ebuild 2052 BLAKE2B 4448c882cdb2b9673d18f7d5ee4c16e1a390fda6c84b0424c2eaf9f0a57b7f91078f7ba162c78f81f5c7fcc8c8ee3dfbedadadc98c8fe394312ebb37342990f1 SHA512 de6f2070c3ba0082ad0c1ccff51afd65e55d84447cc1a1dc9f0bed85596baeb2417598967c2357702825c2c7e0606752d98529cb98cc6a63a6ef493967e28a72
+EBUILD gdbus-codegen-2.62.6.ebuild 2047 BLAKE2B 68609cee5dcc41ecdddcbe3953756dc096f2df66f5db0e45101df342bdfa6aafca346aa29b6aa9e375c29708dbe760f98eed54f782e02b946d424710bf558c1c SHA512 f5608ba0bcbbceaa787302e3ac6d7d759f0576aa43f8c8e633e53c3deae8c0324bec99d7d2bc3c0901911f0e5064eba6175ea54b49267472946ff5c84e9312db
 EBUILD gdbus-codegen-2.64.1.ebuild 2210 BLAKE2B 33183b64bb0580f471c75fa8013896e72040482bd17b24bd159418649d6ade174c16d7964732afb86aeebc81bd6692a77e5ed5fc1d4309908abc7dd762075466 SHA512 8a850c678739ca20f6bb55edfad22a2733363784ee7f42aeb8b9775a13d89fd901137a39600ab8921468f2635d8b1c2cb650b5fd696c80e7406ce8a5188da1f5
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.62.6.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.62.6.ebuild
index fe957c7d3de0..68892c0075fd 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.62.6.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.62.6.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~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 9d41b0ef05dc..1f87017c94e4 100644
--- a/dev-util/geany-plugins/Manifest
+++ b/dev-util/geany-plugins/Manifest
@@ -1,11 +1,4 @@
 AUX geany-plugins-1.36-libgit2-0.99.patch 2345 BLAKE2B 8cbaf858dd62c692279b863a8c594fd768c43ef4042fc10093eb608f6c6f7f71d3fadbebf41e98ab1045303b3e921b20aa453467c314132807fb285aab5560bd SHA512 49897e68b7617e429fc98cee9bc6dc47b60f2e526563ab7b3a58fe4aa8c04bec522ad357225ff5d75378a551c8eee4374382c25381ca368769137b045fbbae6b
-DIST geany-plugins-1.30.tar.gz 4469990 BLAKE2B 3cb8434765667814dc95227a82bdf204b2f918c951de8d5d9b56549c3fc343e1fe1c3e225d9f907da6b3227440dbdad09d0318d2738c213640a4629e9f7b42fe SHA512 11dc44215aaa369831c249ef84b5dd0ee7eecdfbbf4707fc6165d78201e9e755447463c171ac6c8b2bc70df28a97b23762073ab9b31f7c33285d4728089da807
-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 3486 BLAKE2B 780841b267551815696d4f15fa15c8677355e8ca14b69a8a9865ff5284036ef1086d61577678dd8d1c32af1580ed224a7baf991d928acd48f63aec071dc57d49 SHA512 35c7282e23cac683a215f35144f7c988fed8ff4f2b556617540dc752138f7e3d126816da7113cfd63d02605f1a7a95d08fcde777bb0ee56daa0faf3202828cda
-EBUILD geany-plugins-1.34-r1.ebuild 3391 BLAKE2B 0c2731c639d829e496038aea52907828d54bad2d00c444bfabd7122463eff5209551990b232cb7e0ab8c2c3aa456e20815b5e3b5dbea969b1b186cfa21854c86 SHA512 7a5cc59f1e02dba2adc6e5fabd735d84a50cf11246d5d7530b02ff35a41b6ff7d727f37bcc498d3f1fce37806d318f109a67a5e70216138c39fa515f60c8cb17
-EBUILD geany-plugins-1.35.ebuild 3358 BLAKE2B 917d11c0797871d74e4db1a08264f7ee539b32a4cd78d523b51a45b89621dd1011e47e262f9c5170168e62c55246cc92608273a0f9df8bbc9e952f8bfffa076e SHA512 7c77e1266185fc4569f10c56fc6d1dfc11dbe7ff7bb199ace577a0483a89e3f4426c84390f761407c56d379da098592c7fb5519ff144b910bb64f5834cfcc2a4
-EBUILD geany-plugins-1.36-r1.ebuild 3474 BLAKE2B c1f3bd654e32bdbf9a3fe518651b398cad4680b23ad9c43a61d2ac921c988319370b9b442cc6f669ff4165087e9300771f31ff07546545ffd0c31725e124754d SHA512 c5ccf6304578171e26e3b754196f381782928fb6c27a62238e7f6c346281744a1268c610f48579a2295e70486597a86ba401e6ec58e3b69fee478952eb71ecfb
-EBUILD geany-plugins-1.36-r2.ebuild 3039 BLAKE2B 1672a7b1921cfbf0dfef9f9a0399f6d8a083b2d0da9f62549e13fd9eefb6fa0ba8ae55613179520f0dae0789854eb9c4f14a3fe868e1f2998fe8c57a7ee3e8f7 SHA512 bc9a48b7723e652686a3bbb08f9d1999d422e075a60f5cd197b34740ea49bb35f4ac901b6e194a5419ff951b4e031fa8a79ccbd227c0aca5b51d1ce17ee21768
-MISC metadata.xml 1647 BLAKE2B b46873a3918b3506a6331aecf522f78467c4ab88e3d9f1b3caa300afbb83986f377d193ed2da43246eacb3ea104396989569f3e8ea663ee766c580d6b96abac5 SHA512 0030c7fb50c9ed0da05c34ef122762c86a5b9f8345403e80cd2cdff0447a62980608ca7ee484520eb097907bc6d9dfe4b390b0d4888775e3b4125d3ccd198d94
+EBUILD geany-plugins-1.36-r2.ebuild 3041 BLAKE2B e25759bbd4f9a48e3fbafb3c4b90ea1e8b648ed137d226976003796df82b769da8f9752e573b6276d940235bd1c8993329b2a56a0ad34c5f2eee99e6ecb98f55 SHA512 51ae6f610441056d9572133c18e61d7f01f7c1cd6258e8e18e4828525cbe05d8e2dc5129291ae23aef52a45d7c75e70ba47a5e98a153a80c900c8913723ca516
+MISC metadata.xml 1224 BLAKE2B e4c6548dff83825d2a2a7fcc0b0996f49aef25bf89468e6f333a5c524b09fc536854a0e3096e08a0026651fbaae70af1c9e09bba8a35fd4fd44cdd3a08a3217c SHA512 f8f2e26977703798922688da150a4dfd397ab06e0e35b28d7b84634a7bd1c2fe96937b586a83ead23a701feed2d3b4e75951d28529a2be980992f8c23565bfba
diff --git a/dev-util/geany-plugins/geany-plugins-1.30.ebuild b/dev-util/geany-plugins/geany-plugins-1.30.ebuild
deleted file mode 100644
index 2c40f13fccf9..000000000000
--- a/dev-util/geany-plugins/geany-plugins-1.30.ebuild
+++ /dev/null
@@ -1,146 +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 eutils ltprune python-single-r1 vala
-
-DESCRIPTION="A collection of different plugins for Geany"
-HOMEPAGE="https://plugins.geany.org"
-SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-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="
-	gtk3? ( !debugger !multiterm !python !scope )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-GTK_COMMON_DEPEND="
-	gtk3? ( x11-libs/gtk+:3 )
-	!gtk3? ( x11-libs/gtk+:2 )
-"
-COMMON_DEPEND="
-	>=dev-util/geany-1.26[gtk3=]
-	dev-libs/glib:2
-	dev-libs/libxml2:2
-	autoclose? ( ${GTK_COMMON_DEPEND} )
-	commander? ( ${GTK_COMMON_DEPEND} )
-	ctags? ( dev-util/ctags )
-	debugger? ( x11-libs/vte:0 )
-	defineformat? ( ${GTK_COMMON_DEPEND} )
-	enchant? ( app-text/enchant:0 )
-	git? ( dev-libs/libgit2:= )
-	gpg? ( app-crypt/gpgme:1= )
-	gtkspell? (
-		gtk3? ( app-text/gtkspell:3= )
-		!gtk3? ( app-text/gtkspell:2 )
-		)
-	lua? ( dev-lang/lua:0= )
-	multiterm? (
-		$(vala_depend)
-		x11-libs/gtk+:2
-		>=x11-libs/vte-0.28:0
-		)
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/pygtk[${PYTHON_MULTI_USEDEP}]
-		')
-		${PYTHON_DEPS}
-		)
-	scope? ( x11-libs/vte:0 )
-	soup? ( net-libs/libsoup:2.4 )
-"
-RDEPEND="${COMMON_DEPEND}
-	scope? ( sys-devel/gdb )
-"
-DEPEND="${COMMON_DEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# bundled lib buster
-	rm markdown/peg-markdown/markdown_lib.c || die
-	# devhelp plugin bundles devhelp
-
-	default
-
-	use multiterm && vala_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-cppcheck
-		--disable-extra-c-warnings
-		$(use_enable !gtk3 geanydoc)
-		# GeanyGenDoc requires ctpl which isn’t yet in portage
-		--disable-geanygendoc
-		# peg-markdown is bundled, use app-text/discount instead
-		--disable-peg-markdown
-		--enable-addons
-		--enable-codenav
-		--enable-geanyextrasel
-		--enable-geanyinsertnum
-		--enable-geanylatex
-		--enable-geanymacro
-		--enable-geanynumberedbookmarks
-		--enable-geanyprj
-		--enable-geanyvc
-		--enable-lineoperations
-		--enable-lipsum
-		--enable-pairtaghighlighter
-		--enable-pohelper
-		--enable-pretty-printer
-		--enable-projectorganizer
-		--enable-sendmail
-		--enable-shiftcolumn
-		--enable-tableconvert
-		--enable-treebrowser
-		--enable-xmlsnippets
-		$(use_enable autoclose)
-		$(use_enable automark)
-		$(use_enable commander)
-		$(use_enable ctags geanyctags)
-		$(use_enable debugger)
-		$(use_enable defineformat)
-		$(use_enable enchant spellcheck)
-		$(use_enable git gitchangebar)
-		$(use_enable gpg geanypg)
-		$(use_enable gtkspell)
-		$(use_enable multiterm)
-		$(use_enable lua geanylua)
-		$(use_enable nls)
-		$(use_enable overview)
-		$(use_enable python geanypy)
-		$(use_enable scope)
-		# Having updatechecker… when you’re using a package manager?
-		$(use_enable soup updatechecker)
-		$(use_enable soup geniuspaste)
-		# Relies on obsolete and vulnerable webkit-gtk versions
-		--disable-devhelp
-		--disable-markdown
-		--disable-webhelper
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	prune_libtool_files --modules
-
-	# make installs all translations if LINGUAS is empty
-	if [[ -n "${LINGUAS+x}" && -z "$LINGUAS" ]]; then
-		rm -r "${D}/usr/share/locale/" || die
-	fi
-}
diff --git a/dev-util/geany-plugins/geany-plugins-1.34-r1.ebuild b/dev-util/geany-plugins/geany-plugins-1.34-r1.ebuild
deleted file mode 100644
index f9ec3ba2ff8b..000000000000
--- a/dev-util/geany-plugins/geany-plugins-1.34-r1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 vala
-
-DESCRIPTION="A collection of different plugins for Geany"
-HOMEPAGE="https://plugins.geany.org"
-SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-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="
-	gtk3? ( !debugger !multiterm !python )
-	!gtk3? ( !markdown )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-COMMON_DEPEND="
-	dev-libs/glib:2
-	>=dev-util/geany-1.34[gtk3=]
-	gtk3? ( x11-libs/gtk+:3 )
-	!gtk3? ( x11-libs/gtk+:2 )
-	ctags? ( dev-util/ctags )
-	debugger? ( x11-libs/vte:0 )
-	enchant? ( app-text/enchant:= )
-	git? ( dev-libs/libgit2:= )
-	gpg? ( app-crypt/gpgme:1= )
-	gtkspell? (
-		gtk3? ( app-text/gtkspell:3= )
-		!gtk3? ( app-text/gtkspell:2 )
-		)
-	lua? ( dev-lang/lua:0= )
-	markdown? (
-		app-text/discount
-		net-libs/webkit-gtk
-		)
-	multiterm? (
-		$(vala_depend)
-		>=x11-libs/vte-0.28:0
-		)
-	pretty-printer? ( dev-libs/libxml2:2 )
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/pygtk[${PYTHON_MULTI_USEDEP}]
-		')
-		${PYTHON_DEPS}
-		)
-	scope? (
-		gtk3? ( x11-libs/vte:2.91 )
-		!gtk3? ( x11-libs/vte:0 )
-		)
-	soup? ( net-libs/libsoup:2.4 )
-"
-RDEPEND="${COMMON_DEPEND}
-	scope? ( sys-devel/gdb )
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND="virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	use multiterm && vala_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-cppcheck
-		--disable-extra-c-warnings
-		$(use_enable nls)
-		--enable-utilslib
-		# Plugins
-		--enable-addons
-		--enable-autoclose
-		--enable-automark
-		--enable-codenav
-		--enable-commander
-		--enable-defineformat
-		--enable-geanyextrasel
-		--enable-geanyinsertnum
-		--enable-geanymacro
-		--enable-geanyminiscript
-		--enable-geanynumberedbookmarks
-		--enable-geanyprj
-		--enable-geanyvc $(use_enable gtkspell)
-		--enable-keyrecord
-		--enable-latex
-		--enable-lineoperations
-		--enable-lipsum
-		--enable-overview
-		--enable-pairtaghighlighter
-		--enable-pohelper
-		--enable-projectorganizer
-		--enable-sendmail
-		--enable-shiftcolumn
-		--enable-tableconvert
-		--enable-treebrowser
-		--enable-vimode
-		--enable-workbench
-		--enable-xmlsnippets
-		$(use_enable debugger)
-		$(use_enable ctags geanyctags)
-		$(use_enable !gtk3 geanydoc)
-		$(use_enable lua geanylua)
-		$(use_enable gpg geanypg)
-		$(use_enable python geanypy)
-		$(use_enable soup geniuspaste)
-		$(use_enable git gitchangebar)
-		$(use_enable markdown) --disable-peg-markdown # using app-text/discount instead
-		$(use_enable multiterm)
-		$(use_enable pretty-printer)
-		$(use_enable scope)
-		$(use_enable enchant spellcheck)
-		# Having updatechecker… when you’re using a package manager?
-		$(use_enable soup updatechecker)
-		# GeanyGenDoc requires ctpl which isn’t yet in portage
-		--disable-geanygendoc
-		# Require obsolete and vulnerable webkit-gtk versions
-		--disable-devhelp
-		--disable-webhelper
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-
-	# make installs all translations if LINGUAS is empty
-	if [[ -z "${LINGUAS-x}" ]]; then
-		rm -r "${ED}/usr/share/locale/" || die
-	fi
-}
diff --git a/dev-util/geany-plugins/geany-plugins-1.35.ebuild b/dev-util/geany-plugins/geany-plugins-1.35.ebuild
deleted file mode 100644
index dd3e32e86691..000000000000
--- a/dev-util/geany-plugins/geany-plugins-1.35.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 vala
-
-DESCRIPTION="A collection of different plugins for Geany"
-HOMEPAGE="https://plugins.geany.org"
-SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-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="
-	gtk3? ( !debugger !multiterm !python )
-	!gtk3? ( !markdown )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-DEPEND="
-	dev-libs/glib:2
-	>=dev-util/geany-1.35[gtk3=]
-	gtk3? ( x11-libs/gtk+:3 )
-	!gtk3? ( x11-libs/gtk+:2 )
-	ctags? ( dev-util/ctags )
-	debugger? ( x11-libs/vte:0 )
-	enchant? ( app-text/enchant:= )
-	git? ( dev-libs/libgit2:= )
-	gpg? ( app-crypt/gpgme:1= )
-	gtkspell? (
-		gtk3? ( app-text/gtkspell:3= )
-		!gtk3? ( app-text/gtkspell:2 )
-		)
-	lua? ( dev-lang/lua:0= )
-	markdown? (
-		app-text/discount
-		net-libs/webkit-gtk:4
-		)
-	multiterm? (
-		$(vala_depend)
-		>=x11-libs/vte-0.28:0
-		)
-	pretty-printer? ( dev-libs/libxml2:2 )
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/pygtk[${PYTHON_MULTI_USEDEP}]
-		')
-		${PYTHON_DEPS}
-		)
-	scope? (
-		gtk3? ( x11-libs/vte:2.91 )
-		!gtk3? ( x11-libs/vte:0 )
-		)
-	soup? ( net-libs/libsoup:2.4 )
-"
-RDEPEND="${DEPEND}
-	scope? ( sys-devel/gdb )
-"
-BDEPEND="virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	use multiterm && vala_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-cppcheck
-		--disable-extra-c-warnings
-		$(use_enable nls)
-		--enable-utilslib
-		# Plugins
-		--enable-addons
-		--enable-autoclose
-		--enable-automark
-		--enable-codenav
-		--enable-commander
-		--enable-defineformat
-		--enable-geanyextrasel
-		--enable-geanyinsertnum
-		--enable-geanymacro
-		--enable-geanyminiscript
-		--enable-geanynumberedbookmarks
-		--enable-geanyprj
-		--enable-geanyvc $(use_enable gtkspell)
-		--enable-keyrecord
-		--enable-latex
-		--enable-lineoperations
-		--enable-lipsum
-		--enable-overview
-		--enable-pairtaghighlighter
-		--enable-pohelper
-		--enable-projectorganizer
-		--enable-sendmail
-		--enable-shiftcolumn
-		--enable-tableconvert
-		--enable-treebrowser
-		--enable-vimode
-		--enable-workbench
-		--enable-xmlsnippets
-		$(use_enable debugger)
-		$(use_enable ctags geanyctags)
-		$(use_enable !gtk3 geanydoc)
-		$(use_enable lua geanylua)
-		$(use_enable gpg geanypg)
-		$(use_enable python geanypy)
-		$(use_enable soup geniuspaste)
-		$(use_enable git gitchangebar)
-		$(use_enable markdown) --disable-peg-markdown # using app-text/discount instead
-		$(use_enable multiterm)
-		$(use_enable pretty-printer)
-		$(use_enable scope)
-		$(use_enable enchant spellcheck)
-		# Having updatechecker… when you’re using a package manager?
-		$(use_enable soup updatechecker)
-		# GeanyGenDoc requires ctpl which isn’t yet in portage
-		--disable-geanygendoc
-		# Require obsolete and vulnerable webkit-gtk versions
-		--disable-devhelp
-		--disable-webhelper
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-
-	# make installs all translations if LINGUAS is empty
-	if [[ -z "${LINGUAS-x}" ]]; then
-		rm -r "${ED}/usr/share/locale/" || die
-	fi
-}
diff --git a/dev-util/geany-plugins/geany-plugins-1.36-r1.ebuild b/dev-util/geany-plugins/geany-plugins-1.36-r1.ebuild
deleted file mode 100644
index d893f9de3ae9..000000000000
--- a/dev-util/geany-plugins/geany-plugins-1.36-r1.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 vala
-
-DESCRIPTION="A collection of different plugins for Geany"
-HOMEPAGE="https://plugins.geany.org"
-SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
-
-IUSE="+gtk3 ctags debugger enchant git gpg gtkspell lua markdown multiterm nls pretty-printer python scope soup workbench"
-REQUIRED_USE="
-	gtk3? ( !multiterm !python )
-	!gtk3? ( !markdown )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-DEPEND="
-	dev-libs/glib:2
-	>=dev-util/geany-1.35[gtk3=]
-	gtk3? ( x11-libs/gtk+:3 )
-	!gtk3? ( x11-libs/gtk+:2 )
-	ctags? ( dev-util/ctags )
-	debugger? (
-		gtk3? ( x11-libs/vte:2.91 )
-		!gtk3? ( x11-libs/vte:0 )
-		)
-	enchant? ( app-text/enchant:= )
-	git? ( dev-libs/libgit2:= )
-	gpg? ( app-crypt/gpgme:1= )
-	gtkspell? (
-		gtk3? ( app-text/gtkspell:3= )
-		!gtk3? ( app-text/gtkspell:2 )
-		)
-	lua? ( dev-lang/lua:0= )
-	markdown? (
-		app-text/discount
-		net-libs/webkit-gtk:4
-		)
-	multiterm? (
-		$(vala_depend)
-		>=x11-libs/vte-0.28:0
-		)
-	pretty-printer? ( dev-libs/libxml2:2 )
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/pygtk[${PYTHON_MULTI_USEDEP}]
-		')
-		${PYTHON_DEPS}
-		)
-	scope? (
-		gtk3? ( x11-libs/vte:2.91 )
-		!gtk3? ( x11-libs/vte:0 )
-		)
-	soup? ( net-libs/libsoup:2.4 )
-	workbench? ( dev-libs/libgit2:= )
-"
-RDEPEND="${DEPEND}
-	scope? ( sys-devel/gdb )
-"
-BDEPEND="virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-PATCHES=( "${FILESDIR}"/${P}-libgit2-0.99.patch )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	use multiterm && vala_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-cppcheck
-		--disable-extra-c-warnings
-		$(use_enable nls)
-		--enable-utilslib
-		# Plugins
-		--enable-addons
-		--enable-autoclose
-		--enable-automark
-		--enable-codenav
-		--enable-commander
-		--enable-defineformat
-		--enable-geanyextrasel
-		--enable-geanyinsertnum
-		--enable-geanymacro
-		--enable-geanyminiscript
-		--enable-geanynumberedbookmarks
-		--enable-geanyprj
-		--enable-geanyvc $(use_enable gtkspell)
-		--enable-keyrecord
-		--enable-latex
-		--enable-lineoperations
-		--enable-lipsum
-		--enable-overview
-		--enable-pairtaghighlighter
-		--enable-pohelper
-		--enable-projectorganizer
-		--enable-sendmail
-		--enable-shiftcolumn
-		--enable-tableconvert
-		--enable-treebrowser
-		--enable-vimode
-		--enable-xmlsnippets
-		$(use_enable debugger)
-		$(use_enable ctags geanyctags)
-		$(use_enable !gtk3 geanydoc)
-		$(use_enable lua geanylua)
-		$(use_enable gpg geanypg)
-		$(use_enable python geanypy)
-		$(use_enable soup geniuspaste)
-		$(use_enable git gitchangebar)
-		$(use_enable markdown) --disable-peg-markdown # using app-text/discount instead
-		$(use_enable multiterm)
-		$(use_enable pretty-printer)
-		$(use_enable scope)
-		$(use_enable enchant spellcheck)
-		# Having updatechecker… when you’re using a package manager?
-		$(use_enable soup updatechecker)
-		$(use_enable workbench)
-		# GeanyGenDoc requires ctpl which isn’t yet in portage
-		--disable-geanygendoc
-		# Require obsolete and vulnerable webkit-gtk versions
-		--disable-devhelp
-		--disable-webhelper
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-
-	# make installs all translations if LINGUAS is empty
-	if [[ -z "${LINGUAS-x}" ]]; then
-		rm -r "${ED}/usr/share/locale/" || die
-	fi
-}
diff --git a/dev-util/geany-plugins/geany-plugins-1.36-r2.ebuild b/dev-util/geany-plugins/geany-plugins-1.36-r2.ebuild
index 9c2a97394909..854fb5782672 100644
--- a/dev-util/geany-plugins/geany-plugins-1.36-r2.ebuild
+++ b/dev-util/geany-plugins/geany-plugins-1.36-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+KEYWORDS="amd64 arm ppc ppc64 ~sparc x86"
 
 IUSE="+gtk3 ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope soup workbench"
 REQUIRED_USE="!gtk3? ( !markdown )"
diff --git a/dev-util/geany-plugins/metadata.xml b/dev-util/geany-plugins/metadata.xml
index 682ca11a03c8..6a11d0ae3243 100644
--- a/dev-util/geany-plugins/metadata.xml
+++ b/dev-util/geany-plugins/metadata.xml
@@ -11,18 +11,12 @@
 	</maintainer>
 	<use>
 		<flag name="gtk3">Use GTK+3 instead of GTK+2</flag>
-		<flag name="autoclose">Enable the autoclose plugin.</flag>
-		<flag name="automark">Enable the automark plugin</flag>
-		<flag name="commander">Enable the commander plugin which provides a command panel for rapid access to any action.</flag>
 		<flag name="ctags">Enable ctags plugin</flag>
 		<flag name="debugger">Enable the debugger plugin which interfaces with <pkg>sys-devel/gdb</pkg></flag>
-		<flag name="defineformat">Enable the defineformat plugin.</flag>
 		<flag name="enchant">Enable spell checking using enchant</flag>
 		<flag name="gpg">Enable geanypg plugin which integrates GPG using <pkg>app-crypt/gpgme</pkg></flag>
 		<flag name="gtkspell">Use gtkspell for dictionary support in GeanyVC</flag>
 		<flag name="markdown">Enable the markdown plugin</flag>
-		<flag name="multiterm">Enable the multiterm plugin</flag>
-		<flag name="overview">Enable overview plugin</flag>
 		<flag name="pretty-printer">Enable pretty-printer plugin</flag>
 		<flag name="scope">Enable the scope plugin which is a graphical GDB front-end</flag>
 		<flag name="soup">Enable updatechecker and geniuspaste plugins which require <pkg>net-libs/libsoup</pkg></flag>
diff --git a/dev-util/geany/Manifest b/dev-util/geany/Manifest
index 0d952b7bc6a3..8d043cff3aa3 100644
--- a/dev-util/geany/Manifest
+++ b/dev-util/geany/Manifest
@@ -1,10 +1,4 @@
-DIST geany-1.30.1.tar.bz2 4352154 BLAKE2B 6efceb21e07aba3b0698196543746e926d6a73ef5d5f560467eee18a7b9ade4ce0ce37808176922b3399ea8a72b2f281af313a9f57aa325e1a9cb964f0f1c34e SHA512 55fb446b0c517ccee4d2f3023334b96a336788422a4dc41207a4f290c5d4b88df1eefa4b7f6fddf0567224f890ae7bea396306a935512f17e01682034f7200e3
-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 1489 BLAKE2B f0784cdb5dfd21690102b6846b61da6d8660c8c9bbf634faa734ad50edbc9105007cc18db0bec86a166ec9dce4e992cfb35b1ee18052fa32a59e29f79a4f7136 SHA512 fb82ed450b0fae73dfd7051eaf8d260a74f0276c72fa4a68d72ac96cd5a8d61491bf7dec395b3e77fe2c8aecd53ed4c0813c9b807ed57b8d9071e717c6992cdc
-EBUILD geany-1.34.1.ebuild 1680 BLAKE2B 2dc3754c1e7aa9cfe0e9a809f3b6b0ef72af9a33f3593bca1a859f52bbc848c7022ae5decca4a4119f6d8462f3b4ec2880e3212d6074df234bb8bd9a38e9a962 SHA512 2e202c6d74b6aae785b2a1a62ccd53ffbc7f030a4e2246efdb8b8706ffc9e1b0f1a6d5e47316e3ededd4dd5a9d602b4501f35e8697525e315737f415c7c06e3d
-EBUILD geany-1.35.ebuild 1684 BLAKE2B d7189974c07cd414eb5ccf9643166827b8e54198a3ece8bba836c5881664cfcd6518c5f9e4cacdd56c75559579aba7dda204c8766ece74c6bc14e1921d4d4180 SHA512 0f9a0c235765833d275ee3d100eb38dcc9272de31ef1f142fb6c0ebdff70ac6205201353fc84ffbbe3fedf877b735d937fecdf83178a42bfd3a062cd1960ffed
-EBUILD geany-1.36.ebuild 1696 BLAKE2B 0bcc4976766c82e966a30072cd4fa453f09b509b90a4d6ed6a7dbc7408a06b604f8b2363ea99ca014ce9e1285644961e0363be6b7823d06485c3b77aeec05422 SHA512 f965f0aa0ec721fe2168847136b8f010f4de2e2f5bb74382c4c9302f8e738f82bae4d59169c5a0265f450078cecca88038cd23cb7929e32a3f352dab8f4ca711
+EBUILD geany-1.36.ebuild 1690 BLAKE2B 5ce4cc4e24de8e0e8aa738912558fadd6aba5e5d7d9588d412ab941bfa16497d78450d1aaf5244ff8af65b2eb77adb01e2e19d82ef72471af2e68bfd9b17f31d SHA512 29f31f63d8187082d9d4be721ff96774380e7196b342dd1d9fd25be7b7e39a37bd93bc9b6d2d14e0fa2f3012433d3f68a72e7637797dbe1e44234d003795ac98
 EBUILD geany-9999.ebuild 1684 BLAKE2B d7189974c07cd414eb5ccf9643166827b8e54198a3ece8bba836c5881664cfcd6518c5f9e4cacdd56c75559579aba7dda204c8766ece74c6bc14e1921d4d4180 SHA512 0f9a0c235765833d275ee3d100eb38dcc9272de31ef1f142fb6c0ebdff70ac6205201353fc84ffbbe3fedf877b735d937fecdf83178a42bfd3a062cd1960ffed
 MISC metadata.xml 1978 BLAKE2B 04d6567b9c02f927e912c8d35bdea73c8015dcc4a6c7f47d91b50086c619e2e25a472170f46a4d1053cb942a33d66f85da1e837bc7f4397678534702cef964fd SHA512 f070310d9266a11c4b91c4f644534f3ff9d7538c2d97e6daa009d403cb2c8aae2856ed51646315906a51399b6e51a1f32fbd12f5ab616b597c4fc7c97c5f5152
diff --git a/dev-util/geany/geany-1.30.1.ebuild b/dev-util/geany/geany-1.30.1.ebuild
deleted file mode 100644
index 3786c41ed1cd..000000000000
--- a/dev-util/geany/geany-1.30.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils fdo-mime gnome2-utils ltprune
-
-LANGS="ar ast be bg ca cs de el en_GB es et eu fa fi fr gl he hi hu id it ja kk ko lb lt mn nl nn pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN ZH_TW"
-NOSHORTLANGS="en_GB zh_CN zh_TW"
-
-DESCRIPTION="GTK+ based fast and lightweight IDE"
-HOMEPAGE="https://www.geany.org"
-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"
-IUSE="gtk3 +vte"
-
-RDEPEND=">=dev-libs/glib-2.32:2
-	!gtk3? (
-		>=x11-libs/gtk+-2.24:2
-		vte? ( x11-libs/vte:0 )
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3
-		vte? ( x11-libs/vte:2.91 )
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/intltool
-	sys-devel/gettext"
-
-pkg_setup() {
-	strip-linguas ${LANGS}
-}
-
-src_prepare() {
-	default
-
-	# Syntax highlighting for Portage
-	sed -i -e "s:*.sh;:*.sh;*.ebuild;*.eclass;:" \
-		data/filetype_extensions.conf || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable gtk3) \
-		$(use_enable vte)
-}
-
-src_install() {
-	emake DESTDIR="${D}" DOCDIR="${ED}/usr/share/doc/${PF}" install
-	rm -f "${ED}"/usr/share/doc/${PF}/{COPYING,GPL-2,ScintillaLicense.txt}
-	prune_libtool_files --all
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/geany/geany-1.34.1.ebuild b/dev-util/geany/geany-1.34.1.ebuild
deleted file mode 100644
index dee55101743f..000000000000
--- a/dev-util/geany/geany-1.34.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils gnome2-utils xdg-utils
-
-LANGS="ar ast be bg ca cs de el en_GB es et eu fa fi fr gl he hi hu id it ja kk ko lb lt mn nl nn pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN ZH_TW"
-NOSHORTLANGS="en_GB zh_CN zh_TW"
-
-DESCRIPTION="GTK+ based fast and lightweight IDE"
-HOMEPAGE="https://www.geany.org"
-if [[ "${PV}" = 9999* ]] ; then
-	inherit autotools git-r3
-	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"
-fi
-LICENSE="GPL-2+ HPND"
-SLOT="0"
-
-IUSE="+gtk3 +vte"
-
-RDEPEND=">=dev-libs/glib-2.32:2
-	!gtk3? (
-		>=x11-libs/gtk+-2.24:2
-		vte? ( x11-libs/vte:0 )
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3
-		vte? ( x11-libs/vte:2.91 )
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/intltool
-	sys-devel/gettext"
-
-pkg_setup() {
-	strip-linguas ${LANGS}
-}
-
-src_prepare() {
-	default
-
-	# Syntax highlighting for Portage
-	sed -i -e "s:*.sh;:*.sh;*.ebuild;*.eclass;:" \
-		data/filetype_extensions.conf || die
-
-	if [[ ${PV} = *_pre* ]] || [[ ${PV} = 9999* ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-html-docs
-		--disable-pdf-docs
-		$(use_enable gtk3)
-		$(use_enable vte)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/dev-util/geany/geany-1.35.ebuild b/dev-util/geany/geany-1.35.ebuild
deleted file mode 100644
index f8bb6955d661..000000000000
--- a/dev-util/geany/geany-1.35.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# eutils required for strip-linguas
-inherit eutils xdg
-
-LANGS="ar ast be bg ca cs de el en_GB es et eu fa fi fr gl he hi hu id it ja kk ko lb lt mn nl nn pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN ZH_TW"
-NOSHORTLANGS="en_GB zh_CN zh_TW"
-
-DESCRIPTION="GTK+ based fast and lightweight IDE"
-HOMEPAGE="https://www.geany.org"
-if [[ "${PV}" = 9999* ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/geany/geany.git"
-else
-	[[ "${PV}" == *_pre* ]] && inherit autotools
-	SRC_URI="https://download.geany.org/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-LICENSE="GPL-2+ HPND"
-SLOT="0"
-
-IUSE="+gtk3 +vte"
-
-RDEPEND=">=dev-libs/glib-2.32:2
-	!gtk3? (
-		>=x11-libs/gtk+-2.24:2
-		vte? ( x11-libs/vte:0 )
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3
-		vte? ( x11-libs/vte:2.91 )
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/intltool
-	sys-devel/gettext"
-
-pkg_setup() {
-	strip-linguas ${LANGS}
-}
-
-src_prepare() {
-	xdg_src_prepare #588570
-
-	# Syntax highlighting for Portage
-	sed -i -e "s:*.sh;:*.sh;*.ebuild;*.eclass;:" \
-		data/filetype_extensions.conf || die
-
-	if [[ ${PV} = *_pre* ]] || [[ ${PV} = 9999* ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-html-docs
-		--disable-pdf-docs
-		$(use_enable gtk3)
-		$(use_enable vte)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/dev-util/geany/geany-1.36.ebuild b/dev-util/geany/geany-1.36.ebuild
index 9e7bd814556a..c9a5abee51e9 100644
--- a/dev-util/geany/geany-1.36.ebuild
+++ b/dev-util/geany/geany-1.36.ebuild
@@ -17,7 +17,7 @@ if [[ "${PV}" = 9999* ]] ; then
 else
 	[[ "${PV}" == *_pre* ]] && inherit autotools
 	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/glade/Manifest b/dev-util/glade/Manifest
index 273dd5de2def..fa88f305edac 100644
--- a/dev-util/glade/Manifest
+++ b/dev-util/glade/Manifest
@@ -2,5 +2,5 @@ AUX glade-3.14.1-doc-version.patch 853 BLAKE2B b7cad3cc9d49cfe24189ba21bffaec2c5
 DIST glade-3.22.1.tar.xz 3592952 BLAKE2B 53f769198a093ff5d4dc98bb4ea98c6e5195933caf24247a99db980312ae3398fca3abbd640d08c02e8fb5f8647ee3e4b18e65073b1500e9017ee0586993a331 SHA512 e1bdc49b89bc5010c0abf6357dbae05c921182655b2ee5a4b161af6adfd596cfbcd495c9851ba956abbf3d6156616a6c0e94640cd72cee11551ca388674ac908
 DIST glade-3.22.2.tar.xz 3550008 BLAKE2B e1217e221b36938937c57ae465a3707eeadc52bc9127b3af2fb6514e572676e3e284811d5332876dce110fd321e2bb33b9ac8b0afbd97dd747725eb73309dc15 SHA512 cb82684423ae055bc8e84a8705529ecdc72957563f444633c2c5c24a922130de84c212537323b6ed259f0e29349b52dff608822610b87babb8fc3cb468a5f4b0
 EBUILD glade-3.22.1-r1.ebuild 2340 BLAKE2B 1e331215e2808e90e8a92e719f7903b8f4c41966c9abb55b188cd7a56d00763722da09ad703498d947f3db9ee95da64b7942c40abe946d7da898783232b1e176 SHA512 94409f97bb91fd56bdfe3c2113d61810f03fbf1a4e601935cd96ff0b467992b86af86919b642a4062ac6615def2a49e5e4094a215f2a8ce092e0883a670e9fd1
-EBUILD glade-3.22.2.ebuild 2322 BLAKE2B a8ccc620c4569335eb7a3b79c03c44371538d4549d7203f4584d7f12d64a7740729d0f8e883c246e0286fb9ff695ba6b21ec8cf66522fa8449378d49e66140ee SHA512 75a56e1540477c84bbffc6e38f2e96b4f0ca84ff216d2943e1f5f6a41e62b0aa28c0409c908b5b673f8d0bbfaad78cddaae4ff7a871be25a957032b710338d3c
+EBUILD glade-3.22.2.ebuild 2317 BLAKE2B 03b5add2c6eacda7c9ffec6ab9150d1fc00cb8415679c482809bb611a1685c79a97a76ad86101c8613524e3004e49dcdd90f5cb02cbdc02c75cc8be73a32fd18 SHA512 5b44e08bb53b2c2dd4e67091cd4cb1b2ba293c20bd2bc7e1bff815f6b82c808cae11bfde1c361357af3cdc0bc04798c3d5fc1ce5189c29d6301d924a3a35a137
 MISC metadata.xml 358 BLAKE2B 33f3b46ab877b311931205095fb2b357fe7fe2da8820944d32e8a16f2dbcf99033f95a17f4cefa4aa6d0f731c72d0f65683a8cc3b947ebf09d084f92e796f887 SHA512 8840ebde12f26a2caf856e75f3f706e3c9a7a7a771d0deeae99ca6b16f4bbeaf119bae7776a8a0bef8b7422f52ebd6498a8b5e862af4548886249386dcb44480
diff --git a/dev-util/glade/glade-3.22.2.ebuild b/dev-util/glade/glade-3.22.2.ebuild
index 55d4695620e4..6d592e23d8c8 100644
--- a/dev-util/glade/glade-3.22.2.ebuild
+++ b/dev-util/glade/glade-3.22.2.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 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~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 547c93627617..ef08e4f8da72 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -4,6 +4,6 @@ DIST glib-2.62.6.tar.xz 4703424 BLAKE2B 0a27245be2575c574dcc730dd051a8c284f421db
 DIST glib-2.64.1.tar.xz 4758548 BLAKE2B 5585d23fee28d7c32b1bb9e1defbc31ba469aa259e3c328760d1e702d98706cf251bfb50b5e2aed37b2cdfa6ab4319372ddcd0a9937c97a2614741b504af17a5 SHA512 1cefe49a42233f24ac6bd09c134ceea7119f4f74f42204a731be56100a180eec69c8224674f0b08d1538ad0859896ed08260a6af0fed469c7d10b4508116a6bc
 EBUILD glib-utils-2.60.7.ebuild 2390 BLAKE2B 1b5593fbfae292b25bf6131c5535f9133dff55d3e63089f5074c78bd8736e510220f277720c081ac7767ffff85e2393da4a8e0e127b13821e5f7fc5bd7d6c24b SHA512 3783dc9671c78d5aeab4fde397ac82654d63875b98e59bfd10cf0fe58fe392c76ebb2ef6d52cca9cdcdba84f600d6627912fdf2e2f7dd5b52b840fe67df199d3
 EBUILD glib-utils-2.62.5.ebuild 2399 BLAKE2B 68065e66c639d695af972944e37e40eb633c6b7033d9d6d4f032f5c016017529cda1ea8d1e264dcaaa6ebdf0c3c2c643b59dae936b87f787c68703f1bb560526 SHA512 15730dd4f08903d49d4c462eb045b557b5c237e581699fcd9253199dc1c953415552dc908e110c701d7ef1803e336a25547509ba15c8bcd95ce8515e1d5914d7
-EBUILD glib-utils-2.62.6.ebuild 2399 BLAKE2B 68065e66c639d695af972944e37e40eb633c6b7033d9d6d4f032f5c016017529cda1ea8d1e264dcaaa6ebdf0c3c2c643b59dae936b87f787c68703f1bb560526 SHA512 15730dd4f08903d49d4c462eb045b557b5c237e581699fcd9253199dc1c953415552dc908e110c701d7ef1803e336a25547509ba15c8bcd95ce8515e1d5914d7
+EBUILD glib-utils-2.62.6.ebuild 2394 BLAKE2B c4ed537a342494830318ef9b76e2d5ad3841609c0851930eb7ec7da2071f1e061abd1e4aac8ec437d321a731bb9fdf0c3bec5db63ed3c0c2d98b423483f3504a SHA512 77d7125bd123a01fe32ed9ebf3fe8e13a4fcaa4082fad5b1672fec61d1ef85d4cbdf59d4620da5f7159fdb9d66a6e36733bcbbfbaac54f91c1252081ac6fa143
 EBUILD glib-utils-2.64.1.ebuild 2399 BLAKE2B 68065e66c639d695af972944e37e40eb633c6b7033d9d6d4f032f5c016017529cda1ea8d1e264dcaaa6ebdf0c3c2c643b59dae936b87f787c68703f1bb560526 SHA512 15730dd4f08903d49d4c462eb045b557b5c237e581699fcd9253199dc1c953415552dc908e110c701d7ef1803e336a25547509ba15c8bcd95ce8515e1d5914d7
 MISC metadata.xml 332 BLAKE2B 1e3c081ae9a2c8ae53cee6c3ae133cbd5e8543a68c03d4a4f7e164437502d996ea9364789e93114687271e1f472bcf13a418cca5b74ecb95a51849f0a5f3dafa SHA512 f7680d9be4071b841f50ece99b5041dc492901d84ae05383c1ff05b6a73bab804b153a50eb70f5417137f6e2041230c5ba8eaede10f7a0bf8a899508642588c6
diff --git a/dev-util/glib-utils/glib-utils-2.62.6.ebuild b/dev-util/glib-utils/glib-utils-2.62.6.ebuild
index 0dd0c2ddd686..01ebbea72a6a 100644
--- a/dev-util/glib-utils/glib-utils-2.62.6.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.62.6.ebuild
@@ -15,7 +15,7 @@ SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~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/gn/Manifest b/dev-util/gn/Manifest
index 916effe0d626..77125ef45759 100644
--- a/dev-util/gn/Manifest
+++ b/dev-util/gn/Manifest
@@ -3,5 +3,5 @@ AUX gn-gen-r4.patch 1559 BLAKE2B b92f487d4153ebd885d9cb1ca6889ca52b5afcccdb9a781
 DIST gn-0.1463.tar.gz 905571 BLAKE2B e048e642704533d478fb751748a97f60283f63868ab1ab6fa5b8e7bc0322745cf21464eaa16194f684869b50f306668d3c7d3b4f72c3985b865d8492d1ff0901 SHA512 f32861a8fa44034b932e6aae4787fd7da6e4c6c19c5b6919de7b0d0f1ba20f415c1c55db95a08958a338b7b9de740ff49a29ab894a9c4e9049a89450d8c88281
 DIST gn-0.1726.tar.xz 663480 BLAKE2B 26920a1594e9cc664293efaeaa8725568b78ecc1f2ac8c9a3cd27333e5fe89f1fa5bdee9e42c408f3c4a7cfb630e79220926c5694e31131d3e7627be49b5d6b2 SHA512 3e93ba02f251386c4aa320a45b8a045c2a1fa686a8f170455f3c06bb25b1a628c44530ae2e56bcbb2ff4b2a84dd065d54dde90955a55a325a8d219acce69ec2f
 EBUILD gn-0.1463.ebuild 1034 BLAKE2B b415c7f196a387de4d3460b9b56f4546a76da2c400d246d14cb9e56ca2eb30c3aa8647b5f58ba73c51f7be41793fd799ffc0152a70f81d47c40407eb2e9756f7 SHA512 8a02e407c0a6b78107932705df99ffc1d8180f66f5d3e23ef3c3121d6d42434ba176012ede5ef1b21d47a3a3bda61578af7165d177c4f8d5b1350af0f57a1790
-EBUILD gn-0.1726.ebuild 1263 BLAKE2B 45c9eca5d2bc2055effbaeb96b505bfa8a1049ba9a8fdc8f20be6d62cb8beaf69bd7dd367a2906b10f47d2803aae1ee7bfde251f9260fe96958b3c6e8f338848 SHA512 ac112856fb7bbe85a3dbb8af9b9e84a0ed87bb657d0bf95116962e666a7e8c23218889c59bc3e3621721ded93dd855e0d3839031ffcbc1ba1ba37c9bbc576115
+EBUILD gn-0.1726.ebuild 1270 BLAKE2B 8a05998ac966690b9411f6bba746ad737a0d9acc6577cb51d0ce14811c35f7bb1b827c107ee6daf5dcb6d0c7a282634cd3f64c0c1e641dfa9c41f131976f1c8f SHA512 9c9e946b3c706a5fa140df781346b87cbfadc9cd934f71bfe00680eebbb38c22a13a3981194f8ec5584dcc1593db816ef4daad7590c386f317a3a473650b36f0
 MISC metadata.xml 220 BLAKE2B da4da8d60764ec3b2181bd9ea602d6e3cf830e73e05b09fe8984f147215a2082b030e402c21098ad33de4b3621d1cbc1328bd52f4f9c32d6b0485773251b1d77 SHA512 a1e65cd8b02b8ffb12754e5d12dfd44ad9973de7c61ec867f1454e79563519182baae7d10cee3488622bbba8636fc7a6dca5806208f204a9b66df8436e3cd696
diff --git a/dev-util/gn/gn-0.1726.ebuild b/dev-util/gn/gn-0.1726.ebuild
index 2baaf308ab77..bc331966cc31 100644
--- a/dev-util/gn/gn-0.1726.ebuild
+++ b/dev-util/gn/gn-0.1726.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="vim-syntax"
 
 BDEPEND="
diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest
index f2513f3956d0..16769bde7618 100644
--- a/dev-util/gnome-builder/Manifest
+++ b/dev-util/gnome-builder/Manifest
@@ -1,11 +1,5 @@
-AUX 3.32.4-optional-vala.patch 898 BLAKE2B ed1ed208eb7b38a2dacee42e0e699c605c8632e12ac1f48b0077a6af18725f8792653317f9c86580056f58e1de645b8b7320c30353fa0f1e3e126066e2afac66 SHA512 a848963d5f3680c995e5342900b987a6481ab26c2650fdd365a0a580814e821a914a10c4481df16f010940c51b0f72868dbb660be955d9a19aa7c7cfca1f7900
 AUX 3.34.1-optional-vala.patch 1249 BLAKE2B dcec506c976b6438cec14d941b911cdc11fe0941c4a1a1590e6069fc42dcf12d6e76fedcc0b356e2ac6e5f4558851bb041fa3de4b54d7d9161cf2232965ead21 SHA512 e037dddb89330807c48228600d43ef34569e9fbfbb4b75b9ca2561d7d5ee25d1953ea94afb85ee3555eeefdd3105cd402c2b231584ae241ba661ca0ced28c046
-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
 DIST gnome-builder-3.34.1-patchset.tar.xz 44680 BLAKE2B 91e91ac8d0fcf6b54d32ce9f1dc209ac22db790a29d724dad20e337fe1962f3d407b59e7f976f1e88277833849c962a470346bb5a308e39b637e6e9ca1dc2c2a SHA512 a114346b093976db227087743a7bbe2ca9523b64a67c95729bfeb7c3c346b3bfb4d02f5e11d36bbbaf506bc7a7f140883bdea7c78407243287bc400dfda43b57
 DIST gnome-builder-3.34.1.tar.xz 11974748 BLAKE2B c34a31c50b327d02632ff18d48ad59f925306901e8874e0c7811b9258c56027403de0d9dc1877c696d96037bdfcdcc27f56f59a41d232e47b330382b1dbf67e9 SHA512 886c732f20563818dcf1deb96d4277fe96a9499b999cfbc7a64286e816e9a36bb978932d36a1e764b54c2d36891b7546fa058f51e036b0fa101c0872f4ce51d8
-EBUILD gnome-builder-3.30.3-r1.ebuild 7089 BLAKE2B d6bbc1128f8575e1d9435c1c147762374743a187347bad7aecaffe3757359991e1d581c2b407f6fbb7edb4c51b29db32470ed7ed8f7dc2a5023cac891dd1a43b SHA512 3b3c214ff96705f21724a29e3766352327acf21953fce4f5ef81a5ab089adc6c29e3b4e0c64716a7f2f1bf6997b434544fc8301ead43faa216e3bdc97bf621a0
-EBUILD gnome-builder-3.32.4-r1.ebuild 7199 BLAKE2B 811cad7dd28146b856faa9ff0eaba8783842ca268812cd20960f6137ebfad6579553c61ebb869a0f6a39b74d7984f8a19f74ed1eae00a2b2f80b787590db577c SHA512 348293ca77e48692004b81e61823c6e56cd767957ba24614a8663e80a5ad86fbfbeb4b8e1cfedbd7450a5b96a6e3e2ee02e749506cdc1b4dbfd0b48a188b20ae
-EBUILD gnome-builder-3.34.1-r1.ebuild 7304 BLAKE2B 17bed51dd94a33b312cb0b80ebf8c08184fe4f104bf425ecf3e3f7c3546dbbbb30a04289bd2aef8f6d3135f10131b67894647d658831dffba09a68d3703b3b2a SHA512 a43243dc6bd2a9fbf604cc5d6023554fcc5aa6cd8f86b5a9063306972771ab10bde4cd9259d965b3361d46924c93233d04ad2ddaf9041e01a14b2c92c346c237
-MISC metadata.xml 1212 BLAKE2B 83f431217b3d0b759597a250e40902979fde0a130e5666427824fe3d48fb05120dd596a8f0292ad23373c00bb8bd807cac667ae51f9a996b0275fbb6039084af SHA512 828803d2518b1684db6f0076e4aa851614682198722c67298ee8e73c29726fdae808d1ee17626d15559a9f6fd28d1abb6f651c39fc59de9c233081ba925d826d
+EBUILD gnome-builder-3.34.1-r1.ebuild 7302 BLAKE2B c001877f4e55af030a7c4d8f83852289c8a6e877643dd642109eb87a24a1d997ad330ef83d1a237c849b2b959f856edcbfb8b340b60567e391682d25ee2d7ffb SHA512 7976f1e62f6009f5de1f1438d954f57a4bc7de2b85c3cbf5e778448d9b3997805f70f845d0fe92c98cc7668cd8868157059141bbb33e9676b8426cfadd2b4552
+MISC metadata.xml 1085 BLAKE2B 0b2bdcfec562b85e54880c819a0345c2aedf4f8b1c0bc34b7b4e3e8551697dcbb3ed93da1e016f3a164bb677459e8d628ba943252e51e842152282c3757f0232 SHA512 58890d32c2d04d63eaae8489ea68054ffc50df5bf9970af6b159b2dfbc99b8ed2d2db80aa29907463c137caf5eb8aa129c1470d1e19ccbf398ff8789f7f63987
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
deleted file mode 100644
index b31ee886eae6..000000000000
--- a/dev-util/gnome-builder/files/3.32.4-optional-vala.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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.30.3-r1.ebuild b/dev-util/gnome-builder/gnome-builder-3.30.3-r1.ebuild
deleted file mode 100644
index 7dce5bd51dfe..000000000000
--- a/dev-util/gnome-builder/gnome-builder-3.30.3-r1.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-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"
-
-# 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 +git gtk-doc sysprof test vala webkit"
-RESTRICT="!test? ( test )"
-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.
-# 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: with_flatpak needs flatpak.pc >=0.8.0, ostree-1, libsoup-2.4.pc >=2.52.0 and ${LIBGIT_DEPS}
-# 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
-
-# These are needed with either USE=git or USE=flatpak (albeit the latter isn't supported yet)
-LIBGIT_DEPS="
-	dev-libs/libgit2[ssh,threads]
-	>=dev-libs/libgit2-glib-0.25.0[ssh]
-"
-# TODO: Handle llvm slots via llvm.eclass; see plugins/clang/meson.build
-RDEPEND="
-	>=dev-libs/libdazzle-3.30.2[introspection,vala?]
-	>=dev-libs/glib-2.58.0:2
-	>=x11-libs/gtk+-3.24.0:3[introspection]
-	>=x11-libs/gtksourceview-4.0.0:4[introspection]
-	>=dev-libs/json-glib-1.2.0
-	>=dev-libs/jsonrpc-glib-3.30.1[vala?]
-	>=x11-libs/pango-1.38.0
-	>=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[vala?]
-	>=dev-libs/libxml2-2.9.0
-	git? ( ${LIBGIT_DEPS} )
-	dev-libs/libpcre:3
-	webkit? ( >=net-libs/webkit-gtk-2.12.0:4=[introspection] )
-
-	>=dev-libs/gobject-introspection-1.48.0:=
-	$(python_gen_cond_dep '
-		>=dev-python/pygobject-3.22.0:3[${PYTHON_MULTI_USEDEP}]
-	')
-	${PYTHON_DEPS}
-	clang? ( sys-devel/clang:= )
-	devhelp? ( >=dev-util/devhelp-3.25.1:= )
-	sysprof? ( >=dev-util/sysprof-3.30.2[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
-# TODO: runtime ctags path finding..
-# FIXME: spellcheck plugin temporarily disabled due to requiring enchant-2
-#	>=app-text/gspell-1.2.0
-#	>=app-text/enchant:2
-
-# 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
-DEPEND="${RDEPEND}
-	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.47.1
-	>=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
-
-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=(
-		-Denable_tracing=false
-		-Denable_profiling=false # not passing -pg to CFLAGS
-		-Dfusermount_wrapper=false # meant for flatpak builds
-		-Dwith_tcmalloc=false
-		-Dwith_channel=other
-		-Dwith_editorconfig=true # needs libpcre
-		$(meson_use webkit with_webkit)
-		$(meson_use vala with_vapi)
-		$(meson_use doc with_help)
-		$(meson_use gtk-doc with_docs)
-
-		-Dnetwork_tests=false
-		$(meson_use clang with_clang)
-		$(meson_use devhelp with_devhelp)
-		-Dwith_deviced=false
-		-Dwith_flatpak=false
-		$(meson_use git with_git)
-		$(meson_use webkit with_html_preview)
-		-Dwith_spellcheck=false # TODO: requires enchant-2
-		$(meson_use sysprof with_sysprof)
-		$(meson_use vala with_vala_pack)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	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_icon_cache_update
-	gnome2_schemas_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-	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/gnome-builder-3.32.4-r1.ebuild b/dev-util/gnome-builder/gnome-builder-3.32.4-r1.ebuild
deleted file mode 100644
index 2101d6527e85..000000000000
--- a/dev-util/gnome-builder/gnome-builder-3.32.4-r1.ebuild
+++ /dev/null
@@ -1,188 +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,8} )
-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
-	>=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:=
-	$(python_gen_cond_dep '
-		>=dev-python/pygobject-3.22.0:3[${PYTHON_MULTI_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:0/0[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 )
-	gtk-doc? ( dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.3 )
-	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/gnome-builder-3.34.1-r1.ebuild b/dev-util/gnome-builder/gnome-builder-3.34.1-r1.ebuild
index db914cde14e8..72012390162f 100644
--- a/dev-util/gnome-builder/gnome-builder-3.34.1-r1.ebuild
+++ b/dev-util/gnome-builder/gnome-builder-3.34.1-r1.ebuild
@@ -16,7 +16,7 @@ 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"
+KEYWORDS="amd64 x86"
 IUSE="clang +devhelp doc +git +glade gtk-doc spell sysprof test vala"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-util/gnome-builder/metadata.xml b/dev-util/gnome-builder/metadata.xml
index efeddd2652d2..e1647c887759 100644
--- a/dev-util/gnome-builder/metadata.xml
+++ b/dev-util/gnome-builder/metadata.xml
@@ -13,6 +13,5 @@
 	<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>
 </use>
 </pkgmetadata>
diff --git a/dev-util/gnome-devel-docs/Manifest b/dev-util/gnome-devel-docs/Manifest
index 0ab48ff85010..b69591dffa76 100644
--- a/dev-util/gnome-devel-docs/Manifest
+++ b/dev-util/gnome-devel-docs/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-devel-docs-3.30.2.tar.xz 10270272 BLAKE2B 762ffdb17b0538bbb93f7a8752c060a629437f685df8e4fcc1c296d0db4fbb33dfc7839504eac187237f50d9748b5d7ea45d0e55db74db8cef76daf01b5e997f SHA512 7479c999bffba72d7b815b6081142d0549e9e407939c9ff16b6f04cff2517231614c43050313d49894fec31e0e1777379505f66cbea2da5a2644a147dd95846d
 DIST gnome-devel-docs-3.32.1.tar.xz 10281104 BLAKE2B 8f1c49a7829588b3c7e82b5d1c25f34506f8dc0470b4402e2f4f7be1420d6f314f9a88088afc2d5860d34e3c5029c3f129220c9a83a46621bdb2a877f83dfccc SHA512 57cd312aa43f529e4b2cc862a3cf1e3d6dd67baa145d4a3119227a18ff3a7db67aaf0d641e736d0362dda72ab274bdb701f73b8b309c3ba013b843d217d94604
-EBUILD gnome-devel-docs-3.30.2.ebuild 656 BLAKE2B 63b9eaa85a8357d3f024dbcc278f5cf526b28ed40635071659d29eb9031238f007d3c52f73915461a3b1cfbd699b01e28001ffaddec7a02a64ff9b30a7177503 SHA512 a162f4daaca17f2930dec1b82737c8c25cdb95593503ddf2ef6a33a629e3cfdbf27e4318507a4d988c6b40cf3e9c73dc55847c425186f732fa62c9dcfb112f18
-EBUILD gnome-devel-docs-3.32.1.ebuild 658 BLAKE2B e67fc8accf3e3dcf0e0f0e12fd3599765972c6477a6e8b2c7cc21293e12668aac195c474b4134d79cfdbdd7976f1a21e23fe9941ba3899e753c99913edd9b18a SHA512 d7d8dddc94667b362cd09e7410b4962fe99859b5684c1d66c743fe61e09a7d9a685d9153e1fdfe40414b405e018cfb7b91bc59bcae42c4ea62fef8c7cc4c7148
+EBUILD gnome-devel-docs-3.32.1.ebuild 656 BLAKE2B 5ee7adc63c8330cf71ef5989283e44389cda94e665df91b3796d4483fbe92b8369b93d3a0df58c2f20d8c6d46e63a65310309b15003809657e29921c83c9e57e SHA512 267601add744eeb41cdb0c2819a76d4ca3941c75c4a54f214987f4188026c1d715b70bff7eb22549711a443e07db3b7afe071603bc0d3ee55d6632bd030f0e47
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gnome-devel-docs/gnome-devel-docs-3.30.2.ebuild b/dev-util/gnome-devel-docs/gnome-devel-docs-3.30.2.ebuild
deleted file mode 100644
index b718fdc8158b..000000000000
--- a/dev-util/gnome-devel-docs/gnome-devel-docs-3.30.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Documentation for developing for the GNOME desktop environment"
-HOMEPAGE="https://developer.gnome.org/"
-
-LICENSE="FDL-1.1+ CC-BY-SA-3.0 CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/docbook-xml-dtd:4.3
-	dev-libs/libxslt
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
-
-src_configure() {
-	# Wants to build demo samples
-	gnome2_src_configure ac_cv_path_CC=""
-}
diff --git a/dev-util/gnome-devel-docs/gnome-devel-docs-3.32.1.ebuild b/dev-util/gnome-devel-docs/gnome-devel-docs-3.32.1.ebuild
index 5deeb4cc7175..0fface02ba10 100644
--- a/dev-util/gnome-devel-docs/gnome-devel-docs-3.32.1.ebuild
+++ b/dev-util/gnome-devel-docs/gnome-devel-docs-3.32.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://developer.gnome.org/"
 
 LICENSE="FDL-1.1+ CC-BY-SA-3.0 CC-BY-SA-4.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-util/gob/Manifest b/dev-util/gob/Manifest
index 7ce6f7ab322f..c700c000fd32 100644
--- a/dev-util/gob/Manifest
+++ b/dev-util/gob/Manifest
@@ -1,3 +1,3 @@
 DIST gob2-2.0.20.tar.xz 202540 BLAKE2B 942fdaa77e660d3c8ea49e9b326ae8201893e01f335b2cb5c518597f4638058c7cb51e89061a6f707f39044a40c71cd1ec91b5fd514aa36904e91401abd9c9b1 SHA512 9d09692ef208f8d6422fd573aa1955ca5dcfc3feaf9e0fb64c27e52f4638fe19a5e08a7282f682ed5241a8fafce3852e4168ba4f3865890df972dad4ee342b7a
-EBUILD gob-2.0.20.ebuild 534 BLAKE2B af5143f85a830e9fbd9d8451860f4cbf4ff72a6d0d49b0f5767b1a0fe8b600138412bb7033023b459c399bfa694b208784427f5fe59fd714f9742ebe86bdb64d SHA512 8a17d6c33261d8508b0284fbc857d87afe15588a82d7286da4678a0fe1f27027a8651fd63e4036b2fc083eadccff1b810b9f8c880aa30ddbcc164283109d2b41
+EBUILD gob-2.0.20.ebuild 535 BLAKE2B 8e1a7b8a65e7f8d2509268d8d0a8835956e4f8f5e0f65895e38d3edb246365776f54b117e7f32bc21017710d0c4aa169a8088acdffafa64bfb9e1a472d0eae42 SHA512 dbe51e195b9284ba1301badd7b23153be2cb6ffbcfd2504e13b2c69801bfcc0ae329ba23201e4396fae64338055d79eb620e0120fb34debd3d56243e48a6f5af
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gob/gob-2.0.20.ebuild b/dev-util/gob/gob-2.0.20.ebuild
index aaf9bf91b070..5e9d53afe3ab 100644
--- a/dev-util/gob/gob-2.0.20.ebuild
+++ b/dev-util/gob/gob-2.0.20.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.jirka.org/gob.html"
 
 LICENSE="GPL-2+"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 m68k ppc ~ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ppc ~ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.4:2"
diff --git a/dev-util/google-perftools/Manifest b/dev-util/google-perftools/Manifest
index 4464b60bd9a1..7bc1c06cc769 100644
--- a/dev-util/google-perftools/Manifest
+++ b/dev-util/google-perftools/Manifest
@@ -2,6 +2,5 @@ AUX fix_ppc64el_FTBFS.patch 1305 BLAKE2B 9f20c5e91a47f3c88c15990d4ae77c423aa7832
 DIST gperftools-2.6.2.tar.gz 911811 BLAKE2B 1201185f3008f75b9db219e47658f5b34294f15d5cae5a9badbc2718d63e58c07e485e84f6af05bdd12398c7ab8af520db9f34f4b33b790b0276ba10fb945358 SHA512 2630687d98cdb7011b9b90ba65e337d74f7e1f7d44190edf5414d0898b906686e547e4bb08979f26fb16ca1ccc065a5a1022dee03539bb1ccdf136439eb99ec1
 DIST gperftools-2.7.tar.gz 916854 BLAKE2B d14c2b88f2986d3691d7184e1759de2066ca50224f745a6291ab2ebd5f7f985dec4916a1c01d61142eca9b64f3742c50b82e64118602afaa7b27ae2d94a4ed4d SHA512 4a8e72b960218b0615281b830b3f1a4a1b27830006c45ed68b1ffd152bb50a8b3beec850526e330e2ad08c28774bdc01dade9bcc3e7c9e26d30823cc55648d77
 EBUILD google-perftools-2.6.2.ebuild 2222 BLAKE2B 3a4bbffae09223f1bde0ac608a1a18d569bd6d1862431a24143b7e8d7fee24ffcc4784765735011975569a6d84acbaf6ee22afab4a656dff2faad2def164ca00 SHA512 60f1bcbe05561d9d91b51b314e56e46f81a862a7cc849e832c7e72d923be012569b184e4a49549db84edb85786327fe8e0f6827f28424afa482dcb85caf405c2
-EBUILD google-perftools-2.7-r1.ebuild 2379 BLAKE2B 79b736fe95ad07919df6fd3b7f3cf790a239b9ddb35c0cb73bd35bd16d1208caee6c58a8058e6feb66e7ff9bda5aeefaeeb562cfe893ab60ae02b60837f3ec73 SHA512 94057345f11062254e0f63acb7beddb607700e783cc27b90b9861401d1782aaf44e2985730e0a1bac5374108d578a3b8e3e3ff050381a904dfecf06155c9e360
-EBUILD google-perftools-2.7.ebuild 2315 BLAKE2B 5ffdb176bb77f92e90d9fdfa2b750ee95257a0298bbdae266f7448e45f7736ac0174614c56286213b2e38f546f8faa215d1e7f744458783f665ab9c6ae0ee551 SHA512 fe42024025eae833242847f81e087a3466776a9b36452b85af91a7b84ce7e76175c14fc79ed8930ce960e2789f751b4561a046723e0d84b4449673193c3c3746
+EBUILD google-perftools-2.7-r1.ebuild 2378 BLAKE2B 1eeac9fa0abc7c94dd89c26e91f6cb060b0c5ff23054456c0fc84c34a154dbd8d39dad9890c8d9bd34c2f0e524162b6ace2d34dafec7698979b83d75a90dd5ee SHA512 992961db8e7cd0e8c0961d5d6908ced58ad005f29c55525dbd710557b7662c2c169c7b2402bbfe15c4a818cf7013b38dd490daa9a7c84b74d987ede01b5765fa
 MISC metadata.xml 921 BLAKE2B 71a3db16b3a5a561ee677caf593ff5c45c01bf1cd449da8782e430ffce02b8661c4a011643192f12329ce164ce0148ee206bef85bf55503aae1161067b8e88ca SHA512 e8198e40382ece3675dd43a1878af9cf189d492bc79f246547423b37426981ab2ab624c6d69bc7d57e8a7bdb1f8f4eee32efb1b7d70ecac159dc2a939e480efb
diff --git a/dev-util/google-perftools/google-perftools-2.7-r1.ebuild b/dev-util/google-perftools/google-perftools-2.7-r1.ebuild
index 3e177a9c1d8d..0a5197f050eb 100644
--- a/dev-util/google-perftools/google-perftools-2.7-r1.ebuild
+++ b/dev-util/google-perftools/google-perftools-2.7-r1.ebuild
@@ -17,7 +17,7 @@ SLOT="0/4"
 # linux x86/amd64/ppc/ppc64/arm
 # OSX ppc/amd64
 # AIX ppc/ppc64
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="-* ~amd64 ~arm arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 IUSE="largepages +debug minimal optimisememory test static-libs"
 RESTRICT="!test? ( test )"
diff --git a/dev-util/google-perftools/google-perftools-2.7.ebuild b/dev-util/google-perftools/google-perftools-2.7.ebuild
deleted file mode 100644
index b120b338e577..000000000000
--- a/dev-util/google-perftools/google-perftools-2.7.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-MY_P="gperftools-${PV}"
-
-inherit toolchain-funcs flag-o-matic autotools vcs-snapshot multilib-minimal
-
-DESCRIPTION="Fast, multi-threaded malloc() and nifty performance analysis tools"
-HOMEPAGE="https://github.com/gperftools/gperftools"
-SRC_URI="https://github.com/gperftools/gperftools/archive/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/4"
-# contains ASM code, with support for
-# freebsd x86/amd64
-# linux x86/amd64/ppc/ppc64/arm
-# OSX ppc/amd64
-# AIX ppc/ppc64
-KEYWORDS="-* ~amd64 ~arm arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="largepages +debug minimal optimisememory test static-libs"
-RESTRICT="!test? ( test )"
-
-DEPEND="sys-libs/libunwind"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	# set up the make options in here so that we can actually make use
-	# of them on both compile and install.
-
-	# Avoid building the unit testing if we're not going to execute
-	# tests; this trick here allows us to ignore the tests without
-	# touching the build system (and thus without rebuilding
-	# autotools). Keep commented as long as it's restricted.
-	use test || \
-		MAKEOPTS+=" noinst_PROGRAMS= "
-}
-
-src_prepare() {
-	default
-	eautoreconf
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	use largepages && append-cppflags -DTCMALLOC_LARGE_PAGES
-	use optimisememory && append-cppflags -DTCMALLOC_SMALL_BUT_SLOW
-	append-flags -fno-strict-aliasing -fno-omit-frame-pointer
-
-	econf \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		$(use_enable debug debugalloc) \
-		$(if [[ ${ABI} == x32 ]]; then printf "--enable-minimal\n" else use_enable minimal; fi)
-}
-
-src_test() {
-	case "${LD_PRELOAD}" in
-		*libsandbox*)
-			ewarn "Unable to run tests when sandbox is enabled."
-			ewarn "See https://bugs.gentoo.org/290249"
-			return 0
-			;;
-	esac
-
-	multilib-minimal_src_test
-}
-
-src_install() {
-	if ! use minimal && has x32 ${MULTILIB_ABIS}; then
-		MULTILIB_WRAPPED_HEADERS=(
-			/usr/include/gperftools/heap-checker.h
-			/usr/include/gperftools/heap-profiler.h
-			/usr/include/gperftools/stacktrace.h
-			/usr/include/gperftools/profiler.h
-		)
-	fi
-
-	multilib-minimal_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	use static-libs || find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-util/gtk-doc-am/Manifest b/dev-util/gtk-doc-am/Manifest
index 4f1b8c2b7fa6..a3ee01749de5 100644
--- a/dev-util/gtk-doc-am/Manifest
+++ b/dev-util/gtk-doc-am/Manifest
@@ -1,5 +1,5 @@
 DIST gtk-doc-1.25.tar.xz 673184 BLAKE2B 2468b70403c0334b52ce1bcb77d2015fe83e0af9fac861464db605de9744ec1c7300e9b9a4b4fe0a3641e016083df063d92e1b74e44771d7a88c66815a396765 SHA512 7ac8c73ab9f9ecb6a142bd2232450a6431c3e4fe2372ff40460145b5d0bcffa1953c8cf49436539db86c3a32461cbd4180c714cb19cdd68bfd557816b789339c
 DIST gtk-doc-1.32.tar.xz 762000 BLAKE2B e87b0ed5dffd04acc7569171343839a742a874438248546b1b85ca71102d5a546f41b450c5cedf54ecab5b7b6585a4dac36d7600b21b5cce491470a50f82d3b0 SHA512 6d28395968c2951f1685570e5778b5add76d1b9cff8fcb8632b200b3ba251602a1ea59b1def84fc28560988b87fc0dbbc6947af88d268db6ff23e9c28aea3b28
-EBUILD gtk-doc-am-1.25-r1.ebuild 1226 BLAKE2B 35269374204699c254f0e22ff60530f1049788800125b68555ed5fd6bba58ae5c439cc140f0ac6076128c5a71c60c9308e4401edfab24f4307ad7c36ad81f825 SHA512 db250e9c5e92ad34f8fcc5214516a5d07b8c0c7d4993f45a562ad23c5c905a116c4470ebba4f6f722f582ce96d89164bba1491a57aef2f4641440c6c5dff0d46
-EBUILD gtk-doc-am-1.32.ebuild 854 BLAKE2B 734b8d9e923d4e427a807cb5c4a08a3a3d4ec5005cf9afc64ca4fda354cc06630341af71bc1dfaca5234585e184f02e13542caf6d07fb4f3c9cab84426c514a1 SHA512 edc488debdaff2a52fa3bfe8a3b24013a82f89f19202b3a920a8252c94850922fe6b1dcf9483dc00a7ba3257ef5ed22e6ccc0a4e213de5e367043946c189a48f
+EBUILD gtk-doc-am-1.25-r1.ebuild 1227 BLAKE2B ace0d550c2ebb0ff35b80242ba3dba196f0b0045d04b1584ca2b9832da02bf2c7c34d57cb82d98815ae1442824de9f8a9fda030f4826a2753264e498a3ad48cb SHA512 b43e74b4da2f9fc31ae02c117e1fba1d8d9ef809888a37a5b1d7d193009862d5b39ad5735d9ca8283ae7bf5e8258eb1c67ddb44b05bc216cc03ba4d8e752e97b
+EBUILD gtk-doc-am-1.32.ebuild 849 BLAKE2B 706cbd180df89ad295b6bbf9647f7a6bd4cdda6b0b32fdf3c220d7a1bf8552958fc97113cdfc8c6546e843b0e5901808a5d454fce161b7f823e4aec0eeab7401 SHA512 83a68b5565dd4351d60e14bc2ab686136d1c4340d21b5d9b7c3e601855cd133c4a0c05db51999846cd860ffb48ef70e41ac3312dce6a2b36104ebb96c0873e0e
 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 a3701fa6ee67..d57b9d54a37f 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 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 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
index 9a3ecfc7dae8..985387215187 100644
--- a/dev-util/gtk-doc-am/gtk-doc-am-1.32.ebuild
+++ b/dev-util/gtk-doc-am/gtk-doc-am-1.32.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtk.org/gtk-doc/"
 
 LICENSE="GPL-2 FDL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~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}
diff --git a/dev-util/gtk-doc/Manifest b/dev-util/gtk-doc/Manifest
index d8313c4511fb..173d5fec86ad 100644
--- a/dev-util/gtk-doc/Manifest
+++ b/dev-util/gtk-doc/Manifest
@@ -3,5 +3,5 @@ AUX gtk-doc-1.8-emacs-keybindings.patch 582 BLAKE2B 9591f8f58dbd2c5897abf020f96a
 DIST gtk-doc-1.25.tar.xz 673184 BLAKE2B 2468b70403c0334b52ce1bcb77d2015fe83e0af9fac861464db605de9744ec1c7300e9b9a4b4fe0a3641e016083df063d92e1b74e44771d7a88c66815a396765 SHA512 7ac8c73ab9f9ecb6a142bd2232450a6431c3e4fe2372ff40460145b5d0bcffa1953c8cf49436539db86c3a32461cbd4180c714cb19cdd68bfd557816b789339c
 DIST gtk-doc-1.32.tar.xz 762000 BLAKE2B e87b0ed5dffd04acc7569171343839a742a874438248546b1b85ca71102d5a546f41b450c5cedf54ecab5b7b6585a4dac36d7600b21b5cce491470a50f82d3b0 SHA512 6d28395968c2951f1685570e5778b5add76d1b9cff8fcb8632b200b3ba251602a1ea59b1def84fc28560988b87fc0dbbc6947af88d268db6ff23e9c28aea3b28
 EBUILD gtk-doc-1.25-r1.ebuild 2764 BLAKE2B c038d0737340ecc172d6bf11977b98ab45c22cfb36c412548c67f89e6b9fe09727a59100160bf9ff885b8e0453b84de9707cb6ed77cfb248ff6ce6bb6b585077 SHA512 95ac0021363d8b8bc6e0d9309f2d9c56d8ada1c8ba88ab75cad0f8ebfba66bebf5131745327867325dfbb66368f559e6f74c5e722083bbb21422c6c9ace4fef6
-EBUILD gtk-doc-1.32-r1.ebuild 2349 BLAKE2B c33126191560f90b9f9d894f14c5d79ab52a9f917906239d8da74d25220cdcb0f5cb8f36cb144c66646eb7150e1b2e594ba6e45dcb943f8683119093830a0697 SHA512 0d06e425c37ceaf8c39d6188b7634b9d7f1e645880da12dfdc2a8649e030254fc07783bd0f80718b0b9538ca766d2d0a420a1f07b681dbd3764aa15e0e930836
+EBUILD gtk-doc-1.32-r1.ebuild 2344 BLAKE2B c62d8cd9bac45504863c4304bbc28d1295be5069e4e0bf35f7414bce777ad22f3c475aa6a245f76795c92a8b8abbcb138110909708f83ecf3386c6876740d270 SHA512 32461c54844802fdbae9d5c9dd3bdcf482d46f2b14b18d854b168f8ab295c2f22d929710a430e13da6e9ba7c2a6bac785765d167f83c61f1095c1b8ee9b14652
 MISC metadata.xml 659 BLAKE2B 8c57567cad76724388d746e74bd1056a062c7280552494d6265b5fa38be518983188f22948bdb389916ec6384c17308e1ec292ec36f633b6ecd6f27102f74f94 SHA512 4ffcd239d0a5788ed94a204395a51d8b706663ac69139965e7d28282c473b55cd006cf3786a3cfd60386439f9ffa5d9242ed43ba05783962cbac002f8a00539b
diff --git a/dev-util/gtk-doc/gtk-doc-1.32-r1.ebuild b/dev-util/gtk-doc/gtk-doc-1.32-r1.ebuild
index 1754b664d78f..df315cbf418c 100644
--- a/dev-util/gtk-doc/gtk-doc-1.32-r1.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.32-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 ~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 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 
 IUSE="debug doc emacs"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/howdoi/Manifest b/dev-util/howdoi/Manifest
index be308ada4ecb..01c6633ad723 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 609 BLAKE2B 0346404da9cfb111371d1d225b6a0d84a63a3f93c69fe37edf8b78e636db28d40c81a55c2c41dc406e46e10f0342f63e4d774132233cb5206a9a4fde65d5b2e3 SHA512 4f3e77050027a8f899a98f0e804d56591b8ff96958d6fe0a1c385bb785553477ced3cae7334cb0f2176c7ed9da8fed3c171595499089f4bb86c97da39dc6494c
+EBUILD howdoi-1.2.1.ebuild 613 BLAKE2B eb1915c84777fe6f247c2abef28ae2130648c377ed539bb80b984f19b7eba421fe9cd3e097c2fc390810d0a6cebf7f68286a6f104ed6c354d963e49595f14808 SHA512 cf39a6512968c9bf70684e59421471ce8cc7b5958a94588b4a2462761a216eb4133b9087ff9d48bd2cbd4983e55834996022d76115dded1a5c8377581add7dbe
 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 d15e587ffec4..4c5234bb257a 100644
--- a/dev-util/howdoi/howdoi-1.2.1.ebuild
+++ b/dev-util/howdoi/howdoi-1.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="A code search tool"
diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest
index ffe787b684c7..b5422d3adc0b 100644
--- a/dev-util/idea-community/Manifest
+++ b/dev-util/idea-community/Manifest
@@ -1,3 +1,4 @@
+DIST ideaIC-1.0.201.6668.121.tar.gz 524536881 BLAKE2B 645e7c0390d89d0e0f1710682a5608dc226154e83ea7368434cf5da61f73064467fe7884d90c13d0d33b8feb0a237ca83446a155a135e3884bdaeca5254191ae SHA512 e2688788188726e418cddeef2bf46a54e8b1bcf4770d7daf5b2ee0d1de7d5ab9c84fef0078622b17e884d9b9cb5b826873b4c120aaec3c592e18ee2ddca2c7f6
 DIST ideaIC-3.3.193.6494.35.tar.gz 563410584 BLAKE2B 765c22e5cf25f8daf465e14cbaca2803a560fe175ce8bd678c9d3890b033b50301aae6ced5c5e2c3a682158c7b5cce3daa38ace25e178a6be49cee5c51b60305 SHA512 c8593434fc230a9e3214cac6782130c42b5a98aadd2d27811be2bec3dae1a311b1af3995739b8eb198e6641974b55cb993b9505496e2688c8a8a67c210e3d9d8
 DIST ideaIC-3.4.193.6911.18.tar.gz 563415699 BLAKE2B d7f76da2251042c2141c39861b9a737cd7350e4140c6d9ff39182b489e5f14b8cdd033f402cecd08ff367e2a171b2137227813e6bf6d120b97cbf81e3eca3684 SHA512 39fb2aca3da78cf8282beae812662d237eba1ea2f55c30db5ebfcadd74af001d8fe07dc5cbb99794c3723487814eb096e5e70c4f654a6dafd0930432dfa86b83
 DIST jbr-11_0_2-linux-x64-b164.tar.gz 131483925 BLAKE2B fb9c55094aeb4a9e6b89ef41699252355895fa4bf55eaa0d3c0a637b6485b5a91a0445b5f4af1872b62cd67b639f7354e05770970d41dcfa58ffeda7ae43c5b6 SHA512 4f32940166cc8ad5a138866e18d4cbfcd07f4326a85c051b7a622c9dcb8ee4b6d493331ef24d0c01999134fa2a9bad901f026982c16780fdc5e6b9308821db34
@@ -5,4 +6,5 @@ DIST jbrx-8u202-linux-i586-b1483.37.tar.gz 80726147 BLAKE2B e4e5a076a541fd7153e8
 DIST jbrx-8u202-linux-x64-b1483.37.tar.gz 81812743 BLAKE2B 86ddf0c8dc992a27e680caa821f54fa4d647a8bff78b9fdbef82996bfbba828a2f68f1a00ed64bd92ce24a62bfc6c0240837c396644c6e91244cb0d980b6c704 SHA512 cd31a3c4da7b8c65e9ae89326c2c8b260b51890258d30f64b1e8a7c6c1442bb2cb68ea2aa80387ce0c1a8f50e3533e8231f72c5935b639e3cf82bc1ffedee8e9
 EBUILD idea-community-2019.3.3.193.6494.35.ebuild 4754 BLAKE2B ef634f522764d63b63ab4b8c333fc9bf38b496f9f9ed370a2e4f1c3393acba58888e08e47c4801552d80ded55e50b356c6152fa1bed8248a02895d2003fa24eb SHA512 334e344deb40b90a6ca5789f48fc667930791d3f365a04d0afba8218459ee2f92eaec5131e89b0c443a116a2cc52c7e852c1be9f2ba759a48536aa8e6c34cc9f
 EBUILD idea-community-2019.3.4.193.6911.18.ebuild 4754 BLAKE2B ef634f522764d63b63ab4b8c333fc9bf38b496f9f9ed370a2e4f1c3393acba58888e08e47c4801552d80ded55e50b356c6152fa1bed8248a02895d2003fa24eb SHA512 334e344deb40b90a6ca5789f48fc667930791d3f365a04d0afba8218459ee2f92eaec5131e89b0c443a116a2cc52c7e852c1be9f2ba759a48536aa8e6c34cc9f
+EBUILD idea-community-2020.1.0.201.6668.121.ebuild 4754 BLAKE2B e737eda8211926ecf893c02036c4df691fa46d530ec2f874d9ebd3540c0a386b82aea8292698f501f2951e6d0fe58c801221306cfe3f62f74ed144457cf50523 SHA512 f5dda7212751fd6895367c13604951d47481b054ccfd313a32b4969797b50f28a14aee04382ae650fbb02dea2af01e4d55e5bca1ed7d0eb7295d5f6e6d8d5c1d
 MISC metadata.xml 758 BLAKE2B 2009b0e669ca0b3cdaee71ac45bf1bbddf940ae8130b0b5c275fa825781dd71aa1c522307ee44cbcf75dde0796f6f2f77a7f4226917e5da52020cde563f4951b SHA512 9a2dfb6862b8f49de5680af6a8ee703c0e6687b5cd312cf304a60547075ee9e1f888516e2172ff54172f89524bf5bdc33d53848b6fbdb708bbea320b804de591
diff --git a/dev-util/idea-community/idea-community-2020.1.0.201.6668.121.ebuild b/dev-util/idea-community/idea-community-2020.1.0.201.6668.121.ebuild
new file mode 100644
index 000000000000..b394855414db
--- /dev/null
+++ b/dev-util/idea-community/idea-community-2020.1.0.201.6668.121.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils desktop
+
+SLOT="0"
+PV_STRING="$(ver_cut 2-6)"
+MY_PV="$(ver_cut 1-2)"
+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
+# available separately
+JRE11_BASE="11_0_2"
+JRE11_VER="164"
+JRE_BASE="8u202"
+JRE_VER="1483.37"
+
+# distinguish settings for official stable releases and EAP-version releases
+if [[ "$(ver_cut 7)"x = "prex" ]]
+then
+	# upstream EAP
+	KEYWORDS=""
+	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${PV_STRING}.tar.gz"
+else
+	# upstream stable
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}-no-jbr.tar.gz -> ${MY_PN}IC-${PV_STRING}.tar.gz
+		jbr8? ( x86? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz -> jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz )
+		amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-${JRE_BASE}-linux-x64-b${JRE_VER}.tar.gz -> jbrx-${JRE_BASE}-linux-x64-b${JRE_VER}.tar.gz ) )
+		jbr11? ( amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz -> jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz ) )"
+fi
+
+DESCRIPTION="A complete toolset for web, mobile and enterprise development"
+HOMEPAGE="https://www.jetbrains.com/idea"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1
+	codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0 jbr8? ( GPL-2 )
+	jbr11? ( GPL-2 ) GPL-2 GPL-2-with-classpath-exception ISC
+	JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT
+	MPL-1.0 MPL-1.1 OFL ZLIB"
+
+#Splitting custom-jdk into jbr8 and jbr11 as upstream now offers downloads with
+#either (or neither) bundled
+#Defaulting to jbr8 to match upstream
+IUSE="+jbr8 -jbr11"
+REQUIRED_USE="jbr8? ( !jbr11 )"
+
+DEPEND="!dev-util/${PN}:14
+	!dev-util/${PN}:15"
+RDEPEND="${DEPEND}
+	>=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-$(ver_cut 4-6)"
+
+QA_PREBUILT="opt/${PN}-${MY_PV}/*"
+
+# jbr11 binary doesn't unpack nicely into a single folder
+src_unpack() {
+	if use !jbr11 ; then
+		default_src_unpack
+	else
+		cd "${WORKDIR}"
+		unpack ${MY_PN}IC-${PV_STRING}.tar.gz
+		cd "${S}"
+		mkdir jre64 && cd jre64 && unpack jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz
+	fi
+}
+
+src_prepare() {
+	if use amd64; then
+		JRE_DIR=jre64
+	else
+		JRE_DIR=jre
+	fi
+
+	if use jbr8; then
+		mv "${WORKDIR}/jre" ./"${JRE_DIR}"
+		PLUGIN_DIR="${S}/${JRE_DIR}/lib/${ARCH}"
+	else
+		PLUGIN_DIR="${S}/${JRE_DIR}/lib/"
+	fi
+
+	rm -vf ${PLUGIN_DIR}/libavplugin*
+	rm -vf "${S}"/plugins/maven/lib/maven3/lib/jansi-native/*/libjansi*
+	rm -vrf "${S}"/lib/pty4j-native/linux/ppc64le
+	rm -vf "${S}"/bin/libdbm64*
+
+	if [[ -d "${S}"/"${JRE_DIR}" ]]; then
+		for file in "${PLUGIN_DIR}"/{libfxplugins.so,libjfxmedia.so}
+		do
+			if [[ -f "$file" ]]; then
+			  patchelf --set-rpath '$ORIGIN' $file || die
+			fi
+		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#-----------------------------------------------------------------------" \
+		-e "\$a# Disable automatic updates as these are handled through Gentoo's" \
+		-e "\$a# package manager. See bug #704494" \
+		-e "\$a#-----------------------------------------------------------------------" \
+		-e "\$aide.no.platform.update=Gentoo"  bin/idea.properties
+
+	eapply_user
+}
+
+src_install() {
+	local dir="/opt/${PN}-${MY_PV}"
+
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}"/bin/{format.sh,idea.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}}
+	if use amd64; then
+		JRE_DIR=jre64
+	else
+		JRE_DIR=jre
+	fi
+	if use jbr8 || use jbr11 ; then
+	if use jbr8; then
+		JRE_BINARIES="java jjs keytool orbd pack200 policytool rmid rmiregistry servertool tnameserv unpack200"
+	else
+		JRE_BINARIES="jaotc java javapackager jjs jrunscript keytool pack200 rmid rmiregistry unpack200"
+	fi
+		if [[ -d ${JRE_DIR} ]]; then
+			for jrebin in $JRE_BINARIES; do
+				fperms 755 "${dir}"/"${JRE_DIR}"/bin/"${jrebin}"
+			done
+		fi
+	fi
+
+	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
+	newicon "bin/${MY_PN}.png" "${PN}.png"
+	make_desktop_entry "${PN}" "IntelliJ Idea Community" "${PN}" "Development;IDE;"
+
+	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+	mkdir -p "${D}/etc/sysctl.d/" || die
+	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
+}
diff --git a/dev-util/intltool/Manifest b/dev-util/intltool/Manifest
index 8fb4cba45c4b..10ade56eb14a 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 967 BLAKE2B 193b5532c0add3d00de19a6bf74f0ea030694aca5ddaa3d7c007de55ee1b3eab0d842fd2652843d5bef698ce6acfbc63f8abc537e9b7437d2c394b1a9848f4e9 SHA512 867ed614c60963739d5c15d4f8a705d1176ac833cb8e2a71b8872ef2da28eb3eaddca6f31d996cd43925c2cb917895111dd5d629cab6b5afade10a493c5c1ab5
+EBUILD intltool-0.51.0-r2.ebuild 968 BLAKE2B 851c6c30bb23659c65f0ef6dd8d855227a2c67a45d0ee71bbee91a577c00233a72a0a20618e826a0ea03c90e9e74df6ec1f2fc8ca19aa17f0d36afe00f6ab81f SHA512 1b9ac0a070b00c667d5a84f6ec57129a00cbb9193dd8e1a2bdf8576948752e519b783fe519b533d35240ee03a0a01d778255bc51dcd3d94865ff1b36206065b8
 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 fa973f4b8df4..66c7df8f5517 100644
--- a/dev-util/intltool/intltool-0.51.0-r2.ebuild
+++ b/dev-util/intltool/intltool-0.51.0-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~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/kdstatemachineeditor/Manifest b/dev-util/kdstatemachineeditor/Manifest
index 175d487bc864..985936bd0cef 100644
--- a/dev-util/kdstatemachineeditor/Manifest
+++ b/dev-util/kdstatemachineeditor/Manifest
@@ -1,4 +1,4 @@
 DIST kdstatemachineeditor-1.2.4.tar.gz 222160 BLAKE2B c0194282b1f17c550454d16fb3790e6747c785b01f867aa115134a3f1298c7d0bdd522d07bdc26ab4353d62482a8602c1418dd8e480a6b5b5665b8dfe8ca1d93 SHA512 f1c076a8646a26d3a6629298523b02589fcf53fc8ac01d93928b1bc42179d3a26c7f90d595e2226e5cf3d54d90d143719e72854f3b756489f6d0b8643810675f
 EBUILD kdstatemachineeditor-1.2.4.ebuild 1073 BLAKE2B 009eb5638315b9c4f293e9262925915d637c06468c6b9679e150e0b04d299e5c47b77574a064c46b641ba6088389b391d1cc639e2a60b83a496f10618c21fa9f SHA512 2f8f6c7c486c0ab82051095e292472160e14db862ed85df82009c265f3485620a940f426dd66903590f8df60cb7cb4661ffde2adaa1d0ef90502a3c1fa8fbe5e
 EBUILD kdstatemachineeditor-9999.ebuild 1073 BLAKE2B 009eb5638315b9c4f293e9262925915d637c06468c6b9679e150e0b04d299e5c47b77574a064c46b641ba6088389b391d1cc639e2a60b83a496f10618c21fa9f SHA512 2f8f6c7c486c0ab82051095e292472160e14db862ed85df82009c265f3485620a940f426dd66903590f8df60cb7cb4661ffde2adaa1d0ef90502a3c1fa8fbe5e
-MISC metadata.xml 361 BLAKE2B 679b7e05175ee00d4293a2e6fcc3a0215cc154cfe1bb6436267a4c6e4b4d9bf096b2bd934ce1e3c95458c3f957cf8263fa3f8e09cd9bcce8061e28e868e59dc5 SHA512 63eeeed36b35609aba151c2dcbe1e501355b3e56c0febd52f394a20b5a27871c6d69164b854a05769d3cd0eadf245f23ef4153fd8a2e9208dfb079381bbc0a41
+MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/dev-util/kdstatemachineeditor/metadata.xml b/dev-util/kdstatemachineeditor/metadata.xml
index 141fbb795002..1b2becffa26c 100644
--- a/dev-util/kdstatemachineeditor/metadata.xml
+++ b/dev-util/kdstatemachineeditor/metadata.xml
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>petross404@gmail.com</email>
-		<name>Petros S</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+  <!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-util/kubebuilder/Manifest b/dev-util/kubebuilder/Manifest
index 6224cdd3dcb6..dbfd6b7814b3 100644
--- a/dev-util/kubebuilder/Manifest
+++ b/dev-util/kubebuilder/Manifest
@@ -14,4 +14,4 @@ DIST kubebuilder-2.0.1.tar.gz 1371557 BLAKE2B fcefc068a9aa3e84d9fc394bb0cb1e99bc
 DIST kubebuilder-2.1.0.tar.gz 1394454 BLAKE2B 0a1a1cb3531eb1346b629813a1d44cbe7346c9d8b2945b2c7d9e4a3381b843591c3db54407ef64590affa88d9427718c85983dbc9fead44fd724b2ba78af8ca9 SHA512 1fff1adf91e9b660937b3c2ba69c3bff534af50a363730a3ae9ddfb50325f343d239398db9f7ad15976c2a1f8d5abaed01136332ba21c0766966f1fb12551442
 EBUILD kubebuilder-2.0.1.ebuild 1196 BLAKE2B 28f8afccd4f6965f8b202e6ce562a89b307b914c01a825e48b07ccdc73796236c186e247fef6b116b43123f74b8cb3ea0d05fdf1ccd232e59f6d1c256655f958 SHA512 1a25098a79d530d05828af5f62e7d47f08edeb929a54cfc45fa836c60a6f4805a4352125f3b419a1b52f1f877f4906a3eff022d73c13deae3ab5bb88a03eb507
 EBUILD kubebuilder-2.1.0.ebuild 1196 BLAKE2B 28f8afccd4f6965f8b202e6ce562a89b307b914c01a825e48b07ccdc73796236c186e247fef6b116b43123f74b8cb3ea0d05fdf1ccd232e59f6d1c256655f958 SHA512 1a25098a79d530d05828af5f62e7d47f08edeb929a54cfc45fa836c60a6f4805a4352125f3b419a1b52f1f877f4906a3eff022d73c13deae3ab5bb88a03eb507
-MISC metadata.xml 1407 BLAKE2B 80fc7e22a57a376599b6ebef5a2c95cf3b34bdcf0dd92590c325ad04474ee517c093d44afa1e38ad5c1c537a9c85f764343d5d0c6939c16f69d390ef39952e24 SHA512 825ad0becd710a0833b593dc4346511a9f54e06f0c22420a122f289bc18b9e0cca7481a5e968ceb4975e2441754be86d1f0a60a0ee6ca6e305d6b53ad4380db4
+MISC metadata.xml 1216 BLAKE2B 7803efa70db5aa7fb9f4404111ebfbd51aa0429a7e2a1c57843c4b37379a0d3fffcf5b63abf9bfe5e2c5a4afbb43597bf0022a27f6fc56dcfe22612c6f9bd11f SHA512 63961b7c6f6b0933454ee7112a9005f26e4cb4fe2eb1256df3ea04d1f51652f52d19b4f27e6e0d7efaee5fcd5b17dd43f31162729f12063b5a63f178cb86a15b
diff --git a/dev-util/kubebuilder/metadata.xml b/dev-util/kubebuilder/metadata.xml
index f9f79039d30d..919b7757ee2e 100644
--- a/dev-util/kubebuilder/metadata.xml
+++ b/dev-util/kubebuilder/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dan@danmolik.com</email>
-		<name>Dan Molik</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		Building Kubernetes tools and APIs involves making a lot of decisions
 		and writing a lot of boilerplate.
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 2e472878c9ac..665a0a33ea27 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,5 +1,3 @@
-DIST meld-3.20.1.tar.xz 594812 BLAKE2B a06ae48af37008b99e7110a826e1d97326b71150870c1546b50d971f51d6c9eb3b24fd8e5ae8e8e8daf30f0a83c71356a368d9ed49114989cd22fb793a644a78 SHA512 cd21f298dc1da6eb08261599b9270989c837e0923d5cf5cfdad227dd7f256ac5f53ac903939ebef90ea6cd684c7355ce9482648057284f4ce44f1c7101959c1f
 DIST meld-3.20.2.tar.xz 593948 BLAKE2B 9f2fee48405d76f9ae2fd0b0dd4116321aa176059dd4ef217a5c4c8d0edff5859bab72bbca83b2e7d612706f017d1889d68579eaf9838d7784c9ecb74ed7d403 SHA512 9c9074cb879e3574eb9a1025eb1212771419ab0d8e92bf8a99f38e70ca583ff5c8cbeaccb87b414e6ff73a61afa08e10742991d574b810cc90e8c4a5ac82ddaa
-EBUILD meld-3.20.1-r1.ebuild 931 BLAKE2B f0d83fb33c7a2fca0bcea034fe25ca8439cdfca097fdd3ae571f416e65d45b59042132bbc3e1a9fc65255d5fde225678c329c4eb8d8e562fe54a9ec2de100afd SHA512 62b485acadc0572a74c89802e3818acac8e8eb4e3ea2cbb1b0baffadf64cfcf433defec7cf1d08859984b80eb815ef5c004d20bd301c4fa4ff01be6a504459bb
-EBUILD meld-3.20.2.ebuild 1174 BLAKE2B ca1a4320c9bc3c756ba78e29ad42cfc01bf7ea8a105ab3124ceb708dcc43c10efc3fa5188e28e99e94ba2fc7dc884d3a71ecf6695c880108185ef3448fcef3d0 SHA512 6b111715692fdd3eb2b17bc310c853c4eb3a668ef4f310fa4f0b57d77bd19c8880267edd267c79d3d4641ee691bbadd17596c04703bec262f3ea1521735cf546
+EBUILD meld-3.20.2-r1.ebuild 1406 BLAKE2B 13584822203873664df1a2b03fd6766349edff3892cbf33184c460dc0038039a35ed06f02b300334c55d5b50c91f21008a07a86e091b4f2c5d9ba5e328cea4bb SHA512 a9d3bc2ff9b5bc006d5e15ecfd69a5b00063a26984cd1d9945dddeaa2bf7784da1083a65b46155d65d633321be7699671a6f210ea1a1f28b306326668ce8500f
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/meld/meld-3.20.1-r1.ebuild b/dev-util/meld/meld-3.20.1-r1.ebuild
deleted file mode 100644
index 7891198a1d56..000000000000
--- a/dev-util/meld/meld-3.20.1-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_REQ_USE="xml"
-PYTHON_COMPAT=( python3_{6,7} )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit gnome2 distutils-r1
-
-DESCRIPTION="A graphical diff and merge tool"
-HOMEPAGE="http://meldmerge.org/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.50:2[dbus]
-	$(python_gen_cond_dep '
-		>=dev-python/pygobject-3.12:3[cairo,${PYTHON_MULTI_USEDEP}]
-	')
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/gtk+-3.20:3[introspection]
-	>=x11-libs/gtksourceview-3.20.0:3.0[introspection]
-	>=x11-libs/pango-1.34[introspection]
-	x11-themes/hicolor-icon-theme
-"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	dev-util/itstool
-	sys-devel/gettext
-"
-
-python_compile_all() {
-	mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
-}
diff --git a/dev-util/meld/meld-3.20.2.ebuild b/dev-util/meld/meld-3.20.2-r1.ebuild
index 8c64e7939216..cd83e457a06a 100644
--- a/dev-util/meld/meld-3.20.2.ebuild
+++ b/dev-util/meld/meld-3.20.2-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://meldmerge.org/"
 
 LICENSE="GPL-2+"
 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=""
 
 RDEPEND="${PYTHON_DEPS}
@@ -40,3 +40,10 @@ DEPEND="${RDEPEND}
 python_compile_all() {
 	mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
 }
+
+python_install() {
+	local mydistutilsargs=( --no-update-icon-cache --no-compile-schemas build )
+	distutils-r1_python_install
+	rm "${ED}"/usr/share/doc/meld-${PV}/{COPYING,NEWS} || die
+	rmdir "${ED}"/usr/share/doc/meld-${PV} || die
+}
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index ae35453e1547..1368d7e13f38 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -3,7 +3,9 @@ AUX 0.53.1-remove-asan-ld_preload.patch 946 BLAKE2B 2f43446f853b5233c7c959e0216e
 AUX 0.53.1-remove-asan.patch 842 BLAKE2B 02864bbd41dd16d3e9e8e7ce9e9ef604f2fc6babd26958a4364147d392d56d8a87baec41fb009389a5fc989067019c6de89d1e2c82043ba7df463e32c99f885c SHA512 4abf8088832a1a9336fdffe04bc91a1fbab7363b72c5a1d14b22f408ea25f180d6526f8d6b3a2866a819f1895c93035869fff799da36b5040b8fb89a65ab0e23
 DIST meson-0.52.1.tar.gz 1507764 BLAKE2B 8daf43d84186905d5c32629ab6a250955bdffda502d2d79f991111d0ae7e3a21b3f9bc09ef5258f709eee4e17b09c6f09e7685a72153efcf8daaaec2645eef8a SHA512 fea3e85191782999de3a9431ec1d2cfacea32cf9598205443855042dca50ddac92eb3e74be4dd6a62bd80a606b73e76a04877b2c8efb275d9de5f87e3f9f8f41
 DIST meson-0.53.1.tar.gz 1552121 BLAKE2B 3f0bbbeba6307397dfe5e49c1f978d6246d8e18317d0361b6f013f5c2ba55ad7cba53c985418686c20db159b7790b45a0c2e05d86f861cd0280fb07afdbeb847 SHA512 0c96c354bcd7e6945473c7df0ddff929ef2bae9c2dfc7b48c6c6174c7f2be4f798398929f9c4d5986aa5fc882305ff76371ad0d65a499f058b33b05ff7025859
-EBUILD meson-0.52.1.ebuild 2099 BLAKE2B 2ec3ee910716247d78f701c283d1d98de405c142e8f420bf5f381703f072d0cc1ca72e53dbac2a61c15dd5a037a24180daa04a9e6f737a3135a72b75670014b9 SHA512 dc59db1ff0e24206bb18b3fdc1862bf3bc4fab86d8b66ec6b96e6b5cfc108c83381ecdd46ede0accbce0299db43f5469feed7cece8776ed7fe739aaedcac7880
+DIST meson-0.54.0.tar.gz 1683491 BLAKE2B 3016beb44c4401672947afa898253b69769f998e18e00baedc3bcb525a9923b9154d7db79cfa4c38fcf66eeaee8137f47917689fdde33674b1f0483b21923393 SHA512 e3c97ffd9409a543e45c8be7b12d4e8437de8dbd0cd236fbe092952d7d0833728d46ff6b679c8a73dae4c4016fdf38b43b56f3959a95968a29db109ebfe254e7
+EBUILD meson-0.52.1.ebuild 2100 BLAKE2B da9c9eefec2f28acc8df8fc2e0484c781eef4bd1485826ca58717563a4d0f1e187653ae291ebb1f8c8a7da32c206d8dc54858fdedca54e5427d576eb1f9ab8ff SHA512 7794fdb872d5399e7315f781836de48e263c79ee7069d5c13005e7a028999d4aef282a67d56d4e95dcb4a784cb2e60968301f8792aec276d78c08062a1e63267
 EBUILD meson-0.53.1.ebuild 1980 BLAKE2B 97d27410b495edd1c85818593d2422031825e2933793e9c3b838b4fad7c339a7a7b4543f371449c9e8cc150e82d8033f4c371a299c3ba4a54774f55318bfb9fe SHA512 3316d47f924e64c576e9acc74ab2912c503a4698c5facc7c366e4a249dd0ba188ab975ba2a29d5afcf703d34ba8431b311e07b7c59127f1bad7b25c2d0a3bb6b
+EBUILD meson-0.54.0.ebuild 1543 BLAKE2B d888fe595fc099515fd1ea247f82617560a99f75d6c9eedf4966c60a6429d16db3a7ed894d9ebcf7693e3b391c48cc59d2729b3a5625aad923d1f39057996bf3 SHA512 d99ef333252c2d5222156f777a2ac6c31360f3ff12f5f1790bb084dc47b59c8ae3a087a19a963b95e022f133d24b20488436e0ffc63dad0b1e0e0b7cae8e4b3f
 EBUILD meson-9999.ebuild 1543 BLAKE2B d888fe595fc099515fd1ea247f82617560a99f75d6c9eedf4966c60a6429d16db3a7ed894d9ebcf7693e3b391c48cc59d2729b3a5625aad923d1f39057996bf3 SHA512 d99ef333252c2d5222156f777a2ac6c31360f3ff12f5f1790bb084dc47b59c8ae3a087a19a963b95e022f133d24b20488436e0ffc63dad0b1e0e0b7cae8e4b3f
 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 0eced5aeae4e..2408f6bf1444 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 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 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 fi
 
 inherit distutils-r1 toolchain-funcs
diff --git a/dev-util/meson/meson-0.54.0.ebuild b/dev-util/meson/meson-0.54.0.ebuild
new file mode 100644
index 000000000000..6154c7a5df15
--- /dev/null
+++ b/dev-util/meson/meson-0.54.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 2016-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
+	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 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+fi
+
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="Open source build system"
+HOMEPAGE="http://mesonbuild.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		dev-util/ninja
+		dev-vcs/git
+		sys-libs/zlib[static-libs(+)]
+		virtual/pkgconfig
+	)
+"
+
+src_test() {
+	tc-export PKG_CONFIG
+	if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
+		ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
+	else
+		# https://bugs.gentoo.org/687792
+		unset PKG_CONFIG
+		distutils-r1_src_test
+	fi
+}
+
+python_test() {
+	(
+		# test_meson_installed
+		unset PYTHONDONTWRITEBYTECODE
+
+		# test_cross_file_system_paths
+		unset XDG_DATA_HOME
+
+		${EPYTHON} -u run_tests.py
+	) || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /usr/share/vim/vimfiles
+	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
+	insinto /usr/share/zsh/site-functions
+	doins data/shell-completions/zsh/_meson
+}
diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest
index 09bf7a7eff2b..2a46126ec22b 100644
--- a/dev-util/ninja/Manifest
+++ b/dev-util/ninja/Manifest
@@ -6,10 +6,10 @@ DIST ninja-1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1.tar.gz 203848 BLAKE2B a6002
 DIST ninja-1.8.2.g81279.kitware.dyndep-1.jobserver-1.tar.gz 204539 BLAKE2B cee66a5d6ad7fd1254e68cf7be1e97eb796ec3103bdb9e869dc66757a96ce1d6e946018aa048855e70d6a3698ae609f75740809a8e9183057da16769f07e1fa6 SHA512 ae5f9c4c76114cabc4ec06056edccfa4027d514c4ae0f3ab08bbcd3ce2322e9ff08b8f90fe69fab989707adb6ecc78f226b65e223b41535aa5c0db5b6c61117a
 DIST ninja-1.8.2.tar.gz 185226 BLAKE2B c464c50829a0e9f0f6fd4b860946b14bf07f752adb8e7857d4072a1c1f06977eda283f633041929065c9164377ca769b3293b04fc9ceab583371708a9c4e8f2a SHA512 1650bf9e3eddeb0b0fbb415c2b8e0a7c094421e991fa8139fd77fae0f6ee7ee980b7cf5e98d883c3a884f99abcb06fa26e3980af3a3a5bb6dd655124755782c2
 DIST ninja-1.9.0.g99df1.kitware.dyndep-1.jobserver-1.tar.gz 213767 BLAKE2B bb6abbed155d39fe65a3a4bbbba3e577e4a13dfd1ccb9e018084153b0dd6928753be9d8c10a2c4c2ab6a2000c5292f912353f2234b01613f46bfa49d13aabd7a SHA512 6c3aaf8decfd792ce6b035dacb87f978f1052d13e5ceac9ce63bc7051fad0eed83cc530d2cf22649ff4186416b0478bb3eb0507c56fec2848061cdad7a0aa812
-EBUILD ninja-1.10.0.ebuild 2651 BLAKE2B 30b09b2a60ef6a996434ff23be9bafc0f5e82b775fd1861de74fce6e8eb61aa40462bd9681a7298911f5bb7cc319c9f23cba7b69ffa7120d5a5286112a718735 SHA512 1576d281b83d7e7c066fd6918fe3b9a83f23f10edd386494445c3a6bfee09fc72f038949928d2a8dedf5716c96cf9010ed46a9aac8a10365dae85027e57c8f5f
+EBUILD ninja-1.10.0.ebuild 2651 BLAKE2B 1647476789dc727cade8d4e0772e297c2da7ff6af846f612c3f735a48ed0f4a5f2e1a5273f3d416dc870cffd6e05900a25722007ccd4d9af5e7bb77d78f635db SHA512 82030199b6d01bfe1eb0bf8aa47056f6d3a7ea7c1d062ee72b41356f680c732c5ba4afa6a9023a4cdef217bef5a6515a657677ec034b5a7a63914e893176d74c
 EBUILD ninja-1.8.2-r1.ebuild 2650 BLAKE2B 381a358380a18d9b59da3d2850661bf47b5b8ab7a5c01a2a553b3367a5b39f1a590d08ad91ac2191e26755799ec60f8596d69db46be57cb74470fc33de1ccb85 SHA512 667d8163314f2625c730ffb4d1960d162e5c90a20c0b754657a0db5e6ca363171cde8558d4ed452194d75a10849a8d05c0c494ed94aaf8bb855537eda92cbe84
 EBUILD ninja-1.8.2-r2.ebuild 2650 BLAKE2B a4ae25652a8e2f60818dee56c7cea2c05967e0f3a4e6fae5d0f0fbbf05f253e174b2ed6fb85b0d2e0a9bd2bca6754fe82eafb50c38e1f51cef2fda616cbe464f SHA512 2bd4dc83bf719baf14d4eda839415519a8d6ff3d320830475091b3bd7ca12cc9204637a46f2155b40c9c4a87bc58f747f56f534547ba24b7306772004bd54a49
-EBUILD ninja-1.8.2.ebuild 2510 BLAKE2B 1e759e02b6ae7cdb5921b4031ba8267ffb3d9b3e9e75eea0769539f01754fa8116b7cacca459111eb4b6932a0f3764b7056b5d54330435cb94aa912e608b031b SHA512 cb7127e4ec9d6971cbad5e7408610ce9bdff203c87e320547086b6c2d6bd1c0bd7bc53b04b7e2a5a4ecd25cce748de85f0b1f5f68a611c04933445f630174026
+EBUILD ninja-1.8.2.ebuild 2511 BLAKE2B 511fb24bda7d2bc511daa86d9c76217b54eeeeb2744dc9050d4c262e999ff496c91cf2800c3bc849e725f528e9d394238a38905aff48e63fbf8a17e2aad5ad6d SHA512 1346570be8d9ad9152130fdf3ed54c223ef48a6c1bf6469f34a24bca0443302fa71458d5777d479893958dd29ffcd37feba8c8ed51eb93e2120a0d0761d372a4
 EBUILD ninja-1.9.0.ebuild 2761 BLAKE2B 1899c84c449d0d55379c60da5cb94f3086e3cc9a28ecd75ab0833b378767daa0e04ab90adb275d2dd1432451c4c646db07a0701adc166ec425b29e8b9ef997cb SHA512 52fa94fc5af0a2ef15df5f013368066f38ccc2d44e68d655f16545dcf17ba9cd4f2479b7cfe34a02036b5f838dc2f4ab175ba0daec83d921db946eb70a76ba5f
 EBUILD ninja-9999.ebuild 2603 BLAKE2B ca20e4c0ce6bb238b81f33dafe9fbb2922d68f27ea55d2bcc2900057f1d464a7ba94ee123080444b53c726cf449db9ca9f92dea693d1910c34562399a26f0914 SHA512 faf4b642e2c53cad0a01e52815112f0bacb64fafea111d8949a705f0e7aae5dc1622af250b4e1d80f0819e3feeed3e1493fcd15449603652531b0909386a3581
 MISC metadata.xml 340 BLAKE2B 7cf71b1a09f74328ea74362db4250bf038c0455dcd5f65676ceb5d80a61b5c2923696ecfeccf9d6cd264633e7dc00daa80bf960cc67e5b889d18d487d8e89b97 SHA512 4b78365b98eb9b8a1ef27115261dbf426942cccb7be03c8264e2728e60dedfec8fa51ee3f43488043be5af21b28a74c1c81f4767bcc58574873c2223172447b2
diff --git a/dev-util/ninja/ninja-1.10.0.ebuild b/dev-util/ninja/ninja-1.10.0.ebuild
index aed66121807b..5ba3ad094ec3 100644
--- a/dev-util/ninja/ninja-1.10.0.ebuild
+++ b/dev-util/ninja/ninja-1.10.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
 
diff --git a/dev-util/ninja/ninja-1.8.2.ebuild b/dev-util/ninja/ninja-1.8.2.ebuild
index 29fe9a3efed9..6f2d2e97d8bd 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 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 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/packer/Manifest b/dev-util/packer/Manifest
index 793b2a6d067e..9e9acdccb643 100644
--- a/dev-util/packer/Manifest
+++ b/dev-util/packer/Manifest
@@ -8,4 +8,4 @@ EBUILD packer-1.4.0.ebuild 792 BLAKE2B 98101308b1243d57463057ac8be281bab376eb32c
 EBUILD packer-1.4.1.ebuild 777 BLAKE2B 6123da351bda25d983b0032e68d842954ac3468b06b85f71070c8021b83644a39a3ae9ab13b7dd9a3849637170613c3ad8a0c9693dbb487905ddf5e9311ec081 SHA512 70a934dc3fda8efffe92a17a67e024c2831859fdb4e5e0f2732017866b296afee87280fabf3ab8c26ab5be86418b4de15366d07b9d6252f0eb53ed93e2a6d96c
 EBUILD packer-1.4.4.ebuild 674 BLAKE2B 8a7aaa2252962053ab87a9c7c7aca766b7dc2328b74f545f55e04136bae9289eb3786cc42b1291578ec6eb2554e3813f6fec426246ddcb5cf7c2a19cfeacdc0a SHA512 0bb54a2f36020864c0ccafed3f6aa525a414ab9cdf3ad6417a6b791af6cfcfa2d7b6cbc1089275ce6a2368cbf5887fcb80a343e4d85fb184de657bec5a228951
 EBUILD packer-1.4.5.ebuild 674 BLAKE2B 8a7aaa2252962053ab87a9c7c7aca766b7dc2328b74f545f55e04136bae9289eb3786cc42b1291578ec6eb2554e3813f6fec426246ddcb5cf7c2a19cfeacdc0a SHA512 0bb54a2f36020864c0ccafed3f6aa525a414ab9cdf3ad6417a6b791af6cfcfa2d7b6cbc1089275ce6a2368cbf5887fcb80a343e4d85fb184de657bec5a228951
-MISC metadata.xml 1367 BLAKE2B 30b2ebc8ec0449bb63f4bf97431bf841a09ef98dd7bf59064bd3d6ac8ed697d254de3ed940274795fd35e56ebf582a3880b4e0a3063074b7fae04bbcc07396fa SHA512 dfb93bd681962fc8290c886248021e8b281c4b184acba7133824a7c00eb9ca03a378769329469ffbaa1559ff6427988d925acbcd68cbe76518f4052831e2ac2b
+MISC metadata.xml 1176 BLAKE2B f8f5d6f67f36e87602efd3164c84c7d80c163bd7b553c5aac5f9f846245a8caea124bee79387e2dba1de5a70c0b745bc9cc7d5cc19fed22b0cd1259e71bfddcc SHA512 415e3c1e6c1de9a9bcd5f5aab462ec0c11c0540996aea140411b4784e7966a030170000ec95c9d67e710f57a5f82264e1335c97bd46a8a195dd4700b15db606a
diff --git a/dev-util/packer/metadata.xml b/dev-util/packer/metadata.xml
index bda27c75a682..c8bbb6c2126f 100644
--- a/dev-util/packer/metadata.xml
+++ b/dev-util/packer/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dan@danmolik.com</email>
-		<name>Dan Molik</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		Packer is an open source tool for creating identical machine images for
 		multiple platforms from a single source configuration. Packer is lightweight,
diff --git a/dev-util/patchutils/Manifest b/dev-util/patchutils/Manifest
index 0021b5867df9..637d4288fd69 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 767 BLAKE2B c432d86b0f6a0c5534bb9040032ecce1b533a9166e8df0dd5514b5dc4cc2d51a484a5eec8609add8c9c18c3704fa5151c0f0a69f528a1a6025a1a7dc4c1337d2 SHA512 36184238703b25a63dbf29a4d4d20f9fe1f1ae4b551821a3eed1b955b7b3286260319eaeb3846e8de79e325331bbe4040eb8e97a87967c04eaa01770176099be
+EBUILD patchutils-0.3.3.ebuild 768 BLAKE2B 46271a2a2dddb8e1148966e99eb18a02d561ac9c8958dab79a4c5f6948b15110333bd9671f647a6f4e52c4379b7fb479ef47344cac2388b3e4acc5490a83980c SHA512 2b39cbfa98aceecf65ae9aa83dca730d5183cac164b59fc9e611821221f6b7137ad6621b3ff3c8a398d653d635fd2f3c47b2186b311ad132375c752d1666e47b
 EBUILD patchutils-0.3.4.ebuild 805 BLAKE2B 2d964a52cc789920409dd8af715031330bca84790bb24e6be9cc37c7b05e950f52b20ad682b9133a6e703a36812624cc648d8c47e31e22de7a01538b220e7a4a SHA512 b31bfa216052f97c3766ea7527f6cc54879d61091b5237d1d390360bf9064610aaf525d2c120bbe0f7c07797d4bfcb6f5b2ac9837fe0514fbc9905c677c4ddfe
 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 3dfe96343452..fd460136c17b 100644
--- a/dev-util/patchutils/patchutils-0.3.3.ebuild
+++ b/dev-util/patchutils/patchutils-0.3.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://cyberelk.net/tim/data/patchutils/stable/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 52c2969f05d9..016aea9c524e 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -4,14 +4,14 @@ AUX perf-5.4.6-fix-clang9.patch 558 BLAKE2B 001bde226595891626dc7b46ece6de240696
 AUX perf-5.4.7-propagate-cflags.patch 1502 BLAKE2B d35f94d10ecc2d384cae9084a7f843581553682bd1ec66e7dd33d0fe110e03c01761b9b2472aa637a71f5c694f4c4eb10691afefb08351e06ea607ca4a460248 SHA512 a5506e118f75439386b3c7699197b20017ef819669b06d89ed79886146e7a79d52d1397680cc94e10137bd6665d3dc2812cb1556498de2739f4d967582522a80
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 DIST linux-4.20.tar.xz 104257836 BLAKE2B fb52cad2897da319299486fa8c3b9415cd0aee0842dbf353a5b269720dcb902db407bb55dd95a77b212dcb4a488c15363d561f3649d6bd16885561f2466d90b1 SHA512 e282399beea5da539701aed2bc131abd5bc74a970dcd344163e9d295106dfd700180e672ed546ae5e55bc6b9ac95efd5ca1de2039015c1b7a6fc9c01ea6583d4
-DIST linux-5.3.tar.xz 108558876 BLAKE2B 0d08eed879d05734e4542f0c93823d43f8dc042a54ba5268064c4bbebd7a9d59c03abf3ad5dee8280e784ae148a3b0c56181eaf2d5b3c079b6fe9f5191544df6 SHA512 6b5edef47c319a3fa7f6c20a3e0903a5acd89ec75e32dc5f99adcb60c9fe118ea312722d9c3d27e2e3900afa2455afb86e83a8b6bb131009bc79ddbe6fb0595d
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
+DIST linux-5.6.tar.xz 111785252 BLAKE2B 8dbe02a8ca7fd3dcf512a15c5d8098c1e7f94257e65173fed43fcc45480e4ab790df8cd39bbbb4e2a21dc9a00385bc9bbe98215a31e7f7e1d9c8f21cd8ace69e SHA512 80846fe2b4e4a7ff471d2dde28a8216ae807a3209f959e93d39ea4fc9a189ea28ec3db9d303b3fe15a28c2cb90e7446876678e93e23353c2d6f262e364a06bc9
 DIST patch-4.14.33.xz 905284 BLAKE2B e67bd9a96708aaaf65eb0aa852493b2323c9e237bfcc6fa837f795e481943ead3e2d5005ee72e40fc247df01c50877d9da3848a05aba3c999c3cfb7678cbdbc9 SHA512 5c76be5171709c2df7df7d5a8e8f3d0f7ede47b433da3b0f1710f262c8fcf5cf6c744a96d4336ea397c2c88a5f0a7507a5ab08c7c82f08deeb7a6f887ad77cfd
 DIST patch-4.20.3.xz 91732 BLAKE2B bf99271bcb35508df239343fd6c9d57c246f88320b586e44e2d97771d08b249a24db230214d4957015a5ed35261e201f0680101b99d0e92f0f1f69bc53e21458 SHA512 47178b8e3bfe4ba09cb82bb1ce8b0742e6749d4be3412fb57518918f7109e74eac1d3d8eb32a43e21b3837a14f37d5eefd8cab819defd10cc2db61fb0ceddeaf
-DIST patch-5.3.7.xz 255616 BLAKE2B 18ec40508fdb2cc17dd927f3ddef07b2b744ff993de75bb7adebe3a3f97c9383ea1845085899aa939ca8a15515420c18a1ac0ae832f9ae52f18cc8ed59a1e75f SHA512 bf2717b721b3acfd423537a6a520388e6a596ae65605ed8c029a67c117a002e9a21c324de0dd41407bfdc8ef95263687764f4f46aa59cbb50f68ab21b96c29d6
 DIST patch-5.4.20.xz 776552 BLAKE2B bad2a95ed8521ac5c379fe91e16d60b2a38de19b9239755084621e5230677b232ec4cf9e2e8161c0022daff43fdbb37d5b5b5bfdc9e932ef3a860bcd17f640f8 SHA512 65fbcdbd41e35c17601ff15bbe33933be2ab7a694aa181a0b802cc11c1c653c9b688dbb382076cbad05983a0c07467955c035ae25f5175f7ce5bc24339303d77
+DIST patch-5.6.4.xz 34744 BLAKE2B 856148010fefa7e45903da23a054429f924920f1fd331b725d00906baaf6a05fee769c5c780ae6548b4f02846f945b12012c1216411c8d92aef7499babc42528 SHA512 05607a47ee72af4a7b4d8424a3995d92d0cf358902459993908df0e95643cbfa9eec7ed56779d254b7b75ec1c8dbec5eea5e2e845f40f5511533d53b90b1c02e
 EBUILD perf-4.14.33-r1.ebuild 5059 BLAKE2B 3bae91131eb7c24b152dbeac414057d1e5ba08d174a51417aeecb4a049c9fec362b4b67e34c367198d2b9729ffedfc82556e3a13c92b5a9129571b44d31b894b SHA512 bcb9c57a583a930aa026988eac0f14c9b13283565189c7251118e4a2037f4094b2999093aec63ebcfc1c6e6325681edd26fe35480b90a90721f92c6405afca7f
 EBUILD perf-4.20.3.ebuild 6042 BLAKE2B e1498b914f8b135927f5e97211d5246dab4bfd5bafbcf9ba431c2f8d95cf1568a162d2704f6cf851951178287efdcc6d75391ede09ea101b18d88463a4586912 SHA512 3f45b1edfefd658eaa48b4e4ae02c09e39cd6f2f7235bbb8eb9d90d69028df6d53709dac1790f932c7a20e7e77fad8327867ccdec80f302c0d72958d3c1bb138
-EBUILD perf-5.3.7.ebuild 6360 BLAKE2B f3f17e3ba1375c7a2e1e4ae33053318b58344c43fad7c8fdde8b867f4a2d326b201c74260df4438eb2314013d110f6e72488601ffe3f40c0473c8a3de4f080b4 SHA512 87f79ea8c9cd3c5709f6592b7f7ba979cfafe6479809aa3f59ca45d35fc4b2f4b2532fdc4e4c49b903a9a647dfabb93899a7c8c7a7a0a01aafcac54fe3293af3
 EBUILD perf-5.4.20.ebuild 6661 BLAKE2B 57b7ef2a784b80469fe6f8f0f4ccfe8024634e75c8db9af16da6914bf0ff353ca9846211f3fc8417f4f553e05ea2a5cf5c679259e639f498387fe5c36936b450 SHA512 f8763d20eac9b809335f65dfa13f6bfb1b7d0787e4f0bdb33d8755c773cc30740f5ebaad21de31ade431a818d29119d3ee7d13c8eb4f0cf53fa32217a5faadc7
+EBUILD perf-5.6.4.ebuild 6232 BLAKE2B 31434728fb030b44cb2b41a850760dff22b9c8176e29ccc1f8c19ff263013de17f606676fac0e3942926c2b364f5318995686c481bc0c1de96f15a639fe4b8f9 SHA512 b247174dfe336b1411a02cddc451ac9fe1c76ee48303ede76b97e2000b76e4b2428c031ef2451d20c2a665a2e613a770d5d69c38252015e49004f53c42e9d3c7
 MISC metadata.xml 1245 BLAKE2B 78921a70a2d435eac57471863f5f8f50eaae16049c6085326cc91a82437b42ada7c3a5fa97124a01f5477b02e37fa03212eb65d9652a71b8c8886f99e2986d22 SHA512 99fcebf78438dd22f2ff35846fadd1280e25154dab4a4ab8bf9bc13d911c7450f92234ed2c39d9905d6b138a783af1e20896e0b09e9dd07813baf5da48234ea2
diff --git a/dev-util/perf/perf-5.3.7.ebuild b/dev-util/perf/perf-5.6.4.ebuild
index dbfe8de5c4ba..3f1d4e665d10 100644
--- a/dev-util/perf/perf-5.3.7.ebuild
+++ b/dev-util/perf/perf-5.6.4.ebuild
@@ -1,10 +1,10 @@
-# 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=( python2_7 )
-inherit bash-completion-r1 estack eutils toolchain-funcs python-single-r1 linux-info
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
+inherit bash-completion-r1 estack eutils llvm toolchain-funcs python-r1 linux-info
 
 MY_PV="${PV/_/-}"
 MY_PV="${MY_PV/-pre/-git}"
@@ -42,8 +42,8 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RDEPEND="audit? ( sys-process/audit )
 	crypt? ( dev-libs/openssl:0= )
 	clang? (
-		sys-devel/clang:*
-		sys-devel/llvm:*
+		<sys-devel/clang-10:*
+		<sys-devel/llvm-10:*
 	)
 	demangle? ( sys-libs/binutils-libs:= )
 	gtk? ( x11-libs/gtk+:2 )
@@ -76,14 +76,13 @@ S="${S_K}/tools/perf"
 CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
 
 pkg_setup() {
-	linux-info_pkg_setup
-	use python && python-single-r1_pkg_setup
+	LLVM_MAX_SLOT=9 llvm_pkg_setup
 }
 
 src_unpack() {
 	local paths=(
 		tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
-		include lib "arch/*/lib"
+		scripts include lib "arch/*/lib"
 	)
 
 	# We expect the tar implementation to support the -j option (both
@@ -107,19 +106,6 @@ src_unpack() {
 		[[ ${a} == ${LINUX_PATCH} ]] && continue
 		unpack ${a}
 	done
-
-	# support clang8
-	echo $(clang-major-version)
-	if use clang; then
-		local old_CC=${CC}
-		CC=${CHOST}-clang
-		if [[ $(clang-major-version) -ge 8 ]]; then
-			pushd "${S_K}" >/dev/null || die
-			eapply "${FILESDIR}/perf-5.1.15-fix-clang8.patch"
-			popd || die
-		fi
-		CC=${old_CC}
-	fi
 }
 
 src_prepare() {
@@ -210,7 +196,14 @@ src_test() {
 }
 
 src_install() {
+	_install_python_ext() {
+		perf_make -f Makefile.perf install-python_ext DESTDIR="${D}"
+	}
+
 	perf_make -f Makefile.perf install DESTDIR="${D}"
+	if use python; then
+		python_foreach_impl _install_python_ext
+	fi
 
 	rm -rv "${ED}"/usr/share/doc/perf-tip || die
 
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 20add417c4b2..33b5c682583f 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -1,4 +1,4 @@
 DIST pkgcheck-0.7.6.tar.gz 234637 BLAKE2B 31c31d987aed03e4a61f58a3dc3074985a4f436e3598f11257d602a668525f24e45c540d56e5779237cd36299b0ab73b9a59e3482099cb5accbb3ea8437cd7c5 SHA512 cfded3a5a0249ee9279fe93156ef524cafe7302915dfbbb01acd0bdc3acefcd1e90c6bcfbf3dc40bd5cb71680cc6453b1de045878d75a9ade00c432e663fd136
-EBUILD pkgcheck-0.7.6.ebuild 1339 BLAKE2B 4ffced551a5b003351ed3495dab9c93482de13a88a28b3ff808241bb61c3d6058f16ac82b159f6f3a307617d40d81e7ee3b275ad5d8f07299e7a3ccc78231abd SHA512 545bd3d837581128a2b4c8d29cc10f116c984c915c34fa3ebf9da8f3f2b99e33a51f918840305bf90cd2feaf8eaa35281060304b67fd71aa0f877926cc3fed3f
-EBUILD pkgcheck-9999.ebuild 1328 BLAKE2B 6c4e1486d82f4adf6bdbd84697bae4a74c28c9c380ed256fab6dc431d4abf7007b70a54e4065a9d010d50aca2626e4d83346c19102b976eb0a8b1c95a0fbd153 SHA512 3bf0d03e5e931913f0721ba3474f59542bae97721428ff6cac17dd8e7c26ca17aef695933d492b98999dda6ec34eea7877a40bcf1bcc59246df5a92bdba301e1
-MISC metadata.xml 551 BLAKE2B 69f4e4b0c2ae515433db1c0bbdc47d1bb06e5f17feb6183bf81e41f971994bbd6c1ef2b57f17ac7bfeb504351177cde249f8f81aef416be44606a436b487ad61 SHA512 dfb7087bfd20b8b435faf246d9c689e82c669790abde1886d88822692493ce08083b3a8b9fd1781519becf0399727ed7c65ce079039b5201a66e950ccb28280e
+EBUILD pkgcheck-0.7.6-r1.ebuild 1394 BLAKE2B 250fff7d5ebd3de6495a561d6075effd102ac7d6d598867e1aeab94fd9d8fbea246446f1fb1f87515bfe3bdb11f49e9cf88f84ba87afdd1b1a432da3cd30f0c2 SHA512 d6b87229f1c205bab06b1f4154dfe2d157aa7ad689eb9a36b12dd3c0b297d74884846f13d136f32828e41de181c01e507cb9a5a168bd76454177ae03fc9efb81
+EBUILD pkgcheck-9999.ebuild 1394 BLAKE2B 250fff7d5ebd3de6495a561d6075effd102ac7d6d598867e1aeab94fd9d8fbea246446f1fb1f87515bfe3bdb11f49e9cf88f84ba87afdd1b1a432da3cd30f0c2 SHA512 d6b87229f1c205bab06b1f4154dfe2d157aa7ad689eb9a36b12dd3c0b297d74884846f13d136f32828e41de181c01e507cb9a5a168bd76454177ae03fc9efb81
+MISC metadata.xml 328 BLAKE2B b84dba717460e84f7ee3163fd8d6a5f13eb3b15dd1bb749f6ece81f062e3530988dacefadb24c1395eb36593a7ab6d868b06c8c4ee8f620a17c85faf04283b24 SHA512 5696505214a737ad495b23bfac2a51fbbc5b1e815eb6fcbabb3c6674325f05e3f6f418de05257c08935e389e47879e8a2d1b3723ec86aeb5ad97c6110fd2ec75
diff --git a/dev-util/pkgcheck/metadata.xml b/dev-util/pkgcheck/metadata.xml
index 823ef4f00a2a..aa0ba050b3e0 100644
--- a/dev-util/pkgcheck/metadata.xml
+++ b/dev-util/pkgcheck/metadata.xml
@@ -5,10 +5,6 @@
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
 	</maintainer>
-	<use>
-		<flag name="network">Enable support for network checks using <pkg>dev-python/requests</pkg></flag>
-		<flag name="perl">Enable support for perl checks using <pkg>dev-perl/Gentoo-PerlMod-Version</pkg></flag>
-	</use>
 	<upstream>
 		<remote-id type="github">pkgcore/pkgcheck</remote-id>
 	</upstream>
diff --git a/dev-util/pkgcheck/pkgcheck-0.7.6.ebuild b/dev-util/pkgcheck/pkgcheck-0.7.6-r1.ebuild
index eb8f739d6267..677e2471a279 100644
--- a/dev-util/pkgcheck/pkgcheck-0.7.6.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.7.6-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 PYTHON_COMPAT=( python3_{6,7,8} )
 DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
+inherit distutils-r1 eutils
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/pkgcore/pkgcheck"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="network perl test"
+IUSE="test"
 RESTRICT="!test? ( test )"
 
 if [[ ${PV} == *9999 ]]; then
@@ -35,8 +35,6 @@ RDEPEND+="
 	dev-python/chardet[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/pathspec[${PYTHON_USEDEP}]
-	network? ( dev-python/requests[${PYTHON_USEDEP}] )
-	perl? ( dev-perl/Gentoo-PerlMod-Version )
 "
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
@@ -52,3 +50,8 @@ python_install_all() {
 	[[ ${PV} == *9999 ]] || doman man/*
 	distutils-r1_python_install_all
 }
+
+pkg_postinst() {
+	optfeature "Network check support" dev-python/requests
+	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
+}
diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild
index d3aed7fc337b..677e2471a279 100644
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild
@@ -4,13 +4,13 @@
 EAPI=6
 PYTHON_COMPAT=( python3_{6,7,8} )
 DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
+inherit distutils-r1 eutils
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/pkgcore/pkgcheck"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="network perl test"
+IUSE="test"
 RESTRICT="!test? ( test )"
 
 if [[ ${PV} == *9999 ]]; then
@@ -35,8 +35,6 @@ RDEPEND+="
 	dev-python/chardet[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/pathspec[${PYTHON_USEDEP}]
-	network? ( dev-python/requests[${PYTHON_USEDEP}] )
-	perl? ( dev-perl/Gentoo-PerlMod-Version )
 "
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
@@ -52,3 +50,8 @@ python_install_all() {
 	[[ ${PV} == *9999 ]] || doman man/*
 	distutils-r1_python_install_all
 }
+
+pkg_postinst() {
+	optfeature "Network check support" dev-python/requests
+	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
+}
diff --git a/dev-util/pkgconfig/Manifest b/dev-util/pkgconfig/Manifest
index 9c7ac18ef5f6..d72245f24f33 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 2880 BLAKE2B ffcee257c446994ffa70c5d869000e5fd28eb224f466ccdbf2267b212657e706b6944dac5d0e869c1f072f6008e6f7d96df1a8e59656d4efd9fae40a12de44c9 SHA512 3f14fdd42ba7c64baf9155fa022658be249c7caafa27e31b76fef06ba1843f31cb7558eb5b126119718b3dc551961517d2f6c99c2346a4f8d4d380ffe93d9a71
+EBUILD pkgconfig-0.28-r2.ebuild 2881 BLAKE2B 8014e43e3449be2620bfae6674df57d5b413ab73eac3385ce68fb3652fe7d8942ff2ec9718f2568cea34d41f05d3bbf4fc5b826899bb092f13873edc9872f428 SHA512 7a16c2fdec93260cb730b66eb8285c09929be22e04184e50057e3335c8df41db01105a3f7612eff9d4264a7deb9f0fe34bee71e3a93e5173b90b0ebad7539eb1
 EBUILD pkgconfig-0.28-r3.ebuild 3400 BLAKE2B e182f6c4d85f0018865b32d89ec4e4884ddfb1f293665c2a71a8c2a41a72756b8074c775f61befecaebd3df8ab0a713a5a83085ce254a8421cd3105572abcdce SHA512 96da7a2c861d6775b89f9e73876bbf22972f508a2664df05c96a599992842e612da94ae863a87dfe0451b39ce898e17ac90f1b55440345d990fa5b1058bda40e
 EBUILD pkgconfig-0.29.1.ebuild 3764 BLAKE2B 9fadfa03b0d010b0edf9e862b2faef1fa7ca5db3f3d579b9e21ab7eea318e44d9cc724b84907a77cb0bc11e4e930b7cdd37728e599419e9ce59d547e49c337e4 SHA512 951d6c913c745ae31e55ba9008558b4bf91f0900f4066ca5f2ecf65323f0389004cad4326920ffae5c07c106be5f49a265b4be1c10144f80c362d1a90d6e704e
-EBUILD pkgconfig-0.29.2.ebuild 3761 BLAKE2B ec96a00b28bce59b182111dbd33e3c694bcc85d56c83441f40600cc29716874644c5370324225d86cd64051f9477c8334282850f3605271b040499d4993b3d72 SHA512 23c3ea8301f7e64aa92b8a0511fc2aee222dd66e92641db699bfef34c732ef0a78de92610d81e315110ad70d28c2f294814c83a5dd053185dffaf88e7545ce95
+EBUILD pkgconfig-0.29.2.ebuild 3762 BLAKE2B 2526c7c31500b087469b41e1a5a0d5e77c18dc1c6152353c0d1755f01bd1d605b424e6d954de9ca0e2af8b092db4f19a3333e7c9b7e9ad78d06ed63b87cd0d76 SHA512 4e0d753615f16081d0282d6ac43f4e0132955cf29fde60cf372905e22f7bb89d3f9de47df73cc7f914674d4f4d3a96740c3126bafd02160fb22813ad13f8bfa1
 EBUILD pkgconfig-9999.ebuild 3764 BLAKE2B 9fadfa03b0d010b0edf9e862b2faef1fa7ca5db3f3d579b9e21ab7eea318e44d9cc724b84907a77cb0bc11e4e930b7cdd37728e599419e9ce59d547e49c337e4 SHA512 951d6c913c745ae31e55ba9008558b4bf91f0900f4066ca5f2ecf65323f0389004cad4326920ffae5c07c106be5f49a265b4be1c10144f80c362d1a90d6e704e
 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 f65c63e3db4c..eabba5a8f09f 100644
--- a/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://anongit.freedesktop.org/git/pkg-config.git"
 	inherit autotools git-2
 else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~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 5bc0f454bfb0..41c441193c98 100644
--- a/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
 	inherit autotools git-r3
 else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~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/radare2/Manifest b/dev-util/radare2/Manifest
index 6cccb508468a..16ee644f3ee6 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,4 +1,6 @@
 DIST radare2-4.3.1.tar.gz 8113591 BLAKE2B 289f6e4e3cb163017454918e7e5e31186cf41435f66a91ca5decf2819a06543908eeb3224041997eeba37e5bb7150874f431f301cf5f6aaa903601735e99d945 SHA512 06009dd2c75cfb2fcadd21041861f9569ff4b0b9438d1d5a1cf49ac8690ef041e18feb2445e6772acd0e217110328660e9de47db54d55c64f64764cb06988db8
+DIST radare2-4.4.0.tar.gz 8135544 BLAKE2B 1a1a4ce97dde4b8985cbe95bb889bfdef8f9d64e2c2257030fda523b1a1aced4e6681bc0f7b14d1a3f25fbce355f2062f0edc33ab396bef98792d29d1f708a11 SHA512 6208d97f8333e72dfd04cccdb0234b60fb8979ca559b92532bf7e47d402f91e0c54678a83e6bafee65666fb7d6008b44b961600f24f9b3275cb2eec32490eaa5
 EBUILD radare2-4.3.1.ebuild 1159 BLAKE2B 979869367436022a049bff280f0c2fb72d61ec24546c2aaac9ff588b5677d1feae9f0a60559f7b488ac2c2c0d955e7de4d399b27a9f275918c08118bee020213 SHA512 014d8eb9417ac50fa56161bd1fc48b375126d5090ac2165b940a246756ec58a1bc84f3f5be70756194a602077091543a642e17b141f91dadc72cc8068f723e55
+EBUILD radare2-4.4.0.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-4.4.0.ebuild b/dev-util/radare2/radare2-4.4.0.ebuild
new file mode 100644
index 000000000000..c3c2387a8dcf
--- /dev/null
+++ b/dev-util/radare2/radare2-4.4.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 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/radareorg/radare2"
+else
+	SRC_URI="https://github.com/radareorg/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ssl libressl"
+
+RDEPEND="
+	dev-libs/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/rbtools/Manifest b/dev-util/rbtools/Manifest
index ad1c87a139ed..80ef1c4dbe7d 100644
--- a/dev-util/rbtools/Manifest
+++ b/dev-util/rbtools/Manifest
@@ -1,3 +1,5 @@
 DIST RBTools-1.0.2.tar.gz 199085 BLAKE2B 469bc0a4d440437126af936c370d40eefa4c59717a955cd1853a1fc437554c251508fabc797b8c6631327fd14d43545cab3710fdbe50b1ad87d4df41d6cc96ba SHA512 2b05c310b877ad57589dedbad638956b81cc539bc793ccbe6f17608f6b979a0f2767998b1e941ef826a435cf0b034cbb2b7fdb6b937d83d5bb2fa9d2f45f70a1
+DIST RBTools-1.0.3.tar.gz 206634 BLAKE2B a058e9f501e5139fd550478dced02883f4fe49e3cfd9da961dfa53dd9552dee59e6a74d873f259ea3ce05884cfb0bf3e1a83d7ddcb696a0dc57139346ce81d91 SHA512 2462da124fb70df05712626451baa0294e82171bc860fce7dc0ddda7bee4ba6749d387c873b08c50f6936c539a13cd15c33bb02b7fd0f69a38c56723e24acbc8
 EBUILD rbtools-1.0.2.ebuild 738 BLAKE2B 7e597356b71c8919b80bab4c2753035fccdc66a8e68d5e6dc9a96b00db123fdf023479022c353e965534e821df08b570233e235410dd7618a8bac295119365ac SHA512 a91727a260eaa5669427b6afcd43638b0b4d6b13b954911ee3d8478052234c728dd9856e261aee9ee9a9fddf5fec22653346ed805017dc518fc129f76a77c9d4
+EBUILD rbtools-1.0.3.ebuild 740 BLAKE2B ea50076ab8d4d9e7d7d9dfa56459a158473eada076aca8a501cf24006374df591c2d7acf71b32eabb6ac0a847d877f8f0e11cf839d5ebbf4bca81c4beb1b3ca8 SHA512 be87550734fec846648fe0922c4351fc7b9638ff1d3fba7440dc3f8841c8b58037262801bc17edce14edb262e7cc2cf2cb244579f85c67ae0592ac50f6ba3963
 MISC metadata.xml 217 BLAKE2B 92b85ca7d657eea200ee74bdafd4df6885c04b125bfdfb86650e2e1066c858aa8623f8b2a362780a200d7e33076129c9aab38a12f189c82d5ce1a9ae81257195 SHA512 1b17a615b7471a1e46b4c291aa7ff84348628ec0c3603e21db1994eb1e82ae28dc7e97321de022ccb7e4d2f411f4e7bcef5a79e93a4229126b9b58fb5d503478
diff --git a/dev-util/rbtools/rbtools-1.0.3.ebuild b/dev-util/rbtools/rbtools-1.0.3.ebuild
new file mode 100644
index 000000000000..06ee7e70ea7a
--- /dev/null
+++ b/dev-util/rbtools/rbtools-1.0.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit distutils-r1
+
+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}/$(ver_cut 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}]
+	dev-python/texttable[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+DOCS=( AUTHORS NEWS README.md )
+
+S=${WORKDIR}/${MY_P}
diff --git a/dev-util/re2c/Manifest b/dev-util/re2c/Manifest
index 47707d11d93a..2f76dc6aa1f5 100644
--- a/dev-util/re2c/Manifest
+++ b/dev-util/re2c/Manifest
@@ -1,3 +1,5 @@
+AUX re2c-1.3-lexer-overflow.patch 1244 BLAKE2B d9f51ea520ca437f4a1cb9c9f788d0c5c76d48358ee2c9d8a821c40c53d7df8e34f97cfda0ccd17e4220600043349afb9d737a2444d58ece8d381f1d30807855 SHA512 19a9011c58107c136ef49a51a712125274f841f884ca76c5f2e25464b24c3a6477ff45752df20c5f508e21a2a55c7f4ce19bc6c7d9b7baecc07fced76ce87de1
 DIST re2c-1.3.tar.xz 1239280 BLAKE2B ae2a8fc323408dd31d39c352bd622d89d19178b7993618ea043bbfd32509fb7573d2b5b50663e100d24fc275fa479982cb1f66ed49638edca61f551fb653176d SHA512 c7084ab2399fb6b96cef74c1393715d90830f43b82b96af46feb71ef008c0215381c3dbea0b003ff810d869db6021e28001b9d588ad55c616642244b2da09c0e
+EBUILD re2c-1.3-r1.ebuild 772 BLAKE2B 9a1c3ec7e9b1ab137802f9e95003820792cf7da85eca0d9ab46f30afd7d2883ca15ef070691d4364b151247295fea16e702d01fb1209e1346787613491e44a3e SHA512 0e26075418517031ee56bc22909db4968e1c15c1fb8417a510cd43803257c5363ef6c574b3ee9dd34cc6985bd294e0202a6de4164ecc90e080015a3eb1180755
 EBUILD re2c-1.3.ebuild 721 BLAKE2B a49a44e123efbbd05d63cb17a17ded1e683aba03e07e6068baff354a84cc16aa1af298af8b85465be3e4d8eb39218b81bb147573924f1351e797066e3c2fabba SHA512 cb4c0b2af7fab1a2e2341b34241546b203128519df58eebec594ada3e3152689d0662e2c2de77561f40a60ec0de579bd89e90e6598a801e74811ed670084da08
 MISC metadata.xml 423 BLAKE2B 69ad12e8bd8cd2356e36736ab276efa0aadc2755f784fa4e7fe23ae4d4e7a27a06c8fcd4ee727f87847a7fdaf136d12e811a20345183d261d2b649724818f9f3 SHA512 997590e1de3136f7f87181746d9dccfd8c34a12e570d15a29a8abd4b4163bfa98405d928e932255c962d4af79e9913de563453891155590bff309d764c2b5bd9
diff --git a/dev-util/re2c/files/re2c-1.3-lexer-overflow.patch b/dev-util/re2c/files/re2c-1.3-lexer-overflow.patch
new file mode 100644
index 000000000000..4222ef430c32
--- /dev/null
+++ b/dev-util/re2c/files/re2c-1.3-lexer-overflow.patch
@@ -0,0 +1,40 @@
+https://bugs.gentoo.org/718350
+
+From c4603ba5ce229db83a2a4fb93e6d4b4e3ec3776a Mon Sep 17 00:00:00 2001
+From: Ulya Trofimovich <skvadrik@gmail.com>
+Date: Fri, 17 Apr 2020 22:47:14 +0100
+Subject: [PATCH] Fix crash in lexer refill (reported by Agostino Sarubbo).
+
+The crash happened in a rare case of a very long lexeme that doen't fit
+into the buffer, forcing buffer reallocation.
+
+The crash was caused by an incorrect calculation of the shift offset
+(it was smaller than necessary). As a consequence, the data from buffer
+start and up to the beginning of the current lexeme was not discarded
+(as it should have been), resulting in less free space for new data than
+expected.
+---
+ src/parse/scanner.cc | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/src/parse/scanner.cc
++++ b/src/parse/scanner.cc
+@@ -155,13 +155,14 @@ bool Scanner::fill(size_t need)
+         if (!buf) fatal("out of memory");
+ 
+         memmove(buf, tok, copy);
+-        shift_ptrs_and_fpos(buf - bot);
++        shift_ptrs_and_fpos(buf - tok);
+         delete [] bot;
+         bot = buf;
+ 
+         free = BSIZE - copy;
+     }
+ 
++    DASSERT(lim + free <= bot + BSIZE);
+     if (!read(free)) {
+         eof = lim;
+         memset(lim, 0, YYMAXFILL);
+-- 
+2.26.1
+
diff --git a/dev-util/re2c/re2c-1.3-r1.ebuild b/dev-util/re2c/re2c-1.3-r1.ebuild
new file mode 100644
index 000000000000..d90e052b5214
--- /dev/null
+++ b/dev-util/re2c/re2c-1.3-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="tool for generating C-based recognizers from regular expressions"
+HOMEPAGE="http://re2c.org/"
+SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="debug"
+
+PATCHES=("${FILESDIR}"/${P}-lexer-overflow.patch)
+
+src_configure() {
+	econf \
+		ac_cv_path_BISON="no" \
+		$(use_enable debug)
+}
+
+src_install() {
+	default
+
+	docompress -x /usr/share/doc/${PF}/examples
+	dodoc -r README.md CHANGELOG examples
+}
diff --git a/dev-util/shadowman/Manifest b/dev-util/shadowman/Manifest
index 383ca00bba5d..5a30c25d0082 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 669 BLAKE2B 6186d0cc0928bc9bd12b42df3b176801696da570969e98a4185d013260dd9c0b8a6f46ef1c1d7a4bdd9b3e3c271d6e3c5053d1a4fa73d8ba8caa9e767d7a47b4 SHA512 565f84f4486bfbcd740786a58326e1b72a81d743a89a1ac4b8deb9ad10a7ce849bf8bf1c461ecdfd1619494ceed21d138bd5eecb7139cd632eb8c3ee03ac43d2
+EBUILD shadowman-2.ebuild 670 BLAKE2B 9725aa2930deff527ba3094648edf814ae42933eeccbdddc52a34d484a5f3d98ce9cdddce134e102e25336e143356b0077484efea157989043c7dd6dc24636c7 SHA512 376608dd1cffded8e7e58e9ee9e2e79517c9b33c2ab07628449839b858492d065bb9370eab55ef7617deacab3033c2cacbd686a4c2d0c070c7d5e356d9e5b3df
 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 9be96213f4c9..f072c802effb 100644
--- a/dev-util/shadowman/shadowman-2.ebuild
+++ b/dev-util/shadowman/shadowman-2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mgorny/shadowman/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE=""
 
 RDEPEND="app-admin/eselect"
diff --git a/dev-util/shellcheck/Manifest b/dev-util/shellcheck/Manifest
index bea9d444ef77..51613238efba 100644
--- a/dev-util/shellcheck/Manifest
+++ b/dev-util/shellcheck/Manifest
@@ -1,5 +1,5 @@
 DIST ShellCheck-0.7.0.tar.gz 163027 BLAKE2B 2d6348f21cb9598c0133cc1548f43727d56155883db83c38483b581b3565c67d5bf9d5333b6c39569dac1f07b19b21db1d62d83e675bb4aa9735725879aaf6e2 SHA512 88a0cb2a2879f597b832979fd934ee63e0f1ca256e5f9e7c51667744d09848817fdbe3988898f49226fc52ec27d92c314a9075995c3110ee10b24468cb60c657
 DIST ShellCheck-0.7.1.tar.gz 163288 BLAKE2B efc8c56348ba924baf660ae16d84e023cdd1a5ef8b355b492844ca41aeb3242eb1e5862bea7f12c69fa43cce285a44afaf95125816f62fbe316d9bdca467b1ae SHA512 fc84bd67e30af1378a92c1e378693a2c181e9567d53f2590e76aedb9f607276b90abd2ac83818c36524bd77a480df347af5a0879a925a846f35440ab207fad8a
-EBUILD shellcheck-0.7.0.ebuild 923 BLAKE2B ab287f52a821a175dc6cc29f4c746d0d0eaab0f65d2c747809623138a40045236f7572062784c59f63e106429f318ea7c671dd2b9664aa1d7fbc6b8391be26f5 SHA512 1b32a4bb38eb891c03fe36b95e271e33c3b35f22f1ed6a82352f733b85e9dcfeaee8750a54192f01ad9917cd940c5579d4a51ce9f8bb90e4f9695fa6bf8bdf0e
+EBUILD shellcheck-0.7.0.ebuild 925 BLAKE2B d1dd5dcf799243cfbf7aabf519ee605386dd4593eb58f061bb31ffaac0a7918d84bf0682414e746ac562a15774ac11e0dab287bd39b71da1594168f41ff8b6b8 SHA512 dffb168c017cf90df2e1b428a7e77b8c5d2850fd7372b027da64c68feb384c1179698a14bce07abbbf94ee35d6c0ca072f1d0f8752a4378bdbd48860ee2568b6
 EBUILD shellcheck-0.7.1.ebuild 849 BLAKE2B 2365d8fc4a090efeae8d407a4f9bcba47446276bcbfd3e3ec8cca544766651593b5d0ef7963f2f59e520393fe5027331fc0b9dc1679e61b755b208c320610b08 SHA512 b3e2ccb90f1405940aa7a373ba92de9d0329826ba5ed7f7b85c3ff0ec57b4ac1f50a1944fd14c6c5b32666df425c72470795833adec930f83f27905c6fa0d74b
 MISC metadata.xml 354 BLAKE2B 147d2403f29d6faf487627ed1bcc9b16cc02936a1afe0f25f7bab24071b7b0009960ec950c2bcbcc3738033c5e10f5d790f0b90a7e75d3f9242b694e1bb96cc7 SHA512 033d85c60d488513cec6cbd63c406ff12882909629acd2417e4d0b1e2046ff9aebda7dcca7b95ee144deb3d876ccc422211cc31eb259f306deb35938b56183af
diff --git a/dev-util/shellcheck/shellcheck-0.7.0.ebuild b/dev-util/shellcheck/shellcheck-0.7.0.ebuild
index 61b08cde9fc2..572de9c65f0b 100644
--- a/dev-util/shellcheck/shellcheck-0.7.0.ebuild
+++ b/dev-util/shellcheck/shellcheck-0.7.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/aeson:=[profile?]
diff --git a/dev-util/shelltestrunner/Manifest b/dev-util/shelltestrunner/Manifest
index 65974dfab10e..25ac29f30c9c 100644
--- a/dev-util/shelltestrunner/Manifest
+++ b/dev-util/shelltestrunner/Manifest
@@ -1,5 +1,5 @@
 DIST shelltestrunner-1.3.5.tar.gz 21428 BLAKE2B af7573a16159baf5dbcbedc10a454b1f09875031cc9d619b287aeaf507744a2a1dc5cde8ea509949097b5364b5b9ac9438705e58d2d08647e5fa6c4eccceec37 SHA512 f0cc03c41fe176ddfd0e498121f5ebafda721b93e9a84f320b445bf797022545e1046ffb3814e2eaac72f0975a2a11fb1de5e0a007c5700de028e57ee66fa093
 DIST shelltestrunner-1.9.tar.gz 39538 BLAKE2B 45dc5acbfd35d65a818938382e62eacc7aa3798e8f0ab9cdd4d4a358f470de9854bedbd2335bae6b4195ea05b2305de84e0b13c86206ac0e53039726fbc59354 SHA512 bdb5476e30189f0997f3a9505d954a828475a5d95e1220dc9ed342e96100f4dfa0cfadc1afd9a5758223cf1a659d1f77d7d0a0533c32bd80b325c9a7ad48178d
-EBUILD shelltestrunner-1.3.5-r1.ebuild 1194 BLAKE2B b5199777a70dc10e1b11d9bb8d94dc4cb20831dd395a281b110956f262a02775fbd484f849756a538ef42726ca3e560abce959ec9b3b9684fe6693f656f80536 SHA512 d1b0ad30f0b273476358b255e6fe22336a2875334592de5a03fa185ddd3af8e8a51715b43ff028eea1a13f0acfcb91cb729b4a2c2e1f2517632080489b8fe132
+EBUILD shelltestrunner-1.3.5-r1.ebuild 1196 BLAKE2B f560c4f4094152431de55a6878fff2f9a70bda9e74f22d0c9d4c965ee34d5a12dd80b0c5765481291abac07e763c068ede1cbe9af3660a527faa52d32c517df0 SHA512 bc939c9ca6c8e545a6781e1d23bbdf426bff73198d4838b1ea24a5d3c4a48ad733a273f69063b413eae43b727d711dcf2f686acf8da536ecbaf95a2858dc9409
 EBUILD shelltestrunner-1.9.ebuild 1424 BLAKE2B 7a8585896b41fe1680bd82550aca07c0e44b75f0f8ccd4e15d72848c6ed46d1fcf0441253b799ec6dbc80e9e35d99189f07fcdbe40eb18a3632eca22b184e1c2 SHA512 7771d6a5ae08f580506a249185f991dc0ee8b1af80e5985eae77f2a7d33053189e8de88a1c2f427d849353bc1776dcd78476e57e5595b20395c60c903fef357d
 MISC metadata.xml 635 BLAKE2B d6582231d4828a390bf96dd9c75dfebc87ef599a2e659f281bee36ac2a1ca3cd73702e38518e47343753766caf772180f19c97b1805f236993d4486d2f15ea2a SHA512 a398308f38fffe954bdcb052e6b22997442c2a303896790c643e3e95cc38976f2d5b8fb9d08a713411fd5ec0aca2d2904a5a388276d69ad132e8780115bac6f8
diff --git a/dev-util/shelltestrunner/shelltestrunner-1.3.5-r1.ebuild b/dev-util/shelltestrunner/shelltestrunner-1.3.5-r1.ebuild
index 6f919da1c793..d51ce4d5631f 100644
--- a/dev-util/shelltestrunner/shelltestrunner-1.3.5-r1.ebuild
+++ b/dev-util/shelltestrunner/shelltestrunner-1.3.5-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/cmdargs-0.7:= <dev-haskell/cmdargs-0.11:=
diff --git a/dev-util/shflags/Manifest b/dev-util/shflags/Manifest
index fd43a69687ee..04408c8d0ed7 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 627 BLAKE2B bbe32c7ed1de43a9dcec06a4c31e00e02bf125b818850a26a7a45fe535e6a4b9ab8b8a45d2d7f4365c170a0a24e0a2460532a9cf4ca965df187d877dd7023247 SHA512 3d214bafb7f3cd0a7044c5adccf5ceb9948f09fb4902733766ef931c45112f133cbb231f2c4a1856fcf745e97020abf7c0f75bcdbbf9d3933140c00944733ea7
+EBUILD shflags-1.0.3.ebuild 628 BLAKE2B 480e47ff6f6a76724df5ea404c95e8c02bd9120f50931b46d19c155321dd1963e1208ad64e8a33c97ddf61d852d6e1692c4a14904bbe2875c9c2d83e35f451f6 SHA512 e74ebbc0240e843f49e84b99bd518c296416c572f0bbe6e2d1166beda6c2dfce32aac652ad8ddd056368a9feb58da3d66a9e894b25f0a2c7ad989543d98fd99c
 EBUILD shflags-1.2.3.ebuild 590 BLAKE2B ab37d5047c85376d77709d2cb568a68d9f57ccd81872b6f936683f16e3d66e3a55638bb9f23fe68b94046b2891069a40f695bab330d8f3cedefcee4936638829 SHA512 522e0f6c15229c8dece104b25fba25bb7fde8eb55cfd00e335e4fff0a9228265b4817565eb257dffba80229f4c0b2edba87b2e84842a31c7289931c3c3d41ba3
 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 99a387806250..e3b2d116e4fa 100644
--- a/dev-util/shflags/shflags-1.0.3.ebuild
+++ b/dev-util/shflags/shflags-1.0.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/kward/shflags/archive/${PV}.tar.gz -> ${P}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="examples"
 
 src_test() {
diff --git a/dev-util/spec-cleaner/Manifest b/dev-util/spec-cleaner/Manifest
index ca80b4aeb00b..ac526e1258b1 100644
--- a/dev-util/spec-cleaner/Manifest
+++ b/dev-util/spec-cleaner/Manifest
@@ -2,4 +2,4 @@ AUX spec-cleaner-1.0.6-pytest-runner.patch 348 BLAKE2B 4bdb0a4db5eb581f826f14452
 DIST spec-cleaner-1.0.7.tar.gz 450429 BLAKE2B 7ec57076f13c526ca10524a3852a26ddee4581137357dd593312cc1b55d908311c9146ac2b9c0a5f0ea491a2e1cec8b8a3e5dba25467881f656d43872bd69f5f SHA512 705fc3b9d5b927a64bd19bbf6c826464e40ec6b3cc97cd032417f8e4debac721c7e5f0c99e02fafbb5ce3454424a8b398a7827779b0a308549955ecac33d39c7
 EBUILD spec-cleaner-1.0.7.ebuild 995 BLAKE2B 6a57408f00f419787335ce4bd5c8341cc109f50b377c342482eba22b1c1632f918a4ff25eef43bc31c4c6b2992c34172afce0c7f58d877476a7cb91b342c8e91 SHA512 c6b4bf8b544624d599250658fdaf3ef2cd8fa7635d5a4f8f2287366e650b80e8c32462915d373353a785fe725c8e09d7a89745e68443bbf727690b7f6a4dcd95
 EBUILD spec-cleaner-9999.ebuild 995 BLAKE2B 6a57408f00f419787335ce4bd5c8341cc109f50b377c342482eba22b1c1632f918a4ff25eef43bc31c4c6b2992c34172afce0c7f58d877476a7cb91b342c8e91 SHA512 c6b4bf8b544624d599250658fdaf3ef2cd8fa7635d5a4f8f2287366e650b80e8c32462915d373353a785fe725c8e09d7a89745e68443bbf727690b7f6a4dcd95
-MISC metadata.xml 450 BLAKE2B b091afea0453f996442347131d337d2cb516a4a5e08a98e0b0ab4a6f2cdd19f7d4d284f02a9fecf35590998fd3143b9151c3cd6632c0bd7148374d307b0a28c0 SHA512 6f10ea61bcc2e9982fb7e1383959f36c77d881a495a9251819b47d168114272c5f26b7e5bcc80657f5d8a79ec18e0a1e7c54201fa6c773bc64d3ceff2a1ddc3c
+MISC metadata.xml 253 BLAKE2B 0c7bbcc445d9f2f3a0bcab386eba8e5afd8f985485b8def8cb4306a3d2a295d58edfd9f38611bd27d9b9bd9af3f4a3bf65af18a7e9482791440a704539a22abf SHA512 29c1493426e613c062e310cc2f5f8477ccf2f57621abbb6603b37e77c6116b60cae7fd36b93b9ab840069c5e965642e2307f97e068463aa0ff9f79595c547b6c
diff --git a/dev-util/spec-cleaner/metadata.xml b/dev-util/spec-cleaner/metadata.xml
index 209ca060ffe3..03f0990dceec 100644
--- a/dev-util/spec-cleaner/metadata.xml
+++ b/dev-util/spec-cleaner/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>jubalh@iodoru.org</email>
-		<name>Michael Vetter</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">openSUSE/spec-cleaner</remote-id>
 	</upstream>
diff --git a/dev-util/stripe-mock/Manifest b/dev-util/stripe-mock/Manifest
index b637755941b7..96819ef68797 100644
--- a/dev-util/stripe-mock/Manifest
+++ b/dev-util/stripe-mock/Manifest
@@ -1,3 +1,5 @@
 DIST stripe-mock-0.79.0.tar.gz 462829 BLAKE2B 7cb1365f3fabe4ad286b7f80bc4e1ef25764c86b090aacd543239ab35626271638fe5bde7131431cf233115451ba1c9e9df53a69ff9948c5e04965a67ed5038a SHA512 46f6900eb2d8ee37b1f8dc9a0603ee6182cc70889f92c2d9a8a976670211b2f37feb33d53d51364a05a91c130c4358cff3e0b15dfe61a7619132ef568266c27e
-EBUILD stripe-mock-0.79.0.ebuild 586 BLAKE2B f7f51e13a772ad6aa932e9c9515cc4469c113b1d1f59903a37c3fe4fb78c111b7fdb427af085203dde69da3282c83664aff7239971a2a9395eca62ec5d4d8970 SHA512 0b0dc92f9574f1ebe63482b11034b17c731dc50ce8302ec938de8a1ec428300942a34fd06772bb21dfb28afa2edc3c86e03a011e0f0852ff45f0d6dc41e4741e
+DIST stripe-mock-0.88.0.tar.gz 504374 BLAKE2B 2414de64ebfd1ed4842fc85e77e940da4b08cc647abebc25259d402db23bf010ab69c9660ad80ad3428f27df4036e706051fa44dcee0d2c0f6e1f089994d31d5 SHA512 eb33249ff0c135d1e74bdfaf5d7ad04b1d7ff05d1472e30d55eb819f06795ec7a05ffe73e90b0dfdd3ebcb54f0fdfa6c0ecd1158ca22abc044e1c2e212984517
+EBUILD stripe-mock-0.79.0.ebuild 584 BLAKE2B 9052a35ea96059edaed6c0893930a2708f76cc8fd14526372468912a20fc38e1a3b93ae7ace2811783ff5c20fed4ed852e7ae01b0d5c5809f7554dc6a13673af SHA512 6d905c6ac495e5b644761cb5a19714360a4dba45f9c673481f5f5afd262cf96ef7c43dc505cecd4146fe14f99d34ff7cbbcbb8d31cdb81e38521fce04b353198
+EBUILD stripe-mock-0.88.0.ebuild 586 BLAKE2B 30982c5d4da1308effaa440eaec34adac5ffa7101750a15c51c6feec5f892ba3a49dcb64273b7a9e1b52224e4081d91dd1385b37ef466393f21c79ced40a00fb SHA512 c2b318303b316c86da799068e6c418ae7eed57bebf7295e740ab8c8b85396ed7a8938467a65fb78209943956035a184a937fbbb8f694690c65f43b5ba3690519
 MISC metadata.xml 591 BLAKE2B 0ecadf3b61979e117b020d78ffa50f7fc9ca8e7d36ef9b403b76063849032187dd7b86c1f44f877504874a100989079b238d0d046f5dcc2c9a74608859c2e1e5 SHA512 6e5bb363e28b92303a6793b4605a970253bb6263c2045527d04b21566aed05f6a51002a0af575e37cc644b9c3e0c2b384dab6cd04fe2ae531881054a901b48c4
diff --git a/dev-util/stripe-mock/stripe-mock-0.79.0.ebuild b/dev-util/stripe-mock/stripe-mock-0.79.0.ebuild
index 03b73892d5d0..c8e38d5bbd7e 100644
--- a/dev-util/stripe-mock/stripe-mock-0.79.0.ebuild
+++ b/dev-util/stripe-mock/stripe-mock-0.79.0.ebuild
@@ -10,7 +10,7 @@ inherit golang-build golang-vcs-snapshot
 DESCRIPTION="Mock HTTP server that responds like the real Stripe API"
 HOMEPAGE="https://github.com/stripe/stripe-mock"
 SRC_URI="https://github.com/stripe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 LICENSE="MIT ISC BSD-2"
 SLOT="0"
diff --git a/dev-util/stripe-mock/stripe-mock-0.88.0.ebuild b/dev-util/stripe-mock/stripe-mock-0.88.0.ebuild
new file mode 100644
index 000000000000..10557ae0ccc1
--- /dev/null
+++ b/dev-util/stripe-mock/stripe-mock-0.88.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_SRC="github.com/stripe/stripe-mock"
+EGO_PN=${EGO_SRC}/...
+inherit golang-build golang-vcs-snapshot
+
+DESCRIPTION="Mock HTTP server that responds like the real Stripe API"
+HOMEPAGE="https://github.com/stripe/stripe-mock"
+SRC_URI="https://github.com/stripe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="MIT ISC BSD-2"
+SLOT="0"
+
+src_install() {
+	golang-build_src_install
+	dobin bin/stripe-mock
+	rm -rf "${D%/}$(get_golibdir_gopath)" || die
+}
diff --git a/dev-util/sysprof-capture/Manifest b/dev-util/sysprof-capture/Manifest
index f6b4b1c52531..18ce09609ec8 100644
--- a/dev-util/sysprof-capture/Manifest
+++ b/dev-util/sysprof-capture/Manifest
@@ -1,4 +1,3 @@
 DIST sysprof-3.34.1.tar.xz 372612 BLAKE2B 3a50a00f29866ae8bf03cc7a57b598e40a6a37ad88ac2159087e4f2a8a6a5cef09b345dc5332fb1df9036c4e159e98f19adda45588150b059af313878b9b554c SHA512 5f2d820935291a3b578222d5daa87b0a2f74cd16d14daca19065495be61cf7359f00f12f452a5c0b4e05dfeb94e2376017c2288cad92dc0c4bb9bca51b903d19
-EBUILD sysprof-capture-3.34.1-r1.ebuild 1160 BLAKE2B 561181c13ade5d59acdc6baaeae1a2e4343ff36dc5f9de0378a408721c51e6ddfab24d9453e21a202e8efaa1d690653a0a4bbad50261577c2f6864a1ade5b51d SHA512 989fc8217a7e4899d67124768718be14b8abfc3fbd899806c32c9707890c11a918493e0a027744a6d9f0407703b93cbf9fe791d17f7b4eb7b0720c63f2c4c445
-EBUILD sysprof-capture-3.34.1.ebuild 1209 BLAKE2B ad76bbf11652385c69eb806fded3ed8adedb8f9ec582d5da8c5e84f3141339300c965bc1cde3a6b9fce99647b53fe464e57277b72dcdb631bb343a0cac7e54da SHA512 4aa74a8f178fd7b04677e999357aa554ad4dfbe2e46208f9bcbd625221851906226549923a166ece49252145b52522e443f82e0e7d26cbf7e3c7f459c45cd770
+EBUILD sysprof-capture-3.34.1-r1.ebuild 1158 BLAKE2B 28a75972c7e9aea4a7115985a0f82bceb3b487c04380b9779c5fc5450000aa47c847d3b03096c760b16a6f08fbc55e8672228537ecd70f0ed5c6cf06dfebf93f SHA512 e55ebb10bfbfb5805ba545441abf5c55f4c2ebbf820680edb27d275e92f388e7f183521faecdb048f6b34dbaaf1811e59be63c45ec80957a601c53de4db65a07
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/sysprof-capture/sysprof-capture-3.34.1-r1.ebuild b/dev-util/sysprof-capture/sysprof-capture-3.34.1-r1.ebuild
index 7e76591dccd0..cdc63554ec99 100644
--- a/dev-util/sysprof-capture/sysprof-capture-3.34.1-r1.ebuild
+++ b/dev-util/sysprof-capture/sysprof-capture-3.34.1-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://sysprof.com/"
 
 LICENSE="GPL-3+ GPL-2+"
 SLOT="3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.61.3:2
diff --git a/dev-util/sysprof-capture/sysprof-capture-3.34.1.ebuild b/dev-util/sysprof-capture/sysprof-capture-3.34.1.ebuild
deleted file mode 100644
index fb4cdee37666..000000000000
--- a/dev-util/sysprof-capture/sysprof-capture-3.34.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME_ORG_MODULE="sysprof"
-
-inherit gnome.org meson systemd
-
-DESCRIPTION="Static library for sysprof capture data generation"
-HOMEPAGE="http://sysprof.com/"
-
-LICENSE="GPL-3+ GPL-2+"
-SLOT="3"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.61.3:2"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/gdbus-codegen
-	>=sys-kernel/linux-headers-2.6.32
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	# In 3.34.1 -Dlibsysprof=false still installs various data files related with it;
-	# some of these seem fixed by 3.36
-	sed -i -e '/subdir.*data/d' meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Denable_gtk=false
-		-Dlibsysprof=false
-		-Dwith_sysprofd=none
-		-Dsystemdunitdir=$(systemd_get_systemunitdir)
-		# -Ddebugdir
-		-Dhelp=false
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	# In 3.36 these shouldn't be needed with with_sysprofd=none
-	rm "${ED}"/usr/share/dbus-1/interfaces/org.gnome.Sysprof2.xml || die
-	rm "${ED}"/usr/share/dbus-1/interfaces/org.gnome.Sysprof3.Service.xml || die
-	rm "${ED}"/usr/share/dbus-1/interfaces/org.gnome.Sysprof3.Profiler.xml || die
-}
diff --git a/dev-util/sysprof/Manifest b/dev-util/sysprof/Manifest
index 896e57c42c92..5d061adde5c1 100644
--- a/dev-util/sysprof/Manifest
+++ b/dev-util/sysprof/Manifest
@@ -1,7 +1,3 @@
-AUX 3.30.2-elogind.patch 1055 BLAKE2B c25d6b83d75d8155ef09d1aa5cdd8dead79a1fe796028cec79166e24ae8a579af83c396c7f4e91948a56bb2215cb180657728c35d84ee8ed09134d4ee72a17cf SHA512 6ed6fcf43238378486f430bf653cc6f209f6bd42136e14f0888b8b190a63058bfcec8777a6df0f1f454b14ef91c6075d342585a8c339a11604ffc3e712057017
-DIST sysprof-3.32.0.tar.xz 296052 BLAKE2B f409c64d40bd3451037e601683f270ff93ea2a60a2c104d22edc6bad5ff3f5c974f80137776b6329dae932852fa0871f2b7b9960a282147ddef5402ad840d9ef SHA512 7b9d84ac241d376a5e545082b1224e7db96af26ae0ee297d5f0b2d45abc4676e23009dbd560085e5d4879378a8dd79eefb4449df3961fbfd09238bd2056061d0
 DIST sysprof-3.34.1.tar.xz 372612 BLAKE2B 3a50a00f29866ae8bf03cc7a57b598e40a6a37ad88ac2159087e4f2a8a6a5cef09b345dc5332fb1df9036c4e159e98f19adda45588150b059af313878b9b554c SHA512 5f2d820935291a3b578222d5daa87b0a2f74cd16d14daca19065495be61cf7359f00f12f452a5c0b4e05dfeb94e2376017c2288cad92dc0c4bb9bca51b903d19
-EBUILD sysprof-3.32.0.ebuild 2223 BLAKE2B 12c03c2a1ea0a43e3445a1ec80eb95d5f2132eae1128d003fa4e004f30797b3f9d741ced16262a61240f0483361b8d620abb33e272651b201568a39eeda07453 SHA512 26a2a6ff561ac905236cb494517b65d70e6682098e043166e8ad274adc25452e9b75ea36c8cd1651972b80b31b5a84730186007f286180f34bbad51a41cfa0a0
-EBUILD sysprof-3.34.1-r1.ebuild 2180 BLAKE2B a7cfdf09e34a1b11b85f360d55338fe42a0753222e25b4ec6136646d9458d3b61c5e551a821dc3644147d518e7022092f24e8ead3af810144675bd0f9b4b9cf6 SHA512 bed8b1be866d6809e0c37e058091a3a3c669dfc68ea43fbcda84df59d1f1077b7861c01e5b5e4a57cc23dc1dba337556e26dbbb4398ff82b23afb46b1d633c03
-EBUILD sysprof-3.34.1.ebuild 1985 BLAKE2B f5f934464afac97c3581e0a37a3fc9caaa8ed7c1ac6f5f65dc93b71ce13a3050791f85b397670ecb1f63e748e969aa1ca701cc2869698761ab26fd10a695f31b SHA512 375c224e1d484025bd31e67e257bf60e7aa379eb4f9b750970bbcbe1a192884d56f3f8b3add88f29cda1bac5863c47f33863afe94fd3699473a468d055354e78
-MISC metadata.xml 960 BLAKE2B 0124f087a9539768f3ed80994f361428eb2edc9944536c6f4d3eb2792358d025a4c872379dbcbc38d43070fa6ef4842536deddbebe599e6ebffe7dbdc5d181ce SHA512 24378a4a329547aa1064b04574015c7c55134522ea9b3b84fccc297734c5cde55a6085e01f4365f0f8d57b8e5d85e41c1719c88af5a5c4c167799cb69278235f
+EBUILD sysprof-3.34.1-r1.ebuild 2178 BLAKE2B c7af4fa12f96de0aff7639364be3fd34574646a1345c27210b3ec6275a3fec64e002c43479dc290906983a673b319b68481469ccf954a270a74c0269290c43ca SHA512 3ef91c9ebe8d26f96bc0ecde85ca9c171c573c6c29a7050554301e4933ab5bb214a9069bb459129bbdc2b99c16b45197c69b4603ebf7270f648ff3d96dcd7681
+MISC metadata.xml 609 BLAKE2B 804eb6dc6f75b570561942eac147e34e4831e9993a4b40d474b75f87a5746c8ab7f3527021d872c69111a28b1837b5b069d11c9edcc7e21f6a2da18c84b4272a SHA512 358d3c0a3083bf578bd67404ff9e62d4c327e04bbaa88b28ac0cf18b8ff9939d0cb8b0d27a2179ede473c471d31e365b6112e809e8aa8c2d774cf710b6d54348
diff --git a/dev-util/sysprof/files/3.30.2-elogind.patch b/dev-util/sysprof/files/3.30.2-elogind.patch
deleted file mode 100644
index 2a57fff3a9c6..000000000000
--- a/dev-util/sysprof/files/3.30.2-elogind.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From b30057251d3f2b5860b36505fed440a6bebe0359 Mon Sep 17 00:00:00 2001
-From: Shiba <not@telling.you>
-Date: Wed, 19 Dec 2018 00:37:57 +0100
-Subject: [PATCH] elogind support
-
----
- daemon/meson.build | 11 ++++++++++-
- 2 files changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/daemon/meson.build b/daemon/meson.build
-index d0cf87c..c7f85d7 100644
---- a/daemon/meson.build
-+++ b/daemon/meson.build
-@@ -11,8 +11,17 @@ sysprofd_sources = [
- # NOTE: This is used in data/meson.build
- pkglibexecdir = join_paths(get_option('prefix'), get_option('libexecdir'), 'sysprof')
- 
-+# Check for sd-bus support either by systemd or elogind
-+sdbus_dep = dependency('libsystemd', version: '>=222', required: false)
-+if not sdbus_dep.found()
-+  sdbus_dep = dependency('libelogind', version: '>=239.3', required: false)
-+  if not sdbus_dep.found()
-+    error('sysprofd requires sd-bus but neither systemd nor elogind were found')
-+  endif
-+endif
-+
- sysprofd_deps = [
--  dependency('libsystemd', version: '>=222'),
-+  sdbus_dep,
-   dependency('glib-2.0'),
- ]
- 
--- 
-2.18.1
-
diff --git a/dev-util/sysprof/metadata.xml b/dev-util/sysprof/metadata.xml
index 2511f1c94370..7b2b574988e8 100644
--- a/dev-util/sysprof/metadata.xml
+++ b/dev-util/sysprof/metadata.xml
@@ -11,12 +11,6 @@
 	Sysprof handles shared libraries and applications do not need to be recompiled.
 	In fact they don't even have to be restarted.
 </longdescription>
-<use>
-	<flag name="elogind">Build the sysprofd daemon service, required to run the UI without root permissions.
-		Relies on <pkg>sys-auth/elogind</pkg> for sd-bus API.</flag>
-	<flag name="systemd">Build the sysprofd daemon service, required to run the UI without root permissions.
-		Relies on <pkg>sys-apps/systemd</pkg> for sd-bus API.</flag>
-</use>
 <slots>
 	<subslots>sysprof and sysprof-ui API version</subslots>
 </slots>
diff --git a/dev-util/sysprof/sysprof-3.32.0.ebuild b/dev-util/sysprof/sysprof-3.32.0.ebuild
deleted file mode 100644
index 0dd5b9278923..000000000000
--- a/dev-util/sysprof/sysprof-3.32.0.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 gnome.org gnome2-utils meson systemd xdg
-
-DESCRIPTION="System-wide Linux Profiler"
-HOMEPAGE="http://sysprof.com/"
-
-LICENSE="GPL-3+ GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="elogind gtk systemd"
-REQUIRED_USE="?? ( elogind systemd )"
-
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	sys-auth/polkit
-	gtk? ( >=x11-libs/gtk+-3.22.0:3 )
-	elogind? ( >=sys-auth/elogind-239.3 )
-	systemd? ( >=sys-apps/systemd-222:0= )
-"
-DEPEND="${RDEPEND}"
-# libxml2 required for glib-compile-resources; appstream-glib for appdata.xml developer_name tag translation
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	>=sys-kernel/linux-headers-2.6.32
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}"/3.30.2-elogind.patch )
-
-src_configure() {
-	# -Dwith_sysprofd=host currently unavailable from ebuild
-	local emesonargs=(
-		$(meson_use gtk enable_gtk)
-		-Dwith_sysprofd=$(usex systemd bundled $(usex elogind bundled none))
-		-Dsystemdunitdir=$(systemd_get_systemunitdir)
-		# -Ddebugdir
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	elog "On many systems, especially amd64, it is typical that with a modern"
-	elog "toolchain -fomit-frame-pointer for gcc is the default, because"
-	elog "debugging is still possible thanks to gcc4/gdb location list feature."
-	elog "However sysprof is not able to construct call trees if frame pointers"
-	elog "are not present. Therefore -fno-omit-frame-pointer CFLAGS is suggested"
-	elog "for the libraries and applications involved in the profiling. That"
-	elog "means a CPU register is used for the frame pointer instead of other"
-	elog "purposes, which means a very minimal performance loss when there is"
-	elog "register pressure."
-	if ! use systemd && ! use elogind; then
-		elog ""
-		elog "Without systemd or elogind, sysprof may not function when launched as a"
-		elog "regular user, thus suboptimal running from root account may be necessary."
-		if use gtk; then
-			elog "Under wayland, that limits the recording usage to sysprof-cli utility."
-		fi
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/dev-util/sysprof/sysprof-3.34.1-r1.ebuild b/dev-util/sysprof/sysprof-3.34.1-r1.ebuild
index e4924b71fee3..834dacd878d4 100644
--- a/dev-util/sysprof/sysprof-3.34.1-r1.ebuild
+++ b/dev-util/sysprof/sysprof-3.34.1-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://sysprof.com/"
 LICENSE="GPL-3+ GPL-2+"
 API_VERSION="3"
 SLOT="0/${API_VERSION}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gtk"
 
 RDEPEND="
diff --git a/dev-util/sysprof/sysprof-3.34.1.ebuild b/dev-util/sysprof/sysprof-3.34.1.ebuild
deleted file mode 100644
index 069a3186fe30..000000000000
--- a/dev-util/sysprof/sysprof-3.34.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson systemd xdg
-
-DESCRIPTION="System-wide Linux Profiler"
-HOMEPAGE="http://sysprof.com/"
-
-LICENSE="GPL-3+ GPL-2+"
-API_VERSION="3"
-SLOT="0/${API_VERSION}"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk"
-
-RDEPEND="
-	>=dev-libs/glib-2.61.3:2
-	gtk? (
-		>=x11-libs/gtk+-3.22.0:3
-		>=dev-libs/libdazzle-3.30.0
-	)
-	>=sys-auth/polkit-0.114
-	dev-util/sysprof-capture:${API_VERSION}
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-util/gdbus-codegen
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	>=sys-kernel/linux-headers-2.6.32
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	xdg_src_prepare
-	# These are installed by dev-util/sysprof-capture
-	sed -i -e '/install/d' src/libsysprof-capture/meson.build || die
-	sed -i -e 's/pkgconfig\.generate/subdir_done()\npkgconfig\.generate/' src/libsysprof-capture/meson.build || die
-}
-
-src_configure() {
-	# -Dwith_sysprofd=host currently unavailable from ebuild
-	local emesonargs=(
-		$(meson_use gtk enable_gtk)
-		-Dlibsysprof=true
-		-Dwith_sysprofd=bundled
-		-Dsystemdunitdir=$(systemd_get_systemunitdir)
-		# -Ddebugdir
-		-Dhelp=true
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	elog "On many systems, especially amd64, it is typical that with a modern"
-	elog "toolchain -fomit-frame-pointer for gcc is the default, because"
-	elog "debugging is still possible thanks to gcc4/gdb location list feature."
-	elog "However sysprof is not able to construct call trees if frame pointers"
-	elog "are not present. Therefore -fno-omit-frame-pointer CFLAGS is suggested"
-	elog "for the libraries and applications involved in the profiling. That"
-	elog "means a CPU register is used for the frame pointer instead of other"
-	elog "purposes, which means a very minimal performance loss when there is"
-	elog "register pressure."
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/dev-util/systemtap/Manifest b/dev-util/systemtap/Manifest
index df6a33002443..cbe182de5fbf 100644
--- a/dev-util/systemtap/Manifest
+++ b/dev-util/systemtap/Manifest
@@ -4,5 +4,5 @@ DIST systemtap-3.1.tar.gz 4885480 BLAKE2B 39352f7507eb924fdb79bbedcdad6c200abbb1
 DIST systemtap-4.0.tar.gz 5282312 BLAKE2B 9eac1cf9c9f13255ac12642c910b5591b0f5380b2a6337dedcb3d20785c0416900b9bee05f239632f7c548812be35ae90b24f524ab6f5c0c6ef474cf5de834a1 SHA512 66b5ba1902ed974101429dce9fee849273d3dc64e862c057177d158c5f284cc93299819ee8ee49d4bd3b7ff47a3512b1c68b74cad374147ce67fa406c7518c79
 EBUILD systemtap-2.4-r1.ebuild 1981 BLAKE2B b1453aba34d1b350506996289c0a73d40c44693a63b3c712a8c171b2f0c6e275c2299e0bc1e8f6b3b201a2591ee3bcbdf383c186f20a2fb430b86be483eee57c SHA512 2bd1b737d6290477bcf342b106a0a7d0e7f30faecbdf0bbecca5ada7791408de14e3125c86e858ead803b8d400034921b96a85471568ab8891453a715ac08b89
 EBUILD systemtap-3.1-r1.ebuild 2159 BLAKE2B cd9b29ffa2a66dd891621c86ab59acc5e91b716772db9ce08ac03177301b932f85e41036151a62eec86987e1eaf27fbba860a9cafd93b3d558c3ae8371b21fd0 SHA512 aed426fc39006ab3758fa657b9e8613b07a0bd92f6cef4cdf393cc4f2c66fd553e55da45450b4ff3d00dabdf592008763fc6bd94373e966371b3e26c66cf7fb6
-EBUILD systemtap-4.0-r1.ebuild 2637 BLAKE2B aa7cfe0603a437e356fe9cb806db9c3de2a5cb9da705369c90d132b1eebc6c8776492c5f85ae4e9f13727757456bb41122319bfda6dabfd23dd61d0bfebdda8d SHA512 9e9763dd1be41636d9890a36fa4a1cb631fed4786ba4ea46230366a95a39d26ffade78ced9d70b7e97c45436bb109414a2f347ee4d77c0a494ea00a63fae9d82
+EBUILD systemtap-4.0-r1.ebuild 2639 BLAKE2B 392ae64845a4488cc1ed28a2c72e8e25f3b3d65eefe6d45474e0dc4636d95dbf757da71762b09fc0671f8b813da22d6efb3f45a70f049b4c26c87645c14b3074 SHA512 0d7c8b4a9f10a18f5aac41ff7edc4690d25ddc6c686df5f2b07e4e19e0244c02c4e352cbaeb81060de9a5986ff8e5f2a933d625ea9b8719d0c968b36f895b895
 MISC metadata.xml 302 BLAKE2B 1118f1c8c5cb76bb140947afd86eefece0251d75fd99bf58decced339e68a700f140b30d7d7f77f8c89fdcd468e79906574ced8c9339498078e6cc9edab83922 SHA512 4db366a3c2ff95cd2cfe271cf4a50fa2d5189985620d3b9e51708f2811609e53eec2656589ff754731d018bf1c184a1bab662be8683c714a8621e9296eacd9a9
diff --git a/dev-util/systemtap/systemtap-4.0-r1.ebuild b/dev-util/systemtap/systemtap-4.0-r1.ebuild
index 4130583b5b76..5701ab62f0ac 100644
--- a/dev-util/systemtap/systemtap-4.0-r1.ebuild
+++ b/dev-util/systemtap/systemtap-4.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit linux-info autotools python-single-r1 user
 
diff --git a/dev-util/unifdef/Manifest b/dev-util/unifdef/Manifest
index ec6ccb575b85..cfd1ab8704a4 100644
--- a/dev-util/unifdef/Manifest
+++ b/dev-util/unifdef/Manifest
@@ -1,7 +1,7 @@
 DIST unifdef-2.10.tar.gz 73285 BLAKE2B e13b75afc9b8e514559b8a13e3069bfb1cb489d21ce4ac56134921e702666bd9b23dad36d251cb65535e5d6fe02bea0d21a5610c542d727dc5e90d7e1726e4dd SHA512 39d4551f43fa8eccaee8a9fc469b5ddc8ca8eb0e0ce46c17c3a8300f7e6960fbf0960f364a83df20059b4aa623edc7c3c16df1b7162f068332e6c066d7ffe9b3
 DIST unifdef-2.11.tar.gz 77947 BLAKE2B 2ddc1a300b329ae91f72f1a8dad86443ba36fc02c7205eacafe1ec3ef82467003bb855c32485e6ca92b61dc45d160990b8aad531ace60ba3e55967f900150af6 SHA512 948abf878852da321f15c6060dfe33a2ab38f1787b0a6096f10bb3828d0b4e50226643e9dbcb678a422868c215b5c4e981dc7da5244d38688e8e91287beb8845
 DIST unifdef-2.12.tar.gz 87091 BLAKE2B d14072f79b9d8b17a033c7068a3c6a423c2e66570aac6d232e387ffd256bc66ad3c4c1467b6f101124bf494f2c12c7b8d37c64104623b0022e435a7e5aa78d5a SHA512 9a00f69309578817af5b3a6cf45f293506e8326b520bed7c0ab2f66661e32a115b7f5aa9b0572cfbee5887044e5f0d70967904ec137172e67a1aab5abe09d3b5
-EBUILD unifdef-2.10.ebuild 550 BLAKE2B 523e6498bc830021dfc59732c78984c069456748f0687e6de71a98465e1555dd96bc30c91eb4a284ade9caf7a35b173368c897255d4d5e61ee7686ca614c6985 SHA512 be8e0502545b4bab9f7ace36d5ae16e544faec4ecd13c892cd7546a57089b834edb73a281ec7ec4b72710511f60bb0e3f0b6af5a1612ba991c96270ceb8fb0a4
+EBUILD unifdef-2.10.ebuild 551 BLAKE2B 52aaf8030dee7a4fccb6f83edae9f37b0fd7adaf21b86b63729a94b7827e48b3d2a95822a1dc086f47f898a6a7f0c35d152fa87ec535ba7308ba95c5c050dedc SHA512 0172ef5c6eb302414b72b6b46a78db39a5b9621d30f3f2ed2e86953b6e20f2c8a248a925231c67f7a26748a61e68131bc4677b9d795b66b3daffb59cc4971051
 EBUILD unifdef-2.11.ebuild 569 BLAKE2B 02870cff451d8cd6409099e4c79d3021e08489f2b818aaf4f932c6beacc7db258a370001861378e700188850dac29145b045e6aae3a6f0308c1f86b4554965ac SHA512 502d0aaa6c866b8a08121f6423ab51b399c8acb50e132a56c2d6fa0ea2646631074060229a5d04591f8edf2e874cb88f6363e8c191c64b85ae1bbdf2dbb39a38
 EBUILD unifdef-2.12.ebuild 569 BLAKE2B 02870cff451d8cd6409099e4c79d3021e08489f2b818aaf4f932c6beacc7db258a370001861378e700188850dac29145b045e6aae3a6f0308c1f86b4554965ac SHA512 502d0aaa6c866b8a08121f6423ab51b399c8acb50e132a56c2d6fa0ea2646631074060229a5d04591f8edf2e874cb88f6363e8c191c64b85ae1bbdf2dbb39a38
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-util/unifdef/unifdef-2.10.ebuild b/dev-util/unifdef/unifdef-2.10.ebuild
index 65b04c5d0a0e..e4d1dd5d88e4 100644
--- a/dev-util/unifdef/unifdef-2.10.ebuild
+++ b/dev-util/unifdef/unifdef-2.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dotat.at/prog/unifdef/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 
 DOCS=( README )
 
diff --git a/dev-util/wxglade/Manifest b/dev-util/wxglade/Manifest
index 4e5c5df50c9c..0344a4366e1a 100644
--- a/dev-util/wxglade/Manifest
+++ b/dev-util/wxglade/Manifest
@@ -1,4 +1,4 @@
 AUX wxglade-0.6.3-wxversion.patch 357 BLAKE2B bd9f6ca3ad8b33d8f152aa067617cdee4b9b2e9302f7585ce9dfe84f7ac3c2c4cb5fbe0719eff92c61bb918a616a03a058a13e7efe6bfba404cf71bd4c165914 SHA512 6a3ab0d1365d7c511d3d360a95ded27abb4eebc1cf605712603934134c6da96d8d2fe4aea71c9b6d3a2fa1b0ff280f3cfc1b9198608b1e7b6a450ac7b62b06b0
 DIST wxGlade-0.8.2.zip 4682765 BLAKE2B b9c6a0fe5ca89dce4ba8236c1db079df76777ecff34c00b9251088f39e5c853c8b775a2d941fa7f45a4f607354b85ab6cb26b387bd7e81f4db9cf458944fecc0 SHA512 d74f0b88509232b5f573af70f643af840c96e810060fdffc413f71ad03acca0fdb0324fefe43ab2a36473d8b053259099883d4aae51afff0c1c0b0ece492f9d7
-EBUILD wxglade-0.8.2-r1.ebuild 1152 BLAKE2B 2127d501f03bf92e72d54159838b2386c07ba37bce9bb899ba6208558e7e3cbf8d0674ba765988a80742009c64015104658f6e0e2e6fa0cf1fac0ccfa1578ce6 SHA512 96099cec0e21507af065de13ec7f40b66b7d1104c9158b7996c28f8eee4ceced2e62eb1b741871c0e5e98b28272b13fc25cdf8a8a04dc07eee9e1a479d4cee3b
+EBUILD wxglade-0.8.2-r1.ebuild 1153 BLAKE2B 590f7fa4176cfec3de5e0630316db5e3812b363b996c4092b38b3b687331bb151ac1567cc180e596a034060d04545ef1d8e5c220a4f8906244a6d2ff152bc244 SHA512 676c04e94ddd326ea7f8f32f8416ae29a8c7af09b8933a6d1ca5e7f47aee1d5b00e87d0e1393c16e86452efca9a63d5d6f7629c56d21ed7b952e9a4a403a29dd
 MISC metadata.xml 338 BLAKE2B 646f91107076526a1d1e8c838869a20f69f0a13ed96a209ede0fedc8b10151ee18becd720646193994281de671a7d51ae7dc99c8652acda63bc73e72c6e57d33 SHA512 a5c2365b0607137be3ea999914329a9ffb3390065163f1f4bc818247ee9d8bfb7b4494c533f739870a31bd5ee484b9ff4199f279a9202708c1742513b0a48b97
diff --git a/dev-util/wxglade/wxglade-0.8.2-r1.ebuild b/dev-util/wxglade/wxglade-0.8.2-r1.ebuild
index 98f28398bcb8..f3625d5a09d5 100644
--- a/dev-util/wxglade/wxglade-0.8.2-r1.ebuild
+++ b/dev-util/wxglade/wxglade-0.8.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/wxglade/${MY_P}.zip"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
author	V3n3RiX <venerix@redcorelinux.org>	2020-04-25 11:37:10 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-04-25 11:37:10 +0100
commit	38423c67c8a23f6a1bc42038193182e2da3116eb (patch)
tree	04e2cf4bd43601b77daa79fe654e409187093c5e /dev-util
parent	623ee73d661e5ed8475cb264511f683407d87365 (diff)