gentoo auto-resync : 07:07:2024 - 12:24:46

8 files changed, 118 insertions, 309 deletions

diff --git a/dev-debug/Manifest.gz b/dev-debug/Manifest.gz
index d40238d48462..f25fbda57e45 100644
--- a/dev-debug/Manifest.gz
+++ b/dev-debug/Manifest.gz
diff --git a/dev-debug/lldb/Manifest b/dev-debug/lldb/Manifest
index 842be34887ea..630cf55a36d1 100644
--- a/dev-debug/lldb/Manifest
+++ b/dev-debug/lldb/Manifest
@@ -1,4 +1,5 @@
 DIST llvm-project-022d15c0039fc1cfaa3cc2eb1a45b71bbb21fadd.tar.gz 215902891 BLAKE2B ecd87b84a4e5f87c91b6df0a2d6849f385bdb7b26b14a2836f1e1fc5a69f9f5b441e47b9251174019f62eabe39a243092cd1a175b5da7d7576cdcfd63083cff0 SHA512 7726e253179bfd9e0b93236e3ce1133b421329b0b3496b10c0a0eecde372fb5e55cce737b6b78db13f2d0833bbc92023d95efa54cb2918b12ce9af166bd90ff4
+DIST llvm-project-0b9f2847da79298ed09c29493245113f02b32d9f.tar.gz 216399453 BLAKE2B ed13e6639d40bdda6dbd09eba0cc8e4f82f4f53ce3cff9742e902af1c306c60dcb6d5fb008057829d46bbbde391697726cba2096c52cf1592c00faf1e37430e4 SHA512 a5b0bf59fa228a41f0c904a42b4b96740fc5e5caa63248c546eb4a810e86d5d8d1d8df663051ed4444cc0389ffa6ec12ee5dbf7d94d6211a253319550d7fac1c
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db365965f1c00bfea6c2d653b3996bd2acef8a2b37e37f6fc8a9d2b65711ad72657e0ef52c42f733053cf65051e7822f27396c30406d SHA512 89a67ebfbbc764cc456e8825ecfa90707741f8835b1b2adffae0b227ab1fe5ca9cce75b0efaffc9ca8431cae528dc54fd838867a56a2b645344d9e82d19ab1b7
@@ -16,4 +17,5 @@ EBUILD lldb-18.1.8.ebuild 2620 BLAKE2B f2a61e79df52d68eca32a9f95fd1d3ebcbd5e7b21
 EBUILD lldb-19.0.0.9999.ebuild 2579 BLAKE2B 60edc61e262a002ffc130dc86b3a77cf647f8bb62707a3c776d542dae3aeaa04fb38b5a6df6c2b7a7386a9267cb28f6af415cc6598e830bf45f13c7a5a8054f6 SHA512 78c3a75ad806b94b1b828ba7cede5f15f02b937b9522ed47882d1443baadb891e18d4c7f8bdfb0c0732bf7d763a92d0f934cdda2e0377a79e159e22c24753d40
 EBUILD lldb-19.0.0_pre20240623.ebuild 2579 BLAKE2B 60edc61e262a002ffc130dc86b3a77cf647f8bb62707a3c776d542dae3aeaa04fb38b5a6df6c2b7a7386a9267cb28f6af415cc6598e830bf45f13c7a5a8054f6 SHA512 78c3a75ad806b94b1b828ba7cede5f15f02b937b9522ed47882d1443baadb891e18d4c7f8bdfb0c0732bf7d763a92d0f934cdda2e0377a79e159e22c24753d40
 EBUILD lldb-19.0.0_pre20240630.ebuild 2579 BLAKE2B 60edc61e262a002ffc130dc86b3a77cf647f8bb62707a3c776d542dae3aeaa04fb38b5a6df6c2b7a7386a9267cb28f6af415cc6598e830bf45f13c7a5a8054f6 SHA512 78c3a75ad806b94b1b828ba7cede5f15f02b937b9522ed47882d1443baadb891e18d4c7f8bdfb0c0732bf7d763a92d0f934cdda2e0377a79e159e22c24753d40
+EBUILD lldb-19.0.0_pre20240706.ebuild 2579 BLAKE2B 60edc61e262a002ffc130dc86b3a77cf647f8bb62707a3c776d542dae3aeaa04fb38b5a6df6c2b7a7386a9267cb28f6af415cc6598e830bf45f13c7a5a8054f6 SHA512 78c3a75ad806b94b1b828ba7cede5f15f02b937b9522ed47882d1443baadb891e18d4c7f8bdfb0c0732bf7d763a92d0f934cdda2e0377a79e159e22c24753d40
 MISC metadata.xml 495 BLAKE2B dec5cbc692a57ddb85bccb855d6e16893e6e851c6e3b3f321693fd7cb8bf930167976573d61bfca3c29dc667bb57c2c11669299bcc80d1da04fb53ea90ca1826 SHA512 6168aeac121fa7b3f19fe2590c4ad52eae959bfd3bebceebc64a54d254a29226d5424ab031f9730af9f574e3956119856d1ea2008b5d24721b346cf8f5ad7f9f
diff --git a/dev-debug/lldb/lldb-19.0.0_pre20240706.ebuild b/dev-debug/lldb/lldb-19.0.0_pre20240706.ebuild
new file mode 100644
index 000000000000..c79bdcdf6f3d
--- /dev/null
+++ b/dev-debug/lldb/lldb-19.0.0_pre20240706.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit cmake flag-o-matic llvm.org llvm-utils python-single-r1
+
+DESCRIPTION="The LLVM debugger"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0/${LLVM_SOABI}"
+IUSE="+debug debuginfod +libedit lzma ncurses +python test +xml"
+RESTRICT="test"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+DEPEND="
+	debuginfod? (
+		net-misc/curl:=
+		dev-cpp/cpp-httplib:=
+	)
+	libedit? ( dev-libs/libedit:0= )
+	lzma? ( app-arch/xz-utils:= )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+	xml? ( dev-libs/libxml2:= )
+	~sys-devel/clang-${PV}
+	~sys-devel/llvm-${PV}[debuginfod=]
+"
+RDEPEND="
+	${DEPEND}
+	python? (
+		${PYTHON_DEPS}
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	python? (
+		>=dev-lang/swig-3.0.11
+	)
+	test? (
+		$(python_gen_cond_dep "
+			~dev-python/lit-${PV}[\${PYTHON_USEDEP}]
+			dev-python/psutil[\${PYTHON_USEDEP}]
+		")
+		sys-devel/lld
+	)
+"
+
+LLVM_COMPONENTS=( lldb cmake llvm/utils )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
+llvm.org_set_globals
+
+src_configure() {
+	llvm_prepend_path "${LLVM_MAJOR}"
+
+	# bug #858389 (https://github.com/llvm/llvm-project/issues/83636)
+	filter-lto
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	local mycmakeargs=(
+		-DLLDB_ENABLE_CURSES=$(usex ncurses)
+		-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLDB_ENABLE_PYTHON=$(usex python)
+		-DLLDB_ENABLE_LUA=OFF
+		-DLLDB_ENABLE_LZMA=$(usex lzma)
+		-DLLDB_ENABLE_LIBXML2=$(usex xml)
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+
+		-DLLDB_INCLUDE_TESTS=$(usex test)
+
+		-DCLANG_LINK_CLANG_DYLIB=ON
+		# TODO: fix upstream to detect this properly
+		-DHAVE_LIBDL=ON
+		-DHAVE_LIBPTHREAD=ON
+
+		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
+		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
+		# ncurses with complete library set (including autodetection
+		# of -ltinfo)
+		-DCURSES_NEED_NCURSES=ON
+
+		-DCLANG_RESOURCE_DIR="../../../clang/${LLVM_MAJOR}"
+
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-lldb-{shell,unit}
+	# failures + hangs
+	#use python && cmake_build check-lldb-api
+}
+
+src_install() {
+	cmake_src_install
+	find "${D}" -name '*.a' -delete || die
+
+	use python && python_optimize
+}
diff --git a/dev-debug/valgrind/Manifest b/dev-debug/valgrind/Manifest
index 762fd27c9a6f..5c21d98ad5d8 100644
--- a/dev-debug/valgrind/Manifest
+++ b/dev-debug/valgrind/Manifest
@@ -10,15 +10,13 @@ DIST valgrind-3.21.0.tar.bz2 17449484 BLAKE2B 1f7306d288eb5ecfb2b2f0b2dc68960ecd
 DIST valgrind-3.21.0.tar.bz2.asc 488 BLAKE2B 6297bc925c16526a51de4f589232a8d5bcb8d54bdc885c145d329deeba45b42d3a5a8a3f59d3fb240d3bd78be7fd30d95ceb33c7624afd3c99c51833d0fd16f2 SHA512 114e5cd2f7352e56099efa3b2c42d39ed24e42419bbaac1af5e2b5c4fa72a2ba38ac6b0c60b93460a0cce8819ca0c7fae6618599b2af809ac0ab4fa30fdb25ba
 DIST valgrind-3.22.0.tar.bz2 16565502 BLAKE2B 80024371b3e70521996077fba24e233097a6190477ced1b311cd41fead687dcc2511ac0ef723792488f4af08867dff3e1f474816fda09c1604b89059e31c2514 SHA512 2904c13f68245bbafcea70998c6bd20725271300a7e94b6751ca00916943595fc3fac8557da7ea8db31b54a43f092823a0a947bc142829da811d074e1fe49777
 DIST valgrind-3.22.0.tar.bz2.asc 488 BLAKE2B 9e4d4cfac4dcc09bb62beeaa7b9f78bfafd0a6ae8d63e423ff81b7b8f5444a301e4c3030a241644c8070c36ee040832ce99f444678f22611457e325ceae18dd1 SHA512 c2317db564ef816d2b5d1a7f2f680dc1c6ea05abbffde660587946c986af179ea7ca2314d94c792f63f3043b6a44819ddf5661fd60ec2454a2c562e7d2711b36
-DIST valgrind-3.23.0-patches-1.tar.xz 9660 BLAKE2B 0f59ff11d440cf39c3af6a3c6d9a21b0d922f79cb00e77c0e183224e4baca6037d30c48368934498ee5bf5c98b555b2cf80d0bdcef851f264949199079c74f65 SHA512 69544e36f0d3718c02ca781b58c5f76856ccba3a863cee785342e26265a430b2b5aebd1e558dd63ba798cc762be750ac66f192ef4eeb3bc18c6c156633475683
 DIST valgrind-3.23.0-patches-2.tar.xz 15024 BLAKE2B ca7085a6dd38cda9df9437697109b2cb59dfcb8154b1df20f9ffb20dcde9acfa671298610ccc8a57704b1a5f7f2a11b40352a51264440daaa0780e54027096d0 SHA512 cc7ea14808100b72e6bdf65248687694bf15f982dec1a42b59a9f42d26b9f1bce0e99a867a544f521d509b107792b26d15b75b417838ac2692e8773d52d6d69f
+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
-EBUILD valgrind-3.21.0-r1.ebuild 4075 BLAKE2B 06c7d359248ebcdab7c99c06e1f8ffe978f92e22ef866bcc936ec719b61a79404e6f1831f968624063da083da27911ea804f6223734d2dd16d4883e7d097fa87 SHA512 edcad8bf726f8991a561e51a42e8ee2bb4f52a9641c12bacc86ad578cd38b3f7bcb10eada151c8ed9b739fd08fdb5d595131ed71c40170f3276d7cb04344161e
 EBUILD valgrind-3.21.0-r2.ebuild 4443 BLAKE2B 2c54610d70864adfa726ee6f9c02e5a79e00625b57547e7f80f2c334f9eae3465834b70068af2413bb9ebd5e1723024f62a1e67cccee7613eb0179cc1051b88f SHA512 c259e9a5871a8d0f72c3c385293df8561d755695837faa0f15ea11f89f088ec214525fcf450f908666e1d71e0e584dd7069abf905e0b001df12d37cb30f25fad
 EBUILD valgrind-3.22.0-r2.ebuild 5364 BLAKE2B 30728ecefc6027886c1a93fa2989e03ba5394ed3b06f34bd93f56cf463dcad8bcc3b0c16b3983abc1a73dc7dd79ccf692e043fd0e115b3da13092480f20a1b05 SHA512 60a875f027645d83c7e3fda68761b2702c16196675f946601eec7529c22fd1f7a04d0a0e1db8d830d7edaec1426a7d8c5bc23be3f510cc7e9ec3d8a7d4d21f71
-EBUILD valgrind-3.23.0.ebuild 5292 BLAKE2B 60677f73b6e8cdeea2c8e2cfe50fe9e0a178e0dde1d0ecce9748d6709a0d64363eac02bf8183ac846896e051d9d1ef6989ac01a56fc0a415eedf6ba985127863 SHA512 4203dee41a738575ece7c59184a42493aa552025e21118fa08ffdd6987f9d0ff18d4d38a3820983b4d31ed9620ba6d48a083b96b0171ad7033bec642ac2c13e2
-EBUILD valgrind-3.23.0_p1.ebuild 5887 BLAKE2B f90ffcf2cb800ad0ad2cf0c5f505d7e21988bab06ff7d445000114b205aefc04edb499a63cbaa7f7fc32854e88c223e85d678b50e81324512bbd4d624483adff SHA512 ab5c282c2d6d4e9cbb0d7215ec94b2bc76448f2380a69c2222b899f1ec2852ebda06c8814adc5c0253057675face6b583a6311cebaa290dc053e5a9ca5889b83
 EBUILD valgrind-3.23.0_p2.ebuild 5904 BLAKE2B 2f76b9cc027abd62174c67b0d31e8dee04f60404f3c6c5cdb122e7de65ccc4e99dd27a9d029d6312ea9232adc66dafe9cf9500dda21c185821789cc703533285 SHA512 3038a00d1bbb52a982e7e333b55f787b7860fa4350d4f1e9172c04c38674424cbdfa0c5a4a1be54e737b768377f37f0de3b7ffdb74491f175e6105680ab5d4f9
-EBUILD valgrind-9999.ebuild 5904 BLAKE2B 0c79ffaf65c830d5d99c0f664e0912f3780537e35a12c47f717ff66ffd3308a129e0f7b426609d64567b735237fef5bd299a01cbf77bb0c0cdd148bc40a4cfa2 SHA512 ec0861209d390415675e33998a5e3201be3543f59da0855e7a83a0a8f135956490fbbb3335608de0d9ec1e38cd9bcc5715d4860fafd98c9e5ba09c32b2cb1b84
+EBUILD valgrind-3.23.0_p3.ebuild 5913 BLAKE2B c04dfa9e55e0d78f7084137b87e68bd40dd4e28e39dcedbe8a11fbc6c4f129e6936de58a00b1a6be40db517f7e243880e13f9eafa6618a7f93cfc44ef0c88e98 SHA512 a2f8ee9c79bc0755b652499e9e35cc70286d232d2b01ac99d05088010c16906498d41990a988cbe45195146e0358026e6a1a17a5430ec48d1317d4a46a84e291
+EBUILD valgrind-9999.ebuild 5913 BLAKE2B c04dfa9e55e0d78f7084137b87e68bd40dd4e28e39dcedbe8a11fbc6c4f129e6936de58a00b1a6be40db517f7e243880e13f9eafa6618a7f93cfc44ef0c88e98 SHA512 a2f8ee9c79bc0755b652499e9e35cc70286d232d2b01ac99d05088010c16906498d41990a988cbe45195146e0358026e6a1a17a5430ec48d1317d4a46a84e291
 MISC metadata.xml 1123 BLAKE2B 17b5501b05acd9384ab57a15018bc0d1ede50d7b5b9a5c38fcce816f68e8946010bc86233a197df89ad208957f90ab643942b7e1a3ceaa6e8d456320828b84e8 SHA512 a8c32063f3afd28c4a2d5c5c0f437c08772e822aaed4feb71f79e0f5a6cf81530d056bd8ae2ef73ac70792bd78fc095c069ef0d4304ff0a1c365f289d1191fe1
diff --git a/dev-debug/valgrind/valgrind-3.21.0-r1.ebuild b/dev-debug/valgrind/valgrind-3.21.0-r1.ebuild
deleted file mode 100644
index 632b096a9c08..000000000000
--- a/dev-debug/valgrind/valgrind-3.21.0-r1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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
-	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"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="mpi"
-
-DEPEND="mpi? ( virtual/mpi )"
-RDEPEND="${DEPEND}"
-if [[ ${PV} != 9999 ]] ; then
-	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
-)
-
-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
-
-	default
-
-	# Regenerate autotools files
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=()
-
-	# 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
-	# -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
-	filter-flags -fsanitize -fsanitize=*
-	replace-flags -ggdb3 -ggdb2
-	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_install() {
-	default
-
-	if [[ ${PV} == "9999" ]]; then
-		# Otherwise FAQ.txt won't exist:
-		emake -C docs FAQ.txt
-		mv docs/FAQ.txt . || die "Couldn't move FAQ.txt"
-	fi
-
-	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.23.0.ebuild b/dev-debug/valgrind/valgrind-3.23.0.ebuild
deleted file mode 100644
index 48014039f07e..000000000000
--- a/dev-debug/valgrind/valgrind-3.23.0.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2024 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}"
-	SRC_URI="https://sourceware.org/pub/valgrind/${MY_P}.tar.bz2"
-	SRC_URI+=" verify-sig? ( https://sourceware.org/pub/valgrind/${MY_P}.tar.bz2.asc )"
-	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
-	# From stable branch
-)
-
-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
-)
-
-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
-
-	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.23.0_p1.ebuild b/dev-debug/valgrind/valgrind-3.23.0_p3.ebuild
index b19c8e416302..bd5cb983fad2 100644
--- a/dev-debug/valgrind/valgrind-3.23.0_p1.ebuild
+++ b/dev-debug/valgrind/valgrind-3.23.0_p3.ebuild
@@ -24,7 +24,7 @@ else
 
 	MY_P="${P/_rc/.RC}"
 	MY_P="${MY_P%%_p*}"
-	VALGRIND_PATCH_TARBALL="${MY_P}-patches-1"
+	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 )
@@ -98,7 +98,7 @@ src_prepare() {
 		cp "${S}"/coregrind/link_tool_exe_{linux,solaris}.in
 	fi
 
-	if [[ -d "${WORKDIR}"/${VALGRIND_PATCH_TARBALL} ]] ; then
+	if [[ ${PV} != 9999 && -d "${WORKDIR}"/${VALGRIND_PATCH_TARBALL} ]] ; then
 		PATCHES+=( "${WORKDIR}"/${VALGRIND_PATCH_TARBALL} )
 	fi
 
diff --git a/dev-debug/valgrind/valgrind-9999.ebuild b/dev-debug/valgrind/valgrind-9999.ebuild
index 8e4648affe18..bd5cb983fad2 100644
--- a/dev-debug/valgrind/valgrind-9999.ebuild
+++ b/dev-debug/valgrind/valgrind-9999.ebuild
@@ -24,7 +24,7 @@ else
 
 	MY_P="${P/_rc/.RC}"
 	MY_P="${MY_P%%_p*}"
-	VALGRIND_PATCH_TARBALL="${MY_P}-patches-1"
+	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 )