3 files changed, 18 insertions, 61 deletions
diff --git a/sys-devel/dwz/Manifest b/sys-devel/dwz/Manifest
index aaad539d9f46..a37c36522578 100644
--- a/sys-devel/dwz/Manifest
+++ b/sys-devel/dwz/Manifest
@@ -1,7 +1,6 @@
 AUX dwz-0.15-gdb-15.patch 13050 BLAKE2B 9f00c3dc0b8e8f4f64da11e41d52afe611c38ba68d4273a8fc898e090b8c02882749c1e34f4754b140702fa24e52b6d0224f7dfd39c74cacf09dabe91ef1d605 SHA512 3291a800ae771244dface7b0180d067e484c5ebbcc2082c3fd2264fe1e76147793d6ffb64827b533eb3598f27ab5c07cd307a48d538c8de018b62362f4cbfa61
 AUX dwz-0.15-readelf.patch 1464 BLAKE2B c8a3752b116f7e79bef4e477e655ee3b490f83013f57c2eaab3890b62f7981df9adb1d2d23ca7789e6c019c04ed541bb42c280c806b98738ab1423317be60b77 SHA512 c8f1fc676008d97ba1e011192a1238f67f52b44617ee6e4aea3579b97dd55fb6a5cd264ff212e55767d48e2731641f8c17339a3c964fcfcec1b86e425524c055
 DIST dwz-0.15.tar.xz 150080 BLAKE2B 4ce1722a53cb588cda8195211a26b28d69891ed32cc59e44897270298d033590c79c8c73168dc3b261cb017fc12874a9cbd50db3bfaa0aa7de8ed7cf8a588cca SHA512 43eb4b08c1f529859dc3466697d5ad7e172d6efbf21409530a67a2492ae4acc3734d5134bbd6e07c089ecc358d915871b13e22f6e4f1dd4c3af19ef804f8fcc5
-EBUILD dwz-0.15-r1.ebuild 1024 BLAKE2B b184f8872b3b1b9edadacabd12fc503ef08d1c4cb44a189a95cbabb29a9bd4effa0ac4d9ebc74baae0ffdeb53f6dadfa7db849f623e741d9a405ac9e3d66eb1d SHA512 6d52170c348aaa928cf44cca1404d97943e48484f9f9d18e32533847db67f6733f9c5f3058c37af0f841724254d307bf05039f9e8879da25307604db3fe6c40e
 EBUILD dwz-0.15-r4.ebuild 1573 BLAKE2B 4d52200df3b5ec8e4724b4f27ff1892bcb59f90dabaf8abea3abdada6494fbc11b8283b718256a37cc61ac24fca4ac3e94356c03e6787be5c9c073026198bc19 SHA512 f07171dca6c0c3094d137e785dd36eb7a79d4ebf12a549ff5746bf7db1b80d3e8fdf35756b12e6b3886192c7b914fa992764b66b19aeb57355e2eaf185b0cf6e
-EBUILD dwz-9999.ebuild 1038 BLAKE2B 942aa7a71de42218ab7a734a0c4b62e82e36045f37ccdef1bbb87f6948c72c0cd7fe9775d3a53e1a331cce07ef08e2c715bc48093e9d68b248263c5eea5dbeb4 SHA512 466762c125ed44a7c764f7f0907798541c8cbab8e2df2494cd08101c2085691fc1db269ac0122cb7024436a55dc314d68303d443c8d624020274dbd4d048ac72
+EBUILD dwz-9999.ebuild 1438 BLAKE2B f68542887327af8386d55396f4307ca3b6a681224e45960cfc57b41c697cbedc2cce67b6a513c188e8205c4931e357fdfad2c1ac4ac2880b084c8287e5e3bdcd SHA512 9c8bb8b7de5ea4f779f52489755272d867312cdf344f1004fa92c5266ecef7cb48a79def8eab288dfa49e19e1f6725570758856691e90a65a6aaa48cf3f66e91
 MISC metadata.xml 812 BLAKE2B abd6e645ab8cf502bfb6b90cd5712ff43d22a4e17ed7a2025bfbb16407a907b6b482497ce060ffb55b250a441fcbc495a37cb540b9d1152ed42dbdbbb4b074ca SHA512 7dea9a490d130dc0a03291b01000f38b880be517c13d762a6b6ac82e7313375c0dc5c0506ead51dd6789e72ffc612ade73e734456bfa8696777ede3f90dd6394
diff --git a/sys-devel/dwz/dwz-0.15-r1.ebuild b/sys-devel/dwz/dwz-0.15-r1.ebuild
deleted file mode 100644
index 93355724c9f4..000000000000
--- a/sys-devel/dwz/dwz-0.15-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="DWARF optimization and duplicate removal tool"
-HOMEPAGE="https://sourceware.org/dwz"
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://sourceware.org/git/dwz.git"
-	inherit git-r3
-else
-	SRC_URI="https://sourceware.org/ftp/dwz/releases/${P}.tar.xz"
-	S="${WORKDIR}/${PN}"
-
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
-fi
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/elfutils
-	dev-libs/xxhash
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? (
-		dev-debug/gdb
-		dev-libs/elfutils[utils]
-		dev-util/dejagnu
-	)
-"
-
-src_prepare() {
-	default
-	tc-export CC
-}
-
-src_compile() {
-	export LANG=C LC_ALL=C  # grep find nothing for non-ascii locales
-
-	emake CFLAGS="${CFLAGS}" srcdir="${S}"
-}
-
-src_test() {
-	emake CFLAGS="${CFLAGS}" srcdir="${S}" check
-}
-
-src_install() {
-	emake DESTDIR="${D}" CFLAGS="${CFLAGS}" srcdir="${S}" install
-}
diff --git a/sys-devel/dwz/dwz-9999.ebuild b/sys-devel/dwz/dwz-9999.ebuild
index 7692569e9bca..2087550f34b4 100644
--- a/sys-devel/dwz/dwz-9999.ebuild
+++ b/sys-devel/dwz/dwz-9999.ebuild
@@ -14,7 +14,7 @@ else
 	SRC_URI="https://sourceware.org/ftp/dwz/releases/${P}.tar.xz"
 	S="${WORKDIR}/${PN}"
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="GPL-2+ GPL-3+"
@@ -25,6 +25,10 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	dev-libs/elfutils
 	dev-libs/xxhash
+	elibc_musl? (
+		>=sys-libs/error-standalone-2.0
+		sys-libs/obstack-standalone
+	)
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
@@ -33,6 +37,7 @@ BDEPEND="
 		dev-libs/elfutils[utils]
 		dev-util/dejagnu
 	)
+	virtual/pkgconfig
 "
 
 src_prepare() {
@@ -43,13 +48,21 @@ src_prepare() {
 src_compile() {
 	export LANG=C LC_ALL=C  # grep find nothing for non-ascii locales
 
-	emake CFLAGS="${CFLAGS}" srcdir="${S}"
+	tc-export PKG_CONFIG
+
+	export LIBS="-lelf"
+	if use elibc_musl; then
+		export CFLAGS="${CFLAGS} $(${PKG_CONFIG} --cflags obstack-standalone error-standalone)"
+		export LIBS="${LIBS} $(${PKG_CONFIG} --libs obstack-standalone error-standalone)"
+	fi
+
+	emake CFLAGS="${CFLAGS}" LIBS="${LIBS}" srcdir="${S}"
 }
 
 src_test() {
-	emake CFLAGS="${CFLAGS}" srcdir="${S}" check
+	emake CFLAGS="${CFLAGS}" LIBS="${LIBS}" srcdir="${S}" check
 }
 
 src_install() {
-	emake DESTDIR="${D}" CFLAGS="${CFLAGS}" srcdir="${S}" install
+	emake DESTDIR="${D}" CFLAGS="${CFLAGS}" LIBS="${LIBS}" srcdir="${S}" install
 }