gentoo resync : 20.03.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-03-20 14:27:17 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-03-20 14:27:17 +0000
commit: 5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 (patch)
tree: 66e860a5099bcad013f1cf667255dc372a7c11b3 /dev-util
parent: 7218e1b46bceac05841e90472501742d905fb3fc (diff)
196 files changed, 908 insertions, 1816 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 5ac52c0e47a1..d4d38b002f4a 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/abi-dumper/Manifest b/dev-util/abi-dumper/Manifest
index 362869e7c07f..c89b2d8b9f51 100644
--- a/dev-util/abi-dumper/Manifest
+++ b/dev-util/abi-dumper/Manifest
@@ -2,4 +2,4 @@ DIST abi-dumper-1.1.tar.gz 49012 BLAKE2B ec86c073bccef5022376acf10b7e0b13d34bac8
 DIST abi-dumper-1.2.tar.gz 47287 BLAKE2B 93aef6a4f11ce33f04d6778d02749b4caf2eb782297957c6295d0d27f43386a92e0207b9bf6fbd17ae5e7f09964677810d6c42d3aea589fcfa46ce5f8353ee16 SHA512 cb081a8aaa548bb2360cfe55d4258c263990a4cc36feaabdafa0dc32252d19ce3ce0209e6af14c03157a144fea0e5ecb6700848f74b4da4c3ee2cdb6f0d860d2
 EBUILD abi-dumper-1.1.ebuild 587 BLAKE2B b3362c46859c331740304089106e36b1ee8cbabc0874febf7a524ab5c0e7d7dc80633d971dcc5a5c2da59a3a933b92593d5e56e2f201e1fc4ac6bf7513d892df SHA512 d9b0ed3d94f6bba83e949e4e3ee309d544d53efe58666e69b37286f879201ed6d2f00e62ac7d8994c711571c6a65a3e02115066a8edcecefdc14fa8dd07ce873
 EBUILD abi-dumper-1.2.ebuild 584 BLAKE2B 717578d28a2891a6343928575c7e1920c9d4215ecdb5c9733d8d7c1f0e41237bbf9b1c8498274faa950adbf93d077c7b678f6064ebb9b9acf5959a07aeca8562 SHA512 ab6a32f5c940b23cff28694aa62bbbcd52f7d31afdab0a767676ac8fa169389ff07a82e3a200d04b17672aa15857fc1091d03e4dc858aaf6592c85f6e30784a6
-MISC metadata.xml 433 BLAKE2B df4920a06673222e81e4142dbfe44e7aaf8cef4793ee72d512f6cc28dd02df6c8e280b722860ed5ccd3e1bf96a26190ab8be81ae76c305190c5b5e053abe1d0e SHA512 1d2b626dd625e2469efe07130c1ccb1d3727f61226a7759d8a9c4eb942c37f992bc8d7bddcb54869b4316af8442c92ff56b76981fcd7bb779920e8da4bb1116a
+MISC metadata.xml 433 BLAKE2B 844c67edbd9da19821b37a591118abae5b4747cadb37b5e3f55c533fee2317fcaab096cdd98f52a39d1bd089cd1617f15155fcc25f9eae87ee81c6198fc4c28e SHA512 7df5d6be1eaa7bf63e8cdea387d5c8586e08b0319ab083112d055033663ae5cd25adfe4934bfe6c4eefe64bc5862b0c4051a0b675cf9a1f4b138a9e3ce343a30
diff --git a/dev-util/abi-dumper/metadata.xml b/dev-util/abi-dumper/metadata.xml
index 410510d0f021..92f91a0c2373 100644
--- a/dev-util/abi-dumper/metadata.xml
+++ b/dev-util/abi-dumper/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-util/appinventor/Manifest b/dev-util/appinventor/Manifest
index 2561e9100542..d2d70c1c5a5a 100644
--- a/dev-util/appinventor/Manifest
+++ b/dev-util/appinventor/Manifest
@@ -1,3 +1,3 @@
 DIST appinventor-setup_1.1.tar.gz 85941449 BLAKE2B 35369899c93b9df1f594e9bb34883707e99685392578d46001b30857a368c0661fc48eff3877adaa169361063323239012e0b9305386df08bf5048782977f767 SHA512 fb04e6dda57e55602cc1f1a556062b7468ce9386c35710f3e84394500077c50bb7969b909cff785c100c46620794daa943c80f5feef22756a6ef8f809cf383e7
 EBUILD appinventor-1.1.ebuild 790 BLAKE2B 8f53854322b792c2271bf5845724ee3cfee2fc7645a9055235bb1c65a0cb54773985d5aca2953ac931651d2d638b87cd66815c4474ec5f18ffb28a45f45e19a8 SHA512 12e05ed2a1a79f43ff908a535ed077650f378e7e3684a3f1b6631d082c915d30b4b67b93bc401d14b75c395cf28ebeb316b6b874086000bdc8039942080bb195
-MISC metadata.xml 360 BLAKE2B a3f001a8ada9ad893348d39ea6d7003d1550bc34df0b4e4d5faa18b927824a1eb270f01e33a206491b9ea0e86bd1897ffc306d0a2b5388f53b5b1e5820b3db26 SHA512 b119dabacd1c80be435e61576233e8c0dbc64eccf2c6155a0aa769c576e9a29764ea7ed0639740f1c9784d980fcb51ca41cb3fa0cd3d3781b6926f850e4c7168
+MISC metadata.xml 390 BLAKE2B 68a8badcfbb961e1ef10cc082ea21a12c1c7f294d9b763b281178bd1cae1806372b0dbb78b0e2952bb1d053781b8317ef40e64b86889e332be2bc787a2686b54 SHA512 82b80bcb5af933eeb69832131fcb89468d754e8446954abd5715f800fe251a33f67199bb5a94f921339490422795dc0b786b19e1bd265e1b0c3d3086682a518e
diff --git a/dev-util/appinventor/metadata.xml b/dev-util/appinventor/metadata.xml
index 20e656c4650e..fc1965cec2cc 100644
--- a/dev-util/appinventor/metadata.xml
+++ b/dev-util/appinventor/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
+<maintainer type="person" proxied="yes">
 	<email>gentoo.power@gmail.com</email>
 	<name>Iván Atienza</name>
 </maintainer>
-<maintainer type="project">
+<maintainer type="project" proxied="proxy">
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>
 </maintainer>
diff --git a/dev-util/bats/Manifest b/dev-util/bats/Manifest
index 209be8cdb0b8..7cb4d02fbb58 100644
--- a/dev-util/bats/Manifest
+++ b/dev-util/bats/Manifest
@@ -1,7 +1,5 @@
-DIST bats-0.4.0.tar.gz 17258 BLAKE2B e43b29a413194e697c25a3f1dd3dc72a23ab9444e48bbe04434f8d6d48ff754ef1c12a1e1ab936bed8389b8fe970799cca13be932f1852c643a529babdb43420 SHA512 83c6c0e3ceec149708a8db5d33e95cc84852d8189498c22131c00f4288a6c870f9d522bae9230157f442338dc101e1468451d78dfa274afb83a6f0dd614c8bdb
-DIST bats-0.4.0_p20170219.tar.gz 18776 BLAKE2B 994649547424ee2e0859e7a82f9d46266645c6fc5cc3f47313d8780c3f81755b77d0109ad397c77381d04ba30708536acdacd0f158dc000cca9df23e25558653 SHA512 dc0e185b09dab5cc026ec39a2b15485751f038a6bab2e1089e55ea7e2913c0b99262edb54014300a25e0e3b6cad7ca61b4068f6ab328adaa61878dbb8efdf450
 DIST bats-1.2.1.tar.gz 62685 BLAKE2B 7ac54c8955375571edf7b303dfe9228a384ca5ec06986b9ac3c368e5b855456b2a3291cb3231f963dcd9c1bd5178f06fcbc8c81bdeee82b659561de072cccba9 SHA512 632345e6d83ed930dab23abc03e4797769063bb049ae1bb99e3102dc1e93e5111144ddc61615d05962f7b5bbf72d90ce19a324faf670a3d6e4ce7ab508b0db29
-EBUILD bats-0.4.0.ebuild 485 BLAKE2B ef5b83cc2119b9fc9d96b3a3e7bc465fa8ba6d73892a7d63f6f7de531f96c489e3f7692ac0142ba9dabd0f2871004de956032a8809453434fc1f5d26b67dc920 SHA512 48856743881d5bec9e275531d2d50897e3d31401d5f4e189a7f9b62f8fde45b108791f50ae4f6c9a9e3f129cad83c391ba220bd359527e1851ab6a97664e43ef
-EBUILD bats-0.4.0_p20170219.ebuild 659 BLAKE2B 0944a49ce57ad39b193d05750e32a9bae8f8b8e2e7c9ffd9750b8a8650049a16932b3876ae174d5c2049d3a58c749583b82335d7097c4bb9d56bc425307a8d30 SHA512 f625785af87a23e9431d4f126ff847804c412f2cd20b88aaa31f10b9486d39375f07de312bc142f22ed07e537af36e64b65562eafb11d2aaa18b36bae2bb021e
+DIST bats-1.3.0.tar.gz 78392 BLAKE2B 5dbc87ee87aba0b001d25f1304939604b1682603fb0d2fae19f852171e8bd76f1a6c262b661a373aeeb9b79818eae3387b3e4d6bcf4f0f95b87dc2430caf029f SHA512 47f67681b380a70863805691eca39532af76670b7bba2406293c58f95cbbe3dade4f792177ee00d8ca72684731efb6db2c1ca8eeabe2fa48359e81c257f95b2c
 EBUILD bats-1.2.1.ebuild 817 BLAKE2B c7a757b7e60ed686a34b566e3c1c8755eede522afe3cc5b4a289097e5f490e6c274af3602e80147ebe0e5e54f307e3f54f86801233602269b68f74dcbfbd2bf0 SHA512 aa5c90cfb0a42f1f64d57e0bced092cb2b9cb51597161e15517f9be9ff98eedfe9b038760ed03f3bd373b9b60fafd9980d8d84f1b34f63ceace33e3fa0960566
-MISC metadata.xml 929 BLAKE2B 5bda8ae72f30ead09a4bdf81bcfd22632ddc01e3d247a56359c91d27dcd936e53d39951ee54d450a0e3485fab6cb76de79cd8e87d01e8e902aa425230b2e0d63 SHA512 99855dfdc7822edb3a93dc53ebab1230fd2ca72997c53641c7731fa7b9edc605cddf9b59594c26e37f0d16e691c541ae1046fbb593b7eb0dd92ea0b2f59d34dd
+EBUILD bats-1.3.0.ebuild 810 BLAKE2B f8d0e14431c65d7aaa3e2a76e749f749f14c6b14edde00c1c98a2ad3605b8f07d933db365ff9387d4939529e41f37056b08cbb2ae7fe8958dde099b781853cbe SHA512 620116401fe1d831669c93317fd04a45db787be2d2dc83a66718e95c0b5e5471536f4050551f12fb6e1435b4bdc95fda2ff00485f98beb6c1de4b0e79e231307
+MISC metadata.xml 959 BLAKE2B cc406ff1f1902059d614efb8ff9742348c4518403c38dd4f4bfdc78f56dd5b620a79e12cae4fe7f2e4084caba34a68026583be38ab2eeb676907deb180088256 SHA512 e3b0bb9b821c9f93ef85d9e5707402b8401e1ca9b4d68b26e63884a9bdfba56d7c65068fdbc2817726ab470b16a27541dcfbc5b0e91857f67e2784de57231b66
diff --git a/dev-util/bats/bats-0.4.0.ebuild b/dev-util/bats/bats-0.4.0.ebuild
deleted file mode 100644
index 0af7a00bf20f..000000000000
--- a/dev-util/bats/bats-0.4.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="An automated testing system for bash"
-HOMEPAGE="https://github.com/sstephenson/bats/"
-SRC_URI="https://github.com/sstephenson/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-src_test() {
-	bin/bats --tap test || die "Tests failed"
-}
-
-src_install() {
-	einstalldocs
-
-	dobin libexec/*
-	doman man/bats.1 man/bats.7
-}
diff --git a/dev-util/bats/bats-0.4.0_p20170219.ebuild b/dev-util/bats/bats-0.4.0_p20170219.ebuild
deleted file mode 100644
index bc519b1c1a97..000000000000
--- a/dev-util/bats/bats-0.4.0_p20170219.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-COMMITHASH="03608115df2071fff4eaaff1605768c275e5f81f"
-
-DESCRIPTION="An automated testing system for bash"
-HOMEPAGE="https://github.com/sstephenson/bats/"
-SRC_URI="https://github.com/sstephenson/bats/archive/${COMMITHASH}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86"
-
-S="${WORKDIR}/bats-${COMMITHASH}"
-
-src_test() {
-	bin/bats --tap test || die "Tests failed"
-}
-
-src_install() {
-	exeinto /usr/libexec/bats
-	doexe libexec/*
-	dosym ../libexec/bats/bats /usr/bin/bats
-
-	dodoc README.md
-	doman man/bats.1 man/bats.7
-}
diff --git a/dev-util/bats/bats-1.3.0.ebuild b/dev-util/bats/bats-1.3.0.ebuild
new file mode 100644
index 000000000000..0cc0631f5528
--- /dev/null
+++ b/dev-util/bats/bats-1.3.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit optfeature
+
+MY_PN="bats-core"
+DESCRIPTION="Bats-core: Bash Automated Testing System"
+HOMEPAGE="https://github.com/bats-core/bats-core/"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND="app-shells/bash:*"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_test() {
+	bin/bats --tap test || die "Tests failed"
+}
+
+src_install() {
+	exeinto /usr/libexec/${MY_PN}
+	doexe libexec/${MY_PN}/*
+	exeinto /usr/lib/${MY_PN}
+	doexe lib/${MY_PN}/*
+	dobin bin/${PN}
+
+	dodoc README.md
+	doman man/${PN}.1 man/${PN}.7
+}
+
+pkg_postinst() {
+	optfeature "Parallel Execution" sys-process/parallel
+}
diff --git a/dev-util/bats/metadata.xml b/dev-util/bats/metadata.xml
index af9f791400de..f96261ed3f64 100644
--- a/dev-util/bats/metadata.xml
+++ b/dev-util/bats/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>henning@hennsch.de</email>
 		<name>Henning Schild</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest
index c260b62a52f8..24054bf720ec 100644
--- a/dev-util/bcc/Manifest
+++ b/dev-util/bcc/Manifest
@@ -4,8 +4,10 @@ AUX bcc-0.9.0-no-luajit-automagic-dep.patch 463 BLAKE2B 286ed298055cbdb22d9c3f3f
 DIST bcc-0.16.0.tar.gz 4124285 BLAKE2B 443077ffd5ad02e34d28a86ee64b8ec52fa4a18696295d58e87aaf2aeb833c394047cd0d87b3bf1da52d5512b889f8873b788e8141bdd91c9463e27cf30a1ef6 SHA512 50d09d6d02335a63d7c01c22f16a706584f231ee16973a80df5b640c31b8e25775da13a2bdff9e57c04c7f6181bb8c46cf3bd11c1e59741234024da71c7f6cdb
 DIST bcc-0.17.0.tar.gz 4166410 BLAKE2B 6833c7a58ed9e99b58bf147dc499ba7c7c113961ff5c21a3ac388abab8caa01dc2a67378899e26050460c4af851a5ddd8747911bda7c7b405dfcb6df29981f85 SHA512 32f27bdd3d8f3e850e59011bcf662b91842b1dcef94d118a0662ffda3b2c48c97a359d736d01f6d06afd74e3d7a4efda4966c71a5c9146b2076d4fba087a85cf
 DIST bcc-0.18.0.tar.gz 4171881 BLAKE2B c5bdf70965e16f0391306b004b4f51b370e7de3d061c8c318f25de478bdcb0c4dc083ceb00e19a66115e31e4c3da63e3b5dded750d44d56985f18bf87eb7617e SHA512 9d3e4c60c6415d40fe803bab44d4372028c210a084e3bff87a71771f06810bbafebe10760aedce9fff704c51235f71ff20458942fc1e67d0b83988ce57cfc493
+DIST bcc-0.19.0.tar.gz 5171216 BLAKE2B 72f0364106f894f21990865209b445eaa9640c00a27060cef220418be87625150cdc8062168dacd1370ebd01c99c2d49853869b518a3a07bb601720412b9a970 SHA512 b6180462a45c768f219e026d8a4b43424b7cad4e07db8101725bd2bc31ee4de117774c0ad8d157502c97c1187057b45c7a491e7198ac2c59e6d56e58797f4df3
 EBUILD bcc-0.16.0-r1.ebuild 2191 BLAKE2B f37dfbd934c348952e18081c9a5226c6c3f22a0969eff3e735dd382a8a405d3d6ab6d21f7a93e99eef5586a93997f599f57c98ea31320adf0da27ead682d3eb2 SHA512 4c548079b4be151a5b3586bd0fa54c8cade52c1bdc86db44dd87466b1872b4a27a2d22224105319075597a55a19972028df3b3207545edb85e9f1ac3aff69d9d
 EBUILD bcc-0.17.0-r100.ebuild 2256 BLAKE2B 3f34b29173d23710d5004de36d5ad3daf1104e8bf37383c60ad7cf35a1b9163d4ebe10cbdadf6892d1498c841990cebcc0327fa56fb3d2c306f9890e9545b8ca SHA512 8e24201f577b7590dad0800eb46bb178fc129c83f1414e4553018654226ade53e393af432ec1ff13eae501bea1ece06061220abfc09ece852732f3d62446a099
 EBUILD bcc-0.17.0.ebuild 2149 BLAKE2B 9d95a1516f37660cb20e8d3fe7994d9d4aea9a202341d63729906f357fe220b8d4d8d74d720241ad6dce4fda1652b891f884e6c9d5d3aee035908fe1c8ceff8c SHA512 b00a2d8163ace6b5f6007e5b46c13173a6565c22a5d08815ddd5c28ff1dfcb07527c9eddb7cb6fa26501e77a11c0fce216c458b7477bcd7508b62319c8abbc78
 EBUILD bcc-0.18.0-r1.ebuild 2257 BLAKE2B 1ba922ba577d5fc96eb16a48973d3ea210c3ea95f1bd0111d44a54f113a37564598a6f7af92ddac52e5cce8b8f1f21d45557746e9f1a6972c86563cfd4d3d63b SHA512 242ee80534c9ab6fd9031160f57d9e0de7588c7102e9bb297378e7614c1c12b5333bcbae2cda0eda612460640862a956e5649ca697fe619680456deabc72c32c
+EBUILD bcc-0.19.0.ebuild 2257 BLAKE2B 1986a93182278d985f0d97959623705136f420c2bd44f3523719cc118a8cd121e3dcd771a60356553d413958c1e4d4d8401f4889d1898587f7db86c40a03f277 SHA512 6a97eb82c9118f3a1f2b53272f76c41191570c85513e36818071d229fcd55eb80db7d8fa7a205b5dd55c661d1239f5b42f14c38fc9334df1f70507cb705c7d55
 MISC metadata.xml 386 BLAKE2B 73062e6902dd7d7f9afb988cce26a8aa5a66e1252652ae364f2295b0a5e77013eec682b36ab65c93772843ad0ec8c7187cd29d8308a3ba17dbacd1ef193f03ae SHA512 6529fa57011cd17b9892e1b8f05e063ae6314f85665a30881335efa80e9b9238a7b61d1f732316e45496707bf350d03149e7ec5efdf1a0fee6d5a788b58a7e70
diff --git a/dev-util/bcc/bcc-0.19.0.ebuild b/dev-util/bcc/bcc-0.19.0.ebuild
new file mode 100644
index 000000000000..c78faabac7be
--- /dev/null
+++ b/dev-util/bcc/bcc-0.19.0.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( luajit )
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit cmake linux-info llvm lua-single python-r1
+
+DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
+HOMEPAGE="https://iovisor.github.io/bcc/"
+
+SRC_URI="https://github.com/iovisor/bcc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+lua test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	lua? ( ${LUA_REQUIRED_USE} )"
+
+RDEPEND="
+	>=dev-libs/libbpf-0.3[static-libs(-)]
+	>=sys-kernel/linux-headers-4.14
+	>=dev-libs/elfutils-0.166:=
+	<=sys-devel/clang-13:=
+	<=sys-devel/llvm-13:=[llvm_targets_BPF(+)]
+	lua? ( ${LUA_DEPS} )
+	${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}
+	test? (
+		|| (
+			net-misc/iputils[arping]
+			net-analyzer/arping
+		)
+		net-analyzer/netperf
+		net-misc/iperf:*
+	)
+"
+BDEPEND="
+	dev-util/cmake
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch"
+	"${FILESDIR}/bcc-0.14.0-cmakelists.patch"
+)
+
+# tests need root access
+RESTRICT="test"
+
+pkg_pretend() {
+	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
+		~HAVE_EBPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL
+		~KPROBES"
+
+	check_extra_config
+}
+
+pkg_setup() {
+	LLVM_MAX_SLOT=11 llvm_pkg_setup
+	python_setup
+}
+
+src_prepare() {
+	local bpf_link_path
+
+	# this avoids bundling
+	bpf_link_path="$(realpath --relative-to="${S}/src/cc/libbpf" /usr/include/bpf)" || die
+	ln -sfn "${bpf_link_path}" src/cc/libbpf/include || die
+
+	cmake_src_prepare
+}
+
+python_add_impl() {
+	bcc_python_impls+="${EPYTHON};"
+}
+
+src_configure() {
+	local bcc_python_impls
+	python_foreach_impl python_add_impl
+
+	local -a mycmakeargs=(
+		-DREVISION=${PV%%_*}
+		-DENABLE_LLVM_SHARED=ON
+		-DCMAKE_USE_LIBBPF_PACKAGE=ON
+		-DKERNEL_INCLUDE_DIRS="${KERNEL_DIR}"
+		-DPYTHON_CMD="${bcc_python_impls%;}"
+
+	)
+	if use lua && use lua_single_target_luajit; then
+		mycmakeargs+=( -DWITH_LUAJIT=1 )
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	python_replicate_script $(grep -Flr '#!/usr/bin/python' "${ED}/usr/share/bcc/tools")
+	python_foreach_impl python_optimize
+
+	newenvd "${FILESDIR}"/60bcc.env 60bcc.env
+}
diff --git a/dev-util/bcpp/Manifest b/dev-util/bcpp/Manifest
index 8e2676ffe611..4d58c7670c75 100644
--- a/dev-util/bcpp/Manifest
+++ b/dev-util/bcpp/Manifest
@@ -1,5 +1,3 @@
-DIST bcpp-20150811.tgz 145969 BLAKE2B c7cdb21b6c07599c93c6f3fdf6ca4f5e825d4ae5f955e1c969d744a9ff2594bf3c7dcded1582dff695201f6e7e8ed57d5796883b63c5c57476c6601da6a49717 SHA512 a11462574bd87cf66dc50ce23f188d335480aae5448b527694791d4b7ae5cde27c0e0c0850dc8899b2b66198c37a434985c833f95f7f2d2d88a3b7dfe4ff34a9
 DIST bcpp-20210108.tgz 150080 BLAKE2B 5614b1e9957d63532ed6ba6d4588ae8b899201c363984bc99726bf48ae49ee9d16a71c407e3988fdeb715fef5e67343bc56c94eb1c8e977a14a6c2b08ee6668a SHA512 46a8fff766bbca4833c898d550ce4f0ac5e6ea64a2e05e63e4680186345a080aa30e54a4a5a3d22d47df8e8c8cbc4e738578fd59ec647d305c32a228d3b01e73
-EBUILD bcpp-20150811-r1.ebuild 903 BLAKE2B c12d2b5f335f5e0d247f14103366a52de0964e56f502d422e9b013dca58bce2c2d8a6194c69002397e4cde5f9a3243a99f03fcb146d02976b096eb61ea2228fb SHA512 9782454f880605021845b3635f4c873f2675f34a22533c43e590ad11f847a5432bacaaecb4aeaa35ada613ba2f37e2b538672bc3fcde99a3fa65167e23baa13c
 EBUILD bcpp-20210108.ebuild 903 BLAKE2B 3748ffc0caa34f1a2a64e29bd7f586406ff45ac63ad6b9fa4a5bc6eb90040d71df74eba132ada63340b1e450d90d961de1e02c6e1921d5395d2ff8771eb7a916 SHA512 59c925ed7e6bd7015bdef7febdc9682e424793df4e568f70b5fc641d2fc65f286deb9b5d421af9159496871a64507c97a896274ac03e430a97f95369ae771f07
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/bcpp/bcpp-20150811-r1.ebuild b/dev-util/bcpp/bcpp-20150811-r1.ebuild
deleted file mode 100644
index bf4a9d304e7a..000000000000
--- a/dev-util/bcpp/bcpp-20150811-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Indents C/C++ source code"
-HOMEPAGE="https://invisible-island.net/bcpp/"
-SRC_URI="ftp://ftp.invisible-island.net/bcpp/${P}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-src_compile() {
-	emake CPPFLAGS='-DBCPP_CONFIG_DIR=\"/etc/bcpp/\"'
-}
-
-src_install() {
-	default
-	dodoc CHANGES MANIFEST README VERSION txtdocs/hirachy.txt \
-		txtdocs/manual.txt
-
-	insinto /etc/bcpp
-	doins bcpp.cfg indent.cfg
-}
-
-pkg_postinst() {
-	elog "Check the documentation for more information on how to"
-	elog "Run bcpp.  Please note that in order to get help for"
-	elog "bcpp, please run bcpp -h and not the command by itself."
-	elog ""
-	elog "Configuration files are at /etc/bcpp."
-	elog "To use them, use the -c option followed by the filename."
-}
diff --git a/dev-util/bitcoin-tx/Manifest b/dev-util/bitcoin-tx/Manifest
index 7bc38aaae547..6788168f3074 100644
--- a/dev-util/bitcoin-tx/Manifest
+++ b/dev-util/bitcoin-tx/Manifest
@@ -4,4 +4,4 @@ DIST bitcoin-v0.20.1.tar.gz 6986090 BLAKE2B ef0e6c424bcb7ffe9a2461e60499cebdfcd1
 DIST bitcoin-v0.21.0.tar.gz 7533957 BLAKE2B 01247cbb9fca2381a8c08ab1c88c479c640963caef22e4207aab46b05813dbf2a5286ac9e98132fb34db0e9ac6c18c79e45a89de166f5c6d480d8ac6e14ecca2 SHA512 c58187996932b0151432a65885b7e8a7b216fb1ab0576fb7d4b5e9620d957594b05e181153e2e0e50bcd5ce764861ec11019ffbb1095d3e704f441e61ac6a04f
 EBUILD bitcoin-tx-0.20.1.ebuild 2436 BLAKE2B f8bfc55eadddefe07189dde452ffb72139a7ce54d8fc859bd781dbba02118453c85abe5f47c5d517cbf266b046ec88e2baaf390eedff237612c0859e60aa9502 SHA512 5f2c1b325870bb62756b42541064ee4004cd514ef56505b1fae5d8bd2ed50201e9c774473443349227cfafa53254a131961877e48b7d6351c44adb7b660d2700
 EBUILD bitcoin-tx-0.21.0.ebuild 2446 BLAKE2B c04f503e39e10d324786aeecd92a6d1a45475a54dd0b5b43bf0b9d72d754676904e0add0836cfafc0306262ff4315ab9012bcbc371091a1635019069f17c7e23 SHA512 f82ae432c1f1ec94e166cf2618e6c1da82f2aff3f1ccc82ab5b2553769e4fa6759a517733a4b7bf07401f0b19966ca7e3e4462833aa8a97663da69a3edc22914
-MISC metadata.xml 620 BLAKE2B e779b6a929a58fad28773a0aba3ef3112df14ce82ce62376b88cbc3519a857faaac6b580d2b5d866b0ec809062cf170e3c29324b03acc005246aea3cef9a0381 SHA512 c253ed29dff90ef2b9cd19b191ad870bd22cbdd371b2f353e724ba950735350225fe6d83c4ca8823ebb395dde9fb5004e781ff78987e2a30c0281ad5e0a4623a
+MISC metadata.xml 650 BLAKE2B fbe3b54c16dd1c935666dc6adb0994d84d7cc49a3c1da88bad93dd9c953586c43f4eb7a3d3e3ef6832e6785c0c7a503e976f43ee334af0821f2e079ea570bf83 SHA512 20f249e2987a45a939bbbb0bebc26c15423c35737368fb9ef5f9f939e2a8ad6daa24c5f11edc922e90a38735b7bbfbad3f69fcc8b407e2b0f2a8f35d3ab83b1a
diff --git a/dev-util/bitcoin-tx/metadata.xml b/dev-util/bitcoin-tx/metadata.xml
index 62d40fbeff4c..824b6d0c5c5d 100644
--- a/dev-util/bitcoin-tx/metadata.xml
+++ b/dev-util/bitcoin-tx/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>luke-jr+gentoobugs@utopios.org</email>
 		<name>Luke Dashjr</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-util/bitrise/Manifest b/dev-util/bitrise/Manifest
index 43319bf578b4..d66c2368f9c5 100644
--- a/dev-util/bitrise/Manifest
+++ b/dev-util/bitrise/Manifest
@@ -1,11 +1,3 @@
-DIST bitrise-1.16.1.tar.gz 3986520 BLAKE2B 2a38eb72abc2aee69b9494abe03434014531a5081e8d71e7883418d686dffd1de8d61b2dda8761a1d074392a4f84699a4cff36be4f6be8abf52ba705434b8283 SHA512 37d87a27f2d3c17df7c61eebb8ab50887c7f723901125af08a5833bd053c5706cf1a2d3310fa30a6ade3bec8292b30bc4ddfb3143ece8129c606fcbe5103ddd6
-DIST bitrise-1.19.0.tar.gz 4223634 BLAKE2B cb0822af15c1214d785f002617cd5c184e50a85c289d7ef5fe4fb429009495db26935aea9b9fbdb43514221d233a10347b52d01c0f839bb981da8437d61f79a1 SHA512 ef0ca59a907bf85ceadd2bccb7859e6b40146fd4983d51c84f82ba3ac36b47eeef41cbd342cfcbe516ed2ee678e66a4e07ef451cc36a7b6977fa6def9ac2a1e4
-DIST bitrise-1.20.0.tar.gz 4226859 BLAKE2B f358caf503e02bfbeb895ebe759aeceb2c28f0055676cc897b16ffacfadf2b0f48e7c0c495716d58d1a65b8697889eb3c6895a145bd7fa6828bbbe32280c5d15 SHA512 edb3e78fe8714604f2e514d80efc879b8a28e18846be9f7a9abc641901355b31ce6659ed30ef9c81bcefbe9816d48a6a3f6c292f8948c09c6e9330fbef154eb7
-DIST bitrise-1.23.0.tar.gz 4294480 BLAKE2B 2bc18a78822280fbca6039270ef61403cebd364aabca23b0bfd6b2e62b865cedeb046fe57641125bbddbd48922a34d89f59ed3c0b3e13b17497f485ac39c0932 SHA512 a41ddb2757f5d13675425fe943ca5834600f81233992fc80505347d87472df6268b98b82da9ea0349786647b2d7360b0a9019b41d1016ae231db348a5a0cac32
 DIST bitrise-1.24.0.tar.gz 4319920 BLAKE2B bc3a318453e32b1889310b21ef5f08a501da7be2f7da95498cbfc003c31d16490242c4972b40b74735731b3cf937b3cc55da08cf846fa2fbdf7b1d4b94bf818d SHA512 63a9fd3db3686140ed41f4f1e31e3787ca17e2e031a06f8561bfc581b01568ae5ff88bb9f81f0365bf60f4db6ba426fa3ad76a7363e31fbf31b702e7a9fe8b57
-EBUILD bitrise-1.16.1.ebuild 1046 BLAKE2B 51bb9aaea5bda07f1505af7e2982b476d5b78e3e5850bb943c74716d022bb71cc74054b9bc9c6228d65dcb1c7549ff4b971a1c59bf2d4f85f59bff4d870c7a08 SHA512 61f650a5c6a37edfe5d3444c1db3200a1f8b8a770686de9332b07767a7e82fe794eda33cb163184fe6b61f3936c856b865e236cae66c2e83390a383155e2deee
-EBUILD bitrise-1.19.0.ebuild 1107 BLAKE2B f7310107af1e54c7c0bbdabed8a34bb395cb32fe7c0f33dbefea4f20bf2e1e1dc220f192f7c7ac2ad7a7b9e4119f81fe4d58a8e01760e8c2310fd68bd5f7820c SHA512 08be8f002c738976f4127fbcc55223949f439bfc2e56de01f442a545164640e88205f24af10a3d643b6947446f809ba5a3690a82e1433321b150248d73978ff1
-EBUILD bitrise-1.20.0.ebuild 1486 BLAKE2B 16bd7ae58234830fe8a85828cf857b8be6a96742531f94de2f8aca024fc88afc2cb2bc4a8802f4cd02a3c12f37b62dd05bc981a34679a7489357f5de0b3c67df SHA512 ab6d0c7e346618d8500dd0308166d2195e6d711f34b5778ba097d96f90529b9e2b01714da454be938706011add5101c3b5b08b37bd00550c7fee5340505f2de1
-EBUILD bitrise-1.23.0.ebuild 1494 BLAKE2B 4d48900a79908b97c4f34b81d2cd38476cd0f92c09aa13345edf967a1cd04af8799a81e1ea45ec95795d68729967ae289f5ebc5582b3a4f166cba9caa357e2f7 SHA512 dcf78dcf576cdacb11ece035c8d5692f7b5c086662f8c9ab6adce6b7faa6fcbbc9246e1090b4f1b8e97a9c38c12ad790c53ab551afbeac0b9b83a201a74088ca
 EBUILD bitrise-1.24.0.ebuild 1503 BLAKE2B a69342ab9b8efb05350714cd0911208f0af7dec18507386525841729dcd7b65ad8876f866c25813910faccbc74e9e59cf2356cd3d2fcaa069252579fcc9ac030 SHA512 774505cb36d2a9779e0fcff09c3e5d2303c49ba397e811cad3c838c5ce2808ba7b5addaf2d3bce4452879e7d4e8373d4c9dfa7d524620f1e2b8a77f143ee4a81
-MISC metadata.xml 1069 BLAKE2B 18a8c9d910ea0495f53dd0f979ee07f5b99394c9198e56739a54e03c9d5a158038de5b9d38fb57a71a191327b76e7902ffe78324c23889295e4f7c404ba0e130 SHA512 787df19e97b702d0b0ca57a2474a68957fb953c16f236aa235f2488598c051851cc174824aaf60bdd7666d8338dca78f109ac03510e1a374605e855605870cf8
+MISC metadata.xml 1099 BLAKE2B bfa625706dbbc318838dc978dfefdf3f1a574e0458f35ec2ada271c45196955e56339a313154f09d338ee3e790627161aad4e7b5251fc41185df35d71a408552 SHA512 9d31c7dac7276e5d202e06cbb1150cdc38b9005bd8fdf8f38e10aeb0bd17cf11a287fe1da4e4be8ea5b62930dfa0206b600f370c2d95500e27d340f7e7de9520
diff --git a/dev-util/bitrise/bitrise-1.16.1.ebuild b/dev-util/bitrise/bitrise-1.16.1.ebuild
deleted file mode 100644
index 35fbfb5fcaf7..000000000000
--- a/dev-util/bitrise/bitrise-1.16.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-build
-
-EGO_ON="github.com/bitrise-io"
-EGO_PN="${EGO_ON}/${PN}"
-
-DESCRIPTION="Run your Bitrise.io automations on any Mac or Linux machine"
-HOMEPAGE="https://www.bitrise.io/cli"
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc"
-
-S="${WORKDIR}/src/${EGO_ON}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${WORKDIR}/src/${EGO_ON}" || die "Couldn't create project dir in GOPATH"
-	mv "${WORKDIR}/${P}" "${WORKDIR}/src/${EGO_ON}/bitrise" || die "Couldn't move sources to GOPATH"
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}" go build -v -o bin/bitrise || die "Couldn't compile bitrise"
-}
-
-src_test() {
-	export PULL_REQUEST_ID=""
-	export INTEGRATION_TEST_BINARY_PATH="${S}/bin/bitrise"
-	GOPATH="${WORKDIR}" go test -v ./_tests/integration/... || die "Integration tests failed"
-}
-
-src_install() {
-	dobin bin/bitrise
-	dodoc README.md
-	use doc && dodoc -r _docs
-}
diff --git a/dev-util/bitrise/bitrise-1.19.0.ebuild b/dev-util/bitrise/bitrise-1.19.0.ebuild
deleted file mode 100644
index 2cb6e23d9810..000000000000
--- a/dev-util/bitrise/bitrise-1.19.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-build
-
-EGO_ON="github.com/bitrise-io"
-EGO_PN="${EGO_ON}/${PN}"
-
-DESCRIPTION="Run your Bitrise.io automations on any Mac or Linux machine"
-HOMEPAGE="https://www.bitrise.io/cli"
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc"
-
-RDEPEND=">=dev-util/envman-1.2.0
->=dev-util/stepman-0.10.0"
-
-S="${WORKDIR}/src/${EGO_ON}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${WORKDIR}/src/${EGO_ON}" || die "Couldn't create project dir in GOPATH"
-	mv "${WORKDIR}/${P}" "${WORKDIR}/src/${EGO_ON}/bitrise" || die "Couldn't move sources to GOPATH"
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}" go build -v -o bin/bitrise || die "Couldn't compile bitrise"
-}
-
-src_test() {
-	export PULL_REQUEST_ID=""
-	export INTEGRATION_TEST_BINARY_PATH="${S}/bin/bitrise"
-	GOPATH="${WORKDIR}" go test -v ./_tests/integration/... || die "Integration tests failed"
-}
-
-src_install() {
-	dobin bin/bitrise
-	dodoc README.md
-	use doc && dodoc -r _docs
-}
diff --git a/dev-util/bitrise/bitrise-1.20.0.ebuild b/dev-util/bitrise/bitrise-1.20.0.ebuild
deleted file mode 100644
index 3a7a162eac9d..000000000000
--- a/dev-util/bitrise/bitrise-1.20.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-build
-
-EGO_ON="github.com/bitrise-io"
-EGO_PN="${EGO_ON}/${PN}"
-
-DESCRIPTION="Run your Bitrise.io automations on any Mac or Linux machine"
-HOMEPAGE="https://www.bitrise.io/cli"
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc"
-
-RDEPEND=">=dev-util/envman-1.2.0
-	>=dev-util/stepman-0.10.0"
-
-S="${WORKDIR}/src/${EGO_ON}/${PN}"
-
-src_unpack() {
-	default
-	mkdir -p "${WORKDIR}/src/${EGO_ON}" || die "Couldn't create project dir in GOPATH"
-	mv "${WORKDIR}/${P}" "${WORKDIR}/src/${EGO_ON}/bitrise" || die "Couldn't move sources to GOPATH"
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}" go build -v -o bin/bitrise || die "Couldn't compile bitrise"
-}
-
-src_test() {
-	pushd "${S}/_tests/integration/" || die "Couldn't find integration tests directory"
-	rm envstore_test.go exit_code_test.go global_flag_test.go json_params_test.go log_filter_test.go output_alias_test.go \
-		step_template_test.go trigger_params_test.go update_test.go timeout_test.go || die "Couldn't remove network-dependent tests"
-	popd || die "Couldn't return to ${S} directory"
-	export PULL_REQUEST_ID=""
-	export INTEGRATION_TEST_BINARY_PATH="${S}/bin/bitrise"
-	GOPATH="${WORKDIR}" go test -v ./_tests/integration/... || die "Integration tests failed"
-}
-
-src_install() {
-	dobin bin/bitrise
-	dodoc README.md
-	use doc && dodoc -r _docs
-}
diff --git a/dev-util/bitrise/bitrise-1.23.0.ebuild b/dev-util/bitrise/bitrise-1.23.0.ebuild
deleted file mode 100644
index d5b744e68293..000000000000
--- a/dev-util/bitrise/bitrise-1.23.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-build
-
-EGO_ON="github.com/bitrise-io"
-EGO_PN="${EGO_ON}/${PN}"
-
-DESCRIPTION="Run your Bitrise.io automations on any Mac or Linux machine"
-HOMEPAGE="https://www.bitrise.io/cli"
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc"
-
-RDEPEND=">=dev-util/envman-2.1.0
-	>=dev-util/stepman-0.10.4"
-
-S="${WORKDIR}/src/${EGO_ON}/${PN}"
-
-src_unpack() {
-	default
-	mkdir -p "${WORKDIR}/src/${EGO_ON}" || die "Couldn't create project dir in GOPATH"
-	mv "${WORKDIR}/${P}" "${WORKDIR}/src/${EGO_ON}/bitrise" || die "Couldn't move sources to GOPATH"
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}" go build -v -o bin/bitrise || die "Couldn't compile bitrise"
-}
-
-src_test() {
-	pushd _tests/integration > /dev/null || die "Couldn't find integration tests directory"
-	rm envstore_test.go exit_code_test.go global_flag_test.go json_params_test.go log_filter_test.go output_alias_test.go \
-		step_template_test.go trigger_params_test.go update_test.go timeout_test.go || die "Couldn't remove network-dependent tests"
-	popd || die "Couldn't return to ${S} directory"
-	local -x PULL_REQUEST_ID=""
-	local -x INTEGRATION_TEST_BINARY_PATH="${S}/bin/bitrise"
-	GOPATH="${WORKDIR}" go test -v ./_tests/integration/... || die "Integration tests failed"
-}
-
-src_install() {
-	dobin bin/bitrise
-	dodoc README.md
-	use doc && dodoc -r _docs
-}
diff --git a/dev-util/bitrise/metadata.xml b/dev-util/bitrise/metadata.xml
index c4961be108e0..5f8e84767b3e 100644
--- a/dev-util/bitrise/metadata.xml
+++ b/dev-util/bitrise/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>karol.wrotniak@droidsonroids.pl</email>
 		<name>Karol Wrótniak</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-util/bloaty/Manifest b/dev-util/bloaty/Manifest
index 1ed0fee73295..62e2dad239af 100644
--- a/dev-util/bloaty/Manifest
+++ b/dev-util/bloaty/Manifest
@@ -3,4 +3,4 @@ DIST bloaty-1.1.tar.bz2 5363836 BLAKE2B a538cf5634ed72844bb128238a521caf375eaab3
 EBUILD bloaty-0_p20170420.ebuild 771 BLAKE2B 4ae64b49ea5409c692772834a7e6cd3b602551535f043caae15edd13ffb0a914189dd3cd2c0f7273e7de2041ad06516a3cdf70dca7868606c81feeed0798f99b SHA512 bb7c2e8461920737f157df3dfeadb8e8bcce290c23c88862e5870b36ebd1f6a568779117302dae9446f9343ba667f264738e120a047ed023cbe81e4ec855cac8
 EBUILD bloaty-1.1.ebuild 863 BLAKE2B c51884ed15178ef9a76090bb55ac298cb79a05e6cf884a48a40c666b8b62e252d62aad7bfe9047bda56c1daf67ab490d443604147a34bb87b42763a592651135 SHA512 2005017783c42be91fdeabdd9d20d80d42858882c19c9b35f74cfc7e358c86890a8a034854d49b55ab0ee1dde69a2b2c204f0f443861dd249d10dfd855a0d04c
 EBUILD bloaty-9999.ebuild 798 BLAKE2B c24d2c676dfcec75c3ee0246877eaa8bc094fb3abf8728af5096090093eaa2e94f4c685bcdb6ed03ef36bc4d70a65e1469e2b8a705792c44aca6994dbd6e0b4b SHA512 f2d7d6f6f09ca7cb021777e5aaf7530e3d69dcb967fe952d4fdf6e0156dad11a75cd3fab0dead023dcc58c8fbfef3be7756a43a78f7f882357f2e3a8a22eed6d
-MISC metadata.xml 449 BLAKE2B d5d4f84a73649bcf9dd3f72b67de86369c401dd65efea8455dcd42f20607d408c22bed118faed36f9768db0519b3da3e884261a7ef45ea596dbe3611b05194ba SHA512 06903ec854e5200edd588dbbab17a45364e76c324262c08b0b7fd1bf54bfd607b8275de5d4e5dc7c7ebcfe62bebbdaa6c00850747d3021bf2939db947cfef63a
+MISC metadata.xml 479 BLAKE2B 317d8fb6f9a6f2f93201bce10789c5f1d386c88d5d0ccb705ecb983e907b727d88b29a624dcff67404e92d6751ee1d8bcfce12df92a21031ad3f942b9465c196 SHA512 aeefd798a7cdfed4908b3c0d78273890578489c35cc4df763a408514065dc458f74bdf04cf24f3124566e90e282f66e5cf293ba2b15c381f978f0e6a4a640bf2
diff --git a/dev-util/bloaty/metadata.xml b/dev-util/bloaty/metadata.xml
index 36b90a82850e..c00900552aa2 100644
--- a/dev-util/bloaty/metadata.xml
+++ b/dev-util/bloaty/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>ngg@ngg.hu</email>
     <name>Gergely Nagy</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-util/bustle/Manifest b/dev-util/bustle/Manifest
index fac14cf4e731..e2a7c6b4cd12 100644
--- a/dev-util/bustle/Manifest
+++ b/dev-util/bustle/Manifest
@@ -1,3 +1,3 @@
 DIST bustle-0.8.0.tar.gz 101175 BLAKE2B 30359a51da16631eda8f74239de7955d5887e12e7e99853dd930b12b351a0dd56425487c339ddf297dae02b271019c11329130aa0caabc4bf0c87e21600b707b SHA512 92f4757c4ed9dd88bfa144a0626d7530b6a1f859a8069d8631a9990b6a523dbb59d573c6ba142614c371171ccf391a3e77d1e8ba0c2155ecf231f9e7aa735f72
 EBUILD bustle-0.8.0.ebuild 1503 BLAKE2B 5d8e656db77fbe5d4f480b3eb2c4d3bc250ec33f1ea88be44f9adb3bd770aeda50a81002432bc3f4a281228511739eb23801e6962334b154dd99f6d080c8c222 SHA512 294818518c6a600d12b38ac9b500ceb3db9f23bf61f1651a51a70e2a52bdc4c25364cd7e8b3fbec30c0f486f4a6da645bb3f6a05ffb8942234f83c26e3da1b1d
-MISC metadata.xml 883 BLAKE2B 20b27f6e236b75bc51e885700d41b3817b410d363a3fd35906e5403f805e167429227701a03ab40265199e3b436f814440ac5f6f5ccfbe9bc7d8bbada2ca0b24 SHA512 0cc6d7942fa68482f1bd72c33a4ace27b9f063a6c02be81f0e692b8372e9d8c8f683a5f1c6a858d85cd450089bfa38e23731c6befec9d29f9e875a26a39859cf
+MISC metadata.xml 879 BLAKE2B dd7ed624cc19a0709b022fd07ed49483905054c0f3f388029d6abc5c453ed9801df0fb00dea3a1d65e29ce83e7143fac94f51fe44c986256d1116df62c408412 SHA512 d36dea91a5ef5f1188f0447f422c1b68c3f3979ee80c290faaa2ce59bb1c5e39b61b8c2072322aaa4f601d95eff4132b19ea381e18deb545431085931eba9147
diff --git a/dev-util/bustle/metadata.xml b/dev-util/bustle/metadata.xml
index 0941fe5a2e70..56b725e0aabb 100644
--- a/dev-util/bustle/metadata.xml
+++ b/dev-util/bustle/metadata.xml
@@ -10,6 +10,6 @@
 		<flag name="threaded">Build with the multi-threaded runtime</flag>
 	</use>
 	<longdescription>
-		Bustle records and draws sequence diagrams of D-Bus activity, showing signal emissions, method calls and their corresponding returns, with timestamps for each individual event and the duration of each method call. This can help you check for unwanted D-Bus traffic, and pinpoint why your D-Bus-based application isn&#39;t performing as well as you like.  It also provides statistics like signal frequencies and average method call times.
+		Bustle records and draws sequence diagrams of D-Bus activity, showing signal emissions, method calls and their corresponding returns, with timestamps for each individual event and the duration of each method call. This can help you check for unwanted D-Bus traffic, and pinpoint why your D-Bus-based application isn't performing as well as you like.  It also provides statistics like signal frequencies and average method call times.
 	</longdescription>
 </pkgmetadata>
diff --git a/dev-util/cbindgen/Manifest b/dev-util/cbindgen/Manifest
index d4804855aec2..8da2e84a59c6 100644
--- a/dev-util/cbindgen/Manifest
+++ b/dev-util/cbindgen/Manifest
@@ -51,4 +51,4 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD cbindgen-0.17.0.ebuild 1259 BLAKE2B d0ef9c3ac9e4bd3e553d795f54c465cf292385a29c6927f42974f575543442a92f090d91077ac6050ef059ee77f4a067609b48059aeb7c6b39099b677dcdf89e SHA512 4023de0539ae8b5627327e5856383157c01fdc4ff9f357a49e115b24e1fcf2b343a74dd918fcc35d0da6cfbe4dc37069c11f1f7253d7e097a77192dc9da84730
 EBUILD cbindgen-0.18.0.ebuild 1262 BLAKE2B d0541c52aa6a247dde67f4a2c23f7e866a8e10a3e36ecd3550d684cc9ba87b119fee7e4714d204d79927083ca0d93fba6a725b6e5da172077f3206c406167b67 SHA512 68d3b3158c2acd4e54d6030bd3bf39627cccbea317516fc9a850d89e4f3e862c538ee85d9e38944cadf7e59530e1bff885528e3187ad39210d7075543c824976
-MISC metadata.xml 334 BLAKE2B 5d7ffa9456ed3cca80fc3089f9bd508e652c600b8b013d03946b674409e45cd2ff52030e8c6a1dbc8fed2aef4caa9ab697c5a0a1b2fb4f0d8b44cf3c40d92f05 SHA512 a5e105a59463430347e5a44e36b8249faa1e84c73ae4e7fced96be371a7a59539d57accbf51065e9e5cf7e8108f69ab28d23f250182ba755e49a67991f4ff029
+MISC metadata.xml 334 BLAKE2B 641a12af31fbdf9200e6138f07f3d63b0ad8649899ba60ac078a57a32eab710c5731133258420e258028cfbe9cbab8078256f184b0968e9a901fd11212ebd814 SHA512 4592a95f23737588e949de9fa7a562467763d2b964787b58c5c1e34aeb55fef2f099ca9e2309e198417a8d58aa4ebca181394a7c06ad81ab1d10f185dc4e8f57
diff --git a/dev-util/cbindgen/metadata.xml b/dev-util/cbindgen/metadata.xml
index 677f50ae24fa..fe0097400fc5 100644
--- a/dev-util/cbindgen/metadata.xml
+++ b/dev-util/cbindgen/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-util/cgdb/Manifest b/dev-util/cgdb/Manifest
index 0ea79c93c611..cb0e213f68fd 100644
--- a/dev-util/cgdb/Manifest
+++ b/dev-util/cgdb/Manifest
@@ -3,4 +3,4 @@ AUX cgdb-test.patch 2132 BLAKE2B 7308e2817a0956382a2949baad003ff0adf10989825170f
 DIST cgdb-0.7.1.tar.gz 314768 BLAKE2B 767a57d071fa4e3c75d231a1ec879d871669fcda9c733d157d380fa525dd321f1deb68d7ef7f424b3f36a115043a0a0faae271f24746f934e288ba7d9a4e7fa1 SHA512 050c7bad963d51c1a2cb309530319ca77e9d236f419fb0abac4ab5030ff1068d799fa626959a8b3036321711de98bddf40d264bf9367ff5697075e30ca8168c6
 EBUILD cgdb-0.7.1.ebuild 1541 BLAKE2B 9ec609c8cd1a8f9b5c89e3ccb160119a5bfc3f31171f056aea03060789cf1813df45702c727600049d76324c548f9f292dc41423b2539b9a3391db9c4264a287 SHA512 647bef5ac18b1f0ba19bbf4e3b2148f760c564cd7f74e4a66721c2417ce46a1605331e29f19615fbc1e843419e8955b42da70494f2c78a770162466c5b072ce0
 EBUILD cgdb-9999.ebuild 1486 BLAKE2B 462a9e9fef68d24af10cf84bf7aff8585d87cd9d854aef53d0aa70dc5a7d166799006cd34a9d1f61b1ace6044576cc0230b3842aadea4037524b16524a693c20 SHA512 0813893bf020b8a77607712df53bdeb694f84b3b2254da0282131384dea8458f0c62f01355601d78ecb0ddc4a7c5e3fc22804f9fa1c3ff6397015d9dbe34400b
-MISC metadata.xml 491 BLAKE2B 6f0b7012dd97eba9ad20c893d489f2793c1381da6fb86e24c6259dc54244632c09be3b0f4ce2f8259e43d86d2d01546d0aaa565982bdc13b575742b1716d66f9 SHA512 fe06ce409d20619b30f9f4cdb28acc77edd1964d7177accbd3c9597d7930f1ec260847112a12e5184acb835e436c9d30a100c4613ed54b678c545dc8d3824a20
+MISC metadata.xml 521 BLAKE2B 9a044dfb99ca308089285719aa47226d2ccb0d67bc1a927199efb6c8e41f1cf96cc484bf825de2d6700e6a288d3bc56795d4d6f2541cd3814c048d374229a562 SHA512 f9ee095d603f7ce6afb8288dcac0acb83042191f2e2013c4f26c1c06cafa658d0eb3d41a5e20e3381855544aca2d2b2a948745408e0f52a4028e4a7f54b427d5
diff --git a/dev-util/cgdb/metadata.xml b/dev-util/cgdb/metadata.xml
index 23bc220af49e..1259638cdb5a 100644
--- a/dev-util/cgdb/metadata.xml
+++ b/dev-util/cgdb/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jakov.smolic@sartura.hr</email>
 		<name>Jakov Smolic</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-util/clion/Manifest b/dev-util/clion/Manifest
index 5ae0b7c89f12..e30f3b183ad5 100644
--- a/dev-util/clion/Manifest
+++ b/dev-util/clion/Manifest
@@ -1,3 +1,3 @@
 DIST CLion-2020.3.2.tar.gz 624043209 BLAKE2B 9a7d1ea2e83c06c27b595f042ba1a9768445ca0d79f6e2e227ed01252b49a72abf0f8c57d9418af31fc9f292bbe4d16306a1359dbf4622170f46d0e22f0b0999 SHA512 a70e9c8393ca8f96e51c2a575dbb67efee61d840198ed5d2dfff19a4d6e63f0612cbdc05752589b29702bb0c90ab1fa07859793f9bbd61d4a5afdd6a33dbae04
 EBUILD clion-2020.3.2.ebuild 2745 BLAKE2B 3d643fefb54fed93ab82bc6764b049990d5dc4fd33922ffb0dd248f1a06896cfeda36ecc9c95260687437cf4bc78b97eab76286ff328cb9e60363f9112eb9d0a SHA512 fb868e55e348552c2797c33c843e9a01fa304e4b0bdb9e7bf7ae4aac129e1c8a226a6eef2f4e8efb492f112ed9a6e49a863e90b8159332803bbcf6ca29f7faa3
-MISC metadata.xml 371 BLAKE2B c653f9e3be558bce98e7e901ec8d83c5e4d415730e18d2130ee35b3ede543a234f6bc40046cfed81b622d64893079a7052bb6cba0bca65486d5461c673daf12b SHA512 70640a8a676dde6f366f3ad3f81709103f229bdda41b1af50f238668876335692c7f8b6806610c24df6dcaedd8d86f58c6eed1f9befe9fe66dec9d95827a574a
+MISC metadata.xml 401 BLAKE2B 8e7319368a46c0f6bacf401c7004b1ae2c96267eab37b3a0a2fd878b5b9c2da2efae52a81a586c3f7aa49a33bb20c34d186350f55478beae674bba9c6e4c90e2 SHA512 388b826fc271151a9a0223ba619f5893e2a33170d505ae032a455e6b46d2dcecf3753244b810b01e0d5f985ef916fb3b9ae2e4476bc6f47ede977077565a8288
diff --git a/dev-util/clion/metadata.xml b/dev-util/clion/metadata.xml
index c92d84e054d0..66d86a6c080b 100644
--- a/dev-util/clion/metadata.xml
+++ b/dev-util/clion/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>c.a.strahl@gmail.com</email>
 		<name>Christian Strahl</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>		
diff --git a/dev-util/cloc/Manifest b/dev-util/cloc/Manifest
index fbf82e45c462..f2d20fa2225d 100644
--- a/dev-util/cloc/Manifest
+++ b/dev-util/cloc/Manifest
@@ -4,4 +4,4 @@ DIST cloc-1.88.tar.gz 548402 BLAKE2B 0da417d907703e42c9c69e46f39792652e6eca49994
 EBUILD cloc-1.84.ebuild 681 BLAKE2B 7f0b61c23a9af5fe8bd6d6359e926989191ef28f5a2fe3b045ac325c8c88d3a48d1c3d884e6aa9a35c38ac586a2eb571a9d36d72b8d6215947f1dbc63d5d26a4 SHA512 f5bcfec8a2c440f6105adfb1c9e99acf2b2b5bdfb3f8e1205b4f3c4a92cef7072f472e8337500846bdcd6d88b1c2fb239d61de1c38d6f4e91653127421e5dd6c
 EBUILD cloc-1.86.ebuild 688 BLAKE2B 4d4301e39c40b0a6113f2ada061eb65864c69b0e11d514e4d60bfb992da9d850ed9e0f470ba4c9523aac6c2bb16c4db34a14c54b0716bcaa0254a513fe6b140d SHA512 ed2bc861df08dd911e5ec06bdf7fa76dd76b7fea2b0906d6bdf5982ef259ccb6b6e59e1f402af48eb111663ec2d6117cb9a4eac191e65b177c14198cc6cdf754
 EBUILD cloc-1.88.ebuild 690 BLAKE2B a970f04b7567717cb94daf8cf59698318a0ccb7f5b8822aaddd497ac136464d37799c23faa6174601012a92578249a1d1c596abf48d6bb92d094e41fbe38e064 SHA512 22fe338db869c8e1d21dfa8f9e9f41ecf2a8036a33723849d1ca2ab2c77e53ae272ffdf70702e2c8086428066ccd9731aa066e3f43493d3360036e87dd146107
-MISC metadata.xml 699 BLAKE2B 424f272c2a398814052cdf40724b0daaf63985ef10194e38b2a22ad4cf67c90a9ee016d7e14dca738729d61b45d0cf7f2044f5801e6b35fe344ab152fe754d80 SHA512 7625ef4e35fda98f4a56ddc5a02f24af4b8a30db9fc1297092188078328ac8c2f188715251b41b3956c40a946b8791c5ec06e71c2edb271ffb0459add56dd7df
+MISC metadata.xml 729 BLAKE2B 5bf2df19190e3878bee61b9e0ce653f8a1dc590ec166e25619a0a391a548a58db2a17d7c0ae5549cb119e151d9d9d5503b0731638712c30f06bb93cf1a43a777 SHA512 7138216cf6d431a42f58db2a5c7fd19f828b9784aa17457d91ec4cb942427fc2dc2e4ad6e13aae933c621b369321611e54492a78c72b7b6b7a198c8e745bd741
diff --git a/dev-util/cloc/metadata.xml b/dev-util/cloc/metadata.xml
index dd5229bff56c..37b3b8e879c2 100644
--- a/dev-util/cloc/metadata.xml
+++ b/dev-util/cloc/metadata.xml
@@ -1,15 +1,15 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
     <email>tamiko@gentoo.org</email>
     <name>Matthias Maier</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>foerster.florianjr@gmail.com</email>
     <name>Florian Förster</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 255334b3e811..95bbb5ae1840 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -17,12 +17,12 @@ AUX cmake-3.9.0_rc2-FindPythonInterp.patch 1458 BLAKE2B a70945921738f00952b40a73
 AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b543452dc574e73d1c80167c83eb482d9eec310950ac811ba35d3eeb97b51958f12f3adf575ddbe7 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf
 DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 765678bc92821207c53bfb4ac995a791b938f20236c3a6fda873b8edd11cd1401b4f4c05f170b8f600f38bde5f1227c715499eee072a8de3bb29d4f5cd230226 SHA512 99e3a8f5bc147dd90b9cab11f06892d87f289aa1354ad323711fe96ebc9c32b1e887e8f9d3575a37831c4d2153a070ff9115c5e27a185d54170bad9dbbaabc26
 DIST cmake-3.18.5.tar.gz 8975784 BLAKE2B 62ea68b602e7e352c22ba6122aa010fb78fb5c4e484aa51bc336e750280d5fc03ffa439bd8005d2c43176f5a5db4ebfd419beca65cc59c5b8cd5666e38394fb8 SHA512 c15e0937a9c0ce0b6164c3d02a147e679ea57e1119cff4189a15de71429a7facb3c04eb8db467471876b5da5dbd4a25acb228efa7101fe78efd205f0d2c96343
-DIST cmake-3.19.5.tar.gz 9270284 BLAKE2B 4620f5f2a08e16a90350559e539a701606a0e8b4ee358ae5d1668c1f1d43674ac75a06ae335e52363fad9750bde430938faa2497108c2db6038479058412969a SHA512 de8645c7c03bd48987f6eefc19bc2856c2a939e537cf204e1c9749d5a3e21c71695080bee246e94871f82996ede9d1a8771972266434549b48df9924fbb4c6f2
 DIST cmake-3.19.6.tar.gz 9270931 BLAKE2B 5480ea3f3d159cd6471623ec73dfd73ab20ceb21744b2acc8bdbd27b8be7338e2ab8ae81366bbc3af474be49723567421450dfd6b7c51c65f36494c04fe13946 SHA512 556655c0fd17d5c70d5c1725f49ccad0d8088e6cbb3370d48d5a548d49d0e066d21c69978ed9b49d786fbb8eb79e086e719882245c9261c692b9457ba23b76f9
-DIST cmake-3.20.0-rc4.tar.gz 9427202 BLAKE2B dccf8c6815198acf44e8f6a6e0d080ec2ae6c13888c59a275ea2b010dc14ab4eca766a2a1e7cb26674ae67e7cb5a6700591845c945675dc2d87666624bef347e SHA512 967f0d56d5a7ce6cee3255852109cc9f121478a91a2ad387f26401e9024b3f36669ac9c393bfc20bbf06994668180fe12446936fdf5e7c2a095ee40972fa8f36
+DIST cmake-3.19.7.tar.gz 9271358 BLAKE2B 379b89c0d6bcfe81a397257cb3f95e4b4a8987566258f6d5b312e8ffd455fd07f09ed570c47111f9a519d76f43014b680e8242cddef13810ba87f9b9ec7e2e2f SHA512 6af1fe3ea41906324d4c29f5f982281d92145d086f4a47fa2220b93483bc65d59b1e23f5b51d82305c630690be7c552827bb795560674b03620763e0917bf14a
+DIST cmake-3.20.0-rc5.tar.gz 9429430 BLAKE2B 14a361c7f5a726a47b249c639c1cc1957332808008ff23a6523332e94a3f34530b7c5721b5e9000083894d52212b90483af06b28bae5b65fa753091865c12e30 SHA512 05950a0138e192875840a3d3564a81eb9e2175b64d91545996f7efe28290ec9ad3835110afb4493d402fb0cc968c0bd2142d14de37e1d38f6d8c71865f68f017
 EBUILD cmake-3.13.5.ebuild 6239 BLAKE2B 5e3b289af5d341e73fbdfe6162330e9e39dac40276991f08df670fcff6e40438995b608704e535545c4538cedb7ed789c2cc2ae0b38a1fd0f3a2e9627c95a494 SHA512 e75ea6defa00993410ed865329b450f38f9ad418c59bfe345880bae25d2f19e4463a407d744527d3f5c6c59fe8cf732cad5ac6274901cfcf3809d29573be7ad1
 EBUILD cmake-3.18.5.ebuild 6069 BLAKE2B 05856767d2ed7a4ba1f8c2fb38523b6e38f36da66866cf64ac2e6cc60c78aa8cd5dc8b9c3a19826e92c7c0343f9101901a401d1795a411bdbf245f3411a7e92f SHA512 f56fb725619b71f5451b5c5fa0a48e744c03ccd94213c85c965b7666b1cb14ec78eef6a4d9a21702299434a7f402077779b725d42c226b3eb5f5d3a8d2112e31
-EBUILD cmake-3.19.5.ebuild 6990 BLAKE2B f382eff3d258673c34e7642ec088f708281a6a65bed568b2094344fbd966eca22128dd93e382a88da16132291bd0f7c644362eaee0b34545c4d3df8ef512c832 SHA512 27af2c67d4a06e0cc3f0d86f003738a8def88a274dc3eda6da32de0b5f015a8e13f315ae93efbcec07cd9b95fc9f046786336f2a1b9ac9f5478610a440cb9964
 EBUILD cmake-3.19.6.ebuild 6990 BLAKE2B f382eff3d258673c34e7642ec088f708281a6a65bed568b2094344fbd966eca22128dd93e382a88da16132291bd0f7c644362eaee0b34545c4d3df8ef512c832 SHA512 27af2c67d4a06e0cc3f0d86f003738a8def88a274dc3eda6da32de0b5f015a8e13f315ae93efbcec07cd9b95fc9f046786336f2a1b9ac9f5478610a440cb9964
-EBUILD cmake-3.20.0_rc4.ebuild 6846 BLAKE2B 563f68ac5e2ef974604ae3c130b6e049f180340d54e48fef71b779bbb85cf132741f50fc6b09cadca29d6f533a40ab26da88eb99dfc98fe5fa637eaf7c42e565 SHA512 7a7177869712e7e9f1217b5992d50e2cc0d560cc3ce97ac9e5f95469bce5a6b883baca033b9a2c9e859abdf978a6ea3ee66e69cafcc1b3b609de955249a0147c
+EBUILD cmake-3.19.7.ebuild 6990 BLAKE2B f382eff3d258673c34e7642ec088f708281a6a65bed568b2094344fbd966eca22128dd93e382a88da16132291bd0f7c644362eaee0b34545c4d3df8ef512c832 SHA512 27af2c67d4a06e0cc3f0d86f003738a8def88a274dc3eda6da32de0b5f015a8e13f315ae93efbcec07cd9b95fc9f046786336f2a1b9ac9f5478610a440cb9964
+EBUILD cmake-3.20.0_rc5.ebuild 6846 BLAKE2B 563f68ac5e2ef974604ae3c130b6e049f180340d54e48fef71b779bbb85cf132741f50fc6b09cadca29d6f533a40ab26da88eb99dfc98fe5fa637eaf7c42e565 SHA512 7a7177869712e7e9f1217b5992d50e2cc0d560cc3ce97ac9e5f95469bce5a6b883baca033b9a2c9e859abdf978a6ea3ee66e69cafcc1b3b609de955249a0147c
 MISC metadata.xml 460 BLAKE2B f1a7e1709a6b9975ffbc377c8b4d1ea8a01f52ccc139693c8e427150b7559ecc867b3e55fb4bc95fe342a2335fe5e13c69f4bd74ffbbf302c83872c65963e73e SHA512 fc562cd5f336101d16ca30a5b3e9b99a6e51ec9d7aa503f20ce278f44d5810286fcd6b46b18073cd88ba88ee5ab4f8a0bfccaa567df09ebb722a68ab721aa340
diff --git a/dev-util/cmake/cmake-3.19.5.ebuild b/dev-util/cmake/cmake-3.19.7.ebuild
index 3d40c53f2157..3d40c53f2157 100644
--- a/dev-util/cmake/cmake-3.19.5.ebuild
+++ b/dev-util/cmake/cmake-3.19.7.ebuild
diff --git a/dev-util/cmake/cmake-3.20.0_rc4.ebuild b/dev-util/cmake/cmake-3.20.0_rc5.ebuild
index 99b8eab6c2f1..99b8eab6c2f1 100644
--- a/dev-util/cmake/cmake-3.20.0_rc4.ebuild
+++ b/dev-util/cmake/cmake-3.20.0_rc5.ebuild
diff --git a/dev-util/codeblocks/Manifest b/dev-util/codeblocks/Manifest
index 655fbab40c9b..e62ba4ad876b 100644
--- a/dev-util/codeblocks/Manifest
+++ b/dev-util/codeblocks/Manifest
@@ -11,6 +11,6 @@ DIST codeblocks_17.12.tar.xz 15725976 BLAKE2B 871427b5d8a2296e04d640c35d9129deeb
 EBUILD codeblocks-17.12-r303.ebuild 2375 BLAKE2B 5cfbe24e5b2514baa89cbac19771d7dfbd160c21bbd3c83cdedd05a8a680e7a5e2a4f20849d20aa906244cf3699f43bc6452edbf678623cc943b18fca0064b55 SHA512 62a241a4617cd8c1f5d1416807c859ae3684b34323f08147e68d21834e6b25c844b63ed1d67738b9923d5f217071d1ec91c6485f7b31115f84a5b5b9ef7e67b6
 EBUILD codeblocks-17.12-r304.ebuild 2294 BLAKE2B f6f79076b52eea3a1c1230e3fcee4220215b3c3b09f2c533e359d51cf52d6433851634a7e94a30d1b467904760bc085ef9bbb449e61a33b9a724814c6ea128ac SHA512 24f38636a6945a7fcdcecdaf5e25a72fa4a8d035d974ff90117ec39f866583ef493aaf359acee65b3b4f839fb121657cc73cfd9d3260dce8a8c2388aa832bf8c
 EBUILD codeblocks-20.03-r1.ebuild 1811 BLAKE2B 9a62643660fa3a3f365fb66cab17a0f9bed43aecf0472809bdc968c7d6950819020e1f21d1d4d377c1717c34c547814b941b19ab12f37138d17158ff4ad83b84 SHA512 adbf6c9798619695333751ce85e43affe2d74eb923728895ec58acdd268513d05db10a96718ed69af91ce1ab8318148cd717308776c307533fac02c3b740ddbf
-EBUILD codeblocks-20.03-r2.ebuild 1856 BLAKE2B 590fcee00cfd835880e41861c831f352d3b4770c093fefdbd6fe5bd1c5f2d768b0b84285bdeb214d1e4fa2435cc1857234a560b4377cb85978ae8176c9fa8a7f SHA512 ba1b0bc9ba7fb021ff8ec7bcf940e8cd5a6972f62074f3ce979321224a4af092c831fb629b2014bb62a4cb4d3578b5a07c9e6da44e72e595bea9e6e53f42b9d1
+EBUILD codeblocks-20.03-r2.ebuild 1855 BLAKE2B d6c4104baa3bacde4ec517e18dc168d75c2a023b087e1496727501aa3bcecdb23f9e9168dff7a0f0662a32a58418454c5b836d24c80d6ae85713a557ca35d46c SHA512 da341a5f98a4d92016acb6ad996e894044926c2ec1eb77fd535b9463f823f99c3952798a0c8b4c59479efba4676fb51eeb364f76f02a31f54658355fa83eff6e
 EBUILD codeblocks-9999.ebuild 1459 BLAKE2B 3add391f132cde04b2e936cd9b014d7ee091f0ce6105356ae1716d1a2a026bbd689c3959e5925c5add922e4d22878bd921fa44688b7aeae7e589911edee482a7 SHA512 0e00e64f4d3c7045b21015970e0c30551865d34439129ddaa3c41221d1414e45e68626d9a686b5e36fe6f46df2483bcb978aaaecb49a64d38da5853cb0c70ed5
-MISC metadata.xml 675 BLAKE2B db56c15590a97e891e387377cafcb743716d9c84f6adaaf43e3885993842e5456086ef1a59a6579fd5058d5d964cf49b34b7993d56cb5a2e78611a4e9edd0618 SHA512 459846c3e46109fb82d0f37d016fea29e3f69cbf8d03ae2ed2aa0beff443e4206082d9f2e53afc6cdac6862f76037dc652f2dc544d6b9bdf15f2de09d863c735
+MISC metadata.xml 689 BLAKE2B a9e3de97d9f9563282d9f1a8bda6dc24116b2f94aaf9edffe71ca8b6d144ebb2558771f06ccb206789db31ce39308c7e977c9e2d13b6e48448f5bc44e0362852 SHA512 9c08bffa22d33fcb962ec5511bd2a907ef2fa9dfef161035b531277c6ab8be1b18323e89b6dae8dae03ba54a4fa240a5332071f82c41667025bcd7867a1fd9a5
diff --git a/dev-util/codeblocks/codeblocks-20.03-r2.ebuild b/dev-util/codeblocks/codeblocks-20.03-r2.ebuild
index cf1336f6f606..9e4061b5925f 100644
--- a/dev-util/codeblocks/codeblocks-20.03-r2.ebuild
+++ b/dev-util/codeblocks/codeblocks-20.03-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
 HOMEPAGE="https://codeblocks.org/"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz
 https://dev.gentoo.org/~leio/distfiles/${P}-fortran-update-v1.7.tar.xz"
diff --git a/dev-util/codeblocks/metadata.xml b/dev-util/codeblocks/metadata.xml
index e0bd14a62a12..6288e1a22b9d 100644
--- a/dev-util/codeblocks/metadata.xml
+++ b/dev-util/codeblocks/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>torokhov-s-a@yandex.ru</email>
     <name>Sergey Torokhov</name>
   </maintainer>
diff --git a/dev-util/conan/Manifest b/dev-util/conan/Manifest
index 00b1f7d5fcb8..6558b8d8b765 100644
--- a/dev-util/conan/Manifest
+++ b/dev-util/conan/Manifest
@@ -2,4 +2,4 @@ DIST conan-1.28.0.tar.gz 1135799 BLAKE2B 774f980b489bc2ee7973447829ac2f9062198ec
 DIST conan-1.28.1.tar.gz 1138639 BLAKE2B 91f277b88a2069efa3ad5f6209279888b4ac8cf5c359b7933ace6cc08c8b61a868dc8f7bb6a817fbdea378ce175229c91c9defb750326e2a5e31c4d6d528985d SHA512 b8eb4fe34b1614ebcb5e15bd0a827c5949e8588c6a04380632858e68eb4172361c96305154cc5a630254ed6236d7fd82e3a2c05962e312af3cedba41eac0a6e3
 EBUILD conan-1.28.0.ebuild 2463 BLAKE2B a7783520d53cd295fcf3ceeecc1f81c3eec33dfee2c00ae031e5fcfccb6025100d3c8e5606dd747560e466da3bd121c25594d442fc58f03a45a31e915a6a1910 SHA512 1cedc6f6ef4326d20c10eedcc43ba5646f352d494c094842ff00612778edc30f0b11509c229f2708c6ecb93ba333c8ce0e25b874d4421e2ebe79952acdc88d60
 EBUILD conan-1.28.1.ebuild 2490 BLAKE2B 89d467c461604d9636e771e5ed2fc06eeae74e835028e760e1977f31d7206141b8a06721a70c36b60d74014a88e50ec3e656cfed395acf740d15833b675648ba SHA512 b9ebe84ab7326f0ff432926763304c35ce7e394f0b590f06ea674d5a9c1c2784cf4430b7d32e4280e3bb732a72790c26fd62284c6d7b9ed5f3b8b0efbf542538
-MISC metadata.xml 739 BLAKE2B 475521b92c84335a4ebda1d68dac1905a99f96b0fbecc8f06b6918e0c075648024ba3bebeaf85cb11ef0b96b917a2ebcf2a0146bd5b37c976d90cee08365c595 SHA512 27c7a3cea74ef2e22fd3dd238fa736efd1786fea4eaf01b9b51e07f7276101ddd7022ad7aedf767d1dbcdba2c29ddf48c07581e4fe5ec089d5e10c5b880c9970
+MISC metadata.xml 769 BLAKE2B 912e435ff8d086998d1bd865a7162d5a99d3a0ef37ee7d6fec986cd9b01cb2c391d2cf1f0a51ee4fccfab5ef779aa03d65858dbe008e6dad3e260f90d2f6ee54 SHA512 5730a569221578910854ed135c963a6fa60cca712e48818cb7fdf97da1d57fa83f64ddad9b4ae994b6ec6d59071e98526fc6a905d43f7088dc1ff99a586b95f1
diff --git a/dev-util/conan/metadata.xml b/dev-util/conan/metadata.xml
index eec79f76ea9f..5d9619b58f68 100644
--- a/dev-util/conan/metadata.xml
+++ b/dev-util/conan/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>azamat.hackimov@gmail.com</email>
     <name>Azamat H. Hackimov</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
   <email>proxy-maint@gentoo.org</email>
   <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-util/cookiecutter/Manifest b/dev-util/cookiecutter/Manifest
index e4fdd73b23a9..24deb369da2d 100644
--- a/dev-util/cookiecutter/Manifest
+++ b/dev-util/cookiecutter/Manifest
@@ -2,4 +2,4 @@ AUX test_cli-1.7.2.patch 579 BLAKE2B 8a77388ddac5bf4aaf1f2f3d950318a8f3af582df9b
 DIST cookiecutter-1.7.2.tar.gz 253484 BLAKE2B de1c773cd5e53532edc7af7aaeac6061b1a5293330b8162da0f31895b0c3a58a4e0f36d66bee3da328a6b0a59fb5bd917a2f3f6fcf7772a4c63db5cd0030caae SHA512 15cc145f143b4cac6e78b12e1c29e191d0c1c96b0187db05a4c8aac18310a5cb31d912073674ef4c01727c9b5a3b67f8c508842cb625db338b4034faa52a4a4c
 EBUILD cookiecutter-1.7.2-r1.ebuild 1301 BLAKE2B 49b746a2ea6120a7dd3cb451fefcc9db8a6240ad1604876c435a8bf9dbae4a72b12995584132b46465a25c01a7a2d8f7fde98e123f71e0971bb06754830aed59 SHA512 5716f7cf06d42e181695680e7a09779d9f1876f02f8fee0e0bb116f6d255bfde5c2bd7e1efd591d2ae8d27c579c2f875b32bb0fbf8599117925e8ff446aa2dee
 EBUILD cookiecutter-1.7.2.ebuild 1288 BLAKE2B 0b17d7cbc3ba94efed52318ffaf68e65f643e28bcbb232c963b9e7be48bfcde474f2c5c569d07964e374a56456376ff6435b6894aedb40f87d18d633d0ba8ba2 SHA512 1a331f871659bebfc8999556fb49d4098b1929404ed845fd4368db1f5b9c6652fe094071aca6dfcbe03fbf17f8ec318ba329ec3352788691b62134bcbf1086b1
-MISC metadata.xml 329 BLAKE2B 3030c112beee6c6e136abcd0390ad47553f874ba5ec6f5d19d87f84d5c9d930ac71d2219c064944601a09bce7c9b71ce1257d1664070f749f4447e2549521bee SHA512 4c36a71c316a8f5b946668fc160685a293c25a292917baad1345fdbafa5108166cf50343cd5fd3627447b5af5a1cf40848488eb0085708b0ca032ba7c44d4101
+MISC metadata.xml 329 BLAKE2B 6c2335992c9d68c7854c593e8f1290bc3e967706fac92fcc365d12f7813dd5490d8ef5921f0e1e61d0c13fa9b1b43ec20c8e7d95fd1ba926ffd7cf82bfaab4aa SHA512 0d318a3a6a0ed5b048d9efa5dff3e5c447ed3545997cffaf1d494898b3d35144dacd2cd9fdb8fed3adb1d39d9621b23734d04b7f6026256a891c3b1c501681bd
diff --git a/dev-util/cookiecutter/metadata.xml b/dev-util/cookiecutter/metadata.xml
index a263231b7fd8..7877307ed7c6 100644
--- a/dev-util/cookiecutter/metadata.xml
+++ b/dev-util/cookiecutter/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-util/cpputest/Manifest b/dev-util/cpputest/Manifest
index a039520a06a3..7ff4e5774c90 100644
--- a/dev-util/cpputest/Manifest
+++ b/dev-util/cpputest/Manifest
@@ -1,3 +1,3 @@
 DIST cpputest-4.0.tar.gz 1163749 BLAKE2B 2ae0f4658662ead0fe5a46a0ae521edf7677a7b64e3c7ce9bad374c4f953ea5a548cdfe1d9128821ab5031211c10f02d0728085e68db02e0d021ea16d8b38f1c SHA512 69f39fffdcd965c871e598118db38ddb74a3e75fd7a7965f8d236029fa891f6fcb6b671147c166ad08482bbd0737537fafe90aa8439a0ab62389f19150cc39d7
 EBUILD cpputest-4.0.ebuild 592 BLAKE2B 73d7c038ea6741080f10a88417eeb709dfeb31eb52909a7d1000f5f83ee3b446534c6daa0a01017ea44b3e0239a816897b5c098193ea5d2606635376403fe1b3 SHA512 de73bb6a00890c7359ab44ef539a849dd6cca1b7267d580dc302baf2ff1360478a6a5b25d3943572dbe08ea35fb33ae4c2bae1e54f623ef9d8cfbd11450dfba0
-MISC metadata.xml 450 BLAKE2B 6db81d287cbc9fcdc9ba0705d551c1acf638a54632702b36155ae2adf7f66410e8139f6b15d99d7f4f5ebf3e5d53aaa922bdd3d922def13bc1072cd2ef108b06 SHA512 fb8d104e5fb4433528a4b9a0a3dccfaae507dba49c0e0959db2b2f5efdc34e7cab0ecfb8c0101be1fa1d933bc36f9344d61f8f5c02ef8185c84473deee9e3221
+MISC metadata.xml 480 BLAKE2B f41963581448d203d06e41ef7892cec637c8d4bb7c78e8d246481ef9358c4cb0bea34a86e43fcbb7d54fbe27077d645f027aa0be763e1510e90fe3217791f823 SHA512 91b23ffa9d22b46901ef95fbabbc14d00a12e391e34f7c3a5f5ccbd7ee6356db5b6d0b6f0955bc0829d47dfad7f0a78f60272cef49e86e0c9235e34dbc218b57
diff --git a/dev-util/cpputest/metadata.xml b/dev-util/cpputest/metadata.xml
index a927ffa0fb10..e782d2cca8a4 100644
--- a/dev-util/cpputest/metadata.xml
+++ b/dev-util/cpputest/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jakov.smolic@sartura.hr</email>
 		<name>Jakov Smolic</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 90fdd2ca407d..017e34bd8b52 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,3 +1,5 @@
 DIST diffoscope-168.tar.gz 1569627 BLAKE2B ad0dcfeb40b4747877a5b0366706a57fea87229d23b4c7faa43e5dd12d8d950df52f42e74df862c52875e4722f046481ceb7204e74df11ed20188522e9874d9d SHA512 55025ff1a4e7664631d15c980aef46e6db4b22501989b1d58812a18eacb0e8c87028e6bed1599842b1ac072e0797d49a9d0796419a9678956c2f779b8909b6f4
+DIST diffoscope-169.tar.gz 1569438 BLAKE2B de2da2a4629c88e71aaeb694595ce04e7bcb6f24b9e84e47b197272c61bd8300922aed4b5d012a8b27abd4b8c4d62d45bc7361195ecf43498baec72753e15d2a SHA512 0207b97784218a324f4b51ad30b95a4c5f3cb072ff757b0617b87f1e8fcf6cbd0edd2f93e104206ce9c2870177ac56f3af171fff35bcaa40477e7c09b0921460
 EBUILD diffoscope-168.ebuild 2194 BLAKE2B 9dd510ff0851561703b950d555d87c92ac9c7f6cd4a29b623397352fd2a6caeecf100d81818145658a781517a4f5bf548779d78b820169f6ab5edf889c9163b9 SHA512 33432f35354fa308b9764c425e13eba5a5242f1f4c08fe544edcfc67f7c90abcadef6afe71e50e32e25fe2bfaea6bd7a34809ec777191884bd2dd4b7c8d59e17
+EBUILD diffoscope-169.ebuild 2196 BLAKE2B 34de6fd45de22af7b90709f728078fa57fd92f58e6fe2f8223ff2a6e57ea91e9fefd016ca3013328f1fc9e54d1f3d76ab3eba668aa7ede530ebf7bc43a6f0579 SHA512 80fffa1ea26a25bf7d1e55b558d40eda4c8289743d5681a0c95ff5bee867e34d83a0f6efb78ad92dfa322a3f35abcd774ad4e09ff277f01700698fa6c57dd2b9
 MISC metadata.xml 2137 BLAKE2B 70393ec4166e001aaeeb4c10958693ff090b04e7e5bf7eb760746dc4920e0554724f61e1a073f008660789438bec33378796ebc117c1cedcac5116b0b1d32142 SHA512 a1f5648c7593f16db4df87b750360034647704b1809ed52d585d49b5769ee8e190ff853941d2739da7c5f514ef02442b3b3ebf55fb21541e7bc551c720a305d0
diff --git a/dev-util/diffoscope/diffoscope-169.ebuild b/dev-util/diffoscope/diffoscope-169.ebuild
new file mode 100644
index 000000000000..a189ed464d44
--- /dev/null
+++ b/dev-util/diffoscope/diffoscope-169.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="ncurses"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
+HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
+find gettext gif gpg gzip haskell hdf5 hex imagemagick iso java llvm
+mono opendocument pascal pdf postscript R rpm sqlite squashfs
+ssh tar tcpdump xz zip zstd"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
+	dev-python/libarchive-c[${PYTHON_USEDEP}]
+	dev-python/distro[${PYTHON_USEDEP}]
+	acl? ( sys-apps/acl )
+	binutils? ( sys-devel/binutils )
+	bzip2? ( app-arch/bzip2 )
+	libcaca? ( media-libs/libcaca )
+	colord? ( x11-misc/colord )
+	cpio? ( app-arch/cpio )
+	diff? ( sys-apps/diffutils )
+	docx? ( app-text/docx2txt )
+	dtc? ( sys-apps/dtc )
+	e2fsprogs? ( sys-fs/e2fsprogs )
+	file? ( sys-apps/file )
+	find? ( sys-apps/findutils )
+	gettext? ( sys-devel/gettext )
+	gif? ( media-libs/giflib )
+	gpg? ( app-crypt/gnupg )
+	gzip? ( app-arch/gzip )
+	haskell? ( dev-lang/ghc )
+	hdf5? ( sci-libs/hdf5 )
+	hex? ( app-editors/vim-core )
+	imagemagick? ( media-gfx/imagemagick )
+	iso? ( app-cdr/cdrtools )
+	java? ( virtual/jdk )
+	llvm? ( sys-devel/llvm )
+	mono? ( dev-lang/mono )
+	opendocument? ( app-text/odt2txt )
+	pascal? ( dev-lang/fpc )
+	pdf? (
+		app-text/pdftk
+		app-text/poppler
+		dev-python/PyPDF2[${PYTHON_USEDEP}]
+	)
+	postscript? ( app-text/ghostscript-gpl )
+	R? ( dev-lang/R )
+	rpm? ( app-arch/rpm )
+	sqlite? ( dev-db/sqlite:3 )
+	squashfs? ( sys-fs/squashfs-tools )
+	ssh? ( net-misc/openssh )
+	tar? ( app-arch/tar )
+	tcpdump? ( net-analyzer/tcpdump )
+	xz? ( app-arch/xz-utils )
+	zip? ( app-arch/unzip )
+	zstd? ( app-arch/zstd )
+"
+# Presence if filemagic's magic.py breaks imports
+# of dev-python/python-magic: https://bugs.gentoo.org/716482
+RDEPEND+=" !dev-python/filemagic"
diff --git a/dev-util/distro-info-data/Manifest b/dev-util/distro-info-data/Manifest
index 1590e3a83d0a..326ed77c8a2b 100644
--- a/dev-util/distro-info-data/Manifest
+++ b/dev-util/distro-info-data/Manifest
@@ -4,4 +4,4 @@ DIST distro-info-data_0.46.tar.xz 8632 BLAKE2B 2f19c670afd37a02279b420f795dd5aef
 EBUILD distro-info-data-0.29.ebuild 429 BLAKE2B 4db3f1370a5e2b3f81a36f9f971d3ef0b3f8f63caa731e06d76321655ce28345cb087761b700c039fc4ae86fc683982dfd39e7c7ea341ba2cd3272b635a94e3e SHA512 afcfea1a2a5bfdf74dc35205a191a3bc634223083243a56cbb3857132dd93aefa4d35e4ba8a5d641f3448dae18bef4262d8c71a721cee8bcc155458ed8db5793
 EBUILD distro-info-data-0.42.ebuild 448 BLAKE2B 200eb6268d8b44263352a770c0bbf5a5409cafaf94e7400f32a7170393923a661c3445b0eef73bb015470a5918aed95ac4db90c13596a8760fbda84411a379e9 SHA512 b456a4737d63d51b37b16a97ab55e7390bcbb0bc8fa1c633d7f99e0b1cca3f9d2e376c8260fc4ab426a3afc99cf5bb2add8f7051126ef768f33edd5b68b2e53f
 EBUILD distro-info-data-0.46.ebuild 428 BLAKE2B 15fddacd3972adededabbb2073101b2d0754d00e15c5355dc4db57195c6397435e17e3849c8237696b885c99a6bba2d58bf0fb9a8cdd593a35859f0d45d26466 SHA512 56759f6e46f3853774adbdf36d123bed8bb73a9d09500f1f060588425f2897aae980f9aa75f9c385f1e3a602ecf6842b91cdd1ed5a13aed197744e4786439ed8
-MISC metadata.xml 367 BLAKE2B 867a3664c5bbd444d69af80af19994e07e3810349258e85c2afd0c838cb140aa3f3342ee1aa5e6862d1fd5130e7e09c1f9f30443827fe7df705f4273694c0784 SHA512 3eb0be47e7eb6bfb6d8eecee66a25183da436c38272e226e7819c8748774f3aae620eab7227414cb862734d4baf8fa060290c1b2371233141abcffd7b489c7b8
+MISC metadata.xml 397 BLAKE2B 4d9ba102aaba8fd35794cd064553a45edc66b0b845fbcd5660ad11c66fc1d7435423f79edb021da9e44683d2a157ca3cd057cc51e660ca824f6b75c6b4adf8bc SHA512 fafafc81fdef8bd5d2c4e2c58996be3c1c78d169d28ebcd493813f3aa84cb058cdd81d660ae9e1c7711df0f5fd0b0c9e7536538c15dc3ec015e152a79897cef3
diff --git a/dev-util/distro-info-data/metadata.xml b/dev-util/distro-info-data/metadata.xml
index 425c7b2eae49..1e17568d9a77 100644
--- a/dev-util/distro-info-data/metadata.xml
+++ b/dev-util/distro-info-data/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>ykonotopov@gnome.org</email>
 		<name>Yuri Konotopov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-util/distro-info/Manifest b/dev-util/distro-info/Manifest
index b4b0801376b8..b43e32d4d242 100644
--- a/dev-util/distro-info/Manifest
+++ b/dev-util/distro-info/Manifest
@@ -2,4 +2,4 @@ DIST distro-info_0.22.tar.xz 29104 BLAKE2B 88eab833ea34de9e62f858e1fb9acfb94efb6
 DIST distro-info_1.0.tar.xz 30908 BLAKE2B 8355e54919d83d09d3eb7983a35151f0e4253c62eefeccf4d1e614cef0bb7cecf466007c7789749c145674aa30324423f9977a26695d5de537f80d5eb069f371 SHA512 2d84b5845ff4e7ce8059fe83e9d64a380d6732e0e85bc889c948068579d27a86fd31f8e6b7d8cc256f4ff4631cd0ffd480835bf290452d3bc28469f5b3be9ddb
 EBUILD distro-info-0.22.ebuild 1968 BLAKE2B 9c2e9c64077fedc8dbe4be14065189e6cb429857b6bcdf1d7f015fdefc0a3003c5e4440313099581975a2773290fbf1adcea9908e55f37f2d7e38231c3a4e6e8 SHA512 52c783c7292c7a1545673117883fea87011a9ccffa270a53f6d459dd49835e0e75c53fe5dbae5351083a878dba18d0fc6cf861ff205b7dc34e62642d02cf82da
 EBUILD distro-info-1.0.ebuild 1989 BLAKE2B 7db23cf154f0d6ce2b3d25964785c22e407a2c67f83c8e360f7bbd650a65dd09e43c66f472c306834afb2559969e8ef6bac8541b0e87625a804d0a2e52d1044f SHA512 a34a1502ad6bb72330c1c410486c05184a400b5bf197dfbf72cb746c34e01687c4619825376e00a3ce2999c9bceb272a934798a5926d84052cb3b5fbeb8a1dcc
-MISC metadata.xml 367 BLAKE2B 867a3664c5bbd444d69af80af19994e07e3810349258e85c2afd0c838cb140aa3f3342ee1aa5e6862d1fd5130e7e09c1f9f30443827fe7df705f4273694c0784 SHA512 3eb0be47e7eb6bfb6d8eecee66a25183da436c38272e226e7819c8748774f3aae620eab7227414cb862734d4baf8fa060290c1b2371233141abcffd7b489c7b8
+MISC metadata.xml 397 BLAKE2B 4d9ba102aaba8fd35794cd064553a45edc66b0b845fbcd5660ad11c66fc1d7435423f79edb021da9e44683d2a157ca3cd057cc51e660ca824f6b75c6b4adf8bc SHA512 fafafc81fdef8bd5d2c4e2c58996be3c1c78d169d28ebcd493813f3aa84cb058cdd81d660ae9e1c7711df0f5fd0b0c9e7536538c15dc3ec015e152a79897cef3
diff --git a/dev-util/distro-info/metadata.xml b/dev-util/distro-info/metadata.xml
index 425c7b2eae49..1e17568d9a77 100644
--- a/dev-util/distro-info/metadata.xml
+++ b/dev-util/distro-info/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>ykonotopov@gnome.org</email>
 		<name>Yuri Konotopov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-util/docker-distribution-pruner/Manifest b/dev-util/docker-distribution-pruner/Manifest
index f5f0ba858a2b..bb9cd3429984 100644
--- a/dev-util/docker-distribution-pruner/Manifest
+++ b/dev-util/docker-distribution-pruner/Manifest
@@ -1,4 +1,4 @@
 DIST docker-distribution-pruner-0_p20170401.tar.gz 6245783 BLAKE2B 7fd29631ff4072a4ef7a9486d8dd9f4b17a2238f94c93e670e7b7af4ba93c8a6577e9ce9f2d248d5d16fb7279f4517317e2c63413424250f14f01d4c47628f5b SHA512 8e2bf3c9be37f7b16299e1e7219d646e2b037ff40ba244bb2262905ab9864b212d7f96d844a096b057c6111440d66236f8ed5eb4a61e95f7a81bac3516f65cdd
 DIST github.com-go-yaml-yaml-a3f3340b5840cee44f372bddb5880fcbc419b46a.tar.gz 60814 BLAKE2B a77b7d72e2937af71a0734c21bee7a1d7770157c27f1ddfa164c66fd5461f86a2ef46e002087092ef011caae572838bcc9537a8290cd54dfafb7f54423e47c48 SHA512 184a0e658a4eac3b867533cd0e494bd84db94fbe10e8df0d0b755c7ffc95bc99e2f84c0157183ca74cdc79289a85dcf7f1dea8a4c89a253565baf473b3627eae
 EBUILD docker-distribution-pruner-0_p20170401.ebuild 874 BLAKE2B 80edeedcfba5656cd343bc91a32daca30557e143b27585dcfb42f85c30d2b4ab0231a812ed5e97f9ff1e1ae987f6a871fd595114f1c7e3295bc2d4a38a099250 SHA512 8300b5002ce41c619fde53b0ca820b48583091b5bc62c3e4b495b5c0d5187061958312534a23b0b91fc0e64d69536849eba31f6eb3b9410f6d00cbe62b8c4313
-MISC metadata.xml 167 BLAKE2B 6c0e30dd2c7ad7044fee9c1e7065d02ba4ea022e00dc6ffb0f2963999c1dd2cf520462de2bd5c7bd3538feb2995fe22faecd5025505b0e23b85a566abad5cb96 SHA512 82819c7f6af01f9e7f859b7a25f61e44792421b66db7d6568022709d7ecb0d9b3fae57c8d1141ce05860b46561d187a3a4c252774d6f842c55097a9dc1b18cf0
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-util/docker-distribution-pruner/metadata.xml b/dev-util/docker-distribution-pruner/metadata.xml
index b372191c798e..7a38bb900964 100644
--- a/dev-util/docker-distribution-pruner/metadata.xml
+++ b/dev-util/docker-distribution-pruner/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/dev-util/docker-ls/Manifest b/dev-util/docker-ls/Manifest
index a0bb546f47e0..91180c7789f8 100644
--- a/dev-util/docker-ls/Manifest
+++ b/dev-util/docker-ls/Manifest
@@ -1,3 +1,3 @@
 DIST docker-ls-0.3.1.tar.gz 7308660 BLAKE2B eaedd07cef81da01c2d0c629867f5c3841900f839cecc9049c81b11bbbcb864ff4e8048068688832660961221b499710db45cbe417f326ec019f473dff0d6a4a SHA512 8ae831222e03b7dcb90121c2e6dea7bdc442418aa6dcc3905db82f6fd1ceb78a048d6fc2a2ef9bf0dea21a6e9d601ad77e25c077de7632057994f614d484fb99
 EBUILD docker-ls-0.3.1.ebuild 1351 BLAKE2B e89b9f857ddefade7c200913d879e807f32e32e9da2ddcc7dc19d1f081d2fb78dc66ed093140ea748e24650164a0671a99b87f92db717bc6beab4231ccbd1d16 SHA512 22bf7455ba8a43f84fbf2af83a2e9434723399751b8dd768f710690ecf30fcadb298d7c453560ead2188634474e9d6c86d56d3c16a7cbab4770f5d5230a7efb6
-MISC metadata.xml 245 BLAKE2B 6032e31aa98a3b51173eed0e5f5e110951fc7782dc921bd64369326613cdf94fbde87ec10c29f309fb4528790698ef105223ccfb5674e7cff05e5e72c10e1d63 SHA512 1808e8e5e1cc6bbb7f336471e940eb2b42489781d60cb302db6182b0ce7aa6a01148332f2d0ce32c32a57060e369c3a99330d7a02f292646acfd9dc40954709e
+MISC metadata.xml 245 BLAKE2B 476a73abadb5a9b79bf4529b9332a43921d93337b146410b20868bb24eb4095b96d24d177173cfdea63f6fb319225153ab4f0b325607e40b309fe063fd3c824b SHA512 4f30d91d4945294fec7285dc610abafdb477249fec9e54419c064035795f4bb6fb1257367c24fd0aca993910dad295375ef75321b813919ba64cb78131dafa02
diff --git a/dev-util/docker-ls/metadata.xml b/dev-util/docker-ls/metadata.xml
index 06d6a6e291cb..c629886abffb 100644
--- a/dev-util/docker-ls/metadata.xml
+++ b/dev-util/docker-ls/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/dev-util/dput-ng/Manifest b/dev-util/dput-ng/Manifest
index 2e4be7e995f0..58d49fccdff0 100644
--- a/dev-util/dput-ng/Manifest
+++ b/dev-util/dput-ng/Manifest
@@ -2,4 +2,4 @@ DIST dput-ng_1.28.tar.xz 85276 BLAKE2B d205d15aad1b81dcf2cc0b765c9724b21add32df3
 DIST dput-ng_1.32.tar.xz 86280 BLAKE2B 7e195eab4f48d77968b866185e337f2b51113f7e11cfa4929d47e79082c2fa866af2c8394c50816b650f865db9ef244775618a05a6b398090366d342a45a3db7 SHA512 596247eecb2dce080cd6f3cd1ddb1364cfa00fc3048081149e4d6dc35822aee10fa10ec25ed91154b477a909cc29dcf17cb38ccefa649f40eb70c16e0a575b2e
 EBUILD dput-ng-1.28-r1.ebuild 1879 BLAKE2B a089ff7d09249df94644d9895d1758c3522034f953f3b67c5cb0a1ad5e1fb16d6dfaed04466a386b97f18489f3ad64eecb4e94769a89a8e34eb178261e69ebc0 SHA512 90effe3d5955c3efeb248534ccfe60ca0014a2420a6ecf91b1bb4a25a2d367e241f3bfbf124a95d3b7126b1ecb629e871be5407bef3766be67c844fbb7958497
 EBUILD dput-ng-1.32.ebuild 1887 BLAKE2B 1bc7632022db9a31432a0e0aff656dd85ed98285e5bba4db7f396fc5f4932df74257bd3def1e254b2f5fdd56aba0988f9901925cd88040636d58ba3c961d2c3e SHA512 d3821e7902422740155533c50f24751427c0518f4a1af1417683ef9b470c9aa999e458333dd3d98a0bfcfa4d4266cb0367162ace06f51c60914c679dba3b29f2
-MISC metadata.xml 367 BLAKE2B 867a3664c5bbd444d69af80af19994e07e3810349258e85c2afd0c838cb140aa3f3342ee1aa5e6862d1fd5130e7e09c1f9f30443827fe7df705f4273694c0784 SHA512 3eb0be47e7eb6bfb6d8eecee66a25183da436c38272e226e7819c8748774f3aae620eab7227414cb862734d4baf8fa060290c1b2371233141abcffd7b489c7b8
+MISC metadata.xml 397 BLAKE2B 4d9ba102aaba8fd35794cd064553a45edc66b0b845fbcd5660ad11c66fc1d7435423f79edb021da9e44683d2a157ca3cd057cc51e660ca824f6b75c6b4adf8bc SHA512 fafafc81fdef8bd5d2c4e2c58996be3c1c78d169d28ebcd493813f3aa84cb058cdd81d660ae9e1c7711df0f5fd0b0c9e7536538c15dc3ec015e152a79897cef3
diff --git a/dev-util/dput-ng/metadata.xml b/dev-util/dput-ng/metadata.xml
index 425c7b2eae49..1e17568d9a77 100644
--- a/dev-util/dput-ng/metadata.xml
+++ b/dev-util/dput-ng/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>ykonotopov@gnome.org</email>
 		<name>Yuri Konotopov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-util/dwarves/Manifest b/dev-util/dwarves/Manifest
index 464bfa6d19fe..a9be909fc100 100644
--- a/dev-util/dwarves/Manifest
+++ b/dev-util/dwarves/Manifest
@@ -1,12 +1,4 @@
 AUX dwarves-1.10-python-import.patch 399 BLAKE2B 7abd98ec5711ec4ce9230a2d0bb06328174a4a67b62ba14b2413b83b6d44676d372930d4796b9ece230c4de9185d35cb31a086ca340871e50e29d584ab9a7487 SHA512 c2f5c1e99ef2ffeaf0e7962cbdf28817f6896b27ff6894571823c81ba08b9e9440af1a5b6ad82770b8e8d6ec99ec2ef8f46a98b67fea7cd4ed7e8c22e716e314
-DIST dwarves-1.17.tar.xz 309028 BLAKE2B 600d095359fa1ef208cc83655761505a07512faf9957144cc5fdd9e69bef98be3afc8b29a4c13aa0246aa43fdc9b4906de95f37c86fc6790ece52a79e3b13695 SHA512 8916ea24316efe1eb322d045fb2d81c230905f2fe33942eac641e9e0311f33a3bcf55be454eac32781799c255303bafacd8f1bd1b3ec08f0dae4d5f38d8186ba
-DIST dwarves-1.18.tar.xz 324912 BLAKE2B bdce2903608a1229e2fc7e8a01bc41249a17a1a003fc3616910959fc43b430569cd737a220edfab2473485cd2dc0519b4add0e0e3a690e51ad35c4fa082752a5 SHA512 01647607ce0f4dfceb464367f2dd8a432f33eb5d0e003b6bbb07b38bd992a2992844309b04aee2a0388658c41d8b2059d03064c6e450fe7c347c5bca445d7938
-DIST dwarves-1.19.tar.xz 686136 BLAKE2B f7fe50be30fa9b247bf0f35d5dec6aa8f1bed44eaaf8a2cde8da6f65a870212c2d257740a6d4f94da24f365ad49259d53c4f5447921b22754c63184001029620 SHA512 b378a504da5b00c6280b9efda7348c2d61015ce6477f3e4e4466f58d9bf6837457cd0aa9263b7d921093cca5ee26c4fab9950f7f75ca05d27ae646b3bfe22f9a
 DIST dwarves-1.20.tar.xz 688728 BLAKE2B c57f390f7e1d20c861a4acb8cd7fe238a3f7c3f2d915d96fc051dba2587942e8fabfa4f524d18555c486863fa02bc4ab63d90e90d477f376dc5e547aa36cccac SHA512 306bb74c498527a5a9bdae4d304e90511336cab627d9acad5237d93cbb48efe11dbca4418c540fa03e3ecdd168ce224cabe9fd2f6fbb50520d0dd17741c80817
-EBUILD dwarves-1.17-r1.ebuild 918 BLAKE2B f9da513e397cf0b8f2dc68853e6ed8965c5b0f91c31ea6d272f47b4f559530c110ae14c2933f168721ec168fb1749278e9f74a1ea5b91c0e184e00b9422f922c SHA512 a8eac9a1a836459c7ae6a91ab34413127a93632afb3a4b84e4cda008d61e7eebc2d53a5e5f3d0cf42151097d7ce1f75f7d8103133a830a80b088a2a78184082a
-EBUILD dwarves-1.17.ebuild 933 BLAKE2B 8cd67a6045d31537c2165522db80a34986107df4ba9180d3d5f6f2733d31ec88fd81dab7d6ff3b6c90485a1710bbb39df90cb7badb885bf0057e6999b0a3af16 SHA512 0a2487163441ab6570c36f0ec812e26fad471ce8ae6e9db5fecbe657c8b9f437b4a85641d756a9c38db2dbab37e0a1b5e798eab3ab0da8ffab83a79df267a6e3
-EBUILD dwarves-1.18.ebuild 918 BLAKE2B f9da513e397cf0b8f2dc68853e6ed8965c5b0f91c31ea6d272f47b4f559530c110ae14c2933f168721ec168fb1749278e9f74a1ea5b91c0e184e00b9422f922c SHA512 a8eac9a1a836459c7ae6a91ab34413127a93632afb3a4b84e4cda008d61e7eebc2d53a5e5f3d0cf42151097d7ce1f75f7d8103133a830a80b088a2a78184082a
-EBUILD dwarves-1.19-r1.ebuild 1027 BLAKE2B 152b86a3775abb0e6d2505bc7a7f651bcbd2e7d0fa38ce7cd1abda1021345496751d493982f795a8171953f11b1f76374c1d9084091314aaaac9fd21aadc0611 SHA512 ffc02657d39e3672b7a63ae77e83062270eaf2e27f46c5c49d08ced5578c70bd9f1c3ad18431299efc44bdd44db54df5fa201e22597dba91d3869f759f6d733b
-EBUILD dwarves-1.19.ebuild 930 BLAKE2B 9a82ee9483d21c5b0d89dc02de73a656a3269604a76906b10b4e0e368812fdb4650195b67c6bc46ac1dee85c58cee119cd52bea6ab3a01319287ce7e8650e940 SHA512 5e6202ea6aefae993358b0439ecf1d75659a69533e63fe486dabc40d3faa63bf05693117662c951730c60f57bfc40c2692eeaaeaffb1076fa14d38ea8bddb558
 EBUILD dwarves-1.20.ebuild 1024 BLAKE2B e0a14962d98c00a5e2cb51355b2872665ffc085c4038074975860269e927a65fb0f0d05cf1f2553a10042ed50d0de5c1efc8a0ced01e4baf7a37b03ae88c8e52 SHA512 df1491907d9d5a56fc41d1277b2921d48fa8da9c8864ac52d0989888c3165e0a3ee6645fcff3d86bb948777c058b685eeeb83671107a2a57064db752f32db096
 MISC metadata.xml 671 BLAKE2B 78a2fa86c0acc136403b1477db4e2deb3bde1ceed636ced96705cdaccb7e42f76e8fbd202c3fa258c1f33b14827f95b5ce343f8f4df981be66e0ad3a8dd226b8 SHA512 0cdd2c3e4e76a9017120a409aec1f70327363ee146e5fb74684d0e08e2836f0079cb97be1c4874445b271b98c13daf04f75ee481ef21607aac8976a78437af11
diff --git a/dev-util/dwarves/dwarves-1.17-r1.ebuild b/dev-util/dwarves/dwarves-1.17-r1.ebuild
deleted file mode 100644
index 02626d8bfca6..000000000000
--- a/dev-util/dwarves/dwarves-1.17-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-inherit multilib cmake python-single-r1
-
-DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
-HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
-
-LICENSE="GPL-2" # only
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/elfutils-0.178
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-if [[ ${PV//_p} == ${PV} ]]; then
-	SRC_URI="http://fedorapeople.org/~acme/dwarves/${P}.tar.xz"
-else
-	SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz"
-fi
-
-DOCS=( README README.ctracer NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.10-python-import.patch
-)
-
-src_configure() {
-	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
-	cmake_src_configure
-}
-
-src_test() { :; }
-
-src_install() {
-	cmake_src_install
-}
diff --git a/dev-util/dwarves/dwarves-1.17.ebuild b/dev-util/dwarves/dwarves-1.17.ebuild
deleted file mode 100644
index c3afae1486d3..000000000000
--- a/dev-util/dwarves/dwarves-1.17.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7,8} )
-inherit multilib cmake-utils python-single-r1
-
-DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
-HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
-
-LICENSE="GPL-2" # only
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE="debug"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/elfutils-0.178
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-if [[ ${PV//_p} == ${PV} ]]; then
-	SRC_URI="http://fedorapeople.org/~acme/dwarves/${P}.tar.xz"
-else
-	SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz"
-fi
-
-DOCS=( README README.ctracer NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.10-python-import.patch
-)
-
-src_configure() {
-	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
-	cmake-utils_src_configure
-}
-
-src_test() { :; }
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/dev-util/dwarves/dwarves-1.18.ebuild b/dev-util/dwarves/dwarves-1.18.ebuild
deleted file mode 100644
index 02626d8bfca6..000000000000
--- a/dev-util/dwarves/dwarves-1.18.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-inherit multilib cmake python-single-r1
-
-DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
-HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
-
-LICENSE="GPL-2" # only
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/elfutils-0.178
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-if [[ ${PV//_p} == ${PV} ]]; then
-	SRC_URI="http://fedorapeople.org/~acme/dwarves/${P}.tar.xz"
-else
-	SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz"
-fi
-
-DOCS=( README README.ctracer NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.10-python-import.patch
-)
-
-src_configure() {
-	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
-	cmake_src_configure
-}
-
-src_test() { :; }
-
-src_install() {
-	cmake_src_install
-}
diff --git a/dev-util/dwarves/dwarves-1.19-r1.ebuild b/dev-util/dwarves/dwarves-1.19-r1.ebuild
deleted file mode 100644
index 10618245f8ef..000000000000
--- a/dev-util/dwarves/dwarves-1.19-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
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit multilib cmake python-single-r1
-
-DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
-HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
-
-LICENSE="GPL-2" # only
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/elfutils-0.178
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-if [[ ${PV//_p} == ${PV} ]]; then
-	SRC_URI="http://fedorapeople.org/~acme/dwarves/${P}.tar.xz"
-else
-	SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz"
-fi
-
-DOCS=( README README.ctracer NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.10-python-import.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-	python_fix_shebang ostra/ostra-cg ostra/python/ostra.py
-}
-
-src_configure() {
-	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
-	cmake_src_configure
-}
-
-src_test() { :; }
-
-src_install() {
-	cmake_src_install
-}
diff --git a/dev-util/dwarves/dwarves-1.19.ebuild b/dev-util/dwarves/dwarves-1.19.ebuild
deleted file mode 100644
index 7624739ac404..000000000000
--- a/dev-util/dwarves/dwarves-1.19.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-inherit multilib cmake python-single-r1
-
-DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
-HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
-
-LICENSE="GPL-2" # only
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/elfutils-0.178
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-if [[ ${PV//_p} == ${PV} ]]; then
-	SRC_URI="http://fedorapeople.org/~acme/dwarves/${P}.tar.xz"
-else
-	SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz"
-fi
-
-DOCS=( README README.ctracer NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.10-python-import.patch
-)
-
-src_configure() {
-	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
-	cmake_src_configure
-}
-
-src_test() { :; }
-
-src_install() {
-	cmake_src_install
-}
diff --git a/dev-util/envman/Manifest b/dev-util/envman/Manifest
index b8a840f2dc60..b5c5fc39ff4a 100644
--- a/dev-util/envman/Manifest
+++ b/dev-util/envman/Manifest
@@ -1,9 +1,3 @@
-DIST envman-1.2.0.tar.gz 2997860 BLAKE2B e49d3b421fb1ab226de4430e90d8c684bc3a2554205c6383a140c0832134eaba338797dca44668fc2473d248940b5499395ab3a6d3359382305fd8a719772257 SHA512 5245aea8c280a6d6022e8132216891f09abee707c0ed736bfe6b4882aa23880a771dce5371b8ba5fcdd41fa951606727e7582442d897058b25985cf9dd5a9d18
-DIST envman-1.2.1.tar.gz 3033981 BLAKE2B a48c46d35a122ad86274867c246f1af998a983a67e8d30214bc6f3a989ad6b435a61ebad7f128803ffb9dcfc05af261b99cf3316fed93412c6ee1da873cc988e SHA512 bbec25964d868077c88a01ab827744633b325eb955809d4ec48a5224f6f8530c31b297b592f0280dabd01007bf75fd6ac3609c4d19be0332ca114d36725c7fb6
-DIST envman-2.1.0.tar.gz 3133726 BLAKE2B 8c5c87d43bdc22838036fe25ea6b48e702163d474169181257cef6f0fe4fba01b18f870d9bfee5f56b30cce13f47f6af70f4e55fcff221af77f14550a13ebb46 SHA512 c0b7ab5355332fa24ecd4166e3fdb1f02e589ee11288768a382a9556d2c3061b1930061873525e19b71451a47c72c09f5b7c6191b8564b0dec2a9c29dfbcf222
 DIST envman-2.1.1.tar.gz 3162514 BLAKE2B 3aad5bc174bbbfc52ffe219fae7590e3ebcf7ef0a5390add53e27232500b777f562d3c4662219732048f1a700f6a11da6aba490b3495d57d4da3610a02d544c9 SHA512 5d30bd23a2aa828786663f184707d776ddc0e71ee09e007f8075b99ce0c415db28e612a785ab1acd8767cfd8623939a82a7c0fc71e0fd6ce8d8ce4e0b0048cf0
-EBUILD envman-1.2.0.ebuild 873 BLAKE2B ab827ea0ff610b6d2675f925dc65b32b47472eaca4f605341a71d332ea00527fb8f8357847a7f0bdbc3314d9182ea104dd13f9c179a8b210410190cb1472ade1 SHA512 862df91f0bed24dffec1e1c0d209aed338a2ab060c41ec147a82503a81f279b787ed2524ff0cca90be47717881b491ac7a4490736a8ac4a3011289bd7480ac11
-EBUILD envman-1.2.1.ebuild 869 BLAKE2B ed7a46805b4ee9acc2746795b09d812bf012c2975f7b75d501d94409c3a14312c9c4c985cb3191512203e9ce5fcedda346fed15c39bc79c4160f509a7041e49a SHA512 6dd367bd5ff737cb782192c35be6251a60a049f2a69a196171a2b2415b57d896a1c5db8702689ad926a6a445227cac50de83e00aaf2429cffb52133292357f15
-EBUILD envman-2.1.0.ebuild 865 BLAKE2B de902e8487a1978ca7de1283449ebeae631a01a10a54b26351ee3a3a7ab67327d28c308e4c56bf25cd22832906884f92f71c4faad7e616b181e875eb5793fd08 SHA512 b274313029889346172143f43ef85c234b55c683b0db93f37f1a52ba0222d3585d56e656045ac76d629578b8eef76a06c99ed3c9d12343a186b0d8d5b1308a61
 EBUILD envman-2.1.1.ebuild 862 BLAKE2B b938d2ad3381020be36b1ae3bc545b6684ee4e08a13c892722279ffcfbfef282638685bc5900f5d20eb4ce68ba49b26ed69fdfc33e02606d5d05298677ab4c97 SHA512 d799c413839ff772964c7101120fdf8fdeafc64ba4b64f09a5ac9c476e45683a28fc9037336034960d1fbee248ce228e3b894a08a18f63ca50ea7a1407d2e567
-MISC metadata.xml 942 BLAKE2B 32b021b4b9f97464d5ff81c7541a389105d75d32ac8598474007f4f27013c0b1bff37968a4ebcf9b9e41264686aef44c43da6896426392adfaf91576ca2873fa SHA512 4fd1c54eec14f80bd804140299d2f987c404f0653c6b6adfc1715ac01cbaed0555ccb8cd87fbe6a2f34b7cb90f81cf20db817866f40ea2f6c607c7268705a089
+MISC metadata.xml 972 BLAKE2B 657ff0da14d738f26a1ee1d2b4cabc5911643206c98d838e654cf2847c1228708daeb09eeccd4834ebe839a68353520c81ffd33b8143aa41b437b7ecf1a35f07 SHA512 6162bda597f2b568c1a20c8bc0b34b6583d0f8436e616609c27c984090f90009677144cdd8709269309e7ef3549f0278a21fe184fe043f3e4394e75e2d0e701b
diff --git a/dev-util/envman/envman-1.2.0.ebuild b/dev-util/envman/envman-1.2.0.ebuild
deleted file mode 100644
index 6713bc5a103a..000000000000
--- a/dev-util/envman/envman-1.2.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-build
-
-EGO_ON="github.com/bitrise-io"
-EGO_PN="${EGO_ON}/${PN}"
-
-DESCRIPTION="Environment variable manager for Bitrise CLI."
-HOMEPAGE="https://www.bitrise.io/cli"
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-S="${WORKDIR}/src/${EGO_ON}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${WORKDIR}/src/${EGO_ON}" || die "Couldn't create project dir in GOPATH"
-	mv "${WORKDIR}/${P}" "${WORKDIR}/src/${EGO_ON}/envman" || die "Couldn't move sources to GOPATH"
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}" go build -v -o bin/envman || die "Couldn't compile envman"
-}
-
-src_test() {
-	GOPATH="${WORKDIR}" go test ./... || die "Tests failed"
-}
-
-src_install() {
-	dobin bin/envman
-	dodoc README.md
-}
diff --git a/dev-util/envman/envman-1.2.1.ebuild b/dev-util/envman/envman-1.2.1.ebuild
deleted file mode 100644
index 6909eb936e5a..000000000000
--- a/dev-util/envman/envman-1.2.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-build
-
-EGO_ON="github.com/bitrise-io"
-EGO_PN="${EGO_ON}/${PN}"
-
-DESCRIPTION="Environment variable manager for Bitrise CLI"
-HOMEPAGE="https://www.bitrise.io/cli"
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-S="${WORKDIR}/src/${EGO_ON}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${WORKDIR}/src/${EGO_ON}" || die "Couldn't create project dir in GOPATH"
-	mv "${WORKDIR}/${P}" "${WORKDIR}/src/${EGO_ON}/envman" || die "Couldn't move sources to GOPATH"
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}" go build -v -o bin/envman || die "Couldn't compile envman"
-}
-
-src_test() {
-	GOPATH="${WORKDIR}" go test ./... || die "Tests failed"
-}
-
-src_install() {
-	dobin bin/envman
-	einstalldocs
-}
diff --git a/dev-util/envman/envman-2.1.0.ebuild b/dev-util/envman/envman-2.1.0.ebuild
deleted file mode 100644
index 20bf664c7e84..000000000000
--- a/dev-util/envman/envman-2.1.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-build
-
-EGO_ON="github.com/bitrise-io"
-EGO_PN="${EGO_ON}/${PN}"
-
-DESCRIPTION="Environment variable manager for Bitrise CLI"
-HOMEPAGE="https://www.bitrise.io/cli"
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-S="${WORKDIR}/src/${EGO_ON}/${PN}"
-
-src_unpack() {
-	default
-	mkdir -p "${WORKDIR}/src/${EGO_ON}" || die "Couldn't create project dir in GOPATH"
-	mv "${WORKDIR}/${P}" "${WORKDIR}/src/${EGO_ON}/envman" || die "Couldn't move sources to GOPATH"
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}" go build -v -o bin/envman || die "Couldn't compile envman"
-}
-
-src_test() {
-	GOPATH="${WORKDIR}" go test ./... || die "Tests failed"
-}
-
-src_install() {
-	dobin bin/envman
-	einstalldocs
-}
diff --git a/dev-util/envman/metadata.xml b/dev-util/envman/metadata.xml
index c93a133753ba..e5ee1b331336 100644
--- a/dev-util/envman/metadata.xml
+++ b/dev-util/envman/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>karol.wrotniak@droidsonroids.pl</email>
 		<name>Karol Wrótniak</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-util/geany-plugins/Manifest b/dev-util/geany-plugins/Manifest
index 99c242990e17..2d8da91a6f0a 100644
--- a/dev-util/geany-plugins/Manifest
+++ b/dev-util/geany-plugins/Manifest
@@ -1,9 +1,4 @@
-AUX geany-plugins-1.36-libgit2-0.99.patch 2345 BLAKE2B 8cbaf858dd62c692279b863a8c594fd768c43ef4042fc10093eb608f6c6f7f71d3fadbebf41e98ab1045303b3e921b20aa453467c314132807fb285aab5560bd SHA512 49897e68b7617e429fc98cee9bc6dc47b60f2e526563ab7b3a58fe4aa8c04bec522ad357225ff5d75378a551c8eee4374382c25381ca368769137b045fbbae6b
 AUX geany-plugins-1.37_use-stdbool.patch 1392 BLAKE2B ff3e64bb921b01cd35943d9fcb0a860d65ac71eb70298456c36c84713e71431838cb05823886faaa1d93050b759090625513dd263187649b89120cc3217a202d SHA512 9fa5960d9eb6418de7acb8efe94f9148deae1cb72864c149abc4ae1b22e23f53bd6905f72a901e052f33a445d31d8c5c0cd3dd8efe535ee58910585e759b0dbd
-DIST geany-plugins-1.36.tar.gz 4693634 BLAKE2B a7c319a77cb92a55a0a53063ab75d9375f7d2a0e419eb3e0acd063b8fda4b4d9798c103ce53b80090c73bd86804c58f815aaf8d0eecc0d7fbf7ad1c8470cb9b5 SHA512 b3e58b42432d17c27289fa20d10b833a2d7f5d8c72b51abe5b1ebdabcb952b18e0984b15ef6ac9753102d839f3174f28798269e1e94bf032bdaa189e98d72b2d
 DIST geany-plugins-1.37.tar.gz 4711239 BLAKE2B 7f4fd121f6f0784aecf2dcc04d208c89e502b23debcbc40889f93c1421e414c33c8634376cfe01e91c370f70818d33b373b88698f5cb0ee23dff5edee9d781cf SHA512 47f8d7170593114c773067a8132c724471cbf881582a0a739da578ca42533783d8ecbccb04e039f2990ceed440bbd2d94e4be4a28e336c7f74b8e11a15ba4ce9
-EBUILD geany-plugins-1.36-r2.ebuild 3041 BLAKE2B e25759bbd4f9a48e3fbafb3c4b90ea1e8b648ed137d226976003796df82b769da8f9752e573b6276d940235bd1c8993329b2a56a0ad34c5f2eee99e6ecb98f55 SHA512 51ae6f610441056d9572133c18e61d7f01f7c1cd6258e8e18e4828525cbe05d8e2dc5129291ae23aef52a45d7c75e70ba47a5e98a153a80c900c8913723ca516
-EBUILD geany-plugins-1.37-r100.ebuild 3055 BLAKE2B 9983e26e9c6321b54e88e8258044983df16416982b9f64fe4285900e6fdae9f8775e63fbbf1c6314038c37ffec84ca825ecc72e5899418387f23daba6050c2e5 SHA512 2191e647cb73b6fad45127943109194fe7d6042032b6d3444fe7f09814e71a579da87e471347eac4a17532db77c6f1ba41efb8bea0b64c25203d4090aa28f8d1
-EBUILD geany-plugins-1.37-r101.ebuild 2961 BLAKE2B a297d54487b57a38ac1ab4ff323bffdfafe1f983555b62e2e399fb88ea718a1f5c2f6e7ab785bf49629048df2cbf0b01c88e7158086d25832d7f01ffbaf54d26 SHA512 d038947715bd19eb7df1db3a6f731eb7fd1b18f47a6dc809ebdf38f785f25e5b3480c0902faaf2e08b1fe88abdc01ad7206b601cef3de0b3f7233ca752571794
-EBUILD geany-plugins-1.37.ebuild 2992 BLAKE2B 0c9d6f96df55650387d8077e6da25367f4077445ed77071199e8f2e21ccdf10419fd656ed7aa34177b498c9748c2bb77adbf27c956854fccafe642564997945c SHA512 48402ae37f4eb61a1b437d36235e97b95e775a8b8ee0b458454f11c4265bfae3528c5e25dc82958ef4638d08415078419b71f9b49a3305081268ec6420cc24e4
-MISC metadata.xml 1278 BLAKE2B d7069dbc82acd4fae0939c09f867e557a1b214d4ebe48add0cb483aeeec073ae362d35033c0017117e614793de109790c0c17c399327ac4e823f378948301e8f SHA512 5effdf6d8adbb1d63835c55d9a5e97a5596c59027b7c250dbdd6e0d88c7bedc6c1a4c1d8150cd00da538d40bcceb7b819c50080262737255eb2e5463904a4eb3
+EBUILD geany-plugins-1.37-r101.ebuild 2959 BLAKE2B 47de3cee422c58a9a6c7e311b0e63f6ce48eeea824ec9c728a503212022e230d0fa48de5ec67ec3cef9c7d98713138ba69253a01009a8a7d480ec557fb0cf66c SHA512 a70bd981c05c18e174e4943b91dbe39828b17aabe93e44b2c8f76adb675de304f91eada551ff8763edcfd1e954003efc6940732a3e5364a6e77006d55403ae20
+MISC metadata.xml 1200 BLAKE2B 60891abe35d87180eac8f9bc6a9377f3b3152b7bb3d5862cca5f31d423371302a9ba8556827e5db0e893ab82d73efdf4bf3c89c16b0c751ebc4d0e827c7a44a9 SHA512 ce72297d075ebb4ad7397116466706c35f767a60d5ed15e4642f27e0ec81bae20a1f6acb1154f3b8e92f8d83b480923890529219ef3f8b743e01b0a1928aa5dc
diff --git a/dev-util/geany-plugins/files/geany-plugins-1.36-libgit2-0.99.patch b/dev-util/geany-plugins/files/geany-plugins-1.36-libgit2-0.99.patch
deleted file mode 100644
index 25e5ac4ea28e..000000000000
--- a/dev-util/geany-plugins/files/geany-plugins-1.36-libgit2-0.99.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 9497d829e1b207eb83575dc6f617feecfb89bc16 Mon Sep 17 00:00:00 2001
-From: Dominik Schmidt <dominik@schm1dt.ch>
-Date: Sun, 23 Feb 2020 19:15:30 +0100
-Subject: [PATCH] Make libgit2 version preprocessor conditionals compatible
- with libgit2-0.99
-
-LIBGIT2_SOVERSION is defined as string literal, e.g. "0.99",
-from libgit2-0.99 and beyond. Arithmetic checks against this
-variable whill hence fail. This patch switches the checks to
-compare against the LIBGIT2_VER_* family, which should be more stable.
----
- git-changebar/src/gcb-plugin.c | 6 +++---
- workbench/src/plugin_main.c    | 2 +-
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/git-changebar/src/gcb-plugin.c b/git-changebar/src/gcb-plugin.c
-index b7083199..a911815f 100644
---- a/git-changebar/src/gcb-plugin.c
-+++ b/git-changebar/src/gcb-plugin.c
-@@ -32,11 +32,11 @@
- #include <geany.h>
- #include <document.h>
- 
--#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 22
-+#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 22) )
- # define git_libgit2_init     git_threads_init
- # define git_libgit2_shutdown git_threads_shutdown
- #endif
--#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 23
-+#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 23) )
- /* 0.23 added @p binary_cb */
- # define git_diff_buffers(old_buffer, old_len, old_as_path, \
-                           new_buffer, new_len, new_as_path, options, \
-@@ -45,7 +45,7 @@
-                     new_buffer, new_len, new_as_path, options, \
-                     file_cb, hunk_cb, line_cb, payload)
- #endif
--#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 28
-+#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 28) )
- # define git_buf_dispose  git_buf_free
- # define git_error_last   giterr_last
- #endif
-diff --git a/workbench/src/plugin_main.c b/workbench/src/plugin_main.c
-index 6fa6fc84..25ecdf6d 100644
---- a/workbench/src/plugin_main.c
-+++ b/workbench/src/plugin_main.c
-@@ -36,7 +36,7 @@
- #include "tm_control.h"
- 
- 
--#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 22
-+#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 22))
- # define git_libgit2_init     git_threads_init
- # define git_libgit2_shutdown git_threads_shutdown
- #endif
diff --git a/dev-util/geany-plugins/geany-plugins-1.36-r2.ebuild b/dev-util/geany-plugins/geany-plugins-1.36-r2.ebuild
deleted file mode 100644
index 854fb5782672..000000000000
--- a/dev-util/geany-plugins/geany-plugins-1.36-r2.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
-
-DESCRIPTION="A collection of different plugins for Geany"
-HOMEPAGE="https://plugins.geany.org"
-SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 ~sparc x86"
-
-IUSE="+gtk3 ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope soup workbench"
-REQUIRED_USE="!gtk3? ( !markdown )"
-
-DEPEND="
-	dev-libs/glib:2
-	>=dev-util/geany-1.35[gtk3=]
-	gtk3? ( x11-libs/gtk+:3 )
-	!gtk3? ( x11-libs/gtk+:2 )
-	ctags? ( dev-util/ctags )
-	debugger? (
-		gtk3? ( x11-libs/vte:2.91 )
-		!gtk3? ( x11-libs/vte:0 )
-		)
-	enchant? ( app-text/enchant:= )
-	git? ( dev-libs/libgit2:= )
-	gpg? ( app-crypt/gpgme:1= )
-	gtkspell? (
-		gtk3? ( app-text/gtkspell:3= )
-		!gtk3? ( app-text/gtkspell:2 )
-		)
-	lua? ( dev-lang/lua:0= )
-	markdown? (
-		app-text/discount
-		net-libs/webkit-gtk:4
-		)
-	pretty-printer? ( dev-libs/libxml2:2 )
-	scope? (
-		gtk3? ( x11-libs/vte:2.91 )
-		!gtk3? ( x11-libs/vte:0 )
-		)
-	soup? ( net-libs/libsoup:2.4 )
-	workbench? ( dev-libs/libgit2:= )
-"
-RDEPEND="${DEPEND}
-	scope? ( sys-devel/gdb )
-"
-BDEPEND="virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-PATCHES=( "${FILESDIR}"/${P}-libgit2-0.99.patch )
-
-src_configure() {
-	local myeconfargs=(
-		--disable-cppcheck
-		--disable-extra-c-warnings
-		$(use_enable nls)
-		--enable-utilslib
-		# Plugins
-		--enable-addons
-		--enable-autoclose
-		--enable-automark
-		--enable-codenav
-		--enable-commander
-		--enable-defineformat
-		--enable-geanyextrasel
-		--enable-geanyinsertnum
-		--enable-geanymacro
-		--enable-geanyminiscript
-		--enable-geanynumberedbookmarks
-		--enable-geanyprj
-		--enable-geanyvc $(use_enable gtkspell)
-		--enable-keyrecord
-		--enable-latex
-		--enable-lineoperations
-		--enable-lipsum
-		--enable-overview
-		--enable-pairtaghighlighter
-		--enable-pohelper
-		--enable-projectorganizer
-		--enable-sendmail
-		--enable-shiftcolumn
-		--enable-tableconvert
-		--enable-treebrowser
-		--enable-vimode
-		--enable-xmlsnippets
-		$(use_enable debugger)
-		$(use_enable ctags geanyctags)
-		$(use_enable !gtk3 geanydoc)
-		$(use_enable lua geanylua)
-		$(use_enable gpg geanypg)
-		$(use_enable soup geniuspaste)
-		$(use_enable git gitchangebar)
-		$(use_enable markdown) --disable-peg-markdown # using app-text/discount instead
-		$(use_enable pretty-printer)
-		$(use_enable scope)
-		$(use_enable enchant spellcheck)
-		# Having updatechecker… when you’re using a package manager?
-		$(use_enable soup updatechecker)
-		$(use_enable workbench)
-		# GeanyGenDoc requires ctpl which isn’t yet in portage
-		--disable-geanygendoc
-		# Require obsolete and vulnerable webkit-gtk versions
-		--disable-devhelp
-		--disable-webhelper
-		# GTK 2 only
-		--disable-geanypy
-		--disable-multiterm
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-
-	# make installs all translations if LINGUAS is empty
-	if [[ -z "${LINGUAS-x}" ]]; then
-		rm -r "${ED}/usr/share/locale/" || die
-	fi
-}
diff --git a/dev-util/geany-plugins/geany-plugins-1.37-r100.ebuild b/dev-util/geany-plugins/geany-plugins-1.37-r100.ebuild
deleted file mode 100644
index a7b45aeecd51..000000000000
--- a/dev-util/geany-plugins/geany-plugins-1.37-r100.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-1 )
-
-inherit lua-single
-
-DESCRIPTION="A collection of different plugins for Geany"
-HOMEPAGE="https://plugins.geany.org"
-SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 ~sparc x86"
-
-IUSE="gtk2 ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope soup workbench"
-REQUIRED_USE="gtk2? ( !markdown ) lua? ( ${LUA_REQUIRED_USE} )"
-
-DEPEND="
-	dev-libs/glib:2
-	>=dev-util/geany-1.37[gtk2=]
-	!gtk2? ( x11-libs/gtk+:3 )
-	gtk2? ( x11-libs/gtk+:2 )
-	ctags? ( dev-util/ctags )
-	debugger? (
-		!gtk2? ( x11-libs/vte:2.91 )
-		gtk2? ( x11-libs/vte:0 )
-		)
-	enchant? ( app-text/enchant:= )
-	git? ( dev-libs/libgit2:= )
-	gpg? ( app-crypt/gpgme:1= )
-	gtkspell? (
-		!gtk2? ( app-text/gtkspell:3= )
-		gtk2? ( app-text/gtkspell:2 )
-		)
-	lua? ( ${LUA_DEPS} )
-	markdown? (
-		app-text/discount
-		net-libs/webkit-gtk:4
-		)
-	pretty-printer? ( dev-libs/libxml2:2 )
-	scope? (
-		!gtk2? ( x11-libs/vte:2.91 )
-		gtk2? ( x11-libs/vte:0 )
-		)
-	soup? ( net-libs/libsoup:2.4 )
-	workbench? ( dev-libs/libgit2:= )
-"
-RDEPEND="${DEPEND}
-	scope? ( sys-devel/gdb )
-"
-BDEPEND="virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-src_configure() {
-	local myeconfargs=(
-		--disable-cppcheck
-		--disable-extra-c-warnings
-		$(use_enable nls)
-		--enable-utilslib
-		# Plugins
-		--enable-addons
-		--enable-autoclose
-		--enable-automark
-		--enable-codenav
-		--enable-commander
-		--enable-defineformat
-		--enable-geanyextrasel
-		--enable-geanyinsertnum
-		--enable-geanymacro
-		--enable-geanyminiscript
-		--enable-geanynumberedbookmarks
-		--enable-geanyprj
-		--enable-geanyvc $(use_enable gtkspell)
-		--enable-keyrecord
-		--enable-latex
-		--enable-lineoperations
-		--enable-lipsum
-		--enable-overview
-		--enable-pairtaghighlighter
-		--enable-pohelper
-		--enable-projectorganizer
-		--enable-sendmail
-		--enable-shiftcolumn
-		--enable-tableconvert
-		--enable-treebrowser
-		--enable-vimode
-		--enable-xmlsnippets
-		$(use_enable debugger)
-		$(use_enable ctags geanyctags)
-		$(use_enable gtk2 geanydoc)
-		$(use_enable lua geanylua)
-		$(use_enable gpg geanypg)
-		$(use_enable soup geniuspaste)
-		$(use_enable git gitchangebar)
-		$(use_enable markdown) --disable-peg-markdown # using app-text/discount instead
-		$(use_enable pretty-printer)
-		$(use_enable scope)
-		$(use_enable enchant spellcheck)
-		# Having updatechecker… when you’re using a package manager?
-		$(use_enable soup updatechecker)
-		$(use_enable workbench)
-		# GeanyGenDoc requires ctpl which isn’t yet in portage
-		--disable-geanygendoc
-		# Require obsolete and vulnerable webkit-gtk versions
-		--disable-devhelp
-		--disable-webhelper
-		# GTK 2 only
-		--disable-geanypy
-		--disable-multiterm
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-
-	# make installs all translations if LINGUAS is empty
-	if [[ -z "${LINGUAS-x}" ]]; then
-		rm -r "${ED}/usr/share/locale/" || die
-	fi
-}
diff --git a/dev-util/geany-plugins/geany-plugins-1.37-r101.ebuild b/dev-util/geany-plugins/geany-plugins-1.37-r101.ebuild
index 7512e75d44a1..6d06c1275d7d 100644
--- a/dev-util/geany-plugins/geany-plugins-1.37-r101.ebuild
+++ b/dev-util/geany-plugins/geany-plugins-1.37-r101.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm ppc ppc64 ~sparc x86"
 
 IUSE="ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope soup workbench"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
diff --git a/dev-util/geany-plugins/geany-plugins-1.37.ebuild b/dev-util/geany-plugins/geany-plugins-1.37.ebuild
deleted file mode 100644
index a1018068f128..000000000000
--- a/dev-util/geany-plugins/geany-plugins-1.37.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A collection of different plugins for Geany"
-HOMEPAGE="https://plugins.geany.org"
-SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="gtk2 ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope soup workbench"
-REQUIRED_USE="gtk2? ( !markdown )"
-
-DEPEND="
-	dev-libs/glib:2
-	>=dev-util/geany-1.37[gtk2=]
-	!gtk2? ( x11-libs/gtk+:3 )
-	gtk2? ( x11-libs/gtk+:2 )
-	ctags? ( dev-util/ctags )
-	debugger? (
-		!gtk2? ( x11-libs/vte:2.91 )
-		gtk2? ( x11-libs/vte:0 )
-		)
-	enchant? ( app-text/enchant:= )
-	git? ( dev-libs/libgit2:= )
-	gpg? ( app-crypt/gpgme:1= )
-	gtkspell? (
-		!gtk2? ( app-text/gtkspell:3= )
-		gtk2? ( app-text/gtkspell:2 )
-		)
-	lua? ( dev-lang/lua:0= )
-	markdown? (
-		app-text/discount
-		net-libs/webkit-gtk:4
-		)
-	pretty-printer? ( dev-libs/libxml2:2 )
-	scope? (
-		!gtk2? ( x11-libs/vte:2.91 )
-		gtk2? ( x11-libs/vte:0 )
-		)
-	soup? ( net-libs/libsoup:2.4 )
-	workbench? ( dev-libs/libgit2:= )
-"
-RDEPEND="${DEPEND}
-	scope? ( sys-devel/gdb )
-"
-BDEPEND="virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-src_configure() {
-	local myeconfargs=(
-		--disable-cppcheck
-		--disable-extra-c-warnings
-		$(use_enable nls)
-		--enable-utilslib
-		# Plugins
-		--enable-addons
-		--enable-autoclose
-		--enable-automark
-		--enable-codenav
-		--enable-commander
-		--enable-defineformat
-		--enable-geanyextrasel
-		--enable-geanyinsertnum
-		--enable-geanymacro
-		--enable-geanyminiscript
-		--enable-geanynumberedbookmarks
-		--enable-geanyprj
-		--enable-geanyvc $(use_enable gtkspell)
-		--enable-keyrecord
-		--enable-latex
-		--enable-lineoperations
-		--enable-lipsum
-		--enable-overview
-		--enable-pairtaghighlighter
-		--enable-pohelper
-		--enable-projectorganizer
-		--enable-sendmail
-		--enable-shiftcolumn
-		--enable-tableconvert
-		--enable-treebrowser
-		--enable-vimode
-		--enable-xmlsnippets
-		$(use_enable debugger)
-		$(use_enable ctags geanyctags)
-		$(use_enable gtk2 geanydoc)
-		$(use_enable lua geanylua)
-		$(use_enable gpg geanypg)
-		$(use_enable soup geniuspaste)
-		$(use_enable git gitchangebar)
-		$(use_enable markdown) --disable-peg-markdown # using app-text/discount instead
-		$(use_enable pretty-printer)
-		$(use_enable scope)
-		$(use_enable enchant spellcheck)
-		# Having updatechecker… when you’re using a package manager?
-		$(use_enable soup updatechecker)
-		$(use_enable workbench)
-		# GeanyGenDoc requires ctpl which isn’t yet in portage
-		--disable-geanygendoc
-		# Require obsolete and vulnerable webkit-gtk versions
-		--disable-devhelp
-		--disable-webhelper
-		# GTK 2 only
-		--disable-geanypy
-		--disable-multiterm
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-
-	# make installs all translations if LINGUAS is empty
-	if [[ -z "${LINGUAS-x}" ]]; then
-		rm -r "${ED}/usr/share/locale/" || die
-	fi
-}
diff --git a/dev-util/geany-plugins/metadata.xml b/dev-util/geany-plugins/metadata.xml
index db5b9d2b0d41..979845bc227d 100644
--- a/dev-util/geany-plugins/metadata.xml
+++ b/dev-util/geany-plugins/metadata.xml
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>aklhfex@gmail.com</email>
 		<name>Chris Mayo</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Gentoo Proxy Maintainers Project</name>
 	</maintainer>
 	<use>
-		<flag name="gtk2">Use GTK+2 instead of GTK+3</flag>
-		<flag name="gtk3">Use GTK+3 instead of GTK+2</flag>
 		<flag name="ctags">Enable ctags plugin</flag>
 		<flag name="debugger">Enable the debugger plugin which interfaces with <pkg>sys-devel/gdb</pkg></flag>
 		<flag name="enchant">Enable spell checking using enchant</flag>
diff --git a/dev-util/github-cli/Manifest b/dev-util/github-cli/Manifest
index c2c83af080d9..84f326dd927f 100644
--- a/dev-util/github-cli/Manifest
+++ b/dev-util/github-cli/Manifest
@@ -13,7 +13,7 @@ DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod 374 BLAKE2B 4fef9f7da9f23
 DIST dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod 36 BLAKE2B b430ef9388b0dfe932b201495a00275a6036338c99160d7362556be1e25924584b0802061d193533f23b1f76719dfd6a9484572babd25f1af0e53fd9bf07ac00 SHA512 196affe091247f94ceda4b56629bd62d4ee2b397f2c0f56c9534c02e43531b46705ad33543b58c1a4fc7a48e25e5923db087fe0485a93966a4086581c0d1d3e1
 DIST github-cli-1.4.0.tar.gz 386950 BLAKE2B 68126e45886e1bc38ac6c3a541e52f69299a6e12f1b6c5baafa6d5c3fbf5be8c30854b5c85294de6b50dd6bfe9e12262758a4751aad1aa4f310206ac10d4cf2f SHA512 cac1675bef1bcf749c87cb1d196fe687e32b304d73e16d4fc21dc4f429d18d4c04aa00be713a6b76e1261df565ecb589b8cf2ad322e4f7d49ea102369c5bf644
 DIST github-cli-1.5.0.tar.gz 396453 BLAKE2B 728939040d263bea4a623571d03589628f69bf3887b0bd79da14d36da8fa515c1d646c00b2aff154685369d0e1a4ea5b16ed788f4989addff28af233568f3208 SHA512 a75bf4ea913310f097dc158a1b8ce73453402af0647d918007afe7fa05cb5dbf1bdff1f4dfc4b4b0a301d68ed447428088e956fbcbc755ea9396ffb6cb77152c
-DIST github-cli-1.6.2.tar.gz 419795 BLAKE2B cd34782f2afccc976487082532a15e9c9ca6ff0d12b89469e4234290a62e98d1207f111e51a8d7cef2a4ae926046b1705e59cf7e95364fd0981357f79f6004c9 SHA512 5aed724fe508d118c35d5efd089b1d0b7a220ed4713567fff528c692c402a8ee5245aef62fd8f219bead5e2d55dc92f9f2ca60e2c048e43c04dd48f125cf56d7
+DIST github-cli-1.7.0.tar.gz 435572 BLAKE2B 303b9e7ddd23a538952d0f2f9fa7f18f4523ef5ff9c1779d5d1988a709f4b26991934b0481b1ac3adb6ae70e1ba5601171fbe91fe1038e40f527c0359d974524 SHA512 27d50b698dcf137a192a80e3bf8ca9c5b393f566acc7d504f4285c236d6e1ef6e9195afcb3025f5c0442b2c538f18db6c2d86e5ce7074af59db384e91b01bb39
 DIST github.com%2F!alec!aivazis%2Fsurvey%2Fv2%2F@v%2Fv2.2.3.mod 719 BLAKE2B d95afef5c101e842eb6754ce837753f0d953c76546b5cfa0a25b672e42db57b78e7fcf9fbc48dab261301c448a811818f53aabb251edf6cb209adf196a5cc0a8 SHA512 11355981fa0cc2c28a274175a123c7a3ac5dab596ea08faa429da137611bcfacfa15b38110943b520a99565776039f2c48c5474eade25aa64b8eb5a3fdb3f098
 DIST github.com%2F!alec!aivazis%2Fsurvey%2Fv2%2F@v%2Fv2.2.3.zip 154742 BLAKE2B 1eb9644a4458d70e3d0ca66969cd4c50ee3ac3ec89a3840a0168d703fb4d716cdbdc703e07b9c60775220dfda3d48791d7410484314b7263f231155d51ec0d1b SHA512 765d4137f91984faf60380e9a67726cc679c26dcf421445b932aa18db9f2b29ef9c58d69c3cdbb97c3f1703fb880152d53c6eeafb639392a35218afc6491d8aa
 DIST github.com%2F!alec!aivazis%2Fsurvey%2Fv2%2F@v%2Fv2.2.7.mod 707 BLAKE2B 3f7da997d7cb7e3ed2426497741ee7b4517adb66588f268b095f9abe4ab12842a5e14df940a1b89d1e5514c0c377a0a71e5460ab22073a1639c6dbed892fe8fc SHA512 6f0c6aa88ce38abfa9bce0992b75b8ef5a2f58c743bc96ef49b8a97d7e04ad7071c0f63f65c3ff82e5014df91d383f5ab84a2c0ac8e54739048de9aede5443c5
@@ -148,6 +148,13 @@ DIST github.com%2Fhinshun%2Fvt10x%2F@v%2Fv0.0.0-20180616224451-1954e6464174.mod
 DIST github.com%2Fhinshun%2Fvt10x%2F@v%2Fv0.0.0-20180616224451-1954e6464174.zip 22492 BLAKE2B e82ef3edaee9b1060bbb2933f101a6298978cf568e79626b2d327d970da112d433ba4d5fd267b2ba1040c85de93a83d8649acb584f35766720506f2b2a950aae SHA512 5e6879cca425ea5b46f6acdaa71c63ca9da3f4d056ba50b8c037552595ff18151d0b399955c5037281a868c8c126753d95a36ed00ac2106dbe8d4e1fba915daf
 DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod 44 BLAKE2B 764581d416faa477a91695a42c68cef5638d019a1622fb3bcee976c1581e904995d33c79ffed1d3b805f660931ece844b3e17437f158f8b82ddae82e95f0358f SHA512 0c77200112d96f9cddf8cf7da0059204914b06a8c400e2e672443bd02a45d9ebb3274275c20e6e7ee0728992e77579d945b36de44ccbaab2ee92fd55f382f7ac
 DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip 3712 BLAKE2B f4f79741bb83862583f51f2ac5e80181eb0e9c2a4578df32f7e24eb98f4f548b99333e0e6a377e03ef701057b01e852e6b710ab885b65170c861bef556863da4 SHA512 e16bd414c1df566a12944e4a99ebd84d2103f0cb3bf8ec312e3de400f20b3eae27845db50672801c10474dbf1dc61d0c2e16e5dcd3c4447681c0b77f9114a411
+DIST github.com%2Fitchyny%2Fastgen-go%2F@v%2Fv0.0.0-20210113000433-0da0671862a3.mod 45 BLAKE2B deee82c732b1293068a504f976dac3949cfc27be1dc7ac3b82592b3b69c3bdc59452a4d9daeca0d6bc87dc2dc38062915e5b33bafa5073140c7e55d752777233 SHA512 7724e9b2ded9c666471067a7f1484630366fa91861ea59c86db0a8afbb56fd24ed9aaeba6c6beda12970f208395f9829c9e854586ba55acd28b5cf3765e65071
+DIST github.com%2Fitchyny%2Fastgen-go%2F@v%2Fv0.0.0-20210113000433-0da0671862a3.zip 10305 BLAKE2B 32865c53f9f3bae9b47c406dc8c33b35fe35cd74fe105893ad2aced99dbae2f4c76912f28872903c251f85ea61246ee2b77f1a5a93acd29e6f16b9bdd1eebcef SHA512 aa5184acf872feaebc24389af0e67938d7347b0813ea224ff5799dea9abdc0ca8620c336fca9b28cc23d31531067578964ba1d58037266bfbd59d4f36f586a81
+DIST github.com%2Fitchyny%2Fgo-flags%2F@v%2Fv1.5.0.mod 105 BLAKE2B 38e253824f75e345a5c8183f2d691c11625baab82c55f0488ab0e8e90700517a4942fd3105dd3e9aa2a495b7b5383e760a15c2a4ee7d5328f3301bb04f478d5e SHA512 5ba24b125bc8e8ec720cedc56d426be715818f5c3d9b3779026caedf7a540b3f2b4c0097e9b002bcbe10ca0cdbd3293a034fa5792f76d056cd29996a5c2905c4
+DIST github.com%2Fitchyny%2Fgojq%2F@v%2Fv0.12.1.mod 420 BLAKE2B 69d19bcf04af4ff9dd5343aa1000151ee7231cccda034b1810b8289d7e3e443cbf66d7f6b4110f8ff8959cc7a935d316ec98ccb0cc6e933dbdda29e44f96c577 SHA512 1d0e9abab589f422864fb58872c0f5188749379c76ae7498cd66313a8fff18cf322ad66425e4462d4dcec001f91b36aff8e450f47d597e475891cddeac72cdf0
+DIST github.com%2Fitchyny%2Fgojq%2F@v%2Fv0.12.1.zip 128499 BLAKE2B 069b6d10ea7cc9d22034e7889652d12d0a253c32375f0e138ae7b8178818b88dae2a4c20a95fd591eb95c7955571ab3fc8b179fa1b2416cd67c7b76efaa7d1e0 SHA512 1177920ae8e1705a70bceff1272969639958447cfc44b1ad1d3ab1cb490632ee89cf2507fc083623f88d9a959b05c943511a237a3e4ce8d6fae9db60107e08b5
+DIST github.com%2Fitchyny%2Ftimefmt-go%2F@v%2Fv0.1.1.mod 46 BLAKE2B 0268917d388205c33d5717f9f405ff0fd46077d8aa78597f879a83d5a94394f50862f012a29ab7a9fd545915601a63e9435d29b522ad8b2b3ece469bfbc8ca32 SHA512 282906eeaa17b0bd648ca60830c232a640d81a504a248745b792e54255e4b0bbd71b49b044105328d42860fb49427defc9268506c67bce067b708d5ec7408557
+DIST github.com%2Fitchyny%2Ftimefmt-go%2F@v%2Fv0.1.1.zip 12666 BLAKE2B 5ba82f4c8b59e064ec4b1d06f002fec03d4e26a8649115497caad3a5beb981f7d5756b7046f09a9975abf41b134de78df2c5edbeb22c33941903e66970524f6a SHA512 2fd289e8e5fb60d0d6a9e5e6b3ed4279311f67987b670ef7a924ec5d85388005ed8594f363463929dcc42ba1b855635f1ead51faa351ee06fe36a42b17a84316
 DIST github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod 38 BLAKE2B 091e824ab9156af7978fe3aa6f61ae046588510903cf635ec166225395e40df6a1c715e4eb3c47aee849435eca3cc10db971a7c28acdae233eda85a4408c7520 SHA512 377d94cf7dd50f88b57ba829ded5169a6c41c5a304814660df0a3447d10860b87855f25cdb945a6e4de14c41281651330d4109c6dd6684c86fa4dbba27a3872d
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c
 DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod 43 BLAKE2B 02346f7c8a28f8d40ef233bc1fc6f3cee54a54bfd79b374ab7f3435039a5d9f7da5d7fb7824c618d25034cde1d355b503bddd76b804d610828a080ccb2707dc2 SHA512 801663d67d1aead6b01df89e329c8ca969a1f860b5ee2c2018094791060bf6e8cddac8e2d788ac823e32278d4e9ad1dbd72935e4da2cf6e65a34dc97f195ce7c
@@ -354,12 +361,15 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190530182044-ad28b68e88f1.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.zip 1918660 BLAKE2B 015e9ad74f145cdd7cdeb55d7b2d8949d6e7baedaae36089fa53cb257b4fb49830aeb299ea3a1f782b2f033443a18d009cafcf0211d1709d4d37b4b97d5f3d08 SHA512 24a653028d079c52ba8128d9f43452d2ecabd374c8eba36d44704c3f70cac50761597c7b7bb6524ba50fcde696fbcded57c29f04f35e42c62e23a9790852bb56
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.zip 1470272 BLAKE2B 9a8bbb988370bedc24428e6c78f42a9ba44dbb852ce91c3d7fc54e83678b72b9177e67c955c49dc8ef7a1e2e214475a2e55c53254469e3426ec271e90ec9e2d5 SHA512 e46ef76fe4a1628def4c6a291003b64cf11185c0214427af9c49b9ff3af99f258488d49e887206a9c8652784228d822665c5841ce87d6ff993e95ea3d0494129
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200413165638-669c56c373c4.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200413165638-669c56c373c4.zip 1471634 BLAKE2B cd90cd97113e500e5d20b6bb1c9921be7132157089936ca68d862efc531e2e3a8ede741d6c682c8f38122dc33cb65c84a8962eb1eb9cf25277502740639091d6 SHA512 c3fce15b61446dc0805383e55eefcbace75fe1e8149561692624f47ad69d20eb81e6415dc0000beec435a6caf0937b9bbbef67504016a5f77faaf72a46125085
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210113181707-4bcb84eeeb78.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210113181707-4bcb84eeeb78.zip 1543048 BLAKE2B 072e92fdb409e64a2123db40fd98b9705b87fb3cee94355874125daa6c6f65bb8b7ef3b58b8f5ad321b1a89d3cf3667475b2b7d9017e049696a33a9df2bac78c SHA512 ab2dbbde4ddcda3c66b54f574ffc90fe70be3c11d0a914a4410c764e91b0c20f4ccfd36b9af29d639808d3155e645ea5afc5a6942cf36a5e7d1a318f037cade4
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip 6349244 BLAKE2B 0aa464ac7b7d17fa7ec0627b64cd2301ed4f2819f837807db7a55725950dacb40be899b5148b07ea31b51530818edcccc6444a9800755e1d369ba8f1bce949b0 SHA512 982d78f580a7eac99a0c51e6f1fd2b2c3b91f56cd5e2b96fe960510049f7daf5915264f73f55f05675eee232a52998f9667fa84a9ccba15ed7819e4c93f583a7
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
@@ -427,6 +437,8 @@ DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip 80666 BLAKE2B ff3645b71cedd41b9fef6e5d
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.zip 103453 BLAKE2B 493d6289e171d84dded89f11aa89da42aefb6510e1b0a5a2e3a9223b31a6291af42c65b720246e9d632fed7e8a2868a2cd2e4f3e3f4acee99cff535aca0b6899 SHA512 7870ff82dad193b5087a735324705dc4ae3e29e96eff29ecd5b5e7ec38369aebc87151bb806dbd11b023dada74ff0c9fb4b7f0ed36d8f893f1c715909cb2b994
+DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
+DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.zip 105245 BLAKE2B f0bcfd9d097905364d9c2b032b92a8aad64b63e0942eb864759b156eb97ac58769fbc035acf4ba57bd55db1b6596499ddc6d36e6d2e5cc584c2a465256ca3a73 SHA512 f9c0400f1f5590d7185ae3fdac7adf1787a5f5198e52ebd02841b7df5113c5e34de6a66fa01b2f5735be4b21190dffb46e9d8b084ad5c00ebd99599a39ff73db
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
@@ -434,6 +446,6 @@ DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod 300 BLAKE2B 3e3f5a2be0918
 DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8b842257202c89b3462edf9368b73cab29f9dbd4dcc66c3e290a1d6329b7d62321eecc52082a8c4c0797eac743a29a8a00910a93f SHA512 db50ff677b0bdccbc1a1ad3df7c5cc76f2fcccf3ab99d08d1c2868440eb9b893fe89452f4286f7d42f2f16abf0f4acda67fe86e174dcfa730a743aafcc166774
 EBUILD github-cli-1.4.0.ebuild 23946 BLAKE2B 92bed0b0cdb4dfbaaedaaa0a1422469442e0e29c09b82693afd9f06ae170a7b52ecbad5e8e8a14bf6b26c8fe3eba9439ccacbd0991ff0eae7682e7efa6ace240 SHA512 31d547fa6b05903ca5cd486c28c59b4aab8babe5f6ddec9e6650adb8f17a9883573bce1fb457dc5770187a6b3271f9fbf0cc738b617df3416ded496627c99f8b
 EBUILD github-cli-1.5.0.ebuild 24088 BLAKE2B 915dc87d77bef29406bbf88aba29c98c197bdc9d6a9a4cedef87a2f909b9070250da3caa0bd9188f1a2cba823eb42e1dbce60f20bc9d96f94df020c87b282a6f SHA512 6844b174514097335920afaeccd08266b312202b3c9d8064ba12ee9b8956f1126f8edc73479f33c07aef1e61e718c7d91383eeed3ef323fb7bc972f981082026
-EBUILD github-cli-1.6.2.ebuild 24144 BLAKE2B f82595ed627ae2e6c1daf29c6b26082c4c40201bc33e551ca93c8878738cec603752f1b0cab3d7e24f4d9aa1500c0a91d517670f3aeeb8bbd6f7913963e12119 SHA512 59b81a1f1935cf84374148d4bb62c73c4e63975faa66dc5e1624d50046a6121ce5201f59cad8ca026dc202611cc1757e3aeef5b22d088441fc11ab8208e43bfa
+EBUILD github-cli-1.7.0.ebuild 24673 BLAKE2B 3fc5070dc9d6a2db4cdae414c35813c0e7ae9a207f55ac5bb73635dc75ac1112fb324e12a1e7db2424a9cd0fb8d200b5254588486e6b69afead2fe7b141da3b2 SHA512 18613c00fb4b2379ca6c5b7a709d287d8a868780c802d7dfe8c913fc806b7169a41a0b7f21efa3b6118a2706027618ce6f9df6df9d481e721cf0d63ef7d37239
 EBUILD github-cli-9999.ebuild 14428 BLAKE2B f50d76ca95adf375bef2be3a8e514b1839c1dc1778ae29cf9b851dacfa127ea71bd8a639c65d63e326a21436acb0ec23bbdf6e7ab3f4efc1154bd4e24ee5241c SHA512 e2fbaca1d718798501aabc8362b1f62c7eab0b4d48314d2650b5fa203927618237ea51b583c38b70ed5afae5ce7ed090e89a98dcd4ffa3e6b468d201c7e24798
 MISC metadata.xml 332 BLAKE2B 54306af02dde121faa49501abda73a96982f0e2aa0c34b1bc3698594d558b52aa4f98cf2c966a5d3cc2df698cade7461d99de437a92edc41958d0057c8cfd339 SHA512 f3aec1ccc8b69282598c560f63162fae9fadb47e784725e0d05631d2b4686bfd001f6b0a899dab39c977a9da5788b5c38f796723653f80be2b65525ea5e7f930
diff --git a/dev-util/github-cli/github-cli-1.6.2.ebuild b/dev-util/github-cli/github-cli-1.7.0.ebuild
index ae5398409433..ca482d4bfe87 100644
--- a/dev-util/github-cli/github-cli-1.6.2.ebuild
+++ b/dev-util/github-cli/github-cli-1.7.0.ebuild
@@ -157,6 +157,13 @@ EGO_SUM=(
 	"github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174/go.mod"
 	"github.com/inconshreveable/mousetrap v1.0.0"
 	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+	"github.com/itchyny/astgen-go v0.0.0-20210113000433-0da0671862a3"
+	"github.com/itchyny/astgen-go v0.0.0-20210113000433-0da0671862a3/go.mod"
+	"github.com/itchyny/go-flags v1.5.0/go.mod"
+	"github.com/itchyny/gojq v0.12.1"
+	"github.com/itchyny/gojq v0.12.1/go.mod"
+	"github.com/itchyny/timefmt-go v0.1.1"
+	"github.com/itchyny/timefmt-go v0.1.1/go.mod"
 	"github.com/jonboulle/clockwork v0.1.0/go.mod"
 	"github.com/json-iterator/go v1.1.6/go.mod"
 	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
@@ -363,12 +370,15 @@ EGO_SUM=(
 	"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
 	"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
 	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+	"golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod"
 	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae"
 	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
 	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd"
 	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
 	"golang.org/x/sys v0.0.0-20200413165638-669c56c373c4"
 	"golang.org/x/sys v0.0.0-20200413165638-669c56c373c4/go.mod"
+	"golang.org/x/sys v0.0.0-20210113181707-4bcb84eeeb78"
+	"golang.org/x/sys v0.0.0-20210113181707-4bcb84eeeb78/go.mod"
 	"golang.org/x/text v0.3.0"
 	"golang.org/x/text v0.3.0/go.mod"
 	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
@@ -434,8 +444,8 @@ EGO_SUM=(
 	"gopkg.in/yaml.v2 v2.2.8"
 	"gopkg.in/yaml.v2 v2.2.8/go.mod"
 	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
-	"gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776"
-	"gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b"
+	"gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod"
 	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
 	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
 	"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
diff --git a/dev-util/global/Manifest b/dev-util/global/Manifest
index d7f3799302b6..0fbb442f073d 100644
--- a/dev-util/global/Manifest
+++ b/dev-util/global/Manifest
@@ -3,4 +3,4 @@ AUX global-6.2.9-tinfo.patch 2047 BLAKE2B b88b65679f9b6ed0b96ca236c1918c3238baf9
 AUX global-6.6.4-fno-common.patch 946 BLAKE2B 8063d13db0942c0face6fde1411b96f352d706a85a4cf9f4b5c1eac43f6855e4c914166df2da8d01521a73f2d05b20df65aa25f6a3b965379346d2b523c8ca88 SHA512 f2579cbe22a4c97be0e7ccbf945b9d509bf22cdfa064e6e9fb6182204edf6085e97166ef3f771fe65942505259aa9b42b6c164c644ae95bba8d1e11f1319e0f4
 DIST global-6.6.4.tar.gz 2988969 BLAKE2B 784087537094d27c10d1f2bc992e799c35ab6ce3b86e041c31279e6954b203e80676b3158ba95e7957456b75a213d70998aae9047836cd4d388212236f05a081 SHA512 cb4ed451d3aaf47c4c59cdc3f74c97d3171108177d4846b5dac843589710e66d87c9d7bbe080c3770329e8e40105ac52dcafb4609257347593cca4d94711f483
 EBUILD global-6.6.4.ebuild 1697 BLAKE2B 91fddaf844d76a6b68f3372cb78992067b4c5c552c4dd8bdf375384cf0346382becd9da6de7cabf5358271c3c0df1573d27e4bec7d8625ca68df35bb0e01c104 SHA512 39a8ae3a8b7bedcee0bb9ee7a490555d8640cb098da23042e5d3b81967f2711bdee8ce8631c02a2aee3e6f3864022f4046793bf47f9c20ea628adc9e176c67fb
-MISC metadata.xml 398 BLAKE2B fb266f584dfc0e682d13870da7bbb4bbb46027cea3101b196b48d033766d627c723928f9a2f4ac4c8c6159a8ea147810b82fcec9ceb4981dc5491e54ef367c17 SHA512 89b426c4682fa885cedc1755f4720f1a003f9bc2dac725667ae45e098edebf627897830c911762f7d8856fc66cafb1c60d0f315173ddbbebada0d05ca6d8d5e8
+MISC metadata.xml 412 BLAKE2B 80451fe26f86f4f2e5d7e9aa7618517dc576c11970061d3f45509554a522e7b7f3e46a34cbb55321e2c482a49d277dc5c73889e453f846a619b836171e22b926 SHA512 16e000084a98ac86459f1e4c6193a8cdda17194191edc0f9478b50b60bfbbc1f6e555a6ecbaf6c5a7fa84744fcc85ae8f8a626927387759543438be847d3e108
diff --git a/dev-util/global/metadata.xml b/dev-util/global/metadata.xml
index 8dbeee5f3285..566066d8bab9 100644
--- a/dev-util/global/metadata.xml
+++ b/dev-util/global/metadata.xml
@@ -4,7 +4,7 @@
 	<maintainer type="person">
 		<email>naota@gentoo.org</email>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arfrever.fta@gmail.com</email> 
 	</maintainer>
 	<use>
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index 92a70307dc5d..bce3a4208b7a 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -3,4 +3,4 @@ DIST glslang-10.11.0.0_pre20201216.tar.gz 3290064 BLAKE2B 46ce951ab6c69eb25dc249
 EBUILD glslang-10.11.0.0_pre20200924.ebuild 889 BLAKE2B ca2ee26c46fa049f042b37e7ff9e8d10175c3a195e810ea6f840c16c72d0214fdf187438ccac266a3923533db0cf16ef121dda96e2371a1054c329d9c71696dc SHA512 d08fb9ea49b0ec7a2f2d367ab6f903111758847e0707233715142c4ead94702e81ad01f18c0733a50d1ee79a858a2bbba02d393612dd5890b45517c33d6f8e90
 EBUILD glslang-10.11.0.0_pre20201216.ebuild 890 BLAKE2B d2ae97e1228f30154c2e0674284aeee59943c6b97c619a594106e0765353c14a58e5a03ab03a024a934ccd6b6d66091764af9ad181dc79f577a495037415ef77 SHA512 889bd334d5a13e3ad22e97de659687bdcdc575f30cb45e21a4c253e469181008a5fdb05ef6ca5a21dc03ae22ef3ebbcf88ac8d09941c1d7ce0442942d826f5a0
 EBUILD glslang-9999.ebuild 758 BLAKE2B 802d3dec30280cea4dc1c5b8dc652495537f93ef3b52c7d60740d8f9d6ea1343f22b0f0f4b6bc127eb3bca925daf6b1837a1763416cb27489e6db07173aec4ca SHA512 c8db05953380d7c0709e25a9507d5f043a05da423d9e119ae09ef00e5afae939c209b078a0b6da9d6072f07d04c3c20fd9d3827f6fdd71c793ea21036d4e03a6
-MISC metadata.xml 330 BLAKE2B fd98c615a1b5c3364e122b66d18e9667ff1bae51218e2474862a0376f352421cfbe7aa3b4f9751ff8e8f24510f4a6e3f0e1977ca759b566b54f48fa45243980c SHA512 9658890a6aa3ae0c91e71416c3996d9c8064bb970521b5c444d617fc4a51ef2edb62aa7d44b25ef96768417de0c5478999e74405c6d9ff847816311990c945ee
+MISC metadata.xml 329 BLAKE2B 6238c1e548b8044e1112033dc166f06d7690d05bbdd006670f2151f28640a2c96d9d7fe4d8e6eeb6beb1bd6248cf177315e5cff314593718d838c91a81c02832 SHA512 6242378037de440c8e216330d6f2861ed3d473a0dfe55b9df1234c0956365d3206c1951034b9b2ee31702f741483f4fa113d801c6b1fdece9aad468021202326
diff --git a/dev-util/glslang/metadata.xml b/dev-util/glslang/metadata.xml
index c277a8030673..4577a9fb6988 100644
--- a/dev-util/glslang/metadata.xml
+++ b/dev-util/glslang/metadata.xml
@@ -9,4 +9,3 @@
 		<remote-id type="github">KhronosGroup/glslang</remote-id>
 	</upstream>
 </pkgmetadata>
-
diff --git a/dev-util/gyp/Manifest b/dev-util/gyp/Manifest
index 021a58ec9618..46bb3c965d8d 100644
--- a/dev-util/gyp/Manifest
+++ b/dev-util/gyp/Manifest
@@ -1,4 +1,4 @@
 DIST gyp-20200512145953.tar.xz 443884 BLAKE2B 74ff269e3e8aa51e6b34f795892f6e8922d098a81b4d855619520d3d366e79b611931cddf4ee2ec60a7e040af11ac8eba7582ad10e24de627df5a4aa4eba6474 SHA512 35bf2af22f2e632b3d6e546e5017df8effd0c7ad80beed9b95ed1e2f294d70215889bc6a0147506461254e951d70189dc48824af10a6620e996945d2cf5586ee
 EBUILD gyp-20200512145953.ebuild 1605 BLAKE2B 01ac4411cccbc243f96a0bbc1241a8f126e324004db0ab0ff576c8a7b6f386ace0dce51fb0e6eac87e793ed3851700ddaa97b5b2a9ae599cc3df7a7a8e2e3316 SHA512 f234adc429a697b3925ac91702b4b3cb398f3b2b03339efc6d645519f52752cf0d08d1825bec9b7a9149db37e82231c2b166172fd0608044d98d0eb3cf377354
 EBUILD gyp-99999999999999.ebuild 1582 BLAKE2B a1ebaba4e2bd2ada60cfc78599e298fea52d4f59c99054b3f779948712749086a8e63184f94fd76d12306e9afe04bb11783c89993068ec6146097ecdda961c02 SHA512 d478ca981d03d2f6d18ab4f1a7a63b433260ee2ff03546ea750d9636bb83865c32596330c97df6a50ca1b032b477dc36f5b2fd7c1b91d70100e1612a03cfad8b
-MISC metadata.xml 415 BLAKE2B bee460235492c13da7eb83441f00a502d900c169b48c91802a8891f9856c5f87aa225e61d8efd90ac2aade3ec52a93db293e3927b73c9b9b2708f723370d8585 SHA512 378e53a81fa2177409ae4557c336ddfb62b8657bf2d756ae651011d5dc5e94604d52aece3cdda38fbd0f123d5a1f83b721ccee3ecc5870cc562670fd748631c9
+MISC metadata.xml 410 BLAKE2B 7b2731279aa8599e77a19c158b27de326fef97aa7124475e14b141890752b1879a4a41ad32236688dcbbd7ed1b4823eb5d7fcf26641b5322abc3e20c60cb0871 SHA512 c2edf0810bb34f1a042f48d8a8be616506916e60e61fa0eade20abfc38f365ac11eda040c6232ceda3691f8697e7479547a1198cd1d5d9d49605f5b87fbe6f7c
diff --git a/dev-util/gyp/metadata.xml b/dev-util/gyp/metadata.xml
index db283761922a..e130c460034a 100644
--- a/dev-util/gyp/metadata.xml
+++ b/dev-util/gyp/metadata.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="proxy">
 		<email>floppym@gentoo.org</email>
 		<name>Mike Gilbert</name>
-		<description>Proxy</description>
 	</maintainer>
 </pkgmetadata>
diff --git a/dev-util/hermes/Manifest b/dev-util/hermes/Manifest
index 4ebc8173e33f..7d6666c983e1 100644
--- a/dev-util/hermes/Manifest
+++ b/dev-util/hermes/Manifest
@@ -3,4 +3,4 @@ AUX hermes-2.8-lua-shebang.patch 531 BLAKE2B ff3f44fa1793d5506302c9266c7d0fe7126
 DIST hermes-2.8_p20180315.tar.gz 60771 BLAKE2B e523f1ee01e1ed3da5daa68f5b9f9d146f0764b5d5f75e9dbb71a3b4630ce06ef538745b01f0bcc30e0f2899adf1b1427022be07321c0dbe7859e0c6db82af33 SHA512 838fe1049f8f42113f5d394791499b47af4748d5fb6beccab8e3ce71398a85562340e95c0f96039fa58e6e8de3e79f3c7e87af2f7c47dc087b729cee557dac4a
 EBUILD hermes-2.8_p20180315.ebuild 1136 BLAKE2B 92245afac3ea67f50b05c4ea6139a71aa54b187b8839b2e5514127bfeab88ccde12590cafdccb491b75f15fb76eec6e413340f4e12354fc762de74947d3b79ea SHA512 8e6eaaf7dd80e25d524ed4877474432d8a6a78fa8f882f0cf261ce6f441711751f66d1034578ca8f0c14024e3e3765f488071bbea271edcca372b6edf784fc61
 EBUILD hermes-9999.ebuild 1125 BLAKE2B beeceb45063a4ce7d569c1312846cfd7c23174fc2787a30ebad342389c87295a7183b5c3ae12b923b118d4c07bd3c961a9e438d39888b84dd3e75a9a0536c0c6 SHA512 3765a15b66af61531125c6fd85e21e3086eb134cc919c17ce49ac870a0d720806624fe34e47b6e254b0d643f774827024a2a26c2be596f69bfa7ecda492170a9
-MISC metadata.xml 356 BLAKE2B ffeb5fde219af8b22df4100049e885316a8889daf293bc92d61ba05953aa62e27dc3735fc96e579aae4d0e56498022616cc6c57250af886631d2f31bd00a57a2 SHA512 76a904528cbc4c1b333a7f97bc17d2cd3fb00a797766728cea99ca79186f4c54b2f54379c288aff943932825d2a7d5ee0a1a3b201f76f603611a87e392b0203e
+MISC metadata.xml 370 BLAKE2B 758ce0d00e5bf3bff6078c8456cfc9e7fbee1d6d16c66596cae76a4e5e25ab7ca2ae31c7913f8755cf5b6f0f28b938ab662ee0d1dcb679d4f1b0d67cff18049d SHA512 83028f7048a0f199f412cd4e20ebf3a01d38facab41346bbee98c63c47b75dbeb0d4b93af8ae2dff8d56cb98044752cfd7177b107869925f56f229a9b449f9e5
diff --git a/dev-util/hermes/metadata.xml b/dev-util/hermes/metadata.xml
index e97c4322aa87..8c843a2c3d41 100644
--- a/dev-util/hermes/metadata.xml
+++ b/dev-util/hermes/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@aisha.cc</email>
 		<name>Aisha Tammy</name>
 	</maintainer>
diff --git a/dev-util/hip/Manifest b/dev-util/hip/Manifest
index f4c4f08ed5b0..1588db70a04d 100644
--- a/dev-util/hip/Manifest
+++ b/dev-util/hip/Manifest
@@ -7,4 +7,4 @@ AUX hip-3.9.0-lpl_ca-add-include.patch 418 BLAKE2B 7d1439e51b1c5e20fcb1768c5f33b
 DIST rocm-hip-4.0.0.tar.gz 1012154 BLAKE2B 02343239a5b27c42dafd241f2c9b6f5195c50f78bfd717ae72bcb16d384bd6cf97ff6f2b86bfcf323aaaf022d6897f46d0987826c80d6f6279be4cb4792e15be SHA512 cf840dbe28a9a15e3be14351bfa22d3c81e1654813a7aee55f53e71b2ee183f8dd0de14a79791617fabb5b357cadbf2ce2f476f78884b2843d30f206d65088f6
 EBUILD hip-4.0.0-r1.ebuild 3817 BLAKE2B c01eb20493f27e9650d1cad3413b7fa14ef799d67e8b02de235d1e37a4f6633c8f0f6ea73fa8f075d0a10ffb2dbe0ccba4a65c4a505e665be7d657d5c773641a SHA512 2b5b58f13d832572f547f5ba4e67daf62b180523424e1e4605e96d1b7d834b700f8aebc95b047ab08ba36e16098aa07ddf7f9c91654672b00edc863bb5c25d68
 EBUILD hip-4.0.0.ebuild 3451 BLAKE2B c219b26871ab9197ddd75a4d8e03bdb2d6f9c12cc9d8bd4b29e1babceb3572afb5f859288c395952befd8520fdf2875703566a4dd7280045f98f309af8c3756b SHA512 d7b82a954d9dfde559e48dcad266aa7d3cb204442045ea2c3eaeafa7513f0f549ca3a656d5d823e636600e3b9112fd276fbfb9e9ebac74f01024327de76276dd
-MISC metadata.xml 582 BLAKE2B 2b99c57a359c2ede87080fe4205b41092abedb50c63f4d6124c4741f765f8167322ce901f27db5a34fb9822852db043d13bbe0e5884916ce845a3337719b25f2 SHA512 da4a80f011b027d3a56743fe0196f5c85a79bd9a1bec6749ab908a8a372008ffd2b47198dc9913d5343e6c9ec7e7a05823727f6fae0608130542ffbb2fb3e357
+MISC metadata.xml 596 BLAKE2B 32b0fcf237a501e546584504ead6f5cc817f5f7891715df60d9e6a8863a87d779f6ccdb365536338440b3bdeb1f541dc481f2a29c014506519f6c62f9834ef0d SHA512 b67b87b25453471fe1337c78095341c00fe6e76a4d222390cb47d1b52226f7ebdf23c1f66f5926819a384ac1473cb1d6f22f5467ec1c600a5a96eef5e24fe1d2
diff --git a/dev-util/hip/metadata.xml b/dev-util/hip/metadata.xml
index db491e13a348..464f8cb17073 100644
--- a/dev-util/hip/metadata.xml
+++ b/dev-util/hip/metadata.xml
@@ -9,7 +9,7 @@
     <email>candrews@gentoo.org</email>
     <name>Craig Andrews</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>gentoo@holzke.net</email>
     <name>Wilfried Holzke</name>
   </maintainer>
diff --git a/dev-util/howdoi/Manifest b/dev-util/howdoi/Manifest
index 9f5c122c9188..865b4c7da5de 100644
--- a/dev-util/howdoi/Manifest
+++ b/dev-util/howdoi/Manifest
@@ -1,9 +1,7 @@
-DIST howdoi-2.0.10.tar.gz 25921 BLAKE2B 6af903f11ca240eeaf773957a34f8eb585067c589d3a51b449f044bcc5b4e885637d3f4e7f266fbe39ccebbfbe6da7f12feba75f196e99d4215c270a58afb506 SHA512 534d292bfbd3b2c44dd4101faa5642ae71d6c0161d45fe082dfb4129e6a594d13148970029e9c91e3672911fe55ab570fddad352c1efa405e6312b3c3c16eca4
 DIST howdoi-2.0.13.tar.gz 26143 BLAKE2B 39eb23c94ec8883a88a1b6205af69668396ab4bfeccdab9994bddd3fcbe90b78d2348b4b3b9b935bdaa936edb1fce31c05aab6308195612c535d516e5aff332d SHA512 b44e506ecbaf8d10590168ab62ab4e943bfe832e8b981109647c9304d46956afb343239575e1196dbb3284c9db9831839cb9933aca0eaff037f6454434c8194b
+DIST howdoi-2.0.14.tar.gz 26675 BLAKE2B 901a39d7f9dd9f2dd5931e0c9710083280f067687a6be985188f459cf9b82e89993f352128e3dc616ea6395bf853762f1d8a7b1fd79c0e457d71af8859e9dc7f SHA512 7c913a0b3d6fda60a140520406956c6ada291ae9e9d7116a10adcb1b31a6fc6d22d221285e852d07bade33e1c075f0dc489eee39c3f4db420454d4813ab33254
 DIST howdoi-2.0.7.tar.gz 25167 BLAKE2B 5923aaae6d6aaee4da7e02cd283d6e794c31d600d2834d1354e0d90194ac573d80140517ba7289bbf97b01923b6ed8c9c2ab6abe0beea0534fc41ecf24196c24 SHA512 9f8278e6ea688c40fee5227aa23375cb7dc7339d579953c73dbf7111087550ece412e26508e129f377e2326ce4635c38d96ad99f98c8c6f1131a01bbaf062275
-DIST howdoi-2.0.8.tar.gz 25366 BLAKE2B f444b600f80c60cea658781b2b1e12dbb241b6707f51f419e55099334cd45c8bfda402ada052473b2ef35ffbc77c88d33000b210fada5eb4f09b529589fe8d60 SHA512 c2a62f5e6669fcca41a706cdeec8827e39816d31d37464d061b881ed3731995163cab56322d73362863acf5064d35dc82c383db1fad78434152bd36678ec0794
-EBUILD howdoi-2.0.10.ebuild 695 BLAKE2B 70c88f0b23fd73d22fe788c5a02e0d48e3686b2192ac5701053af5c42d5177847fa6b7626a0db9233d332c3573b4500a68748682baf6384b688aeb2b7e3b269a SHA512 e1876358f75aa6acbf7446933a792ff6df59c5745ed25a10e6fde5d0529b19cb3c8cf1f48caa58347ca1628fde463c766972404d8687387ea4e3c6862b190adb
 EBUILD howdoi-2.0.13.ebuild 695 BLAKE2B 70c88f0b23fd73d22fe788c5a02e0d48e3686b2192ac5701053af5c42d5177847fa6b7626a0db9233d332c3573b4500a68748682baf6384b688aeb2b7e3b269a SHA512 e1876358f75aa6acbf7446933a792ff6df59c5745ed25a10e6fde5d0529b19cb3c8cf1f48caa58347ca1628fde463c766972404d8687387ea4e3c6862b190adb
+EBUILD howdoi-2.0.14.ebuild 695 BLAKE2B 70c88f0b23fd73d22fe788c5a02e0d48e3686b2192ac5701053af5c42d5177847fa6b7626a0db9233d332c3573b4500a68748682baf6384b688aeb2b7e3b269a SHA512 e1876358f75aa6acbf7446933a792ff6df59c5745ed25a10e6fde5d0529b19cb3c8cf1f48caa58347ca1628fde463c766972404d8687387ea4e3c6862b190adb
 EBUILD howdoi-2.0.7.ebuild 693 BLAKE2B f3349a11696b95e0cfdee1a19b9589d487bbd762c2bdf034d0c41865413908b52bf0db1357ba8fe612db3ea5e14a6c63e14b090f763eab8a2ae52b07d2fed09b SHA512 99fef66aa24ea1ddc962d9637a79691b215bc86633ef16359bc2bed9b1b39f4298bf8974fa643e88fb9d42220a4fa4ee6214e0ba1e98ef55e8043b6e527db01c
-EBUILD howdoi-2.0.8.ebuild 695 BLAKE2B 2ae9852f20f40a24cae7afcd591022d1c824ec2d34bb1939ad3321ea92e6507071245fba5064fe229128eebb31d6a99c4067d7fe53bf1b3558f304332fc71c52 SHA512 526ac025b6ef755e21b26db1d3fc0fcdd672ade3b24c642a151a95c4546dba4e391728352ad6056ccacfad7e3211255eb8a2b3075a7cd9483700622a983db134
 MISC metadata.xml 367 BLAKE2B cad999effcfe4ba7eb7fcce4efa22b7cc1bc501c01f28c647c8d94fd560645b96d25bc89703bd43c8f5a969606f9842e14f955bc7ace46fcff0333469843e62b SHA512 eacaf9118ec14ec50c3f22d0abf5deafb42ebbcb3bfbdb87f01c6908983b36c6c837b13f903c0cdd7be3137d9c999f66d7983157a7ec33685d08d608096f0e27
diff --git a/dev-util/howdoi/howdoi-2.0.10.ebuild b/dev-util/howdoi/howdoi-2.0.14.ebuild
index 8fba32c5aa56..8fba32c5aa56 100644
--- a/dev-util/howdoi/howdoi-2.0.10.ebuild
+++ b/dev-util/howdoi/howdoi-2.0.14.ebuild
diff --git a/dev-util/howdoi/howdoi-2.0.8.ebuild b/dev-util/howdoi/howdoi-2.0.8.ebuild
deleted file mode 100644
index a9a2eb1a0456..000000000000
--- a/dev-util/howdoi/howdoi-2.0.8.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS="manual"
-PYTHON_COMPAT=( python{3_7,3_8} )
-inherit distutils-r1
-
-DESCRIPTION="A code search tool"
-HOMEPAGE="https://pypi.org/project/howdoi/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	dev-python/appdirs[${PYTHON_USEDEP}]
-	dev-python/cachelib[${PYTHON_USEDEP}]
-	dev-python/keep[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	>=dev-python/pyquery-1.4.1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.24.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest
index cd7658655862..3b84dbf3adb4 100644
--- a/dev-util/idea-community/Manifest
+++ b/dev-util/idea-community/Manifest
@@ -2,5 +2,6 @@ AUX idea-community-jdk.patch 485 BLAKE2B 3ccbddf308b1cb1af020086e7568e05b4a60b28
 DIST ideaIC-3.1.203.6682.168.tar.gz 577542631 BLAKE2B d47d017b76fa9106a55805b558bd49d6d45dd216ac28151f03cc2a7f3a751707b62fa49623bb04b426d90cfd1cce4e04b2490bb91ec01dfeccdf4a80f1694f7e SHA512 71849f9440c34359a23af1f4735c3b0ac6378f6ab8ddf5799ad7e26036dc87b4abbc234043bd368a7698daf91f83cf989539054db7e1fb9ea95ebf7d756ac068
 DIST jbr-11_0_8-linux-x64-b1098.1.tar.gz 191689225 BLAKE2B 0da0f0e834709c89820f2e7e1c447dc33ea1c59c7dfb573aa47bc205f7920ccf485454f79931d42d4e6eb4de1017589bb908808d6a80cc586659757abc9958d3 SHA512 a455d8bd3332622592186cd7ae3995a9148a47717a81c274497f5408f1e89ef637c7478321b4ccd5dbe97c2e246a16ac8956c5ce475f8a4156232647f0ea7737
 EBUILD idea-community-2020.3.1.203.6682.168.ebuild 4024 BLAKE2B 6d1449e6d05c75658960eca5962fc59b4c51f8cf2da6b92f8bc03eacd26c0ea80c6d6dcfabe6929874dcc24a01f6ee6ad45af48abfc59c6e7fb481963ff7bb77 SHA512 7b82f9c06a7924db2c07e96bfddbfa97b84d54039d8e703988721be8a16fcc9836248038f95f1825f541a5798d5d6510e81f46defb4a6d0f8a4b10cdd564ed0f
+EBUILD idea-community-2021.3.1.203.6682.168-r1.ebuild 3954 BLAKE2B 0a76c751daec71affcd5b117559798b48862a89e1494cd27b328c27e5cb64fe59cbfc0ca28475e7572f418cf62920aa79d69a29c07f740e05bc031b8e1ec819d SHA512 bc0833aa192e0ca5fdaddbb8a27aaa7bf4fc9fc89cbad122c919c700f57af9f291fe59e5cd7b7a1c46479693922d0015e28e1f85000690d57d5d0af69e00f887
 EBUILD idea-community-2021.3.1.203.6682.168.ebuild 4024 BLAKE2B 6d1449e6d05c75658960eca5962fc59b4c51f8cf2da6b92f8bc03eacd26c0ea80c6d6dcfabe6929874dcc24a01f6ee6ad45af48abfc59c6e7fb481963ff7bb77 SHA512 7b82f9c06a7924db2c07e96bfddbfa97b84d54039d8e703988721be8a16fcc9836248038f95f1825f541a5798d5d6510e81f46defb4a6d0f8a4b10cdd564ed0f
 MISC metadata.xml 453 BLAKE2B f244aa814b9eb5c6b00f6fea725a344a7413710b1fae03edc4590dfa9c102872e0e4d1cdb669f739854d7fac351002f7819aec371f3bd0eeef2fdd4aa2c8f60b SHA512 e6c5f1094ca8ba70b9bfd5b028f11542c8150cea0b543b939da144887043e4ee20ddf6cc89641329bde7456492d6def6f0e72092b7fa21095463a20aba9e0b03
diff --git a/dev-util/idea-community/idea-community-2021.3.1.203.6682.168-r1.ebuild b/dev-util/idea-community/idea-community-2021.3.1.203.6682.168-r1.ebuild
new file mode 100644
index 000000000000..e6baaa247430
--- /dev/null
+++ b/dev-util/idea-community/idea-community-2021.3.1.203.6682.168-r1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils desktop
+
+SLOT="0"
+PV_STRING="$(ver_cut 2-6)"
+MY_PV="$(ver_cut 1-3)"
+MY_PN="idea"
+# Using the most recent Jetbrains Runtime binaries available at the time of writing
+# ( jre 11.0.8 build 1098.1  )
+JRE11_BASE="11_0_8"
+JRE11_VER="1098.1"
+
+# distinguish settings for official stable releases and EAP-version releases
+if [[ "$(ver_cut 7)"x = "prex" ]]
+then
+	# upstream EAP
+	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${PV_STRING}.tar.gz"
+else
+	# upstream stable
+	KEYWORDS="~amd64 ~arm64"
+	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}-no-jbr.tar.gz -> ${MY_PN}IC-${PV_STRING}.tar.gz
+		amd64? ( https://bintray.com/jetbrains/intellij-jbr/download_file?file_path=jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz -> jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz )"
+fi
+
+DESCRIPTION="A complete toolset for web, mobile and enterprise development"
+HOMEPAGE="https://www.jetbrains.com/idea"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1
+	codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0
+	GPL-2 GPL-2-with-classpath-exception ISC
+	JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT
+	MPL-1.0 MPL-1.1 OFL ZLIB"
+
+DEPEND="
+	|| (
+		~dev-java/openjdk-11.0.9_p11:11
+		~dev-java/openjdk-bin-11.0.9_p11:11
+	)"
+RDEPEND="${DEPEND}
+	dev-java/jansi-native
+	dev-libs/libdbusmenu
+	=dev-util/lldb-10*"
+
+BDEPEND="dev-util/patchelf"
+RESTRICT="splitdebug"
+S="${WORKDIR}/${MY_PN}-IC-$(ver_cut 4-6)"
+
+QA_PREBUILT="opt/${PN}-${MY_PV}/*"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-jdk.patch"
+)
+
+src_unpack() {
+	default_src_unpack
+	mkdir jre64 && cd jre64 && unpack jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz
+}
+
+src_prepare() {
+
+	default_src_prepare
+
+	if use amd64; then
+		JRE_DIR=jre64
+	else
+		JRE_DIR=jre
+	fi
+
+	PLUGIN_DIR="${S}/${JRE_DIR}/lib/"
+
+	rm -vf ${PLUGIN_DIR}/libavplugin*
+	rm -vf "${S}"/plugins/maven/lib/maven3/lib/jansi-native/*/libjansi*
+	rm -vrf "${S}"/lib/pty4j-native/linux/ppc64le
+	rm -vf "${S}"/bin/libdbm64*
+	rm -vf "${S}"/lib/pty4j-native/linux/mips64el/libpty.so
+
+	if [[ -d "${S}"/"${JRE_DIR}" ]]; then
+		for file in "${PLUGIN_DIR}"/{libfxplugins.so,libjfxmedia.so}
+		do
+			if [[ -f "$file" ]]; then
+			  patchelf --set-rpath '$ORIGIN' $file || die
+			fi
+		done
+	fi
+
+	patchelf --replace-needed liblldb.so liblldb.so.10 "${S}"/plugins/Kotlin/bin/linux/LLDBFrontend || die "Unable to patch LLDBFrontend for lldb"
+	if use arm64; then
+		patchelf --replace-needed libc.so libc.so.6 "${S}"/lib/pty4j-native/linux/aarch64/libpty.so || die "Unable to patch libpty for libc"
+	else
+		rm -vf "${S}"/lib/pty4j-native/linux/aarch64/libpty.so
+	fi
+
+	sed -i \
+		-e "\$a\\\\" \
+		-e "\$a#-----------------------------------------------------------------------" \
+		-e "\$a# Disable automatic updates as these are handled through Gentoo's" \
+		-e "\$a# package manager. See bug #704494" \
+		-e "\$a#-----------------------------------------------------------------------" \
+		-e "\$aide.no.platform.update=Gentoo"  bin/idea.properties
+
+	eapply_user
+}
+
+src_install() {
+	local dir="/opt/${PN}-${MY_PV}"
+
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}"/bin/{format.sh,idea.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}}
+	if use amd64; then
+		JRE_DIR=jre64
+	else
+		JRE_DIR=jre
+	fi
+
+	JRE_BINARIES="jaotc java javapackager jjs jrunscript keytool pack200 rmid rmiregistry unpack200"
+	if [[ -d ${JRE_DIR} ]]; then
+		for jrebin in $JRE_BINARIES; do
+			fperms 755 "${dir}"/"${JRE_DIR}"/bin/"${jrebin}"
+		done
+	fi
+
+	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
+	newicon "bin/${MY_PN}.png" "${PN}.png"
+	make_desktop_entry "${PN}" "IntelliJ Idea Community" "${PN}" "Development;IDE;"
+
+	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+	mkdir -p "${D}/etc/sysctl.d/" || die
+	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
+}
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index fbc1494338c8..992ab45f0915 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -6,4 +6,4 @@ DIST intel-graphics-compiler-1.0.5353.tar.gz 6642256 BLAKE2B 34b80b30f33dbd57bce
 EBUILD intel-graphics-compiler-1.0.4111.ebuild 1948 BLAKE2B b94c41a2657cb985065ef195ae06d62d53db8a02d30f48fdd37014b8209382d459cec5da6bfc4f1a2ded793a60adf736ea4d43f6511aecde9614c2b6aac42c49 SHA512 0abfecf61f289b258909da53e3edae8eea31577a3b57108043b7e8d6902d53153d55d8f635bc3146e71e986e9f12bfebf280ead5f58196e3f36abaeeda7411a0
 EBUILD intel-graphics-compiler-1.0.4944.ebuild 2492 BLAKE2B 2a41f64fb5ab688815cbfb29c4454eabd645cfa4ae0e852ff6fe41511726dd380843a561ebe4b594971093c51f5ceab8b132d9ac766d980bd6b4a254979f996c SHA512 feaaad5029246bff1faff06c3ba9d7c4afb15be0c31656ebfcb1a9dee7127271599144d5fb118625b034f8bb86970aed83f2acc0822eff01f2791ea74c671785
 EBUILD intel-graphics-compiler-1.0.5353.ebuild 2471 BLAKE2B c8874af4a5ba31cc8d977b52a8d2c2a41f0c9ba8957b900bbaafe3e4474a4cac42d1713f2797edaa0ccfaf02b6a35f1f075e80138171339ed9deb784e54a820f SHA512 1ae9e4cbee369646bfa05626e5358a1540b9fbbfc09c55c464f2822abfa7477e688b299bcea224c7796bee175a3d2f71d354e2d4e2f5f7ad91b03b1206a7c966
-MISC metadata.xml 262 BLAKE2B 6c3ab6eb29647b8d630b1421eca7289613438d56dfa180f85efefbb922d8d2772a26ac2360715dbce23f5b5acff73ccc5cf8d85c90a666c0475f232ed1a6a2ad SHA512 58cf8c27cd031f7653e54b8187dd99b885b5ff336c8db4692a9ee64ecbc6f503d2c41921410114d30c1ec49da925bfc67f5f7da61dd6f89a0257eb1f35c9b6ec
+MISC metadata.xml 261 BLAKE2B fb9fbab5069434d85556da8c100fe4fd6f92aea5909300e58766c1df329317b0c7ac692479aac7e579a994a0c215aa2a87743fdab1e85dec9a120f6a6fa79fa2 SHA512 45a7c84c8dd3ef024aee1d481df406cf4cf47e57ad1205e23874e897b49fd84dfe2adfe0c1738c94e9f6a45c4eef611117b24f63b5191b777dffc63ebb330768
diff --git a/dev-util/intel-graphics-compiler/metadata.xml b/dev-util/intel-graphics-compiler/metadata.xml
index 9293e0f2fc0d..36d27b8681c7 100644
--- a/dev-util/intel-graphics-compiler/metadata.xml
+++ b/dev-util/intel-graphics-compiler/metadata.xml
@@ -6,4 +6,3 @@
 		<remote-id type="github">intel/intel-graphics-compiler</remote-id>
 	</upstream>
 </pkgmetadata>
-
diff --git a/dev-util/lcov/Manifest b/dev-util/lcov/Manifest
index 1529c62cdbeb..87dc7a130e0d 100644
--- a/dev-util/lcov/Manifest
+++ b/dev-util/lcov/Manifest
@@ -1,11 +1,5 @@
 AUX lcov-1.13-gcc-8.patch 3049 BLAKE2B ec0e22a61851ec2acbb0ac8909f1fc91d57d8dc2914583cf70cfbd7c08153c0c87a76d7f30e41f3660d4ecd9e76b3f06fb562865fc79474019f29c83602728c4 SHA512 f3598e28e98e97d3d1eec8ed4168996623cf920f94870cce4e731de2e1b0925a786dc8cbaf9d70379fc4e73f4f26f3a9405b2077c5246dcd66cc0eab25625b94
-DIST lcov-1.13.tar.gz 156709 BLAKE2B d0f2635a6e6c29d29bd15d15c7f6c22ff80052b12deb4e88c77a9331d6d151aa2718ad4e4af1aa192757c1fc3189cc0d1688fc5086e5552c74078206cf27e1df SHA512 54033c0f99dbf7b332fcd70730df8672713ffc36c010809353dfd83a73fcc4f504b6a68e3b5010002d6992da5fa940a7d5f4e03dc3fe6930ab713a7b980dff9e
-DIST lcov-1.14.tar.gz 177359 BLAKE2B 17069d38bf607217b8ff59f573fc02badf56afe65965d2a359a14835af57e2b6c512bff06fac3dbf4e94cd35701216edb8026d333b2baa8772d0ef551de37af1 SHA512 2d60c3a63e300dda96171c432fe304840acc76bf6275f60934d08e80765f9f85671e8b77bfed758fc45842a80156586dc0d67c42c9f215f4f163840fc5cf65bc
 DIST lcov-1.15.tar.gz 190487 BLAKE2B 2d6478caae488b84c74a3f7b489013b065b3e8fb106a6e8c5f413ffe87be7f4530aade8d2b5df5b8193949d60f49d5255b4eddb0cd5f1cab6f450ba2f97426ab SHA512 dda0eadbd0ea2093f17cba039309ccda3dbcb7266d083b46bda61e02cd7f049d66de49be1e005157c3e5af910d2703ffbc9cfe7f1242bd67b9787f8508e4d052
-DIST lcov_1.14-2.debian.tar.xz 25740 BLAKE2B ca1a84ed98e0cdd13aae88f0f550cac84f00b3dbf6bd764abe0c7eee7b73c0796abbf20e76cb51707d0d644bb17ee7ad283abbfaa7456dc2a3ade5e12cfbaabc SHA512 10fdb1f82be8cc9aef3b92aa7ca18f2736e5130d8b6ef9703b9444cb88f75f475e8bc48c441ed5cf7e4d11f383c226fc711e8609ea11772b01f454bb6a5bd45a
-EBUILD lcov-1.13-r2.ebuild 859 BLAKE2B d43e1aa8b6117e5296d73da09d943961a86218ccea9f90d890ef0f49835df8fdbf28ebcf78b2a30f57749a54ef22a2cd24a982f66e969f7e80b83803cb8ec66c SHA512 449744a363d44e90cd7fd06cc3beff631a74fd93e6d905c897016b36ec23e85554b163a8274ad951de6cda21adcd4291b754353ae59a6d26e278b61fb4e9b7f5
-EBUILD lcov-1.14.ebuild 809 BLAKE2B b856f279855281d6f25dc6c5ec751e5c4400df33d22a5e098525e0aa1b69edb8decc207d9becf6bbf6b2d53238046cc13dcce9e458a003854cce6349d46aeecf SHA512 4ab08b43adda29c198e59f67e2ebf648884389df131e03eb143bbf777905525d96b59041d8034aeebeaffd621e4f2a22e6d6d4f0c985f20fc09adc95346bd1ed
-EBUILD lcov-1.14_p2.ebuild 1399 BLAKE2B 6ff038ee856a577be12b4f0363abc0f39f181bab519501a77e19398f95885e7a0e8fc83a1b2537df1e0032addfcc29592e1bc2dc3c81a594cc200d54188ec289 SHA512 eba73e1e8f396b4945225e87da9d0eea550611c40b3c5f651ebf83f7a0ba3708acfcc735753023e01be080e60261476ec352a569b6d6a773a2afbd637eff00b4
 EBUILD lcov-1.15.ebuild 963 BLAKE2B 12eb656eb9177ee422a10eb25188a9f6c53817e2251264a397e3a08d220970a848ffb69aaae4e40c986d66a186b52f696c9b1dd9319d696d45b1a12f06a70e9f SHA512 e9602ace4785304ae11ea186f3cb670ec1b192102d011ad1d9c8fd3feeeebdcf6c2ba23c9652f442c10a226216484a31ffb866cc63b2abbadc58cacdd95b8cec
 EBUILD lcov-9999.ebuild 920 BLAKE2B c39cab5754c576571ad3ce4b3151b987af87973a896695a3f25edaf95fea78f2ea812243e047aa6564a25dc52d06d8b7566c23025daa0fcd00bb6e2f54bf5f43 SHA512 b1532e9099ed0a39ad83bd96ceb1b6adf4b6bd4a558678b2a9b32246137996657343e7f9af3b721d40726bd14ee4ac1e76e77b8c8a2f9aa57466690709862369
-MISC metadata.xml 545 BLAKE2B 04986c839db27a72dd78580642dc394723107ae8bd5790fcd0017db1f3324faf27ce0bfca537504a882ae8fdd12b8c451bcd8014d078309a5dad9b01c3457753 SHA512 e5753b7dc704699d98540483ec24632095c63cc8eb39cd8b20d91420ea96f79f4de95787bc7e7547fe2b1078d0c1f694e52a69065e1bccd4e18a1e86a3999289
+MISC metadata.xml 589 BLAKE2B 2da1ae87352bd12158e6f8ff144b89ae5c35c6beeb3f64756998a6da5fc1cd2278db42b5f1148facd12ed1c8f763c700c353c5a7738223bf4fbb30ae223cf9f4 SHA512 25a23b168540a73b2eb5af5aaf07b9d80a8b6affe40395ece2ed2c426e28e577abca0cdd42537edb6f255143573b341b52e10a3333782c3f1b4d7f80af260a0d
diff --git a/dev-util/lcov/lcov-1.13-r2.ebuild b/dev-util/lcov/lcov-1.13-r2.ebuild
deleted file mode 100644
index 309969b8a69e..000000000000
--- a/dev-util/lcov/lcov-1.13-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/linux-test-project/lcov.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://sourceforge/ltp/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux ~x64-macos"
-fi
-
-inherit prefix
-
-DESCRIPTION="A graphical front-end for GCC's coverage testing tool gcov"
-HOMEPAGE="http://ltp.sourceforge.net/coverage/lcov.php"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="png"
-
-RDEPEND="
-	dev-lang/perl
-	png? ( dev-perl/GD[png] )
-"
-
-PATCHES=(
-	"${FILESDIR}/lcov-1.13-gcc-8.patch"
-)
-
-src_prepare() {
-	default
-	if use prefix; then
-		hprefixify bin/*.{pl,sh}
-	fi
-}
-
-src_compile() { :; }
-
-src_install() {
-	emake PREFIX="${ED}/usr" CFG_DIR="${ED}/etc" install
-}
diff --git a/dev-util/lcov/lcov-1.14.ebuild b/dev-util/lcov/lcov-1.14.ebuild
deleted file mode 100644
index f5ded7d1a5c4..000000000000
--- a/dev-util/lcov/lcov-1.14.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/linux-test-project/lcov.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://sourceforge/ltp/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux ~x64-macos"
-fi
-
-inherit prefix
-
-DESCRIPTION="A graphical front-end for GCC's coverage testing tool gcov"
-HOMEPAGE="http://ltp.sourceforge.net/coverage/lcov.php"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="png"
-
-RDEPEND="
-	dev-lang/perl
-	png? ( dev-perl/GD[png] )
-"
-
-src_prepare() {
-	default
-	if use prefix; then
-		hprefixify bin/*.{pl,sh}
-	fi
-}
-
-src_compile() { :; }
-
-src_install() {
-	emake PREFIX="${ED}/usr" CFG_DIR="${ED}/etc" install
-}
diff --git a/dev-util/lcov/lcov-1.14_p2.ebuild b/dev-util/lcov/lcov-1.14_p2.ebuild
deleted file mode 100644
index edd922a3333f..000000000000
--- a/dev-util/lcov/lcov-1.14_p2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LCOV_V=${PV/_p*/}
-DB_V=${PV/*_p/}
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/linux-test-project/lcov.git"
-	inherit git-r3
-else
-	SRC_URI="
-		mirror://sourceforge/ltp/${PN}-${LCOV_V}.tar.gz
-		mirror://debian/pool/main/l/${PN}/${PN}_${LCOV_V}-${DB_V}.debian.tar.xz
-	"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux ~x64-macos"
-fi
-
-inherit prefix
-
-DESCRIPTION="A graphical front-end for GCC's coverage testing tool gcov"
-HOMEPAGE="http://ltp.sourceforge.net/coverage/lcov.php"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="png"
-
-RDEPEND="
-	dev-lang/perl
-	dev-perl/JSON
-	dev-perl/PerlIO-gzip
-	png? ( dev-perl/GD[png] )
-"
-
-PATCHES=(
-	"${WORKDIR}/debian/patches/handle-equals-signs.patch"
-	"${WORKDIR}/debian/patches/fix-undef-behaviour.patch"
-	"${WORKDIR}/debian/patches/reproducibility.patch"
-	"${WORKDIR}/debian/patches/gcc8.patch"
-	"${WORKDIR}/debian/patches/gcc-9-support.patch"
-)
-
-S=${WORKDIR}/${PN}-${LCOV_V}
-
-src_prepare() {
-	default
-	if use prefix; then
-		hprefixify bin/*.{pl,sh}
-	fi
-
-	# Broken by https://github.com/linux-test-project/lcov/commit/75fbae1cfc5027f818a0bb865bf6f96fab3202da
-	rm -rf test/lcov_diff || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	emake PREFIX="${ED}/usr" CFG_DIR="${ED}/etc" install
-}
diff --git a/dev-util/lcov/metadata.xml b/dev-util/lcov/metadata.xml
index 90c86767b856..5314f02f8a93 100644
--- a/dev-util/lcov/metadata.xml
+++ b/dev-util/lcov/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jeffrey@icurse.nl</email>
 		<name>Jeffrey Lin</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>marbacz@gmail.com</email>
 		<name>Marcin Baczyński</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-util/libabigail/Manifest b/dev-util/libabigail/Manifest
index 8c4f14544dd7..b8cb5d431a58 100644
--- a/dev-util/libabigail/Manifest
+++ b/dev-util/libabigail/Manifest
@@ -1,3 +1,5 @@
 DIST libabigail-1.6.tar.gz 176133766 BLAKE2B 4a8fd6861f2213f45bbc5814a8a4e0941c236660ea6f84f09eedf6c08eff963c956f27967581501cd73b51057c3d36a74d53b6bf63d0be4d2c931d465d0564eb SHA512 2ba775bd836b53265dae60e66065fc2106e7f633e890cc70b6abacb8426e04ec0b7b38593c21336f5785cf5e4eb8d110fb15ce63124cddc59f660f31c7b25b3c
+DIST libabigail-1.8.2.tar.gz 258919334 BLAKE2B 6e06c888dcc3f5e0fc5d4046e69f14ba06b3a78206f89e32e4687b07aae1e1d798582285cff5ac9f43d6ba326fe11ec11552eefb5ed05813c25785e337092ba2 SHA512 fa8edaf39632e26430481f15e962a098459eac087074e85ca055293ba324ec5944c45880fcb36f1c54a64652605a439cbf9247dfea9bfd3ec502cc7292dd1c8d
 EBUILD libabigail-1.6.ebuild 1505 BLAKE2B eaf813c7f56b0d703e03ae350885ed6beb54fa7dd08bc62eb58c7b935d4d4a9857f7c8f0e130ee74334bb52c1f967e334d835922ea52569f435df5857276adbf SHA512 5b6db24c5a22f369675f0a1e308ad42b4e79940a8e632503c28f43c528051227a2cb808e050c2cc5918fc519002bedcabb3f8a745bc7c3a125596650a57b84d4
+EBUILD libabigail-1.8.2.ebuild 1505 BLAKE2B 01be3d9285ee4fc4d4c6b507f43db1c2fcd3bd1c8b57b41ef6027da7904c6cac3c8caccee93681675a6a17be521fe761a806c4ce91f2d0409051e10d4514f14e SHA512 dcf3d5792b3eda9aaa842737e8de88cb9be6cde9755c3edee35070e1176a11068c3a26461ac27e09bc13cfa6d8e633e0fc3643e6d27c3585f961799bf1ee517d
 MISC metadata.xml 244 BLAKE2B bd2c6209566a4936a38d9109a9a533aa1669dd50701ff8a96d2a65411aa692517ab70cafd98afcad7058979d62f1a7ac796c5b99a520c0f6ca1ed92cf9e0e207 SHA512 57959095dc10704e073e5517ac49ceee80e42fb1cc3f26b1b7308f872ffda810ce42e0b80ea6da57faa7a759878a9b8d2476fe351fecac1450f9c83751802787
diff --git a/dev-util/libabigail/libabigail-1.8.2.ebuild b/dev-util/libabigail/libabigail-1.8.2.ebuild
new file mode 100644
index 000000000000..65225b855535
--- /dev/null
+++ b/dev-util/libabigail/libabigail-1.8.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit autotools python-any-r1 out-of-source
+
+DESCRIPTION="Suite of tools for checking ABI differences between ELF objects"
+HOMEPAGE="https://sourceware.org/libabigail/"
+SRC_URI="https://mirrors.kernel.org/sourceware/libabigail/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/elfutils:=
+	dev-libs/libxml2:2="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? (
+		app-doc/doxygen
+		dev-python/sphinx
+		sys-apps/texinfo
+	)
+	test? ( ${PYTHON_DEPS} )"
+
+src_prepare() {
+	default
+	# need to run our autotools, due to ltmain.sh including Redhat calls:
+	# cannot read spec file '/usr/lib/rpm/redhat/redhat-hardened-ld': No such file or directory
+	eautoreconf
+}
+
+my_src_configure() {
+	econf \
+		--disable-deb \
+		--disable-fedabipkgdiff \
+		--disable-rpm \
+		--disable-static \
+		--disable-zip-archive \
+		--enable-bash-completion \
+		--enable-cxx11 \
+		--enable-python3 \
+		$(use_enable doc apidoc) \
+		$(use_enable doc manual)
+}
+
+my_src_compile() {
+	default
+	use doc && emake doc
+}
+
+my_src_install() {
+	emake DESTDIR="${D}" install
+
+	if use doc; then
+		doman doc/manuals/man/*
+		doinfo doc/manuals/texinfo/abigail.info
+
+		dodoc -r doc/manuals/html
+
+		docinto html/api
+		dodoc -r doc/api/html/.
+	fi
+}
+
+my_src_install_all() {
+	einstalldocs
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 4fdcae8c9cf9..47c6e0604950 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -7,7 +7,7 @@ DIST llvmorg-12.0.0-rc3.tar.gz 134244008 BLAKE2B ed09aa361b264387711ba1ee2e4b01c
 EBUILD lldb-10.0.1.ebuild 2336 BLAKE2B a9ddc5d6965882c37d0cf11e6331e77130c16ea9d60a90c8733c67b8bef0e947656a0c9e1888d483d4b497453475490b9d8bdd85f1396a8be605efec076d5db8 SHA512 7b352de97e3c2cfbf75e724f2e8a6b393bfc5d6240c4067f4f7bf3d04c52e769de6cf85743635410ea4938e587acc4fc925eb501e51733c6a80d442e0df098a0
 EBUILD lldb-11.0.0.ebuild 2384 BLAKE2B 3b2d520abc4918dd63464f0e7716545e2ee9e1c4592a2acc82df183884ff544343000ab99369c3d4b28dc3349e5816b652a2574998cb6ce2daa2c567e67d0c72 SHA512 6fdd05a0e945cf43735be94eccd31928dcf9a16ff5934cc1028495d6446ad474b0e461dff7b4326475116c4762200dae21986f600d4edd8f2f066e2e3d27da0b
 EBUILD lldb-11.0.1.ebuild 2343 BLAKE2B ad45919d6e378904f946147277776a8f8dab3b16c64a0ee7f92e5d11d5efc67896151c1f90cf7fd08109b2343816222b1dee706bfa3c14de3ccd1c160091b4bb SHA512 461a00a379331e6e47115c412878d8bac8c8f04f233d7245548769527809a02672e3cefbcbfa3c39e2d71db1b144693fa57ce5f3328d57cd078f49683654d488
-EBUILD lldb-11.1.0.ebuild 2347 BLAKE2B ca289b5db493e7437ef0c973e8f500d5826659640c53371cbd934ebeb9f6afe519dab86e840fc3b1593f3e06cad5d939640a1ccf2d83662dd8771fb654c2ea18 SHA512 a92cb6f9379787b0cf52d1f6548d3fde5ff3d39bb629e5bc6a56d6755e340d1d7e883fde11122f751c2af87c71dcfc46f397c49a036342cf453ce2293252802b
+EBUILD lldb-11.1.0.ebuild 2346 BLAKE2B 49a25f9c9f6c5962519567484a2fd26f0b843f173bd645d30d27cc48c6f9ce4741dcd6be318fc1291d18b64a5476fa7acff5ace3e377adbd4a89c238b5a19528 SHA512 229c0c3be9ff7e3f6dcf7dc5b30ebf0a6682684ec544a2ee66fd9b903a11cef117beebf2a7cd03cd8ab81d15bee5069054deefe08c8e36cbbfc2bde274522f9b
 EBUILD lldb-12.0.0.9999.ebuild 2396 BLAKE2B 113bec8d6f4cce99e0156c39fc23deb6fc90a220aaedbfec32769174a33bb40856e5afee02dad197b40e445df71cd2829a1198a7821ef661f28ce42e28b3f5e3 SHA512 7947f7f49e61d05c1dc8b21171d1b462ff2058f2bdaa080ffd3ff65b4cf7cc74084008e8aa9235627de6d4ef156121ebb6c20c353663d379f2d9aae1661179b6
 EBUILD lldb-12.0.0_rc2.ebuild 2396 BLAKE2B 113bec8d6f4cce99e0156c39fc23deb6fc90a220aaedbfec32769174a33bb40856e5afee02dad197b40e445df71cd2829a1198a7821ef661f28ce42e28b3f5e3 SHA512 7947f7f49e61d05c1dc8b21171d1b462ff2058f2bdaa080ffd3ff65b4cf7cc74084008e8aa9235627de6d4ef156121ebb6c20c353663d379f2d9aae1661179b6
 EBUILD lldb-12.0.0_rc3.ebuild 2396 BLAKE2B 113bec8d6f4cce99e0156c39fc23deb6fc90a220aaedbfec32769174a33bb40856e5afee02dad197b40e445df71cd2829a1198a7821ef661f28ce42e28b3f5e3 SHA512 7947f7f49e61d05c1dc8b21171d1b462ff2058f2bdaa080ffd3ff65b4cf7cc74084008e8aa9235627de6d4ef156121ebb6c20c353663d379f2d9aae1661179b6
diff --git a/dev-util/lldb/lldb-11.1.0.ebuild b/dev-util/lldb/lldb-11.1.0.ebuild
index 88ffd4918a1e..82663a8165f4 100644
--- a/dev-util/lldb/lldb-11.1.0.ebuild
+++ b/dev-util/lldb/lldb-11.1.0.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/memprof/Manifest b/dev-util/memprof/Manifest
index e605c13a996f..45f3cb0247e5 100644
--- a/dev-util/memprof/Manifest
+++ b/dev-util/memprof/Manifest
@@ -1,5 +1,5 @@
-AUX memprof-0.6.2-binutils.patch 212 BLAKE2B 0d96ae801a90044478219132d422f44d67f8362a8f44c76236d6c3fc5d98ae771842f45b1ebcd24d2e61b1b467a006bdc0d8645cb4407a74a1debe08595b2edb SHA512 f0b5d6ff79d04536f1b0f2e7275eb795c4fb816f973483970d9fcf01ef07e6216e89890d7a5a367004883b2a5b7d6eda344397641fbd7ae9c921a7f8674a7001
-AUX memprof-0.6.2-desktop.patch 754 BLAKE2B d6e57a85f552dff99fe62e5cecc69956a426fb988ee7f8e7e8c00b50e427a1f9dd7c29c5178d3003432708d473c2ef469290ec74908743801939e8d603d7529e SHA512 a9e96331aac0b5c1eb50ffc24d6e242479d8e3642fff762f529ec2d3ad97e50262109e15ac80ddbeea8bd87bd4c5ac9d5c7f27989a93422140e5edbe0087b375
+AUX memprof-0.6.2-binutils.patch 216 BLAKE2B a2b0b9a8445e7015d7475bc2158d0fa175ef551d6c856220d1f5e6ed9b18cd0e729569fac3fb5300ce168e158a679772e02abc15a7f52c5702f3ebd5a5704b42 SHA512 554281705f92c3e398a1d10bc810d75f3074fe5c0a9879410ce574487e30e4c47b19795b3812efdcfc088451951bf9d4e4a68a21624139bcfdb5c458308a0ad9
+AUX memprof-0.6.2-desktop.patch 758 BLAKE2B d600c34b5a7cef6536a5dbb4a5feb75b2344a8d3b3288b9aff2578251f586a7251eaa5b8e4be0a16687432055ef4e9ffbd25bd31c2f1d10e4d776b4173e6c34d SHA512 60d5e12b16d30272dab56cd1cab3ac4b5cd1f9ff6f099285a8eb699dd1196c54e9605f162e3ce2745a478cf2c00f989a0685b39b961ac7f6b86dee06d39744cc
 DIST memprof-0.6.2.tar.gz 534543 BLAKE2B bc4b98d13ac2a789540006c69b185c95ab9a8c059250e53d89e3baed8d80cffc506ab27e081fbab914390d77c4e67371f2632363a90e3a8d804799b00b5bb208 SHA512 cecfeb88f10f11fc4df106367871487453ddd9cb502ef96a6f120ee8889cfa96e8463f260c853abb351c7864e68904cf6e833864d561f9e7b09a785f4c315ca7
-EBUILD memprof-0.6.2-r1.ebuild 830 BLAKE2B c85bd0d3d84cd11a187af5f23e2973cb50d8a8723d49cfb73b2f0e42494576b6d654a04b6c52d81bc30da17fa8ad9be0db2f6ca9aa8116bf70d16913d3e35823 SHA512 c81b8412eec7ae10abea8da9a2308bdd97316f4428816242a6c8a792f1b287a7de82ef6c0b7db50212f4729ba7a6c12c498786ef7860481ecb485b80c9d53a0f
+EBUILD memprof-0.6.2-r1.ebuild 815 BLAKE2B f34a215f49bc613e6e8760b8dfc4ed9ae3158458ffd639ca3a0a0ec00663fe7cb32049f48212ce0a8d7cf33c930510e21e127eb9a5908fea3df816a1bc1b5dd2 SHA512 24bc293ebe172e9151cff8a78f82cced938b3f1b0a9f7e677ab6cb5835721b6ee5625680b863b7f230fba592bc1eb2230f401e72c5e74f377be4b6284c69be52
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/memprof/files/memprof-0.6.2-binutils.patch b/dev-util/memprof/files/memprof-0.6.2-binutils.patch
index 2a7f80993d5e..c38e8d95b4f2 100644
--- a/dev-util/memprof/files/memprof-0.6.2-binutils.patch
+++ b/dev-util/memprof/files/memprof-0.6.2-binutils.patch
@@ -1,5 +1,5 @@
---- src/memprof.h
-+++ src/memprof.h
+--- a/src/memprof.h
++++ b/src/memprof.h
 @@ -24,6 +24,7 @@
  #include <gtk/gtkwidget.h>
  #include <stdio.h>
diff --git a/dev-util/memprof/files/memprof-0.6.2-desktop.patch b/dev-util/memprof/files/memprof-0.6.2-desktop.patch
index a49b5697aaca..9c1cd7a2f995 100644
--- a/dev-util/memprof/files/memprof-0.6.2-desktop.patch
+++ b/dev-util/memprof/files/memprof-0.6.2-desktop.patch
@@ -1,5 +1,5 @@
---- memprof.desktop
-+++ memprof.desktop
+--- a/memprof.desktop
++++ b/memprof.desktop
 @@ -11,17 +11,13 @@
  Name[uk]=MemProf
  Comment=Check a program for leaks and analyze its memory usage
diff --git a/dev-util/memprof/memprof-0.6.2-r1.ebuild b/dev-util/memprof/memprof-0.6.2-r1.ebuild
index 5bceac4e7801..b2216864763e 100644
--- a/dev-util/memprof/memprof-0.6.2-r1.ebuild
+++ b/dev-util/memprof/memprof-0.6.2-r1.ebuild
@@ -1,34 +1,36 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit eutils ltprune
+EAPI=7
 
 DESCRIPTION="Profiling and leak detection tool"
-HOMEPAGE="http://www.secretlabs.de/projects/memprof/"
-SRC_URI="http://www.secretlabs.de/projects/memprof/releases/${P}.tar.gz"
+HOMEPAGE="https://www.secretlabs.de/projects/memprof/"
+SRC_URI="https://www.secretlabs.de/projects/memprof/releases/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="nls"
 
-RDEPEND="dev-libs/glib:2
+RDEPEND="
+	dev-libs/glib:2
 	>=gnome-base/libglade-2
 	>=x11-libs/gtk+-2.6:2
 	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
-	nls? ( dev-util/intltool
-		sys-devel/gettext )"
+	nls? (
+		dev-util/intltool
+		sys-devel/gettext
+	)"
 
 DOCS=( AUTHORS ChangeLog README NEWS )
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-binutils.patch
-	epatch "${FILESDIR}"/${P}-desktop.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-binutils.patch
+	"${FILESDIR}"/${P}-desktop.patch
+)
 
 src_configure() {
 	econf \
@@ -38,5 +40,5 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files --modules
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index b9cceb836cc6..1d42bbb87833 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,6 +1,6 @@
 DIST meson-0.55.3.tar.gz 1740465 BLAKE2B 7d121f5d2bf487ae3c38be5ddccde6900134b9d0ea47868aac5625449e18a1a97ae0012849b795187221632cd3ac343097ef29b282753a1e8bd871c393d5c0e8 SHA512 afb0bb25b367e681131d920995124df4b06f6d144ae1a95ebec27be13e06fefbd95840e0287cd1d84bdbb8d9c115b589a833d847c60926f55e0f15749cf66bae
 DIST meson-0.56.2.tar.gz 1794847 BLAKE2B 350427e2ff4b4fe688220ca6279ff3361e1b2c7c573e1e0185ea9014fda73bc68929256073fe05855e3403638257e26477868d0a5683a5b91f6a74ee55a01f0e SHA512 3b6cc5cae31d756b251ecde3483d3710bceff50cfd03ef6cf6f939d9e599998e61fcb03a2ee09d6a6f9bfa2198f43e7f20447359de3bff1055febcf03e82e514
 EBUILD meson-0.55.3.ebuild 2264 BLAKE2B c8909e4cbe395ff0e4f4cdf6a7c33d2a8688b1f6b5126dfa41e09bb73aac586093a028dcfc734aeb1b4f9dd9d788f0f890bae857d8eb0f292e22bf1f2a5d9ba0 SHA512 4e307af8de8551f15ea84e373442146ab6f7f3c7b572e49818d7758dc1e76d995a7443cde371a97c7e4efad422ecf299606c7d56543830979cbae1a298f13265
-EBUILD meson-0.56.2.ebuild 2339 BLAKE2B fcbaf754dd02101128f51aebc293f50e0bbf335c1078aa7c03fa773216e7fc32f9de722d5496d37f591863e5d2e11c31162bd19921133e52f3e3fa016cdbdbb8 SHA512 2a6520065467a231d7af76d1cb4859ed878727f9ff091c273688deb15552dbbe199965c1e20e7f95ab3a040d6e03214911c324819e0559bc0514ab8fe9fc8aa6
+EBUILD meson-0.56.2.ebuild 2338 BLAKE2B b50d254d2b52de7478c1480bfca34e9eed952e02df08e57964035a035e33c6dda033d8b50bad9301e79e537ef6a3f1ad7f666083c7e46b8584b7711227938c6d SHA512 d5abc3288b6d4261d3dffa318448d7e61e35781124ddff30527781863cd0b84f5944bf13fb0361af6c690ad627cdc5ec55f35ab50ba58c1699ac4e67add71f5c
 EBUILD meson-9999.ebuild 2346 BLAKE2B 759d97034364081f55be457b9e8a31a51e30a87de26f9e7bd86dd3bc8ec8b0e99a0c6bd7f306c404b716e8b968debaf8a79c83c511832c06001e4f8a5ee0fd26 SHA512 b27c8176ddac2ab83b684190cef83d28cdd32ea7bf3fe4591a42d568766b1badc4cd7e046e8e80283d47f98f46216c53e5914dedad6e343a4f414fcbbd4a8dee
-MISC metadata.xml 423 BLAKE2B d1d1b815b9d2fabe5aaa28b469272420bc1eb0c070de7431ec0d7bc7202b00ca216e6a347e0ebda22fd079d9f0514734c0e0e345788a7e00c8f1ad594259b4a8 SHA512 5c03d82f2fd8009680d4d98c3f62c10dfddb2d66d03e8f9d9ad8e417d0359e43f77ecca067735b31b63ceb778fdcc508196e99d793990286234ff21892e4dab4
+MISC metadata.xml 423 BLAKE2B d5ccfb020cc6bd4c163a6807d27528e6035ef59d0e0a7122c0a194da25126408ed5d5a1d97effb6e7e4721eaa20d15efb2bccb48db4215c3c5609cdcb58938ef SHA512 88f01def35adfd916e55aea1abf8234108338f1b692c1702e64b1fdeb6354f50965651e741b347cf792cd9ae90897ee4451060115d757af6b6235469f8d9aef0
diff --git a/dev-util/meson/meson-0.56.2.ebuild b/dev-util/meson/meson-0.56.2.ebuild
index b21b3c263ecf..20afc602e2bf 100644
--- a/dev-util/meson/meson-0.56.2.ebuild
+++ b/dev-util/meson/meson-0.56.2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 inherit distutils-r1 toolchain-funcs
diff --git a/dev-util/meson/metadata.xml b/dev-util/meson/metadata.xml
index d762c3aed0a9..aba1d26bb84e 100644
--- a/dev-util/meson/metadata.xml
+++ b/dev-util/meson/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-util/metadata.xml b/dev-util/metadata.xml
index b57240b4ca92..3eb8d2846b3c 100644
--- a/dev-util/metadata.xml
+++ b/dev-util/metadata.xml
@@ -37,4 +37,3 @@
 		не попадающие в другие категории.
 	</longdescription>
 </catmetadata>
-
diff --git a/dev-util/opencl-headers/Manifest b/dev-util/opencl-headers/Manifest
index 80945d4b88a2..570d301d8fad 100644
--- a/dev-util/opencl-headers/Manifest
+++ b/dev-util/opencl-headers/Manifest
@@ -1,5 +1,7 @@
 DIST opencl-headers-2020.03.13.tar.gz 48540 BLAKE2B 5befbf7b1ed9df7e45789f1a5c3ec15a2bb0bee4cf50f89e424b6c69534c045c0774fd6f6424d5311c5415c9e6714033b6c70d3c641f60c037a9c3fab3e00bb6 SHA512 4bf368325f6034b2c59b9d3a22f7c12eec078e5e5a0bdcc3f1f5870e211bf7d03ae7137897262440a9c98a35592f4405d85fae1b53246e56b5544af51bf9b39a
 DIST opencl-headers-2020.06.16.tar.gz 54769 BLAKE2B 8b8bf4e1948a38e12cbaba8a5df22757136655c72059af3c1e4526db529e272198fb84d805a79b275bf8432eec6a0f102f062f203e5d43b29bb482d109d05b08 SHA512 702c64648cd5d220aaeea1fc7f8a552f3ec75d1a867e1e9db7295452b288f22c2794e7b9a9bce7f01362b1fc2466940eef45aa7e88dd0e5a4570450a79c66391
+DIST opencl-headers-2020.12.18.tar.gz 59558 BLAKE2B e3956e86df3877fc3a73f748be082b9189eda6b52e6fecea19de788cea61fd6486c2407eca0e89bcc73dc873bfefff55affc4ea8142cd09ae86c88e5bc93c723 SHA512 e083c373a2afd81932daa91d4e7fd449ceefae32ce0d7378def19511f35a96005d10f3b38c55def4754dc34dfb311471e8418a5ede389df673eeb7295110060d
 EBUILD opencl-headers-2020.03.13-r1.ebuild 607 BLAKE2B dc2f65912fb55daeda19f5bf83b09713304eb2e6d9fcaed827e4298e7492436f467b3348dc053e8317364597e44534cee464b057a81e2ffb125fe1a02caaf05f SHA512 27dc174b9cea161c162a2b1511f4f252c1f39fee0c9ad254afcc486d7104ad64034a430981e05490ba1b91672b06767be7682b2b9449af1ea9f17f319ff63080
 EBUILD opencl-headers-2020.06.16.ebuild 607 BLAKE2B dc2f65912fb55daeda19f5bf83b09713304eb2e6d9fcaed827e4298e7492436f467b3348dc053e8317364597e44534cee464b057a81e2ffb125fe1a02caaf05f SHA512 27dc174b9cea161c162a2b1511f4f252c1f39fee0c9ad254afcc486d7104ad64034a430981e05490ba1b91672b06767be7682b2b9449af1ea9f17f319ff63080
-MISC metadata.xml 1055 BLAKE2B bda38a579f6d6369a25342297ec81205dee40d42fc81ccaedb68b0d5b90ae6cd9d3b32eb3fad7d6f4f67f4da5d1dceeb5e9167f94d5619176376778dfa831f97 SHA512 4e75ba94c11582a73e4896f759ce965047357ff123408a2ba3d502c2598269a4273cadb7f02d8b1335a119f2e450fc1c5c07271a3a7c4383d378118af2eed7e2
+EBUILD opencl-headers-2020.12.18.ebuild 609 BLAKE2B 0fd1055b41fbc2b3b996afd9a51d0ab7a645fb97cba6bef71857e725445e13d8a1e624089e7a4fe5ee0ad291789245f8d6cd0a7d37aa780dca2d336e97df956c SHA512 f93611aa63aa761b28f07a8360f0c7f02f60a515526b89f696238a9250db889c10c85dc699e69bb17c050c20a291a41d4747e6641b32d7e1bb12ae2f003a695b
+MISC metadata.xml 1054 BLAKE2B 30fb473e3841df882a700e175f5abef4d5ed0c198c60efdcce36622bb8a1dedf69c1b1a9f745f35b0f2be64fcf13f4c5ca2cd5503dadbf7021a74469f10438fa SHA512 85d2d58484a5def1de36b0922a796658cfcd104c2d25ca6e9916287768955b5a9dc6fce5d00f93211e9ad2b0a743abb07637a78131b6da3bcdfd880c86b7139c
diff --git a/dev-util/opencl-headers/metadata.xml b/dev-util/opencl-headers/metadata.xml
index f5bc8eb8de51..40897a6cb9ca 100644
--- a/dev-util/opencl-headers/metadata.xml
+++ b/dev-util/opencl-headers/metadata.xml
@@ -21,4 +21,3 @@
 		<remote-id type="github">KhronosGroup/OpenCL-Headers</remote-id>
 	</upstream>
 </pkgmetadata>
-
diff --git a/dev-util/opencl-headers/opencl-headers-2020.12.18.ebuild b/dev-util/opencl-headers/opencl-headers-2020.12.18.ebuild
new file mode 100644
index 000000000000..cfa9d86451a7
--- /dev/null
+++ b/dev-util/opencl-headers/opencl-headers-2020.12.18.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="OpenCL-Headers"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Unified C language headers for the OpenCL API"
+HOMEPAGE="https://github.com/KhronosGroup/OpenCL-Headers"
+SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# To avoid file collisions in /usr/include/CL/
+DEPEND="!app-eselect/eselect-opencl"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	insinto /usr/include
+	doins -r "${S}"/CL
+}
diff --git a/dev-util/packer/Manifest b/dev-util/packer/Manifest
index 7d4dbbcf9b95..c5f05ce797da 100644
--- a/dev-util/packer/Manifest
+++ b/dev-util/packer/Manifest
@@ -1,11 +1,3 @@
-DIST packer-1.4.0.tar.gz 9794922 BLAKE2B 2e1d817e0a3f549255ecd8693d6d99b2e45df2e8fb0acc128f03bd1448f28afa865a0849ccf58e9a562ef50b901ea86efd29fe29747c126aa98c05456638719f SHA512 d2dbeb99d1fe44a427d2997eeb4ff6ae66bdf2d7f8f08e2105f8614487a6565b8bc263cf8aab8413520783a4dde18d150aae6c69db171fe1cfab3ee1bd0a0743
-DIST packer-1.4.5.tar.gz 13705057 BLAKE2B d23527e8bb0104e3f0206f5a82eb93fbe15a9542409bcce13cefd49fa83a47c0262f48e74ff951990211de9f85fc32efd41bbd4ed286b3462aed86df68afebc8 SHA512 b2a3ae27612c78fcfcb2ac655437faf2cff6e587fd10033b39ddaca8b92b634b93ecd0ae7e3ee43253ee716a2c0f7da532b3ae0ce33c59d1d3896f9187d9a657
-DIST packer-1.5.6.tar.gz 16037500 BLAKE2B 9409aad981b3494a442fc6854481853494b12b74532ed3ac8d210d4e275a8f4f18bfb6dcfd7c36c4e97b3d5ba0263155fc8f08592b0123705c5d341d9183e6eb SHA512 993f54a1bf98abd5bc450bafaf202fbbfbad009b661d49783ff82cba9891b8556340801680c0fdc33b90396a3101a2ed93a11798ad51c10d7bd5f81fef4f5a31
-DIST packer-1.6.1.tar.gz 17334870 BLAKE2B c6db96de6a96c337ca2b2e7f273be21b4410e272817622af849346f38fab7212119aec1fcfd71b0c67bb00e8aad879485fd21cd42d7054eab4a37251fccc3ae7 SHA512 3b4b21eac425fec44a47a5799dcb5387099de06b777906a4b7c5bf169c71d8b82ab4296a21c8b60daefa4546d5a814b8d9f23e4d2afcf0eb91c3338d8f327ce7
 DIST packer-1.6.5.tar.gz 17900733 BLAKE2B b267f5b861de9eb4fc88ab747560aef30825897e1f42038ff443185c6591afec039e12a4639ca22598704a7ada68b8af373c67f7391f9884566fd0f431b3c0ee SHA512 17df612ccac44f6ee987cfee0f5b0422768302a40e7e4177c47e427fd0aa09be136ceda40272e6a1cbdeb52587b5c93f2fe7158f787e19399149ee514fec001d
-EBUILD packer-1.4.0.ebuild 792 BLAKE2B 98101308b1243d57463057ac8be281bab376eb32c5b78156f3d00645335a5de62b71e3422fc14b4c8d4b33994563773e47970a9c671e4341c28e77e731680a0c SHA512 0529bbe8e372bcc7e89ceb7b2f3b3d6a14122d1b1c0276dde64f230430049c3c41f1d443df65ce1413713abf138d7f0eeec81b91909ef92aa675dc5facc59135
-EBUILD packer-1.4.5.ebuild 674 BLAKE2B 8a7aaa2252962053ab87a9c7c7aca766b7dc2328b74f545f55e04136bae9289eb3786cc42b1291578ec6eb2554e3813f6fec426246ddcb5cf7c2a19cfeacdc0a SHA512 0bb54a2f36020864c0ccafed3f6aa525a414ab9cdf3ad6417a6b791af6cfcfa2d7b6cbc1089275ce6a2368cbf5887fcb80a343e4d85fb184de657bec5a228951
-EBUILD packer-1.5.6.ebuild 674 BLAKE2B e434094f73b06347d1cba9e315290b26a2f6f32bfea078bcf4a657ff8769f413bf3724cf4fe12e439e5e162644d870cfdd282601b297bd195748a9a69b5fc579 SHA512 7088a701f7a71c9080a1d236d56091118d135b8f833fe998cf571ec95d931d65701aa86370b2cfb5d0e0bd0df56591598ab7fb893330e0577dd1af98d708ca8a
-EBUILD packer-1.6.1.ebuild 674 BLAKE2B e434094f73b06347d1cba9e315290b26a2f6f32bfea078bcf4a657ff8769f413bf3724cf4fe12e439e5e162644d870cfdd282601b297bd195748a9a69b5fc579 SHA512 7088a701f7a71c9080a1d236d56091118d135b8f833fe998cf571ec95d931d65701aa86370b2cfb5d0e0bd0df56591598ab7fb893330e0577dd1af98d708ca8a
 EBUILD packer-1.6.5.ebuild 697 BLAKE2B d3a064c070aeafd3284eb74b3ad93e7d2e3295426de77ef28d674ba273e6d91cafc12d7d95b0086dd7a0e2cf9a100f688e65fba0da102cd9f26b24f4e936febb SHA512 e67cb808d480047f76da9bae46fe5ce0066c04fa1f5f41ad30bff603e24af50d06bbef6e2092ef5bd203f6e16e92de6e9777e686c24f46742503bd60cf037860
-MISC metadata.xml 1377 BLAKE2B a2c25ec31f167d12a441da18cfa141e1d19001e2fbb0cd4df5d8c613edd0ebbc95190541b6586380dba6f62f6f4c4715ec729b22d4f30ffbfe1a7fccb13f5a8b SHA512 0f949311fffa40abd1cf6722068b210e1d06270d25698dbf17554722fcdff847dfedd6e47650a5091d2afa1ecf960e50937a2058150051a4af98a485ac9435b2
+MISC metadata.xml 1407 BLAKE2B 76e06a879e52fb8538d9f6f692e91c589896e5574ca497e0b35a2a51bc3abf049842b27c5b04ffa1ec009e61826f524a3634c0dcd1c93c2eb95b7fc7b57b42c3 SHA512 9cef2540558ca98a457aaf738aa4c0743eaea6a830a344d18ceb5012f3be021753654269fb3b93c0dc73f7ad1bcfc3c60d87912dbe7888f966c90794c6d00821
diff --git a/dev-util/packer/metadata.xml b/dev-util/packer/metadata.xml
index a2b26dedcc96..489636ef7cec 100644
--- a/dev-util/packer/metadata.xml
+++ b/dev-util/packer/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>xp.vit.blr@gmail.com</email>
 		<name>Viktar Patotski</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-util/packer/packer-1.4.0.ebuild b/dev-util/packer/packer-1.4.0.ebuild
deleted file mode 100644
index 5a13c74a3fa0..000000000000
--- a/dev-util/packer/packer-1.4.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit golang-vcs-snapshot
-
-DESCRIPTION="A tool to create identical machine images for multiple platforms"
-HOMEPAGE="https://www.packer.io"
-
-EGO_PN="github.com/hashicorp/packer"
-SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-DEPEND=">=dev-lang/go-1.11.0"
-
-DOCS=( README.md CHANGELOG.md )
-
-src_compile() {
-	cd "src/${EGO_PN}" || die
-	GOPATH="${S}" GOCACHE="${T}/go-cache" go build \
-		-v -work -o "${S}/${PN}" ./ || die
-}
-
-src_install() {
-	dobin packer
-
-	pushd "src/${EGO_PN}" || die
-	einstalldocs
-	insinto /usr/share/zsh/site-functions
-	doins contrib/zsh-completion/_packer
-	popd || die
-}
diff --git a/dev-util/packer/packer-1.4.5.ebuild b/dev-util/packer/packer-1.4.5.ebuild
deleted file mode 100644
index ab0e1cbcd571..000000000000
--- a/dev-util/packer/packer-1.4.5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module
-
-DESCRIPTION="A tool to create identical machine images for multiple platforms"
-HOMEPAGE="https://www.packer.io"
-SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD-2 BSD-4 ECL-2.0 icu imagemagick ISC JSON MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DOCS=( {README,CHANGELOG}.md )
-
-src_compile() {
-	go build \
-		-mod=vendor \
-		-work -o "bin/${PN}" ./ || die
-}
-
-src_install() {
-	dobin bin/packer
-
-	einstalldocs
-
-	insinto /usr/share/zsh/site-functions
-	doins contrib/zsh-completion/_packer
-}
diff --git a/dev-util/packer/packer-1.5.6.ebuild b/dev-util/packer/packer-1.5.6.ebuild
deleted file mode 100644
index c1237d3214bd..000000000000
--- a/dev-util/packer/packer-1.5.6.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module
-
-DESCRIPTION="A tool to create identical machine images for multiple platforms"
-HOMEPAGE="https://www.packer.io"
-SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD-2 BSD-4 ECL-2.0 icu imagemagick ISC JSON MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DOCS=( {README,CHANGELOG}.md )
-
-src_compile() {
-	go build \
-		-mod=vendor \
-		-work -o "bin/${PN}" ./ || die
-}
-
-src_install() {
-	dobin bin/packer
-
-	einstalldocs
-
-	insinto /usr/share/zsh/site-functions
-	doins contrib/zsh-completion/_packer
-}
diff --git a/dev-util/packer/packer-1.6.1.ebuild b/dev-util/packer/packer-1.6.1.ebuild
deleted file mode 100644
index c1237d3214bd..000000000000
--- a/dev-util/packer/packer-1.6.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module
-
-DESCRIPTION="A tool to create identical machine images for multiple platforms"
-HOMEPAGE="https://www.packer.io"
-SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD-2 BSD-4 ECL-2.0 icu imagemagick ISC JSON MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DOCS=( {README,CHANGELOG}.md )
-
-src_compile() {
-	go build \
-		-mod=vendor \
-		-work -o "bin/${PN}" ./ || die
-}
-
-src_install() {
-	dobin bin/packer
-
-	einstalldocs
-
-	insinto /usr/share/zsh/site-functions
-	doins contrib/zsh-completion/_packer
-}
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index ee2c1a669065..81c94775e666 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -5,13 +5,17 @@ DIST pkgcheck-0.8.2.tar.gz 455039 BLAKE2B 282c75578cd4aa7aca3f54e9625360cde4d714
 DIST pkgcheck-0.9.0.tar.gz 585528 BLAKE2B f9fa2d11b9510d84b5d9381ff033de14ca5ec74cf84d50f3f8847c1585c38bd02f534b09cc017e04d6f322ebd95c8396d95eca299ed1327cd25fab9e42973be3 SHA512 a6778785c23eacd80df555c77c8a77ef66b16e2a601fbd9405f85ce8520079a6f1366aeede3a1758abc8db606bc4608cb4a7e1ad421a8416bdb35b3ff3af9d6f
 DIST pkgcheck-0.9.1.tar.gz 591753 BLAKE2B e4c8840c022b77dde34ad461367eb1947f269c8a0ff12e9dee2c8e373d1926f58f9d104571bc5de233975eda73509bf39eec533de03f78cf82fa41bbd10bcc74 SHA512 9adcf2fd5b9652e834f96f8a7652c97d28c4ec5a8b8704cd4c7c4ef8463237fc15f4c46e36993d0e72de5aab068b108368378d5481cf4d5df974e4a78adf6072
 DIST pkgcheck-0.9.2.tar.gz 593674 BLAKE2B e5d02e914e90db28540ca350d91d38ece9cea1f8413ec90b877bb41896cc7b710e451658c7c6cea3f4cc2f834230a986d18429c8ac3f23d4b317b28e3af8d74f SHA512 2bbced17dcc1718576aa4ce2401fc856cfb6256fe437295c25716852645841c6a28d1c1276f3a5943ce27943ab36bd3ca3ef9bf1ace20138368371a793a80b6d
+DIST pkgcheck-0.9.3.tar.gz 460029 BLAKE2B 3ef3aa6c338c5b379e4845302aaaacc5c71679309f45985e1dfa71fb1e62760c4f94ca43d34ca4ad75ecd1f738d9bcb0140568b4e4826ee6a14586c21d0c1a03 SHA512 5613f65437e6cc1c55330eef8bc354ad2f6e325a03c8353186d17a8e9dd21333a3900f91a36c1af0767ccda56f30d425ddb848e4eccf9d20ccba3f5de5098fb3
+DIST pkgcheck-0.9.4.tar.gz 609445 BLAKE2B c0a8afe0a008069dc54e977b937c00c3b21c2a86af16b3339348e0f6ed454084a97745f59afda2489a65cfb23e92b35bd3cc464075e8729b8dd1c1cd8e8e5ebd SHA512 821ecabad722a51c85ae9d9b32bff425c56f9f5ad719f70ca3a60467f9978acaab78a27ff7d9b41d0572f749ae2a08de960fb8e470f50095fc6ee67668a0e4c4
 EBUILD pkgcheck-0.7.7-r1.ebuild 1439 BLAKE2B c9f277bf416adb2b9e8371b539cfce4d04cd42080c71f292e218769c81030ca59e792f8eb198370aabd95fadd9c8470d399fb00eedb37453c87ad5e7c47bdd22 SHA512 eb03cd5371488c808186f057c20127935ae2570aaee927ea4d012fc4c0634970f5fd0d33757f611f14958de7e4a9e192a65d5ba997ff6389c8e9f2145de8ecb8
 EBUILD pkgcheck-0.7.9-r1.ebuild 1446 BLAKE2B 3a4b8bc7d6d0d515e220343eef74345ba39853f65ed39e898a68b8bf900c49610c7f5f78c1f49de08eff9254f0cdd54f57672a8177469e23bf0cc82e0effbef4 SHA512 a077e0f9e8879d89691c608e6cf0b619fc56ccb3ba92052280a55c5a5b1005d397ae72aa7638df040dbb2c15498e0df4f33f0d7e1dc3540b4e87fbdc583523e7
 EBUILD pkgcheck-0.7.9-r2.ebuild 1447 BLAKE2B ddbd3beddb0ecfd71c9120eab6d338d398b82f7dc3813698a115c74a126fb0464f6c077a7ea1b4aa35787517538c23531d58233da0d61ded74db7e2bb4b57e5e SHA512 eb46f428631af94a1095bb3f9df59ff7ec9cc6b57621f38b745e1755ae50f5b830f4c4ddc45f86b0a76afd6ef36cfef159a1f92723be3432195b08d3b1c507c1
-EBUILD pkgcheck-0.8.1-r1.ebuild 1341 BLAKE2B 226ef3dfaa1d376e246648726efdb599b2b75211d2ae36da71533db09f76e3c41832692d813ddc3fbcb90d171d5d6df4bb598a026400d51ca23cf09600b6546e SHA512 ecce76cd05d58945652d84f4adaec6fa44ec91d8aeb1b5b910828acf98fdf15b807b4e2c77b41c1502c04b23990dcf3eda5419b37eede537ed5aa17333da33c7
-EBUILD pkgcheck-0.8.2-r1.ebuild 1365 BLAKE2B 05608be4393f1058d5d3c79831e5a01138056e55b5f67a4efeaabd07005a01b5f5f73f14b45dfee76c4982acaae5e1c28a36fa5a792dca8e16be5da96d4f9391 SHA512 12be2b9125e3f0fe5763f771c759500e84028cbab0c46aaf37d47f6ae25a63473b63f35ef3296dcfd8fe2eb4c8ab514c0d6de30c4457fb730d3e6f8ae5152763
-EBUILD pkgcheck-0.9.0-r1.ebuild 1426 BLAKE2B e62ed959fbeefe699e90ac619406d8552d28d4cede6def95d3f6826d892ac4e68155a9428affc231a69498b11ffd6944777bae5992a9911a43051f36cecd1b51 SHA512 5608eabeaae655a60240b4f4576199f74c8e94ed7aee8536be2e7e2063ea66344e20c9aa8a410ac4b44a3dd63699e33f3631e1376af1a83084c069c8716b273a
-EBUILD pkgcheck-0.9.1-r1.ebuild 1500 BLAKE2B dcf03bfbf0099db0e3b6e27a6a6e3d7ac309392548f5668b5acbc866b980b97124a72d294f9f4a253397369373c1b945c2f131d6e73f3d4d6a249eb0c7ac1bc0 SHA512 9500283e6ebed04e4923971141ccda4e4dd9762765e660360b24390a4c5cd40b8ff35a40584e008336564fcda509b88425b06f1adf3bcd8bb3c844ae8f2ebe1a
-EBUILD pkgcheck-0.9.2.ebuild 1501 BLAKE2B d0c8b037a86e3f817a6b7ea3ab01198b3a4e3bf2df869ced7835f53c5e7955e3ca7793d584401581865740c3f9ef2849d15a2dbd5f53ec1006c0d1352b97f225 SHA512 62c31e8f132d4d4dd1af78072bc03179a853f5fbb22ecdd1c6fba2b1774465c6465807b9988577020e63871955acfe0dc17601d4d595d7c5824db1f47464eca9
+EBUILD pkgcheck-0.8.1-r2.ebuild 1386 BLAKE2B 8038faade06c55eed6be95c34e5a7ad01d5d0e4e1bb36db023327435456ce608fb975f785890b055a587b888ef7c23d1eec626dcc69211f11b49315e737cfeb4 SHA512 9ea5244aa12ba08a5ab1e80842c6f991d1ffa1eb121ebba947a02ae6679052e58680e5cfbf0c579cc9476ada71d2bb5d8bf58565d0490b549379229548af290f
+EBUILD pkgcheck-0.8.2-r2.ebuild 1417 BLAKE2B 0b635b4a66c79928fd2ae21de749e456686dcd77d66e7fb413c39c0b645c3252c4eab7d77f1725b038fdcdd84d25998dcb79b9ee1a0c80b6063510d49d9f15a5 SHA512 3ef8917647484400d8a46e2942e598769e01918f381117877815535ed0dc6e683640ef49dc4cec2f5182d80c2ef06184ce823f9beb6ecc9203490a907db813e1
+EBUILD pkgcheck-0.9.0-r2.ebuild 1471 BLAKE2B e11a1f5b4435064308cab3acd07ea5301b7b0d463786c0037ec217c5378221b8c6d53ff34faea6365c08c8fa38bc6ac5c3b212ea6b156dfe4da0f43864dc8ea7 SHA512 32b50f2db0deb57931288e6fad53f899441ea2034722ae94c8485971657a47e2cda11920c119322ce0ad976107d7b2b5169a80bfb9b7d705b559f081fe68671d
+EBUILD pkgcheck-0.9.1-r2.ebuild 1545 BLAKE2B 5a421d8b7ed67ac8712a7b64dec324785c582696ea188c556fcea09089d1fd239909dd73d9ec6c934eb611509ecca058e915e536b4dab3e0552406bc145597f4 SHA512 41bb42a7cfa5eb458a601abd53a9b357b9377c472d9db5fd712ec7beca9fe21ebbef4898503d2cc2f14b34e716530aaa1e4911dc244bebfb1d905a2afdd1d995
+EBUILD pkgcheck-0.9.2-r1.ebuild 1545 BLAKE2B b9362796ea299c1c4cc0efaed08f2ef54e7f4f0daa44bc735b5808319a905194004e272590caa5297154d0f0c10741f1261dd55ecfb1f7625c4b4eb6e5fc5f67 SHA512 8da319f22d2506cf254bf23e8d22d83e9689f858ea89ce484a0157481b42f93b1f70a5630de8988fa9cf2ab8aaee04031e33b428c126da7fbf8e04d024650fce
+EBUILD pkgcheck-0.9.3-r1.ebuild 1552 BLAKE2B bba0c6003224d4620fba6a8dbc2d0954a45cf0558f7d9e1aeb0abb8a851f20d00373be9b556db4ecdf44964f8adee15a7b354e069d67228f009ec5a6163a0d37 SHA512 ee0d8ff0e909054a06ccdc89cec5819ba7b8a7cd694da79a32b70f2e8b2cd2709d44ea4ff34efa6aef4b8d9c38106dff0c2df7c0d32c2d7b487361b249fbe334
+EBUILD pkgcheck-0.9.4.ebuild 1507 BLAKE2B ed58c351d977d491d464d896a8519d88ed1799d7bfada82c2588249ff4245b5efcb65a2df38fb3a620f5573d0fc542ee7347338c8bd58fcba22118e1f0106f0b SHA512 dff66a95a5c5ec85d886f58674b6b9bc945f2664c666105b2e8e4989a2cddcd324578ca1abcbfbd56bfd98eabc99abd222662882163a5b51d3813e8b899f1279
 EBUILD pkgcheck-9999.ebuild 1501 BLAKE2B d0c8b037a86e3f817a6b7ea3ab01198b3a4e3bf2df869ced7835f53c5e7955e3ca7793d584401581865740c3f9ef2849d15a2dbd5f53ec1006c0d1352b97f225 SHA512 62c31e8f132d4d4dd1af78072bc03179a853f5fbb22ecdd1c6fba2b1774465c6465807b9988577020e63871955acfe0dc17601d4d595d7c5824db1f47464eca9
 MISC metadata.xml 328 BLAKE2B b84dba717460e84f7ee3163fd8d6a5f13eb3b15dd1bb749f6ece81f062e3530988dacefadb24c1395eb36593a7ab6d868b06c8c4ee8f620a17c85faf04283b24 SHA512 5696505214a737ad495b23bfac2a51fbbc5b1e815eb6fcbabb3c6674325f05e3f6f418de05257c08935e389e47879e8a2d1b3723ec86aeb5ad97c6110fd2ec75
diff --git a/dev-util/pkgcheck/pkgcheck-0.8.1-r1.ebuild b/dev-util/pkgcheck/pkgcheck-0.8.1-r2.ebuild
index d625f9d99b44..4c51a0245288 100644
--- a/dev-util/pkgcheck/pkgcheck-0.8.1-r1.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.8.1-r2.ebuild
@@ -27,6 +27,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	RDEPEND="
 		>=dev-python/snakeoil-0.9.0[${PYTHON_USEDEP}]
+		<sys-apps/pkgcore-0.11.6[${PYTHON_USEDEP}]
 		>=sys-apps/pkgcore-0.11.1[${PYTHON_USEDEP}]"
 fi
 RDEPEND+="
diff --git a/dev-util/pkgcheck/pkgcheck-0.8.2-r1.ebuild b/dev-util/pkgcheck/pkgcheck-0.8.2-r2.ebuild
index 940c596c1165..a0ec54b06b5e 100644
--- a/dev-util/pkgcheck/pkgcheck-0.8.2-r1.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.8.2-r2.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 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 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.0[${PYTHON_USEDEP}]
+		<sys-apps/pkgcore-0.11.6[${PYTHON_USEDEP}]
 		>=sys-apps/pkgcore-0.11.1[${PYTHON_USEDEP}]"
 fi
 RDEPEND+="
diff --git a/dev-util/pkgcheck/pkgcheck-0.9.0-r1.ebuild b/dev-util/pkgcheck/pkgcheck-0.9.0-r2.ebuild
index 01cc542dcbc7..2a6517ae020b 100644
--- a/dev-util/pkgcheck/pkgcheck-0.9.0-r1.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.9.0-r2.ebuild
@@ -27,6 +27,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	RDEPEND="
 		>=dev-python/snakeoil-0.9.0[${PYTHON_USEDEP}]
+		<sys-apps/pkgcore-0.11.6[${PYTHON_USEDEP}]
 		>=sys-apps/pkgcore-0.11.1[${PYTHON_USEDEP}]"
 fi
 RDEPEND+="
diff --git a/dev-util/pkgcheck/pkgcheck-0.9.1-r1.ebuild b/dev-util/pkgcheck/pkgcheck-0.9.1-r2.ebuild
index f4fc9d8e1d48..90f85d834a8d 100644
--- a/dev-util/pkgcheck/pkgcheck-0.9.1-r1.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.9.1-r2.ebuild
@@ -27,6 +27,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	RDEPEND="
 		>=dev-python/snakeoil-0.9.3[${PYTHON_USEDEP}]
+		<sys-apps/pkgcore-0.11.6[${PYTHON_USEDEP}]
 		>=sys-apps/pkgcore-0.11.4[${PYTHON_USEDEP}]"
 fi
 RDEPEND+="
diff --git a/dev-util/pkgcheck/pkgcheck-0.9.2.ebuild b/dev-util/pkgcheck/pkgcheck-0.9.2-r1.ebuild
index 18f0ea5c49f8..305c632e3e48 100644
--- a/dev-util/pkgcheck/pkgcheck-0.9.2.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.9.2-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 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~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.3[${PYTHON_USEDEP}]
+		<sys-apps/pkgcore-0.11.6[${PYTHON_USEDEP}]
 		>=sys-apps/pkgcore-0.11.4[${PYTHON_USEDEP}]"
 fi
 RDEPEND+="
diff --git a/dev-util/pkgcheck/pkgcheck-0.9.3-r1.ebuild b/dev-util/pkgcheck/pkgcheck-0.9.3-r1.ebuild
new file mode 100644
index 000000000000..3b4b3965e984
--- /dev/null
+++ b/dev-util/pkgcheck/pkgcheck-0.9.3-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1 optfeature
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="pkgcore-based QA utility for ebuild repos"
+HOMEPAGE="https://github.com/pkgcore/pkgcheck"
+
+LICENSE="BSD MIT"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	RDEPEND="
+		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
+		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
+else
+	RDEPEND="
+		>=dev-python/snakeoil-0.9.4[${PYTHON_USEDEP}]
+		<sys-apps/pkgcore-0.11.6[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.11.4[${PYTHON_USEDEP}]"
+fi
+RDEPEND+="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pathspec[${PYTHON_USEDEP}]
+	>=dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests setup.py
+
+src_test() {
+	local -x PYTHONDONTWRITEBYTECODE=
+	distutils-r1_src_test
+}
+
+python_install_all() {
+	local DOCS=( NEWS.rst )
+	[[ ${PV} == *9999 ]] || doman man/*
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Network check support" dev-python/requests
+	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
+}
diff --git a/dev-util/pkgcheck/pkgcheck-0.9.4.ebuild b/dev-util/pkgcheck/pkgcheck-0.9.4.ebuild
new file mode 100644
index 000000000000..78f8b6d343cf
--- /dev/null
+++ b/dev-util/pkgcheck/pkgcheck-0.9.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1 optfeature
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="pkgcore-based QA utility for ebuild repos"
+HOMEPAGE="https://github.com/pkgcore/pkgcheck"
+
+LICENSE="BSD MIT"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	RDEPEND="
+		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
+		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
+else
+	RDEPEND="
+		>=dev-python/snakeoil-0.9.4[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.11.6[${PYTHON_USEDEP}]"
+fi
+RDEPEND+="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pathspec[${PYTHON_USEDEP}]
+	>=dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests setup.py
+
+src_test() {
+	local -x PYTHONDONTWRITEBYTECODE=
+	distutils-r1_src_test
+}
+
+python_install_all() {
+	local DOCS=( NEWS.rst )
+	[[ ${PV} == *9999 ]] || doman man/*
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Network check support" dev-python/requests
+	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
+}
diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
index 89b3a0f725a8..8e35b276d428 100644
--- a/dev-util/pkgconf/Manifest
+++ b/dev-util/pkgconf/Manifest
@@ -1,9 +1,9 @@
 AUX pkgconf-1.7.3-darwin9.patch 517 BLAKE2B f6f2374bb32aa2e9513df0c91e51ee41e0c8d1c847c3d00ac3a420a6299d3abca74d211b0e3b52a41d1a64d737d18d4348e5ea72ae5537425d14e8bac1fd1a67 SHA512 f55e795a503d5a0349968a6b69f3aae6335d90daa38c6f829f7ce54ab63beedde48e37a59397263aa8dffefbabc1bd9d22aeeff8d0111f7e317b580272aa3d41
 DIST pkgconf-1.6.3.tar.xz 291216 BLAKE2B 04bf58590e2f0b37bac7b24b3d595ad08680e85647548cbd642495398d95706f9f738af5c6f9b9ad8801567caa20ade85d4c4d74179f08313420683cb1b34263 SHA512 437c5a5c9866e2047e62e0592639930b2420d4afd41d98cef51f3475165418a39e916477860025314828a6ee0a4eefc10fdf26bda66f80c291f324d9674fa5c1
-DIST pkgconf-1.7.2.tar.xz 292944 BLAKE2B dd0197afb75590e18b6ec8c76f9a7109edc3a0934b6b9ef7bf4006ffa73b0083d2a4aa120f2f3bd0a0e9d5fd564fd7d387aedeaa297fe72c63bc440518a51c6d SHA512 b0376178e93743fd844bdc94b5fa2678521ffe5022323e20f3c5196d500a87c3546d0edc2ac22e92cb528348116e2826d6f144bd7bd18d3f0afaa5cda74f25cd
 DIST pkgconf-1.7.3.tar.xz 293148 BLAKE2B b0fdad9e86c7e2aaf5f268de779730e55e14d6f0ddbec50f354b888aa9ca284f6d1d4c462f00b815cd6e0e17a3b41025ce77485f66a7d527f519a7b80283774d SHA512 37b6c4f9f3b93970e35b6970fde22fbbde65e7fa32a5634b3fdfc25cc1f33843582722ad13d9a8e96fd6768406fcbe86bf5feb76996ddd0bb66d6ff91e65f0b6
+DIST pkgconf-1.7.4.tar.xz 293888 BLAKE2B af814174b59e3ea7009230f639a6237226caafb22300946904dd10810c0b5cfcbfeea21767a3a1d2c2b5cb1fe4b7b1d995a52d820fcfce3adb383c66762b7576 SHA512 92c080684898b42824a1f1a7e3ce8a600896fc9c20fcf263f032b856fa4c7139607f87ba44d18ed358b8c5f4f04477708800d20a4e10f96e4268a55682f7f0c1
 EBUILD pkgconf-1.6.3.ebuild 1667 BLAKE2B 17a7957cfa6994523620d43977f569d1e82c229ce67f478a3531e03b94bc40bbb0c1a76f1d01fe38b6369c700e0f8f79aa4c3aa92f4a9ef4cc1a0d139cb391f8 SHA512 bb283e3c29ca6bed10c5c4357c8e9456b7fc169881d8d708155e56bcfca2ebe5dc90a27f3e6c4b8a8289d6b15e7605d6faeafe651d8da0ed1e4ceaf1cd2eaef5
-EBUILD pkgconf-1.7.2.ebuild 1676 BLAKE2B 415269c2b15399d877263b95ea77f56f065ec2fc4047228dabeeea5e65df62cf91a47cd23dfa2865a67101e419b36b63c88df2ea804c0ce7cf87d836dcaf0fb3 SHA512 367c84f00478c27a93e3be87243af32693a072fc7e12ecb2ff0d0baf08ddcc16c2ec080904c58c8fdf7864d04fd33e0a79284274d357dcd349d75258662a5139
 EBUILD pkgconf-1.7.3-r1.ebuild 1873 BLAKE2B ebe897ccef4d85b6e69318ccc11d4ecde771b5c6b61fd166f09a673481c5016612f79692ddab4147228a8018f310fa2c79b678ce23ab6437b35816058f3077c1 SHA512 88f90221e933b8b20d64836b4d7b06e914e03fb7058c1f1d895d02d72cfb76735ab3252a485001ccb412af32f2edd5fd2b23209662daced0f98f01a7616329d7
+EBUILD pkgconf-1.7.4.ebuild 1873 BLAKE2B ebe897ccef4d85b6e69318ccc11d4ecde771b5c6b61fd166f09a673481c5016612f79692ddab4147228a8018f310fa2c79b678ce23ab6437b35816058f3077c1 SHA512 88f90221e933b8b20d64836b4d7b06e914e03fb7058c1f1d895d02d72cfb76735ab3252a485001ccb412af32f2edd5fd2b23209662daced0f98f01a7616329d7
 EBUILD pkgconf-9999.ebuild 1766 BLAKE2B c470aa4fc8eeb6c2e61c636eab8d9b1684eda76d1d7f2c5734e5159ae9ab4f905adbdb372166ba38ab13bc5bf83c92022c07023a0ca7ac512baa0c348086ff1a SHA512 c101e8a92926436c40a82da763c6a92a43e503b10014cd59ed202b1ea257de52f12e5c8d1bd91ea23aa07880e11a0bf8fbaea89009cf563fa9495e3b8b8a9efe
 MISC metadata.xml 605 BLAKE2B 316f82c4daabf91792e48e82973daaf0b0af972f7760636990e64c94e5e68b41b7cf65fa5d15387ce81a25926a5ffea19519ffe29a1ae487046d973708495b75 SHA512 68a71f55636e987c721da3c54451c75068e3261a0b462189fed45309bb4c286d0ec00a8a29962969b54ac8e31a13a34167cfc3fd44f5da8b84e4ce36eb5b4b10
diff --git a/dev-util/pkgconf/pkgconf-1.7.2.ebuild b/dev-util/pkgconf/pkgconf-1.7.4.ebuild
index 40e4e28319d4..3923dd6417ea 100644
--- a/dev-util/pkgconf/pkgconf-1.7.2.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.7.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2012-2020 Gentoo Authors
+# Copyright 2012-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://git.sr.ht/~kaniini/pkgconf"
 else
 	SRC_URI="http://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
-	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 ~x64-cygwin ~ppc-macos ~x64-macos"
 fi
 
 DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
@@ -30,11 +30,7 @@ BDEPEND="
 	)
 "
 RDEPEND="
-	pkg-config? (
-		!dev-util/pkgconfig
-		!dev-util/pkg-config-lite
-		!dev-util/pkgconfig-openbsd[pkg-config]
-	)
+	pkg-config? ( !dev-util/pkgconfig )
 "
 
 MULTILIB_CHOST_TOOLS=(
@@ -44,6 +40,8 @@ MULTILIB_CHOST_TOOLS=(
 src_prepare() {
 	default
 
+	[[ ${CHOST} == *-darwin9 ]] && eapply "${FILESDIR}"/${P}-darwin9.patch
+
 	[[ ${PV} == "9999" ]] && eautoreconf
 	if use pkg-config; then
 		MULTILIB_CHOST_TOOLS+=(
@@ -54,7 +52,12 @@ src_prepare() {
 
 multilib_src_configure() {
 	local ECONF_SOURCE="${S}"
-	econf --disable-static
+	local args=(
+		--disable-static
+		--with-system-includedir="${EPREFIX}/usr/include"
+		--with-system-libdir="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)"
+	)
+	econf "${args[@]}"
 }
 
 multilib_src_test() {
diff --git a/dev-util/pkgdev/Manifest b/dev-util/pkgdev/Manifest
index 4e6ba965f0e9..39d1a5cb8109 100644
--- a/dev-util/pkgdev/Manifest
+++ b/dev-util/pkgdev/Manifest
@@ -1,4 +1,6 @@
-DIST pkgdev-0.1.tar.gz 26075 BLAKE2B e7f7a83d91ef923bdd38465e7c70d6a2d0693d945273583937b4f444e26493887c5aeff9cf6a353dc02c42786d635eda7cc0fbfbc888be2b0e4eee883b5bd9c6 SHA512 1714857c3d66655226a4217ec8955662c5e37022c92183bdd8e61f91ff46f335935af8d6badf79f7c9f894a56b970ab0109f9b18ac7f3e59722d096ce2f24664
-EBUILD pkgdev-0.1.ebuild 1533 BLAKE2B b52d4e7310632fab48a5879e1990eb9d5789b9e7c19c743926756b8d4dcdaee43dd055ef6e8a400999ac933fa1450859a24d56af5980eccd8253e06c6d459776 SHA512 f8f85c891036270e560853e6a27dc13272164ddb410b4372dd6b185d20aecd5b593fe5f335dc590a04fbed48fecea999906ed665f872d153d73664d752e9cc75
-EBUILD pkgdev-9999.ebuild 1532 BLAKE2B 35f3dfc9677eb887f97cfc736e61d10d950e8cbb3e49092ad201ebd547223a68230af7bd053ab695f72a71e1eb7f356b554c8bccdad25065b0a6788c58645245 SHA512 ad2abc4203f8a06a633f1ac1b41067091d3b1467d56bd855ae52d6cc4f42cf3d22562c27ea4f7a5850833e99739d9fdcc3657d993843081ab2e879de3c0fcab7
+DIST pkgdev-0.1.1.tar.gz 31435 BLAKE2B 94f0246bdbc4ee91e6d570969df60ede6f756745e46b41d3a66f1518891c67f15e6daf4ba4eea91d0427346e9d5336b817b7ef918acd717fa7cf704e0151ee7b SHA512 30c70e11fdfb414b2818559eeae250f1a8330187a9b7006475a539aa7fbdeb81b4b0a564fd79105119f697db80845fbd6bd42d278c9339781eb674843cd49717
+DIST pkgdev-0.1.2.tar.gz 32579 BLAKE2B 42ecd7403dcb49b256539e12c22a6bca72884bf55139c5f0972961fbebf4f976dedd3a4fac1186cc1d5af62d339ac7dd3eb20106ff1dcc7b8c264e1c4c53c3de SHA512 c224a054612fd6caa9c66855be9bb5ed439c3ac2abf5b32c4ac516d87fa4e345fc8bc328aa74b4fec44d7fd319322bb42af48f6dfdfff941e3b819a75b9fae9b
+EBUILD pkgdev-0.1.1.ebuild 1533 BLAKE2B 9370cf9d8343d9bb2ebc040561e87d5b5203cb237684f581afd61166a82fbcb92a27f0a68f47e6b09203ad6d101893592ce713147f5ae99ec73326ca711953f2 SHA512 a8a7468cc49526b34cbaf3aa19812681365fa2f14feaa46e8f15980b0a5a31c84e26c1afc191938bf823dfa22d63552a12b30974d53d5015840f0f09d595be31
+EBUILD pkgdev-0.1.2.ebuild 1544 BLAKE2B 8ae62335378a5dc3e826e3db386cca2be16280f41582d4f30c1cbccae31202c608f7cc67ab1f1f4695efc3055338ed3fe3d7a2432502d98d58e698e182017fc9 SHA512 f43bae40fa31725cd7d6ec49ddcbeb1d6cf142940ece6c73f9d7c06d16d6e590c08e56ee87c3aaf407adbab086b2c2be356896f0fc4a23b607e0b4f3ff7e611a
+EBUILD pkgdev-9999.ebuild 1544 BLAKE2B 246fce7c899c709848e29dac7b74cffd8d44dda6be1c7db7b30506413d303ae467bef09be70039406ed29b9847f619447ffd8d19ad1989a362c9ea1864e14b30 SHA512 08602dcf3e3934551c9b774e6e000210eee08a48dbf2c948caf03efe7d7e810bf4af8128e06e264288c3c3f9356bb947f65677f02701489dc4c2c624f015d47e
 MISC metadata.xml 318 BLAKE2B 857b4e6e454663321e0c8f2b9083246459e751c4a1b0c7d900935274efcb63e82379e66984639e41a1adddb32cb995d4ccc99e910f76f3bf19d543d82520b1ef SHA512 40feecfb7907213bad0ee60f17e748aebbc4df381f59bfa47f3a5c9938917b032a37dce6650be4d60e695c17356290a7be984e1d235d219749b11d73d2fa2f6e
diff --git a/dev-util/pkgdev/pkgdev-0.1.1.ebuild b/dev-util/pkgdev/pkgdev-0.1.1.ebuild
new file mode 100644
index 000000000000..310eba8bb7b9
--- /dev/null
+++ b/dev-util/pkgdev/pkgdev-0.1.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/pkgdev.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="Collection of tools for Gentoo development"
+HOMEPAGE="https://github.com/pkgcore/pkgdev"
+
+LICENSE="BSD MIT"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]] ; then
+	# https://github.com/pkgcore/pkgdev/blob/main/requirements/dev.txt
+	RDEPEND="
+		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
+		~dev-util/pkgcheck-9999[${PYTHON_USEDEP}]
+		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]
+	"
+else
+	# https://github.com/pkgcore/pkgdev/blob/main/requirements/install.txt
+	RDEPEND="
+		>=dev-python/snakeoil-0.9.4[${PYTHON_USEDEP}]
+		>=dev-util/pkgcheck-0.9.1[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.11.5[${PYTHON_USEDEP}]
+	"
+fi
+
+# Uses pytest but we want to use the setup.py runner to get generated modules
+BDEPEND+="test? ( dev-python/pytest )"
+RDEPEND+="dev-vcs/git"
+
+distutils_enable_sphinx doc
+distutils_enable_tests setup.py
+
+python_install_all() {
+	# We'll generate man pages ourselves
+	# Revisit when a release is made
+	# to pregenerate them, making USE=doc
+	# for generating the real HTML docs only.
+	if use doc ; then
+		cd doc || die
+		emake man
+		doman _build/man/*
+	fi
+
+	cd .. || die
+
+	# HTML pages only
+	sphinx_compile_all
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-util/pkgdev/pkgdev-0.1.ebuild b/dev-util/pkgdev/pkgdev-0.1.2.ebuild
index fdf04f9fc038..d3bd40f87aeb 100644
--- a/dev-util/pkgdev/pkgdev-0.1.ebuild
+++ b/dev-util/pkgdev/pkgdev-0.1.2.ebuild
@@ -11,8 +11,8 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgdev.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x64-macos"
 fi
 
 DESCRIPTION="Collection of tools for Gentoo development"
diff --git a/dev-util/pkgdev/pkgdev-9999.ebuild b/dev-util/pkgdev/pkgdev-9999.ebuild
index 041813b0cea7..b94c6c1d71d8 100644
--- a/dev-util/pkgdev/pkgdev-9999.ebuild
+++ b/dev-util/pkgdev/pkgdev-9999.ebuild
@@ -11,8 +11,8 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgdev.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x64-macos"
 fi
 
 DESCRIPTION="Collection of tools for Gentoo development"
@@ -31,9 +31,9 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	# https://github.com/pkgcore/pkgdev/blob/main/requirements/install.txt
 	RDEPEND="
-		>=dev-python/snakeoil-0.9.3[${PYTHON_USEDEP}]
-		>=dev-util/pkgcore-0.11.4[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.9.1[${PYTHON_USEDEP}]
+		>=dev-python/snakeoil-0.9.4[${PYTHON_USEDEP}]
+		>=dev-util/pkgcheck-0.9.1[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.11.5[${PYTHON_USEDEP}]
 	"
 fi
 
diff --git a/dev-util/ply/Manifest b/dev-util/ply/Manifest
index a93639bda2d6..73e0de6b9edd 100644
--- a/dev-util/ply/Manifest
+++ b/dev-util/ply/Manifest
@@ -1,4 +1,4 @@
 DIST ply-2.1.1-arm-build-fix.patch 1433 BLAKE2B 305bb06ce1e5516dc3868cd276edc94d89cb7c20866094c6947092048af2c090a29bae52dc82956cbf7f36e42e15d873c553948dade17f4b1f9d490bb8191ed9 SHA512 e7572e5e777e13b483e9123fc5c62d63f3f1a2c753d7dedce8de8d78a4c5baa9c10b45b0e31ba16a92b0e2af11e206662cfe815643f0a8145f8d79e388d536b9
 DIST ply-2.1.1.tar.gz 71578 BLAKE2B b63d0bd355985035b8d1c934c13982e21eeda0d710f40b8131562e9ef6a21a3eaf04960b871f5ab83d718ab1726450996988a2aef1a6fbd2e8f1a3c55db92beb SHA512 fdc66d752989a239e01d2746e6c56610c2c945fbeeff8f2a79be1db487a6cbba365d1bd1b553d25c43a3fdc3634ab96bf4a37ab4f694c6eb6eba82c35b37231e
 EBUILD ply-2.1.1-r1.ebuild 1109 BLAKE2B 24dcc519455d9575a3ca3367823c4bf36814f486eae96ad8d79b7ee5e865ac3a329046e3c7ff8bffc47c4fb3274089f0c56ef74f3682e4a0f34be026659a9787 SHA512 09ad3fde619012e5246c2f8b646a6d3639f60edd9d000491d7026f8fd4302775151b45b6b8a08dc2f9f93d44ce034de97387da3784f8d9e37ac92d30d34aef6b
-MISC metadata.xml 659 BLAKE2B dc960603c0d60aed83463b6e7b284faa759caf821a5087aeb320efe15b8a7af0c74d532b0fbe9ae67fdc6e0b07b9a5a5e9a04bc123fceaff615bb49408126872 SHA512 ee75ce0854893a75ee1bc8a2ff723e93ce4845192b7a16a5c1d217b36231c009fb1d07d05792b4fd8a700081b6f0d1b60786d1184c9b32289dbe8c6d34f9d563
+MISC metadata.xml 703 BLAKE2B 732e9109d3233783cc936b6af7b3f4ec2f6c3a897cd390c4d4d89960b19cabe1fa80f656d48e39bd2f060b8cffd8a2af1c88011e3a3256134c3e062ff2f7a192 SHA512 da85c8189060d95c6bdaed68f824c4d0e3ffe5a7c6766c27efa3e2e5403c08b07ed964aa745a80b37ca84fdb6767113378bbff1f1035781df5a711745507d8d4
diff --git a/dev-util/ply/metadata.xml b/dev-util/ply/metadata.xml
index 28ee2e30136d..b6666629264a 100644
--- a/dev-util/ply/metadata.xml
+++ b/dev-util/ply/metadata.xml
@@ -4,15 +4,15 @@
   <maintainer type="person">
     <email>zmedico@gentoo.org</email>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>jakov.smolic@sartura.hr</email>
     <name>Jakov Smolic</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>luka.perkov@sartura.hr</email>
     <name>Luka Perkov</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-util/poke/Manifest b/dev-util/poke/Manifest
index 21ec03df2fc5..1cc3684225d5 100644
--- a/dev-util/poke/Manifest
+++ b/dev-util/poke/Manifest
@@ -1,3 +1,3 @@
 DIST poke-1.0.tar.gz 6698818 BLAKE2B 4f66e1e5f2aa1c33bf2b2b823e60662c98fe608f53526f5ea5117f84540c75b7f3196c53fd80858c10e12f3005ccce0ff9a457fba7b439f2fecd4c4bad061bfc SHA512 e7c567e5e14fdd5a45e9568c972ba7c93e2b8810428f16d608e638654890854e3dd49ba5f91c9c49bffe4cc846e1ba823fe1d4c9ac2673cde535cb46c24b5a62
 EBUILD poke-1.0.ebuild 979 BLAKE2B 33b10895f02e85f773e705232d8e2cd063424c2c4cabbc0f29a9a812162decb18f50296d0becdd0dbc08a8becb0bd56f5491fd475cf625a322aad32f9b02f2c4 SHA512 a268a3ec5c3d271dd4857c6a4eb87c0abeb5211f9c09af8ee6ac1ae3d13fa9c2b267ac02b85181cc2590d1eae0ff1e7a961684ea1373656e49923644923ba6df
-MISC metadata.xml 373 BLAKE2B 7c574ccfb12bcfae133a365a31a0398e7c555bfd41b59bd031e6453ac40a3f8a100146c234ceee6744e6816a533179cb0acdf8b1b7f3883b547854d7f46367d7 SHA512 ae9674b2b8c7d508c8ff0b8b975dbb469b0a6c5d00bf6262295c5c38b7d2682be22c88fd89ed0a3d2ba70365cc7fd06b584eec0f827f8657d2af368a7136e08c
+MISC metadata.xml 373 BLAKE2B 5a16b41a8e507a250ba57aa741890c395eb484af1535229199399f68d62da619298d10583fd7b8d454139765526307ab3f0486814a5ccc22f32eae413e2f4abb SHA512 a74066509b1ac23992121781cb2befa222e250467e9d54ee1cff7d5e7cf5df81d86a44b0eef3768d22c0105f8f1136843f54ef1f5111e1ed8f3659f9eba1898d
diff --git a/dev-util/poke/metadata.xml b/dev-util/poke/metadata.xml
index f44bceafc510..81c0a3800a8e 100644
--- a/dev-util/poke/metadata.xml
+++ b/dev-util/poke/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Sergei Trofimovich</name>
 	</maintainer>
 	<use>
-		<flag name='machine-interface'>enable machine-interface protocol using <pkg>dev-libs/json-c</pkg></flag>
+		<flag name="machine-interface">enable machine-interface protocol using <pkg>dev-libs/json-c</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-util/qdevicemonitor/Manifest b/dev-util/qdevicemonitor/Manifest
index 941eba9e9dcd..764ce7340476 100644
--- a/dev-util/qdevicemonitor/Manifest
+++ b/dev-util/qdevicemonitor/Manifest
@@ -5,4 +5,4 @@ AUX qdevicemonitor-1.0.1-screen-geometry-is-deprecated.patch 1316 BLAKE2B ae704d
 DIST qdevicemonitor-1.0.1.tar.gz 955052 BLAKE2B 9efbc2d5575b09056d2e52e3d6208a2cb70ba2cab0cede574faab9845decbf9758d3cc1ce41905ba0a915de12c8ac474fb2933522fa5e5be5543ab7c780ca5b9 SHA512 c393d8e33aa6234c2b62af8c25e5fc2e6ccacf9734b77500a512fbd584ecde723b9d5717dbe268d65565d3d30801d297236b3546263ba2689ba246d2b13b8f55
 EBUILD qdevicemonitor-1.0.1-r2.ebuild 1135 BLAKE2B af435aa2a1fede750d5bb0b465bd5e54d99c157981c12b1427f4e8d76f32d0218a96becec4a56283e727d17edbac71c5da67d8102b4d58aa7bec9f8fabfaeafc SHA512 f3cdd756461c34ea4bd31c8c8cb0c62ee7389a87c23f85dacae929f19d056a8a43c9d68744a5d33ff130423bb0b828b4a4a2d020d19fa826e8f290bc07bb5aba
 EBUILD qdevicemonitor-9999.ebuild 915 BLAKE2B e05fb16f77410c0478ad212b0ae18616cc8c98072b1c06e81163df9fa55694af652eeaf6d5aba943ceb9c999187210922827d12d4cd41425279e1ecad8ef5fdc SHA512 4088257b67415a9ec932ab62b2ecdaada1c544df2f828279249a49b5346a8fa3dd906561cf2549212e0caebcac8b43c7c8cf725d01c9c778193a0de9b3f16be9
-MISC metadata.xml 462 BLAKE2B 73aba43e52e799e289409d8c39de41eac87c5049a13ec1bac10ba66c309ff286d09708b30d8ee5362bb9be7e04053ec85d13628329286bfbfa374a2694e84c02 SHA512 c5211a1c7bb8b223854560f45bbdf117e92aa17a513b59ccbea2670c7334e3e1850244c636348f61f0200380601a38a8c0a833c36f9d291984ef0ec643fd41ec
+MISC metadata.xml 492 BLAKE2B fd5462bdcdb9d6515164448000c9ceb1a3c32ce58afbc988f7cfd096c32470377235b873bb35155f470a40e1c54bbb7fbd61a587d4bb6d6d051511e547a3e8bd SHA512 34d717131edf32dcdef69591f956a5c403e6b9d17a76581721b5fbccaae072277c09bf3756c469be870263725b608c3e6c6e9a104b73d3ecd483fc679d21c1d1
diff --git a/dev-util/qdevicemonitor/metadata.xml b/dev-util/qdevicemonitor/metadata.xml
index acda2b8dd0ff..5853dc91a0aa 100644
--- a/dev-util/qdevicemonitor/metadata.xml
+++ b/dev-util/qdevicemonitor/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>alopatindev@gmail.com</email>
 		<name>Alexander Lopatin</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-util/qstlink2/Manifest b/dev-util/qstlink2/Manifest
index 3c544c2878ab..eb3175a293e6 100644
--- a/dev-util/qstlink2/Manifest
+++ b/dev-util/qstlink2/Manifest
@@ -1,4 +1,4 @@
 DIST qstlink2-1.2.3.tar.gz 681169 BLAKE2B e1ebf6a30de3724eedcc5fa00f8a9a79e6fd038b6276dfc424a7d78f8b55b99173037c47fbdba85bbb69a7530682bd3616e185a1bb9882c686b8c3ee34105a7c SHA512 13c06a53f44acc99e620c89052fc2f128076e3aec1cac76ddcee76a49ed473d5ef816d77fc5be23d125bbb16306c176f54c2d611c88d2b9c6e7954752a96c7e8
 DIST qtusb-0.2.1.tar.gz 47928 BLAKE2B 5215e726c111d1835033848ee9d5e3d85c4a1d47be20d04423f5c1582251f75b0cf0272028d307a7a37df1f4533f04189f9660f62a0c5461c9ac803ee8d33aac SHA512 76e6df81d9bbd5725a113932506bd6541d0bb32301ead03d92faf1f0fa4dc68749e2728d8bf3fe8efefd00a3774b46f0c8f81be8028a2c5ceb6bc1b6d36da38d
 EBUILD qstlink2-1.2.3.ebuild 896 BLAKE2B bff4a85e44a9d3c953dec3d8038babd412f7f872974d2cda1bf9ad86d44b4890d93f6ac48173ed571bc91bb408c45d689988f92f4e7d2b79f59c2f02c1e35c50 SHA512 ce9a1960c7f2d93ab3e16131662e3be5793ce7fe1fc4eee84c8d11c20dded840d33446da8151069b9fc94f6d33f9e5a10c0684f81f3997b30ceb72905355e39b
-MISC metadata.xml 593 BLAKE2B 8e1e6002217c771828cabce29eb7a4392412d9fa388f3e76e9db83e232f586b87e77114d2d3b6c4162427027237020431dfdea2287924539a3d0c1be3dd0d87a SHA512 db483eeddccf6c2642e090c8ae0136e028156ec05152b5fc3ac9cf60fa59310cac3cb6477f4c5d7c09c0fa4b3abe1b7535d402203a23ef4f0e3fe1094a4cebec
+MISC metadata.xml 623 BLAKE2B 6a8313e6ee13781728b230b5642695c5edf5ebfab47ea129431e05a5ff80ce81f07aceb1bed8225be592f86ecb9775c49dd2fa59975cc5b7a641317f2778e8aa SHA512 fde99fe3ab53bbc9f82f697c9ba6caa34600cf319f681c891fa9f22ab9052adc57e2f1458a4d858500822a16e3c4fa779aaa7e0c5e962454c8d9b8e3245fe1a9
diff --git a/dev-util/qstlink2/metadata.xml b/dev-util/qstlink2/metadata.xml
index caa2d5863828..8f63ee935078 100644
--- a/dev-util/qstlink2/metadata.xml
+++ b/dev-util/qstlink2/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>no111u3@gmail.com</email>
 		<name>Boris Vingradov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index 3f7b939cc208..e346b303e994 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -3,4 +3,4 @@ DIST radare2-5.1.1.tar.gz 7920840 BLAKE2B c6109453d3da6a08f8169bfdc610614f2aee2d
 EBUILD radare2-4.5.1-r1.ebuild 1700 BLAKE2B 71ba7c3ec35e8555ae9125e89c9b2b2b97bc6206d591b54ccb79151c195854cfc97b36725ee521cdd431d80214537dbd9c5b04cd418c7da7f222d1f11c744cda SHA512 2658993539d9e2631b83a6e6a52a1d363598f50656e254e21434c76b14e31b79da7c43388e72f77cd7010462982789251da93c02120f969c314dc4bb880b1705
 EBUILD radare2-5.1.1.ebuild 1700 BLAKE2B d66644f48b043f437e1161b57bd40f97d5be9bdc29a6df60fc631ec781461f1e7ba67aefe2c4100e6641beb947d06c79dcdf586c4613d88fb6c4d987b7b35353 SHA512 9084fb753207d024beaca63143781b7f9dc73043845118a2eb86e6230bd5394964c8638bb657fb463ea3fc01ed28270cb325d1bccda49c29a3164a73c908ba7d
 EBUILD radare2-9999.ebuild 1700 BLAKE2B 71ba7c3ec35e8555ae9125e89c9b2b2b97bc6206d591b54ccb79151c195854cfc97b36725ee521cdd431d80214537dbd9c5b04cd418c7da7f222d1f11c744cda SHA512 2658993539d9e2631b83a6e6a52a1d363598f50656e254e21434c76b14e31b79da7c43388e72f77cd7010462982789251da93c02120f969c314dc4bb880b1705
-MISC metadata.xml 361 BLAKE2B f92dfa8905623cd3a34f0b61766ae071d09801460b8b2a13bf4c3bb0a4715446b61b79309101b032511851f9d7a15973bca97ce9d1ed667266e2d6a3485933a2 SHA512 fb01d7b5abd1966cf270227640d1e4197a09930afb6f03e18bf4f79ba74e73fd86782b99efbb710b697315c25b63e575ec6120fb1cedaa19d4562831f41f81a4
+MISC metadata.xml 375 BLAKE2B 16f6bc4a1322225cd5188b2555418ba9e64e4cd2b2afc98226a9f4bbfed59f5da1d4495fc154f6ac254e9e5f48d8a9669176391084c6f62d0f04fbb02676a726 SHA512 225a2e358254837ede6e6bba6298fdc9cf5d8fc9dddb7201b094424f62d3ba7fd54b57cc9dc6c1828163f3df50b0bdceb51de30271f4b6e8963b190893582124
diff --git a/dev-util/radare2/metadata.xml b/dev-util/radare2/metadata.xml
index 45f16b33e569..4f934568ee58 100644
--- a/dev-util/radare2/metadata.xml
+++ b/dev-util/radare2/metadata.xml
@@ -5,7 +5,7 @@
 		<email>slyfox@gentoo.org</email>
 		<name>Sergei Trofimovich</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>davidroman96@gmail.com</email>
 		<name>David Roman</name>
 	</maintainer>
diff --git a/dev-util/rebar-bin/Manifest b/dev-util/rebar-bin/Manifest
index 9b518ad0488b..1152ede85369 100644
--- a/dev-util/rebar-bin/Manifest
+++ b/dev-util/rebar-bin/Manifest
@@ -1,5 +1,3 @@
-DIST rebar-bin-3.13.2 839684 BLAKE2B f7aab86b015549bb13a7fe2b3b0c64fc6b8383f46adef2fd50a080983a411f936d1c416be60eac70a2ea72439831c9a5e0e85381168ca973d6fcfbfa198e0987 SHA512 33cb7b083cd0e90159e06d6b21c1e8047cc5a2d49c469ae15449fefb8576427f2088977a294c677548f0543eb06cb25ad4c165e8df4b373e3562a7adc6125a94
-DIST rebar-bin-3.6.2 694889 BLAKE2B 3a8f5562a0c984caf5d7b3ba1063a90bf110a60cea316eaf88f5199b890e186f85193dc0302b36dc31051d3552912c8d1582f563f989df97ee28364a3f47512a SHA512 8fb5c7737d70fc7a706b1e124ab660550e8637da9258338016ab2e260f1c6d662548ef723705cd18210050d052e79945578623d9e9892e08dbfdb9cb04fd89fb
-EBUILD rebar-bin-3.13.2.ebuild 601 BLAKE2B 61e55196804a2eb904108d36ce183fcaff72eb0cf67006256015df7e2ca5bb2972bb5188fc50526679fcb5312caba1c58833388d201bcd4d8ac0ff4648d49ffe SHA512 60cbeb39494490552b18114d11c3db68d4e82c01986b4303522ec3e481f5dfaa6fe6e2e690ec6fe8a8613b31a7114466a625853c1bb38ee6cada505c311d1d1c
-EBUILD rebar-bin-3.6.2.ebuild 601 BLAKE2B 61e55196804a2eb904108d36ce183fcaff72eb0cf67006256015df7e2ca5bb2972bb5188fc50526679fcb5312caba1c58833388d201bcd4d8ac0ff4648d49ffe SHA512 60cbeb39494490552b18114d11c3db68d4e82c01986b4303522ec3e481f5dfaa6fe6e2e690ec6fe8a8613b31a7114466a625853c1bb38ee6cada505c311d1d1c
-MISC metadata.xml 939 BLAKE2B 3d451a472d9986f1aee67c4ede6ddc28d56cac865e0fd0a33f957f3007126d47d7cb3bf87916abca0be68138c167b138d884b38da65ca26d4dab79e42b839c58 SHA512 6e6e0a14df5031fee427dc518e0b69cafca6b8dcc429fa8cbcecacf78a1a56796c9cc6a545a6e9506a752e749c06a4ef7cf4cdb889ef2c6ca53bcf0f68fa363b
+DIST rebar-bin-3.14.4 943940 BLAKE2B b9196c44407783f5cdeec6d56acad20837b2f9c550e5dd1cc16d7190a5dd9897cf4044720175db216f154beed093fc81b4a3c26702e7f4675473924dc7508530 SHA512 35a8ca34a26c7fe0b7edc22ca0589b3813827ee6d59f49e7b2669186fc6183d4efd33c258a4659f14421bbe2b2d7c7c464ab7fd36f87297faa3c6f812945eb2d
+EBUILD rebar-bin-3.14.4.ebuild 601 BLAKE2B 6afd6e93bf2af1241125dc220b926b02e26858ea889cb08329e0724e342f85bb0eedb72178cc3cad97ab421fd7bbac1fd1e2f08e9cee8e4a8ae78b8f76aa8a58 SHA512 b68fc00c68544014bc89d00456eb03fc6e134e053b870d4b3ea6cd2d5e608a918fc3259850ddf099d8d55a5751c5c01aad7546c485063db758c48cae36c55fbd
+MISC metadata.xml 1186 BLAKE2B 2ab14359cd530e009f7e793334b93587adf02cf7a43ecc51cb710fe10bb59b5ccc82ccba8323b7b28f4872871048cce8d7acd468adb2d9d62ee426ed268c08da SHA512 7da7c4e15611f93e3692fa462e024ebb0f9b447a93c518ade6bb151a548a65437a285ae9bea4334ee84790ed75fcaaa2e57872f0ae117dbec66bd9f2d6da9031
diff --git a/dev-util/rebar-bin/metadata.xml b/dev-util/rebar-bin/metadata.xml
index 4c134f3392dc..504a42e86ef7 100644
--- a/dev-util/rebar-bin/metadata.xml
+++ b/dev-util/rebar-bin/metadata.xml
@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<stabilize-allarches/>
+	<maintainer type="person" proxied="yes">
+		<email>matt@offtopica.uk</email>
+		<name>Matt Smith</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		Rebar3 is an Erlang tool that makes it easy to create, develop, and
 		release Erlang libraries, applications, and systems in a repeatable
diff --git a/dev-util/rebar-bin/rebar-bin-3.13.2.ebuild b/dev-util/rebar-bin/rebar-bin-3.14.4.ebuild
index 4f7f563c355f..40d27f46700a 100644
--- a/dev-util/rebar-bin/rebar-bin-3.13.2.ebuild
+++ b/dev-util/rebar-bin/rebar-bin-3.14.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-util/rebar-bin/rebar-bin-3.6.2.ebuild b/dev-util/rebar-bin/rebar-bin-3.6.2.ebuild
deleted file mode 100644
index 4f7f563c355f..000000000000
--- a/dev-util/rebar-bin/rebar-bin-3.6.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=${P#-bin}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A sophisticated build-tool for Erlang projects that follows OTP principles"
-HOMEPAGE="https://github.com/erlang/rebar3"
-
-SRC_URI="https://github.com/erlang/rebar3/releases/download/${PV}/rebar3 -> ${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-lang/erlang"
-DEPEND=""
-
-S="${WORKDIR}"
-
-QA_PREBUILT="/usr/bin/rebar3"
-
-src_unpack() {
-	cp -v "${DISTDIR}/${P}" "${S}/rebar3" || die
-}
-
-src_install() {
-	dobin rebar3
-}
diff --git a/dev-util/rocm-smi/Manifest b/dev-util/rocm-smi/Manifest
index 1bdd9693d122..28998c2ce71d 100644
--- a/dev-util/rocm-smi/Manifest
+++ b/dev-util/rocm-smi/Manifest
@@ -1,4 +1,4 @@
 DIST rocm-smi-4.0.0.tar.gz 45065 BLAKE2B 90a28c162099deaa67c98701b79328c760973d88fa598f8a66116927483f25dbfd85366312c4c6e8e64fa2199dfb32fb661db04b464bd58cb39dea09a84ac51e SHA512 63c1274470df079320164d29cb4c009f52e59ffebdadfefe73cbe21238a70858fd5a86417b9f81ab2c405bc64707b02ddbf65e9d301f757f245b60152cd63dcf
 EBUILD rocm-smi-4.0.0.ebuild 769 BLAKE2B 4a153b49245275a87f45e02d67f86d94c6bf6ea7b2df93cf5a0061f3b7c5b6de33b39c4fd220fa04d8642647eac47383635b84a2c7ec91679ebb09d4e3803897 SHA512 24a62c42e875f0895effa97e6979f41e276b66f0d53198ac549dfce68c1229336ac05241507c7c2ad123874f551d6ca81de7d3496654116956d42dd470fc6039
 EBUILD rocm-smi-9999.ebuild 769 BLAKE2B 4a153b49245275a87f45e02d67f86d94c6bf6ea7b2df93cf5a0061f3b7c5b6de33b39c4fd220fa04d8642647eac47383635b84a2c7ec91679ebb09d4e3803897 SHA512 24a62c42e875f0895effa97e6979f41e276b66f0d53198ac549dfce68c1229336ac05241507c7c2ad123874f551d6ca81de7d3496654116956d42dd470fc6039
-MISC metadata.xml 630 BLAKE2B de855b379cdc08578676c7344606c42305f466d417558a6529f9c7a15679b2c4a71b7f460c0b553c99280524fe33e2951b2bd494c496ad4e4d7302c53aea7549 SHA512 6b59dc67647f0ce170b287fe9ed95d50deae676887874d02a713eef672c184e57e2da59fa917c36b3fdb0bc9cdebf7a4b0287ebffbbb698840d9e2e076b05913
+MISC metadata.xml 660 BLAKE2B 6286b201788d800e5d712d9528bf01bdff728a146f31ee31fddd05d650fba9957bd7cca8a94cf99e1ff6701b91f83e09466a147863dea76d721ab60c044eabb0 SHA512 5cad9f4870cd8d01ff0962ec818dd3dee7797d8eb260b5773d5853423f8ec4541e0d586a686d801bc345166714a263b1481db57aa389df9720e82ea77a42d04b
diff --git a/dev-util/rocm-smi/metadata.xml b/dev-util/rocm-smi/metadata.xml
index c968d7fd87f4..eb9ba00a8a38 100644
--- a/dev-util/rocm-smi/metadata.xml
+++ b/dev-util/rocm-smi/metadata.xml
@@ -5,11 +5,11 @@
         <email>candrews@gentoo.org</email>
         <name>Craig Andrews</name>
     </maintainer>
-    <maintainer type="person">
+    <maintainer type="person" proxied="yes">
         <email>gentoo@holzke.net</email>
         <name>Wilfried Holzke</name>
     </maintainer>
-    <maintainer type="project">
+    <maintainer type="project" proxied="proxy">
         <email>proxy-maint@gentoo.org</email>
         <name>Proxy Maintainers</name>
     </maintainer>
diff --git a/dev-util/roctracer/Manifest b/dev-util/roctracer/Manifest
index 1da95a25de92..ebb92736922c 100644
--- a/dev-util/roctracer/Manifest
+++ b/dev-util/roctracer/Manifest
@@ -1,4 +1,4 @@
 AUX roctracer-3.8.0-gen_ostream_ops-toPython3.patch 1496 BLAKE2B 951878e73412f08de88e073e2f790620c4a0f97d479211668cc9eb0e1d9cb3245070df8d0a81374d2a22d6c3d68591f85c99114639fc620a8c742167eb5a5044 SHA512 7a8808b33cf2c4280e70773768b4a5997aafe8916262fb4be562d42867847e6d4600a6559955c901d0841059a1b3764c6acef5b755b61f1ee116bc9b9d7a62c0
 DIST rocm-tracer-4.0.0.tar.gz 462166 BLAKE2B 1294b5639a743a9d32737c72dc0f082b5a33ee1b3365f48221ad6392cdde7637926c42ea344fa96e9fc8410ea04e9ce3f535e188a25130f4be764c4d4a59b69c SHA512 312cd6c4c98a83e28a9f8b9e6123862af2e80a0d0852acff11be65d198f277c6ea194e72f6dbaccab1dd5d4af318bef28ca546e49440f22d024a546a4e5e9e15
 EBUILD roctracer-4.0.0-r1.ebuild 1572 BLAKE2B dbdbf598991d569c3bc4788d5be653678431df80f8dd5229f5be5a0dda05146ca9417d738ecae08eb6eb10f9056e09403b5289a25badddf5b24d1a863ea778fc SHA512 b4dc5f0f4b189139df9ffcc854daedb0a59547ad99156814ae50b95c888a209d2b4b4771e39599cc3bc5afb5fa44a4010d0fc77b8e80299ecd7a275b7bbf4647
-MISC metadata.xml 588 BLAKE2B fa0a772d2f9c1b7c838f62faa1eb05c451dedd2c58f9164aea2c57a8f0e81d1f599dc0fe337143d7c2d705492b67ef0e9e890b518b07ca2c168b18723895805e SHA512 3581cd68135fccfb9504071b5d388cc101a19180ce5311b0ba404f0c0c6d0e14a3a9fea08c7e5d3e641b475ef6c616a3c6baf38470dcf2e02a2d08b29904fe07
+MISC metadata.xml 602 BLAKE2B eadd55217e056e8331434427e8ba60908453ef2e74bebc1dddce93627d6ce6c2c7d94aed9ac4803a44c68da5eb0f43ab39d7fde1566c8ad46250d05870a66d1f SHA512 0acfbe065cdcd66a61f8dd18b9112635e7ab28add42b1783428aedeb7e8f9af43568ca4e3c47ce1e16ef83ce5cf9aa3f49fc17d77d7344d1c0939f477ee548ca
diff --git a/dev-util/roctracer/metadata.xml b/dev-util/roctracer/metadata.xml
index eec4ce34fdda..0197d1d32ccc 100644
--- a/dev-util/roctracer/metadata.xml
+++ b/dev-util/roctracer/metadata.xml
@@ -9,7 +9,7 @@
     <email>candrews@gentoo.org</email>
     <name>Craig Andrews</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>gentoo@holzke.net</email>
     <name>Wilfried Holzke</name>
   </maintainer>
diff --git a/dev-util/rt-tests/Manifest b/dev-util/rt-tests/Manifest
index 50cc2a315d38..6172604e44d5 100644
--- a/dev-util/rt-tests/Manifest
+++ b/dev-util/rt-tests/Manifest
@@ -1,4 +1,4 @@
 AUX rt-tests-1.10-musl.patch 10825 BLAKE2B 64195bfd2ca512721701613a1aa881e3d17290d75bc3ec991bdc8c7092b8cc9ba055fe86a5390350158c7b3a442bcd35f07a3eeb148fe6c701a4ada7840934cf SHA512 3a5c47315e3630c38600d359af4f4b9ef572c7db7ae550fa57512b72f50bb5d762933aba3594876b66ba37d85dfecc3ffd6c0172c951f8c48d4ff37620cee674
 DIST rt-tests-1.10.tar.xz 112300 BLAKE2B b38a7357b1402de94661014e71ed9fc48d9dde6cabbe72ed4031841b57f7fb76a01dda03c7888f11d8e5e9c11cda8281dae1b437f0d1ff971d2941547f659103 SHA512 9512419b364746ad490894c7184a391f0e8d571477ad636abff8ed473151c6f2c263475ca4aa7d498e81c18e17e42ae82260693b90bce4ef9889e0eaf0b77b58
 EBUILD rt-tests-1.10.ebuild 903 BLAKE2B c989e36ce497c25a3354344c5f62638a0d1791087414884636bf0bb596451b4702773ab198e3257d0bf3961cbeb80168a53f0af3f51ee998558ae74dda5b9a7c SHA512 99d386c80e8e9a8d51f2e467361fdbce6f54c2fad1a6b4cd956c6ff9515081809265595a9603b62dc82e786eea8590a29091b4d145b1429554e337347b71574c
-MISC metadata.xml 718 BLAKE2B e09ef2dd4bd98df6e36e684105242e579fd86dfa28fd02f6b04ea78f91dc2089485a54497edb0a9a1b3c36fe5033eb1e98b626735b82d2a765150812f724bb93 SHA512 8b7eb83545e11f2f5786f0e5fbc47ce15fbb9a364ad9fcf51a7c47e8a05e70d3d0c48c2f69b5f6abd4b839514bc2575a66a43202204340137ec3d8a9f41564e1
+MISC metadata.xml 748 BLAKE2B 6603446c7aa66d6586f9e8dfa53c6338f9287c3ecf6768b67554832fa45ab38f488dc54d077947e46973c251d454320adf8788ebd8b797055604b26c878a428e SHA512 c2c39041a28bfc866667589c67f8c3a8b044489fe4b10b247ee770f41b84fa75b1d55eaf70d94e0e43d27e82774aff982c4fe72555933baaedcb208b01d17cdd
diff --git a/dev-util/rt-tests/metadata.xml b/dev-util/rt-tests/metadata.xml
index 991f708b4de2..36f895b4b9aa 100644
--- a/dev-util/rt-tests/metadata.xml
+++ b/dev-util/rt-tests/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>kurt@kmk-computers.de</email>
     <name>Kurt Kanzenbach</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-util/serialtalk/Manifest b/dev-util/serialtalk/Manifest
index 86b5f78067d0..a84488720d4e 100644
--- a/dev-util/serialtalk/Manifest
+++ b/dev-util/serialtalk/Manifest
@@ -1,4 +1,4 @@
 DIST serialtalk-1.2.tar.gz 19214 BLAKE2B c3b07e7134ac2884bf5dfb8db9433485b21b325fa025c1ea198e01e8a9037ebac5190dee2e450727adb3711615b2a2072f47cfabd84aa123c9759623f06701b5 SHA512 4634e4a044915841bf4c2ba141b479207237b1d078a3af47515adebbca3feeb8e1a8e86a673b8a77595255b017e51bbe3e3567e4914b9d603ba676525a7f1dc2
 EBUILD serialtalk-1.2-r1.ebuild 482 BLAKE2B 125e9ee0c6c01cd1ebfce153e8c0d66e3e7422b309fe9f176c149dd93794e160c7c9bbd41dfaec77ffcca8ebd3495c292522178e914f34583059100e24599bbb SHA512 0afb85341590b86216b5a2ccc9731915b0484b1da1bda7eaa83c1d75adc99fa32581d1ba967e1d5f4e32162e7281d0924e2567379ae25d279a2ca39b1594f6e7
 EBUILD serialtalk-9999.ebuild 484 BLAKE2B 3ffa80f188568337f991df8605c453fd4f5f31d1253ee003854643772ca3f6748875f0c73aef291e0318614b68e182c69f22476f95b94405089871e4ec6ed4dc SHA512 81e4590049aadbbb062c7622abba69b2d3c6b8ed38becac7ea8a57178e00e55f1cd0e2f6ae45994b516e3f4881f16028102b7d446886f71aecd34c5258840186
-MISC metadata.xml 475 BLAKE2B 4fce004e271bc77dd68ef59184469081f941d5bcc27c6710305d1a7b1376c531ab557aac8997a9ea3439a1224c8b46b32d00c02b60b536f2d90f82a02af2a13f SHA512 7b2a2b0436c52b0548534b479dcf93f68803badded46ae6147145412060286685a5e094865082b9e7614ddb6b515e8fd1b309b4879e0be8258b152a0f4867d91
+MISC metadata.xml 505 BLAKE2B 34b296b4c523bd1aa9dc7777c746f579e2ae4781487802c0582a3532db2a5aeac192097e04a65cb0a88b3a4b562efd857a948ce79c6aaa05568190b848efa5df SHA512 20805377396f0d72b48d6f023d5fbe6a76e4601a8c53314056909b34d84aca8afc2bcba5a33b708745c6324e6b8c9c1b8211c1bddd7b26d6343792a391d22451
diff --git a/dev-util/serialtalk/metadata.xml b/dev-util/serialtalk/metadata.xml
index 0dd8b67910d7..a71c3ed22f56 100644
--- a/dev-util/serialtalk/metadata.xml
+++ b/dev-util/serialtalk/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>o.freyermuth@googlemail.com</email>
     <name>Oliver Freyermuth</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-util/shards/Manifest b/dev-util/shards/Manifest
index 89325dae829a..b46b2fdef6ec 100644
--- a/dev-util/shards/Manifest
+++ b/dev-util/shards/Manifest
@@ -1,6 +1,4 @@
 DIST crystal-molinillo-0.1.0.tar.gz 23932 BLAKE2B c9bcd707a3208f5d80e6e3030523d50f86cb5977799de8ea6035d014094e3c2fff9bb189fa98f566e72e1e7ad161e47e44c89d9b264d47f109b2e891ecb469e5 SHA512 8d74d95896cd7ff510c87e2ffba6ae5f04ceeddde574930ee609851312b65d713a315cc24f9aa3fab02f9447ccb25ef2dd2e8179640b8c5cfb3d7d6b52d1ded5
-DIST shards-0.14.0.tar.gz 61662 BLAKE2B f590b8eb876cb7a5d5bbade13b3ee78db443ef24f9abefe9ba662a7018ee0e543950e84ef388bd3cf81960883a60de4eb2409616790c0caef6d06f8fa19ff288 SHA512 214f038f3ddedca8297fe6deac1d12a632b7563c5eda796771f925abe7f197c637328eb1fd1fdd51063131e51fcc73edd6be59c9b213779b6ed5090e8a715fe6
 DIST shards-0.14.1.tar.gz 61664 BLAKE2B 35f5626096266a86561f9b8613cfdb5f628e2ce247eb511dc0896c600619dcc7660b5b2b473fa0d9cec07010a5e13b8614fa63475acffe17a79cab8503cc6485 SHA512 be51e6d5459f0537681bea9b5c7ff048c33cd67fbb9effa20e6af8ac31f8ee0534f2012ed03712b5204451e7a48b932b0c44011dd39a7b47f81c85587579fcdf
-EBUILD shards-0.14.0.ebuild 1054 BLAKE2B a0df5a35bc945b59d7200469f771309a1bd046b21ba684c6b61955fe10b84e1df6eb36ba96366164591a328e6a82b0678af26e18d7f0ff4381a0d57b140cc087 SHA512 734b4b5bff2e1c8c7a2de794a14812f2d5887db86c8461c235e83996b66b721736f8517522661bd083f0b01fc6081216ca875895a45c66fa9d2705c3331c495a
 EBUILD shards-0.14.1.ebuild 1054 BLAKE2B a0df5a35bc945b59d7200469f771309a1bd046b21ba684c6b61955fe10b84e1df6eb36ba96366164591a328e6a82b0678af26e18d7f0ff4381a0d57b140cc087 SHA512 734b4b5bff2e1c8c7a2de794a14812f2d5887db86c8461c235e83996b66b721736f8517522661bd083f0b01fc6081216ca875895a45c66fa9d2705c3331c495a
-MISC metadata.xml 334 BLAKE2B 9958fd270de05b67ac94b791633635bd62770ad0ebe44630e43c26933d2059d042bc00997a8b5b8983c0e839a8adaf238359a17285e4bf8321f082077baaabbc SHA512 8010e36b15550ce7e599e30f1716b3df9d17f464f01cad097e829f3ec97624578f9bb7e24f832e14c67b4cdd5c8d25c998282e39ea0341e81baff39c1bcae658
+MISC metadata.xml 333 BLAKE2B 5aaa8a509bd10e9a7e109960503d257388133ade4ec87394855e78b8e19b7bde217cc129ac30ca61c7ec7d893216a3843b4319dc0509caea1eb60dd5beab54c6 SHA512 982fbd4d41b30594cec235354f7d8fe091f3c183ba49bfc28497fd00f94055a06ac2d72e8160fd906d79f853d864b6d00d298fc00bcc0ece5c69085912ae9a33
diff --git a/dev-util/shards/metadata.xml b/dev-util/shards/metadata.xml
index cde3551f9733..a6998f23f29d 100644
--- a/dev-util/shards/metadata.xml
+++ b/dev-util/shards/metadata.xml
@@ -9,4 +9,3 @@
 		<remote-id type="github">ysbaddaden/shards</remote-id>
 	</upstream>
 </pkgmetadata>
-
diff --git a/dev-util/shards/shards-0.14.0.ebuild b/dev-util/shards/shards-0.14.0.ebuild
deleted file mode 100644
index ed35979dd3c2..000000000000
--- a/dev-util/shards/shards-0.14.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multiprocessing toolchain-funcs
-
-CRYSTAL_MOLINILLO_PV=0.1.0
-CRYSTAL_MOLINILLO_P=crystal-molinillo-${CRYSTAL_MOLINILLO_PV}
-
-DESCRIPTION="Dependency manager for the Crystal language"
-HOMEPAGE="https://github.com/crystal-lang/shards"
-SRC_URI="
-	https://github.com/crystal-lang/shards/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/crystal-lang/crystal-molinillo/archive/v${CRYSTAL_MOLINILLO_PV}.tar.gz -> ${CRYSTAL_MOLINILLO_P}.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
-	>dev-lang/crystal-0.11.1[yaml]
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT=test # missing files in tarball
-
-src_prepare() {
-	default
-
-	# bundle crystal-molinillo to bootstrap 'shards'
-	mkdir -p lib || die
-	ln -s ../../${CRYSTAL_MOLINILLO_P} lib/molinillo || die
-
-	tc-export CC
-}
-
-src_compile() {
-	emake release=1 FLAGS="--link-flags=\"${LDFLAGS}\" --verbose --threads $(makeopts_jobs)"
-}
-
-src_install() {
-	dobin bin/${PN}
-	dodoc README.md
-}
diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest
index 2ab8b4c3d6c4..cea85c1b2587 100644
--- a/dev-util/spirv-headers/Manifest
+++ b/dev-util/spirv-headers/Manifest
@@ -1,4 +1,4 @@
 DIST spirv-headers-1.5.4.1.tar.gz 395834 BLAKE2B e4852f1d694271e9928f1f9aa460c6ba33ad2d0568bd38b24ba31e8dd0390a5542192f9c6977cd3ff4a56520af83280b779fd4e7cece6adc33a5261ef2d2398d SHA512 3578a0210b954e904ac154307a0b98a2c01410adf910e549669109b1b559781959bb5771e39945c50523548a6613d064576fcba15aa3c9125255c0443d3e61a6
 EBUILD spirv-headers-1.5.4.1.ebuild 520 BLAKE2B cdc4447f89db8ce4c51313de7f062404c0fbf6b7f30fe33bbaf2853f597c702a0ee406ef626d717e022fe55c2e19104aa67840136057b44231c1054da5ce8961 SHA512 20637f37df7f01a551d19ea6e1e324f4022b0f9a7652fbb69a39fba38748a7c2d13a698233233d666ad3ae5867914d2f2fb75b50ddeb6ba26e12c9ff159ff4bc
 EBUILD spirv-headers-9999.ebuild 600 BLAKE2B e52054009b4c2a119218fe8e7d1d7606a5355fa93c8a9e14d7e6174dc212d2c87a7d2c57106bd4d217c8fd0ab88234e5a186f700664ccbd04de8b3520afef10e SHA512 420d7be91c892302e0b052c9bf1a628d663f95051a6d38580944aafd1c43c395cb87cec8df6d2d756b8fb4a177b23671911f58c05e9e5b035a41b0b9bb399dfe
-MISC metadata.xml 431 BLAKE2B 2a03bfd5ff92d23da598ab731032790658e828cfc16c1bb1bcaed0e8e8aeba5d76ca97d5b52f5433bae5391e5f50d2d1028c49689114da7d4fc9703e40f964d6 SHA512 a770e25b42892a5062dc35739c6776d1e8baa22ee4ac9c745b0283fdb3322ae4f6549693045f9125b6a604f4f103c34e52bc069c11f47394373400c522a877c5
+MISC metadata.xml 430 BLAKE2B 6b143a506671795115d2b676cd50050b856f54cb93569d7c4892d620b742c9f2c0cceea268e9438b20854a73d7c7a157d78b353e17a595302c21c3d2c52b55cd SHA512 59dc2bf8f8df13626f1b48600ebfa1f9d14fad03efe8e0512f9db5b1928d98ccee16182ade4567f49764f69bb4004747d6746a1e966ef6d1feeb88bf0be766d4
diff --git a/dev-util/spirv-headers/metadata.xml b/dev-util/spirv-headers/metadata.xml
index e0db081821a3..898d15df3054 100644
--- a/dev-util/spirv-headers/metadata.xml
+++ b/dev-util/spirv-headers/metadata.xml
@@ -13,4 +13,3 @@
 		<remote-id type="github">KhronosGroup/SPIRV-Headers</remote-id>
 	</upstream>
 </pkgmetadata>
-
diff --git a/dev-util/spirv-llvm-translator/Manifest b/dev-util/spirv-llvm-translator/Manifest
index 75bffd965399..b3b3a19b7ff1 100644
--- a/dev-util/spirv-llvm-translator/Manifest
+++ b/dev-util/spirv-llvm-translator/Manifest
@@ -7,4 +7,4 @@ EBUILD spirv-llvm-translator-10.0.0.ebuild 1266 BLAKE2B be273ccb5a212aae3dbed3bf
 EBUILD spirv-llvm-translator-10.0.0_p20200909.ebuild 1555 BLAKE2B 12befee30e2c709c9e709195bb37d9149542ea0abcea4b2fe94a6174c5262a991ca80bc74cd32437b410b0afb43adb7a7e69cd5bb623c2599863c282c03821d0 SHA512 f5a0144d7ecdbd13e263e972774ddf0b08de7ebe4e8cbd450a6c58d1f535b725556f323018433838d4df15620fbc458461f2edab76c605344be5380605e91f2b
 EBUILD spirv-llvm-translator-11.0.0.ebuild 1555 BLAKE2B e2140c932905dfe3f53507cdfca04572fcf9c68a7c16e3f09de02426e9b1af71ff1056e5a9aca39d248653a4561ed686eecd76f7f9d2e5b3082ef7c9f3d6ea57 SHA512 0650a432c75a86437bb94ce30ba569bf5c39117e3eff5efca26e3bef9bc1047f20c3209f4b0347bd734e49c32fbec5531fa27e0b141f6e752b593a130169cb6b
 EBUILD spirv-llvm-translator-11.1.0_pre20210212.ebuild 1555 BLAKE2B 03064f9e4cc3acd127f98ff1485e73db3cbab63781e24a447b829990418e7dae05ced9b3af77ca7f73613e3b5d04fa91e14a94a06809abeed596d5b4f476bd1d SHA512 cf57d2357b1b1b5ac35326648b9dddf179f9a8a0cab92f8271fc809179e4cf4d01af7b17f53841fcd29c5b498ae00d725dde558fef6ca89cbeb6d59810036a13
-MISC metadata.xml 364 BLAKE2B 203073aa7deafccc7b4521504756fdf2f062d089e132b3175394c3bcc19b72d372260b911bf451a0b362194599b09a9d59dd018fdea8d2bb36d70c631ac1d167 SHA512 770937412a353d713452613168a44fa6697a19352c4b04f51b68fb93aa194f079120d095660b55477ce4d4bbf9eb9c587b2cc7d39d6dbf87cf0ee8181cc1442c
+MISC metadata.xml 363 BLAKE2B 8dcf09b8fc5a238a4c4c841973d13f9046440c08ea0eb5240616836e5891ad49fea580c72d83f52eba6f11781a177245a62fe2746cf0e2404c3ce843136a9588 SHA512 721f1801ac362a45601b9928280210c68cd971dedfb2a2851c97f6899ad9fad68929760e7b5692c9fbf97a66a35619ec8e9d3fda2adb051c76c0d6c77d72d0b3
diff --git a/dev-util/spirv-llvm-translator/metadata.xml b/dev-util/spirv-llvm-translator/metadata.xml
index 59d8ee72c1b1..13135f7c6360 100644
--- a/dev-util/spirv-llvm-translator/metadata.xml
+++ b/dev-util/spirv-llvm-translator/metadata.xml
@@ -11,4 +11,3 @@
 		<remote-id type="github">KhronosGroup/SPIRV-LLVM-Translator</remote-id>
 	</upstream>
 </pkgmetadata>
-
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index ea1205927b1c..f9e6dd6605a8 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,4 +1,4 @@
 DIST spirv-tools-2020.6.tar.gz 2595300 BLAKE2B bd500824866fcd0f0e05ccf3f43a168e33bc4783396d24fa6ddc58d4e46110b001cc32acde1cadcd793a997d547476f58c07475f43c3cbec5314b039926896b2 SHA512 b6d3667581101536e1f4d405e9c1c64e64a0aba174cc2f41d31e080f44d23bcfaed9642fd31f1d44a56c3df3e894526b643c572832cb96218b16d748b1ac6fe2
 EBUILD spirv-tools-2020.6.ebuild 1197 BLAKE2B 05ac606f25f2bfd1280ba5c19574628578046b033a9f01b2c939c7e2d1e55d0386ba71db94d988e8689cd8b20bd8f427ccb2f8259f17b7352e770d44aa337238 SHA512 bf598004767b75ee52149e7e2cb90e949c10284e3e0053bfd06de3ad69ad19cfee608f24b11eaf46345ed07d21239cc601f5e6984e82c738de6157a077d15a66
 EBUILD spirv-tools-9999.ebuild 1230 BLAKE2B eba1cacd83dce13d51dd9198ebbd2f0f65fe141ccaf7938bd1ca0f1f78bfa72bc8b759459060eba98ddff7b08a65b18bb1f3f0e916d933779e3130ca494deaa5 SHA512 c3d7bb950afc4ac2ccba4850ad3a843d7e691e78fd581cd8c6007d005e18eac5b67951e3485a8432d628458411180fff4e3d7299b87aa6783f89c08bda3d5412
-MISC metadata.xml 429 BLAKE2B 84129eb27ea4a745c90ed7eab09723b41b45a696375c41458c45a6163dc00cd15d208d6858ea4fd92280e3ff3bb385f340ec3684c980a97ea5fd46fdc4c24001 SHA512 13b340b0e43ba726370f3b013759adab727fc37e251ec5777d10541976843e3e575be23ee015af83dd2e98a1917f4d2511467a38afd064cef025ab4700f005a6
+MISC metadata.xml 428 BLAKE2B e5ec493782c93cb593d56b58a4f1d8b89dad2b0a11cc5eb2faf6b9cdb898e1097440ad446f0c920c69bd0eddfb9225bf8fce8d3749a03f8e6e5c94cdeea5173a SHA512 a5c873d573590a7c538f96d03bbe66b9a42eaabd5b96bafe8642a9cdde2a27bd067e5e46802ceb76e83160af0e4dd052ecc0b6e8c3b6fda3ee15a2eedf1d8b08
diff --git a/dev-util/spirv-tools/metadata.xml b/dev-util/spirv-tools/metadata.xml
index 8199d3b4700f..a1baeed0243e 100644
--- a/dev-util/spirv-tools/metadata.xml
+++ b/dev-util/spirv-tools/metadata.xml
@@ -13,4 +13,3 @@
 		<remote-id type="github">KhronosGroup/SPIRV-Tools</remote-id>
 	</upstream>
 </pkgmetadata>
-
diff --git a/dev-util/stepman/Manifest b/dev-util/stepman/Manifest
index ab3b75c425c5..08094c78d9ba 100644
--- a/dev-util/stepman/Manifest
+++ b/dev-util/stepman/Manifest
@@ -1,9 +1,3 @@
-DIST stepman-0.10.0.tar.gz 3054342 BLAKE2B 8d1d6fc8b4b85c79d535c6162a8b7c5ba15042b6a8334286cdf7ad5d498ee20abecaa1bb9ce9ffe5406891271e23a2e2554bea0b52bbf08df23a2154fdcb4da8 SHA512 1437d5c997e62a9da3beb666a15ac665e18300fad3668ee3acdae30307027bbf16c0d95f649a9a62c6203f3e09f9ec83525a23b3789f09c3707ff1937a7affbe
-DIST stepman-0.10.2.tar.gz 3087278 BLAKE2B 224bc6141678d4155474591d7094956ddd230086315ccff8ec2f91bb2d72761f46daa864086a449fb5d79dc2f7ec6f8935fa62a9a5be41a2f0aad9e3de84ca20 SHA512 6b7f1e17ff14e8a0a69056f6a8fa00043b53d818e61603fc2571a42a73e2c88edae1bb233fb734e1796c581c63f7aaf6e91c425525adbb2e1c3429cdc8dfa1e8
-DIST stepman-0.10.4.tar.gz 3173321 BLAKE2B b8dcf7eb7ff5afba1fc12b8bf8d4d594b7c86cf26346de053fd8b50010d6a8dbbf55c6e33eef9e9606c672516319b8bacd66eb8a188eb915280f92d027fea253 SHA512 9cd66e45f9a379ad785dc9a35a022d7f9fadeb9707154890d6c6ee17c716d5fcf319dee80c121f9eedc53baef71aaac3a60a6f32135c05113b97f9a5fc7dd299
 DIST stepman-0.10.5.tar.gz 3197451 BLAKE2B f6a4fd2cc0396c5635d7d45a6d88166669dab0bdfed2d53cb8c809c122ee84039660704326c996436d62797db58d46f35bb73af2415e875cf748be9137304280 SHA512 6bd325e1d50d75bf2a38b89c1faf5275914a3a7f00de0d072450253121d9931c4e32ca85300319aaec90ca108223600d3ff1195276df87b11148d4771c642471
-EBUILD stepman-0.10.0.ebuild 962 BLAKE2B d83a3ee4b3169a85604fd93d8de9ca2b54ccc2c7e47592d98236eda93dd2edc8ef080de477906e2f305d6e855402fdecf60e74b2c6dc959afff19bae1799a78d SHA512 09686058814adcb51f743b97410ea933b4122dbf2b96ace3ddad51499d50f867fb65e253c3ec9c23ed7334fb3b0d26ceb6477d9130bcf96f91d4071edb6eb1c4
-EBUILD stepman-0.10.2.ebuild 799 BLAKE2B d2e4bf1e47c302e80aa19a705c8a6297714834e721c53da69df8234e8e43e655d4be1d3777e92bcc3f457a1570531d08b989880b393ed05099e0048249e31099 SHA512 12a7cbe7df5a571055e3787e5ab337dd996967dc01267d6627ba0f15544bf8ba5e9275f1d1c8b71685ed91025865b33fa6eb0c703bc5c6078a1d04403f37b962
-EBUILD stepman-0.10.4.ebuild 1197 BLAKE2B 8067e8f30073f7c992c6d68af486b9e8bc80321157132f10777e23f5da6b3a2f05523ea25ffd1c79b072ab6ddde50c4145bc01dba47a84368c809c0e16d612a5 SHA512 3e386f354d56a561d25ca860dc0b4ed1cd1cae7afe205f28ababf1dff4da5743f18b17c2a2b508a6914711e2d34b0d6b09a445f6ee22d02e71e29c3cdb220367
 EBUILD stepman-0.10.5.ebuild 1194 BLAKE2B 956cb529f7277a81773462a8a6dff4e4d109fec668e280392c44286fde9c9fbdb45c4ff2f9009cdd6684b0149387c198e62b9137165f99e120d37175adc1c72f SHA512 0c8b35f6e3d951d04cee097db6ecdc538f103ed84b24fee524829ffa5fe4ccb9fe62d44ba3347e95e190bdc8450f1684b8ed1ddfdb24ed715962f24e7aa3823d
-MISC metadata.xml 942 BLAKE2B 29a5ac9fabe873c653e59f0afb8e19e23259d5e3116769c6c0371de83b08b89b09ad221e8116f06eca5f49659e25e80fce02f6085a5f16e71cabb6aa4bdea176 SHA512 58bef9578f6df469253ba9d10a2e5e374d1462c9e90b9e1870fa5d812ff5d4d34a834a6afaa4743b7a106116d8f85d722c412e6f2cc03cb27b7e1fa3c6459d1d
+MISC metadata.xml 972 BLAKE2B 75758b4ba1e9ca7d52a2165141b9f3c3be156598e5855e255f2030dda2178ac7aefcd7100460461bc8bf7c4cb3999db14bb21fadfbc29de1a5fb46f26c07867f SHA512 c7299e83b81bfc2859bb8aa5ebc1e7bb107d448798000b9d531509266984f4e09e6bcf3ae61bb24ae32600d2099d774e1157e6d7199bc771635462704a2197d3
diff --git a/dev-util/stepman/metadata.xml b/dev-util/stepman/metadata.xml
index 3e39f8636d3c..6f594b598601 100644
--- a/dev-util/stepman/metadata.xml
+++ b/dev-util/stepman/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>karol.wrotniak@droidsonroids.pl</email>
 		<name>Karol Wrótniak</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-util/stepman/stepman-0.10.0.ebuild b/dev-util/stepman/stepman-0.10.0.ebuild
deleted file mode 100644
index 4b0b891bc494..000000000000
--- a/dev-util/stepman/stepman-0.10.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-build
-
-EGO_ON="github.com/bitrise-io"
-EGO_PN="${EGO_ON}/${PN}"
-
-DESCRIPTION="Step collection manager for Bitrise CLI."
-HOMEPAGE="https://www.bitrise.io/cli"
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-S="${WORKDIR}/src/${EGO_ON}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${WORKDIR}/src/${EGO_ON}" || die "Couldn't create project dir in GOPATH"
-	mv "${WORKDIR}/${P}" "${WORKDIR}/src/${EGO_ON}/stepman" || die "Couldn't move sources to GOPATH"
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}" go build -v -o bin/stepman || die "Couldn't compile stepman"
-}
-
-src_test() {
-	export INTEGRATION_TEST_BINARY_PATH="${S}/bin/stepman"
-	GOPATH="${WORKDIR}" go test -v ./_tests/integration/... || die "Integration tests failed"
-}
-
-src_install() {
-	dobin bin/stepman
-	dodoc README.md
-}
diff --git a/dev-util/stepman/stepman-0.10.2.ebuild b/dev-util/stepman/stepman-0.10.2.ebuild
deleted file mode 100644
index c91e20ce2292..000000000000
--- a/dev-util/stepman/stepman-0.10.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-build
-
-EGO_ON="github.com/bitrise-io"
-EGO_PN="${EGO_ON}/${PN}"
-
-DESCRIPTION="Step collection manager for Bitrise CLI."
-HOMEPAGE="https://www.bitrise.io/cli"
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-S="${WORKDIR}/src/${EGO_ON}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${WORKDIR}/src/${EGO_ON}" || die "Couldn't create project dir in GOPATH"
-	mv "${WORKDIR}/${P}" "${WORKDIR}/src/${EGO_ON}/stepman" || die "Couldn't move sources to GOPATH"
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}" go build -v -o bin/stepman || die "Couldn't compile stepman"
-}
-
-src_install() {
-	dobin bin/stepman
-	dodoc README.md
-}
diff --git a/dev-util/stepman/stepman-0.10.4.ebuild b/dev-util/stepman/stepman-0.10.4.ebuild
deleted file mode 100644
index f95a6153f9c0..000000000000
--- a/dev-util/stepman/stepman-0.10.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-build
-
-EGO_ON="github.com/bitrise-io"
-EGO_PN="${EGO_ON}/${PN}"
-
-DESCRIPTION="Step collection manager for Bitrise CLI"
-HOMEPAGE="https://www.bitrise.io/cli"
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-S="${WORKDIR}/src/${EGO_ON}/${PN}"
-
-src_unpack() {
-	default
-	mkdir -p "${WORKDIR}/src/${EGO_ON}" || die "Couldn't create project dir in GOPATH"
-	mv "${WORKDIR}/${P}" "${WORKDIR}/src/${EGO_ON}/stepman" || die "Couldn't move sources to GOPATH"
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}" go build -v -o bin/stepman || die "Couldn't compile stepman"
-}
-
-src_test() {
-	pushd _tests/integration > /dev/null || die "Couldn't find integration tests directory"
-	rm update_test.go step_info_test.go setup_test.go || die "Couldn't remove network-dependent tests"
-	popd || die "Couldn't return to ${S} directory"
-	local -x INTEGRATION_TEST_BINARY_PATH="${S}/bin/stepman"
-	GOPATH="${WORKDIR}" go test -v ./_tests/integration/... || die "Integration tests failed"
-}
-
-src_install() {
-	dobin bin/stepman
-	dodoc README.md
-}
diff --git a/dev-util/stripe-mock/Manifest b/dev-util/stripe-mock/Manifest
index 46efd9e7f1ef..5fd5f11a6357 100644
--- a/dev-util/stripe-mock/Manifest
+++ b/dev-util/stripe-mock/Manifest
@@ -2,8 +2,8 @@ DIST stripe-mock-0.102.0.tar.gz 555895 BLAKE2B 60062d92b58b0e65727675a2744ca15da
 DIST stripe-mock-0.103.0.tar.gz 567107 BLAKE2B 76dbc6bbb1d62ea68c30291fea894e563a426790c8928e7bc5a444eca8d48c8bcc23067459c1a249449af305a6809c70168918543087a1ef5e38cf7609421a7c SHA512 65ec61ccf94d1931389c4a16288dfac4d820a6fdf641cad1028347dfcb298aa4370d97d2dd4e468e17b8a702ce6b7611213b0707f1d5e37cd20aec46772e6a9c
 DIST stripe-mock-0.79.0.tar.gz 462829 BLAKE2B 7cb1365f3fabe4ad286b7f80bc4e1ef25764c86b090aacd543239ab35626271638fe5bde7131431cf233115451ba1c9e9df53a69ff9948c5e04965a67ed5038a SHA512 46f6900eb2d8ee37b1f8dc9a0603ee6182cc70889f92c2d9a8a976670211b2f37feb33d53d51364a05a91c130c4358cff3e0b15dfe61a7619132ef568266c27e
 DIST stripe-mock-0.88.0.tar.gz 504374 BLAKE2B 2414de64ebfd1ed4842fc85e77e940da4b08cc647abebc25259d402db23bf010ab69c9660ad80ad3428f27df4036e706051fa44dcee0d2c0f6e1f089994d31d5 SHA512 eb33249ff0c135d1e74bdfaf5d7ad04b1d7ff05d1472e30d55eb819f06795ec7a05ffe73e90b0dfdd3ebcb54f0fdfa6c0ecd1158ca22abc044e1c2e212984517
-EBUILD stripe-mock-0.102.0.ebuild 584 BLAKE2B 455d8b5f05654245c33ccefbd33002c6da3f15fe0a27b9129461e8470b00c1620e5b498624841059856e5c356c6dcf253ff24e95daa0349f6e2b0b4943815be5 SHA512 21a2f75e84a60c4dea866be981f19fbae71bfe78bb0bc9b80136a3573c443b71450badd2cd2b4e14f0d841da40e57bf748b231f2b61b0eb897f1fede45eb59ac
+EBUILD stripe-mock-0.102.0.ebuild 583 BLAKE2B c59cdf187cc4ae59b76404a32fac3d835c797e12f7622f5c40788eb3b877750e3abe7d71feef513c889aa36a1162f8d222cd528098cbccd84eeaca44425ddca0 SHA512 484f105ae4fdfbcde6e8687b6ae9b69621ea08afd4f5efa23c03d4f6cf5fa9ca68c8e8cafa5c4ebafff983be0a2ea7d1016f7ac66c8cc3ccbe60cfd28352e353
 EBUILD stripe-mock-0.103.0.ebuild 584 BLAKE2B 455d8b5f05654245c33ccefbd33002c6da3f15fe0a27b9129461e8470b00c1620e5b498624841059856e5c356c6dcf253ff24e95daa0349f6e2b0b4943815be5 SHA512 21a2f75e84a60c4dea866be981f19fbae71bfe78bb0bc9b80136a3573c443b71450badd2cd2b4e14f0d841da40e57bf748b231f2b61b0eb897f1fede45eb59ac
 EBUILD stripe-mock-0.79.0.ebuild 584 BLAKE2B 9052a35ea96059edaed6c0893930a2708f76cc8fd14526372468912a20fc38e1a3b93ae7ace2811783ff5c20fed4ed852e7ae01b0d5c5809f7554dc6a13673af SHA512 6d905c6ac495e5b644761cb5a19714360a4dba45f9c673481f5f5afd262cf96ef7c43dc505cecd4146fe14f99d34ff7cbbcbb8d31cdb81e38521fce04b353198
 EBUILD stripe-mock-0.88.0.ebuild 582 BLAKE2B dd8676dfab0891cc40b5922fe235ba58960c644a09734cbe60a1943d14b54395e7079a87b817b375bcf45536ad3314eb9751917d7a0aef68adafb6072a40b4a2 SHA512 a640eefff3cace87e30b6fc09ad3686139f8ce9048afa3115df14845a64602ccc76681bb34e345c1d4703820209d0c57961dddfd4aa1c6b435e06151934e4ccd
-MISC metadata.xml 725 BLAKE2B 5581ffca5d7ed165d7f01d0d158e4ef45454d7a917d1996e62b9e1fab9593d6ee63c6042149f3581944747f896292dd9f65d462b019768658f5adf24146093a7 SHA512 808daf9ba987547a9d639c70bf6d78d4d1769481a9023a54005a79106a5cc7bbf90c9edec7551f3284fa055a2ffd368335405d558fd1bc5578da3bd667956ba3
+MISC metadata.xml 755 BLAKE2B 27b837f64385f50cf83e0bd5753560f5b6878d8ae5984c6e99deaf02138791e397e5755db1033ab3b4863f75edc90caaa91309247789ca54d01362178670d862 SHA512 bac1e56b0fb021b43712b31e98042f8a30cdc3f365ce928da35491a8261f04469c666afe8e21b82c9b3095b374ffc3312a8d909e4e24a87638b0de8551ff5d10
diff --git a/dev-util/stripe-mock/metadata.xml b/dev-util/stripe-mock/metadata.xml
index 2f64d0144cbb..66770fb3fc7f 100644
--- a/dev-util/stripe-mock/metadata.xml
+++ b/dev-util/stripe-mock/metadata.xml
@@ -5,11 +5,11 @@
      <email>cedk@gentoo.org</email>
      <name>Cédric Krier</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>m.seifert@digitalernachschub.de</email>
     <name>Michael Seifert</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-util/stripe-mock/stripe-mock-0.102.0.ebuild b/dev-util/stripe-mock/stripe-mock-0.102.0.ebuild
index 05a7220e34b0..0d362eb78a2b 100644
--- a/dev-util/stripe-mock/stripe-mock-0.102.0.ebuild
+++ b/dev-util/stripe-mock/stripe-mock-0.102.0.ebuild
@@ -10,7 +10,7 @@ inherit golang-build golang-vcs-snapshot
 DESCRIPTION="Mock HTTP server that responds like the real Stripe API"
 HOMEPAGE="https://github.com/stripe/stripe-mock"
 SRC_URI="https://github.com/stripe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 LICENSE="MIT ISC BSD-2"
 SLOT="0"
diff --git a/dev-util/systemtap/Manifest b/dev-util/systemtap/Manifest
index c330720e2675..8ddd8cede681 100644
--- a/dev-util/systemtap/Manifest
+++ b/dev-util/systemtap/Manifest
@@ -4,7 +4,7 @@ AUX systemtap-4.0-configure.ac-non-posix-test.patch 10038 BLAKE2B ce0bf23977dd5e
 AUX systemtap-4.4-configure.ac-non-posix-test.patch 9435 BLAKE2B df56bc874cc14afce539ad5f52f040abfb44d96401c809aa10ca925a20a9ee158aa809c79561e27dbf33aedcb8d383bc567d45b706e6e0aea101c314cd880b7e SHA512 22dc30701e1bfea872e0fdb1937ac0f43fbe72510c8322579e98b5ad75f37b6c1289718ad1786879d16890bd27ec4f051a27261d33421a7e9f0dc79ae0fba9f1
 DIST systemtap-4.0.tar.gz 5282312 BLAKE2B 9eac1cf9c9f13255ac12642c910b5591b0f5380b2a6337dedcb3d20785c0416900b9bee05f239632f7c548812be35ae90b24f524ab6f5c0c6ef474cf5de834a1 SHA512 66b5ba1902ed974101429dce9fee849273d3dc64e862c057177d158c5f284cc93299819ee8ee49d4bd3b7ff47a3512b1c68b74cad374147ce67fa406c7518c79
 DIST systemtap-4.4.tar.gz 5532282 BLAKE2B bcb2f744ad09821ce63d78b3e86eb489013aed247952c72d3dbc4cc6fc1a2b85f948b71c622487876f43b615c147eb1624b2c146e9b4176e3c91e2b7cbef9ea0 SHA512 8fb1fe5071ec99ce3c6bcf82afdc98a3e1abc0ea937f3019b225c3a1879ada30080740b1918a84c6db06fe1893e6d1e7dc84be26c7e597d7feda1efe11354e76
-EBUILD systemtap-4.0-r1.ebuild 2829 BLAKE2B 08d2fd325a6b6111cea070e6af3a99f4928e023bfb90cb6d550bc083cc08c3973f845811ffb6196944fbb5db7d298e35bd59b2c1c29e759d3ade0defec73cf41 SHA512 ebc821c97c9a4f61f38fc289b315e84b40b1ea46b4920ba347eb43952149fd8523003cc08854beabfdbacdad08d551d4281336d5291f0794198ee61d95f219fd
-EBUILD systemtap-4.0-r2.ebuild 2899 BLAKE2B 5d0346dc179f67a1a40c18f08938830d086c6c4741329afe31cada2e9e7b06e0f21e5e4334a77f1b635a0e05606e63624676591ab47e0bb7756fdf24dd25d7c4 SHA512 12ef285fbdf9a5ab4f6fdf5a96f5c59dae3437dc52ca123e1e18bc55262de074b4d1b00fa326c32ab2be34c0a036524e2f3df0d4d422b105fd59f2507a57faef
-EBUILD systemtap-4.4.ebuild 2865 BLAKE2B ab50a603e442c631c493b4a1121a85c641c08f5d6cfd76b68ba53f8d009e6c9a2a830299d32cd4a8a4a49f21b8462183aa6da0b59a9ffc60f7129d114f781dd9 SHA512 c72407408f48eca5634f0ad9c533eeba3a0cdc7a7afd276852ab311633642a973112daf5b9e95526419183c4da82cf1c8e16008ef6af6c2e3a85e9366560f9e5
+EBUILD systemtap-4.0-r1.ebuild 2856 BLAKE2B d49b03f84101093365efe67a0b477a829e05403dd94beae937059c52e4088f890ef577314e2a7f5f8174933e0d84cdaa01ca5a0ed01199af995eac1acc441067 SHA512 08a10f72bef1df25fcc735728680e4d493e5bafcced16adebc3fefe5013de31d33956349284b338ef7a318d81c124e2903b2e13d086bd8d0edc6bdb426d03420
+EBUILD systemtap-4.0-r2.ebuild 2926 BLAKE2B 7de3ae27e0e904f805f80138bcf67a366094a091de2bc4e432cf8fce6a091853fc9e972478b0f04babd6ab51f413e9fe96b41ea98fa9d17061fb71db1af4ec83 SHA512 959dba0ef465ed1ab64274c892dbfc6ed50abc3804cae620731c9f5907c35e1d8be269d557575681a069fdb4067f38e537d565d3dee8144010bdbe30c0c8522c
+EBUILD systemtap-4.4.ebuild 2892 BLAKE2B 725a690e263da0a13c04291e201f3771d2866da3e31e0832f8aba3b0ae5bcfc3802639e6888ec0a0ca2b38f9c5c63fc867d1444067072741098d80ff027c96ec SHA512 027197b55699f6c69f3ec482249d980ff33acf54832fb5e971084f46a683db8dac0b1d28d94ce6cd927abf41155bbae26bebbb0ee92a89ab059ded2d6548bd95
 MISC metadata.xml 302 BLAKE2B 1118f1c8c5cb76bb140947afd86eefece0251d75fd99bf58decced339e68a700f140b30d7d7f77f8c89fdcd468e79906574ced8c9339498078e6cc9edab83922 SHA512 4db366a3c2ff95cd2cfe271cf4a50fa2d5189985620d3b9e51708f2811609e53eec2656589ff754731d018bf1c184a1bab662be8683c714a8621e9296eacd9a9
diff --git a/dev-util/systemtap/systemtap-4.0-r1.ebuild b/dev-util/systemtap/systemtap-4.0-r1.ebuild
index 8756646eff70..de5dabdc1044 100644
--- a/dev-util/systemtap/systemtap-4.0-r1.ebuild
+++ b/dev-util/systemtap/systemtap-4.0-r1.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="libvirt selinux sqlite +ssl test zeroconf"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-libs/elfutils-0.142
 	dev-libs/json-c:=
diff --git a/dev-util/systemtap/systemtap-4.0-r2.ebuild b/dev-util/systemtap/systemtap-4.0-r2.ebuild
index dcf1f8df499f..cb49b3599c90 100644
--- a/dev-util/systemtap/systemtap-4.0-r2.ebuild
+++ b/dev-util/systemtap/systemtap-4.0-r2.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="libvirt selinux sqlite +ssl test zeroconf"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-libs/elfutils-0.142
 	dev-libs/json-c:=
diff --git a/dev-util/systemtap/systemtap-4.4.ebuild b/dev-util/systemtap/systemtap-4.4.ebuild
index 1e32ea4a68ac..5a3e3efea14c 100644
--- a/dev-util/systemtap/systemtap-4.4.ebuild
+++ b/dev-util/systemtap/systemtap-4.4.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="libvirt selinux sqlite +ssl test zeroconf"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-libs/elfutils-0.142
 	dev-libs/json-c:=
diff --git a/dev-util/uftrace/Manifest b/dev-util/uftrace/Manifest
index 450da37a9fd7..4feaabc1e235 100644
--- a/dev-util/uftrace/Manifest
+++ b/dev-util/uftrace/Manifest
@@ -1,4 +1,4 @@
 DIST uftrace-0.9.4.tar.gz 1068091 BLAKE2B cbf9ead0e2c0e8d59be379e65617cfa310fd4134cfbbc8091c489913f108e8a7a0b81e33d46032f3717a5bb8127cbeeeb246e3be0c37da03981dac4bacc07119 SHA512 f73ad4461051b9c61668161e077897d118ac556d234ff204e32bf14ecdc2c0df148da30ea5d5054641e79ea20b29261d6f637908f5047f5669207ef244865358
 EBUILD uftrace-0.9.4-r100.ebuild 1137 BLAKE2B 78c1fe9945a099d538963d188ebf91f83018620659567b713a0c0b169ed7aa9c5687ae126d534b0d060f95c4f8897413baebff50acceea6b31f45060136bf815 SHA512 2a111b38989d73bfb15af823ad98417946200a71fa6851e22828d7fbc5ce4ff30157bb4908c41f993290e9b9e4a7558816bdc02eba45bb6737cc53e9a1ee7a7b
 EBUILD uftrace-0.9.4.ebuild 906 BLAKE2B 1dac005c9729ba654a2fb47bb9f62ea3133980bc13b15082a0f456ac11916e405eb68a0b82f2fb4aee8fb08195cc02036dd3a642be920e1d7815b26faef9c709 SHA512 6d2efb66d03e8f0aa828167d7803da3582e43e87c885ce5ed70d59b150d41b3db2206dc50358603f9ab98b418e6ef299d4d6b3161760ae24264f57723ed9ce31
-MISC metadata.xml 438 BLAKE2B 573900b49b5a09077887b8703137b6e33cfe992340299f397601fee032b474fc1127ff96f07a8db6da9bb9592e0ef1f45c996dff40fefeb63a15a233de2fee98 SHA512 b272ef1b4664a53c3d00445285a550f8bf9abcb100417febe7e177b803cc2414b32bf5c6900113dcccea0449a5e23c14543b349c3e6452f5ca1a37d6639214d3
+MISC metadata.xml 438 BLAKE2B a270f82a149c32758b8d0054b5f1204add5dabd8812ce01e6c9ed9e0a71aa38bfef9def386f8a2c6f67cae59c63e58fbff8b3f00a3cea5a334ee41434f3c6fa1 SHA512 774d0ec195987c0b98467e03a18c1eb4e2880d5c5d63e3864b5aee84981e0539197d74530a64068399dac7c0eb28e7570a0b8242e0ecf049f79d995eab884a8d
diff --git a/dev-util/uftrace/metadata.xml b/dev-util/uftrace/metadata.xml
index ae2d867c1726..3ba421f6e224 100644
--- a/dev-util/uftrace/metadata.xml
+++ b/dev-util/uftrace/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-util/uncrustify/Manifest b/dev-util/uncrustify/Manifest
index efc23cb0b1b3..b44f1f8447eb 100644
--- a/dev-util/uncrustify/Manifest
+++ b/dev-util/uncrustify/Manifest
@@ -3,4 +3,4 @@ DIST uncrustify-0.72.0.tar.gz 1530850 BLAKE2B 59b3ff4b47fee1f2a303e237d46b5fb656
 EBUILD uncrustify-0.71.0.ebuild 687 BLAKE2B ece80f3cab177715aadd0bc203e6c0b816b7c2e05f18fa0594e35e0306e8c8ce0728613dbd62b2ebe2a92533c40790c1f17bd558fb8a9e3a0d3390bf3af6cb57 SHA512 071f8557bedcff76bf46ce3910926655135bfb889401bc39e23b404c840579e0340de24576a9dae7b78faf455ee2db8ac707df59029783c7da998732314ce1dc
 EBUILD uncrustify-0.72.0.ebuild 681 BLAKE2B 3c5527c916bbfed4fc622a4a3deb22c6ce7af796cb0361de8bbbe8ae0fc762676cb431f72ecc20e1af629ee1ce8a8200a1b746b46e4f79f58f37d18b36a9483b SHA512 f7431a6210854a32bbe36d6c9649750c26b88806e83d20746d195cb4f632a2b8a6de91d1566d36eb53739f46a9d90bf72174c3c8ac7c1ed7bbecf99239f4b192
 EBUILD uncrustify-9999.ebuild 695 BLAKE2B 02437173f4bfa7935c22fdc51f53e0cafe4dad47e6ef453697effc254b048a63abe8e6cbea8f741b7781a5c902bd52fb1b4ceb0a9f8e8d192de96d251d211ade SHA512 389d3547d295c03acaf3cbbfa698dd62ad2c33f1227e2d421fa97be8da29bff05a3d3644714fc5f1c3dd5cbacf2bb57a7251a6b1b9811ac16ab3bb09f0b7a1df
-MISC metadata.xml 499 BLAKE2B 9418af314e83877ee50d76d87b3fbe9223ed7ef21d53ab85d5a916a46bb631296ca2babb8b470049003e1b6889185df52bdb62c9fd1f2f371d6902885dc4f399 SHA512 e8a379440acebe626dc28ecd4de5e76e1a684e67441bcce6720eb4ea834102c4d020d91a5950ffd24fc297ccd5ea8386850b0bfe0771352539936345d8b1f3cb
+MISC metadata.xml 499 BLAKE2B 835eb2ba7d168187f396d660d70a5eff9d8ee5c6cf90313eb8d5fe08bba7246eaaefbef28e88655553a4af18d49efc379bfd5ebeb4f15b9fc0e833a272dc24bc SHA512 2fa746b88bd158f9d7cec94c1e6bccf2d0bf3c6154c9a8fcb49faaeab7a39644b2994f0e4f979b3230f98955e82537f6761c93c46ca013b1edee8a6b13bda840
diff --git a/dev-util/uncrustify/metadata.xml b/dev-util/uncrustify/metadata.xml
index 370ea023f4f0..57b44e86cc58 100644
--- a/dev-util/uncrustify/metadata.xml
+++ b/dev-util/uncrustify/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-util/vbindiff/Manifest b/dev-util/vbindiff/Manifest
index c10caabb6600..ff6a6880ae31 100644
--- a/dev-util/vbindiff/Manifest
+++ b/dev-util/vbindiff/Manifest
@@ -1,3 +1,3 @@
 DIST vbindiff-3.0_beta5.tar.gz 134192 BLAKE2B 9a7437833fef8db4316fd2c67a781868f6aead5ae47c7abc05683545bb3990950a465b1665ff5bc2e7d298465b3b1a427d6d67b43f59bd7dfb112143c9b52d2f SHA512 e6abd5cb93beffa3bc55455dbfbc98f0effc2a6667c8b9c721792c4a274dfe6f35ef121d27506fc9c951a1decb0e69886775fcf092a5f47fda82ed75ef760a74
 EBUILD vbindiff-3.0_beta5.ebuild 399 BLAKE2B 2589d4256b28d30778a743235e78cdc2dedf5356d59b1df362befeedcb0a450caeb7886458b1203843112cd3f57b790d93e549b223fed8369bb6aff2ea061492 SHA512 a0e0961d4e7ab4bb9b9819c5af2b45423b60039559646d1e610ff75f44aa19ce3933982e0bc48b0f9d8097dc899f64f0d489593af491d5b9895c38abc3bd60df
-MISC metadata.xml 331 BLAKE2B e1827fc3619bfde5ed89a9eebb60943e22419a20e89d6ff3441f30195bb05fdafff6549cf09985e43a58712cf5846f9eec82a792dd66505cded6525c1c5235a2 SHA512 32b9763a0137fc5fb36751a38c9476a6f813ff118f4cc0a491dcae75439fb7ce40f934d6d0cffb0397ad11b85373859791622884c194ddddd3bd5bb03427001f
+MISC metadata.xml 331 BLAKE2B 62db8c95752ea477fec8b7a7bb76c5cd7c6075f8d2618c476f8da83917cd893e6878ed63bc5f8ef039d7c32fd3e1dc8cf9418a454b94adfd889d7445198de023 SHA512 99149387b18568a36c5057f0b19d1a467632ffac30cd1917688ff1d590f673ba700e16ab42d3b5b2a214f5f933b4ff0c666bbcd7d2675608ca9368f334a9904e
diff --git a/dev-util/vbindiff/metadata.xml b/dev-util/vbindiff/metadata.xml
index f842cb0feb5f..3174e2784a40 100644
--- a/dev-util/vbindiff/metadata.xml
+++ b/dev-util/vbindiff/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-util/vint/Manifest b/dev-util/vint/Manifest
index c89f0f391248..0660cb0f3dac 100644
--- a/dev-util/vint/Manifest
+++ b/dev-util/vint/Manifest
@@ -1,3 +1,3 @@
 DIST vint-0.3.21.tar.gz 96747 BLAKE2B 926b46493030dc0daa477ded3cb70f2b825b4eb8054c14a4b824b97e7df60d0141cf1bcf4c33893afd870f51308b7156fb6e5870f320f8c9449fdca8fe78774f SHA512 47e832d382952cb16bcc233eefa1f06ca74f95eb445d7f96d6804391b91a2c8a8e7b749b7f33f65aed9d3bdc1ff5e5332a62c3935969395f16a854f0f66e383b
 EBUILD vint-0.3.21.ebuild 886 BLAKE2B 50abf8d296e0470e98b46f881bd4093c54684d7d93b64d19ac03d86e4c89fbf8dab74bf7c7e87e28d90195e9688991bfcf57db39f776c9966945f94f31805cd0 SHA512 c54bd92dfbd9400728c2dffa8fffca797d5270bace822c662ec18d04030114315114aad16b5ad48b27fcfef253cca6571a47686f540e6fbda37578abe068ae20
-MISC metadata.xml 553 BLAKE2B 2fa32b5a72b9d9fd9587db124e7786d8f4a4607084016166b36f02cae5c6b7d4ed375c462ffeb770fb0799aec8a20e7509a627219cd21109d1ab2bb4575a901f SHA512 715bf84e6bb405197f1667a8e03bc14d4e05ab6393f863bbdd56a56c8e92789fdcc4ad3ef0d3e65934e4a8f759acf50d9e6f52aaeab4a3955e6d9b9edba6f891
+MISC metadata.xml 583 BLAKE2B 231be31465fd4051462c0fe55416e433dddf9bc31e736383cce4e8c1623ed0d1e0a08cab983140502779183ef363479de7b3faa959cc6e9204eb2643ab61ea13 SHA512 0e49d9d4b776de48850ef366829fcfd67a4cd34d7ff6f45430d25144f58420fc4fd0055caf587331997dedaaee461c8757e5118888068b47df87b878991adfac
diff --git a/dev-util/vint/metadata.xml b/dev-util/vint/metadata.xml
index 0daec353c951..b6565be06544 100644
--- a/dev-util/vint/metadata.xml
+++ b/dev-util/vint/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>lucianposton@pm.me</email>
 		<name>Lucian Poston</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-util/visual-regexp/Manifest b/dev-util/visual-regexp/Manifest
index 8b68f753d4a8..f12eee4a2c5d 100644
--- a/dev-util/visual-regexp/Manifest
+++ b/dev-util/visual-regexp/Manifest
@@ -11,4 +11,4 @@ DIST visual_regexp-3.1.tcl 71183 BLAKE2B df6541179cf06c49f6bb40a0bc186ad45aaf535
 DIST visualregexp-icon.png.tar 20480 BLAKE2B 589ea0480f68c442cfecc2638f87a901cc2d75237deefae49616b6626bc1073f14ff9c009c09a28c2e93b2f8c1ae3e4123a05e24aa73f2f6e0bd9fb53bfad15f SHA512 af0a5ec63d2d5fa71842ed85a83541b0f1ee72a4b37941e11f4f212874564b0255a97dfa953ea1684b056a4ab6f86ce47b6df9374628551c9cf8e775f7d12fb2
 EBUILD visual-regexp-3.0-r1.ebuild 935 BLAKE2B cb5066717a3ae6af48b7071e556e8ae1f42a8f7cdc4a8e529ae6ece3dce0db594677be95fc974e142daeab59f81d2fe66c920a3d20bd23a0f06d38bf60c4bbf8 SHA512 19f39420f473fb8a9b049c4fd377abf1ff230c9eeae397d583afb0065851660413ff2c339e9f9b82cd5c62018dc8d9435e0b596f662bc4cbb830071f1de19078
 EBUILD visual-regexp-3.1.ebuild 1237 BLAKE2B 4acfd1028cc591f2ee852a845aa43f0fe3928ff3bfcaee16b552de4794309a59b4360a73f65529b33bc80bf4891ce8c922c260831052d82b5e9d496f1081df35 SHA512 532ecc703222531147989096acbee3523aa39ce79148bb46a0c2ebcf0b5aa7cfe760fe1773dc4b0837f41f7ced5517373bef2b4d43687f92269834cc1c711dea
-MISC metadata.xml 365 BLAKE2B ea9b3d852fce83839d993c8118c21d945a2944fbbdd476cea7635b2e7361ba030d33a433fce6c6ce2bc44e0a250d2d0dbc9f6e30d1c1c692252251cfc9181971 SHA512 9556a7d272b95bfde71df2994d8ac26639f3252cd743f9caeeea8b516a70dfd031dacf42dd56df19394c03223001e09bacb094b68256641764d139b3880e9ff1
+MISC metadata.xml 395 BLAKE2B 99fff524ddfcceb143a1eb1e6436a9c8f81fa972d80d3ec5609428be2b236355b8f33bad4ac41ed320aaf9fff6c770a63aba8e54db28eb0c9a3871fd7a913876 SHA512 96785ef8ec6aae2f17b9c99f2cd239f6a695bfb349739155fedd585c8787dc8649248ffd7039620fc4c7f8cdcfedc6512e39bba1086231bf3f31fbc127a293e6
diff --git a/dev-util/visual-regexp/metadata.xml b/dev-util/visual-regexp/metadata.xml
index 61d19ccc4a52..302b0c2d20e8 100644
--- a/dev-util/visual-regexp/metadata.xml
+++ b/dev-util/visual-regexp/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>quentin@minster.io</email>
 		<name>Quentin Minster</name>
 	</maintainer>
-<maintainer type="project">
+<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-util/vtable-dumper/Manifest b/dev-util/vtable-dumper/Manifest
index 48e1512c14b8..1fb960c32a46 100644
--- a/dev-util/vtable-dumper/Manifest
+++ b/dev-util/vtable-dumper/Manifest
@@ -1,3 +1,3 @@
 DIST vtable-dumper-1.2.tar.gz 16033 BLAKE2B 5674918fa91f7dc266da2a0fe9d4bfea1fc6643fa6dba5a031add4a758b7e6d729cad0c1be72ef3f374887bda3cbdfa3e5a0e68a9ab8f502dd29c711f5a5b55c SHA512 b1e052b95af1fa557e2e2eb4faae79afd9b7a87c664c546d43ff92de0f118d6f5fa9e792671e546a5c05364af6149b066705f94c2c590dd103e0067004a7543f
 EBUILD vtable-dumper-1.2.ebuild 551 BLAKE2B f80ccdd061181b47c0aa840504a6ea1631a1b26a6784670412c7e0bd270874667b2bc368b96535dd3e04717cb853894280529f36427a4b8b89d88547e3466933 SHA512 c4d83121a25b48d69e3738b12b350a2f77334cca40670f9b5a93a2a4a3d968cebbe4b807d0d7f4383f80ba7d11b039a346baa755cfda3d41a040aecb587f4471
-MISC metadata.xml 436 BLAKE2B 7b226efbd5fed222de490c97d8eef802dca2acc22e644cd4c13ae25175ace4ecd6aaec117a0b0117aa5540159197dbf256302262b62dd8980786e9f8b7ad394e SHA512 e3070f8ddc5ad65ec16e6d8b49b1d71f48a459d5e12cee08d4a1bc12eac903918842bcd4434de4a0a2c77a37be95e3691c8ba94a2cec0f1857665f464b907e55
+MISC metadata.xml 436 BLAKE2B 3fcb763a2c7182578b001109debd64a3178b40438676f7ac326c0ee9c7a4ae48e57838dd8a1257f16bcfef0cf7a7fd47966f4cf918e5ccebbbc88acc513e12d7 SHA512 06a65fa0174b572865e320c8982c0c6f96479c38bcbca9a2daf8c7b6bc613376f0016d0de0a63e39aee860dbbd4eecbc5fbb409c261359d1543bca43a2bdf5f7
diff --git a/dev-util/vtable-dumper/metadata.xml b/dev-util/vtable-dumper/metadata.xml
index fac2ebc49305..b19bb9a8d88f 100644
--- a/dev-util/vtable-dumper/metadata.xml
+++ b/dev-util/vtable-dumper/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index 8ecfe79c6e00..a087d33e4db4 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,4 +1,4 @@
 DIST vulkan-headers-1.2.162.tar.gz 852973 BLAKE2B 3907c247f115f4dee2fc8697f157aeb30a3ef91a774132591771c0b327090abf7c0caad2082edb86c787883c167ce1ffe75c199d9b94fc642aae30526f5311cd SHA512 7b33f6ef32f1ef34d3b37ad38b077a3a2ebcef62612371afa1b6f4910815bbab8418a837c49b3872b57d2e5012c15623521121f5d62836e46d6f20773841d7b0
 EBUILD vulkan-headers-1.2.162.ebuild 611 BLAKE2B a0dc00cde81752730cd13704bd71f06943f2a523306bb250ec4043c2cbbb7fccf9a9ab4e90ca7bb6811852f9b866940a7722e623dea0d36abff1d7001d8ffe40 SHA512 e08e859280da3384fc8248b255333b8e781e4a6d57c3cf8952b37f905bc78b5ca8df25bae6d79f39ca52bf21f1e11786bd2b60d0d70cb7a6b93eb66cb49e0b7c
 EBUILD vulkan-headers-9999.ebuild 593 BLAKE2B 101dc4954cc61f0375202d2398a3bab6e99e379f9dbc3aaab01129670e0413cba3fc9d15f031a44f634ec7576f0cd6bbd52ccfdbec0de9d703f6db5a9a2eff52 SHA512 a95238b09e9d71d72588e9e90af0d99590a8d4fffb6b134cc75c5b9bfc542c40f7a438447ce06aaf4a5ea5922d9ce49763af91b49934c8f66fc5dbb1d7ea8246
-MISC metadata.xml 432 BLAKE2B e6c1f4f34e41862d3739bad772b910b21348dce97dbde38cc7fbc9cb42993a493881dd100a0c21be3615805f27d3987259233ae5830ef56e2d1dd928c285c09f SHA512 f4f93b16ad29f813a2c0397ec46c6decf7c9bdb3f4a376e1f24a29724c136feabd230d0558d37a502f2795f71c959833a662e6d2544a78704408b3be9be314fc
+MISC metadata.xml 431 BLAKE2B 69dedef8b74edc3fa3b45eb8af40784b585f84007d205c4db52c3d05abccb20e7c078708f3bcedcc8dac268eced84c03b0bf92cd836ee7a9f2dda01b1c87a65d SHA512 88631011f2fc130495c8a9feeb24691389bfac96a8db4b1bc4b5503e354f0fa882a516ba1af7bcf72d7604c8974ab72a2189c8cd7feddefaaaada54cb405898d
diff --git a/dev-util/vulkan-headers/metadata.xml b/dev-util/vulkan-headers/metadata.xml
index 830c78812893..de2b07466f94 100644
--- a/dev-util/vulkan-headers/metadata.xml
+++ b/dev-util/vulkan-headers/metadata.xml
@@ -13,4 +13,3 @@
 		<remote-id type="github">KhronosGroup/Vulkan-Headers</remote-id>
 	</upstream>
 </pkgmetadata>
-
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index c01e623d7a90..fa3b5cc86c66 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,4 +1,4 @@
 DIST vulkan-tools-1.2.162.tar.gz 724232 BLAKE2B 16eb2dde35883fb2c7c263a72a615818ff8e1557ac9d74553ec3784d96a827e6900efa4e42218cb9081f7501d9b1a53eac82c360c2d20922043308515ab48983 SHA512 7827f6775dfb26820a2a2cbc60e7da8c7e7bdcb57b65523fbc6b2e989ae6869b04a57ae458c72715722c67d842660574697834c92f9b909dd5673da1945ac6dc
 EBUILD vulkan-tools-1.2.162.ebuild 1881 BLAKE2B 4c9129b5619a374830b27c7d425f2c119e1613a667c9d901101cdf0a59ae5c9c70d340e5fdf885b1b84901df01f152b03a4e687d1674d9d8ad65620fdb30a386 SHA512 ec5501ccda226135f0b33c818c6c5fe1fd33325d3bb01586775a55d6236e1d5aec3bac9c87cc309f88a648df0754bfaae310cfd92e4a818c4bd8024d3c46e3b1
 EBUILD vulkan-tools-9999.ebuild 1886 BLAKE2B 2afef23e4399f9547e7fd691ec1050473993ca0decefa62e56a1d5499663bc5071aaa680d0a743a4776993997c0adc5bc92587ad24dc0cce3ffa6c325a86b35c SHA512 1769b436f7e1a8d4c4c22a7f99d1c2884db790b0f15dcdd8dc4e7cb144796654c48cfa6a75ff413653a5a2bf974c142c7a1dc0e81804fd7968e8d7a78bf5fb39
-MISC metadata.xml 500 BLAKE2B 2b03cd2296502530b43020bacbbef0edaabacc6b8d2458ef6d5f653fbbdf6b02ff5fba9988fd19ee9c9e14e41df359c150cbc2fd141769960f2f1b95e213d8ed SHA512 327529a5a8a57115e116c31c5b86a00f978c8612a4905eed90ad3b33671acaabbaa5e7e82bb140ad5d9b1574b0f37a53882d117c50ec320c1ea0c8d5fc25994e
+MISC metadata.xml 499 BLAKE2B 9ede9725de281e0877f865e41ce68be15d5c04fd95023d3ab1180f4987c506a8f12ad23412ecf5795f6f8e6f36e576bc65f7cef786ced70296f5a4a8584ac4f1 SHA512 eb5dbcfbb58449c5a6ae7580f0c8a25c06f85fd6ac32fe1354fffe550214465921dace3c05264c11517d7dbeeffa444eb468d63f4781c6383f4be8a4202ecefd
diff --git a/dev-util/vulkan-tools/metadata.xml b/dev-util/vulkan-tools/metadata.xml
index 9d9218cb035e..12c000ac20d3 100644
--- a/dev-util/vulkan-tools/metadata.xml
+++ b/dev-util/vulkan-tools/metadata.xml
@@ -16,4 +16,3 @@
 		<remote-id type="github">KhronosGroup/Vulkan-Tools</remote-id>
 	</upstream>
 </pkgmetadata>
-
diff --git a/dev-util/watchman/Manifest b/dev-util/watchman/Manifest
index cfa7b05b3a87..9668f5653008 100644
--- a/dev-util/watchman/Manifest
+++ b/dev-util/watchman/Manifest
@@ -2,4 +2,4 @@ AUX 4.9.0-changes.patch 2974 BLAKE2B 71163fce5ec3f62e174810f485a43fe0a329757004c
 AUX 4.9.0-python3.patch 2402 BLAKE2B 9378a4613048891e6d4b461a9442ff7585dc9f137c03de417c62fad5edb78f138e417e35abe9283f33bcc7da884a2b2e885ebfcfa638c183c1521660af97c300 SHA512 68490ac9eaed522f81e51bc1a2bd98f93282f929587c8e865baa519faecc921192f9e751a5ef8099a5ab6e1e5523855ba4bf8aadb2656506e632cb97eff16839
 DIST watchman-4.9.0.tar.gz 3508045 BLAKE2B 413b779f02736442c371af1d9e18e5c84f05f9e9465c114dc4bdf79cbc1d823f1ad3167abef22818652a924ca2cb563c54d18f7599b987f579655d8a2b82162a SHA512 3c1222ba41383b26c2c427415e75abdb4bef5a95001438c3debe7cf3ca654944ecf08e432c5ad0aefa2a6554ae73ff0f6995e7f4ee61cdb2cde80f8378d3a704
 EBUILD watchman-4.9.0.ebuild 1160 BLAKE2B 0b161235121928f955ce1ec143340562b970cc3dcc869745a68ea7491ea813ac0f61880aec68d6f2c555c4dae8a369231fd0cac42aa44998ed190508dbf9da76 SHA512 d083c55765de1866ce247bce16e5b1f1ccb40281cfadba352f879fe94b129a7c65f1305fa44f174c53073483f9714ac77d7359f0589c7859eb1981db5a71aebd
-MISC metadata.xml 672 BLAKE2B 96db77114305163124079f89946b3824baad223e6a3e64c820904d0c9f05addec99e746e22a76f22eff7d4e533788bdb0a39d7ddd566f012be4f8fd37b8a68c7 SHA512 3b0a92388bc934b430a7367760373d033975d47a3a96efec80eae5570acd10648f93e8ce85dff74d51f33a08faa53161bb7c90365575e01284211e3261382a78
+MISC metadata.xml 702 BLAKE2B 5851e5a0ba81aa282d1a013ce5415b5f7415bb20a0e4da24a5d198908ddb8df4d1c96de7d59d5d354705b0ef4d8b4041cde467dc8d48eaefc614c87f77deff65 SHA512 d26e3f1e4cb84708dd1ff5c2de3c669c53c2916ab26379ef3cfec4d4ab0afb6fffffb3b53527e53d51fddec5b11ba777d74fa6932f3d98b054c73cedb2265f5c
diff --git a/dev-util/watchman/metadata.xml b/dev-util/watchman/metadata.xml
index 0dc2b75aa0cb..e1493f500696 100644
--- a/dev-util/watchman/metadata.xml
+++ b/dev-util/watchman/metadata.xml
@@ -5,11 +5,11 @@
 		<email>monsieurp@gentoo.org</email>
 		<name>Patrice Clement</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>adrian@planetcoding.net</email>
 		<name>Adrian Moennich</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
author	V3n3RiX <venerix@redcorelinux.org>	2021-03-20 14:27:17 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-03-20 14:27:17 +0000
commit	5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 (patch)
tree	66e860a5099bcad013f1cf667255dc372a7c11b3 /dev-util
parent	7218e1b46bceac05841e90472501742d905fb3fc (diff)