gentoo resync : 11.05.2021

66 files changed, 589 insertions, 681 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 67dba90fcfa2..3e24d33a6a2d 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest
index 24054bf720ec..a42d616817dd 100644
--- a/dev-util/bcc/Manifest
+++ b/dev-util/bcc/Manifest
@@ -5,9 +5,11 @@ DIST bcc-0.16.0.tar.gz 4124285 BLAKE2B 443077ffd5ad02e34d28a86ee64b8ec52fa4a1869
 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
+DIST bcc-0.20.0.tar.gz 5193274 BLAKE2B ea78004d114e8187d82d6e58bf2c8e17d93b96a651a5557dcf3c405dfcf5ed0df3a2147f35d1b3831aa5aca5c1caf59742026740bb6da02dfda7c1dd7ef8161b SHA512 fa7c50a4fc64846ad798b6652101aa414cda53d08779cf48bd505191189cb23da2838f7511e700d59e086d35216f4e3bc9867b614738061630984dff3c4576dc
 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
+EBUILD bcc-0.20.0.ebuild 2257 BLAKE2B e1a2fe2fb590acc67bc2d99978af7d62ebc71ffd37567c198ca32f82fc82c2e1abfc52ce5121870d0732e8e8a7c94a9b3efe21fca89e3bd8abc461353dc53bde SHA512 adc85ee7d708d5350843bee4e32ebf2004aab572e2a213a77b13ad921e1beba80dc757b6920917d46c084fca1798d79a3bb3a2003c84634c6e05c05dbcde55a6
 MISC metadata.xml 386 BLAKE2B 73062e6902dd7d7f9afb988cce26a8aa5a66e1252652ae364f2295b0a5e77013eec682b36ab65c93772843ad0ec8c7187cd29d8308a3ba17dbacd1ef193f03ae SHA512 6529fa57011cd17b9892e1b8f05e063ae6314f85665a30881335efa80e9b9238a7b61d1f732316e45496707bf350d03149e7ec5efdf1a0fee6d5a788b58a7e70
diff --git a/dev-util/bcc/bcc-0.20.0.ebuild b/dev-util/bcc/bcc-0.20.0.ebuild
new file mode 100644
index 000000000000..de2211fe25ce
--- /dev/null
+++ b/dev-util/bcc/bcc-0.20.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=12 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 4d58c7670c75..2b464d32a08e 100644
--- a/dev-util/bcpp/Manifest
+++ b/dev-util/bcpp/Manifest
@@ -1,3 +1,3 @@
 DIST bcpp-20210108.tgz 150080 BLAKE2B 5614b1e9957d63532ed6ba6d4588ae8b899201c363984bc99726bf48ae49ee9d16a71c407e3988fdeb715fef5e67343bc56c94eb1c8e977a14a6c2b08ee6668a SHA512 46a8fff766bbca4833c898d550ce4f0ac5e6ea64a2e05e63e4680186345a080aa30e54a4a5a3d22d47df8e8c8cbc4e738578fd59ec647d305c32a228d3b01e73
 EBUILD bcpp-20210108.ebuild 903 BLAKE2B 3748ffc0caa34f1a2a64e29bd7f586406ff45ac63ad6b9fa4a5bc6eb90040d71df74eba132ada63340b1e450d90d961de1e02c6e1921d5395d2ff8771eb7a916 SHA512 59c925ed7e6bd7015bdef7febdc9682e424793df4e568f70b5fc641d2fc65f286deb9b5d421af9159496871a64507c97a896274ac03e430a97f95369ae771f07
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+MISC metadata.xml 259 BLAKE2B 05c05849dacdafd9e6d1de398007a66b019d040b17ea6bff1b63040bd96808e84ec6aa674a470b5822178acaede8b74452137dc08028108e015c7d152d98e911 SHA512 81a4526a020d21c810f9b06b63908f342faaaa4089cb17e9f33ab808f307b570fd9d51d00cdb4b44162b88e245727633e2ad6165d2e7a08b800b5e7d8a58dae9
diff --git a/dev-util/bcpp/metadata.xml b/dev-util/bcpp/metadata.xml
index 6f49eba8f496..1279f095ac29 100644
--- a/dev-util/bcpp/metadata.xml
+++ b/dev-util/bcpp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<!-- maintainer-needed -->
+	<upstream>
+		<changelog>https://invisible-island.net/bcpp/CHANGES</changelog>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/bear/Manifest b/dev-util/bear/Manifest
index e7c096358336..8135bbf05436 100644
--- a/dev-util/bear/Manifest
+++ b/dev-util/bear/Manifest
@@ -1,5 +1,5 @@
 DIST bear-2.4.4.tar.gz 50347 BLAKE2B 73fa332cf97413e55c588f8830806a26c6905299af902c6cf1f39fd576c6261690239c1b502b28b5a2aa24e5ca521c3f1dd58aacd60e00ece4fe1840f5656155 SHA512 4ee3fd5c846149029fe9e4104e2a0d0e318a15215aa80fc5dc376e22ebea510384b02d4d62765495343cab537bacd2b1b0130c00246e081feb4e543761a594e5
 DIST bear-3.0.11.tar.gz 118678 BLAKE2B 209d904a84363a87e566798dcd65ffed96cdbf3d2e753af8dc2706adb995d2999bc112eabb88db28791cbb245c373eb330cf9c20d3d886bb2caeb5c01150e65d SHA512 6d362aede911a8ad35be30638a698579582ca5de770a7c3199bb205046f08f355387099261b8d857188d526ab62024f78e3d06a225734c5f9acca03e5dfea1ec
-EBUILD bear-2.4.4.ebuild 1640 BLAKE2B 33c75872aa47499025a9296eb7bc535206d29215040e75c31c85b9b7667b035d9aee4886423ec6f5cab80aad3d5e15f6627aa7909957014872dffa2ba8223c56 SHA512 037fdf6bf071188df0027c6deb69a402dd721d44ff0e8ccf96dacc0b7692e6e9cd71901c284c984636bfeb49f5186a6881896ddfc1832106b0ba05e617335483
+EBUILD bear-2.4.4.ebuild 1638 BLAKE2B 26435a94e41a295c629ca64a62f726a1ec58be5e85bcfbc312a2f6cd75d3232aae1e6854ad3415e99dfc369ce0e4a1ed0ff9e1b413332d24102015a2d1592d24 SHA512 c7d5cd603d219d8a1f764c728fdfb476b79b500b3db6c5513bb91397f88d4b5f46d4b16903834b93fff38f1fad243bca7c0c10d8893f2ce6238ac24847402e94
 EBUILD bear-3.0.11-r1.ebuild 2071 BLAKE2B a133a2e37f574d2ad1b060023becf5277f3011a7d54bad2d389b146ae3ef08f2a5d55ad93d2bd1c4e2778d9c44d6f4cea403ece918e111e19d3261ee9bde5a77 SHA512 562c3d1a8c4bded4cb8f29cefdc06dcef5665d40bf37c7f097c848a01b29df8c7bde0d905bc2e11dc20fec291963579ddc4db6c24b8679ffb5935b3f52c43764
 MISC metadata.xml 914 BLAKE2B 791cac2c9a3850bc49848ec8f6ff889a21802ddce6937783afccdda45045b3861f0c79e44028ea6df18f046c5fc1b6ad89ac1a940afc9e4d6607507a12933382 SHA512 a7b29ce47f3c9d91f2ba5d1abf5975d64a9229619737b75d38d54b3bde860a47a859e6de7a959ad67cba21b2a0ced8a9fbaf508c02cace63c4090afbac2005ba
diff --git a/dev-util/bear/bear-2.4.4.ebuild b/dev-util/bear/bear-2.4.4.ebuild
index 9e2aef4064b7..e7c189ffb934 100644
--- a/dev-util/bear/bear-2.4.4.ebuild
+++ b/dev-util/bear/bear-2.4.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rizsotto/Bear/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index 24e9f7b2ac40..838ae55657d6 100644
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -8,6 +8,6 @@ AUX boost-build-1.76.0-respect-user-flags.patch 456 BLAKE2B 02a383d7a969220da3a4
 AUX site-config.jam 688 BLAKE2B e43a7ad1a94d113a7f890e8b634770f5c60556101d428d83f655bbbe72c46b587485886a9941d05a2ae4319fc325f1e0ecfb9b660158b81c5e9fd02e0b1c0530 SHA512 b65bf1be3133f9f66d3139b00f195a288591bb20a13ba35041507c2c33d7d2da6047c3b02dc27bc4eb21798b91e1262a60e294b7fd4af90808b9de0f5af517df
 DIST boost_1_75_0.tar.bz2 121849575 BLAKE2B ce7ecd8bcee518ce54f7e5302f202acbea60cedd6ae9248708c0bb5bbc2713607b2e1967a9e6f77cc20a4c008c1ee4db651def55937efc80407487a7a44fa8d6 SHA512 d86f060245e98dca5c7f3f831c98ea9ccbfa8310f20830dd913d9d4c939fbe7cb94accd35f1128e7c4faf6c27adb6f4bb54e5477a6bde983dfc7aa33c4eed03a
 DIST boost_1_76_0.tar.bz2 110073117 BLAKE2B 45445e6a9725cb99131e0b831b2fac0840d083692c13887b41adeac5cb8b3732026db3641d6be20591a676b78a87fcf363eb9b1508f87ed26039bba6a1ced533 SHA512 5d68bed98c57e03b4cb2420d9b856e5f0669561a6142a4b0c9c8a58dc5b6b28e16ccbb16ac559c3a3198c45769a246bf996b96cb7b6a019dd15f05c2270e9429
-EBUILD boost-build-1.75.0.ebuild 2047 BLAKE2B 343c26a7f5a41ed1409b21a671351ac21e1f1b2f3a4a8ede47605299a97bda7360a0566bb63641a235804667ea9f9b19a749bda7234b4eb2ac970e3db3e62fda SHA512 7d90a1a4bba841e22e8d0a73bb371f7e00fd0b3af46ef991c63ae60e19f63b6ec27560f264044b4ef598d70d9e97a5ad786b15993745ff3b4365ef3bb9cddaae
-EBUILD boost-build-1.76.0.ebuild 2077 BLAKE2B 3ec1fb5e4575165fc789bc539e7c18e83ae3ac3d2ac6b16dc13169ac82fb60ccd3b30688aac60448ecb5b6d8314f9eebff5b20f807df7f2bbb1d95112de22056 SHA512 f28b7414028b11b38ae39d2fe14bfa39c6c4aa3c39cd1b8941f82268eb731810149ef0ef0983993b5ab117b78786a6b57c1191534f3cb9d6889aa3938f1eb142
+EBUILD boost-build-1.75.0.ebuild 2058 BLAKE2B 42e8c169a139c01463c809b4b1d3bdb1293a28f0c375751e2fa6cbfd432aefddbe798d5f62bc795ef0a656e13a11a5623cf68533fe8bf0a402c12c26181179ae SHA512 d3640a4dd60f81acff16e6125b23956ab0bc4530f25cb51a5af6d7c7986776533dc3876620774b0802de927bc8ee3e35eae7eeddacd30a67257a9ff641cba47f
+EBUILD boost-build-1.76.0-r1.ebuild 2121 BLAKE2B 4a5af1641fee7021799b994613f5dd5d50e0dffd0ec82b48945b7647df79ac5ec3b413f0e4cac75a1b4385eece0c1ac9625e7b59c976903f468015443d9323d9 SHA512 42ddb1f014552aec09a19723e779bb3388b97b5c13e5a68138dc28cc8e86d862177ba1f166d7d3d67455a946b20ec912c1a1e67a9c862adadada7cc4f2c228f4
 MISC metadata.xml 329 BLAKE2B f492b1ba64c3f7bce1d3fb304bcff93357cc069dfd06b69c25cf26f4423ebea51ac4614a8d865635568f0e9db424a6904fc1edd5fa729243838e16e9887f4202 SHA512 57baf2d8e0a4c240d99f68ce122086a147d42145687b712609fdcd73b77fe3fdfecc1b078edb6a9c922213482fcc17c2fccb6762ec69890fbc9a912c4cb34827
diff --git a/dev-util/boost-build/boost-build-1.75.0.ebuild b/dev-util/boost-build/boost-build-1.75.0.ebuild
index e1e963171bd2..e00d0b86d370 100644
--- a/dev-util/boost-build/boost-build-1.75.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.75.0.ebuild
@@ -9,7 +9,7 @@ MY_PV="$(ver_rs 1- _)"
 
 DESCRIPTION="A system for large project software construction, simple to use and powerful"
 HOMEPAGE="https://boostorg.github.io/build/"
-SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar.bz2"
+SRC_URI="https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/boost_${MY_PV}.tar.bz2"
 
 LICENSE="Boost-1.0"
 SLOT="0"
diff --git a/dev-util/boost-build/boost-build-1.76.0.ebuild b/dev-util/boost-build/boost-build-1.76.0-r1.ebuild
index 39c312debe8a..2a800a247142 100644
--- a/dev-util/boost-build/boost-build-1.76.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.76.0-r1.ebuild
@@ -9,7 +9,7 @@ MY_PV="$(ver_rs 1- _)"
 
 DESCRIPTION="A system for large project software construction, simple to use and powerful"
 HOMEPAGE="https://boostorg.github.io/build/"
-SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar.bz2"
+SRC_URI="https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/boost_${MY_PV}.tar.bz2"
 S="${WORKDIR}/boost_${MY_PV}/tools/build/src"
 
 LICENSE="Boost-1.0"
@@ -45,7 +45,7 @@ src_configure() {
 
 src_compile() {
 	cd engine || die
-	./build.sh cxx --cxx="$(tc-getCXX)" --cxxflags="${CXXFLAGS}" -d+2 --without-python || die "building bjam failed"
+	${CONFIG_SHELL:-${BASH}} ./build.sh cxx --cxx="$(tc-getCXX)" --cxxflags="${CXXFLAGS}" -d+2 --without-python || die "building bjam failed"
 }
 
 src_test() {
@@ -56,12 +56,12 @@ src_test() {
 src_install() {
 	dobin engine/{bjam,b2}
 
-	insinto /usr/share/boost-build
+	insinto /usr/share/boost-build/src
 	doins -r "${FILESDIR}/site-config.jam" \
 		../boost-build.jam bootstrap.jam build-system.jam ../example/user-config.jam *.py \
 		build kernel options tools util
 
-	find "${ED}"/usr/share/boost-build -iname '*.py' -delete || die
+	find "${ED}"/usr/share/boost-build/src -iname '*.py' -delete || die
 
 	dodoc ../notes/{changes,release_procedure,build_dir_option,relative_source_paths}.txt
 
diff --git a/dev-util/byacc/Manifest b/dev-util/byacc/Manifest
index 66a6b4236124..7ff77f409681 100644
--- a/dev-util/byacc/Manifest
+++ b/dev-util/byacc/Manifest
@@ -1,7 +1,5 @@
-DIST byacc-20200330.tgz 872217 BLAKE2B 870ac1eeb439c96875e343223925414115b500d5b22ccdae9d7b30830ff6805d18d5bc43ec6f7ae1237ec500cfa1693aefad6e9607cfcc74188b541abfd16595 SHA512 df8cc1aa550d633ab547a13a4f091d8c940a9a67b52dc5ecacad5b005fd54c3ceb1269593068c1a7949049e85b6e6eea20cffbbf4b408e049fde75c0ffe51f07
-DIST byacc-20200910.tgz 871242 BLAKE2B de0f63b9edfb9451e23d7693daaea59f2661305a6727cd8e986c2557e513ca5dda8f0008d05b5c8f35a153a309bc4b02ecd6f45219bb553f928c9da11b616130 SHA512 491bbde2d5b0fdf2ad57bec5080112ad7c12ce3830b5e14f2289092aad1addae6edd4698368a9c8d69219a95ae5fa47eb32a95a2625841915297972591bebea3
 DIST byacc-20210109.tgz 873282 BLAKE2B 3f856bfba00b692ecc5fd297582ff594873914552d522be5de78bc74c0c52a7e0b7fbcdd31e209e7269d9e00e2449cf7162ac5cd0a1f2060e051f8fca2171460 SHA512 95eafe81948fee1839fed8fff71d65c23d85de02af51672c118b2eed7c680f0dd300cec54cf366a248307c480844edc66a027575b29e20ef2f71f3c243ad5202
-EBUILD byacc-20200330.ebuild 597 BLAKE2B d2369392975f705756da06a683bf456d3bc80737db5c54b4dc21ef1d52fae6fa8dd3128f1c8c25538c94f7beb22b8143186590c829a0dd81536c9c7edc5e1892 SHA512 8892e8d83199332d811e4ddb2e5abf92cbbcd4fe57815628650007f1e188ff851346badd284e8e5b334ffc6b2f506450e3db806c428cbb400829482a917afafa
-EBUILD byacc-20200910.ebuild 597 BLAKE2B d2369392975f705756da06a683bf456d3bc80737db5c54b4dc21ef1d52fae6fa8dd3128f1c8c25538c94f7beb22b8143186590c829a0dd81536c9c7edc5e1892 SHA512 8892e8d83199332d811e4ddb2e5abf92cbbcd4fe57815628650007f1e188ff851346badd284e8e5b334ffc6b2f506450e3db806c428cbb400829482a917afafa
-EBUILD byacc-20210109.ebuild 604 BLAKE2B 6f4b3612b5638cd6962ecb8eca298c0f92740750f45db9d53e45f9988d0d5c3e52b4031a02557adf4e7b1fe40e643e0f33206fc8397d9acb3076950ad11554ae SHA512 1062db25ea711b5ec17f4320a0e6826847bce4cc22c5416b298d66b82fc5dcc002bdf0ae125614bcfb77c153d13fcd7dcf72f67db32692fcd2af25c16186cfde
-MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
+DIST byacc-20210328.tgz 874281 BLAKE2B acd0fb0ebd99987ad5e823391e5186cedc64a9a7b5a1088ba42ac2c1a80d98d86f47c7626af5294853026a2e6bd4aeeca7b39b1a39527c170f118e33c021eba7 SHA512 fdcf98976524c1f37710cf9551a357ebc24ece94dd2bd10501d4fafb914a7ab4847926b99647e387f22a3d3206e6a4bfc14a4c41115702382fcc1d6f688f9dae
+EBUILD byacc-20210109.ebuild 597 BLAKE2B d2369392975f705756da06a683bf456d3bc80737db5c54b4dc21ef1d52fae6fa8dd3128f1c8c25538c94f7beb22b8143186590c829a0dd81536c9c7edc5e1892 SHA512 8892e8d83199332d811e4ddb2e5abf92cbbcd4fe57815628650007f1e188ff851346badd284e8e5b334ffc6b2f506450e3db806c428cbb400829482a917afafa
+EBUILD byacc-20210328.ebuild 604 BLAKE2B 6f4b3612b5638cd6962ecb8eca298c0f92740750f45db9d53e45f9988d0d5c3e52b4031a02557adf4e7b1fe40e643e0f33206fc8397d9acb3076950ad11554ae SHA512 1062db25ea711b5ec17f4320a0e6826847bce4cc22c5416b298d66b82fc5dcc002bdf0ae125614bcfb77c153d13fcd7dcf72f67db32692fcd2af25c16186cfde
+MISC metadata.xml 355 BLAKE2B 10160435379a759071cde21a0195dbeaac5783119695a9d9b092090158c429d01280d2442d351e5dd8a6368ff11566f153e02abc07d81c19ace1838f1943a09a SHA512 b0b39011f45894df952d34cd75ee087fd42a77aeb5a0e60e4201fb404781d77c4a5a82d2492712ad0ac2a2daad029a19c1284f7fc8f624c2ed47fd0b55d680dd
diff --git a/dev-util/byacc/byacc-20200910.ebuild b/dev-util/byacc/byacc-20200910.ebuild
deleted file mode 100644
index b7181571aa4b..000000000000
--- a/dev-util/byacc/byacc-20200910.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="the best variant of the Yacc parser generator"
-HOMEPAGE="https://invisible-island.net/byacc/byacc.html"
-SRC_URI="https://invisible-mirror.net/archives/byacc/${P}.tgz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
-
-src_configure() {
-	econf --program-prefix=b
-}
diff --git a/dev-util/byacc/byacc-20210109.ebuild b/dev-util/byacc/byacc-20210109.ebuild
index 556684fdc8ae..b7181571aa4b 100644
--- a/dev-util/byacc/byacc-20210109.ebuild
+++ b/dev-util/byacc/byacc-20210109.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://invisible-mirror.net/archives/byacc/${P}.tgz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
 
diff --git a/dev-util/byacc/byacc-20200330.ebuild b/dev-util/byacc/byacc-20210328.ebuild
index b7181571aa4b..556684fdc8ae 100644
--- a/dev-util/byacc/byacc-20200330.ebuild
+++ b/dev-util/byacc/byacc-20210328.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://invisible-mirror.net/archives/byacc/${P}.tgz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
 
diff --git a/dev-util/byacc/metadata.xml b/dev-util/byacc/metadata.xml
index 56c124413057..cc5a71f5bad8 100644
--- a/dev-util/byacc/metadata.xml
+++ b/dev-util/byacc/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<upstream>
+		<changelog>https://invisible-island.net/byacc/CHANGES.html</changelog>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index e7a2bf462ee9..8ab550de702a 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,10 +1,9 @@
 AUX ccache-3.5-nvcc-test.patch 262 BLAKE2B b33b6372e8e6c597d7ed6c781f0a3ac22c435d1309fe387e62c5f9b61c783294ec81cfd1c8a0afc60e63148dcc89f95ebc6d313a0567431a8d05c96e3d59bae1 SHA512 651e26335df8eb551f95064d67925d6e7dd15c8a082b291cdea31fcbc2e5482b2358de71c205c668173b3dc5a75ef004d95dbdd92391e4a4aa6bc1283f5f3a72
 AUX ccache-4.0-objdump.patch 271 BLAKE2B e641f1acef1e439660753c781d5760ab2a2530ce8dbcfacb1c3835523ec41ff35701536698827f11c39c1e06641fcf6b57d374944ecb44888a66c7860f97b813 SHA512 cc53f44b173c1ae66258aa573182ae936304dac9daf8489a20c45dbe3d554df207bd93b370da2c86b22fbc4edf5fd954f84fd18812d97d41a88ea4c7926f117c
 AUX ccache-4.1-avoid-run-user.patch 557 BLAKE2B 956ac163da6c8acdefb5b395549067272beea095e93686cf553d534c94d76c1c032ef3423f851907367006e1e7bc7b4afe1494bef1eb293e5aca2e3625c29c10 SHA512 bbdd370e478839980423777053baa42ce37cd18ebf8cd36d3f5b13d9252c38b17840ab6e71aefda20a9903bd4a85e4cdb4582728a9db9d1e847b0ee9569bba9e
-AUX ccache-4.2-atomic.patch 236 BLAKE2B 39afe8910b218fd29261b2805cd583daaddb2e18caf136bf5f01b4fcec002a9717ebfacb028396c69ae56f7aa61aefdbb0c3e05da0545a2a3bf87aa1ab32b300 SHA512 b07868200e13b562027aa95a4d4ad949f0d9ef3e5e277a4ed67720e12cda54ddac0443b70e1c17bf8255ea70492d9d9a9931bc1fcb400ef3b134013719dbd267
 AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b30c381b0df28be9c0ae7c0f1d7325282e97ca54881171846c13945b264bd4a793785ff1a19d0941669 SHA512 05d512b001b6a2fdc947d10d810c89683144080a060c24a37422e9b587594e1ee42fa1d7607461571f196819dae92146d861e8ae116e9226e1ff97ea035b3003
 DIST ccache-4.2.1.tar.xz 431484 BLAKE2B 10bb0d1e263e441d91c2dfcd2b2c89f64dfb10b4c5aa66012c388fea2c99d8488538e84b5cef86abf0c9f9aaa0a562b7c7be8a9d4a4073ae3c046e7fe28b7eda SHA512 46bb760ddad5999c5bdff4f3ce6e405eb2018c4a591ad76ba3dd7921b8bfd59a257d992d285e38d69aaf86537962602689175b8741894094819775eec9493b77
-DIST ccache-4.2.tar.xz 422688 BLAKE2B 932db2e4f6ef9d98359fe44f931d083acb9fd32661d9baec5a2d0cfffc9301a999b04e4628d31513ec809bf43e3e94d71f9b92a1c83bcebbaf5e35e219596704 SHA512 b7e5823a0705b9a1100c959281170dcd682228b585c329821337ef57d5b5cf47d6f3d644a6d5a3675a32a02730559f8fe6d84d11f01847f47b77c0893d1d1fbe
+DIST ccache-4.3.tar.xz 433508 BLAKE2B 6ab48aa587b4dc86020e3b0f722003dc5c03709626e143a1d38506b6072f9963fc76e89b6d18128dfc28035bf8d24e46ea44f219db69a1b3a294416f0b023090 SHA512 ec082de95ea8b22154ce1e67e0a0fc28266cfb71f382205f7eab14e6ac1c7841027d063041131832b3227d833d99ec874e90df238f35f433de4c381566931c7f
 EBUILD ccache-4.2.1.ebuild 1655 BLAKE2B b3cc038828f86dbd2d8060f5d13a197c399e7b99d0c0fcf4a82fbb498c212a9624fcb023f481c628a123fd1e2237689b1b094187c5fa1caa98aeca38c9c870d7 SHA512 0adb9fe19611bd373870e85d889b2bdaecb0fe6b11c40f3d48add1ecdca99c4b6beed5b151c685eaf13f0b11b0988bf870525ac23e3f78c865565f84e1aba156
-EBUILD ccache-4.2.ebuild 1693 BLAKE2B 6699454a8dc3d4a8c2b3050a1d99589592a97ca32ae9bf0ea1172b9fe7345cdafe21edd32141df31b2fd1a85c12864986637bb0c80b3dbbf3920cb8cd4a256ad SHA512 7c1d37251f59a4621c4fe107a47ffaa53d760fb2e94790fb492a06eb8d191001047b2e0c7a9b681f32847634ec7f5083a1484ab059765ba25b094712c13d0025
+EBUILD ccache-4.3.ebuild 1662 BLAKE2B 3747ef40e6edd8f35a9c2760200593bb93c222b5864f9edda872413f1f54393b01402c675a7e39280786d32f87f2a798286f6ab6c14993a366d76c6e7548eef3 SHA512 7538e49273de477d4bc77b8db6e093c5c222d59c5c25383677195399a89bce281d64014b8631ab107c5af05c04aef69f6872a55631fecaee3a81b36d957b5921
 MISC metadata.xml 445 BLAKE2B 8ef8f120989420428ea85108180c659c72a7553f3f20ab96597d26aa04b059f491aeae8c887697a214c437f2dba30fbb934cb47c1db93821eda7dd489e6cb693 SHA512 41ffcad23c9f0274c48a058090d6404cd782dea6674b81615a6b3b7fa272ff5df4c68404fb4dcdb9d2275c13fb137f21f0f65232d5fb1ef6152cc25213893249
diff --git a/dev-util/ccache/ccache-4.2.ebuild b/dev-util/ccache/ccache-4.3.ebuild
index 543cf2ad6286..3f58044c6822 100644
--- a/dev-util/ccache/ccache-4.2.ebuild
+++ b/dev-util/ccache/ccache-4.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="test"
 
 DEPEND=""
@@ -37,7 +37,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
 	"${FILESDIR}"/${PN}-4.0-objdump.patch
 	"${FILESDIR}"/${PN}-4.1-avoid-run-user.patch
-	"${FILESDIR}"/${PN}-4.2-atomic.patch
 )
 
 src_prepare() {
diff --git a/dev-util/ccache/files/ccache-4.2-atomic.patch b/dev-util/ccache/files/ccache-4.2-atomic.patch
deleted file mode 100644
index 6148e232af9d..000000000000
--- a/dev-util/ccache/files/ccache-4.2-atomic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-https://github.com/ccache/ccache/pull/800
---- a/cmake/StdAtomic.cmake
-+++ b/cmake/StdAtomic.cmake
-@@ -10,6 +10,7 @@ set(
-     int main()
-     {
-       std::atomic<long long> x;
-+      ++x;
-       (void)x.load();
-       return 0;
-     }
diff --git a/dev-util/checkbashisms/Manifest b/dev-util/checkbashisms/Manifest
index 84bfd96868ef..cb5947534b8a 100644
--- a/dev-util/checkbashisms/Manifest
+++ b/dev-util/checkbashisms/Manifest
@@ -1,5 +1,3 @@
-DIST devscripts_2.20.5.tar.xz 881976 BLAKE2B 3d4079d3268b3b9bfacdd0a4afcfee5390bdbf4660038306611d9c24e7b5c6453eff5f24d938c9764a17336475cd60615919adaa11dcf47495d930cd4b3b4e09 SHA512 fbd372a62758e3d2872f37bfd93d9b169d0cc745719057078378949c4d01b4fb27830ae501fe45b06b30a869e8afc853d8477419bb2f46d7fd62749f54981ec0
 DIST devscripts_2.21.1.tar.xz 887812 BLAKE2B 3eac4adfe1dfc85ffcc5b9f30ec29377f253596c2377bb81456c20848aae7376fce6b24c5c9b75d284ca7f46251db13e3ff89d1efc1f312229d93883b09d07df SHA512 5bcdd1cc8138e2e1aab2efd948cc104aee138b64e93059e929d8365afe1a1a92fac88586186ab53294d17104c661f2e29102bdcdd55f1b73d24be287615207ad
-EBUILD checkbashisms-2.20.5.ebuild 785 BLAKE2B d0a5bf4112c10c3b46ae63320bcc6a5503bf07215353d5ef5dcd86a30b5028418cbb94b48e79f3846a664ec8a65a7075193c8a2ec52d9b699557709cdc982ce1 SHA512 d112b95caa864ae6faa7d09f3f13d8f758ad6603d19abc1882926de0d132eadde4f28033b773b53289cb5246616b6bee7e53dae5a359edba7ce31d0e1cc22ee9
-EBUILD checkbashisms-2.21.1.ebuild 787 BLAKE2B 114c5210a05e634ac2ebffb2c8e7ab771602a1475fba145a0cfa3fe988ef043880aad9aa613ae44a72cafc62e9af03ff928865b3c546425e3a80a166dadca0e1 SHA512 495d4336148137abd41f7d46b038d79d1e563993600616c812e46e77d4b00ac3b1bbda90d0c72bd01db307c835180899bc604edc87b7ab4b59ee1538374a3a7b
+EBUILD checkbashisms-2.21.1.ebuild 785 BLAKE2B d0a5bf4112c10c3b46ae63320bcc6a5503bf07215353d5ef5dcd86a30b5028418cbb94b48e79f3846a664ec8a65a7075193c8a2ec52d9b699557709cdc982ce1 SHA512 d112b95caa864ae6faa7d09f3f13d8f758ad6603d19abc1882926de0d132eadde4f28033b773b53289cb5246616b6bee7e53dae5a359edba7ce31d0e1cc22ee9
 MISC metadata.xml 433 BLAKE2B b54d1290789d3ce8931f832c8c1ca7a56fbdebe85c0a81c32a929168fdf2d5a7be0dea01881e8fcc583061db1a071d1787723c9342c77a5862e228f0203c178b SHA512 945c3b95a61d4219e98ce5be3aed255cb148867409aca572714e8679bf623ee0c3396966cd80d783ace60bae7e6c01b85fad6c7f7ac9056422d732ed07f54716
diff --git a/dev-util/checkbashisms/checkbashisms-2.20.5.ebuild b/dev-util/checkbashisms/checkbashisms-2.20.5.ebuild
deleted file mode 100644
index a2183decd385..000000000000
--- a/dev-util/checkbashisms/checkbashisms-2.20.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="devscripts"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Perl script to check for commonly used bash features not defined by POSIX"
-HOMEPAGE="https://packages.debian.org/devscripts https://salsa.debian.org/debian/devscripts"
-SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# Requires python packages to check tools we don't need anyway
-RESTRICT="test"
-
-RDEPEND="dev-lang/perl
-	virtual/perl-Getopt-Long"
-
-S="${WORKDIR}/${MY_P}/scripts"
-
-src_prepare() {
-	default
-
-	sed "s@###VERSION###@${PV}@" -i checkbashisms.pl || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	newbin ${PN}.pl ${PN}
-	doman ${PN}.1
-}
diff --git a/dev-util/checkbashisms/checkbashisms-2.21.1.ebuild b/dev-util/checkbashisms/checkbashisms-2.21.1.ebuild
index f10c85c3af96..a2183decd385 100644
--- a/dev-util/checkbashisms/checkbashisms-2.21.1.ebuild
+++ b/dev-util/checkbashisms/checkbashisms-2.21.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 # Requires python packages to check tools we don't need anyway
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index a0baa350c147..810d27fa28bf 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -18,11 +18,9 @@ AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b54345
 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.7.tar.gz 9271358 BLAKE2B 379b89c0d6bcfe81a397257cb3f95e4b4a8987566258f6d5b312e8ffd455fd07f09ed570c47111f9a519d76f43014b680e8242cddef13810ba87f9b9ec7e2e2f SHA512 6af1fe3ea41906324d4c29f5f982281d92145d086f4a47fa2220b93483bc65d59b1e23f5b51d82305c630690be7c552827bb795560674b03620763e0917bf14a
-DIST cmake-3.20.1.tar.gz 9438789 BLAKE2B 44f3f209f0bf55fa56d439d6196faac311ef55031eb23dafaa61266d83280eca32d9575f6c462b947f12c068e61c63d031b2046ab57099668dfcf7e61ffa1bb2 SHA512 726a2ea36dcc2887adc9b2a579060a7c5d7780bf246bc7915a3bfd35a800a544bb27d4daeae2a37c8f8acf576ed9feb45f97f2d53d7049da98b73cd2d2524248
 DIST cmake-3.20.2.tar.gz 9438694 BLAKE2B b1e1c091047d5ccae77d64ffda8201cfa7661f09fac2aceadfede8be09257cebdc8c2536f10ced82c700fd87174979344489fa6ab1b460e3ddfc41325ca6f19b SHA512 675a92f84b437169aee86dbfa59715671b9195ddeffc6fea83c7803a70abe3116106ad0a627b9e4bef326bfb2a10fdf624ad341fd9d3d08e3d8a69c271cd2b32
 EBUILD cmake-3.13.5.ebuild 6239 BLAKE2B 5e3b289af5d341e73fbdfe6162330e9e39dac40276991f08df670fcff6e40438995b608704e535545c4538cedb7ed789c2cc2ae0b38a1fd0f3a2e9627c95a494 SHA512 e75ea6defa00993410ed865329b450f38f9ad418c59bfe345880bae25d2f19e4463a407d744527d3f5c6c59fe8cf732cad5ac6274901cfcf3809d29573be7ad1
 EBUILD cmake-3.18.5.ebuild 6070 BLAKE2B 24ab19a092db23bbcbf3d8f1a87e21cc8f17575e8eff885efa81c3fb0161204f8f821bda04ac819fbad5f73936db8b2bff38b688252a9bcab30a7df002adfc71 SHA512 59b479102626d771fbf66f1dccc011e33ca5e3d77bc37f291c6e28fbdf998b7b5853da56875345807714b85a1e95c7b41fe2f5e98f6486191b1c80d6962697c8
 EBUILD cmake-3.19.7.ebuild 6990 BLAKE2B f382eff3d258673c34e7642ec088f708281a6a65bed568b2094344fbd966eca22128dd93e382a88da16132291bd0f7c644362eaee0b34545c4d3df8ef512c832 SHA512 27af2c67d4a06e0cc3f0d86f003738a8def88a274dc3eda6da32de0b5f015a8e13f315ae93efbcec07cd9b95fc9f046786336f2a1b9ac9f5478610a440cb9964
-EBUILD cmake-3.20.1.ebuild 6990 BLAKE2B f382eff3d258673c34e7642ec088f708281a6a65bed568b2094344fbd966eca22128dd93e382a88da16132291bd0f7c644362eaee0b34545c4d3df8ef512c832 SHA512 27af2c67d4a06e0cc3f0d86f003738a8def88a274dc3eda6da32de0b5f015a8e13f315ae93efbcec07cd9b95fc9f046786336f2a1b9ac9f5478610a440cb9964
 EBUILD cmake-3.20.2.ebuild 7042 BLAKE2B b60e9f4a8bcb96c74db8e221b28f49d7a641cbce8ca954af4f2ea93e118c68b6d6028bdab91ea7907cd87238f7d2f85862866f607fa738674315a0d51e069b70 SHA512 b95e61889cf487d3f7977b740a5857f2c4130ae8c843e2b74f38ebede2bcd3f9d9a1fa7311058c65d075eddea128e3390eb55b5f9068a57142c357290413b74f
 MISC metadata.xml 460 BLAKE2B f1a7e1709a6b9975ffbc377c8b4d1ea8a01f52ccc139693c8e427150b7559ecc867b3e55fb4bc95fe342a2335fe5e13c69f4bd74ffbbf302c83872c65963e73e SHA512 fc562cd5f336101d16ca30a5b3e9b99a6e51ec9d7aa503f20ce278f44d5810286fcd6b46b18073cd88ba88ee5ab4f8a0bfccaa567df09ebb722a68ab721aa340
diff --git a/dev-util/cmake/cmake-3.20.1.ebuild b/dev-util/cmake/cmake-3.20.1.ebuild
deleted file mode 100644
index 3d40c53f2157..000000000000
--- a/dev-util/cmake/cmake-3.20.1.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake" # TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja
-CMAKE_REMOVE_MODULES_LIST=( none )
-inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
-	toolchain-funcs virtualx xdg-utils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="https://cmake.org/"
-SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs ncurses qt5 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=app-arch/libarchive-3.3.3:=
-	app-crypt/rhash
-	>=dev-libs/expat-2.0.1
-	>=dev-libs/jsoncpp-1.9.2-r2:0=
-	>=dev-libs/libuv-1.10.0:=
-	>=net-misc/curl-7.21.5[ssl]
-	sys-libs/zlib
-	virtual/pkgconfig
-	emacs? ( >=app-editors/emacs-23.1:* )
-	ncurses? ( sys-libs/ncurses:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? (
-		dev-python/requests
-		dev-python/sphinx
-	)
-	test? ( app-arch/libarchive[zstd] )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-	# prefix
-	"${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
-	"${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
-	"${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch
-
-	# handle gentoo packaging in find modules
-	"${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
-	# Next patch needs to be reworked
-	#"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch
-	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
-	# respect python eclasses
-	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
-	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
-
-	"${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544
-
-	# upstream fixes (can usually be removed with a version bump)
-)
-
-cmake_src_bootstrap() {
-	# disable running of cmake in bootstrap command
-	sed -i \
-		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
-		bootstrap || die "sed failed"
-
-	# execinfo.h on Solaris isn't quite what it is on Darwin
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e 's/execinfo\.h/blablabla.h/' \
-			Source/kwsys/CMakeLists.txt || die
-	fi
-
-	# bootstrap script isn't exactly /bin/sh compatible
-	tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \
-		--prefix="${T}/cmakestrap/" \
-		--parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
-		|| die "Bootstrap failed"
-}
-
-cmake_src_test() {
-	# fix OutDir and SelectLibraryConfigurations tests
-	# these are altered thanks to our eclass
-	sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
-		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
-		|| die
-
-	pushd "${BUILD_DIR}" > /dev/null
-
-	local ctestargs
-	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
-	# Excluded tests:
-	#    BootstrapTest: we actually bootstrap it every time so why test it.
-	#    BundleUtilities: bundle creation broken
-	#    CMakeOnly.AllFindModules: pthread issues
-	#    CTest.updatecvs: fails to commit as root
-	#    Fortran: requires fortran
-	#    RunCMake.CompilerLauncher: also requires fortran
-	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
-	#        debugedit binary is not in the expected location
-	#    RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
-	#        it can't find a deb package that owns libc
-	#    RunCMake.{IncompatibleQt,ObsoleteQtMacros}: Require Qt4
-	#    TestUpload: requires network access
-	"${BUILD_DIR}"/bin/ctest \
-		-j "$(makeopts_jobs)" \
-		--test-load "$(makeopts_loadavg)" \
-		${ctestargs} \
-		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|DependencyGraph|Fortran|RunCMake.CompilerLauncher|RunCMake.IncompatibleQt|RunCMake.ObsoleteQtMacros|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
-		|| die "Tests failed"
-
-	popd > /dev/null
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# disable Xcode hooks, bug #652134
-		sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \
-			Source/CMakeLists.txt || die
-		sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \
-			-e '/cmGlobalXCodeGenerator.h/d' \
-			Source/cmake.cxx || die
-		# disable isysroot usage with GCC, we've properly instructed
-		# where things are via GCC configuration and ldwrapper
-		sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
-			Modules/Platform/Apple-GNU-*.cmake || die
-		# disable isysroot usage with clang as well
-		sed -i -e '/_SYSROOT_FLAG/d' \
-			Modules/Platform/Apple-Clang.cmake || die
-		# don't set a POSIX standard, system headers don't like that, #757426
-		sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
-			Source/cmLoadCommandCommand.cxx \
-			Source/cmStandardLexer.h \
-			Source/cmSystemTools.cxx \
-			Source/cmTimestamp.cxx
-		sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
-			Source/cmStandardLexer.h
-	fi
-
-	# Add gcc libs to the default link paths
-	sed -i \
-		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
-		-e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
-		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
-		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-	if ! has_version -b \>=${CATEGORY}/${PN}-3.4.0_rc1 || ! cmake --version &>/dev/null ; then
-		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-		cmake_src_bootstrap
-	fi
-}
-
-src_configure() {
-	# Fix linking on Solaris
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
-
-	local mycmakeargs=(
-		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
-		-DCMAKE_DOC_DIR=/share/doc/${PF}
-		-DCMAKE_MAN_DIR=/share/man
-		-DCMAKE_DATA_DIR=/share/${PN}
-		-DSPHINX_MAN=$(usex doc)
-		-DSPHINX_HTML=$(usex doc)
-		-DBUILD_CursesDialog="$(usex ncurses)"
-		-DBUILD_TESTING=$(usex test)
-	)
-	use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON )
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	if use emacs; then
-		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins Auxiliary/vim/syntax/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/indent
-	doins Auxiliary/vim/indent/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/${PN}.vim"
-
-	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
diff --git a/dev-util/cproto/Manifest b/dev-util/cproto/Manifest
index 19f9c025602e..7886a75dfef6 100644
--- a/dev-util/cproto/Manifest
+++ b/dev-util/cproto/Manifest
@@ -2,4 +2,4 @@ DIST cproto-4.7r.tgz 178234 BLAKE2B 83198fda34413253c7396e0171e3675642c664044b5a
 DIST cproto-4.7s.tgz 178765 BLAKE2B d9c990e0e71851774bbedfcd2ee6119efcee5c32d8e29ff3e0cb7762f03900546e646745712e77fa66379bb4b76f9c5378608e5e1f1c7c176ac2e20448be2a6d SHA512 1ec46356dce91a504ac04b6220034bd53f736580bf92d9939af66f548c50e519b8959c9f1396227e14e668e6c73a4e771af6e8bda75f97d0ccc58a1381e4ddbf
 EBUILD cproto-4.7r.ebuild 422 BLAKE2B f5495bf978f1a1a03d907edc7d70e4fe808fa2b278808fef8be397e44e5d42cbe1478d92268196aedaa9f57fffdcc4f59c4aa8445420ff63b8de8b475d5a43c8 SHA512 ca832bfcc8415386be6577cc2cf8864d844a8cae97bc449450315c27e432198693a0b15f553786eba3bdb865665f00dd71a56750c4a839073e4f445c96e1992d
 EBUILD cproto-4.7s.ebuild 422 BLAKE2B f5495bf978f1a1a03d907edc7d70e4fe808fa2b278808fef8be397e44e5d42cbe1478d92268196aedaa9f57fffdcc4f59c4aa8445420ff63b8de8b475d5a43c8 SHA512 ca832bfcc8415386be6577cc2cf8864d844a8cae97bc449450315c27e432198693a0b15f553786eba3bdb865665f00dd71a56750c4a839073e4f445c96e1992d
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+MISC metadata.xml 266 BLAKE2B 93882a3947e075a136fce74475b88620c53ee3fb6a75e83812172b61a8146a657c28eea67c8dbb3f7a4afc55b8cebd48ad83a77418de2b70b06a876674119da4 SHA512 baaee50267216c9d1cc7999e96fbf85ac21871bbe71159d5b32c99757f2a69e56a2bd055a9b6ab27bea034f9ce6458451c1fc2c42192c3c3e5f1743bf973ee21
diff --git a/dev-util/cproto/metadata.xml b/dev-util/cproto/metadata.xml
index 6f49eba8f496..d8d8b11f5ba5 100644
--- a/dev-util/cproto/metadata.xml
+++ b/dev-util/cproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<!-- maintainer-needed -->
+	<upstream>
+		<changelog>https://invisible-island.net/cproto/CHANGES.html</changelog>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/d-feet/Manifest b/dev-util/d-feet/Manifest
index 6cca0d7f7057..0c7c9e1d551d 100644
--- a/dev-util/d-feet/Manifest
+++ b/dev-util/d-feet/Manifest
@@ -1,5 +1,5 @@
 DIST d-feet-0.3.14.tar.xz 177064 BLAKE2B be1150cead543dab3daf1c8beae4047d3c32e60dbf9a73a50ef95fe62cbafbf6af9ab174c7f9128212b0d33aa111545b598c6aab6d359625c94f0029ca5f1a20 SHA512 1ea3bd2251693884592d375f1459681043b5185c341299dc28cbc8e4e05f3ff3a423c051b650806f6b930d8b89e0d751983ada7ad9a74b380f74f3205125b1b4
-DIST d-feet-0.3.15.tar.xz 231672 BLAKE2B c00352dcec6ef753d888fb7255dfe614a848012aa7b1ed2269ad2f21434219315e10510a6cc60f08108d7d9332a1b5b6cbb73978b9746d3939bf880ce12f2f34 SHA512 c8ac20b91dfa5fea2282099a772c3668ebe75b0e4977b08adc3ee9591e00e391398835af5486b32d8d65e558c58f55cc26523b0e4a3ff1745b722ee90000de87
+DIST d-feet-0.3.16.tar.xz 237888 BLAKE2B b4773b781c53feb11889b49746e714a42a15a85daeb16dcd5235609fb6105c0b1a3ebeeb4a08830de9067f1c193702b31fcbfc67190eb2f901907b96acfcadbc SHA512 ff4db968cbd679e2065c614d538187fe3c56118b44638771ec9f7472bdba4a798dc682565f520a8680a8001ea39ce88555b07cda172e60f88eb6bdf1e00b5a6d
 EBUILD d-feet-0.3.14-r1.ebuild 1099 BLAKE2B 63d29b6eed4e7408d907adb67de690e6d671603a01fb4398729c1bdfad7264a3ba89d0fd8d921e2231320a8cb7b7c42ed274e4075df541d6d788ffb439e4f451 SHA512 2c0a8d75d8254d9e42b0d3723584af4a96215e44713f9a2b206d157be859b9324efe52437ed66d101e2e4f1d958601b5374ee69edbf193a46bf83596f6cc3529
-EBUILD d-feet-0.3.15.ebuild 1001 BLAKE2B 1e14aa076495f94de6a0642ac2318b6e1ef55fea4e93cf3cd659eef78aa32afb6c703a0f098ae4e408dd5a159e45bfbab535f4da46299dff891e93bfcfeb41eb SHA512 a55820743a2c37357429968c81837ba6078aeba336799be569f3f1949d704cf00fc8033ba0f4e7d2ab527c81dc3cc31dc9396f387ca41a71923d987c845d9b91
+EBUILD d-feet-0.3.16.ebuild 1025 BLAKE2B 6d9bcb7b555421c523000d4d0448b9564fd30b2930f7880ca8fd1f53dd5e5121df46eaf52b3aeabf9b88eaea4969faf6d7b9ad22b7a5890b5addd9fa62d8e88f SHA512 b092bd7e545a19e34b82c7eeab4eee6b94a6ddb3a37e56f347b25f6d1aca6661911c8933c3ca0bf7e0600d180c28ecf343b836bee3cd68039c441642a418d20d
 MISC metadata.xml 251 BLAKE2B c20c56e3f057e8bba258876f96b8ef08720698ee3aea60b765a79b1ff134df44036e6a230e071bdac6e5350a3b494975859db42c9693cbf165627bfecc566efd SHA512 0f975a0edfae95b6d15e292492de323063860e21caa4cc1e0ad70509bc3d3ead872daa50c66817efc9a8820e565ab9126d11f20d5daddf5f86b2e96100a4b9b1
diff --git a/dev-util/d-feet/d-feet-0.3.15.ebuild b/dev-util/d-feet/d-feet-0.3.16.ebuild
index 7ffd4b2190b4..ba12cd342830 100644
--- a/dev-util/d-feet/d-feet-0.3.15.ebuild
+++ b/dev-util/d-feet/d-feet-0.3.16.ebuild
@@ -40,6 +40,7 @@ BDEPEND="
 src_configure() {
 	local emesonargs=(
 		$(meson_use test tests)
+		-Dpython="${EPYTHON}"
 	)
 	meson_src_configure
 }
diff --git a/dev-util/dialog/Manifest b/dev-util/dialog/Manifest
index d05d26681414..3a019a7c417c 100644
--- a/dev-util/dialog/Manifest
+++ b/dev-util/dialog/Manifest
@@ -1,3 +1,5 @@
 DIST dialog-1.3-20200327.tar.gz 547962 BLAKE2B b335d8b57d9a9f3a7e303aa3b2c64736007b66618a79c79368d9dba20a8123813cdeb7d0643bf7c6d147314963ff469b6e41d2378fe9181081fa543f0aca50f2 SHA512 c8c7ccd86fa189a2b6739320f59f127512e53f908ed257280099f8c45754da98d2095835d0c14090cd071af0ed6e8ff95f9938f5ca8027b0b7001c7fd746fe59
+DIST dialog-1.3-20210324.tgz 561235 BLAKE2B fbeae52e207def0b9ebcd9669f9321a711be82d0b6e163a94adaa21192a8fefa67255cd8b0a0121559728f4e5108ea8a90992a64d39fd0fa0f32e201de11f5a9 SHA512 6850485de5ffb4b5b702be792381b1e2c3e3e74143474b9d96f418ff755e17bd8075f1efab950cf0ca84fffb61c2373526d3607f2f1805b4056aac0ea6831069
 EBUILD dialog-1.3.20200327.ebuild 1180 BLAKE2B e78b39cdfe37a0e49cd2db3299e5688802e692cb264842d7414b9fb1318117bca20e144137ff452feba85bb8c649e53691cfb010ad852efb1d8e49b56f356d2f SHA512 ec810cb43d692cec37720782c8c664923b0326581c1292f118e6bf061d7425b2e4a2bb4223d21315a3e5c9d6d30d9537949f4464d6445474343d47d655c4f190
-MISC metadata.xml 351 BLAKE2B 7f75a5909f8c405476b601ef0074a04daf1d837279462addc59c9f6b2b1449e46fd1d09d6a43ab12a6b89a2bc34a08c0d39cd10b9ed33914ac0c3af918ff6614 SHA512 b4a6309807d74355be8a695b9882da53be8c90bca68c6bab292280341ada808b5c9ebbdc50ec7bb97f25e9467edab2a4dd83cee02e0e74a88ce342f760e91d6e
+EBUILD dialog-1.3.20210324.ebuild 1190 BLAKE2B 9f7962f4c02cc7e74683b1c4aea2e77bb773642715dfcad8d348d47ce116c968f18b38159b83007846da8c3091b14d6be80de1a1e3e39c8bab6453f1cd4f0b11 SHA512 95e959df5c92f2b02fa7e1f16a13f8e1b928d272407c442743b82647fd5d8b7e1dba003da554220215e6e285476b22f18e150b0e3de16d047a6357990226bd41
+MISC metadata.xml 460 BLAKE2B 2a2b2180cab325004ef2543c1e4cde0d98ce338beaad156c6b114f0ef49b3d726ad8f85974a681b596e8c68dd2433aae64ce38d8b47e0d52441bc1581bc35149 SHA512 f1c8215f8865105bba71efe5516742f694988b4421a3ea3ec07569f5e40cb50caddfe478c2bd5bae1b0579316fb7fc3ae361d19c3b33c6572e31239d927b3fc6
diff --git a/dev-util/dialog/dialog-1.3.20210324.ebuild b/dev-util/dialog/dialog-1.3.20210324.ebuild
new file mode 100644
index 000000000000..49c4faca4039
--- /dev/null
+++ b/dev-util/dialog/dialog-1.3.20210324.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P=${PN}-$(ver_rs 2 -)
+
+DESCRIPTION="Tool to display dialog boxes from a shell"
+HOMEPAGE="https://invisible-island.net/dialog/"
+SRC_URI="https://invisible-mirror.net/archives/dialog/${MY_P}.tgz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0/15"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="examples minimal nls static-libs unicode"
+
+RDEPEND=">=sys-libs/ncurses-5.2-r5:=[unicode?]"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+BDEPEND="!minimal? ( sys-devel/libtool )"
+
+src_prepare() {
+	default
+	sed -i -e '/LIB_CREATE=/s:${CC}:& ${LDFLAGS}:g' configure || die
+	sed -i '/$(LIBTOOL_COMPILE)/s:$: $(LIBTOOL_OPTS):' makefile.in || die
+}
+
+src_configure() {
+	econf \
+		--disable-rpath-hack \
+		$(use_enable nls) \
+		$(use_with !minimal libtool) \
+		--with-libtool-opts=$(usex static-libs '' '-shared') \
+		--with-ncurses$(usex unicode w '')
+}
+
+src_install() {
+	use minimal && default || emake DESTDIR="${D}" install-full
+
+	use examples && dodoc -r samples
+
+	dodoc CHANGES README
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-util/dialog/metadata.xml b/dev-util/dialog/metadata.xml
index 0c448e73a433..05ae37b868f1 100644
--- a/dev-util/dialog/metadata.xml
+++ b/dev-util/dialog/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-<email>base-system@gentoo.org</email>
-<name>Gentoo Base System Project</name>
-</maintainer>
-<use>
-<flag name="minimal">Disable library, install command-line program only</flag>
-</use>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System Project</name>
+	</maintainer>
+	<use>
+		<flag name="minimal">Disable library, install command-line program only</flag>
+	</use>
+	<upstream>
+		<changelog>https://invisible-island.net/dialog/CHANGES.html</changelog>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index b4e247b5312a..5a8ea018c98f 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,3 +1,3 @@
-DIST diffoscope-170.tar.gz 1569521 BLAKE2B c036ce959f3d36eefbb2a6638c0e34ccb554c3999a17e3f32ada5d10580c96d42ffd8da59ffd21987648e185ce42afa7540129a203d65d94026e2a001fde9b9c SHA512 c569d223de8219348d856647d69b3e7bc04ee0740e54b85a1a91580ea91e550bcf23592372068a2dd8d166c79ae2f266b63173c1c2c75667747b23c028aa5d57
-EBUILD diffoscope-170.ebuild 2196 BLAKE2B 34de6fd45de22af7b90709f728078fa57fd92f58e6fe2f8223ff2a6e57ea91e9fefd016ca3013328f1fc9e54d1f3d76ab3eba668aa7ede530ebf7bc43a6f0579 SHA512 80fffa1ea26a25bf7d1e55b558d40eda4c8289743d5681a0c95ff5bee867e34d83a0f6efb78ad92dfa322a3f35abcd774ad4e09ff277f01700698fa6c57dd2b9
+DIST diffoscope-174.tar.gz 1590794 BLAKE2B 8ff40a301571f33953aafb431081a34e1c84fc8b222869fa0a7967f842e950727467af38dfb733257637a946b313bdc72a176b23ea1a36f977bdc8484e1d01e7 SHA512 8bc51c902ca24e08aacb96e3f225837f1de926746feddfbea7cd6bb947710c29ce3f32a98e032fb417d7938a86ec9de2bf15f556e7887571480facd6ce63acd3
+EBUILD diffoscope-174.ebuild 2196 BLAKE2B 34de6fd45de22af7b90709f728078fa57fd92f58e6fe2f8223ff2a6e57ea91e9fefd016ca3013328f1fc9e54d1f3d76ab3eba668aa7ede530ebf7bc43a6f0579 SHA512 80fffa1ea26a25bf7d1e55b558d40eda4c8289743d5681a0c95ff5bee867e34d83a0f6efb78ad92dfa322a3f35abcd774ad4e09ff277f01700698fa6c57dd2b9
 MISC metadata.xml 2137 BLAKE2B 70393ec4166e001aaeeb4c10958693ff090b04e7e5bf7eb760746dc4920e0554724f61e1a073f008660789438bec33378796ebc117c1cedcac5116b0b1d32142 SHA512 a1f5648c7593f16db4df87b750360034647704b1809ed52d585d49b5769ee8e190ff853941d2739da7c5f514ef02442b3b3ebf55fb21541e7bc551c720a305d0
diff --git a/dev-util/diffoscope/diffoscope-170.ebuild b/dev-util/diffoscope/diffoscope-174.ebuild
index a189ed464d44..a189ed464d44 100644
--- a/dev-util/diffoscope/diffoscope-170.ebuild
+++ b/dev-util/diffoscope/diffoscope-174.ebuild
diff --git a/dev-util/edi/Manifest b/dev-util/edi/Manifest
index bf06acd6514f..439536525128 100644
--- a/dev-util/edi/Manifest
+++ b/dev-util/edi/Manifest
@@ -1,4 +1,3 @@
 DIST edi-0.8.0.tar.gz 1076134 BLAKE2B b422493a1786f6dd2865adfdc88d756e7ced7681d8ccfbb6d0befcf04b035435134b168752d47dc25f86b1ee59c659a23b04b392787f8863f772e90a5f6f55fb SHA512 88d4ff3f5a4c56c3de7392024022a505907b6d6a16854254f227e457157fd7abd35eff1916842c77fcd6b81d42ec2fa15deceee632bf67d22ab272f8e755215c
-EBUILD edi-0.8.0-r1.ebuild 1336 BLAKE2B 16d75dfbb607cd10af2d707936a72a7fabac3f0f0e87020f7811b3db684b911e07c1ed4563b0094824e064d6c1d741ac516072e8a3b82a0eb9f22743be4d42de SHA512 376fc6f5a5069aa200373a4c521a35d6fbcb3a98767f05df1c5e1928f5f43d8ba73db5eab34365e70e07326d9dd5375c405b3c8c292cd2841d3bfa6c490586c2
-EBUILD edi-0.8.0.ebuild 1326 BLAKE2B 8d19fb97573d407745245e831b17773c5bee155793a57e1cd52476fbe21df94e31348a4dda50542930167168282f9aee8d0a35638c1e0d1439a2767a6ae748ac SHA512 c62d9ac269f371c58b0e582a447d76a610a1c0dcdeb22c08dfb5ede0d4ba11e8f9f5c99374b6a7be11c10f7554641cbff3cf2c68553fd9667545e0397b55fad5
+EBUILD edi-0.8.0-r1.ebuild 1334 BLAKE2B 0221ed226091ba13f7a89469274248aa8a3ee997eb485244258ed67645037cd50efc8f557183d05677178a3c817067824ea07566241add4974640e8a14ba7004 SHA512 f83cc9c36ae10e12cc9e1b63682334386c9ec4d11f9c7b7814132486058a5386147373628d55075379646d3ad5c64b59357a3373b14b97ad74894352b7e49ea2
 MISC metadata.xml 483 BLAKE2B a74b8edb150be764ce0e5a23ca284ae487c98c192be96842286dac979a2c32a34aab96a0a285e87f486ed73e329c6c21d0604ac3ffe41cc4f83feaef18118646 SHA512 85bafe3c82b7d5e0a6f5dacf976e8a0f2cc5d336ac769a1dfb2bb3730ce057a6762e845b4a2a35832b9cf1d3d7c4e6c71be5b5613539e7957b0809fbb3f4ac0f
diff --git a/dev-util/edi/edi-0.8.0-r1.ebuild b/dev-util/edi/edi-0.8.0-r1.ebuild
index 5f9ff81adc18..920db6c168b1 100644
--- a/dev-util/edi/edi-0.8.0-r1.ebuild
+++ b/dev-util/edi/edi-0.8.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Enlightenment/edi/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2 GPL-3 LGPL-2.1-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="clang"
 
 RDEPEND="|| ( dev-libs/efl[X] dev-libs/efl[wayland] )
diff --git a/dev-util/edi/edi-0.8.0.ebuild b/dev-util/edi/edi-0.8.0.ebuild
deleted file mode 100644
index 7d927fc23d22..000000000000
--- a/dev-util/edi/edi-0.8.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit llvm meson xdg
-
-DESCRIPTION="An EFL-based IDE"
-HOMEPAGE="http://edi-ide.com/
-	https://www.enlightenment.org/about-edi
-	https://phab.enlightenment.org/w/projects/edi/
-	https://github.com/Enlightenment/edi"
-SRC_URI="https://github.com/Enlightenment/edi/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 GPL-3 LGPL-2.1-with-linking-exception"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="clang"
-
-RDEPEND="|| ( dev-libs/efl[X] dev-libs/efl[wayland] )
-	>=dev-libs/efl-1.22.0[eet]
-	clang? ( sys-devel/clang:= )"
-DEPEND="${RDEPEND}
-	dev-libs/check"
-BDEPEND="virtual/pkgconfig"
-
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-	use clang && llvm_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# fix a QA issue with .desktop file, https://phab.enlightenment.org/T7368
-	sed -i '/Version=/d' data/desktop/edi.desktop* || die
-
-	# fix 'unexpected path' QA warning
-	sed -i 's|share/doc/edi/|share/doc/'${PF}'/|g' doc/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-D bear=false
-		$(meson_use clang libclang)
-	)
-
-	if use clang; then
-		emesonargs+=(
-			-D libclang-headerdir="$(llvm-config --includedir)"
-			-D libclang-libdir="$(llvm-config --libdir)"
-		)
-	fi
-
-	meson_src_configure
-}
diff --git a/dev-util/gi-docgen/Manifest b/dev-util/gi-docgen/Manifest
index 48074622dfee..a35fdfb084c8 100644
--- a/dev-util/gi-docgen/Manifest
+++ b/dev-util/gi-docgen/Manifest
@@ -1,3 +1,3 @@
 DIST gi-docgen-2021.5.tar.gz 1251568 BLAKE2B 6dfd34ba97881562e5474874e3d51214b9536356d02c341ac2e7b135c49c5948114e0c78b2d53678ca09006238ec5ead50a1c0a50328ea5392960cd8c434c8e9 SHA512 30b91c2edf4be92eb4164ba64433948d2ae1c2857e54ac07a71aa1393d2ab61b77371c03504b521049f1841093ef3384788eaffab4208ef4e6fda8f254736ec6
-EBUILD gi-docgen-2021.5.ebuild 862 BLAKE2B 3c83e342d5b37a57ad467d1390ad76078285f19d2f4ee87c788ffb17e72d92d66d260fcfa51609bbc008ef8df7ecba13a5e6b628837c4903362e7407e3a0a9e7 SHA512 3c71ffaab8a8b1896de05682faa1f426c6c5135e95e3f2356fd8ca549f5ca25447b62b090ce4841a830ece42294554d19c2365b0c83b2789728f0ff403da3cb6
+EBUILD gi-docgen-2021.5.ebuild 890 BLAKE2B 08b27faa56cfbed7a500ec4679e6200582a46d38e30224a4f10d9d1a6bd0c19d68dc090a305a2d531213a48430a9637fe34c82f9fd1210487318c54a9775717e SHA512 e51a34653cd9b7b2f96a858e1c57dec1b3524d6026df987d11bf255cb9b1004c0328096c4216d46855cb8b6f523d01c41960da093ccc94f2daf7372562639e65
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gi-docgen/gi-docgen-2021.5.ebuild b/dev-util/gi-docgen/gi-docgen-2021.5.ebuild
index 69ed1b9834b6..6517d40e5a77 100644
--- a/dev-util/gi-docgen/gi-docgen-2021.5.ebuild
+++ b/dev-util/gi-docgen/gi-docgen-2021.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 GPL-3+ ) CC0-1.0 OFL-1.1 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest
index bf116eb19e14..976a25f94031 100644
--- a/dev-util/glade/Manifest
+++ b/dev-util/glade/Manifest
@@ -2,5 +2,5 @@ AUX glade-3.14.1-doc-version.patch 853 BLAKE2B b7cad3cc9d49cfe24189ba21bffaec2c5
 DIST glade-3.36.0.tar.xz 4466808 BLAKE2B ebc93c9471225782bcbcbafc4a475638e77ad763d607188d95e8ac77b3de70f76fefe963027bb6b32ae71adeb1daafdb1a2c98363b25030d83f20f767613f68e SHA512 c984613ade26e3fe68a700a48cccadf5ac96eb716a6e90aad36f3de684faeb607d9aaf112d74a048cd33e222a02388ee6583ca915648486f0259cc805e16d243
 DIST glade-3.38.2.tar.xz 2709224 BLAKE2B 2bcd447b90d6e67abc44dd273f0f5d7fc1d6848ef0bd878481f2c10e8846828e63fbf9c9c96e5effe8126b4aec7eb05886606ca1dc5fb94943bc5d1d8d0ef4e2 SHA512 2df8c8363206905663cd3ac9196da44445425a888b64f1b3b3ac6cd41e14c4a82a5d2c299730ef0606c3970a04dd8f245bb5639218794eb67dcbd26fae17565e
 EBUILD glade-3.36.0.ebuild 2291 BLAKE2B e14a55178057ebc2f8feaa1be8e1f1fdcaa2eaca28b16bd6f2641f6683d99aa15fdf4dbbc012006bb212354bcb43eafbe7265f8e64c8926b9f8e8e2b81634c3e SHA512 fc273664dfc8f9766bd92a8314ff786a2c232727d62ef0160e547728758e332e4f3ea1857527a3a86c0c07908e60a10d91aa49b2c982887d06e8f0f6e990e720
-EBUILD glade-3.38.2.ebuild 1900 BLAKE2B 773d69739d1ae310e6867bc4c15ec4ec0a24f7ce772c766e478edf99c2822692ae971e5701e7a000b24c6842fdb8dcb30c353076df0f4e80bb1a91b30ef022e1 SHA512 ffd37e23795ecaff26afaa0fb82a8f89055bfddae95b969cd40839fd69f94b4824fa286d1374e147001cb312550c8db585830aeb16dcf1dd88d0022e14e649cd
+EBUILD glade-3.38.2.ebuild 1895 BLAKE2B 3925044e5d6f9a3cc030362770e05ab40376c8d83a06cb7e9964f5b2496afa8f71fa32ecb435009c2ed7fddee24353ccaf35bef5b47cd8b4b40a8dbf19d23bb2 SHA512 44459a61b2b6b42e2f521d85e67102f55a8df73f8544605445be4e274d19008b103a505c242ccb81555a17a1e7fb38bc6382a0f676d64f1ac31d2e934c8d28c6
 MISC metadata.xml 442 BLAKE2B aff6c373736411da1244bc230767cce9e4edd0d10f51f4157f1cfecbb134b54f282d2504901b621e988e7973fc43e5253d6b0aaefa3c3015ddace6c0790ba13b SHA512 c819e5ce58646f681aa536d6c859bba6e847aa27ba651ea0574bd81008030e359610eb68663a610a20a899a8aa4e94fa215a4085524eed09ab84d5c50fd9a536
diff --git a/dev-util/glade/glade-3.38.2.ebuild b/dev-util/glade/glade-3.38.2.ebuild
index 365fa2842742..ebf254857d28 100644
--- a/dev-util/glade/glade-3.38.2.ebuild
+++ b/dev-util/glade/glade-3.38.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://glade.gnome.org/"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="3.10/13" # subslot = suffix of libgladeui-2.so
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
 
 IUSE="gjs gtk-doc +introspection python webkit"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-util/goland/Manifest b/dev-util/goland/Manifest
index a4f41b35b9a6..31c75cdea35a 100644
--- a/dev-util/goland/Manifest
+++ b/dev-util/goland/Manifest
@@ -1,3 +1,3 @@
-DIST goland-2020.3.2.tar.gz 484904300 BLAKE2B a60825d0b994cb16b9a41fe228787e0dba541f34e613cc88b040b2b80d044a9b45a69fb1346ba2a919241cc5497b5cc398b571344a790d173dbb60333d536b19 SHA512 2ea02dbc8ba0338ec73cd35c6eb0a70f5f6b6487d7d58629ee1e454ca5b22b233dd5fb28be64e5131be291a4153910b6ed2ddadeb1f8f4ac1ce2f63b22c6b233
-EBUILD goland-2020.3.2.ebuild 2503 BLAKE2B 65b09fe6619840071b7c1db9f239f7d3bcb392279467b7796bab1a2e4921ad62b42223a84449754ea19bc115feb1ccc95af8b8dec4b7d7b0e8d43fc4376a7890 SHA512 0101e3fe3e5d6987ac89094e30e023c562ec916dcc087f2df77c385f16438bedb844885ebdc3d7064e2a57522f59a4273a4611b64c3eb2775434a8afd567d9be
+DIST goland-2021.1.1.tar.gz 544517245 BLAKE2B 2c7e11f6a3fc4ca779d4273befe93d89c53aaa06a650b4181295c2f74d0679ecd8ecfcb44a6394a6173ec3b7379d57df671ef54c0af4b75d90443c4804f2d6af SHA512 53b49984c3d5ecf7c9497a6a958656c26beda122987442cb7a37a95ddf1514ec5d31fcccb3babb5bfe394bd636231901a34dc9a1a25cc861a8be86d1db02fd16
+EBUILD goland-2021.1.1.ebuild 2503 BLAKE2B 65b09fe6619840071b7c1db9f239f7d3bcb392279467b7796bab1a2e4921ad62b42223a84449754ea19bc115feb1ccc95af8b8dec4b7d7b0e8d43fc4376a7890 SHA512 0101e3fe3e5d6987ac89094e30e023c562ec916dcc087f2df77c385f16438bedb844885ebdc3d7064e2a57522f59a4273a4611b64c3eb2775434a8afd567d9be
 MISC metadata.xml 244 BLAKE2B 2ac557d4fb04230c7b4f706b52203ab6dc62d90aebc8e916561e6e3f6e41bf61bac231a0e7afe07fb18752177c6163b79fee124a171c3e8933041f4648db3a22 SHA512 da08729fbf0eceb858cadc8413dd857600ab595860ca483054e4d1422e3cacc52ce94f89d633a25c25d6b30df4a48ac7de011731418072238adb43bc8e7b3f3f
diff --git a/dev-util/goland/goland-2020.3.2.ebuild b/dev-util/goland/goland-2021.1.1.ebuild
index 86cbae508305..86cbae508305 100644
--- a/dev-util/goland/goland-2020.3.2.ebuild
+++ b/dev-util/goland/goland-2021.1.1.ebuild
diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest
index 0566ddd818ca..54cc7551bf76 100644
--- a/dev-util/idea-community/Manifest
+++ b/dev-util/idea-community/Manifest
@@ -1,5 +1,5 @@
 AUX idea-community-jdk.patch 379 BLAKE2B ac892a7e52d5c592b193d80a7933529f15e21982feb4c4a4b5c8286c7479a342a0121e5b464922cac68e9b7c8e3f7a4293df42d30e6907365116e736d9c862b6 SHA512 f984855440d2d4b495d8bf1b1c3172c9842c096e8fda148d8b2d1980bc3d03061954db06f73513998e52bc161c35abdcec2b88e3b31b4e36605714cb85a66fa4
-DIST ideaIC-3.1.211.6693.111.tar.gz 652142239 BLAKE2B 7ce39420fd42c829ce1e742be20f37a255c3452740e77ee276495932dcab2db50aad1ce43a27aff6d02821a5e9d9c69d782c6a35ce7621d6b2abf14e29c45808 SHA512 cb7e8bf31f7ce87ab29483086ed3cbb5bd2a638c9179f9131de0344d97947950abecd5aec1d98e881434bb2f72aafd440cafc358829db3516d0e960eae722da0
+DIST ideaIC-1.1.211.7142.45.tar.gz 652283495 BLAKE2B 601111752b8bab9bc4988c6f5f12a841cd46a2ce504772a82968a094f471566f9cd6f15731c30dca6d332e74fbd3cbeef026d05587fee9ad65ebc3c5921656ec SHA512 ccfb941b074f04701bb9ad3a4e4001582fac268048bb07ab7958b5f18b10f2385e0a242d518f525e2550b9da901a052653cee6147edf6559fab1978b8dfe6fe9
 DIST jbr-11_0_10-linux-x64-b1304.4.tar.gz 201507596 BLAKE2B aa83f396dd37a96c769806c3f95a4c78bcc31e9c8eda047903cbee932a84029ad7133fc03496a248c017795ec45ff42f30f3860780a00d9d766ac7b262019905 SHA512 0de75baac30dad42927fa0cef3b78dc183f4dd317f8426021dd51cf1288680bbc65ed934e867dfa3ca9397d9bd5cff4b4d6896eb4878323c8b0aaa2b39d33d82
-EBUILD idea-community-2021.3.1.211.6693.111.ebuild 4163 BLAKE2B 44b21c905764e910a07c75d978f82f1de51b0ad4e39c1122f34cc8749bf108ce6c0a94738ec0873e8762d3d6f1732862a742e00bfbfd52831bbe8d645183afa8 SHA512 6b894d679f8de2ce536e4f051b3246e51e922d643a6536f890938c3d4861747a13e2ecd92cfa315337547204589395af2f32e56f4a8c2002f31b6600579afd03
+EBUILD idea-community-2021.1.1.211.7142.45.ebuild 4161 BLAKE2B 83f0a55bb39c19e5ec15d07b65d7d853d3e922269945514fd05813bcb576595e3959fb0095dabe680b558750937d2334c61f156b5aa7b2945aee0f7d5fcf576a SHA512 2c4493cfdc58e23237f5de7c724bace15d566a4025e590dfc954e2342c6a4c6cf7af4f1bd1ddde62f8e4bad06cac472dc59377545f8142ab4c2eb202d5dba6a5
 MISC metadata.xml 453 BLAKE2B f244aa814b9eb5c6b00f6fea725a344a7413710b1fae03edc4590dfa9c102872e0e4d1cdb669f739854d7fac351002f7819aec371f3bd0eeef2fdd4aa2c8f60b SHA512 e6c5f1094ca8ba70b9bfd5b028f11542c8150cea0b543b939da144887043e4ee20ddf6cc89641329bde7456492d6def6f0e72092b7fa21095463a20aba9e0b03
diff --git a/dev-util/idea-community/idea-community-2021.3.1.211.6693.111.ebuild b/dev-util/idea-community/idea-community-2021.1.1.211.7142.45.ebuild
index 35a6a1bcf8ed..9d686a4fb000 100644
--- a/dev-util/idea-community/idea-community-2021.3.1.211.6693.111.ebuild
+++ b/dev-util/idea-community/idea-community-2021.1.1.211.7142.45.ebuild
@@ -6,13 +6,13 @@ inherit eutils desktop
 
 SLOT="0"
 PV_STRING="$(ver_cut 2-6)"
-MY_PV="$(ver_cut 1-1).$(ver_cut 3-3)"
+MY_PV="$(ver_cut 1-2).$(ver_cut 3-3)"
 MY_PN="idea"
 # Using the most recent Jetbrains Runtime binaries available at the time of writing
 # ( jre 11.0.10 build 1304.4  )
 JRE11_BASE="11_0_10"
 JRE11_VER="1304.4"
-IDEA_VER="2.111705284.1737970125.1619718960-2104634719.1619551776"
+IDEA_VER="2.236075331.371301151.1620596360-682219170.1619910833"
 
 # distinguish settings for official stable releases and EAP-version releases
 if [[ "$(ver_cut 7)"x = "prex" ]]
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index 25c74c75b8f1..075148ebd7ac 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -3,7 +3,9 @@ AUX jenkins-bin-r2.init 1782 BLAKE2B 25c78b64308be71d605f3c4f2d33c5cf1074ab431e2
 AUX jenkins-bin-r2.service 566 BLAKE2B 38511fddc783a70ae3deab70526c737a883ef090bcfb20216658b0775667022782f3ee8a6638515b46e6a4df96228fb2368521c74a0ddca2f121e9170549df8e SHA512 87b59349edcb1503e6c91440327092732f0dddb8cc35e4576c81da55e08a2ad67d462a4d871c46da4f3ed037de8b9109d766ba36ca9acf244506d129766ed5cb
 AUX jenkins-bin.confd 998 BLAKE2B 5c44e37118e15fdd76fc7eb0e10e06683828d3efe086877a49d048334c7f94ea915040943b20ff96b7b60f983a434f1cd2c15743d2c387c86915e0597ac5ed1d SHA512 465ade6325efa05b4a150234f847ad19b9824f667fdc8f783af3d9842afc2815ee3d20dfd9566348701102bf28e1e0627af27ae43d055a9a6279ed638d8ece8b
 DIST jenkins-bin-2.277.3.war 70887043 BLAKE2B 4801be0af417044ca2bbd07f5768594d7cd3ea980ae3cde32bffd9bef1851abd3d7134dd748f9d539e4d717a146d4c53c04a2604ae4398653d83ce4e4fe011cc SHA512 e0d364e619e183b745e08e1e72531d59dc6a92927dcb3b3372d2575d6020e465673d91fd650ad8805260037675623655f0cde9de95c22988be514d6314ffc668
+DIST jenkins-bin-2.277.4.war 70918017 BLAKE2B 990222bedb5ad58e8a00f29194b0f201395545fa70af22485a88c55e0898abdd218e501222689abbdf5cc8f4f3dc32dae7e54198b43a8c46172501017018eea6 SHA512 eb635bc0767c242063e88aa6f91a6daa8fbf23f74333f2dd73535a7ff3a4e690e3a456fba2e92b44ee883378b783896f8052a1b26536dac5954d74a62a63597a
 DIST jenkins-bin-2.289.war 74326992 BLAKE2B 60d8523bc0ec3022cfc152c00059bd153d3d0888640a66502385fb318c90ef1b43b3cb8fb621263f440c7852ac46f796840bac4f602e7f12b6de845af2bf9a45 SHA512 76a6785346f14e86e43f0c2e5ebf2ce2dd14ceb45c780ac650374a5a15615d5256567def6db0eed87a3ca6d853bda360f011cdd7972084fc76cc3ad3d4831c92
 EBUILD jenkins-bin-2.277.3.ebuild 1106 BLAKE2B 804133edf4915210670994a35ba872924ba74b5627a64ea10373230eef31dbd350de7b6fc108685b05fb43f55b522c3e4d5418f61f727d262071c2234e09171f SHA512 50efe3ce97debf73fff1f06c97a5747cfc0e2e105cd27470c99958216b1db1ffb544171ae8baf1080b59178b6118af9fce7c348d67a61eed9945c462b3833700
+EBUILD jenkins-bin-2.277.4.ebuild 1106 BLAKE2B 804133edf4915210670994a35ba872924ba74b5627a64ea10373230eef31dbd350de7b6fc108685b05fb43f55b522c3e4d5418f61f727d262071c2234e09171f SHA512 50efe3ce97debf73fff1f06c97a5747cfc0e2e105cd27470c99958216b1db1ffb544171ae8baf1080b59178b6118af9fce7c348d67a61eed9945c462b3833700
 EBUILD jenkins-bin-2.289.ebuild 1099 BLAKE2B dbfe00baf90085bb5698d8177b2aed42707e30a8b10648b09f32b996df9368a6cfaab778efd20fc40dc0932acab808c96f1de298688bb1826a52f1b8f6c17701 SHA512 c52d261e0d89664065376ae28961aa43ba2d6b6d2073792e3c1cf4b8e7603fbfe0c58d6ff887e2ae0e70cc29bf0e2ef2d072460bc40521cc4c605419ef8ce7f3
 MISC metadata.xml 397 BLAKE2B b1a7fd87c8d5857ab102ec3d3bf5830c26c6988bb97caf89018b05e159f038c9c3a092b4f35788929d05042ac5cfd694bd03a8381686b9472880d0d205a451cd SHA512 4087fd799f4019f09103fb32d7f120e74d94715205bcc66858d11b9457774acaed37f3ad97ca0328f4ec28230a409dcfb0cbaceec142eb0a5fd3241ca35f8810
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.277.4.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.277.4.ebuild
new file mode 100644
index 000000000000..10778d0c4f4a
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.277.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="https://jenkins.io/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
+SLOT="lts"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
+IUSE=""
+
+DEPEND="acct-group/jenkins
+	acct-user/jenkins"
+
+RDEPEND="acct-group/jenkins
+	acct-user/jenkins
+	media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:0
+	>=virtual/jre-1.8.0"
+
+S="${WORKDIR}"
+
+src_install() {
+	local JENKINS_DIR=/var/lib/jenkins
+
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}-r2.init jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}-r2.service jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 485784117d41..184f0116abf8 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -1,3 +1,4 @@
+AUX pkgcheck-0.9.7-py310-update.patch 7845 BLAKE2B c530448d0019af7ba7d2f3866ed4a8d12fc84a4dfd7fdf7260fe8d84fe4f9539e116c60190bff80b518abcc6c8dfeeda2a7c46c74b1d4b999a4b4fb81efdf6e7 SHA512 e976a8cab6196b738073491b407a431611fda0bfe0c6202a3b799c8608a6404b9d607c1d4b472e051ebee23f7fc1b97caad31ef7f80144bd1280ebf2562e173b
 DIST pkgcheck-0.8.2.tar.gz 455039 BLAKE2B 282c75578cd4aa7aca3f54e9625360cde4d7146cc08a6b2bcf2f594b21b6224a18e0623055e8aa866e89583b9fd6ec12749aa4bba791f06a851b1b43fe60d440 SHA512 3377060dae6e2c49d5ae6f2dbb883da4ddeab35ecd04133635f3a91f5bfb63177497b8843445914132539efc461ce0ea89bd5d07d3cba49e0854b91d7e2f74ce
 DIST pkgcheck-0.9.3.tar.gz 460029 BLAKE2B 3ef3aa6c338c5b379e4845302aaaacc5c71679309f45985e1dfa71fb1e62760c4f94ca43d34ca4ad75ecd1f738d9bcb0140568b4e4826ee6a14586c21d0c1a03 SHA512 5613f65437e6cc1c55330eef8bc354ad2f6e325a03c8353186d17a8e9dd21333a3900f91a36c1af0767ccda56f30d425ddb848e4eccf9d20ccba3f5de5098fb3
 DIST pkgcheck-0.9.5.tar.gz 459226 BLAKE2B 23f42ffb49bb89b33d01749fede01a8399c99a8e400bd451d1577c4240b929913b13738ba5bc55f3251058e26bebb619bedfb2ec1a50733a1bd8a7c62c7602df SHA512 2a404657e9b6d48d7f99d743aaee6bd4d5aee9cb48c28f89fea46cc7c680e6d3c0351660632abcf879c5ca3569b47cb22c7d6a53ba17d60fe6b545b3c96b90e7
@@ -5,6 +6,7 @@ DIST pkgcheck-0.9.7.tar.gz 453478 BLAKE2B 486bae68af1757fbdb4b109b34cea836cb6dee
 EBUILD pkgcheck-0.8.2-r2.ebuild 1417 BLAKE2B 0b635b4a66c79928fd2ae21de749e456686dcd77d66e7fb413c39c0b645c3252c4eab7d77f1725b038fdcdd84d25998dcb79b9ee1a0c80b6063510d49d9f15a5 SHA512 3ef8917647484400d8a46e2942e598769e01918f381117877815535ed0dc6e683640ef49dc4cec2f5182d80c2ef06184ce823f9beb6ecc9203490a907db813e1
 EBUILD pkgcheck-0.9.3-r1.ebuild 1544 BLAKE2B f8d9c073beafcbedea2058b26420130fe065a25d57524de80caa310b03570a3ad52e6109666a4e008fc87868a708c9510164304880f5e086d14a8b6a9e06ebcf SHA512 a49b1d8d5eabd1139ef081bf374fb36fb0b6e724eac57644cf72c976271878941340774d7e8aea77ece8d185315d38f8cbe359fbc4187be67296ee09b9ab4ee4
 EBUILD pkgcheck-0.9.5.ebuild 1507 BLAKE2B ed58c351d977d491d464d896a8519d88ed1799d7bfada82c2588249ff4245b5efcb65a2df38fb3a620f5573d0fc542ee7347338c8bd58fcba22118e1f0106f0b SHA512 dff66a95a5c5ec85d886f58674b6b9bc945f2664c666105b2e8e4989a2cddcd324578ca1abcbfbd56bfd98eabc99abd222662882163a5b51d3813e8b899f1279
+EBUILD pkgcheck-0.9.7-r1.ebuild 1559 BLAKE2B 3a027528217f62b4f793f616c2d1f562ffc0a991fad0640ab136245ba86e65a000fea4e0d5c6197b3dce4b2b17063d04fa7e0ebed850cefcd99f049a806d99da SHA512 a10e103e418e85453ba40e90203e8aeaad464cd90950fce4c74532496958a02ea9f7f8f2a65ba80da72ae12b1053385d93a501b6540fab507dfb0f3eb2d8f05b
 EBUILD pkgcheck-0.9.7.ebuild 1499 BLAKE2B d902ae79522cd7d08274fc82cf0954557a02ddfcef87f023ea3905ded88b44dc1e651e7cb38b89438532f6f09a3644cd0663e085852161f9cd404cba27e5aea9 SHA512 b506c1d78a8857b3e8a4b36663126b613622cad2ba8f4b15b49a0744412428eb8dd495f57f5d8eedae0c2a400dcf5b4decd72b987d44e8c47116539b240ae3c1
-EBUILD pkgcheck-9999.ebuild 1507 BLAKE2B 195770c065ba7471492ea94d35e9cabf658921cfca255543354f96f4112bd12958d2d445f99e60c5ab71beec94e2dbd98c13f6837d67bede0ad46547a29d1b92 SHA512 ec29615b0f6c41dddc72c6ced8c3edc6e68efb093122ff4896b685189b7676a12d997fac0645ad993ebd79ca14cf285eb063275e1cc0f3297b90acf0a5f6dad2
+EBUILD pkgcheck-9999.ebuild 1566 BLAKE2B 6bb5d7ffc6d1f63444eb574b6a230d187a177593087af1c777c52a8829b19477a7afa570fda4c45f9904d8e5ffc81061ee78eeefbcfcd77a8848eb3212fc58b1 SHA512 c1ac0651030a9d7a503e361fb99031ea3f8aac891696326048a011d299764f27a8ebff9f5e7825f83aa06e2da958191346815162044e973d0418b3a2bf5391dc
 MISC metadata.xml 328 BLAKE2B b84dba717460e84f7ee3163fd8d6a5f13eb3b15dd1bb749f6ece81f062e3530988dacefadb24c1395eb36593a7ab6d868b06c8c4ee8f620a17c85faf04283b24 SHA512 5696505214a737ad495b23bfac2a51fbbc5b1e815eb6fcbabb3c6674325f05e3f6f418de05257c08935e389e47879e8a2d1b3723ec86aeb5ad97c6110fd2ec75
diff --git a/dev-util/pkgcheck/files/pkgcheck-0.9.7-py310-update.patch b/dev-util/pkgcheck/files/pkgcheck-0.9.7-py310-update.patch
new file mode 100644
index 000000000000..8bee592b228e
--- /dev/null
+++ b/dev-util/pkgcheck/files/pkgcheck-0.9.7-py310-update.patch
@@ -0,0 +1,170 @@
+From 443c0aab158e34196399073e801ae19ae0dce4dc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 9 May 2021 10:59:18 +0200
+Subject: [PATCH] python: Fix treating python3.10 as newer than python3.9
+
+Fix the sorting logic to use a combined lexical-numerical sort, in order
+to sort python3.10 as newer than python3.9.  This fixes
+PythonCompatUpdate check.
+---
+ src/pkgcheck/checks/python.py                 | 25 +++++++++++++++----
+ .../PythonCompatUpdate/expected.json          |  6 ++---
+ .../PythonCompatUpdate/fix.patch              |  6 ++---
+ .../profiles/desc/python_single_target.desc   |  1 +
+ .../python/profiles/desc/python_targets.desc  |  1 +
+ .../stub/python-dep1/python-dep1-0.ebuild     |  2 +-
+ .../stub/python-dep2/python-dep2-0.ebuild     |  2 +-
+ 7 files changed, 30 insertions(+), 13 deletions(-)
+
+diff --git a/src/pkgcheck/checks/python.py b/src/pkgcheck/checks/python.py
+index ed922215..7f0e9be4 100644
+--- a/src/pkgcheck/checks/python.py
++++ b/src/pkgcheck/checks/python.py
+@@ -1,4 +1,5 @@
+ import itertools
++import re
+ 
+ from pkgcore.ebuild.atom import atom
+ from pkgcore.restrictions import packages, values
+@@ -28,6 +29,18 @@ CHECK_EXCLUDE = frozenset(['virtual/pypy', 'virtual/pypy3'])
+ IUSE_PREFIX = 'python_targets_'
+ IUSE_PREFIX_S = 'python_single_target_'
+ 
++TARGET_SPLIT_RE = re.compile(r'([0-9]+)')
++
++
++def target_sort_key(target):
++    def iter():
++        for x in TARGET_SPLIT_RE.split(target):
++            try:
++                yield int(x)
++            except ValueError:
++                yield x
++    return tuple(iter())
++
+ 
+ def get_python_eclass(pkg):
+     eclasses = ECLASSES.intersection(pkg.inherited)
+@@ -281,14 +294,14 @@ class PythonCompatCheck(Check):
+         for target, _desc in repo.config.use_expand_desc.get(IUSE_PREFIX[:-1], ()):
+             if target[len(IUSE_PREFIX):].startswith('python'):
+                 targets.append(target[len(IUSE_PREFIX):])
+-        multi_targets = tuple(sorted(targets))
++        multi_targets = tuple(sorted(targets, key=target_sort_key))
+ 
+         # determine available PYTHON_SINGLE_TARGET use flags
+         targets = []
+         for target, _desc in repo.config.use_expand_desc.get(IUSE_PREFIX_S[:-1], ()):
+             if target[len(IUSE_PREFIX_S):].startswith('python'):
+                 targets.append(target[len(IUSE_PREFIX_S):])
+-        single_targets = tuple(sorted(targets))
++        single_targets = tuple(sorted(targets, key=target_sort_key))
+ 
+         self.params = {
+             'python-r1': (multi_targets, IUSE_PREFIX, None),
+@@ -327,8 +340,9 @@ class PythonCompatCheck(Check):
+         try:
+             # determine the latest supported python version
+             latest_target = sorted(
+-                f"python{x.slot.replace('.', '_')}" for x in deps
+-                if x.key == 'dev-lang/python' and x.slot is not None)[-1]
++                (f"python{x.slot.replace('.', '_')}" for x in deps
++                if x.key == 'dev-lang/python' and x.slot is not None),
++                key=target_sort_key)[-1]
+         except IndexError:
+             # should be flagged by PythonMissingDeps
+             return
+@@ -355,4 +369,5 @@ class PythonCompatCheck(Check):
+             except IndexError:
+                 return
+ 
+-            yield PythonCompatUpdate(sorted(targets), pkg=pkg)
++            yield PythonCompatUpdate(sorted(targets, key=target_sort_key),
++                                     pkg=pkg)
+diff --git a/testdata/data/repos/python/PythonCompatCheck/PythonCompatUpdate/expected.json b/testdata/data/repos/python/PythonCompatCheck/PythonCompatUpdate/expected.json
+index ab7d9b01..f3476eac 100644
+--- a/testdata/data/repos/python/PythonCompatCheck/PythonCompatUpdate/expected.json
++++ b/testdata/data/repos/python/PythonCompatCheck/PythonCompatUpdate/expected.json
+@@ -1,3 +1,3 @@
+-{"__class__": "PythonCompatUpdate", "category": "PythonCompatCheck", "package": "PythonCompatUpdate", "version": "0", "updates": ["python3_8", "python3_9"]}
+-{"__class__": "PythonCompatUpdate", "category": "PythonCompatCheck", "package": "PythonCompatUpdate", "version": "1", "updates": ["python3_9"]}
+-{"__class__": "PythonCompatUpdate", "category": "PythonCompatCheck", "package": "PythonCompatUpdate", "version": "2", "updates": ["python3_9"]}
++{"__class__": "PythonCompatUpdate", "category": "PythonCompatCheck", "package": "PythonCompatUpdate", "version": "0", "updates": ["python3_8", "python3_9", "python3_10"]}
++{"__class__": "PythonCompatUpdate", "category": "PythonCompatCheck", "package": "PythonCompatUpdate", "version": "1", "updates": ["python3_9", "python3_10"]}
++{"__class__": "PythonCompatUpdate", "category": "PythonCompatCheck", "package": "PythonCompatUpdate", "version": "2", "updates": ["python3_9", "python3_10"]}
+diff --git a/testdata/data/repos/python/PythonCompatCheck/PythonCompatUpdate/fix.patch b/testdata/data/repos/python/PythonCompatCheck/PythonCompatUpdate/fix.patch
+index c63184e9..9be4952a 100644
+--- a/testdata/data/repos/python/PythonCompatCheck/PythonCompatUpdate/fix.patch
++++ b/testdata/data/repos/python/PythonCompatCheck/PythonCompatUpdate/fix.patch
+@@ -4,7 +4,7 @@ diff -Naur python/PythonCompatCheck/PythonCompatUpdate/PythonCompatUpdate-0.ebui
+ @@ -1,5 +1,5 @@
+  EAPI=7
+ -PYTHON_COMPAT=( python3_7 )
+-+PYTHON_COMPAT=( python3_{7..9} )
+++PYTHON_COMPAT=( python3_{7..10} )
+  
+  inherit python-r1
+  
+@@ -14,7 +14,7 @@ diff -Naur python/PythonCompatCheck/PythonCompatUpdate/PythonCompatUpdate-1.ebui
+ @@ -1,5 +1,5 @@
+  EAPI=7
+ -PYTHON_COMPAT=( python3_{7,8} )
+-+PYTHON_COMPAT=( python3_{7..9} )
+++PYTHON_COMPAT=( python3_{7..10} )
+  
+  inherit python-single-r1
+  
+@@ -24,7 +24,7 @@ diff -Naur python/PythonCompatCheck/PythonCompatUpdate/PythonCompatUpdate-2.ebui
+ @@ -1,5 +1,5 @@
+  EAPI=7
+ -PYTHON_COMPAT=( python3_{7,8} )
+-+PYTHON_COMPAT=( python3_{7..9} )
+++PYTHON_COMPAT=( python3_{7..10} )
+  
+  inherit python-any-r1
+  
+diff --git a/testdata/repos/python/profiles/desc/python_single_target.desc b/testdata/repos/python/profiles/desc/python_single_target.desc
+index da5be2fd..3c39a224 100644
+--- a/testdata/repos/python/profiles/desc/python_single_target.desc
++++ b/testdata/repos/python/profiles/desc/python_single_target.desc
+@@ -3,4 +3,5 @@ python2_7 - Build with Python 2.7
+ python3_7 - Build with Python 3.7
+ python3_8 - Build with Python 3.8
+ python3_9 - Build with Python 3.9
++python3_10 - Build with Python 3.10
+ pypy3 - Build for PyPy3 only
+diff --git a/testdata/repos/python/profiles/desc/python_targets.desc b/testdata/repos/python/profiles/desc/python_targets.desc
+index b2be59ca..8e55f2da 100644
+--- a/testdata/repos/python/profiles/desc/python_targets.desc
++++ b/testdata/repos/python/profiles/desc/python_targets.desc
+@@ -3,4 +3,5 @@ python2_7 - Build with Python 2.7
+ python3_7 - Build with Python 3.7
+ python3_8 - Build with Python 3.8
+ python3_9 - Build with Python 3.9
++python3_10 - Build with Python 3.10
+ pypy3 - Build for PyPy3 only
+diff --git a/testdata/repos/python/stub/python-dep1/python-dep1-0.ebuild b/testdata/repos/python/stub/python-dep1/python-dep1-0.ebuild
+index 9eebedfd..55c455d9 100644
+--- a/testdata/repos/python/stub/python-dep1/python-dep1-0.ebuild
++++ b/testdata/repos/python/stub/python-dep1/python-dep1-0.ebuild
+@@ -1,5 +1,5 @@
+ EAPI=7
+-PYTHON_COMPAT=( python2_7 python3_{7,8,9} )
++PYTHON_COMPAT=( python2_7 python3_{7,8,9,10} )
+ 
+ inherit python-r1
+ 
+diff --git a/testdata/repos/python/stub/python-dep2/python-dep2-0.ebuild b/testdata/repos/python/stub/python-dep2/python-dep2-0.ebuild
+index 9eebedfd..55c455d9 100644
+--- a/testdata/repos/python/stub/python-dep2/python-dep2-0.ebuild
++++ b/testdata/repos/python/stub/python-dep2/python-dep2-0.ebuild
+@@ -1,5 +1,5 @@
+ EAPI=7
+-PYTHON_COMPAT=( python2_7 python3_{7,8,9} )
++PYTHON_COMPAT=( python2_7 python3_{7,8,9,10} )
+ 
+ inherit python-r1
+ 
+-- 
+2.31.1
+
diff --git a/dev-util/pkgcheck/pkgcheck-0.9.7-r1.ebuild b/dev-util/pkgcheck/pkgcheck-0.9.7-r1.ebuild
new file mode 100644
index 000000000000..1859af4de531
--- /dev/null
+++ b/dev-util/pkgcheck/pkgcheck-0.9.7-r1.ebuild
@@ -0,0 +1,63 @@
+# 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.6[${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
+
+PATCHES=(
+	"${FILESDIR}"/${P}-py310-update.patch
+)
+
+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-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild
index f801b3b477e3..4f3e1d2a82c8 100644
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild
@@ -42,6 +42,10 @@ BDEPEND="
 
 distutils_enable_tests setup.py
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.7-py310-update.patch
+)
+
 src_test() {
 	local -x PYTHONDONTWRITEBYTECODE=
 	distutils-r1_src_test
diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index 850321740f34..9bf1fa96ecef 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,9 +1,7 @@
 AUX radare2-5.2.0-ssl-build.patch 1652 BLAKE2B e9c0e5aac9a5f88b6beeb7cefb5401c3277b2952c41c468e60bc12bcbcf423cf51a36e16a14a763e5111c2d7b756fcd2d4b799b0a22883a96a2567eb135cc49b SHA512 040cb21ac7bdeb7d513ea1b2d69f2abb8e2978aaa57713850e53b0c1175d4884c9a78e44a9e144bc445bbbfaa0fbc8bb9ba2e513794495ca00c36c47e0ed9cfd
 DIST radare2-4.5.1.tar.gz 8266567 BLAKE2B 0d23c1d47dd79ffd9398ca7b2c8b383ba6a7e3ec662046d1111ab34cabcdaaf1fdd449686433b3229e3c22c31c705530b0a85bbd22b5fc79891a5ad292ba0ff1 SHA512 f08a4cd1e0d65643463d9f9dbb1aacfe793c7b411ec820a18b75a5975d265cfc2cf91e593522c8823aa369098ded21415939acb07c84d8acd102889bf5aed899
-DIST radare2-5.2.0.tar.gz 8254980 BLAKE2B 51335b5560ea9085a7cb6ae998657d62353ad65e10f715ca25ec34cde75d48cd06d8312a898de71096138365d3ea13de45e6e48b2c0f06cea7d593cca43a0ef9 SHA512 664ea6df65c1ea8d13a80d281c3dbbcae16fb308826b9276e68d63f26f239f4a5c0d59abcf9325c299894ad4ebf1098b964aa3cad0bbe58b6c96cbd6e7b25952
 DIST radare2-5.2.1.tar.gz 8302475 BLAKE2B 2edfa30d15214ac4dac6065349c808b539619413e7a100459efd5bf74e95c2483edb1ec13de8387d3a7dcfe25a2922ee377c37f4781c374df04e63fe98910b7e SHA512 c744f5c8fff163022a7a9a913fe34dfa0dee0d9ab3b18bd4cc038c2d487dbfeba2f1523aa12a3166a2c22c45bcc71e802fae101b72fc2e6adab96b522c0de17b
 EBUILD radare2-4.5.1-r1.ebuild 1635 BLAKE2B 70e132b2d36bab7414ac66b0b1cfeced89880124cd21cd10918db62768d9969b17a81ed8b75ca97f72a97a9260fa350b56cbb65540c2af4a5a007f7938c5947d SHA512 4dec2c92cc02b4523530135167722502da12eef6aff1bf571e2efbfb2c4633170106131a980ea1c94153f5212a6cf8adc0fdb396a60d87d0230dcf8ca24b3691
-EBUILD radare2-5.2.0.ebuild 1681 BLAKE2B 0b8bab5df7884ae8704c5e429c03d1db41857b159cb0fe345746b3b16062c68fb4115315ba56a6e5a76d7bdd6f63c78c65779db9a3974ea2a5699b9e6669a104 SHA512 5563920bb740ac1b669b2c11627320adc375c6059b72c3ed6a84d7977b93867bdad53037980360ceca67615167b5111481aae61aa78a353babfd07deac0336fc
 EBUILD radare2-5.2.1.ebuild 1635 BLAKE2B 70e132b2d36bab7414ac66b0b1cfeced89880124cd21cd10918db62768d9969b17a81ed8b75ca97f72a97a9260fa350b56cbb65540c2af4a5a007f7938c5947d SHA512 4dec2c92cc02b4523530135167722502da12eef6aff1bf571e2efbfb2c4633170106131a980ea1c94153f5212a6cf8adc0fdb396a60d87d0230dcf8ca24b3691
 EBUILD radare2-9999.ebuild 1635 BLAKE2B 70e132b2d36bab7414ac66b0b1cfeced89880124cd21cd10918db62768d9969b17a81ed8b75ca97f72a97a9260fa350b56cbb65540c2af4a5a007f7938c5947d SHA512 4dec2c92cc02b4523530135167722502da12eef6aff1bf571e2efbfb2c4633170106131a980ea1c94153f5212a6cf8adc0fdb396a60d87d0230dcf8ca24b3691
 MISC metadata.xml 375 BLAKE2B 16f6bc4a1322225cd5188b2555418ba9e64e4cd2b2afc98226a9f4bbfed59f5da1d4495fc154f6ac254e9e5f48d8a9669176391084c6f62d0f04fbb02676a726 SHA512 225a2e358254837ede6e6bba6298fdc9cf5d8fc9dddb7201b094424f62d3ba7fd54b57cc9dc6c1828163f3df50b0bdceb51de30271f4b6e8963b190893582124
diff --git a/dev-util/radare2/radare2-5.2.0.ebuild b/dev-util/radare2/radare2-5.2.0.ebuild
deleted file mode 100644
index ce046dd6d939..000000000000
--- a/dev-util/radare2/radare2-5.2.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 toolchain-funcs
-
-DESCRIPTION="unix-like reverse engineering framework and commandline tools"
-HOMEPAGE="http://www.radare.org"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/radareorg/radare2"
-else
-	SRC_URI="https://github.com/radareorg/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ssl"
-
-RDEPEND="
-	dev-libs/libzip
-	dev-libs/xxhash
-	sys-apps/file
-	sys-libs/zlib
-	dev-libs/capstone:0=
-	ssl? ( dev-libs/openssl:0= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=("${FILESDIR}"/${P}-ssl-build.patch)
-
-src_prepare() {
-	# Fix hardcoded docdir for fortunes
-	sed -i -e "/^#define R2_FORTUNES/s/radare2/$PF/" \
-		libr/include/r_userconf.h.acr
-	default
-}
-
-src_configure() {
-	# Ideally these should be set by ./configure
-	tc-export CC AR LD OBJCOPY RANLIB
-	export HOST_CC=${CC}
-
-	econf \
-		--without-libuv \
-		--with-syscapstone \
-		--with-sysmagic \
-		--with-sysxxhash \
-		--with-syszip \
-		$(use_with ssl openssl)
-}
-
-src_install() {
-	default
-
-	insinto /usr/share/zsh/site-functions
-	doins doc/zsh/_*
-
-	newbashcomp doc/bash_autocompletion.sh "${PN}"
-	bashcomp_alias "${PN}" rafind2 r2 rabin2 rasm2 radiff2
-
-	# a workaround for unstable $(INSTALL) call, bug #574866
-	local d
-	for d in doc/*; do
-		if [[ -d ${d} ]]; then
-			rm -rfv "${d}" || die "failed to delete '${d}'"
-		fi
-	done
-
-	# These are not really docs. radare assumes
-	# uncompressed files: bug #761250
-	docompress -x /usr/share/doc/${PF}/fortunes.{creepy,fun,nsfw,tips}
-}
diff --git a/dev-util/re2c/Manifest b/dev-util/re2c/Manifest
index 6e29588cd07e..b6c20482ab59 100644
--- a/dev-util/re2c/Manifest
+++ b/dev-util/re2c/Manifest
@@ -1,6 +1,4 @@
 AUX re2c-2.1.1-sh.patch 1688 BLAKE2B 1143d1d5867c07aaa48e3c1795b1c4867eba665315a583d4991872b457a7ba222dac1c699917cf02b6d55306e6de3a5e0c65cf2f0505ec4283b7833522b5bb39 SHA512 33b48ee8f4ab871958eff901596c1282823eb597c7679ad8e11e72a84e4da1d72b01d2732f0d251c5f1dcb8656c86c60fc31f795cdd679f0d66a4053cb49529a
-DIST re2c-2.0.3.tar.xz 1288996 BLAKE2B 76913a79ad9c237843ccbe86dd05db755da19fc89351b64d6ece6a9a8d53860f1cc12493748fca5b7391cddff4f4668295fb2613c257c128870ea2e7163811ed SHA512 893c533e9847a6236d55ae65e413ddc48b7531b89f5552a3ad79beeac079317ceca4c35710f3c2d88a6de5a3c0a5070a24a8cffb1b4277578a41697ea0e3bf8c
 DIST re2c-2.1.1.tar.xz 1340740 BLAKE2B e0e3cdb7ea78324467a8fe3161fe9b0cc1eb44baf9a554b892e1f7f8b8d089e8dca58da347527c595881e1119344858694c133ba0f1676424914f6518adbf4f4 SHA512 13edbe961e0482677aff52ada93129500c10e134b579365f1d0cd180a898251f3060f1fe0597fc6c900c0ea29b1eb28fc2519b0ebfa2ed496a777bf7e138feae
-EBUILD re2c-2.0.3.ebuild 763 BLAKE2B 1be81406a67a3a0366e29d2708f1f79f9d9a2b3f5c23e54b1a7db465371b4cd95f2c0ce7b3ffc4bc1daf4eaeb8da1427e6f148a4f73ca315b2c5181e429da422 SHA512 463e2dccbd6d9efb36d739926d52836180155d7fe5265de9977fa735b016c0775af869b11c6f1d8efe4afce4d8417a425e07f84b081270df367cfb941a140bd4
-EBUILD re2c-2.1.1-r1.ebuild 802 BLAKE2B c23439ed5b68ad7263c0dcc337870b2b4256c7d9b4aabba114e1c93065468b8eda320a803356bebe08897d88a48ad6f69e6dd30fe7a999909bb13a1a7dd36651 SHA512 a314917b545b13ce8de5e35c66f216866a90b6033d8ba8c52e7d955440bea93a91cda91fdbc0ffe7b2c430abfae885960a90c6592b94271487194a73836fc0cd
+EBUILD re2c-2.1.1-r1.ebuild 1031 BLAKE2B 37bd605831fcac4a33ed2973a9f419d71dd295e59d28227444bf664d4b7f4f568d43b161ba22dd92f08c20d82b0a27d5152b81ee4c7d8dbe4e4acb52304a5859 SHA512 10c26da7a45635380d4350a23cc0b4795bd9c4d8ffa7648ac5ef7051ee12c3e7bd875ba254982aad1b264b3b1aa1da8c30b93070390eb37bb398bbd96f192e51
 MISC metadata.xml 476 BLAKE2B b2dad245e1cdcbb73e8b6e53442f7e9ec41337746c50f026c0fda68d57ebe10fb6193a26fcf9fca11e23570f44b104bd40d22fa1283fa91034f7cb792d436463 SHA512 e3018ee81606a018d66169cd142a17a34248587b77deb4baeb6daae6aca2d9a70095fb5dc2180d146043030631172f6fa17b3c8ddd5bebe85eebf6f3be79f9ab
diff --git a/dev-util/re2c/re2c-2.0.3.ebuild b/dev-util/re2c/re2c-2.0.3.ebuild
deleted file mode 100644
index 6057a230e385..000000000000
--- a/dev-util/re2c/re2c-2.0.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="tool for generating C-based recognizers from regular expressions"
-HOMEPAGE="http://re2c.org/"
-SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug"
-
-src_configure() {
-	econf \
-		--enable-golang \
-		ac_cv_path_BISON="no" \
-		$(use_enable debug)
-}
-
-src_install() {
-	default
-
-	docompress -x /usr/share/doc/${PF}/examples
-	dodoc -r README.md CHANGELOG examples
-}
diff --git a/dev-util/re2c/re2c-2.1.1-r1.ebuild b/dev-util/re2c/re2c-2.1.1-r1.ebuild
index 29518e3a9d51..854354f08251 100644
--- a/dev-util/re2c/re2c-2.1.1-r1.ebuild
+++ b/dev-util/re2c/re2c-2.1.1-r1.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+inherit autotools
+
 DESCRIPTION="tool for generating C-based recognizers from regular expressions"
 HOMEPAGE="http://re2c.org/"
 SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.xz"
@@ -14,6 +16,16 @@ IUSE="debug"
 
 PATCHES=("${FILESDIR}"/${P}-sh.patch)
 
+src_prepare() {
+	default
+
+	# Only needed for the sh patch
+	# Despite the patch modifying the configure directly,
+	# this is sometimes fragile and triggers maintainer mode anyway.
+	# bug #779187
+	eautoreconf
+}
+
 src_configure() {
 	econf \
 		--enable-golang \
diff --git a/dev-util/shellcheck/Manifest b/dev-util/shellcheck/Manifest
index bdbbc1d6b962..bbf4c62042c3 100644
--- a/dev-util/shellcheck/Manifest
+++ b/dev-util/shellcheck/Manifest
@@ -1,3 +1,4 @@
-DIST ShellCheck-0.7.1.tar.gz 163288 BLAKE2B efc8c56348ba924baf660ae16d84e023cdd1a5ef8b355b492844ca41aeb3242eb1e5862bea7f12c69fa43cce285a44afaf95125816f62fbe316d9bdca467b1ae SHA512 fc84bd67e30af1378a92c1e378693a2c181e9567d53f2590e76aedb9f607276b90abd2ac83818c36524bd77a480df347af5a0879a925a846f35440ab207fad8a
-EBUILD shellcheck-0.7.1.ebuild 849 BLAKE2B 2365d8fc4a090efeae8d407a4f9bcba47446276bcbfd3e3ec8cca544766651593b5d0ef7963f2f59e520393fe5027331fc0b9dc1679e61b755b208c320610b08 SHA512 b3e2ccb90f1405940aa7a373ba92de9d0329826ba5ed7f7b85c3ff0ec57b4ac1f50a1944fd14c6c5b32666df425c72470795833adec930f83f27905c6fa0d74b
+AUX shellcheck-0.7.2-haddock.patch 2125 BLAKE2B 4e31c5b3a74235af69601ae01c1ad8e3ab5fd334dc55a34e858ce6e5dd81eaef0028750b480a81b8b9abca31f670c2952d3a67464ffbb03271d5ae9b50e21555 SHA512 f9e94857c5ca6e082a03dc7aa60cb07d95e55d114cec10e2db6a47e3ad1e0035cc5befb9e84062590b365baea5246fc6366dcc06fa9f48020f7e3d460d168338
+DIST ShellCheck-0.7.2.tar.gz 173937 BLAKE2B ac5b6c4aec9a9bb736e1218726780e9f97775ad5f144e5862daf24a88fe0bf24404b58880638e03ceeb02ff5ca84027727ebd637a82f8ae272dc18bc14d5c532 SHA512 ec77038763b3520deef3838d0f51f06bc3d755945f519b19be09765b3122f0251f00cd4907cb60c38612161b0c03f73025e0f52b3c47e22855f0b0e3ff5f81c5
+EBUILD shellcheck-0.7.2.ebuild 883 BLAKE2B c8e396834e75fb1de51f618893e47afae3ca8b437def1a03bbeb1e895d408e542ec29f04c0b2c7d9f4740d8d157327af48eead9380299b7992ab925d80314c43 SHA512 adfa31b075abbdd1641e91081c3500c39d2581f9df6d6eccb1e193f811bf3ac32b5c0d8defc681372b42289f4f47f8f39c63382985698f8817173ec2733d508a
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-util/shellcheck/files/shellcheck-0.7.2-haddock.patch b/dev-util/shellcheck/files/shellcheck-0.7.2-haddock.patch
new file mode 100644
index 000000000000..db6297064bad
--- /dev/null
+++ b/dev-util/shellcheck/files/shellcheck-0.7.2-haddock.patch
@@ -0,0 +1,53 @@
+From 9e60b3ea841bcaf48780bfcfc2e44aa6563a62de Mon Sep 17 00:00:00 2001
+From: Vidar Holen <spam@vidarholen.net>
+Date: Thu, 22 Apr 2021 22:17:51 -0700
+Subject: [PATCH] Fix haddock failures (fixes #2216)
+
+---
+ src/ShellCheck/Analytics.hs | 12 ++++++------
+ test/buildtest              |  2 ++
+ 2 files changed, 8 insertions(+), 6 deletions(-)
+
+--- a/src/ShellCheck/Analytics.hs
++++ b/src/ShellCheck/Analytics.hs
+@@ -4155,11 +4155,11 @@ checkEqualsInCommand params originalToken =
+                     _ | "===" `isPrefixOf` s -> borderMsg (getId originalToken)
+                     _ -> prefixMsg (getId cmd)
+ 
+-            -- $var==42
++            -- '$var==42'
+             _ | "==" `isInfixOf` s ->
+                 badComparisonMsg (getId cmd)
+ 
+-            -- ${foo[x]}=42 and $foo=42
++            -- '${foo[x]}=42' and '$foo=42'
+             [T_DollarBraced id braced l] | "=" `isPrefixOf` s -> do
+                 let variableStr = concat $ oversimplify l
+                 let variableReference = getBracedReference variableStr
+@@ -4172,22 +4172,22 @@ checkEqualsInCommand params originalToken =
+                                 && "]" `isSuffixOf` variableModifier
+ 
+                 case () of
+-                    -- $foo=bar should already have caused a parse-time SC1066
++                    -- '$foo=bar' should already have caused a parse-time SC1066
+                     -- _ | not braced && isPlain ->
+                     --    return ()
+ 
+                     _ | variableStr == "" -> -- Don't try to fix ${}=foo
+                         genericMsg (getId cmd)
+ 
+-                    -- $#=42 or ${#var}=42
++                    -- '$#=42' or '${#var}=42'
+                     _ | "#" `isPrefixOf` variableStr ->
+                         genericMsg (getId cmd)
+ 
+-                    -- ${0}=42
++                    -- '${0}=42'
+                     _ | variableStr == "0" ->
+                         assign0Msg id $ fixWith [replaceToken id params "BASH_ARGV0"]
+ 
+-                    -- $2=2
++                    -- '$2=2'
+                     _ | isPositional ->
+                         positionalMsg id
+ 
diff --git a/dev-util/shellcheck/shellcheck-0.7.1.ebuild b/dev-util/shellcheck/shellcheck-0.7.2.ebuild
index 357bb0ecd576..012df314142a 100644
--- a/dev-util/shellcheck/shellcheck-0.7.1.ebuild
+++ b/dev-util/shellcheck/shellcheck-0.7.2.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-# ebuild generated by hackport 0.6.4.9999
+# ebuild generated by hackport 0.6.7.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 MY_PN="ShellCheck"
 MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="Shell script analysis tool"
 HOMEPAGE="https://www.shellcheck.net/"
@@ -18,7 +19,6 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="dev-haskell/aeson:=[profile?]
 	>=dev-haskell/diff-0.2.0:=[profile?]
@@ -26,10 +26,10 @@ RDEPEND="dev-haskell/aeson:=[profile?]
 	>=dev-haskell/parsec-3.0:=[profile?]
 	>=dev-haskell/quickcheck-2.7.4:2=[template-haskell,profile?]
 	dev-haskell/regex-tdfa:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
+	>=dev-lang/ghc-8.4.3:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
+	>=dev-haskell/cabal-2.2.0.1
 "
 
-S="${WORKDIR}/${MY_P}"
+PATCHES=("${FILESDIR}"/${P}-haddock.patch)
diff --git a/dev-util/unifdef/Manifest b/dev-util/unifdef/Manifest
index 3203123a9aea..56050d94fcb2 100644
--- a/dev-util/unifdef/Manifest
+++ b/dev-util/unifdef/Manifest
@@ -1,7 +1,3 @@
-DIST unifdef-2.10.tar.gz 73285 BLAKE2B e13b75afc9b8e514559b8a13e3069bfb1cb489d21ce4ac56134921e702666bd9b23dad36d251cb65535e5d6fe02bea0d21a5610c542d727dc5e90d7e1726e4dd SHA512 39d4551f43fa8eccaee8a9fc469b5ddc8ca8eb0e0ce46c17c3a8300f7e6960fbf0960f364a83df20059b4aa623edc7c3c16df1b7162f068332e6c066d7ffe9b3
-DIST unifdef-2.11.tar.gz 77947 BLAKE2B 2ddc1a300b329ae91f72f1a8dad86443ba36fc02c7205eacafe1ec3ef82467003bb855c32485e6ca92b61dc45d160990b8aad531ace60ba3e55967f900150af6 SHA512 948abf878852da321f15c6060dfe33a2ab38f1787b0a6096f10bb3828d0b4e50226643e9dbcb678a422868c215b5c4e981dc7da5244d38688e8e91287beb8845
 DIST unifdef-2.12.tar.gz 87091 BLAKE2B d14072f79b9d8b17a033c7068a3c6a423c2e66570aac6d232e387ffd256bc66ad3c4c1467b6f101124bf494f2c12c7b8d37c64104623b0022e435a7e5aa78d5a SHA512 9a00f69309578817af5b3a6cf45f293506e8326b520bed7c0ab2f66661e32a115b7f5aa9b0572cfbee5887044e5f0d70967904ec137172e67a1aab5abe09d3b5
-EBUILD unifdef-2.10.ebuild 553 BLAKE2B d7907f421b0a6869162fbff8b53073b79a735450ceb063355508167bb09dcb327d257954fbe4eee25c2d630641f2f4a9c67ad4605469f1de716715f0449944fc SHA512 10b62b01a013b36c44860b3354ff18377283b512a4afce3b2cc1371e55339338491729ded53a4ba60092f341ef581407bbe676ad2558eb5ef87a50d48514e67f
-EBUILD unifdef-2.11.ebuild 569 BLAKE2B 02870cff451d8cd6409099e4c79d3021e08489f2b818aaf4f932c6beacc7db258a370001861378e700188850dac29145b045e6aae3a6f0308c1f86b4554965ac SHA512 502d0aaa6c866b8a08121f6423ab51b399c8acb50e132a56c2d6fa0ea2646631074060229a5d04591f8edf2e874cb88f6363e8c191c64b85ae1bbdf2dbb39a38
-EBUILD unifdef-2.12.ebuild 569 BLAKE2B 02870cff451d8cd6409099e4c79d3021e08489f2b818aaf4f932c6beacc7db258a370001861378e700188850dac29145b045e6aae3a6f0308c1f86b4554965ac SHA512 502d0aaa6c866b8a08121f6423ab51b399c8acb50e132a56c2d6fa0ea2646631074060229a5d04591f8edf2e874cb88f6363e8c191c64b85ae1bbdf2dbb39a38
+EBUILD unifdef-2.12.ebuild 563 BLAKE2B 50b7570343f050aa44dc88a9a6e895d6361b034fa320b689adf752b51abfe67d29fd7ecff5abb6483f49c04f6df76de8626174fa50cd93cf14762d6dedccefcc SHA512 d42ac038ae89def0a64d2278d3851d7b36de0dba63f50afd84ccc76fcdebdb0fd2d0aead71c1cc21bc58e3fc67c420ae1dcfd11fbb89ace0bb41c36eefec81f3
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-util/unifdef/unifdef-2.10.ebuild b/dev-util/unifdef/unifdef-2.10.ebuild
deleted file mode 100644
index 8a1a627ca6c4..000000000000
--- a/dev-util/unifdef/unifdef-2.10.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Remove #ifdef'ed lines from a file while otherwise leaving the file alone"
-HOMEPAGE="https://dotat.at/prog/unifdef/"
-SRC_URI="https://dotat.at/prog/unifdef/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-DOCS=( README )
-
-src_prepare() {
-	sed -i '/^prefix/s:=.*:=/usr:' Makefile || die
-	tc-export CC
-	default
-}
diff --git a/dev-util/unifdef/unifdef-2.11.ebuild b/dev-util/unifdef/unifdef-2.11.ebuild
deleted file mode 100644
index 4a75de434b41..000000000000
--- a/dev-util/unifdef/unifdef-2.11.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="remove #ifdef'ed lines from a file while otherwise leaving the file alone"
-HOMEPAGE="https://dotat.at/prog/unifdef/"
-SRC_URI="https://dotat.at/prog/unifdef/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-DOCS=( README )
-
-src_prepare() {
-	sed -i "/^prefix/s:=.*:=${EPREFIX}/usr:" Makefile || die
-	tc-export CC
-	default
-}
diff --git a/dev-util/unifdef/unifdef-2.12.ebuild b/dev-util/unifdef/unifdef-2.12.ebuild
index 4a75de434b41..cf3ba7f64167 100644
--- a/dev-util/unifdef/unifdef-2.12.ebuild
+++ b/dev-util/unifdef/unifdef-2.12.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
@@ -11,7 +11,7 @@ SRC_URI="https://dotat.at/prog/unifdef/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 DOCS=( README )
 
diff --git a/dev-util/visualvm/Manifest b/dev-util/visualvm/Manifest
index d99371f6839e..46289c1dd973 100644
--- a/dev-util/visualvm/Manifest
+++ b/dev-util/visualvm/Manifest
@@ -1,9 +1,5 @@
-AUX visualvm-r1.conf 786 BLAKE2B 863af1d373f3e8633a630c6a1cdbc8ada09b1a9b5f35704db044e12614c997e9648ae9c087caaed89c2632dde7a09a1eb3b158d4227a1e2cd94214ba25d61eef SHA512 243ab8ac4472492edf796582dea5164f53261f654168cde9ccf863e0f265ec5c50442c1c44de89ca759c8d0dee6c00c10a3f807ad45d039976ff4d91c89d8397
-AUX visualvm-r1.sh 424 BLAKE2B ad18e375535b92e5bc5720c7b4f9f9526ee136d29d51103038a68e8c260245222af1e912b8320ca98dbaeb1a8736f041fea89ae87b15d1db9cb916eb1552c8e6 SHA512 8e579f126142f52e14f235a23c3834933b59a9df95ba76b6b9a82175cfc5e12d759bc0d7234ae3cea7684bdfe12f2efb9785afbe6844394f458cff05ae8342f7
 AUX visualvm-r2.conf 1243 BLAKE2B a1e97a1e1ee914620a29bd68580043654304b9cff29edbb700de02473113a7984f3ec910cbff674465ccab6f1deac4da5412ade9a8069918b4acae839ba8d731 SHA512 0f826859bba484e8eae20750e4c3f021ce129cd06dc6c19cf2724b0c2c3d4c68a4370788bdc5cf7e0859348197466382c877c885937c0a87c0e8467944160bf7
 AUX visualvm-r2.sh 423 BLAKE2B cdc5db4465a339735ccff5f37bed89d76da2f2d514f522b7768fa37aad46804997d267285b09d6346674d43964d0ef0a0cadb24d28e9b90256a593d7420aab4a SHA512 eb7356e10a94db048fb471215b2115b93764931ed4178594bca5a1aac480f2262ef361b2f53fc23dbcdb4d44e1aeab678204c50583abb8016696a7d87288a9bb
-DIST visualvm-1.4.1.tar.gz 56752632 BLAKE2B cd171a48a0a9af440c27f2968ce27c5f89af3769046258629ba384ebbfc1c2ecb9847678af9d69bea5847fe1098e9039f35d350fb6f5d112e9236a6510c52bc7 SHA512 de8cf37e619e15c3a30c5116d49becddc09b54062aa22709e412892cf78e3048777116a8388dc6f63609d11bfb6fe37176fe48f5e3263a4dbce8439df676ef15
 DIST visualvm-2.0.6.tar.gz 39086223 BLAKE2B f5657d4ccc0063281226b4d70c35820c78333db5574bae5acadc321938cfe42a3e0e4c1752badcc3e01b5694f6081213f5da898f5a13587d44e36d18fbd5c2c7 SHA512 03ad628f753e31f26217366d8f5f184f4657ba55badd55f1466dbf00cda61e9c320cc8ddb82b228863b9c6416aec3e94a01c5429e2b2f4664c9daaccd02f5d7b
-EBUILD visualvm-1.4.1.ebuild 1667 BLAKE2B 92813bb7a920d1f2a83af817d9fdd821be79661331c29b6c4a7f8f945c190a9dfd4a89a8cae04ae347be3fbb68bf6a8f9b02a80310780f7fea29f3522dec0fbf SHA512 b38ac4aae3d549e8f7c749436f885cc538c5844b81af6ba2adbed503ffc5ec297ffc1dec3a4f5e3c96ac7f53dd8f508e25c18e3a11f7a3b9108b05ce0d51d542
-EBUILD visualvm-2.0.6.ebuild 1904 BLAKE2B 302b2318c8f5be891333ff791de2834a47f2c1a67225a1837c181190c55008ea03e5ad96c8766b6a0d738f47dc9ecd5398b72391bff572de68dfe5d5843b1b92 SHA512 c4c921215285343094f8e31faf4b3cde7bfca6e77e23b2fad60e91ebf0e098626b160f47fcc50faf12b9ae7b796cbbe31a50b5389af8fbe6c757a93200942bf9
+EBUILD visualvm-2.0.6.ebuild 1903 BLAKE2B 612e393a06c26225c1f0e76925dfc447d41e7843e63b26a0019126f674b4a09b418fa10dd7b1b8471000b1573fd211e8ea778b08fd55ac986cc48ea34eddc83e SHA512 8123f7999a45111a745f7e8e38fde858d7af3cea4032c8d72cd3e46e91d412c128b2541082960fb212f45592aaabfbdf08c9e14083b8c463f7b9635d6a85d0df
 MISC metadata.xml 316 BLAKE2B ad191b52b75273728dec1af289e8df2ee7d538cde7dd30b2c8facd2623a6984de090356891a9e9f992d99da4bff9ae48be15bc7257987e8b6419fe8beaa979d9 SHA512 46972dae3e0d778f11af43101b50944f9edd850d1e7eecca9f5bf08c4db438dd53415348f61b85f37f788435410867e61bb516960d4ceb6edb8e88fde71cb243
diff --git a/dev-util/visualvm/files/visualvm-r1.conf b/dev-util/visualvm/files/visualvm-r1.conf
deleted file mode 100644
index fce7cfece13f..000000000000
--- a/dev-util/visualvm/files/visualvm-r1.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# Default user directory
-visualvm_default_userdir="${HOME}/.visualvm"
-visualvm_default_cachedir="${HOME}/.cache/visualvm"
-
-# Default runtime options
-visualvm_default_options="-J-client -J-Xms24m -J-Xmx256m -J-Dnetbeans.accept_license_class=com.sun.tools.visualvm.modules.startup.AcceptLicense -J-Dsun.jvmstat.perdata.syncWaitMs=10000 -J-Dsun.java2d.noddraw=true -J-Dsun.java2d.d3d=false -J--add-exports=java.desktop/sun.awt=ALL-UNNAMED -J--add-exports=jdk.jvmstat/sun.jvmstat.monitor.event=ALL-UNNAMED -J--add-exports=jdk.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED -J--add-exports=java.desktop/sun.swing=ALL-UNNAMED -J--add-exports=jdk.attach/sun.tools.attach=ALL-UNNAMED -J--add-modules=java.activation -J-XX:+IgnoreUnrecognizedVMOptions"
-
-# JDK home
-visualvm_jdkhome="$(java-config -O)"
diff --git a/dev-util/visualvm/files/visualvm-r1.sh b/dev-util/visualvm/files/visualvm-r1.sh
deleted file mode 100644
index dd6956da0697..000000000000
--- a/dev-util/visualvm/files/visualvm-r1.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-# source the configuration file
-. /etc/visualvm/visualvm.conf
-
-# launch visualvm
-exec sh /usr/share/visualvm/platform/lib/nbexec \
-	--branding visualvm \
-	--jdkhome "${visualvm_jdkhome}" \
-	--userdir "${visualvm_default_userdir}" \
-	--cachedir "${visualvm_default_cachedir}" \
-	--clusters /usr/share/visualvm/cluster:/usr/share/visualvm/platform:/usr/share/visualvm/profiler \
-	${visualvm_default_options} "${@}"
diff --git a/dev-util/visualvm/visualvm-1.4.1.ebuild b/dev-util/visualvm/visualvm-1.4.1.ebuild
deleted file mode 100644
index a33b5289f774..000000000000
--- a/dev-util/visualvm/visualvm-1.4.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-NBV=90
-NBT=24042018
-NBZ=nb${NBV}_${PN}_${NBT}.zip
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Integrates commandline JDK tools and profiling capabilities"
-HOMEPAGE="https://visualvm.github.io"
-
-# Netbeans plattform is already included in the main archive this time
-#    SRC_URI="https://github.com/oracle/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-#       https://github.com/oracle/${PN}/releases/download/${PV}/${NBZ}"
-SRC_URI="https://github.com/oracle/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="7"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=virtual/jre-1.7"
-
-DEPEND="
-	>=virtual/jdk-1.7"
-
-S="${WORKDIR}/${P}/${PN}"
-
-EANT_BUILD_TARGET=build
-INSTALL_DIR=/usr/share/${PN}
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd "${S}" || die
-	# unpack ${NBZ}
-	unpack "${S}"/"${NBZ}"  # archive is included in the main archive
-}
-
-src_prepare() {
-	default
-
-	# Remove unneeded binaries
-	rm -rv netbeans/platform/lib/*.{dll,exe} \
-		netbeans/platform/modules/lib/{amd64/*.dll,i386,x86} || die
-	find netbeans/profiler/lib/deployed/jdk1? -mindepth 1 \
-		-maxdepth 1 ! -name linux-amd64 -exec rm -rv {} + || die
-}
-
-src_install() {
-	# this is the visualvm cluster
-	insinto ${INSTALL_DIR}
-	doins -r build/cluster netbeans/{platform,profiler}
-
-	# configuration file that can be used to tweak visualvm startup parameters
-	insinto /etc/${PN}
-	newins "${FILESDIR}"/${PN}-r1.conf ${PN}.conf
-
-	# visualvm runtime script
-	newbin "${FILESDIR}"/${PN}-r1.sh ${PN}
-
-	# makes visualvm entry
-	make_desktop_entry ${PN} VisualVM java "Development;Java;"
-}
diff --git a/dev-util/visualvm/visualvm-2.0.6.ebuild b/dev-util/visualvm/visualvm-2.0.6.ebuild
index e132e704c5ce..001ed43cc6e0 100644
--- a/dev-util/visualvm/visualvm-2.0.6.ebuild
+++ b/dev-util/visualvm/visualvm-2.0.6.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/oracle/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="7"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="
 	>=virtual/jre-1.8"