3 files changed, 2 insertions, 91 deletions
diff --git a/dev-debug/duma/Manifest b/dev-debug/duma/Manifest
index 7b7377927f1a..bf67692c1f5f 100644
--- a/dev-debug/duma/Manifest
+++ b/dev-debug/duma/Manifest
@@ -1,6 +1,5 @@
 AUX duma-2.5.15-gcc6.patch 599 BLAKE2B 7fa6c2d42b9c1191e40854aae2bfee236b0c9f9e5360f8c59a32d9b4a89c1a5351812dadce8943848478751ce49db30d5374251a759fa5af9ce28420be64ddbe SHA512 9577e34e97b6f63654a8fa5b6ad26f54733cdd758a2a96b99c2771f9593436501b09ade40e8b20ff61da033e64c635a29b4884a6e4ea3b62fa9a4c12587cf947
 DIST duma-2.5.15-GNUmakefile.patch.bz2 4618 BLAKE2B 506127ce1f8f3d01d0443ab1240c585aa734bf3756ae632ccec8ff88f33fc0ffc5113705d5c3c31c14bf52a2cf3c82132669c2c14d24f0c6df17b8e802c8ef40 SHA512 6d83294897a60c6d0ebac388c8f791adc6a199b2c9838497bcfff39502262014c8437a331e08e3526568d3ef755a7dfdc2557771bdae89c58cd5f714eae70df2
 DIST duma_2_5_15.tar.gz 240479 BLAKE2B c79f47ba418e22a65a2ad2d4cbff796c2a620ec5f36743d543fe1260e61ec700c648033ac3c91e71be3f3e1129a1c12e9f83a91277244962cfbd494d9588d681 SHA512 0e2abdb08cfbaf9fd0a6be348c831a83ac4ee86d2297dcd1c4d625ddb4b2c1c73eef05e2b895e291d5b8076b1baea559c89d475f30e409210df4ab69b71b6345
-EBUILD duma-2.5.15-r2.ebuild 2177 BLAKE2B 5a19b980f165fc2d5d28542091de627abdc27957571d0d3e9b587dc1a754e9fc9debb22cfdb7ef91c8805ec2476200399a2694c4140d1e14657dc475e4b5e050 SHA512 75cc049c79e98759f78e0980327cf3adf187b96d0713cbedbe6fbf311a320bccbbbf773dff85c29d5890cac917418286356b646b1e466752da8601e04a4c4da8
-EBUILD duma-2.5.15-r3.ebuild 2130 BLAKE2B cc2a7c24af6f27b9564eeb4079676bfbea61118412ac125c159dd5d20f19b1a4c1c020947eb816d385eb6811ad5d23387c1be02518696477330964827dd17ffb SHA512 7a519c99d9715e04b33ade710dd7dbfe42820fc983cd671f5034806549f05bc8a1280faa759378ceacdafd81a74ab54b783d275579fdeb5bb429257621f8b96e
+EBUILD duma-2.5.15-r3.ebuild 2127 BLAKE2B 4b9fe0e881c161effa351fc65f8c8748bdffe2ed6445149361cdfd7c4ad47ec4cd885cd6957ff00eaaa18029a08b0085671239e3f224ec116878fb5a18e82b90 SHA512 e263dd1c8e1c9c73c0b1ef26631c74e83c599221eeb849c681e96e62155b4ea9fe77bede63a682e5e50302bc38d3140c7165803f2897ec4da3955a3d24ee2cdc
 MISC metadata.xml 513 BLAKE2B 38e5501e1e6330168567d0bac3adee680025df82160f5e3d2b57161ebbf913ab5b3338b28eb13686d62a197cc19167933a80895d67296b92fb76cef8ff3a85d2 SHA512 e3fc78a9197bab39ccbd386824fe9862d6b34fa424df0fc137281b0277aa725ab4ddc0f360b5460f36dce14d2ce1f7b1bb566280bb31ae327e8d85c1523b1f28
diff --git a/dev-debug/duma/duma-2.5.15-r2.ebuild b/dev-debug/duma/duma-2.5.15-r2.ebuild
deleted file mode 100644
index 867fad99a60f..000000000000
--- a/dev-debug/duma/duma-2.5.15-r2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic toolchain-funcs versionator
-
-MY_P=${PN}_$(replace_all_version_separators '_')
-
-DESCRIPTION="DUMA (Detect Unintended Memory Access) is a memory debugging library"
-HOMEPAGE="http://duma.sourceforge.net"
-SRC_URI="https://downloads.sourceforge.net/duma/${MY_P}.tar.gz
-	mirror://gentoo/${P}-GNUmakefile.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="examples"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${WORKDIR}"/${P}-GNUmakefile.patch
-	"${FILESDIR}"/${P}-gcc6.patch
-)
-
-src_configure() {
-	# other flags will break duma
-	export CFLAGS="-O0 -Wall -Wextra -U_FORTIFY_SOURCE"
-	tc-export AR CC CXX LD RANLIB
-
-	# bug #789708
-	append-cxxflags -std=c++14
-
-	case "${CHOST}" in
-		*-linux-gnu)
-			OS=linux;;
-		*-solaris*)
-			OS=solaris;;
-		*-darwin*)
-			OS=osx;;
-	esac
-	export OS="${OS}"
-	elog "Detected OS is: ${OS}"
-
-	if use amd64 && ! [ -n "${DUMA_ALIGNMENT}" ]; then
-		export DUMA_ALIGNMENT=16
-		elog "Exported DUMA_ALIGNMENT=${DUMA_ALIGNMENT} for x86_64,"
-	fi
-
-}
-
-src_compile() {
-	# The below must be run first if distcc is enabled, otherwise
-	# the real build breaks on parallel makes.
-	emake reconfig
-	emake
-}
-
-src_test() {
-	emake test
-
-	elog "Please, see the output above to verify all tests have passed."
-	elog "Both static and dynamic confidence tests should say PASSED."
-}
-
-src_install() {
-	emake prefix="${D}/usr" libdir="${D}/usr/$(get_libdir)" \
-		docdir="${D}/usr/share/doc/${PF}" install
-
-	sed -i "s|LD_PRELOAD=./libduma|LD_PRELOAD=libduma|" "${D}"/usr/bin/duma \
-		|| die "sed failed"
-
-	dodoc CHANGELOG TODO GNUmakefile
-
-	if use examples; then
-		docinto examples
-		dodoc example[1-6].cpp example_makes/ex6/Makefile
-	fi
-}
-
-pkg_postinst() {
-	elog "See the GNUmakefile which will be also installed at"
-	elog "/usr/share/doc/${PF} for more options. You can now export"
-	elog "varibles to the build system easily, e.g.:"
-	elog "# export CPPFLAGS=\"-DFLAG\" (or by using append-cppflags)"
-	elog "# export DUMA_ALIGNMENT=${DUMA_ALIGNMENT} (Default is 16 for x86_64)"
-	elog "See more information about DUMA_ALIGNMENT from Readme.txt"
-}
diff --git a/dev-debug/duma/duma-2.5.15-r3.ebuild b/dev-debug/duma/duma-2.5.15-r3.ebuild
index fc8f17608610..f0f76efd1d0c 100644
--- a/dev-debug/duma/duma-2.5.15-r3.ebuild
+++ b/dev-debug/duma/duma-2.5.15-r3.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${P//[.-]/_}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="examples"
 
 PATCHES=(