gentoo resync : 14.12.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-12-14 13:26:14 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-12-14 13:26:14 +0000
commit: 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (patch)
tree: 25413d1cb3a0cbfe36029db32398c0f333609215 /dev-util
parent: 9c417bacd51da6d8b57fa9f37425161d30d4b95b (diff)
160 files changed, 2316 insertions, 1885 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index e3613a339703..a1ea3d963e40 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/aruba/Manifest b/dev-util/aruba/Manifest
index 6e301640720f..7885ed4e3cfa 100644
--- a/dev-util/aruba/Manifest
+++ b/dev-util/aruba/Manifest
@@ -5,6 +5,6 @@ DIST aruba-1.0.3.tar.gz 133790 BLAKE2B 4008cfec1bc1d63113b1d8961e3bd6219f3884875
 EBUILD aruba-0.14.14.ebuild 1746 BLAKE2B 419b70985f18519c23aab2e13b006d867a19ae534fda30c9a4ab88a3df18bab5a38b74b5614c8fa00f1577acca27b90ab260c05de2da8700133d33c71edbc97f SHA512 84eb8be2f99c0e7a65a61450ed56ddf632565da6db96e1b10e5cd5dffeae24f476a765507a2e57fffa22a7d90447036967f66cd346bf03c7151c5797d6118140
 EBUILD aruba-0.6.2-r2.ebuild 965 BLAKE2B 4988dd0014e07031f1ed9e4e2dd052a4e16f4c3692e2bac9a724ccad35bddc88694f1b622b71a75af997e7f09dd1eadf3ebf89b330c64bbeab7368b19a61ae7b SHA512 2e2be6948e70a9826ab445ab002466183ede2a185b40ab95ad78d218d0df32e0fe10bc351567fdb1eacdd04a3cc2d7bd290b42fec2f5459c758eb711a8c1f4a0
 EBUILD aruba-1.0.2.ebuild 1922 BLAKE2B f7d9aa054e862cf7aeef26a322a067ef8b279c8a96a472471aa0dd2a027c0e06d66908ede4730ccfeeec07c76dcc52657a497f7040d9b83104a60cee83d4f032 SHA512 e8451f0ec7ec1c9967dd0046050eb01b96ce616c55fb50ab98705595ad4b98b747df4be1c468da45163c710398d2de2b253d3b3ff58f042153f45e30664bc311
-EBUILD aruba-1.0.3-r1.ebuild 1962 BLAKE2B 5121d8d5e5b6db8b66b04988f99ae73878c03cf2b57889d40e4e33f298cf69a91856792b70c574a295cfd6cc072f170dc8f5b533e25eb38a2a44611145944563 SHA512 4c80de11a4cf9799fbf3ca52d0a6899c0657ef57c4d18b5ba6cf1ca11ec5c70a6994327fb61461d7ae7bb33e393e7f73731bb0688d7a75a7a351dde6b69cd877
+EBUILD aruba-1.0.3-r1.ebuild 1968 BLAKE2B 1423a47057cd55850ddffa55a807832d6c88a3d6c52b40151e6722f7b06c2486c6757286f184528e34b962ad39e87ff4853f94fa3422febf8c79b67529ba7fad SHA512 145d0ea4cc31df24758d3baa19567b82fc68a2a890034d3e03fc64ade8ea262954796c96f421bf77e45de6d79cd4db99cb59a25d26e71fa79c4680e18c35c897
 EBUILD aruba-1.0.3.ebuild 1955 BLAKE2B 0b36d1b42e8a9cf1ca22a19118189f2a8bcd5291cf8e4626d2de1542fa3352a0e9c2a777394f93b7bc92888debfa32673863a52137c8077cc0b97040eeded385 SHA512 25587725ee21665a2d36bbae4eae8e836cc96f57b95b974a7dd0f0ba0e9a8a8b520451e1543d80ae335d1ad6ab00b681beb67bc294e71ad0160dcad5e732053c
 MISC metadata.xml 296 BLAKE2B 5d13c2f0fdb1a3a5e8278e93124af9b7f8e069ccca8ac9327132e8aea862aaee163d778260bd0ba6cd0d6488372b04b4330cc2838447fe2d075ec5fdcb28cadc SHA512 6add4a1a905857c1d96e347089fa8f47643f990a153f6457c4d424978bcf76b89607c89f60d3e312365525b1d0dbd17db62b4baf48ee3da9a0f2ab77435d68b4
diff --git a/dev-util/aruba/aruba-1.0.3-r1.ebuild b/dev-util/aruba/aruba-1.0.3-r1.ebuild
index 02c6b6cb9ab7..c9d582ff382c 100644
--- a/dev-util/aruba/aruba-1.0.3-r1.ebuild
+++ b/dev-util/aruba/aruba-1.0.3-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/cucumber/aruba"
 SRC_URI="https://github.com/cucumber/aruba/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
 SLOT="$(ver_cut 1)"
 IUSE=""
 
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index ea2b7825acc6..96b3ab10a55b 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -6,5 +6,5 @@ AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b3
 DIST ccache-3.7.12.tar.xz 354684 BLAKE2B b0b1028ede8206622c4b563cdc1351bdbe49ac11aa92d405c778af91db5bac029f7331371ef0a55bc3b1c7a0b60fbc5711277e048481bf0f4ad4b1be8acd3495 SHA512 0eb47869f86d36b3e5fad0d5073973f0444f3efe23fd14469a9e05154ea219228443098b1c5e4a8a0c5c78b4bfa7623735b50ebd6b8b4d0626766061850d6a62
 DIST ccache-4.1.tar.xz 389240 BLAKE2B 265ed6cd9602a04db0fadf63266d0fe1e78a74c69a27f05854a287e4048934d6afd63e71987bc525217782075c1a158601c400f3418caa0eb9730f34275bd08c SHA512 e80075eeea3fef8215de0a793e02381bfb59d7e74237fa34a49306047c60f0de0e678396ad3a9e5d86d3ad2aa21bbe29c7f0055f06b3ba2470f6895ce2eedd7b
 EBUILD ccache-3.7.12.ebuild 1530 BLAKE2B 6ea1ab50007e06e65ec0a5115a05d052bd529ca672a7fa53661ff45b6c388f7b5807f2f2f2bd1ef93ee46668e6f31406aaee905a7c68afc6acc39352ebf2934e SHA512 e34c1ee340602cfdeb3e83d92a299af71a36c217037a8f703796b3595ab8c38ae84c63ba79117d583857a59b30218da7025f22469c7c52d4f06305b5542fd398
-EBUILD ccache-4.1.ebuild 1504 BLAKE2B 291541d21959b85e974c9fe00086a98dbebe35cbb5bfec6af37dd4e9b32c55512dabce472cfae2eccf003cf9903928c76e718fb0a5d71982173d73056ffbf94b SHA512 fdcf3c601b4e574f4e6f7b305c5b417b69d5cb9916c8838dbca86e4e87082ba7901002b8432e349ca4d93252dbbf093e660b25b81999e007ee6735e60e1473bf
+EBUILD ccache-4.1.ebuild 1523 BLAKE2B 608a809f9286d85c9ef4fb45cd17c7c27f3e49f9740e674e2d0033c83d87b1a06fb80f36a5bcdcbc8d28261ac4ae56f9fc39a810bf8143d671633ed803200b99 SHA512 f21adb2004c0916331fb0d4ab9c08624a95be808ef94262af9758ce2b4041336213d0cfdd5034ad49e1416e16f639a61beb53a6446df3cdb2be623feaafbd00b
 MISC metadata.xml 445 BLAKE2B 8ef8f120989420428ea85108180c659c72a7553f3f20ab96597d26aa04b059f491aeae8c887697a214c437f2dba30fbb934cb47c1db93821eda7dd489e6cb693 SHA512 41ffcad23c9f0274c48a058090d6404cd782dea6674b81615a6b3b7fa272ff5df4c68404fb4dcdb9d2275c13fb137f21f0f65232d5fb1ef6152cc25213893249
diff --git a/dev-util/ccache/ccache-4.1.ebuild b/dev-util/ccache/ccache-4.1.ebuild
index 8f04356c74b3..6e6b4021efcc 100644
--- a/dev-util/ccache/ccache-4.1.ebuild
+++ b/dev-util/ccache/ccache-4.1.ebuild
@@ -16,8 +16,10 @@ IUSE="test"
 
 DEPEND=""
 RDEPEND="${DEPEND}
+	app-arch/zstd:0=
 	dev-util/shadowman
-	sys-apps/gentoo-functions"
+	sys-apps/gentoo-functions
+"
 # clang-specific tests use dev-libs/elfutils to compare objects for equality.
 # Let's pull in the dependency unconditionally.
 DEPEND+="
diff --git a/dev-util/cligh/Manifest b/dev-util/cligh/Manifest
index dc93b3a5b1ea..dbe80621b59f 100644
--- a/dev-util/cligh/Manifest
+++ b/dev-util/cligh/Manifest
@@ -1,4 +1,4 @@
 DIST cligh-0.3.tar.gz 8043 BLAKE2B 496c7d169463a2ecec66ac193480503eb4f5207c8e874fedd8a8a50047f5a3e480dc3c8f7cd401e1c1360a9fa1ae918adfd4f2e5ba928f8ff68df8032d8360af SHA512 85aa702c15e6f19b0118c642944d3151648f38d8f9e86a93f4d4c03c28245548e9910d21edc19f3ada338c33b995fee7bb03e6bafd99499d58cdba35b37faca8
-EBUILD cligh-0.3.ebuild 487 BLAKE2B b4d14f011297666b8915e2a179cc045b1b4d15aa05629e00997e3730b1a0172b97f144c53e1aa4e9b8d941fad32a083843f692cdeedd2a3347fe318db4c5164a SHA512 5ef00b3a9d7635ff81c4b24181cae54ebfa29d6d42a6ffe958eb8e15a8c808f6de5b45604e639b06f4e980979cbf11af3ed113d460ba8fd4874b539c667b10fb
-EBUILD cligh-9999.ebuild 476 BLAKE2B 022452dfafaf2f33921aba89c57b1f8b336a377bd277bea5348c2f68417286216fd1c9e41f0254d3782c8e63d6861689f2e0e1744a378a50fb2f1e4c4361d087 SHA512 b598785128a40a5ac918692ecd79d7ce3f5064a2126da47be3482f0c3592fc486420243514a96ecb1dafc9f21abba3086720681cc1f76fd47c6280c2d49c0334
+EBUILD cligh-0.3.ebuild 489 BLAKE2B f6714f9986c2368b31a5afb3bc90e1eaaff6df1226c328cb6e4cbbc8bbe3aabd3118e0fd3cb16490765f1d8b0c147e995692d75a7e84d8f867d808ebfdb6cfaf SHA512 d010b3ea332d1c908ecc781a5663bf11ec7687d96c366f553d1f41d58000574444de3e5a55b0944ac10cc2513f4e8967729ded1dba9ca69d9b4a79918062f685
+EBUILD cligh-9999.ebuild 478 BLAKE2B 2b42449abc881b5d3b71a07fcab8e8a115fd279581b476e99d5ea340ca80892009b9d7981603255d31e82c17fe40a7183745379adcc1476f1a12b5d1550cb365 SHA512 2a51849c551981d408fe48992b2b48fd550c1f997005999f328644eed5ca2531531b1c83814157b806e619a1467147eac99834ce95f82447437eacf2111e28f6
 MISC metadata.xml 322 BLAKE2B 17e6d135ed46dac64053e30754ace41a45926ea930b32b4c41493eb67d03ff851301b07e4d42c37f6eef1150546eeec67994d9f3795af7197a376435acb68d2a SHA512 3d76d3e71460441beecd4bfdfd96f033d0701a2fa71918b9ffe222c4354ee5d716415ebb1aeff43818bc34a428ca60ef34894c44cee0256244f118e2b54d090d
diff --git a/dev-util/cligh/cligh-0.3.ebuild b/dev-util/cligh/cligh-0.3.ebuild
index e5589bdcd205..22f46becfe05 100644
--- a/dev-util/cligh/cligh-0.3.ebuild
+++ b/dev-util/cligh/cligh-0.3.ebuild
@@ -4,7 +4,8 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7} )
+
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
diff --git a/dev-util/cligh/cligh-9999.ebuild b/dev-util/cligh/cligh-9999.ebuild
index 186acb99add1..c2d970ff34b5 100644
--- a/dev-util/cligh/cligh-9999.ebuild
+++ b/dev-util/cligh/cligh-9999.ebuild
@@ -4,7 +4,8 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7} )
+
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1 git-r3
 
diff --git a/dev-util/cloc/Manifest b/dev-util/cloc/Manifest
index be0df66dd421..a5acce655ba0 100644
--- a/dev-util/cloc/Manifest
+++ b/dev-util/cloc/Manifest
@@ -1,3 +1,5 @@
 DIST cloc-1.84.tar.gz 514868 BLAKE2B 53fa0f0d2c8033619f9f7202802e5fd51013c459bbeed8482a35050be69981e60f3c96879cc2853d509322933050fda52fe17be7ec393783f06a0df5e9cec785 SHA512 85f8af041b0ca858c21e28d3fb7cd9201264afa9e12bd3a14b15a8af3e6e68378dbb02a39dc12140bcbb104424cf38bfa602d2a0683e8c89fa50cbdcf7556b3a
+DIST cloc-1.86.tar.gz 536828 BLAKE2B f584da0e25ae755a1450117774ec8fdb87eb693ac77473929a52e617713391eb4bffc2f6b74bbcd5b01f6e2c0d747221e3f7c4e74dfd6131d3cde10a3a102daa SHA512 fe6101404f5884d11bf73de43bd25e533b04a70707b95e4e9482b51413aed46ddb55beaa27e3d25cd7604394a739f7cac6c1f8695cd9cab3f23adf6e27171719
 EBUILD cloc-1.84.ebuild 681 BLAKE2B 7f0b61c23a9af5fe8bd6d6359e926989191ef28f5a2fe3b045ac325c8c88d3a48d1c3d884e6aa9a35c38ac586a2eb571a9d36d72b8d6215947f1dbc63d5d26a4 SHA512 f5bcfec8a2c440f6105adfb1c9e99acf2b2b5bdfb3f8e1205b4f3c4a92cef7072f472e8337500846bdcd6d88b1c2fb239d61de1c38d6f4e91653127421e5dd6c
-MISC metadata.xml 435 BLAKE2B 5658cf3e41d5dac9b2acab8075357492429742f12fee07bedec393e3a068d9c57464d7434e044eeacff38bc7a043ecb4b3b6d42d57c0441d27a8f645c599fe0d SHA512 c747ba0f0014099be6572197e6aa9aa520cdfd6bae63fc3e0f92b723554a56180d52e1cb40422a063f56a4003d07b3cd09337b4413471668e62d51a6deace02a
+EBUILD cloc-1.86.ebuild 683 BLAKE2B 125b6eb0805bd7047cd3cb74e807a7110393001879aeb9be71b221c3e9369d95e82ed83aab6d7230235e7479c83ecd9030542d9017c9ea529af7fc33350ee594 SHA512 80fffb487795b4abfca524c7a20abf284d8647fbd45c415b0c29ca512beb3edff41fe93e312989690651ba1d61358162b2de51293cb8a7961a8c6d6f4cbd8bbb
+MISC metadata.xml 699 BLAKE2B 424f272c2a398814052cdf40724b0daaf63985ef10194e38b2a22ad4cf67c90a9ee016d7e14dca738729d61b45d0cf7f2044f5801e6b35fe344ab152fe754d80 SHA512 7625ef4e35fda98f4a56ddc5a02f24af4b8a30db9fc1297092188078328ac8c2f188715251b41b3956c40a946b8791c5ec06e71c2edb271ffb0459add56dd7df
diff --git a/dev-util/cloc/cloc-1.86.ebuild b/dev-util/cloc/cloc-1.86.ebuild
new file mode 100644
index 000000000000..61220333dbd9
--- /dev/null
+++ b/dev-util/cloc/cloc-1.86.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Count Lines of Code"
+HOMEPAGE="https://github.com/AlDanial/cloc"
+SRC_URI="https://github.com/AlDanial/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}
+	dev-perl/Algorithm-Diff
+	dev-perl/Parallel-ForkManager
+	dev-perl/Regexp-Common
+	virtual/perl-Digest-MD5
+	virtual/perl-File-Spec
+	virtual/perl-File-Temp
+	virtual/perl-Getopt-Long"
+
+src_compile() {
+	pod2man "Unix/${PN}.1.pod" > "${PN}.1" || die
+}
+
+src_install() {
+	doman "${PN}.1"
+	dobin "Unix/${PN}"
+}
diff --git a/dev-util/cloc/metadata.xml b/dev-util/cloc/metadata.xml
index 273f73f2439a..dd5229bff56c 100644
--- a/dev-util/cloc/metadata.xml
+++ b/dev-util/cloc/metadata.xml
@@ -1,13 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>tamiko@gentoo.org</email>
-		<name>Matthias Maier</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">AlDanial/cloc</remote-id>
-		<bugs-to>https://github.com/AlDanial/cloc/issues</bugs-to>
-		<remote-id type="sourceforge">cloc</remote-id>
-	</upstream>
+  <maintainer type="person">
+    <email>tamiko@gentoo.org</email>
+    <name>Matthias Maier</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>foerster.florianjr@gmail.com</email>
+    <name>Florian Förster</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">AlDanial/cloc</remote-id>
+    <bugs-to>https://github.com/AlDanial/cloc/issues</bugs-to>
+    <remote-id type="sourceforge">cloc</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 89ab26d90cd0..329a719fd9b9 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -14,6 +14,8 @@ AUX cmake-3.17.0_rc1-FindLAPACK.patch 1973 BLAKE2B d4f10694b55fcea047f364f3dd383
 AUX cmake-3.17.4-uv-check-return.patch 1460 BLAKE2B 1cc26575dc1ad8ff9adea7ecf7f5ba0f4b2e16510c2ef3572baaf4f6bf771d6b4a1018000b78310b246e333c95e857851a40643609d997f2283486eddda8e8f3 SHA512 e79c6b34d433804f549b60a926bbbffaeba8506430225e284187905d7df5f522c29b8507bdb334cf30ce88414d326ee4476782731f36f1b1a48f64f9fa208aef
 AUX cmake-3.18.0-filter_distcc_warning.patch 842 BLAKE2B 8c9b02a251d118f2ac31fe417e10750e3f4b911891723b0edacea83bf2b6220f121e02c299655cd49ae5a019af8a747218f81d6ece6cda41aeb57d24f9385277 SHA512 91b795225313270449d6da12baa818382da4f6937795303c5cc894f3f38f03cb88d8fb3b774fb0b8ab9cf5cd344ebeda3d83f48ef8474093a8a0268d8f342828
 AUX cmake-3.19.1-darwin-gcc.patch 433 BLAKE2B 72fb716af3d24d2723a06f0c2351d16af215cb64effa46bf404d8e00106ec80297b34b3d7f787b191e3fc08e1d35c515b6d2d527213285de91cb1f4b81272cb2 SHA512 a732f6f22e4eaab747cf80eaebb4fe5624aec893fc2bbb782f86d8377d3eda365568f091dd2505e18798fa8147f13adda0fa5cb0687c5c427a65bdc7cb957ff0
+AUX cmake-3.19.1-fix-spurious-include-target.patch 7557 BLAKE2B c67a83e4729676e5f9b239e5b428a53c78c516f40cc53e6cba0b39d356eb24a6fc855c6c2749ede5f478242a556fe1e40df6f57899a06a2157474f91fcf47c95 SHA512 0a46074acf6b40affdd57a019d354603e6a102a604e41ffa402b5107d4f1b629c8cbaa121ebec35749ad45b0cd62f6a7ff2a638f15cc73e3251b6e9abf0a89ec
+AUX cmake-3.19.1-use-FPHSA-outside-find_package.patch 1451 BLAKE2B 9cdc2067a741f60174fa86239e4390087cc29aef43fe111c1ffa5a337424bc273f06f1fa8bf880c66959455462d2696c1687e20e6180a7f64c5cb8fd2a58dde9 SHA512 3cfc27166a389b04ab0bb8464c938fc9229e7b5c5dd3e0e5e36b2ce3020de00b373695cda73aa40bfc720cc9f3fc6eae11b7e88c56905cb411cbda432fe2f699
 AUX cmake-3.4.0_rc1-darwin-bundle.patch 1043 BLAKE2B 99fc8061352b6a503f472e11045f9a99c2b980f08e9c1406722eacdd438617dccc394f53bdcaa4d93c4aa499b4615185c3ec99ccad8be3504972001498b02c48 SHA512 8c6297bf824d5a911e14004ac4c4e62d1a1528e44199d8860ca885bb1b8dd3d66a73c3db32664b830c3c635bdb498abbd5196be92ed2571cb22828d7186ff9f9
 AUX cmake-3.5.2-FindQt4.patch 1585 BLAKE2B 8cfda84c419515be57f65be7b4b22d7937b656eb7f58d61c7d9e30db9dac36e934f2a529b4ea20d69c5f8a653c727bae34374ebcb7f5017fd70df41abd538164 SHA512 bab8960bfea3c29416bdc8f39c7dee59b89bd7951752401f24eeb9161ac7bc2c6dd200cb62c6b9f964d763b5d257a94d8b04dc7090d6fa947a04f2d0c2e8c479
 AUX cmake-3.9.0_rc2-FindPythonInterp.patch 1458 BLAKE2B a70945921738f00952b40a73d9ea26ecc86614aa3f12c94226aac4710dd0b9723c365b6f5def965069a54919bab13a33490facc6c5e64fad69d2e05a97d2812f SHA512 8adcb75cc035f64521e85229eb8dfa1e627326f8e189f66b707b3a0448ed3ae6acf306643026f7cbc7b924edcef73cad7a107d83162b4ca46bd6bbdc7a58af12
@@ -21,15 +23,11 @@ AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b54345
 DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 765678bc92821207c53bfb4ac995a791b938f20236c3a6fda873b8edd11cd1401b4f4c05f170b8f600f38bde5f1227c715499eee072a8de3bb29d4f5cd230226 SHA512 99e3a8f5bc147dd90b9cab11f06892d87f289aa1354ad323711fe96ebc9c32b1e887e8f9d3575a37831c4d2153a070ff9115c5e27a185d54170bad9dbbaabc26
 DIST cmake-3.16.5.tar.gz 9111262 BLAKE2B 5f996113a4979563d7b9f298b4b1a32d6f91eebaa79af42e1cbf247884e443de47e30030fd0f16c7755c4086e2bff0c0741911753ea7c889b68c393c0b98c876 SHA512 204ce83501c8068ff660c30a68641a354764135e1600a9a95b39476d072876e400961377e19bbe03a7b18412b36dcf21a693946a2a81cff5985e637e9f193671
 DIST cmake-3.17.4.tar.gz 9473549 BLAKE2B 2ce29415525b5292ae9e06d73570ed0af2173d8d15612f4d645f22d4f55cb99018663c374c4282731e09f8c6e4ffd59316d65f38aef9db5c34d874ca8992382b SHA512 6af879502e52388f3be02a4edfb006274840ad1afa8f28ffd6ec69b0310c7f718812b2272e5f77ffa422717f61407a6d482deb95941555c21c73fc5f62356a4e
-DIST cmake-3.18.4.tar.gz 8976659 BLAKE2B b121a641f5470c5e210bd0ee5506cdc2165ad186074b54bc81de72f36ff6b5748fe846794eff16a13c52e98ce246561fb1aab0f0fd1fdcf9173c4bdacd9cbb8f SHA512 2f0c5647ed58bf911d0bfeafc7f22a3de09aa3be86301158fa51c8560e994534d7500869067432ecf91e82213a0b36ddb5db11c5c55d2ca5e5647ac9f75717b9
 DIST cmake-3.18.5.tar.gz 8975784 BLAKE2B 62ea68b602e7e352c22ba6122aa010fb78fb5c4e484aa51bc336e750280d5fc03ffa439bd8005d2c43176f5a5db4ebfd419beca65cc59c5b8cd5666e38394fb8 SHA512 c15e0937a9c0ce0b6164c3d02a147e679ea57e1119cff4189a15de71429a7facb3c04eb8db467471876b5da5dbd4a25acb228efa7101fe78efd205f0d2c96343
-DIST cmake-3.19.0.tar.gz 9257338 BLAKE2B bcfbbc92e3b1a5ee540ad4d24a358eccd73bd36f43fa642536f73ffb51fc052150e41b356a4df8cd2b6b1e477f121adc8232d50f4f1464a31c91e8d2a8d6d3a2 SHA512 f9b880cf1e425101ea1e1015cb58fc006abc258b57a8b9734d5245ba0b4fca8acb9589ea495b3eb21d03e825a1fc3ff560d23b5b9c033266b4d858b1e561d54f
 DIST cmake-3.19.1.tar.gz 9256956 BLAKE2B 00874fa3099fe55e7a8c16f5225d30c56e05aaaa69930e0f10d1829bb373f83c17cb11ba538918089bd94162dbb4cc736b2024bd0e1e7102f3d8c462bfe71c1b SHA512 1a1c9a8546c80f8602babffc7fd398cea5d9163512ef74333f87e26a97ca35358bd0e90423768cfc971ebfed185e19d775737e557e0e982403b77a2ccbcd063a
 EBUILD cmake-3.13.5.ebuild 6250 BLAKE2B 51fd5c675042b869a8dd3f54ceaed2f3a2d9bc43aeb2894b1b8c9d995660bc81ed9b39f99bfbb376d0dd658942def7bc2c1ec3538efc36c1f43f65bc1ca5dd5b SHA512 638eece44d2cb688d92fd9fbedd189aee9b0b878b1fd054984e806d17083eda352695136bf0d800d9e2ecb7993917f2da4f1f1913e14c7686c4d7cff8c641f60
 EBUILD cmake-3.16.5.ebuild 5911 BLAKE2B f124d2d41b33a9a76749ced21fac3717eb50bba7065500986fdafc445bef3f17bf6e1faac7e863257ad5d8f571e4bdf17c9e750f5b83163401b491d85a2319f7 SHA512 4cfeb2154bd96b1f146b508ed038158a8cb58ead403011054702c4bdc1e2d99e677baa1b7ee6c33c4b317ca4992718cdc352b55724e73bf8edc758d2748e2603
 EBUILD cmake-3.17.4-r1.ebuild 6136 BLAKE2B 255ddfbb74512dbbbbf5ad397bbf6f78b9185ff2aa25e8b5ca9f12ffc57ba65a2906de692977c722c8a29f524169b72ff46ee7226ec8ba9d81f36c90357ae149 SHA512 c836b5851c424b9880967c248605cc1ba1e992946a1ba96f0622695902303bb40b1c0d6d015fb17dac7778b1fa388d277c9dfe964cfd0796b48c93fe8badd426
-EBUILD cmake-3.18.4.ebuild 6130 BLAKE2B 57a06ffa279519744afa1854fabb28f90da78d31dc26ea6e78fd1f0e0401a4ce86bb5a45297679cb92df3928a79ee8740a5288ad1e8711d908601fadfa02b028 SHA512 8337e005af90f1a0f792b6f2a7d9098767024ad221aed57237e4ced1b20f98a5d16a7633ca86e1df83043a3e3b7d58c138104b58ebd170675146af37e619744a
 EBUILD cmake-3.18.5.ebuild 6130 BLAKE2B 57a06ffa279519744afa1854fabb28f90da78d31dc26ea6e78fd1f0e0401a4ce86bb5a45297679cb92df3928a79ee8740a5288ad1e8711d908601fadfa02b028 SHA512 8337e005af90f1a0f792b6f2a7d9098767024ad221aed57237e4ced1b20f98a5d16a7633ca86e1df83043a3e3b7d58c138104b58ebd170675146af37e619744a
-EBUILD cmake-3.19.0.ebuild 6182 BLAKE2B baf789644fe5a895f2659aff3e0820ca512b003e21c69a471ec7a98ed3609ebdc32985487607c636400a7890c9edb1d1215d1cb4043ab5713b7c5cee2e9221a6 SHA512 5dbd0c14bb478245ce0e84a5d672ac9ccaa31f4f879791dca998e67a703661f658238e279dbe1ef4b3faa7ffc2b078b8397f79f146c1b41553aea2a2428fa905
-EBUILD cmake-3.19.1.ebuild 6342 BLAKE2B b9710a55e3a16ab80335f7fa44fb3b75becced5f8db1b1a1607abdf003e200dd3081a0c7b110916877f582879638e8535b2ab1ec9dcf9c1d0478d9db010aa768 SHA512 51f453ceb2728064a02ea16e99de8d2213dff0c833bf1fc4757b87c4dae711b0608c30978c5b8a0176691afb4b80367c2779f9738828d2a8198f0079ed08b6af
+EBUILD cmake-3.19.1-r1.ebuild 6757 BLAKE2B 2efce746909404d51f2f2f294bcf0c89d21938fc9721d0d0fa79977c28574078f6a57fec8e87dee8732cb6704f636b7f02770cff6b1873e4ac2babb8284d203f SHA512 a65f25b10379f0483cf7afe38bd76b7eca0c39b852c30ab80f73794ccf80a258c5377254fb0294d362a8447f4bb65628b271d225f00dbefdcffec33d420afa68
 MISC metadata.xml 460 BLAKE2B f1a7e1709a6b9975ffbc377c8b4d1ea8a01f52ccc139693c8e427150b7559ecc867b3e55fb4bc95fe342a2335fe5e13c69f4bd74ffbbf302c83872c65963e73e SHA512 fc562cd5f336101d16ca30a5b3e9b99a6e51ec9d7aa503f20ce278f44d5810286fcd6b46b18073cd88ba88ee5ab4f8a0bfccaa567df09ebb722a68ab721aa340
diff --git a/dev-util/cmake/cmake-3.18.4.ebuild b/dev-util/cmake/cmake-3.18.4.ebuild
deleted file mode 100644
index 7334e72c320d..000000000000
--- a/dev-util/cmake/cmake-3.18.4.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake" # TODO: Re-check with 3.19, see commit 491dddfb; bug #596460
-CMAKE_REMOVE_MODULES_LIST=( none )
-inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
-	toolchain-funcs virtualx xdg-utils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="https://cmake.org/"
-SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs ncurses qt5 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=app-arch/libarchive-3.3.3:=
-	app-crypt/rhash
-	>=dev-libs/expat-2.0.1
-	>=dev-libs/jsoncpp-1.9.2-r2:0=
-	>=dev-libs/libuv-1.10.0:=
-	>=net-misc/curl-7.21.5[ssl]
-	sys-libs/zlib
-	virtual/pkgconfig
-	emacs? ( >=app-editors/emacs-23.1:* )
-	ncurses? ( sys-libs/ncurses:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? (
-		dev-python/requests
-		dev-python/sphinx
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-	# prefix
-	"${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
-	"${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
-	# Next patch requires new work from prefix people
-	#"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
-
-	# handle gentoo packaging in find modules
-	"${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
-	"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch
-	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
-	# respect python eclasses
-	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
-	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
-
-	"${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544
-
-	# upstream fixes (can usually be removed with a version bump)
-)
-
-cmake_src_bootstrap() {
-	# disable running of cmake in bootstrap command
-	sed -i \
-		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
-		bootstrap || die "sed failed"
-
-	# execinfo.h on Solaris isn't quite what it is on Darwin
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e 's/execinfo\.h/blablabla.h/' \
-			Source/kwsys/CMakeLists.txt || die
-	fi
-
-	# bootstrap script isn't exactly /bin/sh compatible
-	tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \
-		--prefix="${T}/cmakestrap/" \
-		--parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
-		|| die "Bootstrap failed"
-}
-
-cmake_src_test() {
-	# fix OutDir and SelectLibraryConfigurations tests
-	# these are altered thanks to our eclass
-	sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
-		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
-		|| die
-
-	pushd "${BUILD_DIR}" > /dev/null
-
-	local ctestargs
-	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
-	# Excluded tests:
-	#    BootstrapTest: we actually bootstrap it every time so why test it.
-	#    BundleUtilities: bundle creation broken
-	#    CMakeOnly.AllFindModules: pthread issues
-	#    CTest.updatecvs: fails to commit as root
-	#    Fortran: requires fortran
-	#    RunCMake.CommandLineTar: whatever...
-	#    RunCMake.CompilerLauncher: also requires fortran
-	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
-	#        debugedit binary is not in the expected location
-	#    RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
-	#        it can't find a deb package that owns libc
-	#    RunCMake.{IncompatibleQt,ObsoleteQtMacros}: Require Qt4
-	#    TestUpload: requires network access
-	"${BUILD_DIR}"/bin/ctest \
-		-j "$(makeopts_jobs)" \
-		--test-load "$(makeopts_loadavg)" \
-		${ctestargs} \
-		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CommandLineTar|RunCMake.CompilerLauncher|RunCMake.IncompatibleQt|RunCMake.ObsoleteQtMacros|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
-		|| die "Tests failed"
-
-	popd > /dev/null
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# disable Xcode hooks, bug #652134
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
-			Source/cmGlobalXCodeGenerator.cxx || die
-	fi
-
-	# Add gcc libs to the default link paths
-	sed -i \
-		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
-		-e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
-		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
-		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-	if ! has_version -b \>=${CATEGORY}/${PN}-3.4.0_rc1 || ! cmake --version &>/dev/null ; then
-		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-		cmake_src_bootstrap
-	fi
-}
-
-src_configure() {
-	# Fix linking on Solaris
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
-
-	local mycmakeargs=(
-		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
-		-DCMAKE_DOC_DIR=/share/doc/${PF}
-		-DCMAKE_MAN_DIR=/share/man
-		-DCMAKE_DATA_DIR=/share/${PN}
-		-DSPHINX_MAN=$(usex doc)
-		-DSPHINX_HTML=$(usex doc)
-		-DBUILD_CursesDialog="$(usex ncurses)"
-		-DBUILD_TESTING=$(usex test)
-	)
-	use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON )
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	if use emacs; then
-		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins Auxiliary/vim/syntax/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/indent
-	doins Auxiliary/vim/indent/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/${PN}.vim"
-
-	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
diff --git a/dev-util/cmake/cmake-3.19.0.ebuild b/dev-util/cmake/cmake-3.19.0.ebuild
deleted file mode 100644
index 5dc94575a14f..000000000000
--- a/dev-util/cmake/cmake-3.19.0.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake" # TODO: Re-check with 3.19, see commit 491dddfb; bug #596460
-CMAKE_REMOVE_MODULES_LIST=( none )
-inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
-	toolchain-funcs virtualx xdg-utils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="https://cmake.org/"
-SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs ncurses qt5 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=app-arch/libarchive-3.3.3:=
-	app-crypt/rhash
-	>=dev-libs/expat-2.0.1
-	>=dev-libs/jsoncpp-1.9.2-r2:0=
-	>=dev-libs/libuv-1.10.0:=
-	>=net-misc/curl-7.21.5[ssl]
-	sys-libs/zlib
-	virtual/pkgconfig
-	emacs? ( >=app-editors/emacs-23.1:* )
-	ncurses? ( sys-libs/ncurses:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? (
-		dev-python/requests
-		dev-python/sphinx
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-	# prefix
-	"${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
-	"${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
-	# Next patch requires new work from prefix people
-	#"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
-
-	# handle gentoo packaging in find modules
-	"${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
-	# Next patch needs to be reworked
-	#"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch
-	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
-	# respect python eclasses
-	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
-	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
-
-	"${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544
-
-	# upstream fixes (can usually be removed with a version bump)
-)
-
-cmake_src_bootstrap() {
-	# disable running of cmake in bootstrap command
-	sed -i \
-		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
-		bootstrap || die "sed failed"
-
-	# execinfo.h on Solaris isn't quite what it is on Darwin
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e 's/execinfo\.h/blablabla.h/' \
-			Source/kwsys/CMakeLists.txt || die
-	fi
-
-	# bootstrap script isn't exactly /bin/sh compatible
-	tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \
-		--prefix="${T}/cmakestrap/" \
-		--parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
-		|| die "Bootstrap failed"
-}
-
-cmake_src_test() {
-	# fix OutDir and SelectLibraryConfigurations tests
-	# these are altered thanks to our eclass
-	sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
-		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
-		|| die
-
-	pushd "${BUILD_DIR}" > /dev/null
-
-	local ctestargs
-	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
-	# Excluded tests:
-	#    BootstrapTest: we actually bootstrap it every time so why test it.
-	#    BundleUtilities: bundle creation broken
-	#    CMakeOnly.AllFindModules: pthread issues
-	#    CTest.updatecvs: fails to commit as root
-	#    Fortran: requires fortran
-	#    RunCMake.CommandLineTar: whatever...
-	#    RunCMake.CompilerLauncher: also requires fortran
-	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
-	#        debugedit binary is not in the expected location
-	#    RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
-	#        it can't find a deb package that owns libc
-	#    RunCMake.{IncompatibleQt,ObsoleteQtMacros}: Require Qt4
-	#    TestUpload: requires network access
-	"${BUILD_DIR}"/bin/ctest \
-		-j "$(makeopts_jobs)" \
-		--test-load "$(makeopts_loadavg)" \
-		${ctestargs} \
-		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|DependencyGraph|Fortran|RunCMake.CommandLineTar|RunCMake.CompilerLauncher|RunCMake.IncompatibleQt|RunCMake.ObsoleteQtMacros|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
-		|| die "Tests failed"
-
-	popd > /dev/null
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# disable Xcode hooks, bug #652134
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
-			Source/cmGlobalXCodeGenerator.cxx || die
-	fi
-
-	# Add gcc libs to the default link paths
-	sed -i \
-		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
-		-e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
-		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
-		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-	if ! has_version -b \>=${CATEGORY}/${PN}-3.4.0_rc1 || ! cmake --version &>/dev/null ; then
-		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-		cmake_src_bootstrap
-	fi
-}
-
-src_configure() {
-	# Fix linking on Solaris
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
-
-	local mycmakeargs=(
-		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
-		-DCMAKE_DOC_DIR=/share/doc/${PF}
-		-DCMAKE_MAN_DIR=/share/man
-		-DCMAKE_DATA_DIR=/share/${PN}
-		-DSPHINX_MAN=$(usex doc)
-		-DSPHINX_HTML=$(usex doc)
-		-DBUILD_CursesDialog="$(usex ncurses)"
-		-DBUILD_TESTING=$(usex test)
-	)
-	use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON )
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	if use emacs; then
-		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins Auxiliary/vim/syntax/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/indent
-	doins Auxiliary/vim/indent/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/${PN}.vim"
-
-	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
diff --git a/dev-util/cmake/cmake-3.19.1.ebuild b/dev-util/cmake/cmake-3.19.1-r1.ebuild
index 09d448bde370..2726694149e4 100644
--- a/dev-util/cmake/cmake-3.19.1.ebuild
+++ b/dev-util/cmake/cmake-3.19.1-r1.ebuild
@@ -69,6 +69,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544
 
 	# upstream fixes (can usually be removed with a version bump)
+	"${FILESDIR}"/${P}-fix-spurious-include-target.patch # bug 759271
+	"${FILESDIR}"/${P}-use-FPHSA-outside-find_package.patch # bug 755743
 )
 
 cmake_src_bootstrap() {
@@ -129,14 +131,20 @@ cmake_src_test() {
 src_prepare() {
 	cmake_src_prepare
 
-	# disable Xcode hooks, bug #652134
 	if [[ ${CHOST} == *-darwin* ]] ; then
+		# disable Xcode hooks, bug #652134
 		sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
 			Source/cmGlobalXCodeGenerator.cxx || die
 		# disable isysroot usage with GCC, we've properly instructed
 		# where things are via GCC configuration and ldwrapper
 		sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
-			Modules/Platform/Apple-GNU-C{,XX}.cmake || die
+			Modules/Platform/Apple-GNU-*.cmake || die
+		# don't set a POSIX standard, system headers don't like that, #757426
+		sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
+			Source/cmLoadCommandCommand.cxx \
+			Source/cmStandardLexer.h \
+			Source/cmSystemTools.cxx \
+			Source/cmTimestamp.cxx
 	fi
 
 	# Add gcc libs to the default link paths
diff --git a/dev-util/cmake/files/cmake-3.19.1-fix-spurious-include-target.patch b/dev-util/cmake/files/cmake-3.19.1-fix-spurious-include-target.patch
new file mode 100644
index 000000000000..1b51cf013fe5
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.19.1-fix-spurious-include-target.patch
@@ -0,0 +1,198 @@
+From 38bcb5c0a3accd2dd29fb7632c6b3bf31b990d82 Mon Sep 17 00:00:00 2001
+From: Deniz Bahadir <dbahadir@benocs.com>
+Date: Tue, 1 Dec 2020 00:25:39 +0100
+Subject: [PATCH] export: Do not fail generation for separate namelink only
+ case
+
+Update the change from commit 64690f6df0 (export: Do not fail generation
+for namelink-only case, 2020-10-09, v3.19.0-rc1~7^2) to also handle
+separate namelink-only and namelink-skip calls.
+
+Fixes: #21529
+---
+ Source/cmExportBuildFileGenerator.cxx         |  3 +++
+ Source/cmExportInstallFileGenerator.cxx       |  3 +++
+ Source/cmInstallCommand.cxx                   | 19 +++++++++++--------
+ Source/cmTargetExport.h                       |  2 ++
+ Tests/RunCMake/export/RunCMakeTest.cmake      |  1 +
+ .../export/SeparateNamelinkExport.cmake       | 16 ++++++++++++++++
+ .../install/EXPORT-SeparateNamelink.cmake     | 19 +++++++++++++++++++
+ Tests/RunCMake/install/RunCMakeTest.cmake     |  1 +
+ 8 files changed, 56 insertions(+), 8 deletions(-)
+ create mode 100644 Tests/RunCMake/export/SeparateNamelinkExport.cmake
+ create mode 100644 Tests/RunCMake/install/EXPORT-SeparateNamelink.cmake
+
+diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
+index dd700c5edf..1a31ae4afd 100644
+--- a/Source/cmExportBuildFileGenerator.cxx
++++ b/Source/cmExportBuildFileGenerator.cxx
+@@ -288,6 +288,9 @@ void cmExportBuildFileGenerator::GetTargets(
+   if (this->ExportSet) {
+     for (std::unique_ptr<cmTargetExport> const& te :
+          this->ExportSet->GetTargetExports()) {
++      if (te->NamelinkOnly) {
++        continue;
++      }
+       targets.push_back(te->TargetName);
+     }
+     return;
+diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
+index 987ec9ea7b..0b9b183d54 100644
+--- a/Source/cmExportInstallFileGenerator.cxx
++++ b/Source/cmExportInstallFileGenerator.cxx
+@@ -42,6 +42,9 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
+     std::string sep;
+     for (std::unique_ptr<cmTargetExport> const& te :
+          this->IEGen->GetExportSet()->GetTargetExports()) {
++      if (te->NamelinkOnly) {
++        continue;
++      }
+       expectedTargets += sep + this->Namespace + te->Target->GetExportName();
+       sep = " ";
+       if (this->ExportedTargets.insert(te->Target).second) {
+diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx
+index b99e6a3c6c..ff08ee41ef 100644
+--- a/Source/cmInstallCommand.cxx
++++ b/Source/cmInstallCommand.cxx
+@@ -461,6 +461,13 @@ bool HandleTargetsMode(std::vector<std::string> const& args,
+     std::unique_ptr<cmInstallFilesGenerator> publicHeaderGenerator;
+     std::unique_ptr<cmInstallFilesGenerator> resourceGenerator;
+ 
++    // Avoid selecting default destinations for PUBLIC_HEADER and
++    // PRIVATE_HEADER if any artifacts are specified.
++    bool artifactsSpecified = false;
++
++    // Track whether this is a namelink-only rule.
++    bool namelinkOnly = false;
++
+     auto addTargetExport = [&]() {
+       // Add this install rule to an export if one was specified.
+       if (!exports.empty()) {
+@@ -475,20 +482,13 @@ bool HandleTargetsMode(std::vector<std::string> const& args,
+         te->ObjectsGenerator = objectGenerator.get();
+         te->InterfaceIncludeDirectories =
+           cmJoin(includesArgs.GetIncludeDirs(), ";");
+-
++        te->NamelinkOnly = namelinkOnly;
+         helper.Makefile->GetGlobalGenerator()
+           ->GetExportSets()[exports]
+           .AddTargetExport(std::move(te));
+       }
+     };
+ 
+-    // Avoid selecting default destinations for PUBLIC_HEADER and
+-    // PRIVATE_HEADER if any artifacts are specified.
+-    bool artifactsSpecified = false;
+-
+-    // Track whether this is a namelink-only rule.
+-    bool namelinkOnly = false;
+-
+     switch (target.GetType()) {
+       case cmStateEnums::SHARED_LIBRARY: {
+         // Shared libraries are handled differently on DLL and non-DLL
+@@ -497,6 +497,7 @@ bool HandleTargetsMode(std::vector<std::string> const& args,
+         if (target.IsDLLPlatform()) {
+           // When in namelink only mode skip all libraries on Windows.
+           if (namelinkMode == cmInstallTargetGenerator::NamelinkModeOnly) {
++            namelinkOnly = true;
+             addTargetExport();
+             continue;
+           }
+@@ -529,6 +530,7 @@ bool HandleTargetsMode(std::vector<std::string> const& args,
+           if (target.IsFrameworkOnApple()) {
+             // When in namelink only mode skip frameworks.
+             if (namelinkMode == cmInstallTargetGenerator::NamelinkModeOnly) {
++              namelinkOnly = true;
+               addTargetExport();
+               continue;
+             }
+@@ -574,6 +576,7 @@ bool HandleTargetsMode(std::vector<std::string> const& args,
+         if (target.IsFrameworkOnApple()) {
+           // When in namelink only mode skip frameworks.
+           if (namelinkMode == cmInstallTargetGenerator::NamelinkModeOnly) {
++            namelinkOnly = true;
+             addTargetExport();
+             continue;
+           }
+diff --git a/Source/cmTargetExport.h b/Source/cmTargetExport.h
+index cb4d8dae44..1e38d84923 100644
+--- a/Source/cmTargetExport.h
++++ b/Source/cmTargetExport.h
+@@ -31,4 +31,6 @@ public:
+   cmInstallFilesGenerator* HeaderGenerator;
+   std::string InterfaceIncludeDirectories;
+   ///@}
++
++  bool NamelinkOnly = false;
+ };
+diff --git a/Tests/RunCMake/export/RunCMakeTest.cmake b/Tests/RunCMake/export/RunCMakeTest.cmake
+index 95c8d5cf45..0e6020f0f4 100644
+--- a/Tests/RunCMake/export/RunCMakeTest.cmake
++++ b/Tests/RunCMake/export/RunCMakeTest.cmake
+@@ -17,3 +17,4 @@ run_cmake(DependOnNotExport)
+ run_cmake(DependOnDoubleExport)
+ run_cmake(UnknownExport)
+ run_cmake(NamelinkOnlyExport)
++run_cmake(SeparateNamelinkExport)
+diff --git a/Tests/RunCMake/export/SeparateNamelinkExport.cmake b/Tests/RunCMake/export/SeparateNamelinkExport.cmake
+new file mode 100644
+index 0000000000..b006aea128
+--- /dev/null
++++ b/Tests/RunCMake/export/SeparateNamelinkExport.cmake
+@@ -0,0 +1,16 @@
++enable_language(CXX)
++add_library(foo SHARED empty.cpp)
++install(TARGETS foo EXPORT fooExport
++  RUNTIME DESTINATION bin
++  LIBRARY
++     DESTINATION lib
++     COMPONENT runtime
++     NAMELINK_SKIP
++)
++install(TARGETS foo EXPORT fooExport
++  LIBRARY
++     DESTINATION lib
++     COMPONENT development
++     NAMELINK_ONLY
++)
++export(EXPORT fooExport FILE "${CMAKE_CURRENT_BINARY_DIR}/foo.cmake")
+diff --git a/Tests/RunCMake/install/EXPORT-SeparateNamelink.cmake b/Tests/RunCMake/install/EXPORT-SeparateNamelink.cmake
+new file mode 100644
+index 0000000000..5c6fa10d18
+--- /dev/null
++++ b/Tests/RunCMake/install/EXPORT-SeparateNamelink.cmake
+@@ -0,0 +1,19 @@
++enable_language(C)
++add_library(foo SHARED empty.c)
++install(TARGETS foo EXPORT fooExport
++  RUNTIME DESTINATION bin
++  LIBRARY
++     DESTINATION lib
++     COMPONENT runtime
++     NAMELINK_SKIP
++)
++install(TARGETS foo EXPORT fooExport
++  LIBRARY
++     DESTINATION lib
++     COMPONENT development
++     NAMELINK_ONLY
++)
++install(EXPORT fooExport
++    DESTINATION "lib/cmake/"
++    FILE "foo.cmake"
++)
+diff --git a/Tests/RunCMake/install/RunCMakeTest.cmake b/Tests/RunCMake/install/RunCMakeTest.cmake
+index 5aab88ca80..d64d88b770 100644
+--- a/Tests/RunCMake/install/RunCMakeTest.cmake
++++ b/Tests/RunCMake/install/RunCMakeTest.cmake
+@@ -78,6 +78,7 @@ run_cmake(TARGETS-DESTINATION-bad)
+ run_cmake(EXPORT-OldIFace)
+ run_cmake(EXPORT-UnknownExport)
+ run_cmake(EXPORT-NamelinkOnly)
++run_cmake(EXPORT-SeparateNamelink)
+ run_cmake(CMP0062-OLD)
+ run_cmake(CMP0062-NEW)
+ run_cmake(CMP0062-WARN)
+-- 
+GitLab
+
diff --git a/dev-util/cmake/files/cmake-3.19.1-use-FPHSA-outside-find_package.patch b/dev-util/cmake/files/cmake-3.19.1-use-FPHSA-outside-find_package.patch
new file mode 100644
index 000000000000..8cde769ce8f8
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.19.1-use-FPHSA-outside-find_package.patch
@@ -0,0 +1,40 @@
+From 14ecf9c2f6edfae4033d9311f79d79d0d07fc1cf Mon Sep 17 00:00:00 2001
+From: Marc Chevrier <marc.chevrier@gmail.com>
+Date: Wed, 25 Nov 2020 16:36:12 +0100
+Subject: [PATCH] FPHSA: ensure it can be used outside 'find_package'
+
+Fixes: #21505
+---
+ Modules/FindPackageHandleStandardArgs.cmake | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/Modules/FindPackageHandleStandardArgs.cmake b/Modules/FindPackageHandleStandardArgs.cmake
+index 7af017136d..7e172779e4 100644
+--- a/Modules/FindPackageHandleStandardArgs.cmake
++++ b/Modules/FindPackageHandleStandardArgs.cmake
+@@ -275,8 +275,10 @@ function(FIND_PACKAGE_CHECK_VERSION version result)
+     unset (${FPCV_RESULT_MESSAGE_VARIABLE} PARENT_SCOPE)
+   endif()
+ 
+-  if (CMAKE_FIND_PACKAGE_NAME)
+-    set (package ${CMAKE_FIND_PACKAGE_NAME})
++  if (_CMAKE_FPHSA_PACKAGE_NAME)
++    set (package "${_CMAKE_FPHSA_PACKAGE_NAME}")
++  elseif (CMAKE_FIND_PACKAGE_NAME)
++    set (package "${CMAKE_FIND_PACKAGE_NAME}")
+   else()
+     message (FATAL_ERROR "find_package_check_version(): Cannot be used outside a 'Find Module'")
+   endif()
+@@ -436,6 +438,9 @@ function(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRST_ARG)
+       "will be used.")
+   endif()
+ 
++  # to propagate package name to FIND_PACKAGE_CHECK_VERSION
++  set(_CMAKE_FPHSA_PACKAGE_NAME "${_NAME}")
++
+   # now that we collected all arguments, process them
+ 
+   if("x${FPHSA_FAIL_MESSAGE}" STREQUAL "xDEFAULT_MSG")
+-- 
+GitLab
+
diff --git a/dev-util/colm/Manifest b/dev-util/colm/Manifest
index 5a38e8241b15..d9cd2bfc3c29 100644
--- a/dev-util/colm/Manifest
+++ b/dev-util/colm/Manifest
@@ -6,5 +6,5 @@ EBUILD colm-0.13.0.4.ebuild 372 BLAKE2B 789e470189b8c31dce2145bd696f762569d5a802
 EBUILD colm-0.13.0.5.ebuild 493 BLAKE2B 1db4cd9d96b82533efaf02912860354d02afadc9db9efcd753717fa8640c31fa23b375cdd6db8d87872accf1cf89931a73f76ec454fb435d2ac6c3aec08d5b1d SHA512 78358f795c3344b0705c9a50906696781dc835c8b600f8dc2fe3c64e5f3451329405dc3cd1496893059b2d09f9f49f261f497c370a674840713d7d7459a47793
 EBUILD colm-0.13.0.6-r1.ebuild 495 BLAKE2B da89d4c288e2fac01b749a1021722d1a8e20d9ab2d9665a34b88d3711d7adeb080e16e8dcbed189ebf61508ecf595b5cd01411febc652a79f2e2689280c3d701 SHA512 f041d1089febd167ea240289d0c8e1876a74093204d3a866310ec4547a274ba4015a04f8329fcaf0d7df9f10ae362badbe18f04858a0fffbf675fcf4fdae1b63
 EBUILD colm-0.13.0.6.ebuild 390 BLAKE2B cdc09b52c1787783cfe49fe1361559b0c5317d9ce9db7b0116f393fd818c17027b257685b15ee06e0cdc7fc3d9779e977dcd97d88ba63306c8cce5dd2bb1ca4d SHA512 1943cd5be8929df9a5c119a7cc9362ba1936440fc2fd77f3a80b1c94e5107709af590987dc32067cdfbea0daf9486e235bdbb3c7035c1bcdc2b57731a536302a
-EBUILD colm-0.13.0.7.ebuild 526 BLAKE2B 7040619abb35bcb6c3ca60f5fedc1bbbfede531a0bddae09c377f810b4be50ff78095ae0e08fd9c5a6fe2a94e1a2762072abedf902d2524366fa847890a3a5c5 SHA512 a8bdb42222771ef619f0fdf55333cdd18eb77f5c7eac186cf8e56df47b07b52124ad38e223ea0cb19f463e11bc9aef304b11eafdb9a5f177a52d9634728a7766
+EBUILD colm-0.13.0.7.ebuild 544 BLAKE2B 692afe01d09a7b165da07004e272ba82117b4784004763b5b12cd0af53839885c1d9911b9cdcb2ffa1f91e98709a95be817b1fcaebe3f2434df07ad6a3a0bbda SHA512 202e8e5621bff37ba41ce18f47c3f2cb4bdf2bcd1f4f737f1548b8f19a37c04b5d6ba03c22fe27b1bdcdf1c9a4582b38fab2a17b86e8f9cff9ce06e996fed709
 MISC metadata.xml 253 BLAKE2B 7dac7f77dcc8de31f439cc6d7770a503f95be9c2f8ae57df9e725df941e2b31a90a43664a485a5fad9510b9ae060ba7aaaddba29324338dd9eb07d88a63c7dce SHA512 303268e1f46e337e32c64b544c0962ecbe8de1799c42736b3c3515b6f31954a655830c402317bd0534cac12059e17eeb5f360d010432dff795a136662a5c10f1
diff --git a/dev-util/colm/colm-0.13.0.7.ebuild b/dev-util/colm/colm-0.13.0.7.ebuild
index a7249366d3ad..71615c0c0d25 100644
--- a/dev-util/colm/colm-0.13.0.7.ebuild
+++ b/dev-util/colm/colm-0.13.0.7.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.colm.net/files/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 BDEPEND="app-text/asciidoc"
 
diff --git a/dev-util/comparator/Manifest b/dev-util/comparator/Manifest
index 341c59b646b5..94c0d74ae29f 100644
--- a/dev-util/comparator/Manifest
+++ b/dev-util/comparator/Manifest
@@ -1,4 +1,4 @@
 AUX comparator-2.12-gcc10.patch 793 BLAKE2B 0bab88fa6aeaf046ee4dc569aeb0d3344a2a9def5e2a67f1139fd59621dac0cb7f89468b04fd776b4a81f883c55fe5d311890409a0de22363ada166c3c20475a SHA512 c4e4c03f0dd8759e2fbd9421465b75254f4a02a56846347c4f1062c411c124f62e803854af389a527a8323f57daef563f7948eac5fbe25ff3e0529c7384a1287
 DIST comparator-2.12.tar.gz 1463333 BLAKE2B 081251a0a3cb2f99d5b74092a46a868741049d27c367fc9bc3445d35fe01eaaaee75f7afd3674ecdc2569c2ac1ef2d5acd838a546aa307b33c977c4c8a91db12 SHA512 dc5acf3d5900e293e3f0188c0809bc99f2f18edb55df882b2e12e66bc655e7faf030b8daffdd2d175234b398e6a8c125ca6af615933c998651d7f1579734b080
-EBUILD comparator-2.12.ebuild 958 BLAKE2B b028284f0f21d9dcf25acb133885eace8f7e730bd1b75644bc436ae7c10388104e3866740553b6f86bc9a83eb0c2a319675c9c88ae729e71277c8b015c5eca59 SHA512 19da391ed6b6867620190253209947daa19e91e491bf9ac6e57276cfc13387021e875f2715b4a5b6bff4dfc846e61198affdcdaecdf7ba97e70edadcf677cae1
+EBUILD comparator-2.12.ebuild 959 BLAKE2B 2152f2e2415934d1e57d3cf0066a4447023bec279f4d88a22edd0b3d812e1e7599c76e358fc4d5060a72ced719d847f1ae0a3371d6784482dbdf6638c21d337b SHA512 b7f6a0871bd9435adcac4484c07a19f59cf8e6f9053a0b87f850faae599441c0e57ca02a1305a4605e421116b623606c59bfa38b4324cf9f6cdb284bfa046314
 MISC metadata.xml 331 BLAKE2B fd076ee192291de68e11340e0f62ea70193b7ddf71484d602a836bc103b097253054f085ad49161f70e1dc197080fa902f93e498c07ef6e406dc7b9034070f91 SHA512 32c3410d936b566ab3f5c6ff890ba8ca7c66e3d61491ac74b0abafa5cd5f5d338e2064737f0421e8e31237f8bd424d84ab8dd668fe8db381c186604eba649e97
diff --git a/dev-util/comparator/comparator-2.12.ebuild b/dev-util/comparator/comparator-2.12.ebuild
index 8fa2b7883030..e8870a5c7a09 100644
--- a/dev-util/comparator/comparator-2.12.ebuild
+++ b/dev-util/comparator/comparator-2.12.ebuild
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7} )
+
+PYTHON_COMPAT=( python3_{6..9} )
+
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 toolchain-funcs
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index 99f2d2578eb0..4c054f64f3a0 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -1,13 +1,7 @@
-AUX cppcheck-1.75-tinyxml2.patch 2232 BLAKE2B 389e8678fca9eee616640fc535b0c71d0476f6a2a3eb8700238d85bbc32823c92fe9b72e1a4a3b01143e23df60996a21a669625b418e579441d85ef460fd38b5 SHA512 575dfe090885cbd8157b089def7a47750519b8ea459404d3755ce23ea98e0fde2da5f0c7551a69ac195c2e3c5d03ce5a71c3d66b3fb119609eba6aaa31c39899
-AUX cppcheck-1.85-ldflags.patch 1503 BLAKE2B 0458ff66d61b9cd759839d31bc0fbe611e7d23e8d720a4b0a861d53b3fc54b30d67c481c22dfbb5254a6160eac04505f00dee01c4283214e15e21b26e0b7a76c SHA512 7cad7d456c8d3bfa5efab1c67bcd0f7e509e10e539ee9941055caad41ff3b4737d3ff82cfa172ad867651817bdd4a518a98d22732ce0df5227c149dd2122e9f7
 AUX cppcheck-1.88-ldflags.patch 967 BLAKE2B c88cf4c199e686b6befe353c25d1507969c3c48d9f30e6a0e6bf18389f28acf4c6b62a0f6a6521da453090140ed77dd86102811b296918dde238e928ff0c8cac SHA512 62f8bd8ed415bafd57cd204d51d29de73832e2510f329e57e51d19605d4df1681cbf2c1813b88681cb3b203d093ef0ec0edf44c45b7bbdb610bde7406e400035
 AUX cppcheck-1.88-tinyxml2.patch 4689 BLAKE2B a4ad83cfa7e9edf7c52493ae78c72f730dea604be12ef8ae885c82b65fcbd5dc1a3b36c154da0c2c691a0f445b44a256f48de74f00daba7d544fd14d8237ee77 SHA512 2d8a90d2698607abfedcbeda806ad6e0589fd637c2b5b755cab2f6ba99f144ff11dce05162fa6a2b4b753f7814a3fc1cc83510bbbd5ed8811b6353ed30c27d5f
-AUX cppcheck-9999-tinyxml2.patch 2491 BLAKE2B df8130302d06dde1c7f21cb4aa49daf0b1cb7e39593a6e8a08716feb44e8c34cf453c4ff4eb68a8e5cdf088ee8556d54cf1d351f4732ebdc0799579e80579986 SHA512 a8ff7854bffbb7e578cf6f0ccefd66ab02b7f3dd707540d2de140054440efd45528b5aea57e8ac7dffd7f7e44e48df04a48bd2693d5345fa39ccb23b08bc10b2
-DIST cppcheck-1.86.tar.gz 2184186 BLAKE2B 8b488ec72d0998d6b037de2b1204373c8b3de475ad165bf108bb331399356cb0d1e20a7bc6f368f1a038ec886ad7a84ad694172d0a96a203a6877f3838c21001 SHA512 59cec55b8408e8f2e2e7172bce69350c248bc3185a0938b523c44a58f98b344e11aef957ec1b7a7b2bc7a876660b2683e51f54b76f0b550f9549497c29453655
-DIST cppcheck-1.87.tar.gz 2243258 BLAKE2B ffe42bfb2e896163678c5bb24e46ae2391ba8254cbe7c1c19c3c1b16cd38adf9c773de6aaefe70af08b9c1dca8b0b0b5e9939323368a2f81491fd6981ff18139 SHA512 b0149002b40260c1488904929296403722a66b84263b41d0097c3caed28265332766c114f0d1f378ea6c7e73ab973ea71ab89c6744f6cc818f22de08933e6766
 DIST cppcheck-1.88.tar.gz 2364053 BLAKE2B b688974ff83019422cc5b2ec575d9838bdff4ada17d71fb3d436f07eea50429490c222659163b845667d98c0ec186b3288464827894e379fd017dd0c3fea645f SHA512 fa4ede0665546341af0ba3dae09a00b6efae09ec7838c616c580be01ff6902594d61168a059539779be0c78e1708d2bd9c8e7987dd0bb67dc8fa332a10d1de6a
-EBUILD cppcheck-1.86.ebuild 2326 BLAKE2B 292de19a52987e0c8a56458956c0f8fffaf9feda3c745805d9e1b22b8982bff7dd5405be71a467e2743b989d66a7d987b44ea5741366429c2afdfc91e692c264 SHA512 c934f617da26e49e0593c62bc44c88663a206186f4556fc7240c45f8e48a98b3c0d2552ad5cca61f284ff56c31597900400e366c5bd8bf17ac9caea5fb0dfed2
-EBUILD cppcheck-1.87.ebuild 2343 BLAKE2B 5d5b0a974743823fe8c942eb39b3d3049ed9cd7929b4e7db65ba12f34bc65c2a75c58f363fcaddfc21435782df8257319d225b9e8d55830de87fdffc655101e6 SHA512 eb10790caa7f2eb91b0ce00c5f0cde85df1da076f481fd7a8a4655d8a27c89225e238f36c271bb1f1e9e10940c642c79e014e81aebbb8040ee50e953a622c212
-EBUILD cppcheck-1.88.ebuild 2338 BLAKE2B 2ebce8ad2055903800eeafb7bbf1c84938fc88a54dca95f6cbe34c178f063a993431a576b35ea1b2c33a82d92db7311dd85030eb8a11197c6dc2b86c344cec7e SHA512 e1a1e8b05fa3cbe4149b9b3e9b5e63d230057735716c6f22bb94ee2c0d9c85eff9de26800c7ef59c6691a576d8160fadc0908a752c1f1351f895a4bdeb7c56f4
-EBUILD cppcheck-9999.ebuild 2237 BLAKE2B e90d8e35afcac652a03c518bdb0ed494fb2fdda35c55d0d6e9c995525274f6d0af55e05f87a0bd4948ccd2b56b6cb3cbb8caa7b189d874e55d2d83c9084e4afa SHA512 ceb118dc93351cdadc345b5a5f4fb64f76ff15afd2537680a19d24aaff13e8f572718c292734db102023eac1208884e054122a08b9508dc774493062c4d670de
-MISC metadata.xml 401 BLAKE2B b48cd9d365773e4c050d1ce2f58a108fa33bf28fb669a8fbe99a9b15d33cf203fa4a94d3411674892efb4cb5e5bd1cb5a08d97a3054b7fbdacc462695f0d1874 SHA512 08b51c30fcc21277bf320c1c9f36cd9efc7c39261b52f70f686953731c2d075482fc1959457dbe276877d508510b32a23d8f7def4ca52044fabc44a23c56a8f4
+DIST cppcheck-2.2.tar.gz 3561406 BLAKE2B e436de4bec5412a18f013c8557a966c28c14edcd07fbb80eb53a897848d15f32afc180798ea1a074742f896b15d4020755c104b87dc8f82252121b58a92b92dc SHA512 d766187a69d6aa839e072e3c0ed44009621ca8492504257288ca2f49774f705a1ebcf2957f0801ac6eab2ffbdd845e9237f1213f85c6d0fcdbf16b1e7c690327
+EBUILD cppcheck-1.88.ebuild 2346 BLAKE2B b769d672abfaf0188b66f7b2dff0e1a58ddf2017939fb6f5375b181736a4986d6bed2038be80f4835a95ebb567fab91d4131e54ac09c246b5f43f88b115d1763 SHA512 f81d88c84326a950b4796f6a89873ad359386ba4866660f6f13c18d65852b3cf7b6e170278d346aaaa96bde4da71b563e0eb163fc073953bbe16415544cd11bb
+EBUILD cppcheck-2.2.ebuild 1708 BLAKE2B b2000ee4ef2fa05db36d18637b86d9dda8da22dda3fa224387c69aa97e46c1a1c92fa5c1d8102c749c9fa74838e8d39adadea90c49d0108f22731d035d9eae68 SHA512 ab416a331de6ecea9a0a9fa0f6a42bab0d42e85488eb448ff29e0abe7f9b2ebff63e4ec7b6c11e25a3557d5f995d80bf2b306ab570e5da4750364a6c5b0245c1
+MISC metadata.xml 490 BLAKE2B 63b66d1ab0e87f0dd53dfaec62c4d17c1e806ddf2208df30b1a5fcc0f198ca343afa5a39ab55d92a3b4ac3b0143c24ec5c161afe23982c3c5eaca2050621c776 SHA512 1db095c4b258ccea938d6e4648aca9c3a165a123a703311de95f1743f641c5860cd1dd0369e6539efadd270b9f82f25694f504c34129cf55c74b323ffb3ac3c5
diff --git a/dev-util/cppcheck/cppcheck-1.86.ebuild b/dev-util/cppcheck/cppcheck-1.86.ebuild
deleted file mode 100644
index 03e138c82501..000000000000
--- a/dev-util/cppcheck/cppcheck-1.86.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1 qmake-utils toolchain-funcs
-
-DESCRIPTION="Static analyzer of C/C++ code"
-HOMEPAGE="https://github.com/danmar/cppcheck"
-SRC_URI="https://github.com/danmar/cppcheck/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 hppa ~ppc64 sparc x86"
-IUSE="htmlreport pcre qt5"
-
-RDEPEND="
-	dev-libs/tinyxml2:=
-	htmlreport? ( dev-python/pygments[${PYTHON_USEDEP}] )
-	pcre? ( dev-libs/libpcre )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtprintsupport:5
-	)
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.75-tinyxml2.patch
-	"${FILESDIR}"/${PN}-1.85-ldflags.patch
-)
-
-src_prepare() {
-	default
-
-	rm -r externals/tinyxml || die
-}
-
-src_configure() {
-	tc-export CXX PKG_CONFIG
-	export LIBS="$(${PKG_CONFIG} --libs tinyxml2)"
-
-	emake dmake
-	./dmake || die
-
-	if use pcre ; then
-		sed -e '/HAVE_RULES=/s:=no:=yes:' \
-			-i Makefile || die
-	fi
-
-	if use qt5 ; then
-		pushd gui || die
-		eqmake5
-		popd || die
-	fi
-}
-
-src_compile() {
-	emake ${PN} man \
-		CFGDIR="${EROOT}/usr/share/${PN}/cfg" \
-		DB2MAN="${EROOT}/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl"
-
-	if use qt5 ; then
-		pushd gui || die
-		emake
-		popd || die
-	fi
-
-	if use htmlreport ; then
-		pushd htmlreport || die
-		distutils-r1_src_compile
-		popd || die
-	fi
-}
-
-src_test() {
-	# safe final version
-	mv -v ${PN}{,.final} || die
-	mv -v lib/library.o{,.final} || die
-	mv -v cli/cppcheckexecutor.o{,.final} || die
-	#trigger recompile with CFGDIR inside ${S}
-	emake check CFGDIR="${S}/cfg"
-	# restore
-	mv -v ${PN}{.final,} || die
-	mv -v lib/library.o{.final,} || die
-	mv -v cli/cppcheckexecutor.o{.final,} || die
-}
-
-src_install() {
-	# it's not autotools-based, so "${ED}" here, not "${D}", bug 531760
-	emake install DESTDIR="${ED}"
-
-	insinto "/usr/share/${PN}/cfg"
-	doins cfg/*.cfg
-	if use qt5 ; then
-		dobin gui/${PN}-gui
-		dodoc gui/{projectfile.txt,gui.${PN}}
-	fi
-	if use htmlreport ; then
-		pushd htmlreport || die
-		distutils-r1_src_install
-		popd || die
-		find "${D}" -name "*.egg-info" -delete
-	else
-		rm "${ED}/usr/bin/cppcheck-htmlreport" || die
-	fi
-	doman ${PN}.1
-	dodoc -r triage
-}
diff --git a/dev-util/cppcheck/cppcheck-1.88.ebuild b/dev-util/cppcheck/cppcheck-1.88.ebuild
index bff6e611639f..20e3efce2c1a 100644
--- a/dev-util/cppcheck/cppcheck-1.88.ebuild
+++ b/dev-util/cppcheck/cppcheck-1.88.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} )
 inherit distutils-r1 qmake-utils toolchain-funcs
 
 DESCRIPTION="Static analyzer of C/C++ code"
diff --git a/dev-util/cppcheck/cppcheck-1.87.ebuild b/dev-util/cppcheck/cppcheck-2.2.ebuild
index cd7a61d7ca8b..1cb526a0bac6 100644
--- a/dev-util/cppcheck/cppcheck-1.87.ebuild
+++ b/dev-util/cppcheck/cppcheck-2.2.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7} )
-inherit distutils-r1 qmake-utils toolchain-funcs
+PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} )
+inherit distutils-r1 toolchain-funcs cmake
 
 DESCRIPTION="Static analyzer of C/C++ code"
 HOMEPAGE="https://github.com/danmar/cppcheck"
@@ -12,15 +12,15 @@ SRC_URI="https://github.com/danmar/cppcheck/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
-IUSE="htmlreport pcre qt5"
+IUSE="htmlreport pcre qt5 +z3"
 
 RDEPEND="
-	dev-libs/tinyxml2:=
 	htmlreport? ( dev-python/pygments[${PYTHON_USEDEP}] )
 	pcre? ( dev-libs/libpcre )
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
+		dev-qt/qthelp
 		dev-qt/qtprintsupport:5
 	)
 "
@@ -28,47 +28,27 @@ DEPEND="${RDEPEND}
 	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt
 	virtual/pkgconfig
+	z3? ( sci-mathematics/z3 )
 "
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.75-tinyxml2.patch
-	"${FILESDIR}"/${PN}-1.85-ldflags.patch
-)
 
 src_prepare() {
-	default
-
-	rm -r externals/tinyxml || die
+	cmake_src_prepare
 }
 
 src_configure() {
-	tc-export CXX PKG_CONFIG
-	export LIBS="$(${PKG_CONFIG} --libs tinyxml2)"
-
-	emake dmake
-	./dmake || die
-
-	if use pcre ; then
-		sed -e '/HAVE_RULES=/s:=no:=yes:' \
-			-i Makefile || die
-	fi
 
-	if use qt5 ; then
-		pushd gui || die
-		eqmake5
-		popd || die
-	fi
+	local mycmakeargs=(
+		-DHAVE_RULES="$(usex pcre)"
+		-DBUILD_GUI="$(usex qt5)"
+		-DUSE_Z3="$(usex z3)"
+		-DFILESDIR="${EROOT}/usr/share/${PN}/"
+		-ENABLE_OSS_FUZZ=OFF
+	)
+	cmake_src_configure
 }
 
 src_compile() {
-	emake ${PN} man \
-		CFGDIR="${EROOT}/usr/share/${PN}/cfg" \
-		DB2MAN="${EROOT}/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl"
-
-	if use qt5 ; then
-		pushd gui || die
-		emake
-		popd || die
-	fi
+	cmake_src_compile
 
 	if use htmlreport ; then
 		pushd htmlreport || die
@@ -77,27 +57,15 @@ src_compile() {
 	fi
 }
 
-src_test() {
-	# safe final version
-	mv -v ${PN}{,.final} || die
-	mv -v lib/library.o{,.final} || die
-	mv -v cli/cppcheckexecutor.o{,.final} || die
-	#trigger recompile with CFGDIR inside ${S}
-	emake check CFGDIR="${S}/cfg"
-	# restore
-	mv -v ${PN}{.final,} || die
-	mv -v lib/library.o{.final,} || die
-	mv -v cli/cppcheckexecutor.o{.final,} || die
-}
-
 src_install() {
 	# it's not autotools-based, so "${ED}" here, not "${D}", bug 531760
-	emake install DESTDIR="${ED}"
+	emake install DESTDIR="${ED}" \
+		FILESDIR="${EROOT}/usr/share/${PN}/"
 
 	insinto "/usr/share/${PN}/cfg"
 	doins cfg/*.cfg
 	if use qt5 ; then
-		dobin gui/${PN}-gui
+		dobin "${WORKDIR}/${P}_build/bin/${PN}-gui"
 		dodoc gui/{projectfile.txt,gui.${PN}}
 	fi
 	if use htmlreport ; then
@@ -108,6 +76,6 @@ src_install() {
 	else
 		rm "${ED}/usr/bin/cppcheck-htmlreport" || die
 	fi
-	doman ${PN}.1
+
 	dodoc -r tools/triage
 }
diff --git a/dev-util/cppcheck/cppcheck-9999.ebuild b/dev-util/cppcheck/cppcheck-9999.ebuild
deleted file mode 100644
index b5bb8e433e7b..000000000000
--- a/dev-util/cppcheck/cppcheck-9999.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7} )
-inherit distutils-r1 git-r3 qmake-utils toolchain-funcs
-
-DESCRIPTION="Static analyzer of C/C++ code"
-HOMEPAGE="https://github.com/danmar/cppcheck"
-EGIT_REPO_URI="https://github.com/danmar/cppcheck"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS=""
-IUSE="htmlreport pcre qt5"
-
-RDEPEND="
-	dev-libs/tinyxml2:=
-	htmlreport? ( dev-python/pygments[${PYTHON_USEDEP}] )
-	pcre? ( dev-libs/libpcre )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtprintsupport:5
-	)
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-9999-tinyxml2.patch
-)
-
-src_prepare() {
-	default
-
-	rm -r externals/tinyxml || die
-}
-
-src_configure() {
-	tc-export CXX PKG_CONFIG
-	export LIBS="$(${PKG_CONFIG} --libs tinyxml2)"
-
-	emake dmake
-	./dmake || die
-
-	if use pcre ; then
-		sed -e '/HAVE_RULES=/s:=no:=yes:' \
-			-i Makefile || die
-	fi
-
-	if use qt5 ; then
-		pushd gui || die
-		eqmake5
-		popd || die
-	fi
-}
-
-src_compile() {
-	emake ${PN} man \
-		CFGDIR="${EROOT}/usr/share/${PN}/cfg" \
-		DB2MAN="${EROOT}/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl"
-
-	if use qt5 ; then
-		pushd gui || die
-		emake
-		popd || die
-	fi
-
-	if use htmlreport ; then
-		pushd htmlreport || die
-		distutils-r1_src_compile
-		popd || die
-	fi
-}
-
-src_test() {
-	# safe final version
-	mv -v ${PN}{,.final} || die
-	mv -v lib/library.o{,.final} || die
-	mv -v cli/cppcheckexecutor.o{,.final} || die
-	#trigger recompile with CFGDIR inside ${S}
-	emake check CFGDIR="${S}/cfg"
-	# restore
-	mv -v ${PN}{.final,} || die
-	mv -v lib/library.o{.final,} || die
-	mv -v cli/cppcheckexecutor.o{.final,} || die
-}
-
-src_install() {
-	# it's not autotools-based, so "${ED}" here, not "${D}", bug 531760
-	emake install DESTDIR="${ED}"
-
-	insinto "/usr/share/${PN}/cfg"
-	doins cfg/*.cfg
-	if use qt5 ; then
-		dobin gui/${PN}-gui
-		dodoc gui/{projectfile.txt,gui.${PN}}
-	fi
-	if use htmlreport ; then
-		pushd htmlreport || die
-		distutils-r1_src_install
-		popd || die
-		find "${D}" -name "*.egg-info" -delete
-	else
-		rm "${ED}/usr/bin/cppcheck-htmlreport" || die
-	fi
-	doman ${PN}.1
-	dodoc -r tools/triage
-}
diff --git a/dev-util/cppcheck/files/cppcheck-1.75-tinyxml2.patch b/dev-util/cppcheck/files/cppcheck-1.75-tinyxml2.patch
deleted file mode 100644
index 67e4ac65a410..000000000000
--- a/dev-util/cppcheck/files/cppcheck-1.75-tinyxml2.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- a/gui/gui.pro
-+++ b/gui/gui.pro
-@@ -19,6 +19,7 @@
-     DEFINES += CPPCHECKLIB_IMPORT
- }
- LIBS += -L$$PWD/../externals
-+LIBS += $(shell $(PKG_CONFIG) --libs tinyxml2)
- 
- DESTDIR = .
- RCC_DIR = temp
---- a/tools/dmake.cpp
-+++ b/tools/dmake.cpp
-@@ -123,7 +123,6 @@
- 
-     std::vector<std::string> extfiles;
-     extfiles.push_back("externals/simplecpp/simplecpp.cpp");
--    extfiles.push_back("externals/tinyxml/tinyxml2.cpp");
- 
-     std::vector<std::string> clifiles;
-     getCppFiles(clifiles, "cli/", false);
-@@ -172,7 +171,6 @@
-         std::ofstream fout1("test/testfiles.pri");
-         if (fout1.is_open()) {
-             fout1 << "# no manual edits - this file is autogenerated by dmake\n\n";
--            fout1 << "INCLUDEPATH += ../externals/tinyxml\n";
-             fout1 << "\n\nSOURCES += ";
-             for (unsigned int i = 0; i < testfiles.size(); ++i) {
-                 const std::string filename(testfiles[i].substr(5));
-@@ -337,9 +335,9 @@
-          << "endif\n\n";
- 
-     makeConditionalVariable(fout, "PREFIX", "/usr");
--    makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib -Iexternals/simplecpp -Iexternals/tinyxml");
--    makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib -Iexternals/simplecpp -Iexternals/tinyxml");
--    makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli -Iexternals/simplecpp -Iexternals/tinyxml");
-+    makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib -Iexternals/simplecpp");
-+    makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib -Iexternals/simplecpp");
-+    makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli -Iexternals/simplecpp");
- 
-     fout << "BIN=$(DESTDIR)$(PREFIX)/bin\n\n";
-     fout << "# For 'make man': sudo apt-get install xsltproc docbook-xsl docbook-xml on Linux\n";
---- a/externals/externals.pri
-+++ b/externals/externals.pri
-@@ -1,8 +1,5 @@
--INCLUDEPATH += $${PWD}/simplecpp \
--               $${PWD}/tinyxml
-+INCLUDEPATH += $${PWD}/simplecpp
- 
--HEADERS += $${PWD}/simplecpp/simplecpp.h \
--           $${PWD}/tinyxml/tinyxml2.h
-+HEADERS += $${PWD}/simplecpp/simplecpp.h
- 
--SOURCES += $${PWD}/simplecpp/simplecpp.cpp \
--           $${PWD}/tinyxml/tinyxml2.cpp
-+SOURCES += $${PWD}/simplecpp/simplecpp.cpp
diff --git a/dev-util/cppcheck/files/cppcheck-1.85-ldflags.patch b/dev-util/cppcheck/files/cppcheck-1.85-ldflags.patch
deleted file mode 100644
index 84e892827125..000000000000
--- a/dev-util/cppcheck/files/cppcheck-1.85-ldflags.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/tools/dmake.cpp
-+++ b/tools/dmake.cpp
-@@ -363,10 +363,10 @@
-     fout << ".PHONY: run-dmake tags\n\n";
-     fout << "\n###### Targets\n\n";
-     fout << "cppcheck: $(LIBOBJ) $(CLIOBJ) $(EXTOBJ)\n";
--    fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS) $(LDFLAGS) $(RDYNAMIC)\n\n";
-+    fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) $(RDYNAMIC) $(LIBS)\n\n";
-     fout << "all:\tcppcheck testrunner\n\n";
-     fout << "testrunner: $(TESTOBJ) $(LIBOBJ) $(EXTOBJ) cli/threadexecutor.o cli/cmdlineparser.o cli/cppcheckexecutor.o cli/filelister.o\n";
--    fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS) $(LDFLAGS) $(RDYNAMIC)\n\n";
-+    fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) $(RDYNAMIC) $(LIBS)\n\n";
-     fout << "test:\tall\n";
-     fout << "\t./testrunner\n\n";
-     fout << "check:\tall\n";
-@@ -380,7 +380,7 @@
-     fout << "generate_cfg_tests: tools/generate_cfg_tests.o $(EXTOBJ)\n";
-     fout << "\tg++ -Iexternals/tinyxml -o generate_cfg_tests tools/generate_cfg_tests.o $(EXTOBJ)\n";
-     fout << "reduce:\ttools/reduce.o $(LIBOBJ) $(EXTOBJ)\n";
--    fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS) $(LDFLAGS) $(RDYNAMIC)\n\n";
-+    fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) $(RDYNAMIC) $(LIBS)\n\n";
-     fout << "clean:\n";
-     fout << "\trm -f build/*.o lib/*.o cli/*.o test/*.o tools/*.o externals/*/*.o testrunner reduce dmake cppcheck cppcheck.1\n\n";
-     fout << "man:\tman/cppcheck.1\n\n";
diff --git a/dev-util/cppcheck/files/cppcheck-9999-tinyxml2.patch b/dev-util/cppcheck/files/cppcheck-9999-tinyxml2.patch
deleted file mode 100644
index 7a2a037ab377..000000000000
--- a/dev-util/cppcheck/files/cppcheck-9999-tinyxml2.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/externals/externals.pri
-+++ b/externals/externals.pri
-@@ -1,9 +1,6 @@
- INCLUDEPATH += $${PWD} \
--               $${PWD}/simplecpp \
--               $${PWD}/tinyxml
-+               $${PWD}/simplecpp
- 
--HEADERS += $${PWD}/simplecpp/simplecpp.h \
--           $${PWD}/tinyxml/tinyxml2.h
-+HEADERS += $${PWD}/simplecpp/simplecpp.h
- 
--SOURCES += $${PWD}/simplecpp/simplecpp.cpp \
--           $${PWD}/tinyxml/tinyxml2.cpp
-+SOURCES += $${PWD}/simplecpp/simplecpp.cpp
---- a/gui/gui.pro
-+++ b/gui/gui.pro
-@@ -15,6 +15,7 @@ contains(LINKCORE, [yY][eE][sS]) {
-     DEFINES += CPPCHECKLIB_IMPORT
- }
- LIBS += -L$$PWD/../externals
-+LIBS += $(shell $(PKG_CONFIG) --libs tinyxml2)
- 
- DESTDIR = .
- RCC_DIR = temp
---- a/tools/dmake.cpp
-+++ b/tools/dmake.cpp
-@@ -122,7 +122,6 @@ int main(int argc, char **argv)
- 
-     std::vector<std::string> extfiles;
-     extfiles.push_back("externals/simplecpp/simplecpp.cpp");
--    extfiles.push_back("externals/tinyxml/tinyxml2.cpp");
- 
-     std::vector<std::string> clifiles;
-     getCppFiles(clifiles, "cli/", false);
-@@ -171,7 +170,6 @@ int main(int argc, char **argv)
-         std::ofstream fout1("test/testfiles.pri");
-         if (fout1.is_open()) {
-             fout1 << "# no manual edits - this file is autogenerated by dmake\n\n";
--            fout1 << "INCLUDEPATH += ../externals/tinyxml\n";
-             fout1 << "\n\nSOURCES += ";
-             for (unsigned int i = 0; i < testfiles.size(); ++i) {
-                 const std::string filename(testfiles[i].substr(5));
-@@ -335,9 +333,9 @@ int main(int argc, char **argv)
-          << "endif\n\n";
- 
-     makeConditionalVariable(fout, "PREFIX", "/usr");
--    makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib -isystem externals -isystem externals/simplecpp -isystem externals/tinyxml");
--    makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib -isystem externals/simplecpp -isystem externals/tinyxml");
--    makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli -isystem externals/simplecpp -isystem externals/tinyxml");
-+    makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib -isystem externals -isystem externals/simplecpp");
-+    makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib -isystem externals/simplecpp");
-+    makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli -isystem externals/simplecpp");
- 
-     fout << "BIN=$(DESTDIR)$(PREFIX)/bin\n\n";
-     fout << "# For 'make man': sudo apt-get install xsltproc docbook-xsl docbook-xml on Linux\n";
diff --git a/dev-util/cppcheck/metadata.xml b/dev-util/cppcheck/metadata.xml
index de3bd183267b..af774e39e7f8 100644
--- a/dev-util/cppcheck/metadata.xml
+++ b/dev-util/cppcheck/metadata.xml
@@ -7,6 +7,9 @@
 	</maintainer>
 	<use>
 		<flag name="htmlreport">install cppcheck-htmlreport</flag>
+		<flag name="z3">
+			Enable support for <pkg>sci-mathematics/z3</pkg> backend
+		</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">cppcheck</remote-id>
diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest
index f01f32de1c4d..3e0ac7cbafb5 100644
--- a/dev-util/debhelper/Manifest
+++ b/dev-util/debhelper/Manifest
@@ -3,7 +3,7 @@ DIST debhelper_13.2.1.tar.xz 541428 BLAKE2B eb377a09fe23aef159c6a8309c1a63df94be
 DIST debhelper_13.2.tar.xz 540400 BLAKE2B a1734ecbd92eadc3f5fbd0b118ffb4c6b697b157c39cab7626bd734adb80c6dfd0061298220c5d5c7a7fff412a1a52490e7001c8d634596dc41389a7e81c7a74 SHA512 07fd1f32975a9d84940a15140875994d30fe4bc0a40b40fe83a1ff9a304121167345194802691326251490852e601c388cab5cd02c000a4a6768edd1259a7bbc
 DIST debhelper_9.20160814.tar.xz 344328 BLAKE2B 38791ab3dfb74d12e44226b79a377889911a08505cdb45cc0a6e653906edbafcac1038d1d9ff9f5fd9f714ed36681562ce7fb1c9c1109a8528523100128fced6 SHA512 63072ba35ec8c62ee4c4d44833712925264c808a91f1522ef6a73377f2da3d11b285a21ad39158fd44693c801916189261186c8c7b28096719328a81a0a65f62
 EBUILD debhelper-13.1.ebuild 1530 BLAKE2B 39d9f9b5772bc7806940fe0bf8f14e265ecbe9fa1a9a68e09394ad1ea6396a14b9562346f79a340c7ed3d21e54a9245720ddcd102449958554ac1e2d86f4e28a SHA512 b838f7546ecddbbecf8f07c11f0f7a92c69069297173c080a2fce21fcb06d525e0d54900698b005fc2f5f0b819ed5808f71d2ce1d4a16c66adbee7eb43cc6d7e
-EBUILD debhelper-13.2.1.ebuild 1530 BLAKE2B 39d9f9b5772bc7806940fe0bf8f14e265ecbe9fa1a9a68e09394ad1ea6396a14b9562346f79a340c7ed3d21e54a9245720ddcd102449958554ac1e2d86f4e28a SHA512 b838f7546ecddbbecf8f07c11f0f7a92c69069297173c080a2fce21fcb06d525e0d54900698b005fc2f5f0b819ed5808f71d2ce1d4a16c66adbee7eb43cc6d7e
+EBUILD debhelper-13.2.1.ebuild 1524 BLAKE2B 26c0ec05171e41da67876ea27452d799f8be8540c0893beaade349bcaf447a2a3ecc4e9d97a97174c9eb04747b3d8948a6f2e07193c5e1ffd43f6389ed676044 SHA512 73016959d67d163b61d9af938b991df6388d1e23a0ef3debbd75d7d0fd101264805e31d4e29091debf8c65840631f9eab3af2a807090df4efedea05e6d2ebdc2
 EBUILD debhelper-13.2.ebuild 1530 BLAKE2B 39d9f9b5772bc7806940fe0bf8f14e265ecbe9fa1a9a68e09394ad1ea6396a14b9562346f79a340c7ed3d21e54a9245720ddcd102449958554ac1e2d86f4e28a SHA512 b838f7546ecddbbecf8f07c11f0f7a92c69069297173c080a2fce21fcb06d525e0d54900698b005fc2f5f0b819ed5808f71d2ce1d4a16c66adbee7eb43cc6d7e
 EBUILD debhelper-9.20160814.ebuild 1530 BLAKE2B 8a4529891546c0553fc545b41c0721ab899ff6f62ca5b71e8950c306bc5bdb6f9971fec6534c3b4aa03270154290e6e41b91916deb67a58f6a5fce24c57cca9e SHA512 b466001b990d497caccfdbbd88cd6e28e2e55e399923b33d1050bf667d7a050ccede8c4c2bf2df7460177d4a2094247e2ffcfd34c29d580f40ab432e89a96525
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/debhelper/debhelper-13.2.1.ebuild b/dev-util/debhelper/debhelper-13.2.1.ebuild
index 99dca21e93e2..8b150d906aa6 100644
--- a/dev-util/debhelper/debhelper-13.2.1.ebuild
+++ b/dev-util/debhelper/debhelper-13.2.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 DH_LANGS=( de es fr )
diff --git a/dev-util/debugedit/Manifest b/dev-util/debugedit/Manifest
index 51c639b86f58..239ac099ab04 100644
--- a/dev-util/debugedit/Manifest
+++ b/dev-util/debugedit/Manifest
@@ -1,3 +1,5 @@
 DIST rpm-4.16.0.tar.bz2 4341683 BLAKE2B 5161e5dcc6d9a1f1d4b8e44740fb368050b808fd9e8b8276fb17b530a4642e1b9ad104b5a30c0071215aef7f823eeab10988dd41f73af1c52d575529c374b5eb SHA512 177119c3ac3d48980db55bb4ba0fdbb2a911968e5efc690bfa8cc343f850fc90531cc0dee6dd8e45d2b14f0d951ced35bd8893d24011b7f270745d281ddf4e3d
+DIST rpm-4.16.1.tar.bz2 4348973 BLAKE2B 5f415099ed5b4f3425c1cbd02476c3066ef51e8efbe09829c0c7d9732cfdeed76ab0c5eed113a1b007d35bf5d5fb1c60543b7ef23319ba0f63550d598e98dcdd SHA512 cbce8381e7a0bdaf2c7529d0ac91fda15e663db7a76b02652d53327ebcd7d5b6b6154d5e88feeda87f71727a036e7a2afcd57c7dcddef610e32957b9e430d367
 EBUILD debugedit-4.16.0.ebuild 1765 BLAKE2B 463b1295cb2cf4d8fd4914546610844495065a62d164b099b3352761b2329cb016d9fa15a1cfab3d8f348a1d9c9392eb4debac627b58af9402cc01d99244eba1 SHA512 29e6a33ff92e86ba3c7eb52eb593c97af3ca52fdf9df999984cdbe7ea2c2a3039619738b0877af42ff1b77515fac2249d603827abbe7c9bba86368f959242a29
+EBUILD debugedit-4.16.1.ebuild 1770 BLAKE2B 9657d25e12679c563a0dd2f6220a58844c043f28ead997e6add996cff70e78964f6f3b88afbb65e7c1a683b4d7250919ebbc822001744adcc46b4e1324300823 SHA512 86a515866fa7f33aeb896b9ee67451bdb8d2850a34fcfca719307bacc002e99039fb24e3d6c6f088da1a6e59ca6c71ae764baca4c875e076315852be9100f1b8
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-util/debugedit/debugedit-4.16.1.ebuild b/dev-util/debugedit/debugedit-4.16.1.ebuild
new file mode 100644
index 000000000000..d2c338794406
--- /dev/null
+++ b/dev-util/debugedit/debugedit-4.16.1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+MY_P=rpm-${PV}
+DESCRIPTION="Stand-alone debugedit from RPM"
+HOMEPAGE="https://rpm.org
+	https://github.com/rpm-software-management/rpm"
+SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	sys-libs/zlib:=
+	>=dev-libs/popt-1.7
+	>=dev-libs/elfutils-0.176-r1
+	dev-libs/nss
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	eapply_user
+
+	# cheat it into believing we're bundling db
+	mkdir -p db/dist || die
+	touch db/dist/configure || die
+	chmod +x db/dist/configure || die
+	echo 'install:' > db3/Makefile || die
+
+	# TODO: why do we need to do this?
+	mkdir rpm || die
+	find -name '*.h' -exec cp {} rpm/ ';' || die
+}
+
+src_configure() {
+	append-cppflags -I"${EPREFIX}/usr/include/nss" -I"${EPREFIX}/usr/include/nspr"
+	local myconf=(
+		# force linking to static librpmio
+		--disable-shared
+
+		# disable linking compression libraries
+		ac_cv_header_bzlib_h=no
+		ac_cv_header_lzma_h=no
+		--disable-zstd
+
+		# fake some libraries we don't use
+		ac_cv_header_magic_h=yes
+		ac_cv_lib_magic_magic_open=yes
+
+		# use nss as crypto provider
+		--with-crypto=nss
+
+		# disable other stuff irrelevant to debugedit
+		--disable-bdb
+		--disable-nls
+		--disable-plugins
+		--disable-python
+		--without-acl
+		--without-archive
+		--without-cap
+		--without-external-db
+		--without-hackingdocs
+		--without-lua
+		--without-selinux
+	)
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake -C misc
+	emake -C rpmio
+	emake debugedit
+}
+
+src_test() {
+	:
+}
+
+src_install() {
+	dobin debugedit
+}
diff --git a/dev-util/desktop-file-utils/Manifest b/dev-util/desktop-file-utils/Manifest
index 9b95c085daed..ae5b26dba022 100644
--- a/dev-util/desktop-file-utils/Manifest
+++ b/dev-util/desktop-file-utils/Manifest
@@ -2,5 +2,5 @@ AUX 50desktop-file-utils-gentoo.el 250 BLAKE2B 6778fd6faecc6afe376598cdab5d89036
 DIST desktop-file-utils-0.24.tar.xz 137424 BLAKE2B 3cce27caa14782ef10886fdc0602c0378c1bad0d49a4b99077436a9951f13ccdb539fdc2b9d27b54430fce94fb0ee0268746b216cc5d6c1b9ba517e1af81b4ce SHA512 b19d700d4403c8757c62e49bb7650e0138a85e799f79de07b0d0099a52398a3ead90c8125ccc883df6e2a3f8f5f97696009ebb7452dc7acc25afeef20e06fde0
 DIST desktop-file-utils-0.26.tar.xz 83132 BLAKE2B fdbe5427a0278ebe4a9b1bc15a148ecdc3f54b54058b355ae4f9a962fb1c4ec309d24a075973caf8f187a1c74b013e9bed0a7c3668bf888274e77fac9e077ec8 SHA512 5b4e435f0b635d8f898ac7f5759f74a08ffbe2a56d41fee0e84ff57e73b98d08b57b4416f20b99f696dad8bcb1c20792b39acf836b0814220c0b386ea5f6b831
 EBUILD desktop-file-utils-0.24.ebuild 1287 BLAKE2B 7ac58a5fc22f86c48162d3ef0c5f5471031a36294d8e9a68c1bc6643db4bcabb51e0ad581115e18df0e97c1b119d9c0b65737c617f6cdd3dbb984c7c90e81fd5 SHA512 09ee0891f66b52b89f6f45e909c579408cb36f0e8e535636444ab82424cb1c93f89d9cebf48c141f8bd9322c362e3948a5bc6cc3d0e844d1d8d8cb758f129870
-EBUILD desktop-file-utils-0.26-r1.ebuild 1168 BLAKE2B 51abe19eaf1f632475faa8358425dbe45a72d921d87b299ec32c9012eca4526a8bca8d8d50fcc101d32d7b7001d0a47bd293107e14a57568f28cdeda95998f32 SHA512 90ba5e353c9e1e5bd9caa31c2b4c1c02e7459880543d09c235c51fb0a8f395630d48175211276616181f5edb6f987e46e2554315cd60693c179a7a86cb710c2a
+EBUILD desktop-file-utils-0.26-r1.ebuild 1168 BLAKE2B fe43657150b74c25da3656c9ea58ff48c8a3be0b4c770727e7055ac11ad7aed0ef80f1b415a5a8898fa921a497f89e3186e92c7101e2a05c50a6084f1c426231 SHA512 dcdb9758d6b071f5666607f31d4489fb9852e45d203be14573d21e1fea44fe6306ffc616bad6cb302a8ec2dea9f0de89b24972af9533bce26186ee763230565b
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild
index 52a6baaa91b2..390c5208bb58 100644
--- a/dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild
+++ b/dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="emacs"
 
 RDEPEND=">=dev-libs/glib-2.12:2"
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 8ff37f04562c..c4a746339348 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,3 +1,5 @@
 DIST diffoscope-162.tar.gz 1564386 BLAKE2B e5ea37ae48c65dae3c850a04152c322e1e8535ad982107689f23a4111ec04b9b7766681b7e61f69c75bece271d8875ef2d109b315ec5d55ad77658a065148ed6 SHA512 a5de428b491adfadc432322eba524dc8031a6be9709887f2f290376bb94b358cec45a4a0a31b8fb5f25377a33752044882245a22d7f2b71b17d5efe002c850f4
+DIST diffoscope-163.tar.gz 1566445 BLAKE2B 4985d3a1e63fd2d4ef7cdf9e933e3ac6d1bc6c18a703bc92a8dc573b368c5989107debd57d96cfa40fe9e48d43b8ef0a07143ee48dd982a4a71b914a8e4d64ae SHA512 fc02d864c9a4b799aec45b88646f68de4f559366462b2057094592dfd3bff94213c17ea048b98070ae9a1f2f30d0e8d58d630b643e198dd85369cadea227a7e4
 EBUILD diffoscope-162.ebuild 2161 BLAKE2B fb5e4e91fc32b56175d45b589cd3c11bdb42b5b1c33910843d489ea311d4eade3860c777a94398908fe2c94a0bf8a15b91df62b4f7ce7dfb43b76ad452bc8184 SHA512 4713e398d39141876170b6864e497321743b868eaf62f181dcb8341f95a012f72c46db35c51ff08ff375b1439efc2b411f61e36b50950aecac333af0d0df377c
+EBUILD diffoscope-163.ebuild 2161 BLAKE2B fb5e4e91fc32b56175d45b589cd3c11bdb42b5b1c33910843d489ea311d4eade3860c777a94398908fe2c94a0bf8a15b91df62b4f7ce7dfb43b76ad452bc8184 SHA512 4713e398d39141876170b6864e497321743b868eaf62f181dcb8341f95a012f72c46db35c51ff08ff375b1439efc2b411f61e36b50950aecac333af0d0df377c
 MISC metadata.xml 2137 BLAKE2B 6ff55f85ebf3f769c10c3e17a69900918abe142e491b7b8460bed8fe6a036763a743324bf1a10e7a3772761b38c9632ff1352e9c6677ef691f81acc29dc321e9 SHA512 e782e12dc91d86612768a2e0c498f54a9728691a76008ee1e6cdbc4d8719c2593344f6c37786982abb0de7b85d743d7614652a2e8c9cd9fef053c3a32e1e484c
diff --git a/dev-util/diffoscope/diffoscope-163.ebuild b/dev-util/diffoscope/diffoscope-163.ebuild
new file mode 100644
index 000000000000..572dad5645e4
--- /dev/null
+++ b/dev-util/diffoscope/diffoscope-163.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
+HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
+find gettext gif gpg gzip haskell hdf5 hex imagemagick iso java llvm
+mono opendocument pascal pdf postscript R rpm sqlite squashfs
+ssh tar tcpdump xz zip zstd"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
+	dev-python/libarchive-c[${PYTHON_USEDEP}]
+	dev-python/distro[${PYTHON_USEDEP}]
+	acl? ( sys-apps/acl )
+	binutils? ( sys-devel/binutils )
+	bzip2? ( app-arch/bzip2 )
+	libcaca? ( media-libs/libcaca )
+	colord? ( x11-misc/colord )
+	cpio? ( app-arch/cpio )
+	diff? ( sys-apps/diffutils )
+	docx? ( app-text/docx2txt )
+	dtc? ( sys-apps/dtc )
+	e2fsprogs? ( sys-fs/e2fsprogs )
+	file? ( sys-apps/file )
+	find? ( sys-apps/findutils )
+	gettext? ( sys-devel/gettext )
+	gif? ( media-libs/giflib )
+	gpg? ( app-crypt/gnupg )
+	gzip? ( app-arch/gzip )
+	haskell? ( dev-lang/ghc )
+	hdf5? ( sci-libs/hdf5 )
+	hex? ( app-editors/vim-core )
+	imagemagick? ( media-gfx/imagemagick )
+	iso? ( virtual/cdrtools )
+	java? ( virtual/jdk )
+	llvm? ( sys-devel/llvm )
+	mono? ( dev-lang/mono )
+	opendocument? ( app-text/odt2txt )
+	pascal? ( dev-lang/fpc )
+	pdf? (
+		app-text/pdftk
+		app-text/poppler
+		dev-python/PyPDF2[${PYTHON_USEDEP}]
+	)
+	postscript? ( app-text/ghostscript-gpl )
+	R? ( dev-lang/R )
+	rpm? ( app-arch/rpm )
+	sqlite? ( dev-db/sqlite:3 )
+	squashfs? ( sys-fs/squashfs-tools )
+	ssh? ( net-misc/openssh )
+	tar? ( app-arch/tar )
+	tcpdump? ( net-analyzer/tcpdump )
+	xz? ( app-arch/xz-utils )
+	zip? ( app-arch/unzip )
+	zstd? ( app-arch/zstd )
+"
+# Presence if filemagic's magic.py breaks imports
+# of dev-python/python-magic: https://bugs.gentoo.org/716482
+RDEPEND+=" !dev-python/filemagic"
diff --git a/dev-util/dwdiff/Manifest b/dev-util/dwdiff/Manifest
index 7cd327ca9e93..a4ecf65151ca 100644
--- a/dev-util/dwdiff/Manifest
+++ b/dev-util/dwdiff/Manifest
@@ -1,5 +1,8 @@
+AUX C99-fix.patch 581 BLAKE2B b32c33cf78b2cdd290b1c9f74425acf43b1000d235032a8286d6363e0305f7d9cc1f10fa8d18ea853b813b97de0763b51fca9c9c1493ac621091c37f4603bbaf SHA512 4bcef29b0f4ab5d7e575a7637a62bdb2309ee6e1ac6fd5d1402433c065f0495351b2f30258b0a7b6bb77c68ac18ab6e2c0d359c10d19562f6f08424aa2ca6eeb
 DIST dwdiff-2.1.1.tar.bz2 79628 BLAKE2B eb024d9c0eff18de9eee4a0fcf2d6a9ef6b049286ebb7f9715ddf18d920cacaab2738f04607b358be784f9d3e1c25f279ede620d412fad026f3280b9f8ee471f SHA512 b3392ef01c0701ea7738f1b539dab81727735e5de8ea77b56feae4e2f64dbda0155b479d7be0eedb65fc56ebc8d1a22c1ca67075abdec54205ad9c305b3751b7
 DIST dwdiff-2.1.2.tar.bz2 79282 BLAKE2B c938c9684d6ee1abacd77c1570b88157548e217e1837758f6c45266e29abc3857c6d4275d72126c29cc361e484722fe1d8c85a3714ac909b35a06d8390fb6506 SHA512 e4897ec3990261ddadf1fd4287902dd74c8350d11448714be8ea4b7808fc7d419ca2fd7fe65f347f46fdb1090d2d116c180a53fde3ff095027765f40acaa1c91
+DIST dwdiff-2.1.3.tar.bz2 79862 BLAKE2B 72eb07071de413526b70ebfd30030394c8bc4958bd14128b9a8b87a76561e4bfbd61064def314a4b989da027664d999cfb9a4ac9ab6f1b06cbe3f38f271e538e SHA512 e4375658ddb919d763bedacd122e5597a4c3cd40ddff2c954c6cc88e5047d20d4d3b18eaf75c6835be21e1f72e2622e25b212ae9882d8eaa36874af3f6de4b3f
 EBUILD dwdiff-2.1.1.ebuild 826 BLAKE2B 56666408fce2fa065675d12e372b29601281b5c7ea1f7fa0a677ade24f843bdb863d5b5727cba9144352137e6007dde190702d67fb6822b69178ea79feeded01 SHA512 d3d7c79ead64fd11fa55a134d7027295bcabe0e5419c1fdad3c35c490d2f6dc9513cd40498db1e05dec6131d26ba44fbb8fa28f46c54f815fbdf827078292817
-EBUILD dwdiff-2.1.2.ebuild 829 BLAKE2B dc378595c30cf6dd3a0ff647d2a6e200f070ee060c55ad8e5a4515aa1b2ca0f71a119f64421677404eb4c49316de52d2a2cfd2bd0cc190bfecef5429e51b7ed4 SHA512 6e91426fcef7c02a9d7391559d659e7f7ec701fab711983822d48170947740e03cda1c1bb1e7294c65e11eaf5618b2a64c05912763bc6d3b2a175837ff278c7a
+EBUILD dwdiff-2.1.2.ebuild 898 BLAKE2B 3e5d049d08ea81929edf87fce2cef1dced4e121466d6b9b3edb3222d036e0c64001762b691dd800351df1fe643f3eb6b6501eb3d212de80d6c1a6134715291a9 SHA512 3103653d4df9ffeeeb31a86c2d9a2930297b036c87f8a8444ad43acf091a105f83b181d6421a9841cd38e85a5199b3ddad708167a78e592de18734b68ac55ebe
+EBUILD dwdiff-2.1.3.ebuild 898 BLAKE2B 3e5d049d08ea81929edf87fce2cef1dced4e121466d6b9b3edb3222d036e0c64001762b691dd800351df1fe643f3eb6b6501eb3d212de80d6c1a6134715291a9 SHA512 3103653d4df9ffeeeb31a86c2d9a2930297b036c87f8a8444ad43acf091a105f83b181d6421a9841cd38e85a5199b3ddad708167a78e592de18734b68ac55ebe
 MISC metadata.xml 220 BLAKE2B eabf3517ba7e5b67320254eeb2b07adf1dbe0c3432b693973bc25a3e3dc8ed160b7313f9f8ae64d994ac272487b785f33202d9640bb5a7ace9f56ceb42978a19 SHA512 1db105eebacb6c7d44fd17746981e6e24badb2e81327410aa935a7603379cfcc8f3cf27dcf4e9d870cea2f73f6a15cf052e3e785205095ea9a93d72980ff71cc
diff --git a/dev-util/dwdiff/dwdiff-2.1.2.ebuild b/dev-util/dwdiff/dwdiff-2.1.2.ebuild
index 0ed5a821f25a..5c70c554fffb 100644
--- a/dev-util/dwdiff/dwdiff-2.1.2.ebuild
+++ b/dev-util/dwdiff/dwdiff-2.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,6 +24,10 @@ DEPEND="
 	${CDEPEND}
 	nls? ( sys-devel/gettext )"
 
+PATCHES=(
+	"${FILESDIR}/C99-fix.patch"
+)
+
 src_prepare() {
 	default
 
@@ -35,7 +39,7 @@ src_prepare() {
 src_configure() {
 	./configure \
 		--prefix=/usr \
-		$(use_with nls gettext)
+		$(use_with nls gettext) || die "./configure error"
 }
 
 src_compile() {
diff --git a/dev-util/dwdiff/dwdiff-2.1.3.ebuild b/dev-util/dwdiff/dwdiff-2.1.3.ebuild
new file mode 100644
index 000000000000..5c70c554fffb
--- /dev/null
+++ b/dev-util/dwdiff/dwdiff-2.1.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="diff-like program operating at word level instead of line level"
+HOMEPAGE="https://os.ghalkes.nl/dwdiff.html"
+SRC_URI="https://os.ghalkes.nl/dist/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="nls"
+
+CDEPEND="dev-libs/icu:="
+
+RDEPEND="
+	${CDEPEND}
+	sys-apps/diffutils"
+
+DEPEND="
+	${CDEPEND}
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}/C99-fix.patch"
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/INSTALL/s:COPYING::' \
+		Makefile.in || die
+}
+
+src_configure() {
+	./configure \
+		--prefix=/usr \
+		$(use_with nls gettext) || die "./configure error"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	emake prefix="${D}/usr" docdir="${D}/usr/share/doc/${PF}" install
+}
diff --git a/dev-util/dwdiff/files/C99-fix.patch b/dev-util/dwdiff/files/C99-fix.patch
new file mode 100644
index 000000000000..9d6d9ae2bca5
--- /dev/null
+++ b/dev-util/dwdiff/files/C99-fix.patch
@@ -0,0 +1,15 @@
+--- a/src/definitions.h
++++ b/src/definitions.h
+@@ -43,11 +43,11 @@
+ 
+ /*==== Misc definitions ====*/
+ /* Define a bool type if not already defined (C++ and C99 do)*/
+-#if !(defined(__cplusplus) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 19990601L))
++#if !(defined(__cplusplus) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L))
+ /*@-incondefs@*/
+ typedef enum {false, true} bool;
+ /*@+incondefs@*/
+-#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 19990601L
++#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+ #include <stdbool.h>
+ #endif
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 9997612c45e2..39d967c090b8 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -3,7 +3,9 @@ AUX setup.py-2.32.4 192 BLAKE2B 574320d89095d1452a3eee4404b5ebb19fbed32febf2a154
 DIST glib-2.62.6.tar.xz 4703424 BLAKE2B 0a27245be2575c574dcc730dd051a8c284f421dbc46579aadc5fbbacb8f934af4374b61bb26085e5c9ab78a868c567818f3fb9d67adddce37f5c4fec00e0d276 SHA512 8e3972a371f3c1a50b7d245b30e4f740583ad72ba4ab325e0e15e0732be44dfb69b603fb39dcf4989255a23a181e9ea5dd25982dd94c386cd9f21952243ad6f5
 DIST glib-2.64.5.tar.xz 4778456 BLAKE2B 7fdee0e16a7ac820f4c4f7dc66d37add464d3005e89e6013302d3ef103319331811d68e9b42db072b82242c3d7badfbd085b69333e770012def89dc8aae7a2eb SHA512 a87537274619b6de88a0e68555059036ac18c748b5005c8d84728646b0db342fde0b8c5b303b9ad79f64d71ea4ed990d52a4fbd68cda3ca74aed5fe4d497e060
 DIST glib-2.66.0.tar.xz 4839236 BLAKE2B 930bf071bb4b1e744ca46cb5267d42772488030f848c7b11c5424fcef087ac27d070d20cf403ae504e573ce49faf26ce9101656391d3915ae04422d021d5561a SHA512 358e6a840b722139593eb7825c3aa70153eb26036e05d13d3286bcc6d2e962c2b4ddcb0fe5c6728b89bfffbd178101e72c576081ae714326a272a9fc34ed953e
+DIST glib-2.66.3.tar.xz 4837796 BLAKE2B 44632477b56bea5b6324deccc17e2d6b72e00dba518f9fc3ec5edad8b20df59f8bf9087e5de16b587b72c2f143d9ab650c478666132b1564da9bf333f380a4e3 SHA512 ab2670ae4eeb3b561c0e71ff9153908f450e430cd43771bfee09233a65826dc16462537ec64bdfcced867f4c8663341b6b9d17af5ba0fab8564b8f21b04a45d7
 EBUILD gdbus-codegen-2.62.6.ebuild 2043 BLAKE2B a55f20184ac1bafd3aa391b2d0c79ccefd5c6dc64f7c4619ee505f16f645c479fda199e6c54cd41ac666c5e68ab9431109f642655250b3f16f28c1d8dffc6da6 SHA512 9ad9a9475d431ba44a913f2b0423fa35623105d87ec8eb583b9eb0c67aa8358681b8d7ef1f5856e6c15d873bb29d1d5397788e44ba2e6bd5fbb734c1c503717e
 EBUILD gdbus-codegen-2.64.5.ebuild 2201 BLAKE2B 24a877d49166197adb71f8c323ff4324852585e5c155c90d116eefd4ef8fdffd6599d836b8c745143c38aa92a7c84b80a8b9b0fa79042d7b81e1d39bd3d9257c SHA512 93a9475d91d276c7766a5214f29aa085b7f965b2705b1dd61d5a798766e8469c1a62065cb928eeed371d4b7afef6bd1d9c81c1d5a4835d7659083b15fa91c8e7
 EBUILD gdbus-codegen-2.66.0.ebuild 2212 BLAKE2B 07cc625a31740b5e6404a9e5bf91a8344d6e37176bb971085dbdcc83959324b8e6f8fd6ca908a962fab205fc27136aef7c37bdb7d72eee95a6636a7f56fa4596 SHA512 4bc6e71c8f2d093e3db6c8a834a809b4152a7ad7c07902b13f70f7dd8b88612520eb2a7f3a6bdeaa061a721e91e7509445e705f2d077880040d1796433bae525
+EBUILD gdbus-codegen-2.66.3.ebuild 2212 BLAKE2B 07cc625a31740b5e6404a9e5bf91a8344d6e37176bb971085dbdcc83959324b8e6f8fd6ca908a962fab205fc27136aef7c37bdb7d72eee95a6636a7f56fa4596 SHA512 4bc6e71c8f2d093e3db6c8a834a809b4152a7ad7c07902b13f70f7dd8b88612520eb2a7f3a6bdeaa061a721e91e7509445e705f2d077880040d1796433bae525
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.66.3.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.66.3.ebuild
new file mode 100644
index 000000000000..38da7d52d767
--- /dev/null
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.66.3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME_ORG_MODULE="glib"
+PYTHON_COMPAT=( python3_{6,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 ~x86-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 43ddf2e140a5..fe8514b61f40 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -1,7 +1,9 @@
 DIST glib-2.62.6.tar.xz 4703424 BLAKE2B 0a27245be2575c574dcc730dd051a8c284f421dbc46579aadc5fbbacb8f934af4374b61bb26085e5c9ab78a868c567818f3fb9d67adddce37f5c4fec00e0d276 SHA512 8e3972a371f3c1a50b7d245b30e4f740583ad72ba4ab325e0e15e0732be44dfb69b603fb39dcf4989255a23a181e9ea5dd25982dd94c386cd9f21952243ad6f5
 DIST glib-2.64.5.tar.xz 4778456 BLAKE2B 7fdee0e16a7ac820f4c4f7dc66d37add464d3005e89e6013302d3ef103319331811d68e9b42db072b82242c3d7badfbd085b69333e770012def89dc8aae7a2eb SHA512 a87537274619b6de88a0e68555059036ac18c748b5005c8d84728646b0db342fde0b8c5b303b9ad79f64d71ea4ed990d52a4fbd68cda3ca74aed5fe4d497e060
 DIST glib-2.66.2.tar.xz 4836456 BLAKE2B 5484a7fe497dbe06df7ce11dbc8836c95dbb01e6e309516b82158f2915eeee36ccbe6e904cb6ae9a5a0223ccc0b52f6e64d61a418bf790538bc90388430977b2 SHA512 30278c066c6b209f45fcfdb9ffc4732236451464506b93c0fff0964ff8aac58c15be85c3793c686d4740d9d97857984bc0ab71e38d5da11c5fd860e569fb6cb9
+DIST glib-2.66.3.tar.xz 4837796 BLAKE2B 44632477b56bea5b6324deccc17e2d6b72e00dba518f9fc3ec5edad8b20df59f8bf9087e5de16b587b72c2f143d9ab650c478666132b1564da9bf333f380a4e3 SHA512 ab2670ae4eeb3b561c0e71ff9153908f450e430cd43771bfee09233a65826dc16462537ec64bdfcced867f4c8663341b6b9d17af5ba0fab8564b8f21b04a45d7
 EBUILD glib-utils-2.62.6.ebuild 2390 BLAKE2B 6160cd993d8ea330b68812082a1e14c6d9c64e4adc2832bb68693e8a8eacc7598541f19e049a7601027b5fc1624485dcdc9745c7095b07d3b004a99a7f612d44 SHA512 4840e214e3283609722803ac6e52b015cce5e1f74168e318bf78bd0f0d2e7332f35063939c843ed39d03b0c9822a6aa738183bd0e0b6ea1067aae5c6b2a57a03
 EBUILD glib-utils-2.64.5.ebuild 2392 BLAKE2B 712bf35068847530523ade60b5d0943a5d8d28dcc0f4ac87d816245d924189716d2b97a73591a687092d99a7a704caea1e53b07abcdc989a70260a2655fca72c SHA512 495167c4c8b091b7f1ed5dfab873bac852d8a7056342c35ac18881ddc310f6ff8970e2625f5773ffa8c38b3a60e944452f8016d275d8296c856c5932559e777d
 EBUILD glib-utils-2.66.2.ebuild 2401 BLAKE2B 520f38ab480c4e463a1a6f141221556b6d20d0857b5c91525170bac962b268dd904f31bb42a60693dcde317ff30a18cbb12300aa027db4e333ea33445ee4e384 SHA512 42cc368b74c34714a28b9189f29cd7a891d0c5fe908f16c12683c0030d5e12724cf3cbdd7ada38d6b5512a0e982a7f44ccfcca0717a3bf250accdf62ef985776
+EBUILD glib-utils-2.66.3.ebuild 2401 BLAKE2B 520f38ab480c4e463a1a6f141221556b6d20d0857b5c91525170bac962b268dd904f31bb42a60693dcde317ff30a18cbb12300aa027db4e333ea33445ee4e384 SHA512 42cc368b74c34714a28b9189f29cd7a891d0c5fe908f16c12683c0030d5e12724cf3cbdd7ada38d6b5512a0e982a7f44ccfcca0717a3bf250accdf62ef985776
 MISC metadata.xml 332 BLAKE2B 1e3c081ae9a2c8ae53cee6c3ae133cbd5e8543a68c03d4a4f7e164437502d996ea9364789e93114687271e1f472bcf13a418cca5b74ecb95a51849f0a5f3dafa SHA512 f7680d9be4071b841f50ece99b5041dc492901d84ae05383c1ff05b6a73bab804b153a50eb70f5417137f6e2041230c5ba8eaede10f7a0bf8a899508642588c6
diff --git a/dev-util/glib-utils/glib-utils-2.66.3.ebuild b/dev-util/glib-utils/glib-utils-2.66.3.ebuild
new file mode 100644
index 000000000000..03ff214270c2
--- /dev/null
+++ b/dev-util/glib-utils/glib-utils-2.66.3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+
+RDEPEND="${PYTHON_DEPS}
+	!<dev-libs/glib-2.56.2:2
+"
+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 fc276ee0db9c..6f64f6bcc3ab 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -5,7 +5,7 @@ DIST glslang-7.12.3353_pre20191027.tar.gz 3119760 BLAKE2B 4a7eda7bf89b1589cb8a71
 DIST glslang-8.13.3559.tar.gz 3122936 BLAKE2B 856e6068a06407195f97478b3e6bd91aa619213d8468a8c9ff7ee8e7a36a904e4896e34e021e8e4e047fab6ea406d89206849058a659de8075c52a06118b0e7b SHA512 d2f09888dd1b6edb4f324502627aeca0c78411f61ab50e672fa2a6d9ae46611849e1d13b9c6069b77f31092d843abcf3d74ed7cfc3c9144ced80e65876f4b781
 DIST glslang-8.13.3560_pre20200404.tar.gz 3185684 BLAKE2B fac831212b46b22f10657ee44afc788d174779dd36e9d5f045f8e84ab3cca448aee89aab13771a29598b242653d6a29e4eb8fd8965e1c03ceec599e7ab1fafa9 SHA512 ec5b89d918cf55bb0a166f59eeea3662d54f29a986f979a9b04ab35bc8e02e5b01d13c24f336666669115f90d3d97eb91abe7ba4b9108590ec9b8a78e976223f
 DIST glslang-8.13.3743.tar.gz 3183453 BLAKE2B 2e8fc3693477be8bd6f8000a0eb032b314f5903991dc5a73dbd913a92aa0d6878e45f29f0a01ca5e8453b566d8a503a3cf4256def7f90a4cb561391b047c2a1d SHA512 19169c4ffa511113978af8e8efc57b290d4aa962a4c2429dbea1af72204787c6ce20ffbbb452dc04bef5416e00510819d84463a2e76295b9a59b409e12af6792
-EBUILD glslang-10.11.0.0_pre20200924.ebuild 889 BLAKE2B 70980aaf60163f39d478a9c2e6b3037f9d5fe62541e174554984765958152cd67010c59c2e10953fb084a53f034c2dc286d8babf88093c35e19bc51ff2c0669c SHA512 24d05f0e30ef28a112a218738116fe0a3537a049286950a1ed56a3be44bcff9a3075f530bc93b603bae74eadb82fefca2646425fe3a739e7eeb216ecd3c01c94
+EBUILD glslang-10.11.0.0_pre20200924.ebuild 892 BLAKE2B 02ea8c0d451b7d06f18c653f20ffbf2bea94d96252b48d74579ca1429431fb43cfc05291c0e1b7f2a4412df81991f5e8f7bf8499cf65a6a8445bf2675f0189b6 SHA512 da75d32d2c8ee1df404afbb93625a35028dab80dedb096e516f0bedc2a16e53e662d8273a60ffeded743e62222fc5c43021b210eb20623c5f5683c814e5bf1dd
 EBUILD glslang-7.12.3353_pre20191027-r2.ebuild 848 BLAKE2B c21ffc390e783a2abae679b7c10b20b0f6b2c7c0240638a54b2717c0e65289006b367ddc96115f6234a3c999515314736011649283c14ec73aec8c37abd26710 SHA512 d6b739906ffc084106aa5dcd0182980c91a0874b1425f1eaa2b05e206597e2f7c807f87c02c8fca0db5c1f9860a378579cbfb4646f429bca72de672c151e87ee
 EBUILD glslang-8.13.3559.ebuild 759 BLAKE2B 64a7cb4e904a835110d41ce432dbb04a2e60efd884daa5daea7f36eaa6356126793239889b0b69ce87ebdcaea2987550b84405c58553dd87276a579a61b788f2 SHA512 0a362fa37d32551a976a8ced67b9dee1556b3c8f5c90cdb7446643c4ea4f07e388bfc9594e9de9ad3daa5f8c638db3373ef6592566ed72349dd892c5a24777b6
 EBUILD glslang-8.13.3560_pre20200404.ebuild 870 BLAKE2B a79d014151d18393e8fc95cd4bf3ca7eb859ba7250665ea97d3f77c60973dd496c0ca82a1c0f90d5870bcb6b2e87d5fb29ee9bc968b70b9df6900cdc90827f6b SHA512 47ad53da564d55ab780b5a69abcc232798f2c48b9babf9391416abf34a8f7871ffbb27d6893cf98caf56cf079b3885f06e8b6e60a3407a5e051938beef7b8cd7
diff --git a/dev-util/glslang/glslang-10.11.0.0_pre20200924.ebuild b/dev-util/glslang/glslang-10.11.0.0_pre20200924.ebuild
index 47b7b64c6e30..9cdeed43912d 100644
--- a/dev-util/glslang/glslang-10.11.0.0_pre20200924.ebuild
+++ b/dev-util/glslang/glslang-10.11.0.0_pre20200924.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SNAPSHOT_COMMIT="bacaef3237c515e40d1a24722be48c0a0b30f75f"
 	SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 	S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}"
 fi
 
diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest
index 560e5e3cd346..3d548a147a7f 100644
--- a/dev-util/gnome-builder/Manifest
+++ b/dev-util/gnome-builder/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-builder-3.36.1.tar.xz 12026976 BLAKE2B d833665bb71b1549fe789d05dbd89db588ae4cc7187e532f38f3bd9e779bccab644d9f9bfc4c84bd484ac678bcf8594e4aa4edff29ea8c87c5c557fc3e422a4f SHA512 284da6e5a9e766cb6f6122f1134c779cde8406b006728ae1fff3518020ef4b96239aa5037cd2d35cfe4728ea088d61c4eeabc39ea753a16208fdaba7b04e63c2
+DIST gnome-builder-3.38.1.tar.xz 12077860 BLAKE2B 68dfbf9aeda93c695035a51c020735a914a11a09d7106228c2b7fe603b3b1b7b292f6a110c77df2057d40ae7f0c7559cb48c6ecc888de2767984a03d34467a2f SHA512 50872a7285292f4e29acec153a7ba4616ab8e69529fbc7682fb74fa9d8b5c49ed52b939c7652bcf410444e2c2de969280b82ab4da44008f4b95863bfd52ac59a
 EBUILD gnome-builder-3.36.1.ebuild 6736 BLAKE2B 5d431790f425c8030785833770b60e374a80faf3e9c11c3a7ec5874c66bc5701820d430af57bd43f3335d87bfa1d2417a1402f6639376462342f2d5de1124050 SHA512 91ff5b073bca65e41dc5834b1363bec51c1217d9432c4f05f16990852673d1da36de188758a0115446e43114c5c6cd089a7f28beb8cabd7d893122a657029fc6
+EBUILD gnome-builder-3.38.1.ebuild 6823 BLAKE2B b823ff1af658dab5e172c1a39a85f5e11463da92e4b8624bc9e46a6c57af6aff3b2d543c05559e3e6a6a716363d5ef6a4e9b907b436f2a031640b2b0c9d14cf9 SHA512 f7b294af1018985866e612dee8638f5debb2796be4082c471c3b7f41c86cdcf1f27ae3d8215cd4da7507275e14210eec5530830f6d1c28ffefe9e83dec655366
 MISC metadata.xml 976 BLAKE2B 088592bf7fc4c650b17862e771d3283aced4d7a5003f66938dd5830c4a8b88884fb46362e50745b09f9903347dad3233b1ba8339bdaa66c7ea9f70024071a3b8 SHA512 136ec6b271c0084e86f8b7e309f46cd89d382e96d815269f50f0dae33795084d17790daf360fb760a17a2d4885a4a5aae5f8563449160ebec49bf4c9f69438a8
diff --git a/dev-util/gnome-builder/gnome-builder-3.38.1.ebuild b/dev-util/gnome-builder/gnome-builder-3.38.1.ebuild
new file mode 100644
index 000000000000..73796652f6bc
--- /dev/null
+++ b/dev-util/gnome-builder/gnome-builder-3.38.1.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISABLE_AUTOFORMATTING=1
+FORCE_PRINT_ELOG=1
+
+inherit gnome.org gnome2-utils llvm meson python-single-r1 readme.gentoo-r1 virtualx xdg
+
+DESCRIPTION="An IDE for writing GNOME-based software"
+HOMEPAGE="https://wiki.gnome.org/Apps/Builder"
+
+# FIXME: Review licenses at some point
+LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="clang +devhelp doc +git +glade gtk-doc spell sysprof test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# When bumping, pay attention to all the included plugins/*/meson.build (and other) build files and the requirements within.
+# `grep -rI dependency * --include='meson.build'` can give a good initial idea for external deps and their double checking.
+# The listed RDEPEND order shold roughly match that output as well, with toplevel one first then sorted by file path.
+# Most plugins have no extra requirements and default to enabled; we need to handle the ones with extra requirements. Many of
+# them have optional runtime dependencies, for which we try to at least notify the user via DOC_CONTENTS (but not all small
+# things); `grep -rI -e 'command-pattern.*=' -e 'push_arg'` can give a (spammy) idea, plus python imports in try/except.
+
+# FIXME: plugin_flatpak needs flatpak.pc >=0.8.0, ostree-1, libsoup-2.4.pc >=2.52.0 and git plugin enabled
+# Editorconfig needs old pcre, with vte migrating away, might want it optional or ported to pcre2?
+# An introspection USE flag of a dep is required if any introspection based language plugin wants to use it (grep for gi.repository). Last full check at 3.28.4
+
+# TODO: Handle llvm slots via llvm.eclass; see plugins/clang/meson.build
+# TODO: automagic libportal dep
+# TODO: automagic sysprof dep for tracing paths from toplevel meson.build
+RDEPEND="
+	>=dev-libs/libdazzle-3.37.0[introspection]
+	>=dev-libs/glib-2.65.0:2
+	>=x11-libs/gtk+-3.22.26:3[introspection]
+	>=x11-libs/gtksourceview-4.0.0:4[introspection]
+	>=dev-libs/json-glib-1.2.0
+	>=dev-libs/jsonrpc-glib-3.19.91
+	>=x11-libs/pango-1.38.0
+	>=dev-libs/libpeas-1.22.0[python,${PYTHON_SINGLE_USEDEP}]
+	>=dev-libs/template-glib-3.28.0[introspection]
+	>=x11-libs/vte-0.40.2:2.91[introspection]
+	>=net-libs/webkit-gtk-2.26:4=[introspection]
+	>=dev-libs/libxml2-2.9.0
+	git? ( dev-libs/libgit2:=[ssh,threads]
+		>=dev-libs/libgit2-glib-0.28.0.1[ssh]
+	)
+	dev-libs/libpcre:3
+	dev-libs/libpcre2
+
+	>=dev-libs/gobject-introspection-1.54.0:=
+	$(python_gen_cond_dep '
+		>=dev-python/pygobject-3.22.0:3[${PYTHON_USEDEP}]
+	')
+	${PYTHON_DEPS}
+	clang? ( sys-devel/clang:= )
+	devhelp? ( >=dev-util/devhelp-3.25.1:= )
+	glade? ( >=dev-util/glade-3.22.0:3.10= )
+	spell? ( >=app-text/gspell-1.8:0=
+		app-text/enchant:2 )
+	sysprof? ( >=dev-util/sysprof-3.37.1:0/4[gtk] )
+"
+DEPEND="${RDEPEND}"
+# TODO: runtime ctags path finding..
+
+# desktop-file-utils required for tests, but we have it in deptree for xdg update-desktop-database anyway, so be explicit and unconditional
+# appstream-glib needed for validation with appstream-util with FEATURES=test
+BDEPEND="
+	doc? ( $(python_gen_cond_dep '
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	') )
+	gtk-doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3 )
+	test? (
+		dev-libs/appstream-glib
+		sys-apps/dbus )
+	dev-util/desktop-file-utils
+	dev-util/glib-utils
+	>=dev-util/meson-0.49.2
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+DOC_CONTENTS='gnome-builder can use various other dependencies on runtime to provide
+extra capabilities beyond these expressed via USE flags. Some of these
+that are currently available with packages include:
+
+* dev-util/uncrustify and dev-python/autopep8 for various Code Beautifier
+  plugin out of the box functionality.
+* dev-util/ctags with exuberant-ctags selected via "eselect ctags" for
+  C, C++, Python, JavaScript, CSS, HTML and Ruby autocompletion, semantic
+  highlighting and symbol resolving support.
+* dev-python/jedi and dev-python/lxml for more accurate Python
+  autocompletion support.
+* dev-util/valgrind for integration with valgrind.
+* dev-util/meson for integration with the Meson build system.
+* dev-util/cargo for integration with the Rust Cargo build system.
+* dev-util/cmake for integration with the CMake build system.
+* net-libs/nodejs[npm] for integration with the NPM package system.
+'
+# FIXME: Package codespell and mention here
+# FIXME: Package gnome-code-assistance and mention here, or maybe USE flag and default enable because it's rather important
+# eslint for additional diagnostics in JavaScript files (what package has this? At least something via NPM..)
+# jhbuild support
+# rust support via rust-analyzer (rls plugin now disabled by default); Go via go-langserver
+# autotools stuff for autotools plugin; gtkmm/autoconf-archive for C++ template
+# gjs/gettext/mono/PHPize stuff, but most of these are probably installed for other reasons anyways, when needed inside IDE
+# stylelint for stylesheet (CSS and co) linting
+# gvls for vala language-server integration
+
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	use clang && llvm_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dtracing=false
+		-Dprofiling=false # not passing -pg to CFLAGS
+		-Dtcmalloc=false
+		-Dchannel=other
+
+		$(meson_use doc help)
+		$(meson_use gtk-doc docs)
+
+		-Dnetwork_tests=false
+		$(meson_use clang plugin_clang)
+		$(meson_use devhelp plugin_devhelp)
+		-Dplugin_deviced=false
+		-Dplugin_editorconfig=true # needs libpcre
+		-Dplugin_flatpak=false
+		$(meson_use git plugin_git)
+		$(meson_use glade plugin_glade)
+		-Dplugin_podman=false
+		$(meson_use spell plugin_spellcheck)
+		$(meson_use sysprof plugin_sysprof)
+		-Dplugin_update_manager=false
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_optimize
+	if use doc; then
+		rm "${ED}"/usr/share/doc/gnome-builder/en/.buildinfo || die
+		rm "${ED}"/usr/share/doc/gnome-builder/en/objects.inv || die
+		# custom docdir in build system, blocked by https://github.com/mesonbuild/meson/issues/825
+		mv "${ED}"/usr/share/doc/gnome-builder/en "${ED}"/usr/share/doc/${PF}/html || die
+		# _sources subdir left in on purpose, as HTML links to the rst files as "View page source". Additionally default docompress exclusion of /html/ already ensures they aren't compressed, thus linkable as-is.
+		rmdir "${ED}"/usr/share/doc/gnome-builder/ || die
+	fi
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
+
+src_test() {
+	# FIXME: can't run meson_src_test together with virtx or dbus-run-session
+	virtx dbus-run-session meson test -C "${BUILD_DIR}"
+}
diff --git a/dev-util/gprof2dot/Manifest b/dev-util/gprof2dot/Manifest
index 4d102bb95c75..3deed392e210 100644
--- a/dev-util/gprof2dot/Manifest
+++ b/dev-util/gprof2dot/Manifest
@@ -1,3 +1,3 @@
 DIST gprof2dot-2019.11.30.tar.gz 31388 BLAKE2B 1781f59e5daa8315d3fd9defb6e28290272c4ddca01312e9af4acac494f3c7b29a437e3411b0bbb218f2eedbb2acf83d4dfa9c1d47f20b2eedc0fd607f1e4a02 SHA512 06fa8feed23e21d7827bbac19c887f65b9ca6a0cfd5b54c4da373ca33ecf0f11835b961dd1c2237ac2bf9764a8122d3ed9c7f9981c127a14ae74a733fc1275b1
-EBUILD gprof2dot-2019.11.30.ebuild 588 BLAKE2B 7e1ed5291ca8e6e2ca5211573b40985adb98fac00f4f92ea42dbedb5e1c931d1ed8be8e7dbb7f91cb71686e3564ecaf95b6a0e2df590eb6aea296a5add0ae22c SHA512 8f119ce709066da1d158cd2805e061aa25da19cd5771dae79c46f07699ba8298476d24ec01c31e721a98b7a3aa2ab1785268f29bccfb497916aeddf965bfa29a
+EBUILD gprof2dot-2019.11.30.ebuild 503 BLAKE2B b6c37204481a2deda014b3ec5f607c25f9345ca8dffffab299dfcde1656b2a863147c8395cd0acf9a26c4dd61818ae3512ae0f5fccdcc8c1a4d52ca29fcf0498 SHA512 6ae3361a6d9e30bdfeca5fbca43f92ca5303a5c71c14e9eba7a835cd388abf2b62c68e3b66568ae32c49ce07c029c99140a66b9a7a0bb351312693e867ade1f8
 MISC metadata.xml 333 BLAKE2B d1735f6673a0258eadd2d185548fba581c8613d4c8709e388bab630e81d9e835aa1fac22495b400a8db3e9895ba655e273657bd9329c9a9a8022c5bd7ada2f3e SHA512 503d8f740b27ef37b79be92c4652c60f49087634451e0d418da990c7b1f9c911aca461f2578e66e3e09f7db0588e57e304949a04b279fe782ead8222e1324a28
diff --git a/dev-util/gprof2dot/gprof2dot-2019.11.30.ebuild b/dev-util/gprof2dot/gprof2dot-2019.11.30.ebuild
index b1c471e71f2a..7cf8f6da8f61 100644
--- a/dev-util/gprof2dot/gprof2dot-2019.11.30.ebuild
+++ b/dev-util/gprof2dot/gprof2dot-2019.11.30.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE='xml'
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
@@ -19,9 +19,5 @@ LICENSE="LGPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
 
 S="${WORKDIR}"/${MY_P}
diff --git a/dev-util/gtk-doc-am/Manifest b/dev-util/gtk-doc-am/Manifest
index a3deb7e1093e..a1d9141080f4 100644
--- a/dev-util/gtk-doc-am/Manifest
+++ b/dev-util/gtk-doc-am/Manifest
@@ -1,3 +1,5 @@
 DIST gtk-doc-1.32.tar.xz 762000 BLAKE2B e87b0ed5dffd04acc7569171343839a742a874438248546b1b85ca71102d5a546f41b450c5cedf54ecab5b7b6585a4dac36d7600b21b5cce491470a50f82d3b0 SHA512 6d28395968c2951f1685570e5778b5add76d1b9cff8fcb8632b200b3ba251602a1ea59b1def84fc28560988b87fc0dbbc6947af88d268db6ff23e9c28aea3b28
+DIST gtk-doc-1.33.1.tar.xz 768896 BLAKE2B 0d6cc32611618669aac4045942497a404f4d3ed703341cce56efefba439eb8595877297b76085c6a57d3d76710257153040b8f895d6dd6381502e852e6b82e93 SHA512 18620f0164382849980938103a9243abc35ea5a2628258f00e096e16a698b598d0c7fe80a1739fc689217c59a648c728a014bc672a92346c65768ebf89675b90
 EBUILD gtk-doc-am-1.32.ebuild 845 BLAKE2B 044ea059ea4f541aec142d17fc65f30d6ed83fc3bceed2ad2025c02585d0e7f49787a78275ccdb3a90f3f067b71685e8e8717564cbc948d1a0213b9157f0d002 SHA512 734909caf4c8da99c292462b4360a14bb5af0665388465483f9619ebe79de3050f2e6ed0b12272be3e80b6ce2f6b300d9796804ba3143cfee37f5777f0120491
+EBUILD gtk-doc-am-1.33.1.ebuild 863 BLAKE2B 6909ae517b04aeb7e393fcc837a672fb9677af569856e47f7473428f2c24aa9bd5939e06b07d6579782a98329c43aad05496a69e18577164a82d42d5ca29d610 SHA512 657e11a668c1dafb36742f82a33523af980d5c9df9fb173fd8968326c3af75d5c1d536c51a8db409c281507c46ab4cf7c16e733f4f5186a83bd034906fdf8a1b
 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
new file mode 100644
index 000000000000..04df1f0818c7
--- /dev/null
+++ b/dev-util/gtk-doc-am/gtk-doc-am-1.33.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME_ORG_MODULE="gtk-doc"
+
+inherit gnome.org
+
+DESCRIPTION="Automake files from gtk-doc"
+HOMEPAGE="https://wiki.gnome.org/DocumentationProject/GtkDoc"
+
+LICENSE="GPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="!<dev-util/gtk-doc-${GNOME_ORG_PVP}"
+PDEPEND="virtual/pkgconfig"
+
+# This ebuild doesn't even compile anything, causing tests to fail when updating (bug #316071)
+RESTRICT="test"
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	insinto /usr/share/aclocal
+	doins buildsystems/autotools/gtk-doc.m4
+}
diff --git a/dev-util/gtk-doc/Manifest b/dev-util/gtk-doc/Manifest
index bb017954ab13..c3831b1344f8 100644
--- a/dev-util/gtk-doc/Manifest
+++ b/dev-util/gtk-doc/Manifest
@@ -2,6 +2,8 @@ AUX 1.32-deprecation-parse-fixes.patch 7181 BLAKE2B e7415a1d8f9aad544581c8fc5d5b
 AUX 61gtk-doc-gentoo.el 283 BLAKE2B 116d2b43d42b05130482c5bff7a10f13930a0d04f34874d25bfa6c61dc8920efe60ae615e6d54de1eeed87044a7232a992a37582d608b0756f0b099b5ee62d03 SHA512 d9e7c8bacd97a5147dbbe9ad568323356c9c38ad982ce88c63ef5f8e3955289274393a91e07d2159c082ac2a058455a1905c251ff3676f60bad596379fb12837
 AUX gtk-doc-1.8-emacs-keybindings.patch 582 BLAKE2B 9591f8f58dbd2c5897abf020f96a3ad8124830c274bfa581756ccaa43c67002264cc6d5a04c0316e4bb2dfa75a3cb08b5de6217a81a295b3a31e18dae8d1ad7d SHA512 360e97c0d2603c17dd1c1ca92739eb5ac229f3bcda6dc76267b95cac73db1008a52164ac9cba5a0e43f7b6359b5e6d3b242fde757fa1b7409051bade5f6f35a6
 DIST gtk-doc-1.32.tar.xz 762000 BLAKE2B e87b0ed5dffd04acc7569171343839a742a874438248546b1b85ca71102d5a546f41b450c5cedf54ecab5b7b6585a4dac36d7600b21b5cce491470a50f82d3b0 SHA512 6d28395968c2951f1685570e5778b5add76d1b9cff8fcb8632b200b3ba251602a1ea59b1def84fc28560988b87fc0dbbc6947af88d268db6ff23e9c28aea3b28
+DIST gtk-doc-1.33.1.tar.xz 768896 BLAKE2B 0d6cc32611618669aac4045942497a404f4d3ed703341cce56efefba439eb8595877297b76085c6a57d3d76710257153040b8f895d6dd6381502e852e6b82e93 SHA512 18620f0164382849980938103a9243abc35ea5a2628258f00e096e16a698b598d0c7fe80a1739fc689217c59a648c728a014bc672a92346c65768ebf89675b90
 EBUILD gtk-doc-1.32-r1.ebuild 2340 BLAKE2B bd2c6091b9237fe011e29429bf7a515d3e9149667fd8e553319d04da49f0a8983dac1a3aebf0f5aa7df589e03398f1dcbb816fc3381cd10cf2f8da328e4afbd3 SHA512 e70e382d6f2f73de8a9205055f9766b1b18318c4707044c595f6ea8b4f75a53afe0f09c7cf5774a8820ec234f9b31196b2d1a2fa18be6cf6112cb35ea05f8368
-EBUILD gtk-doc-1.32-r2.ebuild 2551 BLAKE2B f0a5da533e9b648396efe547e6f540327a026ffb958ce6d4fb3a37d455fccb34b78114f018432f5c2bcf35c9d8d60847e40dd878985af4e9071b2485af0ed445 SHA512 473663a2dcc0176c426845c6604725afd5a5eae98f7670c0381faa2b95d953ebdf9cdd1d26d92bf1ffc13f3125c025d1fc63a54e6b2b35544ffe51b06722c9de
+EBUILD gtk-doc-1.32-r2.ebuild 2562 BLAKE2B f960065afc674c9e5dd77f5fd5a7697c617e7dd5fa7943ac6aa0b92c03cda65fbca7a9a46c2ec49136b06f71c55807c244e89fcaef1c45db7f764fec4001cf5a SHA512 c8da40dc45ad66929133a46174ff70019a2bbe4c7d693151c45eba0aea9b9b2bcd560f385543659a363526d7c5f3c1a62bd65d7acd451e4eeeb6bbc359714200
+EBUILD gtk-doc-1.33.1-r3.ebuild 2579 BLAKE2B f2c8cd20a4e099c7aad6dc2ec47c7c53402dd2ee02fdc9641698014a35941f48d7fa22330bc693e93d81218534087b86bf9b0d4f7ed83f5e8402f8282b95a4a5 SHA512 d1fde24610d74530c4760d96713c0d45192a21e8088254abb4f66eb896cdcbcb8e5c33bce40032626a702694a65e6ba21a83183b18b8dbdb9ea2125c0ae53358
 MISC metadata.xml 490 BLAKE2B 9b4d27b146f567501af858fd704d7713e8eea66caac0b5878d685814b48825f4222a6286acd3a8ec4d8e698ace318c52c74e301dc8eb3eec41bca3d83d24a130 SHA512 0d33e970b5924c264711c8a77aa966ff8f1e6cd2695d34088c0f9af825cd72603173e07e39fb6d6bd22098d76c048b3dc03dd83916b092f2c68c58f94aa95b7a
diff --git a/dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild b/dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild
index ac05cc2f848b..4f0071b54e28 100644
--- a/dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit eutils elisp-common gnome2 python-single-r1 readme.gentoo-r1
 
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtk.org/gtk-doc/"
 
 LICENSE="GPL-2 FDL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 
 IUSE="debug doc emacs"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/gtk-doc/gtk-doc-1.33.1-r3.ebuild b/dev-util/gtk-doc/gtk-doc-1.33.1-r3.ebuild
new file mode 100644
index 000000000000..44f172a60df3
--- /dev/null
+++ b/dev-util/gtk-doc/gtk-doc-1.33.1-r3.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..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 ~x86-macos ~sparc-solaris ~x64-solaris"
+
+IUSE="doc 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}
+	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=(
+		$(meson_use test tests)
+		$(meson_use doc yelp_manual)
+	)
+	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 9f24caf344da..cbe96da42730 100644
--- a/dev-util/gtk-update-icon-cache/Manifest
+++ b/dev-util/gtk-update-icon-cache/Manifest
@@ -1,5 +1,7 @@
 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
 EBUILD gtk-update-icon-cache-3.24.20.ebuild 895 BLAKE2B eab694de369f6703304e6d838a1a73e0ddeb996253b65a8a14368e52919ae75c2ee040f261152b19040d71c23108ac027b7a6f6f0cbacc8cdd5325c2b5a66750 SHA512 3e228071261e416f164201cef33c5e68d8e8936ffb89985ab93614d2d325cf419dd2ab2f331225180258575581407b54c0caa47d263b45f631787db78898085f
-EBUILD gtk-update-icon-cache-3.24.21.ebuild 894 BLAKE2B c3534d66ac52481507d5a722eba0b98eb780cc18be33e18e336228def9d67d0a41a067507e83d3cfddac74c57fe2d33f26f1caeca77565f64a1a6197e0c664df SHA512 a3173194e30215c653e2d10fc7e864c2a9f70a35f0bd0d8e3e72d5eed8e8f98552de249bd5c4ff59320fd4bd0be7aac90896434ec7b70a44de12e3c1afb899dc
+EBUILD gtk-update-icon-cache-3.24.21.ebuild 901 BLAKE2B e5133c22054152144502c7c63412f1e9e93762e92177b3ec198fc4e9097872c674d90fcfaa2edb6cf494e440588020384ad26c427015978dfbfd964f69350d15 SHA512 bf3eab7e6166482452a74d7366abd19e137fc5297be6ebb77bb3e8f82e75a8d08ab2cae932c896cc0f1019b31578d4bc9ea38ea53507c077b429f08cfb9296c8
+EBUILD gtk-update-icon-cache-3.24.24.ebuild 910 BLAKE2B 06309f11e67ee783cc31874f1f5f3aa5cdacfaafb0c80ce0d46d8d486fb8e92eb59ea0187b31df4e3041a4fcc0b3a114439c9c58d94a10c1889065e2e36bd90b SHA512 f1fd2192bcf446a371cf923164206991c5c864cbb4186f2a1333d0c85c4d8a9c225729d7202e0b3c5e7afcde5b9cfcacf666d6403e358d6d5b1ae166a8396a94
 MISC metadata.xml 647 BLAKE2B 2846e4ac0b5816fe7699b197958118535cac7092930d7b6ba63c23b126242102edd832d60b13baeed23bf8781babe1058f06fece732c4ecd58c9b01b621042ae SHA512 7301a9425528d65112ec9dd1eca7291473905493b1b550119c6984141b3b216c4f3825d3b2a395a8375aa8b481b29d841153bd279d593586d5ea7d77ce46d7d3
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.21.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.21.ebuild
index c82aa749e296..74deb5dcb08f 100644
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.21.ebuild
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.21.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # man page was previously installed by gtk+:3 ebuild
 RDEPEND="
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.24.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.24.ebuild
new file mode 100644
index 000000000000..8e95d63ee896
--- /dev/null
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.24.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 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 ~x86-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
new file mode 100644
index 000000000000..6e2f5a6a2652
--- /dev/null
+++ b/dev-util/hermes/Manifest
@@ -0,0 +1,5 @@
+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
+MISC metadata.xml 356 BLAKE2B ffeb5fde219af8b22df4100049e885316a8889daf293bc92d61ba05953aa62e27dc3735fc96e579aae4d0e56498022616cc6c57250af886631d2f31bd00a57a2 SHA512 76a904528cbc4c1b333a7f97bc17d2cd3fb00a797766728cea99ca79186f4c54b2f54379c288aff943932825d2a7d5ee0a1a3b201f76f603611a87e392b0203e
diff --git a/dev-util/hermes/files/99hermes b/dev-util/hermes/files/99hermes
new file mode 100644
index 000000000000..364c4f4d4c3a
--- /dev/null
+++ b/dev-util/hermes/files/99hermes
@@ -0,0 +1 @@
+PATH="/opt/hermes/bin"
diff --git a/dev-util/hermes/files/hermes-2.8-lua-shebang.patch b/dev-util/hermes/files/hermes-2.8-lua-shebang.patch
new file mode 100644
index 000000000000..67058f726d78
--- /dev/null
+++ b/dev-util/hermes/files/hermes-2.8-lua-shebang.patch
@@ -0,0 +1,23 @@
+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
++++ b/bin/lua_cmd
+@@ -37,7 +37,7 @@ extra=
+ if [ "x$LUA_PATH" != x ]; then
+   extra=";$LUA_PATH"
+ else
+-  extra=";`lua -e 'print(package.path)'`"
++  extra=";`@LUA@ -e 'print(package.path)'`"
+ fi
+ 
+ export LUA_PATH="$execLuaPath$extra"
diff --git a/dev-util/hermes/hermes-2.8.ebuild b/dev-util/hermes/hermes-2.8.ebuild
new file mode 100644
index 000000000000..a6b7694d1f6a
--- /dev/null
+++ b/dev-util/hermes/hermes-2.8.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 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"
+SRC_URI="https://github.com/TACC/Hermes/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/Hermes-${PV}
+
+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/luaposix[${LUA_USEDEP}]
+	')
+"
+
+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/metadata.xml b/dev-util/hermes/metadata.xml
new file mode 100644
index 000000000000..e97c4322aa87
--- /dev/null
+++ b/dev-util/hermes/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gentoo@aisha.cc</email>
+		<name>Aisha Tammy</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/howdoi/Manifest b/dev-util/howdoi/Manifest
index a5a917dba8fd..5e7ae0e11129 100644
--- a/dev-util/howdoi/Manifest
+++ b/dev-util/howdoi/Manifest
@@ -5,5 +5,5 @@ DIST howdoi-2.0.7.tar.gz 25167 BLAKE2B 5923aaae6d6aaee4da7e02cd283d6e794c31d600d
 EBUILD howdoi-1.2.1.ebuild 613 BLAKE2B eb1915c84777fe6f247c2abef28ae2130648c377ed539bb80b984f19b7eba421fe9cd3e097c2fc390810d0a6cebf7f68286a6f104ed6c354d963e49595f14808 SHA512 cf39a6512968c9bf70684e59421471ce8cc7b5958a94588b4a2462761a216eb4133b9087ff9d48bd2cbd4983e55834996022d76115dded1a5c8377581add7dbe
 EBUILD howdoi-2.0.5.ebuild 655 BLAKE2B 9db2a97feddd4f5460a4bdd4a62861f1aef99caf76602d34de731b586f44e62080e3eeae7b77f57b715e01c5dd2f8a027733cedb48a08dc8f33108bc10af3949 SHA512 56a487f4271914cf55c3267ab705e2ea620b6e10ff550bb87f7f4800eabdc64560ff1f26323b72cf06b2db430c0b897de07d2b047c6ca237d4c09a1323765478
 EBUILD howdoi-2.0.6.ebuild 655 BLAKE2B 9db2a97feddd4f5460a4bdd4a62861f1aef99caf76602d34de731b586f44e62080e3eeae7b77f57b715e01c5dd2f8a027733cedb48a08dc8f33108bc10af3949 SHA512 56a487f4271914cf55c3267ab705e2ea620b6e10ff550bb87f7f4800eabdc64560ff1f26323b72cf06b2db430c0b897de07d2b047c6ca237d4c09a1323765478
-EBUILD howdoi-2.0.7.ebuild 689 BLAKE2B 29f1642be822e240bfb107a4e537dd767c3913312ef1ebb95531c8279ead5fcbe4a699d42b5cfa8fe88b6ad5299fed798beb1d45a369eda918ca185bfd706031 SHA512 45c2c8b3bc67b23c6297156da4d26592e5aba510baf5ec315aad927d55c60f2eda99ea967b04afc0feb3a5c2d3fcdfced5916e8a437dd58f45650561cdb1d6a8
+EBUILD howdoi-2.0.7.ebuild 694 BLAKE2B c0667a8e0ad928f61abaada0476c107bf5aecc05487fea466718a4c6c6fabc5480fc65224a0a875c0c6ec75404b34df801fdbd1915b63db52e8cbeb663254732 SHA512 73d0270e9d1d3de2362bfae171563488300fb5ae82d01c50e15ef2d584a1588830ca79c66bfad7cc67a86ef2626b8d0747de82c333d5522ca80ad041b0c046a2
 MISC metadata.xml 343 BLAKE2B 34cc8c4f7372fc0492d8b328ccae1b94946bc5593d20a181d6e32d3fc8e79471f517eea7509cf32172ef55092d898ed65350167d465b22bf127f62fbab6dc1c5 SHA512 f83f432490f25508a138dfbce3a67a120937fa12fee712cbdda9302d238805f3bd18034cc52d473d28b990221bb73748c9305f31cdc9912aed91a79f86386efa
diff --git a/dev-util/howdoi/howdoi-2.0.7.ebuild b/dev-util/howdoi/howdoi-2.0.7.ebuild
index ded420b714d1..ef6d331c9143 100644
--- a/dev-util/howdoi/howdoi-2.0.7.ebuild
+++ b/dev-util/howdoi/howdoi-2.0.7.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS="manual"
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python{3_7,3_8} )
 inherit distutils-r1
 
 DESCRIPTION="A code search tool"
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest
index 203607d07037..fb1339b38e3b 100644
--- a/dev-util/idea-community/Manifest
+++ b/dev-util/idea-community/Manifest
@@ -1,10 +1,4 @@
-DIST ideaIC-2.2.202.7319.50.tar.gz 529375561 BLAKE2B 08a77a1326b81e9d6299779bf48fb0b9be389572143bd92591bcdf6ede79ecf86b725dde634e1b8bd412dc0b886bde29169bb236fbc902ba509b468e79073e90 SHA512 f68fe18a824fd47b3b21f0a3dcd172652858aafa9f81d1db908b3adc82f925677d2ce48d0a06ad58354c06b30e01c36fff910b4eb7d5ec89c408a6a1ff017e8e
-DIST ideaIC-2.3.202.7660.26.tar.gz 529860795 BLAKE2B 6704910e1ab456dde957eb14545ae2b6a0f9007091b875b65329b3e3ac354ddce326cdc5f0820ef3340cb291ffd2f40ac8f35fcfe6a042e3c4947c6e5a9f9852 SHA512 71ba86615024af4bd3c5ff61598c08122d0c2a7f093766e22e9ed65f1fed73ae7e7eeb8e57cb9c0021e20a268811e8c0a08eace0d4c3e370c092a92e7d572dc2
-DIST ideaIC-2.4.202.8194.7.tar.gz 529563361 BLAKE2B 1f792d1ff8b1246d5ccaf4324d6c85dbe2491f6585c126ef38594709358512766f7ed3cbb2128b6b8db71286ef1a5c6cf8ac21bc0293b0ac9b373e55e6cae3d9 SHA512 f603416c829f1f2b47e371c18dc8706bb6b9df9d87ee6056ac7e4786d7f9c029246195c2fb3b63bb7d0c1c7bfee99911b2c0d686232aa243087e4a17c0f559d7
-DIST jbr-11_0_2-linux-x64-b164.tar.gz 131483925 BLAKE2B fb9c55094aeb4a9e6b89ef41699252355895fa4bf55eaa0d3c0a637b6485b5a91a0445b5f4af1872b62cd67b639f7354e05770970d41dcfa58ffeda7ae43c5b6 SHA512 4f32940166cc8ad5a138866e18d4cbfcd07f4326a85c051b7a622c9dcb8ee4b6d493331ef24d0c01999134fa2a9bad901f026982c16780fdc5e6b9308821db34
-DIST jbrx-8u202-linux-i586-b1483.37.tar.gz 80726147 BLAKE2B e4e5a076a541fd7153e861193ff4247c02ecbc144396ed28737afa7440f7771569b8d968b7c67b3dac333a89ff0b54cc9e5e76d1651b174cc7c0c21b1deb033c SHA512 53693f2ce994f4891807873ae3fe46ce60bee000b78be03c5d3df06b436328abe5b5d7e75d43e57f35f24187f49915187d034b39589e29806f55deeb14a029f2
-DIST jbrx-8u202-linux-x64-b1483.37.tar.gz 81812743 BLAKE2B 86ddf0c8dc992a27e680caa821f54fa4d647a8bff78b9fdbef82996bfbba828a2f68f1a00ed64bd92ce24a62bfc6c0240837c396644c6e91244cb0d980b6c704 SHA512 cd31a3c4da7b8c65e9ae89326c2c8b260b51890258d30f64b1e8a7c6c1442bb2cb68ea2aa80387ce0c1a8f50e3533e8231f72c5935b639e3cf82bc1ffedee8e9
-EBUILD idea-community-2020.2.2.202.7319.50.ebuild 4693 BLAKE2B ac564614a230e6539459a2122d5ca9b9ce842697a06c44b4b10eef9cdab283a5e8967d39a40cf24c1ec2e1252f97d6569806aa3807aaca8c3a9f686aedf372e5 SHA512 e07f7c5957113f18a57281cfbe75c136b141c82d1ec6487cc0a1eb47f2b87c181f203111ae86505df7d5f2c73791ce03c68e48ae09916caf87188aa121656f7c
-EBUILD idea-community-2020.2.3.202.7660.26.ebuild 4693 BLAKE2B ac564614a230e6539459a2122d5ca9b9ce842697a06c44b4b10eef9cdab283a5e8967d39a40cf24c1ec2e1252f97d6569806aa3807aaca8c3a9f686aedf372e5 SHA512 e07f7c5957113f18a57281cfbe75c136b141c82d1ec6487cc0a1eb47f2b87c181f203111ae86505df7d5f2c73791ce03c68e48ae09916caf87188aa121656f7c
-EBUILD idea-community-2020.2.4.202.8194.7.ebuild 4693 BLAKE2B ac564614a230e6539459a2122d5ca9b9ce842697a06c44b4b10eef9cdab283a5e8967d39a40cf24c1ec2e1252f97d6569806aa3807aaca8c3a9f686aedf372e5 SHA512 e07f7c5957113f18a57281cfbe75c136b141c82d1ec6487cc0a1eb47f2b87c181f203111ae86505df7d5f2c73791ce03c68e48ae09916caf87188aa121656f7c
-MISC metadata.xml 758 BLAKE2B ab45d0a8508bed2b64d02ca83d0aaffab9dfceb13a6a188accbb18f0648593ef1a9cfa03f375292b9858c05b17f003f4c6c2261b9d962ddaf679eebe7cea2eda SHA512 15ad0429ec342e939f3406e83b736ec9a273cb4ba33998a83584cee7af4ad0433a5a4758c8d01feb24efef51e4a4d9761db18d0bfc054bf9a0980ac8806eb459
+DIST ideaIC-3.0.203.5981.155.tar.gz 582023182 BLAKE2B 671fbba0c2173e3780a99d0d3b106af75c4ef6df4198ced3653c1b74a7bbb055a29b1fc31eb89823bfd56e6737c7788f78a90fe7ef46e52ab410c0dff18868e9 SHA512 35d569c5e13ec620d0a476cc52c005d29ea3c7c3c1ab0614a1a73255309635c84ee00820c50584ca19af634165138c77d8d712cfe0d367b9525956ad33aafe77
+DIST jbr-11_0_8-linux-x64-b1098.1.tar.gz 191689225 BLAKE2B 0da0f0e834709c89820f2e7e1c447dc33ea1c59c7dfb573aa47bc205f7920ccf485454f79931d42d4e6eb4de1017589bb908808d6a80cc586659757abc9958d3 SHA512 a455d8bd3332622592186cd7ae3995a9148a47717a81c274497f5408f1e89ef637c7478321b4ccd5dbe97c2e246a16ac8956c5ce475f8a4156232647f0ea7737
+EBUILD idea-community-2020.3.0.203.5981.155-r1.ebuild 3941 BLAKE2B 1c5eff3e15c0fa06e6562c8d7f8bb4b1f97e8c747621795f575c48eb5d2e8488b887b489df1dc9a8ec833126d9e90dca993dd6e23a545cdff1c2208386d50158 SHA512 64f71f6de6cd859a518ee066790221528988f45246bedc7b4d450fc4099961e3b67a0642b1fad8636ace5d411edfad88730d3696d33fe434bd4656a53ea83438
+MISC metadata.xml 561 BLAKE2B 511df10fb880b655143aba1063715ffdaaadd232c97f3f957105c1526a7a25ab1019fb13d0d36212799050dda94c1040a82c5219f81e41c4202ba9ae417723d3 SHA512 f1c87b067dc5252c5a9a92070428971472c3bd8102ebaea048aff7eb2783ec4fe485a5a91be4463c808025ea5df150c0c28c34cf5b3094c1aa52f0dd3b9f1db6
diff --git a/dev-util/idea-community/idea-community-2020.2.3.202.7660.26.ebuild b/dev-util/idea-community/idea-community-2020.2.3.202.7660.26.ebuild
deleted file mode 100644
index 97ec35a8801d..000000000000
--- a/dev-util/idea-community/idea-community-2020.2.3.202.7660.26.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils desktop
-
-SLOT="0"
-PV_STRING="$(ver_cut 2-6)"
-MY_PV="$(ver_cut 1-3)"
-MY_PN="idea"
-# Using the most recent Jetbrains Runtime binaries available at the time of writing
-# As the exact bundled versions ( jre 11 build 159.30 and jre 8 build 1483.39 ) aren't
-# available separately
-JRE11_BASE="11_0_2"
-JRE11_VER="164"
-JRE_BASE="8u202"
-JRE_VER="1483.37"
-
-# distinguish settings for official stable releases and EAP-version releases
-if [[ "$(ver_cut 7)"x = "prex" ]]
-then
-	# upstream EAP
-	KEYWORDS="~arm64"
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${PV_STRING}.tar.gz"
-else
-	# upstream stable
-	KEYWORDS="~amd64 ~arm64 ~x86"
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}-no-jbr.tar.gz -> ${MY_PN}IC-${PV_STRING}.tar.gz
-		jbr8? ( x86? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz -> jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz )
-		amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-${JRE_BASE}-linux-x64-b${JRE_VER}.tar.gz -> jbrx-${JRE_BASE}-linux-x64-b${JRE_VER}.tar.gz ) )
-		jbr11? ( amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz -> jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz ) )"
-fi
-
-DESCRIPTION="A complete toolset for web, mobile and enterprise development"
-HOMEPAGE="https://www.jetbrains.com/idea"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1
-	codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0 jbr8? ( GPL-2 )
-	jbr11? ( GPL-2 ) GPL-2 GPL-2-with-classpath-exception ISC
-	JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT
-	MPL-1.0 MPL-1.1 OFL ZLIB"
-
-#Splitting custom-jdk into jbr8 and jbr11 as upstream now offers downloads with
-#either (or neither) bundled
-#Defaulting to jbr8 to match upstream
-IUSE="+jbr8 -jbr11"
-REQUIRED_USE="jbr8? ( !jbr11 )"
-
-DEPEND="!dev-util/${PN}:14
-	!dev-util/${PN}:15"
-RDEPEND="${DEPEND}
-	>=virtual/jdk-1.7:*
-	dev-java/jansi-native
-	dev-libs/libdbusmenu
-	=dev-util/lldb-9*"
-BDEPEND="dev-util/patchelf"
-RESTRICT="splitdebug"
-S="${WORKDIR}/${MY_PN}-IC-$(ver_cut 4-6)"
-
-QA_PREBUILT="opt/${PN}-${MY_PV}/*"
-
-# jbr11 binary doesn't unpack nicely into a single folder
-src_unpack() {
-	default_src_unpack
-	if use jbr11 ; then
-		mkdir jre64 && cd jre64 && unpack jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz
-	fi
-}
-
-src_prepare() {
-	if use amd64; then
-		JRE_DIR=jre64
-	else
-		JRE_DIR=jre
-	fi
-
-	if use jbr8; then
-		mv "${WORKDIR}/jre" ./"${JRE_DIR}"
-		PLUGIN_DIR="${S}/${JRE_DIR}/lib/${ARCH}"
-	else
-		PLUGIN_DIR="${S}/${JRE_DIR}/lib/"
-	fi
-
-	rm -vf ${PLUGIN_DIR}/libavplugin*
-	rm -vf "${S}"/plugins/maven/lib/maven3/lib/jansi-native/*/libjansi*
-	rm -vrf "${S}"/lib/pty4j-native/linux/ppc64le
-	rm -vf "${S}"/bin/libdbm64*
-
-	if [[ -d "${S}"/"${JRE_DIR}" ]]; then
-		for file in "${PLUGIN_DIR}"/{libfxplugins.so,libjfxmedia.so}
-		do
-			if [[ -f "$file" ]]; then
-			  patchelf --set-rpath '$ORIGIN' $file || die
-			fi
-		done
-	fi
-
-	patchelf --replace-needed liblldb.so liblldb.so.9 "${S}"/plugins/Kotlin/bin/linux/LLDBFrontend || die "Unable to patch LLDBFrontend for lldb"
-
-	sed -i \
-		-e "\$a\\\\" \
-		-e "\$a#-----------------------------------------------------------------------" \
-		-e "\$a# Disable automatic updates as these are handled through Gentoo's" \
-		-e "\$a# package manager. See bug #704494" \
-		-e "\$a#-----------------------------------------------------------------------" \
-		-e "\$aide.no.platform.update=Gentoo"  bin/idea.properties
-
-	eapply_user
-}
-
-src_install() {
-	local dir="/opt/${PN}-${MY_PV}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}"/bin/{format.sh,idea.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}}
-	if use amd64; then
-		JRE_DIR=jre64
-	else
-		JRE_DIR=jre
-	fi
-	if use jbr8 || use jbr11 ; then
-	if use jbr8; then
-		JRE_BINARIES="java jjs keytool orbd pack200 policytool rmid rmiregistry servertool tnameserv unpack200"
-	else
-		JRE_BINARIES="jaotc java javapackager jjs jrunscript keytool pack200 rmid rmiregistry unpack200"
-	fi
-		if [[ -d ${JRE_DIR} ]]; then
-			for jrebin in $JRE_BINARIES; do
-				fperms 755 "${dir}"/"${JRE_DIR}"/bin/"${jrebin}"
-			done
-		fi
-	fi
-
-	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
-	newicon "bin/${MY_PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "IntelliJ Idea Community" "${PN}" "Development;IDE;"
-
-	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
-	mkdir -p "${D}/etc/sysctl.d/" || die
-	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-}
diff --git a/dev-util/idea-community/idea-community-2020.2.4.202.8194.7.ebuild b/dev-util/idea-community/idea-community-2020.2.4.202.8194.7.ebuild
deleted file mode 100644
index 97ec35a8801d..000000000000
--- a/dev-util/idea-community/idea-community-2020.2.4.202.8194.7.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils desktop
-
-SLOT="0"
-PV_STRING="$(ver_cut 2-6)"
-MY_PV="$(ver_cut 1-3)"
-MY_PN="idea"
-# Using the most recent Jetbrains Runtime binaries available at the time of writing
-# As the exact bundled versions ( jre 11 build 159.30 and jre 8 build 1483.39 ) aren't
-# available separately
-JRE11_BASE="11_0_2"
-JRE11_VER="164"
-JRE_BASE="8u202"
-JRE_VER="1483.37"
-
-# distinguish settings for official stable releases and EAP-version releases
-if [[ "$(ver_cut 7)"x = "prex" ]]
-then
-	# upstream EAP
-	KEYWORDS="~arm64"
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${PV_STRING}.tar.gz"
-else
-	# upstream stable
-	KEYWORDS="~amd64 ~arm64 ~x86"
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}-no-jbr.tar.gz -> ${MY_PN}IC-${PV_STRING}.tar.gz
-		jbr8? ( x86? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz -> jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz )
-		amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-${JRE_BASE}-linux-x64-b${JRE_VER}.tar.gz -> jbrx-${JRE_BASE}-linux-x64-b${JRE_VER}.tar.gz ) )
-		jbr11? ( amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz -> jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz ) )"
-fi
-
-DESCRIPTION="A complete toolset for web, mobile and enterprise development"
-HOMEPAGE="https://www.jetbrains.com/idea"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1
-	codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0 jbr8? ( GPL-2 )
-	jbr11? ( GPL-2 ) GPL-2 GPL-2-with-classpath-exception ISC
-	JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT
-	MPL-1.0 MPL-1.1 OFL ZLIB"
-
-#Splitting custom-jdk into jbr8 and jbr11 as upstream now offers downloads with
-#either (or neither) bundled
-#Defaulting to jbr8 to match upstream
-IUSE="+jbr8 -jbr11"
-REQUIRED_USE="jbr8? ( !jbr11 )"
-
-DEPEND="!dev-util/${PN}:14
-	!dev-util/${PN}:15"
-RDEPEND="${DEPEND}
-	>=virtual/jdk-1.7:*
-	dev-java/jansi-native
-	dev-libs/libdbusmenu
-	=dev-util/lldb-9*"
-BDEPEND="dev-util/patchelf"
-RESTRICT="splitdebug"
-S="${WORKDIR}/${MY_PN}-IC-$(ver_cut 4-6)"
-
-QA_PREBUILT="opt/${PN}-${MY_PV}/*"
-
-# jbr11 binary doesn't unpack nicely into a single folder
-src_unpack() {
-	default_src_unpack
-	if use jbr11 ; then
-		mkdir jre64 && cd jre64 && unpack jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz
-	fi
-}
-
-src_prepare() {
-	if use amd64; then
-		JRE_DIR=jre64
-	else
-		JRE_DIR=jre
-	fi
-
-	if use jbr8; then
-		mv "${WORKDIR}/jre" ./"${JRE_DIR}"
-		PLUGIN_DIR="${S}/${JRE_DIR}/lib/${ARCH}"
-	else
-		PLUGIN_DIR="${S}/${JRE_DIR}/lib/"
-	fi
-
-	rm -vf ${PLUGIN_DIR}/libavplugin*
-	rm -vf "${S}"/plugins/maven/lib/maven3/lib/jansi-native/*/libjansi*
-	rm -vrf "${S}"/lib/pty4j-native/linux/ppc64le
-	rm -vf "${S}"/bin/libdbm64*
-
-	if [[ -d "${S}"/"${JRE_DIR}" ]]; then
-		for file in "${PLUGIN_DIR}"/{libfxplugins.so,libjfxmedia.so}
-		do
-			if [[ -f "$file" ]]; then
-			  patchelf --set-rpath '$ORIGIN' $file || die
-			fi
-		done
-	fi
-
-	patchelf --replace-needed liblldb.so liblldb.so.9 "${S}"/plugins/Kotlin/bin/linux/LLDBFrontend || die "Unable to patch LLDBFrontend for lldb"
-
-	sed -i \
-		-e "\$a\\\\" \
-		-e "\$a#-----------------------------------------------------------------------" \
-		-e "\$a# Disable automatic updates as these are handled through Gentoo's" \
-		-e "\$a# package manager. See bug #704494" \
-		-e "\$a#-----------------------------------------------------------------------" \
-		-e "\$aide.no.platform.update=Gentoo"  bin/idea.properties
-
-	eapply_user
-}
-
-src_install() {
-	local dir="/opt/${PN}-${MY_PV}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}"/bin/{format.sh,idea.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}}
-	if use amd64; then
-		JRE_DIR=jre64
-	else
-		JRE_DIR=jre
-	fi
-	if use jbr8 || use jbr11 ; then
-	if use jbr8; then
-		JRE_BINARIES="java jjs keytool orbd pack200 policytool rmid rmiregistry servertool tnameserv unpack200"
-	else
-		JRE_BINARIES="jaotc java javapackager jjs jrunscript keytool pack200 rmid rmiregistry unpack200"
-	fi
-		if [[ -d ${JRE_DIR} ]]; then
-			for jrebin in $JRE_BINARIES; do
-				fperms 755 "${dir}"/"${JRE_DIR}"/bin/"${jrebin}"
-			done
-		fi
-	fi
-
-	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
-	newicon "bin/${MY_PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "IntelliJ Idea Community" "${PN}" "Development;IDE;"
-
-	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
-	mkdir -p "${D}/etc/sysctl.d/" || die
-	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-}
diff --git a/dev-util/idea-community/idea-community-2020.2.2.202.7319.50.ebuild b/dev-util/idea-community/idea-community-2020.3.0.203.5981.155-r1.ebuild
index 97ec35a8801d..358d9caaec62 100644
--- a/dev-util/idea-community/idea-community-2020.2.2.202.7319.50.ebuild
+++ b/dev-util/idea-community/idea-community-2020.3.0.203.5981.155-r1.ebuild
@@ -6,15 +6,12 @@ inherit eutils desktop
 
 SLOT="0"
 PV_STRING="$(ver_cut 2-6)"
-MY_PV="$(ver_cut 1-3)"
+MY_PV="$(ver_cut 1-2)"
 MY_PN="idea"
 # Using the most recent Jetbrains Runtime binaries available at the time of writing
-# As the exact bundled versions ( jre 11 build 159.30 and jre 8 build 1483.39 ) aren't
-# available separately
-JRE11_BASE="11_0_2"
-JRE11_VER="164"
-JRE_BASE="8u202"
-JRE_VER="1483.37"
+# ( jre 11.0.8 build 1098.1  ) 
+JRE11_BASE="11_0_8"
+JRE11_VER="1098.1"
 
 # distinguish settings for official stable releases and EAP-version releases
 if [[ "$(ver_cut 7)"x = "prex" ]]
@@ -24,47 +21,40 @@ then
 	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${PV_STRING}.tar.gz"
 else
 	# upstream stable
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm64"
 	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}-no-jbr.tar.gz -> ${MY_PN}IC-${PV_STRING}.tar.gz
-		jbr8? ( x86? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz -> jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz )
-		amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-${JRE_BASE}-linux-x64-b${JRE_VER}.tar.gz -> jbrx-${JRE_BASE}-linux-x64-b${JRE_VER}.tar.gz ) )
-		jbr11? ( amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz -> jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz ) )"
+		amd64? ( https://bintray.com/jetbrains/intellij-jbr/download_file?file_path=jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz -> jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz )"
 fi
 
 DESCRIPTION="A complete toolset for web, mobile and enterprise development"
 HOMEPAGE="https://www.jetbrains.com/idea"
 
 LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1
-	codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0 jbr8? ( GPL-2 )
-	jbr11? ( GPL-2 ) GPL-2 GPL-2-with-classpath-exception ISC
+	codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0
+	GPL-2 GPL-2-with-classpath-exception ISC
 	JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT
 	MPL-1.0 MPL-1.1 OFL ZLIB"
 
-#Splitting custom-jdk into jbr8 and jbr11 as upstream now offers downloads with
-#either (or neither) bundled
-#Defaulting to jbr8 to match upstream
-IUSE="+jbr8 -jbr11"
-REQUIRED_USE="jbr8? ( !jbr11 )"
-
 DEPEND="!dev-util/${PN}:14
-	!dev-util/${PN}:15"
+	!dev-util/${PN}:15
+	|| (
+		dev-java/openjdk:11
+		dev-java/openjdk-bin:11
+	)"
 RDEPEND="${DEPEND}
 	>=virtual/jdk-1.7:*
 	dev-java/jansi-native
 	dev-libs/libdbusmenu
-	=dev-util/lldb-9*"
+	=dev-util/lldb-10*"
 BDEPEND="dev-util/patchelf"
 RESTRICT="splitdebug"
 S="${WORKDIR}/${MY_PN}-IC-$(ver_cut 4-6)"
 
 QA_PREBUILT="opt/${PN}-${MY_PV}/*"
 
-# jbr11 binary doesn't unpack nicely into a single folder
 src_unpack() {
 	default_src_unpack
-	if use jbr11 ; then
-		mkdir jre64 && cd jre64 && unpack jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz
-	fi
+	mkdir jre64 && cd jre64 && unpack jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz
 }
 
 src_prepare() {
@@ -74,17 +64,13 @@ src_prepare() {
 		JRE_DIR=jre
 	fi
 
-	if use jbr8; then
-		mv "${WORKDIR}/jre" ./"${JRE_DIR}"
-		PLUGIN_DIR="${S}/${JRE_DIR}/lib/${ARCH}"
-	else
-		PLUGIN_DIR="${S}/${JRE_DIR}/lib/"
-	fi
+	PLUGIN_DIR="${S}/${JRE_DIR}/lib/"
 
 	rm -vf ${PLUGIN_DIR}/libavplugin*
 	rm -vf "${S}"/plugins/maven/lib/maven3/lib/jansi-native/*/libjansi*
 	rm -vrf "${S}"/lib/pty4j-native/linux/ppc64le
 	rm -vf "${S}"/bin/libdbm64*
+	rm -vf "${S}"/lib/pty4j-native/linux/mips64el/libpty.so
 
 	if [[ -d "${S}"/"${JRE_DIR}" ]]; then
 		for file in "${PLUGIN_DIR}"/{libfxplugins.so,libjfxmedia.so}
@@ -95,7 +81,12 @@ src_prepare() {
 		done
 	fi
 
-	patchelf --replace-needed liblldb.so liblldb.so.9 "${S}"/plugins/Kotlin/bin/linux/LLDBFrontend || die "Unable to patch LLDBFrontend for lldb"
+	patchelf --replace-needed liblldb.so liblldb.so.10 "${S}"/plugins/Kotlin/bin/linux/LLDBFrontend || die "Unable to patch LLDBFrontend for lldb"
+	if use arm64; then
+		patchelf --replace-needed libc.so libc.so.6 "${S}"/lib/pty4j-native/linux/aarch64/libpty.so || die "Unable to patch libpty for libc"
+	else
+		rm -vf "${S}"/lib/pty4j-native/linux/aarch64/libpty.so
+	fi
 
 	sed -i \
 		-e "\$a\\\\" \
@@ -119,17 +110,12 @@ src_install() {
 	else
 		JRE_DIR=jre
 	fi
-	if use jbr8 || use jbr11 ; then
-	if use jbr8; then
-		JRE_BINARIES="java jjs keytool orbd pack200 policytool rmid rmiregistry servertool tnameserv unpack200"
-	else
-		JRE_BINARIES="jaotc java javapackager jjs jrunscript keytool pack200 rmid rmiregistry unpack200"
-	fi
-		if [[ -d ${JRE_DIR} ]]; then
-			for jrebin in $JRE_BINARIES; do
-				fperms 755 "${dir}"/"${JRE_DIR}"/bin/"${jrebin}"
-			done
-		fi
+
+	JRE_BINARIES="jaotc java javapackager jjs jrunscript keytool pack200 rmid rmiregistry unpack200"
+	if [[ -d ${JRE_DIR} ]]; then
+		for jrebin in $JRE_BINARIES; do
+			fperms 755 "${dir}"/"${JRE_DIR}"/bin/"${jrebin}"
+		done
 	fi
 
 	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
diff --git a/dev-util/idea-community/metadata.xml b/dev-util/idea-community/metadata.xml
index 5ddfb4646361..3642c1e6927b 100644
--- a/dev-util/idea-community/metadata.xml
+++ b/dev-util/idea-community/metadata.xml
@@ -12,8 +12,4 @@
 	<longdescription lang="en">
 	Excel at enterprise, mobile and web development with Java, Scala and Groovy, with all the latest modern technologies and frameworks available out of the box.
 	</longdescription>
-	<use>
-		<flag name="jbr8">Install and use the Java 8 based version of JetBrains Runtime.</flag>
-		<flag name="jbr11">Install and use the Java 11 based version of JetBrains Runtime.</flag>
-	</use>
 </pkgmetadata>
diff --git a/dev-util/imediff2/Manifest b/dev-util/imediff2/Manifest
index 8e1ab134f586..098569ebb561 100644
--- a/dev-util/imediff2/Manifest
+++ b/dev-util/imediff2/Manifest
@@ -1,5 +1,4 @@
 AUX 1.1.2-python-3.patch 4553 BLAKE2B bc16393f3c7071017255e8f188456e77d89a2ab2d605d6d99882aef4c65c7e5270a9348cf278a98d5ff7527423e899feffbb93b00f12a8c6e9a7b131acb86eba SHA512 fa5065572eb7fdbf38e3d7785ae92bddaeae8eadd9dbd006f5691c8647087df7529015750b66ea7618dd3306fcda80083c8dc2d2f019787137095db5b2c1a4d7
 DIST imediff2_1.1.2.orig.tar.gz 17974 BLAKE2B f83b6ab652b1dd044587e75e4e7551a8132e1860b14f0d85d37f35383bd161a672860162e93554cf4db844d6a4700fa1876a30874c50fcb8442b4190a9b19185 SHA512 54d196d67107283bc3339eba30acb1c60972f256a268e86da397e0bdafa05220facc7979638a6a917b0c2dc7171edc3aa6b188295c9f40e9debf87a63731e748
-EBUILD imediff2-1.1.2-r5.ebuild 781 BLAKE2B b9ead2e81dc7ae8c220c7f8bd49e9ba4db66c72fbf2c2f9c59ece8c757ede11e7b1bb72f6e089c05d793b1497cd98ef00cb7b2776f7f4d72e75ae583c831602b SHA512 5ab6deb4fdb12cc8746ed7b6f42e0fcd651761d2aa3ec0bd91da7f3df3ff57aa76e2162d9349172822df0d8089c787ec6a8101bedc582f0b7f3e2ef4c706b697
-EBUILD imediff2-1.1.2-r6.ebuild 775 BLAKE2B edac497a5df99d7795bdee94bf8dc0bad18bf5b52bf7e25315a800f2380a37483bc65b2c750d95d9db4b9fd76754fa99f1e8466c69570d94782c17021bbc6163 SHA512 70e1aa2fa11ff2530c5d5204a568bdc85ed51232bad940deb80ad8f796c728083ebf5eace768e96ff369fb404cd2e6e36074351c047b5569612f6ba82cd4fdf5
-MISC metadata.xml 246 BLAKE2B 464fa3d4dae2c15dd040a7580e6324ebe6cd2fa1d37a746ce991ec34484621fe6d3ae2362ea7696bde10cd6c466e1c8e0fd1fdcc161de4a502970e9e2841faa4 SHA512 30ecd86dc0fd1e0c83b4401da36f040346046e260e53c9ce77336869a2442d6b432863b031f61aa2209e58e43d172ef471c6fae5ef19a4c9e2a653e60e96c73a
+EBUILD imediff2-1.1.2-r6.ebuild 773 BLAKE2B 5828e2b2f63f03f6e2771d46d61d153f31beca1cbc266e5ccec7f9e6accd043984eacb8fdc58ae22f47261ab574db6ca8d4687f99a10ccefb58fc0116d4d1c74 SHA512 90cc81e4719b4c02a9838bcc1cf44e1bbf4ac9d9244620335a809580e5be84561b721889fbf9097283495ee6b482977c8c25321f5e935fea1829591088659da0
+MISC metadata.xml 270 BLAKE2B db96fa7275398e582ba29ef0506116343ffb732fb9f4885311a7ebb5db977382dddc2e9d05c57f53f87e2961dd8bf768336f7c7b8bb5e80ece44969bb1c7dbee SHA512 650922039b23e4a7727a2a4123577d872000f6fbcd303b45801ad9e00dbed3326aab1d69964d18c1f36779b91011016a8009157d04757f4a9fe777e6b01734b8
diff --git a/dev-util/imediff2/imediff2-1.1.2-r5.ebuild b/dev-util/imediff2/imediff2-1.1.2-r5.ebuild
deleted file mode 100644
index 367b5313edfb..000000000000
--- a/dev-util/imediff2/imediff2-1.1.2-r5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="ncurses"
-
-inherit python-single-r1 eapi7-ver
-
-MY_P="${PN}_$(ver_rs 3 -)"
-
-DESCRIPTION="An interactive, user friendly 2-way merge tool in text mode"
-HOMEPAGE="https://elonen.iki.fi/code/imediff/"
-SRC_URI="mirror://debian/pool/main/i/${PN}/${MY_P}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=( "${FILESDIR}/${PV}-python-3.patch" )
-
-src_compile() {
-	# Otherwise the docs get regenerated :)
-	:
-}
-
-src_install() {
-	python_doscript imediff2
-	dodoc AUTHORS README
-	doman imediff2.1
-}
diff --git a/dev-util/imediff2/imediff2-1.1.2-r6.ebuild b/dev-util/imediff2/imediff2-1.1.2-r6.ebuild
index 53ef872d4340..a210685fab7e 100644
--- a/dev-util/imediff2/imediff2-1.1.2-r6.ebuild
+++ b/dev-util/imediff2/imediff2-1.1.2-r6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://debian/pool/main/i/${PN}/${MY_P}.orig.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/imediff2/metadata.xml b/dev-util/imediff2/metadata.xml
index 7782eaa2297f..dc74e8075c11 100644
--- a/dev-util/imediff2/metadata.xml
+++ b/dev-util/imediff2/metadata.xml
@@ -5,4 +5,5 @@
 		<email>grknight@gentoo.org</email>
 		<name>Brian Evans</name>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-util/indent/Manifest b/dev-util/indent/Manifest
index dd5285291a0d..a7b048991d05 100644
--- a/dev-util/indent/Manifest
+++ b/dev-util/indent/Manifest
@@ -7,5 +7,5 @@ DIST indent-2.2.12.tar.xz 620280 BLAKE2B c3414ebe58d75b74356b5c37234639dc34998b7
 DIST indent_2.2.11-5.debian.tar.xz 6540 BLAKE2B c4d0805f39e1af503bcfcc49a8e9e679fb0df1021de9952af5a80c81f0c36c70e8dd6609b7e7ec5e36596f974d9c9ac31a7cad831a431cd9401758981d46a7ec SHA512 f89f04bb3b9772c5428ef6df939b5cbe92761f3a39869020dad4f98a5e48c57c34de526803141258c9d55ba6edaedf05127009530aa09b1a54cfa15c8a421a31
 EBUILD indent-2.2.11-r1.ebuild 1231 BLAKE2B 89908894927dbcf9a423998aca2f3d5052a6912bad1ff67a68dafee6bd651b402a388873dab797efb196c2a4cb8208b9a0f259b0b1af5be64ba16267885e9571 SHA512 1ddfa9c9624bf7409a063fbf2707a095e120f64c3b2a86abd86ad0e8b9b2200e0a2ba2cf7bacf221d3d9c1553fa71971c94ff4e19bc59fa90ee87bf198177fa7
 EBUILD indent-2.2.11_p5.ebuild 1392 BLAKE2B de097169420daf098c4a3a1f88cd973f0047bc282e3ae5e08be60ea27c18eef908d91d44d418b395ac79af0c6caa4f4fc742a4423d7f3162c5e9ea37a7c77af7 SHA512 9b1b34cdc5fbdc205fa448ba9ddb47a313c2842eb6f0872078c0b1769fe98a8fc491f6b2d4af4c425dacc1f105f2dbe88eb1b27682d339f9cc98185ea1fede1a
-EBUILD indent-2.2.12.ebuild 1123 BLAKE2B 042021ce75527202ed59073fbb4810152ca10955b49baa3ffa0bb874dbea56aaa284a0d1864f02ca0c604a02d328cd74ff6622f6bdc98d844ffd227a541053ef SHA512 cc85dba62c15974d85fe6d3533fd579a394d1b60dd4706b5222f370a204a3a7e2e6dbd61115c00a66a5f9aad8a0817a4492abce0cd4cff062f2bc337502e264f
+EBUILD indent-2.2.12.ebuild 1116 BLAKE2B 8a06875a4d6ef730ff939c11f16b7b6d7c500fb2859028dbc4bdf35c2e38955397bf233448d4e6f75d7a1fa752251cdc429a9c12e70592453ee3f682b5196bc8 SHA512 1a03c1c440cdf5642b7982ffb9d1b9b6f4754b60f4930d7ba237a4e385d1a021f145aa38c4ce3952850bc42f747d7bca9de12f77caef0b6a5c8237e813f0d78c
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/indent/indent-2.2.12.ebuild b/dev-util/indent/indent-2.2.12.ebuild
index 593d2b3c78a9..f147dca41c81 100644
--- a/dev-util/indent/indent-2.2.12.ebuild
+++ b/dev-util/indent/indent-2.2.12.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="nls"
 
 DEPEND="
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index 6f8b786a42c8..9ba4d0745f62 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -5,10 +5,14 @@ AUX jenkins-bin.service 499 BLAKE2B 28a90d5cf40e46880570e87acbc6d78766460faebc6e
 AUX jenkins-bin.service2 566 BLAKE2B 38511fddc783a70ae3deab70526c737a883ef090bcfb20216658b0775667022782f3ee8a6638515b46e6a4df96228fb2368521c74a0ddca2f121e9170549df8e SHA512 87b59349edcb1503e6c91440327092732f0dddb8cc35e4576c81da55e08a2ad67d462a4d871c46da4f3ed037de8b9109d766ba36ca9acf244506d129766ed5cb
 DIST jenkins-bin-2.249.2.war 67399569 BLAKE2B df3d954988370a47d90363a01de97f17a92cb4d93049ceacea80f7d2a92195cd1e95b1f3780521efa166aee1058949f0e8861b887d6da5b0f0126a2579d22595 SHA512 0300369b3c427420a9c41ee17f3e098c77f14b25597059d740fdbea03f3679ce56d9e154d7765601274cd9dc866939595f7728bc2b8b8a0ef3ea131378648a98
 DIST jenkins-bin-2.249.3.war 67400032 BLAKE2B eb9ffde454bf9ee2140655a985c6f383cb2e3d21f172075cf19171871564d356afd38b8ed6119cb3bd43801843d499242c0ae99087c5c4f7cb2db1b8b80b70a4 SHA512 5d65dee8c128ba2a307ade0750a0ad9b71136b1102a36df0a34a1217ce62df9c0c60449e0f5dd8861369b553000ef65f8bb0afb54a3c8e4315400dede58e779b
+DIST jenkins-bin-2.263.1.war 67270143 BLAKE2B 2c59b2d58632c741a0ce9ba66e4d177779899be01d3e0b9f7ba2e8fa5ff8bac667c2e2c98b9c199a8d55f9c873c1937b80f4aa6ea5f7ff6bbf256047c9a6ee94 SHA512 320dc0d4b365c0b9e11e76d6753b5ba3fbdf81e1acb9a7bbb4082fba1c57f22126810b75c563c4aa75ef3ff1633f2fe1a953c8aa1a25af5f3a0a9b2bc3a104d9
 DIST jenkins-bin-2.264.war 67272894 BLAKE2B 8cf8afc038420bbf101bf8c81cdb37e9ba25f631ccbe0f98d8897f12a93abf8355dca1ec23f254e14b16dbd8e88507a37b545c4854f2e8f3684bda871d8e171f SHA512 9bf29d7ae084c30c02931ba065e7d712a3cab4e4519587a1edc68e7205dac7a91934ca910536dd8d2c268575547fea2cdcc43229c726ed495658210cea7747a5
 DIST jenkins-bin-2.267.war 70971700 BLAKE2B 1470144d6be6cfc33d7b84c51ebb3f762b3e590427a362596302b87510d694b479608ff290b64a433aa98266d3c47b1294a505525cfdeae3547e58cc65f0d172 SHA512 39c042b3ca9d48c040d0a9d9ac9d65aff2f579888e24b800bc1e1b77b7175528aed31f2675b3417577b0b0eef7c17b6faa2d7b794360a17a6a4c8ba867007185
+DIST jenkins-bin-2.268.war 70969355 BLAKE2B e24424c8cd0535c04134cd22b8fc5e73de80c8eaa090e9fdf512dfeda4a9d029b0657e7ecaed4934ff996c1f5e8e59e9f10a7bfc31a313792cf759017780aeeb SHA512 b0e55310a21039fc57a7bdcc3b190ec61141f253d084a8279d279cff1778a3a4edc281bcc2cd1f872389d160a77dd2c9ebdf1b6cbc5d90272f2aedd66296535a
 EBUILD jenkins-bin-2.249.2.ebuild 1105 BLAKE2B 161bf3f0ad77e74702cfdd1db69cfaa54f6e267e814b358d3fdcac2ca5c7210410d1cf87d03a9e6f987d2ede8459d37f6bf352bc2a7fcd7f2167edf81542aff9 SHA512 d86e52237449bda33bc052d7b1dd3bc15306c4b771c485d34843973a7a7df6c0d0593ab156837cc64a018466222fd0c09bb331bb5c820807f5038300517e2283
 EBUILD jenkins-bin-2.249.3.ebuild 1105 BLAKE2B 161bf3f0ad77e74702cfdd1db69cfaa54f6e267e814b358d3fdcac2ca5c7210410d1cf87d03a9e6f987d2ede8459d37f6bf352bc2a7fcd7f2167edf81542aff9 SHA512 d86e52237449bda33bc052d7b1dd3bc15306c4b771c485d34843973a7a7df6c0d0593ab156837cc64a018466222fd0c09bb331bb5c820807f5038300517e2283
+EBUILD jenkins-bin-2.263.1.ebuild 1105 BLAKE2B 161bf3f0ad77e74702cfdd1db69cfaa54f6e267e814b358d3fdcac2ca5c7210410d1cf87d03a9e6f987d2ede8459d37f6bf352bc2a7fcd7f2167edf81542aff9 SHA512 d86e52237449bda33bc052d7b1dd3bc15306c4b771c485d34843973a7a7df6c0d0593ab156837cc64a018466222fd0c09bb331bb5c820807f5038300517e2283
 EBUILD jenkins-bin-2.264.ebuild 1105 BLAKE2B 90abfb2e3e72792cf968489f1da72a5bf90a6f622ac0003fcd56e5cda7a1ae79cd7effb539a7526fabcf85a6453499c831cfaced13db2ad5762b93cd0e2925f7 SHA512 0f1b7d69bb9e1dd47a42c5a0c925bb55f04692c2097b16d64f08d6d49f6b4267b81c766cca359c9ab55b411372741a2af1029ded72e93a600d44dbda7ad02110
 EBUILD jenkins-bin-2.267.ebuild 1105 BLAKE2B 90abfb2e3e72792cf968489f1da72a5bf90a6f622ac0003fcd56e5cda7a1ae79cd7effb539a7526fabcf85a6453499c831cfaced13db2ad5762b93cd0e2925f7 SHA512 0f1b7d69bb9e1dd47a42c5a0c925bb55f04692c2097b16d64f08d6d49f6b4267b81c766cca359c9ab55b411372741a2af1029ded72e93a600d44dbda7ad02110
+EBUILD jenkins-bin-2.268.ebuild 1105 BLAKE2B 90abfb2e3e72792cf968489f1da72a5bf90a6f622ac0003fcd56e5cda7a1ae79cd7effb539a7526fabcf85a6453499c831cfaced13db2ad5762b93cd0e2925f7 SHA512 0f1b7d69bb9e1dd47a42c5a0c925bb55f04692c2097b16d64f08d6d49f6b4267b81c766cca359c9ab55b411372741a2af1029ded72e93a600d44dbda7ad02110
 MISC metadata.xml 397 BLAKE2B b1a7fd87c8d5857ab102ec3d3bf5830c26c6988bb97caf89018b05e159f038c9c3a092b4f35788929d05042ac5cfd694bd03a8381686b9472880d0d205a451cd SHA512 4087fd799f4019f09103fb32d7f120e74d94715205bcc66858d11b9457774acaed37f3ad97ca0328f4ec28230a409dcfb0cbaceec142eb0a5fd3241ca35f8810
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.263.1.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.263.1.ebuild
new file mode 100644
index 000000000000..8ab8d5db213a
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.263.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="https://jenkins.io/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
+RESTRICT="mirror"
+SLOT="lts"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE=""
+
+RDEPEND="media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:0
+	>=virtual/jre-1.8.0"
+
+S=${WORKDIR}
+
+JENKINS_DIR=/var/lib/jenkins
+
+pkg_setup() {
+	enewgroup jenkins
+	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
+}
+
+src_install() {
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}.init2 jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}.service2 jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.268.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.268.ebuild
new file mode 100644
index 000000000000..231d58c8748f
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.268.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="https://jenkins.io/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
+RESTRICT="mirror"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
+IUSE=""
+
+RDEPEND="media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:lts
+	>=virtual/jre-1.8.0"
+
+S=${WORKDIR}
+
+JENKINS_DIR=/var/lib/jenkins
+
+pkg_setup() {
+	enewgroup jenkins
+	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
+}
+
+src_install() {
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}.init2 jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}.service2 jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index 9bba277287fa..1a008269f0e8 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1,3 +1,5 @@
 DIST kdev-php-5.6.0.tar.xz 1063760 BLAKE2B 72b3a6e77d6f569877687490f654daf79c14e2f7b374aadabbf54d7cad129c15051e72d816073d961582efa33d8354c51b2d3efa77a930ed2c81db4c5cd6668c SHA512 b6838e8eb44df1a0b2d94503c28636ce36dd63e91a8476b1f523b7457f1f831987eb3d079cbb7ed629c5c8143cd6a6f5832579ab7dc38f38162198c2cc068cdc
+DIST kdev-php-5.6.1.tar.xz 1063372 BLAKE2B 4c7d3897c67629b6aafb8a2e04d080a3ab5fd3bbbd836fe09d41cbdc29a14367fc2b1dc790375e761917b81bce08b88737a1b4a03163743fad71eea1410a5d29 SHA512 45e84c7ecf293dfa48805c3a80804f468a5fb8019ea3ced6b8cc1cb9042d84774635bc58e2d61945c3e5a2e77d1bc139ecdf9ebc408157c640ccbcaa2c26f189
 EBUILD kdevelop-php-5.6.0.ebuild 1265 BLAKE2B 351649e8c90a6a4345c365badf879e79ce7e6948d51d19098f12f26f169e20cd1a276426274dbda2753189c210078a7e3e4a11085e013e5ba68eb7bb1e723bcb SHA512 983a12755cf9a998a549ea9c58d52b9d9f03242c60fbb2beb28b40a1a9bf55c4b90ebccfdd4f3db2912b617f4ab79a6fd818e4968864d2508941eb668a7d8519
+EBUILD kdevelop-php-5.6.1.ebuild 1267 BLAKE2B 062930f3006ef4d3ccdd4c727ed1142bc305b54c68889e2436531d1581b08022d1dcfbc03d1efefb50e9d93bbe10489ac20e220c755f934fa0dc79bb1e79df0e SHA512 785a7334b15a4da69e656bf763be4ad90a29eb58e27c63ced585a9718177ffba6d94db8abb94dbc7ac5a5ef1a6d81be0b5fce667e52a4b33d3ce2ea1360cf7c8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.6.1.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.6.1.ebuild
new file mode 100644
index 000000000000..e732610f5639
--- /dev/null
+++ b/dev-util/kdevelop-php/kdevelop-php-5.6.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_HANDBOOK_DIR="docs"
+ECM_TEST="true"
+KDE_ORG_CATEGORY="kdevelop"
+KDE_ORG_NAME="kdev-php"
+KFMIN=5.74.0
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="PHP plugin for KDevelop"
+HOMEPAGE="https://www.kdevelop.org/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="5"
+IUSE=""
+
+BDEPEND="
+	test? ( dev-util/kdevelop:5[test] )
+"
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	dev-util/kdevelop-pg-qt:5
+	dev-util/kdevelop:5=
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/threadweaver-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+# remaining tests fail for some, bug 668530
+RESTRICT+=" test"
+
+src_test() {
+	# tests hang, bug 667922
+	local myctestargs=(
+		-E "(completionbenchmark|duchain_multiplefiles)"
+	)
+	ecm_src_test
+}
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index f327010c1dd9..3b7d96e2671f 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1,3 +1,5 @@
 DIST kdev-python-5.6.0.tar.xz 1069480 BLAKE2B 0ceb8c1a4bd279b621844eb94eeecef4272b13e77764afeb6403d8a757d6873caf2cc5ad5a1a1eef901365c90dc11298bab21274b684c6b49c8e55388c9504bb SHA512 c6a866a563f3304aab860f66d752a617f8a0822c2e3b0f4131b8e8603f2ed86b5141ad308f967ffc5e9458693f389281a8918feea9fc584d7b4213fa265479be
+DIST kdev-python-5.6.1.tar.xz 1071080 BLAKE2B f9972f6460723bc4822b00e49ab35f74eecc86cfb642fe76d98f551519f8ab690d6c5b6bbd7db778a3a62a1d11e81f8a0ea39fda91120b951b0fb80667d52b64 SHA512 bdf05ed098cfbca395c8c82650c278f33bd5878a08527f43d555e905142b3b486267d37789cbe9bf4924162fb9c3024c13e445a2f1d408626861b96c96103e12
 EBUILD kdevelop-python-5.6.0.ebuild 1276 BLAKE2B 6a870a67a788a65eb90a4b5aad84b2a88141b525effa74b6ca8f2334966316cb03ccd1d984e2e4dc20cd30c523aef0013e5b1d7bb1f94d09fbda731d4078f1b5 SHA512 26b9e8c4681030a3586829d5b2411208f67d8a88840a06de3225b563b6bf105e9e000d9394f190e658918eac947dc68a94625fbc59fb62d12f9af2ed3632a127
+EBUILD kdevelop-python-5.6.1.ebuild 1278 BLAKE2B 73799d77de68d9a9cf670b1703cac813dd851f94f2e6cca5d65d52341f011e513a1091fc033a38f81e14df6fdb7d15d633459699a580625f7f4c76ec1afb0d2b SHA512 44733158c97287629f6433133941fb85849fe7685c90f9cb89e33f2de46f5241a6420a3940d9df90c626a33c3043fdc069ec72d4d1fea30a3388dcec525c6e62
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.6.1.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.6.1.ebuild
new file mode 100644
index 000000000000..f8b45387e8ee
--- /dev/null
+++ b/dev-util/kdevelop-python/kdevelop-python-5.6.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+KDE_ORG_CATEGORY="kdevelop"
+KDE_ORG_NAME="kdev-python"
+PYTHON_COMPAT=( python3_{7,8,9} )
+KFMIN=5.74.0
+QTMIN=5.15.1
+inherit ecm kde.org python-single-r1
+
+DESCRIPTION="Python plugin for KDevelop"
+HOMEPAGE="https://www.kdevelop.org/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	dev-util/kdevelop:5=
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/threadweaver-${KFMIN}:5
+"
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/pycodestyle[${PYTHON_MULTI_USEDEP}]
+	')
+"
+
+RESTRICT+=" test"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ecm_pkg_setup
+}
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 9d812a333b9d..6391ffc53b1f 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,3 +1,5 @@
 DIST kdevelop-5.6.0.tar.xz 7116544 BLAKE2B c548c695dab41c93aef31549bd479f1ca832a3fac9cde044523bf590d536473f36a87521ac678d37008ff451c091b843f65ccce154d9b1ca59efac2b48a81515 SHA512 c96a79d92972d606778d76f74f9dfddb9a0da9f41b462ada1a52842aa14306ad3cb183cda8103a9a3cf56d0dd5c1f18d5fad6b65cd8ae42f2fc407aaa6dc88f7
+DIST kdevelop-5.6.1.tar.xz 7130284 BLAKE2B 989218ec07d437d641033b7895b533a4f92b8c557e73bac0e3671a34335aac02936eeb3b73b95d1a7bbab6ad8b32a21f15db1d5af0485999fa2f7eb24b9e8bb6 SHA512 a03e22d57b5d556489e3e140e4cad6939170087a36afa8c755318ff6b5101806b8df82bd402e32daa715f4a72352dada1c2ce3ff4455dcac0debe6456c0bc7cd
 EBUILD kdevelop-5.6.0-r1.ebuild 4068 BLAKE2B 321d5d5dc48e2213b26a6d68d2910fe33004435a2f948d9c59e2d5b388d5680476a73d62bda5010007cfd77ab939b8604e4417768ad15b83f9c0aab3c51742a7 SHA512 f56ee8296e0b90aa33f3fd523e7b72147e8cdba68e13811ced1949a857617f13495976275c135c82c1aebf6ce106e725f2949d5398ba6f682f9be3011d13e2b5
+EBUILD kdevelop-5.6.1.ebuild 4070 BLAKE2B 2807533e0763c1488eb1e24b55e67359a9abca92eae08afee926a022e813424fca3a825e155ef943c0c83e6f01de96a370f68080d11900ad41afbf79c268542b SHA512 a32039f6428131b597519ef4a520cb69ab57f17f8021bdeb5fcfb7bbe141f1adac018847ef480e4cee17ae2be5409de25699306eb404b5e6270e2f465d49934f
 MISC metadata.xml 554 BLAKE2B 4e34566d1ec19cb7589766d89dafabfb0b50698afdcffd9c217108cb0f5940d27c367f44cf1f6be491814f3874c67e96ebf9cbf517670091e6fa36f3a8471bd9 SHA512 33f889291d1c2b4ddf7ad8fdd33d74758090e401b093d3f7691bfe6569ab068720811747380275db58b2160fd1b301126576721d0c2c61f04e917560af2c33ac
diff --git a/dev-util/kdevelop/kdevelop-5.6.1.ebuild b/dev-util/kdevelop/kdevelop-5.6.1.ebuild
new file mode 100644
index 000000000000..262a77ad4251
--- /dev/null
+++ b/dev-util/kdevelop/kdevelop-5.6.1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KDE_ORG_CATEGORY="kdevelop"
+KFMIN=5.74.0
+QTMIN=5.15.1
+VIRTUALDBUS_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
+HOMEPAGE="https://kdevelop.org/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="5/56" # look at KDEVELOP_SOVERSION inside CMakeLists.txt
+IUSE="+gdbui hex +plasma +qmake reviewboard subversion"
+
+COMMON_DEPEND="
+	dev-libs/grantlee:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qthelp-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qttest-${QTMIN}:5
+	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=dev-util/astyle-3.1:=
+	kde-apps/libkomparediff2:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	>=kde-frameworks/threadweaver-${KFMIN}:5
+	>=sys-devel/clang-6.0:=
+	gdbui? ( kde-plasma/libksysguard:5= )
+	hex? ( app-editors/okteta:5 )
+	plasma? (
+		>=kde-frameworks/krunner-${KFMIN}:5
+		>=kde-frameworks/plasma-${KFMIN}:5
+	)
+	qmake? ( dev-util/kdevelop-pg-qt:5 )
+	reviewboard? ( >=kde-frameworks/purpose-${KFMIN}:5 )
+	subversion? (
+		dev-libs/apr:1
+		dev-libs/apr-util:1
+		dev-vcs/subversion
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qdbus-${QTMIN}:5
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	dev-util/ninja
+	kde-apps/kapptemplate:5
+	kde-apps/kio-extras:5
+	>=sys-devel/gdb-7.0[python]
+	reviewboard? ( kde-apps/ktp-accounts-kcm:5 )
+	!dev-util/kdevelop-clang-tidy
+"
+
+RESTRICT+=" test"
+# see bug 366471
+
+src_configure() {
+	local clang_version=$(best_version sys-devel/clang)
+	local llvm_root="/usr/lib/llvm/$(ver_cut 1 ${clang_version##sys-devel/clang-})"
+
+	local mycmakeargs=(
+		-DLLVM_ROOT=${llvm_root}
+		$(cmake_use_find_package gdbui KSysGuard)
+		-DBUILD_executeplasmoid=$(usex plasma)
+		$(cmake_use_find_package plasma KF5Plasma)
+		$(cmake_use_find_package hex OktetaKastenControllers)
+		$(cmake_use_find_package qmake KDevelop-PG-Qt)
+		$(cmake_use_find_package reviewboard KF5Purpose)
+		$(cmake_use_find_package subversion SubversionLibrary)
+	)
+
+	use gdbui || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5SysGuard=ON )
+	use reviewboard || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON )
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Optional dependencies:"
+		optfeature "konsole view" kde-apps/konsole
+		optfeature "Static C++ Qt code analysis" dev-util/clazy
+		optfeature "Static C/C++ code analysis" dev-util/cppcheck
+		optfeature "Heap memory profiling" dev-util/heaptrack[qt5]
+		optfeature "Meson Project manager plugin" dev-util/meson
+	fi
+	ecm_pkg_postinst
+}
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index ffd2c374f1de..5f6b535cc86b 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -1,11 +1,11 @@
-DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
+DIST llvmorg-11.0.1-rc1.tar.gz 122777435 BLAKE2B 23b520d33cf4b641027ee52bb10c6171d60356c9167d5b94012929e6e547c526cda1a6177c295ed19592dfb83b020f63b2cef4cabc70ce9a2a8e098fe654a3cd SHA512 605c7bbff1610f335be8ea4f1204df797fed21185a54c77565f6ff2d00794d1967e9c5fab7c87633e242f2f999bdffb76da83f756d261c1ca476114599409ae1
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD lldb-10.0.0.ebuild 2477 BLAKE2B 21be1f15644d0c00a5c9fb21d0874b2784116b16a36190947b1df9d4a962a9cefae2e386c741b91b3e60709e1cb8fa8d8327f38c310198641a0c91aaecda9d0b SHA512 61bff2bfcdb91f14c8a4f70b59136df0b39fbdc86aa43e090f116e11e8e03ff0af15d3ca0b0ae7dfd516207e3457b670f08c1cf4198ecd979c5e1c2b4f7fb117
 EBUILD lldb-10.0.1.ebuild 2335 BLAKE2B 1e8212cd840aa2898451bca1c2670f443707738b4c8ca9c673f9e940fa918d0f742b04273f9d2899791aebb2db499bf210605f9ed90479029d4c25add49a310c SHA512 86f5ded28593601e21abf270a0dd0ff703c1ef863534cae87ec72f67ddf8de4fc3394b7088be9d38dfb39a79c1593a57b3df4f5a167e96e6aa1a34c2b1c8f656
-EBUILD lldb-11.0.0.9999.ebuild 2375 BLAKE2B 1be4c3300661c9b6adcc94c7b47954506de3ceda677f0c7df84a4a98f46a61338bdbe9d21688cff76abc3d07f23ef83f1e62c943e999b3b955f70be81ae1d862 SHA512 47d27d3edc618f93850199aaf89cbd081f2346ba6b9a370571901994f66519f780babe6e63f189b8b6a3153c311866527777256100599379d81a277456c64d45
 EBUILD lldb-11.0.0.ebuild 2383 BLAKE2B 86df01e0663b79c93b5816c6cbf4ec9a995cded9350d100bbdbad9b9ab7529fedf0244274718a919a003209ad0c48580192a06aeb19f3ca4c06bea0c9d35f9b7 SHA512 ddc49fda9558b794f08ed9c3b0f91ea3fffc67ab171354a7f229790a7b2f05d0b144da8bbc686571a5f9dc1f0fbf5fc502bf99ec3f8897d4537b0ba9ad69a7e4
-EBUILD lldb-12.0.0.9999.ebuild 2364 BLAKE2B 8675e540428b1f3618cb35e1ae3a624c9c1f1d0c65177921c0cd2c77013732b8f7b933241e3984ca764ae87799126eb420b89dc34ba028745cef42a645a53afb SHA512 a3742b37d65b30e9fea09dc3a80e2e944fbd642364842c9f9bc8f665549bad8ac30afb3c678d1346b836f9f90b794c213d4fde59907df95a79b32f23419d4b51
+EBUILD lldb-11.0.1.9999.ebuild 2377 BLAKE2B 24e812157bf567f7fe15f3cfd87be257d497f3718344d811289268e8dbc88a3fef3f5c93fb40b05b3f7d2c967e7eb8c995d558c5d735ffc770c2d2ae20a35c99 SHA512 84be51f4c642347a8d9210aab04c5de8c990c8cd413fc575aa3a8d4eadf8b83ea5c0f3df41d60b41deab20b1cde465ee9262a17e7f6cf9eca44f20210dc17c5f
+EBUILD lldb-11.0.1_rc1.ebuild 2377 BLAKE2B 24e812157bf567f7fe15f3cfd87be257d497f3718344d811289268e8dbc88a3fef3f5c93fb40b05b3f7d2c967e7eb8c995d558c5d735ffc770c2d2ae20a35c99 SHA512 84be51f4c642347a8d9210aab04c5de8c990c8cd413fc575aa3a8d4eadf8b83ea5c0f3df41d60b41deab20b1cde465ee9262a17e7f6cf9eca44f20210dc17c5f
+EBUILD lldb-12.0.0.9999.ebuild 2366 BLAKE2B 4dc3eb12f0168e7915b6baaee930a79ff514e2ea900562c3ed46c01e6d115bd7bfeff34ae1f65e46fc8b6d142b7de63b848b38d35f0306c185793ead33cdf752 SHA512 61b66d649f28a0dea7805ebec036ea6c805c76d4bc9cf8c9ba778cdd6f7568c6c3d5c803f6510374fbb2f483c24056e6bd0a01b338bed30cab9f98d39d260622
 EBUILD lldb-9.0.1-r1.ebuild 2391 BLAKE2B c0e73cf6e7c6fc153855681daa373618baffa2d45bd290855633d957464e99d86112918eec8aa0b43a975750e8ccd87fbffe2594b0110ac406eab8579c654f72 SHA512 8edadff2f01c15b75d894e30546a00826f140a81bc0ebfb5fb214eb5d133d8390b18a3075746fe94f061b36fcea9fb981ecd6de3d0567f73736c388af62c6320
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-util/lldb/lldb-11.0.0.9999.ebuild b/dev-util/lldb/lldb-11.0.1.9999.ebuild
index f16add65dbfc..e3f6cc1ae822 100644
--- a/dev-util/lldb/lldb-11.0.0.9999.ebuild
+++ b/dev-util/lldb/lldb-11.0.1.9999.ebuild
@@ -8,9 +8,6 @@ inherit cmake llvm llvm.org python-single-r1 toolchain-funcs
 
 DESCRIPTION="The LLVM debugger"
 HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( lldb )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
-llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
@@ -40,9 +37,14 @@ BDEPEND="
 		$(python_gen_cond_dep "
 			~dev-python/lit-${PV}[\${PYTHON_MULTI_USEDEP}]
 		")
-		sys-devel/lld )
+		sys-devel/lld
+	)
 	${PYTHON_DEPS}"
 
+LLVM_COMPONENTS=( lldb )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
+llvm.org_set_globals
+
 pkg_setup() {
 	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
 	python-single-r1_pkg_setup
diff --git a/dev-util/lldb/lldb-10.0.0.ebuild b/dev-util/lldb/lldb-11.0.1_rc1.ebuild
index 950cb52a4b4f..e3f6cc1ae822 100644
--- a/dev-util/lldb/lldb-10.0.0.ebuild
+++ b/dev-util/lldb/lldb-11.0.1_rc1.ebuild
@@ -3,19 +3,15 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-utils llvm llvm.org multiprocessing python-single-r1 \
-	toolchain-funcs
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm llvm.org python-single-r1 toolchain-funcs
 
 DESCRIPTION="The LLVM debugger"
 HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( lldb )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
-llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
+KEYWORDS=""
 IUSE="libedit lzma ncurses +python test"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RESTRICT="!test? ( test )"
@@ -35,16 +31,19 @@ RDEPEND="
 	!<sys-devel/llvm-4.0"
 DEPEND="${RDEPEND}"
 BDEPEND="
+	>=dev-util/cmake-3.16
 	python? ( >=dev-lang/swig-3.0.11 )
 	test? (
 		$(python_gen_cond_dep "
 			~dev-python/lit-${PV}[\${PYTHON_MULTI_USEDEP}]
 		")
-		sys-devel/lld )
+		sys-devel/lld
+	)
 	${PYTHON_DEPS}"
 
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
+LLVM_COMPONENTS=( lldb )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
+llvm.org_set_globals
 
 pkg_setup() {
 	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
@@ -72,6 +71,8 @@ src_configure() {
 		# ncurses with complete library set (including autodetection
 		# of -ltinfo)
 		-DCURSES_NEED_NCURSES=ON
+
+		-DPython3_EXECUTABLE="${PYTHON}"
 	)
 	use test && mycmakeargs+=(
 		-DLLVM_BUILD_TESTS=$(usex test)
@@ -80,20 +81,21 @@ src_configure() {
 
 		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
 		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
 	local -x LIT_PRESERVES_TMP=1
-	cmake-utils_src_make check-lldb-lit
-	use python && cmake-utils_src_make check-lldb
+	cmake_build check-lldb-lit
+	# failures + hangs
+	#use python && cmake_build check-lldb
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	find "${D}" -name '*.a' -delete || die
 
 	use python && python_optimize
diff --git a/dev-util/lldb/lldb-12.0.0.9999.ebuild b/dev-util/lldb/lldb-12.0.0.9999.ebuild
index 9e83aa0a2497..bcf3d783cb74 100644
--- a/dev-util/lldb/lldb-12.0.0.9999.ebuild
+++ b/dev-util/lldb/lldb-12.0.0.9999.ebuild
@@ -8,9 +8,6 @@ inherit cmake llvm llvm.org python-single-r1 toolchain-funcs
 
 DESCRIPTION="The LLVM debugger"
 HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( lldb )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
-llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
@@ -40,9 +37,14 @@ BDEPEND="
 		$(python_gen_cond_dep "
 			~dev-python/lit-${PV}[\${PYTHON_MULTI_USEDEP}]
 		")
-		sys-devel/lld )
+		sys-devel/lld
+	)
 	${PYTHON_DEPS}"
 
+LLVM_COMPONENTS=( lldb )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
+llvm.org_set_globals
+
 pkg_setup() {
 	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
 	python-single-r1_pkg_setup
diff --git a/dev-util/lttng-ust/Manifest b/dev-util/lttng-ust/Manifest
index 9dc55a369e1d..db0cbd59cabf 100644
--- a/dev-util/lttng-ust/Manifest
+++ b/dev-util/lttng-ust/Manifest
@@ -4,7 +4,7 @@ DIST lttng-ust-2.11.0.tar.bz2 824285 BLAKE2B 161d50282a95cce47ab3811216241ade73e
 DIST lttng-ust-2.7.1.tar.bz2 643906 BLAKE2B 2ef4be03ce3b2bcc8e781c2b6e798ee00bb85d7f7039ad34fc49b3bfda46142d65fc98d19fefefb3e375e6f0de95292a1e15de25318b2da62b51d9fb017b43a1 SHA512 80ba4b79df2a0ba0606a31145a427c8c5b30e2a4ace20f9e4602738ace99fe88146569de549288ff33c809a606b6973c17c3effcf9699b5dca3383b8da5b10ee
 DIST lttng-ust-2.8.1.tar.bz2 743271 BLAKE2B d6adac00525ab747306288dd71f27ce982dd93e4ff42b9938064ae1435ad1c0867acebe3030a33748dc9aa78b6200ba2c47631e4359a963772fc4685472d21ae SHA512 15c459620cb73ef5be8c7df2ef02663ef650555b973a3d1ed976ae38068b53a8c83143a611bcb53e91a3f211361c44cd2a331cb41dd53d28a69924f7ac44cc95
 EBUILD lttng-ust-2.10.6.ebuild 631 BLAKE2B 5152ec21ce38221c5ac845b5a5b7fe1d0408b2c84f564145b5b71fa868ec9c129bcd91868b138d9328e46e0ae3177b90678276b74bdcbdd07a37a463a8edb3a7 SHA512 ff342925629a70af6feb62eb11126f12f5c49d64d28ca98d26c2938d97c5187cfb2e05a7d7f60fc1c479ade9faa45f7b59d81eb867e52bb93b66cf0cd8e51e5e
-EBUILD lttng-ust-2.11.0.ebuild 766 BLAKE2B a4fab5bd37c7f5e35c895a1d82e2b9c991259ddb37f0f9f48a68f58907e6b9b5829f7e8b461c32883a7e9049b21129fa0f391a5b08891c994750ecb5d84492c8 SHA512 d928f25eaed1b5dda4f26886bc1d0fb3a1923b34fa21e3112a48f28c2fd82607313a0b654c2f366bf505cc6e823a46634df20fa748467a3041b0f1dca8b05c0f
+EBUILD lttng-ust-2.11.0.ebuild 773 BLAKE2B 8ab82f84b6e9a444e8e24f02d3c3ff51f9dc187f8e327f709f86126e4b770987ac45f29f0bf2a24e8c56affb1f7834769bf78800424d715b1ebbb8a661911541 SHA512 cf354f8e33cb778b58b8afdbd64720eea0a13afe4362641fa59057531f31f9279b927b4359b1f8da6f466eba0d7f31ccd5eec043eab6300e369e5686ee056233
 EBUILD lttng-ust-2.7.1.ebuild 633 BLAKE2B 646b4940625af6ab525b2b3e5cb1736f1235cc87d9aac55e36f2766922dc1d74cad537d74f203a343ac8378aad49dc2de63412cf253780a305f468fd65794787 SHA512 ab93a93b6f670d1e7d1d4f1def1ac3710b141167d62b0c450716cdab0a47b6cde6731ea3162c94a6d58399a6d7aa5afcde26c224d1faca3599e74a65ee700cd3
 EBUILD lttng-ust-2.8.1.ebuild 660 BLAKE2B 430d2052ce40c58a00a2b8b32cb43f793f9adc2488a90f073dcdfb1ee6daf1f575a398c08b6070ec7f7e94a776322cccefd69693ac25736a011a44c79f2ea240 SHA512 0dd349fb6bd5a1892e6bfa3c4436347250a2931b9390dcdc06bb121ce2dabf5b96c3fe88d13005acfd4ffa558248edd1426b25eeef310773249dcb76fb3f768c
 MISC metadata.xml 700 BLAKE2B 868502f60e5fe09cbd2a2abd0794920341ccb496eaf2b1bbeaf377c0d894b35e950f79636e334ec910dd3ea0e3f2a205eb849b3bb2eaf17c1b7851e630a186fe SHA512 dda0af06ba5f4c5cf8b01aa61989c910acb58ff96b0e50f23f43f8d1932194a954bd3e1ae38ef052e4ad4d32dd025a082fea1de739ca1d9e4a2f60bf8ecbcae4
diff --git a/dev-util/lttng-ust/lttng-ust-2.11.0.ebuild b/dev-util/lttng-ust/lttng-ust-2.11.0.ebuild
index 224f06a6fe9e..bbe2663203dd 100644
--- a/dev-util/lttng-ust/lttng-ust-2.11.0.ebuild
+++ b/dev-util/lttng-ust/lttng-ust-2.11.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/${MY_SLOT}"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="examples numa"
 
 DEPEND="
diff --git a/dev-util/mdds/Manifest b/dev-util/mdds/Manifest
index 60689188f16b..26392ff5d9f1 100644
--- a/dev-util/mdds/Manifest
+++ b/dev-util/mdds/Manifest
@@ -1,9 +1,6 @@
 AUX mdds-1.5.0-buildsystem.patch 1006 BLAKE2B a6205a749a5a619443a060912bd863c93f74eb88cc68e62b077bdbab0a3e67e2f9ab35774ec5fcd23599b5b10478f529ebd2f89806fe926786d63967f83a9075 SHA512 eb03daf08605c9e54326621af3be39214659627fc4922c9cd3f031073f78a0823c2f1bb7267eb671c189b0326f9ff5d1fe3f60cda14fe9a7ac58d293972d67b9
-AUX mdds-1.6.0-bashism.patch 2041 BLAKE2B 3b67fed97b47e4ce284125df1caad1486d6b2d981877eb9b9fcd0ace4f682f176408b6f7d69306557c2713e76a4b879ebf74e4c767caa8fa68cb17a134a5954f SHA512 de2d1851b20267bc7391bdc2fc41d21147f069fddcfe378ac10838ebdee87d01f424dc355cdbc19b6064fdd41de376c4fdf492da11a16e0678878b4335a5cbd2
 AUX mdds-1.7.0-bashism.patch 2061 BLAKE2B 766eb3b27b55f058175894d01c91d4b9fa544c8ba15fab79eafb0e333ddf86ed328fa928d21add6bb2da9a31420f35de3a97e960723ce2766b898313434c56d5 SHA512 4994df435477e600aba80c8c7e80cf2b8a76f4d20b19090b61ce94aadfa3d9ff0b75d26fc88094a6b1aa5742fd5ddc70a535dcb6456c890416ac9393aeab0738
-DIST mdds-1.6.0.tar.bz2 350406 BLAKE2B 70a99d779f318140f37bb3f873f1845c153f389a9e671a4d9ee4d1f0e762db312d536392061923c3c02494df6945a5a7743480eca1020d9cda6f3495888d7b00 SHA512 7c66894748e998f24374a5c6ea342ae2736e4bdba53be89510a1674690517ed7303786e1290fcfa26b07f236788c192ad29790129c228074397ab43699cdb290
 DIST mdds-1.7.0.tar.xz 313220 BLAKE2B 02ab09ad1338223da2911c05fc8d67c9d0d5414d1dcedac066dc95a2b0853f3801347c9791a5fc5700d666933be78efc52f735453769f9f2123ce06eca1fa67f SHA512 ac2bfe5186d499a79f4379c1dc7cc869bbbd9a59d4943399409dd4dd1ef7e3567a993deda5d5a06ad67dbd94b0a534439805837f2f405c5aca0aeb197178291a
-EBUILD mdds-1.6.0.ebuild 1376 BLAKE2B a09be0bf7519a5c7b09185473ac3ddd4de4c1ee17703555646034086fdb2c1101e52e6dbfd635174398da9e9fa16593826e66c64138accc0e6c263f993b8a89c SHA512 d52c9d2155fcc405f87399af47d6dcd1b9832d336dcd7e7fc70358bb7478a81f4a2c2b341d7edef39ee3bafb0ee48f0421ab1589573242df10ed28ba39317cc5
 EBUILD mdds-1.7.0.ebuild 1372 BLAKE2B f032869d8a76a81c0c69306c50744808fc496f152e3ffc6c009c2dfd2f3b248cfce16a31b94f69a8e1d5fa6b7d2541fcabf583da8989919f7e9d74d2a21871b5 SHA512 7d5cd45025533c21387c50d034d61acd72c838859fd94b669340c4d7e082dcfd9543a60a96d4c9c3c873c55a38fe93967a9fb2d490e43fb65be3256e66c2b230
 EBUILD mdds-9999.ebuild 1331 BLAKE2B c100cdb0e2f8cfbcdd67ad7789c34d7528d8d3a01f8c328e20b10021286ad36b5d5dab9e21cf3c185c65d2a1d284c4a04fec29fe5c91da3172d74130d3390a8c SHA512 694a84b819dcab0fa40ebfb2d6b90949c23feaeb7350e771057d48ace29356d66551d40470d6f45442c87a4c145bcfc916caa4bbb23a2c39e2333171ca722504
 MISC metadata.xml 456 BLAKE2B 18fd8f49cbbb2b86b19ef2aaa0dcc1ae57c16597e4357c7f18eeb529972931234fa165e3d1a8a65f1f5b004fed57bfb09896a6b5505fd71d2ffe7cd2a2a42f3b SHA512 51aa3106f9bb7b962e7225e88fb56335b0bef35dc1749866a4e44290ca0cac510be348aa6b5542f536a8b3bdc83dbf39c4af6b79dc603047a7a6ba6980842d71
diff --git a/dev-util/mdds/files/mdds-1.6.0-bashism.patch b/dev-util/mdds/files/mdds-1.6.0-bashism.patch
deleted file mode 100644
index 4fa155c653fb..000000000000
--- a/dev-util/mdds/files/mdds-1.6.0-bashism.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 65da7c25f4d8204b1379a0afb46d82dc1b263ab0 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Thu, 28 May 2020 18:36:07 +0200
-Subject: [PATCH] Fix bashisms in configure.ac
-
----
- configure.ac | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 00ab937..2282165 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -32,7 +32,7 @@ AC_ARG_ENABLE(debug-stdcxx,
- ]
- ,debug_stdcxx=yes)
- 
--AS_IF([test x"$debug_stdcxx" == "xyes"], [
-+AS_IF([test x"$debug_stdcxx" = "xyes"], [
-   CXXFLAGS="$CXXFLAGS -D_GLIBCXX_DEBUG"
- ])
- 
-@@ -42,7 +42,7 @@ AC_ARG_ENABLE(release-tests,
- ]
- ,release_tests=yes)
- 
--AS_IF([test x"$release_tests" == "xyes"], [
-+AS_IF([test x"$release_tests" = "xyes"], [
-   CXXFLAGS="$CXXFLAGS -DNDEBUG -O2"
- ])
- 
-@@ -56,11 +56,11 @@ AC_ARG_ENABLE(loop-unrolling,
-     [enable_loop_unrolling="$enableval"],[enable_loop_unrolling=yes]
- )
- 
--AS_IF([test x"$enable_loop_unrolling" == "xno"], [
-+AS_IF([test x"$enable_loop_unrolling" = "xno"], [
-   CXXFLAGS="$CXXFLAGS -DMDDS_LOOP_UNROLLING=0"
- ])
- 
--AS_IF([test x"$enable_gcov" == "xyes"], [
-+AS_IF([test x"$enable_gcov" = "xyes"], [
-   CXXFLAGS="$CXXFLAGS --coverage -O0"
- ])
- 
-@@ -69,7 +69,7 @@ AC_ARG_ENABLE(openmp,
-     [enable_openmp="$enableval"],[enable_openmp=yes]
- )
- 
--AS_IF([test x"$enable_openmp" == "xyes"], [
-+AS_IF([test x"$enable_openmp" = "xyes"], [
-   CXXFLAGS="$CXXFLAGS -fopenmp"
-   LDFLAGS="$LDFLAGS -fopenmp"
- ])
-@@ -79,7 +79,7 @@ AC_ARG_ENABLE(sanitizer-coverage,
-     [enable_sanitizer_coverage="$enableval"],[enable_sanitizer_coverage=no]
- )
- 
--AS_IF([test x"$enable_sanitizer_coverage" == "xyes"], [
-+AS_IF([test x"$enable_sanitizer_coverage" = "xyes"], [
-   CXXFLAGS="$CXXFLAGS -fprofile-instr-generate -fcoverage-mapping -O0"
- ])
- 
-@@ -122,7 +122,7 @@ AC_ARG_ENABLE([werror],
- 	[enable_werror="$enableval"],
- 	[enable_werror=no]
- )
--AS_IF([test x"$enable_werror" == "xyes"], [
-+AS_IF([test x"$enable_werror" = "xyes"], [
- 	CXXFLAGS="$CXXFLAGS -Werror"
- ])
- 
--- 
-2.26.2
-
diff --git a/dev-util/mdds/mdds-1.6.0.ebuild b/dev-util/mdds/mdds-1.6.0.ebuild
deleted file mode 100644
index 916b5bce61ac..000000000000
--- a/dev-util/mdds/mdds-1.6.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == *9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.com/mdds/mdds.git"
-	inherit git-r3
-else
-	SRC_URI="https://kohei.us/files/${PN}/src/${P}.tar.bz2"
-	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-fi
-inherit autotools toolchain-funcs
-
-DESCRIPTION="A collection of multi-dimensional data structure and indexing algorithm"
-HOMEPAGE="https://gitlab.com/mdds/mdds"
-
-LICENSE="MIT"
-SLOT="1/1.5" # Check API version on version bumps!
-IUSE="doc openmp valgrind test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	doc? (
-		app-doc/doxygen
-		dev-python/sphinx
-	)
-	valgrind? ( dev-util/valgrind )
-"
-DEPEND="dev-libs/boost:="
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.5.0-buildsystem.patch"
-	"${FILESDIR}/${P}-bashism.patch" # bug 723094
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable doc docs)
-		$(use_enable valgrind memory_tests)
-	)
-	if use openmp && tc-has-openmp; then
-		myeconfargs+=( --enable-openmp )
-	else
-		myeconfargs+=( --disable-openmp )
-	fi
-
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	tc-export CXX
-
-	default
-}
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 665a0a33ea27..024cbd40730d 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,3 +1,3 @@
 DIST meld-3.20.2.tar.xz 593948 BLAKE2B 9f2fee48405d76f9ae2fd0b0dd4116321aa176059dd4ef217a5c4c8d0edff5859bab72bbca83b2e7d612706f017d1889d68579eaf9838d7784c9ecb74ed7d403 SHA512 9c9074cb879e3574eb9a1025eb1212771419ab0d8e92bf8a99f38e70ca583ff5c8cbeaccb87b414e6ff73a61afa08e10742991d574b810cc90e8c4a5ac82ddaa
-EBUILD meld-3.20.2-r1.ebuild 1406 BLAKE2B 13584822203873664df1a2b03fd6766349edff3892cbf33184c460dc0038039a35ed06f02b300334c55d5b50c91f21008a07a86e091b4f2c5d9ba5e328cea4bb SHA512 a9d3bc2ff9b5bc006d5e15ecfd69a5b00063a26984cd1d9945dddeaa2bf7784da1083a65b46155d65d633321be7699671a6f210ea1a1f28b306326668ce8500f
+EBUILD meld-3.20.2-r1.ebuild 1413 BLAKE2B 539d5f21deee3584931dc6c6796e2fa49a9e6f693f5ca639e0fa9d8e0e7216442107d10d304d0b42d29d8a568323c72445b2a7a5966fbb5d07745a3c5c182bfe SHA512 f4d578e70b08d477b7e201a33aae001b12783fc3048a053031e50fd41015e01940da73d4dfd741854dd799170d2432acd3e62b878af108560cd614b0b043b686
 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 cd83e457a06a..dc488f67b46a 100644
--- a/dev-util/meld/meld-3.20.2-r1.ebuild
+++ b/dev-util/meld/meld-3.20.2-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://meldmerge.org/"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest
index ef6b741fcb0a..719c179c1993 100644
--- a/dev-util/ninja/Manifest
+++ b/dev-util/ninja/Manifest
@@ -2,7 +2,9 @@ AUX ninja-1.10.0-readme.patch 1334 BLAKE2B 22543d95e66045b5b2c489cbb823c9c75ca20
 AUX ninja-cflags.patch 738 BLAKE2B ec025836197d41d96cfcab0a7363ab3bda50cb7fc3f91f096ccfaa16babdc353269738aef92e68a261f43ba617720f677766f7044acb1a01dd7e07d6c9eca13e SHA512 97935accbef92e6eeda7d38bae6978016f4423e3989fcfb13c6de55644133ddef43db49811fc85d2649d68473d8b81e1bfb70f59a5e63d2607741d90152a4f42
 DIST ninja-1.10.0.tar.gz 210313 BLAKE2B 0a3db145deaea8a990958ad2e812bc18ed014aaba94911a2905b082745a0d08f10ce1113badabaa362f3834540b7bd3858f07e2a5fce268c66d3d6c73e974e76 SHA512 5ed47ef1ff18a03eb73296629679a8617a08ee443e10e28ae9cb24e4506f84fe1eb142888adea9a62364b626b35817def8c55ba956c9b3cbc7b82d3e62293044
 DIST ninja-1.10.1.tar.gz 211216 BLAKE2B cb27beeef903ff7c5a00f2ac85b36e66d9c41bcb271edbb6c6d827d5b2b652bacfe3d429a3f966d22fd97495323f83692abf7835f3d6ed3af51a3df9fef180c1 SHA512 9915767a6ffc7147903f346082b5c31fcaeb1e45742754cfaaa642e8ec4c1bd9ec26692a59eb4e2118c397336712a6548e6a16408e094001f8f0c173e67afcc2
+DIST ninja-1.10.2.tar.gz 213959 BLAKE2B b8160ca6d58cfa0edb93d16b7dfb9776d290c42e54b33b78cd925f167c80f8794e4cc30af984a526b8263c7904a734cf0770d3c27283d21d02f18d3e2eb70032 SHA512 895412ae1cbc83c656e92f282602a29300e08274e9dea0da4464202ae556e7a1ab03bec057f23da4756bbd91bd2d744cd7a64b336740fd2782bb4db5c3b7b496
 EBUILD ninja-1.10.0.ebuild 2687 BLAKE2B e025b310f8ba38be99d226155b365e3a62d5230fbccbe24f045a396b313ee3e8cff7785a9cc3a1e2c55586a4953863d37c7a64fcb0a9a26a1924a335c4b8ca7c SHA512 d25cbb60faa8cf707c4850ae431cb9f46c024ddb32683b226c906294b2dc40f3cd5df5faacc2a6ee968a98cd1df6bdd6ee958e8e3c536b90bafaa96d311115db
-EBUILD ninja-1.10.1.ebuild 2649 BLAKE2B 780f566a6a8e8b7580276897047de0969ea104459eba255de5f9c1a7e805fac28c120594eedbbb99a20d08eaa501641c720b2ff2f93ace0b6b18df87dd51d1de SHA512 cb202c83509546f6d9a64851b3ec80cb08e4e6740dfe91a553ca6a5453b99f829bfb76b1c40c4ca13ed39d0f5e132f6c47615f03a2313e77c79a683f7dadd7a7
+EBUILD ninja-1.10.1.ebuild 2648 BLAKE2B c2207e99eafb807dfd3c2fc92bd2a95bb807d338098f05fc8d37e57febb7d92447e7e21434c5a01c04a4257a8de5c10c37040f2e6be1569d690518f1e387a715 SHA512 06d81ac9a2021f27c75847ff7ae0a68a7652f0b1497d10326b2edf91bbf869e9e9142c3dd2b14c151b55220d78b898ad05f9d86990bd52c85802cd71b1e56baf
+EBUILD ninja-1.10.2.ebuild 2657 BLAKE2B f7ce3fd75ba0221b701aee7845ebda0476365284914291f2568cf563126819dbb4b1c9ac46d4066ff3db5e3b3823d294d373d33ba58ffe499ea043a0db07f846 SHA512 9228921ff8ac1a4c27f1b03931198c0577d5e79064b24b62d911b5c16cce8a55548c08bb5b2da2416b11259785cbac6dde06dbcc3857b2190896d363ca9f6c3d
 EBUILD ninja-9999.ebuild 2605 BLAKE2B 63f1a467b6a02f99b2db9555d7bfe54c0f7232e7c0e1551f0b440d1e77926876eb9c461540b57788d43499246f8d595244313ecee2b99146e01d4f7a8503c785 SHA512 e4028a3e3fbc58b02faa9e1b857ca45985490e6beb446474fe00acc781101b9c2a76cd777d5f3f71f072ceea32050b6bb1a9d7f97b149898a80315df4b644d6f
 MISC metadata.xml 340 BLAKE2B 7cf71b1a09f74328ea74362db4250bf038c0455dcd5f65676ceb5d80a61b5c2923696ecfeccf9d6cd264633e7dc00daa80bf960cc67e5b889d18d487d8e89b97 SHA512 4b78365b98eb9b8a1ef27115261dbf426942cccb7be03c8264e2728e60dedfec8fa51ee3f43488043be5af21b28a74c1c81f4767bcc58574873c2223172447b2
diff --git a/dev-util/ninja/ninja-1.10.1.ebuild b/dev-util/ninja/ninja-1.10.1.ebuild
index f9153242f055..b5f5107e6278 100644
--- a/dev-util/ninja/ninja-1.10.1.ebuild
+++ b/dev-util/ninja/ninja-1.10.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
 else
 	SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A small build system similar to make"
diff --git a/dev-util/ninja/ninja-1.10.2.ebuild b/dev-util/ninja/ninja-1.10.2.ebuild
new file mode 100644
index 000000000000..4fa91eecab51
--- /dev/null
+++ b/dev-util/ninja/ninja-1.10.2.ebuild
@@ -0,0 +1,132 @@
+# Copyright 2012-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
+else
+	SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A small build system similar to make"
+HOMEPAGE="https://ninja-build.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+IUSE="doc emacs test vim-syntax"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/re2c
+	doc? (
+		app-text/asciidoc
+		app-doc/doxygen
+		dev-libs/libxslt
+	)
+	test? ( dev-cpp/gtest )
+"
+RDEPEND="
+	emacs? ( >=app-editors/emacs-23.1:* )
+	vim-syntax? (
+		|| (
+			app-editors/vim
+			app-editors/gvim
+		)
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/ninja-cflags.patch
+)
+
+run_for_build() {
+	if tc-is-cross-compiler; then
+		local -x AR=$(tc-getBUILD_AR)
+		local -x CXX=$(tc-getBUILD_CXX)
+		local -x CFLAGS=
+		local -x CXXFLAGS=${BUILD_CXXFLAGS}
+		local -x LDFLAGS=${BUILD_LDFLAGS}
+	fi
+	echo "$@" >&2
+	"$@"
+}
+
+src_compile() {
+	tc-export AR CXX
+
+	# configure.py appends CFLAGS to CXXFLAGS
+	unset CFLAGS
+
+	run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die
+
+	if tc-is-cross-compiler; then
+		mv ninja ninja-build || die
+		${EPYTHON} configure.py || die
+		./ninja-build -v ninja || die
+	else
+		ln ninja ninja-build || die
+	fi
+
+	if use doc; then
+		./ninja-build -v doxygen manual || die
+	fi
+
+	if use emacs; then
+		elisp-compile misc/ninja-mode.el || die
+	fi
+}
+
+src_test() {
+	if ! tc-is-cross-compiler; then
+		# Bug 485772
+		ulimit -n 2048
+		./ninja -v ninja_test || die
+		./ninja_test || die
+	fi
+}
+
+src_install() {
+	dodoc README.md CONTRIBUTING.md
+	if use doc; then
+		docinto html
+		dodoc -r doc/doxygen/html/.
+		dodoc doc/manual.html
+	fi
+	dobin ninja
+
+	newbashcomp misc/bash-completion "${PN}"
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax/
+		doins misc/ninja.vim
+
+		echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}/ninja.vim"
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${T}/ninja.vim"
+	fi
+
+	insinto /usr/share/zsh/site-functions
+	newins misc/zsh-completion _ninja
+
+	if use emacs; then
+		cd misc || die
+		elisp-install ninja ninja-mode.el* || die
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index 733d47cdfd83..b918cba41f1d 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -6,6 +6,7 @@ DIST cuda_10.1.243_418.87.00_linux.run 2572375299 BLAKE2B df9cb4faeeeeecc536e726
 DIST cuda_10.2.89_440.33.01_linux.run 2645419389 BLAKE2B 236aa70a7b45e3636c2c229fffa7d1ca0699ab4365865a73edab607a209c42c2899133dd6a83c61c5929fa754668ad15aec4d847639af1c00a8e6657c8487c77 SHA512 ad8da539ff5df7caf411d1e497ff3d6978cfa8a1fd9150fa4846089e92a604ea56be8631f3efdfe7229a655b8d2d28e6edb32f5731530a77d6f00241cc7aab6e
 DIST cuda_11.0.3_450.51.06_linux.run 3112522594 BLAKE2B f458aeebee3f7145f46c5607d1743d350ed96e9b8fd824fd94d2c998bcd8ccf3ef924cf37e95ce002ba92f464edd5004164497e820084953613ec2deb6edb144 SHA512 e7014c868c0bf40c000b1fd14d156265773a399782937cc85a2b09cd62abddcacdc20b412e1cc91c3877d01563cf054b1e021f047b32cfff4ab516e7167382dd
 DIST cuda_11.1.0_455.23.05_linux.run 3498245611 BLAKE2B 754d974acf309a0f2f969bb3312949aa5469b3ec6ebfc4a89f244420cecebc22dc19fb9f63ec7d5c177eeb533a8984cb6bfa8d271ba36d02aacce22d42442ba4 SHA512 b5d64f20dbb51f12c558be4a724c18ddcd6d18670036efb63d19bb8009300463b8051dd1a2d2d7768bf3076681954ea690af399651da832ba00867a3f4a9acdf
+DIST cuda_11.1.1_455.32.00_linux.run 3532172082 BLAKE2B f4af6bd87c419c002b4913ea7cfcbc84c78e3da485a7ac7dff0da483347cb38bde020e70c7352fe995a2efe0b8e97a156e0536f87aef69ff13fdf6e75fa634d1 SHA512 3da629e6f63548d06050a77d6ad2dbf314db33b2bf4e7d1659f039b3d9ad2ad3f87a6e506ec54db9ca2d21ac7b5ec576748082684bbab3b6642c03d2793d73a9
 DIST cuda_6.5.14_linux_32.run 76788277 BLAKE2B 75e79dce6cac5155bde8a3cafa945047c489b10272f8a3b94bf55d499df4b9c8b82506a81a20f9fd816bd4fd0514e515a6435399db1cb62b027c76490bd4dfae SHA512 89649ee0f4543b37037b7c8f5ed0b8bd502512afb4d93e3158b3df4786123be05a5288986b5abbfe15c14eb010777d2527b715225bea96a354a898c34e4a2fcc
 DIST cuda_6.5.14_linux_64.run 972320904 BLAKE2B 4a4361fb7a90989ec4b4aa433189e7b358e5a2272fb9b9c59429e0014ac14e3b8de1b247ee98dc30c3f3ee4cc009eca4fdd86027bd3b9527a683353d60bdf5c6 SHA512 fecca731b86955f5bc7b09d88b02951e3ee5d4b1f1cf5f92658227a029b87cd35d6ac22956a5fa0afe62dcdc57191f1d12bb08c9f7cc05128727cd8455947b1e
 DIST cuda_6.5.19_linux_32.run 81882112 BLAKE2B cf55ef7c969503c156431fc56301ed4e9a1234ae0cb867f12649636069f35e56bf6fc9df7482b6baade45d78c8baa2d98c41a28696da59294e0f575c4a0344ce SHA512 1ce9bd6b472b7e4f1fb181eb340dfcb757714d59a89aaa02146cfe1a97c8ccb7eb7699b4ec823276f277eb4d82d95050eaba17e7ed5fd2e47b9b5d78531c5d4e
@@ -23,6 +24,7 @@ EBUILD nvidia-cuda-toolkit-10.1.243-r3.ebuild 4238 BLAKE2B 07fdf4e6eb0ac919a73b0
 EBUILD nvidia-cuda-toolkit-10.2.89-r2.ebuild 3992 BLAKE2B 858d1b4db64e393f061a36c3e8f22dfa83bb2e4d083ca5d987eb80b1e74ed2fb51923ecc49a4e32f52291d6ef84e1d82ab257bb345d11225e92be1368b5f4f9d SHA512 047735e7b92f12a7152b950c88d8c6b09da7772a31f4b133c8af5c8295f55d81b312b796b481dd7f6ae6767d3f2632a280533c6bcd5a22ec705dfcbd3933a94b
 EBUILD nvidia-cuda-toolkit-11.0.3.ebuild 6553 BLAKE2B dffab99d248356bc4d08f987901a0cad7941fa6b71eb684b9297a61637dfc8e964986d1dca719ae61fe2920265e5639f7afe559ac1f15cf919aeca01e37ced90 SHA512 f69720ca2b578e030a8c07b7663602aef82678274d0671d4dd1302d50ea177cd8ccd09963ff63f1e84c1f58cf5de5672e9d675c21db0b8a1500674bbd09595fb
 EBUILD nvidia-cuda-toolkit-11.1.0.ebuild 6333 BLAKE2B d436666ae256fc1256f87ca382a325df9d34cf2a0e74f1d867cc87449b0b0635eed7bb814bd079e832540f11fe4702749815f01235347e2e05a612aa6e2fe761 SHA512 2356fbfdc33d79ae3d9de86bd6e67dc2f79ed3d5b9debf26e2d090e6dcf62d72c48a804c0faa8f7627e78af1159aba9d2db837c78b91a696227756df39a13e74
+EBUILD nvidia-cuda-toolkit-11.1.1.ebuild 6333 BLAKE2B b689e1357c742fd40a01e648c5edb4fcd30a3a73a55f6f83a3b13bb4c508a097333f99b99c86f6e00c50b987541b23cee0edcd03b992ec730ecf08b771086e08 SHA512 e9c6c0f5811e137504dfe8744801511ec92aba144dbf5e0af88409ac7d069873d317b2b154fb62b30fea00239d7d0b26859b25525d785e9ff8bed3262f23a6a6
 EBUILD nvidia-cuda-toolkit-6.5.14.ebuild 3902 BLAKE2B fb559c6ca55638853cede289104f9528bc939f10c20b9c67d168caf6cc3962c06e56f25961a17acfef4c143a95648efbc7d37f2362ef4af3f40d9d289ef88dcf SHA512 c810885c9fd7747d61078fedcefe4180da8aaa4ee7fa8822908f7d8dc649fd488781ea570f9f078c6a91ac7949cef3f112e8fe8a6bca3bb0d662abbe0ba755e9
 EBUILD nvidia-cuda-toolkit-6.5.19-r1.ebuild 3928 BLAKE2B a3cc31983db891d496f5172bce661a5f1fd77a10afe0fb4ea1e243121530fc5560257c5846cc240da52986c7e6157feaace7047d0c675d0653144f5a42263a21 SHA512 9705c2ee7e76b5a66b20e08ca84c4ff998405a0816bbdd2e3d56eed21115ca154219d079943966525c71460baafdaf2858e2c7c6e08c44eff45db1be4d8c1f0f
 EBUILD nvidia-cuda-toolkit-7.5.18-r2.ebuild 3439 BLAKE2B d1f61624448cdcd69db1a592d6fa4a78004fa8021b591efaa64dcd46263a2803f4983782b87ec9a3a89834e4ed99ab26f7dd706dee2a631887b1ac96b2080d4d SHA512 0c191cb31f5349a7a09c88c1d06e52ce025421a61a2c2bfc925a058b33f855585ccf20d538943c8e7f4d77fd1bb926d16fed76efa467e0a4380ba4b7f93f2c7f
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.ebuild
new file mode 100644
index 000000000000..81930c21bfaa
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.1.1.ebuild
@@ -0,0 +1,228 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit check-reqs cuda toolchain-funcs unpacker
+
+DRIVER_PV="455.32.00"
+
+DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
+HOMEPAGE="https://developer.nvidia.com/cuda-zone"
+SRC_URI="https://developer.download.nvidia.com/compute/cuda/${PV}/local_installers/cuda_${PV}_${DRIVER_PV}_linux.run"
+
+LICENSE="NVIDIA-CUDA"
+SLOT="0/${PV}"
+KEYWORDS="-* ~amd64 ~amd64-linux"
+IUSE="debugger nsight profiler vis-profiler sanitizer"
+RESTRICT="bindist mirror"
+
+BDEPEND=""
+RDEPEND="
+	<sys-devel/gcc-11_pre[cxx]
+	>=x11-drivers/nvidia-drivers-${DRIVER_PV}[X,uvm]
+	debugger? (
+		dev-libs/openssl-compat:1.0.0
+		sys-libs/libtermcap-compat
+		sys-libs/ncurses-compat:5[tinfo]
+	)
+	vis-profiler? (
+		dev-libs/openssl-compat:1.0.0
+		>=virtual/jre-1.6
+	)"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="opt/cuda/*"
+
+CHECKREQS_DISK_BUILD="6800M"
+
+pkg_setup() {
+	# We don't like to run cuda_pkg_setup as it depends on us
+	check-reqs_pkg_setup
+}
+
+src_prepare() {
+	local cuda_supported_gcc
+
+	# ATTENTION: change requires revbump
+	cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4 6.3 6.4 7.2 7.3 8.2 8.3 8.4 9.2 9.3 10.2"
+
+	sed \
+		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
+		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
+
+	default
+}
+
+src_install() {
+	local cudadir=/opt/cuda
+	local ecudadir="${EPREFIX}${cudadir}"
+	dodir ${cudadir}
+	into ${cudadir}
+
+	# Install standard sub packages
+	local builddirs=(
+		builds/cuda_{cudart,cuobjdump,memcheck,nvcc,nvdisasm,nvml_dev,nvprune,nvrtc,nvtx}
+		builds/lib{cublas,cufft,curand,cusolver,cusparse,npp,nvjpeg}
+		$(usex profiler "builds/cuda_nvprof builds/cuda_cupti" "")
+		$(usex vis-profiler "builds/cuda_nvvp" "")
+		$(usex debugger "builds/cuda_gdb" "")
+	)
+
+	local d
+	for d in "${builddirs[@]}"; do
+		ebegin "Installing ${d}"
+		[[ -d ${d} ]] || die "Directory does not exist: ${d}"
+
+		if [[ -d ${d}/bin ]]; then
+			local f
+			for f in ${d}/bin/*; do
+				if [[ -f ${f} ]]; then
+					dobin "${f}"
+				else
+					insinto ${cudadir}/bin
+					doins -r "${f}"
+				fi
+			done
+		fi
+
+		insinto ${cudadir}
+		if [[ -d ${d}/targets ]]; then
+			doins -r "${d}"/targets
+		fi
+		if [[ -d ${d}/share ]]; then
+			doins -r "${d}"/share
+		fi
+		if [[ -d ${d}/extras ]]; then
+			doins -r "${d}"/extras
+		fi
+		eend
+	done
+	dobin "${T}"/cuda-config
+
+	doins builds/EULA.txt
+	# nvml and nvvm need special handling
+	ebegin "Installing nvvm"
+	doins -r builds/cuda_nvcc/nvvm
+	exeinto ${cudadir}/nvvm/bin
+	doexe builds/cuda_nvcc/nvvm/bin/cicc
+	eend
+
+	ebegin "Installing nvml"
+	doins -r builds/cuda_nvml_dev/nvml
+	eend
+
+	if use sanitizer; then
+		ebegin "Installing sanitizer"
+		dobin builds/integration/Sanitizer/compute-sanitizer
+		doins -r builds/cuda_sanitizer_api/Sanitizer
+		# special handling for the executable
+		exeinto ${cudadir}/Sanitizer
+		doexe builds/cuda_sanitizer_api/Sanitizer/compute-sanitizer
+		eend
+	fi
+
+	if use vis-profiler; then
+		ebegin "Installing libnvvp"
+		doins -r builds/cuda_nvvp/libnvvp
+		# special handling for the executable
+		exeinto ${cudadir}/libnvvp
+		doexe builds/cuda_nvvp/libnvvp/nvvp
+		eend
+	fi
+
+	if use nsight; then
+		local ncu_dir=$(grep -o 'nsight-compute-[0-9][0-9\.]*' -m1 manifests/cuda_x86_64.xml)
+		ebegin "Installing ${ncu_dir}"
+		mv builds/nsight_compute builds/${ncu_dir} || die
+		doins -r builds/${ncu_dir}
+
+		exeinto ${cudadir}/${ncu_dir}
+		doexe builds/${ncu_dir}/{ncu,ncu-ui,nv-nsight-cu,nv-nsight-cu-cli}
+
+		exeinto ${cudadir}/${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64
+		doexe builds/${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/{ncu-ui,ncu-ui.bin,CrashReporter}
+		dobin builds/integration/nsight-compute/{ncu,ncu-ui,nv-nsight-cu,nv-nsight-cu-cli}
+		eend
+
+		local nsys_dir=$(grep -o 'nsight-systems-[0-9][0-9\.]*' -m1 manifests/cuda_x86_64.xml)
+		ebegin "Installing ${nsys_dir}"
+		mv builds/nsight_systems builds/${nsys_dir} || die
+		doins -r builds/${nsys_dir}
+		exeinto ${cudadir}/${nsys_dir}/target-linux-x64
+		doexe builds/${nsys_dir}/target-linux-x64/nsys
+
+		exeinto ${cudadir}/${nsys_dir}/host-linux-x64
+		doexe builds/${nsys_dir}/host-linux-x64/{nsight-sys,nsight-sys.bin,nsys-ui,CrashReporter,ImportNvtxt,QdstrmImporter,ResolveSymbols}
+		dobin builds/integration/nsight-systems/{nsight-sys,nsys,nsys-exporter,nsys-ui}
+		eend
+		# TODO: unbundle qt5
+		# TODO: unbundle boost
+		# TODO: unbundle icu
+		# TODO: unbundle openssl
+		# TODO: unbundle mesa
+		# TODO: unbundle libz
+		# TODO: unbundle libstdc++
+		# TODO: unbundle libSshClient
+		# TODO: unbundle sqlite
+		# TODO: unbundle libpfm ?
+	fi
+
+	# Add include and lib symlinks
+	dosym "targets/x86_64-linux/include" ${cudadir}/include
+	dosym "targets/x86_64-linux/lib" ${cudadir}/lib64
+
+	newenvd - 99cuda <<-EOF
+		PATH=${ecudadir}/bin$(usex vis-profiler ":${ecudadir}/libnvvp" "")
+		ROOTPATH=${ecudadir}/bin
+		LDPATH=${ecudadir}/lib64:${ecudadir}/nvvm/lib64$(usex profiler ":${ecudadir}/extras/CUPTI/lib64" "")
+	EOF
+
+	# Cuda prepackages libraries, don't revdep-build on them
+	insinto /etc/revdep-rebuild
+	newins - 80${PN} <<-EOF
+		SEARCH_DIRS_MASK="${ecudadir}"
+	EOF
+	# TODO: Find a better way to add +x permission to installed executables
+	# TODO: Add pkgconfig files for installed libraries
+}
+
+pkg_postinst_check() {
+	local a="$(${EROOT}/opt/cuda/bin/cuda-config -s)"
+	local b="0.0"
+	local v
+	for v in ${a}; do
+		ver_test "${v}" -gt "${b}" && b="${v}"
+	done
+
+	# if gcc and if not gcc-version is at least greatest supported
+	if tc-is-gcc && \
+		ver_test $(gcc-version) -gt "${b}"; then
+			ewarn
+			ewarn "gcc > ${b} will not work with CUDA"
+			ewarn "Make sure you set an earlier version of gcc with gcc-config"
+			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
+			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
+			ewarn "to the nvcc compiler flags"
+			ewarn
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		pkg_postinst_check
+	fi
+
+	if use profiler || use nsight; then
+		einfo
+		einfo "nvidia-drivers restrict access to performance counters."
+		einfo "You'll need to either run profiling tools (nvprof, nsight) "
+		einfo "using sudo (needs cap SYS_ADMIN) or add the following line to "
+		einfo "a modprobe configuration file "
+		einfo "(e.g. /etc/modprobe.d/nvidia-prof.conf): "
+		einfo
+		einfo "options nvidia NVreg_RestrictProfilingToAdminUsers=0"
+		einfo
+	fi
+}
diff --git a/dev-util/oprofile/Manifest b/dev-util/oprofile/Manifest
index 87e27db7648f..3acb78415873 100644
--- a/dev-util/oprofile/Manifest
+++ b/dev-util/oprofile/Manifest
@@ -3,5 +3,5 @@ AUX musl.patch 632 BLAKE2B fcaff5d665639ee365d51171024b98f58a431668dc36e829267ca
 DIST oprofile-1.3.0.tar.gz 1547258 BLAKE2B d8777e41856dc2f082570a1542609bd730fd7076000443f2e17c77eaf75df7a7a772ebb49d82ee657f563797858cecb4c23b130b0174d154c54d5619b8528ad1 SHA512 02a940cd8d38834dca2a97c8ac0fff04ef95b3819cfdf74a462b9326c7abbf2dc55d2a9b9d1fbefc7f455465bf85516be2b879d7daf1861ba2c4af51214377ba
 DIST oprofile-1.4.0.tar.gz 1557625 BLAKE2B fe1a725b713da0e06d3876c52f001163965c1b0dd8ccbb271ef6924525ac6ca342d55172c06cc21681b441c744780d5cb523be08562952c5916005ec67734221 SHA512 44c0ae55d20d623ea8b4245bfe3e208813dbb8778d7e320378ffe70538ef6af1a6ddaf5d110e29751c216879543f13121dd71cb320023205622b3f0cd6b157df
 EBUILD oprofile-1.3.0.ebuild 1710 BLAKE2B f8e293e267d697ac5032aa086dcee205a86709b2c26b9ae730e105cd5b2045aec0550c6672ff8fc300c203d53b5d1bae26cdf1a310cd0226f60a58aaf38bbdcb SHA512 b0e87f0a90f21f35cdc9dd21b32d0a93e3bb26ec7517a28669ae5b7086a3d597c1a64f6ca117cec1625cdf239a191c4b028388ca7f3e5ff24fbbf695a55e1234
-EBUILD oprofile-1.4.0.ebuild 2016 BLAKE2B a56ddd9a7058c6b897f77cc8c79c719de5a524f2094250dcfcf421ffaf81334fb8ab578c86475910a1ec7e432c225244361f5b88f42d77ed9d153d20ec96f0b3 SHA512 b92c6f600a90796cb8e69e243d97f89ffdc256b2348e4bac6de959af6b7ddc28c011debe860984e92ec552bde930caecb7396936878cb5fb03dde0e686aa9b96
+EBUILD oprofile-1.4.0.ebuild 2023 BLAKE2B 1d030088f84ba4a06454f139db4016ba531b126be74038beb458c33b42f0490ed3407744de02841ab26aa1f1a74eb45d610066de800f252f7d51c0aca22aa1b4 SHA512 84a69937d9b8224f87120f0ef27905f90a6079b5718e1045b509a4044e34f28cc39cda59853cb1dd2e2689b18115eb1fec2183b832af9d88d64118f5ac58c4b7
 MISC metadata.xml 423 BLAKE2B 18e22d9fcde7236f7aacf9513bb12e7ae4a7eb07445b1b2c56b563a816b02d600722865d8460e810ae0206632b7b52703cac1812aea9626dcd47fd173d4b8cc5 SHA512 2bc1c9012a9f410cc206abf7b5471c1f8b3adf214241ab3ce1da36f34597a2ccc309ee627582c766d1988440a21e8df7a90668691fd57015b6cdd4db34661f22
diff --git a/dev-util/oprofile/oprofile-1.4.0.ebuild b/dev-util/oprofile/oprofile-1.4.0.ebuild
index 485fdf66c1f0..c44a69cfe3dc 100644
--- a/dev-util/oprofile/oprofile-1.4.0.ebuild
+++ b/dev-util/oprofile/oprofile-1.4.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="apidoc java pch static-libs"
 
 BDEPEND="
diff --git a/dev-util/patchutils/Manifest b/dev-util/patchutils/Manifest
index 637d4288fd69..0f07d393410b 100644
--- a/dev-util/patchutils/Manifest
+++ b/dev-util/patchutils/Manifest
@@ -2,5 +2,5 @@ AUX patchutils-0.3.3-format-security.patch 715 BLAKE2B 48be5e5e0376b6520cd0baffc
 DIST patchutils-0.3.3.tar.xz 156328 BLAKE2B e7da090e1fc7f95f5c2e4c02828702b485dc92fa22a4f45d69f5d9f610fb5a5e3267794fa572cf3aa73be45a86a5c889776eeadf5cca98237d97e53cb1b9be91 SHA512 4ec085078e9ae2e878dc10fbfea5974d9772716aef5d8e130a0023ceaa26640bccfaf1022c8153923b38230b36c8d4dddf4aaa674076c733bb1277895b63a268
 DIST patchutils-0.3.4.tar.xz 166400 BLAKE2B 382be328bfd1ab848f38126ad7a41a4c953844956c181265953a7496c8de3df5d90d071a823b226ceeddd7321bd4ecae1e06c8583155b08826c97177efa9b68b SHA512 ede006122fad180b78feaf69294f1c40c0a764981fa581f1893abeeb0421f9d586fc33f79d065690a6bc6187a31f11311b086669879dde12c6e49c7c8a2aa440
 EBUILD patchutils-0.3.3.ebuild 768 BLAKE2B 46271a2a2dddb8e1148966e99eb18a02d561ac9c8958dab79a4c5f6948b15110333bd9671f647a6f4e52c4379b7fb479ef47344cac2388b3e4acc5490a83980c SHA512 2b39cbfa98aceecf65ae9aa83dca730d5183cac164b59fc9e611821221f6b7137ad6621b3ff3c8a398d653d635fd2f3c47b2186b311ad132375c752d1666e47b
-EBUILD patchutils-0.3.4.ebuild 805 BLAKE2B 2d964a52cc789920409dd8af715031330bca84790bb24e6be9cc37c7b05e950f52b20ad682b9133a6e703a36812624cc648d8c47e31e22de7a01538b220e7a4a SHA512 b31bfa216052f97c3766ea7527f6cc54879d61091b5237d1d390360bf9064610aaf525d2c120bbe0f7c07797d4bfcb6f5b2ac9837fe0514fbc9905c677c4ddfe
+EBUILD patchutils-0.3.4.ebuild 804 BLAKE2B 9e4581d61c03d5b2276757492bf75e89600933ad2d1f12cae622250581e95312b16e05f156c4ba5292f95b007c6013c4a0351c52fb07eb63b70b88f47e15edce SHA512 6c1bbebcda5ea8bd6917ac59ab619d6b2deb2316c33f2eeb3a14ffb2fbcb9c9d9d578ebf58879be3a55991449da3b4b92ee590f42f9e8b925cd08ccd9de2cc06
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/dev-util/patchutils/patchutils-0.3.4.ebuild b/dev-util/patchutils/patchutils-0.3.4.ebuild
index fae95d7d4131..f97fd4b806f0 100644
--- a/dev-util/patchutils/patchutils-0.3.4.ebuild
+++ b/dev-util/patchutils/patchutils-0.3.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://cyberelk.net/tim/data/patchutils/stable/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index f75ab4121eed..a82d4456ec19 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -1,4 +1,6 @@
 DIST pkgcheck-0.7.7.tar.gz 236359 BLAKE2B 46628e6fe1ab711773209785f3160ad5521f7173a676363a44102bd26b443eafe4f88829d9a6c9cf10538ebfa7ca8b28cb8c27f9719f98217ff626d1b5a9a0b3 SHA512 ac88a3aa689983bfac0efa85240e3a02c822a075095ff9940fac0cdc188428126e7612807e57a7582f21fcf1d668dba29d4785d062d757f6444fa024d0437751
+DIST pkgcheck-0.7.9.tar.gz 275854 BLAKE2B 4a98d801fc4e628f6b116fa6d05a5e31bf259f7774fc724c5ca497ea29c5e475a4679fdc4d5c2256de307af740c7bdb95a1d10e30adba94e8336a1e8a3657838 SHA512 1af7d90dcc1c13882f946f470746f7d03638762ed12d97094977c05eb11208f00a19d3a8789ce074efcc91e15258ac784027018016487213ae17e91ed6916630
 EBUILD pkgcheck-0.7.7.ebuild 1414 BLAKE2B 01638e4375ff92e362b168ffae6c79b3f736232701e0b391458eea12060d8445190781f7d81bf0db6506f7d4cc7ee2f64276184d01cab4eeda2c26ccb0c8a981 SHA512 fd0c558a38cac10ed4c8a9ebd63df097d48d41bac5f52a7aa94d9e48685cc1c0f9d76922f1cc2bc386824ca182131c6957c4aac4d98882e32700e101412e1908
-EBUILD pkgcheck-9999.ebuild 1411 BLAKE2B f5f24d58e52919909b9b3fe9ef9f83d9a87e0cf86e5793b0cc5cbfb48236405f440f3fd2ec90dbf6100c24a77636a7af74b10cd7bea2a0547f4a823757acaab6 SHA512 9eb21a1fb70ddb97c087391785d168c567fc5be55eda21abb9c2573318e990cc28e93ab16710e64ba40051bb3a7cbe791d8a6acf5586aa0193d7bdc1370f0270
+EBUILD pkgcheck-0.7.9.ebuild 1422 BLAKE2B b003499b4686b50a1129e81450e3f92394922841284796729ed6e3e7e1d8bc8ad396334844f797496eb13a6f61e2e0bb3f1b35929fc9e1d4fa2a11735708abe2 SHA512 3cf15a66e2c9bfa159b1a51001eb0c0ebecd99ad0e47d7731d5345cf2ddac734f1a0ab88a20eedadb2ae955c6dfa7bcbe017dce0872076c938284b9fca917a25
+EBUILD pkgcheck-9999.ebuild 1468 BLAKE2B e86c456ffd7e7ad84e3d50f2a01236e32c0d561899a3bf92dc68dbb602aa33f75aaba166ea31ce9b5466102523940dee727104294f2d7e1c2e9b883b28397e1f SHA512 dabe7b1a9a7e77fa920c25585a9c387abb3fe05a637c1360eccbdfe589b879e18b1e84fb5ff29be4f83b77a624fb772e019ed252a531052194eca55a93ac1e7c
 MISC metadata.xml 328 BLAKE2B b84dba717460e84f7ee3163fd8d6a5f13eb3b15dd1bb749f6ece81f062e3530988dacefadb24c1395eb36593a7ab6d868b06c8c4ee8f620a17c85faf04283b24 SHA512 5696505214a737ad495b23bfac2a51fbbc5b1e815eb6fcbabb3c6674325f05e3f6f418de05257c08935e389e47879e8a2d1b3723ec86aeb5ad97c6110fd2ec75
diff --git a/dev-util/pkgcheck/pkgcheck-0.7.9.ebuild b/dev-util/pkgcheck/pkgcheck-0.7.9.ebuild
new file mode 100644
index 000000000000..72a9c7ce56f1
--- /dev/null
+++ b/dev-util/pkgcheck/pkgcheck-0.7.9.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1 optfeature
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="pkgcore-based QA utility for ebuild repos"
+HOMEPAGE="https://github.com/pkgcore/pkgcheck"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+if [[ ${PV} == *9999 ]]; then
+	RDEPEND="
+		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
+		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
+else
+	RDEPEND="
+		>=dev-python/snakeoil-0.8.9[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.10.14[${PYTHON_USEDEP}]"
+fi
+RDEPEND+="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pathspec[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	local DOCS=( NEWS.rst )
+	[[ ${PV} == *9999 ]] || doman man/*
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Network check support" dev-python/requests
+	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
+}
diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild
index 2ef90f0d26cc..ae82d9f6d150 100644
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 DISTUTILS_IN_SOURCE_BUILD=1
 inherit distutils-r1 optfeature
 
@@ -10,14 +10,14 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
 DESCRIPTION="pkgcore-based QA utility for ebuild repos"
 HOMEPAGE="https://github.com/pkgcore/pkgcheck"
 
-LICENSE="BSD"
+LICENSE="BSD MIT"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
@@ -28,13 +28,14 @@ if [[ ${PV} == *9999 ]]; then
 		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
 else
 	RDEPEND="
-		>=dev-python/snakeoil-0.8.8[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.10.13[${PYTHON_USEDEP}]"
+		>=dev-python/snakeoil-0.8.9[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.10.14[${PYTHON_USEDEP}]"
 fi
 RDEPEND+="
 	dev-python/chardet[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/pathspec[${PYTHON_USEDEP}]
+	dev-python/tree-sitter[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-util/pycharm-community/Manifest b/dev-util/pycharm-community/Manifest
index 9d5f88934e56..e4645b95f83f 100644
--- a/dev-util/pycharm-community/Manifest
+++ b/dev-util/pycharm-community/Manifest
@@ -1,16 +1,10 @@
 AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73156f63892b1e126ac068d5b2f271d1b71a77486205848cce72452d671692418b6e09e8e25da60e SHA512 a0254552b98b6ec8dadd91ed7df35bf990d08025d8352366f58ecabe94cdde2df64d8665447d0a2ffc1edacdeb05124c2a82722d5ad70b614d90bb0ae38544d2
-DIST pycharm-community-2019.3.1.tar.gz 389620376 BLAKE2B a780ab27feef9747539d9cd607b67c7e047d0a7c1eb6b090a63c4f1c11c80c49e5091a29d80ea249ace1f16acdcd418f0a4901e10c2c623e792da9d7d0e7c9d6 SHA512 4bfa78a5f3993e85ad5ba624ed9e586d195b9f4bffa8bd764e8dba27edc1cdc0bd2b3bba86135156c1f306601db290703e61e7561badc7dcb634dc5826134b1f
-DIST pycharm-community-2019.3.2.tar.gz 391689310 BLAKE2B 11627839e823e2d6c946f5fa25df28cb919960300c51dcc2883989341228604dad9ebf365ffc055809bf3768d757b40cb059a7b5cc492935733c5576ff3f9933 SHA512 6c9e607d938a23be78b4acb5aa39e6276720347aac6fadfbaf456e4f05af4b55ef24f4a97f3aca91b6f09d68af7ec834a5af5e08b775d1439d573cff6c6d3e7c
-DIST pycharm-community-2019.3.3.tar.gz 391606138 BLAKE2B a07bf941ea7a98cadf6ff15b8f69e745ceecf0a820a098811d462a638b0d1b749e1580e23f0cfbdb78a9740e0f41777dd7d505527b6bc83f9c9d5e9ff70a6c95 SHA512 566667109662cffeaba6da9b5e5837adb00f8fbb29523f8415d4fd691cb71f7a40952d28c3713c0409ecbf50ce116ef83bf34a4cbe46015a2a11593771dc97a9
-DIST pycharm-community-2019.3.4.tar.gz 391698063 BLAKE2B f089515412a769c7ffb88cd30aab43def64ff66a0d59ced35740efac4d604220fa5d293d8eb65eea0fc35c116f9d5f771f50f38fc1e61329507cd62070e39ad8 SHA512 0cb5684816eb739de5d106ab8262c9004914d174e89210866286841512c1aa80c00af4299c72f31c1da59c4ed92da10f423c9d5c37e53e1fe836f0586da30c6e
 DIST pycharm-community-2020.1.1.tar.gz 383138867 BLAKE2B 872c658709cab76636f864caff4be4086f861347f5591cf846f6e2b57593380d796a417a684e935b5d3cc6482d80d60f04553e1c11f31fb63554df6a683512ba SHA512 91465d6754981f88a1175ba7da40eb8aed128897b732ba598caa3dbbd6b928f56857c0e80c7bc6c27bb276ffa9a5529dbdcd4508ea1b038579bc7bf359d83ab4
 DIST pycharm-community-2020.1.3.tar.gz 384015566 BLAKE2B a8f69912d7f24ce81c0f4ab579423ef45de6be3f1a0d9d72c6a1566d28c4be41917b3a586964f0b3e7cba7a658da6e5d852d89844f0fd166919f55f3f487380a SHA512 d66f3fb07f06fbaf7282c81f9a81b3106c61d1f60c9b5acf9f512dd5ec12bc772f93192aa535823c808531aea973653b0d59aa770fe898eaa406be319b8873fe
 DIST pycharm-community-2020.1.tar.gz 382333125 BLAKE2B 5fa9000bad467784f2276286639c98509481ab3aef7482f8d0d166d058b2798fb027c037762c76dfd947376320e75f05045b34f172f849198c63950fe27d9855 SHA512 7e2663ac21536f7663910d0e2561a93869f46cc7b1d06bbc448d5afbdf89c4fcb834b9e7e3f61263e5c0a3d25caf35c663a42c6219ae2d5a67cb2516eba2e8e6
-EBUILD pycharm-community-2019.3.1.ebuild 1000 BLAKE2B 50f17b3d3ad772f9db163a67a6c26c809c98d23f0901435b8e3e6117687de1c52e47d59c6942355abbf5ca0d4756de9c1c68674d91b1dfb152c5cabacb79494c SHA512 2ea345700d58ed15634df0565ecfc81727b879a0924fadbdf3c611f5e4a81f3b857cb67b3c1e9782fa19f00f4938ed68473ca54cb3053b6e68c1b772957a7eb7
-EBUILD pycharm-community-2019.3.2.ebuild 1002 BLAKE2B eec9be9f7d3acf21cd183bd6f03ffc6641886143102a71dd4b6b66f172f76271865f6449939ab4e11523262d407effc95e93dac62fa7c1efbb93d40684706986 SHA512 9e93f4915d2c4822d3403bd237a05a3862a768b84649b9ce9204b31f0a4545f39c278aec8959c740340990d6e1d92cf02ebcc9349c65ec9f26ef73d7259e9f26
-EBUILD pycharm-community-2019.3.3.ebuild 1002 BLAKE2B eec9be9f7d3acf21cd183bd6f03ffc6641886143102a71dd4b6b66f172f76271865f6449939ab4e11523262d407effc95e93dac62fa7c1efbb93d40684706986 SHA512 9e93f4915d2c4822d3403bd237a05a3862a768b84649b9ce9204b31f0a4545f39c278aec8959c740340990d6e1d92cf02ebcc9349c65ec9f26ef73d7259e9f26
-EBUILD pycharm-community-2019.3.4.ebuild 1002 BLAKE2B eec9be9f7d3acf21cd183bd6f03ffc6641886143102a71dd4b6b66f172f76271865f6449939ab4e11523262d407effc95e93dac62fa7c1efbb93d40684706986 SHA512 9e93f4915d2c4822d3403bd237a05a3862a768b84649b9ce9204b31f0a4545f39c278aec8959c740340990d6e1d92cf02ebcc9349c65ec9f26ef73d7259e9f26
+DIST pycharm-community-2020.3.tar.gz 486641961 BLAKE2B 35172e213cd90378637adecfc12ecbb758866a5359a5b6159d5201d232ff1e99a0af447163a598057d94c2d307d4d9c627f3f971b58c18c3d95cc2d9d81ef0fc SHA512 16d3508dfd89a3c4b17cdc68e35b2f44e3e18903b94c323c3e845801a8c0d7609b5f9693d7a76ad927860f8d1ec8c9537a1595391167cb5648cb97f248ffa171
 EBUILD pycharm-community-2020.1.1.ebuild 1126 BLAKE2B 75505747c1022c043cd0b3ded83467eec60a08dd82308dbc625d7d022ab1c1f2e31d06804b8e81cf092ad5bd9a2050b0d98752111d36535814631a4f8db99b63 SHA512 71649bffc6eee5c6d182d7d04b42975a90e0a262857543cf109d0c6e3934bd8f71e331d77ff3ec90ed81ef3aeeec68e5791a6ed0a38aca0cab24dde6678420f9
-EBUILD pycharm-community-2020.1.3.ebuild 1126 BLAKE2B 75505747c1022c043cd0b3ded83467eec60a08dd82308dbc625d7d022ab1c1f2e31d06804b8e81cf092ad5bd9a2050b0d98752111d36535814631a4f8db99b63 SHA512 71649bffc6eee5c6d182d7d04b42975a90e0a262857543cf109d0c6e3934bd8f71e331d77ff3ec90ed81ef3aeeec68e5791a6ed0a38aca0cab24dde6678420f9
+EBUILD pycharm-community-2020.1.3.ebuild 1124 BLAKE2B 76db763b32397741bf15260b6073fee6309da8fbd86da0d3dee507d02709b37f75f14047b2ec156d357f02fe472c8d3fbca449e8c5dd5c6a72a3de42488480f5 SHA512 b13496596d1f954cd5367c404c337597d6f5891ae28cd5cd57447993d93484e05314abe22bfe1faa4f243fc0fb6c4899c57dd9f529a61a5ff5e6e8315759b0cf
 EBUILD pycharm-community-2020.1.ebuild 1126 BLAKE2B 75505747c1022c043cd0b3ded83467eec60a08dd82308dbc625d7d022ab1c1f2e31d06804b8e81cf092ad5bd9a2050b0d98752111d36535814631a4f8db99b63 SHA512 71649bffc6eee5c6d182d7d04b42975a90e0a262857543cf109d0c6e3934bd8f71e331d77ff3ec90ed81ef3aeeec68e5791a6ed0a38aca0cab24dde6678420f9
+EBUILD pycharm-community-2020.3.ebuild 1260 BLAKE2B c75eaecabbde98febb9b3a2f794377e5aa77b418166fe28aa86d47ac36f656587715a23d743919def2e6f566057abfac5b72eaabb394bb81a377fed8e5a0ce79 SHA512 99c2005ea16f31635fa227d45bd16cd1051c3f83dbc2d91e647078c11533231ba033b3e626bed6c155623e57855a91bf930139b58a8c230d5178beab4d81cec1
 MISC metadata.xml 305 BLAKE2B 0a2bb327add477e508177540871b19dcfd282f2a140dc2be97698d5a2e4b5c0999e3137e1d4175a529604a960633aee4beb374c4b196d731ded3e1b545a2b3af SHA512 d1d991fd226ee6166b0d3460a7f7192824191aa4939503cd9792cb51e9f317442fcb9a700e1e2d8f9317e3f3e1031b1ef2594749b996d4f0f36e68047a8f37e4
diff --git a/dev-util/pycharm-community/pycharm-community-2019.3.1.ebuild b/dev-util/pycharm-community/pycharm-community-2019.3.1.ebuild
deleted file mode 100644
index c27b0cdf1258..000000000000
--- a/dev-util/pycharm-community/pycharm-community-2019.3.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=virtual/jre-1.8
-	dev-libs/libdbusmenu
-	dev-python/pip"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="*"
-
-MY_PN=${PN/-community/}
-
-src_prepare() {
-	default
-
-	rm -rf jre || die
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/pycharm-community/pycharm-community-2019.3.2.ebuild b/dev-util/pycharm-community/pycharm-community-2019.3.2.ebuild
deleted file mode 100644
index 77dfad45880f..000000000000
--- a/dev-util/pycharm-community/pycharm-community-2019.3.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=virtual/jre-1.8
-	dev-libs/libdbusmenu
-	dev-python/pip"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="*"
-
-MY_PN=${PN/-community/}
-
-src_prepare() {
-	default
-
-	rm -rf jre || die
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/pycharm-community/pycharm-community-2019.3.4.ebuild b/dev-util/pycharm-community/pycharm-community-2019.3.4.ebuild
deleted file mode 100644
index 77dfad45880f..000000000000
--- a/dev-util/pycharm-community/pycharm-community-2019.3.4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=virtual/jre-1.8
-	dev-libs/libdbusmenu
-	dev-python/pip"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="*"
-
-MY_PN=${PN/-community/}
-
-src_prepare() {
-	default
-
-	rm -rf jre || die
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/pycharm-community/pycharm-community-2020.1.3.ebuild b/dev-util/pycharm-community/pycharm-community-2020.1.3.ebuild
index 722cecd0b2a8..09b8a54087c3 100644
--- a/dev-util/pycharm-community/pycharm-community-2020.1.3.ebuild
+++ b/dev-util/pycharm-community/pycharm-community-2020.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
 
 LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+bundled-jdk"
 
 RDEPEND="!bundled-jdk? ( >=virtual/jre-1.8 )
diff --git a/dev-util/pycharm-community/pycharm-community-2019.3.3.ebuild b/dev-util/pycharm-community/pycharm-community-2020.3.ebuild
index 77dfad45880f..4448e547cef7 100644
--- a/dev-util/pycharm-community/pycharm-community-2019.3.3.ebuild
+++ b/dev-util/pycharm-community/pycharm-community-2020.3.ebuild
@@ -12,8 +12,9 @@ SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
 LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE="+bundled-jdk"
 
-RDEPEND=">=virtual/jre-1.8
+RDEPEND="!bundled-jdk? ( >=virtual/jre-1.8 )
 	dev-libs/libdbusmenu
 	dev-python/pip"
 
@@ -23,16 +24,22 @@ QA_PREBUILT="*"
 
 MY_PN=${PN/-community/}
 
-src_prepare() {
-	default
-
-	rm -rf jre || die
-}
-
 src_install() {
 	insinto /opt/${PN}
 	doins -r *
 
+	if use bundled-jdk; then
+		fperms -R a+x /opt/pycharm-community/jbr/bin/
+	else
+		rm -r "${D}"/opt/pycharm-community/jbr/ || die
+	fi
+
+	local rub
+
+	for rub in aarch64 mips64el ppc64le; do
+		rm -r "${D}"/opt/pycharm-community/lib/pty4j-native/linux/${rub} || die
+	done
+
 	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
 
 	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
diff --git a/dev-util/pycharm-professional/Manifest b/dev-util/pycharm-professional/Manifest
index f1a0900fd494..9739ee0e8dfc 100644
--- a/dev-util/pycharm-professional/Manifest
+++ b/dev-util/pycharm-professional/Manifest
@@ -1,16 +1,10 @@
 AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73156f63892b1e126ac068d5b2f271d1b71a77486205848cce72452d671692418b6e09e8e25da60e SHA512 a0254552b98b6ec8dadd91ed7df35bf990d08025d8352366f58ecabe94cdde2df64d8665447d0a2ffc1edacdeb05124c2a82722d5ad70b614d90bb0ae38544d2
-DIST pycharm-professional-2019.3.1.tar.gz 509724729 BLAKE2B cd466d9c2b0f9be8442c719066d5647f0b9631dde38b782d23250207760247380419d7470826da2d5c4203dbca2742aa8fcd1987a4204d229cd700ac6f6a68f2 SHA512 3c3ad0546926dac4a0e336e04a16bb5f630066c7b2abeb16eda698fcc92dd0c165237bb3ad9b6382b38b989e67b8c3a4649bf8361421c7da6916a99eb3ea4633
-DIST pycharm-professional-2019.3.2.tar.gz 513486485 BLAKE2B eba9f0adb8f289f42ee2f50df506dfe628e3b835aedd7a8c0c03da39e5bc5921a6600ea7194c81674a5aad50cbc2f2afb0387dcc88a037e1a92a4fa0f2f3984b SHA512 e3a0e750c821ebd6736e39641d635db1c0a3aa00592d7ede204ce547fc12d69209a253caa4284f76607543f08da594f29ca38c3f8b586848c5b2277ae7227b8a
-DIST pycharm-professional-2019.3.3.tar.gz 513714430 BLAKE2B 7891d5290b87d8f01904860a80f2a5b7e90e41bf894decbdf04f5f322ed269eaf042954ad17656594ee85dc5518cbc69ea4c6b12b9f3febeb068021751fba5d8 SHA512 33f40be3f20370a0a62833510ed9c69b0a022e9298540bea0287038edfd6c8362cee1eb26592279728bf57f41bba2c921400ac56d4b371c8a3881d4f978115a0
-DIST pycharm-professional-2019.3.4.tar.gz 513944449 BLAKE2B 9f925eb48385abb57a833c8bd73307ba593fbea8ceae4df999b6c2a9ec54916e7e16d4ce8ed212842b1fc4f5383fac40fe6cc2ce5e99336852a96a2655c8e358 SHA512 187dd385ec07c908b13060135f1663cb5678ba82d017192ae0a4d2a8bf0f1e0ff51ec52f9b0fdc15d96f42808f801a971391de455afb52ea55cfb5f6d024d813
 DIST pycharm-professional-2020.1.1.tar.gz 507346192 BLAKE2B eb035967475fa1baf7833cf0b4ea18a7870e9ddeb68cef1ed6eaa0690ae21cb2482a61138cfe230928aa41a65e6f78078107d44b6c98b1ace7e6de22af5db555 SHA512 222f2e7284fb77018ace14907da6fbbe58bb8411f71aef9b2875e8c375ea2754a8595bfe9b5847bcfde2f8d59d0480f8fb4acf342231933a58f0f99fafc5a48d
 DIST pycharm-professional-2020.1.3.tar.gz 508036989 BLAKE2B 13bca1d093596bfedcad3c7837ab26c21631d15b5dce9ca62798baab281a7a4736e35fcbd96acc94b8e336119398c82c23583798ad53555eb8f1eac86febf031 SHA512 57a7878d3ee817778c7e1087d97e4d7a615fdd2f987fafecf4c6bcd7e1c0e7c1cb4411283214849cbd76fa92a2b98a074045b52cf1cd306f2e2995ed3b53e0e0
 DIST pycharm-professional-2020.1.tar.gz 507643980 BLAKE2B f0869ebec8ae6396a4ff9579214a913be631d52e67cf12b437800a6f3292c96bef67b8b813bb9d703a2b6893ad27835a6868cce5ac4f3db818bacc2de4aed87c SHA512 23737bdd8bafb57dab794b4c874e6d14bb3b2591706bf13a835b0172fbe914ade932c701a313d982d7c393d02b15629a8273f3be092a92178ed0bfd4eff9baa5
-EBUILD pycharm-professional-2019.3.1.ebuild 1070 BLAKE2B 76b072d78b685590ead13e288e125e6d29feaf090ff6b7f65af5b1b8ba0e9a773ad6a40d3141fa7f6c54a01142b1ba34f8311361b581057a83a04e4fa86c6989 SHA512 b59cbf885667cb316169e3d2e2fad32d97f384715909a994852fb4783c88e83242abea28c75ab32e114f08fbbacd6a06ece1fbe0849310c213ddd399ec174853
-EBUILD pycharm-professional-2019.3.2.ebuild 1072 BLAKE2B 71695bcbc8561ecf5a0e3ee012969443bdc9a595f54e42857908216f14b47007b8f161f123db642a427e54dc5d53cfe3f2e66d1d18fff7767ae94f2998a5829a SHA512 7ad674f1c7077e9ca26cce5005e631d66d689187b78520d28b14b9a13dc1fa4b9749c5857214c12a3110e02c2e63ba17a9f6c2a471ece4773a0159b0e476b7ac
-EBUILD pycharm-professional-2019.3.3.ebuild 1072 BLAKE2B 71695bcbc8561ecf5a0e3ee012969443bdc9a595f54e42857908216f14b47007b8f161f123db642a427e54dc5d53cfe3f2e66d1d18fff7767ae94f2998a5829a SHA512 7ad674f1c7077e9ca26cce5005e631d66d689187b78520d28b14b9a13dc1fa4b9749c5857214c12a3110e02c2e63ba17a9f6c2a471ece4773a0159b0e476b7ac
-EBUILD pycharm-professional-2019.3.4.ebuild 1072 BLAKE2B 71695bcbc8561ecf5a0e3ee012969443bdc9a595f54e42857908216f14b47007b8f161f123db642a427e54dc5d53cfe3f2e66d1d18fff7767ae94f2998a5829a SHA512 7ad674f1c7077e9ca26cce5005e631d66d689187b78520d28b14b9a13dc1fa4b9749c5857214c12a3110e02c2e63ba17a9f6c2a471ece4773a0159b0e476b7ac
+DIST pycharm-professional-2020.3.tar.gz 614570714 BLAKE2B 48ecb93a8db053b2b5983392b6270388fc1bf0ddf18e99453d04f87975ac3b8accfe14895b23db9d0b2eb199c0a64c9b137ea09142fc0cbe0d2ca6196ca2ec55 SHA512 e0c726abddbb98dc5d23043e6e5d2e41a3b813c18352ee3ad9596f0c37bdadfdefba3c74890bb9d2e9c0c8f6114841c2b52c6af2169e021256060452aacb7ec7
 EBUILD pycharm-professional-2020.1.1.ebuild 1202 BLAKE2B c62b786e55539696fd4494546afe2a848c65e0e397709959b316d2092b27c790593d941f542de9c3e198468c3f5727faeb432c56d533a2f94b52c2f39100548a SHA512 12a116cf5b92bd4a4df64a38353f2cb859f80ddacb1007b76adc95b6e92b3a38261aa91b6df6b7883253fff5fd8678cdb7ef31e0d7af9ce9dfd3d2f1aca8ad0f
-EBUILD pycharm-professional-2020.1.3.ebuild 1202 BLAKE2B c62b786e55539696fd4494546afe2a848c65e0e397709959b316d2092b27c790593d941f542de9c3e198468c3f5727faeb432c56d533a2f94b52c2f39100548a SHA512 12a116cf5b92bd4a4df64a38353f2cb859f80ddacb1007b76adc95b6e92b3a38261aa91b6df6b7883253fff5fd8678cdb7ef31e0d7af9ce9dfd3d2f1aca8ad0f
+EBUILD pycharm-professional-2020.1.3.ebuild 1200 BLAKE2B 78916efa1a114fb4ba92eb043c8f69c2e9fded97b6f47d8c71ff2b5ce682a9d25be191c62d9ba0b7abe16e9c2f2daa8bcafc37c98d69447372aea70bc6e820d5 SHA512 57ac46da0be9a950fad9daae363b55af3df23c6dc219d2d7ac53083c998eadc1c184878063a83a9d4741528328c3ffa6912fed70444c035158937066f3c489cb
 EBUILD pycharm-professional-2020.1.ebuild 1202 BLAKE2B c62b786e55539696fd4494546afe2a848c65e0e397709959b316d2092b27c790593d941f542de9c3e198468c3f5727faeb432c56d533a2f94b52c2f39100548a SHA512 12a116cf5b92bd4a4df64a38353f2cb859f80ddacb1007b76adc95b6e92b3a38261aa91b6df6b7883253fff5fd8678cdb7ef31e0d7af9ce9dfd3d2f1aca8ad0f
+EBUILD pycharm-professional-2020.3.ebuild 1339 BLAKE2B 1894f006eeb385ad9afe93e75616ddc1b58a4acd94d3a8219a02f97ce8d56e06461fd962964f42e468827f3fdf92672282b37843d02bd8aa66bcd6a2ae08c398 SHA512 b34418bf4365b0d7f3b5dfc5c68d4d13d2227da3f379aabbc39dfa43f11f44b042fe98ffb80b82373dcaec6100962e0068d37fd82d92d65546a084a7870f8a31
 MISC metadata.xml 305 BLAKE2B 0a2bb327add477e508177540871b19dcfd282f2a140dc2be97698d5a2e4b5c0999e3137e1d4175a529604a960633aee4beb374c4b196d731ded3e1b545a2b3af SHA512 d1d991fd226ee6166b0d3460a7f7192824191aa4939503cd9792cb51e9f317442fcb9a700e1e2d8f9317e3f3e1031b1ef2594749b996d4f0f36e68047a8f37e4
diff --git a/dev-util/pycharm-professional/pycharm-professional-2019.3.1.ebuild b/dev-util/pycharm-professional/pycharm-professional-2019.3.1.ebuild
deleted file mode 100644
index 678583b314f9..000000000000
--- a/dev-util/pycharm-professional/pycharm-professional-2019.3.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=virtual/jre-1.8
-	dev-libs/libdbusmenu
-	dev-python/pip"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="*"
-
-MY_PN=${PN/-professional/}
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	default
-
-	rm -rf jre || die
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/pycharm-professional/pycharm-professional-2019.3.3.ebuild b/dev-util/pycharm-professional/pycharm-professional-2019.3.3.ebuild
deleted file mode 100644
index 65ce101fe2d0..000000000000
--- a/dev-util/pycharm-professional/pycharm-professional-2019.3.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=virtual/jre-1.8
-	dev-libs/libdbusmenu
-	dev-python/pip"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="*"
-
-MY_PN=${PN/-professional/}
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	default
-
-	rm -rf jre || die
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/pycharm-professional/pycharm-professional-2019.3.4.ebuild b/dev-util/pycharm-professional/pycharm-professional-2019.3.4.ebuild
deleted file mode 100644
index 65ce101fe2d0..000000000000
--- a/dev-util/pycharm-professional/pycharm-professional-2019.3.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=virtual/jre-1.8
-	dev-libs/libdbusmenu
-	dev-python/pip"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="*"
-
-MY_PN=${PN/-professional/}
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	default
-
-	rm -rf jre || die
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/pycharm-professional/pycharm-professional-2020.1.3.ebuild b/dev-util/pycharm-professional/pycharm-professional-2020.1.3.ebuild
index 035932264b04..39a685c8d78c 100644
--- a/dev-util/pycharm-professional/pycharm-professional-2020.1.3.ebuild
+++ b/dev-util/pycharm-professional/pycharm-professional-2020.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
 
 LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+bundled-jdk"
 
 RDEPEND="!bundled-jdk? ( >=virtual/jre-1.8 )
diff --git a/dev-util/pycharm-professional/pycharm-professional-2019.3.2.ebuild b/dev-util/pycharm-professional/pycharm-professional-2020.3.ebuild
index 65ce101fe2d0..c3b7f577705a 100644
--- a/dev-util/pycharm-professional/pycharm-professional-2019.3.2.ebuild
+++ b/dev-util/pycharm-professional/pycharm-professional-2020.3.ebuild
@@ -12,8 +12,9 @@ SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
 LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE="+bundled-jdk"
 
-RDEPEND=">=virtual/jre-1.8
+RDEPEND="!bundled-jdk? ( >=virtual/jre-1.8 )
 	dev-libs/libdbusmenu
 	dev-python/pip"
 
@@ -24,22 +25,28 @@ QA_PREBUILT="*"
 MY_PN=${PN/-professional/}
 S="${WORKDIR}/${MY_PN}-${PV}"
 
-src_prepare() {
-	default
-
-	rm -rf jre || die
-}
-
 src_install() {
 	insinto /opt/${PN}
 	doins -r *
 
+	if use bundled-jdk; then
+		fperms -R a+x /opt/pycharm-professional/jbr/bin/
+	else
+		rm -r "${D}"/opt/pycharm-professional/jbr/ || die
+	fi
+
 	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
 
 	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
 	newicon bin/${MY_PN}.png ${PN}.png
 	make_desktop_entry ${PN} ${PN} ${PN}
 
+	local rub
+
+	for rub in aarch64 mips64el ppc64le; do
+		rm -r "${D}"/opt/pycharm-professional/lib/pty4j-native/linux/${rub} || die
+	done
+
 	readme.gentoo_create_doc
 }
 
diff --git a/dev-util/ragel/Manifest b/dev-util/ragel/Manifest
index 0f9478fe597f..509f001a8f89 100644
--- a/dev-util/ragel/Manifest
+++ b/dev-util/ragel/Manifest
@@ -5,8 +5,8 @@ DIST ragel-7.0.0.12.tar.gz 1543127 BLAKE2B c3024c55eb5397f78159da83e318923529d3c
 DIST ragel-7.0.0.9.tar.gz 850078 BLAKE2B 0e7d458e9f78fc7e0fb2e9a0c6fdd3f3789a9104f4441bc878ac64d077dee716e27d3a54c3898fcf1e4ba56b8d46d956a36b92258750f2541fd96f951038d852 SHA512 87de7d41af4a08f09d422a0e58820f9b5b1218acc4733c58690feea4f872790813b5f2d7505ce147a2a6e1bcd341926c35fed7c6b55f543bdf864b119868bcde
 EBUILD ragel-6.10.ebuild 928 BLAKE2B 3c6d2b9df8ec41596c730b85285d7598a05dfdfa758c4d7c1ebc51eb40550d608c222db968ce536c6fc0b1ba891351dfe0aad5215741c13cf55393ee37b547f7 SHA512 efb62282412b3723b117b237b7a22c786a571028dd479ae98eaa4f8dc940b7b492d456510e67e77902bf8aec48b4395f3426d07f032b0cfeca3531d56555bd3d
 EBUILD ragel-7.0.0.10-r1.ebuild 758 BLAKE2B 362a2dee75eb9b744af7b0fca9f26175961029165988cf6a5f8f3aeab8d4e9a4264a553509211884c3bd7d6a7992b5fe0dee7b473f61831e6ab8dcfb1f94ba8b SHA512 12f9640eb0c51a497e274bf0d5dd7dadea78a1e21dba5d8a4a114066717badfa1de28116e133f7cc688fce02b7e2859f45479846f460865982c2ced0f4ea4fc8
-EBUILD ragel-7.0.0.10-r2.ebuild 779 BLAKE2B 373a5b4979da94d22d514197aadc6a4f67ddd863b7fd25f2dd5e0ea96b3c3bab5c7100a3aec73d62868803697462e907840318fefff6f83928ca536378bc47d4 SHA512 140311ff587643c81b229f2e576eba50aa1efc825210c34d650551f2d362e50f0a5cb4978b524e991b5a71cef773a65642e607abec2764e9775cebab4d913aed
+EBUILD ragel-7.0.0.10-r2.ebuild 790 BLAKE2B 83edd042aeea77d1dcc9cea68a5ae5a335b46d7411e47fbde10e6d1b0696ef248194993725aad4bc2e76d624c775b74be4c8cd968dd2d4cc5a2288be5f0c1123 SHA512 f1396bfa1bfcf74ccdcf01c8269ae2d37b06b62200e7417c129bd7fd1188ed9f838ad46f5528cb60c849c020b36f6e5c19d77b6cfd26f7c896b7807969f6d085
 EBUILD ragel-7.0.0.10.ebuild 622 BLAKE2B 4eb1438c8fd1c8e1a3f3f2a95589b719e7b1e07d0411ee0d68bbb0eb5d433471becffdc718593beed535a6f360a3bc63f5fafb058fe6d8c50a6163552ad9da99 SHA512 9f98a2fc800727b126d5db3914ebaf699b4a1095f334906d5809edd9f08b0b5c1d90699a145d303fc06a31d95e600d85aee4a7b5ebb98fd8cfd117f20ee10d2b
-EBUILD ragel-7.0.0.12.ebuild 762 BLAKE2B a23b7f6e2b3a41c2ac697b9e6453244bd15a11aa5fd3170ea0ed881f68762ea2a5380e840c95a35926f798f04aa79cd293baf9c369a7a3be61a0c9f41cdd2218 SHA512 19015e4abbc04c2be325c607232a578be66d73dc440bb06f593f41f42d2a4346e2d212e32e539cfb6341baaf61d80999061c930262ae126f6734a28fc0bbd498
+EBUILD ragel-7.0.0.12.ebuild 780 BLAKE2B 71e8b2b282dee86b1c9aa88b911fbe2a11593abbbb7bc8a077be4481da6732b1de9559a8fedc4c484266d486c8435c8234b5f39e7fe247e8afcd8e50528324d5 SHA512 85e0753294b12b681cb69f13dc0c9ec5a1c55465b68954c54e5e679438ffde51fbb9f3d006f263d925aac2c8efa7bd1957cd395b550bba7040d59c7e1346cb6a
 EBUILD ragel-7.0.0.9.ebuild 627 BLAKE2B b1c47b5508878b7e13fb95333bb7158a85e4795decd4be8cfc82769934106a43878fb5c15d3df5e139a6af96df04614411ceeef20ff0c3bc695cfe424ae258d5 SHA512 1f88ee8f0bac60c073a2be525ea1dcc9128961d8383f36d992121064746d7c154b1338f4582797145fe782485c8d322119aa7ac8ee903315d056cf17a635a3c6
 MISC metadata.xml 222 BLAKE2B 1c7746701a7405c30d961a743df2c2b3b1c5f20c863057e76862844f34bcf701a01f5b31d6b6dc4b4c3192a0f833b783d0c1db3c79f25ea45b576e1c575b502f SHA512 f5b07576edb64cee121aab00dd2a5f0c080fa947e00b6ff6ad6c514a82c132230426ca81e3430d7785c212786f7ead5f6c3f48e58478507df7d96a4e734168ab
diff --git a/dev-util/ragel/ragel-7.0.0.10-r2.ebuild b/dev-util/ragel/ragel-7.0.0.10-r2.ebuild
index 5cd81dac09e4..02fdab57ba4c 100644
--- a/dev-util/ragel/ragel-7.0.0.10-r2.ebuild
+++ b/dev-util/ragel/ragel-7.0.0.10-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.colm.net/files/ragel/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ia64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="vim-syntax"
 
 DEPEND="~dev-util/colm-0.13.0.5"
diff --git a/dev-util/ragel/ragel-7.0.0.12.ebuild b/dev-util/ragel/ragel-7.0.0.12.ebuild
index fd53d7f1912f..2f0d0c5f9b78 100644
--- a/dev-util/ragel/ragel-7.0.0.12.ebuild
+++ b/dev-util/ragel/ragel-7.0.0.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.colm.net/files/ragel/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="vim-syntax"
 
 DEPEND="~dev-util/colm-0.13.0.7"
diff --git a/dev-util/rbtools/Manifest b/dev-util/rbtools/Manifest
index 1c0a103d2ff3..95d4280ce611 100644
--- a/dev-util/rbtools/Manifest
+++ b/dev-util/rbtools/Manifest
@@ -1,5 +1,5 @@
-DIST RBTools-1.0.2.tar.gz 199085 BLAKE2B 469bc0a4d440437126af936c370d40eefa4c59717a955cd1853a1fc437554c251508fabc797b8c6631327fd14d43545cab3710fdbe50b1ad87d4df41d6cc96ba SHA512 2b05c310b877ad57589dedbad638956b81cc539bc793ccbe6f17608f6b979a0f2767998b1e941ef826a435cf0b034cbb2b7fdb6b937d83d5bb2fa9d2f45f70a1
 DIST RBTools-1.0.3.tar.gz 206634 BLAKE2B a058e9f501e5139fd550478dced02883f4fe49e3cfd9da961dfa53dd9552dee59e6a74d873f259ea3ce05884cfb0bf3e1a83d7ddcb696a0dc57139346ce81d91 SHA512 2462da124fb70df05712626451baa0294e82171bc860fce7dc0ddda7bee4ba6749d387c873b08c50f6936c539a13cd15c33bb02b7fd0f69a38c56723e24acbc8
-EBUILD rbtools-1.0.2.ebuild 738 BLAKE2B 7e597356b71c8919b80bab4c2753035fccdc66a8e68d5e6dc9a96b00db123fdf023479022c353e965534e821df08b570233e235410dd7618a8bac295119365ac SHA512 a91727a260eaa5669427b6afcd43638b0b4d6b13b954911ee3d8478052234c728dd9856e261aee9ee9a9fddf5fec22653346ed805017dc518fc129f76a77c9d4
+DIST RBTools-2.0.tar.gz 229078 BLAKE2B 23a0c9e9241a6d989044a4197ed5812d81d43b10195788c7754265969166f654af5fafc5ac027f1cf6e9d00bdd7938455beef6719380e09eacf219fa13bc74ab SHA512 aa773744365fcb5bd2ed5413684290c1d794c8bc76f9f9d0fb9400ab1e2baa1b647db85b8992dfea3e3bffe7ee87f2d735b1e6d5385d621d011be62a64d8890b
 EBUILD rbtools-1.0.3.ebuild 738 BLAKE2B 4770f27abb57ac0eabdfd689ed28a88ff9f4dde2a1e241f591cc6ff27a7eb25d6a21f5bf94eebe6a12fb7cecaa8f99130d9fc076c08f05a51ac250d1f6391de0 SHA512 bcc312c64cfed756cac4347f86642a2633bb3d003dd74ec9c1b4c9699ec79e30fdfe4af422457e809994b06231c67989e7e055819947bf2849fe558b3a8085f6
+EBUILD rbtools-2.0.ebuild 740 BLAKE2B 2f214588fd5001c5594bb7b40211114e4399f0c9944f3f36178f3bf1d157502f6af861b8570b34a755ffe624d8660aeea06ecf158e0e7698eecb3201eb4432ee SHA512 f9dcf9d8731eba3681ca7bd19ce1bd7d301bbad06c11f462a4c6fbf783dd4578cebbcfe233c0fcecc8621ed16b023000022684d4e41efea3ef98ecd8bb7dd1d8
 MISC metadata.xml 217 BLAKE2B 92b85ca7d657eea200ee74bdafd4df6885c04b125bfdfb86650e2e1066c858aa8623f8b2a362780a200d7e33076129c9aab38a12f189c82d5ce1a9ae81257195 SHA512 1b17a615b7471a1e46b4c291aa7ff84348628ec0c3603e21db1994eb1e82ae28dc7e97321de022ccb7e4d2f411f4e7bcef5a79e93a4229126b9b58fb5d503478
diff --git a/dev-util/rbtools/rbtools-1.0.2.ebuild b/dev-util/rbtools/rbtools-2.0.ebuild
index c8348a8df9ff..4ef4c539a64b 100644
--- a/dev-util/rbtools/rbtools-1.0.2.ebuild
+++ b/dev-util/rbtools/rbtools-2.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
@@ -15,7 +15,7 @@ SRC_URI="https://downloads.reviewboard.org/releases/${MY_PN}/$(ver_cut 1-2)/${MY
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-util/rocm-cmake/Manifest b/dev-util/rocm-cmake/Manifest
index 84540b8b8872..2cc2fb42872c 100644
--- a/dev-util/rocm-cmake/Manifest
+++ b/dev-util/rocm-cmake/Manifest
@@ -1,5 +1,7 @@
+DIST rocm-cmake-3.10.0.tar.gz 15825 BLAKE2B d54140431c5ce11250bd1b9fbdc03ce6de628a48e83fba89a93a4c6062319c52085ec036a7c1f2bf9605de3c276abfbec6864aea456ada5dfbde2f857da5394c SHA512 f58d17af522332b9a3366d47e44e61a361f83a3f5dcea6a410025e2383a1231435243ce123f5d8044e77b7572682be8d4d2a1f08d364e5be6a8cb25c4a8c4c69
 DIST rocm-cmake-3.8.0.tar.gz 15823 BLAKE2B 321d31769cee254f9f9048104c7837fc6eb4a224d53e3e3ec18d5fa283f33cb116ece739a19f791cf62ac84f533933233461fd9e470b5c413363aa58fe23b57a SHA512 52e71033ef85b526edc00c1c11681c888ca7a50cf70a69f111ac2d7d32821340d8c812714a525711ff7ec54c8e7cbb79c4cb620a6e559699c509397ebf1b5886
 DIST rocm-cmake-3.9.0.tar.gz 15815 BLAKE2B 86fedeb90ee27367b5fcfe842009055ef073932823fe54c9c6b7dfc7d08e92165c6cb4befebee347645777948b8c24de0c90f2547648cadbd34d39de2da540ef SHA512 bda392023494929ae743a81afdb4b802a3f7728a101ec06dd49c2e1d1165a2306d25beda6a4ea7dfc0aeeeee3f8bad8949d5c897618a362262570d6582c789db
+EBUILD rocm-cmake-3.10.0.ebuild 731 BLAKE2B 463d3a82ab60695d46d43566435db7d3c8e09848a9d43b3c810a6c82628fa882deb81e94b134ec7b5661e4530dff9a9dd407043348bbcb100ad2d7318277a904 SHA512 6fdd1d769eaf846f8e582fa24316da54e6d4210a7b08094300930941d3bee8b671919a4589fb28d3ddb5df61f5ce6969b858de6a0c5fc9de7530e9351df9cd29
 EBUILD rocm-cmake-3.8.0.ebuild 731 BLAKE2B 463d3a82ab60695d46d43566435db7d3c8e09848a9d43b3c810a6c82628fa882deb81e94b134ec7b5661e4530dff9a9dd407043348bbcb100ad2d7318277a904 SHA512 6fdd1d769eaf846f8e582fa24316da54e6d4210a7b08094300930941d3bee8b671919a4589fb28d3ddb5df61f5ce6969b858de6a0c5fc9de7530e9351df9cd29
 EBUILD rocm-cmake-3.9.0.ebuild 731 BLAKE2B 463d3a82ab60695d46d43566435db7d3c8e09848a9d43b3c810a6c82628fa882deb81e94b134ec7b5661e4530dff9a9dd407043348bbcb100ad2d7318277a904 SHA512 6fdd1d769eaf846f8e582fa24316da54e6d4210a7b08094300930941d3bee8b671919a4589fb28d3ddb5df61f5ce6969b858de6a0c5fc9de7530e9351df9cd29
 EBUILD rocm-cmake-9999.ebuild 731 BLAKE2B 463d3a82ab60695d46d43566435db7d3c8e09848a9d43b3c810a6c82628fa882deb81e94b134ec7b5661e4530dff9a9dd407043348bbcb100ad2d7318277a904 SHA512 6fdd1d769eaf846f8e582fa24316da54e6d4210a7b08094300930941d3bee8b671919a4589fb28d3ddb5df61f5ce6969b858de6a0c5fc9de7530e9351df9cd29
diff --git a/dev-util/rocm-cmake/rocm-cmake-3.10.0.ebuild b/dev-util/rocm-cmake/rocm-cmake-3.10.0.ebuild
new file mode 100644
index 000000000000..a8e68baa5599
--- /dev/null
+++ b/dev-util/rocm-cmake/rocm-cmake-3.10.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocm-cmake/"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/rocm-cmake/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/rocm-cmake-rocm-${PV}"
+fi
+
+DESCRIPTION="Radeon Open Compute CMake Modules"
+HOMEPAGE="https://github.com/RadeonOpenCompute/rocm-cmake"
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="test"
+
+src_prepare() {
+	sed -e "s:set(ROCM_INSTALL_LIBDIR lib):set(ROCM_INSTALL_LIBDIR $(get_libdir)):" -i "${S}/share/rocm/cmake/ROCMInstallTargets.cmake" || die
+	cmake_src_prepare
+}
diff --git a/dev-util/rocminfo/Manifest b/dev-util/rocminfo/Manifest
index c4d537d27406..5d994564bf10 100644
--- a/dev-util/rocminfo/Manifest
+++ b/dev-util/rocminfo/Manifest
@@ -1,6 +1,8 @@
+DIST rocminfo-3.10.0.tar.gz 15106 BLAKE2B 7cc90a1c0b9c5f8664dc6c9bebe83f590526565df8ccb3b3d137ca1db42a7ae9640c43a2de01ae13319d8ea3267709ff8b0a70d2b4473d84d5350f7568a897fa SHA512 79eae3c294c1f3077515b807f9b0070a32122542ac6330704b9e0130366717361e046a9ccd5f43a02770746d2123292020d94de6878d053aec58519f1bd36521
 DIST rocminfo-3.7.0.tar.gz 15104 BLAKE2B 728ce471e52dadca8b59aa3196c2f75933650e3002335014accd7f8eada19d4936a7404f908d50747a0e51faa8a65764200072cf598f9d0855a3052db8290160 SHA512 25a6a9216366e310ece9db50a21bc0eb7741760a7b46fa1818ee102557000348f430f9269e2ba9e872437dfafcb31ac563476e2bf83a10705fde8dd5fc854404
 DIST rocminfo-3.8.0.tar.gz 15103 BLAKE2B afa6a2cd3315b18f2711cf1de4701e672beac76d08548453f9377c865f2b108f4f50340f545a9040450c7acded3ac093d334908a7ceddba35c847136fe92aa77 SHA512 c75fa7a4116b9cfa75d6b7ff3920c85ad19fea09ab5f6a7abebde9cd184763905aea8684574f6b1919044806af8ab35a81d7f6010cbd0fb18b36699a182b5f39
 DIST rocminfo-3.9.0.tar.gz 15106 BLAKE2B 0be734ee03298a83892fb237f7b171c7bb5779d153efa2f49ceadd27a32709fd7f6fe4895d43c7d55763be6a5ddf22a4ab9c6b42e4f28946b0d35d44cd897d54 SHA512 aaa2feaad1e0c8583f5211d629934c270f30c046d4e4067c142ea5ddc4fba95c6719d38cd623d1f5190962ccbbfc63196a3f4618d84e9b223bc6ee8cc5544530
+EBUILD rocminfo-3.10.0.ebuild 614 BLAKE2B 06e1e5b14bd58c8ca3519a9b446fec7e6ce46043cbb0bfedd6bc22b9e45d3c41d03a135c742c5451aa3b23d3a811fe76dcd0d71ba29f8ea37b62b4626414c8c3 SHA512 523379bff77eee0cb15ff6fa529f724698fb4e3ea590af72555db46ae51644ecfc3c4ece36db2a3864314f66ec4bbe8fed954cccf4d1fb2afcbb8115b020a840
 EBUILD rocminfo-3.7.0.ebuild 614 BLAKE2B 06e1e5b14bd58c8ca3519a9b446fec7e6ce46043cbb0bfedd6bc22b9e45d3c41d03a135c742c5451aa3b23d3a811fe76dcd0d71ba29f8ea37b62b4626414c8c3 SHA512 523379bff77eee0cb15ff6fa529f724698fb4e3ea590af72555db46ae51644ecfc3c4ece36db2a3864314f66ec4bbe8fed954cccf4d1fb2afcbb8115b020a840
 EBUILD rocminfo-3.8.0.ebuild 614 BLAKE2B 06e1e5b14bd58c8ca3519a9b446fec7e6ce46043cbb0bfedd6bc22b9e45d3c41d03a135c742c5451aa3b23d3a811fe76dcd0d71ba29f8ea37b62b4626414c8c3 SHA512 523379bff77eee0cb15ff6fa529f724698fb4e3ea590af72555db46ae51644ecfc3c4ece36db2a3864314f66ec4bbe8fed954cccf4d1fb2afcbb8115b020a840
 EBUILD rocminfo-3.9.0.ebuild 614 BLAKE2B 06e1e5b14bd58c8ca3519a9b446fec7e6ce46043cbb0bfedd6bc22b9e45d3c41d03a135c742c5451aa3b23d3a811fe76dcd0d71ba29f8ea37b62b4626414c8c3 SHA512 523379bff77eee0cb15ff6fa529f724698fb4e3ea590af72555db46ae51644ecfc3c4ece36db2a3864314f66ec4bbe8fed954cccf4d1fb2afcbb8115b020a840
diff --git a/dev-util/rocminfo/rocminfo-3.10.0.ebuild b/dev-util/rocminfo/rocminfo-3.10.0.ebuild
new file mode 100644
index 000000000000..6de4e9b7cca0
--- /dev/null
+++ b/dev-util/rocminfo/rocminfo-3.10.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocminfo/"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/rocminfo/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/rocminfo-rocm-${PV}"
+fi
+
+DESCRIPTION="ROCm Application for Reporting System Info"
+HOMEPAGE="https://github.com/RadeonOpenCompute/rocminfo"
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND=">=dev-libs/rocr-runtime-${PV}"
+DEPEND="${RDEPEND}"
diff --git a/dev-util/scanmem/Manifest b/dev-util/scanmem/Manifest
index 30a7dbec16d4..ad881e63e58c 100644
--- a/dev-util/scanmem/Manifest
+++ b/dev-util/scanmem/Manifest
@@ -1,3 +1,3 @@
 DIST scanmem-0.17.tar.gz 220489 BLAKE2B b1ae07f96fd736e9ca6a5d55ad2d6b06b7d0dc4828915e0f2adaa2d58b053d9734ccd7425fb5391289249f838773cf3f9a81dbe76bacd42f41203d27dcffed05 SHA512 6d74f3d1d3492d41cabc342cfd1189815536dcbd57857d8a92e05c5dcaebcb9b1df886aee706c56eaf3344737070ea0fe852eef164ef3fe7907f66c626d8523e
-EBUILD scanmem-0.17.ebuild 1077 BLAKE2B c6ed800c7b808a6283a0a01141505bce99542855450003c814dddef0685c0c93d04e9f9cd7d638f1da3f99b3b100d2fc99c5f98fa0715348a4469ebaf8e48a62 SHA512 3558864f6a224cca25e12cefab7cf38a3d3a0b69bb8502e03e5cd47438e4b736aea00bd08763bd4544c3fc28042efcbef9c39b41071f2921a5d1bcc7eb5c124d
+EBUILD scanmem-0.17.ebuild 1076 BLAKE2B e82be153866a6d5c575ae52ccab4ace007af4f2f8ed0a52b7dbb954757c7bd502c3ba216b6505779c24f48920588c86102baabf451f5638d90d2d0f218b1fe23 SHA512 9ea3614c57bcf19871c1687000105e7e83e22afe98407b1f2beb1afc671f30efc6cb3d94afac88b1042d4c9d6d84d0d73412521919fc5cdeaa316edfee9c736b
 MISC metadata.xml 317 BLAKE2B 6d3e5903daa28fe65c109b4a75c8e143a90b7a99095353bc440d41566e9f942f0e415b5561b220bf23fd8e1e0b658d298a6d49d8a442b66042b129c6ee60057f SHA512 44f1ccb76808c4bd5c2bdade165d0f32d68ca07fbec73b2c074ff5b486cb69df2b23cb619d590b5a15d1adfe2f444f2b91aad3f238b29c752aaad97b3a5616b0
diff --git a/dev-util/scanmem/scanmem-0.17.ebuild b/dev-util/scanmem/scanmem-0.17.ebuild
index 2c502521ae88..9fd46852bf87 100644
--- a/dev-util/scanmem/scanmem-0.17.ebuild
+++ b/dev-util/scanmem/scanmem-0.17.ebuild
@@ -2,9 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
 
-inherit autotools eutils python-single-r1
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit autotools python-single-r1
 
 DESCRIPTION="Locate and modify variables in executing processes"
 HOMEPAGE="https://github.com/scanmem/scanmem"
@@ -54,5 +55,6 @@ src_install() {
 		dodoc gui/{README,TODO}
 		python_fix_shebang "${ED}"
 	fi
+
 	find "${ED}" -type f -name "*.la" -delete || die
 }
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index d0beb9ec2cb8..4c6c663233e4 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -14,5 +14,5 @@ DIST scons-4.0.1.gh.tar.gz 5578800 BLAKE2B f9ece5eaf1b133219f975e484beb5df726560
 DIST scons-4.0.1.tar.gz 2874481 BLAKE2B 98377e62ae31d32758a93c4e04c578b88ea541cc292af63c6ca43e2948745e416ee6d757d98129ee30d0e0bbab90664889441a5bb86d4c9dfc649ca1dbef7536 SHA512 400b11323d48f04395b519dfafb6fce15a6dea92013f599dc4895b112629c0a06c7d2806755c74047d001d60087b94f39a118f512b7ee8de6214a4ffc7310468
 EBUILD scons-3.1.1.ebuild 1569 BLAKE2B 316c0f94ab8e17d91245401d9b2cccd35908e67c71413e6778586e97c8618fac9a157cdb573b131793b5b57eab506d1535527ce0af2617e9eef1a2c5f16661cc SHA512 1ac845dab5fef8cf70cd2df90a91b7d762447eb50f56e47eaa9f88fb8ad9137c7d5089d789e1dff0814105792436d3e1471271bd6ccf645d9cc3b00a997d98e2
 EBUILD scons-3.1.2.ebuild 1693 BLAKE2B ec64a596efa07156828d5354fef08c3d0965a5cc022d3c704ef05ba0f2186da9784a740b10cee69dc69b7e9eb75fe8752d32fcab7fd8e10bfcb602eebf74cb7a SHA512 fa6168e8bc71108cd5231a2c51eb856919d798d78ed760cccd79c180610a438ae8be3a7ce68945edd76424a8152d44a5bd5d0f3b3a0c38f4c43c4c1963e9b81c
-EBUILD scons-4.0.1.ebuild 2875 BLAKE2B c1227224fb69f8dfd2ce2ac5aa6e3aad3888146cc6ee4f2a6fa2d9ed6bbc3c42389c94ced13a4e707c94f7aec8941fc18950a218e0ae91daaa2cc95b5076130d SHA512 5491b317ce5ac313e29d1f00560e9ca1f83b610d3400adb1631a7e8959f5ba2eae70befcfd5fbde966999f37e6731d7c4cca8da7276d834a0d1977e88c085d8f
+EBUILD scons-4.0.1.ebuild 2874 BLAKE2B 4f465a56629c5d51c8e03ace75373c10de07a06278154c65441b03d3e97a010a7b91e861dc6a390878258eeb0d483220176bd662a38aba969b085c66cc9db0ab SHA512 ef66f20999891aa4e47bb267f9f44d568a61a07922a067cce3a89b9509a6be7e2ae580c9b564e53f3a05c4eeb8ec25f4ce24afaa3e58689cae610beeb5789c4b
 MISC metadata.xml 704 BLAKE2B 448bfef70e4f230008c21d8e542618a52f9761295ed33f1c7385a2a678bcb29d1028792e221441f9ba61fecb34646f5ef0f04795e28b17e8d4aeacbabf8751f2 SHA512 62e5c8c23f1c67c218ff6b33c1f941ac3c258b39a5b2d799bedceb734aa5b2e29a718f90823ab5bf199e9d1eb8236aefaddcbff99c6d03f58987fb4936b10aa6
diff --git a/dev-util/scons/scons-4.0.1.ebuild b/dev-util/scons/scons-4.0.1.ebuild
index d589066d63c6..410ffd8f581f 100644
--- a/dev-util/scons/scons-4.0.1.ebuild
+++ b/dev-util/scons/scons-4.0.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/shflags/Manifest b/dev-util/shflags/Manifest
index 04408c8d0ed7..97e22644b2c6 100644
--- a/dev-util/shflags/Manifest
+++ b/dev-util/shflags/Manifest
@@ -1,5 +1,5 @@
 DIST shflags-1.0.3.tgz 43549 BLAKE2B 2f5376dc9589eb63133857dd48fde5bd9aae48b31d1f94a97c1d9d3f505d48ee1586a2e6a6f7b44ae85be26b4e7643beee2cdc47a5f3c3ff1a69379f174d98eb SHA512 993f5b274855d5dea5d01d3a799cfd5ff6c5ff2bf153461983052a78d8a96f9b0ee44124b4c51977baa4905c86a3293778c5d7e154305ee051fcac03f6fe70cc
 DIST shflags-1.2.3.tgz 42253 BLAKE2B 4837d31762129790659b67d4025cf8627ca5db32225ac61b437a5ba6bf9f894c87976d06dd5e5039a5ad4b7a0b7b173cc7f96fc3a11dc3c2ac797de2c749a8ed SHA512 5bddebce14e516fe37b2b1631d5aec54651ee728e538dfb0fcc68d32b79d335c7b48f5ef5aab99dd730de3b8fd556a6640db9b9ae2a7753feb6aa1e0831b64af
 EBUILD shflags-1.0.3.ebuild 628 BLAKE2B 480e47ff6f6a76724df5ea404c95e8c02bd9120f50931b46d19c155321dd1963e1208ad64e8a33c97ddf61d852d6e1692c4a14904bbe2875c9c2d83e35f451f6 SHA512 e74ebbc0240e843f49e84b99bd518c296416c572f0bbe6e2d1166beda6c2dfce32aac652ad8ddd056368a9feb58da3d66a9e894b25f0a2c7ad989543d98fd99c
-EBUILD shflags-1.2.3.ebuild 590 BLAKE2B ab37d5047c85376d77709d2cb568a68d9f57ccd81872b6f936683f16e3d66e3a55638bb9f23fe68b94046b2891069a40f695bab330d8f3cedefcee4936638829 SHA512 522e0f6c15229c8dece104b25fba25bb7fde8eb55cfd00e335e4fff0a9228265b4817565eb257dffba80229f4c0b2edba87b2e84842a31c7289931c3c3d41ba3
+EBUILD shflags-1.2.3.ebuild 582 BLAKE2B de3030c851d9d84e74f94ec5b31e2e6643da2cb368bdaf2ed8d4a0bf5e3371e067cfbc9995d46541038392ff16fd009e0815c5f6f023242ea03ddb5540698a03 SHA512 52a462369358190db0890bc609e3dbdd764b1b63b74225a1c66f888b31cc9008be30be3632bfd107ad17e4d82f4e9122d96e88e97234c2c18bc32cbd2fe78774
 MISC metadata.xml 395 BLAKE2B 771aa58612fb4b5b7502bb3ce0b98eeea7449b3c56fe57b2de23cddec6c4041dea7d4f61cbf29f95bdfbd87c4b1bbb24eba62b255b7b4c7e05ff7710112e7dce SHA512 d5cec821871007bded7b69b96c3a36ff84b5756c97dc21d8e18af460e6218d176f019771843b9bb3e8cd940226c8d121057a3dcc1345bec0771ed301dac9bcc6
diff --git a/dev-util/shflags/shflags-1.2.3.ebuild b/dev-util/shflags/shflags-1.2.3.ebuild
index 1a8dfb65407f..87735aff81d9 100644
--- a/dev-util/shflags/shflags-1.2.3.ebuild
+++ b/dev-util/shflags/shflags-1.2.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/kward/shflags/archive/v${PV}.tar.gz -> ${P}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="examples"
 
 src_test() {
diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest
index 4e04fa23d90b..2d541f552f9d 100644
--- a/dev-util/spirv-headers/Manifest
+++ b/dev-util/spirv-headers/Manifest
@@ -1,6 +1,6 @@
 DIST spirv-headers-1.5.3.tar.gz 387520 BLAKE2B 80f210792294232b9f1ebd12e96a8070b27ca29fcfcf8f61c19b0ddef493511bd1f5f85d44f6112de6154108237147feb564334cd47fb37b6f3e7dfb50620a7e SHA512 fab90cd073aed34320d2a03c441746101e757a4bd44f0b259aaa34e1fafd450b9576d8d539d85a8066cdf0eda3e78c807ccf65cd86ab9d8660195a96e9a50795
 DIST spirv-headers-1.5.4.tar.gz 394957 BLAKE2B c94d0ab2e98242aeb78c6948ac915467ba2cc9568483b8e3d00d5c5e1f422a23e9645161ea6b958cb3a8f7b2d51cf8e8040b7479712dd32382c5c5cbba30e4f3 SHA512 050ae8ded345bbef3d94e91f22dd72860fdeed3072f943bafaa37f86f2d522e59d7c4ff2e6aa5bddb3c3df55f124200394a91e6d99eb95933463e7b8ce360aad
 EBUILD spirv-headers-1.5.3.ebuild 514 BLAKE2B e5d846bf7b3aaf4b39a254e17b55926ca91c016bea43f57f52a8c30ab5152013f5f4b96a9d25981b32e0c58091626704ee4bc79088d9447f72ad9af0897d3ee8 SHA512 8edf411df280b4c0d143263d7eca5f3a1866972c4df4f8b62c899f7e2c1d3975a3d6bc80ab570d36f7dcbe1131529c2fadf658349167a15494affde48a7e5679
-EBUILD spirv-headers-1.5.4.ebuild 484 BLAKE2B 15495a74ce925fca3844fe3df6945dfa31bbba115515dce2965995e036249c47853ddc70d5573154db2e90e74a8f21669b2d1d8a8bbe03eb503f7e70b88fa0c8 SHA512 f6eb2390b41f192e225b090595ea504490938acdf7eb1747aa86c0190a5cd5025792a30b96b72947bd0923f683e32b911c88eaa426ec7490f38a6c9e4843f0d8
+EBUILD spirv-headers-1.5.4.ebuild 487 BLAKE2B b201adb9dc981e5f7523b926e843941cd53ffbe0466f858c1933307cf2bce2e34371ef59cdb2a92db17b3211261e6ddf12b9112751f3993c3ef26a226803105a SHA512 5b75746f154205fc72676597f6650bc3e4c54bcecfa55240e4f3a8a1cad110fd3cd7e8cfeca0058d738a982c68502e95bb49313cac18b2dba7f53d15fedd1640
 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.ebuild b/dev-util/spirv-headers/spirv-headers-1.5.4.ebuild
index 857097a8c8bb..d9ba70c80794 100644
--- a/dev-util/spirv-headers/spirv-headers-1.5.4.ebuild
+++ b/dev-util/spirv-headers/spirv-headers-1.5.4.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 ~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 7ff432dc59c5..118229546b8f 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,6 +1,6 @@
 DIST spirv-tools-2020.3.tar.gz 2170858 BLAKE2B c9fdc6bbf6edbb6e3e5aba1fff9bd179b7b435ecb4ebbe29db38ce0c71166269484f8c3798a69a0fe5d936392b07fc6ccd5f058945aa70330612a6ef8fafe12f SHA512 8abb4fe227dbe9d0fc4279523eb714ce3a590a3c56e3dcd226317bc7835e2dceaef3a46c0873c2f144c61b28f41c0fcdf2985cc4f708fa496186c16738cc493f
 DIST spirv-tools-2020.5_pre20201107.tar.gz 2583541 BLAKE2B f234e34142af47a98268d85fa12861b9c66c78d74af7e44d4aa9150ad5cfce8e65780d89344ec947b4866de9811a8198e174480c23c30f690193feca7cc136a6 SHA512 a65174e5f1b7cad3be80e0df0d46e8fbfbb62f397fe98eb1b2c37bb85cf8f92d7b4c9103b5e9e8181240bcf97e5a7e3f09323f78159d4b25f7f02176e982f542
 EBUILD spirv-tools-2020.3.ebuild 1088 BLAKE2B 9576a7b33287e9139790225411a344c0a2eb17459140d6c165791195bc6e265be3038e269c7de85ca54405e4030f80d3d3e863ff832ca59772bbf0a9027774f9 SHA512 947a778123f62fd3901d017dfaf9743c50cb75d2014c2e85289b9709958d21462371bdfc926c3e6b5cbc5e2e6a4a86481552b45f062810c04007b09fac529b64
-EBUILD spirv-tools-2020.5_pre20201107.ebuild 1228 BLAKE2B 93c5fb104f3264f14e1ac18a0d7954dfb166e2add2ba2d79b6bab09e89e7e7605e9baa53824f919c8e825f354f719b226bfa647d814b5be45d9861dcfaeccb99 SHA512 54e65f2212524e7a11d5d73bf0368151048a4efcfdcf9636cb42a7da890a97f5e4aad6b9b53a035ec94e78608bc6d488627d50f46905a8986108e4e255f3d85d
+EBUILD spirv-tools-2020.5_pre20201107.ebuild 1231 BLAKE2B 42263f9563cfdf7d4efbbc932b377f6ad0e92b01b1ff457690dbcbe72aaa19c22a862dad5a4161ca2bbb4d9a7f4347599522f859a4d07504bc4ec24fb53ae656 SHA512 999f277a3e3acfdf1644c2bf1ad0a8c41a60c7322eaf588183bb251ee19ce16a3b83217bd5f2ce18dcc8a21147c1ee3056ce6c89614c7fcff174b93c4153fef1
 EBUILD spirv-tools-9999.ebuild 1228 BLAKE2B 93c5fb104f3264f14e1ac18a0d7954dfb166e2add2ba2d79b6bab09e89e7e7605e9baa53824f919c8e825f354f719b226bfa647d814b5be45d9861dcfaeccb99 SHA512 54e65f2212524e7a11d5d73bf0368151048a4efcfdcf9636cb42a7da890a97f5e4aad6b9b53a035ec94e78608bc6d488627d50f46905a8986108e4e255f3d85d
 MISC metadata.xml 429 BLAKE2B 84129eb27ea4a745c90ed7eab09723b41b45a696375c41458c45a6163dc00cd15d208d6858ea4fd92280e3ff3bb385f340ec3684c980a97ea5fd46fdc4c24001 SHA512 13b340b0e43ba726370f3b013759adab727fc37e251ec5777d10541976843e3e575be23ee015af83dd2e98a1917f4d2511467a38afd064cef025ab4700f005a6
diff --git a/dev-util/spirv-tools/spirv-tools-2020.5_pre20201107.ebuild b/dev-util/spirv-tools/spirv-tools-2020.5_pre20201107.ebuild
index d1cdb00c129a..7921c01f46cd 100644
--- a/dev-util/spirv-tools/spirv-tools-2020.5_pre20201107.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-2020.5_pre20201107.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	EGIT_COMMIT="a61d07a72763c1eb200de0a2c316703643a0d1d9"
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 	S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
 fi
 
diff --git a/dev-util/sysprof-capture/Manifest b/dev-util/sysprof-capture/Manifest
index e7bd00eb5bca..3b203a8e6756 100644
--- a/dev-util/sysprof-capture/Manifest
+++ b/dev-util/sysprof-capture/Manifest
@@ -1,5 +1,5 @@
 DIST sysprof-3.36.0.tar.xz 435956 BLAKE2B 990a6c6c28339594df915ed1fb98f504bf6b080a5e3c31af0cc4bcfd208027361f02a9068291692d082787a6fd42ab414079122a63e4706aee2511040379f0c8 SHA512 41f99cc3446a6624ea74fcdecd7a29a2e5e2d4086383d59a9064c4a3df5d9b8d08f4903ff4dcc85ffa9c6d42bd84dec5c03f6010fffd4415cc8fecf4dc0b23f4
 DIST sysprof-3.38.1.tar.xz 458572 BLAKE2B 68c219a6c80ed070314fc7718a2995c49821cc7c761b277fdd29c233da9d81b561b6c68cd0d0a42cc3e4c150e3de438322f7d418140ce19f3381f4ffac78aa1a SHA512 7ba3dd51bd4055dcdf4d46ff87e46537afe42ba009809fdee5ba0ebcdf70776d9e1ff812714096d33b09ac57d459707b92b1ca07682e2f3888b612ca74820442
-EBUILD sysprof-capture-3.36.0.ebuild 929 BLAKE2B d3eb2dd1588bd42872120abb7145df27e9cd1a16baf1aa07387abb22fe588e3902430877c9b84e71310aaa5af2cddd9e2008e68c56fdd056bcaa950a5d424896 SHA512 ffc8dfcb4aaa36a2af7fadee096ffe103ddd49aa6356e5909e2b1fbf1c4398a357a6c303ff71a45524a4391398a5dcd8937018831a57d22b3b50e21448dd83e6
-EBUILD sysprof-capture-3.38.1.ebuild 899 BLAKE2B 6a436fee3348ce2894612aa6e85f7da9763cd548de778261e5b81e3eacacb3a9456da54a7a456fdd580aeabf94d75bf27b73ee79cefe06086f1ab8032697e8eb SHA512 48ab1c769f38aaef628a3daa3aac695469741f261cba3cdf57491ecd946575ca6eafcfe53c249e089536dde7db43ee44d27ab98aa0f5799509806320dc9271b4
+EBUILD sysprof-capture-3.36.0-r1.ebuild 897 BLAKE2B ffcc34d5ba95dfeeed50f42634e7404905d6022600e79215e6008e8f200382e224358de100aae1f3488ba1951377b219ddd04d1a2bb616bacafa23e7657d9027 SHA512 8dd4ef1baa437e1b68a6a3e2399bb147153f670ad521a31df2b2ef783e4434c9bbead188891d621f1cf9a096072f8d9bc776665bd345900f5382045e0c154709
+EBUILD sysprof-capture-3.38.1-r1.ebuild 945 BLAKE2B c9d0feab8d5b29c686a58f800ef18b39e579319cf784a0c1bf29f00d9eb86daef1a171d40faae7a73106a3a08ad98b467368328c912df4e59882ebdebe1d4bd2 SHA512 c21fc6b7c5d599bcf93f63c30b9876ab7b455800d2abe10d33c9e4e31c945dde0e97ff9cf0a8408cf4f8163f745f41de3e13ef353f99d38ff4eba77980a496ed
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/sysprof-capture/sysprof-capture-3.38.1.ebuild b/dev-util/sysprof-capture/sysprof-capture-3.36.0-r1.ebuild
index c2eafbf121c1..9eade9326177 100644
--- a/dev-util/sysprof-capture/sysprof-capture-3.38.1.ebuild
+++ b/dev-util/sysprof-capture/sysprof-capture-3.36.0-r1.ebuild
@@ -10,8 +10,8 @@ DESCRIPTION="Static library for sysprof capture data generation"
 HOMEPAGE="http://sysprof.com/"
 
 LICENSE="GPL-3+ GPL-2+"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
+SLOT="3"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.61.3:2
diff --git a/dev-util/sysprof-capture/sysprof-capture-3.36.0.ebuild b/dev-util/sysprof-capture/sysprof-capture-3.38.1-r1.ebuild
index 42316cefd30a..eac804936444 100644
--- a/dev-util/sysprof-capture/sysprof-capture-3.36.0.ebuild
+++ b/dev-util/sysprof-capture/sysprof-capture-3.38.1-r1.ebuild
@@ -4,18 +4,17 @@
 EAPI=7
 GNOME_ORG_MODULE="sysprof"
 
-inherit gnome.org meson systemd
+inherit gnome.org meson multilib-minimal systemd
 
 DESCRIPTION="Static library for sysprof capture data generation"
 HOMEPAGE="http://sysprof.com/"
 
 LICENSE="GPL-3+ GPL-2+"
-SLOT="3"
-KEYWORDS="amd64 x86"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=dev-libs/glib-2.61.3:2
-	!=dev-util/sysprof-3.34.1-r0"
+RDEPEND="!=dev-util/sysprof-3.34.1-r0"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-util/gdbus-codegen
@@ -23,13 +22,7 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-src_prepare() {
-	default
-	# We want to ship org.gnome.Sysprof3.Profiler.xml here for the benefit of x11-wm/mutter
-	sed -i -e "s|if get_option('libsysprof')|if true|g" src/meson.build || die
-}
-
-src_configure() {
+multilib_src_configure() {
 	local emesonargs=(
 		-Denable_gtk=false
 		-Dlibsysprof=false
@@ -38,6 +31,21 @@ src_configure() {
 		# -Ddebugdir
 		-Dhelp=false
 		-Dlibunwind=false
+		-Denable_tools=false
+		-Denable_tests=false
+		-Denable_examples=false
 	)
 	meson_src_configure
 }
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+}
diff --git a/dev-util/sysprof-common/Manifest b/dev-util/sysprof-common/Manifest
new file mode 100644
index 000000000000..9508cb6e95b2
--- /dev/null
+++ b/dev-util/sysprof-common/Manifest
@@ -0,0 +1,3 @@
+DIST sysprof-3.38.1.tar.xz 458572 BLAKE2B 68c219a6c80ed070314fc7718a2995c49821cc7c761b277fdd29c233da9d81b561b6c68cd0d0a42cc3e4c150e3de438322f7d418140ce19f3381f4ffac78aa1a SHA512 7ba3dd51bd4055dcdf4d46ff87e46537afe42ba009809fdee5ba0ebcdf70776d9e1ff812714096d33b09ac57d459707b92b1ca07682e2f3888b612ca74820442
+EBUILD sysprof-common-3.38.1.ebuild 494 BLAKE2B 9508543ab0484eb5ed0348dfd83f8273554f0610c2bec17727b459030044885416fb9e22c9b7c20cec762a64f5239cdbedb185f87d85c23cdf7c972f9b7755bf SHA512 95862717922174ff70179a7f150432620990a4888c928707326d607500d14dad7a40e54f2385ace9e253738618dc09ce7b987c61ee07c1b5c916bc561b45f689
+MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/sysprof-common/metadata.xml b/dev-util/sysprof-common/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/dev-util/sysprof-common/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-util/sysprof-common/sysprof-common-3.38.1.ebuild b/dev-util/sysprof-common/sysprof-common-3.38.1.ebuild
new file mode 100644
index 000000000000..c302f72f5778
--- /dev/null
+++ b/dev-util/sysprof-common/sysprof-common-3.38.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME_ORG_MODULE="sysprof"
+
+inherit gnome.org
+
+DESCRIPTION="Static library for sysprof capture data generation"
+HOMEPAGE="http://sysprof.com/"
+
+LICENSE="GPL-3+ GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+	!=dev-util/sysprof-3.34.1-r0
+	!=dev-util/sysprof-capture-3.36.0-r0
+"
+
+src_install() {
+	insinto /usr/share/dbus-1/interfaces/
+	doins "${S}"/src/org.gnome.Sysprof3.Profiler.xml
+}
diff --git a/dev-util/sysprof/Manifest b/dev-util/sysprof/Manifest
index 276ae7cb532e..d92900b406af 100644
--- a/dev-util/sysprof/Manifest
+++ b/dev-util/sysprof/Manifest
@@ -1,4 +1,6 @@
 AUX 3.36.0-fix-32bit-tests-build.patch 916 BLAKE2B 17301f082a57bd513da3f82e4adbabe3b577bbbaa8623ac3882e2b69555d384b4ecb3cc74676f10d06d58907f831536164c40bb3dc82443a25f6e7664c0af48e SHA512 901a5781cb6acdf7febad8fd264d16b1aeacbfc6c44126593d75b4f271aa0925da65a846b8b27afe42633e491994ab68913bd36484b6b77473fe8adb972e28cc
 DIST sysprof-3.36.0.tar.xz 435956 BLAKE2B 990a6c6c28339594df915ed1fb98f504bf6b080a5e3c31af0cc4bcfd208027361f02a9068291692d082787a6fd42ab414079122a63e4706aee2511040379f0c8 SHA512 41f99cc3446a6624ea74fcdecd7a29a2e5e2d4086383d59a9064c4a3df5d9b8d08f4903ff4dcc85ffa9c6d42bd84dec5c03f6010fffd4415cc8fecf4dc0b23f4
-EBUILD sysprof-3.36.0.ebuild 2307 BLAKE2B 1568508955c5be1b360553aa1e1aaba72ebd4f4c2e62884ebcfc8b0f0cff7ba2032159b3a9ef414c1cb56944f33662c65016a43d59b115a1763fea3be55fe112 SHA512 c350410c8775e4f8ec6817d73add43a86afd36fcd4d3a303f9e87aef642edbbfaaa799a685f8cd70aa579b86fff71f224e0ee120b47b21722330f396b62fffe2
+DIST sysprof-3.38.1.tar.xz 458572 BLAKE2B 68c219a6c80ed070314fc7718a2995c49821cc7c761b277fdd29c233da9d81b561b6c68cd0d0a42cc3e4c150e3de438322f7d418140ce19f3381f4ffac78aa1a SHA512 7ba3dd51bd4055dcdf4d46ff87e46537afe42ba009809fdee5ba0ebcdf70776d9e1ff812714096d33b09ac57d459707b92b1ca07682e2f3888b612ca74820442
+EBUILD sysprof-3.36.0-r1.ebuild 2339 BLAKE2B 090ddbc9258c0542ea51ef953e2ee3f63797dab13fad27f142d8675ab513574715bba2256a530ce52500a123fb8ad334ffc77a4f496f186dbc0468d72a931186 SHA512 4eea6236de13ce28c2738ef746dacf1b5d9e18f612e0c7f6f7635447c9d4ff970eb6caa3c5d0933c09f1c88b5e0b3327a181f8d0ac960e971dac78b97bd929a9
+EBUILD sysprof-3.38.1.ebuild 2279 BLAKE2B f9c35b03f39a24186ef1d31290b77d6ce99233a2d2a222f5de7910bcdb5540f56df3d1d2c80c7382623df91038577dd86db234f225f754f9b9130cb5e51fd29e SHA512 57f2eb0986d6f2322e39b463b22144c5f5d33069386378c8c9d396c5e925f50e8a63a77389415ae59bb8085cb1dc9569b0f5559004925593b5d8ed759d6f3d97
 MISC metadata.xml 704 BLAKE2B 0f16b3a4886ed687e5e889f9cacee3148f0ed4c80f5bc88c66217dcd7d411a0e900710d36e7e9a12995872f75b247f231fd1a085fe699a3b3d14d48e67e13dbd SHA512 247b92c056fe9b224ca5a096825223b883534af67bdd514dfa424460ee3b50cf7187bdd81fc70c64b1073477e7292f19d92d8d5112c1f27472f59e59bcae450d
diff --git a/dev-util/sysprof/sysprof-3.36.0.ebuild b/dev-util/sysprof/sysprof-3.36.0-r1.ebuild
index 25aaf9a9f76a..a759c6a7ec27 100644
--- a/dev-util/sysprof/sysprof-3.36.0.ebuild
+++ b/dev-util/sysprof/sysprof-3.36.0-r1.ebuild
@@ -22,6 +22,7 @@ RDEPEND="
 	)
 	>=sys-auth/polkit-0.114
 	unwind? ( sys-libs/libunwind:= )
+	>=dev-util/sysprof-common-${PV}
 	>=dev-util/sysprof-capture-${PV}:${API_VERSION}
 "
 DEPEND="${RDEPEND}"
@@ -43,7 +44,7 @@ src_prepare() {
 	# These are installed by dev-util/sysprof-capture
 	sed -i -e '/install/d' src/libsysprof-capture/meson.build || die
 	sed -i -e 's/pkgconfig\.generate/subdir_done()\npkgconfig\.generate/' src/libsysprof-capture/meson.build || die
-	# We want to ship org.gnome.Sysprof3.Profiler.xml in sysprof-capture for the benefit of x11-wm/mutter
+	# We want to ship org.gnome.Sysprof3.Profiler.xml in sysprof-common for the benefit of x11-wm/mutter
 	sed -i -e "s|if get_option('libsysprof')|if false|g" src/meson.build || die
 }
 
diff --git a/dev-util/sysprof/sysprof-3.38.1.ebuild b/dev-util/sysprof/sysprof-3.38.1.ebuild
new file mode 100644
index 000000000000..b93358958f77
--- /dev/null
+++ b/dev-util/sysprof/sysprof-3.38.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson systemd xdg
+
+DESCRIPTION="System-wide Linux Profiler"
+HOMEPAGE="http://sysprof.com/"
+
+LICENSE="GPL-3+ GPL-2+"
+API_VERSION="4"
+SLOT="0/${API_VERSION}"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk +unwind"
+
+RDEPEND="
+	>=dev-libs/glib-2.61.3:2
+	gtk? (
+		>=x11-libs/gtk+-3.22.0:3
+		>=dev-libs/libdazzle-3.30.0
+	)
+	>=sys-auth/polkit-0.114
+	unwind? ( sys-libs/libunwind:= )
+	>=dev-util/sysprof-common-${PV}
+	>=dev-util/sysprof-capture-${PV}:${API_VERSION}
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-util/gdbus-codegen
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	>=sys-kernel/linux-headers-2.6.32
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	xdg_src_prepare
+	# These are installed by dev-util/sysprof-capture
+	sed -i -e '/install/d' src/libsysprof-capture/meson.build || die
+	sed -i -e 's/pkgconfig\.generate/subdir_done()\npkgconfig\.generate/' src/libsysprof-capture/meson.build || die
+	# We want to ship org.gnome.Sysprof3.Profiler.xml in sysprof-common for the benefit of x11-wm/mutter
+	sed -i -e "s|if get_option('libsysprof')|if false|g" src/meson.build || die
+}
+
+src_configure() {
+	# -Dwith_sysprofd=host currently unavailable from ebuild
+	local emesonargs=(
+		$(meson_use gtk enable_gtk)
+		-Dlibsysprof=true
+		-Dwith_sysprofd=bundled
+		-Dsystemdunitdir=$(systemd_get_systemunitdir)
+		# -Ddebugdir
+		-Dhelp=true
+		$(meson_use unwind libunwind)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	elog "On many systems, especially amd64, it is typical that with a modern"
+	elog "toolchain -fomit-frame-pointer for gcc is the default, because"
+	elog "debugging is still possible thanks to gcc4/gdb location list feature."
+	elog "However sysprof is not able to construct call trees if frame pointers"
+	elog "are not present. Therefore -fno-omit-frame-pointer CFLAGS is suggested"
+	elog "for the libraries and applications involved in the profiling. That"
+	elog "means a CPU register is used for the frame pointer instead of other"
+	elog "purposes, which means a very minimal performance loss when there is"
+	elog "register pressure."
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/dev-util/umockdev/Manifest b/dev-util/umockdev/Manifest
index 7d0c9e23a535..01261cff29a8 100644
--- a/dev-util/umockdev/Manifest
+++ b/dev-util/umockdev/Manifest
@@ -1,3 +1,3 @@
 DIST umockdev-0.12.1.tar.xz 756920 BLAKE2B a8c1d9734f4c0a8e7f19405e011ce964efce6621b4886efead88e040bfe07d2f5a85f063977dfed1c8fb5a5bf4668024b6e687b688a9609cdba1db419518a8ac SHA512 a8995d09179c7d2d37d319f8e675fb15c3caa605c57b56cbb2e785088909d886e790864475feb82ab2b6eb2449038c636a06250d4f9eb8b28b38f0d80574824c
-EBUILD umockdev-0.12.1.ebuild 1207 BLAKE2B ca4f162dae088382eb619e58dac0a0e6e7c481ba7784267de9e0ab00ec08f5755a6aa3554f52ea62ebb3eb02b4f36de006b2d632746797694d7d87607320188c SHA512 a206ee1fb26cfc0a3cee18351a7dffc533b890bb8b603eaab349e253d701a582e96868d39b88aa0d01a238c3435982afe9c13fcb3cc91413279abf6f75f8cb0a
+EBUILD umockdev-0.12.1.ebuild 1214 BLAKE2B 3dd7448aa669c13ebe3dd06b33036bac27d0543d0d601924400e6732e5bd9322c1e0a67503625ab5dff683d1687396a9097ea97a2d197968a424f77e423cb3fc SHA512 fa203cff056a7ce9eede859c251435b41dc32ff53898c85e0e8e282c3dcd72693f28db68993e12f7a18a5685ca03653dfc513c14b946ce08e80bbcf8e984a3db
 MISC metadata.xml 388 BLAKE2B 5140e5be03021c8b50516cddf6a51b8715a1e110e13519313cd3e30b2317874cec5c56eea5168d47496a2055635b87effcc66dac54a66a482818da15b540186d SHA512 ca1c14fa200681d916d6d4539fa9ee8c64d6894d7b78870abfc4ad03446a30703f0fe862a11c5838e26719ae66e0bc944fe0ca75f0f89195128d4e8856b6cd78
diff --git a/dev-util/umockdev/umockdev-0.12.1.ebuild b/dev-util/umockdev/umockdev-0.12.1.ebuild
index 91b6c9f98ed0..e4d830860d36 100644
--- a/dev-util/umockdev/umockdev-0.12.1.ebuild
+++ b/dev-util/umockdev/umockdev-0.12.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/martinpitt/umockdev/releases/download/${PV}/${P}.tar
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="+introspection static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index 92ef744a300f..d6865c16f151 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,6 +1,6 @@
 DIST vulkan-headers-1.2.143.tar.gz 758635 BLAKE2B e1fa8e1290d2fd1e4cef932e4dcd2bc10ef14449cdb41d57f0e4ef58f9a758add7e05d06d7884b08e080250cbb93bf0b211ac3570f0be6b256f6c70bd9eb1704 SHA512 fafd28822da050211525b289a324d333d5651e74e455a7b1010db55eac624edbbf50f5e7f899e2003c821fd06a9a61fec32ea7d07dc4d90a3b3697e03d3ddcc3
 DIST vulkan-headers-1.2.154.tar.gz 817069 BLAKE2B 66b073daf01741d74a8c2524e6f2692a4c2143340bba8349f3c85408ce12cd7405f960fac0b6ffe3cbd6dcddfcbb04a6481b2743428c66a527d51c16cbd326c6 SHA512 97f9b56b57a762a3616ff3e9795de01c9b9327b80903adf2b141f33be45b30980acd50007ac6af9562ee1897491929d23f7f5dc6a8bafced59e14df27dfca6a9
 EBUILD vulkan-headers-1.2.143.ebuild 605 BLAKE2B caf8d1eff6c89b36ca7e4a544a97699aa257bd306b69bb40e3522a743469f079c3fdbcb26e79bcee137267eccf2de8f7886a3282e6d0582e3a33bd3cfade49ee SHA512 211cf1ac07e4dd0bcdf133cc9cf288bf4613ee91cf1358c406a7534584aa117a72e0d2a51a45afed59e5884c05ce87d2acfe49995ad91b3e20fa15b54cd5d6ed
-EBUILD vulkan-headers-1.2.154.ebuild 610 BLAKE2B df50cddc20133ece723f3bdfd28c02b435de3582685ef4235829dc3df964b9a9afd26ee26e11775ba53824d0bd0e32a1674ff56b8820fc2af2c36ed00489bc02 SHA512 164378f4ee98383c16f40e89a8fde5225ef80c8e2a447ca635ef27eb6885be0e7c42aa51fb703ae229df5ec248619cb95f6db2c3907d6cc59dfc4cc0d81fee09
+EBUILD vulkan-headers-1.2.154.ebuild 613 BLAKE2B e14d48d56969086af316c53f09968f0825b036e69923aa7ec3ba9da858a9f88777e0a639cc9afdfbd74c2e093bc8b43248fbe512a6bf7985a8d037c58dcb0ab4 SHA512 9028c31acfa8c3d622b0ac7fd9195440fef9c6639d456fc950904aa70248b5ee533ddb4d94573cc1913d25caadb4c63b96fbf01140439aa9564154600b33a3f4
 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.154.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.2.154.ebuild
index a5f2a13e8786..79af58fcdc70 100644
--- a/dev-util/vulkan-headers/vulkan-headers-1.2.154.ebuild
+++ b/dev-util/vulkan-headers/vulkan-headers-1.2.154.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 ~x86"
+	KEYWORDS="~amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
diff --git a/dev-util/wiggle/Manifest b/dev-util/wiggle/Manifest
index d0bb504202cc..3db124dbb272 100644
--- a/dev-util/wiggle/Manifest
+++ b/dev-util/wiggle/Manifest
@@ -2,5 +2,5 @@ AUX wiggle-1.0-cflags.patch 576 BLAKE2B 25b065a28bb88f3163c063a90a9dc60ec9171e4a
 DIST wiggle-0.9.tar.gz 809756 BLAKE2B 62fd35c721c4d54204984fd196686decff54c1613ceabf5c727b6383500158a04110c4fa2e63d6456452ac79fb811aac611876528fd2503c1acb7e0eb000e49f SHA512 2e3a4977704231f3bd6aa96ffaba8bc733acde425773b86a9649312676b44360c5b85cb48bf944cd383d8e4d0a541d88755f23be7d7a8884213f68a6320c62d9
 DIST wiggle-1.0.tar.gz 868216 BLAKE2B 7241cbbde488b5cbf8970feb1cc258deb04c935347d793796f34993feba3e82870c9ac2aa7d5039f4739308cd0b20b4b104fb50c5ce64a5c66381ff3f6c545d4 SHA512 e9bd6e794ba0cff70db96a648c53aa21b427967758375b843fccf409dd17faf59468c11bafb1e0a7af8bfa657551da8bc1903b9ccf8def1ed9acc84f50c7e0b3
 EBUILD wiggle-0.9-r1.ebuild 1714 BLAKE2B e8c17c40f61dad213d8cfd43e3211fdcb5293eb46baee1f875f6b262382d6931b1e739d80ffcee7bec2930d6fba1878a1e8d4553dea17daa9be9b74851202f3f SHA512 8b976140f14ac386c2c483f3402097ac49b89bfc7742e8800c1053e3cb46fb75fc8b10ba6be49627aaaaf4261f6c8dff11a8834fdadc31f1029304f062eebe8a
-EBUILD wiggle-1.0.ebuild 1492 BLAKE2B 78af1811c96aff9c1352fbc9b786ce83eacc566431de0299f36d043659037a3eaccbffda21fcb1e582f6cda620740828d943c30f632cecf88da19c42090df476 SHA512 d96b9597f5b23d04adb8d5b25dc18b359cc3555d396a2a1533d75f4e89601750d154b3763ad554f0069a76a63a5f37ecb304eb3a4695300db0be38338f7c6070
+EBUILD wiggle-1.0.ebuild 1491 BLAKE2B 031b2ad8091f0521f9ab17900309ca336f7616570a99188b22fcbdec4f237f5e232e1453d569bb06152374dd7bbc568b94636181ddc279bc614c05dbdd83df0b SHA512 7d62261ed2d1187a2e5d5efe13f792179a2f47975b704627e0b63e953b3c2bb501e4ec90c96ea12ae43de52e3dd88dbfc0c52f493315be30809831b5721661f0
 MISC metadata.xml 256 BLAKE2B 7380eb4443aa7d04fc02d228edb72f675580a9f36244c083c4bbdcbc492a4c5169fb3121158d4a613f25f7c0464042bba7951fb92cf9f11c5208a2d9699e195e SHA512 574345bb2730bbc2d0190a03b16703d10441ccd589623c5e8bdddf84d7ce86226da7e079d7b2135e4c724d0813973c551143cdd0f525a58efdd37716dd83edfd
diff --git a/dev-util/wiggle/wiggle-1.0.ebuild b/dev-util/wiggle/wiggle-1.0.ebuild
index 11a76e00ddf0..33e321fa5383 100644
--- a/dev-util/wiggle/wiggle-1.0.ebuild
+++ b/dev-util/wiggle/wiggle-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://neil.brown.name/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/xfce4-dev-tools/Manifest b/dev-util/xfce4-dev-tools/Manifest
index bab739d403fc..ee1b555ffc69 100644
--- a/dev-util/xfce4-dev-tools/Manifest
+++ b/dev-util/xfce4-dev-tools/Manifest
@@ -1,7 +1,7 @@
 DIST xfce4-dev-tools-4.14.0.tar.bz2 292275 BLAKE2B 18f28394ded038a7bcf0e754ebb359464358df245903a0c4441df2845e57c9059de6e6775a90c0e6c3cde4936a847ddf26ae88ff61fe7612fc2626b00f1d56a7 SHA512 e22b139ff7516ec0e510f882cc6a9e8e8b2b7bd41093c8e67e5ef11eb6c2c2848637513369d652f7238f10b5005c5483a938d3348020b48a4c1fadadd6d635f8
 DIST xfce4-dev-tools-4.15.0.tar.bz2 336453 BLAKE2B 9072d86b4b1645e72c04f26b5609162f50aac9d90ad007d2f629bb1ec67d242f3addea4bdd6f129f3336658b04f0eaecbd039154dfd98ccb87a85840b502d11f SHA512 125c8a7d594b17ce822dc5f57f5c700e69ee6208b06931cb0fefcbd1aa70281f388a9eebe8b451ffb55f16682070f9119a43b148f97adcdfd2278b4901910425
 DIST xfce4-dev-tools-4.15.1.tar.bz2 340738 BLAKE2B 73c08f27011ce0d2144eaa1672209669a382695bc9fc9c0a7b9966398df09cf4813afdde9f809354b48d8ddc06644b6e8d4f45ed758dfca24c92e557f5536c8e SHA512 e24fb63774b36f5b3cd901394b75b36e891a68fe7a46a1503a1fc3cfe901bd267e2d8d4aa35a2c760226524079617059e5344b93ef98b3f97dce85e765e5c5dc
-EBUILD xfce4-dev-tools-4.14.0.ebuild 579 BLAKE2B 366d376277ef62122256194b0d4dfdd747e30e82097009b8c41d83473497f5b285b2b75b4584d2293236a17c9efc1ef152a331a398a7f1e67b68dc904c55eb58 SHA512 68fadca9308eb50c5c2be9f50847df966457518cebe86263c21d2f4b8aa64bc5b0f7146f25c16df281924c643ce4de2f38e2fe8db8efb155dde8b3dd9771363e
+EBUILD xfce4-dev-tools-4.14.0.ebuild 578 BLAKE2B ee9471d511f0f61bebc4458fafd29ec7c246ede52b393404d055058f8453149fb13a0c5e83504aa15465ac4549ec67a8bc693d59f44cb268e61ab313de3b0aac SHA512 de4981b2dd476a6582654f5bc09b3e6008d0f96b310737e0797c66bf3e469783a7dbef58445ff20d5e9d8ea02539d334e6c5047f78ecbb82290deab39a9aa83a
 EBUILD xfce4-dev-tools-4.15.0.ebuild 584 BLAKE2B 6b2f6fcd2f8ed91d4a09138a3ea90c1ecb1e5cf8236dc7e16bbf4889d0aabb9a08d822b7cca7b0888ee586837e41a5c055d71836cb2255ac82c99af875a58cf7 SHA512 35e950fba2c4de9b286afa8d9af5560c8c1ec72c8df70ab2fafc67015005bee23f5e7b59e79e8d631e668cb1ceb423106c4a1fddfdbd39e8e7741e6fb9fe1c9e
 EBUILD xfce4-dev-tools-4.15.1.ebuild 584 BLAKE2B 6b2f6fcd2f8ed91d4a09138a3ea90c1ecb1e5cf8236dc7e16bbf4889d0aabb9a08d822b7cca7b0888ee586837e41a5c055d71836cb2255ac82c99af875a58cf7 SHA512 35e950fba2c4de9b286afa8d9af5560c8c1ec72c8df70ab2fafc67015005bee23f5e7b59e79e8d631e668cb1ceb423106c4a1fddfdbd39e8e7741e6fb9fe1c9e
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.14.0.ebuild b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.14.0.ebuild
index 82bfd3fc320c..f68bf7c7a78a 100644
--- a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.14.0.ebuild
+++ b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.14.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.42"
diff --git a/dev-util/ydiff/Manifest b/dev-util/ydiff/Manifest
index 4d059bedf871..de1d1d1e300a 100644
--- a/dev-util/ydiff/Manifest
+++ b/dev-util/ydiff/Manifest
@@ -1,5 +1,5 @@
 DIST ydiff-1.1.tar.gz 36357 BLAKE2B 4465c85132bb7c7d58c13dd79903610c74edec3b2b8ab8980918a1bf3a98f2b8387872a0974743503fcaad1e7ecb24c21d312a13d9aabe94780e9d623c35175a SHA512 575b3327edd3b8796f5f150fc7ebde32561e1782582e03e9b63bf9010998913fb8b00a8245d799f6cd5599e286f07f9e97e160f23606323d1a6f6059faa59bc9
 DIST ydiff-1.2.tar.gz 42808 BLAKE2B 927482c2ed9a96efc354178679b4ba50497289bc31107e8cdef3062a71d91268fa703620f1f4b0be03aebaf339eba5254f4b43c16403f1d7818b84b0c450defb SHA512 0eb2230b64f43e20f6dc2411296389dc99356ef626152dc7f234583f70678e64a07b764fd89635479e7ac4aa7e2490db6e76c744369eefef8ab6a5386db1a7b5
 EBUILD ydiff-1.1.ebuild 652 BLAKE2B 64b7eb0fa137e38a02ff45de004eded3d9b07863d546b992a7f7e80fdee29b7ea3c82842e4183752012e64811369c3d8d54927f0fb72dd24106c46d7941edd19 SHA512 c274ee20ef7535608aeacf48704fd40f24d8b53dd398c702f7ab475cefa31d9fa44243b3361cddaa6a9fda4177eee46e1c576d81509ca308d08f05571373430d
-EBUILD ydiff-1.2.ebuild 654 BLAKE2B c5efed318721a50d0e477f7011aadf753e2ab307b26ceeab4feab11ef94699479c2a546324e94171c5d3eddfb728049e422760115d389af45b96aefc5196be82 SHA512 276c9f3ecf1f808d4bd76fafa13a2840e44bccfcc61fbbd7435fd8f34270c570bd4f9310edf2d25ad28ff5827cf0e0bdb0c95fc9ec46ed9657383ffb333948a4
+EBUILD ydiff-1.2.ebuild 642 BLAKE2B 92d9aade555437c87e66e26ada7f59ffd5733a622c7eacb8541f4e7ffc43593b971d8c091e698e5736422ce374507099433f5b09c04f87b6afae15107c2e0815 SHA512 94d99b71d6243d7a18bf5ab2a006d3742e6512587a544418aec562195872dfa49318cb1064d688cc3ac094e2389faec68a2790187714c57d62a8cdee05b1e302
 MISC metadata.xml 369 BLAKE2B e1679b4929852125cc2ce7ec0ede870da64132b820c16865d6fa4e572227c64d699871e07df5588ea46ae67cab3775be9908a76d2d222d75bc2f59ea9269b14a SHA512 798de8606d059795e57d1cfaf513e2587b132e512a8833d422d94e7708473379ddbcee63ec2cf8068653f7c1e02de516f7facb5e5fea59a9dca98698cc3c6d57
diff --git a/dev-util/ydiff/ydiff-1.2.ebuild b/dev-util/ydiff/ydiff-1.2.ebuild
index d3dfb7dd60a0..cdfe106fd620 100644
--- a/dev-util/ydiff/ydiff-1.2.ebuild
+++ b/dev-util/ydiff/ydiff-1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
@@ -14,10 +14,9 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
 
-DEPEND="sys-apps/less"
-RDEPEND=""
+RDEPEND="sys-apps/less"
 
 DOCS=( CHANGES.rst README.rst )
author	V3n3RiX <venerix@redcorelinux.org>	2020-12-14 13:26:14 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-12-14 13:26:14 +0000
commit	6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (patch)
tree	25413d1cb3a0cbfe36029db32398c0f333609215 /dev-util
parent	9c417bacd51da6d8b57fa9f37425161d30d4b95b (diff)