gentoo resync : 17.02.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-02-17 10:35:54 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-02-17 10:35:54 +0000
commit: 463397cf1e064185110fe57c568d73f99a06f5d1 (patch)
tree: 9aa75eefc5154eaf0e3c33658b830fc54dc68052 /dev-util
parent: c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 (diff)
89 files changed, 799 insertions, 300 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 433434ce69f7..b010edf5c495 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bcpp/Manifest b/dev-util/bcpp/Manifest
index cc95962c9844..8e2676ffe611 100644
--- a/dev-util/bcpp/Manifest
+++ b/dev-util/bcpp/Manifest
@@ -1,5 +1,5 @@
 DIST bcpp-20150811.tgz 145969 BLAKE2B c7cdb21b6c07599c93c6f3fdf6ca4f5e825d4ae5f955e1c969d744a9ff2594bf3c7dcded1582dff695201f6e7e8ed57d5796883b63c5c57476c6601da6a49717 SHA512 a11462574bd87cf66dc50ce23f188d335480aae5448b527694791d4b7ae5cde27c0e0c0850dc8899b2b66198c37a434985c833f95f7f2d2d88a3b7dfe4ff34a9
 DIST bcpp-20210108.tgz 150080 BLAKE2B 5614b1e9957d63532ed6ba6d4588ae8b899201c363984bc99726bf48ae49ee9d16a71c407e3988fdeb715fef5e67343bc56c94eb1c8e977a14a6c2b08ee6668a SHA512 46a8fff766bbca4833c898d550ce4f0ac5e6ea64a2e05e63e4680186345a080aa30e54a4a5a3d22d47df8e8c8cbc4e738578fd59ec647d305c32a228d3b01e73
 EBUILD bcpp-20150811-r1.ebuild 903 BLAKE2B c12d2b5f335f5e0d247f14103366a52de0964e56f502d422e9b013dca58bce2c2d8a6194c69002397e4cde5f9a3243a99f03fcb146d02976b096eb61ea2228fb SHA512 9782454f880605021845b3635f4c873f2675f34a22533c43e590ad11f847a5432bacaaecb4aeaa35ada613ba2f37e2b538672bc3fcde99a3fa65167e23baa13c
-EBUILD bcpp-20210108.ebuild 904 BLAKE2B 08572081987ce9581d3ef49da3893816a13aaa665d2ff8a6440ae862e194231292e9548c0dcd1cac4c1af778a433d9d16536d2f8a1bb7ff672bfe5f54c3dd5ec SHA512 4a260b5b446599ad97e97c9a0927eaf439f9755a1888399066efb14b8f168b304950404cb278bf023ca5638a68ce465f904667e864e66d3bacabea49decd44a5
+EBUILD bcpp-20210108.ebuild 903 BLAKE2B 3748ffc0caa34f1a2a64e29bd7f586406ff45ac63ad6b9fa4a5bc6eb90040d71df74eba132ada63340b1e450d90d961de1e02c6e1921d5395d2ff8771eb7a916 SHA512 59c925ed7e6bd7015bdef7febdc9682e424793df4e568f70b5fc641d2fc65f286deb9b5d421af9159496871a64507c97a896274ac03e430a97f95369ae771f07
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/bcpp/bcpp-20210108.ebuild b/dev-util/bcpp/bcpp-20210108.ebuild
index 244592ad4d7f..dbb5c4e1bf49 100644
--- a/dev-util/bcpp/bcpp-20210108.ebuild
+++ b/dev-util/bcpp/bcpp-20210108.ebuild
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.invisible-island.net/bcpp/${P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 src_compile() {
 	emake CPPFLAGS='-DBCPP_CONFIG_DIR=\"/etc/bcpp/\"'
diff --git a/dev-util/bless/Manifest b/dev-util/bless/Manifest
index db45b6d0e993..8452bf382c72 100644
--- a/dev-util/bless/Manifest
+++ b/dev-util/bless/Manifest
@@ -1,4 +1,6 @@
 AUX bless-0.6.2-range-disambiguation.patch 6964 BLAKE2B 65708f4fdae5b9b2d9afcd2fb326bdc414decf265557071314b1f539fe6742364b58acd69dce32d50db0173f00d13aa6e4808baae6e16217d62ccec9a45f1189 SHA512 03a0507db3ef4384344c6ee9f04c59879a48315adf219ba32afb10c9dee7d33a8a5543e4751e5b09bd61fd9955d22e35ff841b6f3ad68f9c827be7f803806751
 DIST bless-0.6.2.tar.gz 514695 BLAKE2B 2c9681e03992d42b20d0073e9107e5bd83d6f1699235b49fb6cf14fb5f9bc87e682e96b4f8bab2b45a3211515a8990e72b80922a62198c7ad603aeb5f3d3c406 SHA512 3fef715ed138323af50437ef8cda3d9f53987498042f1b4df2d9ce23f00dade68147cbdf28b85aed8b9c594fb5c43839c9dedbc14a994ad609fd4cedd89bfcf5
+DIST bless-0.6.3.tar.gz 532687 BLAKE2B ce710ba1883fff9f0f77ca08c02573a3de756e9a2b6cdfad9dffd8d00c1d89648fc68218dd322f9e1ab6e0b42d205148c4a1d99546ba42b58689fe58511b7ed8 SHA512 22841b6f1b923ebfc7952ad9233cffb30df4ecb22a655f6461ff3cc97066a8c68ffc6bbd88e4fd83c345226928ed08c557f2f322942766da61bcd2b2c7f7d3cb
 EBUILD bless-0.6.2-r1.ebuild 1154 BLAKE2B 7eaa666aac4660ac2ca6fb5d36557bd7a5fea0abff6256d06086e65e2e013b847d37138ae45677a6d014d590572699ea466fd70d091257e4388026a828d9aba4 SHA512 70510946131504f9fb49d8809310d91e6353f9326f084ff0a537fcd366e237d9aa0a74ed171b4db0d0a29039c371f04a9879bd6e01dcc5b0002e2c1fa03932e0
+EBUILD bless-0.6.3.ebuild 856 BLAKE2B d110c545dfed604a8fe7c6a79e3ad591c12db08c55ca3da3bcddd162ea84a601be5908ade0a4e14891c32f52ab048f5d25ae7e6029ecd9bc495e23e519d32744 SHA512 3f0e2551047324ad143347add4a7f467b111bad1fd08d582b81189e9d911c7fb1e81a38928022d3ef74ee062b25e3415089853e622fb573e16329f40e10416e9
 MISC metadata.xml 242 BLAKE2B 896ec48a498764d193d9e3c54bfc07d07a6f95675e772ff73730bbdfb8cce43d2d1d99fbd0ee96a6c0ad3eab13e6a82bff55ce3a1e5a6883204fe8c5d5932f0f SHA512 c305f98db61dfe31ddc48084c932b6c45eee7a8cd664ebeade704135fb1da0978ace942a2a4d92d418ad4bdd22acd0685864cf0f4297660fc325cd3842e283e9
diff --git a/dev-util/bless/bless-0.6.3.ebuild b/dev-util/bless/bless-0.6.3.ebuild
new file mode 100644
index 000000000000..1d4264121f8b
--- /dev/null
+++ b/dev-util/bless/bless-0.6.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit meson gnome2
+
+DESCRIPTION="GTK# Hex Editor"
+HOMEPAGE="https://github.com/afrantzis/Bless/"
+SRC_URI="https://github.com/afrantzis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+# EGIT_REPO_URI="https://github.com/afrantzis/bless/"
+# EGIT_COMMIT="v${PV}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug test"
+
+RDEPEND="
+	>=dev-util/meson-0.46
+	>=dev-lang/mono-1.1.14
+	>=dev-dotnet/gtk-sharp-2.12.21:2
+"
+DEPEND="${RDEPEND}
+	app-text/rarian
+	>=sys-devel/gettext-0.15
+	virtual/pkgconfig
+"
+
+# See bug 278162
+# Waiting on nunit ebuild entering the tree
+RESTRICT="test"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use test tests)
+	)
+
+	meson_src_configure
+}
+
+src_compile() {
+	meson_src_compile
+}
+
+src_install() {
+	meson_src_install
+}
diff --git a/dev-util/catkin/Manifest b/dev-util/catkin/Manifest
index 4e152ddfe539..1397294354f8 100644
--- a/dev-util/catkin/Manifest
+++ b/dev-util/catkin/Manifest
@@ -8,6 +8,6 @@ AUX gtest.patch 1676 BLAKE2B 2f53c95833d47d6637d4aecd07212e33be66e576ed2d869c221
 AUX package_xml.patch 1588 BLAKE2B 15a11031b704f307778e8cb85438851bfa38a2784abee9c544a10fa4e61036ffb45a391f40eacd7f97ec92abf060a1afc790d87cc1cfa40ddc07561db14c027f SHA512 7d6e1cb0076681c6cbb1332b05e6cd33bae4f780939e00412fd4b022f71b0418a4ff4f8e13d06f42fd21225e78d058818d680fef691dad4412d75ea0f0ef9f5e
 AUX tests.patch 1640 BLAKE2B cc0d89a779ad056806b1c721709c1318278cb836e539042071e83acaa0aaffed9c316ed482a821219c9c074c71ea15bad343a7f63b887b9b266982fe4afe7f71 SHA512 a53ff72bf5302107241d43a0daa8ff18c50b6e69c0e1ecf2a841ace8d37fe7f3e8cb4202b666ad3bdda1bcb7d79f39244308542e1992b9af94d97bcec7086913
 DIST catkin-0.8.9.tar.gz 217743 BLAKE2B e59df77a7df04492942917377f4f3dd9e302e20fd901bbc8878d1f51879a481e15b01482db4f1d3b8d1eee360779bedb5d999663fe58f10d33c5e4f1964a3be7 SHA512 a34784d349935f5917e7d4600c5ad3e728a86d8ed235fb3be86b4dec212693a1e4209901929d284e50c112f31ada62a04a9caf9845ee06c6db2e98e79602ecd9
-EBUILD catkin-0.8.9.ebuild 3152 BLAKE2B c0447746bfdff1ced27423db17872cbbd2eaa27013e8b0ee340e9e0add06e6cf6a44f881cdb618c6fbf0f769828402f98ad83e9cc3fa9279b89cc3ca5f34a873 SHA512 1e418504612d314daa5c5cf8efbb1ab26b6a249f6a0ba96a22cf1065ae1c43ec88d7399ebfc9588ff24b20b526824325b3ad6fb6128f497b1973f9dda32b983b
-EBUILD catkin-9999.ebuild 3152 BLAKE2B 349565c28a813851db2dd89a8805c0fd2e78c0a64c2c317147177227efcc620ac48d7b7d3f8eb285bc426e0dbbf508157cb9de70704417be3398a1c9376e6535 SHA512 fe9d12aab13782331ec2ad34f355b86e0367c17aa6851afb3d5dee20a6114b17a83adb0a473aff7c8be2f88ae726c9ce265a1084ddda9ac618cbd6246d504ac0
+EBUILD catkin-0.8.9.ebuild 3139 BLAKE2B 814f839892968462a8d1cef298f0e7ae91f071e377f497dc11e11e342fa3552192469596e04453c01a748e434d4487642216a28a30a544f895a681eb5f3fb9d4 SHA512 4f14a2fbee4f8abd1df90d96c1a94849057adebaf7fc51f99877c76e53b75d6296812ee7dce246053de3b5b056ea52ccdbf7b4f8ccf81d29eb32a1ab60e99165
+EBUILD catkin-9999.ebuild 3139 BLAKE2B 814f839892968462a8d1cef298f0e7ae91f071e377f497dc11e11e342fa3552192469596e04453c01a748e434d4487642216a28a30a544f895a681eb5f3fb9d4 SHA512 4f14a2fbee4f8abd1df90d96c1a94849057adebaf7fc51f99877c76e53b75d6296812ee7dce246053de3b5b056ea52ccdbf7b4f8ccf81d29eb32a1ab60e99165
 MISC metadata.xml 324 BLAKE2B 393e10af3d1bef82391a91bbf6382d9d1cafcdfe8a681b3a24844427cee1e3aa36f27ffd0a37a65b8a476ce0b3f2a860f546adc32c480164c69f66673bb0b5f4 SHA512 598dc8dd4427079a7eeca415c192ec39e99e53bc41c06796d2355b8858363b71ee8f038646c61ddd82d27451eb48c6f93b47489cdb04ae7c8663a6b46c4f9b94
diff --git a/dev-util/catkin/catkin-0.8.9.ebuild b/dev-util/catkin/catkin-0.8.9.ebuild
index a7ca681ed537..65304103f95e 100644
--- a/dev-util/catkin/catkin-0.8.9.ebuild
+++ b/dev-util/catkin/catkin-0.8.9.ebuild
@@ -17,7 +17,6 @@ DESCRIPTION="Cmake macros and associated python code used to build some parts of
 HOMEPAGE="https://wiki.ros.org/catkin"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/ros/catkin/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm"
diff --git a/dev-util/catkin/catkin-9999.ebuild b/dev-util/catkin/catkin-9999.ebuild
index 262ed3d74b20..65304103f95e 100644
--- a/dev-util/catkin/catkin-9999.ebuild
+++ b/dev-util/catkin/catkin-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,6 @@ DESCRIPTION="Cmake macros and associated python code used to build some parts of
 HOMEPAGE="https://wiki.ros.org/catkin"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/ros/catkin/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm"
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index e11bfbd2b8ea..f7ee051709fd 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,9 +1,10 @@
 AUX ccache-3.5-nvcc-test.patch 262 BLAKE2B b33b6372e8e6c597d7ed6c781f0a3ac22c435d1309fe387e62c5f9b61c783294ec81cfd1c8a0afc60e63148dcc89f95ebc6d313a0567431a8d05c96e3d59bae1 SHA512 651e26335df8eb551f95064d67925d6e7dd15c8a082b291cdea31fcbc2e5482b2358de71c205c668173b3dc5a75ef004d95dbdd92391e4a4aa6bc1283f5f3a72
 AUX ccache-4.0-objdump.patch 271 BLAKE2B e641f1acef1e439660753c781d5760ab2a2530ce8dbcfacb1c3835523ec41ff35701536698827f11c39c1e06641fcf6b57d374944ecb44888a66c7860f97b813 SHA512 cc53f44b173c1ae66258aa573182ae936304dac9daf8489a20c45dbe3d554df207bd93b370da2c86b22fbc4edf5fd954f84fd18812d97d41a88ea4c7926f117c
 AUX ccache-4.1-avoid-run-user.patch 557 BLAKE2B 956ac163da6c8acdefb5b395549067272beea095e93686cf553d534c94d76c1c032ef3423f851907367006e1e7bc7b4afe1494bef1eb293e5aca2e3625c29c10 SHA512 bbdd370e478839980423777053baa42ce37cd18ebf8cd36d3f5b13d9252c38b17840ab6e71aefda20a9903bd4a85e4cdb4582728a9db9d1e847b0ee9569bba9e
+AUX ccache-4.2-atomic.patch 236 BLAKE2B 39afe8910b218fd29261b2805cd583daaddb2e18caf136bf5f01b4fcec002a9717ebfacb028396c69ae56f7aa61aefdbb0c3e05da0545a2a3bf87aa1ab32b300 SHA512 b07868200e13b562027aa95a4d4ad949f0d9ef3e5e277a4ed67720e12cda54ddac0443b70e1c17bf8255ea70492d9d9a9931bc1fcb400ef3b134013719dbd267
 AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b30c381b0df28be9c0ae7c0f1d7325282e97ca54881171846c13945b264bd4a793785ff1a19d0941669 SHA512 05d512b001b6a2fdc947d10d810c89683144080a060c24a37422e9b587594e1ee42fa1d7607461571f196819dae92146d861e8ae116e9226e1ff97ea035b3003
 DIST ccache-4.1.tar.xz 389240 BLAKE2B 265ed6cd9602a04db0fadf63266d0fe1e78a74c69a27f05854a287e4048934d6afd63e71987bc525217782075c1a158601c400f3418caa0eb9730f34275bd08c SHA512 e80075eeea3fef8215de0a793e02381bfb59d7e74237fa34a49306047c60f0de0e678396ad3a9e5d86d3ad2aa21bbe29c7f0055f06b3ba2470f6895ce2eedd7b
 DIST ccache-4.2.tar.xz 422688 BLAKE2B 932db2e4f6ef9d98359fe44f931d083acb9fd32661d9baec5a2d0cfffc9301a999b04e4628d31513ec809bf43e3e94d71f9b92a1c83bcebbaf5e35e219596704 SHA512 b7e5823a0705b9a1100c959281170dcd682228b585c329821337ef57d5b5cf47d6f3d644a6d5a3675a32a02730559f8fe6d84d11f01847f47b77c0893d1d1fbe
 EBUILD ccache-4.1.ebuild 1726 BLAKE2B 26faa29d244714adedc0a6f7306ea92d39ab152be9ba623491c195207d6685a5e8b265fb264bfc75d8ee6679b0ea872b50a18656e517bb507c630b02c312340e SHA512 215de272d0ecb95fbb6acf0fd0cf5760c953d20fc922e39c1ef159034a4db82100911177f199c1a1b9ada1cb16723fbbaa24de4b15e3881b18e686ab8b6b09df
-EBUILD ccache-4.2.ebuild 1662 BLAKE2B 3747ef40e6edd8f35a9c2760200593bb93c222b5864f9edda872413f1f54393b01402c675a7e39280786d32f87f2a798286f6ab6c14993a366d76c6e7548eef3 SHA512 7538e49273de477d4bc77b8db6e093c5c222d59c5c25383677195399a89bce281d64014b8631ab107c5af05c04aef69f6872a55631fecaee3a81b36d957b5921
+EBUILD ccache-4.2.ebuild 1700 BLAKE2B d07f54c529556c12f55efa296fd4b2037f9232d1d82476f2091165d84f0126fe783a67f07c4f4ffd539ddf4e1b9f7aead70fffc11dc0d66f32a72fd5fb9d97c5 SHA512 50e2e5ac0675240f0fadf085451cb0811708e112c6d0394845428ca8a4a84ba729ee098f95012b9b414fbb4ec4a035f5b8932c0eec0ee3702e42c928be2f95ca
 MISC metadata.xml 445 BLAKE2B 8ef8f120989420428ea85108180c659c72a7553f3f20ab96597d26aa04b059f491aeae8c887697a214c437f2dba30fbb934cb47c1db93821eda7dd489e6cb693 SHA512 41ffcad23c9f0274c48a058090d6404cd782dea6674b81615a6b3b7fa272ff5df4c68404fb4dcdb9d2275c13fb137f21f0f65232d5fb1ef6152cc25213893249
diff --git a/dev-util/ccache/ccache-4.2.ebuild b/dev-util/ccache/ccache-4.2.ebuild
index 3f58044c6822..c34ca6a6ca30 100644
--- a/dev-util/ccache/ccache-4.2.ebuild
+++ b/dev-util/ccache/ccache-4.2.ebuild
@@ -37,6 +37,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
 	"${FILESDIR}"/${PN}-4.0-objdump.patch
 	"${FILESDIR}"/${PN}-4.1-avoid-run-user.patch
+	"${FILESDIR}"/${PN}-4.2-atomic.patch
 )
 
 src_prepare() {
diff --git a/dev-util/ccache/files/ccache-4.2-atomic.patch b/dev-util/ccache/files/ccache-4.2-atomic.patch
new file mode 100644
index 000000000000..6148e232af9d
--- /dev/null
+++ b/dev-util/ccache/files/ccache-4.2-atomic.patch
@@ -0,0 +1,11 @@
+https://github.com/ccache/ccache/pull/800
+--- a/cmake/StdAtomic.cmake
++++ b/cmake/StdAtomic.cmake
+@@ -10,6 +10,7 @@ set(
+     int main()
+     {
+       std::atomic<long long> x;
++      ++x;
+       (void)x.load();
+       return 0;
+     }
diff --git a/dev-util/clion/Manifest b/dev-util/clion/Manifest
index 4a6ef0fd97be..5ae0b7c89f12 100644
--- a/dev-util/clion/Manifest
+++ b/dev-util/clion/Manifest
@@ -1,5 +1,3 @@
-DIST CLion-2020.3.1.tar.gz 624087156 BLAKE2B 5e67194ee08d837da4b5f62707d89befb40b89f577502b8f7575da7765cdf5d8bcebca4276fe75c6d4f154c2de10dc76a1507e944e3155382aa3507a3203a36a SHA512 e0338da95d909af00ad6c1901584971062f0e2aa2a0b6de7b75ac6cb6cd4a90ac09831d1e6a3770f61e2da81a969c3428693c2e192cadd623e7c4b0b094319a0
-DIST clion-2020.2.4.tar.gz 554105965 BLAKE2B f2854abed5773647152d1631e6b3a5493683336b63b6435af7461f41e1e001e834cdf9a4113a6a0ba4e1fd956d5b8a7706ac7b1f28db59ce6a9e05718cbd07b2 SHA512 f0fc517588bf1d61227bd65aa71da3276a643b67ca5dfe4dfc7d6460db5498fe5f2a86a9d5a98d5d3dbef1624baf926093e2a07fab84431d0c9b8daaaffc8a4f
-EBUILD clion-2020.2.4.ebuild 2181 BLAKE2B 7295567cd18a4672aaf8cdd39c8c3795f38c5ce63763628524780eec2c209088ed407bb76c8409bd9aa2567387bbe370d75428bf6df1bb8454739ec6957a0192 SHA512 cf096417f6e0d4493b711add4e253f62ec7e8e9cb29cf1740daecf2b23804b639059ed3b75f09f80f39d188816b9a8803f3e7dca200ade1d182e42f052d04580
-EBUILD clion-2020.3.1-r1.ebuild 2745 BLAKE2B 3d643fefb54fed93ab82bc6764b049990d5dc4fd33922ffb0dd248f1a06896cfeda36ecc9c95260687437cf4bc78b97eab76286ff328cb9e60363f9112eb9d0a SHA512 fb868e55e348552c2797c33c843e9a01fa304e4b0bdb9e7bf7ae4aac129e1c8a226a6eef2f4e8efb492f112ed9a6e49a863e90b8159332803bbcf6ca29f7faa3
-MISC metadata.xml 458 BLAKE2B 1393fb2b8c1487a670f3c2fc7c2fe9246d8f18bc7d33e2d494f0ffc3a3492285dab041f3cf810d16e78a312dd3936eb9bad0838ff9a8c3b6a4b7d80b90764fc4 SHA512 c00a66b6722a62222d06c325df55a3d946267ce7a4a452855933d721b936cd05aae5e9acdb784fc8e97235ead35e6625522c579397f43e9755619b1a8dcaccc7
+DIST CLion-2020.3.2.tar.gz 624043209 BLAKE2B 9a7d1ea2e83c06c27b595f042ba1a9768445ca0d79f6e2e227ed01252b49a72abf0f8c57d9418af31fc9f292bbe4d16306a1359dbf4622170f46d0e22f0b0999 SHA512 a70e9c8393ca8f96e51c2a575dbb67efee61d840198ed5d2dfff19a4d6e63f0612cbdc05752589b29702bb0c90ab1fa07859793f9bbd61d4a5afdd6a33dbae04
+EBUILD clion-2020.3.2.ebuild 2745 BLAKE2B 3d643fefb54fed93ab82bc6764b049990d5dc4fd33922ffb0dd248f1a06896cfeda36ecc9c95260687437cf4bc78b97eab76286ff328cb9e60363f9112eb9d0a SHA512 fb868e55e348552c2797c33c843e9a01fa304e4b0bdb9e7bf7ae4aac129e1c8a226a6eef2f4e8efb492f112ed9a6e49a863e90b8159332803bbcf6ca29f7faa3
+MISC metadata.xml 371 BLAKE2B c653f9e3be558bce98e7e901ec8d83c5e4d415730e18d2130ee35b3ede543a234f6bc40046cfed81b622d64893079a7052bb6cba0bca65486d5461c673daf12b SHA512 70640a8a676dde6f366f3ad3f81709103f229bdda41b1af50f238668876335692c7f8b6806610c24df6dcaedd8d86f58c6eed1f9befe9fe66dec9d95827a574a
diff --git a/dev-util/clion/clion-2020.2.4.ebuild b/dev-util/clion/clion-2020.2.4.ebuild
deleted file mode 100644
index 1fd308530f3a..000000000000
--- a/dev-util/clion/clion-2020.2.4.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop wrapper
-
-DESCRIPTION="A complete toolset for C and C++ development"
-HOMEPAGE="https://www.jetbrains.com/clion"
-SRC_URI="https://download.jetbrains.com/cpp/CLion-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( IDEA IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )
-	Apache-1.1 Apache-2.0 BSD BSD-2 CC0-1.0 CDDL-1.1 CPL-0.5 CPL-1.0
-	EPL-1.0 EPL-2.0 GPL-2 GPL-2-with-classpath-exception GPL-3 ISC JDOM
-	LGPL-2.1+ LGPL-3 MIT MPL-1.0 MPL-1.1 OFL public-domain PSF-2 UoI-NCSA ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="bindist mirror splitdebug"
-IUSE="custom-jdk"
-
-# RDEPENDS may cause false positives in repoman.
-# clion requires cmake and gdb at runtime to build and debug C/C++ projects
-RDEPEND="
-	dev-libs/libdbusmenu
-	dev-util/cmake
-	sys-devel/gdb
-	!custom-jdk? ( virtual/jdk )"
-
-QA_PREBUILT="opt/${P}/*"
-
-src_prepare() {
-	default
-
-	local remove_me=(
-		bin/gdb/linux
-		bin/lldb/linux
-		bin/cmake
-		license/CMake*
-		lib/pty4j-native/linux/ppc64le
-	)
-
-	use amd64 || remove_me+=( bin/fsnotifier64 lib/pty4j-native/linux/x86_64)
-	use x86 || remove_me+=( bin/fsnotifier lib/pty4j-native/linux/x86)
-
-	use custom-jdk || remove_me+=( jbr )
-
-	rm -rv "${remove_me[@]}" || die
-}
-
-src_install() {
-	local dir="/opt/${P}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}"/bin/{clion.sh,clang/linux/clang{d,-tidy}}
-
-	if use amd64; then
-		fperms 755 "${dir}"/bin/fsnotifier64
-	fi
-	if use arm; then
-		fperms 755 "${dir}"/bin/fsnotifier-arm
-	fi
-	if use x86; then
-		fperms 755 "${dir}"/bin/fsnotifier
-	fi
-
-	if use custom-jdk; then
-		if [[ -d jbr ]]; then
-			fperms 755 "${dir}"/jbr/bin/{jaotc,java,javac,jdb,jjs,jrunscript,keytool,pack200,rmid,rmiregistry,serialver,unpack200}
-		fi
-	fi
-
-	make_wrapper "${PN}" "${dir}/bin/${PN}.sh"
-	newicon "bin/${PN}.svg" "${PN}.svg"
-	make_desktop_entry "${PN}" "clion" "${PN}" "Development;IDE;"
-
-	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
-	dodir /usr/lib/sysctl.d/
-	echo "fs.inotify.max_user_watches = 524288" > "${D}/usr/lib/sysctl.d/30-clion-inotify-watches.conf" || die
-}
diff --git a/dev-util/clion/clion-2020.3.1-r1.ebuild b/dev-util/clion/clion-2020.3.2.ebuild
index a78766675052..a78766675052 100644
--- a/dev-util/clion/clion-2020.3.1-r1.ebuild
+++ b/dev-util/clion/clion-2020.3.2.ebuild
diff --git a/dev-util/clion/metadata.xml b/dev-util/clion/metadata.xml
index 7b00c206608d..c92d84e054d0 100644
--- a/dev-util/clion/metadata.xml
+++ b/dev-util/clion/metadata.xml
@@ -9,7 +9,4 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>		
-	<use>
-		<flag name="custom-jdk">Install and use IntelliJ's custom JRE.</flag>
-	</use>
 </pkgmetadata>
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 81b4fab50d34..d1e821e646c5 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -19,11 +19,11 @@ AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b54345
 DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 765678bc92821207c53bfb4ac995a791b938f20236c3a6fda873b8edd11cd1401b4f4c05f170b8f600f38bde5f1227c715499eee072a8de3bb29d4f5cd230226 SHA512 99e3a8f5bc147dd90b9cab11f06892d87f289aa1354ad323711fe96ebc9c32b1e887e8f9d3575a37831c4d2153a070ff9115c5e27a185d54170bad9dbbaabc26
 DIST cmake-3.17.4.tar.gz 9473549 BLAKE2B 2ce29415525b5292ae9e06d73570ed0af2173d8d15612f4d645f22d4f55cb99018663c374c4282731e09f8c6e4ffd59316d65f38aef9db5c34d874ca8992382b SHA512 6af879502e52388f3be02a4edfb006274840ad1afa8f28ffd6ec69b0310c7f718812b2272e5f77ffa422717f61407a6d482deb95941555c21c73fc5f62356a4e
 DIST cmake-3.18.5.tar.gz 8975784 BLAKE2B 62ea68b602e7e352c22ba6122aa010fb78fb5c4e484aa51bc336e750280d5fc03ffa439bd8005d2c43176f5a5db4ebfd419beca65cc59c5b8cd5666e38394fb8 SHA512 c15e0937a9c0ce0b6164c3d02a147e679ea57e1119cff4189a15de71429a7facb3c04eb8db467471876b5da5dbd4a25acb228efa7101fe78efd205f0d2c96343
-DIST cmake-3.19.3.tar.gz 9265831 BLAKE2B 133ca8b12c0ccff0f9d833543c66cac597d72898d6e8602c74ef2875c90059b0a19d059b8801e407a7d5931b8aa50b253aef970330454789e13e2e63a7bb6d97 SHA512 54c91fa76882152d3933b696d7e547bc4edf6f97f3810e8dd57ca28c98e9fcaf757eac7c77e1e7fab88aced10937ed354917aeac3997edef406313dcf76ba0c5
 DIST cmake-3.19.4.tar.gz 9266976 BLAKE2B b5ac44fa426a47031e37fca990130d9289909a5f21eed2ebb0987da9202db16f654a1f3eeaca2465693b2fca09de05b9bb452dd71df9a65ffd27c02da577a1c5 SHA512 e2781479d2185f8f927439b795120a0f4957e9da7730804ff8ec06d6bbe75a0069e49d95e642706179520a7229ae82e53bab891fa8cfd859913c0cb5fd4e843f
+DIST cmake-3.19.5.tar.gz 9270284 BLAKE2B 4620f5f2a08e16a90350559e539a701606a0e8b4ee358ae5d1668c1f1d43674ac75a06ae335e52363fad9750bde430938faa2497108c2db6038479058412969a SHA512 de8645c7c03bd48987f6eefc19bc2856c2a939e537cf204e1c9749d5a3e21c71695080bee246e94871f82996ede9d1a8771972266434549b48df9924fbb4c6f2
 EBUILD cmake-3.13.5.ebuild 6239 BLAKE2B 5e3b289af5d341e73fbdfe6162330e9e39dac40276991f08df670fcff6e40438995b608704e535545c4538cedb7ed789c2cc2ae0b38a1fd0f3a2e9627c95a494 SHA512 e75ea6defa00993410ed865329b450f38f9ad418c59bfe345880bae25d2f19e4463a407d744527d3f5c6c59fe8cf732cad5ac6274901cfcf3809d29573be7ad1
 EBUILD cmake-3.17.4-r1.ebuild 6124 BLAKE2B e5e3ae707d53e486d2fc594a3376138067b1e2e0041e04354e1ac3a1f7ae40f2d87b4eb404e457967a3cb62ba437b0b9dcd916cce50e8d6d30c0c0da3ecece28 SHA512 145b100bd219c50de18d94066c5d73cc77051b054ea5822e0fcb86f53c3d381a29e0026c25e115320df3c324a96519ffa670ecf73e8dc24527043dafb51fe443
 EBUILD cmake-3.18.5.ebuild 6077 BLAKE2B 09bb5432f455b53cf232dd57a11a5ea755af02860923ba4a4b9b9b2a86824b71b72fdd89b86ac2afc02b414aad1a0f4460b17185942db0f4591f23a394ebba8c SHA512 e4f51821a1b966ccc716115bbf8a5ee325272cf03f4011a2b04e2e5f882fa3804b6af0776bd2922cfe48946501de1de1dfbe00b7f17c6543902bdbe6223a42f7
-EBUILD cmake-3.19.3.ebuild 6846 BLAKE2B 563f68ac5e2ef974604ae3c130b6e049f180340d54e48fef71b779bbb85cf132741f50fc6b09cadca29d6f533a40ab26da88eb99dfc98fe5fa637eaf7c42e565 SHA512 7a7177869712e7e9f1217b5992d50e2cc0d560cc3ce97ac9e5f95469bce5a6b883baca033b9a2c9e859abdf978a6ea3ee66e69cafcc1b3b609de955249a0147c
 EBUILD cmake-3.19.4.ebuild 6846 BLAKE2B 563f68ac5e2ef974604ae3c130b6e049f180340d54e48fef71b779bbb85cf132741f50fc6b09cadca29d6f533a40ab26da88eb99dfc98fe5fa637eaf7c42e565 SHA512 7a7177869712e7e9f1217b5992d50e2cc0d560cc3ce97ac9e5f95469bce5a6b883baca033b9a2c9e859abdf978a6ea3ee66e69cafcc1b3b609de955249a0147c
+EBUILD cmake-3.19.5.ebuild 6846 BLAKE2B 563f68ac5e2ef974604ae3c130b6e049f180340d54e48fef71b779bbb85cf132741f50fc6b09cadca29d6f533a40ab26da88eb99dfc98fe5fa637eaf7c42e565 SHA512 7a7177869712e7e9f1217b5992d50e2cc0d560cc3ce97ac9e5f95469bce5a6b883baca033b9a2c9e859abdf978a6ea3ee66e69cafcc1b3b609de955249a0147c
 MISC metadata.xml 460 BLAKE2B f1a7e1709a6b9975ffbc377c8b4d1ea8a01f52ccc139693c8e427150b7559ecc867b3e55fb4bc95fe342a2335fe5e13c69f4bd74ffbbf302c83872c65963e73e SHA512 fc562cd5f336101d16ca30a5b3e9b99a6e51ec9d7aa503f20ce278f44d5810286fcd6b46b18073cd88ba88ee5ab4f8a0bfccaa567df09ebb722a68ab721aa340
diff --git a/dev-util/cmake/cmake-3.19.3.ebuild b/dev-util/cmake/cmake-3.19.5.ebuild
index 99b8eab6c2f1..99b8eab6c2f1 100644
--- a/dev-util/cmake/cmake-3.19.3.ebuild
+++ b/dev-util/cmake/cmake-3.19.5.ebuild
diff --git a/dev-util/cproto/Manifest b/dev-util/cproto/Manifest
index 936e4b39a24c..fcb5ae6287f0 100644
--- a/dev-util/cproto/Manifest
+++ b/dev-util/cproto/Manifest
@@ -1,5 +1,5 @@
 DIST cproto-4.7q.tgz 175005 BLAKE2B 4138aeb87bff6cd59182939ca93c174cc23a67fd5830bbbb4f0e148edb7856acd7ec98390b46cc1c268c694347d6624a48d94e126751ddeec29fa8a305ed5d89 SHA512 014b51dfcc4b00cf0f71355901ce6ea5d5627846f4bce370559c4a7d9935abe8abc2f994a70793d4886ab93a24843152aa6c873515aa7d9a72d9c4a18fa1171e
 DIST cproto-4.7r.tgz 178234 BLAKE2B 83198fda34413253c7396e0171e3675642c664044b5a409d3a652b0b4ec6a83c9eb64bd35e86a9593ba02af60e9947e04f0251224d1766ef6d0d4639ea56b905 SHA512 934b9241f8e3ddabb6f0065117f500e716f552bc3593879e03890a22332da8baf6cf0b9c0b13c077e13c4bb692bef0efd3c39e96092154863d318219b7845e57
 EBUILD cproto-4.7q.ebuild 422 BLAKE2B f5495bf978f1a1a03d907edc7d70e4fe808fa2b278808fef8be397e44e5d42cbe1478d92268196aedaa9f57fffdcc4f59c4aa8445420ff63b8de8b475d5a43c8 SHA512 ca832bfcc8415386be6577cc2cf8864d844a8cae97bc449450315c27e432198693a0b15f553786eba3bdb865665f00dd71a56750c4a839073e4f445c96e1992d
-EBUILD cproto-4.7r.ebuild 423 BLAKE2B 78023dc73091355c36184f28e745c31e75ad43b309f705a1fe9e128851339fb3be96b784918ca0adf21d3c23c7ca63e03c64095bb6902c13360c5f1fefb23b84 SHA512 d05c79fa7989c46c07aeb1d0f59d2f7ac9ffce1f19561ba3594b7e4621f1635ab054a81dbcd1dc9aca31c436cd2317542d0f4bf87835e15c2a82d39f1d1e1723
+EBUILD cproto-4.7r.ebuild 422 BLAKE2B f5495bf978f1a1a03d907edc7d70e4fe808fa2b278808fef8be397e44e5d42cbe1478d92268196aedaa9f57fffdcc4f59c4aa8445420ff63b8de8b475d5a43c8 SHA512 ca832bfcc8415386be6577cc2cf8864d844a8cae97bc449450315c27e432198693a0b15f553786eba3bdb865665f00dd71a56750c4a839073e4f445c96e1992d
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/cproto/cproto-4.7r.ebuild b/dev-util/cproto/cproto-4.7r.ebuild
index 0ae328fd7df6..981859029532 100644
--- a/dev-util/cproto/cproto-4.7r.ebuild
+++ b/dev-util/cproto/cproto-4.7r.ebuild
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.invisible-island.net/cproto/${P}.tgz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND="sys-devel/flex
 	virtual/yacc"
diff --git a/dev-util/crash/Manifest b/dev-util/crash/Manifest
index 1c9b3b693830..d24c7fd59361 100644
--- a/dev-util/crash/Manifest
+++ b/dev-util/crash/Manifest
@@ -1,5 +1,5 @@
 DIST crash-7.2.9.tar.gz 1324947 BLAKE2B dac5485742119fce1cdcab37a87a2a417e408108a73bffdd6fa215587e4c5dec29508d5f11285dbe2a21cd8365cee437296168b85f2f43dc743461061fd0a26e SHA512 57b7b7780ad71bad09d962bfb2d5ad729dd167d9aaffd86f7b5467c98f52e8cb2c6ebb317bf1ad285dcb78ffa300b5dd733c63efd7aaa4ef03ddfe076c269984
 DIST gdb-7.6.tar.gz 31437633 BLAKE2B fb8cb9f0c33f360c864c5776c3dd0233ad534d376a9df8157c7bc9f1c4ccfc8698933409561700f134705c0107038d8bfa23844e512cd3a08e24925d37a1ce58 SHA512 02d9c62fa73bcb79138d14c7fc182443f0ca82d4545b4d260b67d3f0074ed75f899a657814a56727e601032a668b0ddd7b48aabd49215fc012eeea6077bca368
-EBUILD crash-7.2.9.ebuild 1036 BLAKE2B 4747cb1da28dba89dd301699b3dbf63d1072d48043324a5c183cd8ff234e6204cffda5a5c00b39f0b98692ecaf8436ae5f77acd90208250bc8dc7caaef7cd7e3 SHA512 0eb1c85699aecc4cbce0eb9ab2ecd11c93c8117d77144c44ba6a53f4d638fc59fcababc4f33a8a1eb98f20fbae6bd8d325ec55b4d607460b4a27272bb1db3e4e
-EBUILD crash-9999.ebuild 1036 BLAKE2B 4747cb1da28dba89dd301699b3dbf63d1072d48043324a5c183cd8ff234e6204cffda5a5c00b39f0b98692ecaf8436ae5f77acd90208250bc8dc7caaef7cd7e3 SHA512 0eb1c85699aecc4cbce0eb9ab2ecd11c93c8117d77144c44ba6a53f4d638fc59fcababc4f33a8a1eb98f20fbae6bd8d325ec55b4d607460b4a27272bb1db3e4e
+EBUILD crash-7.2.9.ebuild 1023 BLAKE2B 13ab8eb63a61894808a6ad374174f268ae605250b7ced5d208acefed4e99f0b80f073b4e063bf6f7f98d68175488c69d56c7f2e98bf583eeb526145b83ce1e05 SHA512 ef9b29e59d02e36f12ad6fc1323ec36e5f3580eace9f3f57d43fe201fe47c0d6764d20d2098cb625535669dc659321841418dd1a3e0effba8675b0f1b71ad257
+EBUILD crash-9999.ebuild 1023 BLAKE2B 13ab8eb63a61894808a6ad374174f268ae605250b7ced5d208acefed4e99f0b80f073b4e063bf6f7f98d68175488c69d56c7f2e98bf583eeb526145b83ce1e05 SHA512 ef9b29e59d02e36f12ad6fc1323ec36e5f3580eace9f3f57d43fe201fe47c0d6764d20d2098cb625535669dc659321841418dd1a3e0effba8675b0f1b71ad257
 MISC metadata.xml 640 BLAKE2B 65450e02ac8c60f56fa7e82bc8b20f3d6b36bae290ad891265f9cd19ac405bf8452a5712e2c83c85c6635e4bc75f396c1b7976a7b7341efee3a8475f720d6c15 SHA512 c131b6f87a36deff7f2bc599000a692315f016774d0e87aa186c1ebe660ef85da04f2c3e5b89afa90473a65acf40f493d9434d677a621c9e77a0ae8ae81ed0da
diff --git a/dev-util/crash/crash-7.2.9.ebuild b/dev-util/crash/crash-7.2.9.ebuild
index 65a7a71821fd..25d3d913e8f2 100644
--- a/dev-util/crash/crash-7.2.9.ebuild
+++ b/dev-util/crash/crash-7.2.9.ebuild
@@ -9,7 +9,6 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/crash-utility/crash.git"
 	SRC_URI="http://ftp.gnu.org/gnu/gdb/gdb-7.6.tar.gz"
 	EGIT_BRANCH="master"
-	KEYWORDS=""
 	inherit git-r3
 else
 	SRC_URI="https://github.com/crash-utility/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
diff --git a/dev-util/crash/crash-9999.ebuild b/dev-util/crash/crash-9999.ebuild
index 65a7a71821fd..25d3d913e8f2 100644
--- a/dev-util/crash/crash-9999.ebuild
+++ b/dev-util/crash/crash-9999.ebuild
@@ -9,7 +9,6 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/crash-utility/crash.git"
 	SRC_URI="http://ftp.gnu.org/gnu/gdb/gdb-7.6.tar.gz"
 	EGIT_BRANCH="master"
-	KEYWORDS=""
 	inherit git-r3
 else
 	SRC_URI="https://github.com/crash-utility/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
diff --git a/dev-util/cwdiff/Manifest b/dev-util/cwdiff/Manifest
index dda70af788e1..52607d2f4a43 100644
--- a/dev-util/cwdiff/Manifest
+++ b/dev-util/cwdiff/Manifest
@@ -1,4 +1,4 @@
 DIST cwdiff-0.4.0.tar.gz 4468 BLAKE2B 3c2310c5f57d932d46df1e53a130f4df7f8c5206689df00412507949f7e613e13dbe72b006be1d9adc7c9d630fc91303c900f17914fefa66fd9fa9a9f11f4918 SHA512 b5deda44d94bd3aa93a68da136f4170996ee02c683c38329cbc16a108e0795e86c3543759e1d7adc3d512d4dcbc416436e733341e1b4f3d96325e999e84a4fbe
-EBUILD cwdiff-0.4.0.ebuild 809 BLAKE2B 285dce87410bf3d88cc61f2e8428bd20f3173cfb2ae4706a31aa991d4f1b8a583127d3189b9efaa35716d014b5a76764d7ff5eeaac12afa6c431a9e6b666683d SHA512 a8376e550dc86e1783c18bfade5684f0a4e64c5fe26413e6fcb80901e84a76150c62d388685728737b87d8080ef0ae5b4bbefe3a3603654ae0dda4402e0581c9
-EBUILD cwdiff-9999.ebuild 809 BLAKE2B 7a5dc41425f3f77ba1b38c0972785ef936f0f5eabfa4ed4cbf4885165e41cd79e4b2a6cd6e56ab155389430f38de78b229d3ee1b1ec064557ed9c2f9c857d926 SHA512 0c1c27e7ed540d0eb686113b73fb965f3e093a2fbec9dae547bd151ef8a1b13aa3222b4af196ca61677e29f882f3b0fbe77f3fa03e1217bd67412fd80796528e
+EBUILD cwdiff-0.4.0.ebuild 796 BLAKE2B 70f93a91a3b3e40a825f900c386bd55994e83392791e7e3f19198350314ef27985308cbba71a24cf6a4e196c1f73521a32ebfceef33d519c5b954ede97c63222 SHA512 6b8bdc28032612057dbbd2d52c27fd72575d2daa6d3382d386881f93517024dde8a546458c2aae5d581f37d91708b122dff57d708ee45deb6cd80e805808a0a8
+EBUILD cwdiff-9999.ebuild 796 BLAKE2B 2d436dbeeb7e54debe7f9879584be4cc3827ced77877687b3b113e1f3949e3c5e951cadc095c0196cc6c1ba9e76f4bfb8f63de5b8628bd96073079c62324f281 SHA512 dda34ea3c15f46aebbec4e8bdf45ac6de1583df26b7251912def129ca65c360742944689b18b579b45f228e27038ad8566e53ef84ddd25a0090138a42b4bb9a2
 MISC metadata.xml 436 BLAKE2B 148f2b63587f8fbed463d7477c160905e7c6a7424ac8efd7e653a13a3dea90235ce5af32da28e29e91e0ce6cb08e198dd22eee792eeee53a9c00f063814c0f6c SHA512 c55b7ab58723d522f9b35bcb02c9b3e5e292bb81787e3cecf72b90323761e1bfa832aa97dd25401fae8a6b74e71d7d12a0cc80763fb0d72cc865d21fc8bc6def
diff --git a/dev-util/cwdiff/cwdiff-0.4.0.ebuild b/dev-util/cwdiff/cwdiff-0.4.0.ebuild
index c6d9a4320020..fdf1b9afed55 100644
--- a/dev-util/cwdiff/cwdiff-0.4.0.ebuild
+++ b/dev-util/cwdiff/cwdiff-0.4.0.ebuild
@@ -6,7 +6,6 @@ EAPI=5
 if [ "${PV}" = "9999" ]; then
 	EGIT_REPO_URI="https://github.com/junghans/${PN}.git"
 	inherit git-r3
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/junghans/cwdiff/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x64-macos"
diff --git a/dev-util/cwdiff/cwdiff-9999.ebuild b/dev-util/cwdiff/cwdiff-9999.ebuild
index bf86708882c7..a8184eef699d 100644
--- a/dev-util/cwdiff/cwdiff-9999.ebuild
+++ b/dev-util/cwdiff/cwdiff-9999.ebuild
@@ -6,7 +6,6 @@ EAPI=6
 if [ "${PV}" = "9999" ]; then
 	EGIT_REPO_URI="https://github.com/junghans/${PN}.git"
 	inherit git-r3
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/junghans/cwdiff/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x64-macos"
diff --git a/dev-util/diffstat/Manifest b/dev-util/diffstat/Manifest
index 1f3c3e5f8d84..21f88f74392c 100644
--- a/dev-util/diffstat/Manifest
+++ b/dev-util/diffstat/Manifest
@@ -1,5 +1,5 @@
 DIST diffstat-1.63.tgz 270855 BLAKE2B 01a54c49200396a102c42d982e952d38d23c78452ae467e799d29ae1199aa179927ff719955d700081c4b4f4296c0b73229fa35823e3e18f80b2edc51e3316e2 SHA512 e1319f95088e615d442b0b02af922605d0c76e15ba2f0e8cf8c4db56949ac63f4a6e3e42099254480b9aab388cbd6550f515ed4d4995c6723d24f392d1872b16
 DIST diffstat-1.64.tgz 278873 BLAKE2B 41500977adacf492498a7ea38d5f5a7bb5a31d5e39a202c72ee344ad1996f36c493ff18af74cf4dda18d47617832351fd55e386f008493c39f4b64e6d3f01910 SHA512 d647477beb49b0999c5de41d084da827528571c4848f40c69c2d64d060fc89848d15d03d59b1a31d79f02180f81d92cdf6e19d0172482bc569cf2a87476f12cf
 EBUILD diffstat-1.63.ebuild 449 BLAKE2B 8e41fa28b91fb83c97c8304ba302c33a25b7c2abf7d76e012c3f11f852a9932452ad36a4139a2b152d86c87ebbe0aa431e8b660525ef63e2c8e012bde74018a8 SHA512 f8c6d1d9c207d2957f4afee7abb589f89d81df0d33e2c3ea414f5dbccce2f2cb732e11f4753fffd3a298db99322e3caaa9e163b44d81591e0114e0303396e29c
-EBUILD diffstat-1.64.ebuild 446 BLAKE2B 8cc4fb83b26f7d04d059705330ca4c56e2e7fe045e111c0cb70f888e7c50ae4729cec48bd39e92a919d45ea52e7ebe38fe7fa0c75d4235886485e00a4e241b6d SHA512 57b886e9c33568afcf87089b75e41ce0f8a8843ed4d9aa75447cffe747ad31e7a0e1b1caffd77e06bfb42beab62754cfab63b12d5b9411d0f636dc6a577577c5
+EBUILD diffstat-1.64.ebuild 441 BLAKE2B 1298a0956a225fe6eb4aea21f6dc81abfa4d4224cca54fa3cbfc32cf31d7510a8e825836185299889abc56f6981c3b1736c9cb8d43d46579eda2d948c46237ee SHA512 395cc49027d6424937b9d147475dc880fbe72135fcbea70538e95f0f0406e0b5c45826e190ac9f2820ce7fbb26ae160ddbc3abefdd6a9fdc1f01ae5b536b1ad3
 MISC metadata.xml 371 BLAKE2B 2c3b630946c1fa3f6e48d84b71b09902f6bd1d325abf2addc77cf89347771b9de8851c918eb90268989c41f725ce8f44ff5383fd51b4a483e40e67fe7ee066c2 SHA512 612277ac37956a5eb62db296c83919d9b49125145a9e9408dd4cd65c4e38439ac70b965de73e8f975e0410d9b0bcdf8bf1fce6a93c4883cd806fd39c6f9ab549
diff --git a/dev-util/diffstat/diffstat-1.64.ebuild b/dev-util/diffstat/diffstat-1.64.ebuild
index fa125520d04d..7d3b27a36b50 100644
--- a/dev-util/diffstat/diffstat-1.64.ebuild
+++ b/dev-util/diffstat/diffstat-1.64.ebuild
@@ -9,4 +9,4 @@ SRC_URI="https://invisible-mirror.net/archives/${PN}/${P}.tgz"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
diff --git a/dev-util/diffuse/Manifest b/dev-util/diffuse/Manifest
index 29c60f3d77c8..ce1dd65114b3 100644
--- a/dev-util/diffuse/Manifest
+++ b/dev-util/diffuse/Manifest
@@ -1,3 +1,5 @@
 DIST diffuse-0.5.0_alpha7.tar.xz 531124 BLAKE2B e97b8dd1b24253c4049dd4dc0f185049f030163945d822c3dbf6763f14eff270ed6bea82ae55b6cecaaa0f90976aab286db53c3f69d54f708e403832f8b2b1c1 SHA512 280d2c3c698affbf91b0e25ba658133999ea9b0199d8c165e2cef05210386f0fb3ff8611710903c1a3cb13aed01a648d04b3b8b13227f96803b74adbebf62adf
+DIST diffuse-0.6.0.tar.gz 621120 BLAKE2B c39cbe55edb6e1734d4db1343a0b0029ab146fe92ef4edc58cd6ea82bc6780e3f789d6765d2bddecd941fa458781c59ddde71a010f1b90d4ca238e6d6b233dc2 SHA512 fe9842738560dbefe9c546c8bba3f9f1cefcf4c327ad644430c512ec6bb1b4877986ca2b816af75226975eefa9b0f70120a4ed574e2ed90058b0a92380e8995a
 EBUILD diffuse-0.5.0_alpha7-r1.ebuild 1412 BLAKE2B 26c9c509ca41c0e774c553491d72f5e98260b814d02d7e776832d693d6579a3de6cd6822268c8463607f7d3cedb0e718e116eda7cdba3983a5336c2d3c799352 SHA512 6ddf8811d286d9ae953889b3aedbf7af89c3b4ab8eda13182af115b5d34c70a2e60ee00a62131f3b4b0df54c0eaf86456d13c2e8c8491cd49a449a544b10a9e4
+EBUILD diffuse-0.6.0.ebuild 1361 BLAKE2B 04af69408ea1c4b529eb626ba0abff615b45c79517f9bce3852683b20be83bd0b3f5860798c0f02e7e789a74fb338e89c1cf17ecfb85a05fb57b6bb79be59ed1 SHA512 f76cb4ca93b9a7066e64e49c3a4b59044e29cb9e0d8788089e1eb763fd660463dc6cb28eb728d1d27c9bd96db8d7b5f2cb76c9e757ca75ac0236300ee29f0284
 MISC metadata.xml 323 BLAKE2B cc8163e0d9562747e2d52729e8298b38ba93b077f3b6a387a800c4720d52ad90bc13482f4120ba9ca9a41ee65e15e2ed2d52b81c41d9906c0ee2b677d4c67b8f SHA512 327c3e242485b96d7923358eb647b5a711d87b6b75c0cf76f01b6118b5b9a3436b0286de1e390a07a76d78d752b701a51319f5c35e24af2160dd6745521d965c
diff --git a/dev-util/diffuse/diffuse-0.6.0.ebuild b/dev-util/diffuse/diffuse-0.6.0.ebuild
new file mode 100644
index 000000000000..fd3abb9089ba
--- /dev/null
+++ b/dev-util/diffuse/diffuse-0.6.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+PLOCALES="cs de es it ja ko pl pt ru sv th zh_CN zh_TW"
+inherit meson python-single-r1 l10n xdg-utils
+
+DESCRIPTION="A graphical tool to compare and merge text files"
+HOMEPAGE="http://diffuse.sourceforge.net/ https://github.com/MightyCreak/diffuse/"
+SRC_URI="https://github.com/MightyCreak/diffuse/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP},cairo]
+	')
+	x11-libs/gtk+:3[introspection]"
+# file collision, bug #279018
+DEPEND="${DEPEND}
+	!sci-chemistry/tinker"
+
+src_prepare() {
+	default
+	l10n_find_plocales_changes translations '' '.po'
+
+	rm_locale() {
+		rm -f translations/${1}.po
+		rm -rf src/usr/share/man/${1}
+		rm -rf src/usr/share/gnome/help/${PN}/$1
+		rm -f src/usr/share/omf/${PN}/${PN}-$1.omf
+		sed -e "/^${1}/d" -i translations/LINGUAS
+	}
+
+	l10n_for_each_disabled_locale_do rm_locale
+}
+
+src_install() {
+	meson_src_install
+	dodoc AUTHORS CHANGELOG.md README.md
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/dev-util/emilpro/Manifest b/dev-util/emilpro/Manifest
index 8c428dfabca9..2bd1ecf6bc17 100644
--- a/dev-util/emilpro/Manifest
+++ b/dev-util/emilpro/Manifest
@@ -5,6 +5,6 @@ AUX or1k.patch 4386 BLAKE2B 5851de07ac3d48595a61442425123372fa39ac6cb4bcd436e2d7
 AUX respect-cflags.patch 662 BLAKE2B b7aadf77fc42c717e0246d3c2bc5be58f1d10e933a726972e51a413548b8df76b76c8b0e5bdc9048e88305b0fd1c1dafbc7a625d010efa6bed4047045b136163 SHA512 5d308894752de0df6fee2f19ebc3664a0cd980a3e6babed9707db39a342ce3eb2f2c56e7680d0d9d969b3dff9059c2ef1b9cb14ea23af991b3b9e10653a0bda6
 DIST binutils-2.23.2.tar.bz2 21440347 BLAKE2B 9e85ae032d27b75fd5a868c2d59da470849a67016170b549550f28ae0aeed938e9d887d80de0e3354aa3e9956783e68ce9c0a32e9fce8783620601fb96b57599 SHA512 dec753bbba008f1526b89cf1bd85feba78f362f5333ffdf93953fd131eb755976dec82a0a4ba38c43d2434da007137780cfe674de5414be5cf7ce7fbc6af6d16
 DIST emilpro-3.tar.gz 120276 BLAKE2B 97f45f1ee4f48f936c1332dd8256ecbd4de89fb728691cf18a91d25ffdc725a9d8fc310b7a15a2c9f62d254538058871eedd56448e9e89eb369240ae43e402d4 SHA512 18a90dd672a4fb878f0da1eefacb01f159e25b28c94ea6707578deab74dbf07ee0f9d276e376f4eaff7b00c4dd7edcf5b7cbb3e5b316f4d720fe0343e1c36727
-EBUILD emilpro-3-r3.ebuild 1654 BLAKE2B e074352d7f74a808dc98db2ff3e84cf3c970d2976d1ee7e7d3736339f33b5cc35b26e0698326d69cee1a7a6cebfd07e8ebf7e68ffdeb740442554e2d188270f7 SHA512 df5a61bfcaa3f3f5d0665522c7d9e3622eb90304bcc03d2879a20f110165f5cc3ebe8ba4690c918d2c4c9fd14d940d8ffae1e8c6670b8516b5ae404b7b991f6f
-EBUILD emilpro-9999.ebuild 1579 BLAKE2B f510a5f1ad4d0f0eecc1f5c7a6362b64020ff756999c2ab46f078be5a5ad064111218b6ab9de6cffbf27c5d4a30a63f1c5459b4748008d010c9c8e8b4f38d82e SHA512 dd5005b1322ba00d6b1d323fc73c402109dada2c226eb6353beb88d3ef89d6c141cdb0656afa5ba036a4748de6098062917be14a2f52ea0305bcce3e93fd286c
+EBUILD emilpro-3-r4.ebuild 1646 BLAKE2B 9064d30851cb20f509c256f25e1584aeb114597621ecc725c67ec549e11e1ccaaaee97b0b3e53b7139c89282704c926c22af548524db28e2323986ac56a1ce64 SHA512 aaa76003f60a49f60baec68fabd4389a2793512ec30167db0035c1ac967d6091c6570f6afac25f27ee148d1bed577537b39342b0c5f5921589269774c0b4d042
+EBUILD emilpro-9999.ebuild 1571 BLAKE2B 7ca659559f3a4404d97b5c6b38b9b5a70dabfc0099017550e2dbf9a1dd77d247c1a58cc2ee17c9d7cb377b05102509b78d1b756788b997bee161547db2bb9dbd SHA512 e3f76e2cea9c6724baf3a516d4e236641fa37676a08fd09f3c44a0ab1db266a793da97d1f681a2e51e12ad42e40816a85c54fda4d5df0ce6e0c2a123f84bf7d6
 MISC metadata.xml 371 BLAKE2B 5070db4fdc4d08e734a6e06436712d07321e07e4da449530e20ae03099b347c5b4491cb7876b7ced979914b6c630d1ae8e200494b1ff94a0f2eb0ab4861a614c SHA512 133f1a99dcc7b0eaa0ed4c28334fb7ee73010987f5435d9d2ccaa1e5956ff4a9cc4f4b0fcb9f755e44fb5e0453aa9b69684a7435ac6d7d4c27bcb01dbe65117c
diff --git a/dev-util/emilpro/emilpro-3-r3.ebuild b/dev-util/emilpro/emilpro-3-r4.ebuild
index e40bc9b228ee..d34b5c3dcfb6 100644
--- a/dev-util/emilpro/emilpro-3-r3.ebuild
+++ b/dev-util/emilpro/emilpro-3-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,6 @@ HOMEPAGE="http://www.emilpro.com/"
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/SimonKagstrom/emilpro"
 	inherit git-r3
-	KEYWORDS=""
 	SRC_URI="!system-binutils? ( mirror://gnu/binutils/binutils-2.23.2.tar.bz2 )"
 else
 	SRC_URI="http://www.emilpro.com/${P}.tar.gz
@@ -24,12 +23,12 @@ SLOT="0"
 IUSE="+system-binutils"
 
 DEPEND="
+	dev-cpp/cairomm:0
+	dev-cpp/glibmm:2
 	dev-cpp/gtkmm:3.0
 	dev-cpp/gtksourceviewmm:3.0
 	dev-cpp/libxmlpp:2.6
-	dev-cpp/glibmm
-	dev-cpp/pangomm
-	dev-cpp/cairomm
+	dev-cpp/pangomm:1.4
 	dev-libs/libsigc++:2
 	dev-libs/glib:2
 	system-binutils? ( >=sys-libs/binutils-libs-2.25.1-r2:=[multitarget] )
diff --git a/dev-util/emilpro/emilpro-9999.ebuild b/dev-util/emilpro/emilpro-9999.ebuild
index 3cad6fafde7f..95e42ec49ae4 100644
--- a/dev-util/emilpro/emilpro-9999.ebuild
+++ b/dev-util/emilpro/emilpro-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,6 @@ HOMEPAGE="http://www.emilpro.com/"
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/SimonKagstrom/emilpro"
 	inherit git-r3
-	KEYWORDS=""
 	SRC_URI="!system-binutils? ( mirror://gnu/binutils/binutils-2.23.2.tar.bz2 )"
 else
 	SRC_URI="http://www.emilpro.com/${P}.tar.gz
@@ -24,12 +23,12 @@ SLOT="0"
 IUSE="+system-binutils"
 
 DEPEND="
+	dev-cpp/cairomm:0
+	dev-cpp/glibmm:2
 	dev-cpp/gtkmm:3.0
 	dev-cpp/gtksourceviewmm:3.0
 	dev-cpp/libxmlpp:2.6
-	dev-cpp/glibmm
-	dev-cpp/pangomm
-	dev-cpp/cairomm
+	dev-cpp/pangomm:1.4
 	dev-libs/libsigc++:2
 	dev-libs/glib:2
 	system-binutils? ( >=sys-libs/binutils-libs-2.25.1-r2:=[multitarget] )
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 902a8a1a87bf..9c74f98b5a39 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -5,9 +5,11 @@ DIST glib-2.64.5.tar.xz 4778456 BLAKE2B 7fdee0e16a7ac820f4c4f7dc66d37add464d3005
 DIST glib-2.66.0.tar.xz 4839236 BLAKE2B 930bf071bb4b1e744ca46cb5267d42772488030f848c7b11c5424fcef087ac27d070d20cf403ae504e573ce49faf26ce9101656391d3915ae04422d021d5561a SHA512 358e6a840b722139593eb7825c3aa70153eb26036e05d13d3286bcc6d2e962c2b4ddcb0fe5c6728b89bfffbd178101e72c576081ae714326a272a9fc34ed953e
 DIST glib-2.66.3.tar.xz 4837796 BLAKE2B 44632477b56bea5b6324deccc17e2d6b72e00dba518f9fc3ec5edad8b20df59f8bf9087e5de16b587b72c2f143d9ab650c478666132b1564da9bf333f380a4e3 SHA512 ab2670ae4eeb3b561c0e71ff9153908f450e430cd43771bfee09233a65826dc16462537ec64bdfcced867f4c8663341b6b9d17af5ba0fab8564b8f21b04a45d7
 DIST glib-2.66.4.tar.xz 4838124 BLAKE2B de2b8690c9ef9d66378b396ec0abe2bc83380654b3ca2e221678fb6dc9bf449c544a7e2b2a662739f7b400e9ce0a5a0af115ba2f06b8f5597967e518fdec4937 SHA512 b3bc3e6e5cca793139848940e5c0894f1c7e3bd3a770b213a1ea548ac54a2432aebb140ed54518712fb8af36382b3b13d5f7ffd3d87ff63cba9e2f55434f7260
+DIST glib-2.66.7.tar.xz 4844892 BLAKE2B 2d128e8c933a8c5bd27734e96e50244f27c29199823e2185e8cfa5b4bbc0ca23f761c9de275c9941672eb945e302178b3cb4b5bd577f375ad953a97dddc70e34 SHA512 f6e6cc0fe2ab4a31a623bf9a1e63f833783e044e7ed55b66a84fc0cbf1410eec233fe0e226abb20aac0e40167a9624bf5e65197f9eed879da1293af44408d530
 EBUILD gdbus-codegen-2.62.6.ebuild 2030 BLAKE2B f570a588f7bacffc4aa788ffa6439bfc78d0fe8a583723d723e69198efe034faa11ebcbb91ad1d439fa622331c9b248b074d4aaf31f2a88b12ab1b94c57e0077 SHA512 f8cf3a7ce629a36cb0d1ed3f1fe56a4e9868479b22ed8186ccaa5a2c06f7431a456bb28bb3dc412d162aab676dbf298a31632651b99c718b13826ce46c7cce1f
 EBUILD gdbus-codegen-2.64.5.ebuild 2188 BLAKE2B 5d4c36ec161d160994b4ffb2767a697acb24bddf775ae34518f8179e320989cf0d269408769593c8ee81dfb51868b0ccd278fd84e802e0da4d3bdc73fd2a5519 SHA512 ce3431735cb42f4917effa59d86758fdeec6d133df829cf7618a40d20465b1836944176f5aa638a47c8899a6789b65a720c2476292e849f45d7a1a2b7c968447
 EBUILD gdbus-codegen-2.66.0.ebuild 2199 BLAKE2B 425de5185936d4dd0db3a77109fdb5a019044d7d0a7343978bb40031f56b6641511632a42bfa521c6bb732fdc6c1f8829e8a884f8572b8a0cd706209ae20768a SHA512 9f5748bc80d1849f4e7adb5b1995c43ae15c413af5f371fc25f2a33559536fb35d0e927e0e93d6fa3409fd2814cc3353d943fe54eb7fd541c909d46ee276d7f6
 EBUILD gdbus-codegen-2.66.3.ebuild 2199 BLAKE2B 425de5185936d4dd0db3a77109fdb5a019044d7d0a7343978bb40031f56b6641511632a42bfa521c6bb732fdc6c1f8829e8a884f8572b8a0cd706209ae20768a SHA512 9f5748bc80d1849f4e7adb5b1995c43ae15c413af5f371fc25f2a33559536fb35d0e927e0e93d6fa3409fd2814cc3353d943fe54eb7fd541c909d46ee276d7f6
 EBUILD gdbus-codegen-2.66.4.ebuild 2199 BLAKE2B 425de5185936d4dd0db3a77109fdb5a019044d7d0a7343978bb40031f56b6641511632a42bfa521c6bb732fdc6c1f8829e8a884f8572b8a0cd706209ae20768a SHA512 9f5748bc80d1849f4e7adb5b1995c43ae15c413af5f371fc25f2a33559536fb35d0e927e0e93d6fa3409fd2814cc3353d943fe54eb7fd541c909d46ee276d7f6
+EBUILD gdbus-codegen-2.66.7.ebuild 2196 BLAKE2B 73f021fe1049497441b8e79182830d0b2dbf95b7f3ac8bdcaa938547de7a5cd3596e563fe318d42b554cd61b028b8973b4ec8256ed013cc515195b8dfe9f71b8 SHA512 3a949b0e7ada042382a89adb4b840db42fb79d9b7c870994b1e839f8ab859be0b1937f4b536b8ebe02319a3a486e3fa2d358efb64389a921e00c1405873d8e78
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.66.7.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.66.7.ebuild
new file mode 100644
index 000000000000..34788f2fe089
--- /dev/null
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.66.7.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME_ORG_MODULE="glib"
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="xml"
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit gnome.org distutils-r1
+
+DESCRIPTION="GDBus code and documentation generator"
+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"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+"
+
+S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
+
+python_prepare_all() {
+	PATCHES=(
+		"${FILESDIR}/${PN}-2.56.1-sitedir.patch"
+	)
+	distutils-r1_python_prepare_all
+
+	local MAJOR_VERSION=$(ver_cut 1)
+	local MINOR_VERSION=$(ver_cut 2)
+	sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die
+	sed -e "s:@VERSION@:${PV}:" \
+		-e "s:@MAJOR_VERSION@:${MAJOR_VERSION}:" \
+		-e "s:@MINOR_VERSION@:${MINOR_VERSION}:" config.py.in > config.py || die
+	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
+	sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
+}
+
+do_xsltproc_command() {
+	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/glib-utils)
+	xsltproc \
+		--nonet \
+		--stringparam man.output.quietly 1 \
+		--stringparam funcsynopsis.style ansi \
+		--stringparam man.th.extra1.suppress 1 \
+		--stringparam man.authors.section.enabled 0 \
+		--stringparam man.copyright.section.enabled 0 \
+		-o "${2}" \
+		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
+		"${1}" || die "manpage generation failed"
+}
+
+src_compile() {
+	distutils-r1_src_compile
+	do_xsltproc_command "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.xml" "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
+}
+
+src_test() {
+	einfo "Skipping tests. This package is tested by dev-libs/glib"
+	einfo "when merged with FEATURES=test"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all # no-op, but prevents QA warning
+	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
+}
diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index a905515a0bd2..96b4e7433387 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -3,9 +3,11 @@ DIST glib-2.64.5.tar.xz 4778456 BLAKE2B 7fdee0e16a7ac820f4c4f7dc66d37add464d3005
 DIST glib-2.66.2.tar.xz 4836456 BLAKE2B 5484a7fe497dbe06df7ce11dbc8836c95dbb01e6e309516b82158f2915eeee36ccbe6e904cb6ae9a5a0223ccc0b52f6e64d61a418bf790538bc90388430977b2 SHA512 30278c066c6b209f45fcfdb9ffc4732236451464506b93c0fff0964ff8aac58c15be85c3793c686d4740d9d97857984bc0ab71e38d5da11c5fd860e569fb6cb9
 DIST glib-2.66.3.tar.xz 4837796 BLAKE2B 44632477b56bea5b6324deccc17e2d6b72e00dba518f9fc3ec5edad8b20df59f8bf9087e5de16b587b72c2f143d9ab650c478666132b1564da9bf333f380a4e3 SHA512 ab2670ae4eeb3b561c0e71ff9153908f450e430cd43771bfee09233a65826dc16462537ec64bdfcced867f4c8663341b6b9d17af5ba0fab8564b8f21b04a45d7
 DIST glib-2.66.4.tar.xz 4838124 BLAKE2B de2b8690c9ef9d66378b396ec0abe2bc83380654b3ca2e221678fb6dc9bf449c544a7e2b2a662739f7b400e9ce0a5a0af115ba2f06b8f5597967e518fdec4937 SHA512 b3bc3e6e5cca793139848940e5c0894f1c7e3bd3a770b213a1ea548ac54a2432aebb140ed54518712fb8af36382b3b13d5f7ffd3d87ff63cba9e2f55434f7260
+DIST glib-2.66.7.tar.xz 4844892 BLAKE2B 2d128e8c933a8c5bd27734e96e50244f27c29199823e2185e8cfa5b4bbc0ca23f761c9de275c9941672eb945e302178b3cb4b5bd577f375ad953a97dddc70e34 SHA512 f6e6cc0fe2ab4a31a623bf9a1e63f833783e044e7ed55b66a84fc0cbf1410eec233fe0e226abb20aac0e40167a9624bf5e65197f9eed879da1293af44408d530
 EBUILD glib-utils-2.62.6.ebuild 2357 BLAKE2B 26128c1c69bb7947a1268e9aaac8960797511136f28ed6215c9170c224c3c1429e86864a50f590f4274e5ff627eb7a04aed3ff5272f283182b204b1fd689895b SHA512 ea8d7c17dffa127a74e16faa780dbe9f5b375c3ae86cdbf632bbd627754a82533a96568f94b15f4bb4afa240de486d7750b22369420d1b38446521ee75c0e8a4
 EBUILD glib-utils-2.64.5.ebuild 2359 BLAKE2B dbca3cbf84958c96266f4f4705df85b9975220567de81c2e85a87b611062b247349da25db907c88a1f229c950bba90e97a05e5602dde0e276a31f33aaa2910bf SHA512 2463be610808a5ce6b850007337595b16ce42d880b9527ebd759fadecdf25f6495f202ec5a47882197c548a613ac344c2541484a83998318fee970924971cd3d
 EBUILD glib-utils-2.66.2.ebuild 2368 BLAKE2B 863d7c223c71ed4333e21ded7ebbdefa361543cd0056ba586e0acb3d9b0eb48b88b07817e5a8fdf524276be80f620bea5a511bf10db36d52400beb0cbc8ed715 SHA512 a6c0852e977b5808070f313ae073752fb95dbe8a8faf28ce1d82c90b60dc273f7c3282a7196c65c00494c2ec8628fc67d01d7b94f7545be40055d9ff55361154
 EBUILD glib-utils-2.66.3.ebuild 2368 BLAKE2B 863d7c223c71ed4333e21ded7ebbdefa361543cd0056ba586e0acb3d9b0eb48b88b07817e5a8fdf524276be80f620bea5a511bf10db36d52400beb0cbc8ed715 SHA512 a6c0852e977b5808070f313ae073752fb95dbe8a8faf28ce1d82c90b60dc273f7c3282a7196c65c00494c2ec8628fc67d01d7b94f7545be40055d9ff55361154
 EBUILD glib-utils-2.66.4.ebuild 2368 BLAKE2B 863d7c223c71ed4333e21ded7ebbdefa361543cd0056ba586e0acb3d9b0eb48b88b07817e5a8fdf524276be80f620bea5a511bf10db36d52400beb0cbc8ed715 SHA512 a6c0852e977b5808070f313ae073752fb95dbe8a8faf28ce1d82c90b60dc273f7c3282a7196c65c00494c2ec8628fc67d01d7b94f7545be40055d9ff55361154
+EBUILD glib-utils-2.66.7.ebuild 2365 BLAKE2B 4386c37aaab2a1113563837d33ca83f6e899f2ef8478d47feac4251e303736c999cb792a432b1e20b4c6ebd349ad5b8c042ec5a5351851cb471082b7e9cacf45 SHA512 72787709dc6e1433e021abd95e4a9a4f2e38f4000cdb4903cb553c00c9b7f2f0e356bc82dbdcb2c98f515f1b4b04ceda858f5dfb2c10f903e1018b3ac2a85334
 MISC metadata.xml 332 BLAKE2B 1e3c081ae9a2c8ae53cee6c3ae133cbd5e8543a68c03d4a4f7e164437502d996ea9364789e93114687271e1f472bcf13a418cca5b74ecb95a51849f0a5f3dafa SHA512 f7680d9be4071b841f50ece99b5041dc492901d84ae05383c1ff05b6a73bab804b153a50eb70f5417137f6e2041230c5ba8eaede10f7a0bf8a899508642588c6
diff --git a/dev-util/glib-utils/glib-utils-2.66.7.ebuild b/dev-util/glib-utils/glib-utils-2.66.7.ebuild
new file mode 100644
index 000000000000..386ed096f7ef
--- /dev/null
+++ b/dev-util/glib-utils/glib-utils-2.66.7.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8,9} )
+GNOME_ORG_MODULE="glib"
+
+inherit gnome.org python-single-r1
+
+DESCRIPTION="Build utilities for GLib using projects"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2.1+"
+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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+
+RDEPEND="${PYTHON_DEPS}
+	!<dev-libs/glib-2.56.2:2
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+"
+
+src_configure() { :; }
+
+do_xsltproc_command() {
+	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/gdbus-codegen)
+	xsltproc \
+		--nonet \
+		--stringparam man.output.quietly 1 \
+		--stringparam funcsynopsis.style ansi \
+		--stringparam man.th.extra1.suppress 1 \
+		--stringparam man.authors.section.enabled 0 \
+		--stringparam man.copyright.section.enabled 0 \
+		-o "${2}" \
+		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
+		"${1}" || die "manpage generation failed"
+}
+
+src_compile() {
+	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-genmarshal.in > gobject/glib-genmarshal || die
+	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-mkenums.in > gobject/glib-mkenums || die
+	sed -e "s:@GLIB_VERSION@:${PV}:g;s:@PYTHON@:python:g" glib/gtester-report.in > glib/gtester-report || die
+	do_xsltproc_command docs/reference/gobject/glib-genmarshal.xml docs/reference/gobject/glib-genmarshal.1
+	do_xsltproc_command docs/reference/gobject/glib-mkenums.xml docs/reference/gobject/glib-mkenums.1
+	do_xsltproc_command docs/reference/glib/gtester-report.xml docs/reference/glib/gtester-report.1
+}
+
+src_install() {
+	python_fix_shebang gobject/glib-genmarshal
+	python_fix_shebang gobject/glib-mkenums
+	python_fix_shebang glib/gtester-report
+	exeinto /usr/bin
+	doexe gobject/glib-genmarshal
+	doexe gobject/glib-mkenums
+	doexe glib/gtester-report
+	doman docs/reference/gobject/glib-genmarshal.1
+	doman docs/reference/gobject/glib-mkenums.1
+	doman docs/reference/glib/gtester-report.1
+}
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index eebbc918eb76..92a70307dc5d 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -1,6 +1,6 @@
 DIST glslang-10.11.0.0_pre20200924.tar.gz 3246618 BLAKE2B e4353a9cf06273f6a5fc79004c5f97df3da3444a793ddefb6adee96cbcf541d6088bf2f2edc65dea53363cbcb254f7da80fefb8a93b8650adf2ed283b243fa24 SHA512 01551b2347f25e6135ef82f5ae838dbf275cb3f20300659b830c85fded334a8dea3928c017ff7d48d58d89ddf93f5429191f0a326f310db9ee989f622e23477f
 DIST glslang-10.11.0.0_pre20201216.tar.gz 3290064 BLAKE2B 46ce951ab6c69eb25dc2490e3eb817c5cc0e2bf2416f29842b45bb1efb83ea439d72c823c981e2f37803e203077ea01d1c84c28391fb78288c107510a47d2241 SHA512 4b9e300152dc2ec3b14657b3a745d5b26b5da49e5ff3da0d75680f84126237ec6af0f7cee5aaa74b2d4a123a386522cd7342b5f25e4c01f114da3d5d92057128
 EBUILD glslang-10.11.0.0_pre20200924.ebuild 889 BLAKE2B ca2ee26c46fa049f042b37e7ff9e8d10175c3a195e810ea6f840c16c72d0214fdf187438ccac266a3923533db0cf16ef121dda96e2371a1054c329d9c71696dc SHA512 d08fb9ea49b0ec7a2f2d367ab6f903111758847e0707233715142c4ead94702e81ad01f18c0733a50d1ee79a858a2bbba02d393612dd5890b45517c33d6f8e90
-EBUILD glslang-10.11.0.0_pre20201216.ebuild 891 BLAKE2B 62bcea8a054f942c9d918a9875efdcce4841b11eed29cbfeeb67633b580b9db5ec15bd32cb068743e73dfdabe000fabed99f5fbe45f32f4ad06366caa970cbd9 SHA512 fbbaca489dd5b697b79084e84c755bf74d2ca7e2e2d534700f9e53f71bab5ed08a766646ae6e61aff598753bcbb488c4d89cd20607cd93a5732a10f13a7e463a
+EBUILD glslang-10.11.0.0_pre20201216.ebuild 890 BLAKE2B d2ae97e1228f30154c2e0674284aeee59943c6b97c619a594106e0765353c14a58e5a03ab03a024a934ccd6b6d66091764af9ad181dc79f577a495037415ef77 SHA512 889bd334d5a13e3ad22e97de659687bdcdc575f30cb45e21a4c253e469181008a5fdb05ef6ca5a21dc03ae22ef3ebbcf88ac8d09941c1d7ce0442942d826f5a0
 EBUILD glslang-9999.ebuild 758 BLAKE2B 802d3dec30280cea4dc1c5b8dc652495537f93ef3b52c7d60740d8f9d6ea1343f22b0f0f4b6bc127eb3bca925daf6b1837a1763416cb27489e6db07173aec4ca SHA512 c8db05953380d7c0709e25a9507d5f043a05da423d9e119ae09ef00e5afae939c209b078a0b6da9d6072f07d04c3c20fd9d3827f6fdd71c793ea21036d4e03a6
 MISC metadata.xml 330 BLAKE2B fd98c615a1b5c3364e122b66d18e9667ff1bae51218e2474862a0376f352421cfbe7aa3b4f9751ff8e8f24510f4a6e3f0e1977ca759b566b54f48fa45243980c SHA512 9658890a6aa3ae0c91e71416c3996d9c8064bb970521b5c444d617fc4a51ef2edb62aa7d44b25ef96768417de0c5478999e74405c6d9ff847816311990c945ee
diff --git a/dev-util/glslang/glslang-10.11.0.0_pre20201216.ebuild b/dev-util/glslang/glslang-10.11.0.0_pre20201216.ebuild
index d9848be829e2..6b9fd65c7f88 100644
--- a/dev-util/glslang/glslang-10.11.0.0_pre20201216.ebuild
+++ b/dev-util/glslang/glslang-10.11.0.0_pre20201216.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SNAPSHOT_COMMIT="c594de23cdd790d64ad5f9c8b059baae0ee2941d"
 	SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 	S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}"
 fi
 
diff --git a/dev-util/gtk-doc-am/Manifest b/dev-util/gtk-doc-am/Manifest
index cfb0c1aeb676..3fefdca63f0c 100644
--- a/dev-util/gtk-doc-am/Manifest
+++ b/dev-util/gtk-doc-am/Manifest
@@ -1,5 +1,5 @@
 DIST gtk-doc-1.32.tar.xz 762000 BLAKE2B e87b0ed5dffd04acc7569171343839a742a874438248546b1b85ca71102d5a546f41b450c5cedf54ecab5b7b6585a4dac36d7600b21b5cce491470a50f82d3b0 SHA512 6d28395968c2951f1685570e5778b5add76d1b9cff8fcb8632b200b3ba251602a1ea59b1def84fc28560988b87fc0dbbc6947af88d268db6ff23e9c28aea3b28
 DIST gtk-doc-1.33.1.tar.xz 768896 BLAKE2B 0d6cc32611618669aac4045942497a404f4d3ed703341cce56efefba439eb8595877297b76085c6a57d3d76710257153040b8f895d6dd6381502e852e6b82e93 SHA512 18620f0164382849980938103a9243abc35ea5a2628258f00e096e16a698b598d0c7fe80a1739fc689217c59a648c728a014bc672a92346c65768ebf89675b90
 EBUILD gtk-doc-am-1.32.ebuild 814 BLAKE2B f5f0ebc0ef5050238eb3c39aea706f051fe43d4e7f1e17b6c9295db7ce4ae6f0b342ca542d25290132d0b8d2399e3d48747d32899ed09c2557e97dade37f9b00 SHA512 c36d4feba2d75e37e8045c640e3b81c73d25f85a68b8716ebcd1cf74c5fbfe7db645cc5dcebff11013fd2896b2deb31a39c958c227e9cbf077c478aeb3470f96
-EBUILD gtk-doc-am-1.33.1.ebuild 832 BLAKE2B 2e381cbac19bb707ccdc0f85a1bbc8fab10375d34b83ac9489646fbc3d2831f1dde0823e5a64184b24148c42e0a83fb79da4d18c95125841709d164d9df83ccf SHA512 6384da06c848259619fc0d29cdd4e9d7d6d7c49e87bbd4e91a34057234256c5becc9578d16741d29b72bcaa1ad46f6dd4bb2a3647a56615c46125ce0d3763a0a
+EBUILD gtk-doc-am-1.33.1.ebuild 829 BLAKE2B 3a1e1dd3e603a281f734cf2d16f69e0a6006d0665128be92d8c395f1097a263be914d3ca10ddbfc90a2b074b3b5dd23f7836d4cdf3ac380444bf579f3227e8b4 SHA512 e099c27c6f95146ad0b9fffc2b95a3f937f68550b68a9f83942201c7c571409a61c3f9e7224a2d059e7711d0b8a65005b3a84b7d912c93891e6891b1def08bb4
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gtk-doc-am/gtk-doc-am-1.33.1.ebuild b/dev-util/gtk-doc-am/gtk-doc-am-1.33.1.ebuild
index 718c3f4fd20b..7aad8fba972b 100644
--- a/dev-util/gtk-doc-am/gtk-doc-am-1.33.1.ebuild
+++ b/dev-util/gtk-doc-am/gtk-doc-am-1.33.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/DocumentationProject/GtkDoc"
 
 LICENSE="GPL-2 FDL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="!<dev-util/gtk-doc-${GNOME_ORG_PVP}"
 PDEPEND="virtual/pkgconfig"
diff --git a/dev-util/gtk-doc/Manifest b/dev-util/gtk-doc/Manifest
index bef1ad2d59ac..aaeadee14616 100644
--- a/dev-util/gtk-doc/Manifest
+++ b/dev-util/gtk-doc/Manifest
@@ -6,4 +6,5 @@ DIST gtk-doc-1.33.1.tar.xz 768896 BLAKE2B 0d6cc32611618669aac4045942497a404f4d3e
 EBUILD gtk-doc-1.32-r1.ebuild 2325 BLAKE2B ac9e1061f3fcec7cfc6cc90746e4444259dad4e705817a459e9735a2691f7e4d80701d9a688f3b9ad773429e0248491661a526e798318025022f75a997824cd6 SHA512 f9a4eaafff2b0edf6f6d0b13a5b82db0d19a36cf3d1ed2b1872787bb5ee1369f0a75300f59db8dfab7b54a0a15cecfd16215c221ffc0039985476ec20cd362ce
 EBUILD gtk-doc-1.32-r2.ebuild 2549 BLAKE2B e1fe420648742f9c9300522fe262d105411fe29d7bcc67d8ab17ef7be7e7553ca0e52a5c079c392c9f7f6833970426993df091c1b0a3ff46528d7b5eeec57b87 SHA512 38f4b9bdf9f9274a00d9fddedd827c66f4709a63441b097a306faf95d6b8e0a9b7efceb237e31f9a60821426a9d54fcb4d131763793ce5580fe70d8360f77cfa
 EBUILD gtk-doc-1.33.1-r3.ebuild 2568 BLAKE2B b91e838e58259c1198963e66337b2cbe8d2b1261c2d9e1c8b384733aa4b9d6f4b57887cb00c9e999f40573b9ef6f1b358551e2d588794a9f16d035eb9c4196b0 SHA512 1391ab5c8dc72747aef6ab0db001e44306eff25fd129b32163c2165b8703b7c55bd8b025568b7d7a8a550132c51d25b7c4b96024b3a087a734f7274b8ef15046
+EBUILD gtk-doc-1.33.1-r4.ebuild 2619 BLAKE2B 2edc191c2c894bc54fe0422a97d2dd11f2fd7b7923f66b330f2ea3208029aee1a0fa1be433572ca9b9a0d90cbf22e9c1cc8cc5cb87170dfb7e5a267015871381 SHA512 d4c65af4234bf660336a5b6eed024e1b9fa486b570fd67d34fb6c3b0ec39d606289f54507818c3b62c3d16f3156a51151a5180c899e40350fb85dc343640664d
 MISC metadata.xml 490 BLAKE2B 9b4d27b146f567501af858fd704d7713e8eea66caac0b5878d685814b48825f4222a6286acd3a8ec4d8e698ace318c52c74e301dc8eb3eec41bca3d83d24a130 SHA512 0d33e970b5924c264711c8a77aa966ff8f1e6cd2695d34088c0f9af825cd72603173e07e39fb6d6bd22098d76c048b3dc03dd83916b092f2c68c58f94aa95b7a
diff --git a/dev-util/gtk-doc/gtk-doc-1.33.1-r4.ebuild b/dev-util/gtk-doc/gtk-doc-1.33.1-r4.ebuild
new file mode 100644
index 000000000000..5f9d0375b60b
--- /dev/null
+++ b/dev-util/gtk-doc/gtk-doc-1.33.1-r4.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit elisp-common gnome.org meson python-single-r1 readme.gentoo-r1
+
+DESCRIPTION="GTK+ Documentation Generator"
+HOMEPAGE="https://wiki.gnome.org/DocumentationProject/GtkDoc"
+
+LICENSE="GPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+
+IUSE="emacs test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/glib-2.38:2
+	dev-libs/libxslt
+	>=dev-libs/libxml2-2.3.6:2
+	~app-text/docbook-xml-dtd-4.3
+	app-text/docbook-xsl-stylesheets
+	~app-text/docbook-sgml-dtd-3.0
+	>=app-text/docbook-dsssl-stylesheets-1.40
+	emacs? ( >=app-editors/emacs-23.1:* )
+	$(python_gen_cond_dep '
+		dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+	')
+"
+DEPEND="${RDEPEND}
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/parameterized[${PYTHON_USEDEP}]
+		')
+	)
+"
+BDEPEND="
+	~dev-util/gtk-doc-am-${PV}
+	dev-util/itstool
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# Remove global Emacs keybindings, bug #184588
+	"${FILESDIR}"/${PN}-1.8-emacs-keybindings.patch
+)
+
+pkg_setup() {
+	DOC_CONTENTS="gtk-doc does no longer define global key bindings for Emacs.
+		You may set your own key bindings for \"gtk-doc-insert\" and
+		\"gtk-doc-insert-section\" in your ~/.emacs file."
+	SITEFILE=61${PN}-gentoo.el
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Requires the unpackaged Python "anytree" module
+	sed -i -e '/mkhtml2/d' "${S}"/tests/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dautotools_support=true
+		-Dcmake_support=true
+		-Dyelp_manual=true
+		$(meson_use test tests)
+	)
+	meson_src_configure
+}
+
+src_compile() {
+	meson_src_compile
+	use emacs && elisp-compile tools/gtk-doc.el
+}
+
+src_install() {
+	meson_src_install
+
+	# The meson build system configures the shebangs to the temporary python
+	# used during the build. We need to fix it.
+	sed -i -e 's:^#!.*python3:#!/usr/bin/env python3:' "${ED}"/usr/bin/* || die
+	python_fix_shebang "${ED}"/usr/bin
+
+	# Don't install this file, it's in gtk-doc-am now
+	rm "${ED}"/usr/share/aclocal/gtk-doc.m4 || die "failed to remove gtk-doc.m4"
+	rmdir "${ED}"/usr/share/aclocal || die
+
+	if use emacs; then
+		elisp-install ${PN} tools/gtk-doc.el*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+		readme.gentoo_create_doc
+	fi
+}
+
+pkg_postinst() {
+	if use emacs; then
+		elisp-site-regen
+		readme.gentoo_print_elog
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/gtk-update-icon-cache/Manifest b/dev-util/gtk-update-icon-cache/Manifest
index 37dffe876c3f..63d1544e7a5f 100644
--- a/dev-util/gtk-update-icon-cache/Manifest
+++ b/dev-util/gtk-update-icon-cache/Manifest
@@ -1,7 +1,9 @@
 DIST gtk-update-icon-cache-3.24.20.tar.bz2 91769 BLAKE2B 4fb1d4e06117924377e2e3f28f733ffd4f929414e6e36855a4486d6aa2a63f3a37cf5710c8dffdb6c32470c24861070a3160b8373dfa10a3831d098446f5701f SHA512 2ba23145e3cd46d3cd7129c68355c6918a271688935b828be110049e6a912879d25f88a8105c8dd1484de8b0c89d220bb6e8f4282aaf083602ad88e2cef9a54e
 DIST gtk-update-icon-cache-3.24.21.tar.bz2 91918 BLAKE2B b9cf0f944f13c3280ad615a6453e8fe80424b481d66af7bfd98826354f124f67c3a75afece07cd38cb8722eb1beeeb23b1cb7e23ae8d68f2dca195a155c69508 SHA512 207449dc92b029f735f40cf4e9cc59dd02103bab7c382a69feb7162873e2cf7b1fa6a7ce818533888305424667795da86be55e5befc89f8bfc8809d6aa6cd92a
 DIST gtk-update-icon-cache-3.24.24.tar.bz2 91902 BLAKE2B ed0ad6b501c31745eb40d56523ac78609d793d1389e4222a3e26c585d467aa57c17b188de8fd0c5847a7e773bcd174b25752a3b4c613c8f2a30e0d3237e9f484 SHA512 6dd7237d5f2e3bdbccafef2114c88aa4cfe6ba027f451791c981e8cb2cdd134ddc7bd20d2252d4605dab260567dbb78ba639f985baa2ae8ca8cf4c7d41deef26
+DIST gtk-update-icon-cache-3.24.25.tar.bz2 92060 BLAKE2B e6a0ae2cf791070287978c928aca7ee8e615306e19dd68ee952a9715061d5873364bc9397325d074fcc160b93f8ed8402e1833114fb3804a746c5bafa016bbbb SHA512 897a78dbadc108d8eaa026ff28a7a16c908b40bbb99a79ca9249115528d83aed7bad5c0fbd9a0d24861c08019c890362b2709ad01572b34f45651ff9f7fb192a
 EBUILD gtk-update-icon-cache-3.24.20.ebuild 884 BLAKE2B 63830fae35e08408a5f65874cdbce4c6a5c8235508e1dec4b994a1a2ff15afdae4a31700b4172b9c1b3a42d6488c25ea84f878eb4efbc6743aab88108181c353 SHA512 847e0b3e70971ca53b6e5b1c0202135f79199e8f919f115dcb658f786735e6fc2add758fa554e93d3c24ef56f1d30145da75dd673f192678d4d711f15f28d68b
 EBUILD gtk-update-icon-cache-3.24.21.ebuild 891 BLAKE2B 3f0624e0b7e5f9c6de546d656deb5493ce4f4e549810e3cf76bd935cd57ecc987da693bcc298e308196726976093d04ef2b86fe9c40c68bb116b2d28929763e2 SHA512 18b0292291330e263af174acd179c36ab2e283eb36a29163e78774ae7461ae3057b49dfc183d57e04f12517dfad8e5f4b5acc06f709b44575f5ce1dbb0171f34
 EBUILD gtk-update-icon-cache-3.24.24.ebuild 892 BLAKE2B 53b4ce1015ceb2c8f561f89861254111ba547ac364757e8940564894442342504b542efdc6bf0b79d574f12dcbae67406bf68c610fa8c111793474f88e359b98 SHA512 0b7df96eca435a6653d5b26ba95d95ba91f8e4164b7f16e325c89eef7f65d886c3f7adeed393b56412ecf6113010b28eb55e8383b3a444410276681d79404a7b
+EBUILD gtk-update-icon-cache-3.24.25.ebuild 899 BLAKE2B 3c6deea073dc6034fc8d9a8c58295066445af479b4f7116a7203a4c7bdbd1729dfe7695259f53945bd3b813f315daed32276277fae3f6290ac35016d5091653c SHA512 3216d5f465b0740229c0d97ebe7f8104129b3537bcd3cffff0145dc2ad2f18c58cc18caa0694ddd06bbc25ce040a4182ff625972aa09685ff8662455a15cfff8
 MISC metadata.xml 647 BLAKE2B 2846e4ac0b5816fe7699b197958118535cac7092930d7b6ba63c23b126242102edd832d60b13baeed23bf8781babe1058f06fece732c4ecd58c9b01b621042ae SHA512 7301a9425528d65112ec9dd1eca7291473905493b1b550119c6984141b3b216c4f3825d3b2a395a8375aa8b481b29d841153bd279d593586d5ea7d77ce46d7d3
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.25.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.25.ebuild
new file mode 100644
index 000000000000..e69d4d6239b5
--- /dev/null
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.25.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit meson
+
+DESCRIPTION="GTK update icon cache"
+HOMEPAGE="https://www.gtk.org/ https://gitlab.gnome.org/Community/gentoo/gtk-update-icon-cache"
+SRC_URI="https://gitlab.gnome.org/Community/gentoo/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# man page was previously installed by gtk+:3 ebuild
+RDEPEND="
+	>=dev-libs/glib-2.53.4:2
+	>=x11-libs/gdk-pixbuf-2.30:2
+	!<x11-libs/gtk+-2.24.28-r1:2
+	!<x11-libs/gtk+-3.22.2:3
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.3
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
diff --git a/dev-util/hermes/Manifest b/dev-util/hermes/Manifest
index 6e2f5a6a2652..44652c99622a 100644
--- a/dev-util/hermes/Manifest
+++ b/dev-util/hermes/Manifest
@@ -1,5 +1,6 @@
 AUX 99hermes 23 BLAKE2B e0c6e227ba65cc9a4d13c0b1207c4afb1b268c7c82c34eb823912c3f065988d8282bbebe42312770517940e557b0c93610dc632597193a5d9fd78dfb9d1f066d SHA512 9ac639746a3f37910c63a305daabd1c338976e3d4232b2d769e73f869727a09b3cb48e3a1f428f55751c870529403c2ea5dd4ece9676f07f16d9e40d3d9950c5
-AUX hermes-2.8-lua-shebang.patch 514 BLAKE2B 70c2c393d8c3c653de67b9cf5733ea11af9ada13ff1fc9c693bae311a9266e8776269b60387182a8937df6a631aa93bdbdc99231208c2d2644084ad08521e089 SHA512 124e36c8584f263008498c572819eb239761ea96c4716175c60a181d21da9b52fd67f33df4f3a6e0bb39a1aa236062b89ac84d8344710bfe759fee3e37c42ddd
-DIST hermes-2.8.tar.gz 61010 BLAKE2B 520110318dd0c2f2bc150b050729f9fa36c14ea5dca9a8492e77bc67618e14adb36ca35cf67b1aeb7a1e8a2dfef84fb6662bbdad21e427bff8aea4d53c271be3 SHA512 ea3378e5311202333f6eb59e301c92d9db1937e540f00283b679bd50e54312b8a98c469cf106374e9dde78a37e8997d7022569a9f81703ba445577f8cdd7e6e3
-EBUILD hermes-2.8.ebuild 899 BLAKE2B 641716bb0d45f91474ea08bd454836c87c5aecd5f4e1a221eb3a7030e7f54a8e06f2c9e3a3a04d7782e819ec7000cf9992479bf35539b46cec6d864ae8fa3a75 SHA512 89dafd4dda86b0839c95fba76d856a2d4d66fc28624c0a0091821da3a0eef5e2229d640eb361173da9a64fc87d4a1884729c5785a543959e256e2ec786b999d5
+AUX hermes-2.8-lua-shebang.patch 531 BLAKE2B ff3f44fa1793d5506302c9266c7d0fe7126a0ece9ec364d9a2bd6861ac018bdf5ef4182c9723307f208c1c96523c9d5b9af63055f927a77787df4ded504edcc3 SHA512 9713eb09c50212e8f8c5abca911e5f13891941be4d348267f33159bd0aa5517e39b760d1ade8855751849605e67580df4de69c990c17a3eec3c45a08501e47ae
+DIST hermes-2.8_p20180315.tar.gz 60771 BLAKE2B e523f1ee01e1ed3da5daa68f5b9f9d146f0764b5d5f75e9dbb71a3b4630ce06ef538745b01f0bcc30e0f2899adf1b1427022be07321c0dbe7859e0c6db82af33 SHA512 838fe1049f8f42113f5d394791499b47af4748d5fb6beccab8e3ce71398a85562340e95c0f96039fa58e6e8de3e79f3c7e87af2f7c47dc087b729cee557dac4a
+EBUILD hermes-2.8_p20180315.ebuild 1129 BLAKE2B 5f564bce7edf5ac2a57f2453cd09155f9484ed93d9caa458f94eff526e12706d8f753662989a55854edbe67465b45b52cbb385685ee1edfb399efa01c1650d00 SHA512 30a4849c484da212a7e9e1ee40ad05d4223647dc586f11206528eb0a573f25e59a9d89ef6b1d54b14c74e5c2b0b96e7f729ae0b30b241cb2afd7f00a400f33ed
+EBUILD hermes-9999.ebuild 1125 BLAKE2B beeceb45063a4ce7d569c1312846cfd7c23174fc2787a30ebad342389c87295a7183b5c3ae12b923b118d4c07bd3c961a9e438d39888b84dd3e75a9a0536c0c6 SHA512 3765a15b66af61531125c6fd85e21e3086eb134cc919c17ce49ac870a0d720806624fe34e47b6e254b0d643f774827024a2a26c2be596f69bfa7ecda492170a9
 MISC metadata.xml 356 BLAKE2B ffeb5fde219af8b22df4100049e885316a8889daf293bc92d61ba05953aa62e27dc3735fc96e579aae4d0e56498022616cc6c57250af886631d2f31bd00a57a2 SHA512 76a904528cbc4c1b333a7f97bc17d2cd3fb00a797766728cea99ca79186f4c54b2f54379c288aff943932825d2a7d5ee0a1a3b201f76f603611a87e392b0203e
diff --git a/dev-util/hermes/files/hermes-2.8-lua-shebang.patch b/dev-util/hermes/files/hermes-2.8-lua-shebang.patch
index 67058f726d78..c575c5e605a2 100644
--- a/dev-util/hermes/files/hermes-2.8-lua-shebang.patch
+++ b/dev-util/hermes/files/hermes-2.8-lua-shebang.patch
@@ -1,13 +1,3 @@
-diff --git a/lib/tool.lua b/lib/tool.lua
-index a9124f3..8c39911 100755
---- a/lib/tool.lua
-+++ b/lib/tool.lua
-@@ -1,4 +1,4 @@
--#!/usr/bin/env lua
-+#!@LUA@
- 
- require("strict")
- function tool()
 diff --git a/bin/lua_cmd b/bin/lua_cmd
 index fabc5d5..32c8e13 100755
 --- a/bin/lua_cmd
@@ -21,3 +11,13 @@ index fabc5d5..32c8e13 100755
  fi
  
  export LUA_PATH="$execLuaPath$extra"
+diff --git a/lib/tool.lua b/lib/tool.lua
+index 01acca1..bec5e8d 100755
+--- a/lib/tool.lua
++++ b/lib/tool.lua
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env lua
++#!@LUA@
+ _DEBUG      = false
+ local posix = require("posix")
+ 
diff --git a/dev-util/hermes/hermes-2.8_p20180315.ebuild b/dev-util/hermes/hermes-2.8_p20180315.ebuild
new file mode 100644
index 000000000000..1f67ffbecd8b
--- /dev/null
+++ b/dev-util/hermes/hermes-2.8_p20180315.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} )
+inherit lua-single
+
+DESCRIPTION="Lua based testing manager"
+HOMEPAGE="https://github.com/TACC/Hermes"
+if [[ "${PV}" == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/TACC/Hermes"
+else
+	COMMIT="b99622087233178368cff6cf38ec72fa01dfd8a6"
+	SRC_URI="https://github.com/TACC/Hermes/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/Hermes-${COMMIT}
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="${LUA_DEPS}
+	$(lua_gen_cond_dep '
+		dev-lua/luafilesystem[${LUA_USEDEP}]
+		dev-lua/luaposix[${LUA_USEDEP}]
+	')
+"
+DEPEND="test? ( ${RDEPEND} )"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.8-lua-shebang.patch )
+
+src_compile() {
+	sed -e "s|@LUA@|${LUA}|g" \
+		-i lib/tool.lua \
+		-i bin/lua_cmd || die
+}
+
+src_test() {
+	local -x PATH="bin:${PATH}"
+	tm -vvv || die
+	testcleanup || die
+}
+
+src_install() {
+	dodir /opt/hermes
+	cp -r "${S}"/. "${ED}"/opt/hermes/ || die
+
+	doenvd "${FILESDIR}"/99hermes
+}
diff --git a/dev-util/hermes/hermes-2.8.ebuild b/dev-util/hermes/hermes-9999.ebuild
index a6b7694d1f6a..e616c7382f47 100644
--- a/dev-util/hermes/hermes-2.8.ebuild
+++ b/dev-util/hermes/hermes-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,28 +8,37 @@ inherit lua-single
 
 DESCRIPTION="Lua based testing manager"
 HOMEPAGE="https://github.com/TACC/Hermes"
-SRC_URI="https://github.com/TACC/Hermes/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/Hermes-${PV}
+if [[ "${PV}" == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/TACC/Hermes"
+else
+	COMMIT="b99622087233178368cff6cf38ec72fa01dfd8a6"
+	SRC_URI="https://github.com/TACC/Hermes/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/Hermes-${PV}
+	KEYWORDS="~amd64 ~x86"
+fi
 
-KEYWORDS="~amd64 ~x86"
 LICENSE="MIT"
 SLOT="0"
 IUSE="test"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
+
 RESTRICT="!test? ( test )"
 
 RDEPEND="${LUA_DEPS}
 	$(lua_gen_cond_dep '
+		dev-lua/luafilesystem[${LUA_USEDEP}]
 		dev-lua/luaposix[${LUA_USEDEP}]
 	')
 "
+DEPEND="test? ( ${RDEPEND} )"
 
 PATCHES=( "${FILESDIR}"/${PN}-2.8-lua-shebang.patch )
 
 src_compile() {
 	sed -e "s|@LUA@|${LUA}|g" \
-	    -i lib/tool.lua \
-	    -i bin/lua_cmd || die
+		-i lib/tool.lua \
+		-i bin/lua_cmd || die
 }
 
 src_test() {
diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest
index a6f69c6480d3..cd7658655862 100644
--- a/dev-util/idea-community/Manifest
+++ b/dev-util/idea-community/Manifest
@@ -1,6 +1,6 @@
 AUX idea-community-jdk.patch 485 BLAKE2B 3ccbddf308b1cb1af020086e7568e05b4a60b28d77e995194e622aa229340b82069bcdce0e5f05152ce626cdd574c3d891f494fdead59354223e96b0347036a6 SHA512 156f05a7f78c48e9ef9d0ed991d1fb390c5d40f7b32f41c02f51805fa2a6f523a255576fa4033ec98192f8626edd31d20259b0a37660506331ea8060826ffd4b
 DIST ideaIC-3.1.203.6682.168.tar.gz 577542631 BLAKE2B d47d017b76fa9106a55805b558bd49d6d45dd216ac28151f03cc2a7f3a751707b62fa49623bb04b426d90cfd1cce4e04b2490bb91ec01dfeccdf4a80f1694f7e SHA512 71849f9440c34359a23af1f4735c3b0ac6378f6ab8ddf5799ad7e26036dc87b4abbc234043bd368a7698daf91f83cf989539054db7e1fb9ea95ebf7d756ac068
 DIST jbr-11_0_8-linux-x64-b1098.1.tar.gz 191689225 BLAKE2B 0da0f0e834709c89820f2e7e1c447dc33ea1c59c7dfb573aa47bc205f7920ccf485454f79931d42d4e6eb4de1017589bb908808d6a80cc586659757abc9958d3 SHA512 a455d8bd3332622592186cd7ae3995a9148a47717a81c274497f5408f1e89ef637c7478321b4ccd5dbe97c2e246a16ac8956c5ce475f8a4156232647f0ea7737
-EBUILD idea-community-2020.3.1.203.6682.168.ebuild 4043 BLAKE2B 4bf62f4d6d79ab1d6d839f18e94c4f13965e3d7c5d3473aad0f00a0f80bc1123fb5ce9a2cc86212b21c53d0691514c5cf4e9b24bc8decbb89042f1e80dc6cb15 SHA512 75c0b45cd2cf78d9f4a19bb1f2fff91ec0ed6b4ccc7e44b9a33baa72bea6600965fc728ef3f6eb36a4f57fb722bbe6d20ac29a39a767c14ede0f09e9bf7116fd
-EBUILD idea-community-2021.3.1.203.6682.168.ebuild 4043 BLAKE2B 4bf62f4d6d79ab1d6d839f18e94c4f13965e3d7c5d3473aad0f00a0f80bc1123fb5ce9a2cc86212b21c53d0691514c5cf4e9b24bc8decbb89042f1e80dc6cb15 SHA512 75c0b45cd2cf78d9f4a19bb1f2fff91ec0ed6b4ccc7e44b9a33baa72bea6600965fc728ef3f6eb36a4f57fb722bbe6d20ac29a39a767c14ede0f09e9bf7116fd
+EBUILD idea-community-2020.3.1.203.6682.168.ebuild 4024 BLAKE2B 6d1449e6d05c75658960eca5962fc59b4c51f8cf2da6b92f8bc03eacd26c0ea80c6d6dcfabe6929874dcc24a01f6ee6ad45af48abfc59c6e7fb481963ff7bb77 SHA512 7b82f9c06a7924db2c07e96bfddbfa97b84d54039d8e703988721be8a16fcc9836248038f95f1825f541a5798d5d6510e81f46defb4a6d0f8a4b10cdd564ed0f
+EBUILD idea-community-2021.3.1.203.6682.168.ebuild 4024 BLAKE2B 6d1449e6d05c75658960eca5962fc59b4c51f8cf2da6b92f8bc03eacd26c0ea80c6d6dcfabe6929874dcc24a01f6ee6ad45af48abfc59c6e7fb481963ff7bb77 SHA512 7b82f9c06a7924db2c07e96bfddbfa97b84d54039d8e703988721be8a16fcc9836248038f95f1825f541a5798d5d6510e81f46defb4a6d0f8a4b10cdd564ed0f
 MISC metadata.xml 453 BLAKE2B f244aa814b9eb5c6b00f6fea725a344a7413710b1fae03edc4590dfa9c102872e0e4d1cdb669f739854d7fac351002f7819aec371f3bd0eeef2fdd4aa2c8f60b SHA512 e6c5f1094ca8ba70b9bfd5b028f11542c8150cea0b543b939da144887043e4ee20ddf6cc89641329bde7456492d6def6f0e72092b7fa21095463a20aba9e0b03
diff --git a/dev-util/idea-community/idea-community-2020.3.1.203.6682.168.ebuild b/dev-util/idea-community/idea-community-2020.3.1.203.6682.168.ebuild
index bb95ab1a3858..0afe236ed52b 100644
--- a/dev-util/idea-community/idea-community-2020.3.1.203.6682.168.ebuild
+++ b/dev-util/idea-community/idea-community-2020.3.1.203.6682.168.ebuild
@@ -17,7 +17,6 @@ JRE11_VER="1098.1"
 if [[ "$(ver_cut 7)"x = "prex" ]]
 then
 	# upstream EAP
-	KEYWORDS="~arm64"
 	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${PV_STRING}.tar.gz"
 else
 	# upstream stable
diff --git a/dev-util/idea-community/idea-community-2021.3.1.203.6682.168.ebuild b/dev-util/idea-community/idea-community-2021.3.1.203.6682.168.ebuild
index bb95ab1a3858..0afe236ed52b 100644
--- a/dev-util/idea-community/idea-community-2021.3.1.203.6682.168.ebuild
+++ b/dev-util/idea-community/idea-community-2021.3.1.203.6682.168.ebuild
@@ -17,7 +17,6 @@ JRE11_VER="1098.1"
 if [[ "$(ver_cut 7)"x = "prex" ]]
 then
 	# upstream EAP
-	KEYWORDS="~arm64"
 	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${PV_STRING}.tar.gz"
 else
 	# upstream stable
diff --git a/dev-util/kcov/Manifest b/dev-util/kcov/Manifest
index cf807e62f8ed..32487becb8d5 100644
--- a/dev-util/kcov/Manifest
+++ b/dev-util/kcov/Manifest
@@ -1,4 +1,4 @@
 DIST kcov-34.tar.gz 296345 BLAKE2B de6acbecd35b1d85a4a0f9f43fdf5dcb09331f88622a236fee672a8624c77baf4a8589d61aaecfb51220b83d28d98426ed32bfb345b717bb13fb180f479cc371 SHA512 63ea8e47f00e53b55be4c37697a7f0b78c15f887a40fc0679d7e92f1561bd379a526a82179ee243838fe6f6bd5b89c9eb76716cdb5add7bfb0f312176422a346
 EBUILD kcov-34.ebuild 509 BLAKE2B 8e9bb470e023a442d4aeedc2ba564d8ad8c9a2c40c2619b28b130a14b225ab49ec619aa161444ef31d078dd49226c159be28a11833a8dbbebc92dd7ef748f2ef SHA512 7cbdaf21d0b35a72f994c05b1aff180b9f805d7bfb05f1af89e7d5d33db9543bd1cd468813c8c5518305fa0de3926ec1b3d8b093badfabf11df53811086a7a58
-EBUILD kcov-9999.ebuild 638 BLAKE2B fdd240a4bf38de8939b29ba7c04c1f29fe8977a074fb2c35bf23c80ac34539da1a0f39d60073a785d2850194e92d03f8618e6169ab00706cb0b686dd458ba5ce SHA512 cec899ac8769080dfa88b1d34d9f4a0b2da654da9712a4236cc343533e3bc33815159ef84074c843eba3053ee672f034ac2c439e9431ae2e0a0b4eac5f584eca
+EBUILD kcov-9999.ebuild 622 BLAKE2B ea0b26b8f99d3cf6274611ebcf0992b8ebff8694ad2eba1fb13ad6f68e36bdad5e9aee581df2d2082c2be96de24d356bff3b0b2831bae502f70ac6223ff928bf SHA512 5e0063bd35d39a228b56b796a1c7e5c769e68fd156bb933d96dd79113c9ab2e831a3c595efa305a6e18639d06c1ed76d07e64245afcedfb17584e00c78043a14
 MISC metadata.xml 250 BLAKE2B 4aa2c984b48b686831ccaa542ffffed7eb9bbdbc41d1f4ede551845768fdf0f2a3443502037db80e77e6105f97c0932d4512a84b244d67e6e8aab8e1dcbb83f2 SHA512 aabb9dd0e703f923f2d03a759fbdb731e6c07b2149cea06d1215cb8e282cdddf0a1f9b7bee7adcc391583566bd7962d7e4f2c7d61286bac56c0c2549bfadbc7c
diff --git a/dev-util/kcov/kcov-9999.ebuild b/dev-util/kcov/kcov-9999.ebuild
index eec056058ef3..bfac1caa27c4 100644
--- a/dev-util/kcov/kcov-9999.ebuild
+++ b/dev-util/kcov/kcov-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,6 @@ SLOT="0"
 if [ "${PV}" -eq 9999 ]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/SimonKagstrom/${PN}.git"
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/SimonKagstrom/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index ac435a6a14cf..9933fbad812f 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,3 +1,5 @@
 DIST meld-3.20.2.tar.xz 593948 BLAKE2B 9f2fee48405d76f9ae2fd0b0dd4116321aa176059dd4ef217a5c4c8d0edff5859bab72bbca83b2e7d612706f017d1889d68579eaf9838d7784c9ecb74ed7d403 SHA512 9c9074cb879e3574eb9a1025eb1212771419ab0d8e92bf8a99f38e70ca583ff5c8cbeaccb87b414e6ff73a61afa08e10742991d574b810cc90e8c4a5ac82ddaa
-EBUILD meld-3.20.2-r1.ebuild 1411 BLAKE2B 9f8ca38cd71aadff4a95cd3c45b007c2b2e5fc4e08ed2badd0d937b53c1038a897b72dbcdfe791fb6e688a52feae5548a75517283870d71a8951ebd019dc59e9 SHA512 0ab7e5b54c56bed1ab80cc7702c02c374ce760513fbf407daae1b6b8e334c31adaea01896c5c5ed6f162131a6355edf25de8d49ad3b12dd51a3049a9b6a1eaea
+DIST meld-3.20.3.tar.xz 615248 BLAKE2B e60e6e9437c27cd217d39d045a5a23000b5b52e99387cfe0612c32ffb31205e467a13c8f42f478515bc8ba0d27814963649c362a7a95ac53e98f14398fd0cb3f SHA512 88052d1a59453e780a7842d2bf4d42ac5db8f5b4aa4b1ec3a931fb8d982d45fd212cfb75bb8395a2ad7b380a6e0c33d020a0562b4ffdf4afdc74d92d6d5751f0
+EBUILD meld-3.20.2-r1.ebuild 1413 BLAKE2B 65dff56545810e4f02a93381e4c6f63aa46d2a637d70fa92c4dd3a1dee8c6eb9235ddad0d6e5050b1263de9b65f6115a0b80fd78ccfd5e6617f3d87b3ce14d91 SHA512 41f9e42e6c9d9af7d276da34fa67c9e84b39352a86d788b12b84544a468168822689875758b6fd53ffc3b0a22fb1b5b603a2ec6ea0f6cd87a86269abdc5bb159
+EBUILD meld-3.20.3.ebuild 1425 BLAKE2B a650c3941ccb0a6840aca833e0355fcaf5be13dfe1291104686c2f9bb757c4060cb28fb128f33fde54ec50f241e80fb989e6f637774ed182947df94491523035 SHA512 9b2afa73f5550bb7f9efd00d0689d50229b21fe0b4fc577afe06fef735cf7313b91aa10671bb8fc1ba9fd63769f0c49ba45a339e667c85ea83d09b7d14e6a960
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/meld/meld-3.20.2-r1.ebuild b/dev-util/meld/meld-3.20.2-r1.ebuild
index 2238ffdef30b..5e3097a134e4 100644
--- a/dev-util/meld/meld-3.20.2-r1.ebuild
+++ b/dev-util/meld/meld-3.20.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 PYTHON_REQ_USE="xml"
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=no
 
diff --git a/dev-util/meld/meld-3.20.3.ebuild b/dev-util/meld/meld-3.20.3.ebuild
new file mode 100644
index 000000000000..f398fdb8b2f2
--- /dev/null
+++ b/dev-util/meld/meld-3.20.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_REQ_USE="xml"
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit gnome2 distutils-r1
+
+DESCRIPTION="A graphical diff and merge tool"
+HOMEPAGE="http://meldmerge.org/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.50:2
+	$(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}"
+BDEPEND="
+	dev-util/intltool
+	dev-util/itstool
+	sys-devel/gettext
+"
+# dev-python/distro is soft-required in BDEPEND for python3.8 and onwards,
+# but it's mainly needed for debian and derivatives - seems the fallback
+# works fine, as we aren't a special_case, just an annoying warning.
+
+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/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index 664ca9cd01cb..9baf8f12deb9 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -6,8 +6,8 @@ DIST cuda_11.2.0_460.27.04_linux.run 3046790184 BLAKE2B 5330bc2e12ff131eb993610c
 DIST cuda_8.0.61_375.26_linux.run 1465528129 BLAKE2B d52ddf1dcf5246f230f210d10d1f6e7b540c892dea5a8cd770f0d062b30b01f5c8467d930430b383464d40a9b4a14eaaf22a365e081955e4452ec4f55e08da0b SHA512 d22303719a9feff64f95bf6a966f1caa2bf0cf8c955e475ce08ce54faa5e098d336c2db223ef0185c1f23b9c52b7d2f81a63515485219cfc016d72bda979248b
 DIST cuda_9.2.88_396.26_linux.run 1758421686 BLAKE2B 5068b2dfae87e43c124a6a72ac98b7c562aebc7161e7c977cfba68342127e99705228be531aa5bb8af0318e17c4ef8fe36257452d0f507fc3b82e3fbd0184bdc SHA512 2d0d87926e11a1b21d6d3377138753df458a53ba9539d8399f9f252e0784cb41e2c63a5c724ca81ded82b9657b97fda51d812b467b0827e7d361aa2ad73b2dba
 EBUILD nvidia-cuda-toolkit-10.2.89-r2.ebuild 3992 BLAKE2B 858d1b4db64e393f061a36c3e8f22dfa83bb2e4d083ca5d987eb80b1e74ed2fb51923ecc49a4e32f52291d6ef84e1d82ab257bb345d11225e92be1368b5f4f9d SHA512 047735e7b92f12a7152b950c88d8c6b09da7772a31f4b133c8af5c8295f55d81b312b796b481dd7f6ae6767d3f2632a280533c6bcd5a22ec705dfcbd3933a94b
-EBUILD nvidia-cuda-toolkit-11.1.1.ebuild 6333 BLAKE2B b689e1357c742fd40a01e648c5edb4fcd30a3a73a55f6f83a3b13bb4c508a097333f99b99c86f6e00c50b987541b23cee0edcd03b992ec730ecf08b771086e08 SHA512 e9c6c0f5811e137504dfe8744801511ec92aba144dbf5e0af88409ac7d069873d317b2b154fb62b30fea00239d7d0b26859b25525d785e9ff8bed3262f23a6a6
-EBUILD nvidia-cuda-toolkit-11.2.0-r1.ebuild 7332 BLAKE2B dfe474e2b23725f8008a9ced0aa533caf3db20176e1a849d6b7ba971e426b4c490425b00758826fe60db1c8eb406658ffe151dd66ff2f8e1f3f6e032236dfd8d SHA512 88fe7a6fd22e2e369bca13ea03d1a27fee5fc8070ec2a03cdd5142144f652bac6d4595e5cec2045078198641ea03c0b43954f37f71d99ee54c422bc5d5541ad7
+EBUILD nvidia-cuda-toolkit-11.1.1-r1.ebuild 6307 BLAKE2B 7e80b1f12a9f9f4eafb4f0117dc9adfc00c3cbade520f45a61a124f5d7bbe5c2387b137076ae505cca0e351bfd3c701c68668fe5f44fd8966f82861b6c99a1df SHA512 625f46b9f3fa13e78caaa0154fd663f71f5d500b0774422df8324b13e48db0fa0dd5ed72d0ae7394724416ebf802234b2ce4ae840db43dd2d732f6a9861f829d
+EBUILD nvidia-cuda-toolkit-11.2.0-r2.ebuild 7306 BLAKE2B 9fb4f81f27142e8194142bf8d25c7f8426f7e186faa56bd757a40d397dcda56fbdd6871fcf20e12179ecdbc016c0810fb314c372e1247dba2eebe17c004b59f6 SHA512 2b6f47c95837214912361ba1cd56d9d6952c3d29e464621ba8e97ed4c08150d468a1521f1591647dde7ac410bc236b635dbfafdd4c9a07bc1ceab07bda74cb02
 EBUILD nvidia-cuda-toolkit-8.0.61.ebuild 3435 BLAKE2B f404d22f374dad343031ed38a7223069e4e10c3b7f93122f415803bc3f6ec868f92bbcd3104b1e43899f77d990f429befcee77846e92c20830586b6e8c665e04 SHA512 1fa6bea7b82dd4264608ef3e73f589061617bd05c7c15e343a0f548c5f37845ea85ffdc4fe6151e7e798781beaeea015309f2cb42170a4991ca0db8f98ab6756
 EBUILD nvidia-cuda-toolkit-9.2.88.ebuild 3420 BLAKE2B c0b4f78b1a1947b8414ab2dd163365b189edf15b49465c24f104b424bc11b9b92bd36c633226f5b1a4c01b84721247e58b4501952f96f60531ed42b1eebff3f8 SHA512 c9e5bf620e9d29495d623c70a574e5f1847eef4464820229a77c6ceb25b150be5c8d0c2612193b2ba5fd1642d60d8d0a619f679825355cd7bd42cbaea03f1620
 MISC metadata.xml 724 BLAKE2B fd9e30ae430f56599bab7004b9cd46a79bd9b94e75b0a4574ae393d8979b5e40862bf30d110d5d47186d74e629f035f854cea720d8393709d95a9c14b1185a26 SHA512 3a77849ec1bf2e61da35ffd76c20464b5de745c73abd14ffcb7e7d3b2f52e7d114c7d4630292ea219a23e327f1b6a0a8ec488a8cbdaf763a73554f17f50c2f7f
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.1.1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.1.1-r1.ebuild
index 81930c21bfaa..5c396d56aa32 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.1.1.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,12 +22,12 @@ RDEPEND="
 	<sys-devel/gcc-11_pre[cxx]
 	>=x11-drivers/nvidia-drivers-${DRIVER_PV}[X,uvm]
 	debugger? (
-		dev-libs/openssl-compat:1.0.0
+		dev-libs/openssl
 		sys-libs/libtermcap-compat
 		sys-libs/ncurses-compat:5[tinfo]
 	)
 	vis-profiler? (
-		dev-libs/openssl-compat:1.0.0
+		dev-libs/openssl
 		>=virtual/jre-1.6
 	)"
 
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.2.0-r1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.2.0-r2.ebuild
index aa6f7ee59f5c..5bc6c57081f8 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.2.0-r1.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.2.0-r2.ebuild
@@ -22,12 +22,12 @@ RDEPEND="
 	<sys-devel/gcc-11_pre[cxx]
 	>=x11-drivers/nvidia-drivers-${DRIVER_PV}[X,uvm]
 	debugger? (
-		dev-libs/openssl-compat:1.0.0
+		dev-libs/openssl
 		sys-libs/libtermcap-compat
 		sys-libs/ncurses-compat:5[tinfo]
 	)
 	vis-profiler? (
-		dev-libs/openssl-compat:1.0.0
+		dev-libs/openssl
 		>=virtual/jre-1.6
 	)"
 
diff --git a/dev-util/patchbin/Manifest b/dev-util/patchbin/Manifest
index a6865045eae8..7cdf7b46f43a 100644
--- a/dev-util/patchbin/Manifest
+++ b/dev-util/patchbin/Manifest
@@ -1,4 +1,4 @@
 DIST patchbin-20160208.tar.gz 9713001 BLAKE2B 4ce3c5d43f7b0a909b5058b3877cecef68f703d803bcb6a4e4b7e907dedaab98cbe87f33a5211a318f8146e9ef4753da18d58b3cbc8e4ff715b58d82227ad7b6 SHA512 eeb5c4bc708cfc3a065568ef233297586c3bb3d497c6bf3ace52b8337b5a5d127e607f668a6f74e3be892e8cfac96a046dea3646735c4404efedd8760572353a
-EBUILD patchbin-20160208.ebuild 1008 BLAKE2B ab47ce4a15474422f0f286214c14aa830ffd1e000c69dcaacb2e1623828c8f00181f04036d88c65e90f958ae95537b488fb224119121f81ac0a29b9f7a0fd95b SHA512 6718f909bda5a9e5b626f6837c26361af47322860cb47b9b87de8a52296d4a3c2b629c352de59dd364cbee9f1d433becf0ffc784cf46f6aed60255cf047307f6
-EBUILD patchbin-99999999.ebuild 1010 BLAKE2B 85063233e51b7c5a4abd5b45dcc41a64aa81cef9ddfd41b6bc8ecad93ff8017cb12b66d1e0f56f5d516399117e6c9ada0e2806fae11d05bdf223d3fd55804100 SHA512 dc867d5298c24ee84b815cf7c875e6adc430d14dce274343f3814b3b5fb0525a9a32308465f87133ad29e7c4d17088b525f9035f9245e543a0826b0a58ff480e
+EBUILD patchbin-20160208.ebuild 995 BLAKE2B f7829e3549ea052ead9f7cd9f88b4dfdc570486eea499e56727dbb94956d59fbd99fc2784e4fa9abcb79a958016798f81795004b14a268743d5098645e4b38f5 SHA512 5883bf5561b8ac40dbc40bbf7f38c6fec298f0388e0d6abe96f1b40b177f7b883a61b6f1429bc4fc45dcc56c9b8b52951aa358eecc2fc988a7b7354012776a24
+EBUILD patchbin-99999999.ebuild 997 BLAKE2B 564d7d299fb5e76661fb30098bc3fad45e544c4a3839dbcd7a4c5938fa38dd46cae64c12fde6a3e61c0288a4a355d81820cacb24dfe94a655539b30186c6f85f SHA512 8048960d5ae5b23451b280df49e605fb7b1ba8d2d7c39edafb49188c56c2ab9540b4de65ce6bd406e6145dcfa40fb2ebf8e60cc0cbc50d26407a5460cc8e7739
 MISC metadata.xml 444 BLAKE2B 5f90f435bd40ef6a4850e446570555068201e16125a3f8ecee0e8b1bdc5a4394d53c6bd773be20fe79cfef9eeb3cf62504b5e8b5999479d875a8e3aa81bdaa0d SHA512 f26b1774c72115b0b16a90279350861bd38d6e69a35c7b8fb1cada3082ea988b1ce187d8ba8f31dbb2386e7e7d6c75fe26dcf88286d733aea883bafedfb84a38
diff --git a/dev-util/patchbin/patchbin-20160208.ebuild b/dev-util/patchbin/patchbin-20160208.ebuild
index dc1c6612f55f..4986103bdca5 100644
--- a/dev-util/patchbin/patchbin-20160208.ebuild
+++ b/dev-util/patchbin/patchbin-20160208.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,6 @@ EAPI=6
 if [[ ${PV} == 99999999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/wine-compholio/wine-staging"
-	KEYWORDS=""
 else
 	SHA="4ffcf184bb71c6c3512b3a8c144dcf4a3a76d23c"
 	SRC_URI="https://github.com/wine-compholio/wine-staging/archive/${SHA}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-util/patchbin/patchbin-99999999.ebuild b/dev-util/patchbin/patchbin-99999999.ebuild
index e6f35b3196ad..e624022cb841 100644
--- a/dev-util/patchbin/patchbin-99999999.ebuild
+++ b/dev-util/patchbin/patchbin-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,6 @@ EAPI=6
 if [[ ${PV} == 99999999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/wine-compholio/wine-staging"
-	KEYWORDS=""
 else
 	SHA="4ffcf184bb71c6c3512b3a8c144dcf4a3a76d23c"
 	SRC_URI="https://github.com/wine-compholio/wine-staging/archive/${SHA}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index e2470d472c8f..b83f8d8e13e2 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -2,14 +2,14 @@ AUX perf-5.1.15-fix-clang8.patch 659 BLAKE2B 5f68efedb5dfe092116db7cb1a0586dbefb
 AUX perf-5.4.20-binutil-libs-2.34.patch 1845 BLAKE2B 573a1d620ec5ee45b8baa09527062733f699e667be83f0fc17af469295778453b0ad0a6af892321423b1189a2d19b7b4c8e26533c1f23e48ed8b1baae7b2ed60 SHA512 d83549c67b97c0039764bea381a00bdda1b883352306dfa47ff326f9290d6cbcf3f830b29bc4a44cfccefdedb5e92974c8dfa28f6e6007ab289ee07546ddfa59
 AUX perf-5.4.6-fix-clang9.patch 558 BLAKE2B 001bde226595891626dc7b46ece6de240696bbfb7e5071e4f071653f90e3b98a032ed375b0ec4a3f88795c20b8066954e8934fc4c38f8814c0349c6037d60a1a SHA512 af1c82863b2e7e9d87199896765646622d8431fac7a80b7579fb88ca83df182493996b61033618632a9b11ca6c87e4400cf14506ade9b00d327ed2cf644e1945
 AUX perf-5.4.7-propagate-cflags.patch 1502 BLAKE2B d35f94d10ecc2d384cae9084a7f843581553682bd1ec66e7dd33d0fe110e03c01761b9b2472aa637a71f5c694f4c4eb10691afefb08351e06ea607ca4a460248 SHA512 a5506e118f75439386b3c7699197b20017ef819669b06d89ed79886146e7a79d52d1397680cc94e10137bd6665d3dc2812cb1556498de2739f4d967582522a80
-DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
-DIST linux-5.7.tar.xz 112690468 BLAKE2B b2b71e231507429b178b6b89be546c4a3ee2757f5d2c58b6137d383f16034a587225a75a9dbca6a01a433056ebe078487132c224e909a2971c9634687e47b1d1 SHA512 45bde01593f6147c8c169b9e46b4b56eee998142552ae0ff82f1dd21b1fd54f3b32f6283f6bd77ea717d374672167849e468c157f235d2f12f7d7816e4623bf6
+DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
+DIST linux-5.11.tar.xz 117619104 BLAKE2B 81300c27bd5476387a83123aaeb4163c73eb61e9245806c23660cb5e6a4fa88ffc9def027031335fa0270fc4080506cd415990014364e3a98b9d2e8c58a29524 SHA512 a567ec133018bb5ec00c60281479b466c26e02137a93a9c690e83997947df02b6fd94e76e8df748f6d70ceb58a19bacc3b1467de10b7a1fad2763db32b3f1330
 DIST linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556
 DIST linux-5.9.tar.xz 115507140 BLAKE2B e8d11472d63a9f8409ca12a2e8c97c6963a3d4516b5a398b627d6ece565584526f9b5a1377a2fa4bd184c09c7db94c987428bc5d52df0c788464a67e9e8d6dcb SHA512 d3d92ce4246bad74c9a784212f160d98449b1e8793970c2c308276568d852b8effe0528686bdb87d55d691f09a826abf7938d69bdd4759ce65ddd5c05ffe4eca
-DIST patch-5.4.20.xz 776552 BLAKE2B bad2a95ed8521ac5c379fe91e16d60b2a38de19b9239755084621e5230677b232ec4cf9e2e8161c0022daff43fdbb37d5b5b5bfdc9e932ef3a860bcd17f640f8 SHA512 65fbcdbd41e35c17601ff15bbe33933be2ab7a694aa181a0b802cc11c1c653c9b688dbb382076cbad05983a0c07467955c035ae25f5175f7ce5bc24339303d77
+DIST patch-5.10.16.xz 498880 BLAKE2B 14061b505285f24938fb955ccc7f9fbd78ccc0b1026bffb17a89fdad08ea54bfee7bbb841123d9af4d0720a960a27c649c39852af7e2be8a286af926c7bce9c0 SHA512 be9cfe1ae6697956ca7476cedc212a8cbd9da2c3c72096a89afaaf73c5b6655fd04d458f96c472f680c5513c0ea3e4449c4092a958425b6040f0c7774453cd2f
 DIST patch-5.9.9.xz 502816 BLAKE2B 104fa2ecaac3c543662b891de22cb881a917320317d58dcaeb6b6826e3f0296126ab5177cc7a44a438c15d3ae9cab116ff6926cce9d5e4d310df99fca0d9b909 SHA512 87852bc4d08cd5e82c7de9a8c8d50c1b4c67eed7157bfe1034d279370ff21a194f082f126d49812f84ec726100c5d97b3d908994e92c2cbfd231a4ac851babe3
-EBUILD perf-5.4.20.ebuild 6647 BLAKE2B bd49393856869a9211a533d736210e2cb69d53fa47cc4a766c091384ce1d71a0812ca8225733edb3fd395304087eaf85f3663b82357b66f360d7a06d8d8d7582 SHA512 887881de705a28c0b8cdd1ea46586b0d0c8a7323acd460eec7dc8a93fc6d10da7280412d117feb4debd2d4a05843c975ae576e3d6252d30b7abdf793a9cb5cfe
-EBUILD perf-5.7-r1.ebuild 6479 BLAKE2B aacf8002ddaa40ebb9aabca97bf241dd07673d219629e3e3f088e392a1b4e1b378393fad2c889c0b137a3624a56317645492d8f9dce9a62832cb8f9a10aadf05 SHA512 1d4c98b296bfc1c2b64487f5094afacfc941e13709955342501a11af5f3938cf335f9aa82e971835d6bdafa5679e64636692f3350cc17c9ba08de00827b90aff
+EBUILD perf-5.10.16.ebuild 6865 BLAKE2B 120563893c8f98e43abca27a96a3a4d3884308924a78a94134c407cc2cd2363b404dc37736db13ba7ba1c5a254c852f305ef8e4937a9e53cce097a75bb0fa8b1 SHA512 367f1f16a1dc471df6c636ad45547615b67100fda93a5f4acbfa7f78122129fb3dc696695a4f143cab450baf838258fba492328d3fd3c5f8833c94bd330b4a89
+EBUILD perf-5.11.ebuild 6865 BLAKE2B 120563893c8f98e43abca27a96a3a4d3884308924a78a94134c407cc2cd2363b404dc37736db13ba7ba1c5a254c852f305ef8e4937a9e53cce097a75bb0fa8b1 SHA512 367f1f16a1dc471df6c636ad45547615b67100fda93a5f4acbfa7f78122129fb3dc696695a4f143cab450baf838258fba492328d3fd3c5f8833c94bd330b4a89
 EBUILD perf-5.8.ebuild 6645 BLAKE2B be18e759056f79629689d00cfe599c4102a6e041ac5d9657f854773681437040a1ed19c634db594be4779da799b163c514f11f2bea479705f9489f4f81fbb736 SHA512 b77d0aafd23dec90cf050d6a810f2a7807b0b8301d3619a80d790c2d7c2472c94e386174224d7aecfaf210ca8fcfe61147e8bed3ea2282c595433f9ebd549399
 EBUILD perf-5.9.9.ebuild 6863 BLAKE2B a72ab5d45815e2311d1a88a1bf8971171cd13ab476d3a3a8fa45b769f64bbf4b537860318b6ae601ec9104f729af5b057ec90b90e981df2672551336a7b2d171 SHA512 766cd1f2e0e10c46c05ac3dacd585a1acc027edaccd89b38cbc5db8ac535c66c5aac65ccc4ed666dfdd5b2faff6adf54b5ff4d61b9c8b9948a3fde71b5cc7a28
 MISC metadata.xml 1506 BLAKE2B 3f82b3824ed6e126239ccedc332b79b450a695df6149b094b05674e6bf99c1300919fd7046bc47b62a39f879cfaa72d1f496f46c2f6b76aded8ef154b3ae5a2d SHA512 ba7560b91456c4930c44427865859512166e747002fb4e5331530a2fd2b40f0828870ec59f21abb2836b6c51c70ddf77a820d475f7f8f97a03737c7178b5d8d6
diff --git a/dev-util/perf/perf-5.7-r1.ebuild b/dev-util/perf/perf-5.10.16.ebuild
index a954d845b707..57147178746e 100644
--- a/dev-util/perf/perf-5.7-r1.ebuild
+++ b/dev-util/perf/perf-5.10.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,9 +6,6 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7,8} )
 inherit bash-completion-r1 estack eutils llvm toolchain-funcs prefix python-r1 linux-info
 
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
 DESCRIPTION="Userland tools for Linux Performance Counters"
 HOMEPAGE="https://perf.wiki.kernel.org/"
 
@@ -34,11 +31,22 @@ SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="audit clang crypt debug +demangle +doc gtk java lzma numa perl python slang systemtap unwind zlib"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="audit clang crypt debug +demangle +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib"
 # TODO babeltrace
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
+BDEPEND="
+	${LINUX_PATCH+dev-util/patchutils}
+	sys-devel/bison
+	sys-devel/flex
+	doc? (
+		app-text/asciidoc
+		app-text/sgml-common
+		app-text/xmlto
+		sys-process/time
+	)"
+
 RDEPEND="audit? ( sys-process/audit )
 	crypt? ( dev-libs/openssl:0= )
 	clang? (
@@ -48,6 +56,7 @@ RDEPEND="audit? ( sys-process/audit )
 	demangle? ( sys-libs/binutils-libs:= )
 	gtk? ( x11-libs/gtk+:2 )
 	java? ( virtual/jre:* )
+	libpfm? ( dev-libs/libpfm )
 	lzma? ( app-arch/xz-utils )
 	numa? ( sys-process/numactl )
 	perl? ( dev-lang/perl:= )
@@ -57,24 +66,25 @@ RDEPEND="audit? ( sys-process/audit )
 	unwind? ( sys-libs/libunwind )
 	zlib? ( sys-libs/zlib )
 	dev-libs/elfutils"
+
 DEPEND="${RDEPEND}
 	>=sys-kernel/linux-headers-4.19
-	${LINUX_PATCH+dev-util/patchutils}
-	sys-devel/bison
-	sys-devel/flex
 	java? ( virtual/jdk )
-	doc? (
-		app-text/asciidoc
-		app-text/sgml-common
-		app-text/xmlto
-		sys-process/time
-	)"
+"
 
 S_K="${WORKDIR}/linux-${LINUX_VER}"
 S="${S_K}/tools/perf"
 
 CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
 
+pkg_pretend() {
+	if ! use doc ; then
+		ewarn "Without the doc USE flag you won't get any documentation nor man pages."
+		ewarn "And without man pages, you won't get any --help output for perf and its"
+		ewarn "sub-tools."
+	fi
+}
+
 pkg_setup() {
 	use clang && LLVM_MAX_SLOT=9 llvm_pkg_setup
 }
@@ -126,7 +136,8 @@ src_prepare() {
 		"${S}"/Makefile.perf "${S_K}"/tools/lib/bpf/Makefile || die
 
 	# Avoid the call to make kernelversion
-	echo "#define PERF_VERSION \"${MY_PV}\"" > PERF-VERSION-FILE
+	sed -i -e '/PERF-VERSION-GEN/d' Makefile.perf || die
+	echo "#define PERF_VERSION \"${PV}\"" > PERF-VERSION-FILE
 
 	# The code likes to compile local assembly files which lack ELF markings.
 	find -name '*.S' -exec sed -i '$a.section .note.GNU-stack,"",%progbits' {} +
@@ -149,7 +160,7 @@ perf_make() {
 
 	local arch=$(tc-arch-kernel)
 	local java_dir
-	use java && java_dir="/etc/java-config-2/current-system-vm"
+	use java && java_dir="${EPREFIX}/etc/java-config-2/current-system-vm"
 	# FIXME: NO_CORESIGHT
 	# FIXME: NO_LIBBABELTRACE
 	emake V=1 VF=1 \
@@ -157,23 +168,26 @@ perf_make() {
 		CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="$(tc-getLD)" NM="$(tc-getNM)" \
 		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
 		prefix="${EPREFIX}/usr" bindir_relative="bin" \
+		tipdir="share/doc/${PF}" \
 		EXTRA_CFLAGS="${CFLAGS}" \
 		ARCH="${arch}" \
 		JDIR="${java_dir}" \
 		LIBCLANGLLVM=$(usex clang 1 "") \
+		LIBPFM4=$(usex libpfm 1 "") \
 		NO_AUXTRACE="" \
 		NO_BACKTRACE="" \
 		NO_CORESIGHT=1 \
 		NO_DEMANGLE=$(puse demangle) \
-		NO_GTK2=$(puse gtk) \
+		GTK2=$(usex gtk 1 "") \
+		feature-gtk2-infobar=$(usex gtk 1 "") \
 		NO_JVMTI=$(puse java) \
 		NO_LIBAUDIT=$(puse audit) \
 		NO_LIBBABELTRACE=1 \
 		NO_LIBBIONIC=1 \
-		NO_LIBBPF="" \
+		NO_LIBBPF= \
 		NO_LIBCRYPTO=$(puse crypt) \
-		NO_LIBDW_DWARF_UNWIND="" \
-		NO_LIBELF="" \
+		NO_LIBDW_DWARF_UNWIND= \
+		NO_LIBELF= \
 		NO_LIBNUMA=$(puse numa) \
 		NO_LIBPERL=$(puse perl) \
 		NO_LIBPYTHON=$(puse python) \
@@ -208,30 +222,29 @@ src_install() {
 	}
 
 	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
-
 	if use gtk; then
-		mv "${ED}"/usr/$(get_libdir)/libperf-gtk.so \
+		local libdir
+		libdir="$(get_libdir)"
+		# on some arches it ends up in lib even on 64bit, ppc64 for instance.
+		[[ -f "${ED}"/usr/lib/libperf-gtk.so ]] && libdir="lib"
+		mv "${ED}"/usr/${libdir}/libperf-gtk.so \
 			"${ED}"/usr/libexec/perf-core || die
 	fi
 
 	dodoc CREDITS
 
 	dodoc *txt Documentation/*.txt
+
+	# perf needs this decompressed to print out tips for users
+	docompress -x /usr/share/doc/${PF}/tips.txt
+
 	if use doc ; then
 		HTML_DOCS="Documentation/*.html" einstalldocs
 		doman Documentation/*.1
 	fi
 }
-
-pkg_postinst() {
-	if ! use doc ; then
-		elog "Without the doc USE flag you won't get any documentation nor man pages."
-		elog "And without man pages, you won't get any --help output for perf and its"
-		elog "sub-tools."
-	fi
-}
diff --git a/dev-util/perf/perf-5.4.20.ebuild b/dev-util/perf/perf-5.11.ebuild
index 23fa3098706a..57147178746e 100644
--- a/dev-util/perf/perf-5.4.20.ebuild
+++ b/dev-util/perf/perf-5.11.ebuild
@@ -1,13 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_7 )
-inherit bash-completion-r1 estack eutils toolchain-funcs python-r1 linux-info
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
+PYTHON_COMPAT=( python3_{7,8} )
+inherit bash-completion-r1 estack eutils llvm toolchain-funcs prefix python-r1 linux-info
 
 DESCRIPTION="Userland tools for Linux Performance Counters"
 HOMEPAGE="https://perf.wiki.kernel.org/"
@@ -34,20 +31,32 @@ SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="audit clang crypt debug +demangle +doc gtk java lzma numa perl python slang systemtap unwind zlib"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="audit clang crypt debug +demangle +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib"
 # TODO babeltrace
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
+BDEPEND="
+	${LINUX_PATCH+dev-util/patchutils}
+	sys-devel/bison
+	sys-devel/flex
+	doc? (
+		app-text/asciidoc
+		app-text/sgml-common
+		app-text/xmlto
+		sys-process/time
+	)"
+
 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 )
 	java? ( virtual/jre:* )
+	libpfm? ( dev-libs/libpfm )
 	lzma? ( app-arch/xz-utils )
 	numa? ( sys-process/numactl )
 	perl? ( dev-lang/perl:= )
@@ -57,28 +66,33 @@ RDEPEND="audit? ( sys-process/audit )
 	unwind? ( sys-libs/libunwind )
 	zlib? ( sys-libs/zlib )
 	dev-libs/elfutils"
+
 DEPEND="${RDEPEND}
 	>=sys-kernel/linux-headers-4.19
-	${LINUX_PATCH+dev-util/patchutils}
-	sys-devel/bison
-	sys-devel/flex
 	java? ( virtual/jdk )
-	doc? (
-		app-text/asciidoc
-		app-text/sgml-common
-		app-text/xmlto
-		sys-process/time
-	)"
+"
 
 S_K="${WORKDIR}/linux-${LINUX_VER}"
 S="${S_K}/tools/perf"
 
 CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
 
+pkg_pretend() {
+	if ! use doc ; then
+		ewarn "Without the doc USE flag you won't get any documentation nor man pages."
+		ewarn "And without man pages, you won't get any --help output for perf and its"
+		ewarn "sub-tools."
+	fi
+}
+
+pkg_setup() {
+	use clang && 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
@@ -102,26 +116,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" \
-				"${FILESDIR}/perf-5.4.6-fix-clang9.patch"
-			popd || die
-		fi
-		CC=${old_CC}
-	fi
-
-	pushd "${S_K}" >/dev/null || die
-	eapply "${FILESDIR}/perf-5.4.7-propagate-cflags.patch"
-	eapply "${FILESDIR}/perf-5.4.20-binutil-libs-2.34.patch"
-	popd || die
 }
 
 src_prepare() {
@@ -142,10 +136,16 @@ src_prepare() {
 		"${S}"/Makefile.perf "${S_K}"/tools/lib/bpf/Makefile || die
 
 	# Avoid the call to make kernelversion
-	echo "#define PERF_VERSION \"${MY_PV}\"" > PERF-VERSION-FILE
+	sed -i -e '/PERF-VERSION-GEN/d' Makefile.perf || die
+	echo "#define PERF_VERSION \"${PV}\"" > PERF-VERSION-FILE
 
 	# The code likes to compile local assembly files which lack ELF markings.
 	find -name '*.S' -exec sed -i '$a.section .note.GNU-stack,"",%progbits' {} +
+
+	# Fix shebang to use python from prefix
+	if [[ -n "${EPREFIX}" ]]; then
+		hprefixify ${S_K}/scripts/bpf_helpers_doc.py
+	fi
 }
 
 puse() { usex $1 "" no; }
@@ -160,29 +160,34 @@ perf_make() {
 
 	local arch=$(tc-arch-kernel)
 	local java_dir
-	use java && java_dir="/etc/java-config-2/current-system-vm"
+	use java && java_dir="${EPREFIX}/etc/java-config-2/current-system-vm"
 	# FIXME: NO_CORESIGHT
 	# FIXME: NO_LIBBABELTRACE
 	emake V=1 VF=1 \
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="$(tc-getLD)" \
+		HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)" \
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="$(tc-getLD)" NM="$(tc-getNM)" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
 		prefix="${EPREFIX}/usr" bindir_relative="bin" \
+		tipdir="share/doc/${PF}" \
 		EXTRA_CFLAGS="${CFLAGS}" \
 		ARCH="${arch}" \
 		JDIR="${java_dir}" \
 		LIBCLANGLLVM=$(usex clang 1 "") \
+		LIBPFM4=$(usex libpfm 1 "") \
 		NO_AUXTRACE="" \
 		NO_BACKTRACE="" \
 		NO_CORESIGHT=1 \
 		NO_DEMANGLE=$(puse demangle) \
-		NO_GTK2=$(puse gtk) \
+		GTK2=$(usex gtk 1 "") \
+		feature-gtk2-infobar=$(usex gtk 1 "") \
 		NO_JVMTI=$(puse java) \
 		NO_LIBAUDIT=$(puse audit) \
 		NO_LIBBABELTRACE=1 \
 		NO_LIBBIONIC=1 \
-		NO_LIBBPF="" \
+		NO_LIBBPF= \
 		NO_LIBCRYPTO=$(puse crypt) \
-		NO_LIBDW_DWARF_UNWIND="" \
-		NO_LIBELF="" \
+		NO_LIBDW_DWARF_UNWIND= \
+		NO_LIBELF= \
 		NO_LIBNUMA=$(puse numa) \
 		NO_LIBPERL=$(puse perl) \
 		NO_LIBPYTHON=$(puse python) \
@@ -217,30 +222,29 @@ src_install() {
 	}
 
 	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
-
 	if use gtk; then
-		mv "${ED}"/usr/$(get_libdir)/libperf-gtk.so \
+		local libdir
+		libdir="$(get_libdir)"
+		# on some arches it ends up in lib even on 64bit, ppc64 for instance.
+		[[ -f "${ED}"/usr/lib/libperf-gtk.so ]] && libdir="lib"
+		mv "${ED}"/usr/${libdir}/libperf-gtk.so \
 			"${ED}"/usr/libexec/perf-core || die
 	fi
 
 	dodoc CREDITS
 
 	dodoc *txt Documentation/*.txt
+
+	# perf needs this decompressed to print out tips for users
+	docompress -x /usr/share/doc/${PF}/tips.txt
+
 	if use doc ; then
 		HTML_DOCS="Documentation/*.html" einstalldocs
 		doman Documentation/*.1
 	fi
 }
-
-pkg_postinst() {
-	if ! use doc ; then
-		elog "Without the doc USE flag you won't get any documentation nor man pages."
-		elog "And without man pages, you won't get any --help output for perf and its"
-		elog "sub-tools."
-	fi
-}
diff --git a/dev-util/quilt/Manifest b/dev-util/quilt/Manifest
index 34eda2f34275..d5b9f330b270 100644
--- a/dev-util/quilt/Manifest
+++ b/dev-util/quilt/Manifest
@@ -1,5 +1,6 @@
 AUX quilt-0.66-no-graphviz.patch 1464 BLAKE2B b1a67706f29f3986de0202a4ea68aa2f001989354bf9ab91996cb4f5dbb6578baf28fc1ac781a18525d04fb92d9f6d554efcc598dabbdf1a35b0f63b93c3cd8d SHA512 3f935a6e137998f7d0391ef87f5324c8882490001b37333de22efc068bda8a7e84ccefc3e85616c3aa93894acb8a0841a2b089c59c6a658d1157298d4132707c
 DIST quilt-0.66.tar.gz 413069 BLAKE2B 41201d54cb26d4761413365fe19b65bd6971ada1e69198d2edbc346df6a3060ff3af4d80551d68ab4ffe003183bc0a28515ce1d070db95f2b1a04a0680ac4fb2 SHA512 c2cb75c0937612e1e0da25b713acf629b6b5aacbd8254d8bd17220b63c7b8ca996cd9d0315a32d67d54a4a7dc01b212cdda33afaacf3db063da757f1973306f4
+EBUILD quilt-0.66-r1.ebuild 1659 BLAKE2B 2140fe7dbc502aa1da6ccf0170a644e832761b03de244c996df12e38b28feb67245fea12e268387d654f4427117f9ecc4f67f52058406947b8905cf549fef823 SHA512 f0cd020a1476b443ec880959d4378294811929bb6c50f2a9e2a0a28d7bae0e5560a0d2bfaa82b958d0d58faeeb7643ee8b707cf7c85e9da7335ff71917ccf68a
 EBUILD quilt-0.66.ebuild 1649 BLAKE2B 8e1d391368e2a18344b60bd8e715200658f8d3e87f4c1a72185ea5e0b88b3749060571975e340c8b7dd8156238abd71b8792d823b52bc2843e58ad1545a66d64 SHA512 97fae7a33f76f89bdbb72d56ab18e37f2b055226bcab9755dce7b8fbc07f44c2cc720542588a91f9eb8cd42aae3d423fd385fd0324bfba789302759fb9fb2071
-EBUILD quilt-9999.ebuild 1742 BLAKE2B 5a7b4b2412500323224d462b4bdd15ed5ba3b5eaca34f7dd17cf238a75fe340e3e430536ce6bf96464b70a043b4fa231693ecc942720f250599e1ecd2d0126f3 SHA512 625ecfbf37f5eeb217f3a2e208fd8ad7332fa3abc792373fce12ad83ae82d7493199bd833fbcace9f74eba7989b1c0ac1bfcb21df5a57e5797db8027e6bfd400
+EBUILD quilt-9999.ebuild 1752 BLAKE2B b9b3ab429a3a58a65ac0abc85a1e5c80d3aa4d4856946341eb637880d8b71400e353935cbde8bc5139b236f3c9770e7ac67d2a53e3108b8a757a4d6a00267815 SHA512 94111e12516af2c41f721f4debaea35328dbd93af578b50de90e93a38e331e226e1b4b53dd3bed1b95cbea5465ebc58bc3ccbfff232876e3f20b000a6a342225
 MISC metadata.xml 218 BLAKE2B 01c06279fa64627fda89adb9c5748c7629ff3eb46c10acc15b327a0f432d50b86de1d3980ccdafa9b620582db9abdf4d4506b1a53baebd6334f1a890a10783b1 SHA512 cff4a2ad321709df053184879b278c5a5abc74790344f6170cf020cf45a20d8062421e20d215c73002077d66c6367de5fcede710c2ffdd9f067cdf1f40b784ee
diff --git a/dev-util/quilt/quilt-0.66-r1.ebuild b/dev-util/quilt/quilt-0.66-r1.ebuild
new file mode 100644
index 000000000000..4297340cae98
--- /dev/null
+++ b/dev-util/quilt/quilt-0.66-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit bash-completion-r1 eutils
+
+DESCRIPTION="quilt patch manager"
+HOMEPAGE="https://savannah.nongnu.org/projects/quilt"
+SRC_URI="https://savannah.nongnu.orgdownload/quilt/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+IUSE="emacs graphviz elibc_Darwin elibc_SunOS"
+# unresolved test failures
+RESTRICT="test"
+
+RDEPEND="sys-apps/ed
+	dev-util/diffstat
+	graphviz? ( media-gfx/graphviz )
+	elibc_Darwin? ( app-misc/getopt )
+	elibc_SunOS? ( app-misc/getopt )
+	>=sys-apps/coreutils-8.32-r1"
+
+PDEPEND="emacs? ( app-emacs/quilt-el )"
+
+pkg_setup() {
+	use graphviz && return 0
+	echo
+	elog "If you intend to use the folding functionality (graphical illustration of the"
+	elog "patch stack) then you'll need to remerge this package with USE=graphviz."
+	echo
+}
+
+src_prepare() {
+	# Add support for USE=graphviz
+	use graphviz || PATCHES+=( "${FILESDIR}"/${PN}-0.66-no-graphviz.patch )
+	default
+}
+
+src_configure() {
+	[[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] && \
+		myconf="${myconf} --with-getopt=${EPREFIX}/usr/bin/getopt-long"
+	econf ${myconf}
+}
+
+src_install() {
+	emake BUILD_ROOT="${D}" install
+
+	rm -rf "${ED}"/usr/share/doc/${P}
+	dodoc AUTHORS TODO "doc/README" "doc/README.MAIL" "doc/quilt.pdf"
+
+	rm -rf "${ED}"/etc/bash_completion.d
+	newbashcomp bash_completion ${PN}
+
+	# Remove the compat symlinks
+	rm -rf "${ED}"/usr/share/quilt/compat
+
+	# Remove Emacs mode; newer version is in app-emacs/quilt-el, bug 247500
+	rm -rf "${ED}"/usr/share/emacs
+}
diff --git a/dev-util/quilt/quilt-9999.ebuild b/dev-util/quilt/quilt-9999.ebuild
index ce1acb35fbf5..8fee81630b8f 100644
--- a/dev-util/quilt/quilt-9999.ebuild
+++ b/dev-util/quilt/quilt-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 EGIT_REPO_URI="git://git.sv.gnu.org/quilt.git"
 
@@ -25,7 +25,7 @@ RDEPEND="
 	sys-apps/ed
 	elibc_Darwin? ( app-misc/getopt )
 	elibc_SunOS? ( app-misc/getopt )
-	>=sys-apps/coreutils-8.5
+	>=sys-apps/coreutils-8.32-r1
 	graphviz? ( media-gfx/graphviz )
 "
 
@@ -53,7 +53,7 @@ src_install() {
 	rm -rf "${ED}"/etc/bash_completion.d
 	newbashcomp bash_completion ${PN}
 
-	rm -rf "${ED}"usr/share/doc/${PN}
+	rm -rf "${ED}"/usr/share/doc/${PN}
 	dodoc AUTHORS TODO "doc/README" "doc/README.MAIL" "doc/quilt.pdf"
 
 	# Remove the compat symlinks
@@ -64,7 +64,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	if ! has_version app-emacs/quilt-el ; then
+	if ! has_version -r 'app-emacs/quilt-el' ; then
 		elog "If you plan to use quilt with emacs consider installing \"app-emacs/quilt-el\""
 	fi
 }
diff --git a/dev-util/regexxer/Manifest b/dev-util/regexxer/Manifest
index f8446a48b57c..2ffb7d8dc05d 100644
--- a/dev-util/regexxer/Manifest
+++ b/dev-util/regexxer/Manifest
@@ -1,5 +1,5 @@
 AUX regexxer-0.10-glib-2.32.patch 864 BLAKE2B 330dbfaad5752ba94bfcdcd669550ab3b7f2e2f72b8f7160a1621fa586e62f0505f259b79d7476744005c2097d3b41a840eece4203c43e33dc1d2775e340af0c SHA512 99e25b974a6be678169a57f8f5e728f60c470e7d2290e365f7b9c0c326d8e7867af0a093f6b0a7505ea7068e01770cdc565cf33e2db8cc6695bd5bd269a56a8b
 AUX regexxer-0.10-sandbox.patch 412 BLAKE2B 9d1e1d6f5b9e73ca6d8250bcaea5f2dab5b1843c5a0df01c0da16bdebdbf7b73b56b392d9e0368e3b2e6df5b7b87046d905ffe86ea38a84e5837c99daec265f8 SHA512 2e895d2686e243ce1ada04dc9fe4db846b59dd076252e992349442658c96cba6ce62499fb056c77d0aa19329794545ea313c538c61efab147a44fe85b2c40534
 DIST regexxer-0.10.tar.xz 251544 BLAKE2B a6ec17e27754de86de60eb44e1b945f09bd66b5755a558c9934eea7b52854ea86b64fc7742d5adfd227514df7565e37b78a567a0a9b83fa421c0140fa8ae0e02 SHA512 0b18c8f167595984a042403c7e91c8b65c1348870c47d664c6cfc825b74e047f657190f30830ce6e2098867bbd8e1b042e1adc2798aedb86a59299583340f920
-EBUILD regexxer-0.10.ebuild 724 BLAKE2B cbdfd4041660fba8ff173fcf2a002efdb29be90dad14ee6c5a66fc01a175b8b4d2f485573fc8d6e32c6ead5d8ef1ece333c90679d5c89c43637d93bc2d24ffc4 SHA512 23bc0caf21d75aaec7ae65def8cf30f77ee3f06eaa91dce8dd0e77bbca261d3377fb353f42f36e30c100f656878056d6229da23ef93c33c5feffb461d84081f2
+EBUILD regexxer-0.10-r1.ebuild 723 BLAKE2B 5b510df4ce01b1ccd3f5f5ff670f78be58032122490be2348222069acf5a89190f3364a62d930c41f78769209c203ab1f1164355cb68fbbc21b3a20debbaa44c SHA512 8282f94940ec0f4f54399a6cdc6284fe08f9cd1df18b29e09af0400bb2dab66f57176632ed4254b6b1dc29af9f929c54f97675551e0ca4c14f3078222391d972
 MISC metadata.xml 354 BLAKE2B 9dfd93a2017cadc91d9ec6d138cf3e172ece5b4800e536c8882f79ff64e8160983cadbb6e3ecfb48769436dccd93f2a991138abf0df0b503816ef3419001b69b SHA512 3da056033c05593bc2bf0b606cdb7ff99879eb99580c3b7741759a0b4bdcfd0025cebaa1e586fe12e69972f75df6003b041bd338800ff814e7aae6094fad02aa
diff --git a/dev-util/regexxer/regexxer-0.10.ebuild b/dev-util/regexxer/regexxer-0.10-r1.ebuild
index 2e3e14fec72b..061dcaec6a06 100644
--- a/dev-util/regexxer/regexxer-0.10.ebuild
+++ b/dev-util/regexxer/regexxer-0.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 
-RDEPEND=">=dev-cpp/glibmm-2.28
+RDEPEND=">=dev-cpp/glibmm-2.28:2
 	dev-cpp/gtkmm:3.0
 	dev-cpp/gtksourceviewmm:3.0"
 DEPEND="${RDEPEND}
diff --git a/dev-util/rosdep/Manifest b/dev-util/rosdep/Manifest
index d66304ccc7ee..835913b82ef8 100644
--- a/dev-util/rosdep/Manifest
+++ b/dev-util/rosdep/Manifest
@@ -1,5 +1,5 @@
 AUX tests.patch 886 BLAKE2B e631053ce6ecd6419cf88ca952d28a225229d248f52f6f600bb9865cf9760dea01e4039401b5039330aa6776ae18e1fe0159c725ee5f1bebcc1fd73248d37209 SHA512 87f7ca16f7b7f781ac5a2173ee4a9a6ed1baa2d9583d740d0cd46590d41a5781395fc5fbba185a20cac5cae0a1f967abfc205a67bce3487c0f82b04b0c08600b
 DIST rosdep-0.20.0.tar.gz 310881 BLAKE2B f81275e6b88de10b1bd080feaa97a5f870aea6f4bfa7d8ccaa788df01b5b43890f99fee3d2bdbf7dda811745a89d54aac948201a218dd32d56f2ed49eefbdaf8 SHA512 f464b4a1bd3ef437f4ef0ca55eed873125c537aed793b22e99dcdfdeb078bdd3dc03cbe75b67d6ba7b29c7390b893f85c436fb90fc339a26dca338e8652db917
 EBUILD rosdep-0.20.0.ebuild 1622 BLAKE2B 7fb877e6799c37eea92e7266acc5c84dcc927ec1090edd743ae1a9a2b5785f01cb89cd35991e58b2a3a91be967b4946eb0fd7688784bfd89e9903e45a784408f SHA512 2346d2036c08e20955514a1311988b410b359e1f335ce78828b2194be8820e6f5fef48eaa1a8cebd997938507c64be916abe97f45030ab8ac21c6808c1c277d8
-EBUILD rosdep-9999.ebuild 1622 BLAKE2B 512407e5330d3e8f20849999e7ec48cc205936e17dd2a081d8421bccb41f2a60da4f314ace2dd6e42c8f487bf8b05c633ed17c40c50a767ce22590965f007601 SHA512 72b7c74e1d067e6840d01a2294f126f027069f8b3cfd4f1d433db742b61183f9153f8cec7b380fc22c1ea032a8aef5f010b4eb0d3c595bc897c7e877603453c2
+EBUILD rosdep-9999.ebuild 1609 BLAKE2B 4c00b9fa66bb080f651154342ee5b5be37bfc39475486baa46cdadb60d4ee1cd3244a2d5b7df4243e8a4b4336bcd51ead94caea145d86de53fe4611a160387c2 SHA512 0ca03af2b33947a00a8256b9c5f7a11e74c98958a61c1ff91cd8797659df78946750e04c2d714fb9d02edd993f6694a78c6b93b7d3b337123da532edf3b9a633
 MISC metadata.xml 339 BLAKE2B 98c570641ca07f96e5fcfaece9d49977136f720d77c9cf6dcecbb06bc4016410e082201d69d3c36af5de03cc70ea5a1b726289124324e2f11266e5db69a6ea97 SHA512 62ab4dc2638e4af95290eba19e1755d3bade56e5d1e7251d3cc9da410fcf7ead48562193b2cb6b6f8800daf7df31786e70ce153780b9e278891c31d2b9c257bf
diff --git a/dev-util/rosdep/rosdep-9999.ebuild b/dev-util/rosdep/rosdep-9999.ebuild
index a97be8570020..dde1899da88c 100644
--- a/dev-util/rosdep/rosdep-9999.ebuild
+++ b/dev-util/rosdep/rosdep-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,6 @@ DESCRIPTION="Command-line tool for installing ROS system dependencies"
 HOMEPAGE="https://wiki.ros.org/rosdep"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
-	KEYWORDS=""
 else
 	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
 		https://github.com/ros-infrastructure/rosdep/archive/${PV}.tar.gz -> ${P}.tar.gz
diff --git a/dev-util/rosinstall/Manifest b/dev-util/rosinstall/Manifest
index e388f9ee7c46..15d17d8d1748 100644
--- a/dev-util/rosinstall/Manifest
+++ b/dev-util/rosinstall/Manifest
@@ -1,4 +1,4 @@
 DIST rosinstall-0.7.8.tar.gz 26430 BLAKE2B fae82276f5376a94914272e60b2e3b0f81cb37bd7b41e0a4df73c8b58d19a73505a0c5e193495fd59c931c04265cbb372abfad19fd4043fc77e5224127bd97f5 SHA512 a53ae8fb96f9dda4671b22dfd9dbadc18d1e4adbf34a50b6706baf971c1c7ee418e14641d334346b02638f06c10d1bc984b4759c92a39510dd0044fbc346be67
-EBUILD rosinstall-0.7.8.ebuild 1558 BLAKE2B f547041bb6f406b3e041d18d876a423c9350de2a9ca10b16805e51611b9dabf7843cb345f2a748cd9566706a7511ac7200a7ae94658808613936108790c05a14 SHA512 c3bd0e150f7c21394a1665a277883beac5e17a2f67e2c614a95962d00fa62d0d38ea61ad66a3f8e133f31e66aa95690ecf921a470af600bfc527792c17ea7d3a
-EBUILD rosinstall-9999.ebuild 1558 BLAKE2B f547041bb6f406b3e041d18d876a423c9350de2a9ca10b16805e51611b9dabf7843cb345f2a748cd9566706a7511ac7200a7ae94658808613936108790c05a14 SHA512 c3bd0e150f7c21394a1665a277883beac5e17a2f67e2c614a95962d00fa62d0d38ea61ad66a3f8e133f31e66aa95690ecf921a470af600bfc527792c17ea7d3a
+EBUILD rosinstall-0.7.8.ebuild 1545 BLAKE2B a3c73b17a9516ef032ebe314c957f47741bfde4628c708d25571ee20e5ca5514ea46f02f2f27dbf3daa889f640dc66f73e8dc4e2c70fdac8ad1316b12f76ce84 SHA512 371e493fc470411d558260373cb8a19c85d7065d4f5ae7d511179b58d9abe0821ad9ae407896811e11aef1f40270325ee67ad91aae9b66cf6a38e54b01f8a6c8
+EBUILD rosinstall-9999.ebuild 1545 BLAKE2B a3c73b17a9516ef032ebe314c957f47741bfde4628c708d25571ee20e5ca5514ea46f02f2f27dbf3daa889f640dc66f73e8dc4e2c70fdac8ad1316b12f76ce84 SHA512 371e493fc470411d558260373cb8a19c85d7065d4f5ae7d511179b58d9abe0821ad9ae407896811e11aef1f40270325ee67ad91aae9b66cf6a38e54b01f8a6c8
 MISC metadata.xml 333 BLAKE2B 55190f2209aab41e0f1625fb699d61be2a53d0af996feff9ee5b0cbb5326363dcb915aa83427096f1723b885806a4cdb5b6cd2285c76064bf0b889b624fbcc31 SHA512 5c6ef4930985cd5c2ea51b18a25d7cc2a5e387bdbd26e42f8710d6ce903cf13fe85ee1f1d13a0ffe82c8056dd295a3e25268ec58353508f30bf10404ae4ffb8a
diff --git a/dev-util/rosinstall/rosinstall-0.7.8.ebuild b/dev-util/rosinstall/rosinstall-0.7.8.ebuild
index 1ba4f919dc2b..e77de122d88a 100644
--- a/dev-util/rosinstall/rosinstall-0.7.8.ebuild
+++ b/dev-util/rosinstall/rosinstall-0.7.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,6 @@ DESCRIPTION="Command-line tools for maintaining a workspace of projects for ROS"
 HOMEPAGE="https://wiki.ros.org/rosinstall https://wiki.ros.org/roslocate"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
-	KEYWORDS=""
 else
 	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
 		https://github.com/vcstools/rosinstall/archive/${PV}.tar.gz -> ${P}.tar.gz
diff --git a/dev-util/rosinstall/rosinstall-9999.ebuild b/dev-util/rosinstall/rosinstall-9999.ebuild
index 1ba4f919dc2b..e77de122d88a 100644
--- a/dev-util/rosinstall/rosinstall-9999.ebuild
+++ b/dev-util/rosinstall/rosinstall-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,6 @@ DESCRIPTION="Command-line tools for maintaining a workspace of projects for ROS"
 HOMEPAGE="https://wiki.ros.org/rosinstall https://wiki.ros.org/roslocate"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
-	KEYWORDS=""
 else
 	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
 		https://github.com/vcstools/rosinstall/archive/${PV}.tar.gz -> ${P}.tar.gz
diff --git a/dev-util/rosinstall_generator/Manifest b/dev-util/rosinstall_generator/Manifest
index d4e6d1ea0557..df8b0187fe96 100644
--- a/dev-util/rosinstall_generator/Manifest
+++ b/dev-util/rosinstall_generator/Manifest
@@ -1,5 +1,5 @@
 AUX yaml.patch 493 BLAKE2B ce0d917dc54edda1423b29c1f39662c56e6be8b0c33012cc8cbb8a86b4fe20c9a25139ed2b59db9aca245ebae01a7a1f06f4956a8521bc046ffd46ed795752c9 SHA512 d63da158e7a496da2de41bbfe453e492cd32b9380b11f3201491fc40bc6a9f4057adc19ce0ce7e417080bb9ded0010790caf69d7cd50373cd53033f37a42c456
 DIST rosinstall_generator-0.1.22.tar.gz 11902 BLAKE2B 6dd41c8b86146a9e50d4a20fd4991ed247de915d29f051c6dc416b6820386497ccf3a9cf6dde16e039932c354d7dfc5b6706bc206c16b068633fbddb69686452 SHA512 c1801ea441d1765090684a12e559a39ce496d08f91021b13d026a4127e5bc16974daa2cb561f0ed6c54a31216f57c1f3e257b4a96aec8255c34b37c5545123c6
-EBUILD rosinstall_generator-0.1.22-r1.ebuild 1133 BLAKE2B 07635b6369509ae02130f4c0aa53cb64d75b2fd7568cfe589c10a14c7daa1b1d886b12ffd5ebec43062056a845861f459cf6b9fd95c76cbd458991919304b118 SHA512 638551a2fa38a7b255a33dc504c2ce68b5083edafc95a6fd0dcf44e37fc5fd94b3dabda6895e5101b6933529d044eb2df501db9f1add666538624c3cd12b7309
-EBUILD rosinstall_generator-9999.ebuild 1133 BLAKE2B 07635b6369509ae02130f4c0aa53cb64d75b2fd7568cfe589c10a14c7daa1b1d886b12ffd5ebec43062056a845861f459cf6b9fd95c76cbd458991919304b118 SHA512 638551a2fa38a7b255a33dc504c2ce68b5083edafc95a6fd0dcf44e37fc5fd94b3dabda6895e5101b6933529d044eb2df501db9f1add666538624c3cd12b7309
+EBUILD rosinstall_generator-0.1.22-r1.ebuild 1120 BLAKE2B 059dca47a9a67b7f56c11312463296537e295971f23b59f078d2bcffa1eac0807364f6a29607843de82a79c66c5002fb47f16d6bfa24c467836a9e9e7aea402b SHA512 37be09684eb12d66b3e2a3ffd3501c025d126e1f2ca4befa94d35a57daad6f07570a1064b694085b6d4341efa3c3f11c91f18e61ccea4b4bde02e333c879a0f6
+EBUILD rosinstall_generator-9999.ebuild 1120 BLAKE2B 059dca47a9a67b7f56c11312463296537e295971f23b59f078d2bcffa1eac0807364f6a29607843de82a79c66c5002fb47f16d6bfa24c467836a9e9e7aea402b SHA512 37be09684eb12d66b3e2a3ffd3501c025d126e1f2ca4befa94d35a57daad6f07570a1064b694085b6d4341efa3c3f11c91f18e61ccea4b4bde02e333c879a0f6
 MISC metadata.xml 353 BLAKE2B 26692ca3eb76500607275909a9c86bc88f7c80114e7840763136902a59dddc8f23dcd766f821aa5beffff9419d39a48e18682f86c8148df7d640977c9b30ebcd SHA512 a681a9f31c4cf06a775ef57f7a942c76d0e8873c4c854fddaf44df0301f3e14bd836727e6816bc74f0ced9e54dfd9335c376c47b8af2a19455c42a3f6ed38a18
diff --git a/dev-util/rosinstall_generator/rosinstall_generator-0.1.22-r1.ebuild b/dev-util/rosinstall_generator/rosinstall_generator-0.1.22-r1.ebuild
index 37ae2699a2fd..ce7bd63097bd 100644
--- a/dev-util/rosinstall_generator/rosinstall_generator-0.1.22-r1.ebuild
+++ b/dev-util/rosinstall_generator/rosinstall_generator-0.1.22-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,6 @@ DESCRIPTION="Generates rosinstall metadata about repositories with ROS packages/
 HOMEPAGE="https://wiki.ros.org/rosinstall_generator"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/ros-infrastructure/rosinstall_generator/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm"
diff --git a/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild b/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild
index 37ae2699a2fd..ce7bd63097bd 100644
--- a/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild
+++ b/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,6 @@ DESCRIPTION="Generates rosinstall metadata about repositories with ROS packages/
 HOMEPAGE="https://wiki.ros.org/rosinstall_generator"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/ros-infrastructure/rosinstall_generator/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm"
diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest
index 906537da3f7a..20398b96f077 100644
--- a/dev-util/spirv-headers/Manifest
+++ b/dev-util/spirv-headers/Manifest
@@ -1,6 +1,6 @@
 DIST spirv-headers-1.5.4.1.tar.gz 395834 BLAKE2B e4852f1d694271e9928f1f9aa460c6ba33ad2d0568bd38b24ba31e8dd0390a5542192f9c6977cd3ff4a56520af83280b779fd4e7cece6adc33a5261ef2d2398d SHA512 3578a0210b954e904ac154307a0b98a2c01410adf910e549669109b1b559781959bb5771e39945c50523548a6613d064576fcba15aa3c9125255c0443d3e61a6
 DIST spirv-headers-1.5.4.tar.gz 394957 BLAKE2B c94d0ab2e98242aeb78c6948ac915467ba2cc9568483b8e3d00d5c5e1f422a23e9645161ea6b958cb3a8f7b2d51cf8e8040b7479712dd32382c5c5cbba30e4f3 SHA512 050ae8ded345bbef3d94e91f22dd72860fdeed3072f943bafaa37f86f2d522e59d7c4ff2e6aa5bddb3c3df55f124200394a91e6d99eb95933463e7b8ce360aad
-EBUILD spirv-headers-1.5.4.1.ebuild 521 BLAKE2B 5a10cd5499873e0eb1d02a0da4634acabf218ebf894d58e52f73341fb8d3cd42f7a35b322f550a9c3cfb3fe14f229f348ac9b75375cffa093365262023d83a72 SHA512 8e4b7ebd5aff39331d10f86095bed449cd599796020aa6920bc1dabbd130d8924bcef99228882f020d4f8a3d5df68ec01840c3c8983e6e198d996e9ce6b9180b
+EBUILD spirv-headers-1.5.4.1.ebuild 520 BLAKE2B cdc4447f89db8ce4c51313de7f062404c0fbf6b7f30fe33bbaf2853f597c702a0ee406ef626d717e022fe55c2e19104aa67840136057b44231c1054da5ce8961 SHA512 20637f37df7f01a551d19ea6e1e324f4022b0f9a7652fbb69a39fba38748a7c2d13a698233233d666ad3ae5867914d2f2fb75b50ddeb6ba26e12c9ff159ff4bc
 EBUILD spirv-headers-1.5.4.ebuild 486 BLAKE2B 70210f64f9151c4676d41bae9eef920ce25fa4da56531c2978d67841757a76c4f250932ccf2c90b810e6df0343a9329bcc9e677d3cf94e8bdf839d5ff07c07a8 SHA512 d5c18b4b5938377b4795364b1013e28c5c2793fa35cc8307456495d25dbc08d65987bbf2e49d1abdf298a0762c1e45f5a4918cbcd094d9951f6d6396683f94f0
 EBUILD spirv-headers-9999.ebuild 600 BLAKE2B e52054009b4c2a119218fe8e7d1d7606a5355fa93c8a9e14d7e6174dc212d2c87a7d2c57106bd4d217c8fd0ab88234e5a186f700664ccbd04de8b3520afef10e SHA512 420d7be91c892302e0b052c9bf1a628d663f95051a6d38580944aafd1c43c395cb87cec8df6d2d756b8fb4a177b23671911f58c05e9e5b035a41b0b9bb399dfe
 MISC metadata.xml 431 BLAKE2B 2a03bfd5ff92d23da598ab731032790658e828cfc16c1bb1bcaed0e8e8aeba5d76ca97d5b52f5433bae5391e5f50d2d1028c49689114da7d4fc9703e40f964d6 SHA512 a770e25b42892a5062dc35739c6776d1e8baa22ee4ac9c745b0283fdb3322ae4f6549693045f9125b6a604f4f103c34e52bc069c11f47394373400c522a877c5
diff --git a/dev-util/spirv-headers/spirv-headers-1.5.4.1.ebuild b/dev-util/spirv-headers/spirv-headers-1.5.4.1.ebuild
index 04183969c896..76999b74c836 100644
--- a/dev-util/spirv-headers/spirv-headers-1.5.4.1.ebuild
+++ b/dev-util/spirv-headers/spirv-headers-1.5.4.1.ebuild
@@ -12,6 +12,6 @@ SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 
 S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index 3e5009eeeceb..c6a9da0ad38b 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,6 +1,6 @@
 DIST spirv-tools-2020.5_pre20201107.tar.gz 2583541 BLAKE2B f234e34142af47a98268d85fa12861b9c66c78d74af7e44d4aa9150ad5cfce8e65780d89344ec947b4866de9811a8198e174480c23c30f690193feca7cc136a6 SHA512 a65174e5f1b7cad3be80e0df0d46e8fbfbb62f397fe98eb1b2c37bb85cf8f92d7b4c9103b5e9e8181240bcf97e5a7e3f09323f78159d4b25f7f02176e982f542
 DIST spirv-tools-2020.6.tar.gz 2595300 BLAKE2B bd500824866fcd0f0e05ccf3f43a168e33bc4783396d24fa6ddc58d4e46110b001cc32acde1cadcd793a997d547476f58c07475f43c3cbec5314b039926896b2 SHA512 b6d3667581101536e1f4d405e9c1c64e64a0aba174cc2f41d31e080f44d23bcfaed9642fd31f1d44a56c3df3e894526b643c572832cb96218b16d748b1ac6fe2
 EBUILD spirv-tools-2020.5_pre20201107.ebuild 1229 BLAKE2B c7fe03ba8ad83f655733dd1c36afdcef73ea30ffd5c283639c392a098e160d3d6240411588b95f85ff721cee00025f1b97fb25b8c229f6a0c16e6d71e28ddc2e SHA512 9a53d72ecf225a5e1a7a060b94463ef5f2cb05368d3febe56f85ebb373b3632d2a22864f33d9fdf75c9880d829b98af19bf188d2b95b7be32383c766b8ba8658
-EBUILD spirv-tools-2020.6.ebuild 1198 BLAKE2B fe4555487094671288e4ed4bf0bd400adb2dbcc1c7eb154697a7b194cd8a6980defca4ab5b6bdad6dc777e9eaee482334a9996194c8564c5b68ae8add3aec0d8 SHA512 ee7a1fc6690108736cf7d60cdc5245f0305cfc56b7d927769aa1b7681bb05fc9153c9e25e7d882fb107ce5457695420f991d6a79fbaafdaa31b7f6dcfa32af68
+EBUILD spirv-tools-2020.6.ebuild 1197 BLAKE2B 05ac606f25f2bfd1280ba5c19574628578046b033a9f01b2c939c7e2d1e55d0386ba71db94d988e8689cd8b20bd8f427ccb2f8259f17b7352e770d44aa337238 SHA512 bf598004767b75ee52149e7e2cb90e949c10284e3e0053bfd06de3ad69ad19cfee608f24b11eaf46345ed07d21239cc601f5e6984e82c738de6157a077d15a66
 EBUILD spirv-tools-9999.ebuild 1230 BLAKE2B eba1cacd83dce13d51dd9198ebbd2f0f65fe141ccaf7938bd1ca0f1f78bfa72bc8b759459060eba98ddff7b08a65b18bb1f3f0e916d933779e3130ca494deaa5 SHA512 c3d7bb950afc4ac2ccba4850ad3a843d7e691e78fd581cd8c6007d005e18eac5b67951e3485a8432d628458411180fff4e3d7299b87aa6783f89c08bda3d5412
 MISC metadata.xml 429 BLAKE2B 84129eb27ea4a745c90ed7eab09723b41b45a696375c41458c45a6163dc00cd15d208d6858ea4fd92280e3ff3bb385f340ec3684c980a97ea5fd46fdc4c24001 SHA512 13b340b0e43ba726370f3b013759adab727fc37e251ec5777d10541976843e3e575be23ee015af83dd2e98a1917f4d2511467a38afd064cef025ab4700f005a6
diff --git a/dev-util/spirv-tools/spirv-tools-2020.6.ebuild b/dev-util/spirv-tools/spirv-tools-2020.6.ebuild
index 874760b6890c..ba1095682791 100644
--- a/dev-util/spirv-tools/spirv-tools-2020.6.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-2020.6.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	EGIT_COMMIT="${PV}"
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 	S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
 fi
 
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index 46158cfa691b..fdc59baebf7e 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,6 +1,6 @@
 DIST vulkan-headers-1.2.154.tar.gz 817069 BLAKE2B 66b073daf01741d74a8c2524e6f2692a4c2143340bba8349f3c85408ce12cd7405f960fac0b6ffe3cbd6dcddfcbb04a6481b2743428c66a527d51c16cbd326c6 SHA512 97f9b56b57a762a3616ff3e9795de01c9b9327b80903adf2b141f33be45b30980acd50007ac6af9562ee1897491929d23f7f5dc6a8bafced59e14df27dfca6a9
 DIST vulkan-headers-1.2.162.tar.gz 852973 BLAKE2B 3907c247f115f4dee2fc8697f157aeb30a3ef91a774132591771c0b327090abf7c0caad2082edb86c787883c167ce1ffe75c199d9b94fc642aae30526f5311cd SHA512 7b33f6ef32f1ef34d3b37ad38b077a3a2ebcef62612371afa1b6f4910815bbab8418a837c49b3872b57d2e5012c15623521121f5d62836e46d6f20773841d7b0
 EBUILD vulkan-headers-1.2.154.ebuild 612 BLAKE2B 64c4431737365668e9e0625218152e4299dd9fc06b60a341ae93b7642667663f0ee7a8d3d19e709d484826f34a9c37d9901942c42659d1e1f9ad7e4bb5379642 SHA512 e6fd884d43405daab2ad3df6c02fc2d3e029647d1facecb79acbaed0a456d41e7709e56aaa8d752dab8ce59a82de51cc6bba7cd365edbe911f329e788c084c98
-EBUILD vulkan-headers-1.2.162.ebuild 612 BLAKE2B 8f4c58ec70eebd34081a75e13bf2057d5305556d3e8f12b71955b55cc8b3abf56d6365187e68bb237cb1a457dc2aa9b677c9f1eee0d08925ab70943727907298 SHA512 aa8d6cb7888780b6802dac47c9fc57eb362804612dd95fe5fd214cb793836de90b782222b6680aa5a47a9771d35f0a4672ad7dafed52e16e9bde9d3081ff21aa
+EBUILD vulkan-headers-1.2.162.ebuild 611 BLAKE2B a0dc00cde81752730cd13704bd71f06943f2a523306bb250ec4043c2cbbb7fccf9a9ab4e90ca7bb6811852f9b866940a7722e623dea0d36abff1d7001d8ffe40 SHA512 e08e859280da3384fc8248b255333b8e781e4a6d57c3cf8952b37f905bc78b5ca8df25bae6d79f39ca52bf21f1e11786bd2b60d0d70cb7a6b93eb66cb49e0b7c
 EBUILD vulkan-headers-9999.ebuild 593 BLAKE2B 101dc4954cc61f0375202d2398a3bab6e99e379f9dbc3aaab01129670e0413cba3fc9d15f031a44f634ec7576f0cd6bbd52ccfdbec0de9d703f6db5a9a2eff52 SHA512 a95238b09e9d71d72588e9e90af0d99590a8d4fffb6b134cc75c5b9bfc542c40f7a438447ce06aaf4a5ea5922d9ce49763af91b49934c8f66fc5dbb1d7ea8246
 MISC metadata.xml 432 BLAKE2B e6c1f4f34e41862d3739bad772b910b21348dce97dbde38cc7fbc9cb42993a493881dd100a0c21be3615805f27d3987259233ae5830ef56e2d1dd928c285c09f SHA512 f4f93b16ad29f813a2c0397ec46c6decf7c9bdb3f4a376e1f24a29724c136feabd230d0558d37a502f2795f71c959833a662e6d2544a78704408b3be9be314fc
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.2.162.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.2.162.ebuild
index 118ed20a994a..482f4914180d 100644
--- a/dev-util/vulkan-headers/vulkan-headers-1.2.162.ebuild
+++ b/dev-util/vulkan-headers/vulkan-headers-1.2.162.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
diff --git a/dev-util/wstool/Manifest b/dev-util/wstool/Manifest
index 695f31fea026..f1381375da3a 100644
--- a/dev-util/wstool/Manifest
+++ b/dev-util/wstool/Manifest
@@ -1,4 +1,4 @@
 DIST wstool-0.1.18.tar.gz 80595 BLAKE2B ed90fc5c63ab5d775dfb49ddacc6da6e285aeb5078cf471c0d504659a9e322fde27797e4d05fd56dff4b9958558200cf05e46cf7ae71fd1231ab63048e668808 SHA512 fda9c679183c605048ed024a57b07fd2d9b644978a3e4ff89c3716b74d8e4ba0124779bcdf88a75fdbbf47c765b7ab63db7c84a55a6e1744fc6f955649590c48
-EBUILD wstool-0.1.18.ebuild 1448 BLAKE2B bc3e4c2f688664a4ccda9262cbdedf6e97b8382ebc4598df059b724e13b5868b310e69eef81af8b5db46e860ffcbd75278d52d3bc2a3707892fb098ecceabc05 SHA512 496efe14dd2efae6141bffd8f5f957e07b848a2c8de32bdc67971b412f43a11a7c53cf6bdb5237bec01528c769b1e98bd2394cce7d6c44a23b3ef9bc2ac50e03
-EBUILD wstool-9999.ebuild 1448 BLAKE2B bc3e4c2f688664a4ccda9262cbdedf6e97b8382ebc4598df059b724e13b5868b310e69eef81af8b5db46e860ffcbd75278d52d3bc2a3707892fb098ecceabc05 SHA512 496efe14dd2efae6141bffd8f5f957e07b848a2c8de32bdc67971b412f43a11a7c53cf6bdb5237bec01528c769b1e98bd2394cce7d6c44a23b3ef9bc2ac50e03
+EBUILD wstool-0.1.18.ebuild 1435 BLAKE2B cce676217e08bdec531eb15ff9ca203cf9e983dcc2876b4c60f0dbf5c8a18c22dbd9226e818758a01164d6a49fa7c9d184d653ecf2eb93f2f18bb38ec30dcddf SHA512 bb18b857666e08828835c8bb94cfab06c1749490a0f12078f4aeed753b61538165dd89c008ebec03a6c7fd5cce584417480a5d7b5dbc5139cd23ce6789ff569b
+EBUILD wstool-9999.ebuild 1435 BLAKE2B cce676217e08bdec531eb15ff9ca203cf9e983dcc2876b4c60f0dbf5c8a18c22dbd9226e818758a01164d6a49fa7c9d184d653ecf2eb93f2f18bb38ec30dcddf SHA512 bb18b857666e08828835c8bb94cfab06c1749490a0f12078f4aeed753b61538165dd89c008ebec03a6c7fd5cce584417480a5d7b5dbc5139cd23ce6789ff569b
 MISC metadata.xml 329 BLAKE2B ffdb449cef2fa449771425241f9a03b49d915bed8abc73329586e9a2873e41ac669e4a347ed6f2cabc92b7132a741d5fcc79f13a9d900f7fced17fba322c460c SHA512 7bedf1430c3a2e5a8c98701ef48ce3a97ac59bebe3d42e19da193480c97ef0b2020916c7582f4083ebbf361b5c66b17ad1bfa7889e8aa62d3c945ba8dcf5b62f
diff --git a/dev-util/wstool/wstool-0.1.18.ebuild b/dev-util/wstool/wstool-0.1.18.ebuild
index 1468b0f89a0f..48cc34f6d138 100644
--- a/dev-util/wstool/wstool-0.1.18.ebuild
+++ b/dev-util/wstool/wstool-0.1.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,6 @@ DESCRIPTION="Commands to manage several local SCM repositories for ROS"
 HOMEPAGE="https://wiki.ros.org/wstool"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
-	KEYWORDS=""
 else
 	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
 		https://github.com/vcstools/wstool/archive/${PV}.tar.gz -> ${P}.tar.gz
diff --git a/dev-util/wstool/wstool-9999.ebuild b/dev-util/wstool/wstool-9999.ebuild
index 1468b0f89a0f..48cc34f6d138 100644
--- a/dev-util/wstool/wstool-9999.ebuild
+++ b/dev-util/wstool/wstool-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,6 @@ DESCRIPTION="Commands to manage several local SCM repositories for ROS"
 HOMEPAGE="https://wiki.ros.org/wstool"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
-	KEYWORDS=""
 else
 	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
 		https://github.com/vcstools/wstool/archive/${PV}.tar.gz -> ${P}.tar.gz
diff --git a/dev-util/xfce4-dev-tools/Manifest b/dev-util/xfce4-dev-tools/Manifest
index de7b81128124..a5be041585ba 100644
--- a/dev-util/xfce4-dev-tools/Manifest
+++ b/dev-util/xfce4-dev-tools/Manifest
@@ -3,5 +3,5 @@ DIST xfce4-dev-tools-4.15.1.tar.bz2 340738 BLAKE2B 73c08f27011ce0d2144eaa1672209
 DIST xfce4-dev-tools-4.16.0.tar.bz2 340107 BLAKE2B 93919e1b705858770f5c98cab080ba86785d524dc7371f09fba065f2bdf549d9a3ada66cdef3e1bbd344fb62cecb70661a1b6ce8c8bb51ada0be9459604d4d4f SHA512 54d9b45535c174ab0d13a3061ba2ff247c788a1190a6622b0adb4242d12e1fe42715256a18168d42fd5e425bbc7e9e81de30aa507da04f3e8d9b6f1ae5a5a7a7
 EBUILD xfce4-dev-tools-4.14.0.ebuild 578 BLAKE2B ee9471d511f0f61bebc4458fafd29ec7c246ede52b393404d055058f8453149fb13a0c5e83504aa15465ac4549ec67a8bc693d59f44cb268e61ab313de3b0aac SHA512 de4981b2dd476a6582654f5bc09b3e6008d0f96b310737e0797c66bf3e469783a7dbef58445ff20d5e9d8ea02539d334e6c5047f78ecbb82290deab39a9aa83a
 EBUILD xfce4-dev-tools-4.15.1.ebuild 584 BLAKE2B 6b2f6fcd2f8ed91d4a09138a3ea90c1ecb1e5cf8236dc7e16bbf4889d0aabb9a08d822b7cca7b0888ee586837e41a5c055d71836cb2255ac82c99af875a58cf7 SHA512 35e950fba2c4de9b286afa8d9af5560c8c1ec72c8df70ab2fafc67015005bee23f5e7b59e79e8d631e668cb1ceb423106c4a1fddfdbd39e8e7741e6fb9fe1c9e
-EBUILD xfce4-dev-tools-4.16.0.ebuild 594 BLAKE2B 58ebfcb1e8ac14763ebc87d471913e54f6053491ae6085289833f0a47a234184d7f1e772da1b69bebda31289e3ef6a6ce9993e7c25bad1fac5d84e422cdcacad SHA512 04950ffd8223e353cdfd6bcbbba291cbd9f15eb6b40000cf9433e9eea52cd701e1ae4c78db0ad133b4b31dccfd80e104ee376f81449d5a8decd5f514679fe4ae
+EBUILD xfce4-dev-tools-4.16.0.ebuild 593 BLAKE2B 43d605fb1b947e698c79205a3b7e8a37dd09da0c77e393d58572022d62c836814f274821884701de023ad57290166778fd709a3ad316f1ab4dbbf24764df9d9d SHA512 9b2b017701d7ff67855f8353d12ee0aea853987d25b35bc1af541b9e40f5beb082ea1322d477de0ac7d484ae128f8a4f3e3b403453e2c69cc01138c18772f155
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.16.0.ebuild b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.16.0.ebuild
index 61c8cb857a19..812da9e2c073 100644
--- a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.16.0.ebuild
+++ b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.16.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE=""
 
 RDEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2021-02-17 10:35:54 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-02-17 10:35:54 +0000
commit	463397cf1e064185110fe57c568d73f99a06f5d1 (patch)
tree	9aa75eefc5154eaf0e3c33658b830fc54dc68052 /dev-util
parent	c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 (diff)