gentoo resync : 10.09.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-09-10 04:21:55 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-09-10 04:21:55 +0100
commit: 677b7ba5c317778df2ad7e70df94b9b7eec4adbc (patch)
tree: 6c418a1546fff5becab5d8b9ed6803323e7f316e /dev-util
parent: fbda87924e6faa7a1919f1a2b4182490bde5ec5c (diff)
78 files changed, 604 insertions, 1171 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 2a05fe1e40f4..afce25df7469 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/cbindgen/Manifest b/dev-util/cbindgen/Manifest
index 63e79228e639..b31058b30f35 100644
--- a/dev-util/cbindgen/Manifest
+++ b/dev-util/cbindgen/Manifest
@@ -50,5 +50,5 @@ DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9d
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD cbindgen-0.19.0.ebuild 1259 BLAKE2B 631c95bc89f17fdfb13180f4e6c203d3f8f8e8297e578f098b2fc583db2725d66e70e8f2b3eb3b366fb155c004e255bbcf856a1c79579bd24b591de0c337bb4a SHA512 48bdd6a80553225bc952964aa11e9e1a27a79793588d720362ae4acc23ccf8728c36c113312a99279989f8851e7186090d709f80333f9933e624b9f5a5826ac5
-EBUILD cbindgen-0.20.0.ebuild 1262 BLAKE2B 19790c8c77bbd0a6d11eeeaa62e908358a6cd306245a1a319da01db8e3db23400656484607a053570cea95609315534d709953dd21635c864a720bd3fabc5ae8 SHA512 cb66ded180a5c8f980328d532696fc53079634931e9ed5cb099636f7d17517ffe6c920836af26b26d17a633cdd10d1ea12c25765cfa4f0bb7bbd8d31503ee4d8
+EBUILD cbindgen-0.20.0.ebuild 1259 BLAKE2B 8e9a78c796e5cbc6d03c1c5f6b83978f862c79a9fb133748a9c1ddae041c376b02af513139519db0d18722b6bd384ddca321a875403cfe8e0cb6ae1abd16139a SHA512 698435ae90b75822093b70d6879b7542340c6df92593738c43754bd9ff28a62a7d411d2e539845982d66d69b5101167316be8311d7ca71694a893d1dbc441fdc
 MISC metadata.xml 334 BLAKE2B 641a12af31fbdf9200e6138f07f3d63b0ad8649899ba60ac078a57a32eab710c5731133258420e258028cfbe9cbab8078256f184b0968e9a901fd11212ebd814 SHA512 4592a95f23737588e949de9fa7a562467763d2b964787b58c5c1e34aeb55fef2f099ca9e2309e198417a8d58aa4ebca181394a7c06ad81ab1d10f185dc4e8f57
diff --git a/dev-util/cbindgen/cbindgen-0.20.0.ebuild b/dev-util/cbindgen/cbindgen-0.20.0.ebuild
index 75e46a2609ea..64f487c6f5f4 100644
--- a/dev-util/cbindgen/cbindgen-0.20.0.ebuild
+++ b/dev-util/cbindgen/cbindgen-0.20.0.ebuild
@@ -63,6 +63,6 @@ HOMEPAGE="https://github.com/eqrion/cbindgen/"
 SRC_URI="$(cargo_crate_uris ${CRATES})"
 LICENSE="MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 RESTRICT="test"
 QA_FLAGS_IGNORED="usr/bin/cbindgen"
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index f9f3409ba18e..dffa180a599c 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -5,7 +5,7 @@ AUX ccache-4.3-PWD.patch 2677 BLAKE2B 4a21c496fc2e2249490246d9595935afe13244a4ba
 AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b30c381b0df28be9c0ae7c0f1d7325282e97ca54881171846c13945b264bd4a793785ff1a19d0941669 SHA512 05d512b001b6a2fdc947d10d810c89683144080a060c24a37422e9b587594e1ee42fa1d7607461571f196819dae92146d861e8ae116e9226e1ff97ea035b3003
 DIST ccache-4.3.tar.xz 433508 BLAKE2B 6ab48aa587b4dc86020e3b0f722003dc5c03709626e143a1d38506b6072f9963fc76e89b6d18128dfc28035bf8d24e46ea44f219db69a1b3a294416f0b023090 SHA512 ec082de95ea8b22154ce1e67e0a0fc28266cfb71f382205f7eab14e6ac1c7841027d063041131832b3227d833d99ec874e90df238f35f433de4c381566931c7f
 DIST ccache-4.4.tar.xz 509516 BLAKE2B 6c4519d3cd93be49dfff09f22ada798894c9f4475395443e0dcfcf768178f1520cf26bc5c2e0ea22e06cc3ebd6ddaf930a2d1b517593a10c3253f7faa3131f43 SHA512 a857d1aded9c352eabba9c0f31b43fd17ae91672dabdfc086851448867c9dff6ad6dd7ee60f8e39102d41b7d8cf7866c6bf104e0214e865de45e75a8df7626f0
-EBUILD ccache-4.3-r2.ebuild 2040 BLAKE2B 8016d81a0d7b8b4af592b49f1b16ae013a0a86db3900c94dc6c0b4fcc999f99469ec756679796b7917777e07bd359ce93e58f4e7569846651f881f60e6075e47 SHA512 6ed3f885dce3dfa048486b7635fc11e0506ba8d72e5379b04fd5c656ed769e3346aba429c163cf8960c8ffda049b3e4057b9c8c057ee46f1da1bf9d55dd9b79b
+EBUILD ccache-4.3-r2.ebuild 2039 BLAKE2B 52f3830cb8451b66871732aa64aec3a8e42bc1730640337f2baed76ef9fec092f43c36749b0c9939e7e98b75ae3d7a14847d9dd8ec380f8acc8981b3de989dd0 SHA512 1e5bea0e4d4bd454d6d224975972d2dd1470061be94a6fcc6eee7bf5bdad2c07007a586b0003144308eed1fa4cbe11c07d3ca3d3f96f27b4eed7ca644c2b1c01
 EBUILD ccache-4.3-r3.ebuild 2125 BLAKE2B c2390d35d1f1f32cd4861eadc080b06b35047207937c6a71eb88b175b849adb2af58f61713375e664328ae47bd0a07392461a611b0085344dbf29990934977dd SHA512 8c2b00b7f810beac432b18ce61620eef5d1a8187d0f9a7b5f29658291af6ad6f1498148fc2f422026871d068b8c8267b9c8460f4a980bcab560b601a883b7cde
 EBUILD ccache-4.3.ebuild 1655 BLAKE2B b3cc038828f86dbd2d8060f5d13a197c399e7b99d0c0fcf4a82fbb498c212a9624fcb023f481c628a123fd1e2237689b1b094187c5fa1caa98aeca38c9c870d7 SHA512 0adb9fe19611bd373870e85d889b2bdaecb0fe6b11c40f3d48add1ecdca99c4b6beed5b151c685eaf13f0b11b0988bf870525ac23e3f78c865565f84e1aba156
 EBUILD ccache-4.4.ebuild 2204 BLAKE2B a6ae2e76ed4fe98970eeda1e36da986ccfedf80cc35b74414a7dba16853b3663908621c5b00029def4031c3324edbe44283c60ca353899d778e9d8e8e1f8d193 SHA512 5d7ccb58cea38b208092b87c954bfd029007b84cd09bc05fc79c3f6164a9ddde15321998c074436e3d2065edd104d27e32f067f811867407c743c82e34a5fb10
diff --git a/dev-util/ccache/ccache-4.3-r2.ebuild b/dev-util/ccache/ccache-4.3-r2.ebuild
index 9de66b172c8b..b3930229a412 100644
--- a/dev-util/ccache/ccache-4.3-r2.ebuild
+++ b/dev-util/ccache/ccache-4.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.
 
 LICENSE="GPL-3 LGPL-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="static-c++ test"
 
 DEPEND=""
diff --git a/dev-util/checkbashisms/Manifest b/dev-util/checkbashisms/Manifest
index 8339106221dd..7982383f1a6d 100644
--- a/dev-util/checkbashisms/Manifest
+++ b/dev-util/checkbashisms/Manifest
@@ -1,7 +1,5 @@
 DIST devscripts_2.21.2.tar.xz 980516 BLAKE2B 907f2f4e258a8396ad0a28eead1e2058b8e19be205f024ea80c0fbd9621d5ca4299844fe83d66cac7f653a917705d9c36eddb9d51454a7fbb9d7e2b52bc994ff SHA512 a6765d807dc0c2ef7a3d8c59e1262bfe7542c3ca52cda3c1910af253925cb105a9d1bf272c76a86f0b3cdda9c8a4e2d29a660437f73087dd70ee8a444bbedb01
-DIST devscripts_2.21.3.tar.xz 980408 BLAKE2B 99207ed58c0fdc592ce491ddda79a2ecb22a8975ef70828749bf58dff9cc94f63779025b3f0326d0c2c49ca768a7e651b1f9e7843e6da298c25340916334de25 SHA512 84122dd36de7961c26044ac8b8eeee2c0aae1dd4a811b5f0d522fe43488dad2872aa044ad1f38a78e49f9d13d8c19eb583a8082d636caeebb188f1dd4f1caec7
 DIST devscripts_2.21.4.tar.xz 981488 BLAKE2B 29339490586a66c6360f599a90e23452fd1e99fd01757e258e082b9550731b3e443b12fb9ce9b8fe6fb229f228a115f87a9b91b8769000afd741eb77e9e7a4a4 SHA512 99250737cabc24bbd21e20de7c787e182492e15cad4288226ed497349cbf3dd45927e1c501d73341e48dfd14ee2285c8cca8ac3b2145c2f02ce4d04ddb881e50
 EBUILD checkbashisms-2.21.2.ebuild 804 BLAKE2B 3327e778848aa5aaddb57e44ad561465133c2833db704842d1fc5e3533fcf5d15a33c065baa5dd199d3e2694b770096805f7719236eca33b35953afd6d1814a4 SHA512 bff58abba0ecc7da82e22d5a5aea758fb5a665a7cb05d0f472ef423de5273dc9ba89ba6af5ef613bcb740faa1e8a7d0d0e4debf53baa632e36fff31c736fc292
-EBUILD checkbashisms-2.21.3.ebuild 797 BLAKE2B dad0d0308e87e0b915e3aec869bb893fb725aca31fa847a7869e285f75f9e4558af24aacf6860d5bb439d76ac45aaa1c1d952af986f73592f10968a6e2528bb5 SHA512 5e5a736f8ab2e23d0e1a3237b930bb3d60bc39c9b56acba2f191334b5eebe9cb7e529b8b6ac734ca426581402437a89136ecf03858a0ac74334bd2203c902411
 EBUILD checkbashisms-2.21.4.ebuild 797 BLAKE2B dad0d0308e87e0b915e3aec869bb893fb725aca31fa847a7869e285f75f9e4558af24aacf6860d5bb439d76ac45aaa1c1d952af986f73592f10968a6e2528bb5 SHA512 5e5a736f8ab2e23d0e1a3237b930bb3d60bc39c9b56acba2f191334b5eebe9cb7e529b8b6ac734ca426581402437a89136ecf03858a0ac74334bd2203c902411
 MISC metadata.xml 433 BLAKE2B b54d1290789d3ce8931f832c8c1ca7a56fbdebe85c0a81c32a929168fdf2d5a7be0dea01881e8fcc583061db1a071d1787723c9342c77a5862e228f0203c178b SHA512 945c3b95a61d4219e98ce5be3aed255cb148867409aca572714e8679bf623ee0c3396966cd80d783ace60bae7e6c01b85fad6c7f7ac9056422d732ed07f54716
diff --git a/dev-util/checkbashisms/checkbashisms-2.21.3.ebuild b/dev-util/checkbashisms/checkbashisms-2.21.3.ebuild
deleted file mode 100644
index c92bd4dea7d8..000000000000
--- a/dev-util/checkbashisms/checkbashisms-2.21.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="devscripts"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Perl script to check for commonly used bash features not defined by POSIX"
-HOMEPAGE="https://packages.debian.org/devscripts https://salsa.debian.org/debian/devscripts"
-SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
-S="${WORKDIR}/${MY_P}/scripts"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-# Requires python packages to check tools we don't need anyway
-RESTRICT="test"
-
-RDEPEND="dev-lang/perl
-	virtual/perl-Getopt-Long"
-
-src_prepare() {
-	default
-
-	sed "s@###VERSION###@${PV}@" -i checkbashisms.pl || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	newbin ${PN}.pl ${PN}
-	doman ${PN}.1
-}
diff --git a/dev-util/clazy/Manifest b/dev-util/clazy/Manifest
index 052dd4c78fb2..9410668e7c90 100644
--- a/dev-util/clazy/Manifest
+++ b/dev-util/clazy/Manifest
@@ -2,6 +2,6 @@ AUX clazy-1.9-llvm12.patch 3056 BLAKE2B 7c090b17a3a598075fdcaec04df4efc0fb6c2a8d
 AUX clazy-1.9-llvm13.patch 1098 BLAKE2B 6933e7f9e159e4e4d10bcacf67a7f384ca1782d84606e2cde85e4f2bc5007f25e1fef96129de366c9be013ef2f602f7e34a4388576b404c0a913625de99992bf SHA512 a8d4c59236b9329ad1a0db4fc3a21eebc16faa19888c21f6fdf53a3d242dfc955f0902ba95e38f1f0666524d926611b353925e4519e60cca7d6e5d69a3f107f4
 DIST clazy-1.10.tar.xz 398920 BLAKE2B 1cdc160de21363c7dc9c93ea7e780412a4971b18e97c7ec6e06f1c7450c56e0fbbdb7592d6b92ae53e4c161f6d9abca205984f83b68646f04ea11d63e3c45fa6 SHA512 59dd8c6903bcc239dfc356804cab265597a771de3858a6add4877149e0e7875b3c9ddae9aeec889c9102fb9ec6b0125bb8a786344e47872b01ba87425ba021eb
 DIST clazy-1.9.tar.xz 394856 BLAKE2B 641ca46a31475cf7bd03ba921e390cb2712362dc97b960a519e05c47049927f805d3ef6f1c756b96d3483e8f4b75e2dc41a2419a462ed2e45cbd08c88c07f933 SHA512 2e8bec44a027366263de23c50d14192e310fd38fa2b369afb21413da9cb78da9882b2153daf1784c4c9076cc62e2867b5211c75ff9a1eabcb583e405f20f5912
-EBUILD clazy-1.10.ebuild 985 BLAKE2B ac0048fb7c7327c035aa5c4708b5b47084870a7760e14cd5749ca83c2c565f3b891b4eb4ca8111a715b1e397dcea49546524953c619b9bef1c2d9d3c5491920d SHA512 3433fa1a459c0d60a57a460d2d393d75a160f40733c2becb62ce5a40e8d53b1bd881948c50a8dcbe7438100944853a9b3d043950c1fd42ad6adff1f63c3f190c
+EBUILD clazy-1.10.ebuild 984 BLAKE2B 6cde06f05ae2f8d1521d84f925e549c35ee622c941ccf65306dacedf94eea6e1ba0bbb540f5cf1ea07a31cff1bf533f48f58f0933fd112836146261fbbcdab2d SHA512 68d1cf5bb74852ea22466ca36697273bc4d17d574f2b7ca8b83ed1b76b6b10430b0cec046bc23fcf39dff2100e76f63e2514fdc28149a9de494db71882f6b2e3
 EBUILD clazy-1.9.ebuild 1048 BLAKE2B 19aab05c1a0ea51e60164834cd1d18c22537a35224258d5e37bee821b384efa90bbfe98b38362ebed62c667c8ec3e0947cd1ea5ebb2517f1d8ca4f621a135859 SHA512 5a1adc300ca1fd975e07b97b4fb5bce068c2b99afbbdb5701df327060bea1f2afbb77d00bb2ba5d9be795c84641ee235ab076c1a83f1075ad0ecddce260705dd
 MISC metadata.xml 317 BLAKE2B fe6f2d2665436ac520b360fcd1278ef117d274ce4956e1e3e5d8f249fe599b24fa505c80200f8f408cef58034d99fb7df0104cc06fb5e173948617c0cb580270 SHA512 386bdabf344736baac2223bac211d0c08c86c78323ae20be5e8103469576b42ce61336f921f39a7a76693eea22a0ac0bccf0e03b4b3431e003f191be34768369
diff --git a/dev-util/clazy/clazy-1.10.ebuild b/dev-util/clazy/clazy-1.10.ebuild
index a4846ed8082e..7f7ef80b9200 100644
--- a/dev-util/clazy/clazy-1.10.ebuild
+++ b/dev-util/clazy/clazy-1.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 arm64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 242109d41129..1572b4b17304 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -10,9 +10,7 @@ AUX cmake-3.5.2-FindQt4.patch 1585 BLAKE2B 8cfda84c419515be57f65be7b4b22d7937b65
 AUX cmake-3.9.0_rc2-FindPythonInterp.patch 1458 BLAKE2B a70945921738f00952b40a73d9ea26ecc86614aa3f12c94226aac4710dd0b9723c365b6f5def965069a54919bab13a33490facc6c5e64fad69d2e05a97d2812f SHA512 8adcb75cc035f64521e85229eb8dfa1e627326f8e189f66b707b3a0448ed3ae6acf306643026f7cbc7b924edcef73cad7a107d83162b4ca46bd6bbdc7a58af12
 AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b543452dc574e73d1c80167c83eb482d9eec310950ac811ba35d3eeb97b51958f12f3adf575ddbe7 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf
 DIST cmake-3.20.5.tar.gz 9441947 BLAKE2B f073d7c3968c714be315f5014076c785790ed47e9a746f2d16bc59769fb6862009f67c2e118038c6c9d8390b709f2b4ed4a4dfc41a93996fedd9d7d77111b84a SHA512 4ad7f194353be291e76d86d95928633daea653a0bd8d35369ac6ee2bb3f811c3a1aabe6a2bd51c6d5b07af2c6edc7e38d8b347ded32ab1ddcf331dbfce40c008
-DIST cmake-3.21.1.tar.gz 9629567 BLAKE2B 1f33117f6fe3491923d053e4d025741340eff477a7a34ef26a6185d7e8f197d159a4cb45b0d79af3298939f8970c27e663a6011fcf479405d458b294fdf3dd72 SHA512 1453b1f5139950f501c570c305257e4e5dacb8224944de8ed1489aae162c6dd75fe1cd5188d619c47e4e53ca5b846f07318ffb3ab004a0547f2c8b13f60083b4
 DIST cmake-3.21.2.tar.gz 9630492 BLAKE2B 7c73cad02ee9dbadd8cbf60994856ccb6fd3721cbb7a58d66638169cf99426d8ad732de912ee5c736466d64c145a68a102db93cb5d4d0dbde001681edbf7a200 SHA512 75649404564aaa6175a8c66ab19a10318066dbb667806c287e3cb125ac4c16c1629c160e355bcc50864a38d5488b1f7d1bc77acc602f5f3edd5f68691ae5080d
 EBUILD cmake-3.20.5.ebuild 7034 BLAKE2B ec62fb9ae6b4cf3b2e28142a571c217bfed6d9c1489d5d7ced9250690df058ca3ff5dda3b3a59800b770c7afea56b200b309a2bb8eb7763da2fdfc6a45794407 SHA512 1155e55439ff5f46d78e447a74a7f7a5600e8a4eb123f233861675462caeeffbdc1cfa38ea44d5ecb1a77f3db302017c750399f645d78e37adbe9649e8b21978
-EBUILD cmake-3.21.1.ebuild 7042 BLAKE2B b60e9f4a8bcb96c74db8e221b28f49d7a641cbce8ca954af4f2ea93e118c68b6d6028bdab91ea7907cd87238f7d2f85862866f607fa738674315a0d51e069b70 SHA512 b95e61889cf487d3f7977b740a5857f2c4130ae8c843e2b74f38ebede2bcd3f9d9a1fa7311058c65d075eddea128e3390eb55b5f9068a57142c357290413b74f
 EBUILD cmake-3.21.2.ebuild 7042 BLAKE2B b60e9f4a8bcb96c74db8e221b28f49d7a641cbce8ca954af4f2ea93e118c68b6d6028bdab91ea7907cd87238f7d2f85862866f607fa738674315a0d51e069b70 SHA512 b95e61889cf487d3f7977b740a5857f2c4130ae8c843e2b74f38ebede2bcd3f9d9a1fa7311058c65d075eddea128e3390eb55b5f9068a57142c357290413b74f
 MISC metadata.xml 337 BLAKE2B b5072e22c7dbf6ac9047fd7ffca1ae44796f3de7453668e7fb43df54952777fcadca5b17e3b7bf13f4257e4a70043fa204088b471e05251861b8c81233fd05ce SHA512 a6d95246e55fc770db8b00487890dbb34cc9e99688907e4fe2c378756a2f91a00f36be8786611019ada86af2e04bfc109198aedbe70c00268c3a6219fed976b2
diff --git a/dev-util/cmake/cmake-3.21.1.ebuild b/dev-util/cmake/cmake-3.21.1.ebuild
deleted file mode 100644
index b1cc1455ac6c..000000000000
--- a/dev-util/cmake/cmake-3.21.1.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake" # TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja
-CMAKE_REMOVE_MODULES_LIST=( none )
-inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
-	toolchain-funcs virtualx xdg-utils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="https://cmake.org/"
-SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs ncurses qt5 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=app-arch/libarchive-3.3.3:=
-	app-crypt/rhash
-	>=dev-libs/expat-2.0.1
-	>=dev-libs/jsoncpp-1.9.2-r2:0=
-	>=dev-libs/libuv-1.10.0:=
-	>=net-misc/curl-7.21.5[ssl]
-	sys-libs/zlib
-	virtual/pkgconfig
-	emacs? ( >=app-editors/emacs-23.1:* )
-	ncurses? ( sys-libs/ncurses:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? (
-		dev-python/requests
-		dev-python/sphinx
-	)
-	test? ( app-arch/libarchive[zstd] )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-	# prefix
-	"${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
-	"${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
-	"${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch
-
-	# handle gentoo packaging in find modules
-	"${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
-	# Next patch needs to be reworked
-	#"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch
-	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
-	# respect python eclasses
-	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
-	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
-
-	"${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544
-
-	# upstream fixes (can usually be removed with a version bump)
-)
-
-cmake_src_bootstrap() {
-	# disable running of cmake in bootstrap command
-	sed -i \
-		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
-		bootstrap || die "sed failed"
-
-	# execinfo.h on Solaris isn't quite what it is on Darwin
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e 's/execinfo\.h/blablabla.h/' \
-			Source/kwsys/CMakeLists.txt || die
-	fi
-
-	# bootstrap script isn't exactly /bin/sh compatible
-	tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \
-		--prefix="${T}/cmakestrap/" \
-		--parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
-		|| die "Bootstrap failed"
-}
-
-cmake_src_test() {
-	# fix OutDir and SelectLibraryConfigurations tests
-	# these are altered thanks to our eclass
-	sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
-		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
-		|| die
-
-	pushd "${BUILD_DIR}" > /dev/null
-
-	local ctestargs
-	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
-	# Excluded tests:
-	#    BootstrapTest: we actually bootstrap it every time so why test it.
-	#    BundleUtilities: bundle creation broken
-	#    CMakeOnly.AllFindModules: pthread issues
-	#    CTest.updatecvs: fails to commit as root
-	#    Fortran: requires fortran
-	#    RunCMake.CompilerLauncher: also requires fortran
-	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
-	#        debugedit binary is not in the expected location
-	#    RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
-	#        it can't find a deb package that owns libc
-	#    RunCMake.{IncompatibleQt,ObsoleteQtMacros}: Require Qt4
-	#    TestUpload: requires network access
-	"${BUILD_DIR}"/bin/ctest \
-		-j "$(makeopts_jobs)" \
-		--test-load "$(makeopts_loadavg)" \
-		${ctestargs} \
-		-E "(BootstrapTest|BundleUtilities|ConfigSources|CMakeOnly.AllFindModules|CPackComponentsDEB-components-depend2|CompileOptions|CTest.UpdateCVS|DependencyGraph|Fortran|RunCMake.CompilerLauncher|RunCMake.IncompatibleQt|RunCMake.ObsoleteQtMacros|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
-		|| die "Tests failed"
-
-	popd > /dev/null
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# disable Xcode hooks, bug #652134
-		sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \
-			Source/CMakeLists.txt || die
-		sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \
-			-e '/cmGlobalXCodeGenerator.h/d' \
-			Source/cmake.cxx || die
-		# disable isysroot usage with GCC, we've properly instructed
-		# where things are via GCC configuration and ldwrapper
-		sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
-			Modules/Platform/Apple-GNU-*.cmake || die
-		# disable isysroot usage with clang as well
-		sed -i -e '/_SYSROOT_FLAG/d' \
-			Modules/Platform/Apple-Clang.cmake || die
-		# don't set a POSIX standard, system headers don't like that, #757426
-		sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
-			Source/cmLoadCommandCommand.cxx \
-			Source/cmStandardLexer.h \
-			Source/cmSystemTools.cxx \
-			Source/cmTimestamp.cxx
-		sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
-			Source/cmStandardLexer.h
-	fi
-
-	# Add gcc libs to the default link paths
-	sed -i \
-		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
-		-e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
-		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
-		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-	if ! has_version -b \>=${CATEGORY}/${PN}-3.4.0_rc1 || ! cmake --version &>/dev/null ; then
-		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-		cmake_src_bootstrap
-	fi
-}
-
-src_configure() {
-	# Fix linking on Solaris
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
-
-	local mycmakeargs=(
-		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
-		-DCMAKE_DOC_DIR=/share/doc/${PF}
-		-DCMAKE_MAN_DIR=/share/man
-		-DCMAKE_DATA_DIR=/share/${PN}
-		-DSPHINX_MAN=$(usex doc)
-		-DSPHINX_HTML=$(usex doc)
-		-DBUILD_CursesDialog="$(usex ncurses)"
-		-DBUILD_TESTING=$(usex test)
-	)
-	use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON )
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	if use emacs; then
-		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins Auxiliary/vim/syntax/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/indent
-	doins Auxiliary/vim/indent/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/${PN}.vim"
-
-	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
diff --git a/dev-util/cookiecutter/Manifest b/dev-util/cookiecutter/Manifest
index 9ba16ef03eff..e6ff80eae204 100644
--- a/dev-util/cookiecutter/Manifest
+++ b/dev-util/cookiecutter/Manifest
@@ -3,5 +3,5 @@ DIST cookiecutter-1.7.2.tar.gz 253484 BLAKE2B de1c773cd5e53532edc7af7aaeac6061b1
 DIST cookiecutter-1.7.3.tar.gz 253444 BLAKE2B 92ae74768c909ab8e2ae97ad87921ae0cbf24c417ab6985ac10eacd913981ee7756843e2588936174d3c04ecfa7a62077a6d4a323fdfa6d1872f3c84d943cbcb SHA512 a7dd7993ba40a084a719d553afbb8035f26976f38a3e8ee373c8074db64eac6bd7b711eca8cedbfd1050fc057a0b45409af4d59ff3bde57b344317dbee56f10b
 EBUILD cookiecutter-1.7.2-r1.ebuild 1301 BLAKE2B 49b746a2ea6120a7dd3cb451fefcc9db8a6240ad1604876c435a8bf9dbae4a72b12995584132b46465a25c01a7a2d8f7fde98e123f71e0971bb06754830aed59 SHA512 5716f7cf06d42e181695680e7a09779d9f1876f02f8fee0e0bb116f6d255bfde5c2bd7e1efd591d2ae8d27c579c2f875b32bb0fbf8599117925e8ff446aa2dee
 EBUILD cookiecutter-1.7.2.ebuild 1288 BLAKE2B 0b17d7cbc3ba94efed52318ffaf68e65f643e28bcbb232c963b9e7be48bfcde474f2c5c569d07964e374a56456376ff6435b6894aedb40f87d18d633d0ba8ba2 SHA512 1a331f871659bebfc8999556fb49d4098b1929404ed845fd4368db1f5b9c6652fe094071aca6dfcbe03fbf17f8ec318ba329ec3352788691b62134bcbf1086b1
-EBUILD cookiecutter-1.7.3.ebuild 1258 BLAKE2B cae8acdb517a564f9680dc39f9c0ae4fe48a7e1eb6012fe2840f19a90698d3ded2995487c192c4ebd38f6cba9840e6006e9c3d5b7e8a402dd8c34be545e8b14e SHA512 f9c5a307065e12af8df01d6d9f5b0adcf7acf5331525a929b6ae6f507a5fcea94afaa9b52a383b4bb1cd64c1f0a1824db91ab5ff12e6b4e74dfb757f8a48a48c
+EBUILD cookiecutter-1.7.3.ebuild 1256 BLAKE2B 22d1054eed5f8f4e215a8267f47ff5cac2930c6f2a4daeb1aaa11772c14d7786033ed260634291302e304d13d335b490e03d141c32e6d212b61c9a55d821aa61 SHA512 badb2a112429300aa4a2a1478ab0cdfae028465a42176cee412bf23dbb365c9fa8de13c00772f0ad82f6f6690d8ad0fe98e3df0fb5f90feba411e4d075d36a04
 MISC metadata.xml 448 BLAKE2B 8b1da3b9426a697368f2fe27dc7f703be31f91a56e22cb481ac9d9bfe3825e0f903fc2b090893ee3c198aefa40f329bb520c15392ca853c58f007c2cc8b19bf1 SHA512 678abf4897103b1da004221ab3d7b4ae2c29c5f89a580b9a869ab547ca49eaccee175aadaa57677d5ced915f32755bf3c88226cf07c2ffebca65bd54398127b7
diff --git a/dev-util/cookiecutter/cookiecutter-1.7.3.ebuild b/dev-util/cookiecutter/cookiecutter-1.7.3.ebuild
index 8f17c7650bd6..88fe924e6df3 100644
--- a/dev-util/cookiecutter/cookiecutter-1.7.3.ebuild
+++ b/dev-util/cookiecutter/cookiecutter-1.7.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/cookiecutter/cookiecutter/archive/${PV}.tar.gz -> ${
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/binaryornot-0.4.4[${PYTHON_USEDEP}]
diff --git a/dev-util/cppunit/Manifest b/dev-util/cppunit/Manifest
index b95a0828dba2..f80e000b3ba1 100644
--- a/dev-util/cppunit/Manifest
+++ b/dev-util/cppunit/Manifest
@@ -1,6 +1,4 @@
-DIST cppunit-1.14.0.tar.gz 959716 BLAKE2B 581e3b73d6d152c249005ddf267100443e6c9cba12c52c43e9d6f81096b9cd13c3686fa2f73ebaf28c31193e41dbfd5d919dfb0143b190881345da65a5b7f86d SHA512 4ea1da423c6f7ab37e4144689f593396829ce74d43872d6b10709c1ad5fbda4ee945842f7e9803592520ef81ac713e95a3fe130295bf048cd32a605d1959882e
 DIST cppunit-1.15.1.tar.gz 814363 BLAKE2B a1d1d1ee9b6ef408843a6e989a37653944ad85069b4896f18d0f01410acebf7342f70e8c031e58f7ad0e686a85869d521906816e0f0b1762d238efb606cb7310 SHA512 0feb47faec451357bb4c4e287efa17bb60fd3ad966d5350e9f25b414aaab79e94921024b0c0497672f8d3eeb22a599213d2d71d9e1d28b243b3e37f3a9a43691
-EBUILD cppunit-1.14.0.ebuild 1693 BLAKE2B 83a201e91d37b031e7fc0763a31df8da568aff53d1f2e6c7d678d44582c6ffacab63d998bbcabb5fd9edff7bf005b40387bfba3f97573f53c6e9d99051133144 SHA512 aac5f7f4f969a4a7511f9f338c0948a8b454f9f6691d34f3ae0f5d90ab6ba0c29257be0e206ca6740323c41b5a5c3deea56e360ab3af1f195127a7001eb37322
 EBUILD cppunit-1.15.1-r2.ebuild 1659 BLAKE2B 267535123db135043b5a74bae59ccee1428625ca3040527fd607f97e709350d8f58f947cef55b9604a9e47a312df2cafa8e903b6a6915db261995cda4f9dbeb6 SHA512 662b8bd560d7040ae6a0752be6cdbbc6849ab116498baed1d913217e232dc4197f8d28117835b06c687716a5c142d3b4a8cfcff1759156648c0621e8752bb70d
-EBUILD cppunit-9999.ebuild 1654 BLAKE2B 8357d827f94727e3074f5933a97f64b129710fa77033848fe72dd1e8589d545f381989515805861bd53e988fcd227e8a7cc61adb54b965bce1ea8c8aa991e533 SHA512 63b847b7125ae2e2540879ae4e685b337320260883e27b49f3837c83381ca38450fdfb31d70bc05093ad4aaf7939b25a46ab5db25ec599475d4684973ef5c04f
+EBUILD cppunit-1.15.1-r3.ebuild 1343 BLAKE2B 401e1705db024dc09bc87b987ba42c17d8f553f65d883aa2bcd4cc1314e7bebb2bf1ccafd02affea9b2f8a5ac251da6ab45de9db62178ff1bad196f4bc41acbd SHA512 0304b185747ca190fced8c531838ff3ebd240b764ca561b0762e2c7e128c05fe68aa5b340dbd107ac2eb7f17223edd543cdba71cac8c5249ca24e1bb6e7603c9
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/cppunit/cppunit-1.14.0.ebuild b/dev-util/cppunit/cppunit-1.14.0.ebuild
deleted file mode 100644
index f8d6b23177e3..000000000000
--- a/dev-util/cppunit/cppunit-1.14.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/cppunit.git"
-[[ ${PV} = 9999 ]] && inherit git-r3 autotools
-inherit flag-o-matic multilib-minimal
-
-DESCRIPTION="C++ port of the famous JUnit framework for unit testing"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/cppunit"
-[[ ${PV} = 9999 ]] || SRC_URI="https://dev-www.libreoffice.org/src/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ ${PV} = 9999 ]] || \
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="doc examples static-libs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen[dot]
-		media-gfx/graphviz
-	)
-"
-
-DOCS=( AUTHORS BUGS NEWS README THANKS TODO doc/FAQ )
-[[ ${PV} = 9999 ]] || DOCS+=( ChangeLog )
-
-src_prepare() {
-	default
-	[[ ${PV} = 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	# Anything else than -O0 breaks on alpha
-	use alpha && replace-flags "-O?" -O0
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_enable doc doxygen) \
-		$(multilib_native_use_enable doc dot) \
-		--disable-werror
-}
-
-multilib_src_install_all() {
-	if use doc; then
-		mv "${ED%/}"/usr/share/${PN}/html "${ED%/}"/usr/share/doc/${PF} || die
-		rm -r "${ED%/}"/usr/share/${PN} || die
-	fi
-	einstalldocs
-
-	find "${D}" -name '*.la' -delete || die
-
-	if use examples ; then
-		find examples -iname "*.o" -delete
-		insinto /usr/share/${PN}
-		doins -r examples
-	fi
-}
diff --git a/dev-util/cppunit/cppunit-9999.ebuild b/dev-util/cppunit/cppunit-1.15.1-r3.ebuild
index a03be99e2df6..8a942d3911d2 100644
--- a/dev-util/cppunit/cppunit-9999.ebuild
+++ b/dev-util/cppunit/cppunit-1.15.1-r3.ebuild
@@ -1,25 +1,20 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit flag-o-matic multilib-minimal
 
 DESCRIPTION="C++ port of the famous JUnit framework for unit testing"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/cppunit"
-if [[ "${PV}" == *9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/cppunit.git"
-else
-	SRC_URI="https://dev-www.libreoffice.org/src/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-fi
+
+SRC_URI="https://dev-www.libreoffice.org/src/${P}.tar.gz"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
 LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="doc examples static-libs"
+SLOT="0/1.15"
+IUSE="doc examples"
 
-RDEPEND=""
-DEPEND="${RDEPEND}"
 BDEPEND="
 	doc? (
 		app-doc/doxygen[dot]
@@ -27,13 +22,7 @@ BDEPEND="
 	)
 "
 
-DOCS=( AUTHORS BUGS NEWS README THANKS TODO doc/FAQ )
-[[ "${PV}" == 9999 ]] || DOCS+=( ChangeLog )
-
-src_prepare() {
-	default
-	[[ "${PV}" == 9999 ]] && eautoreconf
-}
+DOCS=( AUTHORS BUGS NEWS README THANKS TODO ChangeLog doc/FAQ )
 
 src_configure() {
 	# Anything else than -O0 breaks on alpha
@@ -47,7 +36,6 @@ multilib_src_configure() {
 		--disable-werror
 		$(multilib_native_use_enable doc dot)
 		$(multilib_native_use_enable doc doxygen)
-		$(use_enable static-libs static)
 	)
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
diff --git a/dev-util/desktop-file-utils/Manifest b/dev-util/desktop-file-utils/Manifest
index b9485452f891..debc2bdfdf64 100644
--- a/dev-util/desktop-file-utils/Manifest
+++ b/dev-util/desktop-file-utils/Manifest
@@ -1,6 +1,4 @@
 AUX 50desktop-file-utils-gentoo.el 250 BLAKE2B 6778fd6faecc6afe376598cdab5d890364edc33f0a55983b9a1ae76bcaf78a784fae92eaa66dc24c270ecf160f747e848872fa17e9c331dce7ad2deb498492b1 SHA512 5fc03fb9c9eea7d4c19c9b263413fb4f7f247b6bd40a7452b26f7e175646dc9b3af945d25cafc42a01a8d95059324652c56baa4bb5768b62dbd58f3ae4f05fe3
-DIST desktop-file-utils-0.24.tar.xz 137424 BLAKE2B 3cce27caa14782ef10886fdc0602c0378c1bad0d49a4b99077436a9951f13ccdb539fdc2b9d27b54430fce94fb0ee0268746b216cc5d6c1b9ba517e1af81b4ce SHA512 b19d700d4403c8757c62e49bb7650e0138a85e799f79de07b0d0099a52398a3ead90c8125ccc883df6e2a3f8f5f97696009ebb7452dc7acc25afeef20e06fde0
 DIST desktop-file-utils-0.26.tar.xz 83132 BLAKE2B fdbe5427a0278ebe4a9b1bc15a148ecdc3f54b54058b355ae4f9a962fb1c4ec309d24a075973caf8f187a1c74b013e9bed0a7c3668bf888274e77fac9e077ec8 SHA512 5b4e435f0b635d8f898ac7f5759f74a08ffbe2a56d41fee0e84ff57e73b98d08b57b4416f20b99f696dad8bcb1c20792b39acf836b0814220c0b386ea5f6b831
-EBUILD desktop-file-utils-0.24.ebuild 1277 BLAKE2B b47d28084695f6b29453122e8af7fe4aae1d317e53446443d6f3b466d47afc5b8e039373027aa10a6a89dab5a693891dafdc2129bfcd9b41641c072be62ad5fd SHA512 72ad05b3e9a7c951b35cf3836a61f5faec067ce8bc57c1160bf6f818abc3eb3bc6dc92edb02f9e18e28d8666dd9ee5cf4b76b3ec8719948c1fc82267ba614f80
 EBUILD desktop-file-utils-0.26-r1.ebuild 1156 BLAKE2B 27d6d824066935cec46224abf0e2dc322c6e7a0eca12653fec7c298cdc099b062bd6fb333484484156b30f1cd0b7f76b56c8c7903904eb1a299428bf5626a889 SHA512 a0a77cbf6c9470fcec03fc235f95a96d414d5ca68ce3bd3381267d7e2ac463fc8f9683f1afae34c6ef6e757f9b85fbf57c5fe80b4a230baef4aaca39c5b8eba0
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.24.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.24.ebuild
deleted file mode 100644
index c9c70c4e60d2..000000000000
--- a/dev-util/desktop-file-utils/desktop-file-utils-0.24.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit elisp-common
-
-DESCRIPTION="Command line utilities to work with desktop menu entries"
-HOMEPAGE="https://freedesktop.org/wiki/Software/desktop-file-utils"
-SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="emacs"
-
-RDEPEND=">=dev-libs/glib-2.12:2
-	emacs? ( >=app-editors/emacs-23.1:* )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/xz-utils
-	virtual/pkgconfig
-"
-
-SITEFILE=50${PN}-gentoo.el
-
-DOCS=( AUTHORS ChangeLog HACKING NEWS README )
-
-src_prepare() {
-	default
-	sed -i -e '/SUBDIRS =/s:misc::' Makefile.in || die
-}
-
-src_configure() {
-	econf "$(use_with emacs lispdir "${SITELISP}"/${PN})"
-}
-
-src_compile() {
-	default
-	use emacs && elisp-compile misc/desktop-entry-mode.el
-}
-
-src_install() {
-	default
-	if use emacs; then
-		elisp-install ${PN} misc/*.el misc/*.elc || die
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/dialog/Manifest b/dev-util/dialog/Manifest
index 58f35620d2d5..2a2e23f23a73 100644
--- a/dev-util/dialog/Manifest
+++ b/dev-util/dialog/Manifest
@@ -1,7 +1,3 @@
-DIST dialog-1.3-20200327.tar.gz 547962 BLAKE2B b335d8b57d9a9f3a7e303aa3b2c64736007b66618a79c79368d9dba20a8123813cdeb7d0643bf7c6d147314963ff469b6e41d2378fe9181081fa543f0aca50f2 SHA512 c8c7ccd86fa189a2b6739320f59f127512e53f908ed257280099f8c45754da98d2095835d0c14090cd071af0ed6e8ff95f9938f5ca8027b0b7001c7fd746fe59
-DIST dialog-1.3-20210530.tgz 562950 BLAKE2B 2aa33c4e2568f91a08d173c3a02d0d64f3b02127e70fc942fa76904fda9bd929fcb19b5254874199fc00e873e7dfb18365beba04350e80939bea5d75d8df8438 SHA512 8f39cfa5f3ba70795927c261861bc55bde668d68d3b45559542cf980e1cfabefb3d1ebabc91715e29a4a9ffca5cdb6affa640ed155539692c868942f6014e7e0
 DIST dialog-1.3-20210621.tgz 563430 BLAKE2B 8ffb630ed67f303facd79ca72aaca89d32c55a2b504293105a72c596409828fffd3e5e5f603fb5bec7f8748358a03ddadc7f1cd6fb989d1b31af1fd8f1078d97 SHA512 bde13aaf215127d143aa0d37989e0bacb6bc23f007681aeff27683efa01a483106710ff756358e396c23e4c1f0355cd8a2b3bb362ae1c3a1a997e00835d53c2b
-EBUILD dialog-1.3.20200327-r1.ebuild 1183 BLAKE2B 1d0444786f3f407017ccffcf3b44bef2bd72ae9aaa8a318ebc8c875efb02e2ef2140582b61b9c4c499e2fd02d6aa1713208a61818f812a054257473e2a70303d SHA512 0360d757aafb6df51c48171b198b9a4be9e693b6faa88a9a587141e9a879a2d63d0e7436008022eb213ecb85cc7f6afa11c07957c4689bd9cc98467bbd292fbd
-EBUILD dialog-1.3.20210530-r1.ebuild 1288 BLAKE2B cac0fb5481a56a82bfc72811b63044cd0c79d2dfcdc0dfa2371e34af141076dfb4a06618229897924c6b8d971ead2ffb0634bb2385a3e24cd28c1420f5de67c6 SHA512 054319ff13d7bf219700d700456ed1b2120a6d2abaababd45ab481c68213db55d241cbd935c75ff7cb7677d0e46d9ec426839e651e65b463ee8ce5008eddadd5
 EBUILD dialog-1.3.20210621-r1.ebuild 1281 BLAKE2B 8a61eabdbfcbbc3459b9cf2d5b7bcd9efa4b043f9435cb7328e56487b432915af61163e44cb6283b7e19de230fb00cea34228e7bced62c1a5b9809dfca63d2be SHA512 9012faba9de2703ea8f0b1418b81e76498d407edeeef5810c9d57894022dd5e1f082695f2824b717b378cd3e12880cf7e8a60af3c2a1b9d306009dd68a520b28
 MISC metadata.xml 460 BLAKE2B 2a2b2180cab325004ef2543c1e4cde0d98ce338beaad156c6b114f0ef49b3d726ad8f85974a681b596e8c68dd2433aae64ce38d8b47e0d52441bc1581bc35149 SHA512 f1c8215f8865105bba71efe5516742f694988b4421a3ea3ec07569f5e40cb50caddfe478c2bd5bae1b0579316fb7fc3ae361d19c3b33c6572e31239d927b3fc6
diff --git a/dev-util/dialog/dialog-1.3.20200327-r1.ebuild b/dev-util/dialog/dialog-1.3.20200327-r1.ebuild
deleted file mode 100644
index 4ad9c4b2c30e..000000000000
--- a/dev-util/dialog/dialog-1.3.20200327-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIA_P=${PN}-$(ver_cut 1-2)-$(ver_cut 3)
-DESCRIPTION="tool to display dialog boxes from a shell"
-HOMEPAGE="https://invisible-island.net/dialog/"
-SRC_URI="https://dev.gentoo.org/~jer/${DIA_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/15"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="examples minimal nls static-libs unicode"
-
-RDEPEND="
-	>=sys-libs/ncurses-5.2-r5:=[unicode(+)?]
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-	!minimal? ( sys-devel/libtool )
-"
-S=${WORKDIR}/${DIA_P}
-
-src_prepare() {
-	default
-	sed -i -e '/LIB_CREATE=/s:${CC}:& ${LDFLAGS}:g' configure || die
-	sed -i '/$(LIBTOOL_COMPILE)/s:$: $(LIBTOOL_OPTS):' makefile.in || die
-}
-
-src_configure() {
-	econf \
-		--disable-rpath-hack \
-		$(use_enable nls) \
-		$(use_with !minimal libtool) \
-		--with-libtool-opts=$(usex static-libs '' '-shared') \
-		--with-ncurses$(usex unicode w '')
-}
-
-src_install() {
-	use minimal && default || emake DESTDIR="${D}" install-full
-
-	use examples && dodoc -r samples
-
-	dodoc CHANGES README
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-util/dialog/dialog-1.3.20210530-r1.ebuild b/dev-util/dialog/dialog-1.3.20210530-r1.ebuild
deleted file mode 100644
index d9eb069d20c7..000000000000
--- a/dev-util/dialog/dialog-1.3.20210530-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P=${PN}-$(ver_rs 2 -)
-
-DESCRIPTION="Tool to display dialog boxes from a shell"
-HOMEPAGE="https://invisible-island.net/dialog/"
-SRC_URI="https://invisible-mirror.net/archives/dialog/${MY_P}.tgz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0/15"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="examples minimal nls unicode"
-
-RDEPEND=">=sys-libs/ncurses-5.2-r5:=[unicode(+)?]"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-BDEPEND="!minimal? ( sys-devel/libtool )
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	sed -i -e '/LIB_CREATE=/s:${CC}:& ${LDFLAGS}:g' configure || die
-	sed -i '/$(LIBTOOL_COMPILE)/s:$: $(LIBTOOL_OPTS):' makefile.in || die
-}
-
-src_configure() {
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		export ac_cv_prog_LIBTOOL=glibtool
-	fi
-
-	econf \
-		--disable-rpath-hack \
-		--with-pkg-config \
-		$(use_enable nls) \
-		$(use_with !minimal libtool) \
-		--with-libtool-opts='-shared' \
-		--with-ncurses$(usex unicode w '')
-}
-
-src_install() {
-	use minimal && default || emake DESTDIR="${D}" install-full
-
-	use examples && dodoc -r samples
-
-	dodoc CHANGES README
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index f1dad650c476..21bd1e3dc5ac 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -1,8 +1,10 @@
 DIST glslang-10.11.0.0_pre20201216.tar.gz 3290064 BLAKE2B 46ce951ab6c69eb25dc2490e3eb817c5cc0e2bf2416f29842b45bb1efb83ea439d72c823c981e2f37803e203077ea01d1c84c28391fb78288c107510a47d2241 SHA512 4b9e300152dc2ec3b14657b3a745d5b26b5da49e5ff3da0d75680f84126237ec6af0f7cee5aaa74b2d4a123a386522cd7342b5f25e4c01f114da3d5d92057128
 DIST glslang-11.2.0.tar.gz 3295235 BLAKE2B 42417f3be070a57f0c71f5a0c81ffcf4938044c74fd59435fad6889b74c077032fda18e73971db41b180341c1eb6bcdc24081d5ff57fb9baf36c32fbfac9e67a SHA512 0d6cd866c4e28069dbc2c5f0ceba2acab73356751499f8fe81177357c61b2bdae92d2502c47889687d57094dd9fd59b78a06234de1d9c4989a204f9ce3c73751
 DIST glslang-11.4.0.tar.gz 3342311 BLAKE2B 880f2c5bc2afe5c28b4c9246faed5a12492e24d1f3d75a0df036457ed7767541a18757d368e2298dd7e8e4f8ca9a2a168973274ea6364453130b2928bce4d991 SHA512 e507ff5420a192133dd25b3f1d18dfa4a20c7fff9908e58bad5a7ddf8119989977c2a180575cc24b3434cab4a7cc7559a3254676f6298c0fa3b82dc9e802e1f5
+DIST glslang-11.6.0.tar.gz 3419655 BLAKE2B fb510b0e6e5986da117fb3d1ea7f1c543c5ace7053693b813c16c038c980f1123bdc6936dce67e313a401012753cbb900b8760282b80e9257d981f7325ec3d91 SHA512 f7c1affdb4923758f9ff5cae894c40ca86e723850a6265d9c13f996311451bd84c70a178d8d6c0961dcee39c19d724f02d19a21ee6f67f1bb4cdbc618fdc12cf
 EBUILD glslang-10.11.0.0_pre20201216.ebuild 890 BLAKE2B d2ae97e1228f30154c2e0674284aeee59943c6b97c619a594106e0765353c14a58e5a03ab03a024a934ccd6b6d66091764af9ad181dc79f577a495037415ef77 SHA512 889bd334d5a13e3ad22e97de659687bdcdc575f30cb45e21a4c253e469181008a5fdb05ef6ca5a21dc03ae22ef3ebbcf88ac8d09941c1d7ce0442942d826f5a0
 EBUILD glslang-11.2.0.ebuild 855 BLAKE2B 76f4c363a7ef228854cd948e1017f92c5cda2bca6240a4e011745775981a35266e06a84d9aa77092d111b4685218027facdf7390a020f1bfb074598ce5529ea7 SHA512 c6032b4b76e3cdcb80ff17e7c6dacc1df7930fc58869a6a48df3132665f4ad6661cf3b726f70ad2b5ee660331f90daa1607285aec6dbabcaa063e3b41d963f5f
 EBUILD glslang-11.4.0.ebuild 855 BLAKE2B 76f4c363a7ef228854cd948e1017f92c5cda2bca6240a4e011745775981a35266e06a84d9aa77092d111b4685218027facdf7390a020f1bfb074598ce5529ea7 SHA512 c6032b4b76e3cdcb80ff17e7c6dacc1df7930fc58869a6a48df3132665f4ad6661cf3b726f70ad2b5ee660331f90daa1607285aec6dbabcaa063e3b41d963f5f
+EBUILD glslang-11.6.0.ebuild 861 BLAKE2B bffd4abe4cf2742a3b4b69c8462175a09dca24545000686ef3fd3a5620abf5aa2af5648b0bfadd90871674b3b21534eb3b8f777306c657e56da3b95edfad50ad SHA512 96086d4cade525c556c58b6c869fae8c14dc8d2096b792cc028e989ad65fa5e7a9ca66cad22d01c708abeee810575924c49748b1b27ea18b5ce6d8c686a749fd
 EBUILD glslang-9999.ebuild 758 BLAKE2B 802d3dec30280cea4dc1c5b8dc652495537f93ef3b52c7d60740d8f9d6ea1343f22b0f0f4b6bc127eb3bca925daf6b1837a1763416cb27489e6db07173aec4ca SHA512 c8db05953380d7c0709e25a9507d5f043a05da423d9e119ae09ef00e5afae939c209b078a0b6da9d6072f07d04c3c20fd9d3827f6fdd71c793ea21036d4e03a6
 MISC metadata.xml 329 BLAKE2B 6238c1e548b8044e1112033dc166f06d7690d05bbdd006670f2151f28640a2c96d9d7fe4d8e6eeb6beb1bd6248cf177315e5cff314593718d838c91a81c02832 SHA512 6242378037de440c8e216330d6f2861ed3d473a0dfe55b9df1234c0956365d3206c1951034b9b2ee31702f741483f4fa113d801c6b1fdece9aad468021202326
diff --git a/dev-util/glslang/glslang-11.6.0.ebuild b/dev-util/glslang/glslang-11.6.0.ebuild
new file mode 100644
index 000000000000..2fe500d17138
--- /dev/null
+++ b/dev-util/glslang/glslang-11.6.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS="cmake"
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${PN}.git"
+	inherit git-r3
+else
+	SNAPSHOT_COMMIT="${PV}"
+	SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}"
+fi
+
+DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
+HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang"
+
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND="!<media-libs/shaderc-2020.1"
+BDEPEND="${PYTHON_DEPS}"
+
+# Bug 698850
+RESTRICT="test"
diff --git a/dev-util/heaptrack/Manifest b/dev-util/heaptrack/Manifest
index d58e7090e6c6..0fff0803ff64 100644
--- a/dev-util/heaptrack/Manifest
+++ b/dev-util/heaptrack/Manifest
@@ -1,2 +1,2 @@
-EBUILD heaptrack-9999.ebuild 1295 BLAKE2B 700d336e4bf13b2149d6a919d847632a4e2e9981ea40d0cc2c271223ecd7b888f1df7df26a09f42d6582a97a8d69346b699f737016c392fe20dd77dadf1f328e SHA512 1ee5c61bd545dfdbb9a98063e7c31d4a59366175d36386b1fc2e84526e421ca8ad792662eac3b0fa70d7f8d5ff759392ff14fab5753ee6bfe342f50593e64a09
+EBUILD heaptrack-9999.ebuild 1394 BLAKE2B 4fdc890f870682587d82934bf1971f65b0dc1b866435bf4b9d270790522259a0e4782e26f996c40eda40c039c5101543cc9ac5fcec52edeb27cd0e330ba4ead8 SHA512 b7ed8b66849601b1dd04129dac0bfd40a40355c2fcf553c7d915bccd9c098de1ec54025acb88f744962720f6c88a1f8433d0d6127a0dd548692f08057211fc64
 MISC metadata.xml 394 BLAKE2B 614051906b91544c8562f3779ce4e05d9eebb8cc36c127589787c250a6a25290819162613de570ec6ad3f6ad77e46fd39d6b279c834aed3b03bc793ea8da17e2 SHA512 173a7025f2cc59dbfa17f8c4e3750f0f6bcfa3d1837f2279dc0d5741fd7a580a83205aa49a52af593e13acd79c729dfcf6d13293e44203a1e0d9646c73abe7ad
diff --git a/dev-util/heaptrack/heaptrack-9999.ebuild b/dev-util/heaptrack/heaptrack-9999.ebuild
index 626643eac8ca..cb0a7bdb8024 100644
--- a/dev-util/heaptrack/heaptrack-9999.ebuild
+++ b/dev-util/heaptrack/heaptrack-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit cmake kde.org xdg-utils
+inherit cmake desktop kde.org xdg-utils
 
 DESCRIPTION="Fast heap memory profiler"
-HOMEPAGE="https://apps.kde.org/en/heaptrack
+HOMEPAGE="https://apps.kde.org/heaptrack/
 https://milianw.de/blog/heaptrack-a-heap-memory-profiler-for-linux"
 
 LICENSE="LGPL-2.1+"
@@ -14,12 +14,11 @@ SLOT="0"
 KEYWORDS=""
 IUSE="+gui test zstd"
 
-BDEPEND="
-	gui? ( kde-frameworks/extra-cmake-modules:5 )
-"
+RESTRICT="!test? ( test )"
+
 DEPEND="
-	dev-libs/boost:=
-	sys-libs/libunwind
+	dev-libs/boost:=[zstd?]
+	sys-libs/libunwind:=
 	sys-libs/zlib
 	gui? (
 		dev-libs/kdiagram:5
@@ -40,26 +39,32 @@ DEPEND="
 RDEPEND="${DEPEND}
 	gui? ( >=kde-frameworks/kf-env-4 )
 "
+BDEPEND="
+	gui? ( kde-frameworks/extra-cmake-modules:5 )
+"
 
-RESTRICT+=" !test? ( test )"
+src_prepare() {
+	cmake_src_prepare
+	rm -rf 3rdparty/boost-zstd || die # ensure no bundling
+}
 
 src_configure() {
 	local mycmakeargs=(
 		-DHEAPTRACK_BUILD_GUI=$(usex gui)
 		-DBUILD_TESTING=$(usex test)
-		$(cmake_use_find_package zstd Zstd)
+		$(cmake_use_find_package zstd ZSTD)
 	)
 	cmake_src_configure
 }
 
-xdg_pkg_postinst() {
+pkg_postinst() {
 	if use gui; then
 		xdg_desktop_database_update
 		xdg_icon_cache_update
 	fi
 }
 
-xdg_pkg_postrm() {
+pkg_postrm() {
 	if use gui; then
 		xdg_desktop_database_update
 		xdg_icon_cache_update
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index fe58e338996f..ed7a88125df8 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -7,7 +7,7 @@ DIST llvmorg-13.0.0-rc2.tar.gz 147267736 BLAKE2B 153bf7320f2aa911112d366ffc79f71
 EBUILD lldb-10.0.1.ebuild 2324 BLAKE2B a09d486d0feab20c3bee3a61d2e7443883624bfd51f0a27079163092a38dc69f52d0f2ecbc65bd88c5f6a5eed8e07b8c823f19d231498ead36f4ab70958bf231 SHA512 05248c1d41f860dac014d40f8330ca85bcd3085198652d5c6b011b71ae03311336f5f7cd68b49cb22e325ea1d9043261cbc99727a08a10317b39d7cdae97d5d1
 EBUILD lldb-11.1.0.ebuild 2343 BLAKE2B 7ac5a408af2ac8e74f9ca3bc7e8ea636e394a325cd2dfdeaa5c5521b7a6d7b97ad846514fd131c5d432fe92ba3373c6ce546a999862dfbc63eba361cab63d0b2 SHA512 52ad596b0264f162667ddf3357fbb3a06c4976e9af0451fc999fe27e84ce36cf08336edbec49581248bf3865ca6432770b0202aedfcb0bb3d87dff090c3bcabb
 EBUILD lldb-12.0.0.ebuild 2415 BLAKE2B 72591b9369461530face31022adfedb46c27e973a05c19c55dc33c580fda116b1e8f22df0b760cbdffafc60ccee438009c7bb1175fcbfd15cb9f55c0084c34f1 SHA512 abce2969538626084d680561ca85ece8fdb999fdf9ad41487e60f6fad62bd628ccebee369b56d394588403f7a6c3a2911ac4f699d0c51b284a6ffcbcd22dff22
-EBUILD lldb-12.0.1.ebuild 2419 BLAKE2B c8d6d0c375f9a127d9c0f5772cffcf2fae7a2c964de780af241d19733efbf32d6a7c25b200fc78942491022e7cedd17a0ac22942a64b86e0e319dde9b677b0d5 SHA512 63c7aec510f7106f1b327ff00f2a8feb8b450578b47e39e6de674bcb8649afc8be7fa1f3374be0041793e070170a60d82effd98ae86d3a28f2342c68a813b245
+EBUILD lldb-12.0.1.ebuild 2418 BLAKE2B cb2e31f514ffaedf8d1093f6d2c219beed1a23ea8c3b6926b6782ce191fb89cfcd1e1c65d03cb23de234a44207abe8b3dd8c01c6c1fa23a53fcfe2a5d78345ed SHA512 979b032fe0e5e8eac7c1236bde7afacd96b971e22a8b70896ad225a1a4e5e5fcf01b8471fbd462389b3ad4f90dccae819d4418cea5374ceaf11ec9368198695b
 EBUILD lldb-13.0.0.9999.ebuild 2410 BLAKE2B 1948b5d98c01e131f638999d8f0f48e1f1c44171f5530a64d60e7e6cacdd72ab5b3d1265e62287080f4be0f321d6184e2d4e37cf5f997949666f1f3f82ff8494 SHA512 5908258ad5a3109761ab79ea67c66600b37e94a305283957a752bb26185acfda67c70435f23d8a9475f65c155a40738e9fd56beef57aaf655b3c91d312cd6fc6
 EBUILD lldb-13.0.0_rc1.ebuild 2410 BLAKE2B 1948b5d98c01e131f638999d8f0f48e1f1c44171f5530a64d60e7e6cacdd72ab5b3d1265e62287080f4be0f321d6184e2d4e37cf5f997949666f1f3f82ff8494 SHA512 5908258ad5a3109761ab79ea67c66600b37e94a305283957a752bb26185acfda67c70435f23d8a9475f65c155a40738e9fd56beef57aaf655b3c91d312cd6fc6
 EBUILD lldb-13.0.0_rc2.ebuild 2410 BLAKE2B 1948b5d98c01e131f638999d8f0f48e1f1c44171f5530a64d60e7e6cacdd72ab5b3d1265e62287080f4be0f321d6184e2d4e37cf5f997949666f1f3f82ff8494 SHA512 5908258ad5a3109761ab79ea67c66600b37e94a305283957a752bb26185acfda67c70435f23d8a9475f65c155a40738e9fd56beef57aaf655b3c91d312cd6fc6
diff --git a/dev-util/lldb/lldb-12.0.1.ebuild b/dev-util/lldb/lldb-12.0.1.ebuild
index cd5fc846aee8..12033224b6a0 100644
--- a/dev-util/lldb/lldb-12.0.1.ebuild
+++ b/dev-util/lldb/lldb-12.0.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~x86"
 IUSE="+libedit lzma ncurses +python test"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RESTRICT="test"
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index 169ea8efc087..b921faa65e1a 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -5,10 +5,12 @@ DIST cuda_11.2.2_460.32.03_linux.run 3057439068 BLAKE2B c3f3cd9eaaa4f91eb8080e7c
 DIST cuda_11.3.1_465.19.01_linux.run 3158494112 BLAKE2B 0316c6a9bf062f2503c94604b51dea9a8d19c516e304e43ccdbc79f305a242664b7f029f7b7086edd7adc37d92a3bae074f005b3be412e1361917794cb824686 SHA512 e2db8b4dcb5f6aee2c3e8a8a6848186cdcdd7cd9d5f4bfd069bd3dc2ea500797c66a4592f0e28dcbee6c3611d1f88b6fda6afcd734aa9ef45f4aa17a1527aedb
 DIST cuda_11.4.0_470.42.01_linux.run 3773273383 BLAKE2B 2e466728b6ca9d17dc3caadce13b58c8ba1464c2adeb09739f428aea96f5794c87bf84ca2b81c1019d45223ff5e519503d798032a800a370c7e41517d790f5c4 SHA512 17165102e7f64da77588fd47feeee5ce3f3151a2b482bdc005427ad77ada5d0ff5a51dcd40a27a467cd5988968469476ba90b0191aed993806d284833a08ccb1
 DIST cuda_11.4.1_470.57.02_linux.run 3796641626 BLAKE2B da6a454bb1765833af8c01f2106a1e0f3e33a6a91354a527006fd0335655872b499bb51662c8e224437368ee37c3bf15f0cf0c4bccc02750e46480ceb6b84677 SHA512 a7a2415e6a0ce6a841e15fccc5c6126d8f134ebb7045e11e49d136aed264c236b91cc959320f763d0d7d878d9d83e09310a51c0ac30c926007dae07242a952de
+DIST cuda_11.4.2_470.57.02_linux.run 3833993301 BLAKE2B b12710da9f31e3255f31dd6b0dab8545463983a4cd1c4432bea027d4e5cc4d1ad9183e09b70ac4ea19c7d3e959df0d19bb41ea896d726e877fd3917a3045a9a4 SHA512 50c80141bfe458aa7216173d9d548f25ade03c68fff59ffe63f842773e5afba7635fb8fd79eda416507e1e88b5fe28b39ac8bdc66b168c73a72995824af5c689
 EBUILD nvidia-cuda-toolkit-10.2.89-r3.ebuild 3925 BLAKE2B 5b193f9ba23ffe42a4a23a5e4dc0b526246286fa27c14b7d1bf41e50e24ab46c619f73e371bc1c0034ecd549839631c9f184b2ece8499150e9fa6350ed137add SHA512 30b1a97475666e9e19a1390ebac946d9c1c1b8c61fd35a44239ed751b53943eb66b4002e3b17bf9dff33d45a730db7b1b7c4d0a57cc09bac38609822eebe9fa6
 EBUILD nvidia-cuda-toolkit-11.1.1-r2.ebuild 6238 BLAKE2B f658446f6f597fabcf7314ecd1f468ba9823047ea2344f6505672af159377902389ad430d80cc3a4bcfbfb7731824b2ecd9a7d7e5558a00dabe7a01984aae99c SHA512 d84f04a2995c7baeffa2ffae64e907af1476835c0cfc07b869d1736a7dd168d70cf49a1be139990e17d42b4ee60fc0770480f2a9d6d2bfc4d20b23c483f64c14
 EBUILD nvidia-cuda-toolkit-11.2.2.ebuild 7119 BLAKE2B cb904f01e369415a5386873c6da3d4d89dbad96e998c47190fc5f6eef2261df4d7bc96c508eb19031fc15a6dd7fd5340bfeb544f79f4fa1b7fdcb7109c1f764d SHA512 366005e64ce6ab58d61956a341dbf654df9876003581ef500dafb3e35c7a86af120267390365de55c91927bcb4edea08722708385be32fce0bad34cd7cc7b070
 EBUILD nvidia-cuda-toolkit-11.3.1.ebuild 7121 BLAKE2B 4e1a8edfedd8972445ec7eb413b86707f6accc3acfdda75620a4e14a36376205843cc73872b8e35845e6526cb147e64132d7c4cdc29e3ae218b559e67c3fda39 SHA512 46b28a75e4adea42d6ef06065a38aa13c4bb0acd1ff924b0e81ddf2f8b437b1e18bef85b81d3c40cb58e05934fa645ec08dbea5c2972d09bb0998f0c7a36eb4b
 EBUILD nvidia-cuda-toolkit-11.4.0.ebuild 7121 BLAKE2B 0db4166fc71c33c2bdf52c56e3ba17d502dbd20fbebb6ac65ba5887cefac8504e9af40584e3cd354fd25ee4f4c49eb39c87f04df418e2aabbda7838c937c3931 SHA512 99eea9176c4b611fa769c7be7da58afbad579eb2c732490136bd218d5aea73217fd4b4bb0259d00eb150617fbf6d4c76433cf528c6f7ea1381a1ee30227376a1
 EBUILD nvidia-cuda-toolkit-11.4.1-r2.ebuild 7122 BLAKE2B 3aaf5c625aa3ee20306a1e483714e7f94fbe6c2637006effad3b73faba1a0f42da28dfb60332bd76ad8ab59f11816f10dbd561be7cb4488238a2593614ff3276 SHA512 05b06040654889ed9b597de17ffce0c26dfdf9400fb3af90e07bf6479f2cafbf40af50ce4524df0fa48e27c9329064641fb9f7b6b974dd0b278f1c26ac91a415
+EBUILD nvidia-cuda-toolkit-11.4.2.ebuild 7136 BLAKE2B 5448967cc8b24db1cf2c382f93c83c29aa8f5fd105ae3f4389b0c9a7f652c527e0262d11068727fa4712a30f36b98548072a11d765692998bb883e2d6e7b0dff SHA512 28b7317bb2f044d5fbe25bcb098387de8c8406181de666c48c1ea43ea97ed39b8047e5f36224acc9e8c87e2d2d8bd5649120fd666443f462df710b590198f87c
 MISC metadata.xml 724 BLAKE2B fd9e30ae430f56599bab7004b9cd46a79bd9b94e75b0a4574ae393d8979b5e40862bf30d110d5d47186d74e629f035f854cea720d8393709d95a9c14b1185a26 SHA512 3a77849ec1bf2e61da35ffd76c20464b5de745c73abd14ffcb7e7d3b2f52e7d114c7d4630292ea219a23e327f1b6a0a8ec488a8cbdaf763a73554f17f50c2f7f
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.4.2.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.4.2.ebuild
new file mode 100644
index 000000000000..c929782ee396
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.4.2.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit check-reqs toolchain-funcs unpacker
+
+DRIVER_PV="470.57.02"
+
+DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
+HOMEPAGE="https://developer.nvidia.com/cuda-zone"
+SRC_URI="https://developer.download.nvidia.com/compute/cuda/${PV}/local_installers/cuda_${PV}_${DRIVER_PV}_linux.run"
+S="${WORKDIR}"
+
+LICENSE="NVIDIA-CUDA"
+SLOT="0/${PV}"
+KEYWORDS="-* ~amd64 ~amd64-linux"
+IUSE="debugger nsight profiler vis-profiler sanitizer"
+RESTRICT="bindist mirror"
+
+BDEPEND=""
+RDEPEND="
+	<sys-devel/gcc-12_pre[cxx]
+	>=x11-drivers/nvidia-drivers-${DRIVER_PV}
+	debugger? (
+		dev-libs/openssl
+		sys-libs/libtermcap-compat
+		sys-libs/ncurses-compat:5[tinfo]
+	)
+	vis-profiler? (
+		dev-libs/openssl
+		>=virtual/jre-1.8:*
+	)"
+
+QA_PREBUILT="opt/cuda/*"
+CHECKREQS_DISK_BUILD="6800M"
+
+pkg_setup() {
+	check-reqs_pkg_setup
+}
+
+src_prepare() {
+	# ATTENTION: change requires revbump
+	local cuda_supported_gcc="8.5 9.4 9.5 10.3 10.4 11.1 11.2 11.3"
+
+	sed \
+		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
+		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
+
+	default
+}
+
+src_install() {
+	local cudadir=/opt/cuda
+	local ecudadir="${EPREFIX}${cudadir}"
+	local pathextradirs ldpathextradirs
+	dodir ${cudadir}
+	into ${cudadir}
+
+	# Install standard sub packages
+	local builddirs=(
+		builds/cuda_{cudart,cuobjdump,memcheck,nvcc,nvdisasm,nvml_dev,nvprune,nvrtc,nvtx,thrust}
+		builds/lib{cublas,cufft,curand,cusolver,cusparse,npp,nvjpeg}
+		$(usex profiler "builds/cuda_nvprof builds/cuda_cupti" "")
+		$(usex vis-profiler "builds/cuda_nvvp" "")
+		$(usex debugger "builds/cuda_gdb" "")
+	)
+
+	local d f
+	for d in "${builddirs[@]}"; do
+		ebegin "Installing ${d}"
+		[[ -d ${d} ]] || die "Directory does not exist: ${d}"
+
+		if [[ -d ${d}/bin ]]; then
+			for f in ${d}/bin/*; do
+				if [[ -f ${f} ]]; then
+					dobin "${f}"
+				else
+					insinto ${cudadir}/bin
+					doins -r "${f}"
+				fi
+			done
+		fi
+
+		insinto ${cudadir}
+		if [[ -d ${d}/targets ]]; then
+			doins -r "${d}"/targets
+		fi
+		if [[ -d ${d}/share ]]; then
+			doins -r "${d}"/share
+		fi
+		if [[ -d ${d}/extras ]]; then
+			doins -r "${d}"/extras
+		fi
+		eend
+	done
+	dobin "${T}"/cuda-config
+
+	doins builds/EULA.txt
+	# nvml and nvvm need special handling
+	ebegin "Installing nvvm"
+	doins -r builds/cuda_nvcc/nvvm
+	fperms +x ${cudadir}/nvvm/bin/cicc
+	eend
+
+	ebegin "Installing nvml"
+	doins -r builds/cuda_nvml_dev/nvml
+	eend
+
+	if use sanitizer; then
+		ebegin "Installing sanitizer"
+		dobin builds/integration/Sanitizer/compute-sanitizer
+		doins -r builds/cuda_sanitizer_api/compute-sanitizer
+		# special handling for the executable
+		fperms +x ${cudadir}/compute-sanitizer/compute-sanitizer
+		eend
+	fi
+
+	use profiler && ldpathextradirs+=":${ecudadir}/extras/CUPTI/lib64"
+
+	if use vis-profiler; then
+		ebegin "Installing libnvvp"
+		doins -r builds/cuda_nvvp/libnvvp
+		# special handling for the executable
+		fperms +x ${cudadir}/libnvvp/nvvp
+		eend
+		pathextradirs+=":${ecudadir}/libnvvp"
+	fi
+
+	if use nsight; then
+		local ncu_dir=$(grep -o 'nsight-compute-[0-9][0-9\.]*' -m1 manifests/cuda_x86_64.xml)
+		ebegin "Installing ${ncu_dir}"
+		mv builds/nsight_compute builds/${ncu_dir} || die
+		doins -r builds/${ncu_dir}
+
+		# check this list on every bump
+		local exes=(
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/libexec/QtWebEngineProcess
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/CrashReporter
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/ncu-ui
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/ncu-ui.bin
+			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/TreeLauncherTargetLdPreloadHelper
+			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/TreeLauncherSubreaper
+			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/ncu
+		)
+
+		dobin builds/integration/nsight-compute/{ncu,ncu-ui,nv-nsight-cu,nv-nsight-cu-cli}
+		eend
+
+		local nsys_dir=$(grep -o 'nsight-systems-[0-9][0-9\.]*' -m1 manifests/cuda_x86_64.xml)
+		ebegin "Installing ${nsys_dir}"
+		mv builds/nsight_systems builds/${nsys_dir} || die
+		doins -r builds/${nsys_dir}
+
+		# check this list on every bump
+		exes+=(
+			${nsys_dir}/host-linux-x64/nsys-ui
+			${nsys_dir}/host-linux-x64/nsys-ui.bin
+			${nsys_dir}/host-linux-x64/ResolveSymbols
+			${nsys_dir}/host-linux-x64/ImportNvtxt
+			${nsys_dir}/host-linux-x64/CrashReporter
+			${nsys_dir}/host-linux-x64/QdstrmImporter
+			${nsys_dir}/host-linux-x64/libexec/QtWebEngineProcess
+			${nsys_dir}/target-linux-x64/nsys
+			${nsys_dir}/target-linux-x64/launcher
+			${nsys_dir}/target-linux-x64/nvgpucs
+			${nsys_dir}/target-linux-x64/nsys-launcher
+			${nsys_dir}/target-linux-x64/sqlite3
+			${nsys_dir}/target-linux-x64/python/bin/python
+		)
+
+		dobin builds/integration/nsight-systems/{nsight-sys,nsys,nsys-exporter,nsys-ui}
+		eend
+
+		# nsight scripts and binaries need to have their executable bit set, #691284
+		for f in "${exes[@]}"; do
+			fperms +x ${cudadir}/${f}
+		done
+
+		# remove foreign archs (triggers SONAME warning, #749903)
+		rm -r "${ED}"/${cudadir}/${ncu_dir}/target/linux-desktop-glibc_2_19_0-ppc64le || die
+		rm -r "${ED}"/${cudadir}/${ncu_dir}/target/linux-desktop-t210-a64 || die
+		rm -r "${ED}"/${cudadir}/${nsys_dir}/target-linux-armv8 || die
+
+		# TODO: unbundle qt5
+		# TODO: unbundle boost
+		# TODO: unbundle icu
+		# TODO: unbundle openssl
+		# TODO: unbundle mesa
+		# TODO: unbundle libz
+		# TODO: unbundle libstdc++
+		# TODO: unbundle libSshClient
+		# TODO: unbundle sqlite
+		# TODO: unbundle libpfm ?
+	fi
+
+	# Add include and lib symlinks
+	dosym targets/x86_64-linux/include ${cudadir}/include
+	dosym targets/x86_64-linux/lib ${cudadir}/lib64
+
+	newenvd - 99cuda <<-EOF
+		PATH=${ecudadir}/bin${pathextradirs}
+		ROOTPATH=${ecudadir}/bin
+		LDPATH=${ecudadir}/lib64:${ecudadir}/nvvm/lib64${ldpathextradirs}
+	EOF
+
+	# Cuda prepackages libraries, don't revdep-build on them
+	insinto /etc/revdep-rebuild
+	newins - 80${PN} <<-EOF
+		SEARCH_DIRS_MASK="${ecudadir}"
+	EOF
+	# TODO: Add pkgconfig files for installed libraries
+}
+
+pkg_postinst_check() {
+	local a="$(${EROOT}/opt/cuda/bin/cuda-config -s)"
+	local b="0.0"
+	local v
+	for v in ${a}; do
+		ver_test "${v}" -gt "${b}" && b="${v}"
+	done
+
+	# if gcc and if not gcc-version is at least greatest supported
+	if tc-is-gcc && \
+		ver_test $(gcc-version) -gt "${b}"; then
+			ewarn
+			ewarn "gcc > ${b} will not work with CUDA"
+			ewarn "Make sure you set an earlier version of gcc with gcc-config"
+			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
+			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
+			ewarn "to the nvcc compiler flags"
+			ewarn
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		pkg_postinst_check
+	fi
+
+	if use profiler || use nsight; then
+		einfo
+		einfo "nvidia-drivers restrict access to performance counters."
+		einfo "You'll need to either run profiling tools (nvprof, nsight) "
+		einfo "using sudo (needs cap SYS_ADMIN) or add the following line to "
+		einfo "a modprobe configuration file "
+		einfo "(e.g. /etc/modprobe.d/nvidia-prof.conf): "
+		einfo
+		einfo "options nvidia NVreg_RestrictProfilingToAdminUsers=0"
+		einfo
+	fi
+}
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 22c2eef33965..ade54c9209a3 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -1,10 +1,10 @@
 DIST pkgcheck-0.10.1.tar.gz 454051 BLAKE2B ba0e91fee539d0a41c27da08c91e1c65078eaebea33b8254cbad38d49feb91a4aa490992a5d88bd96ce0570d89f9f8343d0ff0a2d7368f09d55637b2597aad6b SHA512 044067928bc1c1280a95e785def80e6ebb289e0882f9a61b18d1d75ddc22c4f7eea1da4a4621fd5a598c3e7ee75ece2adedb936086f3c3cbc92c23ab93419215
 DIST pkgcheck-0.10.3.tar.gz 454953 BLAKE2B 5ee2c13cb1ca5b13bfcd8434700c69e6839c5dc2f25dec4060020f8477159ff071b1487a446ba7e03bf1b8d139e8c65a1cd21a777d8bfe3ce677bbfe39b8d85f SHA512 edef25fc1542c3d3fb89c0c1546ebfa736b6ad4b113b0e6bc9ede379b0a5cb9ece5dd8b79ddb2df2cfeaf7f67f290e96a8baee1f2dfcc3bcebe32d9dcf4c264e
 DIST pkgcheck-0.10.5.tar.gz 458314 BLAKE2B 143a397f5374b3f84d957953d0915b6ae7107b81f85af4e37e75289ed0edc5bdf16bdc00213860fdf0bdf53be953b80d514839c6568c3a70d2cdd61401e8dc73 SHA512 3902560099c7e5570be2b86b6e7d56427b6ef9cc893dafe5327b6773b92ca44cc787725a0d2e81d4b779ae71dc2acaeceaaff4d5de50fc99aab4c0dc0ab03bfa
-DIST pkgcheck-0.10.6.tar.gz 461033 BLAKE2B 121be47ef1bf083be285c55fed734280c8d834ebe1a0fbb44b80bf7df1182bdcd5477063403bd3ba20cdd825a34c1484529a7c8879fcf8619822d7cceccf504a SHA512 2e04dce6457a303078a69b6fb76ea20693e77f928945afd522513b2460c07c4fcd57d279cd50ced9d6d74a4d6de76aa8fce825d53a8e68cba3493501b835d306
-EBUILD pkgcheck-0.10.1.ebuild 1507 BLAKE2B e9faf1f21afbd8a9846f54cb795083ecdc48853e47e171b9cbb9e7a9e668a3b09caaf1870a31830d33488c4841e04c3fedfd8c2b1219cb391f74c981dcd999ae SHA512 0b1b30f6e5fea0bc8175206903e90ef60e65d0456fdfb14448342abc811e4e9d0333000e8cd6fd79974e22803673f64349cc8404c1ed8dbff4e3f54b58ddf3b2
-EBUILD pkgcheck-0.10.3.ebuild 1565 BLAKE2B 02ff6c94058d03b75ca5ddf73b185390fb109e8a121f9350e7d3937b406ec1786da888af3c040239e68a233a5a6a78c3b42edbea0141ac2c1019245eefaaa711 SHA512 fad22c7ebe4c525daafa358a4e41f968da3efeccf8856deee2886ead00950abcfb107a833af65140843d5ffc4b76e3a82e47ccfffebbe8dc9e17209ccc95a809
-EBUILD pkgcheck-0.10.5.ebuild 1573 BLAKE2B 53540e35f8b2e6a522037bc7be9b70e43ad81477cd22293a2861214d8c06308b8eb96476d6c5a48453fc2e1da17ce64e3a07445d0d44d26974b7ee8dd36e1cb1 SHA512 a40fc7d5d14dac9d79f8891032b02c45b73598d4990c9100409de13821e2756f84a06860da9f7ac067bb3534ea7209e7976eae1f52150196a666acbda1045f70
-EBUILD pkgcheck-0.10.6.ebuild 1488 BLAKE2B 5197d206e072e25f10d87aeb679096a92db5acec53dacca7f0e463199c1cd4687aa28c90f265b0b38387a5b053a976aab1abf2d6df1713aaa89a173a2cbad75c SHA512 a888f51abe94ef29de83b2714402c38facaa70ddc7c671f61eab4d5318676e88269677c622c4069ec03bdd3078c35633b35cadb6c04b6a9690f4888b65407b19
-EBUILD pkgcheck-9999.ebuild 1573 BLAKE2B 85b5c59696e1d4ca8f8d96604134e895066198e76a1047c1fc6115f73f241d95b4e2efa688695f66f781769759e9d030dcb4ab7571c88bb95c3bf332e0e81bf5 SHA512 dcca2bdd00a6057e78ea1a191730128a050bd47227bd24515e66cef4732d7e65d8e9069330495a26965e1eba5aaa6e3f35e3116ae94b4bf62060a1d041e32b13
+DIST pkgcheck-0.10.7.tar.gz 460625 BLAKE2B f62057dcf493ac32fddd1594beb9b38dc463015e8e93de5e51084894be43932f1842c7b5a742d4eac20538160060c538e42e14f5931c5506d443017e1980020a SHA512 ccbbd14cf3f081ff028af164aaf73a0192133f499ed107747f8eb766131c56ccbf0f128a34210e2a54ee47ee713a5151cfb1e0991e5470e5e7f74ca180bba694
+EBUILD pkgcheck-0.10.1-r1.ebuild 1552 BLAKE2B 3ada505dd9f21bdce2f683ac27b7ea30f8a9b4e49c6d287bc87788ac75a478f2bf02c5ade77b56f268e56d1b8790e10a3b64252ca07abaab29fabb3b300fab56 SHA512 1408c239732b315a1a267ff3bdf1f5df40248c3893eecea2baeb500df9720fd8a62aacfd18b7eb890f1e8f39e097432392a9f157c07bbfa23c60139015281f95
+EBUILD pkgcheck-0.10.3-r1.ebuild 1609 BLAKE2B fd96f50c732590d9bacc04267e3e2df094cbfa33bb6be1322aded8c7473c9af12c729086aa759ca3c8a96c0452ebe7e1c7ec97373f55169d99dde10dfb58fe52 SHA512 72043d1cf02676bba1ede0864eeb991b319c7e7c83af1447736d774de0e591f0ef97e714ed441cd4ecdf0933c652382b9031577baac0035ce66af3687f339075
+EBUILD pkgcheck-0.10.5-r1.ebuild 1618 BLAKE2B 6cc7ab548f27a7b1d9ae9ccd86367db964d50c834a6efbbd61a8931596fdd9e6d62a32a615d6e1fe25a6aa3ff3f79dd11d4709608b0f82333fb0715fb30b3213 SHA512 2631da14401dd5fe659180ca8285d24ed10419fa0b4d7fb9fc39c11f606375ca860b6f8d68690bb8ff20a7447a8e59cc3309ca916a92bb819555b54068e433ec
+EBUILD pkgcheck-0.10.7.ebuild 1573 BLAKE2B d03e4d1fe145c9832af499920828bffee127e467ad2a7a6c3e21230325840678f67fe1d20229aab5097105f5dcafeb6cfaf9f7b1cf41faa683ce344bf4df38ec SHA512 1eb05628c9add2ffea776c86155dfef87c28741190d1eb91bb9c894a14126efd84058646460daf6199149b5501b6e306b7b81c59a1bab628127f20c7495a1993
+EBUILD pkgcheck-9999.ebuild 1573 BLAKE2B d03e4d1fe145c9832af499920828bffee127e467ad2a7a6c3e21230325840678f67fe1d20229aab5097105f5dcafeb6cfaf9f7b1cf41faa683ce344bf4df38ec SHA512 1eb05628c9add2ffea776c86155dfef87c28741190d1eb91bb9c894a14126efd84058646460daf6199149b5501b6e306b7b81c59a1bab628127f20c7495a1993
 MISC metadata.xml 328 BLAKE2B b84dba717460e84f7ee3163fd8d6a5f13eb3b15dd1bb749f6ece81f062e3530988dacefadb24c1395eb36593a7ab6d868b06c8c4ee8f620a17c85faf04283b24 SHA512 5696505214a737ad495b23bfac2a51fbbc5b1e815eb6fcbabb3c6674325f05e3f6f418de05257c08935e389e47879e8a2d1b3723ec86aeb5ad97c6110fd2ec75
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.1.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.1-r1.ebuild
index 13158257ef31..eefe391dd7cf 100644
--- a/dev-util/pkgcheck/pkgcheck-0.10.1.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.10.1-r1.ebuild
@@ -27,6 +27,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	RDEPEND="
 		>=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
+		<sys-apps/pkgcore-0.12.7[${PYTHON_USEDEP}]
 		>=sys-apps/pkgcore-0.12.1[${PYTHON_USEDEP}]"
 fi
 RDEPEND+="
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.3.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.3-r1.ebuild
index 8e372ddc4c43..14a791d2ef2d 100644
--- a/dev-util/pkgcheck/pkgcheck-0.10.3.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.10.3-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
@@ -27,6 +27,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	RDEPEND="
 		>=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
+		<sys-apps/pkgcore-0.12.7[${PYTHON_USEDEP}]
 		>=sys-apps/pkgcore-0.12.1[${PYTHON_USEDEP}]"
 fi
 RDEPEND+="
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.5.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.5-r1.ebuild
index 5cce16c33f18..f6b441efb362 100644
--- a/dev-util/pkgcheck/pkgcheck-0.10.5.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.10.5-r1.ebuild
@@ -28,6 +28,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	RDEPEND="
 		>=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
+		<sys-apps/pkgcore-0.12.7[${PYTHON_USEDEP}]
 		>=sys-apps/pkgcore-0.12.1[${PYTHON_USEDEP}]"
 fi
 RDEPEND+="
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.6.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.7.ebuild
index e2fe0a24d846..e934bd067162 100644
--- a/dev-util/pkgcheck/pkgcheck-0.10.6.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.10.7.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
 	inherit git-r3
 else
-	KEYWORDS=""
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
@@ -28,7 +28,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	RDEPEND="
 		>=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.12.6[${PYTHON_USEDEP}]"
+		>=sys-apps/pkgcore-0.12.7[${PYTHON_USEDEP}]"
 fi
 RDEPEND+="
 	dev-python/chardet[${PYTHON_USEDEP}]
diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild
index 95bd406896b3..e934bd067162 100644
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild
@@ -28,7 +28,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	RDEPEND="
 		>=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.12.6[${PYTHON_USEDEP}]"
+		>=sys-apps/pkgcore-0.12.7[${PYTHON_USEDEP}]"
 fi
 RDEPEND+="
 	dev-python/chardet[${PYTHON_USEDEP}]
diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
index 34084c019d59..4773354a5120 100644
--- a/dev-util/pkgconf/Manifest
+++ b/dev-util/pkgconf/Manifest
@@ -1,6 +1,6 @@
 DIST pkgconf-1.7.4.tar.xz 293888 BLAKE2B af814174b59e3ea7009230f639a6237226caafb22300946904dd10810c0b5cfcbfeea21767a3a1d2c2b5cb1fe4b7b1d995a52d820fcfce3adb383c66762b7576 SHA512 92c080684898b42824a1f1a7e3ce8a600896fc9c20fcf263f032b856fa4c7139607f87ba44d18ed358b8c5f4f04477708800d20a4e10f96e4268a55682f7f0c1
 DIST pkgconf-1.8.0.tar.xz 296304 BLAKE2B 6585a855a313406f77d26fba3cc3cef798b27c4b7ece81738bdba12f36ee93fbcaf838e1065406c28adc20852e34e2de14bc5f4837982f9cc35360d9a3ac83a5 SHA512 58204006408ad5ce91222ed3c93c2e0b61c04fa83c0a8ad337b747b583744578dbebd4ad5ccbc577689637caa1c5dc246b7795ac46e39c6666b1aa78199b7c28
-EBUILD pkgconf-1.7.4.ebuild 1792 BLAKE2B 11d4e56fc11e64e3c3fbc3fefff0c4e63b48f7a7276b814601b6cf1afa90d43d8b79e07864ad91a48da1ef9d5bd92fe229780e5f442b0d87c589c7e5756cbff2 SHA512 8d818589365b14b13991546b26c00dc10ead19246c8d464d6c6ae30a4ee22df1f5f0035bbe68757857182be094ffc20547894034353976873868e5eba0fd7962
-EBUILD pkgconf-1.8.0.ebuild 1858 BLAKE2B d8026da5ae94f63512c47b14847ecaeb0615d7564039ccc80c8e75de80669e0e6a1540472d7898bf869df1fe1b3fb2dc156ce3ddcc3f88946365624ea0c6adb1 SHA512 a9ff20e16a51c920d0792183fef882e6c927cc1f8f7ac232a94ee0b892bdd6b35e2292434f38fc9fcd57df6eee0c6c2b5bb6f46bedcd7c77809d8dceec82cbfd
-EBUILD pkgconf-9999.ebuild 1804 BLAKE2B 3404606c1a539968083011ff32730df918e97e8666bfbe934fb571c9dc558637a784ada2f2db1ddeeb7e56eef1b43a34813d65952e917e7891d0ed0c048794a6 SHA512 fb056ad2cbee82dfd2679b4e2adcb73ebf799b9ead815357363d6dfd50d49bd4d261c1d3fca248e1631bc7884247e2a1909ccd6a239757467f6c98ad31fda540
-MISC metadata.xml 689 BLAKE2B ba307c593f7ff5b271b4795f114e3dbaf3ae03a72719ee6bbece732bf4669f9633a25fb8fcdd295907a77dfbcbf4914ce68ac4afc3e2fc4a014609312af7001b SHA512 e7364d608bba7294d4e24f7f2c7d9fbbe2fb90f2ca855ed55ffe2b7abb21fba19520c771c8b990ce3427b92900a0cdecc62582fd69892744fed4efad4186e82c
+EBUILD pkgconf-1.7.4-r1.ebuild 1519 BLAKE2B bb7ef98d18c414eaf498484e9d2281ab2171db86b4aebb0be79126b5090ca4fe24faaf8f081f7fb48671f0c0c20fc4a6af7c0941ae077ee515956d68ad1aa16c SHA512 f8e615a911386599c0365fc5719e5021d45a6ecfbc1ad8b5bdb4c7a573de95c381da195d24e7157b1625cbc83b2d597c95e573ee4fddf8a87c1d4a5305804b03
+EBUILD pkgconf-1.8.0-r1.ebuild 1585 BLAKE2B 05aea64f0cb491cc229b73bb78e468f637188d068214d29dd57cfa2b829db101a2e67c04f8fc342b97659e5140b0f031a0c82ebffab8019fc29af9a9072bea14 SHA512 701e3b4a130da6c56d5d5f6756f5990010b4a27e78694f526c3f4ff58fb6ae7b65b9a978ea4fe6303d85fcf26908bd1e3f2d1464ec76ffcabd7fb996eb9d60e5
+EBUILD pkgconf-9999.ebuild 1531 BLAKE2B 02e5c632a81cc0673903e44c7d708d75a002ba9e6d058626c7686a46b42496194c9e01fd7c8b2ecf228839e6be52f0fbb4bbc9bb09d35c48ec35535fa3719346 SHA512 b2499096796c0645d346e7e0d722c1b38f797b3bf6ce361f8cd76ac1ce59e4f38489c5dc8aa428a862dd4babc176723eeb6fb17f65779a638ce77d96af765844
+MISC metadata.xml 593 BLAKE2B 2fb2501ff313d3fc2ab8163401dac741cf7ba89bbf1865bcad7e2ff028ee94d408545273abd932c9b9c3c45e14c37d28fa2eb8c914cc53be48cc8c018f887f6a SHA512 506039da33ae356cb74b2abc1c9d3877f77e2ac5c4052419d222c5151190a1f15307f7fb532c1624ce6b4d50c44ec6a81eda0e9f3e5190aa7ee9553a90b35239
diff --git a/dev-util/pkgconf/metadata.xml b/dev-util/pkgconf/metadata.xml
index 894f008349f2..e6cdc1e75d6c 100644
--- a/dev-util/pkgconf/metadata.xml
+++ b/dev-util/pkgconf/metadata.xml
@@ -15,9 +15,6 @@
 	<slots>
 		<subslots>SONAME version of libpkgconf</subslots>
 	</slots>
-	<use>
-		<flag name="pkg-config">Install as a replacement for dev-util/pkgconfig</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">pkgconf/pkgconf</remote-id>
 	</upstream>
diff --git a/dev-util/pkgconf/pkgconf-1.7.4.ebuild b/dev-util/pkgconf/pkgconf-1.7.4-r1.ebuild
index edfc4c30bd49..b174cb7572a4 100644
--- a/dev-util/pkgconf/pkgconf-1.7.4.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.7.4-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://git.sr.ht/~kaniini/pkgconf"
 
 LICENSE="ISC"
 SLOT="0/3"
-IUSE="+pkg-config test"
+IUSE="test"
 
 # tests require 'kyua'
 RESTRICT="!test? ( test )"
@@ -30,7 +30,7 @@ BDEPEND="
 	)
 "
 RDEPEND="
-	pkg-config? ( !dev-util/pkgconfig )
+	!dev-util/pkgconfig
 "
 
 MULTILIB_CHOST_TOOLS=(
@@ -41,11 +41,9 @@ src_prepare() {
 	default
 
 	[[ ${PV} == "9999" ]] && eautoreconf
-	if use pkg-config; then
-		MULTILIB_CHOST_TOOLS+=(
-			/usr/bin/pkg-config$(get_exeext)
-		)
-	fi
+	MULTILIB_CHOST_TOOLS+=(
+		/usr/bin/pkg-config$(get_exeext)
+	)
 }
 
 multilib_src_configure() {
@@ -66,15 +64,8 @@ multilib_src_test() {
 multilib_src_install() {
 	default
 
-	if use pkg-config; then
-		dosym pkgconf$(get_exeext) /usr/bin/pkg-config$(get_exeext)
-		dosym pkgconf.1 /usr/share/man/man1/pkg-config.1
-	else
-		rm "${ED}"/usr/share/aclocal/pkg.m4 || die
-		rmdir "${ED}"/usr/share/aclocal || die
-		rm "${ED}"/usr/share/man/man7/pkg.m4.7 || die
-		rmdir "${ED}"/usr/share/man/man7 || die
-	fi
+	dosym pkgconf$(get_exeext) /usr/bin/pkg-config$(get_exeext)
+	dosym pkgconf.1 /usr/share/man/man1/pkg-config.1
 }
 
 multilib_src_install_all() {
diff --git a/dev-util/pkgconf/pkgconf-1.8.0.ebuild b/dev-util/pkgconf/pkgconf-1.8.0-r1.ebuild
index 29fd8c66589f..2e564e60bf9c 100644
--- a/dev-util/pkgconf/pkgconf-1.8.0.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.8.0-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://git.sr.ht/~kaniini/pkgconf"
 
 LICENSE="ISC"
 SLOT="0/3"
-IUSE="+pkg-config test"
+IUSE="test"
 
 # tests require 'kyua'
 RESTRICT="!test? ( test )"
@@ -30,7 +30,7 @@ BDEPEND="
 	)
 "
 RDEPEND="
-	pkg-config? ( !dev-util/pkgconfig )
+	!dev-util/pkgconfig
 "
 
 MULTILIB_CHOST_TOOLS=(
@@ -41,11 +41,9 @@ src_prepare() {
 	default
 
 	[[ ${PV} == "9999" ]] && eautoreconf
-	if use pkg-config; then
-		MULTILIB_CHOST_TOOLS+=(
-			/usr/bin/pkg-config$(get_exeext)
-		)
-	fi
+	MULTILIB_CHOST_TOOLS+=(
+		/usr/bin/pkg-config$(get_exeext)
+	)
 }
 
 multilib_src_configure() {
@@ -66,15 +64,8 @@ multilib_src_test() {
 multilib_src_install() {
 	default
 
-	if use pkg-config; then
-		dosym pkgconf$(get_exeext) /usr/bin/pkg-config$(get_exeext)
-		dosym pkgconf.1 /usr/share/man/man1/pkg-config.1
-	else
-		rm "${ED}"/usr/share/aclocal/pkg.m4 || die
-		rmdir "${ED}"/usr/share/aclocal || die
-		rm "${ED}"/usr/share/man/man7/pkg.m4.7 || die
-		rmdir "${ED}"/usr/share/man/man7 || die
-	fi
+	dosym pkgconf$(get_exeext) /usr/bin/pkg-config$(get_exeext)
+	dosym pkgconf.1 /usr/share/man/man1/pkg-config.1
 }
 
 multilib_src_install_all() {
diff --git a/dev-util/pkgconf/pkgconf-9999.ebuild b/dev-util/pkgconf/pkgconf-9999.ebuild
index 463b0b7e2311..8ac703ecfd4c 100644
--- a/dev-util/pkgconf/pkgconf-9999.ebuild
+++ b/dev-util/pkgconf/pkgconf-9999.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://git.sr.ht/~kaniini/pkgconf"
 
 LICENSE="ISC"
 SLOT="0/3"
-IUSE="+pkg-config test"
+IUSE="test"
 
 # tests require 'kyua'
 RESTRICT="!test? ( test )"
@@ -30,7 +30,7 @@ BDEPEND="
 	)
 "
 RDEPEND="
-	pkg-config? ( !dev-util/pkgconfig )
+	!dev-util/pkgconfig
 "
 
 MULTILIB_CHOST_TOOLS=(
@@ -41,11 +41,9 @@ src_prepare() {
 	default
 
 	[[ ${PV} == "9999" ]] && eautoreconf
-	if use pkg-config; then
-		MULTILIB_CHOST_TOOLS+=(
-			/usr/bin/pkg-config$(get_exeext)
-		)
-	fi
+	MULTILIB_CHOST_TOOLS+=(
+		/usr/bin/pkg-config$(get_exeext)
+	)
 }
 
 multilib_src_configure() {
@@ -66,15 +64,8 @@ multilib_src_test() {
 multilib_src_install() {
 	default
 
-	if use pkg-config; then
-		dosym pkgconf$(get_exeext) /usr/bin/pkg-config$(get_exeext)
-		dosym pkgconf.1 /usr/share/man/man1/pkg-config.1
-	else
-		rm "${ED}"/usr/share/aclocal/pkg.m4 || die
-		rmdir "${ED}"/usr/share/aclocal || die
-		rm "${ED}"/usr/share/man/man7/pkg.m4.7 || die
-		rmdir "${ED}"/usr/share/man/man7 || die
-	fi
+	dosym pkgconf$(get_exeext) /usr/bin/pkg-config$(get_exeext)
+	dosym pkgconf.1 /usr/share/man/man1/pkg-config.1
 }
 
 multilib_src_install_all() {
diff --git a/dev-util/pkgconfig/Manifest b/dev-util/pkgconfig/Manifest
deleted file mode 100644
index 75b8b0646f55..000000000000
--- a/dev-util/pkgconfig/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST pkg-config-0.29.2.tar.gz 2016830 BLAKE2B e8f0420033524ad768cac3c82138546e4cd76c47f5835b7b98662ab01eaf3feef08f495a69c04980d51b57935567ab1d465ef4e1d0529735ad0031c828585324 SHA512 4861ec6428fead416f5cbbbb0bbad10b9152967e481d4b0ff2eb396a9f297f552984c9bb72f6864a37dcd8fca1d9ccceda3ef18d8f121938dbe4fdf2b870fe75
-EBUILD pkgconfig-0.29.2.ebuild 3815 BLAKE2B bc1f6b7642cb410871d38989fb0870c848dab00c284d1cf7cba8fd4dee1bec801f70a4f8d744e270141bcea854c7920c379ef24ef852626089492a5c29b9a84e SHA512 8ae7a64d6776dc7d22d9fe2f8753b7ed66ee69fea4e523d97050513efea15fe5143888247f90efff6ab1079f58178e5da28021d6878708ff225cc4daf4dfa015
-EBUILD pkgconfig-9999.ebuild 3697 BLAKE2B 22e3607d803206ca94d05973ee9e1cd6b0899080918a5a2e1f3c72f987ff8aca10ed117fc6d924ecbc7dc9da27ceedbe41299c8e7363f5876ce6af4e7cd82fa8 SHA512 7b1aaa6608f13b7587d63e1db9dc1654bfffadacc46334e7cea67f8cedec453d83663f6ed1dbebed497e1383497bde1c1d306dac953e6c0060a49b405bb166c0
-MISC metadata.xml 325 BLAKE2B af0abf473903faa5ce1e6d1918fa87b558b99b82d95c7f95ecb596684f7f55ee365a10e943752d1f3c8b6b1684ac4e0985329b89a6f19de2c926bcc0c3127382 SHA512 0db9510bbe132efa03acbbb4fb31407188edd83a6ac5c1d84316fa682db9399879957e8cd4447c1cbde01638f6d220f9a30a17611cd31e35769e71e5d38287a4
diff --git a/dev-util/pkgconfig/metadata.xml b/dev-util/pkgconfig/metadata.xml
deleted file mode 100644
index feea3b542d9b..000000000000
--- a/dev-util/pkgconfig/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 type="project">
-		<email>freedesktop-bugs@gentoo.org</email>
-	</maintainer>
-	<use>
-		<flag name="internal-glib">Use internal copy of <pkg>dev-libs/glib</pkg></flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild b/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild
deleted file mode 100644
index d854a38b0820..000000000000
--- a/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Do not inherit autotools in non-live ebuild - causes circular dependency, bug #550856
-inherit eutils flag-o-matic libtool multilib multilib-minimal
-
-MY_P=pkg-config-${PV}
-
-if [[ ${PV} == *9999* ]]; then
-	# 1.12 is only needed for tests due to some am__check_pre / LOG_DRIVER
-	# weirdness with "/bin/bash /bin/sh" in arguments chain with >=1.13
-	WANT_AUTOMAKE=1.12
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/pkg-config.git"
-	EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
-	inherit autotools git-r3
-else
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
-fi
-
-DESCRIPTION="Package config system that manages compile/link flags"
-HOMEPAGE="https://pkgconfig.freedesktop.org/wiki/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="elibc_FreeBSD elibc_glibc hardened internal-glib"
-
-RDEPEND="!internal-glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] )
-	!dev-util/pkgconf[pkg-config]
-	!dev-util/pkg-config-lite
-	!dev-util/pkgconfig-openbsd[pkg-config]
-	virtual/libintl"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( AUTHORS NEWS README )
-
-src_prepare() {
-	sed -i -e "s|^prefix=/usr\$|prefix=${EPREFIX}/usr|" check/simple.pc || die #434320
-
-	eapply_user
-
-	if [[ ${PV} == *9999* ]]; then
-		eautoreconf
-	else
-		elibtoolize
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# fix standards conflict, since gcc-4.5 default is gnu90
-		if tc-is-gcc && [[ $(gcc-major-version) -gt 4 || \
-			( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -ge 5 ) ]] ;
-		then
-			sed -i \
-				-e 's/\<\(_XOPEN_SOURCE_EXTENDED\)\>/\1_DISABLED/' \
-				-e '/\<_XOPEN_SOURCE\>/s/2/600/' \
-				glib/configure || die
-		fi
-	fi
-}
-
-multilib_src_configure() {
-	local myconf
-
-	if use internal-glib; then
-		myconf+=' --with-internal-glib'
-		# non-glibc platforms use GNU libiconv, but configure needs to
-		# know about that not to get confused when it finds something
-		# outside the prefix too
-		if use prefix && use !elibc_glibc ; then
-			myconf+=" --with-libiconv=gnu"
-			# add the libdir for libtool, otherwise it'll make love with system
-			# installed libiconv
-			append-ldflags "-L${EPREFIX}/usr/$(get_libdir)"
-			# the glib objects reference symbols from these frameworks,
-			# not good, esp. since Carbon should be deprecated
-			[[ ${CHOST} == *-darwin* ]] && \
-				append-ldflags -framework CoreFoundation -framework Carbon
-			if [[ ${CHOST} == *-solaris* ]] ; then
-				# required due to __EXTENSIONS__
-				append-cppflags -DENABLE_NLS
-				# similar to Darwin
-				append-ldflags -lintl
-			fi
-		fi
-	else
-		if ! has_version --host-root dev-util/pkgconfig; then
-			export GLIB_CFLAGS="-I${EPREFIX}/usr/include/glib-2.0 -I${EPREFIX}/usr/$(get_libdir)/glib-2.0/include"
-			export GLIB_LIBS="-lglib-2.0"
-		fi
-	fi
-
-	use ppc64 && use hardened && replace-flags -O[2-3] -O1
-
-	# Force using all the requirements when linking, so that needed -pthread
-	# lines are inherited between libraries
-	use elibc_FreeBSD && myconf+=' --enable-indirect-deps'
-
-	[[ ${PV} == *9999* ]] && myconf+=' --enable-maintainer-mode'
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--with-system-include-path="${EPREFIX}"/usr/include \
-		--with-system-library-path="${EPREFIX}"/usr/$(get_libdir) \
-		${myconf}
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	if use prefix; then
-		# Add an explicit reference to $EPREFIX to PKG_CONFIG_PATH to
-		# simplify cross-prefix builds
-		echo "PKG_CONFIG_PATH=${EPREFIX}/usr/$(get_libdir)/pkgconfig:${EPREFIX}/usr/share/pkgconfig" >> "${T}"/99${PN}
-		doenvd "${T}"/99${PN}
-	fi
-}
diff --git a/dev-util/pkgconfig/pkgconfig-9999.ebuild b/dev-util/pkgconfig/pkgconfig-9999.ebuild
deleted file mode 100644
index d2554a4effda..000000000000
--- a/dev-util/pkgconfig/pkgconfig-9999.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Do not inherit autotools in non-live ebuild - causes circular dependency, bug #550856
-inherit eutils flag-o-matic libtool multilib multilib-minimal
-
-MY_P=pkg-config-${PV}
-
-if [[ ${PV} == *9999* ]]; then
-	# 1.12 is only needed for tests due to some am__check_pre / LOG_DRIVER
-	# weirdness with "/bin/bash /bin/sh" in arguments chain with >=1.13
-	WANT_AUTOMAKE=1.12
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/pkg-config.git"
-	EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
-	inherit autotools git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
-fi
-
-DESCRIPTION="Package config system that manages compile/link flags"
-HOMEPAGE="https://pkgconfig.freedesktop.org/wiki/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="elibc_FreeBSD elibc_glibc hardened internal-glib"
-
-RDEPEND="!internal-glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] )
-	!dev-util/pkgconf[pkg-config]
-	!dev-util/pkg-config-lite
-	!dev-util/pkgconfig-openbsd[pkg-config]
-	virtual/libintl"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( AUTHORS NEWS README )
-
-src_prepare() {
-	sed -i -e "s|^prefix=/usr\$|prefix=${EPREFIX}/usr|" check/simple.pc || die #434320
-
-	eapply_user
-
-	if [[ ${PV} == *9999* ]]; then
-		eautoreconf
-	else
-		elibtoolize
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# fix standards conflicts
-		sed -i -e 's/\(_XOPEN_SOURCE\(_EXTENDED\)\?\|__EXTENSIONS__\)/  \1_DISABLED/' \
-			glib/configure || die
-		sed -i -e '/#define\s\+_POSIX_SOURCE/d' \
-			glib/glib/giounix.c || die
-	fi
-}
-
-multilib_src_configure() {
-	local myconf
-
-	if use internal-glib; then
-		myconf+=' --with-internal-glib'
-		# non-glibc platforms use GNU libiconv, but configure needs to
-		# know about that not to get confused when it finds something
-		# outside the prefix too
-		if use prefix && use !elibc_glibc ; then
-			myconf+=" --with-libiconv=gnu"
-			# add the libdir for libtool, otherwise it'll make love with system
-			# installed libiconv
-			append-ldflags "-L${EPREFIX}/usr/$(get_libdir)"
-			# the glib objects reference symbols from these frameworks,
-			# not good, esp. since Carbon should be deprecated
-			[[ ${CHOST} == *-darwin* ]] && \
-				append-ldflags -framework CoreFoundation -framework Carbon
-			if [[ ${CHOST} == *-solaris* ]] ; then
-				# required due to __EXTENSIONS__
-				append-cppflags -DENABLE_NLS
-				# similar to Darwin
-				append-ldflags -lintl
-			fi
-		fi
-	else
-		if ! has_version --host-root dev-util/pkgconfig; then
-			export GLIB_CFLAGS="-I${EPREFIX}/usr/include/glib-2.0 -I${EPREFIX}/usr/$(get_libdir)/glib-2.0/include"
-			export GLIB_LIBS="-lglib-2.0"
-		fi
-	fi
-
-	use ppc64 && use hardened && replace-flags -O[2-3] -O1
-
-	# Force using all the requirements when linking, so that needed -pthread
-	# lines are inherited between libraries
-	use elibc_FreeBSD && myconf+=' --enable-indirect-deps'
-
-	[[ ${PV} == *9999* ]] && myconf+=' --enable-maintainer-mode'
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--with-system-include-path="${EPREFIX}"/usr/include \
-		--with-system-library-path="${EPREFIX}"/usr/$(get_libdir) \
-		${myconf}
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	if use prefix; then
-		# Add an explicit reference to $EPREFIX to PKG_CONFIG_PATH to
-		# simplify cross-prefix builds
-		echo "PKG_CONFIG_PATH=${EPREFIX}/usr/$(get_libdir)/pkgconfig:${EPREFIX}/usr/share/pkgconfig" >> "${T}"/99${PN}
-		doenvd "${T}"/99${PN}
-	fi
-}
diff --git a/dev-util/plan9port/Manifest b/dev-util/plan9port/Manifest
index aacf1b464133..85364b4d742c 100644
--- a/dev-util/plan9port/Manifest
+++ b/dev-util/plan9port/Manifest
@@ -1,7 +1,6 @@
 AUX plan9port-builderr.patch 882 BLAKE2B 1526bad2833a416cfb214f047f2f14bda89ca82293fa45c02e8165a4ee6050adccea91e2ac2e4d898b6c5b2005afddc82373f16939fe392b141bf664c5afea84 SHA512 38d071d37683f6408f948ee5dea2772ea988945da80c349cdf1731641010d7bff391468c9d4e65507a2a545d3d02a899ade4ea68ac476664e39bb68e587e4940
 AUX plan9port-cflags.patch 312 BLAKE2B d09a4bb70451beb0cb6de05be37c6d68334d51f4db882debde4e3f3accf3aec25054ad5411a3c7289df6b556f59c1a729005f1c21247545158879c429462843d SHA512 29c4419bbc36330b322541b625bbe9131ed14d01008ba2ab2865a175918506de1e96a2b078246d1d6b6bc48537f90f74b1a72b223d74dc73d13cb7cf63d33c58
-AUX plan9port-noexecstack.patch 951 BLAKE2B 76df9fda4dc0124be25dd562ed804f6be75438c426a4e50b86e5806f34624f30a51ad30dd403a4a7ffd0829bc658cd307ed4c148de299016a1bf767011e6889e SHA512 1cb3defd59c3dd86474e23cc5b0ac397f645ab5a0b476a7f3532bee62bf5d2ffb1996945baed755e7cd61060bf8713b227c67472ca0f1a45ceab9aa82c524883
-DIST plan9port-a6ad39aaaa36b8aadc5c35bfc803afbde32918c0.tar.gz 23445647 BLAKE2B 4cb0f08fc404c5618c4be0d7e5710e6a8a32fbe010d28a879b1f9575118256492a3ed2b9b744c35dbbb6c6deae405c05fd7b6606254fb94fc2b40b3a8d14fa71 SHA512 4d9f6ce66d3eebb311cbbb0ec27c01d99cc0e19c6ac8a1c511ff00070c085a349b637048cd0066240af975e90f527388dbeba58f4591bf7dcaa673ee5564430f
-EBUILD plan9port-0_pre20200526.ebuild 3497 BLAKE2B 572e4e4354f4caa1b8ee64defafbdb97e93904b03d4d902d8bc5bb3d7b7b814d998d32e95e3298f57156cdca770a35251f6c1706d035ac6393406e690f57c922 SHA512 317f1de1ec6e17cd084fe930e38d8fa84ee03a6fd5b73c3e4c5b81fa8c4b9de2fac525ff40da8050350d7719f74b34b01a943d86bd5bd338b25500af4ad51a86
-EBUILD plan9port-9999.ebuild 3347 BLAKE2B b26dd95b59ee9603a7506a25e15ac949c986c00c03b558832adcfff0365dfd32d2bccb54deb0e1bce1e1b779ee4535a36f450125e08181628cf2787606542527 SHA512 70f79b52d1d3ca4bcf665eb07e30c9d236167c67da51538c046e2474faea585fd48227b8ad57a875995e212913ed983444b28b0690521b4f0f693ea03e78dc31
-MISC metadata.xml 485 BLAKE2B 562cc265d88d43f48e39421d1ee8be547b74741a6ef9fa4ac6c46ae9fe19d8f1745b71439d21a95370eae39cd0ad5b87b710be375f4141510f6510fa5a721186 SHA512 655f45ad6e519ef7d350fd5df2ad4bb77e08730d80f3da2fc4572522d162279af23e82a79df55b2952135c8348565e1d706c38b1576ec2fd7e68a422deddf068
+AUX plan9port-noexecstack.patch 384 BLAKE2B 7f887894113677df743f64d7b1015aa65837818aff3c8d93bb553177da377a5975e7f8841addfff6b533771085490d306124adaf62a834615f0f5ca46f455bf4 SHA512 833a331d963e1f02ce497ffb293750cd6c535b6b2d6d26a2218264d3a7aa098b30f95cb3968fbaa3a734505286ff560e65f0390154af6a324078e3d7f80385be
+DIST plan9port-88a87fadae6629932d9c160f53ad5d79775f8f94.tar.gz 23413373 BLAKE2B 6145dd77c9e4b33ebc6d68f42ed69e320e8bfcaae474a16afb3a62e30c13a39117d7013f3cc075eb48c95a5600c4fdb457e45f65f7b25ad2acc7b19dc9cf8e64 SHA512 f008969274e790238b58ebd0d0dcfaa730557daf974797f8c4014c36ac39995b330db9c6d658655358fdb2be64905b83c35e2287b7cd66b2d3249e1da1a3e119
+EBUILD plan9port-0_pre20210321.ebuild 3763 BLAKE2B 81ac6c9cbc85293a9ad357a14aa19aabb9434f1cba33797ff753cd01986a44780755e97653573239a9e7b9ac12b78899a1299823d62228935605da3f33e639b0 SHA512 045a58dbe28b113b405ca3dd4acc06d43f9bbf9d251efc39609adf882e45e02b2c3cd842df077c9d2088b0b5c81c6bf0fdeae8344ef9b3013a16810cc08d1ab4
+MISC metadata.xml 566 BLAKE2B 7a6e1aaf45f7c3e5c97a01912b519a88fe3e035208fe23d9938d9f458019a7459c5d8849371a46b9a0e5a055ed70d05d39e5792ff3a90b8613c041740666c6d8 SHA512 54656782266a9019847590221236cdd838b021c8645cec8a215007bf14e9347a6421effe916f59454de49254ce9e3393572ebd29ba01ced9ccec60b45f867595
diff --git a/dev-util/plan9port/files/plan9port-noexecstack.patch b/dev-util/plan9port/files/plan9port-noexecstack.patch
index aff60d07a989..20aecce2515a 100644
--- a/dev-util/plan9port/files/plan9port-noexecstack.patch
+++ b/dev-util/plan9port/files/plan9port-noexecstack.patch
@@ -3,44 +3,9 @@ Remove unneeded executable stack
 Assembly routines in libthread and libmp use an executable stack by
 default. This is not needed and can be removed using --noexecstack.
 
-The plan9port 9a wrapper wrapper needs to be modified to pass flags to the
-underlying assembler first though..
-
 Patch by Andy Spencer
 
   http://code.swtch.com/plan9port/issue/76/
---- a/bin/9a
-+++ b/bin/9a
-@@ -1,10 +1,5 @@
- #!/bin/sh
- 
--if [ $# != 1 ]; then
--	echo 'usage: 9a file.s' 1>&2
--	exit 1
--fi
--
- test -f $PLAN9/config && . $PLAN9/config
- 
- aflags=""
-@@ -17,5 +12,16 @@
- 	;;
- esac
- 
--out=`echo $1 | sed 's/\.s$//;s/$/.o/'`
--exec as $aflags -o $out $1
-+for arg; do
-+	case $arg in
-+	-*)
-+		opts="$opts $arg"
-+		;;
-+	*.s)
-+		src=$arg
-+		dst=$(echo $arg | sed 's/\.s/\.o/')
-+		;;
-+	esac
-+done
-+
-+exec as $aflags $opts -o $dst $src
 --- a/src/mkhdr
 +++ b/src/mkhdr
 @@ -13,7 +13,7 @@
diff --git a/dev-util/plan9port/metadata.xml b/dev-util/plan9port/metadata.xml
index 522c313926ce..e87e52f30942 100644
--- a/dev-util/plan9port/metadata.xml
+++ b/dev-util/plan9port/metadata.xml
@@ -12,4 +12,7 @@
 	<upstream>
 		<remote-id type="github">9fans/plan9port</remote-id>
 	</upstream>
+	<use>
+		<flag name="freefonts">Don't install BigelowHolmes fonts</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-util/plan9port/plan9port-0_pre20200526.ebuild b/dev-util/plan9port/plan9port-0_pre20210321.ebuild
index dff9e3605a98..4b5f80a4b8b6 100644
--- a/dev-util/plan9port/plan9port-0_pre20200526.ebuild
+++ b/dev-util/plan9port/plan9port-0_pre20210321.ebuild
@@ -1,22 +1,25 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit multiprocessing toolchain-funcs readme.gentoo-r1
 
-MY_HASH="a6ad39aaaa36b8aadc5c35bfc803afbde32918c0"
+MY_HASH="88a87fadae6629932d9c160f53ad5d79775f8f94"
 MY_P="${PN}-${MY_HASH}"
 
 DESCRIPTION="Port of many Plan 9 programs and libraries"
 HOMEPAGE="https://9fans.github.io/plan9port/
 	https://github.com/9fans/plan9port"
 SRC_URI="https://github.com/9fans/${PN}/archive/${MY_HASH}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="9base BSD-4 MIT LGPL-2.1 BigelowHolmes"
+S="${WORKDIR}/${MY_P}"
+LICENSE="
+	MIT RSA Apache-2.0 public-domain BitstreamVera BZIP2
+	!freefonts? ( BigelowHolmes )
+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="X aqua truetype"
+IUSE="X aqua freefonts truetype"
 REQUIRED_USE="?? ( X aqua )"
 
 DEPEND="
@@ -34,8 +37,6 @@ PATCHES=(
 	"${FILESDIR}/${PN}-builderr.patch"
 )
 
-S="${WORKDIR}/${MY_P}"
-
 PLAN9="/opt/plan9"
 EPLAN9="${EPREFIX}${PLAN9}"
 QA_MULTILIB_PATHS="${PLAN9}/.*/.*"
@@ -56,10 +57,19 @@ DISABLE_AUTOFORMATTING="yes"
 src_prepare() {
 	default
 
+	if use freefonts; then
+		pushd font || die
+		rm -r big5 fixed jis luc{,m,sans} misc naga10 pelm shinonome || die
+		popd || die
+		rm -r postscript/font/luxi || die
+	fi
+
 	case "${CHOST}" in
-		*apple*)
-			sed -i 's/--noexecstack/-noexecstack/' src/mkhdr ||
-				die "Failed to sed AFLAGS" ;;
+	*apple*)
+		sed -i 's/--noexecstack/-noexecstack/' src/mkhdr ||
+			die "Failed to sed AFLAGS" ;;
+	*)
+		rm -rf mac || die
 	esac
 
 	# don't hardcode /bin and /usr/bin in PATH
@@ -114,6 +124,8 @@ src_compile() {
 src_install() {
 	readme.gentoo_create_doc
 
+	rm -rf src || die
+
 	# do* plays with the executable bit, and we should not modify them
 	dodir "${PLAN9}"
 	cp -a * "${ED}${PLAN9}" || die "cp failed"
diff --git a/dev-util/plan9port/plan9port-9999.ebuild b/dev-util/plan9port/plan9port-9999.ebuild
deleted file mode 100644
index 4c1e286476b1..000000000000
--- a/dev-util/plan9port/plan9port-9999.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multiprocessing toolchain-funcs git-r3 readme.gentoo-r1
-
-DESCRIPTION="Port of many Plan 9 programs and libraries"
-HOMEPAGE="https://9fans.github.io/plan9port/
-	https://github.com/9fans/plan9port"
-EGIT_REPO_URI="https://github.com/9fans/${PN}.git"
-
-LICENSE="9base BSD-4 MIT LGPL-2.1 BigelowHolmes"
-SLOT="0"
-IUSE="X aqua truetype"
-REQUIRED_USE="?? ( X aqua )"
-
-DEPEND="
-	X? ( x11-apps/xauth )
-	truetype? (
-		media-libs/freetype
-		media-libs/fontconfig
-	)
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-noexecstack.patch"
-	"${FILESDIR}/${PN}-cflags.patch"
-	"${FILESDIR}/${PN}-builderr.patch"
-)
-
-PLAN9="/opt/plan9"
-EPLAN9="${EPREFIX}${PLAN9}"
-QA_MULTILIB_PATHS="${PLAN9}/.*/.*"
-
-DOC_CONTENTS="Plan 9 from User Space has been successfully installed into
-${PLAN9}. Your PLAN9 and PATH environment variables have
-also been appropriately set, please use env-update and
-source /etc/profile to bring that into immediate effect.
-
-Please note that ${PLAN9}/bin has been appended to the
-*end* or your PATH to prevent conflicts. To use the Plan9
-versions of common UNIX tools, use the absolute path:
-${PLAN9}/bin or the 9 command (eg: 9 troff)
-
-Please report any bugs to bugs.gentoo.org, NOT Plan9Port."
-DISABLE_AUTOFORMATTING="yes"
-
-src_prepare() {
-	default
-
-	case "${CHOST}" in
-		*apple*)
-			sed -i 's/--noexecstack/-noexecstack/' src/mkhdr ||
-				die "Failed to sed AFLAGS" ;;
-	esac
-
-	# don't hardcode /bin and /usr/bin in PATH
-	sed -i '/PATH/s,/bin:/usr/bin:,,' INSTALL || die "sed on INSTALL failed"
-
-	# don't hardcode /usr/{,local/}include and prefix /usr/include/*
-	sed -Ei -e 's,-I/usr(|/local)/include ,,g' \
-		-e "s,-I/usr(|/local)/include,-I${EPREFIX}/usr\1/include,g" \
-		src/cmd/fontsrv/freetyperules.sh INSTALL $(find -name makefile) ||
-		die "sed failed"
-
-	# Fix paths, done in place of ./INSTALL -c
-	einfo "Fixing hard-coded /usr/local/plan9 paths"
-	sed -i "s,/usr/local/plan9,${EPLAN9},g" $(grep -lr /usr/local/plan9) ||
-		die "sed failed"
-}
-
-src_configure() {
-	local -a myconf=(
-		CC9="$(tc-getCC)"
-		CC9FLAGS="'${CFLAGS} ${LDFLAGS}'"
-	)
-
-	if use X; then
-		myconf+=( WSYSTYPE=x11 )
-	elif use aqua; then
-		local wsystype="$(awk '{if ($1 > 10.5) print "osx-cocoa"; else print "osx"}' \
-			<<< "${MACOSX_DEPLOYMENT_TARGET}")"
-		myconf+=( WSYSTYPE="${wsystype}" )
-	else
-		myconf+=( WSYSTYPE=nowsys )
-	fi
-
-	if use truetype; then
-		myconf+=( FONTSRV=fontsrv )
-	else
-		myconf+=( FONTSRV= )
-	fi
-
-	printf '%s\n' "${myconf[@]}" >> LOCAL.config ||
-		die "cannot create configuration"
-}
-
-src_compile() {
-	# The INSTALL script builds mk then [re]builds everything using that
-	einfo "Compiling Plan 9 from User Space can take a very long time"
-	einfo "depending on the speed of your computer. Please be patient!"
-	NPROC="$(makeopts_jobs)" ./INSTALL -b ||
-		die "Please report bugs to bugs.gentoo.org, NOT Plan9Port."
-}
-
-src_install() {
-	readme.gentoo_create_doc
-
-	# do* plays with the executable bit, and we should not modify them
-	dodir "${PLAN9}"
-	cp -a * "${ED}${PLAN9}" || die "cp failed"
-
-	# build the environment variables and install them in env.d
-	newenvd - 60plan9 <<-EOF
-		PLAN9="${EPLAN9}"
-		PATH="${EPLAN9}/bin"
-		ROOTPATH="${EPLAN9}/bin"
-		MANPATH="${EPLAN9}/man"
-	EOF
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/dev-util/ragel/Manifest b/dev-util/ragel/Manifest
index 5755e6597de9..c1164dff4aef 100644
--- a/dev-util/ragel/Manifest
+++ b/dev-util/ragel/Manifest
@@ -4,7 +4,7 @@ DIST ragel-6.10.tar.gz 1232993 BLAKE2B 401e7a53b062ecd7ec98337866eb2dc0af0ac90e5
 DIST ragel-7.0.0.12.tar.gz 1543127 BLAKE2B c3024c55eb5397f78159da83e318923529d3c1f10cc802564ac13c39b18c261166e27e4f315bbaa49e7eb9afa6840ca72aa62d7ae14d46f20865db64e3ab6759 SHA512 32ec90eddfd209e50995f21b9a5fcddd2b94279828227d367d990d7bfa8e4412682631d4e6ae5081871bac23d96153b96fb4494b991c70bf38df8cc0ddc8866d
 DIST ragel-7.0.3.tar.gz 1656577 BLAKE2B 3a9ce560894714a3801039fb944d3c914f2647a0b76bba4a7b790f8d569eb2e9eb807ab4d8af067560b274692be2d98c5dc28632e11c853893971585e847d48e SHA512 16bcb4b44a3ca94918d6c3e4bce468620cc691bf74cb69f0a264c41cbcffd595f897aa18e300952b60a68e680e1223532bbf9e500168d35d92a6559c190f6e78
 DIST ragel-7.0.4.tar.gz 1656687 BLAKE2B d96444f6b8dc356b9effa6c5032952ffb2526833f90fcb63c7f6c293a73a70ba057995426ba789d237c61dee5e3aa1ab53ec3193bd31c9c4b994193910219d13 SHA512 effa7021f5ce854ab9d2346c6cd8105ad6cbcbbbf59023c9cc704dc9720969221c9eb1e2c776063fcb6375900d457183f63892505615a878fc52c0f238f6921c
-EBUILD ragel-6.10.ebuild 837 BLAKE2B 797418aa818b3dc163611d057c6c2d348b716945ca1632ef93e7c1183429c57bc9150a4c1ba594b751b53c0473d9066d056dbf4bbed75b962cd35c331f3b0c22 SHA512 243802350f28a11f6fa8e194e7562e672d4121b3e45632e09551569dc30594672afbde8e8ca1faa51d9c7d4aa71053ca9d389ea8994244d9399922ce3689c541
+EBUILD ragel-6.10.ebuild 844 BLAKE2B 9b0fff510885955ce828fe02f29918cc42cbfc23f3220755e7b2f96f78eaf3bf2b10f7d8f64ebdf7c9f946074046e275776c690aeb04eb21f22a93293ec94737 SHA512 33c796fbcad69094b021e17188e9d6df28a2f7f1b21019c5cfdf586e7003b73263a9af4c48b7f84596f684fe89700274a72effeee52e4ba533a0faa5e8f22a0c
 EBUILD ragel-7.0.0.12.ebuild 772 BLAKE2B 97dc91562f31eefe83292cef36885fa5562039e16e866b3456d5f4ff603d456fdc66423f809e02e0414ba9e14b60bb89173301b060352f9f02c161344463882d SHA512 ee3579c12527cabd3bbb25be5b3968fe88d0d7f6351cbdaeae50626ed689d6f8e4bb207090c3504f54f2da28bf2e4c399f816295fa20e518d6f7f8046d9f9ac3
 EBUILD ragel-7.0.3.ebuild 1416 BLAKE2B 817cb6f863af04d4c635f86e70ae296f077d07801a5e6fed4d868fa5558cb033b00538c789644a4eda9f6b75fe12c89afa1f4a904579d81728c7d115a3453008 SHA512 c34c6e7c3faab0aad54aec9cbe1b753373590d48d4dfc6e0853815e92375209507263d6071896a5bb748089a986dba90c3c9b47af5568baedcd3ee68bfd48887
 EBUILD ragel-7.0.4-r1.ebuild 1513 BLAKE2B c5b68326de2f45040942b815e6f0fc4d7934c37299779094893033088587db439e72d7ed8a993d7f59c36aa93bbd201fc75cbe61c568b5b06152e638bc343def SHA512 19cf49f798760c2d349d1ab303cc70e97baedd0c6f3d0b6bdcebb842f8185a06acd4a183d4a3a9a15020a86a9c7e47a2487e9ece336a6fd6a6401816e47f2e1c
diff --git a/dev-util/ragel/ragel-6.10.ebuild b/dev-util/ragel/ragel-6.10.ebuild
index e28001024b64..9ffdaf7407a4 100644
--- a/dev-util/ragel/ragel-6.10.ebuild
+++ b/dev-util/ragel/ragel-6.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.colm.net/files/ragel/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # We need to get the txl language in Portage to have the tests :(
 RESTRICT="test"
diff --git a/dev-util/redo/Manifest b/dev-util/redo/Manifest
index cc80527846b5..c9844f1338ce 100644
--- a/dev-util/redo/Manifest
+++ b/dev-util/redo/Manifest
@@ -1,6 +1,6 @@
 DIST redo-0.42a.tar.gz 195053 BLAKE2B 3e84e961eeb66396d5d5aa8a3f05f10d4000089d12c36bd8e061c163e050b9bc125cd8dcc5987c9f3b25e2b8803ff7c34d48a173ab91fc4a3e9fd63c114adc8a SHA512 8473bd8168c8e70b59a573560f8f725c8538061ee15eabeb63e467a363fa6869aa8088e8ce324726da4e2f7115e2ddf72cbb657703e9090f4f93c05f42bb67cb
 DIST redo-0.42c.tar.gz 195232 BLAKE2B b24969d71b247d02642340cebbf325e2ae68d4893d02e489930120e6aac76bd3099fd42e7dc36dae1fdea5c7825657957291876b906c2671a6319f8eb45a9d91 SHA512 3196ff5941d9e62084c7332a6771edd0db0082a499ba16fb6de273295c65b734e7dadb29a9fca3e6266421bc964369a8e725ef55f59ade2ecfb5e8bcc446ced0
-EBUILD redo-0.42a.ebuild 1195 BLAKE2B a684dc3ec946edfe053e29f58cb2581e9f7254935408024b50d87c0a81c2b34270cdac9ce84ab48a5e28c7c55574c8f6787ab93985f9db5306ab80210148caaa SHA512 a26450af153b60b4f17bbc5156d298ae6264927ef33e3e072eeab84a189a560b39c2c027e7f22306ded1d061be7cad2786e6997c9d8cf52e37976f0d5e056157
-EBUILD redo-0.42c.ebuild 1195 BLAKE2B a684dc3ec946edfe053e29f58cb2581e9f7254935408024b50d87c0a81c2b34270cdac9ce84ab48a5e28c7c55574c8f6787ab93985f9db5306ab80210148caaa SHA512 a26450af153b60b4f17bbc5156d298ae6264927ef33e3e072eeab84a189a560b39c2c027e7f22306ded1d061be7cad2786e6997c9d8cf52e37976f0d5e056157
-EBUILD redo-99999.ebuild 1147 BLAKE2B d6481362b06d8e8fd2a071430149223e3592b5572c0cf9f042d85038a1ba2c800bf674d451995dbf4957dc00aee3458df4ad176081acb0e9f6d0b4579c66abc5 SHA512 ef402dcbf2da25f19b94ff91a17e4e4e9edd0586e18712ea30cb4784a311b0229207f54ca2b73ffae3d05aa5afb49626f6b4c4c75805f10c19912eb612670e7a
+EBUILD redo-0.42a.ebuild 1196 BLAKE2B cbfa9243f640002d8622c65df64485df5e28a4ce2b71affb4205fd9e18e0f8c29143eb6b68cd93e39f40cb9df98ba6f36dbe6ba4d360ff226dc0829524796fa2 SHA512 04bafe8b69fef1b9da0fe85d3edab9f47a4ab3505afa43553f9f94cd127b6db690ab642f6fa08c511969ef8a8ae8994141121a77f358338a62e9d30731a32c3a
+EBUILD redo-0.42c.ebuild 1196 BLAKE2B cbfa9243f640002d8622c65df64485df5e28a4ce2b71affb4205fd9e18e0f8c29143eb6b68cd93e39f40cb9df98ba6f36dbe6ba4d360ff226dc0829524796fa2 SHA512 04bafe8b69fef1b9da0fe85d3edab9f47a4ab3505afa43553f9f94cd127b6db690ab642f6fa08c511969ef8a8ae8994141121a77f358338a62e9d30731a32c3a
+EBUILD redo-99999.ebuild 1148 BLAKE2B 5623396573a28532cb16698935afdb2b64134bf7b1bcf5690d09a43ab379f86c892fafd4ff0c42e7da236d4e099a489db64055950bac47a626c954f1427508fc SHA512 840fe513cf9301856fb2266ce5b2943a0ea314d8fe0bc65f6e5f97a76a65a99ba525be1804c7fb59e0c873f5af42c0f78c85cf4512d02db136f67cf48218c419
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/redo/redo-0.42a.ebuild b/dev-util/redo/redo-0.42a.ebuild
index 0d80a00e9098..f70842880856 100644
--- a/dev-util/redo/redo-0.42a.ebuild
+++ b/dev-util/redo/redo-0.42a.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 BDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/beautifulsoup[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/markdown[${PYTHON_USEDEP}]
 	')
 	${PYTHON_DEPS}
diff --git a/dev-util/redo/redo-0.42c.ebuild b/dev-util/redo/redo-0.42c.ebuild
index 0d80a00e9098..f70842880856 100644
--- a/dev-util/redo/redo-0.42c.ebuild
+++ b/dev-util/redo/redo-0.42c.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 BDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/beautifulsoup[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/markdown[${PYTHON_USEDEP}]
 	')
 	${PYTHON_DEPS}
diff --git a/dev-util/redo/redo-99999.ebuild b/dev-util/redo/redo-99999.ebuild
index 340844257a28..be54c05a87b3 100644
--- a/dev-util/redo/redo-99999.ebuild
+++ b/dev-util/redo/redo-99999.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 BDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/beautifulsoup[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/markdown[${PYTHON_USEDEP}]
 	')
 	${PYTHON_DEPS}
diff --git a/dev-util/rizin/Manifest b/dev-util/rizin/Manifest
index 9be8b49007a2..4ea185d2240e 100644
--- a/dev-util/rizin/Manifest
+++ b/dev-util/rizin/Manifest
@@ -1,5 +1,5 @@
 AUX rizin-0.2.1-no-rzpipe.patch 432 BLAKE2B 77e959797f22ea6d32e6742651710ecb042bfa6bf00efccaedcd3d60a6f75c0bdb42128261ffe068d8cfaeb6d7abacef6ea114ffb9061ca365533a1fe2120c34 SHA512 7a03664ed99ea7f9cb214b566e2a74a0aee1ebfa643552ce90f4e7fb60e779628ba75c4cf34ffc3cc45b65d1dd8959d400a9af16bc49d7cc26f1499670ddbaa6
 DIST rizin-src-v0.2.1.tar.xz 51439132 BLAKE2B 3ce048c5e93afa43b33bb7c36e7f7a96734886a44a67339c18b36de84b6e3dd015aa49fd048815bc7cb26a39bd3c44ebd00227fdb0c3dc9d9f07ff2ff1f1948d SHA512 4d0a68971a8fe1de3860f8ee18197606f59c22d4c24f3fcce691c73b45c8fe8c356a9b411604e9c3d4e5bb01f695b6ead32cdc217134eb4ddfec76867c16c327
 DIST rizin-testbins-a80fd0d56d538d07a05ef01e29c8cb430a4f9d72.tar.gz 119214206 BLAKE2B 33916d466d77aaa0aeb6b221529a570a2bd2ad07b59b45967d75a84e3efbbc8ca3b8fff9cd88d61598b4e785ead2f8bc58eb7c1cb31007c27e497d80f36e4d2d SHA512 9b01a63ff281ac19b427e715d669e6080c4afdfd777ae762c30537c59bd2cdc2865adc1b34ccb61430b172e54995375b48bb35fd88f098b6a9839e9f3669fde4
-EBUILD rizin-0.2.1.ebuild 2002 BLAKE2B 9d2e43fca7f6bbc2d4dfbcd30e082a40632b32d073633e1d290fe1f5dc48e7f22f4ff9ab26b24bd2b726ad55f3fe7a5a6d9be092088a2a52cd01d19e481b0aef SHA512 7e066c1b1a4c4bec91a70990a338ca03fd2ea346842bbd70806f1bfde387be2d7efe64a3fa1099b792c4205c91298c09144eb8e41ad4cc3815df9479f1a4977e
+EBUILD rizin-0.2.1.ebuild 2009 BLAKE2B 335a2af33e2a4f4a503f1d5f07a692103e713c9196cd54063c6c2c2b247a160a14507bf681adf06055a87e79a699dedf37c717a042c10f98fbc65885c596e0b2 SHA512 e8c5d35259d78403b86414dce4c9fdf71112e908bb6a31ca1137d0a77b6789097be0b193fca18d5a7a2768c4d2125d85eeb697454dd3f110e478b73436afa6fc
 MISC metadata.xml 347 BLAKE2B 961a2a9b95f82059c0488f5420f33d65fdd0459973b1c6c5bd77e18eb8653ca83f3def91d8170891e8261a29bb2b5476c15a53007ffffbd3c987c30432fbece8 SHA512 d19f726b85dd3cba412ad60cdd57aa7fd879678f9c923c431ea1fe281e5b25fb04c4bba88946f47cd21edde8f5a4b61a4c7883d5b4582853df6922eef2f8669d
diff --git a/dev-util/rizin/rizin-0.2.1.ebuild b/dev-util/rizin/rizin-0.2.1.ebuild
index f8d2d2dd1bdf..056670c878d3 100644
--- a/dev-util/rizin/rizin-0.2.1.ebuild
+++ b/dev-util/rizin/rizin-0.2.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://rizin.re/"
 
 SRC_URI="https://github.com/rizinorg/rizin/releases/download/v${PV}/rizin-src-v${PV}.tar.xz
 	test? ( https://github.com/rizinorg/rizin-testbins/archive/${BINS_COMMIT}.tar.gz -> rizin-testbins-${BINS_COMMIT}.tar.gz )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 LICENSE="Apache-2.0 BSD LGPL-3 MIT"
 SLOT="0"
diff --git a/dev-util/rt-tests/Manifest b/dev-util/rt-tests/Manifest
index 849de712a92d..4f136eb7710d 100644
--- a/dev-util/rt-tests/Manifest
+++ b/dev-util/rt-tests/Manifest
@@ -1,4 +1,4 @@
-AUX rt-tests-2.1-musl.patch 9594 BLAKE2B bd05ee635f1213d202428260d5026e34bce319666f64ddd199efa981ab13e5d1eaff67eabeb435a9479970b27de52e77fed2ce2377b03675d629f4a6dcf40cb8 SHA512 0ad7dd21a9821567d9ea2a52582b54c1697c842b08eeb8f627410d24fc2e812e04e642a7355ba9a907720cecbdbc0d973e711f315b0e185a8f1046c448d067b1
-DIST rt-tests-2.1.tar.xz 114892 BLAKE2B 25a382c898ffdbbe7b6c3f69f440b87ca6b88cc634aae06a3e02154954b8b50da46e2f2b3291d7473bb0ae533f5a90a7769433650bab3f7c229a5d3022e32b50 SHA512 7abab6c1191247ac44f4e5193752474756d82fdf1d8a3b69c92c8d37bd4fe8458444d2165894fc8483590809ff5b4f1c755d66afb296e72041f9efbedd048d0d
-EBUILD rt-tests-2.1.ebuild 904 BLAKE2B 0979405e05778f450e9a3fd18fd942fb9be2753b58612fc81cfd5b516e7527bfa7ada38b7b444747fda618a9d69df26bb2c665f5420d64c0afec3b20bf6b488a SHA512 481b95eb148a0abb46893a4f97022e289c408a42c1b8a48f950555ff143f697a7118cde872d85a841212f7641671f8ed6b2e036c645cc959c02aa4db68cac350
+AUX rt-tests-2.2-musl.patch 9594 BLAKE2B bd05ee635f1213d202428260d5026e34bce319666f64ddd199efa981ab13e5d1eaff67eabeb435a9479970b27de52e77fed2ce2377b03675d629f4a6dcf40cb8 SHA512 0ad7dd21a9821567d9ea2a52582b54c1697c842b08eeb8f627410d24fc2e812e04e642a7355ba9a907720cecbdbc0d973e711f315b0e185a8f1046c448d067b1
+DIST rt-tests-2.2.tar.xz 115120 BLAKE2B 46db78d32b2d5830859757c21e42d4e21cb0da8b2ebcbf8ba738c8e3832a6ea597d686ee6c9cad23f269853ad188219f46a0e5326124f056b4822619076268ac SHA512 826dc8894dd8670e705566b5224f54bdee89e5b48f21ca00e6c4061f28c4fbe2dab14c1e1b1302fec7011dbf28f3eb88c1b8adc137fed7d17958ea972e3c08b1
+EBUILD rt-tests-2.2.ebuild 904 BLAKE2B 9cb0090ae4f160b1f7f6363e250e4e478deef06a5af0dcec81f3c9eb5c9ac943da7814c363d2e7f6900f5a8b4275631260d8b03d43324844032769afab2ab2b7 SHA512 a4e49434a053a31bba7379cda1e41c328d289380503316df3b5cd495c4227b1c5b3f4f98d62c4bfc1a66253843df687908e08d393042449b15faa853187e0fc1
 MISC metadata.xml 748 BLAKE2B 6603446c7aa66d6586f9e8dfa53c6338f9287c3ecf6768b67554832fa45ab38f488dc54d077947e46973c251d454320adf8788ebd8b797055604b26c878a428e SHA512 c2c39041a28bfc866667589c67f8c3a8b044489fe4b10b247ee770f41b84fa75b1d55eaf70d94e0e43d27e82774aff982c4fe72555933baaedcb208b01d17cdd
diff --git a/dev-util/rt-tests/files/rt-tests-2.1-musl.patch b/dev-util/rt-tests/files/rt-tests-2.2-musl.patch
index caa8d415aad5..caa8d415aad5 100644
--- a/dev-util/rt-tests/files/rt-tests-2.1-musl.patch
+++ b/dev-util/rt-tests/files/rt-tests-2.2-musl.patch
diff --git a/dev-util/rt-tests/rt-tests-2.1.ebuild b/dev-util/rt-tests/rt-tests-2.2.ebuild
index 8f2df0599b23..93d7da4245ba 100644
--- a/dev-util/rt-tests/rt-tests-2.1.ebuild
+++ b/dev-util/rt-tests/rt-tests-2.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{7..10} )
 
diff --git a/dev-util/samurai/Manifest b/dev-util/samurai/Manifest
index 7ce2b34bf515..a2e6d5763415 100644
--- a/dev-util/samurai/Manifest
+++ b/dev-util/samurai/Manifest
@@ -1,5 +1,5 @@
 AUX samurai-1.2-null_pointer_fix.patch 758 BLAKE2B c476434d74927d78dbd8f97e3d3e588abee22fc5650b40ead47b5b08e5dee6029253c54047f7f78f611e0ba3008c13b77775727ee547aee6d8bab5d56e99c80e SHA512 0504b137fc9ac113453075a22bdfac4ab7616f668e640b7125041400729aaecad1173c528934223246035f68a95d92c6a85e62d1ea5fea996d85647cb33483eb
 DIST samurai-1.2.tar.gz 32709 BLAKE2B 86ed79f7d6ab492216cf3bf0e19ff8be8c1ca37e5c99de84b457875fa710d720624bd0de53105ed0b1d382c417aeb7397929cb9a35a8d1b36a11e053bf8d7ff5 SHA512 bbe6a582c34b04f1df53b76c1647aa3e03c4698ebf7591a203935f11ffa05971bbcb86dc1a8c06aeb904cdc741abb08918122810fc47216fed0a6d9f87fd1225
-EBUILD samurai-1.2-r1.ebuild 651 BLAKE2B b2cfc0bbf51b51e13e71edbf5e473166ff13f0b7fffd3fe7cfb951c17ea3d2c05da603ea080e27b1ce86712d7b461246f94b7f7cb0e07c25c27f758657d63464 SHA512 967ea36c1f675da1178a02de56d0220637e441150ea96a4b37d8eaadd1f97e16f04f2cb8d7ebb4b0d63fa2c488ff1da52b781cda2f38645233920b4445f91ecf
-EBUILD samurai-9999.ebuild 587 BLAKE2B 6fa336e85f0c650f436c6e36083b90b37398e0c688a9a341ee5663f1b15d74ec92374c290c0f426add46a34f7c0b24deb65a4be396e928e1a35b00e193fa22c8 SHA512 6c2c92f6751892a7842f4033d75a3ae15faa54e234db866dd9333ed2435409d1ac062681e14c4b719802442581e259a0286861d5319b6a97a2a34513ba4ba444
+EBUILD samurai-1.2-r1.ebuild 719 BLAKE2B 083a7a57c20ee650cdcd23063e2d4cf21a7b72e8bad821809429ef0f74cc8dc4f037af3bd5c578d90d9fa71f05ddd268b31ad683854e8caeb2f27f24d852e27d SHA512 f2a98101f6835a85642105633256dc62d443bc9e3fd264cbfba6c5e32ca4fd8dbc3d76ed7a5c68131045fbd0d82115c27037fc852bf4c5b35bfe4b13cd2109e8
+EBUILD samurai-9999.ebuild 655 BLAKE2B 758ccc46bbc5975620bfb9f07fc229c761318794a3db4637efe018f780eba4bcf86fd946e21d09ef4e60dcbfa449990012fd4a64f51afb0935f20946b60a185a SHA512 5b72cb8d504c2abddea126375cb7d1c3283f4b172e1d2288f838d53d2477b0ef270ec74fbbd089a48df21112ba5de6822ab349a5b33da409815e6bfda0b1f29b
 MISC metadata.xml 470 BLAKE2B 9f86033b2410be9ab907e95be93a590792d8f586d80f00a44f6788ec5b61eb4fd79d1b93be7a345a90dcfdc48087a80d87b7143699fbc17ea672e8ab741c554c SHA512 6de8f7a6372fb52ea9a0b9c43afe4569d570491252385f06a1445376a56d6e12e768932348cacdb3118961720b4837e07b8a5bc39b03427cbd4289173d5bc995
diff --git a/dev-util/samurai/samurai-1.2-r1.ebuild b/dev-util/samurai/samurai-1.2-r1.ebuild
index ad8d964b12b3..c2072fc277b1 100644
--- a/dev-util/samurai/samurai-1.2-r1.ebuild
+++ b/dev-util/samurai/samurai-1.2-r1.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+inherit toolchain-funcs
+
 DESCRIPTION="ninja-compatible build tool written in C"
 HOMEPAGE="https://github.com/michaelforney/samurai"
 if [[ "${PV}" == *9999 ]] ; then
@@ -20,6 +22,10 @@ PATCHES=(
 	"${FILESDIR}/${P}-null_pointer_fix.patch" #786957
 )
 
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
 src_install() {
 	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
 	dodoc README.md
diff --git a/dev-util/samurai/samurai-9999.ebuild b/dev-util/samurai/samurai-9999.ebuild
index 4333d1997bfa..6895ee86fc65 100644
--- a/dev-util/samurai/samurai-9999.ebuild
+++ b/dev-util/samurai/samurai-9999.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+inherit toolchain-funcs
+
 DESCRIPTION="ninja-compatible build tool written in C"
 HOMEPAGE="https://github.com/michaelforney/samurai"
 if [[ "${PV}" == *9999 ]] ; then
@@ -16,6 +18,10 @@ fi
 LICENSE="ISC Apache-2.0 MIT"
 SLOT="0"
 
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
 src_install() {
 	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
 	dodoc README.md
diff --git a/dev-util/shadowman/Manifest b/dev-util/shadowman/Manifest
index e7913a28f363..13a045889711 100644
--- a/dev-util/shadowman/Manifest
+++ b/dev-util/shadowman/Manifest
@@ -1,4 +1,4 @@
 DIST shadowman-2.tar.gz 3349 BLAKE2B 2881c0487205c00114967be7600ef5483cc64c7ad5ed5cac60fe8bf2ca17e5b06d5df6e39148d90ff68a51d3e918ca616d0c5eedf11366df90c788a07e4c63b0 SHA512 eeb10248c7f76116352bffa671ab7c761b2f79cb943de20dba327b0d7bf1126d15021508c9e9389b9f0c37cf5049ad2c67bad93f6a03340fcfd27e03c4969110
-EBUILD shadowman-2.ebuild 672 BLAKE2B 95e4ca9b2528f2c318de4b10947a91cf3e77a4a57f96226861cfa77f0fb8f14119fbf01453d38dd63c4ce6975d64433ad8415a491bfc9618fea919a56ac02e3e SHA512 9e1a35b1fa0c4dc1c3ba1d780e2af79d2fb736df25a7b67655370a17fbe3b38f59bcf7e53c35f17502ac23e76fa0eb367000d123740e25930a63656d3b8fd71a
+EBUILD shadowman-2.ebuild 671 BLAKE2B 2174ee3172d4a4a21344915fe180d6726ffb601e9cf712b42da88c151901c75bd487e821f8c594d928c3bea651da7064a60a4a81a434a9172d15f9e9b95d3204 SHA512 8de2ab283abb84f135a478ee435a12386adda2192f7ffe45a4ff0b01a4160d9a61282e6cd1424575d2457c2f35d6c004d75a78a5fe592fd550c097ad861af4a0
 EBUILD shadowman-9999.ebuild 568 BLAKE2B 199779d69123dae88d3024a00370b24a898f40ce7aca43257e0dfd3a9747f5b969133cffce9aa70ff1fa0555a18442e4170829df7d27d397ea10b96136a76524 SHA512 4325db35429e59387690b10c09e86268e79e3a4a5e968075f36155fbcd5af7e0ec0a79b6a08b6e9e74ea5cad6727be0697abebcc63ba48c7449cd54141edd794
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-util/shadowman/shadowman-2.ebuild b/dev-util/shadowman/shadowman-2.ebuild
index a9ade3439891..42799184709b 100644
--- a/dev-util/shadowman/shadowman-2.ebuild
+++ b/dev-util/shadowman/shadowman-2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mgorny/shadowman/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="app-admin/eselect"
diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest
index 1e1b370797db..9b09bee70520 100644
--- a/dev-util/spirv-headers/Manifest
+++ b/dev-util/spirv-headers/Manifest
@@ -1,4 +1,6 @@
 DIST spirv-headers-1.5.4.2_pre20210526.tar.gz 406038 BLAKE2B e10042a4c09668a6eb0d2f08a873794e20d83e6f7be40d58c3a59e1d96aa6845060a9fd7e90ea4e6a940eddbabf6b725be756ea64b49ef9034b34dc6c33fa5bb SHA512 ef9b171c168963a3f25643a3ce5f6a5df3b811daaf237700f793c1d313016c148b107b0d8cfe81fa4cb72f8da87a3da58387545f7bd76d15927c4742d0dc2b68
+DIST spirv-headers-20210817.tar.gz 414897 BLAKE2B f10997c6bca46d48a592ce12b59817d31b0e5cd77fa0518c8ecb0d1da56d54a49562fb8f6fd355feb964f93129a6304ec14ed2a5f1776c130c8e3b727fd93192 SHA512 837ebac5afe05b2eb08029058240a8f08d49eca701201f93181e3a9076a15b67421122e8322a4230d6e21766dc85396be6415d352769791d6a44dbae59ce908b
 EBUILD spirv-headers-1.5.4.2_pre20210526.ebuild 514 BLAKE2B 411e68b89f8ca47e4d7b28c863cc933df12034186ef6c811b65522aec05655be4d87bb20b9648cf51a31933447a7a22844325b4da7ff3b3cec37371ea28845aa SHA512 2595b8d59279ad0eb28beb55c4946c1848a7ab86fb8fff6e17a9ac085918a7f9f3c226729c5af86b19c860f6b7d2e65dabb754601df9e92073d88858435d871e
+EBUILD spirv-headers-20210817.ebuild 520 BLAKE2B 113a986d9b15fb5d3f5fb0357736a570fb5403a43514236a8094c1d632b4111b9d3bbf4bea703306c83b2542d98d7a2c41703368f60d74a2bc123851c48247f2 SHA512 4aa5bc2b62deca9958ba2a4072d026a8d166b403e81ecaffae7d1d42c8756e3dfe79a10236d0d1aa0f64fbdb7afc42065b2827ceb9583aea89a146b116928490
 EBUILD spirv-headers-9999.ebuild 600 BLAKE2B e52054009b4c2a119218fe8e7d1d7606a5355fa93c8a9e14d7e6174dc212d2c87a7d2c57106bd4d217c8fd0ab88234e5a186f700664ccbd04de8b3520afef10e SHA512 420d7be91c892302e0b052c9bf1a628d663f95051a6d38580944aafd1c43c395cb87cec8df6d2d756b8fb4a177b23671911f58c05e9e5b035a41b0b9bb399dfe
 MISC metadata.xml 430 BLAKE2B 6b143a506671795115d2b676cd50050b856f54cb93569d7c4892d620b742c9f2c0cceea268e9438b20854a73d7c7a157d78b353e17a595302c21c3d2c52b55cd SHA512 59dc2bf8f8df13626f1b48600ebfa1f9d14fad03efe8e0512f9db5b1928d98ccee16182ade4567f49764f69bb4004747d6746a1e966ef6d1feeb88bf0be766d4
diff --git a/dev-util/spirv-headers/spirv-headers-20210817.ebuild b/dev-util/spirv-headers/spirv-headers-20210817.ebuild
new file mode 100644
index 000000000000..17e0b0e120f9
--- /dev/null
+++ b/dev-util/spirv-headers/spirv-headers-20210817.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Machine-readable files for the SPIR-V Registry"
+HOMEPAGE="https://www.khronos.org/registry/spir-v/"
+EGIT_COMMIT="449bc986ba6f4c5e10e32828783f9daef2a77644"
+SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index 02d4e7a50538..67666d0438cf 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,4 +1,6 @@
 DIST spirv-tools-2021.1.tar.gz 2613619 BLAKE2B ab5816e3407ba827f5db69cb391b0e4820661aa7367edfc5a9a41cb9fee98a7e814f765d99548cdab1a11869f79710e6243f2c97ec3ee4f6a919990dc24e63dd SHA512 74be4ecb3f6926cebdbfdc2351e3d3e0db18a8a312ce12882442d4e33737f9ccfb0ec6e1f5cd6bb5604525467605c080a8494b4aef6dd797dc805e12bc10226f
+DIST spirv-tools-20210825.tar.gz 2852443 BLAKE2B 87c24d6c5506097cf24b3008450e54a652c1e9d0ad1dd61499b65cc93e4783db2f86b3138ef2c8f33b8b242fc55dfa279d135d347bd21dd8977773ae302ae430 SHA512 d99cb85527810413e6df386342a5d0de201defe401fd175f0cd15604dcba0f8c157b63b4d49be64b5161b6a97c0a6ae16fe82080368ec6eb64cd71300d056bea
 EBUILD spirv-tools-2021.1.ebuild 1254 BLAKE2B f59d178590ac5c0985abb3698c6a2b7618e6f199fbc5018cac01b2e9f63b73ed87e6f1d05bd5bbfaf6edc929e9ab119e46bfae51573b621c7a7f6a694634b9bc SHA512 6a47a37de6a9b741e37c279f8cd910486b1978ab3e94bb89013d7d30b648e511e90559d1798d95b8a9d1816c18509668e5182125b8e7f790c02a53c99c4f434d
+EBUILD spirv-tools-20210825.ebuild 1249 BLAKE2B 0ed3b9118c7ee8068f67d50db3400ab1cc0a953d7720e049f40b50cbcd6aba39af44b6c13afe876cc1847bb15f20a88e4461e8ab2f7606f3f81a29739c0199f3 SHA512 794f2c7a03e71fada2ebdc627a2a75fc7121c5719b2794d9402e44d60453adf429b721b038156c7449d778fd268945c4a914e3e83aa0bcb7ec3684ec47ba3f85
 EBUILD spirv-tools-9999.ebuild 1249 BLAKE2B fff6ed718fed7223911810ad47847230aa3f77c08925893e63e04cd55d4c3486b4e653d26e638a44bce7d9cdce178dff9a01e8b5d99777b245eac9b8563453b3 SHA512 0081fdbc259e420597b3efcd1985cc4e30a963bbc08e49701fb1b7218b092d2af373d510cc484a2e8a1de8e9032f91d0d49272e09f9a5645042bebd9cf278dd1
 MISC metadata.xml 428 BLAKE2B e5ec493782c93cb593d56b58a4f1d8b89dad2b0a11cc5eb2faf6b9cdb898e1097440ad446f0c920c69bd0eddfb9225bf8fce8d3749a03f8e6e5c94cdeea5173a SHA512 a5c873d573590a7c538f96d03bbe66b9a42eaabd5b96bafe8642a9cdde2a27bd067e5e46802ceb76e83160af0e4dd052ecc0b6e8c3b6fda3ee15a2eedf1d8b08
diff --git a/dev-util/spirv-tools/spirv-tools-20210825.ebuild b/dev-util/spirv-tools/spirv-tools-20210825.ebuild
new file mode 100644
index 000000000000..e4f15743b655
--- /dev/null
+++ b/dev-util/spirv-tools/spirv-tools-20210825.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=SPIRV-Tools
+CMAKE_ECLASS="cmake"
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	inherit git-r3
+else
+	EGIT_COMMIT="1fbed83c8aab8517d821fcb4164c08567951938f"
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
+fi
+
+DESCRIPTION="Provides an API and commands for processing SPIR-V modules"
+HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+# Tests fail upon finding symbols that do not match a regular expression
+# in the generated library. Easily hit with non-standard compiler flags
+RESTRICT="test"
+COMMON_DEPEND=">=dev-util/spirv-headers-20210817"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND=""
+BDEPEND="${PYTHON_DEPS}
+	${COMMON_DEPEND}"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		"-DSPIRV-Headers_SOURCE_DIR=${ESYSROOT}/usr/"
+		"-DSPIRV_WERROR=OFF"
+		"-DSPIRV_TOOLS_BUILD_STATIC=OFF"
+		"-DBUILD_SHARED_LIBS=ON"
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index 11803bd8922d..9ddce59aab79 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -1,9 +1,7 @@
 AUX strace-5.11-static.patch 5306 BLAKE2B 24150fcdf0ff75c4698542914bcd0fd39df9794f39ce0d16dac6dc3b689365e124d8d77a75a8fe81caff9432679563d84ffd31add74edb4c8f83aec28ff2f078 SHA512 bbeecbfd73109d21732acdaa28d5b4c82b23b7165f09e78e62cad68f9ac63dfb4c7a1c2eb8bdc642dda9f07d62e286ab46a2be236b5f03e1e6f9920f3093ede8
 DIST strace-5.12.tar.xz 2009060 BLAKE2B 9a7a07e5d2d38c8b456f54d0e1d7c776066b20327fa08d562e426a7096f708dffa00f0c2121683fa71f7029db958d450c5a6abf5ae5970dc02732f5aa7cef591 SHA512 289cf82da4c69270458953b45d09c8eb05a6624898d3ac493c3ec293cd5ad07205084ad0af021dab2be9c0dc53f0301816113a746d96c78780b79231a185e7c9
-DIST strace-5.13.tar.xz 2040116 BLAKE2B a604342d68f504b42ff1cb4918aa9ced6575f589caeb62f53e0b125f24cfaf0423f1911f352f21ecea0d702197d65edc85d3e97ffca3561f619f9c4c80386cdc SHA512 ba8b0eae396fa2b762bf17cbcdcd84b0660b2a5d5e7e9caf098ef3414a87fd28d4140dd10136483f35904560e5044e40be2bf6117462868a360306d62887c8ed
 DIST strace-5.14.tar.xz 2067020 BLAKE2B 479ecf5e66e26e722d108c905130f482c411857db234ac013bf3568905c0f7b896f001ba6da2cabccd0a987c7802aebec9c6298decb691de125e8154c28e1c6f SHA512 3e147521773d900167809db9feeb148e8ba116f90dd634311941ea335eb7bd8b73ab9e641bd2dcfe899ab41c19a841e203dc771ec3000ae01452d22ecdc43c5a
 EBUILD strace-5.12.ebuild 2348 BLAKE2B 59a4676d944dc05b012d9f8b47da68b3d23f95d996dd25ccdb9aab5cda3c3cb950c1ab000aa9536df55b4ee9e59bb4f42bf865f42b295c15cd75655ffcdfc918 SHA512 00c1828d50d7b02ca56f586eb2c3187f9ccddfe38b71a230304a9e111d6d7fe7119da38ff9a4998a4cc6393971874ea6ce699dfc8ae5291f038aca762533084c
-EBUILD strace-5.13.ebuild 2356 BLAKE2B b065af02da7b5432fec1b1fe5c7389325cbb9526318aef6045c42011a002480b569b122311dc52ae9c76ffa27a732a6de1986e525e840e86535ba5392b3c1598 SHA512 52e62ee4c32480c762a49e85aa81b200b2eb0104794ab8535b9202824f126769f42dc013e805cc58fa03f318682c2c9c2f83b5388d425d0c8ece0e79f2de1f03
 EBUILD strace-5.14.ebuild 2346 BLAKE2B f49e8823133e87f9f6c40419285b499137b4c96aff3d5c14e71eb12bc6f0cfbf5d2ac130b072449a8e57ecced242f83989fbe01e7b66db4b506b235f7897050d SHA512 c3a186fc56759642f23354b68934054efac2acc858be809ec690084f6ef019dfd028b29875e94d671198e0c08f036d2efa05f500776283b1eac270b47cd7d397
 EBUILD strace-9999.ebuild 2346 BLAKE2B f49e8823133e87f9f6c40419285b499137b4c96aff3d5c14e71eb12bc6f0cfbf5d2ac130b072449a8e57ecced242f83989fbe01e7b66db4b506b235f7897050d SHA512 c3a186fc56759642f23354b68934054efac2acc858be809ec690084f6ef019dfd028b29875e94d671198e0c08f036d2efa05f500776283b1eac270b47cd7d397
 MISC metadata.xml 760 BLAKE2B 05d51ee681a1103d9619582b1f7788c1c0f2ff180b55fd26cbed2f5aea52cae0e9333ae31fc93a90f8c33798f5caeaf6bc1039cac9a023f114c79c71abfb8480 SHA512 3a7445fe5210eaf6c98ed5193f3e79567e6e815e295671669c2894f3f53a2decd5f2b4db5c87e85cf8b71cc4743fc94cc4a800fb33493c5f99f40ec83b6e57b3
diff --git a/dev-util/strace/strace-5.13.ebuild b/dev-util/strace/strace-5.13.ebuild
deleted file mode 100644
index 73df00d83ec8..000000000000
--- a/dev-util/strace/strace-5.13.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/strace/strace.git"
-	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"
-fi
-
-DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
-HOMEPAGE="https://strace.io/"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="aio perl static unwind elfutils"
-
-REQUIRED_USE="?? ( unwind elfutils )"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-LIB_DEPEND="
-	unwind? ( sys-libs/libunwind[static-libs(+)] )
-	elfutils? ( dev-libs/elfutils[static-libs(+)] )
-"
-# strace only uses the header from libaio to decode structs
-DEPEND="
-	static? ( ${LIB_DEPEND} )
-	aio? ( >=dev-libs/libaio-0.3.106 )
-	sys-kernel/linux-headers
-"
-RDEPEND="
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	perl? ( dev-lang/perl )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.11-static.patch"
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	if [[ ! -e configure ]] ; then
-		# git generation
-		sed /autoreconf/d -i bootstrap || die
-		./bootstrap || die
-		eautoreconf
-		[[ ! -e CREDITS ]] && cp CREDITS{.in,}
-	fi
-
-	filter-lfs-flags # configure handles this sanely
-
-	export ac_cv_header_libaio_h=$(usex aio)
-	use elibc_musl && export ac_cv_header_stdc=no
-
-	# Stub out the -k test since it's known to be flaky. #545812
-	sed -i '1iexit 77' tests*/strace-k.test || die
-}
-
-src_configure() {
-	# Set up the default build settings, and then use the names strace expects.
-	tc-export_build_env BUILD_{CC,CPP}
-	local v bv
-	for v in CC CPP {C,CPP,LD}FLAGS ; do
-		bv="BUILD_${v}"
-		export "${v}_FOR_BUILD=${!bv}"
-	done
-
-	# Don't require mpers support on non-multilib systems. #649560
-	local myeconfargs=(
-		--disable-gcc-Werror
-		--enable-mpers=check
-		$(use_enable static)
-		$(use_with unwind libunwind)
-		$(use_with elfutils libdw)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	if has usersandbox ${FEATURES} ; then
-		ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." #643044
-		return 0
-	fi
-
-	default
-}
-
-src_install() {
-	default
-	if use perl ; then
-		exeinto /usr/bin
-		doexe src/strace-graph
-	fi
-	dodoc CREDITS
-}
diff --git a/dev-util/umockdev/Manifest b/dev-util/umockdev/Manifest
index 0d60c0d60bbf..46a3382692ff 100644
--- a/dev-util/umockdev/Manifest
+++ b/dev-util/umockdev/Manifest
@@ -3,6 +3,6 @@ DIST umockdev-0.12.1.tar.xz 756920 BLAKE2B a8c1d9734f4c0a8e7f19405e011ce964efce6
 DIST umockdev-0.16.1.tar.xz 478308 BLAKE2B 3d49ca1d9c9b7573ac63f5f7ecd81071041597732b507619c333379095434ac55eb26f16bdf5897b94bbeb5c307a34b703accd220cd6202482e172dd3a6d1983 SHA512 baeaf05cc6b8d8e2a5cae16b808db759a18a969cea0f2ceed5f6c2521edc0c4c07dc16265a4821051de51f4314fd39d63ebf2da124fcd3e103ec743dadfedaa8
 DIST umockdev-0.16.2.tar.xz 478388 BLAKE2B 8fb2116ec7d48b238898052d959c596f4f91a65cf7b8292de8b8731e6fe50600282cb56093b8d6ca1afdc082a12c9af3c4a4f443283538ffb2aeae4c2b775596 SHA512 82020c068d5a158a762f865f4b25d1ee8596785a5b379c316c652004e1b1b9c533d4dad87818a490f89983a4c065f34e4ff5ca91360bac6d79b141dfa2139eea
 EBUILD umockdev-0.12.1.ebuild 1304 BLAKE2B 35be39188381c08265e988b7dfc58b6b1f48b57ddb9b8d253513b37e592239d53e0e3b3a7561767336a4910505c47d4db2bba5bcb9d8472b63395d748275e8f6 SHA512 68943daec6ca268b1cc2069286fd4432cdb036c161e4b6a19c1de935a8f28414db30edc854fa87cfc04523c494886d4dc2c86f296f6e8209eee9deb13faf0dbe
-EBUILD umockdev-0.16.1-r1.ebuild 1131 BLAKE2B 30c4ef2eaa38c6d6b39676973819f8966efc3df8da0008aba7e67427be11f7f57353cd03f886ec68016a75d04aa31a37e69ba28a6ffa8855e77bafab30ba368f SHA512 b7fd13a47964d6f7340a41271b4559e4ce7993daeb36e4d611d784c242cc75aa3ae54536af63ae6b8a8f6a85bf8027e9bc578c38fc4163ae662811de80bcca74
-EBUILD umockdev-0.16.2.ebuild 1131 BLAKE2B 30c4ef2eaa38c6d6b39676973819f8966efc3df8da0008aba7e67427be11f7f57353cd03f886ec68016a75d04aa31a37e69ba28a6ffa8855e77bafab30ba368f SHA512 b7fd13a47964d6f7340a41271b4559e4ce7993daeb36e4d611d784c242cc75aa3ae54536af63ae6b8a8f6a85bf8027e9bc578c38fc4163ae662811de80bcca74
+EBUILD umockdev-0.16.1-r1.ebuild 1128 BLAKE2B a3bf80887b5946691abc5e724dd4ea025bd7cca289a17bb9c46c2850e6cb3673c9ab4c8e89af4c2afffc6ff49f611976f3b329772eb49226e45cc2932a45834d SHA512 6fdd8c2463c4ae1d83dd00c37b5da94c4938e30ddae1011a389f7b5c6ca3ed0c6b8b9c344348d843cf4cf2f762a2d65cc9a83761b8ae75bb821a2e56d3f90d65
+EBUILD umockdev-0.16.2.ebuild 1137 BLAKE2B 17a4fd6310ee5845f93739adeb6b991ab1ecb0756de62271e2e63027c49955d679e75feed3296786d0963cadc7feabcae06bb6e6e41e7b534a1060baccc1d7e1 SHA512 2ff8e8b6ff0dc777c3715aa0d579ce466f0c974ee8696922633d6d386ba5ac8e527dec4d81b0e2ddca018b5facf9401e573f2fdafeb350b62cf03c5b1d443fbd
 MISC metadata.xml 388 BLAKE2B 5140e5be03021c8b50516cddf6a51b8715a1e110e13519313cd3e30b2317874cec5c56eea5168d47496a2055635b87effcc66dac54a66a482818da15b540186d SHA512 ca1c14fa200681d916d6d4539fa9ee8c64d6894d7b78870abfc4ad03446a30703f0fe862a11c5838e26719ae66e0bc944fe0ca75f0f89195128d4e8856b6cd78
diff --git a/dev-util/umockdev/umockdev-0.16.1-r1.ebuild b/dev-util/umockdev/umockdev-0.16.1-r1.ebuild
index d57690e716cf..cf5dc5f74cd2 100644
--- a/dev-util/umockdev/umockdev-0.16.1-r1.ebuild
+++ b/dev-util/umockdev/umockdev-0.16.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/martinpitt/umockdev/releases/download/${PV}/${P}.tar
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/umockdev/umockdev-0.16.2.ebuild b/dev-util/umockdev/umockdev-0.16.2.ebuild
index d57690e716cf..b91966d64e13 100644
--- a/dev-util/umockdev/umockdev-0.16.2.ebuild
+++ b/dev-util/umockdev/umockdev-0.16.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/martinpitt/umockdev/releases/download/${PV}/${P}.tar
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index d90664288240..fde01060ce96 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,4 +1,6 @@
 DIST vulkan-headers-1.2.182.tar.gz 1162517 BLAKE2B 0dd396dde2cea94529b99a079cb082d01b4223cd1a63a4bff6405f882b95d896080d62ebfe34365ee104de8530ceaaba6f889443a813926838c82db9938d5ee0 SHA512 045091ad94d335fb4743fb033ca581a5c128b23633d61dc403bddfef8f88b6ae86afff628b2f2f333ee5edfb0f6f68f060e2402d27d5ab53eaed850a16de8782
+DIST vulkan-headers-1.2.189.tar.gz 1191160 BLAKE2B cd322dfd4ad9010cf4a7d84e8bd450fee48008f43aebed69253d42e786d446d1afa2fc32915d7021b8f75fe6a70400ca57e06a20b075aad78a524f811b3ba1fe SHA512 883a3d69c48bea307681791c6e9d5efa4f956c5beba70d3cac87826bade633cbc98feeaa34607a4754c460cb262e0d6a7b20ecae5c3fccb765181d04402daa13
 EBUILD vulkan-headers-1.2.182.ebuild 611 BLAKE2B a0dc00cde81752730cd13704bd71f06943f2a523306bb250ec4043c2cbbb7fccf9a9ab4e90ca7bb6811852f9b866940a7722e623dea0d36abff1d7001d8ffe40 SHA512 e08e859280da3384fc8248b255333b8e781e4a6d57c3cf8952b37f905bc78b5ca8df25bae6d79f39ca52bf21f1e11786bd2b60d0d70cb7a6b93eb66cb49e0b7c
+EBUILD vulkan-headers-1.2.189.ebuild 617 BLAKE2B de17fc55658dff792497262a77db71dbc9a360c6a35497522a7681452bf52398f90435bf6738477f09fa4cc1fcf96c3785ed6b222d9d7a5bb4ff257778dc63eb SHA512 9396dd22eee89217748990fcd336163561244de835947edc5ab6028b63ab16666c9ce28fb737563d572891de036bf3b435b68f6a89191bd2f97b12575af1b80e
 EBUILD vulkan-headers-9999.ebuild 593 BLAKE2B 101dc4954cc61f0375202d2398a3bab6e99e379f9dbc3aaab01129670e0413cba3fc9d15f031a44f634ec7576f0cd6bbd52ccfdbec0de9d703f6db5a9a2eff52 SHA512 a95238b09e9d71d72588e9e90af0d99590a8d4fffb6b134cc75c5b9bfc542c40f7a438447ce06aaf4a5ea5922d9ce49763af91b49934c8f66fc5dbb1d7ea8246
 MISC metadata.xml 431 BLAKE2B 69dedef8b74edc3fa3b45eb8af40784b585f84007d205c4db52c3d05abccb20e7c078708f3bcedcc8dac268eced84c03b0bf92cd836ee7a9f2dda01b1c87a65d SHA512 88631011f2fc130495c8a9feeb24691389bfac96a8db4b1bc4b5503e354f0fa882a516ba1af7bcf72d7604c8974ab72a2189c8cd7feddefaaaada54cb405898d
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.2.189.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.2.189.ebuild
new file mode 100644
index 000000000000..9eea670b13dc
--- /dev/null
+++ b/dev-util/vulkan-headers/vulkan-headers-1.2.189.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=Vulkan-Headers
+inherit cmake
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}"/${MY_PN}-${PV}
+fi
+
+DESCRIPTION="Vulkan Header files and API registry"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+BDEPEND=">=dev-util/cmake-3.10.2"
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index ffd449562d30..abde6f76f81e 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,5 +1,7 @@
 DIST vulkan-tools-1.2.182.tar.gz 847991 BLAKE2B 5ab9d73383338bcc3c54487f0f433466d9974269d3be2aa0d50281affeee8fb94414eb638fc94be6fd2dc059c0a2d3dca4e9a8caf3e2b8758c03c57373e2f73b SHA512 5cc9500923288641529556e82a708b88f7dc775c75166d10ae2a807562ce9dda3993aa01a261ff4f9c2cc31ea47423a12f21ec64d32e6aee66ef7c3fc2dc17fc
+DIST vulkan-tools-1.2.189.tar.gz 849041 BLAKE2B ae38aaca9789276bcb93c5c297c9113fcced4cd3417f0619c0e1fb539df5891e725a77785fbeca0c8957644af7245ff9f0a3981cf5f8726f4f231e39f05ddfbb SHA512 3ac4f79a6ba18690026d1933b7f3c45769f9759e25d19508bc34d431454dc548e1f738ae3d804db2864a97de3b8628f167bc00dcad4059eaeb1714e4fdd3507a
 EBUILD vulkan-tools-1.2.182-r1.ebuild 1960 BLAKE2B 58cc40ddc91151c04eccf4fb10a341e10105f20d195fd5c6d988dcabb22c0352ceeaa0807d443af45fbc4e365286059df8e1ad033657194f389a50afebc826aa SHA512 7fa32f411fbe29e6a999c5c591b21c4388d5400c76e1e7a59494f703c68f7af9f38065b6a9d6260685377e6ddedba8695871daa6b431c388c2e6b4e085c6eca6
 EBUILD vulkan-tools-1.2.182.ebuild 1860 BLAKE2B 3e3f89a5c3f26601333dc91a3532638d08bb15023f2cf487dd075f300245fbbe109b7b84f4046af3972132504d41a8f8bcb82c03bc8c24f9ad0c738d456beab7 SHA512 ad5a23b0a5e4375d80f0d5f912daceff89992c563ba29858f8ddd9b5b3a34a5c3570a80d57617493662b76aa0033027849b0908f463ac88aed55715c91860c9e
+EBUILD vulkan-tools-1.2.189.ebuild 1960 BLAKE2B 58cc40ddc91151c04eccf4fb10a341e10105f20d195fd5c6d988dcabb22c0352ceeaa0807d443af45fbc4e365286059df8e1ad033657194f389a50afebc826aa SHA512 7fa32f411fbe29e6a999c5c591b21c4388d5400c76e1e7a59494f703c68f7af9f38065b6a9d6260685377e6ddedba8695871daa6b431c388c2e6b4e085c6eca6
 EBUILD vulkan-tools-9999.ebuild 1960 BLAKE2B 58cc40ddc91151c04eccf4fb10a341e10105f20d195fd5c6d988dcabb22c0352ceeaa0807d443af45fbc4e365286059df8e1ad033657194f389a50afebc826aa SHA512 7fa32f411fbe29e6a999c5c591b21c4388d5400c76e1e7a59494f703c68f7af9f38065b6a9d6260685377e6ddedba8695871daa6b431c388c2e6b4e085c6eca6
 MISC metadata.xml 499 BLAKE2B 9ede9725de281e0877f865e41ce68be15d5c04fd95023d3ab1180f4987c506a8f12ad23412ecf5795f6f8e6f36e576bc65f7cef786ced70296f5a4a8584ac4f1 SHA512 eb5dbcfbb58449c5a6ae7580f0c8a25c06f85fd6ac32fe1354fffe550214465921dace3c05264c11517d7dbeeffa444eb468d63f4781c6383f4be8a4202ecefd
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.2.189.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.2.189.ebuild
new file mode 100644
index 000000000000..82f33ec2490c
--- /dev/null
+++ b/dev-util/vulkan-tools/vulkan-tools-1.2.189.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=Vulkan-Tools
+CMAKE_ECLASS="cmake-utils"
+CMAKE_MAKEFILE_GENERATOR="emake"
+PYTHON_COMPAT=( python3_{8,9} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv"
+	S="${WORKDIR}"/${MY_PN}-${PV}
+fi
+
+DESCRIPTION="Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cube wayland +X"
+
+# Cube demo only supports one window system at a time
+REQUIRED_USE="cube? ( ^^ ( X wayland ) )"
+
+BDEPEND="${PYTHON_DEPS}
+	>=dev-util/cmake-3.10.2
+	cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+	>=media-libs/vulkan-loader-${PV}:=[${MULTILIB_USEDEP},wayland?,X?]
+	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-util/vulkan-headers-${PV}
+"
+
+pkg_setup() {
+	MULTILIB_CHOST_TOOLS=(
+		/usr/bin/vulkaninfo
+	)
+
+	use cube && MULTILIB_CHOST_TOOLS+=(
+		/usr/bin/vkcube
+		/usr/bin/vkcubepp
+	)
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_VULKANINFO=ON
+		-DBUILD_CUBE=$(usex cube)
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
+	)
+
+	use cube && mycmakeargs+=(
+		-DGLSLANG_INSTALL_DIR="${ESYSROOT}/usr"
+		-DCUBE_WSI_SELECTION=$(usex X XCB WAYLAND)
+	)
+
+	cmake-utils_src_configure
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+}
author	V3n3RiX <venerix@redcorelinux.org>	2021-09-10 04:21:55 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-09-10 04:21:55 +0100
commit	677b7ba5c317778df2ad7e70df94b9b7eec4adbc (patch)
tree	6c418a1546fff5becab5d8b9ed6803323e7f316e /dev-util
parent	fbda87924e6faa7a1919f1a2b4182490bde5ec5c (diff)