gentoo resync : 02.09.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-09-02 14:09:07 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-09-02 14:09:07 +0100
commit: b17a3ef12038de50228bade1f05502c74e135321 (patch)
tree: 9026dffec53f92cba48ca9a500a4f778e6304380 /dev-util
parent: 3cf7c3ef441822c889356fd1812ebf2944a59851 (diff)
119 files changed, 430 insertions, 2163 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 2912e93e9613..bc0fb189ce4d 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest
index 0edf4f7770ae..d7fee002414e 100644
--- a/dev-util/bcc/Manifest
+++ b/dev-util/bcc/Manifest
@@ -16,5 +16,5 @@ EBUILD bcc-0.12.0-r1.ebuild 1886 BLAKE2B f3879a2437abbfc99b87ad1a3a5c1b8b600a9e0
 EBUILD bcc-0.13.0.ebuild 1925 BLAKE2B 4cf4fcfd74ca4a941be56ec92c003be585b81105dc0986e0a63cdcafbb0a9c22f7803aded42ff0214338312463019f6ba7938775dcd6538afd80d85a92b0d523 SHA512 69e3e78d7f6ead73c007e821f5ea2a6e3f5244cf716703b763427bb49e89f5012ec0327fdf142dee93b6c9091c572985a8cc3738b6b238e19e9ceef0a4a9e0d6
 EBUILD bcc-0.14.0.ebuild 1968 BLAKE2B 00d8a66ef59c00a518ee27211236327d883972d4d71eeb9906c0fc20e1eb764dccadaf807937b8c15b67fba45c881f04b6cf8ef866bb24817506d39a2b7bd1e4 SHA512 4620985b4d093c7f436f9d9a7e10f5077afff49f21bf4664bb55c8eb41f2dbac8d9b70ccc91ae6d852f8cabe65e0056540894ea1ba7659e7df7aa691fe75170c
 EBUILD bcc-0.15.0.ebuild 1968 BLAKE2B d26398d364cd3737535b7b2edd992f731cacca839f96fc53908321c86eb40d8944b5c4eaf0b337a61076532dee73e9e99b2a856cafbfa90048f2cba5f7ddcf75 SHA512 c45482e2f910d9b1e17c2531530161cb81f9d240b510092c9890c32aeb628a6572dd785eac846758256fe79e4b15f9c307b86cf299f48c788f9cc061c31177b0
-EBUILD bcc-0.16.0.ebuild 2053 BLAKE2B 3af394ef8ed4d6bbcb8747fb7b57372d7982155c57f8a913bff3c0c981b662cf99c710f15fbf7ac76fc8b3eaec9a0504dc84cf7a8f3ce238fd88b62e5365a49c SHA512 576ca4062b3dc29f258c22a4f4f5475a4317452802773fa56877cf27a863d0d3c8bd5368384569985c3f6fa92357f06a73fe4d8c3ceb2cb2468f35d3d34eb008
+EBUILD bcc-0.16.0.ebuild 2054 BLAKE2B 8ea20763614fbc217bf29cd38f29af9f66a04e36742fc0bd4ba0fd6e732e70c61e73d5c34ac0c0d7a07a95f798bb5aa35353bb46f4c40c92d370f80ab53e6098 SHA512 3677dedc28cbbb04cc2741d36bc331f3d78f7578696c7c2846b43593e468e00208b9d2d758e874cdbe7eeecba714b114eb195aa3896619f5ec34f62cf6db5b87
 MISC metadata.xml 386 BLAKE2B 73062e6902dd7d7f9afb988cce26a8aa5a66e1252652ae364f2295b0a5e77013eec682b36ab65c93772843ad0ec8c7187cd29d8308a3ba17dbacd1ef193f03ae SHA512 6529fa57011cd17b9892e1b8f05e063ae6314f85665a30881335efa80e9b9238a7b61d1f732316e45496707bf350d03149e7ec5efdf1a0fee6d5a788b58a7e70
diff --git a/dev-util/bcc/bcc-0.16.0.ebuild b/dev-util/bcc/bcc-0.16.0.ebuild
index c246d266174e..e1c3279fc72e 100644
--- a/dev-util/bcc/bcc-0.16.0.ebuild
+++ b/dev-util/bcc/bcc-0.16.0.ebuild
@@ -10,7 +10,7 @@ inherit cmake linux-info llvm python-r1
 DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
 HOMEPAGE="https://iovisor.github.io/bcc/"
 
-SRC_URI="https://github.com/iovisor/bcc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/iovisor/bcc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index 7dfedaa644f3..d69a20a33d87 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -3,7 +3,6 @@ AUX bpftrace-0.10.0-install-libs.patch 5790 BLAKE2B 93f12b430f8ba5772423fc0350c5
 AUX bpftrace-0.10.0-llvm-multi.patch 2516 BLAKE2B 354882237ce984c776ae8f4c0c442a3f250b007d11a03d3bc794c69df9405d67ee09e0ae86ff2585ea025e941a246904e80556857e531c1f3fc06befba88c7da SHA512 5a5d6db61da9c1d07991500ab7feeb5aa945d11dc2f6387d7ccb04ff6a07da478d9a1005a79bba8ad04805eadca95fc72ffc3cc1ffc4bca76ea66f08ea56e2a8
 AUX bpftrace-0.10.0-no-bpf_detach_kfunc.patch 379 BLAKE2B cb796b682fa5b4a89d4f7e879e23d7b1fd3a8202b87467dec8cb3abb0b80edaa3b3353bfd56277d2a087541576a0066526110266b961ae36c57c833cb38c46b1 SHA512 be47a1f688f71c49d249a4ce1292e705f0cc5fb0ec73b77c976cde896325cd65423fba9999a5fba2d027230da02c8a8ebc5d2d73f22e46d53b42ae9528a8724d
 AUX bpftrace-0.11.0-install-libs.patch 6063 BLAKE2B c05146ef6d6ffd7fb5e1f97a9ea3dbdbab1b875bcf1707b07ff8c2b93e0e8cd36093330edc32b1d25796a5b72370b114301c1c0db78bc59c48740158e31a8e95 SHA512 e022425af1d19e1ff586f23d7de384b912bf8b67e501b86d31e3450e118ea3266cb81413caa06b3e674a31df2585ad447234e3897c716f055c7423a5f7333a66
-AUX bpftrace-mandir.patch 906 BLAKE2B d875e2523b7e719624d92c58a8f058cdd597da07bf6472d2e3dc05eb46be64718ed4056e15a93e4c22264fa35ceb6b79b428febade422ba435a2a2b9e17fb707 SHA512 11544e9e5892ae3657ff903fa2780e71223e380322b4059ddcea4a6edd80c5a7ab8d45188eb577127f64a6705a6ae41d53f3ba7e05bf450853b12a9ba3d84904
 DIST bpftrace-0.10.0.tar.gz 835854 BLAKE2B 623369bb2a2ad8d5eec364afa98bdae3fbe5e66182d8f1187fe86a8bd70ee357a554eb063fdbe5476eab23912adf2cf027092cac3e6989d8f716e91aa5d01212 SHA512 da400efe78cea505a32deead594b047ec4394d3eefe86e7b6853fe2dc715c5847a3abcbd26c1fac39d0a534f1e57d6c0bc3625e0c3f1054b0d84b7b1d6eb69b9
 DIST bpftrace-0.11.0.tar.gz 867444 BLAKE2B a99255befadea0b4cb54299a8318c0a7a667ac2258b612750705b4d351ac59f4411f2567bc0100929291e3c9756d276671e41af9d398b118b3d486dace2953d7 SHA512 32bf0c23a7b0e1a57d0e0b8fc845a9e184e201ac3f6018a3d3cee8c97096093b333578cb898ede02fb3ab8d55ba9bcd2bb67ac70b81a49461c0f6e5c03c2a6f5
 EBUILD bpftrace-0.10.0-r1.ebuild 1676 BLAKE2B 57af40bbdefcc28fc775f7aadeb2d7213b974b130aa51591076354f1f351ecace66d9c1355c99adab7f5cdcf2e711767d1f045f6e076eef2476055d7a0309bd2 SHA512 42b1eefa65583294af9baf692dcd9d8da5577b4e59cdb202b5d0df25e7746acafeac9888ee2c7eac8bff8974edaf4407c9d07e62e47662a02743fc0de0fbc9e5
diff --git a/dev-util/bpftrace/files/bpftrace-mandir.patch b/dev-util/bpftrace/files/bpftrace-mandir.patch
deleted file mode 100644
index d18c1e2f3210..000000000000
--- a/dev-util/bpftrace/files/bpftrace-mandir.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/man/man8/CMakeLists.txt b/man/man8/CMakeLists.txt
-index 45cfe5d..d13229e 100644
---- a/man/man8/CMakeLists.txt
-+++ b/man/man8/CMakeLists.txt
-@@ -1,12 +1,12 @@
--find_program(GZIP gzip)
-+find_program(CAT cat)
- file(GLOB FILES *.8)
- set(GZFILES "")
- foreach(FIL ${FILES})
-   get_filename_component(NAME ${FIL} NAME)
--  add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.gz
--    COMMAND ${GZIP} -c ${FIL} > ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.gz
-+  add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}
-+    COMMAND ${CAT} ${FIL} > ${CMAKE_CURRENT_BINARY_DIR}/${NAME}
-     DEPENDS ${FIL})
--  list(APPEND GZFILES "${CMAKE_CURRENT_BINARY_DIR}/${NAME}.gz")
-+  list(APPEND GZFILES "${CMAKE_CURRENT_BINARY_DIR}/${NAME}")
- endforeach()
- add_custom_target(man ALL DEPENDS ${GZFILES})
--install(FILES ${GZFILES} DESTINATION man/man8)
-+install(FILES ${GZFILES} DESTINATION share/man/man8)
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 0bf7e0c6ad22..4ca605066fec 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -4,5 +4,5 @@ AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b3
 DIST ccache-3.7.10.tar.xz 353792 BLAKE2B d7c06ee55a79afb4b72cdc20ec3d6413a5417301c63a0c822a4f82e6b9542c7a9cdf9f1bbd60a4698c335fdddfadcb9d674bff02c6dad1c2df9932212fdf6477 SHA512 64b0d42af7fd2dfdda65668b04dbd16807a22324e336e61f6c6a91c00110fb535c7ac9062a9c14c924a7ddaf42247f69a43d83dd0fd187ce3b0737158b5bb8fc
 DIST ccache-3.7.11.tar.xz 354160 BLAKE2B 46fc5d65d6224bb796db7632b35ccca1089e5fed36eeb2ba231cf4c1aaa94be10bf0504f6ef565ce11673e527e09dee64583a764062ca7fea38364d790dd8cc1 SHA512 47b71b3ab4b89bf9b6f6d15941c22d2207b369922f51f9a8fbf4e86554325053dccce669e1c1ed3c0019a7e0a3d610f399e52d3fee68b56111aa7c1b24132c11
 EBUILD ccache-3.7.10.ebuild 1522 BLAKE2B 6c21b6c5782c39eafb043fd6fbde0dec69ffa7e58db5c3efcf51e066a3ab28ab02f16edef5b74db3997e6bf7a43c6790ce81c581fc76ebacb903ea1b9d0c5534 SHA512 1e8a2bbdd0fdbae5923329ef42b2af631c586b883ef9dc610a856744d18d762dda8eb693b8e2d043138bb1b1ad63b3fe7b7250a601f8e82ee1ddeb01b31f5c1c
-EBUILD ccache-3.7.11.ebuild 1536 BLAKE2B e18af4839b030ab57f3b4c6ea1c1e6a44c37a5bb7dc90f4e04403279ab063cc124e3304f4aa68c70ff32907486cfd4f51265b680a2e454a04330e51e074e5149 SHA512 887a05e698fdd15c0211ca65a53c82aeee914f0c432729243238ea704741f417243d5c425e13e4c51254936760c2bdedf878cef7de6a777dccd1c324af3304d0
+EBUILD ccache-3.7.11.ebuild 1533 BLAKE2B e3b04c0e8f8cdc875860ab040bcc6006d1fabfce96d5c05024c86507fd38901038c6df5aa07f434305c79b2663cc0e945c2e18705da5d7265a899a22e66b099d SHA512 c1b0dcfb2b1f6138f747ea633acf407e3746bb6307bee636b91124223571c6c332178b446c9b4dc483c3b169babb19f4a697bdafde323c2745d7c185e6fde778
 MISC metadata.xml 445 BLAKE2B 8ef8f120989420428ea85108180c659c72a7553f3f20ab96597d26aa04b059f491aeae8c887697a214c437f2dba30fbb934cb47c1db93821eda7dd489e6cb693 SHA512 41ffcad23c9f0274c48a058090d6404cd782dea6674b81615a6b3b7fa272ff5df4c68404fb4dcdb9d2275c13fb137f21f0f65232d5fb1ef6152cc25213893249
diff --git a/dev-util/ccache/ccache-3.7.11.ebuild b/dev-util/ccache/ccache-3.7.11.ebuild
index ba117d9a324a..1bdf81b4437f 100644
--- a/dev-util/ccache/ccache-3.7.11.ebuild
+++ b/dev-util/ccache/ccache-3.7.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
 IUSE="test"
 
 DEPEND="app-arch/xz-utils
diff --git a/dev-util/cmdtest/Manifest b/dev-util/cmdtest/Manifest
deleted file mode 100644
index df13802dec52..000000000000
--- a/dev-util/cmdtest/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST cmdtest-0.32.tar.gz 48945 BLAKE2B 64c09a0f7dd66644d8ce785d633af2cc62ce0cba1a636cf18e650fdf0268987ad647509e17ed2c614b48164f9e9fbd6dcb64d6fa0a47ec6dcf24d82b69732857 SHA512 1d6d49f63067cd0343b0123eaa84326042a6382abccb624015ab5517809a11ad149f75fc48cdea87b608d4b8778903fe1a9e68b7942a45a6498bdf7e3dbe3216
-DIST cmdtest_0.30.orig.tar.xz 38508 BLAKE2B 7a27ed4930decdfbc49e922af9724ddba2daabc5af51faa6cafea1ca10dbf5137aa74ad9780156ff13f16e4c22fe5dba43401e22c6c2a7cabbd39d4139f4f515 SHA512 cbdebe175f09a99218d8ce0f2d1e49019f70b7f3ba112e2650e5a58e36a6f1d1b641c9aed5212e12023e956f999ef9cdba27aea7af9211f35a41874147a402af
-EBUILD cmdtest-0.30.ebuild 732 BLAKE2B 707ea52ef032c862afba43fc87bd7b45941947eddeec9137fc16b554b2d790ee6c27077541321f6e792de80526fa3ff3ccefef96c0f423ea261dd8b595276df0 SHA512 c9aaaed50556d50d0f2c17c1bf495091b06b16970e7ace387aa391aefc603c5cd218369bf8940cd96fc9613ff5a4632567bd88ab6e93e239e8161a0552b44cdb
-EBUILD cmdtest-0.32.ebuild 710 BLAKE2B 53e8ed934dbc51fcf5cdbb3aa4d8296fd12805c27f33226c3c5bf8fd9b50dec1d01cb8e53169db063bdcad8bb58dfdaddafd1261f6372541bf6ee6a1774918a2 SHA512 414f63fd61ffdc0b6feba80713a2fc09671904a10d7e438c8f10c1636f62a6384332d9b00c96d82f0f15a9c51ed73835158410b84ad53b7e3d060e98e57faec9
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-util/cmdtest/cmdtest-0.30.ebuild b/dev-util/cmdtest/cmdtest-0.30.ebuild
deleted file mode 100644
index 646a5882df16..000000000000
--- a/dev-util/cmdtest/cmdtest-0.30.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="black box tests Unix command line tools"
-HOMEPAGE="http://liw.fi/cmdtest/"
-SRC_URI="http://code.liw.fi/debian/pool/main/c/${PN}/${PN}_${PV}.orig.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-
-RDEPEND="
-	dev-python/cliapp[${PYTHON_USEDEP}]
-	dev-python/markdown[${PYTHON_USEDEP}]
-	dev-python/ttystatus[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	addwrite /proc/self/comm
-	distutils-r1_src_compile
-}
-
-python_test() {
-	"${EPYTHON}" -m unittest discover -v -p '*_tests.py' || die
-}
diff --git a/dev-util/cmdtest/cmdtest-0.32.ebuild b/dev-util/cmdtest/cmdtest-0.32.ebuild
deleted file mode 100644
index 6d6707bd00ef..000000000000
--- a/dev-util/cmdtest/cmdtest-0.32.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="black box tests Unix command line tools"
-HOMEPAGE="https://liw.fi/cmdtest/"
-SRC_URI="http://git.liw.fi/${PN}/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-
-DEPEND="
-	dev-python/cliapp[${PYTHON_USEDEP}]
-	dev-python/markdown[${PYTHON_USEDEP}]
-	dev-python/ttystatus[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	addwrite /proc/self/comm
-	distutils-r1_src_compile
-}
-
-python_test() {
-	"${EPYTHON}" -m unittest discover -v -p '*_tests.py' || die
-}
diff --git a/dev-util/cmdtest/metadata.xml b/dev-util/cmdtest/metadata.xml
deleted file mode 100644
index 7a38bb900964..000000000000
--- a/dev-util/cmdtest/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-util/coccigrep/Manifest b/dev-util/coccigrep/Manifest
deleted file mode 100644
index 72717cd47529..000000000000
--- a/dev-util/coccigrep/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 50coccigrep-gentoo.el 99 BLAKE2B 596f01a6ac85deca70bdcf4f50c2475c7a38e44926d719e0da5eb23a8c713f89ebad0182cdca66b3011029bcda14d0cde76d4a186a126e05b74a0ccaa8e9efd1 SHA512 13cf90c99017cfb865c1d41e9813bb20993b4a91419e4bcca6b5536e8c35bfb871616c5174dd08eb8f1726f05296205428d14eaf9e9fabcf08bff01b287581f4
-DIST coccigrep-1.13.tar.gz 32366 BLAKE2B 8b9d8e0832c6bbacb3a8efd74ab8f4a0ec3112e935ddca63f345799ebc96a3dfbc8fe8e9fa77cee912d7dd5ee28c62e72ea00173e4ee4b16588b4b6e1eaf661c SHA512 d01baefe1c5f5d23ce03e5daccde0c38d4c05872313a0c8d15e53444c34fa6ae0db3b25bd62d8635a3f7b16e64767f92051c59d29bbd81cd24f94c9376af08ba
-EBUILD coccigrep-1.13.ebuild 1359 BLAKE2B af5e020596d8a540fa5ee2f7e5b7fb00476dbb80432896bdd4b31e00500c2e3896407692e7040564d027ebe1b177e9146727d99a5ed0809f08ea3de50be21786 SHA512 31f62ea2d68fecfaac808ab446c604750dffe6003d0c7a31f03b96461cb3afa3bce909611d2b1b9fa839cb2d3f094674a10efc817cec4371ca9a9ab4b468806a
-MISC metadata.xml 321 BLAKE2B 58502481c090abd4b41a2c9ba39bd7027d03d2a02a65dc462e477917029df36663cac68e98b49d10b28bd73e5cc3a784e69fb1dc2771474f4d97f5f0a7c852e1 SHA512 7b6ae71b16416aa2847c902ebc176ececd5527177c85bfeb2f3e6d8a504405c7d1f34ccfaea2133f49f9052e86b89d8429322c2082f790c230e02da2ca10a2f6
diff --git a/dev-util/coccigrep/coccigrep-1.13.ebuild b/dev-util/coccigrep/coccigrep-1.13.ebuild
deleted file mode 100644
index 896adfe6ed09..000000000000
--- a/dev-util/coccigrep/coccigrep-1.13.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 elisp-common
-
-DESCRIPTION="A semantic grep for the C language"
-HOMEPAGE="http://home.regit.org/software/coccigrep/"
-SRC_URI="https://github.com/regit/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc emacs vim"
-
-RDEPEND="dev-util/coccinelle[python]
-	emacs? ( >=app-editors/emacs-23.1:* )
-	vim? ( || ( app-editors/vim app-editors/gvim ) )"
-DEPEND="doc? ( dev-python/sphinx )
-	emacs? ( >=app-editors/emacs-23.1:* )"
-
-SITEFILE="50${PN}-gentoo.el"
-
-python_compile_all() {
-	use doc && emake -C doc html
-
-	if use emacs ; then
-		elisp-compile editors/*.el || die
-	fi
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS="doc/_build/html/."
-	distutils-r1_python_install_all
-
-	doman ${PN}.1
-
-	if use emacs ; then
-		elisp-install ${PN} editors/*.{el,elc} || die
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
-	fi
-
-	if use vim ; then
-		insinto /usr/share/vim/vimfiles/plugin
-		doins editors/cocci-grep.vim
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-
-	einfo "Syntax highlighting is supported through dev-python/pygments."
-	einfo "Install it if you want colorized output formats."
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/coccigrep/files/50coccigrep-gentoo.el b/dev-util/coccigrep/files/50coccigrep-gentoo.el
deleted file mode 100644
index 7fbc6b93e541..000000000000
--- a/dev-util/coccigrep/files/50coccigrep-gentoo.el
+++ /dev/null
@@ -1,4 +0,0 @@
-;;; coccigrep site-lisp configuration
-
-(add-to-list 'load-path "@SITELISP@")
-(require 'cocci-grep)
diff --git a/dev-util/coccigrep/metadata.xml b/dev-util/coccigrep/metadata.xml
deleted file mode 100644
index 38144618c397..000000000000
--- a/dev-util/coccigrep/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<use>
-		<flag name="vim">Install the coccigrep vim plugin</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">regit/coccigrep</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/coccinelle/Manifest b/dev-util/coccinelle/Manifest
deleted file mode 100644
index dd0ec7332e4c..000000000000
--- a/dev-util/coccinelle/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX 50coccinelle-gentoo.el 154 BLAKE2B debbfe7a00bf6195db370b33430d18fb7121123da26f97c01703704918f977f886090abfa0b6f226f8d713bca566ff6e39fabefb07e098a2bfd7cbd64eaebe6a SHA512 dc99ec43c65fc3b6735b8d06f664c09dabe89bb6dec2a0c0390e97ea2bacb1d76ff33d94124c2a2d1f16795648480c33e0306020e151d67d530e35aa9f4f009d
-DIST coccinelle-1.0.5.tgz 5660596 BLAKE2B 9707e4773d165718b973e004e3359608428d8405d560d7013da66e2b1f0205f003ae0905c02a4f13c9725b39dc94710e5ccbc6b5b11ace66d7e87c3a303363c5 SHA512 0fee450554abc40feac9e745a252c1679f8016c82f04236e642e32e129618a950bb9657f1c447d62543289e95bbd4b1a8b0c6030373025c32a37068f82d30678
-DIST coccinelle-1.0.6.tgz 6684278 BLAKE2B b5b390488e818ce05c364f27782bd1c4dc63657a01c7564764d64faea8ff302c8409bb2ef172ce7ab7c2e00ae1a6f2c3bea76a1148eaf5a977f897d39a9fb23c SHA512 b667762ddf5ad30b126e93572cd8a8b3ffc21a790cd9d6df586e421c5db0a8d049af9587c6e5cb8f7a13f2c090ab2a9cca59ecba69069f9d3fe67b6f75dfe539
-DIST coccinelle-1.0.8.tar.gz 2670961 BLAKE2B 0a11d325f8e39a76111bb9b14afb5dc6c1de07b94fce7904b6be021b17a9346f1b2e09550e6de221280fa9ff57e6e4a41b2e733189e16cc3a460065844015901 SHA512 496b1632c92cc026fbe28f784f56d4cd78f89a8ccd28dc7db1069c0c6b2b239675a10da305e37ed2a03c605668ecd3399aeed522f12ec3fbbf3ca07277ab7bce
-EBUILD coccinelle-1.0.5.ebuild 2533 BLAKE2B 2991df294991a093fe689307e4bd8286bf033df166c0a63d6354c689eed590ba514b728feb604ace53b1be0e91650066595503d62c693737ea7771c7f9bb1fa6 SHA512 39effb31dee5307a0ffb0ff2e923fa910c7e45244aaf4e9c16491b127467a77797c60a9cefc959a32540bee867cb36540277b2cef42882ec62e8a998da6ff815
-EBUILD coccinelle-1.0.6.ebuild 2541 BLAKE2B 18380f62384990dcbe1fb675d6847372ff78ae5e21cf3236c65153e6a4889f1b9adf829036e1902732fea8d47a2de9472375ec602308bd51a062cdb6621b34b5 SHA512 9e66e33bbdc2df5b0fbf553ce4e7d7e9117578c7c12c6b8486dcc3064db827ca961fdd041a936813600764094c71ae6d154de5e7094df4c459e09e75d460fdea
-EBUILD coccinelle-1.0.8.ebuild 2555 BLAKE2B 66a93118dff8537fd25118d5c15f0ebb2a081ce75cd0128aebdd0e043a319851a205d0687ad123e584c8859e51dd3144d9cb3cd97241cd50fccd155f59d7e8bc SHA512 b5bcaad5931ba9e864c2f86b338733fadaa98aea4014d6b71d312475a54d9f55b031393451d82e179a496f9cf587ea1d81505d56f86362e3250095aa40dd0b6e
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/coccinelle/coccinelle-1.0.5.ebuild b/dev-util/coccinelle/coccinelle-1.0.5.ebuild
deleted file mode 100644
index 241294dd2260..000000000000
--- a/dev-util/coccinelle/coccinelle-1.0.5.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit multilib eutils python-single-r1 bash-completion-r1 elisp-common
-
-MY_P="${P/_/-}"
-DESCRIPTION="Program matching and transformation engine"
-HOMEPAGE="http://coccinelle.lip6.fr/"
-SRC_URI="http://coccinelle.lip6.fr/distrib/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc emacs ocaml +ocamlopt pcre python test vim-syntax"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# ocaml enables ocaml scripting (uses findlib)
-CDEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]
-	dev-ml/sexplib:=[ocamlopt(+)?]
-	dev-ml/menhir:=[ocamlopt?]
-	dev-ml/camlp4:=[ocamlopt?]
-	dev-ml/parmap:=[ocamlopt?]
-	emacs? ( >=app-editors/emacs-23.1:* )
-	ocaml? ( dev-ml/findlib:= )
-	pcre? ( dev-ml/pcre-ocaml:=[ocamlopt(+)?] )
-	python? ( ${PYTHON_DEPS} )"
-
-RDEPEND="${CDEPEND}
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
-
-# dev-texlive/texlive-fontsextra contains 'ifsym.sty'
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? (
-		virtual/latex-base
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsextra
-	)"
-
-DOCS=( authors.txt bugs.txt changes.txt credits.txt readme.txt )
-
-RESTRICT="strip !test? ( test )"
-S=${WORKDIR}/${MY_P}
-
-SITEFILE=50coccinelle-gentoo.el
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if use python ; then
-		# fix python install location
-		sed -e "s:\$(LIBDIR)/python:$(python_get_sitedir):" \
-			-i Makefile || die
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_enable python) \
-		$(use_enable ocaml) \
-		$(use_enable pcre) \
-		$(use_enable pcre pcre-syntax) \
-		$(use_enable ocamlopt opt)
-}
-
-src_compile() {
-	emake depend
-
-	if use ocamlopt ; then
-		emake all.opt
-	else
-		emake TARGET_SPATCH=byte-only all-dev
-	fi
-
-	if use doc ; then
-		VARTEXFONTS="${T}"/fonts emake docs
-	fi
-
-	if use emacs ; then
-		elisp-compile editors/emacs/cocci.el || die
-	fi
-}
-
-src_test() {
-	emake check
-	use python && emake pycocci-check
-}
-
-src_install() {
-	default
-
-	use doc && dodoc docs/manual/*.pdf
-	newbashcomp scripts/spatch.bash_completion spatch
-
-	if use emacs ; then
-		elisp-install ${PN} editors/emacs/*
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
-	if use vim-syntax ; then
-		newdoc editors/vim/README README-vim
-		rm editors/vim/README || die
-		insinto /usr/share/vim/vimfiles
-		doins -r editors/vim/*
-	fi
-
-	use python && python_optimize
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/coccinelle/coccinelle-1.0.6.ebuild b/dev-util/coccinelle/coccinelle-1.0.6.ebuild
deleted file mode 100644
index 55e35ea5d44e..000000000000
--- a/dev-util/coccinelle/coccinelle-1.0.6.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit multilib eutils python-single-r1 bash-completion-r1 elisp-common
-
-MY_P="${P/_/-}"
-DESCRIPTION="Program matching and transformation engine"
-HOMEPAGE="http://coccinelle.lip6.fr/"
-SRC_URI="http://coccinelle.lip6.fr/distrib/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc emacs ocaml +ocamlopt pcre python test vim-syntax"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# ocaml enables ocaml scripting (uses findlib)
-CDEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]
-	dev-ml/sexplib:=[ocamlopt(+)?]
-	dev-ml/menhir:=[ocamlopt?]
-	dev-ml/camlp4:=[ocamlopt?]
-	dev-ml/parmap:=[ocamlopt?]
-	emacs? ( >=app-editors/emacs-23.1:* )
-	ocaml? ( dev-ml/findlib:= )
-	pcre? ( dev-ml/pcre-ocaml:=[ocamlopt(+)?] )
-	python? ( ${PYTHON_DEPS} )"
-
-RDEPEND="${CDEPEND}
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
-
-# dev-texlive/texlive-fontsextra contains 'ifsym.sty'
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? (
-		virtual/latex-base
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsextra
-	)"
-
-DOCS=( authors.txt bugs.txt changes.txt credits.txt readme.txt )
-
-RESTRICT="strip !test? ( test )"
-S=${WORKDIR}/${MY_P}
-
-SITEFILE=50coccinelle-gentoo.el
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	if use python ; then
-		# fix python install location
-		sed -e "s:\$(LIBDIR)/python:$(python_get_sitedir):" \
-			-i Makefile || die
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_enable python) \
-		$(use_enable ocaml) \
-		$(use_enable pcre) \
-		$(use_enable pcre pcre-syntax) \
-		$(use_enable ocamlopt opt)
-}
-
-src_compile() {
-	emake depend
-
-	if use ocamlopt ; then
-		emake all.opt
-	else
-		emake TARGET_SPATCH=byte-only all-dev
-	fi
-
-	if use doc ; then
-		VARTEXFONTS="${T}"/fonts emake docs
-	fi
-
-	if use emacs ; then
-		elisp-compile editors/emacs/cocci.el || die
-	fi
-}
-
-src_test() {
-	emake check
-	use python && emake pycocci-check
-}
-
-src_install() {
-	default
-
-	use doc && dodoc docs/manual/*.pdf
-	newbashcomp scripts/spatch.bash_completion spatch
-
-	if use emacs ; then
-		elisp-install ${PN} editors/emacs/*
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
-	if use vim-syntax ; then
-		newdoc editors/vim/README README-vim
-		rm editors/vim/README || die
-		insinto /usr/share/vim/vimfiles
-		doins -r editors/vim/*
-	fi
-
-	use python && python_optimize
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/coccinelle/coccinelle-1.0.8.ebuild b/dev-util/coccinelle/coccinelle-1.0.8.ebuild
deleted file mode 100644
index ebf1fd10abac..000000000000
--- a/dev-util/coccinelle/coccinelle-1.0.8.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools multilib eutils python-single-r1 bash-completion-r1 elisp-common
-
-DESCRIPTION="Program matching and transformation engine"
-HOMEPAGE="http://coccinelle.lip6.fr/"
-SRC_URI="https://github.com/coccinelle/coccinelle/archive/1.0.8.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc emacs ocaml +ocamlopt pcre python test vim-syntax"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# ocaml enables ocaml scripting (uses findlib)
-CDEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]
-	dev-ml/sexplib:=[ocamlopt(+)?]
-	dev-ml/menhir:=[ocamlopt?]
-	dev-ml/camlp4:=[ocamlopt?]
-	dev-ml/parmap:=[ocamlopt?]
-	emacs? ( >=app-editors/emacs-23.1:* )
-	ocaml? ( dev-ml/findlib:= )
-	pcre? ( dev-ml/pcre-ocaml:=[ocamlopt(+)?] )
-	python? ( ${PYTHON_DEPS} )"
-
-RDEPEND="${CDEPEND}
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
-
-# dev-texlive/texlive-fontsextra contains 'ifsym.sty'
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? (
-		virtual/latex-base
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsextra
-	)"
-
-DOCS=( authors.txt bugs.txt changes.txt credits.txt readme.txt )
-
-RESTRICT="strip !test? ( test )"
-
-SITEFILE=50coccinelle-gentoo.el
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-	if use python ; then
-		# fix python install location
-		sed -e "s:\$(LIBDIR)/python:$(python_get_sitedir):" \
-			-i Makefile || die
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_enable python) \
-		$(use_enable ocaml) \
-		$(use_enable pcre) \
-		$(use_enable pcre pcre-syntax) \
-		$(use_enable ocamlopt opt)
-}
-
-src_compile() {
-	emake -j1
-
-	if use ocamlopt ; then
-		emake all.opt
-	else
-		emake TARGET_SPATCH=byte-only all-dev
-	fi
-
-	if use doc ; then
-		VARTEXFONTS="${T}"/fonts emake docs
-	fi
-
-	if use emacs ; then
-		elisp-compile editors/emacs/cocci.el || die
-	fi
-}
-
-src_test() {
-	emake check
-	use python && emake pycocci-check
-}
-
-src_install() {
-	default
-
-	use doc && dodoc docs/manual/*.pdf
-	newbashcomp scripts/spatch.bash_completion spatch
-
-	if use emacs ; then
-		elisp-install ${PN} editors/emacs/*
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
-	if use vim-syntax ; then
-		newdoc editors/vim/README README-vim
-		rm editors/vim/README || die
-		insinto /usr/share/vim/vimfiles
-		doins -r editors/vim/*
-	fi
-
-	use python && python_optimize
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/coccinelle/files/50coccinelle-gentoo.el b/dev-util/coccinelle/files/50coccinelle-gentoo.el
deleted file mode 100644
index 6721b3c5e5a1..000000000000
--- a/dev-util/coccinelle/files/50coccinelle-gentoo.el
+++ /dev/null
@@ -1,6 +0,0 @@
-
-;;; site-lisp configuration for coccinelle
-
-(add-to-list 'load-path "@SITELISP@")
-
-(autoload 'cocci-mode "cocci" "Major mode for editing cocci code." t)
diff --git a/dev-util/coccinelle/metadata.xml b/dev-util/coccinelle/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-util/coccinelle/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-util/comparator/Manifest b/dev-util/comparator/Manifest
index 58ddf931f315..d73c9c8bd71d 100644
--- a/dev-util/comparator/Manifest
+++ b/dev-util/comparator/Manifest
@@ -2,5 +2,5 @@ AUX comparator-2.12-gcc10.patch 793 BLAKE2B 0bab88fa6aeaf046ee4dc569aeb0d3344a2a
 DIST comparator-2.10.tar.gz 1463175 BLAKE2B 58d6bddc5f785de3768ed2c4845b75af03c1fd7f646fc15efaeec09878a72355c46c64f67866217994797193aaba6d4214685c7be89be9872620dce5930238e8 SHA512 b880f7a4a0fbfad44c53606c6d97509305d8485f0ab76b62bb0d1d1d6d4be9fb81e7a08326e78cabd1a9314e6efbf3a966eb6393e424f59dc657975a63ce2988
 DIST comparator-2.12.tar.gz 1463333 BLAKE2B 081251a0a3cb2f99d5b74092a46a868741049d27c367fc9bc3445d35fe01eaaaee75f7afd3674ecdc2569c2ac1ef2d5acd838a546aa307b33c977c4c8a91db12 SHA512 dc5acf3d5900e293e3f0188c0809bc99f2f18edb55df882b2e12e66bc655e7faf030b8daffdd2d175234b398e6a8c125ca6af615933c998651d7f1579734b080
 EBUILD comparator-2.10.ebuild 866 BLAKE2B d57e9166f9a0f14ad04c4c2f686198f866699f1ae0eae03a93e256c9d3195bd008844861000b4a45d4b30092be377110067152133d39d07195c3cce705f39682 SHA512 21ed08a933430f6044de705507a60b875786762f9ca413cef8f74814122aeac931676dedd04c3a1b32b7651f9a6f904e878aefe625d4b255d4e84c27d5da0570
-EBUILD comparator-2.12.ebuild 960 BLAKE2B d1bbfb9c56d4c7c4303010e2a70da1eccadd1e043f86d2bff7957ee9e6ce575d9f79f618139933a1c5389390e5b074474d41caf8772df2f892c7629a93c3d67e SHA512 80e47685cdead18788c9dbf0cfc9528377c5b5ebe1db944fc8cf567154d77ffde63844967006d58ba118703ba904898c23661eb2d5dd7ea87dcc90ee4beb19d7
+EBUILD comparator-2.12.ebuild 959 BLAKE2B be3cda316431033c0522d8aaa0afa03e346e4d4c55c7c87f943e3b0d24ade486810966edce18c78fbe0ab59d45cdab846dad8f6c8339cdf180e1a156ee33d904 SHA512 b9f3e309953fe815201eb4ceaf41e1cc7ac42e75073a424b0781f5233794dd8da722f48e4f1e08e474f73264f917a0552bfbf3c2dea2bcf89c216af8d33a02e0
 MISC metadata.xml 434 BLAKE2B 383d68cbb1192908d9a2dbf445852696f4f819564bb414516f8d15ed444ae0dba20ebd59ee6211be104e947dd1c78488c3abfc7a4a040d6fea0165cae853a287 SHA512 d499eae431272e1541f286cba5dc150442c12848469604ce6696ebc2f60f0b394c3376ebee5a5757e884f1372f732415bb169e7393f27c59a4d0faa57952d7e0
diff --git a/dev-util/comparator/comparator-2.12.ebuild b/dev-util/comparator/comparator-2.12.ebuild
index ec0bfac3e03e..8a10ee5518fd 100644
--- a/dev-util/comparator/comparator-2.12.ebuild
+++ b/dev-util/comparator/comparator-2.12.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.catb.org/~esr/comparator/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~mips ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm ~mips ppc ~ppc64 sparc x86"
 
 DEPEND="=app-text/docbook-xml-dtd-4.1.2*
 	app-text/xmlto"
diff --git a/dev-util/cpptest/Manifest b/dev-util/cpptest/Manifest
index 75775da7beee..e8c7f147735a 100644
--- a/dev-util/cpptest/Manifest
+++ b/dev-util/cpptest/Manifest
@@ -1,6 +1,3 @@
-DIST cpptest-1.1.2.tar.gz 458982 BLAKE2B dbb144196ec5726822f859397f5429e743bdc9bd840c2dab198f19512d2d0ff66b33e8b1018be2616944e300b0bc0e2fd247b7c7a5a290096f8d402592f1441b SHA512 da1030c69a5886e752b9ae08b65c501334c7d2d4abd2174190209ce11ed351239a615b9f7c5019ee601289523b2c21a1205d2042e59aea6c2882d77d636fc57a
 DIST cpptest-2.0.0.tar.bz2 440323 BLAKE2B 7d703a9a41c6fc355f97d2074b71fc5c700ee2483386984147c399c096eebeec7f2a980f0678e1a4d9979a7795d3f7ff7d70cbf8b483e055a420de985aa40f2e SHA512 41b5f7989198a79dca29f7d579c4d3918e5c3bbc0f91f77317ae074af8daaa8e5ee8add7c29c8e345cb95b08524839cecc7659a8d95ee95712e205b8838c5029
-EBUILD cpptest-1.1.2.ebuild 590 BLAKE2B 39c30c57c6d260283cd99ff8412639e9b887f6a7d3e95fa0f85897022a641ada4d9eb1fe76550844b9fbd10a73e6bb715d16b8292179623d43e56c2ae3774627 SHA512 cafeee98794e0c4d4f56f45ff4c35d345ba8765c1c03dda3aba869113de49972750e8db805a1961f76bfeeeefb71185da7dbaac6c83dee6f23b983e9ec8e91b2
-EBUILD cpptest-2.0.0-r1.ebuild 665 BLAKE2B 8696c92fb3022c23384b2889671bdbe009f9c7744610edd0a47ee8822c1897e646e353e776522c5ad56746b0ebbec034bc256a365a3efa32d8c60394d0d2ab2f SHA512 7aba0eb3c4e74783fea20b62c49719611b07164f79d4a260f42379dbb9de5d78861f47515f69884b9e461b6a02b4042c1670305aac8ac914e5771cb793dde781
-EBUILD cpptest-2.0.0.ebuild 624 BLAKE2B ccfffdf1ad6a29ae2b15d28cfe99e9d8029e91688e8e30761b3224b5032f33e9795834bcaed171fad301ee7e37471d15e60867c09af01dabe5cb16ac509f252a SHA512 a096032ab0ad2129b0a97828cab7c286b239236d482c66b2f98a3e340b30151521adf0c1d7fdcd1c539a508e70824912eb72a335114c3dc59120ec4d703588ca
+EBUILD cpptest-2.0.0-r1.ebuild 647 BLAKE2B b71ee992455ecfd6adf2f11c3ad49a17b4f2ffca91c1864a6845fff0c022dad55559d5f0a2e51138bd6c991b1a6dfd191d0f678b36ca7b3a6a1c629c9b641193 SHA512 4a201dd0a1201f18e24458dcc9d7cfba1d37f19ffd21b73c6dc7b139f4ffc83ec4c50226210e451eebc662653bff4530156f16e68d9bbb03527be5adbec12923
 MISC metadata.xml 604 BLAKE2B 2d0f5d155ead0d2035142bd395d1d057a4473d6d724b287bf6429a0c120eb340c16e5626929400acde2377b4c34de6fbb3016021f0b759b6fd16265ed67be017 SHA512 7df99419d82f5c714e2c941f810e3a930569045299b63dd9c2eb851628124c410afd30cc1aeac52ddb651e1e48ae8f41727f02c856b0f5a01d16aec318aa82dd
diff --git a/dev-util/cpptest/cpptest-1.1.2.ebuild b/dev-util/cpptest/cpptest-1.1.2.ebuild
deleted file mode 100644
index b12161051ace..000000000000
--- a/dev-util/cpptest/cpptest-1.1.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils ltprune
-
-DESCRIPTION="Simple but powerful unit testing framework for C++"
-HOMEPAGE="http://cpptest.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
-IUSE="doc"
-
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
-
-DOCS=( AUTHORS BUGS NEWS README )
-
-src_configure() {
-	econf \
-		$(use_enable doc) \
-		--htmldir=/usr/share/doc/${PF}/html/
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/dev-util/cpptest/cpptest-2.0.0-r1.ebuild b/dev-util/cpptest/cpptest-2.0.0-r1.ebuild
index 044ea47a4a8a..f3723fecf377 100644
--- a/dev-util/cpptest/cpptest-2.0.0-r1.ebuild
+++ b/dev-util/cpptest/cpptest-2.0.0-r1.ebuild
@@ -10,18 +10,20 @@ SRC_URI="https://github.com/cpptest/cpptest/releases/download/${PV}/${P}.tar.bz2
 LICENSE="LGPL-2.1"
 SLOT="1"  # for soversion 1.x.x
 KEYWORDS="amd64 ~arm ppc ppc64 x86"
-IUSE="doc static-libs"
+IUSE="doc"
 
-DEPEND="doc? ( app-doc/doxygen )"
 RDEPEND="!dev-util/cpptest:0"
+BDEPEND="doc? ( app-doc/doxygen )"
 
 DOCS=( AUTHORS BUGS NEWS README )
 
 src_configure() {
-	econf $(use_enable doc) $(use_enable static-libs static)
+	econf \
+		--disable-static \
+		$(use_enable doc)
 }
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-util/cpptest/cpptest-2.0.0.ebuild b/dev-util/cpptest/cpptest-2.0.0.ebuild
deleted file mode 100644
index 3d5f2ce9f6ab..000000000000
--- a/dev-util/cpptest/cpptest-2.0.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Simple but powerful unit testing framework for C++"
-HOMEPAGE="https://github.com/cpptest/cpptest"
-SRC_URI="https://github.com/cpptest/cpptest/releases/download/${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="1"  # for soversion 1.x.x
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="doc"
-
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND="!dev-util/cpptest:0"
-
-DOCS=( AUTHORS BUGS NEWS README )
-
-src_configure() {
-	econf $(use_enable doc)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-util/csup/Manifest b/dev-util/csup/Manifest
index ab9d243af96f..7586ebcbebc4 100644
--- a/dev-util/csup/Manifest
+++ b/dev-util/csup/Manifest
@@ -1,4 +1,4 @@
-AUX csup-20060318-respectflags.patch 1374 BLAKE2B 45f3e110cc6607cf12962daf4d0a00ae831d1b91253c3a7b44be32f5523932a77eec86cdcd8f484d18461df6f4862fdb88cb28c5d8806bb4502968605f5897ff SHA512 e112fd37dae7f037e7700579ab59e8611b5f09f0d8351bd2c909e22e393b05f697a51348fab79ba95d31e28b727e62b4a4ce2f8dc22402ac16efcfa4204a1d8b
+AUX csup-20060318-respectflags.patch 1319 BLAKE2B 1c74a442cb0dcaa68b9e37d67c58b8dd4ac0faf1befd5537ace662740db10ea096ff20a2b71c8f40ef93c0bf76df801977095e0cb66765cfac4944059bc67399 SHA512 555f70f70ea376d7d62794b13dc9594c61c3d9f789234b87af0b295c7679bb028d4b6926fe5d9bb42a6035c2bdf0e0662aab5a09a2c58639456afeac3695e2ff
 DIST csup-snap-20060318.tgz 78968 BLAKE2B 9d257e5af438ed784402e427714fc652c5daa403f5cb2240147df5e8c68d2f81eee43da1242b80c82d6bbda3c5534e14c0d6e27ba57442d5b6c34ef1d69ed397 SHA512 60e40f6f903df81b1667af31397978ce99d33b6849dd2476232b325415a391e6840a29e70af85b928a3c7beea55cf3064d3b48d61b9c20c2280dc3f675adcd5a
-EBUILD csup-20060318-r1.ebuild 702 BLAKE2B e6bbb2ad2687b260f527f675628cebf34de2725ae9892e3f17a302a84f0e4aee633e5fd490596e0052ab0974a52f9953a55ececcd9220ba4d7ac99301fdb20d7 SHA512 5047abd39fd2b647ac45a84e1bdc991ec8e8dbcb2adfa65cfb711ee6be337478d1dcf0097132619afc499ee0a5444d436cc76ee20914539a9b599629e0f60165
+EBUILD csup-20060318-r1.ebuild 687 BLAKE2B 8235d6425e9d82cbec09e9d879b7314fedbe1543b2ad4017c5cf38295bea0f61636c45e89ece656fdfbe91469328511883d8fe68d2d445067ee8068156cc480b SHA512 554bde3f74cf04214e76bb6e37ff8017de4bc326d8b77fe01152d3e78b1f0ab3395374a7dac7e3532d047dd60b8872373a54f40ba0c57a3266096c6d8c3b78e5
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/csup/csup-20060318-r1.ebuild b/dev-util/csup/csup-20060318-r1.ebuild
index 2c033c7d93ef..109a7dc21dc3 100644
--- a/dev-util/csup/csup-20060318-r1.ebuild
+++ b/dev-util/csup/csup-20060318-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs
 
 DESCRIPTION="A rewrite of CVSup"
 HOMEPAGE="http://www.mu.org/~mux/csup.html"
@@ -13,31 +13,26 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 
-DEPEND="
+RDEPEND="
 	sys-libs/zlib:0=
 	dev-libs/openssl:0="
-
-RDEPEND="
-	${DEPEND}"
-
-DEPEND="
-	${DEPEND}
-	>=sys-devel/bison-2.1"
+DEPEND="${RDEPEND}"
+BDEPEND=">=sys-devel/bison-2.1"
 
 S="${WORKDIR}/${PN}"
 
-PATCHES=( "${FILESDIR}/${P}-respectflags.patch")
+PATCHES=( "${FILESDIR}"/${P}-respectflags.patch )
 
 src_compile() {
 	# unable to work with yacc, but bison is ok.
 	emake \
 		CC="$(tc-getCC)" \
-		PREFIX=/usr \
+		PREFIX="${EPREFIX}"/usr \
 		YACC=bison
 }
 
 src_install() {
-	dobin "${PN}"
-	doman "${PN}.1"
+	dobin csup
+	doman csup.1
 	einstalldocs
 }
diff --git a/dev-util/csup/files/csup-20060318-respectflags.patch b/dev-util/csup/files/csup-20060318-respectflags.patch
index c95a974c75ed..541622df5777 100644
--- a/dev-util/csup/files/csup-20060318-respectflags.patch
+++ b/dev-util/csup/files/csup-20060318-respectflags.patch
@@ -1,22 +1,22 @@
-Index: csup/GNUmakefile
-===================================================================
---- csup.orig/GNUmakefile
-+++ csup/GNUmakefile
-@@ -21,7 +21,7 @@ WARNS=	-Wall -W -Wno-unused-parameter -W
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -21,22 +21,22 @@
  	-Wcast-align -Wunused-parameter -Wchar-subscripts -Winline \
  	-Wnested-externs -Wredundant-decls -Wno-format-y2k
  
 -CFLAGS+= -g -O -pipe -DNDEBUG -I$(PREFIX)/include
-+CFLAGS+= -I$(PREFIX)/include
++CPPFLAGS+= -DNDEBUG -I$(PREFIX)/include
  ifeq ($(UNAME), Linux)
- 	CFLAGS+= -D_XOPEN_SOURCE -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
+-	CFLAGS+= -D_XOPEN_SOURCE -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
++	CPPFLAGS+= -D_XOPEN_SOURCE -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
  endif
-@@ -29,14 +29,14 @@ ifeq ($(UNAME), Darwin)
- 	CFLAGS+= -DHAVE_FFLAGS
+ ifeq ($(UNAME), Darwin)
+-	CFLAGS+= -DHAVE_FFLAGS
++	CPPFLAGS+= -DHAVE_FFLAGS
  endif
  CFLAGS+= $(WARNS)
 -LDFLAGS= -L$(PREFIX)/lib -lcrypto -lz -lpthread
-+LIBS= -L$(PREFIX)/lib -lcrypto -lz -lpthread
++LIBS= -lcrypto -lz -lpthread
  
  .PHONY: all clean install
  
@@ -28,11 +28,19 @@ Index: csup/GNUmakefile
  
  config.c: parse.h
  
-Index: csup/Makefile
-===================================================================
---- csup.orig/Makefile
-+++ csup/Makefile
-@@ -11,7 +11,7 @@ SRCS=	attrstack.c config.c detailer.c di
+@@ -49,9 +49,6 @@
+ clean:
+ 	rm -f csup $(OBJS) parse.c parse.h token.c csup.1.gz
+ 
+-%.o: %.c
+-	$(CC) $(CFLAGS) -c -o $@ $<
+-
+ %.c: %.y
+ 	$(YACC) -d -o $@ $<
+ 
+--- a/Makefile
++++ b/Makefile
+@@ -11,7 +11,7 @@
  	globtree.c idcache.c keyword.c lister.c main.c misc.c mux.c parse.y \
  	pathcomp.c proto.c status.c stream.c threads.c token.l updater.c
  
diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
index 28d9bfdc5e08..2b06cce709fa 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -3,5 +3,5 @@ AUX 3.30.1-optional-introspection.patch 1266 BLAKE2B 95bc2dece601e561c95d420e3bb
 DIST devhelp-3.34.0.tar.xz 288352 BLAKE2B 26c8c05c161e5607492fc26f012280468ed247ad4c166013e9df5fc1c76d59f98034a157cb58be9554ec65f46520b7d0d2ba78de00134570e84ca5a5ba0dc504 SHA512 34ed48ed323827b01f7d32e186da856c788ddfe37d6836082a81e6c8e4cd7bfc2265309cc3b298a0aea542b85e9261987d47a5a4396d865ec7e4cc13a9d05814
 DIST devhelp-3.36.2.tar.xz 302996 BLAKE2B 61131c7bedfe6803c04315138b017145e7ad7cc2939022a4cfcd0c65f4f3144db705a4a918a4ecd6a6fcea2a5dce64a891d951ccfc21dec0421991455b81ad16 SHA512 8852546b8ff337c2448a88b931803029825e34a6cf906370c683ac004866a548c9de79c934fde36ec04584f0bdc59eee4184b9ed8a480303eb78b9c9d43eb55e
 EBUILD devhelp-3.34.0.ebuild 1773 BLAKE2B 90531b17151b31a31c55fd24201520ee20dc3cb59a9784d7bd81dfc8168fc9187bee1a718d93ec3983071732df5e802cfdbbae9f83776009a3a27d84aaa8ee15 SHA512 5b5685d1acb9f1ec30ba6728d3d7b77787d7f56177b26dee74a52218c2f8f6b666f492b6e6e20147de1c91bbb9d7102429e14d71a18722efeaaecbfcb70eaf0d
-EBUILD devhelp-3.36.2.ebuild 1788 BLAKE2B b045297cc190cd06d0f8b1b3d160d93e0f338ca3918b84f7bce54722aa2bd802124d6e6193902c2b43a843bfec4fa7dff5ee50a7ba6bf28af67cf74122f1ac47 SHA512 2a81df40d83cf170e2bcd6ee481dcbd5556b6dc90fb723a6eb34412ccd02e954413fa5a3833f83b36133b168bdb396486aecd59e16ec275f8228f4061856d7b0
+EBUILD devhelp-3.36.2.ebuild 1786 BLAKE2B df3ef1448328837b7a8b8584c2e2a75cb0271ff7e3f98df682b053078788ec2388bfe0471c5c98dc6f03e17500837c566db5d64e31890a53019f3680b6d572f0 SHA512 b80881b6c705bc8c298e895ed159aacd6948a5767ccbef69f49a2783888ab1cd8372d4dd7d51773864d549b79e61222061fb8c3c051fcbbca0b903eb43b4d13e
 MISC metadata.xml 337 BLAKE2B b031370d8a469a93790b021e5d5f1bbd368ad0c13b144e4fb593d0abbe04d2408f6a7083ae1a1580ef5fdeaf26c59bcbcfcc0d5731f2fd42bde769cf1fb1ece2 SHA512 76931a5e5bff4c6f32aa55e27ff6ef6e320f79c21f1e3c3b3af4733dc0c141a7b782dfa38227fca4d6d50b763dcc3fd191581862ada051951b3185c596ca6753
diff --git a/dev-util/devhelp/devhelp-3.36.2.ebuild b/dev-util/devhelp/devhelp-3.36.2.ebuild
index 22133dbacde5..6d708ca540bc 100644
--- a/dev-util/devhelp/devhelp-3.36.2.ebuild
+++ b/dev-util/devhelp/devhelp-3.36.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Devhelp"
 
 LICENSE="GPL-3+ CC-BY-SA-4.0"
 SLOT="0/3-6" # subslot = 3-(libdevhelp-3 soname version)
-KEYWORDS="~amd64 ~arm ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ppc64 ~sparc x86"
 IUSE="gedit gtk-doc +introspection"
 REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-util/editorconfig-geany/Manifest b/dev-util/editorconfig-geany/Manifest
index ed3c2f57f5ee..b5500b4467b7 100644
--- a/dev-util/editorconfig-geany/Manifest
+++ b/dev-util/editorconfig-geany/Manifest
@@ -1,5 +1,3 @@
-DIST editorconfig-geany-0.1_p20160725.tar.gz 10336 BLAKE2B 0794a7c90c46eb107822a2ceba92ae5dbcafcbe11aac519d8cd2102d92b93c578f3f49e31f7e281df2c3a90facaf29df5fdfa0b2970dd75894356066f4c40a0a SHA512 ac8c4d46c17a5592c8f75a4100cfa1eaa55cb5333a1a6330ae84249d6df3b9ae4b454ee9c68b88ad777f5bea22ad1f3ce0a63bf89a1dd41d13abcfbd2a585734
 DIST editorconfig-geany-0.2.tar.gz 12322 BLAKE2B 2d203d3df6c6a7bb18a0b80cd33c041606b9732a83c5210fe3a66db587dedd81e1a1c2102e827980f6d85404cceed3b097f85e6c33aea81f21e9725fa7dd49e8 SHA512 cda2fd6c8ff5b7a2088840e5f2ceebb2f00f48281ff2943c4ffada30a7e70ce18ae9a84e5ac946e3affb3e5238512f829e545d31b59383722820b89c0309702d
-EBUILD editorconfig-geany-0.1_p20160725.ebuild 952 BLAKE2B f53dd862c4c27b6c061fc5e9f7bb97760b5ffd301e1f50b74695e9b4888ba0b6459dc1d7d5a818cf916083b78d1d39a85c016d6005a36e674c6fbd781a01412f SHA512 1bfbb0bc98b7bf9adaca636eea5a06481b0f645731ce5967711e7d68ca596cd0296f62b23bb6f8b2805fa220be60d88a112a44c6363ed1e6056a8ee6037cd24f
-EBUILD editorconfig-geany-0.2.ebuild 963 BLAKE2B ea286eb12c0b99f568d6062d659598cff680131e0db4f6f74c633accd084ccd4c5c12138dc535996a6f42c7f18fbe077625f7cb031b6c9c71aab35414823e47a SHA512 a064dffe54200e637b5e6cfc083c285915e19d1ae51b99692bcdf5f9197586680a2880e552503e8cb542a5668111d5e16855147d467d0c6ba21a55441dbc9128
+EBUILD editorconfig-geany-0.2.ebuild 996 BLAKE2B 6443273427ece4fa4e2d7504f91cf5a88b8ff5945b5b640ed5a8979abcfce4ad0a010fbf0c6691681c9c316ea887199399e379a2158c47e8bcfe40a79d1909c9 SHA512 c5af88b6429d0fa1497ff87d0dfe8d001022b990625bc3f402554a9b7fc4f5a0b6ed03c5df745c54c65a0c4d2015bc5030ac8b43ec64306ba48ce53a2aa353ea
 MISC metadata.xml 314 BLAKE2B 0689cfb21238bdd9c4c59ab9c9809bf9e99a29d5f18afcdc1c278a623bc10bdb631f1883e729ea0ce3eab0da320054a8c7da2ca707b471167f4c4f74db3d052f SHA512 c6fe2f783aaacb434eca03948af5b32f1b3cd96d701c5f237ff8b0d4ff068ec4ec67daf1715801087b3e54df5451140680caeccac53cc5aae6c0c4a6ea872124
diff --git a/dev-util/editorconfig-geany/editorconfig-geany-0.1_p20160725.ebuild b/dev-util/editorconfig-geany/editorconfig-geany-0.1_p20160725.ebuild
deleted file mode 100644
index de7614d662ba..000000000000
--- a/dev-util/editorconfig-geany/editorconfig-geany-0.1_p20160725.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="EditorConfig plugin for Geany"
-HOMEPAGE="https://github.com/editorconfig/editorconfig-geany/"
-EGIT_COMMIT="9dce3bb476728a8f4124aefe12e0a4ffc8567dff"
-SRC_URI="https://github.com/editorconfig/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-CDEPEND="app-text/editorconfig-core-c:="
-DEPEND="${CDEPEND}
-	dev-util/geany"
-RDEPEND="${CDEPEND}"
-S=${WORKDIR}/${PN}-${EGIT_COMMIT}
-
-src_prepare() {
-	eapply_user
-	sed -e "s|^\\(EDITORCONFIG_PREFIX =\\).*|\\1 ${EPREFIX}/usr|" \
-		-e "s|^\\(CFLAGS =\\).*|\\1 -fPIC $("$(tc-getPKG_CONFIG)" --cflags geany geany) ${CFLAGS}|" \
-		-e "s|\`pkg-config[^\`]*\`||" \
-		-i Makefile || die
-}
-
-src_install() {
-	exeinto "$("$(tc-getPKG_CONFIG)" --variable=libdir geany)/geany"
-	doexe ${PN}.so
-	dodoc README.md
-}
diff --git a/dev-util/editorconfig-geany/editorconfig-geany-0.2.ebuild b/dev-util/editorconfig-geany/editorconfig-geany-0.2.ebuild
index 3e1268e041e6..cc715d422e3c 100644
--- a/dev-util/editorconfig-geany/editorconfig-geany-0.2.ebuild
+++ b/dev-util/editorconfig-geany/editorconfig-geany-0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,6 +23,7 @@ S=${WORKDIR}/${PN}-${EGIT_COMMIT#v}
 src_prepare() {
 	eapply_user
 	sed -e "s|^\\(EDITORCONFIG_PREFIX =\\).*|\\1 ${EPREFIX}/usr|" \
+		-e "s|\\bcc\\b|$(tc-getCC)|" \
 		-e "s|^\\(CFLAGS =\\).*|\\1 -fPIC $("$(tc-getPKG_CONFIG)" --cflags geany geany) ${CFLAGS}|" \
 		-e "s|^\\(LDFLAGS =.*\\)|\\1 ${LDFLAGS}|" \
 		-e "s|\`pkg-config[^\`]*\`||" \
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 3b557e07799a..5f1e1bcc6f69 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -4,6 +4,6 @@ DIST glib-2.62.6.tar.xz 4703424 BLAKE2B 0a27245be2575c574dcc730dd051a8c284f421db
 DIST glib-2.64.4.tar.xz 4779456 BLAKE2B 2ff69c794689c97011103459cb109e6ca7021db20a605cf3942f57e7b73eda9971034b8f65f03191f357169affb278dfa9bff309b4ca44605fd5a0ba0d135d2a SHA512 f21fe33068a5cabdbfef54ef635b3f810b389416c3b4b66ae4975e84841834f7b7640d2518d52cb7341641af5761919eebd5e7b25bd2946f3bdd002c4902b090
 DIST glib-2.64.5.tar.xz 4778456 BLAKE2B 7fdee0e16a7ac820f4c4f7dc66d37add464d3005e89e6013302d3ef103319331811d68e9b42db072b82242c3d7badfbd085b69333e770012def89dc8aae7a2eb SHA512 a87537274619b6de88a0e68555059036ac18c748b5005c8d84728646b0db342fde0b8c5b303b9ad79f64d71ea4ed990d52a4fbd68cda3ca74aed5fe4d497e060
 EBUILD gdbus-codegen-2.62.6.ebuild 2043 BLAKE2B a55f20184ac1bafd3aa391b2d0c79ccefd5c6dc64f7c4619ee505f16f645c479fda199e6c54cd41ac666c5e68ab9431109f642655250b3f16f28c1d8dffc6da6 SHA512 9ad9a9475d431ba44a913f2b0423fa35623105d87ec8eb583b9eb0c67aa8358681b8d7ef1f5856e6c15d873bb29d1d5397788e44ba2e6bd5fbb734c1c503717e
-EBUILD gdbus-codegen-2.64.4.ebuild 2207 BLAKE2B 8f3d0a630b70611af94a2d0d9ff3b5b7c4b1291e0efeb5a87a3ff38fc5e2b2790261ab9ae0bc9b5b325e509f031884a1892616d774ed18b8366c03a86de7bf97 SHA512 5decb4a4ef7c5b62bab57bec7a31884c11a66ecc3a7262e53563e53b21600cc10a96a33355902aed395fd68bb046ebc2ab6619c2ba816c2a435729fbb816be7a
-EBUILD gdbus-codegen-2.64.5.ebuild 2210 BLAKE2B 33183b64bb0580f471c75fa8013896e72040482bd17b24bd159418649d6ade174c16d7964732afb86aeebc81bd6692a77e5ed5fc1d4309908abc7dd762075466 SHA512 8a850c678739ca20f6bb55edfad22a2733363784ee7f42aeb8b9775a13d89fd901137a39600ab8921468f2635d8b1c2cb650b5fd696c80e7406ce8a5188da1f5
+EBUILD gdbus-codegen-2.64.4.ebuild 2205 BLAKE2B 872daa764448aa62fc772b093925a728e93753eba5fc5f744a538a54c9bd768327c39c8213ccd4345b82c4d10e850a408be4a376d34245ff45aa6969bd0bd3bc SHA512 693855710cd8d6aa0bb0df70357b45766e195411f736184583e4185dcd5bfe7b24dc5fae334923b81501310c0edf07defd715412c7689adc1efc23bcc53240ef
+EBUILD gdbus-codegen-2.64.5.ebuild 2206 BLAKE2B f6cab1cd824aa72b64d40ae59e79cff49eee6ad65c098bf7c9258be0da87e1626be8fd3a1ee5e9a498f22b11c8cb90dc594a06e9df8bde42eb4261e808d04be1 SHA512 dea65adcbbfced76a579f37225154d7963ff10e118421accf2aeee822cc3c064fdb532ae4374e55e03c99819278488b18665f0868903a919667ad9da9988b4c8
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.64.4.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.64.4.ebuild
index 145320a2a9dc..63279f3aefd2 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.64.4.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.64.4.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.64.5.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.64.5.ebuild
index 7ac039681680..6832da6eb8d9 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.64.5.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.64.5.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/gengetopt/Manifest b/dev-util/gengetopt/Manifest
index c568130c3937..52d4eeb058ae 100644
--- a/dev-util/gengetopt/Manifest
+++ b/dev-util/gengetopt/Manifest
@@ -1,4 +1,4 @@
 AUX gengetopt-2.22.6-docdirs.patch 364 BLAKE2B 06919d379a6f0e13271d89dda845dcc920a7581ff380d52318ec11f658327c73c1102326108080b9129610fe89b80aec39c01e0923c1449ae2d00123f4e8609d SHA512 f2bb3ba6e63c32deeda6d0408621a480b0902d2e93a3ceecbe3e79f72c79f3269bbd2e2fd3cd6bcb248bd81d0105dcd8520d44d523c53ce58843bc38a9cb21f6
 DIST gengetopt-2.23.tar.xz 584860 BLAKE2B efd94e28d35319f3a04af4f97b87fd8a07bef93856da0dcfad54ab4800d43510f7948bbb7440f39abfe242aede5657abd874bf4ab4dd311336e10f37e7960cb5 SHA512 3749191d35acbeff6680f2a4d0516706a0491053f632aaa44ead7c3a42e56f9870bd7c4a85a1886f2052e17d86a2853e2f65d445e0c9920e41f1dc354f003712
-EBUILD gengetopt-2.23.ebuild 658 BLAKE2B e6f38eee73c376c7b20a3af15561a6797d6c87a2f925f490b7d0cc9b19f0c6ae10c98723d54cf2fa60cc6dafeda636bc4633c78cb25026448880a770a45faa76 SHA512 d8e5765f6b47e020789b2c133e467966c563019d64acf1b60360db1fa0fdf5f3d39763660eebf3ca374c8c6c0fe4859c2851bd944ec4609a6728f301c265fece
+EBUILD gengetopt-2.23.ebuild 665 BLAKE2B eb8e13898a5f9aa73f26699911f491e6a7c36b9128287f11145be7e1967fccea2c27392990288f3293300a358c818e9b497569dfb5dc576c081f5f2186f54cf9 SHA512 a025ad74ec1e1f8b4d6047b03e8f29f7609ea6e9434772e78b4a43cea287414f23a81319d39a95e3d466cf4750afae93d8ee69c9e30c0a334c297dee540611aa
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/gengetopt/gengetopt-2.23.ebuild b/dev-util/gengetopt/gengetopt-2.23.ebuild
index 0077d0818306..eb7a7add915a 100644
--- a/dev-util/gengetopt/gengetopt-2.23.ebuild
+++ b/dev-util/gengetopt/gengetopt-2.23.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86 ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris"
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.22.6-docdirs.patch
 )
diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest
index c3e2c314f4fe..d7b948685826 100644
--- a/dev-util/glade/Manifest
+++ b/dev-util/glade/Manifest
@@ -2,5 +2,5 @@ AUX glade-3.14.1-doc-version.patch 853 BLAKE2B b7cad3cc9d49cfe24189ba21bffaec2c5
 DIST glade-3.22.2.tar.xz 3550008 BLAKE2B e1217e221b36938937c57ae465a3707eeadc52bc9127b3af2fb6514e572676e3e284811d5332876dce110fd321e2bb33b9ac8b0afbd97dd747725eb73309dc15 SHA512 cb82684423ae055bc8e84a8705529ecdc72957563f444633c2c5c24a922130de84c212537323b6ed259f0e29349b52dff608822610b87babb8fc3cb468a5f4b0
 DIST glade-3.36.0.tar.xz 4466808 BLAKE2B ebc93c9471225782bcbcbafc4a475638e77ad763d607188d95e8ac77b3de70f76fefe963027bb6b32ae71adeb1daafdb1a2c98363b25030d83f20f767613f68e SHA512 c984613ade26e3fe68a700a48cccadf5ac96eb716a6e90aad36f3de684faeb607d9aaf112d74a048cd33e222a02388ee6583ca915648486f0259cc805e16d243
 EBUILD glade-3.22.2.ebuild 2315 BLAKE2B f928f40ffcbfe130cfa95f66efc38c25ee98527d1955863247c0c725ec0a73c1d487b15706764c80c7d5023a9afb3c46fc68469e9bb21d17186d988c45560511 SHA512 ef69855f9ad86b60e889b571ff0d7dff359eecccb547b8be85d4717b0a1fa7c0c84a990909826c953ce62916b3403b062bb9eb58807f727579e4923c1da0f11a
-EBUILD glade-3.36.0.ebuild 2300 BLAKE2B f8833626c35a883fb6eab06aefe2bebcd0ad48681a31e8a203be41616bb15843ee0e9a16030c3c039e6cc849d34380319ce0b5d771819f89234dcbd539a39b93 SHA512 4fe5e6cb948ed27c5a52f139b00ed53af03fd33841e075c49081e06b200d16635b3fb0e4911aca7f1646a53dad2fe7e7e671110b41644aaf69182a6c887d3641
+EBUILD glade-3.36.0.ebuild 2296 BLAKE2B f1744eef85a5784f8a0d96519318a0d45a63e7ae408c9c71969120d0e2a33efc7d37280a86565f890daf98c55d73f3e0274070b0f7fd64f82a60c01b50c1a305 SHA512 910a5666241e7fd3fb7884fc4fe676003e836e5e4aa6c6ca41032def599822f5a9aa4259b43e884a25707921e1e1eb8624fc79ede94cfb3ac6456be641832b0e
 MISC metadata.xml 358 BLAKE2B 33f3b46ab877b311931205095fb2b357fe7fe2da8820944d32e8a16f2dbcf99033f95a17f4cefa4aa6d0f731c72d0f65683a8cc3b947ebf09d084f92e796f887 SHA512 8840ebde12f26a2caf856e75f3f706e3c9a7a7a771d0deeae99ca6b16f4bbeaf119bae7776a8a0bef8b7422f52ebd6498a8b5e862af4548886249386dcb44480
diff --git a/dev-util/glade/glade-3.36.0.ebuild b/dev-util/glade/glade-3.36.0.ebuild
index 57e88a13c231..61320ab48fd9 100644
--- a/dev-util/glade/glade-3.36.0.ebuild
+++ b/dev-util/glade/glade-3.36.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://glade.gnome.org/"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="3.10/12" # subslot = suffix of libgladeui-2.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 
 IUSE="+introspection python webkit"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index 33a73c89d8d3..db9784f11e97 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -2,6 +2,6 @@ DIST glib-2.62.6.tar.xz 4703424 BLAKE2B 0a27245be2575c574dcc730dd051a8c284f421db
 DIST glib-2.64.4.tar.xz 4779456 BLAKE2B 2ff69c794689c97011103459cb109e6ca7021db20a605cf3942f57e7b73eda9971034b8f65f03191f357169affb278dfa9bff309b4ca44605fd5a0ba0d135d2a SHA512 f21fe33068a5cabdbfef54ef635b3f810b389416c3b4b66ae4975e84841834f7b7640d2518d52cb7341641af5761919eebd5e7b25bd2946f3bdd002c4902b090
 DIST glib-2.64.5.tar.xz 4778456 BLAKE2B 7fdee0e16a7ac820f4c4f7dc66d37add464d3005e89e6013302d3ef103319331811d68e9b42db072b82242c3d7badfbd085b69333e770012def89dc8aae7a2eb SHA512 a87537274619b6de88a0e68555059036ac18c748b5005c8d84728646b0db342fde0b8c5b303b9ad79f64d71ea4ed990d52a4fbd68cda3ca74aed5fe4d497e060
 EBUILD glib-utils-2.62.6.ebuild 2390 BLAKE2B 6160cd993d8ea330b68812082a1e14c6d9c64e4adc2832bb68693e8a8eacc7598541f19e049a7601027b5fc1624485dcdc9745c7095b07d3b004a99a7f612d44 SHA512 4840e214e3283609722803ac6e52b015cce5e1f74168e318bf78bd0f0d2e7332f35063939c843ed39d03b0c9822a6aa738183bd0e0b6ea1067aae5c6b2a57a03
-EBUILD glib-utils-2.64.4.ebuild 2396 BLAKE2B 5c5d5edfcfce8d27e9b1abe8623d0ebe913338d0afb1fbd331e8feb5df7b446ca5e2d7952014298467909f042e56dc062bcf4ed948d570db55f03a2b847db15a SHA512 a20b2d9bbf6a1685b2be734238e083cbb0f1adc1bfc1d2c152d682d6c04a2a065aaeacb331fa07688702b897a24683b18278b291a9e9c28cb0425d599555007a
-EBUILD glib-utils-2.64.5.ebuild 2399 BLAKE2B 68065e66c639d695af972944e37e40eb633c6b7033d9d6d4f032f5c016017529cda1ea8d1e264dcaaa6ebdf0c3c2c643b59dae936b87f787c68703f1bb560526 SHA512 15730dd4f08903d49d4c462eb045b557b5c237e581699fcd9253199dc1c953415552dc908e110c701d7ef1803e336a25547509ba15c8bcd95ce8515e1d5914d7
+EBUILD glib-utils-2.64.4.ebuild 2394 BLAKE2B 038afba03a85892f5cf5a4ff3cb6e1a1f4de412987be28a8852c7f31028027374f9ffab2ab2088148fd2a282c9040c248900ab478eca9b75337f829d229af86b SHA512 b81197d03d0b477ec54541524492b2d7234eb4817f3e7e5664ea7b844367789c1610bf92a4979cf291a7ac3002a4a988f10270a224e239807cacd4f98f5768d4
+EBUILD glib-utils-2.64.5.ebuild 2395 BLAKE2B 658619493709c26c3651bf6375d5ed4b82b4120184412bbbb52f092acba10953cc57554fc2717f3b18a3cf28f536a634605f4e7d86c55b2173df5bd9c91d5eb4 SHA512 a5e0acd2015b1df3332e632494cf24f2ed9bdbaa6791ac2e3f8ac91fe6ff61f4614f4183e6fd6786f5bb893f94e1945d5b654c131853abe4b3b0d2f56720d985
 MISC metadata.xml 332 BLAKE2B 1e3c081ae9a2c8ae53cee6c3ae133cbd5e8543a68c03d4a4f7e164437502d996ea9364789e93114687271e1f472bcf13a418cca5b74ecb95a51849f0a5f3dafa SHA512 f7680d9be4071b841f50ece99b5041dc492901d84ae05383c1ff05b6a73bab804b153a50eb70f5417137f6e2041230c5ba8eaede10f7a0bf8a899508642588c6
diff --git a/dev-util/glib-utils/glib-utils-2.64.4.ebuild b/dev-util/glib-utils/glib-utils-2.64.4.ebuild
index b77b6e37bdac..bdb4ef5fb8be 100644
--- a/dev-util/glib-utils/glib-utils-2.64.4.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.64.4.ebuild
@@ -15,7 +15,7 @@ SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="${PYTHON_DEPS}
 	!<dev-libs/glib-2.56.2:2
diff --git a/dev-util/glib-utils/glib-utils-2.64.5.ebuild b/dev-util/glib-utils/glib-utils-2.64.5.ebuild
index 0dd0c2ddd686..4c5e6f0ff472 100644
--- a/dev-util/glib-utils/glib-utils-2.64.5.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.64.5.ebuild
@@ -15,7 +15,7 @@ SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="${PYTHON_DEPS}
 	!<dev-libs/glib-2.56.2:2
diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest
index 318e519227b4..3527b789dcf2 100644
--- a/dev-util/gnome-builder/Manifest
+++ b/dev-util/gnome-builder/Manifest
@@ -4,5 +4,5 @@ DIST gnome-builder-3.34.1-patchset.tar.xz 44680 BLAKE2B 91e91ac8d0fcf6b54d32ce9f
 DIST gnome-builder-3.34.1.tar.xz 11974748 BLAKE2B c34a31c50b327d02632ff18d48ad59f925306901e8874e0c7811b9258c56027403de0d9dc1877c696d96037bdfcdcc27f56f59a41d232e47b330382b1dbf67e9 SHA512 886c732f20563818dcf1deb96d4277fe96a9499b999cfbc7a64286e816e9a36bb978932d36a1e764b54c2d36891b7546fa058f51e036b0fa101c0872f4ce51d8
 DIST gnome-builder-3.36.1.tar.xz 12026976 BLAKE2B d833665bb71b1549fe789d05dbd89db588ae4cc7187e532f38f3bd9e779bccab644d9f9bfc4c84bd484ac678bcf8594e4aa4edff29ea8c87c5c557fc3e422a4f SHA512 284da6e5a9e766cb6f6122f1134c779cde8406b006728ae1fff3518020ef4b96239aa5037cd2d35cfe4728ea088d61c4eeabc39ea753a16208fdaba7b04e63c2
 EBUILD gnome-builder-3.34.1-r1.ebuild 7373 BLAKE2B 92642b4c86bb5eb125ce98e2e1e0ebd88e899fd8190de1ead83f1407a78baedbbd7c99978b34e0e6cf4b070dd5a06c5e0488c0a1b2142aae8ec955ab7268f284 SHA512 c56c98b53de6d4de9e3100caf907d0d72df9c8ed4df585578713c69c8cae66eb323b4fc92fc2339d41df5dfacb71eed476494c66a288d317a28b4f66963e28e0
-EBUILD gnome-builder-3.36.1.ebuild 6738 BLAKE2B cc9f2a2e503a817cff819a73bc9b014c662883bdaecc549525d0b8920c9abe6ecf11bd9c6868a467979059afa2dd817b7b7668b1ccd008027bb89c1653ea4c69 SHA512 b877c46c9eef1e37f7c881aa6c5ea2352ea9797cbbc47061cf9711be6583c71b21ca68f903ce5ea3b526406710ce3c242094828f940c1239a11b3b2e05e7a71f
+EBUILD gnome-builder-3.36.1.ebuild 6736 BLAKE2B 5d431790f425c8030785833770b60e374a80faf3e9c11c3a7ec5874c66bc5701820d430af57bd43f3335d87bfa1d2417a1402f6639376462342f2d5de1124050 SHA512 91ff5b073bca65e41dc5834b1363bec51c1217d9432c4f05f16990852673d1da36de188758a0115446e43114c5c6cd089a7f28beb8cabd7d893122a657029fc6
 MISC metadata.xml 1085 BLAKE2B 0b2bdcfec562b85e54880c819a0345c2aedf4f8b1c0bc34b7b4e3e8551697dcbb3ed93da1e016f3a164bb677459e8d628ba943252e51e842152282c3757f0232 SHA512 58890d32c2d04d63eaae8489ea68054ffc50df5bf9970af6b159b2dfbc99b8ed2d2db80aa29907463c137caf5eb8aa129c1470d1e19ccbf398ff8789f7f63987
diff --git a/dev-util/gnome-builder/gnome-builder-3.36.1.ebuild b/dev-util/gnome-builder/gnome-builder-3.36.1.ebuild
index 1e2aa345a274..14d3b5f452b8 100644
--- a/dev-util/gnome-builder/gnome-builder-3.36.1.ebuild
+++ b/dev-util/gnome-builder/gnome-builder-3.36.1.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64 x86"
 IUSE="clang +devhelp doc +git +glade gtk-doc spell sysprof test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-util/gtk-doc/Manifest b/dev-util/gtk-doc/Manifest
index 71aaaa04433f..ec90709a8b43 100644
--- a/dev-util/gtk-doc/Manifest
+++ b/dev-util/gtk-doc/Manifest
@@ -3,5 +3,5 @@ AUX 61gtk-doc-gentoo.el 283 BLAKE2B 116d2b43d42b05130482c5bff7a10f13930a0d04f348
 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
 EBUILD gtk-doc-1.32-r1.ebuild 2340 BLAKE2B bd2c6091b9237fe011e29429bf7a515d3e9149667fd8e553319d04da49f0a8983dac1a3aebf0f5aa7df589e03398f1dcbb816fc3381cd10cf2f8da328e4afbd3 SHA512 e70e382d6f2f73de8a9205055f9766b1b18318c4707044c595f6ea8b4f75a53afe0f09c7cf5774a8820ec234f9b31196b2d1a2fa18be6cf6112cb35ea05f8368
-EBUILD gtk-doc-1.32-r2.ebuild 2557 BLAKE2B bcbe0aab1994af6361449636ac7a1736d609e7bcc7e201340d710ecdcbcab2737040bcc9ef5a10319b1840d30fc2392d7258628de32135d55ea789e9ae325516 SHA512 c7a13bcc30b4fb31bbd484446be1a2933cdc4138b37db9a20a0cbf5ea37123df746607431fc89f6169c28d4a6819a36a017648980479116da0301c5558f22e2c
+EBUILD gtk-doc-1.32-r2.ebuild 2555 BLAKE2B de99db9ba3bcfc3f3f4cc3a0bd68bc7a88d9c1a8f3c0f8e0d5f5d9d16cf5e0725d567a3bba66d1528eafead52b0c6c29a5be37179ad83c152f45e6171a35c468 SHA512 83f0c15490fd51d68798fdf9cb19adbcc7f3b535fcaa4dc0643e80052eaf750e984d793cd84ea2f5e81be96ef722d670115f4bd5000d4b854e64e485962c71eb
 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 a434b00475f0..0c76a1b5fe4c 100644
--- a/dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtk.org/gtk-doc/"
 
 LICENSE="GPL-2 FDL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 
 IUSE="debug doc emacs"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/gtk-update-icon-cache/Manifest b/dev-util/gtk-update-icon-cache/Manifest
index 2d6ffefd5beb..8b1b91e0d188 100644
--- a/dev-util/gtk-update-icon-cache/Manifest
+++ b/dev-util/gtk-update-icon-cache/Manifest
@@ -3,5 +3,5 @@ DIST gtk-update-icon-cache-3.24.20.tar.bz2 91769 BLAKE2B 4fb1d4e06117924377e2e3f
 DIST gtk-update-icon-cache-3.24.21.tar.bz2 91918 BLAKE2B b9cf0f944f13c3280ad615a6453e8fe80424b481d66af7bfd98826354f124f67c3a75afece07cd38cb8722eb1beeeb23b1cb7e23ae8d68f2dca195a155c69508 SHA512 207449dc92b029f735f40cf4e9cc59dd02103bab7c382a69feb7162873e2cf7b1fa6a7ce818533888305424667795da86be55e5befc89f8bfc8809d6aa6cd92a
 EBUILD gtk-update-icon-cache-3.24.16.ebuild 894 BLAKE2B c3534d66ac52481507d5a722eba0b98eb780cc18be33e18e336228def9d67d0a41a067507e83d3cfddac74c57fe2d33f26f1caeca77565f64a1a6197e0c664df SHA512 a3173194e30215c653e2d10fc7e864c2a9f70a35f0bd0d8e3e72d5eed8e8f98552de249bd5c4ff59320fd4bd0be7aac90896434ec7b70a44de12e3c1afb899dc
 EBUILD gtk-update-icon-cache-3.24.20.ebuild 897 BLAKE2B cd9f19dbdeb333e1872d0a7a2b4acd9f6051e0577dd81cd840d5e1e917f558f2ac93bb46f16df39442a1fb3a7d4f79d0f6032510ae1a5e0d421e931d37ba2ef6 SHA512 01b6d21fe354433e574ed12d598df809ac93fb6098a95e93935d8ecf7fde44b54565fdd1d7ec548779e83a70e7c45b33673d4a7ee286f1ebeb68626ccd0ef2e6
-EBUILD gtk-update-icon-cache-3.24.21.ebuild 903 BLAKE2B ee0545f00fea8535537acbdcefb75666308de4370e36e89aa1ddae46dd81442ea3f01db5ae511e1ce459aea94d4bd756811888072de25c678f219d922a520d94 SHA512 972dd1ab10307c5d4d60a0333bbd06fcb84847566ed3fe9395064074230fd93afccfd38eb9872bb9f110960135a064bf09a50b34888265c05e92c8a39fe0f35e
+EBUILD gtk-update-icon-cache-3.24.21.ebuild 899 BLAKE2B 42cd08d6f19bef4f1516d010b97a2052f95e8c7ea4875f01baae65ae3fa0cd893c2963357fd30cd2a782b43c0ad1cdaece14bafb684c67ec4a1628a4fb74727f SHA512 8987bc5966d4fea8f66e97c17df39567ca6714ade5d7d55828a9e0013ab5dba205da548fb36f1b73cb911478b1fdea9ef6aeab0269adfca888a423b379c473e6
 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 4c02aa74fa1a..cd65ce7a6215 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 ~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/idea-community/Manifest b/dev-util/idea-community/Manifest
index 5939ebf69d22..09e9495021c7 100644
--- a/dev-util/idea-community/Manifest
+++ b/dev-util/idea-community/Manifest
@@ -1,12 +1,6 @@
-DIST ideaIC-1.2.201.7846.76_20200507.tar.gz 529076492 BLAKE2B ec93303776324fca08db6e0a0e8058cdc4aa009852cf02beeb27193ea479845319f7b9a11983d56b10b31e280f4da5bfc6f43c802d42fa3c85d43ccbaa67a965 SHA512 59a6e87788dd0776ed11e882ae3f0b9e18f63d899602a4c576f946a7979d895a8750af20947f6273db8fde3fccce05cbd5b6bd4c0142450935d0abaace405679
-DIST ideaIC-1.3.201.8538.31.tar.gz 529511746 BLAKE2B d6eb9a4bc333136475432110ab767efd763d4631379f811a8b9ce70b415d621936630b1e0db55c90f572862176db40b50c76c34d1a179927d1ec7d234b6dc137 SHA512 34dcb365f0c1cd7362cd4660677e25b333557f1440b6835bf42ad365fc660849daf6733f09b1fc7aac8046752532c5a3f329656649708f629a812aa8989df50e
-DIST ideaIC-1.4.201.8743.12.tar.gz 529515629 BLAKE2B 68a14df3945d35e6b1d6780ffe9ce1a14f03289fab2770bb33960c4d6d880d5428c5fafea38ab5b22e8ab3b82abf1c92d438e77257a4f8ab3f11a3a32a9702b1 SHA512 6389c5aaa2c38dc3e920253318ac6989f57f72caef749cabda34551d1a6c235c831e9fe29078f3b92b6f6189ad90577b057396776d4d16b4ff46d096e283061d
-DIST ideaIC-2.202.6397.94.tar.gz 526710783 BLAKE2B 70ea95e09d2dcd3a09b8dbd35e4a86552800015d7f97a66d7144164bd5dc3ae40cb708e0b7541a274995cf026fa90ebbaae16967f4f4328206f653dbd16f0b76 SHA512 39a17494c31854d4dc7525af39f234cea18fcb112c1b05eeca4a0baa19069765cdc213691b5b379a4cfc05b0469e1a532ef0427955b8e1a10041db100d83b495
+DIST ideaIC-2.1.202.6948.69.tar.gz 529563846 BLAKE2B df3771c8ca85a276a1ed9db5e9483f922a98f25ab82061cc54dee791f84d44dcd7d813180d587a3a9f3cd91d10b83881a3d42da11ecee3be77dccbe2ee7e98c5 SHA512 bc32e01297785bfcf2a57f97e697b7ec8f894f49c5f27959ed3fd5bab6ade0cff8f0091847809f7ee5f7b7299c2bda3e4bdb83cadc68a7a3056242dd83c1c4b9
 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.1.2.201.7846.76.ebuild 4689 BLAKE2B 76ebcb168c22aa99bb66c9dea40ee73827457174ccd522fa9783e7ad2464f309813ac584734ad3910fb430a6ddc96896d53c750aa492bf921e5f4b4e41595d7d SHA512 50b38ae228d237ff975ecb824c585f8b97a024952d2cc5bdc02e2b45a7421831bcaa41c35472ac168151b4dedad9833eb25c6aedaa2169ef037ba1c6e5036f88
-EBUILD idea-community-2020.1.3.201.8538.31.ebuild 4693 BLAKE2B ac564614a230e6539459a2122d5ca9b9ce842697a06c44b4b10eef9cdab283a5e8967d39a40cf24c1ec2e1252f97d6569806aa3807aaca8c3a9f686aedf372e5 SHA512 e07f7c5957113f18a57281cfbe75c136b141c82d1ec6487cc0a1eb47f2b87c181f203111ae86505df7d5f2c73791ce03c68e48ae09916caf87188aa121656f7c
-EBUILD idea-community-2020.1.4.201.8743.12.ebuild 4693 BLAKE2B ac564614a230e6539459a2122d5ca9b9ce842697a06c44b4b10eef9cdab283a5e8967d39a40cf24c1ec2e1252f97d6569806aa3807aaca8c3a9f686aedf372e5 SHA512 e07f7c5957113f18a57281cfbe75c136b141c82d1ec6487cc0a1eb47f2b87c181f203111ae86505df7d5f2c73791ce03c68e48ae09916caf87188aa121656f7c
-EBUILD idea-community-2020.2.202.6397.94.ebuild 4693 BLAKE2B d325625d4804d5266b3c3e0582be84cb30fe70bec637aca319490692477064fd42adce9ab1419d9c64b521d0ba0f9d6420052cfb98a39f4c2b674eec99367e83 SHA512 608feb905e8c4898125910c834033e7f7b161f730edad005473be7522e16f1708727d9caf16dbfb35ef753341e8aed4e2235a778a1a7dd98c78718162e6c7ba8
+EBUILD idea-community-2020.2.1.202.6948.69.ebuild 4693 BLAKE2B ac564614a230e6539459a2122d5ca9b9ce842697a06c44b4b10eef9cdab283a5e8967d39a40cf24c1ec2e1252f97d6569806aa3807aaca8c3a9f686aedf372e5 SHA512 e07f7c5957113f18a57281cfbe75c136b141c82d1ec6487cc0a1eb47f2b87c181f203111ae86505df7d5f2c73791ce03c68e48ae09916caf87188aa121656f7c
 MISC metadata.xml 758 BLAKE2B ab45d0a8508bed2b64d02ca83d0aaffab9dfceb13a6a188accbb18f0648593ef1a9cfa03f375292b9858c05b17f003f4c6c2261b9d962ddaf679eebe7cea2eda SHA512 15ad0429ec342e939f3406e83b736ec9a273cb4ba33998a83584cee7af4ad0433a5a4758c8d01feb24efef51e4a4d9761db18d0bfc054bf9a0980ac8806eb459
diff --git a/dev-util/idea-community/idea-community-2020.1.2.201.7846.76.ebuild b/dev-util/idea-community/idea-community-2020.1.2.201.7846.76.ebuild
deleted file mode 100644
index 5759edc135c6..000000000000
--- a/dev-util/idea-community/idea-community-2020.1.2.201.7846.76.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=""
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${PV_STRING}.tar.gz"
-else
-	# upstream stable
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}-no-jbr.tar.gz -> ${MY_PN}IC-${PV_STRING}_20200507.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.1.4.201.8743.12.ebuild b/dev-util/idea-community/idea-community-2020.1.4.201.8743.12.ebuild
deleted file mode 100644
index 97ec35a8801d..000000000000
--- a/dev-util/idea-community/idea-community-2020.1.4.201.8743.12.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.1.3.201.8538.31.ebuild b/dev-util/idea-community/idea-community-2020.2.1.202.6948.69.ebuild
index 97ec35a8801d..97ec35a8801d 100644
--- a/dev-util/idea-community/idea-community-2020.1.3.201.8538.31.ebuild
+++ b/dev-util/idea-community/idea-community-2020.2.1.202.6948.69.ebuild
diff --git a/dev-util/idea-community/idea-community-2020.2.202.6397.94.ebuild b/dev-util/idea-community/idea-community-2020.2.202.6397.94.ebuild
deleted file mode 100644
index bc1a221116ac..000000000000
--- a/dev-util/idea-community/idea-community-2020.2.202.6397.94.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-2)"
-MY_PN="idea"
-# Using the most recent Jetbrains Runtime binaries available at the time of writing
-# As the exact bundled versions ( jre 11 build 159.30 and jre 8 build 1483.39 ) aren't
-# available separately
-JRE11_BASE="11_0_2"
-JRE11_VER="164"
-JRE_BASE="8u202"
-JRE_VER="1483.37"
-
-# distinguish settings for official stable releases and EAP-version releases
-if [[ "$(ver_cut 7)"x = "prex" ]]
-then
-	# upstream EAP
-	KEYWORDS="~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 3-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/imediff2/Manifest b/dev-util/imediff2/Manifest
index 543287088c84..8e1ab134f586 100644
--- a/dev-util/imediff2/Manifest
+++ b/dev-util/imediff2/Manifest
@@ -1,4 +1,5 @@
 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
diff --git a/dev-util/imediff2/imediff2-1.1.2-r6.ebuild b/dev-util/imediff2/imediff2-1.1.2-r6.ebuild
new file mode 100644
index 000000000000..53ef872d4340
--- /dev/null
+++ b/dev-util/imediff2/imediff2-1.1.2-r6.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="ncurses"
+
+inherit python-single-r1
+
+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/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index 4cbe85c27ac6..4d4182497b9b 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1,4 +1,4 @@
 AUX intel-graphics-compiler-1.0.9-no_Werror.patch 272 BLAKE2B 079fe334413dfddb7681940f2a8920a365e8e72526cfc09ea1c7d218e8b19468f80ea9a215be125b441ee5238d7856b8dec02ebfc4bfd76b1850aa9917da35ef SHA512 d3d27943e84e228b480172b4fe91ba9aed8bb1c98700eb8c8beebafb7f1cc6265279031f56181e67eff74f55e1bbc8ee24bdc4d14fc1200c5aff670ef019410d
 DIST intel-graphics-compiler-1.0.4111.tar.gz 5781246 BLAKE2B 6fe47422b31b0c73d24c3cef1265772927a57751bf5648f862f7c73528f2174268fdb2271c30c49ab038b4dfbe530bc088fe727e66babc5db0a41759e7212733 SHA512 8f589ee83a27b7a8f5abcd008e36a73fb704c20c1ae17e1ef265c59641768b75a0a08f2d6f80355442fff7625154603db3ebe9be0a4ba702b45e85db434f8110
-EBUILD intel-graphics-compiler-1.0.4111.ebuild 1595 BLAKE2B f096bc2bde19be56e368a11e2174f9aef4a412595dd96fa7736ea67d1293aa5325f894c84eb3b12c93a8a9f96230f934f07750202dfdaac56bbcbb9b3bc4b3d8 SHA512 74a2e5639030e4dcd4601005be37846f289ba25c13bbb452769659660a73f36f1e6dfdcd1c432639383f15c9f33cb4990e3446d8b469a47363918cdc1f28e791
+EBUILD intel-graphics-compiler-1.0.4111.ebuild 1663 BLAKE2B 5bf7753c427356e80cf79221fedee6dbb61670ac86269787bdfb37fa6b018eb0dfeb0925b7b127d44144e89784fef8052ea5f438df41ae4a3aa0b107c4b8b4a9 SHA512 a1501c953a613beafc2b22f763fbf515cdebea1d0b075cf77f1fedde12418a6a2c573eab71b7e847685d9b96a859a8e78a001ac14923656655516d45fb92c050
 MISC metadata.xml 340 BLAKE2B 6c0e5d932084dffd300a1dc70b29eb0871dfe2187ed8591a5a2f8cba001bf681e908c58a6f9471f7b08842ff538365258305da91004ed63ff97314a07fda529f SHA512 d24016b4ae0ffb05be475f86bb8d72ab4a85475655f409b8826dcd69726e048aa048e321f26ac36f2f52aec40abbfa66a95354a711332df94dc3e57e6c396a0c
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4111.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4111.ebuild
index 7c11b12c6397..3bdf70d334d3 100644
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4111.ebuild
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4111.ebuild
@@ -18,7 +18,9 @@ IUSE="debug"
 
 LLVM_MAX_SLOT=10
 
-COMMON="<=sys-devel/llvm-${LLVM_MAX_SLOT}.9999:=[${MULTILIB_USEDEP}]
+# Bug #738934
+#COMMON="<=sys-devel/llvm-${LLVM_MAX_SLOT}.9999:=[${MULTILIB_USEDEP}]
+COMMON="<sys-devel/llvm-10.0.1:=[${MULTILIB_USEDEP}]
 	<=dev-libs/opencl-clang-${LLVM_MAX_SLOT}.9999:=[${MULTILIB_USEDEP}]"
 DEPEND="${COMMON}"
 RDEPEND="${COMMON}"
diff --git a/dev-util/itstool/Manifest b/dev-util/itstool/Manifest
index 632c42dd11e4..d7591ae54c14 100644
--- a/dev-util/itstool/Manifest
+++ b/dev-util/itstool/Manifest
@@ -1,3 +1,3 @@
 DIST itstool-2.0.6.tar.bz2 103067 BLAKE2B 72d3254cb88ef9d02f9b3509a46c2208e98bf6327f139e5d29b99cc6d80651bd41ea3bfb78e48e23cf7c217770cd8c6c74b00946ad9d2608a92925e43457edf0 SHA512 51058bdcb208f6fb84810f71f9bf67e42b00bf157a9756be45f060849c0aff36f695f4403404193720d4446818fa77de61fa94eed9e8789d26c07a2926072eb7
-EBUILD itstool-2.0.6-r1.ebuild 994 BLAKE2B 53ca29b9eefce4ebf83b5c86f84a99b280079c91db35bcf5ce291523fc19873b74f41216f2b35d66732e9a2416014efd45de69f5c468c06b91f8b144fb587db4 SHA512 fe75fd94042108f1e6f5c287b1694a57e30663d1682b0f3c9e58b6c79369fa6cf8a9c08ab46551914ee36effd997ca9f82d1d35b092b55bdd68f45808e342961
+EBUILD itstool-2.0.6-r1.ebuild 1001 BLAKE2B baf37159a34d90789b25377900e268be21c712880f365d963230feada3e823ac2675b47f41afacf68e3fbf1550b7347e7466b7d78eb7888e1a8762d6a98aa2ea SHA512 5e952b78b167af3b2cc630ed7974cc80a1db47b923be3a84b8371da6408085d2919b1eb785e98a83e002e06937d685343bae43133125d547d12c426d60e4688d
 MISC metadata.xml 525 BLAKE2B a7e426bd9dd273bed10ad74315547eb758df04ceb7ee6ef66f643ba23e60ad8b9c80aa344688e4af7a16fd699a500cf7ceb9d24eb94a930eebf1637e09919a5f SHA512 ad9928fa0359257e3418c0fb6bba6c416fc4505911f35e97377ef7c1426e228b34312fc3156e98f3657974f1156ee2bdc58bbb4b51903bb40b10c97b0714b39b
diff --git a/dev-util/itstool/itstool-2.0.6-r1.ebuild b/dev-util/itstool/itstool-2.0.6-r1.ebuild
index 0a252b447e67..a1a296a1d356 100644
--- a/dev-util/itstool/itstool-2.0.6-r1.ebuild
+++ b/dev-util/itstool/itstool-2.0.6-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://files.itstool.org/itstool/${P}.tar.bz2"
 # files in /usr/share/itstool/its are under a special exception || GPL-3+
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 95b46799c7bb..5af385408521 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -2,11 +2,9 @@ AUX 0.54.2-multilib-clang.patch 8033 BLAKE2B 724d87eef8d560eb733b9873d28afaa6dd4
 AUX 0.54.2-prefix-dont-strip-rpath.patch 1118 BLAKE2B c28bbb0293c2d15a493bd09c902cd6bb3f48c6d279063f326796919f9d06d0dc99e5a7e975742ad8fe4da3dc5bc9b07329d0ae7cb3186431c12aa93709aaa665 SHA512 bb41c4d06c04af4249c9c5ba5724c982a5edb1fe16118120ed53e52ed82cde0bd0ea43454799c986dd008b48a3bbdb7dac820260d9835b020323babc6ec617ed
 DIST meson-0.54.2.tar.gz 1691270 BLAKE2B c1ba552b5d56e0b6b73de46ec6bc90fb520665688d2f5c809baf84749d3bb1dec1fe0131136e1539369fa666ae2427c8fccd5928cbda0b8e3e1edb4a5dc8abbc SHA512 ad5ec826879d3d85088ca40d768599a4c8e66983f2a6a7ebe8ab12051cad18b4ade9a2afd30fe543b0a75900822992c8ef7161d369489e2211dd7a1a8ccc32ed
 DIST meson-0.54.3.tar.gz 1690919 BLAKE2B 5d71731fb33397f470e2440d4d45f828d28d56351843a35b575f8b386f0b1c90faf654289e22ba7c2c4bf6c3be72d3dc8a2257d4a688bcbf9a1f2522394e7728 SHA512 2e62bf992bf337ae5a01f7a0fb842ea0cefcdbc81f5675235e41d8182f37df2e003b0a8a90d650c6cca4ff79898f7888474f75e5103a48d7ca14f51a024e4f2b
-DIST meson-0.55.0.tar.gz 1742882 BLAKE2B 5ca2c6a881a9db72532849e66a52315273033188531a446ae3571faa37d6f698562e1dbd91770156c0c959e06cc7ba62a9ff274cf0d1745e3849435418755723 SHA512 bf2a5bab19deb433e363bf569527dbd1a9e8c0f77482aa077abbaa480dadc396e43148957473a31ecd9d3965578d2f7b7dc8808839c619ae2c0d419aed72d4e2
 DIST meson-0.55.1.tar.gz 1740517 BLAKE2B faec7973d00e13d82268f04b4dd28888d5196df72db1a63c388d23e03195fe18f54207a7f62dd920f53b6001e08e036950db391656d7074ef90df76b93bcfee3 SHA512 172b4de8c7474d709f172431b89bf2b2b1c2c38bc842039cccf6be075a45bd3509a1dab8512bc5b2ee025d65d8050d2f717dd15c1f9be17fca3b2e7da0d3e889
 EBUILD meson-0.54.2.ebuild 2338 BLAKE2B f2cfb920c655509b00c6c5639fc772a049ea37e1f362e8ec84bef7d5920cb4b4be7e9048d02d38597ab8b0f60afecf589b6f290828f2f456bd237379f4a21067 SHA512 193e2c013adc68da916b0cc57650131757adc2e33c5d91e3db689e6af4ccb386d0c1f669f2a2f402bc062a3adb990baacbfc36560c5185205bdb54ae8956e783
-EBUILD meson-0.54.3.ebuild 2410 BLAKE2B f7110eaa51d30fd218f599fd06001c29c9783ac9d041f545b1b3d90bd3f226978bf4a5ea55bd0916032f60e88270266968634edaffd833cd46a2e6f71af67e63 SHA512 f9a06b026528c843b0b96f99c9a0576d2d79f321564663f8a6ad8364c41c89f1fe2402b5420296906a11f9520b870a3bae61dc7e83cc1e8e3c029242dcb269b5
-EBUILD meson-0.55.0.ebuild 2286 BLAKE2B 278d16f6f840de9f634f4c8b74b71fb67916b2f89513454c038969a277437bb2db84653345facd71bceefbc70c05a85c526a905646bd9fb88019108e8c5ffbc4 SHA512 fb6207e6e33c2630d29b13fcd044ea2c86843c0802867c0e8c7313e8c2f6c5b8e1464b8409374ff75b0011fa14dc61c325c451efa468399da9d2b6691b8fb58b
+EBUILD meson-0.54.3.ebuild 2408 BLAKE2B 6f9f7267cc1e3ea124d26c812b705e31c7c5f14d48eb33c08a73e9a4c81a0b9163297540ab6d877b4878376eadbd530d454023735639ec665aac551e0fd1b4ac SHA512 6e4d00a8dac31eb9a46c5424a8c92c3d5275321aaebf77ef1d6e0fe548ff25f9a6ec0d2ad44cdb8a34c9018a565ef7d7406953114737b92ff88437ee3b96547d
 EBUILD meson-0.55.1.ebuild 2286 BLAKE2B 278d16f6f840de9f634f4c8b74b71fb67916b2f89513454c038969a277437bb2db84653345facd71bceefbc70c05a85c526a905646bd9fb88019108e8c5ffbc4 SHA512 fb6207e6e33c2630d29b13fcd044ea2c86843c0802867c0e8c7313e8c2f6c5b8e1464b8409374ff75b0011fa14dc61c325c451efa468399da9d2b6691b8fb58b
 EBUILD meson-9999.ebuild 2286 BLAKE2B 278d16f6f840de9f634f4c8b74b71fb67916b2f89513454c038969a277437bb2db84653345facd71bceefbc70c05a85c526a905646bd9fb88019108e8c5ffbc4 SHA512 fb6207e6e33c2630d29b13fcd044ea2c86843c0802867c0e8c7313e8c2f6c5b8e1464b8409374ff75b0011fa14dc61c325c451efa468399da9d2b6691b8fb58b
 MISC metadata.xml 423 BLAKE2B d1d1b815b9d2fabe5aaa28b469272420bc1eb0c070de7431ec0d7bc7202b00ca216e6a347e0ebda22fd079d9f0514734c0e0e345788a7e00c8f1ad594259b4a8 SHA512 5c03d82f2fd8009680d4d98c3f62c10dfddb2d66d03e8f9d9ad8e417d0359e43f77ecca067735b31b63ceb778fdcc508196e99d793990286234ff21892e4dab4
diff --git a/dev-util/meson/meson-0.54.3.ebuild b/dev-util/meson/meson-0.54.3.ebuild
index cb38de99a7a9..684f4a28639e 100644
--- a/dev-util/meson/meson-0.54.3.ebuild
+++ b/dev-util/meson/meson-0.54.3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~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
 
 inherit distutils-r1 toolchain-funcs
diff --git a/dev-util/meson/meson-0.55.0.ebuild b/dev-util/meson/meson-0.55.0.ebuild
deleted file mode 100644
index 38ccf9179e21..000000000000
--- a/dev-util/meson/meson-0.55.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 2016-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="https://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		dev-util/ninja
-		dev-vcs/git
-		sys-libs/zlib[static-libs(+)]
-		virtual/pkgconfig
-	)
-"
-
-python_prepare_all() {
-	local disable_unittests=(
-		# ASAN and sandbox both want control over LD_PRELOAD
-		# https://bugs.gentoo.org/673016
-		-e 's/test_generate_gir_with_address_sanitizer/_&/'
-
-		# ASAN is unsupported on some targets
-		# https://bugs.gentoo.org/692822
-		-e 's/test_pch_with_address_sanitizer/_&/'
-
-		# https://github.com/mesonbuild/meson/issues/7203
-		-e 's/test_templates/_&/'
-
-		# Broken due to python2 wrapper
-		-e 's/test_python_module/_&/'
-	)
-
-	sed -i "${disable_unittests[@]}" run_unittests.py || die
-
-	# Broken due to python2 script created by python_wrapper_setup
-	rm -r "test cases/frameworks/1 boost" || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	tc-export PKG_CONFIG
-	if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
-		ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
-	else
-		# https://bugs.gentoo.org/687792
-		unset PKG_CONFIG
-		distutils-r1_src_test
-	fi
-}
-
-python_test() {
-	(
-		# test_meson_installed
-		unset PYTHONDONTWRITEBYTECODE
-
-		# test_cross_file_system_paths
-		unset XDG_DATA_HOME
-
-		${EPYTHON} -u run_tests.py
-	) || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr/share/vim/vimfiles
-	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
-	insinto /usr/share/zsh/site-functions
-	doins data/shell-completions/zsh/_meson
-}
diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest
index 36f88c0147bd..012fd13a9107 100644
--- a/dev-util/ninja/Manifest
+++ b/dev-util/ninja/Manifest
@@ -6,7 +6,7 @@ DIST ninja-1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1.tar.gz 203848 BLAKE2B a6002
 DIST ninja-1.8.2.g81279.kitware.dyndep-1.jobserver-1.tar.gz 204539 BLAKE2B cee66a5d6ad7fd1254e68cf7be1e97eb796ec3103bdb9e869dc66757a96ce1d6e946018aa048855e70d6a3698ae609f75740809a8e9183057da16769f07e1fa6 SHA512 ae5f9c4c76114cabc4ec06056edccfa4027d514c4ae0f3ab08bbcd3ce2322e9ff08b8f90fe69fab989707adb6ecc78f226b65e223b41535aa5c0db5b6c61117a
 DIST ninja-1.8.2.tar.gz 185226 BLAKE2B c464c50829a0e9f0f6fd4b860946b14bf07f752adb8e7857d4072a1c1f06977eda283f633041929065c9164377ca769b3293b04fc9ceab583371708a9c4e8f2a SHA512 1650bf9e3eddeb0b0fbb415c2b8e0a7c094421e991fa8139fd77fae0f6ee7ee980b7cf5e98d883c3a884f99abcb06fa26e3980af3a3a5bb6dd655124755782c2
 DIST ninja-1.9.0.g99df1.kitware.dyndep-1.jobserver-1.tar.gz 213767 BLAKE2B bb6abbed155d39fe65a3a4bbbba3e577e4a13dfd1ccb9e018084153b0dd6928753be9d8c10a2c4c2ab6a2000c5292f912353f2234b01613f46bfa49d13aabd7a SHA512 6c3aaf8decfd792ce6b035dacb87f978f1052d13e5ceac9ce63bc7051fad0eed83cc530d2cf22649ff4186416b0478bb3eb0507c56fec2848061cdad7a0aa812
-EBUILD ninja-1.10.0.ebuild 2693 BLAKE2B a0edb1e631b9bbd059387facfc44e842fb8459eb802a1e15b26b69ace7f03ab72726088cd847a0d2c222700bf40ef31d2fc6bba2a81ee1bd53b6a1f67ed83dff SHA512 41d322758822a92f18ac2f98255a7f5ad28f053ced4b65f34812e495a29f1db404472b6b2260e8699c6b12c718dd59b7b79fed04226fdbd2cfa61f2495b96226
+EBUILD ninja-1.10.0.ebuild 2690 BLAKE2B 6a3bd2d13339dee121c2b148e6166b847e3eb3d9bb31bdeeb25a35a08f31146190a72deb5fdaca63fc55bcc1f51cdbb27c5f5a1fc808d37a9da1558656a93028 SHA512 e634ddf1cce3ad058da654c0c5cd40c68baee208774104aed919a98623cc80c9022a2f56552f968d6eb3fcb041b74da2e350477d6ca1a5faf299b1a017a21432
 EBUILD ninja-1.8.2-r1.ebuild 2650 BLAKE2B 381a358380a18d9b59da3d2850661bf47b5b8ab7a5c01a2a553b3367a5b39f1a590d08ad91ac2191e26755799ec60f8596d69db46be57cb74470fc33de1ccb85 SHA512 667d8163314f2625c730ffb4d1960d162e5c90a20c0b754657a0db5e6ca363171cde8558d4ed452194d75a10849a8d05c0c494ed94aaf8bb855537eda92cbe84
 EBUILD ninja-1.8.2-r2.ebuild 2650 BLAKE2B a4ae25652a8e2f60818dee56c7cea2c05967e0f3a4e6fae5d0f0fbbf05f253e174b2ed6fb85b0d2e0a9bd2bca6754fe82eafb50c38e1f51cef2fda616cbe464f SHA512 2bd4dc83bf719baf14d4eda839415519a8d6ff3d320830475091b3bd7ca12cc9204637a46f2155b40c9c4a87bc58f747f56f534547ba24b7306772004bd54a49
 EBUILD ninja-1.8.2.ebuild 2511 BLAKE2B 511fb24bda7d2bc511daa86d9c76217b54eeeeb2744dc9050d4c262e999ff496c91cf2800c3bc849e725f528e9d394238a38905aff48e63fbf8a17e2aad5ad6d SHA512 1346570be8d9ad9152130fdf3ed54c223ef48a6c1bf6469f34a24bca0443302fa71458d5777d479893958dd29ffcd37feba8c8ed51eb93e2120a0d0761d372a4
diff --git a/dev-util/ninja/ninja-1.10.0.ebuild b/dev-util/ninja/ninja-1.10.0.ebuild
index 6a015bfe539a..5ad8565bdf01 100644
--- a/dev-util/ninja/ninja-1.10.0.ebuild
+++ b/dev-util/ninja/ninja-1.10.0.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/oprofile/Manifest b/dev-util/oprofile/Manifest
index 674888738924..0a6b13b59d65 100644
--- a/dev-util/oprofile/Manifest
+++ b/dev-util/oprofile/Manifest
@@ -1,4 +1,6 @@
 AUX binutils-2.34.patch 5670 BLAKE2B 20cf23c45d94d9c71f5fb5c432e832d8db53f6428b7f2849ad3f5854de36e371addd0883174eed4537b66367dbbf842ca557ae7842561a9f643769191929964a SHA512 be14f319c3e1c7486534e91e1dfb88c853148d58435ccf2ecef5e8ec690f20adea1edc48f3b6c88e900382d2dc342319ee28172150682bf1cf2a3e6fea9a1f4b
 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
-MISC metadata.xml 423 BLAKE2B f94e15abeacab93798df7566bd1dc4d8e820aa57ddd71c2e5bfcf0c983bce5961a7c8bffb4f0ebdd92785002745314feece144e29000dd38f29426d2b35b8897 SHA512 01f96b806fca3e20eb84908a1cd77edbe11291be0098aff2e4d20f0fbf86ea0ef9972c7148c791bc826152a109d16903781cc2f2f367a2ac8b8fb7e5efee378a
+EBUILD oprofile-1.4.0.ebuild 1966 BLAKE2B 2c9809cfd086ab38c5a35dfbcc2b132b28e779f421e145df3d8d864fed781fa3abc02915ec30c62ab672ba7f130f80b557bb846f352a54fcb7ef73622af41ccd SHA512 b241793336ec5f6761ed8c5893410cdc66c0fa78c971e5188646a911aa5298b7b9a2ba8be59c9103f34819051046526921a5f378dc2b48afd0ee1de074e2fa19
+MISC metadata.xml 508 BLAKE2B 6568a105deae028206c3dc0e7fa1a4fbe76eef58a4af5ebec47ce8af093803dc5b74f120a25db38bbd7dbd7b17b44a301ca4af27a5da99fbc91e90e7b1fffd9a SHA512 fe94dcd0876d1f7bc500bb02a0fb1bd998c24f84ebb483f28629ea87dfe507f8fb74d2b8847e9d1a938f45f8cc6b0776f431184cfbd38273d32b5f35c97b00e4
diff --git a/dev-util/oprofile/metadata.xml b/dev-util/oprofile/metadata.xml
index 2a35c6646c1e..99119adc69ca 100644
--- a/dev-util/oprofile/metadata.xml
+++ b/dev-util/oprofile/metadata.xml
@@ -6,6 +6,9 @@
     <name>Andrew Savchenko</name>
   </maintainer>
   <longdescription>A transparent low-overhead system-wide profiler</longdescription>
+  <use>
+     <flag name="apidoc">Provide doxygen generated API docs.</flag>
+  </use>
   <upstream>
     <remote-id type="sourceforge">oprofile</remote-id>
   </upstream>
diff --git a/dev-util/oprofile/oprofile-1.4.0.ebuild b/dev-util/oprofile/oprofile-1.4.0.ebuild
new file mode 100644
index 000000000000..e881632d5f3b
--- /dev/null
+++ b/dev-util/oprofile/oprofile-1.4.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools java-pkg-opt-2 linux-info
+
+DESCRIPTION="A transparent low-overhead system-wide profiler"
+HOMEPAGE="http://oprofile.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="apidoc java pch static-libs"
+
+BDEPEND="
+	apidoc? ( app-doc/doxygen[dot] )
+	java? ( >=virtual/jdk-1.5:= )
+"
+CDEPEND="
+	>=dev-libs/popt-1.7-r1
+	sys-libs/binutils-libs:=
+	>=sys-libs/glibc-2.3.2-r1
+	ppc64? ( dev-libs/libpfm )
+"
+DEPEND="${CDEPEND}
+	>=sys-kernel/linux-headers-2.6.31
+"
+RDEPEND="${CDEPEND}
+	acct-user/oprofile
+	acct-group/oprofile
+"
+
+CONFIG_CHECK="PERF_EVENTS"
+ERROR_PERF_EVENTS="CONFIG_PERF_EVENTS is mandatory for ${PN} to work."
+
+pkg_setup() {
+	linux-info_pkg_setup
+	if ! kernel_is -ge 2 6 31; then
+		echo
+		ewarn "Support for kernels before 2.6.31 has been dropped in ${PN}-1.0.0."
+		echo
+	fi
+
+	use java && java-pkg_init
+}
+
+src_prepare() {
+	# bug 723092
+	sed -i 's/==/=/g' configure.ac || die
+
+	java-pkg-opt-2_src_prepare
+	eautoreconf
+}
+
+src_configure() {
+	local jh=""
+	use java && jh="$(java-config -O)"
+	econf \
+		--disable-werror \
+		$(use_enable pch) \
+		$(use_with java java "${jh}")
+}
+
+src_compile() {
+	default
+	use apidoc && emake -C doc/srcdoc
+}
+
+src_install() {
+	emake DESTDIR="${D}" htmldir="/usr/share/doc/${PF}" install
+	use static-libs || rm "${ED}"/usr/$(get_libdir)/${PN}/*.{a,la}
+	use apidoc && dodoc -r doc/srcdoc/html
+
+	dodoc ChangeLog* README TODO
+	echo "LDPATH=${PREFIX}/usr/$(get_libdir)/${PN}" > "${T}/10${PN}" || die
+	doenvd "${T}/10${PN}"
+}
+
+pkg_postinst() {
+	echo
+	elog "Starting from ${PN}-1.0.0 opcontrol was removed, use operf instead."
+	elog "CONFIG_OPROFILE is no longer used, you may remove it from your kernels."
+	elog "Please read manpages and this html doc:"
+	elog "  /usr/share/doc/${PF}/${PN}.html"
+	echo
+}
diff --git a/dev-util/patchelf/Manifest b/dev-util/patchelf/Manifest
index 928caf16da55..dbd953118633 100644
--- a/dev-util/patchelf/Manifest
+++ b/dev-util/patchelf/Manifest
@@ -1,5 +1,7 @@
 DIST patchelf-0.10.tar.bz2 158604 BLAKE2B 6aed9c2e7f37ff0330ca517a9491c46a93212140367b720bf94da4e4ec29a4978c920b53ce306ec333b3f7ac0216ff59637048c6997cfea4a34a87f2a0448796 SHA512 647ad13b7d45b3c5d20683ef8fe9760cb7f213e879231b6c5780bf32771adfbf7c5e5ce694c08e5681dceda63857d7d8a2d53efb60f799d3e7290cebc02ab501
 DIST patchelf-0.11.tar.bz2 159046 BLAKE2B 48d8dd986c681facd8d925d8f471ed6b4cae6a06472d66c1c22a32ded796f50be8d30cefc2847890558c2799707c33beb64ffc5d09f6d142120363bea5e40456 SHA512 ad3a99db6952412a2dac27256640cb9152b8bf5d189f1685b7478b9773bb612e06621511fc7338b2defc435bcdc26f67f79c2d830570a6da70f9d280b123d977
+DIST patchelf-0.12.tar.gz 103075 BLAKE2B 8ea71eb75bcc40e18a168c1e65856809fcceb8f68a9939e5248464d8c2e5d14d4eb1278965727417a26e70734712121d057c3da689be397f93bdb5234a11d5ba SHA512 2563a5b22b90392d5755d9a08022daf8570fa1b741becbbca92548d0a2f82f7ee21175a2c34816a4653c89c2219bf59b1440304b0fa2d49842e398ab18b9923c
 EBUILD patchelf-0.10.ebuild 614 BLAKE2B f8746020ed527d88057d36d819def0266112d58f56f0ac1f7d66b529aa4cabbc17041ea6659cd46a53c6f941920540481d6d4ee4e81973d82fcbf3b24ddefb8e SHA512 9cc306c95e5b5cc72ec93645c829c10df6263d7929b26274c02cd1fda973812dfef85b1ba8f0437a6318a57573f1eabfaf10b318a44a7b40a46eac0fdb38eeb6
 EBUILD patchelf-0.11.ebuild 657 BLAKE2B 805020e7cbd692b91b3db4632a30dab086701bcaffe733ec0f1701c4a9c490188ccf41f3531e7fcffcbe11e317d52fd69137933fd6636e89357a9dd7d0ffa184 SHA512 ea4ddebad53558f5bf31905f55fe2d6147182e673059caf584358731780b3d2db87aa8866a2ab655da8b5dc3efd25f1881e7a8ea9035e05095e43c0849c6e118
+EBUILD patchelf-0.12.ebuild 635 BLAKE2B 998794cc15441f8ef5415e9b965bbb6b8928f53318b4ab13c50002886b4dcaa3efc30bb7e69d24ceb7ecfc013d9105a62d39c0f2e1569b3d35383031af78b6d5 SHA512 1cd4597ae1e09feecbaa9c21c09a270f3422d543795be318775ed90ee888279ab83ad4b3b9be4fa72b5167f6af51c8577eed10fe8a5e7366aea8786873b2ff5b
 MISC metadata.xml 220 BLAKE2B 65b0d9db11c166b2887e1a22962830e288eb917a7f15d0ffcecb3c86a1845491cbcbf4ebc7e661ac7041443a8144b218123b4db7a962191a9e9f894ac086a4ed SHA512 512eee7a953300d5e721b64bade8be9bd1b62984e543552b58a7a72b42cb90973c8c6d557ecfe08c2355cab45f640c88dcd31ab8d116815bc01680a65c7a132c
diff --git a/dev-util/patchelf/patchelf-0.12.ebuild b/dev-util/patchelf/patchelf-0.12.ebuild
new file mode 100644
index 000000000000..b3d5fb270ec6
--- /dev/null
+++ b/dev-util/patchelf/patchelf-0.12.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Small utility to modify the dynamic linker and RPATH of ELF executables"
+HOMEPAGE="https://nixos.org/patchelf.html"
+SRC_URI="https://github.com/NixOS/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+LICENSE="GPL-3"
+
+src_prepare() {
+	default
+	rm src/elf.h || die
+
+	sed -i \
+		-e 's:-Werror::g' \
+		configure.ac || die
+
+	eautoreconf
+}
+
+src_test() {
+	emake check \
+		  CFLAGS+=" -no-pie" \
+		  CXXFLAGS+=" -no-pie"
+}
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index b9a01eabe67c..9c60d53a9117 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -5,16 +5,14 @@ AUX perf-5.4.7-propagate-cflags.patch 1502 BLAKE2B d35f94d10ecc2d384cae9084a7f84
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 DIST linux-4.20.tar.xz 104257836 BLAKE2B fb52cad2897da319299486fa8c3b9415cd0aee0842dbf353a5b269720dcb902db407bb55dd95a77b212dcb4a488c15363d561f3649d6bd16885561f2466d90b1 SHA512 e282399beea5da539701aed2bc131abd5bc74a970dcd344163e9d295106dfd700180e672ed546ae5e55bc6b9ac95efd5ca1de2039015c1b7a6fc9c01ea6583d4
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
-DIST linux-5.6.tar.xz 111785252 BLAKE2B 8dbe02a8ca7fd3dcf512a15c5d8098c1e7f94257e65173fed43fcc45480e4ab790df8cd39bbbb4e2a21dc9a00385bc9bbe98215a31e7f7e1d9c8f21cd8ace69e SHA512 80846fe2b4e4a7ff471d2dde28a8216ae807a3209f959e93d39ea4fc9a189ea28ec3db9d303b3fe15a28c2cb90e7446876678e93e23353c2d6f262e364a06bc9
 DIST linux-5.7.tar.xz 112690468 BLAKE2B b2b71e231507429b178b6b89be546c4a3ee2757f5d2c58b6137d383f16034a587225a75a9dbca6a01a433056ebe078487132c224e909a2971c9634687e47b1d1 SHA512 45bde01593f6147c8c169b9e46b4b56eee998142552ae0ff82f1dd21b1fd54f3b32f6283f6bd77ea717d374672167849e468c157f235d2f12f7d7816e4623bf6
+DIST linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556
 DIST patch-4.14.33.xz 905284 BLAKE2B e67bd9a96708aaaf65eb0aa852493b2323c9e237bfcc6fa837f795e481943ead3e2d5005ee72e40fc247df01c50877d9da3848a05aba3c999c3cfb7678cbdbc9 SHA512 5c76be5171709c2df7df7d5a8e8f3d0f7ede47b433da3b0f1710f262c8fcf5cf6c744a96d4336ea397c2c88a5f0a7507a5ab08c7c82f08deeb7a6f887ad77cfd
 DIST patch-4.20.3.xz 91732 BLAKE2B bf99271bcb35508df239343fd6c9d57c246f88320b586e44e2d97771d08b249a24db230214d4957015a5ed35261e201f0680101b99d0e92f0f1f69bc53e21458 SHA512 47178b8e3bfe4ba09cb82bb1ce8b0742e6749d4be3412fb57518918f7109e74eac1d3d8eb32a43e21b3837a14f37d5eefd8cab819defd10cc2db61fb0ceddeaf
 DIST patch-5.4.20.xz 776552 BLAKE2B bad2a95ed8521ac5c379fe91e16d60b2a38de19b9239755084621e5230677b232ec4cf9e2e8161c0022daff43fdbb37d5b5b5bfdc9e932ef3a860bcd17f640f8 SHA512 65fbcdbd41e35c17601ff15bbe33933be2ab7a694aa181a0b802cc11c1c653c9b688dbb382076cbad05983a0c07467955c035ae25f5175f7ce5bc24339303d77
-DIST patch-5.6.14.xz 376464 BLAKE2B 01b64288759faa67aedfded7dfca5d8d1e894a863bf7bcaf91dd8f23c8b8c9df51d2e54ac5e414a33fc3469b32c10f1d630cf2636206b8e159d602df40ad3048 SHA512 8019bf12993f43d5508845a48b250d30220a8db6db262c8b97cd3f7c73abf0d054fcdfacb671644de529ceb495b95982d693a889051fb60fafc3180bd5b4f29e
 EBUILD perf-4.14.33-r1.ebuild 5059 BLAKE2B 3bae91131eb7c24b152dbeac414057d1e5ba08d174a51417aeecb4a049c9fec362b4b67e34c367198d2b9729ffedfc82556e3a13c92b5a9129571b44d31b894b SHA512 bcb9c57a583a930aa026988eac0f14c9b13283565189c7251118e4a2037f4094b2999093aec63ebcfc1c6e6325681edd26fe35480b90a90721f92c6405afca7f
 EBUILD perf-4.20.3.ebuild 6042 BLAKE2B e1498b914f8b135927f5e97211d5246dab4bfd5bafbcf9ba431c2f8d95cf1568a162d2704f6cf851951178287efdcc6d75391ede09ea101b18d88463a4586912 SHA512 3f45b1edfefd658eaa48b4e4ae02c09e39cd6f2f7235bbb8eb9d90d69028df6d53709dac1790f932c7a20e7e77fad8327867ccdec80f302c0d72958d3c1bb138
 EBUILD perf-5.4.20.ebuild 6651 BLAKE2B e1a091114d71ba1c01f838b8d5ff372e2adad012769b973a2e79d662f6c5f6ed6fd97b2f7be880bfc57fbb99c549c487a084bf2450a935dc34ef22725268047a SHA512 e14917b4e051d3734fa515f3dbf61a2fe2cfdbe5b3aed29b9ce3b05e70609a13276d5f8fd0522f0b4addca16abdd986fb70b16d2b51f1204d02df848b64e6138
-EBUILD perf-5.6.14.ebuild 6406 BLAKE2B 81ae8af3e1380ed33baf0260b6151280ce7eba072c5d2e12d379a4af7de3a394286a28781367317f7e61c3f4dc053d43df501e5df5e28981beec94e3f216849d SHA512 5a4013d3ba171c99c2454ab59e5ee4f603ecd2c5b8f46675eb41005554fcf0ce8abba103cff836febef9c8e12c19e3bebfdb20ea553de468b6de1a33fae6a75e
 EBUILD perf-5.7-r1.ebuild 6481 BLAKE2B 049d8502779dcc2b3f80cff18ab9795855495ce13342ab0394f29c22d552f45652c7faf0b19e24953180d5851167c875b397540375e3db0f66141863851387ab SHA512 66b7922dd0b77f2ee974695bbc6c2330c06b523b1cbc0d0dac0bf16f32489cb4266152267b70ee6130ad252075fac7f3858e5dc222e06d6ab2a8f2a10344f52e
-EBUILD perf-5.7.ebuild 6406 BLAKE2B 81ae8af3e1380ed33baf0260b6151280ce7eba072c5d2e12d379a4af7de3a394286a28781367317f7e61c3f4dc053d43df501e5df5e28981beec94e3f216849d SHA512 5a4013d3ba171c99c2454ab59e5ee4f603ecd2c5b8f46675eb41005554fcf0ce8abba103cff836febef9c8e12c19e3bebfdb20ea553de468b6de1a33fae6a75e
+EBUILD perf-5.8.ebuild 6481 BLAKE2B 049d8502779dcc2b3f80cff18ab9795855495ce13342ab0394f29c22d552f45652c7faf0b19e24953180d5851167c875b397540375e3db0f66141863851387ab SHA512 66b7922dd0b77f2ee974695bbc6c2330c06b523b1cbc0d0dac0bf16f32489cb4266152267b70ee6130ad252075fac7f3858e5dc222e06d6ab2a8f2a10344f52e
 MISC metadata.xml 1355 BLAKE2B adf93b8b750786b9c181b5f4b4477883a365a07201da711d9ea535321d45b9c656397c46bd5f64a740d83e8acf4f2fea837a5a1eac754e9aa9f09692fe1d4d2b SHA512 3e489bb5b3556255d68bcffb3d7a377951da0470ea8e0a89dbc952d0029083fba7f7fd3c6f8a725bfa44c6e4d51871e2376b251f44a4295302be167d55dffb9f
diff --git a/dev-util/perf/perf-5.7.ebuild b/dev-util/perf/perf-5.7.ebuild
deleted file mode 100644
index afc8951d08d5..000000000000
--- a/dev-util/perf/perf-5.7.ebuild
+++ /dev/null
@@ -1,236 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit bash-completion-r1 estack eutils llvm toolchain-funcs prefix python-r1 linux-info
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Userland tools for Linux Performance Counters"
-HOMEPAGE="https://perf.wiki.kernel.org/"
-
-LINUX_V="${PV:0:1}.x"
-if [[ ${PV} == *_rc* ]] ; then
-	LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
-	PATCH_VERSION=$(ver_cut 1-3)
-	LINUX_PATCH=patch-${PV//_/-}.xz
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
-		https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-elif [[ ${PV} == *.*.* ]] ; then
-	# stable-release series
-	LINUX_VER=$(ver_cut 1-2)
-	LINUX_PATCH=patch-${PV}.xz
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
-else
-	LINUX_VER=${PV}
-	SRC_URI=""
-fi
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="audit clang crypt debug +demangle +doc gtk java lzma numa perl python slang systemtap unwind zlib"
-# TODO babeltrace
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="audit? ( sys-process/audit )
-	crypt? ( dev-libs/openssl:0= )
-	clang? (
-		<sys-devel/clang-10:*
-		<sys-devel/llvm-10:*
-	)
-	demangle? ( sys-libs/binutils-libs:= )
-	gtk? ( x11-libs/gtk+:2 )
-	java? ( virtual/jre:* )
-	lzma? ( app-arch/xz-utils )
-	numa? ( sys-process/numactl )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	slang? ( sys-libs/slang )
-	systemtap? ( dev-util/systemtap )
-	unwind? ( sys-libs/libunwind )
-	zlib? ( sys-libs/zlib )
-	dev-libs/elfutils"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-4.19
-	${LINUX_PATCH+dev-util/patchutils}
-	sys-devel/bison
-	sys-devel/flex
-	java? ( virtual/jdk )
-	doc? (
-		app-text/asciidoc
-		app-text/sgml-common
-		app-text/xmlto
-		sys-process/time
-	)"
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/perf"
-
-CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
-
-pkg_setup() {
-	use clang && LLVM_MAX_SLOT=9 llvm_pkg_setup
-}
-
-src_unpack() {
-	local paths=(
-		tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
-		scripts include lib "arch/*/lib"
-	)
-
-	# We expect the tar implementation to support the -j option (both
-	# GNU tar and libarchive's tar support that).
-	echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
-	tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
-		"${paths[@]/#/linux-${LINUX_VER}/}" || die
-
-	if [[ -n ${LINUX_PATCH} ]] ; then
-		eshopts_push -o noglob
-		ebegin "Filtering partial source patch"
-		filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
-			> ${P}.patch
-		eend $? || die "filterdiff failed"
-		eshopts_pop
-	fi
-
-	local a
-	for a in ${A}; do
-		[[ ${a} == ${LINUX_SOURCES} ]] && continue
-		[[ ${a} == ${LINUX_PATCH} ]] && continue
-		unpack ${a}
-	done
-}
-
-src_prepare() {
-	default
-	if [[ -n ${LINUX_PATCH} ]] ; then
-		pushd "${S_K}" >/dev/null || die
-		eapply "${WORKDIR}"/${P}.patch
-		popd || die
-	fi
-
-	# Drop some upstream too-developer-oriented flags and fix the
-	# Makefile in general
-	sed -i \
-		-e "s:\$(sysconfdir_SQ)/bash_completion.d:$(get_bashcompdir):" \
-		"${S}"/Makefile.perf || die
-	# A few places still use -Werror w/out $(WERROR) protection.
-	sed -i -e 's:-Werror::' \
-		"${S}"/Makefile.perf "${S_K}"/tools/lib/bpf/Makefile || die
-
-	# Avoid the call to make kernelversion
-	echo "#define PERF_VERSION \"${MY_PV}\"" > PERF-VERSION-FILE
-
-	# The code likes to compile local assembly files which lack ELF markings.
-	find -name '*.S' -exec sed -i '$a.section .note.GNU-stack,"",%progbits' {} +
-
-	# Fix shebang to use python from prefix
-	if [[ -n "${EPREFIX}" ]]; then
-		hprefixify ${S_K}/scripts/bpf_helpers_doc.py
-	fi
-}
-
-puse() { usex $1 "" no; }
-perf_make() {
-	# The arch parsing is a bit funky.  The perf tools package is integrated
-	# into the kernel, so it wants an ARCH that looks like the kernel arch,
-	# but it also wants to know about the split value -- i386/x86_64 vs just
-	# x86.  We can get that by telling the func to use an older linux version.
-	# It's kind of a hack, but not that bad ...
-
-	# LIBDIR sets a search path of perf-gtk.so. Bug 515954
-
-	local arch=$(tc-arch-kernel)
-	local java_dir
-	use java && java_dir="/etc/java-config-2/current-system-vm"
-	# FIXME: NO_CORESIGHT
-	# FIXME: NO_LIBBABELTRACE
-	emake V=1 VF=1 \
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="$(tc-getLD)" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-		prefix="${EPREFIX}/usr" bindir_relative="bin" \
-		EXTRA_CFLAGS="${CFLAGS}" \
-		ARCH="${arch}" \
-		JDIR="${java_dir}" \
-		LIBCLANGLLVM=$(usex clang 1 "") \
-		NO_AUXTRACE="" \
-		NO_BACKTRACE="" \
-		NO_CORESIGHT=1 \
-		NO_DEMANGLE=$(puse demangle) \
-		NO_GTK2=$(puse gtk) \
-		NO_JVMTI=$(puse java) \
-		NO_LIBAUDIT=$(puse audit) \
-		NO_LIBBABELTRACE=1 \
-		NO_LIBBIONIC=1 \
-		NO_LIBBPF="" \
-		NO_LIBCRYPTO=$(puse crypt) \
-		NO_LIBDW_DWARF_UNWIND="" \
-		NO_LIBELF="" \
-		NO_LIBNUMA=$(puse numa) \
-		NO_LIBPERL=$(puse perl) \
-		NO_LIBPYTHON=$(puse python) \
-		NO_LIBUNWIND=$(puse unwind) \
-		NO_SDT=$(puse systemtap) \
-		NO_SLANG=$(puse slang) \
-		NO_LZMA=$(puse lzma) \
-		NO_ZLIB= \
-		WERROR=0 \
-		LIBDIR="/usr/libexec/perf-core" \
-		"$@"
-}
-
-src_compile() {
-	# test-clang.bin not build with g++
-	if use clang; then
-		pushd "${S_K}/tools/build/feature/" || die
-		make V=1 CXX=${CHOST}-clang++ test-clang.bin || die
-		popd
-	fi
-	perf_make -f Makefile.perf
-	use doc && perf_make -C Documentation
-}
-
-src_test() {
-	:
-}
-
-src_install() {
-	_install_python_ext() {
-		perf_make -f Makefile.perf install-python_ext DESTDIR="${D}"
-	}
-
-	perf_make -f Makefile.perf install DESTDIR="${D}"
-	if use python; then
-		python_foreach_impl _install_python_ext
-	fi
-
-	rm -rv "${ED}"/usr/share/doc/perf-tip || die
-
-	if use gtk; then
-		mv "${ED}"/usr/$(get_libdir)/libperf-gtk.so \
-			"${ED}"/usr/libexec/perf-core || die
-	fi
-
-	dodoc CREDITS
-
-	dodoc *txt Documentation/*.txt
-	if use doc ; then
-		HTML_DOCS="Documentation/*.html" einstalldocs
-		doman Documentation/*.1
-	fi
-}
-
-pkg_postinst() {
-	if ! use doc ; then
-		elog "Without the doc USE flag you won't get any documentation nor man pages."
-		elog "And without man pages, you won't get any --help output for perf and its"
-		elog "sub-tools."
-	fi
-}
diff --git a/dev-util/perf/perf-5.6.14.ebuild b/dev-util/perf/perf-5.8.ebuild
index afc8951d08d5..d0b9058a60c1 100644
--- a/dev-util/perf/perf-5.6.14.ebuild
+++ b/dev-util/perf/perf-5.8.ebuild
@@ -153,7 +153,8 @@ perf_make() {
 	# FIXME: NO_CORESIGHT
 	# FIXME: NO_LIBBABELTRACE
 	emake V=1 VF=1 \
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="$(tc-getLD)" \
+		HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)" \
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="$(tc-getLD)" NM="$(tc-getNM)" \
 		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
 		prefix="${EPREFIX}/usr" bindir_relative="bin" \
 		EXTRA_CFLAGS="${CFLAGS}" \
diff --git a/dev-util/quilt/Manifest b/dev-util/quilt/Manifest
index afd6c7a4a237..9ef6b0006544 100644
--- a/dev-util/quilt/Manifest
+++ b/dev-util/quilt/Manifest
@@ -1,5 +1,5 @@
 AUX quilt-0.66-no-graphviz.patch 1464 BLAKE2B b1a67706f29f3986de0202a4ea68aa2f001989354bf9ab91996cb4f5dbb6578baf28fc1ac781a18525d04fb92d9f6d554efcc598dabbdf1a35b0f63b93c3cd8d SHA512 3f935a6e137998f7d0391ef87f5324c8882490001b37333de22efc068bda8a7e84ccefc3e85616c3aa93894acb8a0841a2b089c59c6a658d1157298d4132707c
 DIST quilt-0.66.tar.gz 413069 BLAKE2B 41201d54cb26d4761413365fe19b65bd6971ada1e69198d2edbc346df6a3060ff3af4d80551d68ab4ffe003183bc0a28515ce1d070db95f2b1a04a0680ac4fb2 SHA512 c2cb75c0937612e1e0da25b713acf629b6b5aacbd8254d8bd17220b63c7b8ca996cd9d0315a32d67d54a4a7dc01b212cdda33afaacf3db063da757f1973306f4
-EBUILD quilt-0.66.ebuild 1617 BLAKE2B 50ea4e59b5baaf315c4b6ba71f589f716f3dc8f29079c8a28ff7f66c16ef080ba77e22409c7c39ac92998b17ac9361bc5e55ce228858e61a1cf30a9bb2fad2d5 SHA512 5e62c6ecaeb0db16a54aeeb6e137442d9ace3ab85f64827caf34c27efd8671d5b62a33dcd748a9a479c288d9736116537f6170d78ee5b3af7320b57d21925990
+EBUILD quilt-0.66.ebuild 1660 BLAKE2B 6ed287198621c0cb22256f60f832a64964b1c8f49f965fdb5885324380d973dece3b87a3cec38d981560b704a442dbbe40a52d05cd2c814840ff46355fae6164 SHA512 a7ee820460eac128d0d7aa4013bf8cb1fe831ad5aac928760034517af594911e03b551aeb8d378bfc24ecb11cfb61e2b15262274ff4fe96591c32645f9c3354f
 EBUILD quilt-9999.ebuild 1753 BLAKE2B 68bd7408caa296dd0d88fe40a39dfb231749a3c96121ce74ff793ea79d7252f57b43a07f04b0bdf2586a319c4b8b59b3a6f9ea00251e0d123b81a135a821ad82 SHA512 9eac74ba4f87b97bfe3d095b83027b5d8c4e67bd624ee8bd1cbc045c3bdc2b3caa1118e932c19bb396c951871130c15197e96bf7ca10dec83502ab2498eebbef
 MISC metadata.xml 218 BLAKE2B 01c06279fa64627fda89adb9c5748c7629ff3eb46c10acc15b327a0f432d50b86de1d3980ccdafa9b620582db9abdf4d4506b1a53baebd6334f1a890a10783b1 SHA512 cff4a2ad321709df053184879b278c5a5abc74790344f6170cf020cf45a20d8062421e20d215c73002077d66c6367de5fcede710c2ffdd9f067cdf1f40b784ee
diff --git a/dev-util/quilt/quilt-0.66.ebuild b/dev-util/quilt/quilt-0.66.ebuild
index cb3d5eb528a2..0f62fd96875b 100644
--- a/dev-util/quilt/quilt-0.66.ebuild
+++ b/dev-util/quilt/quilt-0.66.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -13,6 +13,8 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 arm ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
 IUSE="emacs graphviz elibc_Darwin elibc_SunOS"
+# unresolved test failures
+RESTRICT="test"
 
 RDEPEND="sys-apps/ed
 	dev-util/diffstat
diff --git a/dev-util/rbtools/Manifest b/dev-util/rbtools/Manifest
index 80ef1c4dbe7d..490a523db136 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
-EBUILD rbtools-1.0.3.ebuild 740 BLAKE2B ea50076ab8d4d9e7d7d9dfa56459a158473eada076aca8a501cf24006374df591c2d7acf71b32eabb6ac0a847d877f8f0e11cf839d5ebbf4bca81c4beb1b3ca8 SHA512 be87550734fec846648fe0922c4351fc7b9638ff1d3fba7440dc3f8841c8b58037262801bc17edce14edb262e7cc2cf2cb244579f85c67ae0592ac50f6ba3963
+EBUILD rbtools-1.0.3.ebuild 740 BLAKE2B 2f214588fd5001c5594bb7b40211114e4399f0c9944f3f36178f3bf1d157502f6af861b8570b34a755ffe624d8660aeea06ecf158e0e7698eecb3201eb4432ee SHA512 f9dcf9d8731eba3681ca7bd19ce1bd7d301bbad06c11f462a4c6fbf783dd4578cebbcfe233c0fcecc8621ed16b023000022684d4e41efea3ef98ecd8bb7dd1d8
 MISC metadata.xml 217 BLAKE2B 92b85ca7d657eea200ee74bdafd4df6885c04b125bfdfb86650e2e1066c858aa8623f8b2a362780a200d7e33076129c9aab38a12f189c82d5ce1a9ae81257195 SHA512 1b17a615b7471a1e46b4c291aa7ff84348628ec0c3603e21db1994eb1e82ae28dc7e97321de022ccb7e4d2f411f4e7bcef5a79e93a4229126b9b58fb5d503478
diff --git a/dev-util/rbtools/rbtools-1.0.3.ebuild b/dev-util/rbtools/rbtools-1.0.3.ebuild
index 06ee7e70ea7a..4ef4c539a64b 100644
--- a/dev-util/rbtools/rbtools-1.0.3.ebuild
+++ b/dev-util/rbtools/rbtools-1.0.3.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
 
diff --git a/dev-util/rocm-cmake/Manifest b/dev-util/rocm-cmake/Manifest
index fd03506e7244..41df39ca9b49 100644
--- a/dev-util/rocm-cmake/Manifest
+++ b/dev-util/rocm-cmake/Manifest
@@ -1,20 +1,4 @@
-DIST rocm-cmake-0.2.tar.gz 12729 BLAKE2B 6380e077cdc0dcc8c40c487789bd4405a9104e0c55e68df0587c74ea140c329b28ef224bea0d9d529ddaca2c3b874e64be840f96191b8bae7d662de5854756b6 SHA512 b2ebd749fb99ac6dbeac005bb0de5ca57e12ae3590d560c0fd03371f2dd0fc6e7862e0bc96046b98b8248770852c6ee64dd349f22405e77d8a210884246213bd
-DIST rocm-cmake-2.10.0.tar.gz 14183 BLAKE2B dab0de02815d6ef71a7143dcbd53dab3134bbfbf39e55375d93c9d0fa35902fa9f8f23f85d1da9994ceb1fa4bec6c113b6062f5953d0213a70daeb26e91ddf9e SHA512 1f3f0424554f16ff317eb910aacfd0713d62ab5f6b708dc273c9ee2634979f89805a23e0afeda4a9d7aeea46d16cc2919963f026107fabad94b67725cf6e041c
-DIST rocm-cmake-2.7.0.tar.gz 13352 BLAKE2B 1dd37f9beed98d2120a42505ef7463de672db01c1213262202819ea4ee76678a3126b7ca52e8738717618247a93af680534262ce56b718f7dc4ebb7f62acd358 SHA512 d08d08ea53c7242fccce808189048d195b8edbaa2a8f0a0fac4267a232dddaadab791f0bf2fe0c975f050cdac095531a2cabcab55157b5405f250f74fa0a01cc
-DIST rocm-cmake-2.8.0.tar.gz 13677 BLAKE2B 24fdb6685190e06be0afe9184b048d1be36f66d0fd5033244d481fdc41db6333cde2d4b5e23808add0115018f23e80cf78e09e01f8aacf1f34eca2e9cf64e0b5 SHA512 61fa614acfdd5d18da617f73f6373e3c39ece22674fc9697e2f2d9595317fed179298672f98e178ddcfd73e7cad908189f32b7265a98f773750616abdd11a74c
-DIST rocm-cmake-2.9.0.tar.gz 14185 BLAKE2B 7eaa8535eae99749d0a46b84daa4ee5d00fd7e992a63d97fb578319a3dc309a61b1b239af4b58ee5c668c0c45e944138c85ab2a5aa3da1f83b129ca6a874c6d6 SHA512 ba619d428e7f5bbd2970eb84df1421e0734f33a259d5c98a62a8ea4859eac5fdaba0d0d36fb504618e605c0c6d62213d696e265054814926b9156822e3cd1f24
-DIST rocm-cmake-3.0.0.tar.gz 14239 BLAKE2B 31876239f0bc21b2d37cacb69e3ff1199d7ffa27c92ae1af6e18959af40e6e3bf59279a2fb12b64927e741325c27e6f9b988918e0b6773181bd2ae93fe3b5d8f SHA512 c70e53256c6d4bbd40c9f32939c4aae27ade7191050cd30bcbc7ea8da07493cc1ff8911ebc4a6a4ed1bc12a3e799a5c238539916587a87fd7627408a88fe2f6c
-DIST rocm-cmake-3.3.0.tar.gz 14462 BLAKE2B 1af1b0c10a728b3a5da483c1fc529a0ea586f11f34aaf42983bd1f009c6f92f094cd209ab580ff5c6bc098dfd0a8d860a305264a9235db9ddc3a024d93c6e3c3 SHA512 529ed79a6edf8b37765b4e1af586e51b8aa646dc6f7a4b07c0ec144247b5533b996a1e16d00c7c9182706b419fe9ba598ee41a29761ea7f6eb39503ec6902760
-DIST rocm-cmake-3.5.0.tar.gz 15828 BLAKE2B 3de221b6937f3fb207bb7deb46506ad229eb3e222da4b1dbdf8bde4b8737538000c7efed5b187a4261ba6edc85fa65b672ac1f33fde488eec3ffd201f6975d75 SHA512 13e7c2377f1aaca5a07c796ad1e0a2edfd4ef0800d7ec7fa7b26a44869e1d760604dc29ca2b4ca9887549a6c287873b21bcbb8b5ca2dcd7636e96abb4e7a2679
 DIST rocm-cmake-3.7.0.tar.gz 15833 BLAKE2B 1e111ba502aa7a63b9f3785c44cf622d60f6380fbd7c86720a99d04f1bfa52201849e1316ac3af33857d257f0438f5db083877d6b6769bbd9842fdf59cc7a376 SHA512 3381ca5603a198f00b5e74fcb55e5279f1f9a63df712048c7aeb0fcfc50b94c4e090c33fd27275d2dfb257b39902d233d30df9d2da6d0a3b0962a440b3249ead
-EBUILD rocm-cmake-0.2.ebuild 688 BLAKE2B 32447191ebc2c3d010096f89ec8cc771dc7bdf8c20ccea5669e57ada0b2d8aae3acddb0a9e8de9360aa688b8108c203efe9680c0f78b8f5504e1dc1aa3ae81ff SHA512 3391731df1ccbe71e5db2040cca6a3901b48d5ae85088c0a09cdeff56ee594e94fa02029d187794c06180047e5205f6d5e6934eccdac5c2383720dd1056cd917
-EBUILD rocm-cmake-2.10.0.ebuild 729 BLAKE2B 555a1c7970659c3f01aab1f0dfa1006ed501f2b43cab52aa0a664aed61a248f9d4b7d574b0897329fc83f2da0a0df9962a981781fd0b4e7f865fd457365124fe SHA512 19a51baf03e628c04712bd1b8b83dc30ab0a0c9fd7e332140e9a6f2123f50b8e2482047608fdfc96f24bf227211eccd50ab23144b22e1f60dd0eaae91c902be9
-EBUILD rocm-cmake-2.7.0.ebuild 729 BLAKE2B 555a1c7970659c3f01aab1f0dfa1006ed501f2b43cab52aa0a664aed61a248f9d4b7d574b0897329fc83f2da0a0df9962a981781fd0b4e7f865fd457365124fe SHA512 19a51baf03e628c04712bd1b8b83dc30ab0a0c9fd7e332140e9a6f2123f50b8e2482047608fdfc96f24bf227211eccd50ab23144b22e1f60dd0eaae91c902be9
-EBUILD rocm-cmake-2.8.0.ebuild 729 BLAKE2B 555a1c7970659c3f01aab1f0dfa1006ed501f2b43cab52aa0a664aed61a248f9d4b7d574b0897329fc83f2da0a0df9962a981781fd0b4e7f865fd457365124fe SHA512 19a51baf03e628c04712bd1b8b83dc30ab0a0c9fd7e332140e9a6f2123f50b8e2482047608fdfc96f24bf227211eccd50ab23144b22e1f60dd0eaae91c902be9
-EBUILD rocm-cmake-2.9.0.ebuild 729 BLAKE2B 555a1c7970659c3f01aab1f0dfa1006ed501f2b43cab52aa0a664aed61a248f9d4b7d574b0897329fc83f2da0a0df9962a981781fd0b4e7f865fd457365124fe SHA512 19a51baf03e628c04712bd1b8b83dc30ab0a0c9fd7e332140e9a6f2123f50b8e2482047608fdfc96f24bf227211eccd50ab23144b22e1f60dd0eaae91c902be9
-EBUILD rocm-cmake-3.0.0.ebuild 729 BLAKE2B 555a1c7970659c3f01aab1f0dfa1006ed501f2b43cab52aa0a664aed61a248f9d4b7d574b0897329fc83f2da0a0df9962a981781fd0b4e7f865fd457365124fe SHA512 19a51baf03e628c04712bd1b8b83dc30ab0a0c9fd7e332140e9a6f2123f50b8e2482047608fdfc96f24bf227211eccd50ab23144b22e1f60dd0eaae91c902be9
-EBUILD rocm-cmake-3.3.0.ebuild 729 BLAKE2B 555a1c7970659c3f01aab1f0dfa1006ed501f2b43cab52aa0a664aed61a248f9d4b7d574b0897329fc83f2da0a0df9962a981781fd0b4e7f865fd457365124fe SHA512 19a51baf03e628c04712bd1b8b83dc30ab0a0c9fd7e332140e9a6f2123f50b8e2482047608fdfc96f24bf227211eccd50ab23144b22e1f60dd0eaae91c902be9
-EBUILD rocm-cmake-3.5.0.ebuild 731 BLAKE2B 463d3a82ab60695d46d43566435db7d3c8e09848a9d43b3c810a6c82628fa882deb81e94b134ec7b5661e4530dff9a9dd407043348bbcb100ad2d7318277a904 SHA512 6fdd1d769eaf846f8e582fa24316da54e6d4210a7b08094300930941d3bee8b671919a4589fb28d3ddb5df61f5ce6969b858de6a0c5fc9de7530e9351df9cd29
 EBUILD rocm-cmake-3.7.0.ebuild 731 BLAKE2B 463d3a82ab60695d46d43566435db7d3c8e09848a9d43b3c810a6c82628fa882deb81e94b134ec7b5661e4530dff9a9dd407043348bbcb100ad2d7318277a904 SHA512 6fdd1d769eaf846f8e582fa24316da54e6d4210a7b08094300930941d3bee8b671919a4589fb28d3ddb5df61f5ce6969b858de6a0c5fc9de7530e9351df9cd29
 EBUILD rocm-cmake-9999.ebuild 729 BLAKE2B 555a1c7970659c3f01aab1f0dfa1006ed501f2b43cab52aa0a664aed61a248f9d4b7d574b0897329fc83f2da0a0df9962a981781fd0b4e7f865fd457365124fe SHA512 19a51baf03e628c04712bd1b8b83dc30ab0a0c9fd7e332140e9a6f2123f50b8e2482047608fdfc96f24bf227211eccd50ab23144b22e1f60dd0eaae91c902be9
 MISC metadata.xml 468 BLAKE2B a05fff7df6fd53ff6793719b621d44ffec411b8c287a8fae36f6f07860cbbf819328bf579c8a0972d72fc6cbbdaee6dd628d4fadb9a2100e1fe1dc97911cb012 SHA512 2907497bd76b1a7f265c371fc55773a541647ec5c4ae42257a405bacc0b2839023a44b282719c0b9d4938e53eb55d5929679242219254db9ee728463d0b2a69b
diff --git a/dev-util/rocm-cmake/rocm-cmake-0.2.ebuild b/dev-util/rocm-cmake/rocm-cmake-0.2.ebuild
deleted file mode 100644
index 3fa66f92ec04..000000000000
--- a/dev-util/rocm-cmake/rocm-cmake-0.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-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/rocm-cmake/rocm-cmake-2.10.0.ebuild b/dev-util/rocm-cmake/rocm-cmake-2.10.0.ebuild
deleted file mode 100644
index 5922137e202d..000000000000
--- a/dev-util/rocm-cmake/rocm-cmake-2.10.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/rocm-cmake-roc-${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/rocm-cmake/rocm-cmake-2.7.0.ebuild b/dev-util/rocm-cmake/rocm-cmake-2.7.0.ebuild
deleted file mode 100644
index 5922137e202d..000000000000
--- a/dev-util/rocm-cmake/rocm-cmake-2.7.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/rocm-cmake-roc-${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/rocm-cmake/rocm-cmake-2.8.0.ebuild b/dev-util/rocm-cmake/rocm-cmake-2.8.0.ebuild
deleted file mode 100644
index 5922137e202d..000000000000
--- a/dev-util/rocm-cmake/rocm-cmake-2.8.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/rocm-cmake-roc-${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/rocm-cmake/rocm-cmake-2.9.0.ebuild b/dev-util/rocm-cmake/rocm-cmake-2.9.0.ebuild
deleted file mode 100644
index 5922137e202d..000000000000
--- a/dev-util/rocm-cmake/rocm-cmake-2.9.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/rocm-cmake-roc-${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/rocm-cmake/rocm-cmake-3.0.0.ebuild b/dev-util/rocm-cmake/rocm-cmake-3.0.0.ebuild
deleted file mode 100644
index 5922137e202d..000000000000
--- a/dev-util/rocm-cmake/rocm-cmake-3.0.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/rocm-cmake-roc-${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/rocm-cmake/rocm-cmake-3.3.0.ebuild b/dev-util/rocm-cmake/rocm-cmake-3.3.0.ebuild
deleted file mode 100644
index 5922137e202d..000000000000
--- a/dev-util/rocm-cmake/rocm-cmake-3.3.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/rocm-cmake-roc-${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/rocm-cmake/rocm-cmake-3.5.0.ebuild b/dev-util/rocm-cmake/rocm-cmake-3.5.0.ebuild
deleted file mode 100644
index a8e68baa5599..000000000000
--- a/dev-util/rocm-cmake/rocm-cmake-3.5.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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 05ab9aa858ca..1819cfaaf08e 100644
--- a/dev-util/rocminfo/Manifest
+++ b/dev-util/rocminfo/Manifest
@@ -1,24 +1,4 @@
-AUX rocminfo-2.6.0-cmake-variables.patch 1107 BLAKE2B b613dee2b0b44cf4d31afbe3647ebc2c511903c5a6a6a0f74b6c5b419ab17f81b1d92f5802667bfce4444f839f3dedaea0785e2cdac14b7b49be6a9b97c12971 SHA512 59fcf341a381a1fc3c60c8f4f33050f6e31f0f29f53bb9abf2d0c2d0ed28c18f799ed49bf64ebe30a8e94c463aa88a735b1895df955c671f7e589350ea010ebe
-AUX rocminfo-2.7.0-sizeof.patch 1083 BLAKE2B c86e9f90660afa39b2cfcd6c5362734db31d0492ce4e9a39e9f1ca438c124f5f7e280232a1a3d0123ab2034d9fda504d8b766931638b6bba2cd883703df95183 SHA512 e32fb0cdb750780c011d032f44ae64186ad02c24cf9de8506b3224c49439d167b1c4b2f8c850765db8a210a308481bd8a69d5577bb0244ef75d68778972d791a
-DIST rocminfo-2.10.0.tar.gz 14791 BLAKE2B b0396cc837f140938ee889c819001b8a45bb09c8729cf8c3c1751c6f1a6af39a7d5b48e481187248dcbe6bf5c74db3623ff575ee4390227b289f736248c8637b SHA512 56f05e41cca3a401e7b7f18646338e1cc206d4e44cd5ced0f3fbc796830abc1986b8121374f52a3db54efca3d306dca8d308eb688423bdd60386fb055bbe5820
-DIST rocminfo-2.6.0.tar.gz 12293 BLAKE2B b08725b45f48e78841da9d6e57bb19a441a423e20f853d16024c620914059abf3cb2e61c12ae6fdfdb85eb3e984d488ae9975ab3fd2fcc529ecb576c6816fc92 SHA512 e2dae7e2e02b674b3ad959a3dffdcd8f550842edfd0eac5866259a6a12de1a5f935afbdcb37845fa189d0937c41186f0eb8be08e7b346ddef959d5dd7b62dca7
-DIST rocminfo-2.7.0.tar.gz 12671 BLAKE2B 6cb6e2fa458224654f4b672d117e2a6c71c7d5aeed8ac71cf7ecddb76d9209f25596521b31465a94fde1c91744fc9bf68e637f7ff4f67a000cbfbe4793c5fa4b SHA512 ffdaa3d11d85475c7600c6b25d8eb7f90cbda13b820f33c250a7ac9b90f92d4d5352d8baee765b4bd3b9c7389b5ab6d3b87df77bf62d6696ed8cd96bfc6be1a0
-DIST rocminfo-2.8.0.tar.gz 14786 BLAKE2B ec439fb771980d6b4777e9c3b11e23055eee7b898db2fd6d109c8ad53b0d615baa2d29ed4f1eb7ef673520396e63f0901dffc986bf38e58dcf41f068b25e26ce SHA512 7528deb80b97b70215a0e6aeaf55f9409a53d8aeee921d25da037fbc081bda43263954be8c12a0c3e3441b53aa16a10b83cce7698fc1eaeb5a2bf9168844e617
-DIST rocminfo-2.9.0.tar.gz 14791 BLAKE2B 5438862e461b9c2f53560138f4b7437876048edff6ff31715e9af2be535167042b170c492c59c41862a55a742a53047e2e9f0478fa73c8cf948c0fc1ff388594 SHA512 90c5c1de3ea6e917b338a5498d9e071dd491a97bd7b927dc1ddca568df08b52b6b8518a1105dfab7a262b78d1cb89117813084dfce6b73d7aae40abd357f81d1
-DIST rocminfo-3.0.0.tar.gz 14786 BLAKE2B 4fab1258ff9b43620c79c811678071c38db5afedd9fb5a95227d73e7d2d4104dfbaa72855c845a663b8dabb9ea8f17962baa5ca65613fc40c2d3c3e1c1b7d08b SHA512 94f7c3773b18a8d3bce773b624164d0a4b928b2411ef83307e46634e09259eb8f431f576f0673186f1f44b54c72004818aa10858520b8d86fe283f2f5ed3f5f1
-DIST rocminfo-3.1.0.tar.gz 15113 BLAKE2B 5155819afff87a87a40d5e57c194573a29b85d654bfaf446a17a893490143546e8c706020baae4f1d23a28e53894b20f457dcabf8615730e42e4a18b2caefe12 SHA512 d0be50bab99c4df1ce74e3bf98db68249c681a5eeb6839e4ee6aa91a208ed829d1288ce3cc82f564a22ca8b6f62b65f3c40c3784e21e1fd4953c81315d044dfc
-DIST rocminfo-3.3.0.tar.gz 15120 BLAKE2B 4ac93144dc76d5b8839d3d1cca51d92fdd88ee66ec141afccd84fa3ef2fcf4b140dc78d43f8cbb57eba678e00c247c8189b80c1e0b69662226b505dca57f6be1 SHA512 f2f273882a83632f0d9e7817a722b252cb2c1c7cf5d86cc8980ea680c073f6aa666c4150fff498e8bc48396e3e23f544d05485ee1672bc34223ca8ec64226854
-DIST rocminfo-3.5.0.tar.gz 15503 BLAKE2B 4b3ae79ea2f95fa5783cbbe7ed1aed0085de65f5b4b9d1c58ae7a32b18129d614f81a09c1979132e53acafaf94c1df4b0e08d558d091e55ca412e6ea44f84c89 SHA512 41834d462caca19b3645667bf440946c37d9f2fb0bd209f2b6c506c7debd7950807d787c0bc1cee206249c8651e7a315965965f29471d4832de5ee8e42cba1bb
 DIST rocminfo-3.7.0.tar.gz 15104 BLAKE2B 728ce471e52dadca8b59aa3196c2f75933650e3002335014accd7f8eada19d4936a7404f908d50747a0e51faa8a65764200072cf598f9d0855a3052db8290160 SHA512 25a6a9216366e310ece9db50a21bc0eb7741760a7b46fa1818ee102557000348f430f9269e2ba9e872437dfafcb31ac563476e2bf83a10705fde8dd5fc854404
-EBUILD rocminfo-2.10.0.ebuild 792 BLAKE2B 87746c08f5fe212bb81d84c5d34108b6e277415c7fb0e257cb5ab45ebe3524e2269bac4abf6a80099ea8898558285fe5512a735a9c1cfc8a4766783337442e24 SHA512 f0d45221962b8be509c72ef7b08f408c3bb58366314dee421e6dab4a3e738854a3ba7597b37a1f8f994e6019d0a1b43d2ac6fd22b8af86bfc4825cafc9021ca5
-EBUILD rocminfo-2.6.0.ebuild 847 BLAKE2B 12e23752891ccb97f9bb62d0edd1465bb90858023674b3b5ea4dbd2783e6c7b722a855295dbd25de1787b42e4d5f56fa7064847a582b6e4d757cfcfd95e1f5b5 SHA512 2d2f96093c11690c13fc85868340e670c80c8578c25831a835fb2d8d724893c7a300755dde35c50c9314e778c821f2fa7bd3360ff6105369a16d1a3e2a419bfe
-EBUILD rocminfo-2.7.0.ebuild 887 BLAKE2B b9ba2da7efbdb3c05e9b3dfbdf9d3edf8b5c2f79b9362c4663ff292712f5399156119d243a335814439e537e2718e082a7d52d62e2f679ecc74a7fcd06b85865 SHA512 4ff345ad2e1c4db1429b51e1d46b1505e1a10a5c74aa3ad0c87f3b578b87ef20cc467825d2f9df9d55f29436c2b040dd85555def280d395b35b2944125192dd6
-EBUILD rocminfo-2.8.0.ebuild 792 BLAKE2B 87746c08f5fe212bb81d84c5d34108b6e277415c7fb0e257cb5ab45ebe3524e2269bac4abf6a80099ea8898558285fe5512a735a9c1cfc8a4766783337442e24 SHA512 f0d45221962b8be509c72ef7b08f408c3bb58366314dee421e6dab4a3e738854a3ba7597b37a1f8f994e6019d0a1b43d2ac6fd22b8af86bfc4825cafc9021ca5
-EBUILD rocminfo-2.9.0.ebuild 792 BLAKE2B 87746c08f5fe212bb81d84c5d34108b6e277415c7fb0e257cb5ab45ebe3524e2269bac4abf6a80099ea8898558285fe5512a735a9c1cfc8a4766783337442e24 SHA512 f0d45221962b8be509c72ef7b08f408c3bb58366314dee421e6dab4a3e738854a3ba7597b37a1f8f994e6019d0a1b43d2ac6fd22b8af86bfc4825cafc9021ca5
-EBUILD rocminfo-3.0.0.ebuild 792 BLAKE2B 87746c08f5fe212bb81d84c5d34108b6e277415c7fb0e257cb5ab45ebe3524e2269bac4abf6a80099ea8898558285fe5512a735a9c1cfc8a4766783337442e24 SHA512 f0d45221962b8be509c72ef7b08f408c3bb58366314dee421e6dab4a3e738854a3ba7597b37a1f8f994e6019d0a1b43d2ac6fd22b8af86bfc4825cafc9021ca5
-EBUILD rocminfo-3.1.0.ebuild 792 BLAKE2B 87746c08f5fe212bb81d84c5d34108b6e277415c7fb0e257cb5ab45ebe3524e2269bac4abf6a80099ea8898558285fe5512a735a9c1cfc8a4766783337442e24 SHA512 f0d45221962b8be509c72ef7b08f408c3bb58366314dee421e6dab4a3e738854a3ba7597b37a1f8f994e6019d0a1b43d2ac6fd22b8af86bfc4825cafc9021ca5
-EBUILD rocminfo-3.3.0.ebuild 794 BLAKE2B 8ba7a2ebd5a75e507089f0deeb49b1085175641bc0c53c0609d386f39a1d6f3d38a608703f59f798f2fc24ae453619d8154427e7bf4c02b5852b260b0d01c067 SHA512 32a8fdda420e1440df3a2b297d6030ac69c892e5be970d61647942be7f2be3c620c9fec5bfa179ec54c3af1eb1e19d51e2de82d2eeb5d2b62c57c945844ed2ac
-EBUILD rocminfo-3.5.0.ebuild 794 BLAKE2B 8ba7a2ebd5a75e507089f0deeb49b1085175641bc0c53c0609d386f39a1d6f3d38a608703f59f798f2fc24ae453619d8154427e7bf4c02b5852b260b0d01c067 SHA512 32a8fdda420e1440df3a2b297d6030ac69c892e5be970d61647942be7f2be3c620c9fec5bfa179ec54c3af1eb1e19d51e2de82d2eeb5d2b62c57c945844ed2ac
 EBUILD rocminfo-3.7.0.ebuild 614 BLAKE2B 06e1e5b14bd58c8ca3519a9b446fec7e6ce46043cbb0bfedd6bc22b9e45d3c41d03a135c742c5451aa3b23d3a811fe76dcd0d71ba29f8ea37b62b4626414c8c3 SHA512 523379bff77eee0cb15ff6fa529f724698fb4e3ea590af72555db46ae51644ecfc3c4ece36db2a3864314f66ec4bbe8fed954cccf4d1fb2afcbb8115b020a840
 EBUILD rocminfo-9999.ebuild 794 BLAKE2B 8ba7a2ebd5a75e507089f0deeb49b1085175641bc0c53c0609d386f39a1d6f3d38a608703f59f798f2fc24ae453619d8154427e7bf4c02b5852b260b0d01c067 SHA512 32a8fdda420e1440df3a2b297d6030ac69c892e5be970d61647942be7f2be3c620c9fec5bfa179ec54c3af1eb1e19d51e2de82d2eeb5d2b62c57c945844ed2ac
 MISC metadata.xml 475 BLAKE2B c1ca0f1d0ec94ae012d3a6c2e5b0a896de75fae32ab8af40d2d0e8747544c15f11ce76cc45bd429d4b5b3b3abde5c896fed362641abf995c4bf9f10077e6933d SHA512 f84d5a379fc07d3410bf6cf946c91056295dccad64f100be02959d94e39eaa47d4fcfed84ea2bd596b2ecccb4ad3267bd86cd76b50d938b235655220fcef1549
diff --git a/dev-util/rocminfo/files/rocminfo-2.6.0-cmake-variables.patch b/dev-util/rocminfo/files/rocminfo-2.6.0-cmake-variables.patch
deleted file mode 100644
index 1678f5043273..000000000000
--- a/dev-util/rocminfo/files/rocminfo-2.6.0-cmake-variables.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://github.com/RadeonOpenCompute/rocminfo/pull/17
-
-From c9bfc4b3db029b8502f900cd9bb545a675ca0898 Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Thu, 25 Jul 2019 17:59:51 -0400
-Subject: [PATCH] Use CACHE variables, allow overriding
- ROCR_LIB_DIR/ROCR_INC_DIR
-
-CACHE variables allow for variables to be documented, and ROCR_LIB_DIR/ROCR_INC_DIR should be overridable as they'll have different values on different Linux distributions.
----
- CMakeLists.txt | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b5fa9dd..f8f430f 100755
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -43,9 +43,10 @@ endif()
- #
- 
- # Required Defines first:
--
--set(ROCR_INC_DIR ${ROCM_DIR}/include)
--set(ROCR_LIB_DIR ${ROCM_DIR}/lib)
-+set(ROCRTST_BLD_BITS CACHE "64" STRING "Either 32 or 64")
-+set(ROCM_DIR CACHE PATH "Root for RocM install")
-+set(ROCR_INC_DIR ${ROCM_DIR}/include CACHE PATH "Path for RocM includes")
-+set(ROCR_LIB_DIR ${ROCM_DIR}/lib CACHE PATH "Path for RocM libraries")
- #
- # Determine ROCR Header files are present
- #
diff --git a/dev-util/rocminfo/files/rocminfo-2.7.0-sizeof.patch b/dev-util/rocminfo/files/rocminfo-2.7.0-sizeof.patch
deleted file mode 100644
index 2d96bb227791..000000000000
--- a/dev-util/rocminfo/files/rocminfo-2.7.0-sizeof.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From cf96f42165fe76b98f653f979b4c182279dcac64 Mon Sep 17 00:00:00 2001
-From: Wilfried Holzke <gentoo@holzke.net>
-Date: Fri, 16 Aug 2019 22:04:52 +0200
-Subject: [PATCH] Fixed sizeof(err_val) to return the number of characters in
- the array
-
----
- rocminfo.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/rocminfo.cc b/rocminfo.cc
-index 9fddcfb..ee20da8 100755
---- a/rocminfo.cc
-+++ b/rocminfo.cc
-@@ -72,7 +72,7 @@
-     char* err_str = NULL;                                                     \
-     if (hsa_status_string(err,                                                \
-             (const char**)&err_str) != HSA_STATUS_SUCCESS) {                  \
--      snprintf(&(err_val[0]), sizeof(err_val[12]), "%#x", (uint32_t)err);     \
-+      snprintf(&(err_val[0]), sizeof(err_val), "%#x", (uint32_t)err);         \
-       err_str = &(err_val[0]);                                                \
-     }                                                                         \
-     printf("%shsa api call failure at: %s:%d\n",                              \
diff --git a/dev-util/rocminfo/rocminfo-2.10.0.ebuild b/dev-util/rocminfo/rocminfo-2.10.0.ebuild
deleted file mode 100644
index 99b4e1f557d2..000000000000
--- a/dev-util/rocminfo/rocminfo-2.10.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/rocminfo-roc-${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"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DROCM_DIR="${ESYSROOT}/usr"
-		-DROCR_INC_DIR="${ESYSROOT}/usr/include"
-		-DROCR_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
-	)
-	cmake_src_configure
-}
diff --git a/dev-util/rocminfo/rocminfo-2.6.0.ebuild b/dev-util/rocminfo/rocminfo-2.6.0.ebuild
deleted file mode 100644
index f2225abb0e01..000000000000
--- a/dev-util/rocminfo/rocminfo-2.6.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=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/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/rocminfo-roc-${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"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-cmake-variables.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DROCM_DIR="${ESYSROOT}/usr"
-		-DROCR_INC_DIR="${ESYSROOT}/usr/include"
-		-DROCR_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
-	)
-	cmake_src_configure
-}
diff --git a/dev-util/rocminfo/rocminfo-2.7.0.ebuild b/dev-util/rocminfo/rocminfo-2.7.0.ebuild
deleted file mode 100644
index 32f7f1c79219..000000000000
--- a/dev-util/rocminfo/rocminfo-2.7.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/rocminfo-roc-${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"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.6.0-cmake-variables.patch"
-	"${FILESDIR}/${P}-sizeof.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DROCM_DIR="${ESYSROOT}/usr"
-		-DROCR_INC_DIR="${ESYSROOT}/usr/include"
-		-DROCR_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
-	)
-	cmake_src_configure
-}
diff --git a/dev-util/rocminfo/rocminfo-2.8.0.ebuild b/dev-util/rocminfo/rocminfo-2.8.0.ebuild
deleted file mode 100644
index 99b4e1f557d2..000000000000
--- a/dev-util/rocminfo/rocminfo-2.8.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/rocminfo-roc-${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"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DROCM_DIR="${ESYSROOT}/usr"
-		-DROCR_INC_DIR="${ESYSROOT}/usr/include"
-		-DROCR_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
-	)
-	cmake_src_configure
-}
diff --git a/dev-util/rocminfo/rocminfo-2.9.0.ebuild b/dev-util/rocminfo/rocminfo-2.9.0.ebuild
deleted file mode 100644
index 99b4e1f557d2..000000000000
--- a/dev-util/rocminfo/rocminfo-2.9.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/rocminfo-roc-${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"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DROCM_DIR="${ESYSROOT}/usr"
-		-DROCR_INC_DIR="${ESYSROOT}/usr/include"
-		-DROCR_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
-	)
-	cmake_src_configure
-}
diff --git a/dev-util/rocminfo/rocminfo-3.0.0.ebuild b/dev-util/rocminfo/rocminfo-3.0.0.ebuild
deleted file mode 100644
index 99b4e1f557d2..000000000000
--- a/dev-util/rocminfo/rocminfo-3.0.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/rocminfo-roc-${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"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DROCM_DIR="${ESYSROOT}/usr"
-		-DROCR_INC_DIR="${ESYSROOT}/usr/include"
-		-DROCR_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
-	)
-	cmake_src_configure
-}
diff --git a/dev-util/rocminfo/rocminfo-3.1.0.ebuild b/dev-util/rocminfo/rocminfo-3.1.0.ebuild
deleted file mode 100644
index 99b4e1f557d2..000000000000
--- a/dev-util/rocminfo/rocminfo-3.1.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/rocminfo-roc-${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"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DROCM_DIR="${ESYSROOT}/usr"
-		-DROCR_INC_DIR="${ESYSROOT}/usr/include"
-		-DROCR_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
-	)
-	cmake_src_configure
-}
diff --git a/dev-util/rocminfo/rocminfo-3.3.0.ebuild b/dev-util/rocminfo/rocminfo-3.3.0.ebuild
deleted file mode 100644
index cac515f5ca2b..000000000000
--- a/dev-util/rocminfo/rocminfo-3.3.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DROCM_DIR="${ESYSROOT}/usr"
-		-DROCR_INC_DIR="${ESYSROOT}/usr/include"
-		-DROCR_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
-	)
-	cmake_src_configure
-}
diff --git a/dev-util/rocminfo/rocminfo-3.5.0.ebuild b/dev-util/rocminfo/rocminfo-3.5.0.ebuild
deleted file mode 100644
index cac515f5ca2b..000000000000
--- a/dev-util/rocminfo/rocminfo-3.5.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DROCM_DIR="${ESYSROOT}/usr"
-		-DROCR_INC_DIR="${ESYSROOT}/usr/include"
-		-DROCR_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
-	)
-	cmake_src_configure
-}
diff --git a/dev-util/source-highlight/Manifest b/dev-util/source-highlight/Manifest
index 9fec10d7dedf..d50152921654 100644
--- a/dev-util/source-highlight/Manifest
+++ b/dev-util/source-highlight/Manifest
@@ -1,3 +1,5 @@
+AUX source-highlight-3.1.9-test-clang-p1.patch 998 BLAKE2B 7867aff751170990c48343977f6d92380c1f84ad8f18d9def453b39c6e6a8b97f23727f6cb1419f0b9d82f0fc368517d19f321f23752410ba84fb1cf6335d5dd SHA512 b64f44a9f5c1fff05aaa1a6f025d61cc095e9f22944a1983aca457085f348535ad27a7b7f79ec6358f64fc72fa0869ee3c22659f44f1a0d105ef23d68f466c32
+AUX source-highlight-3.1.9-test-clang-p2.patch 1413 BLAKE2B f66b090bb5004cf4ee344868479b1a1999339d71799e6e6150104f99c0a8ea5ffebe836b8d185ecb52416aaed6da80e24c5870910274ce381cfab6ab3276035c SHA512 a6573d376753dda6e8f64dd9b81c4e8f209ea5cb3dee1dc9a495db6b671d88840baa2fd9c128085cb62d9acbc41e1f88d3a9e6a319b76199755b43008d7ab0de
 DIST source-highlight-3.1.9.tar.gz 1717234 BLAKE2B 6eb40b2274df0772c4a241504e5db5dfdaac600549e0b11aba726f7b4d5ab600c3849a8815bc782ad1bb1f99b69766527645dd202731bde4b2466c663842c47c SHA512 d8e154e9a5d62c77807e4e5d36c0faed5ce2964291be5f8b83e2968a6de52229503689a4ca2109a717ae2632a14b63ec937ca0430c91684c72063f6bc0294195
-EBUILD source-highlight-3.1.9.ebuild 1398 BLAKE2B 829ccc78484078881ecdb1d2f321d625996cc88a97b8f5cb4e96587a15db0b58893a0c16d4de26ac4e404b378e1468ea4ff345d582b871a674ee1cc4b2b7776b SHA512 8a2263143b563610076489b199795aa4b0de29ebe3caf1724bf37adac3e0d3ac15330d4f915ccbe7dab5786d172d2188407eedfbee4fb73f035eb6e1da0dbbac
+EBUILD source-highlight-3.1.9.ebuild 1505 BLAKE2B a630a478ced8369ceb95e8b9cf8bd934444da64cc128079d6385c92fc329911e313deebf5d50bad1d5c4faacabef9a8501ec6859cff8e745e6b0f827a0f4853f SHA512 d59500bb398d6a2e89382c22514dd364af3f26bb698acd5392e14ecd966edbfb3bb2558295beaace6f1e7b279318194ac36c2a6fbf11bdbc5a4be5c34bbcb4db
 MISC metadata.xml 267 BLAKE2B 5267526ad53ec7bedfe46f8cba86c810629394fa4f3c59e1b69619b0a11a9edbb746ae6abf818182da7ade72c862360f43a19209007a23da9701df26b96f77dd SHA512 715bb37d958c1e508b2ef00711ab3a4abee982efe90867fd2bcf91fa91305d5a413a4f3d13d01ea6e27eb15f5f9dcb58fa13ecfed7025cae43745792ac1a105d
diff --git a/dev-util/source-highlight/files/source-highlight-3.1.9-test-clang-p1.patch b/dev-util/source-highlight/files/source-highlight-3.1.9-test-clang-p1.patch
new file mode 100644
index 000000000000..6b0bad369b86
--- /dev/null
+++ b/dev-util/source-highlight/files/source-highlight-3.1.9-test-clang-p1.patch
@@ -0,0 +1,30 @@
+From b3481e66f2014dece48d8dfe8affa416d8d4e104 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Thu, 27 Aug 2020 07:51:14 +0100
+Subject: [PATCH 1/2] lib/tests/stdboosterror.h: use unambiguous form of
+ variable declaration
+
+Original expression has an ambiguity and should not compile:
+https://gcc.gnu.org/PR86564
+
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ lib/tests/stdboosterror.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/tests/stdboosterror.h b/lib/tests/stdboosterror.h
+index 568545b..d59bfa6 100644
+--- a/lib/tests/stdboosterror.h
++++ b/lib/tests/stdboosterror.h
+@@ -4,7 +4,7 @@
+ #include <boost/regex/pattern_except.hpp>
+ 
+ static boost::regex_error
+-        std_boost_exception(boost::regex_error(boost::regex_constants::error_bad_pattern));
++        std_boost_exception = boost::regex_error(boost::regex_constants::error_bad_pattern);
+ 
+ /**
+  * returns the string representing a standard exception (which
+-- 
+2.28.0
+
diff --git a/dev-util/source-highlight/files/source-highlight-3.1.9-test-clang-p2.patch b/dev-util/source-highlight/files/source-highlight-3.1.9-test-clang-p2.patch
new file mode 100644
index 000000000000..4c34f9dcca51
--- /dev/null
+++ b/dev-util/source-highlight/files/source-highlight-3.1.9-test-clang-p2.patch
@@ -0,0 +1,39 @@
+From 4d53621557de31479dad3cb44b7fccba8277b76d Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Thu, 27 Aug 2020 07:52:25 +0100
+Subject: [PATCH 2/2] lib/tests/test_wordtokenizer_main.cpp: insert overload to
+ std namespace
+
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ lib/tests/test_wordtokenizer_main.cpp | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/lib/tests/test_wordtokenizer_main.cpp b/lib/tests/test_wordtokenizer_main.cpp
+index 40e23b1..02e8fd8 100644
+--- a/lib/tests/test_wordtokenizer_main.cpp
++++ b/lib/tests/test_wordtokenizer_main.cpp
+@@ -11,9 +11,9 @@
+ using namespace std;
+ using namespace srchilite;
+ 
+-static ostream &operator <<(ostream &os, const WordTokenizer::WordTokenizerResults::value_type &);
+-
+-ostream &operator <<(ostream &os, const WordTokenizer::WordTokenizerResults::value_type &token) {
++/* Argument-dependent lookup looks only at std:: namespace (ostream and value_type expansion) */
++namespace std {
++static ostream &operator <<(ostream &os, const WordTokenizer::WordTokenizerResults::value_type &token) {
+     if (token.first.size()) {
+         os << "space: \"" << token.first << "\"" << endl;
+     } else {
+@@ -22,6 +22,7 @@ ostream &operator <<(ostream &os, const WordTokenizer::WordTokenizerResults::val
+ 
+     return os;
+ }
++}
+ 
+ int main() {
+     WordTokenizer::WordTokenizerResults tokens;
+-- 
+2.28.0
+
diff --git a/dev-util/source-highlight/source-highlight-3.1.9.ebuild b/dev-util/source-highlight/source-highlight-3.1.9.ebuild
index cbf7b16e377f..3568b4c32e0d 100644
--- a/dev-util/source-highlight/source-highlight-3.1.9.ebuild
+++ b/dev-util/source-highlight/source-highlight-3.1.9.ebuild
@@ -18,6 +18,11 @@ RDEPEND=">=dev-libs/boost-1.62.0:=[threads]
 DEPEND="${RDEPEND}"
 BDEPEND=""
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.9-test-clang-p1.patch
+	"${FILESDIR}"/${PN}-3.1.9-test-clang-p2.patch
+)
+
 src_configure() {
 	# required as rev-dep of dev-libs/boost-1.62.0
 	# https://wiki.gentoo.org/wiki/Project:C%2B%2B/Maintaining_ABI
diff --git a/dev-util/statifier/Manifest b/dev-util/statifier/Manifest
index e6a765a285f9..316fe5d0c439 100644
--- a/dev-util/statifier/Manifest
+++ b/dev-util/statifier/Manifest
@@ -1,5 +1,7 @@
+AUX statifier-1.7.4-clang.patch 344 BLAKE2B 6e5d2f48fa20c34c999cf898f943e9e6113324b7a75cfd58da4978e2cd7ef8cfc3d610b4e70e3fe90a5f548f8c8c3b289ff0b331c0f403c4191fadeed8315704 SHA512 bb15602f245a94c7d29128a3c45aa650ea6165e1b072808d14a2f0187398bab89448f41cd5bf52d8e7a04d8c6f89730b914f437c09a9829123989999bfede377
 AUX statifier-1.7.4-fix-build-system.patch 2104 BLAKE2B 019248feff682a75b90d1aca7eea425aded1b0f01e8dff4bd24410a474ef1350ed8215803915cb52df53866f6dc996428742d0a9187f55bbff17ce30894dd6b3 SHA512 a9bf5adf1206bbca84084df0680785e1f31902fb7ce4d455593ee35e0195ef9546de641d2f5372843afb7c8584fb04b1b13ee7973813ee8561a2282f2162cc87
+AUX statifier-1.7.4-musl.patch 673 BLAKE2B 1b1d46c44ae7675dd757219a40d0f255455308c27a0515c32ebdc629cbb6e1777e4a7d673c51cba42b7b82b4608ed1e69ab3d2aa7bda93b4171c0e9670e608db SHA512 285ed4d06080188b45a10c3e5da83c7e28e198cbe2f20dc84befa4d4b83850278c4f8e444898f6c419b8e13e41140875eb1e7960d9633a03b396a716c53bd03e
 DIST statifier-1.7.4.tar.gz 73245 BLAKE2B 897b78b31aa4f148b6a6a986251ba9d4f40ebad3209f71896ffffb71e06ab25d337a4a79adc0217592051f917bc71428d3032f6216ec053f62c4632edef474d5 SHA512 22d4873130bafe06144c8f6ce7089aa25e3eb047bbee5709344fee1e8d85b24aac689c88d34537fe4a690e231d768e56a2fa13672b9eccf27d945b3f8bcda756
-EBUILD statifier-1.7.4-r1.ebuild 1121 BLAKE2B 65e776a2db0b4fceb22d8c74924b917be7e014cab3283abd547bf828d06c0ce58056a23857a67f965cec652438c192e0155e527f9dd832f5d721d4a244649c7d SHA512 560cfa83d8ae2586fec125c759f2a81055cbd464749d305a435b563f5b1ab258370d10056dc2415a8f22604ace32ba9c45f65235f3dd1bd7b11791502f99c832
-EBUILD statifier-1.7.4.ebuild 1125 BLAKE2B b0b81af822f90d001cc7509a74334e8149bcc26d0f106d84aaa2ca27d5d79b033da1813d60bb37119c604eaf0f007f6c2a6c3553fedcadaacb53fbc49be116eb SHA512 9a8749dfce5361eb7771e0f330b300c1ce56f08ff6cd93abf1457a2ddcb81b3016c14c54df0fdb602f20b72c97d7f799ae496043024ddae347f3af43da19923e
+EBUILD statifier-1.7.4-r1.ebuild 1162 BLAKE2B 98ecff2983258fb635c773247fa50ac120bde4890f2e1e25d9552ceb7204c03ceedb5352c2e8818b0b51f438cbfe98a5da9b854c1fc713d927fe5ea2061ebd21 SHA512 22acc206a52fbc15c519beb60e913a7d77d2a7526570b6161eedab8cc354e6d0352058c1fdc5a277962213de4ed84d61a15475d4279bd301fd978611ed2fc4b4
+EBUILD statifier-1.7.4.ebuild 1159 BLAKE2B fced9ac949c3f45db5a114c082724d94ad524c1272f9f0ec16b34f116a9d839fa656c6e41efcffed0d8af43484931ccd12d2ec15ff58d4ccea7372950f359b35 SHA512 17b53d41ffa6dc4d7ee6706b5b0f93ad713db6d88b51292a5d39800b3f68a8e3ab308c43b8e85a4edd9dc37cd1c74114a859ea7c70ed37603dd27024d4157280
 MISC metadata.xml 250 BLAKE2B d57634b040c498296655940e3ee580c8580075a4190e2600113cee5548ff44a2025568380f3d5d9f3ca0fcd1ea5d41c9871395ffbcf4bd32d8df6a494852a885 SHA512 c225bdf339347a1768b255d905f3831904cdc375f3d4e90e41c68645b8bcfe2dfdf8e6aa4c67063103f459808a387c8edd9b35b073b8be175f7a3bd490fe3dca
diff --git a/dev-util/statifier/files/statifier-1.7.4-clang.patch b/dev-util/statifier/files/statifier-1.7.4-clang.patch
new file mode 100644
index 000000000000..39905eca57f8
--- /dev/null
+++ b/dev-util/statifier/files/statifier-1.7.4-clang.patch
@@ -0,0 +1,14 @@
+--- a/src/end.S
++++ b/src/end.S
+@@ -39,6 +39,10 @@
+ 	 * to the register_size boundary but to 16 boundary.
+   	 * Also as gcc's man say, that 16 is maximum alignment. So, i use it.
+ 	 */
+-	.org . + ((16 - (. % 16 )) % 16)
++#if defined(__clang__)
++# define E(BASE, X)
++#else
++# define E(BASE, X)	.org . + ((16 - (. % 16 )) % 16)
++#endif
+ data:
+ 
diff --git a/dev-util/statifier/files/statifier-1.7.4-musl.patch b/dev-util/statifier/files/statifier-1.7.4-musl.patch
new file mode 100644
index 000000000000..919f354127b3
--- /dev/null
+++ b/dev-util/statifier/files/statifier-1.7.4-musl.patch
@@ -0,0 +1,28 @@
+--- a/src/my_gdb/my_ptrace.c
++++ b/src/my_gdb/my_ptrace.c
+@@ -13,8 +13,10 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
++typedef int statifier_ptrace_req_t;
++
+ long my_ptrace(
+-	enum __ptrace_request request,
++	statifier_ptrace_req_t request,
+ 	pid_t                 pid,
+ 	void                 *addr,
+ 	void                 *data,
+--- a/src/my_gdb/my_ptrace.h
++++ b/src/my_gdb/my_ptrace.h
+@@ -15,8 +15,10 @@
+ #include <sys/types.h>
+ #include <sys/ptrace.h>
+ 
++typedef int statifier_ptrace_req_t;
++
+ long my_ptrace(
+-	enum __ptrace_request request,
++	statifier_ptrace_req_t request,
+ 	pid_t                 pid,
+ 	void                 *addr,
+ 	void                 *data,
diff --git a/dev-util/statifier/statifier-1.7.4-r1.ebuild b/dev-util/statifier/statifier-1.7.4-r1.ebuild
index 046c0699da96..5bdd7e9ca4e7 100644
--- a/dev-util/statifier/statifier-1.7.4-r1.ebuild
+++ b/dev-util/statifier/statifier-1.7.4-r1.ebuild
@@ -22,8 +22,9 @@ RDEPEND="
 "
 
 PATCHES=(
-	# Respect users CFLAGS and LDFLAGS
+	"${FILESDIR}"/${PN}-1.7.4-clang.patch
 	"${FILESDIR}"/${PN}-1.7.4-fix-build-system.patch
+	"${FILESDIR}"/${PN}-1.7.4-musl.patch
 )
 
 src_prepare() {
diff --git a/dev-util/statifier/statifier-1.7.4.ebuild b/dev-util/statifier/statifier-1.7.4.ebuild
index b4021f0a1cf3..7ade05bbc42a 100644
--- a/dev-util/statifier/statifier-1.7.4.ebuild
+++ b/dev-util/statifier/statifier-1.7.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=6
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
 
@@ -14,15 +14,17 @@ SRC_URI="https://sourceforge.net/projects/${PN}/files/${PN}/${PV}/${P}.tar.gz"
 KEYWORDS="amd64 x86"
 SLOT="0"
 LICENSE="GPL-2"
-IUSE=""
 
-RDEPEND="app-shells/bash
+RDEPEND="
+	app-shells/bash
 	sys-apps/coreutils
-	virtual/awk"
+	virtual/awk
+"
 
 PATCHES=(
-	# Respect users CFLAGS and LDFLAGS
+	"${FILESDIR}"/${PN}-1.7.4-clang.patch
 	"${FILESDIR}"/${PN}-1.7.4-fix-build-system.patch
+	"${FILESDIR}"/${PN}-1.7.4-musl.patch
 )
 
 src_prepare() {
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index 1ae50353fae0..c87c1417dde1 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -7,6 +7,6 @@ DIST strace-5.8.tar.xz 1813640 BLAKE2B 315edf404fa57890dcff512f9fd76818e8e7d5ad0
 EBUILD strace-5.3.ebuild 2323 BLAKE2B 02812e696ba9c1f24bb8ea9b7cb21ce1ec6afc9bd5dedb2d70c3bc9b88c4523745333070be4d2a0c9297533a636964efd02b1d1ae33ed025251d18074081d114 SHA512 8c2b4b7e6a9119d226117f72209ec360365615670092370faa22fa605f0afd583749f008146eb59afafefaaab9f634b512c0893e0d10b896e7bd6221e51a7f58
 EBUILD strace-5.4.ebuild 2524 BLAKE2B 3a21233c29527856cbe1723407ddac3525b57efe6fa3bf379b6ba4d902d5dfe607049a5a9264f91f947ab2678cd36cebc4629eb49812658bb895583840fa5fdd SHA512 fae99e9ba572c1c6445ba03ec257759165d5c3be57d6de5269f1e886e6c9fb50361995956671772bfae26ec4d54785e9f40ac7dad25a5d4b2c33f8c3e2eb94b4
 EBUILD strace-5.7.ebuild 2355 BLAKE2B 7a3c90be9f839968e4b7355c80cfec5d9aacfe738af9bd8e8e128a64f7f54816850173e497d28e14087ba49e3c9c80e7b0dc2bc6f9f39aeee279f601bb5e0757 SHA512 e5ddb7a75e527523c8d9e39571fb1ba68dc38aec09536bc43cf1225bbd3cd521a32c517baa5c0c16b6874407fcf31dd8e505dfd4cb61223025df6d2b5fa1e46d
-EBUILD strace-5.8.ebuild 2352 BLAKE2B 1a06ac536e79ffa2a42c62860e2e7d163d258f9cab5054cb2e7d51cec3e9e8eff56cefc67732e403569b37331bb55ea6976b5851c969078623f53c629e12ff57 SHA512 3e763a2bdcf72cf25a4981f8ad1c8d963bdf72c8d3a2e07e64e88d8bc6f71f1521a3a27902e5aa9e9ac0626bc44e2ff9fcfa44a48aa0ba7f3f8fbf485dba5c95
+EBUILD strace-5.8.ebuild 2350 BLAKE2B 095ada57669c2f6d1414f98a4a47cac114944cd64a0017694c45ff265105ba3e6bf748bda55e917426857fd8b8a8f38a8bf9b9275424af718a7514c1bc20756a SHA512 ff906a4626dd54452be909c2072150c231cfcfe3a267381135ded73078b0c724d8d694ef3601109b88987356cf5069332e7527f98f074c13354e74d543de3e9d
 EBUILD strace-9999.ebuild 2354 BLAKE2B 65b3aaf00c35f709158d0f3de01f7bcc0b1a8daaab9e614bb9d381d0b4ae26794cd6fe8e502e1d8f953a9271e8fe0bd460b84f8ca84266192635a37d54c3b653 SHA512 879a423a1786a2147484d817a89060960e1e4796f481902f2001b872a0942a84e7d78ad87869d35637bc9cd2b3ad61821067a32def5a8dbb196b3a638676f3c2
 MISC metadata.xml 705 BLAKE2B 5bbeedc586ec794a2839988f3691780c8b9d00b3279423216d57621e71c562357d4df7df3b359408779ccc0856852f7183c62c2c269c77bfb466b2d456414ad3 SHA512 b0d51447db9f1c34bb31bd519a27082d9e94d14f5ba8d19d9a9a90472f8b27a084f79e348520c92bffc2dfc408f5f45d35df2de94d13f8cf3242e042b66ea048
diff --git a/dev-util/strace/strace-5.8.ebuild b/dev-util/strace/strace-5.8.ebuild
index 2484fd485531..2c980459b03d 100644
--- a/dev-util/strace/strace-5.8.ebuild
+++ b/dev-util/strace/strace-5.8.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
diff --git a/dev-util/sysprof-capture/Manifest b/dev-util/sysprof-capture/Manifest
index f88b6f838f11..31a9e5c50ba9 100644
--- a/dev-util/sysprof-capture/Manifest
+++ b/dev-util/sysprof-capture/Manifest
@@ -1,5 +1,5 @@
 DIST sysprof-3.34.1.tar.xz 372612 BLAKE2B 3a50a00f29866ae8bf03cc7a57b598e40a6a37ad88ac2159087e4f2a8a6a5cef09b345dc5332fb1df9036c4e159e98f19adda45588150b059af313878b9b554c SHA512 5f2d820935291a3b578222d5daa87b0a2f74cd16d14daca19065495be61cf7359f00f12f452a5c0b4e05dfeb94e2376017c2288cad92dc0c4bb9bca51b903d19
 DIST sysprof-3.36.0.tar.xz 435956 BLAKE2B 990a6c6c28339594df915ed1fb98f504bf6b080a5e3c31af0cc4bcfd208027361f02a9068291692d082787a6fd42ab414079122a63e4706aee2511040379f0c8 SHA512 41f99cc3446a6624ea74fcdecd7a29a2e5e2d4086383d59a9064c4a3df5d9b8d08f4903ff4dcc85ffa9c6d42bd84dec5c03f6010fffd4415cc8fecf4dc0b23f4
 EBUILD sysprof-capture-3.34.1-r1.ebuild 1158 BLAKE2B 28a75972c7e9aea4a7115985a0f82bceb3b487c04380b9779c5fc5450000aa47c847d3b03096c760b16a6f08fbc55e8672228537ecd70f0ed5c6cf06dfebf93f SHA512 e55ebb10bfbfb5805ba545441abf5c55f4c2ebbf820680edb27d275e92f388e7f183521faecdb048f6b34dbaaf1811e59be63c45ec80957a601c53de4db65a07
-EBUILD sysprof-capture-3.36.0.ebuild 931 BLAKE2B a0a2caabe8cf49695179e76067ae0a85e2a92433b090756d38d1d1572bdd53bf817d01520f146b7f4476276ffc18da4416cec2d2c7631518d05a504723c5ae6d SHA512 531b2a1d4c4d4e9144d16f70ed95a43c30a3c0460c62c9a1209c7baf1cdbbe86ef635b4651b4a11033a444ceb48e2aa24aa1660aaa8339805e9429758bc9ae3a
+EBUILD sysprof-capture-3.36.0.ebuild 929 BLAKE2B d3eb2dd1588bd42872120abb7145df27e9cd1a16baf1aa07387abb22fe588e3902430877c9b84e71310aaa5af2cddd9e2008e68c56fdd056bcaa950a5d424896 SHA512 ffc8dfcb4aaa36a2af7fadee096ffe103ddd49aa6356e5909e2b1fbf1c4398a357a6c303ff71a45524a4391398a5dcd8937018831a57d22b3b50e21448dd83e6
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/sysprof-capture/sysprof-capture-3.36.0.ebuild b/dev-util/sysprof-capture/sysprof-capture-3.36.0.ebuild
index aeb811d08afa..42316cefd30a 100644
--- a/dev-util/sysprof-capture/sysprof-capture-3.36.0.ebuild
+++ b/dev-util/sysprof-capture/sysprof-capture-3.36.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://sysprof.com/"
 
 LICENSE="GPL-3+ GPL-2+"
 SLOT="3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.61.3:2
diff --git a/dev-util/sysprof/Manifest b/dev-util/sysprof/Manifest
index dae844c5260e..7d357b3738e6 100644
--- a/dev-util/sysprof/Manifest
+++ b/dev-util/sysprof/Manifest
@@ -1,5 +1,6 @@
+AUX 3.36.0-fix-32bit-tests-build.patch 916 BLAKE2B 17301f082a57bd513da3f82e4adbabe3b577bbbaa8623ac3882e2b69555d384b4ecb3cc74676f10d06d58907f831536164c40bb3dc82443a25f6e7664c0af48e SHA512 901a5781cb6acdf7febad8fd264d16b1aeacbfc6c44126593d75b4f271aa0925da65a846b8b27afe42633e491994ab68913bd36484b6b77473fe8adb972e28cc
 DIST sysprof-3.34.1.tar.xz 372612 BLAKE2B 3a50a00f29866ae8bf03cc7a57b598e40a6a37ad88ac2159087e4f2a8a6a5cef09b345dc5332fb1df9036c4e159e98f19adda45588150b059af313878b9b554c SHA512 5f2d820935291a3b578222d5daa87b0a2f74cd16d14daca19065495be61cf7359f00f12f452a5c0b4e05dfeb94e2376017c2288cad92dc0c4bb9bca51b903d19
 DIST sysprof-3.36.0.tar.xz 435956 BLAKE2B 990a6c6c28339594df915ed1fb98f504bf6b080a5e3c31af0cc4bcfd208027361f02a9068291692d082787a6fd42ab414079122a63e4706aee2511040379f0c8 SHA512 41f99cc3446a6624ea74fcdecd7a29a2e5e2d4086383d59a9064c4a3df5d9b8d08f4903ff4dcc85ffa9c6d42bd84dec5c03f6010fffd4415cc8fecf4dc0b23f4
 EBUILD sysprof-3.34.1-r1.ebuild 2178 BLAKE2B c7af4fa12f96de0aff7639364be3fd34574646a1345c27210b3ec6275a3fec64e002c43479dc290906983a673b319b68481469ccf954a270a74c0269290c43ca SHA512 3ef91c9ebe8d26f96bc0ecde85ca9c171c573c6c29a7050554301e4933ab5bb214a9069bb459129bbdc2b99c16b45197c69b4603ebf7270f648ff3d96dcd7681
-EBUILD sysprof-3.36.0.ebuild 2247 BLAKE2B 1fa6898c75a04a64d7f364bcea689b856dd45700a6b95874517abf46e90bb5395d14c9e15132876b505852dc90064c80d938797ce5d756de96a46053f1842d8e SHA512 ffa65d2350b0f537b4cc0d3f61d3e59f289e78463afee3b490723e9db7e61407060cf6290b919a8b5eea85ab2903729f7651a80cd4efde60d9f53ae019280977
+EBUILD sysprof-3.36.0.ebuild 2307 BLAKE2B 1568508955c5be1b360553aa1e1aaba72ebd4f4c2e62884ebcfc8b0f0cff7ba2032159b3a9ef414c1cb56944f33662c65016a43d59b115a1763fea3be55fe112 SHA512 c350410c8775e4f8ec6817d73add43a86afd36fcd4d3a303f9e87aef642edbbfaaa799a685f8cd70aa579b86fff71f224e0ee120b47b21722330f396b62fffe2
 MISC metadata.xml 704 BLAKE2B 0f16b3a4886ed687e5e889f9cacee3148f0ed4c80f5bc88c66217dcd7d411a0e900710d36e7e9a12995872f75b247f231fd1a085fe699a3b3d14d48e67e13dbd SHA512 247b92c056fe9b224ca5a096825223b883534af67bdd514dfa424460ee3b50cf7187bdd81fc70c64b1073477e7292f19d92d8d5112c1f27472f59e59bcae450d
diff --git a/dev-util/sysprof/files/3.36.0-fix-32bit-tests-build.patch b/dev-util/sysprof/files/3.36.0-fix-32bit-tests-build.patch
new file mode 100644
index 000000000000..a9d4ab58ef9a
--- /dev/null
+++ b/dev-util/sysprof/files/3.36.0-fix-32bit-tests-build.patch
@@ -0,0 +1,29 @@
+From 5dea152c7728f5a37370ad8a229115833e36b4f6 Mon Sep 17 00:00:00 2001
+From: Rasmus Thomsen <oss@cogitri.dev>
+Date: Sat, 7 Mar 2020 10:44:16 +0100
+Subject: [PATCH] tests: use G_GSIZE_FORMAT instead of G_GUINT64_FORMAT for
+ gsize
+
+This fixes the build on 32-bit platforms with -Werror-format
+
+fixes #32
+---
+ src/tests/allocs-by-size.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/tests/allocs-by-size.c b/src/tests/allocs-by-size.c
+index 666113a..6260d4b 100644
+--- a/src/tests/allocs-by-size.c
++++ b/src/tests/allocs-by-size.c
+@@ -109,7 +109,7 @@ allocs_by_size (SysprofCaptureReader *reader)
+     {
+       const Item *item = &g_array_index (ar, Item, i);
+ 
+-      g_print ("%"G_GUINT64_FORMAT",%"G_GUINT64_FORMAT",%"G_GUINT64_FORMAT"\n",
++      g_print ("%"G_GSIZE_FORMAT",%"G_GSIZE_FORMAT",%"G_GSIZE_FORMAT"\n",
+                item->size, item->cmp, item->count);
+     }
+ }
+-- 
+2.20.1
+
diff --git a/dev-util/sysprof/sysprof-3.36.0.ebuild b/dev-util/sysprof/sysprof-3.36.0.ebuild
index f177e8ac8280..25aaf9a9f76a 100644
--- a/dev-util/sysprof/sysprof-3.36.0.ebuild
+++ b/dev-util/sysprof/sysprof-3.36.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://sysprof.com/"
 LICENSE="GPL-3+ GPL-2+"
 API_VERSION="3"
 SLOT="0/${API_VERSION}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gtk +unwind"
 
 RDEPEND="
@@ -34,6 +34,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PV}-fix-32bit-tests-build.patch
+)
+
 src_prepare() {
 	xdg_src_prepare
 	# These are installed by dev-util/sysprof-capture
diff --git a/dev-util/tailor/Manifest b/dev-util/tailor/Manifest
deleted file mode 100644
index 74d8b6b3948d..000000000000
--- a/dev-util/tailor/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST tailor-0.9.35.tar.gz 228650 BLAKE2B 00f609b64f22f35791bcbced1d5e62aa38b3d00c88b5d96f525807991cc51e5e82e2312583c257fc039bf89d794bcf3dbe9580e582f0d3d638289399808194ed SHA512 184521adac681ccca279215c115913d98d1521aac41fe15ca65a35e3c5075419e1cb0f1b453bca6d5a56a15b09928c34738a264b44f666de7067b2aba0562bed
-EBUILD tailor-0.9.35-r1.ebuild 858 BLAKE2B 1acc36e234f777dc6d314c6a15a8e725e0636697395b610185f6585f3c62b09ca6e10c80dfc95289379a5b6c49a813ca7bbc0012b14ed48786da235d7b6ceb1f SHA512 e57edf3b0c3ed794828f6350e17a9f15d368005e74455b5781fa721928c5b70e90ec6f4d597a89ef4ed4e0c283d1c6e245c0ced277e3f799bc43d129bea35ed4
-MISC metadata.xml 375 BLAKE2B 33ebd2d721501f15f3688440fea5ee396d7a2edc27f8c8443f71a2a21091db612bd7b1de7b5e811f624a49531081642292e4957fc52881a20663bcb470147773 SHA512 941495f6fcaf8a68c320ad045533fa95a7deab3ec1cf2b55113c67efe004045685464440eaaf4b879711389c9b4afd21eccc74c2be865ce59b1216c206bb8877
diff --git a/dev-util/tailor/metadata.xml b/dev-util/tailor/metadata.xml
deleted file mode 100644
index 8dd954b0400b..000000000000
--- a/dev-util/tailor/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		Tailor is a tool to migrate changesets between ArX, Bazaar,
-		Bazaar-NG, CVS, Codeville, Darcs, Git, Mercurial, Monotone,
-		Subversion and Tla repositories.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-util/tailor/tailor-0.9.35-r1.ebuild b/dev-util/tailor/tailor-0.9.35-r1.ebuild
deleted file mode 100644
index 6999849c97e0..000000000000
--- a/dev-util/tailor/tailor-0.9.35-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="A tool to migrate changesets between version control systems"
-HOMEPAGE="http://wiki.darcs.net/index.html/Tailor"
-SRC_URI="http://darcs.arstecnica.it/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-python_install_all() {
-	local HTML_DOCS=( README.html )
-	distutils-r1_python_install_all
-	rm "${D}usr/share/doc/${PF}/README.html"
-}
-
-pkg_postinst() {
-	elog "Tailor does not explicitly depend on any other VCS."
-	elog "You should emerge whatever VCS(s) that you want to use seperately."
-}
author	V3n3RiX <venerix@redcorelinux.org>	2020-09-02 14:09:07 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-09-02 14:09:07 +0100
commit	b17a3ef12038de50228bade1f05502c74e135321 (patch)
tree	9026dffec53f92cba48ca9a500a4f778e6304380 /dev-util
parent	3cf7c3ef441822c889356fd1812ebf2944a59851 (diff)