4 files changed, 208 insertions, 3 deletions
diff --git a/dev-debug/Manifest.gz b/dev-debug/Manifest.gz
index 0476989f0e07..01b4c5618a19 100644
--- a/dev-debug/Manifest.gz
+++ b/dev-debug/Manifest.gz
diff --git a/dev-debug/valgrind/Manifest b/dev-debug/valgrind/Manifest
index da383b6bf878..78484259a7a4 100644
--- a/dev-debug/valgrind/Manifest
+++ b/dev-debug/valgrind/Manifest
@@ -9,10 +9,13 @@ DIST valgrind-3.24.0-patches-2.tar.xz 17900 BLAKE2B 50304bb6cd0d41cee9605f3ad2af
 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
+DIST valgrind-3.25.0.RC1.tar.bz2 16951927 BLAKE2B 946534ff5b5ed57aa3326589eecce8e934497e37b38cc9e2c1695fb103a129ab96e9ef46267412ede57819b7cc9ce05b709b41f85248427b14e6d0849820c8ff SHA512 448655499e20c00f41b9390c5ee693e78e5aa319aa414437ffdf5ed5028dabd1478a04ce97a7b7780d4415efbc0a51de9eb0abb30be379e490fed7bf188107a5
+DIST valgrind-3.25.0.RC1.tar.bz2.asc 488 BLAKE2B 030ff48f7758a19481df52cad839482fafd1ca40ce8139330d9f4e7018bb36e7b825c9bfe29e2466add364c01b461ffe7d75eb805f6a3a50161bfa3030f1eb84 SHA512 5651ff4ef51aa997ddb29ec24c045e5c9208e278aea19b633949fd3a69910e913a91e3b3074ef6bb9b912f2d397a87ad74582b94010f9970d4f41815a4d3e935
 EBUILD valgrind-3.23.0_p3.ebuild 5951 BLAKE2B 67c33c40565679604dfd289560dcc3dea52fac727f0017e9aa70a5ba86dd2d545c2c9169f5efc522c247564db6d79bf52ee469227de27ea9189a487ba7b11301 SHA512 94cdab6c5f87943887acad1072ad59eefb5acc15f9c8129c3ca732e86a42a06f658d37dd2b3ae9159886308ed5ca61f0280fceb972019d1c153bcf7306b1ae09
 EBUILD valgrind-3.24.0.ebuild 5957 BLAKE2B 4337a1a031490b09759fa09007d64d3b67b4177b9b14ad3767ad6d13fb18d9bee6a46f66daf6e4fb715bed3718498bbc4ff3cc3d977549a9db58878333b6c287 SHA512 cff446a33a7d328c76ac1b9d99de6e2f89998c2a9e143645ac54eb6b5722fcd8427cd535593c83fef5f3e65b41af0f489f09a77bb5a8dc08d1d9119d4b6e209a
 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.25.0_rc1.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.25.0_rc1.ebuild b/dev-debug/valgrind/valgrind-3.25.0_rc1.ebuild
new file mode 100644
index 000000000000..fabc10e80fda
--- /dev/null
+++ b/dev-debug/valgrind/valgrind-3.25.0_rc1.ebuild
@@ -0,0 +1,200 @@
+# 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
+		https://git.sr.ht/~sourceware/valgrind
+	"
+	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. 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
+
+	S="${WORKDIR}"/${MY_P}
+
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~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-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() {