13 files changed, 14 insertions, 359 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index d128eae2113a..72ac665df2ed 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index 636f00217e8d..7a047e7743bd 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,8 +1,5 @@
 AUX 5.19.12-no-stack-protector.patch 517 BLAKE2B 5d47108db32a2c33a0151997c26da2d1f9944b4796e6b0e4c90a8dc8edfc0a0cfc78be248dd484e1b55038f64e226633e9b7d792bed980b875d9d628e04ee376 SHA512 155cf0d515b9c644fcfe233c0f2a05b2b6ffecfc634f0320b32e3dcbfcf7807896bc2d09a70f139af62d9c743c1fcdafade890dcedd73bb240f38b55b1ee6a2a
-DIST linux-6.2.tar.xz 136430892 BLAKE2B 05b63254734ea685db437cb1c00a6da63eee74d7e99f4ed2d074aaa01ac4487813ab297d337a6855cdbcbb33346b631c4256ee3b06191adfb1be3615a56bdd6d SHA512 a01bee0b968b95183934fe3504516be7ef5811944a061f5aed05ecebaa27b5eb64e33232fd0a8dd622b3c8743bfe462ef7e464d381734d111a0ad6a6d9f66ddd
 DIST linux-6.3.tar.xz 136891752 BLAKE2B f1887c8924efa8d0cb14c4e604affd0b0168bcf20f56a37c027405c7bc11aba822a43fcb38ccb55a81a26f747d00e1ab5a6554818affbf1e1c7ef5220150fc69 SHA512 768979440f4907ba64d4481b383d6101faf208f27a0b897156123aa278c5743fe3c4f61945b2541429c532d45382aaee8899ea9d44a1d2895bfbb79bfd937f65
-DIST patch-6.2.1.xz 5688 BLAKE2B 383ad7820e2b581b35c7b33e272782c1ea9588e050b2e306b7a31e82984c49f6da55dd10908c6c2d5cf0b524a7cfacc08b3ce0279e4ccd96286463ae28cb5e90 SHA512 e5777e2cb124ba5899c330135b25aaa4d612fed4af2230214c2311fe6ca03825e9c3f9be7ed84ac3712db6a4aad4fed43e88cbbf3d7b33d8d98000cba78f9085
 DIST patch-6.3.xz 8617176 BLAKE2B cab9b9b3e3a97c425e186e2390b7753e77740a8a7286ba8f8fd88527c1d2e6ee22b0d27510c5ea065e73161ac1f9a178251585ffa8d2648595c92e831cf1fee3 SHA512 4a7228e9d89633d3cb14af2dd7419eb625b765b70b95e4149ff1aff6367fb2490d5bd16d6399da33a0b85c32a8dafa2c2cb2e3695aec335f4d3a2813ca52c9f4
-EBUILD bpftool-6.2.1.ebuild 3002 BLAKE2B 8f0afdbdb41176ff1ed27224b310c88b67c44214d9ad82ba4bca353ba02f04e666b2c19f16e66d68e4cd7540412d7f6ee0eef3ce71048dcadd75f4594909c681 SHA512 604498cf1ba5b83edb808480577395f1d85b59644f06bd3d2d21a843f3062ca3d85f1390e09bc917c8ec2324c56cca4a45b79ee3b6c57311a85d4ce979c5751c
 EBUILD bpftool-6.3.ebuild 2884 BLAKE2B 252a8c4a83c63adc886c8303bc6879abf93f78abc07ab062513a5fc9ec9d8cad1f03cbcb83e65af13d27a839045188076031822029198e2a480d620fa7de2c55 SHA512 4607df1082ae897cb798ec92fe635bcb536520924611b46e93a6790449699a4415a36757aba7b09d65ba9984ce4ce2d51a54d7b94a054af3dbf198f51739377f
 MISC metadata.xml 356 BLAKE2B 4cc2dafd4a125f2144fc8537377c1857c4cf3ace56242965c41f29b5601b346b211ae8a05459b555569b4a11d2eed39345f02c3fe27ba8a8f93117969ee8b8cc SHA512 c2c0f149fbec22400163df406cdc10df537bef638251eeabc332709992e7470c323b366cfc465d6ecf14f2d84065660cccefef7a5ca45980d679b645ebf664be
diff --git a/dev-util/bpftool/bpftool-6.2.1.ebuild b/dev-util/bpftool/bpftool-6.2.1.ebuild
deleted file mode 100644
index ac56b1006ed3..000000000000
--- a/dev-util/bpftool/bpftool-6.2.1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit estack linux-info optfeature python-any-r1 bash-completion-r1 toolchain-funcs
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and maps"
-HOMEPAGE="https://kernel.org/"
-
-LINUX_V="${PV:0:1}.x"
-LINUX_VER=$(ver_cut 1-2)
-LINUX_PATCH=patch-${PV}.xz
-SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/bpf/bpftool"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
-IUSE="caps"
-
-RDEPEND="
-	sys-libs/binutils-libs:=
-	sys-libs/zlib:=
-	virtual/libelf:=
-	caps? ( sys-libs/libcap:= )
-"
-DEPEND="
-	${RDEPEND}
-	>=sys-kernel/linux-headers-5.8
-"
-BDEPEND="
-	${LINUX_PATCH+dev-util/patchutils}
-	${PYTHON_DEPS}
-	app-arch/tar
-	dev-python/docutils
-"
-
-CONFIG_CHECK="~DEBUG_INFO_BTF"
-
-# src_unpack and src_prepare are copied from dev-util/perf since
-# it's building from the same tarball, please keep it in sync with perf
-src_unpack() {
-	local paths=(
-		tools/bpf kernel/bpf
-		tools/{arch,build,include,lib,perf,scripts} {scripts,include,lib} "arch/*/lib"
-	)
-
-	# We expect the tar implementation to support the -j and --wildcards option
-	echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
-	gtar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
-		"${paths[@]/#/linux-${LINUX_VER}/}" || die
-
-	if [[ -n ${LINUX_PATCH} ]] ; then
-		eshopts_push -o noglob
-		ebegin "Filtering partial source patch"
-		filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
-			> ${P}.patch
-		eend $? || die "filterdiff failed"
-		eshopts_pop
-	fi
-
-	local a
-	for a in ${A}; do
-		[[ ${a} == ${LINUX_SOURCES} ]] && continue
-		[[ ${a} == ${LINUX_PATCH} ]] && continue
-		unpack ${a}
-	done
-}
-
-src_prepare() {
-	default
-
-	if [[ -n ${LINUX_PATCH} ]] ; then
-		pushd "${S_K}" >/dev/null || die
-		eapply "${WORKDIR}"/${P}.patch
-		popd || die
-	fi
-
-	pushd "${S_K}" >/dev/null || die
-	# bug #890638
-	eapply "${FILESDIR}"/5.19.12-no-stack-protector.patch
-	popd || die
-
-	# dev-python/docutils installs rst2man.py, not rst2man
-	sed -i -e 's/rst2man/rst2man.py/g' Documentation/Makefile || die
-}
-
-bpftool_make() {
-	local arch=$(tc-arch-kernel)
-	tc-export AR CC LD
-
-	emake V=1 VF=1 \
-		HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)" \
-		EXTRA_CFLAGS="${CFLAGS}" ARCH="${arch}" BPFTOOL_VERSION="${MY_PV}" \
-		prefix="${EPREFIX}"/usr \
-		bash_compdir="$(get_bashcompdir)" \
-		feature-libcap="$(usex caps 1 0)" \
-		"$@"
-}
-
-src_compile() {
-	bpftool_make
-	bpftool_make -C Documentation
-}
-
-src_install() {
-	bpftool_make DESTDIR="${D}" install
-	bpftool_make mandir="${ED}"/usr/share/man -C Documentation install
-}
-
-pkg_postinst() {
-	optfeature "clang-bpf-co-re support" sys-devel/clang[llvm_targets_BPF]
-}
diff --git a/dev-util/fq/Manifest b/dev-util/fq/Manifest
index 84e655cf8732..d31a88cafdd9 100644
--- a/dev-util/fq/Manifest
+++ b/dev-util/fq/Manifest
@@ -1,16 +1,7 @@
-DIST fq-0.2.0-deps.tar.xz 23494148 BLAKE2B 59400200a814d08fac88d9bcedc5db0ea2ae5192a5a67b389fa62cbb6e82d8f4210e9153a14aa2e259143c68f67863865359e7636966419f47b00f9fb44394ca SHA512 fa8d3464976569c5bca810dcbce6492bce85173907366aeda3a290a467d027891a8edc889283a9185c5d7139d51f77a2fb9f08b5a452ebc9cd96994f7db8127e
-DIST fq-0.2.0.tar.gz 12762736 BLAKE2B 7f1496b1da231b804b7e3af40f252381e83c62ca5e4779af65a502e9dc6a15a0a5267af68b83569c996f726870234c03952711e8262f360b2061bf34df5b2e4e SHA512 faf88faf0121a837c32dfbfe4c9e05261f28c2eec50d981f7840937ad121e45b0fa6809f428c45c0b41c99d1ae12a667a81911943e0601f2d81922ac670e03fe
-DIST fq-0.3.0-deps.tar.xz 23500960 BLAKE2B ed03e21c6ad2bedad72c68018518394b6438791d88edf14a725c56752fd83003e486d5e2d9e139742683b1adc43d8931b9a99f06e68d0c4abb389f20de0e1969 SHA512 1ca347a8b057948880fc049ac51810acd8212df5a74410bdeb1fba9f470369cf377f185d1fb36fa603bcaa7aeb0c25e50389935223a4f6a1786f919421933ec2
-DIST fq-0.3.0.tar.gz 12772624 BLAKE2B 07fb3109b89ca3c1a77210d0d59930c4a5665a0dc256d3daf6727d96fedd5fc3ac151b1623a5354cef96e21a0009023702759edd50712a4e76554b6cff71618d SHA512 725b9e7fc3fd481af1d792dcdb37a42d2cf0bb634b424df801909208c2479493219d08649e943296dd187f27f3ff1f16779f1ec3318e6eb99c9fe13943c5e9ae
-DIST fq-0.4.0-deps.tar.xz 23528264 BLAKE2B e547edf1bdd5ffdc567d820f3a8dbe5a87a1b7bb2bc6f5cbdd4b16d57d1458b36a08dd0cb5c3804eaf595876ae445851ae57fdb69b324012681bc410913c264c SHA512 fbf3dfa7e79e0a1eea2228f991c00b87bcbdba4dae24e27730d9824840ca5aeb5b21d6141ed5e5c8586422c171d4ffa3ad1e4bdde8de8bf91c7f309661ce0c92
-DIST fq-0.4.0.tar.gz 14024197 BLAKE2B d3de6e8b88aa4589d4edb18539bc13110bcfcdd3599f3c9b0759e5883e72f31ebe14eeb70a71b6333fd68b5ea97c0f0d1568788d94b7fb6a922f4fccf32d964f SHA512 8c8eeec5f701cbd9310f0cf44cbb5853602df84d21071a481a62cb864fe96925f0c143593c8c90b29c646aeb54d535c274e6745bfd51fddc8cfedffcfc57c712
 DIST fq-0.5.0-deps.tar.xz 23548612 BLAKE2B 2ad41a19b4f600df4ef1ad4e900d037d5df2b4249d1019e8335511ed05dc3c9dcb48db28ca052e61ca07384d1930ef25c9ac3e768c18bdba6069cd51665e219d SHA512 ab8a960a97eb4aac42adcbb9ce7bea13193439c90d9eeea3ba291f67f133953dfb9d0dbcae25a32c25f8284aedd6ff50c7719953ed2cc710839636f09f6964f4
 DIST fq-0.5.0.tar.gz 14043325 BLAKE2B a69d2f8602c8a1def0aff3c291e6ace23509e53a96c3b0e11e0353bc8a35cdd7ca6a8c8d1d72557e1c6895154d5e62070a7cd35ac76224c676c7e708e512d349 SHA512 21d0d23c21d12188bff10845b1c31cc8535f31ccef54d2b3e5b9b9770d6d0c830a9d83db3fb7f6559e940227bdcd8fdb3df45eccc2ab4cfe2e36214585e21343
 DIST fq-0.6.0-deps.tar.xz 23555196 BLAKE2B 9cdaefa577a4f795cdae1ad548a973439e3f9bc00570cee15009fbcc09002598e58888c00ed2179425c124cc00b213476717755e07c580e4e6664649448d5938 SHA512 075f51047f3c8884dd220d14fb72a1b35f2988cc4f5ff103349f4727361be1d0ed404526eaebf8481ab215e8cbca1f20c74981710403b74110311b0e50231fab
 DIST fq-0.6.0.tar.gz 14669090 BLAKE2B 6ad6be12df84e8c21f01679a1dcb94b9095735570843258fe302c5b1ac0d45305fdb4ad15fff287077ecdd20bc51af56f9036127e7dcfc23b69160dc4ee04d75 SHA512 625bef47f03115d52a960ce1afb5f850f8cd8a5414a12df3213fd3af6e6d9b7c0022dc62ee2d424d6dcbee828c9c8f233050e9d0afb880aac2864c2b24737f40
-EBUILD fq-0.2.0-r1.ebuild 942 BLAKE2B ea4d2d52f01d9755017efa28328962ee53200b0bf3b8a038a2ca88042cdde44516839fc9dc1213b1d84599948c9e435205f563a9c848a7e90ef6ecbd00384ecc SHA512 89622e1bf2898438250b808e8398581fd0e1973233a77f7d94b26071e19f41dac107292bd9e5dde9bebd4f4e8c236448e45bec808714832fedcef4ae1c03ae28
-EBUILD fq-0.3.0.ebuild 859 BLAKE2B 9b2338e2c6dede9cd39e49b7a22a4b3088debf3361307d374fd09196179d586d9c27895d7ed55c4f58df61082008346edc0998d7b1f3dcbf6db57a95da6db673 SHA512 a4d769cb953b338d9261253b972807deadd6939ee1f271f772c3779d690f7b9209831237c7b865738db64aa39dbe3c12322186d8f41e1a361f638667d11609f3
-EBUILD fq-0.4.0.ebuild 859 BLAKE2B 9b2338e2c6dede9cd39e49b7a22a4b3088debf3361307d374fd09196179d586d9c27895d7ed55c4f58df61082008346edc0998d7b1f3dcbf6db57a95da6db673 SHA512 a4d769cb953b338d9261253b972807deadd6939ee1f271f772c3779d690f7b9209831237c7b865738db64aa39dbe3c12322186d8f41e1a361f638667d11609f3
-EBUILD fq-0.5.0.ebuild 860 BLAKE2B 118ad811631095bb7fd2b80ca52a826f8ee54c213e18c919bd4dfc18f9a4e5ec54a41f28d0e906e98b3760e7c2b7e3a05c76d78145d22a846f983d7644f2e891 SHA512 c04502e39c0ce7deeb17f3293f8bb84089588226691bb51077bb10058e26e42d8ac0c3786623be0965973a3213185608fed4963cf65e7c79124e5ac3671e53a6
+EBUILD fq-0.5.0.ebuild 859 BLAKE2B 9b2338e2c6dede9cd39e49b7a22a4b3088debf3361307d374fd09196179d586d9c27895d7ed55c4f58df61082008346edc0998d7b1f3dcbf6db57a95da6db673 SHA512 a4d769cb953b338d9261253b972807deadd6939ee1f271f772c3779d690f7b9209831237c7b865738db64aa39dbe3c12322186d8f41e1a361f638667d11609f3
 EBUILD fq-0.6.0.ebuild 860 BLAKE2B 118ad811631095bb7fd2b80ca52a826f8ee54c213e18c919bd4dfc18f9a4e5ec54a41f28d0e906e98b3760e7c2b7e3a05c76d78145d22a846f983d7644f2e891 SHA512 c04502e39c0ce7deeb17f3293f8bb84089588226691bb51077bb10058e26e42d8ac0c3786623be0965973a3213185608fed4963cf65e7c79124e5ac3671e53a6
 MISC metadata.xml 313 BLAKE2B 49888cd21e49fca7d7913fbd265cbffd73dcfaa5080e09ccd1f5b9c62804e5b9fb1de1e21df96609079c18c481b2847897b4fe1a9fc499d0e6dc2559e677a27f SHA512 1d125e77b24aeffe27b0d54b8b9f247e1e2b62037bdb127f232d3089d63e1b92c2062e37446067850defc382d7e49785152e9af86cd46f44827e2e037dd291a7
diff --git a/dev-util/fq/fq-0.2.0-r1.ebuild b/dev-util/fq/fq-0.2.0-r1.ebuild
deleted file mode 100644
index c8afbda8f84e..000000000000
--- a/dev-util/fq/fq-0.2.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module
-
-DESCRIPTION="Tool for working with binary data (app-misc/jq for binary formats)"
-HOMEPAGE="https://github.com/wader/fq"
-SRC_URI="https://github.com/wader/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
-
-LICENSE="MIT BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( dev-tcltk/expect )"
-
-src_prepare() {
-	default
-
-	# https://github.com/wader/fq/issues/494
-	sed -i -e '/test_repl.exp/d' Makefile || die
-	# Don't unconditionally (and therefore twice) build tests
-	# TODO: upstream
-	sed -i -e 's/all: test fq/all: fq/' Makefile || die
-}
-
-src_compile() {
-	# Avoid -s being set in Makefile (stripping)
-	export GO_BUILD_LDFLAGS="-w"
-
-	default
-}
-
-src_install() {
-	einstalldocs
-
-	dobin fq
-}
diff --git a/dev-util/fq/fq-0.3.0.ebuild b/dev-util/fq/fq-0.3.0.ebuild
deleted file mode 100644
index ac1877d19d56..000000000000
--- a/dev-util/fq/fq-0.3.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module
-
-DESCRIPTION="Tool for working with binary data (app-misc/jq for binary formats)"
-HOMEPAGE="https://github.com/wader/fq"
-SRC_URI="https://github.com/wader/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
-
-LICENSE="MIT BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( dev-tcltk/expect )"
-
-src_prepare() {
-	default
-
-	# Don't unconditionally (and therefore twice) build tests
-	# TODO: upstream
-	sed -i -e 's/all: test fq/all: fq/' Makefile || die
-}
-
-src_compile() {
-	# Avoid -s being set in Makefile (stripping)
-	export GO_BUILD_LDFLAGS="-w"
-
-	default
-}
-
-src_install() {
-	einstalldocs
-
-	dobin fq
-}
diff --git a/dev-util/fq/fq-0.4.0.ebuild b/dev-util/fq/fq-0.4.0.ebuild
deleted file mode 100644
index ac1877d19d56..000000000000
--- a/dev-util/fq/fq-0.4.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module
-
-DESCRIPTION="Tool for working with binary data (app-misc/jq for binary formats)"
-HOMEPAGE="https://github.com/wader/fq"
-SRC_URI="https://github.com/wader/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
-
-LICENSE="MIT BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( dev-tcltk/expect )"
-
-src_prepare() {
-	default
-
-	# Don't unconditionally (and therefore twice) build tests
-	# TODO: upstream
-	sed -i -e 's/all: test fq/all: fq/' Makefile || die
-}
-
-src_compile() {
-	# Avoid -s being set in Makefile (stripping)
-	export GO_BUILD_LDFLAGS="-w"
-
-	default
-}
-
-src_install() {
-	einstalldocs
-
-	dobin fq
-}
diff --git a/dev-util/fq/fq-0.5.0.ebuild b/dev-util/fq/fq-0.5.0.ebuild
index 5df96c3f076c..ac1877d19d56 100644
--- a/dev-util/fq/fq-0.5.0.ebuild
+++ b/dev-util/fq/fq-0.5.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar
 
 LICENSE="MIT BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index 4fda23d7d7b8..57430e6c88b4 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -9,6 +9,6 @@ DIST valgrind-3.20.0.tar.bz2.asc 488 BLAKE2B 12642e4f85c7b17bdb892221f74d80ce919
 DIST valgrind-3.21.0.tar.bz2 17449484 BLAKE2B 1f7306d288eb5ecfb2b2f0b2dc68960ecd4a7213b96a2e4ecb9990a755e8c233b0e9d190c0f807019bde669f44a631c8dafe9eb521d739561e6f889f7bdaca5c SHA512 3e86cda2f2d6cd30807fac7933ba2c46a97a2b4a868db989e6b0cceeadf029af7ee34ba900466a346948289aacb30f4399799bb83b97cc49a4d2d810441e5cfd
 DIST valgrind-3.21.0.tar.bz2.asc 488 BLAKE2B 6297bc925c16526a51de4f589232a8d5bcb8d54bdc885c145d329deeba45b42d3a5a8a3f59d3fb240d3bd78be7fd30d95ceb33c7624afd3c99c51833d0fd16f2 SHA512 114e5cd2f7352e56099efa3b2c42d39ed24e42419bbaac1af5e2b5c4fa72a2ba38ac6b0c60b93460a0cce8819ca0c7fae6618599b2af809ac0ab4fa30fdb25ba
 EBUILD valgrind-3.20.0-r2.ebuild 4300 BLAKE2B a7c9b1f23d8e84375846633c1f91e48cf12ac40b9238b2f0d0edd3500c28706837ec1733f7c81e81c2469ae444e8153ea64670c1612e696205629171d3578019 SHA512 7ad54251e9ae5ac05dbb7bc5d59113d7c74cd3a98e1085e6c907672fde857ce2f5acd4ce02aa616db3e4aada01ad3e0923d5695b7e14623e3537dc316b27f823
-EBUILD valgrind-3.21.0-r1.ebuild 4088 BLAKE2B 29e7b8a46241c6da7338070275bd8f3fc98ba153a10617f2f48a541493bd1fbce6f93492bae0e0c4dcc5bd1341d7db9dfa283c0c84a17df8b31dc4ebbebb381b SHA512 5dbcb7c4cfe602443427fa5394d0cfffd891a7a632a16a530aa87b4eb009d99115a9020f6e99ae02918c077e02c045f690cdbc14a07fb570212a9df57e6246a3
+EBUILD valgrind-3.21.0-r1.ebuild 4087 BLAKE2B 3e615ab2b642809cef8220734be89fd63b42bf33e725e28c6b9095f8f0b0036d072904447b8b8be3b42c3f7279c63baeb2398e034e4e414aadb399c2b3d9af1e SHA512 69a47d9c01df9f2e94a91dc7de85dfa11d0dd2d291682d607236c8f0de7cbc91c45a41c269ada95e8d341aafa0fbac83556219a0b0e593104ea27d5ed10cdb65
 EBUILD valgrind-9999.ebuild 4154 BLAKE2B a97cfa84b586051f943d3793ae227aa077e197da9c645bacabdb79daf061af5fee000e63d5c7766cc79c10458db240e26160384c07ca6883fee80d84a89c8ed0 SHA512 6ef312def3f5cebe6c60950fd7bd56699c1c9ad29c9deed138f90b2774dde7fc329c83c6fed66607d60fa1fe01a4534aca54864e7b0eaeb1cd0585904cd9498e
 MISC metadata.xml 1037 BLAKE2B b39708a006ad3ff24b100c702382ec8c45f6e300f3497ccd06199a6195abfa936c8f71ebd3223e0f7299e6644e378ef1d8d2c95a23059b66757d8a91bcbfce15 SHA512 4398f60fdacedbd92881dea016e60c5def5abe8989b56fc450b71b5c65b0d9c26a44b8ee89d0dcb71ab376d987c8e22d12031e9fb2a17b126e3223adb12e0f2f
diff --git a/dev-util/valgrind/valgrind-3.21.0-r1.ebuild b/dev-util/valgrind/valgrind-3.21.0-r1.ebuild
index 7d3dd4bfcbbc..95826a18f9c7 100644
--- a/dev-util/valgrind/valgrind-3.21.0-r1.ebuild
+++ b/dev-util/valgrind/valgrind-3.21.0-r1.ebuild
@@ -15,7 +15,7 @@ else
 	inherit verify-sig
 	SRC_URI="https://sourceware.org/pub/valgrind/${P}.tar.bz2"
 	SRC_URI+=" verify-sig? ( https://sourceware.org/pub/valgrind/${P}.tar.bz2.asc )"
-	KEYWORDS="-* ~amd64 ~arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="-* amd64 ~arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/dev-util/visualvm/Manifest b/dev-util/visualvm/Manifest
index c4708cb74586..eaca1362c5c2 100644
--- a/dev-util/visualvm/Manifest
+++ b/dev-util/visualvm/Manifest
@@ -1,14 +1,8 @@
 AUX visualvm-r2.sh 423 BLAKE2B cdc5db4465a339735ccff5f37bed89d76da2f2d514f522b7768fa37aad46804997d267285b09d6346674d43964d0ef0a0cadb24d28e9b90256a593d7420aab4a SHA512 eb7356e10a94db048fb471215b2115b93764931ed4178594bca5a1aac480f2262ef361b2f53fc23dbcdb4d44e1aeab678204c50583abb8016696a7d87288a9bb
-DIST common-8.0.1.jar 435506 BLAKE2B e3c0db1691c9f27d39b5d0cad18707cd27e708d74d0db17a13b0ee4ddcc1d96cdd7455a8f5c69d01675434e2789fdb1870d87fffc8eae1776b396cf38c50c723 SHA512 0ee73534f08349c07a0c4c8654526030e634a3aee3175ff3986ad4e37dba0ea3b7d760582c8b612d316cf72f455596c1c50f08e6ddb2d175dc4bb12feba65b22
 DIST common-8.3.0.jar 438403 BLAKE2B 56d76e8115bd0022afcdd95a62a7419d1ea1f5a1aa426b8313f5d22d9458c0d30276b13fb616d1a1d19ffd322b86fef5f0fc4b3ce673deadfcbad1ba473ccbcf SHA512 58378deca55362f97dbf7313633012f40871aee5fecf9792b0284952466e7a1ee0e96f2d948c81564ba0cf92a7e16b6d164a535e89f2da732ef9231876cb4b0b
-DIST encoder-1.2.2.jar 37529 BLAKE2B 0e61c679db8c559005de726c8fc358cc5f04ab51b357fe53889cb585c8d006a77a3e24cb51043912ea9be11739ffa14de86f22d3dc4663aefee8bc75b9ff6862 SHA512 eed5529b326a9fd493032539dd50c7d60439fed0743cd567d348aa334e837d412ac10b220fd5099edcf9098fc7c684fba98b92916b9ef79831395686fd83b7dc
 DIST encoder-1.2.3.jar 37931 BLAKE2B b416d455424b3fd87c94f7f963c819d3a8d76e763c112947718514e2bc1b67b40c6cd9cc051c5cfae6b2aa1cbc92961d1bcc3565ba3dcf3bf58395d543c5aae9 SHA512 ba7887259007272c533228cec1e2c5caebd639ef05b7b8925be6a0b5a7da5859e82489af4d462153e64bf2ce1234a8d6caa606fc6e42675a41cf7a067cfc5f6b
-DIST flightrecorder-8.0.1.jar 500815 BLAKE2B af9f024e7199e7f577e75b3d40f40a3e65f8e98be768415e5832aa6e1ffcfc9ecc391ef4d3fa515411d6d3ed051f35579656bae8cf8e1aea2023d54b072c84a0 SHA512 08c98ed3444b396e6e1ae0f909378c56e2ce04741f7b7ee83e39ae8a0699802709a5419f29c3a7bd44a11caba984071ef4f0554183fd5260ed28741edd191809
 DIST flightrecorder-8.3.0.jar 532387 BLAKE2B 9ef286c53427292beea222ab75d7b8b3e36e44fed5e084d3db6a2910627e67abcdcdab18a175a43c57afc30795dcfa8059f7b0189db45371da6c2b5e635c6447 SHA512 98f4ac4799756e560f0ebf2998985ca07ffe826d925651633763358d2ced757780689b3e64d78af54851a93c270a60f226a285372cb783c978fb3543fed898eb
-DIST lz4-java-1.7.1.jar 649950 BLAKE2B caed7593dad078fcaf3853a4dffbd540d7e5a3298b13092dee4b82a70359494584b9901da600239d65e9930e7a769adf1a45eac85033f8ca0cfcaef6a3b09544 SHA512 ff48daeca92c5a7657aa9c7fe41c5ae75a5fa0aad05c655bacb64a40acfe93ffd3d40bef16544614ce8a38db3e1df177023101773f6f7c1d32031413270e42d2
 DIST nb140_platform_20220908.zip 25886909 BLAKE2B 28cf8180eddd81fcfee513faf19e4a9ec2f3b7c35ad1ee23fe89bf6b5611432c3f41e9376b733ec5504fce1258e7dd27e0c229d291a5fbed3755df7fe0e99421 SHA512 cc2b320caa8fa0b4dbc5469e44453f1a586b6713af3bca799a654c7d1223741eab3a463fe53c955fb5639ec580f73ed93a7cc0ac26ce5dd84d55c418e024523e
-DIST visualvm-2.1.2.tar.gz 36393559 BLAKE2B ba925ddacfb1474f47d0ab393c7f8f14d18e12ef25aef82efd59a273eb8464d8758e0cc82cf41238b0356546dd03fed319b8c04366c4037fa99251d358f5e1c2 SHA512 f324bdec570f050c3df3d047cf9ab9e8565ed95150d1bcb5d86166aa221d0a3c55a2c3cdb345ddbf42b9cef35cb6a21033ed24fd203c0dbb67d2f8dc2b5f2960
 DIST visualvm-2.1.6.tar.gz 11610216 BLAKE2B 60e87e1219cd1f39bd8d86ec35d07f4298f8378f3c16354570c8f3422cf7e4a3ed42d0a88d8d33290d226a8d92ec9eea3cf85713281c826aafb7610b1e0b42ca SHA512 3257b1890aab185aa28e226679bc78858f154022d49c8a4dd2ee2a5ec04afc4a5ac9633248f1aa1abcb8a457f5e612f223f4a03fdd54e6b8beb329c79dd0574c
-EBUILD visualvm-2.1.2.ebuild 3010 BLAKE2B 2908c91fd3f7e577e009114e102e193a6fd16ff626814f7afe1286d8e0af9d1696fe44c612bfc6300fb9aacef911aa2372221ba776294dd6f0d052671d4d4dc9 SHA512 5acaa9e212caf5066f25aed0b2a15fe5152c6fb440320ecd9bc89d963db59d88b107e6cb37ff6c72a1eb763951c5d06070b62e4749d94b56f98541b656045d81
-EBUILD visualvm-2.1.6.ebuild 4694 BLAKE2B d0da6458ca3f511338fab9d1b599351b2ee6ab9d8c8cb3c0cd82604fe6f1946672ab3b25de2e9f6f84ac26b21cf2d014dc448da34d3e73235e20211ea7c58377 SHA512 9a777785d88a6c74f11abefd3d2f10ce1269e9068627cdf2b5f32e2b96c5c7753333c21dfe7f69ec282e3bacce6789245ddbe63b1bafbc4d886350960d2143be
+EBUILD visualvm-2.1.6.ebuild 4721 BLAKE2B ee94c9db901f6e429373d196dfbdec6dd2af060a30af02e6a8331f4073eff18567ca0f17df2fcc44fe0339a68f2fcd01dc2b5ef200117bc1de16817811aaee18 SHA512 e32b9fae1a17669d38c7f75c24ad324b93bb47fa1c05781271ea62364a0c5b5d5a285f2d61e83eb35643938740a4e8a529c2703ff746e3a0a3126e7f17ff0e8e
 MISC metadata.xml 317 BLAKE2B e5f32379a40e3c2180df4f3ac4e7ea03a7dbfe69b1cb6537c1693262cc06e6334959abfb68f888c588fa933f60e85f137355bb57ff769107dfe805595d1a3ad1 SHA512 605d7206793c3d865547b69f9715305d46d433d18096b886b362d2d86adf4eda894c23af1819b6af95423fbe2a37781d1d100a9df9f15a01942f66c73dc2fa2c
diff --git a/dev-util/visualvm/visualvm-2.1.2.ebuild b/dev-util/visualvm/visualvm-2.1.2.ebuild
deleted file mode 100644
index b05bacf59f27..000000000000
--- a/dev-util/visualvm/visualvm-2.1.2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-NBV=124
-NBT=21062021
-NBZ=nb${NBV}_platform_${NBT}.zip
-
-inherit java-pkg-2 java-ant-2 desktop
-
-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}"
-# The extra jar files are not present in gentoo atm so bundling them
-SRC_URI="https://github.com/oracle/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://repo1.maven.org/maven2/org/openjdk/jmc/flightrecorder/8.0.1/flightrecorder-8.0.1.jar
-	https://repo1.maven.org/maven2/org/openjdk/jmc/common/8.0.1/common-8.0.1.jar
-	https://repo1.maven.org/maven2/org/lz4/lz4-java/1.7.1/lz4-java-1.7.1.jar
-	https://repo1.maven.org/maven2/org/owasp/encoder/encoder/1.2.2/encoder-1.2.2.jar"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="7"
-KEYWORDS="amd64"
-
-RDEPEND="
-	>=virtual/jre-1.8:*"
-
-# it does not compile with java 11
-DEPEND="
-	virtual/jdk:1.8"
-
-S="${WORKDIR}/${P}/${PN}"
-
-QA_PREBUILT="
-	/usr/share/visualvm/platform/modules/lib/amd64/linux/libjnidispatch-nb.so
-	/usr/share/visualvm/cluster/lib/deployed/jdk1[56]/linux-amd64/libprofilerinterface.so
-"
-
-EANT_BUILD_TARGET=build
-EANT_EXTRA_ARGS="-Dext.binaries.downloaded=true"
-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 libs.profiler/lib.profiler/release/lib/deployed/jdk1? -mindepth 1 \
-		-maxdepth 1 ! -name linux-amd64 -exec rm -rv {} + || die
-
-	# link in downloaded jars
-	for file in flightrecorder-8.0.1.jar common-8.0.1.jar lz4-java-1.7.1.jar encoder-1.2.2.jar; do
-		ln -s "${DISTDIR}/${file}" jfr.generic/external/ || die "Failed to link file ${file}"
-	done
-}
-
-src_install() {
-	# this is the visualvm cluster
-	insinto ${INSTALL_DIR}
-	doins -r build/cluster netbeans/{harness,platform}
-
-	# configuration file that can be used to tweak visualvm startup parameters
-	insinto /etc/${PN}
-	newins launcher/visualvm.conf ${PN}.conf
-	sed -i "s%visualvm_default_userdir=.*%visualvm_default_userdir=\"\${HOME}/.visualvm\"%g" "${ED}/etc/${PN}/visualvm.conf" || die "Failed to update userdir"
-	sed -i "s%visualvm_default_cachedir=.*%visualvm_default_cachedir=\"\${HOME}/.cache/visualvm\"%g" "${ED}/etc/${PN}/visualvm.conf" || die "Failed to update cachedir"
-	echo -e "\nvisualvm_jdkhome=\"\$(java-config -O)\"" >> "${ED}/etc/${PN}/visualvm.conf" || die "Failed to set jdk detection"
-
-	# visualvm runtime script
-	newbin "${FILESDIR}"/${PN}-r2.sh ${PN}
-
-	# makes visualvm entry
-	make_desktop_entry ${PN} VisualVM java "Development;Java;"
-}
diff --git a/dev-util/visualvm/visualvm-2.1.6.ebuild b/dev-util/visualvm/visualvm-2.1.6.ebuild
index 2724f40cf8be..084537d66f3d 100644
--- a/dev-util/visualvm/visualvm-2.1.6.ebuild
+++ b/dev-util/visualvm/visualvm-2.1.6.ebuild
@@ -21,7 +21,7 @@ DESCRIPTION="Integrates commandline JDK tools and profiling capabilities"
 HOMEPAGE="https://visualvm.github.io"
 
 SRC_URI="https://github.com/oracle/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/oracle/${PN}/releases/download/2.1.5/${NBZ}
+	https://github.com/oracle/${PN}/releases/download/$(ver_cut 1-2).5/${NBZ}
 	https://repo1.maven.org/maven2/org/openjdk/jmc/flightrecorder/${FLIGHT_RECORDER_VERSION}/${FLIGHT_RECORDER_FILE}
 	https://repo1.maven.org/maven2/org/openjdk/jmc/common/${COMMON_VERSION}/${COMMON_FILE}
 	https://repo1.maven.org/maven2/org/owasp/encoder/encoder/${ENCODER_VERSION}/${ENCODER_FILE}"
@@ -85,7 +85,8 @@ src_prepare() {
 		ln -s "${DISTDIR}/${file}" jfr.generic/external/ || die "Failed to link file ${file}"
 	done
 
-	java-pkg_jar-from --into jfr.generic/external lz4-java lz4-java.jar ${LZ4_JAVA_FILE} || die "Failed to link lz4 java jar"
+	java-pkg_jar-from --into jfr.generic/external lz4-java lz4-java.jar ${LZ4_JAVA_FILE} \
+		|| die "Failed to link lz4 java jar"
 }
 
 src_install() {
@@ -96,9 +97,12 @@ src_install() {
 	# configuration file that can be used to tweak visualvm startup parameters
 	insinto /etc/${PN}
 	newins launcher/visualvm.conf ${PN}.conf
-	sed -i "s%visualvm_default_userdir=.*%visualvm_default_userdir=\"\${HOME}/.visualvm\"%g" "${ED}/etc/${PN}/visualvm.conf" || die "Failed to update userdir"
-	sed -i "s%visualvm_default_cachedir=.*%visualvm_default_cachedir=\"\${HOME}/.cache/visualvm\"%g" "${ED}/etc/${PN}/visualvm.conf" || die "Failed to update cachedir"
-	echo -e "\nvisualvm_jdkhome=\"\$(java-config -O)\"" >> "${ED}/etc/${PN}/visualvm.conf" || die "Failed to set jdk detection"
+	sed -i "s%visualvm_default_userdir=.*%visualvm_default_userdir=\"\${HOME}/.visualvm\"%g" "${ED}/etc/${PN}/visualvm.conf" \
+		|| die "Failed to update userdir"
+	sed -i "s%visualvm_default_cachedir=.*%visualvm_default_cachedir=\"\${HOME}/.cache/visualvm\"%g" "${ED}/etc/${PN}/visualvm.conf" \
+		|| die "Failed to update cachedir"
+	echo -e "\nvisualvm_jdkhome=\"\$(java-config -O)\"" >> "${ED}/etc/${PN}/visualvm.conf" \
+		|| die "Failed to set jdk detection"
 
 	# replace bundled stuff
 	pushd "${ED}/${INSTALL_DIR}/platform/core" > /dev/null || die