gentoo auto-resync : 23:01:2023 - 06:54:34

24 files changed, 217 insertions, 446 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 97c03480627e..8bc736dfc719 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/astyle/Manifest b/dev-util/astyle/Manifest
index 1500706d12b4..6038ec7a3420 100644
--- a/dev-util/astyle/Manifest
+++ b/dev-util/astyle/Manifest
@@ -1,5 +1,3 @@
-DIST astyle_3.0.1_linux.tar.gz 172483 BLAKE2B 4c80491cbcc976aa38ff294014df0dc01b39685eafdac6989bea082b1f61120c3985d14ff6db9f76606bbe8da1aaa344c2e0c9c2999a014f5d54384c0420cf97 SHA512 3e8d617c0ec89682bfb076081bb63ae9d44e897de0c85d5109b28adbbfe0620d5dacf59a4bd96ac30a5a4fcb3be136758e9c6fe2c69258b37956c212890a7158
 DIST astyle_3.1_linux.tar.gz 185589 BLAKE2B d0bc9bf3403de89d207f33ac885c7cd57fd1e71314c947e1593ee24ade9ce36c83c6fd8e7021f44d8d3b344ea3add63fa5a7b246c40f10193dc38b51e7ad36bc SHA512 2e8f13d291abda66bbba30174c364c81a81a490e0a21376f7da7cf471644c22caa37b9eefb100d093bf26d1a8bfa9d2f14b4c2a9b75b3cb84428b4514e277ff2
-EBUILD astyle-3.0.1-r1.ebuild 2387 BLAKE2B a91a68c3161f8938a3c2be1f005d03e54d10755043b6c0aa69cec1af145136ef90fa388f37acd6aa625252b55d205cb52fba1d9cee4d7452a37ae7f480d00b65 SHA512 9865738112a2ff3c012f09da2cd8b73b13a9f981d1242eeb60e14b6fa4ae783961b0807a1fb56638415b5f0cb593a306a4958dab46115924dcb1d5179b8380a1
-EBUILD astyle-3.1-r2.ebuild 2394 BLAKE2B a43d343d01a3a67181552ef4ee270567e8d56ebe28057a2e95c69f7e67364334ac4e289c48d2b9a95c80d3eeed31f098f2996a480d68f2f12232cbbab5100dda SHA512 060a9a0f576df46da55553d2cfd7c1b08bf78c870ce791a611b88c3a50f283183f688c45fcb3ce23e9062bdc143e0bf9f430d40ad64e498d0244499df66734c9
+EBUILD astyle-3.1-r2.ebuild 1891 BLAKE2B fea27eafaf14eaf1245a87a873dbfa327a23987468a291a9bf8de1af50d57f168143ae94b6dfb8dadfdf121ee3fc13f6efd90656962bd866093e27c2477544be SHA512 ecab4c77e646ee8dd2f174e50e8b5c3af9a077b1c1ddfac4ab05ec56e1b83e82ff7f8053d3f52454c282a9f545a470ba2caa2f1786956a26514b6f0adb988fe7
 MISC metadata.xml 754 BLAKE2B c034556afe246a6d75d57b2e37399bdd24a37046a1bf0181757ed449f144f099964e7cdf470502f83542707094c752de3841d92bf2844fa7ee0b6038d25494f2 SHA512 0e4087bab09255528dfce61e21b12a4a05b93d3eaf75874b2a2b12f168046c0e9e040c29321766cfd505bdc5360eb6d16d320a73b317849d19b2555a95415396
diff --git a/dev-util/astyle/astyle-3.0.1-r1.ebuild b/dev-util/astyle/astyle-3.0.1-r1.ebuild
deleted file mode 100644
index 7396f1662f61..000000000000
--- a/dev-util/astyle/astyle-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs versionator java-pkg-opt-2
-
-DESCRIPTION="Artistic Style is a re-indenter and reformatter for C++, C and Java source code"
-HOMEPAGE="http://astyle.sourceforge.net/"
-SRC_URI="mirror://sourceforge/astyle/astyle_${PV}_linux.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/3.0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="examples java static-libs"
-
-DEPEND="app-arch/xz-utils
-	java? ( >=virtual/jdk-1.6:= )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	if use java ; then
-		java-pkg-opt-2_src_prepare
-		sed	-e "s:^\(JAVAINCS\s*\)=.*$:\1= $(java-pkg_get-jni-cflags):" \
-			-e "s:ar crs:$(tc-getAR) crs:" \
-			-i build/gcc/Makefile || die
-	else
-		default
-	fi
-}
-
-src_configure() {
-	append-cxxflags -std=c++11
-	tc-export CXX
-	default
-}
-
-src_compile() {
-	# ../build/clang/Makefile is identical except for CXX line.
-	emake CXX="$(tc-getCXX)" -f ../build/gcc/Makefile -C src \
-		${PN} \
-		shared \
-		$(usev java) \
-		$(usex static-libs static '')
-}
-
-src_install() {
-	doheader src/${PN}.h
-
-	pushd src/bin >/dev/null || die
-	dobin ${PN}
-
-	local libastylename="lib${PN}.so.${PV}"
-	local libastylejname="lib${PN}j.so.${PV}"
-	local libdestdir="${EPREFIX}/usr/$(get_libdir)"
-
-	dolib.so "${libastylename}"
-	dosym "${libastylename}" "${libdestdir}/lib${PN}.so.$(get_major_version)"
-	dosym "${libastylename}" "${libdestdir}/lib${PN}.so"
-	if use java ; then
-		dolib.so "${libastylejname}"
-		dosym "${libastylejname}" "${libdestdir}/lib${PN}j.so.$(get_major_version)"
-		dosym "${libastylejname}" "${libdestdir}/lib${PN}j.so"
-	fi
-	if use static-libs ; then
-		dolib.a lib${PN}.a
-	fi
-	popd >/dev/null || die
-	if use examples ; then
-		docinto examples
-		dodoc -r file/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	local HTML_DOCS=( doc/. )
-	einstalldocs
-}
-
-pkg_postinst() {
-	if [[ -n "$REPLACING_VERSIONS" && "$(get_major_version $REPLACING_VERSIONS)" -lt 3 ]]; then
-		elog "Artistic Style 3.0 introduces new configuration verbiage more fitting"
-		elog "for modern use. Some options that were valid in 2.06 or older are now"
-		elog "deprecated. For more information, consult astyle's release notes at"
-		elog "http://astyle.sourceforge.net/news.html. To view offline, see:"
-		elog
-		elog "${EROOT%/}/usr/share/doc/${P}/html"
-	fi
-}
diff --git a/dev-util/astyle/astyle-3.1-r2.ebuild b/dev-util/astyle/astyle-3.1-r2.ebuild
index 7f30eabb7a36..82c533c6d7d1 100644
--- a/dev-util/astyle/astyle-3.1-r2.ebuild
+++ b/dev-util/astyle/astyle-3.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit flag-o-matic toolchain-funcs versionator java-pkg-opt-2
+inherit flag-o-matic toolchain-funcs java-pkg-opt-2
 
 DESCRIPTION="Artistic Style is a re-indenter and reformatter for C++, C and Java source code"
 HOMEPAGE="http://astyle.sourceforge.net/"
@@ -57,11 +57,11 @@ src_install() {
 	local libdestdir="/usr/$(get_libdir)"
 
 	dolib.so "${libastylename}"
-	dosym "${libastylename}" "${libdestdir}/lib${PN}.so.$(get_major_version)"
+	dosym "${libastylename}" "${libdestdir}/lib${PN}.so.$(ver_cut 1)"
 	dosym "${libastylename}" "${libdestdir}/lib${PN}.so"
 	if use java ; then
 		dolib.so "${libastylejname}"
-		dosym "${libastylejname}" "${libdestdir}/lib${PN}j.so.$(get_major_version)"
+		dosym "${libastylejname}" "${libdestdir}/lib${PN}j.so.$(ver_cut 1)"
 		dosym "${libastylejname}" "${libdestdir}/lib${PN}j.so"
 	fi
 	if use static-libs ; then
@@ -76,14 +76,3 @@ src_install() {
 	local HTML_DOCS=( doc/. )
 	einstalldocs
 }
-
-pkg_postinst() {
-	if [[ -n "$REPLACING_VERSIONS" && "$(get_major_version $REPLACING_VERSIONS)" -lt 3 ]]; then
-		elog "Artistic Style 3.0 introduces new configuration verbiage more fitting"
-		elog "for modern use. Some options that were valid in 2.06 or older are now"
-		elog "deprecated. For more information, consult astyle's release notes at"
-		elog "http://astyle.sourceforge.net/news.html. To view offline, see:"
-		elog
-		elog "${EROOT%/}/usr/share/doc/${P}/html"
-	fi
-}
diff --git a/dev-util/cloc/Manifest b/dev-util/cloc/Manifest
index 33a64f95fc25..9b84ef5084f9 100644
--- a/dev-util/cloc/Manifest
+++ b/dev-util/cloc/Manifest
@@ -1,5 +1,7 @@
 DIST cloc-1.88.tar.gz 548402 BLAKE2B 0da417d907703e42c9c69e46f39792652e6eca49994a8008b0074899bfb999262d529432ab1e8a1c7cc80dc1fefc9514596f099a4238c4768618057ba3b180e8 SHA512 0acd152b387d3088d8bd35d121677d00accb03f882d83bfb34924915d40700b0c23bca1bde924d1999b5fa910503d33af230567fcc8f452f7d00a69caaaf8c4f
 DIST cloc-1.90.tar.gz 596758 BLAKE2B 273a0ade1cb5d95fda3404b46869fa970276aae0f4f733efafad7949170e63713059e1a09dffae23a3469517bcce1ab6029b4a91b1900ddc7aa4dd5ec0ab2127 SHA512 d2950d56ac4d8a6fe53059759375d8245aa8a8474462daec385a8b4e2f36961270c08390c361d4a0566e529357b0d302cef31c8fc69dc680655f4c3ea3a1d813
+DIST cloc-1.96.tar.gz 646774 BLAKE2B b632d07e1f3b89b210feee80d861e840f16b66899182c1787212b0aebadb9fa6a7ab33935e3df9f9727ac3a696b776f877f5ab858d506c6917babaa3203ff9fc SHA512 459633ec1b0cf9b17ee7a502d0573b6c35ba76518a9d94f9c4e4f99d85873c8934782ac0cffa8616848378e500bc6dfa74b278cf771a7542cedb505f69471708
 EBUILD cloc-1.88.ebuild 688 BLAKE2B 4d4301e39c40b0a6113f2ada061eb65864c69b0e11d514e4d60bfb992da9d850ed9e0f470ba4c9523aac6c2bb16c4db34a14c54b0716bcaa0254a513fe6b140d SHA512 ed2bc861df08dd911e5ec06bdf7fa76dd76b7fea2b0906d6bdf5982ef259ccb6b6e59e1f402af48eb111663ec2d6117cb9a4eac191e65b177c14198cc6cdf754
 EBUILD cloc-1.90.ebuild 706 BLAKE2B 0b1ee3f9dcf498ea639451953bf6ac5aecb8dbe069e9f3956f41e9006084bfbb098d00f0036a5d08294caa78fbe07ce19be5ba2e05305f36d6a28e3aa5efa421 SHA512 063f6649bf507ba5d9b47ec08af5ffb91bdd6d6e44814ed54e6091ad63e3696e11d5efd32faefbe1d234e1ef7e78e111d45e2f6e0aaa486c0c08f9954a64c953
+EBUILD cloc-1.96.ebuild 708 BLAKE2B ab1ee92e8ceb7563a62e45e2ecfdb43593f43f55340d8b20d88612d089cdb944466031a22ebcdfd9aa1b74deb78d33a5e9a9b4cd38110cc154fa5f5f148ac5b6 SHA512 e33fb560d3ff5ea4b86a326d63b57aa5ed72faccff23759960c81f090e257325ef24965d0fcd90591daf50d2093fd67c29713955ff505b0e1b86460f63788a5e
 MISC metadata.xml 730 BLAKE2B 55d88ba6367e16aed1fbe5877a777bf1fb09793c040d8b317e8b09d73419fd61ee66d800835e518c09ed3470b6ea034cfb572335a8d312583e8172f36a74b11d SHA512 f7b98f9dc54bcb268fc51151fce719e2c89d1d251c4a9cbe3632faccfd68e5fd5705d7a8ae985e3599241bd72784103b382b53e7ef6a615d7c5637bbdebe14d4
diff --git a/dev-util/cloc/cloc-1.96.ebuild b/dev-util/cloc/cloc-1.96.ebuild
new file mode 100644
index 000000000000..7918ec1d987b
--- /dev/null
+++ b/dev-util/cloc/cloc-1.96.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Count Lines of Code"
+HOMEPAGE="https://github.com/AlDanial/cloc"
+SRC_URI="https://github.com/AlDanial/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}
+	dev-perl/Algorithm-Diff
+	dev-perl/Parallel-ForkManager
+	dev-perl/Regexp-Common
+	virtual/perl-Digest-MD5
+	virtual/perl-File-Spec
+	virtual/perl-File-Temp
+	virtual/perl-Getopt-Long"
+
+src_compile() {
+	pod2man "Unix/${PN}.1.pod" > "${PN}.1" || die
+}
+
+src_install() {
+	doman "${PN}.1"
+	dobin "Unix/${PN}"
+}
diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
index 181fb038798f..be96bda5fca6 100644
--- a/dev-util/pkgconf/Manifest
+++ b/dev-util/pkgconf/Manifest
@@ -1,8 +1,8 @@
 DIST pkgconf-1.8.0.tar.xz 296304 BLAKE2B 6585a855a313406f77d26fba3cc3cef798b27c4b7ece81738bdba12f36ee93fbcaf838e1065406c28adc20852e34e2de14bc5f4837982f9cc35360d9a3ac83a5 SHA512 58204006408ad5ce91222ed3c93c2e0b61c04fa83c0a8ad337b747b583744578dbebd4ad5ccbc577689637caa1c5dc246b7795ac46e39c6666b1aa78199b7c28
-DIST pkgconf-1.9.3.tar.xz 308612 BLAKE2B 90d48171e24235906c41e97f7a2fa53825724c7500e90e502e5e2e4d668d3be863119e39b83a8e02adcef83a7def42e1c5e3641e77f6194bd81f653776bc95b4 SHA512 f65583f78571e4da161201d6387091562b38893adc31df421b0e6d560a060deb306a0b7ad8b28266253244c935d0a8169f35e04825a7857f21a09527d36f921e
+DIST pkgconf-1.8.1.tar.xz 302372 BLAKE2B 591961f0b1fd185834fd8e2a672199cffc035139599817b1d56d571300d2aa800a719c9477aac4023dfade597ad3cc3b45360babe57498977568ee57077c7bbe SHA512 7a7d5204c1c9bfb6578bda56f299d1fa0300e69a133a65730b10ad77aefbf26fceb74ae77cecda326b3ed5db5736f27fcce94764b3a56d40f4bb99fecdc80bba
 DIST pkgconf-1.9.4.tar.xz 309164 BLAKE2B f0a99f9c7aaf571b14aa24b6dae441fb041d794294e560601232c03254e521a49a5724e41c5ada537f7933bb4831b63482896c8569a9502c8c5d841190e1d091 SHA512 079436244f3942161f91c961c96d382a85082079c9843fec5ddd7fb245ba7500a9f7a201b5ef2c70a7a079fe1aacf3a52b73de5402a6f061df87bcdcf0a90755
 EBUILD pkgconf-1.8.0-r1.ebuild 1628 BLAKE2B a331c5e6da602547564a077f346d24cd8ec374d61806a2504203bbf0ef2409850556a641294678142a6da04692e395e73020404b1c556c3e275c7c1278fd3cd6 SHA512 fbd538560cfc2a4440519d89abe3dac785145f468bd9f8d1def6e7a7838e30c2af1da36032736d4c035f5b28a4e9c50618642f2ad50ba3c4d55051978590e983
-EBUILD pkgconf-1.9.3.ebuild 1621 BLAKE2B 0053a74d4104c9913bed7cf8bebe00d31635c7fd1cf5fa5f12cfe03dd97bf67b169a8ce1b37b313fb01d1c87bda58be0e165f1b23caebc38477c96f0e654649e SHA512 d22ccb7de7591d90e1ac82b5673df9be62e94d3f4079a01957ddc242231e4973740a57bcb3f5ccb9608d59a0f25b629874268974ca2407853d8c94350fe8f8c3
+EBUILD pkgconf-1.8.1.ebuild 1617 BLAKE2B 9ebcbe85582ab382a61c7bdb692ffe865d16bd8c0c0360af184ef35823dd646846b1e49174eee2ce00826a1366e227c6846466eb140861c19788f8b545154ee1 SHA512 7b0ec467a6a5354514e0732ae19d4e90d6ff902f4a64c7560e38912aed1f233c3f66a78320fdbdbbc374bbdf18852504f3ee758bc8e97f4366a6ec7fff7d8b23
 EBUILD pkgconf-1.9.4.ebuild 1621 BLAKE2B da3f310e7f3aba9be5e6b001a4137356f2baebe91c7e0a484a26f89f3f4ee5d069baf6ec09e9269bfd6d7da7acc85994925e8f83d2ff8a50f42ccfeac46ad29d SHA512 9b98f592d34118a9dc6878bc00f4e52af17735658791c593c3bd9f744a0648c0f94df3f59808ab8f81eae61b57a4c7bda20221a9099c42ffa93c349f66c946ad
 EBUILD pkgconf-9999.ebuild 1621 BLAKE2B 0053a74d4104c9913bed7cf8bebe00d31635c7fd1cf5fa5f12cfe03dd97bf67b169a8ce1b37b313fb01d1c87bda58be0e165f1b23caebc38477c96f0e654649e SHA512 d22ccb7de7591d90e1ac82b5673df9be62e94d3f4079a01957ddc242231e4973740a57bcb3f5ccb9608d59a0f25b629874268974ca2407853d8c94350fe8f8c3
 MISC metadata.xml 482 BLAKE2B 3bf8c3349711340133d9e7d81ca94172ce16e607b4fe9135cb7145d0214c0e9753bc884d248d89e2f5d2ab83368b07a95713b2b2a26ad5aaaffe10086a70a9b7 SHA512 6c372c1bc8e8794015838ad7646a503dd19f06890c8a425ce1ed12f3e5211ff01b1c8cc7ee1685b7ffe10c3b1fb89b81a80152f114be72861c27e5bcc6f17653
diff --git a/dev-util/pkgconf/pkgconf-1.9.3.ebuild b/dev-util/pkgconf/pkgconf-1.8.1.ebuild
index e962927aff1a..311850a40d1d 100644
--- a/dev-util/pkgconf/pkgconf-1.9.3.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.8.1.ebuild
@@ -1,26 +1,26 @@
-# Copyright 2012-2022 Gentoo Authors
+# Copyright 2012-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 inherit multilib multilib-minimal
 
-if [[ ${PV} == 9999 ]] ; then
+if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://gitea.treehouse.systems/ariadne/pkgconf.git"
 else
 	SRC_URI="https://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
-	# Per release notes, 1.9.x is a testing/development release.
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
 HOMEPAGE="https://gitea.treehouse.systems/ariadne/pkgconf"
 
 LICENSE="ISC"
-SLOT="0/4"
+SLOT="0/3"
 IUSE="test"
 
+# tests require 'kyua'
 RESTRICT="!test? ( test )"
 
 BDEPEND="
@@ -29,26 +29,30 @@ BDEPEND="
 		dev-util/kyua
 	)
 "
-RDEPEND="!dev-util/pkgconfig"
+RDEPEND="
+	!dev-util/pkgconfig
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/pkgconf$(get_exeext)
+)
 
 src_prepare() {
 	default
 
-	[[ ${PV} == 9999 ]] && eautoreconf
-
-	MULTILIB_CHOST_TOOLS=(
-		/usr/bin/pkgconf
+	[[ ${PV} == "9999" ]] && eautoreconf
+	MULTILIB_CHOST_TOOLS+=(
 		/usr/bin/pkg-config$(get_exeext)
 	)
 }
 
 multilib_src_configure() {
-	local myeconfargs=(
+	local ECONF_SOURCE="${S}"
+	local args=(
 		--with-system-includedir="${EPREFIX}/usr/include"
 		--with-system-libdir="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)"
 	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+	econf "${args[@]}"
 }
 
 multilib_src_test() {
@@ -65,6 +69,5 @@ multilib_src_install() {
 
 multilib_src_install_all() {
 	einstalldocs
-
 	find "${ED}" -type f -name '*.la' -delete || die
 }
diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index 3db1d25029fb..b56e844f63f2 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,16 +1,9 @@
-AUX radare2-5.7.0-vector35.patch 907 BLAKE2B f8bf7cd898a5bda19a50f8966b765bfe3d3b8bb39c9d7132fbe21e5c877400279ee7e79b4b0b367c46c05911cea401e7f2bcc1859ec7128321d7d6842a30ac78 SHA512 f6e2b1f5aa3fc33c09f273ecfc52dff7f9f4c1cf860e83f1928559a6555d0552b3b35aa02e7d1ebddd8c7d31757353779866581564bb8dd48b0dfb8da8beb154
-DIST radare2-5.7.4-vector35-arm64.tar.gz 1050970 BLAKE2B 17b9f730b514d959640bd259af9ebdb44b951eb839dc62160da167f2ea3906a60b10e20ff32561cc9b625dfffd1a83d25f484c91e1976d61a18dd04b9bed9862 SHA512 bee2f8685dc3760fd51eaa2ab9c68aed2833386145fe164ca6dfc4a5aab20596d1c6305167da2c7410c25be1391853f82fddc1cfa2bfa8e473d7f52129c44a3b
-DIST radare2-5.7.4-vector35-armv7.tar.gz 255288 BLAKE2B ca96b3f68381a0987c4efa10dcb798194486019762e89d1eb19a3fd24f6983535eea792099c60e4c1a9d2bdb5baab119fe2e9a7a889fad5a14023e5f984959b8 SHA512 e9eb6cee02bbbb265914b1f9118c7a143ed76a201c085af5516855475bf7f3ad5f9c82d1548e85a0339fbc33e029ef0e4be9d8cef68d212ae16ce1a7f18453ff
-DIST radare2-5.7.4.tar.gz 9814654 BLAKE2B ae8ed1d7b417236c27ee4857f7c33d657d379b46119391037bdb82ddb5b36ab89088c1c0d958757b7cb7fe87a70dd1b288e082af802c818d83d159e7a8460a8a SHA512 e3fc159f2c009ef98c14930086a34cbbb848f779b37206332ee713daa25d803911652d9f1c28b4f23eca02ac103efe9bca4dea65758f1a2077b1eb1279fc1212
-DIST radare2-5.7.6-vector35-arm64.tar.gz 1050960 BLAKE2B 12faa86a4cdfd9cdc8e307c16d8f797ae3ee800b72e76c6ace84cb7cb5108198dbfbc9a00df6b70448628dc869c94bf8cf9794460d05be99e5a08ee5a3ed40de SHA512 478f06c3fe09232152bbb63e500a440ca8546cc11fe59f9d489a25d327469b1869fe80b4e2e2cfad8a2b96261857cf74b6708628ac30ec8dabc5da05d04c1cfd
-DIST radare2-5.7.6-vector35-armv7.tar.gz 255288 BLAKE2B ca96b3f68381a0987c4efa10dcb798194486019762e89d1eb19a3fd24f6983535eea792099c60e4c1a9d2bdb5baab119fe2e9a7a889fad5a14023e5f984959b8 SHA512 e9eb6cee02bbbb265914b1f9118c7a143ed76a201c085af5516855475bf7f3ad5f9c82d1548e85a0339fbc33e029ef0e4be9d8cef68d212ae16ce1a7f18453ff
-DIST radare2-5.7.6.tar.gz 10071795 BLAKE2B e0bd54fcf4a56b34ec6f3b87ab6a20a8be23514e48842d66d7a30f517fa9ba871bd1e740604840fb16a3ae1329221ee67645774ac7df9f8f8d00dc3548dc7830 SHA512 04717ddb4bef9ed415c22aa25a0bf626f05c5d32133ac46d5e8a30ebe83e7b782a2b1835233f17f16315a99a39b33dd4e67c34798eb8ae9fbc6db51ca1051e94
-DIST radare2-5.7.8-vector35-arm64.tar.gz 1050960 BLAKE2B 12faa86a4cdfd9cdc8e307c16d8f797ae3ee800b72e76c6ace84cb7cb5108198dbfbc9a00df6b70448628dc869c94bf8cf9794460d05be99e5a08ee5a3ed40de SHA512 478f06c3fe09232152bbb63e500a440ca8546cc11fe59f9d489a25d327469b1869fe80b4e2e2cfad8a2b96261857cf74b6708628ac30ec8dabc5da05d04c1cfd
-DIST radare2-5.7.8-vector35-armv7.tar.gz 255288 BLAKE2B ca96b3f68381a0987c4efa10dcb798194486019762e89d1eb19a3fd24f6983535eea792099c60e4c1a9d2bdb5baab119fe2e9a7a889fad5a14023e5f984959b8 SHA512 e9eb6cee02bbbb265914b1f9118c7a143ed76a201c085af5516855475bf7f3ad5f9c82d1548e85a0339fbc33e029ef0e4be9d8cef68d212ae16ce1a7f18453ff
-DIST radare2-5.7.8.tar.gz 10324020 BLAKE2B 628b0c146a8e797f34f43f8d76166fb8c5e945a45232c2e4d63b2c2ce89aef96a20349c519ceb62921bad75ce5faaa8ea51ab1dac79156e00eef8f9ef06f5a45 SHA512 7c819a052f5e4b3da72b945915fca92a747c52dc2e2fa8483a8c2d8e71479ce374efbbe2bc02b1b4af26db6a891b6e44cdbb9e062de2f13b22a258cceab561f6
-DIST radare2-testbins-2fdb78f7f754b3aea90377588d45b774ccb41086.tar.gz 120580683 BLAKE2B ba16206f3c44f43c36fbc3079e43d29cd5b6266f8bd31602d7ec218a2b14601173c9022be9329975bd28de948933deeecc052f56c2acd9d6dfeb5576049ec32f SHA512 2c66c8f68df7c51a52a73b33e854b095a4f5435c60eab2a1456f366376aac0f7c39836699e09eae2918f31e75b7c6562994f0916f45de53ae6a480506da95dcb
-DIST radare2-testbins-602471f72caa60d6ece43c3fa483c43decf7052c.tar.gz 124090448 BLAKE2B 446f4b730095dc263f31bbd886b350fbf3cbde0cd3bc6f5ed0c5d65a90a66b4d97a7397798c0f6fb7596722d827a3805c6d4d810d06837cf46e8798cedb1fea4 SHA512 b490ec951813827bed940ca4fc772691f8e446ce14cf2f0cc7fe2027a481c91939e6212ce94237f71091c18ac8428c9a4a4f35fc58f41ba076c1da75835d0ff4
-EBUILD radare2-5.7.4.ebuild 3228 BLAKE2B 651cd352b8b8c2507f2c1952c98af40cf83affb0ecdf8e1aad7b333f6603bffbfdff0e45f94f9cc8002ae2f589696646d19450b62d10181e747e384c4944ba4c SHA512 d2541eb73826e730996ad80b5f151d03055174c53fe770a6df8e7680c672cb5f80463b6a81d918fe804fe680fe6285a4cdec5f030e3fff61875565304a18f7a5
-EBUILD radare2-5.7.6.ebuild 3228 BLAKE2B d89e881b5039acb23dbb049e225b1d7806238bf73be045f30a9e799fba02899fedae5321904a71a96c7938f7cca2da3d9899888483628ac4dcf3b9a0a207f1b6 SHA512 9432d5208c70523295808f26102c9a79aab2d779b2b3fc91a770c6d80104d7857e0a8093974f27c97c99a56c4e07bbebc0390d0181ee16e523ce8847159e839e
-EBUILD radare2-5.7.8.ebuild 3228 BLAKE2B d89e881b5039acb23dbb049e225b1d7806238bf73be045f30a9e799fba02899fedae5321904a71a96c7938f7cca2da3d9899888483628ac4dcf3b9a0a207f1b6 SHA512 9432d5208c70523295808f26102c9a79aab2d779b2b3fc91a770c6d80104d7857e0a8093974f27c97c99a56c4e07bbebc0390d0181ee16e523ce8847159e839e
-MISC metadata.xml 397 BLAKE2B 0da99624e778e490f84d0187d28a27b7f73a3c780fc3151619ef3196ca5c01b3758f0e07b6412b9c4f9fddb8738d5005b412d9bce6456b107e24931ba0ea5052 SHA512 02227b3d952b7dadc9f893246b7913cc7910b440ca6c54e7e0f9efcba95db711f691811a767ca1d81fba3e5c073c56b6154361df4beef7fc621fa8176fc05d47
+AUX radare2-5.8.2-bundled-capstone.patch 562 BLAKE2B 9ec99a25383f17615ba548d67516179dd4f860dad5e1f68674f0e3ac80df9d3edab6f0b6e3911758bf6010bd7be1628d7d4f88b68161739088662007543ea782 SHA512 44972fd7d337c14169a123fcb6e5e27ea71abac84c1cdd654a81fc9c8e6112c6cad596b529b20ce1c85245e1726149dd5e2103c30ca0b7f16faff3ccade838c2
+AUX radare2-5.8.2-vector35.patch 882 BLAKE2B 6453cdeec6e5656ff86af84f0876fd7543896ac289810e1783cc66eecea0e86513ef6374a93109845b6a78d211fff4b82c87e6a66f21b349291ed54f99a36642 SHA512 b9fb378d1817bba06945802d2b1e243c3df493f688d5e1b294acf410666e6e3946cc2438ffb9ef0d60485e4c76995d832ff02c12e6c2ca486a6ead68e23b5c57
+DIST radare2-5.8.2-capstone-4.0.2.tar.gz 3439542 BLAKE2B 435729a8fef2dce6495635352101b3befe563c8404efdbb0dccabecbe2bded332221665bacdbcd9043dda72b652b6f29c0e1a548cefb8c64d5b6b9dc174ed3d9 SHA512 7f93534517307b737422a8825b66b2a1f3e1cca2049465d60ab12595940154aaf843ba40ed348fce58de58b990c19a0caef289060eb72898cb008a88c470970e
+DIST radare2-5.8.2-vector35-arm64.tar.gz 1021315 BLAKE2B 8741de83cddda878536627c0ff6be1f7d4842cf0fefeae2895fe751e39768134f6048167d5aa265169bc22b229a8b66ce37f4ef4df3abc2b3e304dc1f1fe17d1 SHA512 9b0fcf9119304e90b3fbed5e0509a819a0a561953681f5e5f408b55db3b0c962dca59c48553cffef21a56772db7871a3987f0f7c07b5538fd4b7d1af005ccdb0
+DIST radare2-5.8.2-vector35-armv7.tar.gz 255278 BLAKE2B 8b5191c48fad2e7602dc2f7053f9c9ea8cca8e9bc5d68a0cdb7ccff9ecc65c5d1ff6a434e28488dbd6fb71fc7482fce08a0a69c358e5c3d6c017ac1e4cee3b21 SHA512 40c048b29856f48300d4539bc7bda38e6ceae1e8d4d9d131c4a7546b6e26b2fb96309c483b67e2c2290b06cea5fc52a7beb30557d54e89296e7734cc1ab06d10
+DIST radare2-5.8.2.tar.gz 11017554 BLAKE2B 712941ac5871f2201ba806dc7b68ae1825c8dbe896b11aaa6b086651ff28a6d3b7e54b55621e7cc143748d7760ea7007f4dc70232ef16dfe5523a0ab87f0f266 SHA512 3c09d89172ac9a5cee6e52294f10b144237acb31b3d470521a7c8650511a58d1732c73004f2dbb1e6e3c43829e3e310b89d6a8abd5f1fb4fdfd3fea8779a72ec
+DIST radare2-testbins-1f0ea409f2af83fc4d0b685855de9d3b0f9eee41.tar.gz 125596301 BLAKE2B 55b876b09150e780359e753d26143640d410c1c15ace2e29bc06d2163657af2089c5044847f107e20256875c7ea5e7cc72460010df0c662c9da933a0388a3f0e SHA512 44662f0217871a51b856f66e876eb57b2006f6350e6bcfae6629b800197b6f30196caf2474d52881a398fd1d65c68364d870b7de692c9e9a2bd1fab493afe3d0
+EBUILD radare2-5.8.2.ebuild 3486 BLAKE2B 04134fc1770b67190e8448072272bc8f8c056c25ad902db6db8b722c55653fe1077ab41429660d232faa2ae613978e7955fd9c1c48b71756ccda1dbce7c51362 SHA512 4bc612ec51d5bc44df73bd0f7f663781b3bfbca3beeadeb8fab389a50d6fc83f168ebcc1e7fbe0948aaab4b481363fb048f75ee7292fab8b7afe4c43eaf65b7c
+MISC metadata.xml 479 BLAKE2B 57c303d3344fd8a086d7c41ca92ca18d7291c77abbfc8eab6f9f3f1ff11481235aae3b04cc613e3ad28202ad972e9e24e5516a3a1d805341da2dd0ad74efb77b SHA512 e798ed2144748ea2784f7cd89da1a81c59d44bf77f67738de8bc11c797d50ea3c5e45a8cee7801c06c3fff4c634f400e28ef46c0d9bd1063ecc3066ba1b1809e
diff --git a/dev-util/radare2/files/radare2-5.7.0-vector35.patch b/dev-util/radare2/files/radare2-5.7.0-vector35.patch
deleted file mode 100644
index c358d94ff427..000000000000
--- a/dev-util/radare2/files/radare2-5.7.0-vector35.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/libr/asm/arch/arm/v35arm64/Makefile b/libr/asm/arch/arm/v35arm64/Makefile
-index afc4322b83..fe77126a08 100644
---- a/libr/asm/arch/arm/v35arm64/Makefile
-+++ b/libr/asm/arch/arm/v35arm64/Makefile
-@@ -31,7 +31,7 @@ $(ALIBS): arch-arm64 arch-armv7
- ## ARM64
- arch-arm64:
- 	git clone -q https://github.com/radareorg/vector35-arch-arm64 arch-arm64
--	cd arch-arm64 && git checkout -q radare2-wip > /dev/null && git reset --hard $(ARCH_ARM64_COMMIT)
-+	cd arch-arm64
- 
- $(V35ARM64_HOME)/arm64dis.a arm64dis.a: $(ALIBS)
- 	rm -f arm64dis.$(EXT_AR)
-@@ -41,7 +41,7 @@ $(V35ARM64_HOME)/arm64dis.a arm64dis.a: $(ALIBS)
- ## ARMV7
- arch-armv7:
- 	git clone -q https://github.com/radareorg/vector35-arch-armv7 arch-armv7
--	cd arch-armv7 && git checkout -q radare2 > /dev/null && git reset --hard $(ARCH_ARMV7_COMMIT)
-+	cd arch-armv7	
- 
- $(V35ARMV7_HOME)/armv7dis.a armv7dis.a: $(ALIBS)
- 	rm -f armv7dis.$(EXT_AR)
diff --git a/dev-util/radare2/files/radare2-5.8.2-bundled-capstone.patch b/dev-util/radare2/files/radare2-5.8.2-bundled-capstone.patch
new file mode 100644
index 000000000000..31de9b72bb37
--- /dev/null
+++ b/dev-util/radare2/files/radare2-5.8.2-bundled-capstone.patch
@@ -0,0 +1,21 @@
+Need to unbundle capstone due to broken capstone-5 compatibility:
+
+https://github.com/radareorg/radare2/issues/21204
+https://bugs.gentoo.org/891805
+
+diff --git a/shlr/Makefile b/shlr/Makefile
+index 5626a061ff..5e8af3b99b 100644
+--- a/shlr/Makefile
++++ b/shlr/Makefile
+@@ -225,10 +225,7 @@ capstone-sync: capstone
+ capstone-clean:
+ 	-$(MAKE) -C capstone clean
+ 
+-capstone: capstone-$(CS_VER).tar.gz
+-	tar xzvf capstone-$(CS_VER).tar.gz
+-	rm -rf capstone
+-	mv capstone-$(CS_VER) capstone
++capstone:
+ 	$(MAKE) patch-capstone
+ 
+ # already implemented in capstone.sh
diff --git a/dev-util/radare2/files/radare2-5.8.2-vector35.patch b/dev-util/radare2/files/radare2-5.8.2-vector35.patch
new file mode 100644
index 000000000000..6b67f39b40c4
--- /dev/null
+++ b/dev-util/radare2/files/radare2-5.8.2-vector35.patch
@@ -0,0 +1,24 @@
+diff --git a/libr/arch/p/arm/v35/Makefile b/libr/arch/p/arm/v35/Makefile
+index a7a40ddb97..1ef40746ac 100644
+--- a/libr/arch/p/arm/v35/Makefile
++++ b/libr/arch/p/arm/v35/Makefile
+@@ -30,8 +30,7 @@ $(ALIBS): arch-arm64 arch-armv7
+ 
+ ## ARM64
+ arch-arm64:
+-	git clone -q https://github.com/radareorg/vector35-arch-arm64 arch-arm64
+-	cd arch-arm64 && git checkout -q radare2-wip > /dev/null && git reset --hard $(ARCH_ARM64_COMMIT)
++	cd arch-arm64
+ 
+ $(V35ARM64_HOME)/arm64dis.a arm64dis.a: $(ALIBS)
+ 	rm -f arm64dis.$(EXT_AR)
+@@ -40,8 +39,7 @@ $(V35ARM64_HOME)/arm64dis.a arm64dis.a: $(ALIBS)
+ 
+ ## ARMV7
+ arch-armv7:
+-	git clone -q https://github.com/radareorg/vector35-arch-armv7 arch-armv7
+-	cd arch-armv7 && git checkout -q radare2 > /dev/null && git reset --hard $(ARCH_ARMV7_COMMIT)
++	cd arch-armv7
+ 
+ $(V35ARMV7_HOME)/armv7dis.a armv7dis.a: $(ALIBS)
+ 	rm -f armv7dis.$(EXT_AR)
diff --git a/dev-util/radare2/metadata.xml b/dev-util/radare2/metadata.xml
index 0ba1db190ab2..0ed6c8845228 100644
--- a/dev-util/radare2/metadata.xml
+++ b/dev-util/radare2/metadata.xml
@@ -9,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">radareorg/radare2</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/radare2/radare2-5.7.4.ebuild b/dev-util/radare2/radare2-5.7.4.ebuild
deleted file mode 100644
index 26de380f0f15..000000000000
--- a/dev-util/radare2/radare2-5.7.4.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 toolchain-funcs
-
-DESCRIPTION="unix-like reverse engineering framework and commandline tools"
-HOMEPAGE="https://www.radare.org"
-
-ARM64_COMMIT=fddb6d0fb0489c4e797a61b1553ac0d771fbf657
-ARMV7_COMMIT=dde39f69ffea19fc37e681874b12cb4707bc4f30
-BINS_COMMIT=2fdb78f7f754b3aea90377588d45b774ccb41086
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/radareorg/radare2"
-else
-	SRC_URI="mirror+https://github.com/radareorg/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz
-		mirror+https://github.com/radareorg/vector35-arch-arm64/archive/${ARM64_COMMIT}.tar.gz -> ${P}-vector35-arm64.tar.gz
-		mirror+https://github.com/radareorg/vector35-arch-armv7/archive/${ARMV7_COMMIT}.tar.gz -> ${P}-vector35-armv7.tar.gz
-		test? ( https://github.com/radareorg/radare2-testbins/archive/${BINS_COMMIT}.tar.gz -> radare2-testbins-${BINS_COMMIT}.tar.gz )
-	"
-
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ssl test"
-
-# Need to audit licenses of the binaries used for testing
-RESTRICT="fetch !test? ( test )"
-
-RDEPEND="
-	dev-libs/libzip:=
-	dev-libs/xxhash
-	sys-apps/file
-	sys-libs/zlib
-	dev-libs/capstone:0=
-	ssl? ( dev-libs/openssl:0= )
-"
-DEPEND="
-	${RDEPEND}
-	dev-util/gperf
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${PN}-5.7.0-vector35.patch" )
-
-src_prepare() {
-	default
-
-	# Hack for vector35 arm plugins
-	mv "${WORKDIR}/vector35-arch-arm64-${ARM64_COMMIT}" libr/asm/arch/arm/v35arm64/arch-arm64 || die
-	mv "${WORKDIR}/vector35-arch-armv7-${ARMV7_COMMIT}" libr/asm/arch/arm/v35arm64/arch-armv7 || die
-
-	if use test; then
-		cp -r "${WORKDIR}/radare2-testbins-${BINS_COMMIT}" "${S}/test/bins" || die
-		cp -r "${WORKDIR}/radare2-testbins-${BINS_COMMIT}" "${S}" || die
-	fi
-
-	# Fix hardcoded docdir for fortunes
-	sed -i -e "/^#define R2_FORTUNES/s/radare2/$PF/" \
-		libr/include/r_userconf.h.acr
-}
-
-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_test() {
-	ln -fs "${S}/binr/radare2/radare2" "${S}/binr/radare2/r2" || die
-	LDFLAGS=""
-	for i in "${S}"/libr/*; do
-		if [[ -d ${i} ]]; then
-			LDFLAGS+="-R${i} -L${i} "
-			LD_LIBRARY_PATH+=":${i}"
-		fi
-	done
-	export LDFLAGS LD_LIBRARY_PATH
-	export PKG_CONFIG_PATH="${S}/pkgcfg"
-	PATH="${S}/binr/radare2:${PATH}" emake -C test -k unit_tests || die
-}
-
-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}
-
-	# Create plugins directory although it's currently unsupported by radare2
-	keepdir "/usr/$(get_libdir)/radare2/${PV}" || die
-}
diff --git a/dev-util/radare2/radare2-5.7.8.ebuild b/dev-util/radare2/radare2-5.7.8.ebuild
deleted file mode 100644
index 8d4bfd6a4e75..000000000000
--- a/dev-util/radare2/radare2-5.7.8.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 toolchain-funcs
-
-DESCRIPTION="unix-like reverse engineering framework and commandline tools"
-HOMEPAGE="https://www.radare.org"
-
-ARM64_COMMIT=9ab2b0bedde459dc86e079718333de4a63bbbacb
-ARMV7_COMMIT=dde39f69ffea19fc37e681874b12cb4707bc4f30
-BINS_COMMIT=602471f72caa60d6ece43c3fa483c43decf7052c
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/radareorg/radare2"
-else
-	SRC_URI="mirror+https://github.com/radareorg/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz
-		mirror+https://github.com/radareorg/vector35-arch-arm64/archive/${ARM64_COMMIT}.tar.gz -> ${P}-vector35-arm64.tar.gz
-		mirror+https://github.com/radareorg/vector35-arch-armv7/archive/${ARMV7_COMMIT}.tar.gz -> ${P}-vector35-armv7.tar.gz
-		test? ( https://github.com/radareorg/radare2-testbins/archive/${BINS_COMMIT}.tar.gz -> radare2-testbins-${BINS_COMMIT}.tar.gz )
-	"
-
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ssl test"
-
-# Need to audit licenses of the binaries used for testing
-RESTRICT="fetch !test? ( test )"
-
-RDEPEND="
-	dev-libs/libzip:=
-	dev-libs/xxhash
-	sys-apps/file
-	sys-libs/zlib
-	dev-libs/capstone:0=
-	ssl? ( dev-libs/openssl:0= )
-"
-DEPEND="
-	${RDEPEND}
-	dev-util/gperf
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${PN}-5.7.0-vector35.patch" )
-
-src_prepare() {
-	default
-
-	# Hack for vector35 arm plugins
-	mv "${WORKDIR}/vector35-arch-arm64-${ARM64_COMMIT}" libr/asm/arch/arm/v35arm64/arch-arm64 || die
-	mv "${WORKDIR}/vector35-arch-armv7-${ARMV7_COMMIT}" libr/asm/arch/arm/v35arm64/arch-armv7 || die
-
-	if use test; then
-		cp -r "${WORKDIR}/radare2-testbins-${BINS_COMMIT}" "${S}/test/bins" || die
-		cp -r "${WORKDIR}/radare2-testbins-${BINS_COMMIT}" "${S}" || die
-	fi
-
-	# Fix hardcoded docdir for fortunes
-	sed -i -e "/^#define R2_FORTUNES/s/radare2/$PF/" \
-		libr/include/r_userconf.h.acr
-}
-
-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_test() {
-	ln -fs "${S}/binr/radare2/radare2" "${S}/binr/radare2/r2" || die
-	LDFLAGS=""
-	for i in "${S}"/libr/*; do
-		if [[ -d ${i} ]]; then
-			LDFLAGS+="-R${i} -L${i} "
-			LD_LIBRARY_PATH+=":${i}"
-		fi
-	done
-	export LDFLAGS LD_LIBRARY_PATH
-	export PKG_CONFIG_PATH="${S}/pkgcfg"
-	PATH="${S}/binr/radare2:${PATH}" emake -C test -k unit_tests || die
-}
-
-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}
-
-	# Create plugins directory although it's currently unsupported by radare2
-	keepdir "/usr/$(get_libdir)/radare2/${PV}" || die
-}
diff --git a/dev-util/radare2/radare2-5.7.6.ebuild b/dev-util/radare2/radare2-5.8.2.ebuild
index 8d4bfd6a4e75..e54517f249a2 100644
--- a/dev-util/radare2/radare2-5.7.6.ebuild
+++ b/dev-util/radare2/radare2-5.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,9 +8,10 @@ inherit bash-completion-r1 toolchain-funcs
 DESCRIPTION="unix-like reverse engineering framework and commandline tools"
 HOMEPAGE="https://www.radare.org"
 
-ARM64_COMMIT=9ab2b0bedde459dc86e079718333de4a63bbbacb
-ARMV7_COMMIT=dde39f69ffea19fc37e681874b12cb4707bc4f30
-BINS_COMMIT=602471f72caa60d6ece43c3fa483c43decf7052c
+ARM64_COMMIT=c9e7242972837ac11fc94db05fabcb801a8269c9
+ARMV7_COMMIT=f270a6cc99644cb8e76055b6fa632b25abd26024
+BINS_COMMIT=1f0ea409f2af83fc4d0b685855de9d3b0f9eee41
+CAPSTONE_VER=4.0.2
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -19,6 +20,7 @@ else
 	SRC_URI="mirror+https://github.com/radareorg/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz
 		mirror+https://github.com/radareorg/vector35-arch-arm64/archive/${ARM64_COMMIT}.tar.gz -> ${P}-vector35-arm64.tar.gz
 		mirror+https://github.com/radareorg/vector35-arch-armv7/archive/${ARMV7_COMMIT}.tar.gz -> ${P}-vector35-armv7.tar.gz
+		mirror+https://codeload.github.com/capstone-engine/capstone/tar.gz/${CAPSTONE_VER} -> ${P}-capstone-${CAPSTONE_VER}.tar.gz
 		test? ( https://github.com/radareorg/radare2-testbins/archive/${BINS_COMMIT}.tar.gz -> radare2-testbins-${BINS_COMMIT}.tar.gz )
 	"
 
@@ -37,7 +39,6 @@ RDEPEND="
 	dev-libs/xxhash
 	sys-apps/file
 	sys-libs/zlib
-	dev-libs/capstone:0=
 	ssl? ( dev-libs/openssl:0= )
 "
 DEPEND="
@@ -46,14 +47,20 @@ DEPEND="
 "
 BDEPEND="virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}/${PN}-5.7.0-vector35.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-5.8.2-vector35.patch"
+	# Maybe temporary, https://bugs.gentoo.org/891805
+	"${FILESDIR}/${PN}-5.8.2-bundled-capstone.patch"
+)
 
 src_prepare() {
 	default
 
+	mv "${WORKDIR}/capstone-${CAPSTONE_VER}" shlr/capstone || die
+
 	# Hack for vector35 arm plugins
-	mv "${WORKDIR}/vector35-arch-arm64-${ARM64_COMMIT}" libr/asm/arch/arm/v35arm64/arch-arm64 || die
-	mv "${WORKDIR}/vector35-arch-armv7-${ARMV7_COMMIT}" libr/asm/arch/arm/v35arm64/arch-armv7 || die
+	mv "${WORKDIR}/vector35-arch-arm64-${ARM64_COMMIT}" libr/arch/p/arm/v35/arch-arm64 || die
+	mv "${WORKDIR}/vector35-arch-armv7-${ARMV7_COMMIT}" libr/arch/p/arm/v35/arch-armv7 || die
 
 	if use test; then
 		cp -r "${WORKDIR}/radare2-testbins-${BINS_COMMIT}" "${S}/test/bins" || die
@@ -62,7 +69,7 @@ src_prepare() {
 
 	# Fix hardcoded docdir for fortunes
 	sed -i -e "/^#define R2_FORTUNES/s/radare2/$PF/" \
-		libr/include/r_userconf.h.acr
+		libr/include/r_userconf.h.acr || die
 }
 
 src_configure() {
@@ -72,7 +79,6 @@ src_configure() {
 
 	econf \
 		--without-libuv \
-		--with-syscapstone \
 		--with-sysmagic \
 		--with-sysxxhash \
 		--with-syszip \
@@ -90,7 +96,7 @@ src_test() {
 	done
 	export LDFLAGS LD_LIBRARY_PATH
 	export PKG_CONFIG_PATH="${S}/pkgcfg"
-	PATH="${S}/binr/radare2:${PATH}" emake -C test -k unit_tests || die
+	PATH="${S}/binr/radare2:${PATH}" emake -C test -k unit-tests || die
 }
 
 src_install() {
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index 3802d16675be..8969539766ac 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -1,14 +1,14 @@
 AUX musl.supp 758 BLAKE2B 168ff4f38cc6b3c11e949fbc6d7c1e024259d2c02ae1424123b1f99d77c123994270ab56067ac6f1923c0dc1e8b29336a2f9fa7a9010f99e5731f6a7be5bb7d1 SHA512 55f57c84241ad32443095e7cd74607ec8ebd1dd1e67de3ab2b87e996e416980484cc9b9ef13e54bb0c0584d2ffbbd4ae9389cf1215b9c8751dcb77d2816e49f0
-AUX valgrind-3.13.0-malloc.patch 1086 BLAKE2B 004bb1c56f4e8b73838c62563503a3a550d8ced9fda8114d3dd02dc3013171de8116f1510561010256c1855e5ff3e62dd1921f82cfcb14ae78cb566d43423d60 SHA512 15b4d485bbb1fadfaea0ddc0e10874f09438ec4085bf70c2209c0854eaa9bd587f96bc0cf1c367a07fb09acb9dee17b5756a41237d04ceaa573bba0bda0ec523
+AUX valgrind-3.13.0-malloc.patch 1024 BLAKE2B 3917fe49e5b7f8f678801edd3236b76fbc3eaf790bc19db7a1055cd949df802fc7612b8ec8fb40371814790d24f15fc2cdfd5349297ed5b48e28d3224bb2d170 SHA512 57086a768f3876b26b0e507bc159a73f0955f03d5af8cc30e21103e348ca67f2e58b5555a5a97f299751c6602692ad43d8346bb68a80917d740fb4d65bba9665
 AUX valgrind-3.15.0-Build-ldst_multiple-test-with-fno-pie.patch 650 BLAKE2B ffb545d6af214a5bd43ff800d52e0d7cfc03feac8d2466da8d4935db659172cd50cf3e2d63b3aff46d81b21846b304671506cd235b710037218fc16e0ef66438 SHA512 7cb5a46c2d8ed4360053289994014b334e32d48b0608ed58662486bd432c31835ef16e2cdfd734f3e4d720e272d2507ec76f0b77e1364237e9f6dbbd97a8abb6
 AUX valgrind-3.19.0-clang-15.patch 1263 BLAKE2B 0b1734061165735c0eba127d46250bca3bffc4a5c884c4ced121172561e36c7bebc9e138ef6e0ee519de5fb3dac37050540fdf576da5e7690e47a8ecac6a6f32 SHA512 d7af318c02815f705cf307ab673622de7c1b9afa4cc9fdbedfe6b06a98ac7798e1d19ee5836826f0d45c331a2ec2518c5515f7d908b6b8f22d3e4753b176d977
+AUX valgrind-3.20.0-musl-interpose.patch 904 BLAKE2B c2f3e1942bf1a713c993d63ee7e69506feed7dd0c34b906b3b65fa065ea9fff081c49b8ed4341f3f48350b22235bbc0896ebf099a5ea211fe9d502efe899851e SHA512 74a2f29a68ff5d7c10d829469302946982c2ff558f5a9b08d0f6e74a5e73a713461838469efc11b5bf93212d67f9e2922aed3c6f7d772bb037eeb461f2cc6729
 AUX valgrind-3.20.0-tests-clang16.patch 715 BLAKE2B d81ca99227e8175d9ab4ad5e6c706e5033d25527ac9ff7fe784cfded3dd42783c0c27dfa7c97908cb50ce24d2b6ceecaa220e79fc6d77ac9e322ebf86ff2fd5a SHA512 e3d79c67d1589c6fdb26018b146ddf896aa19e5b45ce15ae6d6ef449c72c0ba151c2903e6600ae33a7f76205562f094fbe5d4ed3370ded87d2216d25b5b62b23
 AUX valgrind-3.7.0-respect-flags.patch 360 BLAKE2B 020b9e3af2c6393193edd8be99ff2309f4b138915bd0315090cebd902747678a5b655a8178a8ec8e88782286470922aed505d2a69d6da4d295fd2053d640b035 SHA512 efdb017283b6a5829d1a5acc31b42ddd177a3ab468eb062b8c4fd90b2dbd06679e8d8bc2d6f813e3001efdda831d4410cc8da3a3e42ee2e49efea0423e4b3ca3
-DIST valgrind-3.18.1.tar.bz2 16149159 BLAKE2B a98322e4c12ae1bc495659217bd398b85e459288e775ba5f543b9ce1faa5bdfc17791178c0e7b9703a31588cc4c7cbde814b7a43b2ec76e7362e2aeeb100d935 SHA512 a03b5cd7eafab4a1cea07f46464c1546ae1cb3d106649626b1e55658badf90e58d1f3854a38a33d5dffd8237f5555ae7e1f27a4b40e06254f87825c7fc61b59b
 DIST valgrind-3.19.0.tar.bz2 16403296 BLAKE2B d3ccd25789ec4d87a0ddab58d8098246a33a083505b42adaa94ee3af659cbe073e516bc98163ef56233e6cd9de2125839b71ee443fbc0db6557dcb35a6c05280 SHA512 f720a89dc4c4989cc5714bff9efe97529f71990bcfad7a92b889ce099c4326d6da07fa4d5fbab2e9125e20f352354f6178471e49e419b613a3c82c2a1c667ab2
 DIST valgrind-3.20.0.tar.bz2 16469274 BLAKE2B 8217dcfc185c7f6601fedd8d53bb35d260b985b8049c8c73a26151db6650b1607e8e53b614652c40962ea7382b9301c4b234a933c8d81f57e649ebf3f703e630 SHA512 d6bfb9284d0410134ee7e2a5975b13c01508dd5587b562947d8197b3c113b76fdfac88c4072948be68bbf0dbeb17b4d1acb1412ce898adaa83c30ae2c6a1c12b
-EBUILD valgrind-3.18.1.ebuild 3703 BLAKE2B 8cebf6e55574abde88bb9cb173c35ccb283b1b7c4d62664d26137478f5174b6ca7c366100e09540357caa27d4a221d8e3b5225aaa019fd6b1c7cfe6928932569 SHA512 eba7ba77309a201722ccb4b1e30e1ab7f41a3b90344e4003c64e34cc3e7d71adcba2efe829b31622e9fc2258a49ecda0e84a1b48bd245e8b795518b31d868cac
-EBUILD valgrind-3.19.0.ebuild 3959 BLAKE2B a4599eeb28141def0b522a3e23abe83db44ec8ea47e1438ea2e10abb9bf49fc643e2c1fc7d8cab414ae4108479041575c30c8b204ae296f22b1076fea013db53 SHA512 ae7bc5cdb6f2fc9a882508ea7d7e5407851354fb34a4e8f1dbe5e48814e0d30426c2ab9089217ce4ab57716b4bee42fa54d24e70fe90d8316f956ddc261cf432
-EBUILD valgrind-3.20.0.ebuild 3957 BLAKE2B 5355dd10f03e926d4932e2fc5ace4f429be2e51e48d6a12ff1b390d8ada99acbbf24c22ab84e5246bf8e44961a2ba76e4f2d3e740c0def03aa33fca7ceb2f996 SHA512 26aea2c9a8b0844d6baeddc1035a131baf8f419c6b8ec175ae83c6a15a18e039703746bd356f070595b28ca7e6711448a0495188a4f5405fa5dfa54ec8a0cae5
-EBUILD valgrind-9999.ebuild 3921 BLAKE2B c0f5ce239d2e5990afe6f272de7006219c9ca97e8859ec9491f64f7211c6760f5feecd453356ea3e89e77d14dfa4c27375259c1aa1d886ee0ee028611221fb84 SHA512 655489b4b0cb46f12607edd429277fd677db5793dfbd6e4743c3ac02e160353e3238802c1923d14e533ac040242478730d5091ab756e00ad505b1da832f6eed1
-MISC metadata.xml 1028 BLAKE2B 5e6d52b6a5e657f56dc8da70f83d340c8ad8ff1448b109916d77a51b62f9018dafaf20586684d9d5c0984647df9fb3886b9fc0fabcfd62bcd13ef8d5e1de223e SHA512 1b9bd9d815de416b73e03bb13f88b662b14b4c135a36549ea5ad69a59c9395a240b80c30e6847eaecc2318ca88a2081e71fed41af2e9eed5162dfca78c7af920
+EBUILD valgrind-3.19.0.ebuild 3958 BLAKE2B 993c8677d095cfeb55bb22c3db5f46161b3b615e5559f4b2bf613bb8596fa8c2e4116ef9b0ba4aba8a8ef6dd2ca8a9da82e6b7a73c5061767707444a672b224d SHA512 8af1c7c7cd56ad77d7f81aac35d234b999b502f7288e7881431b8e6c8a7c9c46cecb0f3f1075b879b02aa6c8314540dd90c377366d08f78b1845d04cd71c85b1
+EBUILD valgrind-3.20.0-r2.ebuild 4018 BLAKE2B 519b00b584e9dc9474d1aa544fbaec314e0da9d6c025708b2030dae4785b034b4882aa31c0b784b90f15ce0995206b32f515e3049cdbe70dc8fe5a7525b57baa SHA512 43c9e6e1e2a910e8240937d4dbce1b285e48ad7d6aac29190148dc7207852a66e44009df62e971a0b952c763010c5df39ee02f89ea57534600eba2d43d2eed23
+EBUILD valgrind-3.20.0.ebuild 3956 BLAKE2B 2482b90a5b52a6e92e10dd6616c8355de8807ebfbff1377e8c8378dbf7ff9dc24a1d556d900d5bb19a35714c36e6aa85559b5c81f41e0f4df1dd8a631e7112ae SHA512 ffb496cda3673082efe0f6f02c65ee8cba47d4d65f742b579234c810671a2118e6e8dee59791675f1c12e41307d72f816714676280324e4f5db5501673f97bdf
+EBUILD valgrind-9999.ebuild 3978 BLAKE2B b233178c80db51e40f89496b499ce9f6295cef8806b5f7924f25d0235af889f9f1713513aa6a549644b2b01438ac6851eff332bb4a250080f52e346b53048367 SHA512 2c5c21b0895557ff441229d3906d8b5a720f1741452970e97c10a32fc1ea682ae4d3c4e2d5e087d4338194096e2fb3239e806076e35b1ac505dd7e2125e56222
+MISC metadata.xml 1150 BLAKE2B 05b2508ff61ac0659472f75ab074a5f0cc82a3ead6e9bd6e779984bf11c8257afcadd5734b0c34defa5739f1eb0dadeb2168a448c0482848d8d7bf8b598d5dff SHA512 80841b7058fee9293b9bddeb4ed2b1d2b53b4957d43973d9d748e9797c5a5a4b50f7377d9e6bdf31cc1a0c87702327e02568a15e3e354f1fa6cf280eb439b317
diff --git a/dev-util/valgrind/files/valgrind-3.13.0-malloc.patch b/dev-util/valgrind/files/valgrind-3.13.0-malloc.patch
index ac6d90fef50f..d0eb795b84be 100644
--- a/dev-util/valgrind/files/valgrind-3.13.0-malloc.patch
+++ b/dev-util/valgrind/files/valgrind-3.13.0-malloc.patch
@@ -1,5 +1,3 @@
-From: https://git.alpinelinux.org/aports/tree/main/valgrind/
-
 --- valgrind-3.13.0/coregrind/m_replacemalloc/vg_replace_malloc.c
 +++ valgrind-3.13.0/coregrind/m_replacemalloc/vg_replace_malloc.c
 @@ -765,13 +765,15 @@ static void init(void);
diff --git a/dev-util/valgrind/files/valgrind-3.20.0-musl-interpose.patch b/dev-util/valgrind/files/valgrind-3.20.0-musl-interpose.patch
new file mode 100644
index 000000000000..6ede22f8b5ec
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.20.0-musl-interpose.patch
@@ -0,0 +1,30 @@
+https://bugs.kde.org/show_bug.cgi?id=435441
+
+From 460d0c9a6c27edfffed8ced623cecf64466619f2 Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Thu, 4 Nov 2021 14:26:40 -0700
+Subject: [PATCH] Bug 435441 - Handle weak symbols as global for redirection
+
+Weak symbols are global but with lower precedence, so they should
+be handled the same way as global symbols during malloc replacement.
+
+This fixes valgrind on musl 1.2.2 when it is not patched with a
+soname (as is done on Alpine Linux).
+
+https://bugs.kde.org/show_bug.cgi?id=435441
+--- a/coregrind/m_debuginfo/readelf.c
++++ b/coregrind/m_debuginfo/readelf.c
+@@ -429,7 +429,8 @@ Bool get_elf_symbol_info (
+    }
+ #  endif
+ 
+-   if (ELFXX_ST_BIND(sym->st_info) == STB_GLOBAL) {
++   if (ELFXX_ST_BIND(sym->st_info) == STB_GLOBAL
++       || ELFXX_ST_BIND(sym->st_info) == STB_WEAK) {
+       *is_global_out = True;
+    }
+ 
+-- 
+2.32.0
+
+
diff --git a/dev-util/valgrind/metadata.xml b/dev-util/valgrind/metadata.xml
index 446b8b725919..e0de6e2950ab 100644
--- a/dev-util/valgrind/metadata.xml
+++ b/dev-util/valgrind/metadata.xml
@@ -5,6 +5,10 @@
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>toolchain@gentoo.org</email>
+		<name>Gentoo Toolchain Project</name>
+	</maintainer>
 	<longdescription>
 		Valgrind is a GPL'd tool to help you find memory-management problems
 		in your programs. When a program is run under Valgrind's supervision,
diff --git a/dev-util/valgrind/valgrind-3.19.0.ebuild b/dev-util/valgrind/valgrind-3.19.0.ebuild
index 598db5186193..949500bb17c8 100644
--- a/dev-util/valgrind/valgrind-3.19.0.ebuild
+++ b/dev-util/valgrind/valgrind-3.19.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://sourceware.org/pub/valgrind/${P}.tar.bz2"
-	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/valgrind/valgrind-3.18.1.ebuild b/dev-util/valgrind/valgrind-3.20.0-r2.ebuild
index 1b0f898873ac..0268876b1061 100644
--- a/dev-util/valgrind/valgrind-3.18.1.ebuild
+++ b/dev-util/valgrind/valgrind-3.20.0-r2.ebuild
@@ -1,26 +1,34 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 inherit autotools flag-o-matic toolchain-funcs multilib pax-utils
 
 DESCRIPTION="An open-source memory debugger for GNU/Linux"
 HOMEPAGE="https://www.valgrind.org"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="mpi"
-
-if [[ ${PV} == "9999" ]]; then
+if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://sourceware.org/git/${PN}.git"
 	inherit git-r3
 else
 	SRC_URI="https://sourceware.org/pub/valgrind/${P}.tar.bz2"
-	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"
+SLOT="0"
+IUSE="mpi"
+
 DEPEND="mpi? ( virtual/mpi )"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	# Respect CFLAGS, LDFLAGS
+	"${FILESDIR}"/${PN}-3.7.0-respect-flags.patch
+	"${FILESDIR}"/${PN}-3.15.0-Build-ldst_multiple-test-with-fno-pie.patch
+	"${FILESDIR}"/${P}-tests-clang16.patch
+)
+
 src_prepare() {
 	# Correct hard coded doc location
 	sed -i -e "s:doc/valgrind:doc/${PF}:" docs/Makefile.am || die
@@ -28,10 +36,12 @@ src_prepare() {
 	# Don't force multiarch stuff on OSX, bug #306467
 	sed -i -e 's:-arch \(i386\|x86_64\)::g' Makefile.all.am || die
 
-	# Respect CFLAGS, LDFLAGS
-	eapply "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch
-
-	eapply "${FILESDIR}"/${PN}-3.15.0-Build-ldst_multiple-test-with-fno-pie.patch
+	if use elibc_musl ; then
+		PATCHES+=(
+			"${FILESDIR}"/${PN}-3.13.0-malloc.patch
+			"${FILESDIR}"/${PN}-3.20.0-musl-interpose.patch
+		)
+	fi
 
 	if [[ ${CHOST} == *-solaris* ]] ; then
 		# upstream doesn't support this, but we don't build with
@@ -42,8 +52,7 @@ src_prepare() {
 		cp "${S}"/coregrind/link_tool_exe_{linux,solaris}.in
 	fi
 
-	# Allow users to test their own patches
-	eapply_user
+	default
 
 	# Regenerate autotools files
 	eautoreconf
@@ -64,12 +73,14 @@ src_configure() {
 	# -fstack-protector-strong See -fstack-protector (bug #620402)
 	# -m64 -mx32			for multilib-portage, bug #398825
 	# -ggdb3                segmentation fault on startup
+	# -flto*                fails to build, bug #858509
 	filter-flags -fomit-frame-pointer
 	filter-flags -fstack-protector
 	filter-flags -fstack-protector-all
 	filter-flags -fstack-protector-strong
 	filter-flags -m64 -mx32
 	replace-flags -ggdb3 -ggdb2
+	filter-lto
 
 	if use amd64 || use ppc64; then
 		! has_multilib_profile && myconf+=("--enable-only64bit")
@@ -99,6 +110,9 @@ src_install() {
 
 	pax-mark m "${ED}"/usr/$(get_libdir)/valgrind/*-*-linux
 
+	# See README_PACKAGERS
+	dostrip -x /usr/libexec/valgrind/vgpreload* /usr/$(get_libdir)/valgrind/*
+
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		# fix install_names on shared libraries, can't turn them into bundles,
 		# as dyld won't load them any more then, bug #306467
@@ -110,9 +124,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "Valgrind will not work if glibc does not have debug symbols."
+	elog "Valgrind will not work if libc (e.g. glibc) does not have debug symbols."
 	elog "To fix this you can add splitdebug to FEATURES in make.conf"
-	elog "and remerge glibc.  See:"
+	elog "and remerge glibc. See:"
 	elog "https://bugs.gentoo.org/show_bug.cgi?id=214065"
 	elog "https://bugs.gentoo.org/show_bug.cgi?id=274771"
 	elog "https://bugs.gentoo.org/show_bug.cgi?id=388703"
diff --git a/dev-util/valgrind/valgrind-3.20.0.ebuild b/dev-util/valgrind/valgrind-3.20.0.ebuild
index 3988dcd1f6ae..bf165cdd0c9a 100644
--- a/dev-util/valgrind/valgrind-3.20.0.ebuild
+++ b/dev-util/valgrind/valgrind-3.20.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://sourceware.org/pub/valgrind/${P}.tar.bz2"
-	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/valgrind/valgrind-9999.ebuild b/dev-util/valgrind/valgrind-9999.ebuild
index aed73f6be21b..b690f11f1222 100644
--- a/dev-util/valgrind/valgrind-9999.ebuild
+++ b/dev-util/valgrind/valgrind-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -35,10 +35,11 @@ src_prepare() {
 	# Don't force multiarch stuff on OSX, bug #306467
 	sed -i -e 's:-arch \(i386\|x86_64\)::g' Makefile.all.am || die
 
-	# Conditionally copy musl specific suppressions && apply patch
 	if use elibc_musl ; then
-		cp "${FILESDIR}/musl.supp" "${S}" || die
-		PATCHES+=( "${FILESDIR}"/valgrind-3.13.0-malloc.patch )
+		PATCHES+=(
+			"${FILESDIR}"/${PN}-3.13.0-malloc.patch
+			"${FILESDIR}"/${PN}-3.20.0-musl-interpose.patch
+		)
 	fi
 
 	if [[ ${CHOST} == *-solaris* ]] ; then
@@ -108,6 +109,9 @@ src_install() {
 
 	pax-mark m "${ED}"/usr/$(get_libdir)/valgrind/*-*-linux
 
+	# See README_PACKAGERS
+	dostrip -x /usr/libexec/valgrind/vgpreload* /usr/$(get_libdir)/valgrind/*
+
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		# fix install_names on shared libraries, can't turn them into bundles,
 		# as dyld won't load them any more then, bug #306467
@@ -119,9 +123,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "Valgrind will not work if glibc does not have debug symbols."
+	elog "Valgrind will not work if libc (e.g. glibc) does not have debug symbols."
 	elog "To fix this you can add splitdebug to FEATURES in make.conf"
-	elog "and remerge glibc.  See:"
+	elog "and remerge glibc. See:"
 	elog "https://bugs.gentoo.org/show_bug.cgi?id=214065"
 	elog "https://bugs.gentoo.org/show_bug.cgi?id=274771"
 	elog "https://bugs.gentoo.org/show_bug.cgi?id=388703"