6 files changed, 25 insertions, 212 deletions
diff --git a/dev-debug/valgrind/Manifest b/dev-debug/valgrind/Manifest
index da383b6bf878..550a27c63a53 100644
--- a/dev-debug/valgrind/Manifest
+++ b/dev-debug/valgrind/Manifest
@@ -1,18 +1,16 @@
 AUX valgrind-3.15.0-Build-ldst_multiple-test-with-fno-pie.patch 650 BLAKE2B ffb545d6af214a5bd43ff800d52e0d7cfc03feac8d2466da8d4935db659172cd50cf3e2d63b3aff46d81b21846b304671506cd235b710037218fc16e0ef66438 SHA512 7cb5a46c2d8ed4360053289994014b334e32d48b0608ed58662486bd432c31835ef16e2cdfd734f3e4d720e272d2507ec76f0b77e1364237e9f6dbbd97a8abb6
 AUX valgrind-3.21.0-glibc-2.34-suppressions.patch 4800 BLAKE2B ea36d61be93ca26b301f78bd4f1ea8b7f6769253101858bf27ae5ffddef5375ed1c0627ec648b7310e43a9546ae2a3c0c28ec4e6e6947e68ab8a2f0b0fa0fe27 SHA512 c21d0b7dbe91683669e92cc9f93d0912987b5b241116df08a48eaf422d9961f2c83398a2d8610c22d8cbf5bddf6f1ab8e08c3cdd1ed77b51269f3584cd8a2622
 AUX valgrind-3.7.0-respect-flags.patch 360 BLAKE2B 020b9e3af2c6393193edd8be99ff2309f4b138915bd0315090cebd902747678a5b655a8178a8ec8e88782286470922aed505d2a69d6da4d295fd2053d640b035 SHA512 efdb017283b6a5829d1a5acc31b42ddd177a3ab468eb062b8c4fd90b2dbd06679e8d8bc2d6f813e3001efdda831d4410cc8da3a3e42ee2e49efea0423e4b3ca3
-DIST valgrind-3.23.0-patches-3.tar.xz 23084 BLAKE2B 4794143bd80f984d5dc07f792837faa139a4bf8cc6220c7c1e79b85f2c0e6ee579eb5e4220decc264a4e21424683554794d015e10aee20b9e34c16724d64eb58 SHA512 0144142d62552158d90a118591a50412d077d3e79fce333fb6da40aff8acd6c924d15c85f69293d1a189b2ecde66c184cf82c8ba3a134f95c439d50e147e331c
-DIST valgrind-3.23.0.tar.bz2 16550038 BLAKE2B 9312761b0531006725f13270984b26c48f71ebe66e355b04410d7c01773c9b78ec21db3259cab398e58b3b68f93f5f074db06efe1f359bd7cf423515576191a4 SHA512 27d038faaaf6154cace2df18c3573291393548ba0738dbb6aba58eab6324c5beaa95fc5f3c0271663ca071baf829b15d806f7e81074f7cf087bef20ea0ed3117
-DIST valgrind-3.23.0.tar.bz2.asc 488 BLAKE2B b06781577e3e84e506e56bd4acc7341aecacb6b5898d8f0daab627d24bc70c9c60edad11dc7e3723ac77aa9c7978f1e13af7734e7a37763c720e77ea4ff103a4 SHA512 e10b38c72ed1fb8d79a3fa84ab70c475ec7a15927a578ee6715aa74f9600453f0fb72551053b6c31583321c37dab100bafbf6e689c02a3bc06021f6092b4bc80
 DIST valgrind-3.24.0-patches-1.tar.xz 10112 BLAKE2B 83e3b5970b4b4af60dacd90d0d7153359ece8f207f99e3325c8504a0fca123db3b803f2c745ed184f9aa3a4a54d1f922067dd060ce8d18d8b8bd4b936f676602 SHA512 054f5c9ee2676f172e896838e6fb50b1e51a842a8ede2dacb7def01c786bbd874f8099d9bd9ddb0ae88c7d1b32686dee80631ea7f6e27b0efd78a6c1fbdaaaec
-DIST valgrind-3.24.0-patches-2.tar.xz 17900 BLAKE2B 50304bb6cd0d41cee9605f3ad2af48f8ae90bdda0dc043f73c510a5c75fbe540b69fb2c24f3decf68302c6738c6b8243f43b793389b1f843ad7e5771f61da739 SHA512 ba09bb7b655026825267fcbbb08fc3593d98596daf47f088c1fe9825347827ee3351af2caa48008f1c6af33a550da5cb7da9aa4db5dba7aca04b0028c7e4e331
 DIST valgrind-3.24.0-patches-3.tar.xz 19236 BLAKE2B 9d75207e5d3e772ca150e48625d737e7206dbf75e6e56c5ff648107e75872eba37b381405edfb97156ad999ea5d5d4339ae5643e70fe8655d0855783063ff33a SHA512 2d0bfd06213e0ba6ab9075ce27fb1b9cd2c8ab75bfa9e43a3e26d224b9b36fe5dbb4a0116eeec693c16389f084f3cb363e72675a2c5e0e46f8efbab117f0b57e
 DIST valgrind-3.24.0.tar.bz2 16632387 BLAKE2B e11ad08f0062bd39788cd71d7ce058dec7a7207fbbe25f0dbfc7fb5735667809681cec2c843659553fbd49bcc6c71bdb93d87ffda3589247e4ee87c98fe51332 SHA512 6c131ff93d1f432d8362a47285cc377cba224ebca4f18e922c6156f7736d43020ece14d8fd16913498ab00fd18c85e2042a7d5351c3901e80413c584ebb406f3
 DIST valgrind-3.24.0.tar.bz2.asc 488 BLAKE2B f6307d10ee3ca26d837bf00471d179655ddbb0137920e175767a9d875aae355cea6727112deb788300a5196d94500bf9b341f8c70d46a1f83c40ae579ad45431 SHA512 37e9188756940960dcfe771d10275de7759ae652c94e710618948a8b366f66f3453f77b7751df0010b58304b203d7b3b56ac7a671d142d620916689ce5c84ae0
-EBUILD valgrind-3.23.0_p3.ebuild 5951 BLAKE2B 67c33c40565679604dfd289560dcc3dea52fac727f0017e9aa70a5ba86dd2d545c2c9169f5efc522c247564db6d79bf52ee469227de27ea9189a487ba7b11301 SHA512 94cdab6c5f87943887acad1072ad59eefb5acc15f9c8129c3ca732e86a42a06f658d37dd2b3ae9159886308ed5ca61f0280fceb972019d1c153bcf7306b1ae09
-EBUILD valgrind-3.24.0.ebuild 5957 BLAKE2B 4337a1a031490b09759fa09007d64d3b67b4177b9b14ad3767ad6d13fb18d9bee6a46f66daf6e4fb715bed3718498bbc4ff3cc3d977549a9db58878333b6c287 SHA512 cff446a33a7d328c76ac1b9d99de6e2f89998c2a9e143645ac54eb6b5722fcd8427cd535593c83fef5f3e65b41af0f489f09a77bb5a8dc08d1d9119d4b6e209a
+DIST valgrind-3.25.0-patches-1.tar.xz 5108 BLAKE2B 37062cec7e76e4416d7fd6a64bb4bcc9ca58edcb2abddbb66e7eb84e804d0a8c036954d74de5036f4925577242dc2218539a7cdaf6a675fe03b033fda616b50e SHA512 0d51b7fcde6045708e7884ff4c88787f395f2817381e3a019a394f835b3a176bf8a92634d15304870da700d7cf9042b5bf9766eb24b873a0030cda48bb0958ef
+DIST valgrind-3.25.0.tar.bz2 17723002 BLAKE2B 36505779555ccb52c36b0823e1317203011b020656207cd5ca0c06fd9a8d719d1ec66c89e15b0096c863edfbecd0fb31540e00ea3d75637947575cdae0a39684 SHA512 1fc649ae346d5106b69fe2cf8b494fa441d63f576b16e62d90e547f760851e427a173b6d03c4076a8ae13df66717f66631f4dc6769ede15f5521bd95099a649d
+DIST valgrind-3.25.0.tar.bz2.asc 488 BLAKE2B c1e8d129ad284514eddab6248410c3c88121ab27b3eaa3f56e05316d29303e21bb34fd3ea23b812b881a1ef220bd3acfcfcb1ff54232690ca47fc2814f546153 SHA512 a33dfbe1abb12c9f36a9c8ea03c9de3b51670d155ecbc7dce0aa50bf9f85838d9240eccbb53ab07a11355c82405ccf4168459cb902423b9daffb13b9648ea9af
 EBUILD valgrind-3.24.0_p1.ebuild 6064 BLAKE2B 2589a2e754944a39c947bbbe10a308216a296f772d603e0e1a35a17bf65595969d0ccac4266c4c4f3cfb1c957573245846fa28f5a24003cb29defa1fd6f16f74 SHA512 6f782659098807fb54cc4a70c7743e71416e117a17b5c89de69f119960cb8b9d30812cf92846d7be71b4b97e14979fc02f5f834bf2f4b69ca92f07d150d71b4a
-EBUILD valgrind-3.24.0_p2.ebuild 6070 BLAKE2B c8f481205db75e36e3db155f43a66af8e526e98079de039b2bd853916561dd64b06344a2b5c9513265e484adb8b8bfe433882cfdf2de7a3fdfc37e5c22996f72 SHA512 1b258d053e6feb1983e266f8b22e24b9b9a79231578e903d7cbe4b0b218e76cfea812213f0b929f3321d81b1e53d33375b6623ba058c17f2dbbc58ac468d1cc3
-EBUILD valgrind-3.24.0_p3.ebuild 6070 BLAKE2B c8f481205db75e36e3db155f43a66af8e526e98079de039b2bd853916561dd64b06344a2b5c9513265e484adb8b8bfe433882cfdf2de7a3fdfc37e5c22996f72 SHA512 1b258d053e6feb1983e266f8b22e24b9b9a79231578e903d7cbe4b0b218e76cfea812213f0b929f3321d81b1e53d33375b6623ba058c17f2dbbc58ac468d1cc3
-EBUILD valgrind-9999.ebuild 6072 BLAKE2B 9863c41b39cf03366821a831a260c8cea98c4ed9a9103a1895b176d6c00c48448d30088ba1debe18b17d2ce50d5e1e69f7ab4f85b659685943c58e0dd5fe3e32 SHA512 ac2597043dde0d36871d97904ef16fe1e03d473bcf5c5122d621e98dc6f9325cd686f43a573bc3fc41c4903c1b562b5fa695a1fbef80c89eaba24ffca53f19e2
+EBUILD valgrind-3.24.0_p3.ebuild 6067 BLAKE2B a565f01057666db6d66d971bdf5ac0fc93b32f8e2842e0d2e5f3ff327b9f9829ef921caafbe32f20b053ade3882233efb5834c61d23ae15b371df1bd3394b28e SHA512 19438f6b401464d8256b0a387ba86ade9243e0104254ab1fa146e2d707923818ddf70445d65d9765f6a5959f875f785b133378f5f4b955f431eff3d22cbe9652
+EBUILD valgrind-3.25.0.ebuild 6123 BLAKE2B 99491f1d7732f3894ed34c6800d0eb699bb148c1f00871610fc02080f2e01d8c829acc2c3e9d082b76492583aec7c90a8ed5af6a2f61970ebe640ce28bb69548 SHA512 8f11b9dbd823b38e1473954be7e6040c18714446d33da817597b19e5553712614333c8b2e8d7802c5bf10ad44d78949b6c90000eb6fa0c12db7bb3330431f46a
+EBUILD valgrind-3.25.0_p1.ebuild 6123 BLAKE2B 99491f1d7732f3894ed34c6800d0eb699bb148c1f00871610fc02080f2e01d8c829acc2c3e9d082b76492583aec7c90a8ed5af6a2f61970ebe640ce28bb69548 SHA512 8f11b9dbd823b38e1473954be7e6040c18714446d33da817597b19e5553712614333c8b2e8d7802c5bf10ad44d78949b6c90000eb6fa0c12db7bb3330431f46a
+EBUILD valgrind-9999.ebuild 6123 BLAKE2B 99491f1d7732f3894ed34c6800d0eb699bb148c1f00871610fc02080f2e01d8c829acc2c3e9d082b76492583aec7c90a8ed5af6a2f61970ebe640ce28bb69548 SHA512 8f11b9dbd823b38e1473954be7e6040c18714446d33da817597b19e5553712614333c8b2e8d7802c5bf10ad44d78949b6c90000eb6fa0c12db7bb3330431f46a
 MISC metadata.xml 1123 BLAKE2B 17b5501b05acd9384ab57a15018bc0d1ede50d7b5b9a5c38fcce816f68e8946010bc86233a197df89ad208957f90ab643942b7e1a3ceaa6e8d456320828b84e8 SHA512 a8c32063f3afd28c4a2d5c5c0f437c08772e822aaed4feb71f79e0f5a6cf81530d056bd8ae2ef73ac70792bd78fc095c069ef0d4304ff0a1c365f289d1191fe1
diff --git a/dev-debug/valgrind/valgrind-3.24.0.ebuild b/dev-debug/valgrind/valgrind-3.24.0.ebuild
deleted file mode 100644
index 829b9c011168..000000000000
--- a/dev-debug/valgrind/valgrind-3.24.0.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# The Valgrind upstream maintainer also maintains it in Fedora and will
-# backport fixes there which haven't yet made it into a release. Keep an eye
-# on it for fixes we should cherry-pick too:
-# https://src.fedoraproject.org/rpms/valgrind/tree/rawhide
-#
-# Also check the ${PV}_STABLE branch upstream for backports.
-
-inherit autotools flag-o-matic toolchain-funcs multilib pax-utils
-
-DESCRIPTION="An open-source memory debugger for GNU/Linux"
-HOMEPAGE="https://valgrind.org"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://sourceware.org/git/${PN}.git"
-	inherit git-r3
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/valgrind.gpg
-	inherit verify-sig
-
-	MY_P="${P/_rc/.RC}"
-	MY_P="${MY_P%%_p*}"
-	VALGRIND_PATCH_TARBALL="${MY_P}-patches-${PV##*_p}"
-	SRC_URI="
-		https://sourceware.org/pub/valgrind/${MY_P}.tar.bz2
-		verify-sig? ( https://sourceware.org/pub/valgrind/${MY_P}.tar.bz2.asc )
-	"
-	# Rollups of backports on ${PV}_STABLE branch upstream.
-	if [[ ${PV} == *_p* ]] ; then
-		SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${VALGRIND_PATCH_TARBALL}.tar.xz"
-	fi
-
-	S="${WORKDIR}"/${MY_P}
-
-	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-	fi
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="mpi"
-
-DEPEND="mpi? ( virtual/mpi )"
-RDEPEND="${DEPEND}"
-if [[ ${PV} == 9999 ]] ; then
-	# Needed for man pages
-	BDEPEND+="
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt
-	"
-else
-	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-valgrind )"
-fi
-
-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}"/${PN}-3.21.0-glibc-2.34-suppressions.patch
-)
-
-QA_CONFIG_IMPL_DECL_SKIP+=(
-	# "checking if gcc accepts nested functions" but clang cannot handle good
-	# errors and reports both "function definition is not allowed here" and
-	# -Wimplicit-function-declaration. bug #900396
-	foo
-	# FreeBSD function, bug #932822
-	aio_readv
-)
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-	elif use verify-sig ; then
-		# Needed for downloaded patch (which is unsigned, which is fine)
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.bz2{,.asc}
-	fi
-
-	default
-}
-
-src_prepare() {
-	# Correct hard coded doc location
-	sed -i -e "s:doc/valgrind:doc/${PF}:" docs/Makefile.am || die
-
-	# Don't force multiarch stuff on OSX, bug #306467
-	sed -i -e 's:-arch \(i386\|x86_64\)::g' Makefile.all.am || die
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# upstream doesn't support this, but we don't build with
-		# Sun/Oracle ld, we have a GNU toolchain, so get some things
-		# working the Linux/GNU way
-		find "${S}" -name "Makefile.am" -o -name "Makefile.tool.am" | xargs \
-			sed -i -e 's:-M,/usr/lib/ld/map.noexstk:-z,noexecstack:' || die
-		cp "${S}"/coregrind/link_tool_exe_{linux,solaris}.in
-	fi
-
-	if [[ ${PV} != 9999 && -d "${WORKDIR}"/${VALGRIND_PATCH_TARBALL} ]] ; then
-		PATCHES+=( "${WORKDIR}"/${VALGRIND_PATCH_TARBALL} )
-	fi
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--with-gdbscripts-dir="${EPREFIX}"/usr/share/gdb/auto-load
-	)
-
-	tc-is-lto && myconf+=( --enable-lto )
-
-	# Respect ar, bug #468114
-	tc-export AR
-
-	# -fomit-frame-pointer	"Assembler messages: Error: junk `8' after expression"
-	#                       while compiling insn_sse.c in none/tests/x86
-	# -fstack-protector     more undefined references to __guard and __stack_smash_handler
-	#                       because valgrind doesn't link to glibc (bug #114347)
-	# -fstack-protector-all    Fails same way as -fstack-protector/-fstack-protector-strong.
-	#                          Note: -fstack-protector-explicit is a no-op for Valgrind, no need to strip it
-	# -fstack-protector-strong See -fstack-protector (bug #620402)
-	# -m64 -mx32			for multilib-portage, bug #398825
-	# -fharden-control-flow-redundancy: breaks runtime ('jump to the invalid address stated on the next line')
-	filter-flags -fomit-frame-pointer
-	filter-flags -fstack-protector
-	filter-flags -fstack-protector-all
-	filter-flags -fstack-protector-strong
-	filter-flags -m64 -mx32
-	filter-flags -fsanitize -fsanitize=*
-	filter-flags -fharden-control-flow-redundancy
-	append-cflags $(test-flags-CC -fno-harden-control-flow-redundancy)
-	filter-lto
-
-	if use amd64 || use ppc64; then
-		! has_multilib_profile && myconf+=("--enable-only64bit")
-	fi
-
-	# Force bitness on darwin, bug #306467
-	use x64-macos && myconf+=("--enable-only64bit")
-
-	# Don't use mpicc unless the user asked for it (bug #258832)
-	if ! use mpi; then
-		myconf+=("--without-mpicc")
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	# fxsave.o, tronical.o have textrels
-	# -fno-strict-aliasing: https://bugs.kde.org/show_bug.cgi?id=486093
-	emake CFLAGS="${CFLAGS} -fno-strict-aliasing" LDFLAGS="${LDFLAGS} -Wl,-z,notext" check
-}
-
-src_install() {
-	if [[ ${PV} == 9999 ]]; then
-		# TODO: Could do HTML docs too with 'all-docs'
-		emake -C docs man-pages FAQ.txt
-		mv docs/FAQ.txt . || die "Couldn't move FAQ.txt"
-	fi
-
-	default
-
-	dodoc FAQ.txt
-
-	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
-		local l
-		for l in "${ED}"/usr/lib/valgrind/*.so ; do
-			install_name_tool -id "${EPREFIX}"/usr/lib/valgrind/${l##*/} "${l}"
-		done
-	fi
-}
-
-pkg_postinst() {
-	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 "https://bugs.gentoo.org/214065"
-	elog "https://bugs.gentoo.org/274771"
-	elog "https://bugs.gentoo.org/388703"
-}
diff --git a/dev-debug/valgrind/valgrind-3.24.0_p3.ebuild b/dev-debug/valgrind/valgrind-3.24.0_p3.ebuild
index 1a9c52b3ea9d..727ac38ea0b4 100644
--- a/dev-debug/valgrind/valgrind-3.24.0_p3.ebuild
+++ b/dev-debug/valgrind/valgrind-3.24.0_p3.ebuild
@@ -39,7 +39,7 @@ else
 	S="${WORKDIR}"/${MY_P}
 
 	if [[ ${PV} != *_rc* ]] ; then
-		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
 fi
 
diff --git a/dev-debug/valgrind/valgrind-3.24.0_p2.ebuild b/dev-debug/valgrind/valgrind-3.25.0.ebuild
index 1a9c52b3ea9d..fabc10e80fda 100644
--- a/dev-debug/valgrind/valgrind-3.24.0_p2.ebuild
+++ b/dev-debug/valgrind/valgrind-3.25.0.ebuild
@@ -16,7 +16,10 @@ DESCRIPTION="An open-source memory debugger for GNU/Linux"
 HOMEPAGE="https://valgrind.org"
 
 if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://sourceware.org/git/${PN}.git"
+	EGIT_REPO_URI="
+		https://sourceware.org/git/${PN}.git
+		https://git.sr.ht/~sourceware/valgrind
+	"
 	inherit git-r3
 else
 	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/valgrind.gpg
@@ -39,7 +42,7 @@ else
 	S="${WORKDIR}"/${MY_P}
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 	fi
 fi
 
diff --git a/dev-debug/valgrind/valgrind-3.23.0_p3.ebuild b/dev-debug/valgrind/valgrind-3.25.0_p1.ebuild
index 428925ac1aef..fabc10e80fda 100644
--- a/dev-debug/valgrind/valgrind-3.23.0_p3.ebuild
+++ b/dev-debug/valgrind/valgrind-3.25.0_p1.ebuild
@@ -16,7 +16,10 @@ DESCRIPTION="An open-source memory debugger for GNU/Linux"
 HOMEPAGE="https://valgrind.org"
 
 if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://sourceware.org/git/${PN}.git"
+	EGIT_REPO_URI="
+		https://sourceware.org/git/${PN}.git
+		https://git.sr.ht/~sourceware/valgrind
+	"
 	inherit git-r3
 else
 	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/valgrind.gpg
@@ -29,7 +32,9 @@ else
 		https://sourceware.org/pub/valgrind/${MY_P}.tar.bz2
 		verify-sig? ( https://sourceware.org/pub/valgrind/${MY_P}.tar.bz2.asc )
 	"
-	# Rollups of backports on ${PV}_STABLE branch upstream.
+	# Rollups of backports on ${PV}_STABLE branch upstream. This branch
+	# is usually announced on the mailing list and distros are encouraged
+	# to pull from it regularly.
 	if [[ ${PV} == *_p* ]] ; then
 		SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${VALGRIND_PATCH_TARBALL}.tar.xz"
 	fi
@@ -37,7 +42,7 @@ else
 	S="${WORKDIR}"/${MY_P}
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="-* amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 	fi
 fi
 
diff --git a/dev-debug/valgrind/valgrind-9999.ebuild b/dev-debug/valgrind/valgrind-9999.ebuild
index c8b5db499d34..fabc10e80fda 100644
--- a/dev-debug/valgrind/valgrind-9999.ebuild
+++ b/dev-debug/valgrind/valgrind-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -42,7 +42,7 @@ else
 	S="${WORKDIR}"/${MY_P}
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 	fi
 fi
 
@@ -74,6 +74,8 @@ QA_CONFIG_IMPL_DECL_SKIP+=(
 	# errors and reports both "function definition is not allowed here" and
 	# -Wimplicit-function-declaration. bug #900396
 	foo
+	# FreeBSD function, bug #932822
+	aio_readv
 )
 
 src_unpack() {