6 files changed, 139 insertions, 11 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 018fe4abcd96..60363b7b3d52 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index 75ea67cd3686..6922886a689c 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -5,6 +5,7 @@ DIST elfutils-0.188.tar.bz2 9112977 BLAKE2B 6b0474f1436eaf6af73b735b9b2ddd5448ab
 DIST elfutils-0.188.tar.bz2.sig 310 BLAKE2B c8d9135cffde3b1dd337b692d5351855cf799915d3ebd553327febaac192bd2f108b3f45a6376d458e179390a1ceaf4809762cdc40ea1e05fed0214ac33ed56e SHA512 4cc8a7417d244e319a1650d71b1831660cfe41afc7c73e9c83d1f076f4013fe15247e8b4f5e12a5396d83c4f1c7663ca4be5ea42bff3dc23263f85331fd9d566
 DIST elfutils-0.189.tar.bz2 9143169 BLAKE2B 30596271e14cf3408326abc38a9775b849b8cb0ee119a5455df9434a7d3b9a57afb15e0236a179a26c7bd400d303749964c9d6350c419f747784fd99d12517e0 SHA512 93a877e34db93e5498581d0ab2d702b08c0d87e4cafd9cec9d6636dfa85a168095c305c11583a5b0fb79374dd93bc8d0e9ce6016e6c172764bcea12861605b71
 DIST elfutils-0.189.tar.bz2.sig 310 BLAKE2B d4155de64b15a9ab5c497cd603e73bf918eb1117de36cf28f8ddb50ccb4874fb24cffdf44bcbbc028b2ef3f64562960bf11a431274d861f9db96e3d865b37ec2 SHA512 2016c5f0ccd16f7feb0c825164bb18b2f1afad17dcd39d9f159429360fe4afd645665f612397d48bde191a1e59bb8352e2d065d61d7f649b929c3a7e7bfe8dd0
-EBUILD elfutils-0.188.ebuild 3362 BLAKE2B 957542647ba923b3c6154eab79ea72d0285d9a0b4b875869487ed866b724d55730e74a32ea5af03c10a4f8287afc4384573b85e27c27dcc5994ae71a50dc9675 SHA512 d816aeea3b1c5698de4fe9fc073198e16655c5e643137f2ae827b37a94aab284ea1975f07275d192299cc44970fa4ede92c7cc094b6e3b11fda3143cdbfcfc07
-EBUILD elfutils-0.189-r1.ebuild 3542 BLAKE2B 1122e08523a389e30e8a7f4c1017f0573ecf5ab08506102d7279438df39ab87f290971e5f19700541d464acfa06a03cc156fa5ddb5fb2bc2908cf02f0809aa86 SHA512 ee40d86a3b6429026860bf101016e4fd406471be2892869bd24d082966930571be4d46a8a150f2be853018b57e5b913a4d1d4d1d9c054d2d69621f4663cdb668
-MISC metadata.xml 556 BLAKE2B af40f85a5fb6c474b64de330c5c9b043aff75076a893604d4d8f41686340022ae89f760c5bb0dec36412bc9fc7dc26cdfd0474f4407138846f37f83de3e5f584 SHA512 9a5b55c0b82220a4a4e82b04aab5916cd171a72ac87008d25de5c42f3d53f57decb8d916d593f712f6053d8c321ab0ef9057147b409c52ba9c5479db7afd97e1
+EBUILD elfutils-0.188.ebuild 3243 BLAKE2B dc1cb10cb7f1f98d83712f65bcf1805a214f9842073ce577d13eaf93ca40d35835e40b43e141de34582dbcf42ced380e96a9519c87cf3ba7b47dc127e99f7aac SHA512 85a2bf12f568d137c9ab45deb6e08a64f8973b3794008a37deac569d6546d7a567ca80c9d670647b3c7878d21bba06ddfa0a371e32708d0eba6a8a5997fe92a3
+EBUILD elfutils-0.189-r1.ebuild 3423 BLAKE2B d42cfe9b05573524f27612a55fe134dd83b4acaf9be51cbcfc9301e25265fdbe6474c92cc4e8fd2e0134df3c7722a4d1dcdd325687832225b39127b3157df39b SHA512 48b595e2eb1bfd4e104b4b5baa6c508552ae4703a059a758223d844e4559d39a9a9b5fe917d20fab12e1fe57d9bb2336de898a184abbdf1a0626ff1c9dc871e3
+EBUILD elfutils-0.189-r2.ebuild 3613 BLAKE2B 20de9e30d5ca9380eaf5b03dfd80b9dbfe605f33e4a5cda06bab3eef4ff1fbf5f3a68be0ff36bc4bd8cdfc257452ff8b6f51ec1f3b67ee9f79f0d3639803f739 SHA512 e1f4828f57bca55f79289def6e2d4e0c3d861ded0e1e3959083eaac65401b6a7404fb33bf1a86ab326de96948aaf2a765aa81c014b64b8b0777b85a15b9c8a3f
+MISC metadata.xml 680 BLAKE2B f5f2ad88e2f5f7823ea466403cb44888cea12ded4c1364e4c941be9f0e620ff9214973459bd4f70c43540e8f2a5d915c7d6e65ff3b2758c6660af928deb648b3 SHA512 403b91d41f6ff564c66445492c45d41ed4513709e557ac68d447e583b6bc4e22ccafe67f8e998660dfe47e75120c902107fccba90db06d99bd4c72f024bd881c
diff --git a/dev-libs/elfutils/elfutils-0.188.ebuild b/dev-libs/elfutils/elfutils-0.188.ebuild
index 8f9a919b86fa..0618c072e846 100644
--- a/dev-libs/elfutils/elfutils-0.188.ebuild
+++ b/dev-libs/elfutils/elfutils-0.188.ebuild
@@ -73,10 +73,6 @@ src_configure() {
 	# bug #407135
 	use test && append-flags -g
 
-	# Symbol aliases are implemented as asm statements.
-	# Will require porting: https://gcc.gnu.org/PR48200
-	filter-lto
-
 	multilib-minimal_src_configure
 }
 
diff --git a/dev-libs/elfutils/elfutils-0.189-r1.ebuild b/dev-libs/elfutils/elfutils-0.189-r1.ebuild
index ee2fbcee57d8..0ab6d10eae85 100644
--- a/dev-libs/elfutils/elfutils-0.189-r1.ebuild
+++ b/dev-libs/elfutils/elfutils-0.189-r1.ebuild
@@ -78,10 +78,6 @@ src_configure() {
 	# bug #407135
 	use test && append-flags -g
 
-	# Symbol aliases are implemented as asm statements.
-	# Will require porting: https://gcc.gnu.org/PR48200
-	filter-lto
-
 	multilib-minimal_src_configure
 }
 
diff --git a/dev-libs/elfutils/elfutils-0.189-r2.ebuild b/dev-libs/elfutils/elfutils-0.189-r2.ebuild
new file mode 100644
index 000000000000..0dad996a8027
--- /dev/null
+++ b/dev-libs/elfutils/elfutils-0.189-r2.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2003-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/elfutils.gpg
+inherit autotools flag-o-matic multilib-minimal verify-sig
+
+DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
+HOMEPAGE="https://sourceware.org/elfutils/"
+SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-0.187-patches.tar.xz"
+SRC_URI+=" verify-sig? ( https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2.sig )"
+
+LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 debuginfod lzma nls static-libs test +utils zstd"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!dev-libs/libelf
+	>=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}]
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[static-libs?,${MULTILIB_USEDEP}] )
+	debuginfod? (
+		app-arch/libarchive:=
+		dev-db/sqlite:3=
+		net-libs/libmicrohttpd:=
+
+		net-misc/curl[static-libs?,${MULTILIB_USEDEP}]
+	)
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1[static-libs?,${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd:=[static-libs?,${MULTILIB_USEDEP}] )
+	elibc_musl? (
+		dev-libs/libbsd
+		sys-libs/argp-standalone
+		sys-libs/fts-standalone
+		sys-libs/obstack-standalone
+	)
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	>=sys-devel/flex-2.5.4a
+	sys-devel/m4
+	nls? ( sys-devel/gettext )
+	verify-sig? ( sec-keys/openpgp-keys-elfutils )
+"
+
+PATCHES=(
+	"${WORKDIR}"/${PN}-0.187-patches/
+	"${FILESDIR}"/${P}-configure-bashisms.patch
+	"${FILESDIR}"/${P}-clang16-tests.patch
+)
+
+src_unpack() {
+	if use verify-sig ; then
+		# Needed for downloaded patch (which is unsigned, which is fine)
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.bz2{,.sig}
+	fi
+
+	default
+}
+
+src_prepare() {
+	default
+
+	if use elibc_musl; then
+		eapply "${WORKDIR}"/${PN}-0.187-patches/musl/
+	fi
+
+	# Only here for ${P}-configure-bashisms.patch, delete on next bump!
+	eautoreconf
+
+	if ! use static-libs; then
+		sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in || die
+	fi
+
+	# https://sourceware.org/PR23914
+	sed -i 's:-Werror::' */Makefile.in || die
+}
+
+src_configure() {
+	# bug #407135
+	use test && append-flags -g
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable nls)
+		$(multilib_native_use_enable debuginfod)
+		$(use_enable debuginfod libdebuginfod)
+
+		# explicitly disable thread safety, it's not recommended by upstream
+		# doesn't build either on musl.
+		--disable-thread-safety
+
+		# Valgrind option is just for running tests under it; dodgy under sandbox
+		# and indeed even w/ glibc with newer instructions.
+		--disable-valgrind
+		--program-prefix="eu-"
+		--with-zlib
+		$(use_with bzip2 bzlib)
+		$(use_with lzma)
+		$(use_with zstd)
+	)
+
+	# Needed because sets alignment macro
+	is-flagq -fsanitize=address && myeconfargs+=( --enable-sanitize-address )
+	is-flagq -fsanitize=undefined && myeconfargs+=( --enable-sanitize-undefined )
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	env LD_LIBRARY_PATH="${BUILD_DIR}/libelf:${BUILD_DIR}/libebl:${BUILD_DIR}/libdw:${BUILD_DIR}/libasm" \
+		LC_ALL="C" \
+		emake check VERBOSE=1
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	dodoc NOTES
+
+	# These build quick, and are needed for most tests, so don't
+	# disable their building when the USE flag is disabled.
+	if ! use utils; then
+		rm -rf "${ED}"/usr/bin || die
+	fi
+}
diff --git a/dev-libs/elfutils/metadata.xml b/dev-libs/elfutils/metadata.xml
index 1b2b95f274af..05def2bfd0b3 100644
--- a/dev-libs/elfutils/metadata.xml
+++ b/dev-libs/elfutils/metadata.xml
@@ -8,6 +8,7 @@
 	<use>
 		<flag name="lzma">Support automatic decompression of LZMA-compressed files and kernel images</flag>
 		<flag name="utils">Install command-line utilities (all the eu-* programs)</flag>
+		<flag name="debuginfod">Enable debuginfod support, both the debuginfod server and the libdebuginfod client library</flag>
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:elfutils_project:elfutils</remote-id>