7 files changed, 134 insertions, 4 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 8472cec44017..edf98ec35baf 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index 1fbdb367d448..23284499389c 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -1,5 +1,8 @@
 DIST elfutils-0.187-patches.tar.xz 2804 BLAKE2B 77cbd0666d8da3d5229baaba6605c84e7990200f39bfb72b2008eb2527e4567abd90c93c291cc0c8f3c10bbf97758ccf5877cbdae823780cf8dc97ff4ff2f932 SHA512 d056fdd6ae0e71471087af472a72384d6e73ff2d7fe1b708b5ec9f091a913c8327197660132b7a6619a0db86534715507ef67ee91691a00a591c1d24c55a99f4
 DIST elfutils-0.188.tar.bz2 9112977 BLAKE2B 6b0474f1436eaf6af73b735b9b2ddd5448ab9c03fbaa0be745a31c89ae8f15b0e21a651409c38643ca125794ce82c19d7b46db4a079f3e72cb919d643560e7a4 SHA512 585551b2d937d19d1becfc2f28935db1dd1a3d25571a62f322b70ac8da98c1a741a55d070327705df6c3e2ee026652e0b9a3c733b050a0b0ec5f2fc75d5b74b5
 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 3415 BLAKE2B 2415e7ed6cc16e3cbf43d96ef928f10af8fba89ab1e0e3afd6eba16aaf5b8bf10c14731c51f3e47ad8b10ac2f3a00508fe6d27eb5160d222fad0cd571ba07407 SHA512 766e831f104aa12ca6efd328998369f61979f3bfc0b35f0b65c1e155c58fa4b13f3ae32c668dd046a0ba231f80958d82e63d245db375bc6025f46d72c0181ce8
+EBUILD elfutils-0.189.ebuild 3423 BLAKE2B 5e0891911025fdec075eaae9a05faf0aa016e02f8673fcac678bdbc53fff91f89a36cc7538abd31e27f305a3c13eca658e2ebd7bcf37fa21991e5bf6a77238ed SHA512 f8ccd6e67141fc9afff25e9af36b36ec6949937e42e9fde0c86e5c3382c9c62763ab6a9e642a469cc74b6a47946bcb37115b5fbce34638ba3b5c5c8cc7c3b1ab
 MISC metadata.xml 655 BLAKE2B 246409a9ea3b4ada7ab225dc524b7fe7241a5a65e29b7ccacfb59b6810d19ab7b06aff7bc5024946745da063ea9df4dc7646ee146526a3104504e16ee515b118 SHA512 7a7b42842d8ebb53d45ca3d4feb588f22b106e1023254fb96b39f39b3d8dcd6c5f2b7263e1e696f760daa3472deef43f44578a650b8417facfa17e246782247b
diff --git a/dev-libs/elfutils/elfutils-0.189.ebuild b/dev-libs/elfutils/elfutils-0.189.ebuild
new file mode 100644
index 000000000000..0df16d8efdf8
--- /dev/null
+++ b/dev-libs/elfutils/elfutils-0.189.ebuild
@@ -0,0 +1,127 @@
+# 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 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 lzma nls static-libs test +utils valgrind 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}] )
+	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}
+	valgrind? ( dev-util/valgrind )
+"
+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/
+)
+
+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
+
+	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
+
+	# Symbol aliases are implemented as asm statements.
+	# Will require porting: https://gcc.gnu.org/PR48200
+	filter-flags '-flto*'
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable nls)
+		--disable-debuginfod
+		--disable-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/ell/Manifest b/dev-libs/ell/Manifest
index c6c544af783f..1c99185540ce 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -3,6 +3,6 @@ DIST ell-0.55.tar.xz 562716 BLAKE2B b49acda837e22dec8469423dd47b397471975acdb0df
 DIST ell-0.56.tar.xz 563096 BLAKE2B 3be874ddddab558911d5ea4e4fb0b32c1557b8577435f39ee88d7302bbb0efbd24671f6c426bbeaba2704ba45b865320e6f2e31f6a9c4d86e82dc8ed38ebae9f SHA512 7255470331927f67ebd1297e6c524c9c244234cf00923016c77d90bad5e4e381605c70373a7be4ecf9c1e72ec85fbc1671960dd31fb6eec279f2299e81c66ac1
 EBUILD ell-0.54.ebuild 1175 BLAKE2B 0725c7bec06368247ba9f365c8d6e6f9ea7649d0348d458158b0547c5fb1993789e2465bf2fc2c1c407a0c88488309e27210f3a59f7c7e0e15222fc96d0e8046 SHA512 4a7387f689ef514e39a78b7a323c4cc1096c183df9c1ee1d8ca04efea946f1ab21460faa6c4928d1a6166a8da00c86209b2416eb3adfc37b23a53b9e07aa0861
 EBUILD ell-0.55.ebuild 1178 BLAKE2B 1230e8102454b68f3b87a616090aa3dd85bab9c4f2f78f858caf6d828ff3357995f7f6b7f430f4a78eb5a8ae436b028571bc5c6146ee551eaf28e85aefcc77bf SHA512 4437a86e98f45d8a88e3b3eaa1bbb1e88083a98d983acd2f33436245e4d941a58b96869251a0110f283a06424269b706579c59c90e281473b2fb2e2284fbd57a
-EBUILD ell-0.56.ebuild 1181 BLAKE2B ea1e8d57acdf4be79b60a48f6daf017a907524a7333e87fc5e6d9f4d7c5a9401e048927108de73509d0624e3c9ab65fc906d732ab3b99bf04ce0afb015bf4fc8 SHA512 2f7402b95da0e45596462ead53e6184865f96e9325f2d4fb7b590454a976e7dc827c7ce45d7ccbed951257441ebbb72df50559f0d1d94a8677e714e4a7e1c4c2
+EBUILD ell-0.56.ebuild 1177 BLAKE2B 2c66d28fc58735fe62a461a7fae865fc4f35d2e1f751fe158e1277ecd75990df1340d757f6fe91f3f013f80605a1c454acd9c6febe4ffc6a4a0e5e7aabbe6a88 SHA512 1d8db6ae43f73339331069a72cf32d0f130b42b2afdc8ee5cfe23cb9e6c63bde989c2c1b1236d2f8fe8983ee37882351c2e482ced0317cd702017be0abaf04c6
 EBUILD ell-9999.ebuild 1181 BLAKE2B bcebe8f38618d85d8fddd3c401b76096bdbcb7f2798540f6582c1e56af78cdebf02f4295d60208254a6d2232bb6061372b6eb2dc12331b8384c668012da91430 SHA512 76571ec809fa9584c1d72dbae3f859db318ce061751a1e7d72e05febd9c715c918da5c30637c8dcfbca81ab038c54401b6f49f0e4cce2a720a24185c6915699a
 MISC metadata.xml 251 BLAKE2B a9af03a4a233a890a554ab68f1876580e3720a72c1f946ea6dbb82c49afd94243ea4017cd8a392fa2adea53c588646fd0ebccb948dde0340ec2ff05c0381fb99 SHA512 0837c31655f6a725b0fad20c8998a3a4645dc8049e14980b0097776cf59b4288276489dfddc149893f29844175eeb187a54af7d28690de4afe18ef9fd4c1f98f
diff --git a/dev-libs/ell/ell-0.56.ebuild b/dev-libs/ell/ell-0.56.ebuild
index 5e79649bd337..6921d0eedbe4 100644
--- a/dev-libs/ell/ell-0.56.ebuild
+++ b/dev-libs/ell/ell-0.56.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 55e3198c4b08..191e8bbc2562 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -2,5 +2,5 @@ AUX libinput-1.22.1-sphinx-6.patch 928 BLAKE2B a4028f31bc5caa22c0beafb48f2d014db
 DIST libinput-1.21.0.tar.gz 988650 BLAKE2B 54c63beeff8dee93a52774220b45321d8a94261687b463319fbae9246331b532be7995a5b32c30425b9d0708b2ba69d4b4e83e8dc7ecebe6fb1237b723a266b6 SHA512 510273d68f2d4cfa61564a706b1f334f6bfca0d1c8faf0bb8aa656cf3fbd5e38d79d6fbaa01a20d38bc15777c9afc341e4ed08d35ef367ef3803ce788cbc4a0e
 DIST libinput-1.22.1.tar.bz2 794829 BLAKE2B 253f840e45ab2293503a0da09ea914b982e643c35928af6762955325a002b5bf20bf8571e705e3a050663cd0e1e26ee0cf4952a6193659f9b27ad1080008e900 SHA512 9d1985bc03ae304643fcd3acb762afc53305942e39071a062e7f8950be4929c72bdfeff06039c77f70e53233885df1e2e1a1dc538caeefd2b46f35826d290e9e
 EBUILD libinput-1.21.0-r1.ebuild 2289 BLAKE2B 919c4b10094449a3daf12bfa003f6375fa7d0d7b018315fdad95ffa3483bfa5660c8e14539226715a0d2c25a1d395fbe4717529530fcd5109f32eac7c1e83fa8 SHA512 f33d59fb989cf9daac06bae61f2b71c58212184595ac15da9b0307a6d38c216ff26a79117617d369763f8719cf6d9ab20d7ccffb7eb96e34e529dd850dd160b5
-EBUILD libinput-1.22.1.ebuild 2225 BLAKE2B a9e554c005dfd1bc1bc1448f406fb486444c397dd5803b77efa8a3c4d3efab57aa73b2d1da8f928a7da367bb319b50293e10013e23b52d5b4abf96cca2900deb SHA512 d73d15cb0251e4072c8b81e0a5194ef22ce3fd4a79db7bbd12e455ffff49f67e705bd435ad87c4fe1fac00b1a6909735c5b896502b9dee147ac95b012a9c4beb
+EBUILD libinput-1.22.1.ebuild 2223 BLAKE2B e03ab945edb484498c06197358f928efbd3cf5841bd7c8a36dd9dd7f06f2678743c4deed2bbf0bf342436bdfce2c8ae598b0ba5bb8bc55b680833413dc18bc5f SHA512 d094dccc744bde1c305f018b1a5f3f0adf35b535525fb4956f6086b49d325d2ea0085c865141a39277a1d5929a9ae536b72c04e37f8f3b8646ad63d108b092f7
 MISC metadata.xml 339 BLAKE2B c649f0ffaad1b1dc76c3d3184d95356b2925f642ff6b96c3eba0c31a1d96c3d9b741c1348f8ec90d02428c30a836872fe4e42e7ab5f5e5197f4a787f9147a1a8 SHA512 e9aeca6cc4451ab5b622f597f8debaecfdc672244e5e0b687ac294c20009ba42fb2ccc45e7016a2427312e1c768259005e0a7ff53026087570382652ec23cb60
diff --git a/dev-libs/libinput/libinput-1.22.1.ebuild b/dev-libs/libinput/libinput-1.22.1.ebuild
index efbd82131884..224fa4b6e6d8 100644
--- a/dev-libs/libinput/libinput-1.22.1.ebuild
+++ b/dev-libs/libinput/libinput-1.22.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.bz2
 LICENSE="MIT"
 SLOT="0/10"
 if [[ $(ver_cut 3) -lt 900 ]] ; then
-	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 fi
 IUSE="doc input_devices_wacom test"
 RESTRICT="!test? ( test )"