gentoo auto-resync : 17:03:2024 - 06:49:08

9 files changed, 17 insertions, 288 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 0ff8767c9348..89d41a8c9cfd 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index b9acb2077e79..58d645326636 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -1,16 +1,10 @@
-AUX multipath-tools-0.9.4-remove-Werror.patch 2173 BLAKE2B 38f7c335d1a8b9fab784892b7b9027a5e8d62747b301e757a4d49c8f3a4d753200cfb21877bccaf5b5918779a771aa9520695a33701d215bd1cf958b1d28969b SHA512 60e7393668afaa5c53ba30c8126df571c4ce658d6ac5de505ca38a4404729de377c65bed9e4f6e548ca15db05baced0b39229efeb84a587074484c3e8b5379f6
-AUX multipath-tools-0.9.4-test-fix.patch 1258 BLAKE2B 3b381e1e0690edf77503e2774651fb1c8a58348821e089315db71054fbf8c8a8cee68c037b52c43cd3703c5e42254a63d7b562b13f19b9809edff630404b2d2c SHA512 f24b75a6d0b198c2639d4933b89c48a9530563b399e8554e0349bb7848acb4197a55541ddab588d120e92cac00725ab7a029c438813b666a78f8d7a6c5ec8753
 AUX multipath-tools-0.9.7-null-pointer-dereference-in-uev_update_path.patch 983 BLAKE2B 14f51c1d3ae2151d1662981c9f00a7304a3604909fdf037a466108e3100f33dd99285d3fc546ce1a060afc2c0f29fea1c52ccc1d6617c0f17d7530771df6506d SHA512 b72a66f2b86d6ce31b2b228fd911d24d07801217ec4f2834c458657d26773d5a7a9994bf92c40c79109a9af01d11ad31e00442cb1f9525d805d217a2b93cec8f
 AUX multipath-tools-0.9.7-remove-Werror.patch 2469 BLAKE2B 2a234adf9fb79e70334428c7879b4558ac53a4d2b266e5373bd167cad4f65d085641f943e4327100ca0e4bf69a1d590225ba8aafa06ddc1c56696785b45dd905 SHA512 ab60eb8582c066b74918aeea2cf64bd684d012567f9d61763c9a896bb6afe003eddba648000d2e138c3532a580c64eb0a538a17a82961f61ec69bac14869044c
 AUX multipath.rc 565 BLAKE2B efb26199eddb75c5e87d1ab40aa8cb4fbaf9f7a2bfd7a20add6d55997d25de9a3dbf0d032c977593c2ee8d447539a34be0294ee3a80a80fb004dc2c51c8c64b5 SHA512 f08833fc3c928900f8c29438208b9715581bae426b1f45c246e8c418b210f7f9d35517ef9ad44db3d88944183b34e3411ece909b56892a9f3b7250fed49e43fe
 AUX multipathd-r1.rc 264 BLAKE2B f08733746c702da27e002b2cb07bbc1a1925002b1592c2f566aa8d66c71da5fd39fd6389636fc49b602f9051190ee5f7f85ad9ff35b924f51a2698e1a6654f0e SHA512 8cf764b59ed4bb13c3c2143cd83ee39bc87eca85c40acb3ed1dcd7cf4c39ecbdea7974b9705231d48377266c034a8623157648b9a99b6cef73617e4b37ad377e
-DIST multipath-tools-0.9.3.tar.gz 552442 BLAKE2B e2065119cdd68bd8c2b4420bd0de9ce370601597972dba32c076bfc4df6d0a1a65356454a2f96f95f27cf681387685edcbac2eb41258d4a7049a1ef62cdf0949 SHA512 4faa2ee5a96a9d5d752219931ebc885cb70ed6b022d45ede985ad7919c043a3aee166e6f126d32dffd187c5c32d5cbce91747d87d0b55557e2f7f68b279583da
-DIST multipath-tools-0.9.4.tar.gz 554381 BLAKE2B 297f002e23312415467d8c4935da3b7f449318cd68120c719f40f0f45a9ebebc27f1297b918068b63471b65f72c08ce3cc6cad9b7bafcb646bb163c6486194ea SHA512 5e0dcea610fc215e345444c04453a38f39c73e493c2bc53f6b3a90cd701266aabdf7c4693dfc321099af836d0019bf27355e265ad5db5deff48f8bb94ed4719d
-DIST multipath-tools-0.9.5.tar.gz 557469 BLAKE2B 1a9b9b01c28c8a4e9d4ae9bc55896cb764308f5118ac2f8c983163c0b2e49c0c4a84536c7edd7464a1bcb8ca6aef92452d5c25d4a1d9d490e0e3077b10462171 SHA512 39c2e5d45542c6076eb3b17b9994629b4c1f74347aa43e0119001fa2d07d3a606fd5e617962906a11b313afb37a115bd8eec2ef24447e980e61b5900625f9146
 DIST multipath-tools-0.9.7.tar.gz 570416 BLAKE2B ed3f47d648685f691a69d83ad36f39b279f3a5b1cf1cb15151841ea26d629df3a33ab9a186bbf6922264805cc3bc37d09f22e611215f1972e33b26e08ff71bc2 SHA512 0f4c97179a3de5a0c77893fec229eb183293fed8e5e01a9945b261845ccf5d13f8ef2c2ff0c17c9345217d236275caed4765422ec95aed80821f11658bf96e26
-EBUILD multipath-tools-0.9.3-r2.ebuild 2430 BLAKE2B 4e00be11956c5b7afc44dcad8e608b312a44aade65971951e48faa7fb1d492e84fa285548ad9740018e7ec4b49ecae29638989f03f3d6cbdb47d9d6ded201072 SHA512 9b99079b9090b73b2c8154cd389579919c1bdfd9275f01af679c244436a07bf969c12264655658a19e145cc496d7954a780ade5e6b2d53ca2bf80b0606a0da1a
-EBUILD multipath-tools-0.9.4-r1.ebuild 2003 BLAKE2B 392d31c886e8ed95d49de4cd7d5015ad65b74a582f81646601f83cfd67e5e6d69044752c6da892929fdf245cc90cdd5bc7254d192159872810f4c159749bb7e4 SHA512 3a513bc65b4d13cbe759b53a7d45cd51deecca962d8c2ce1f1a9470736efa2041fa749fc6739c0230eaa34a5d761ccb34bd63f579f453d8e165b58248cba11cc
-EBUILD multipath-tools-0.9.5.ebuild 1958 BLAKE2B ad92406184dd7ae8e4b01ab941d6fbb338178d5a2a213d844694e3fb8647dedfe4b91deb004a862d62233c7fa67012b314ae41cff9d917f6cc3e8943edd588d7 SHA512 c34061223a5f1e5e9cf39ef329a1a08f1ed25a8e7829274f2f0a32359787501eeaa63566167976f6a1d427887fd14b579185f59f9a3a05f788f004197d7af6e3
-EBUILD multipath-tools-0.9.7-r1.ebuild 2117 BLAKE2B 8b8a376392f98e029dafca1025acb0fd1f658280c72415bf09f974ed5a84ef2ce8b2cd2bcceb16611bc99f3602c3e221873bd4448c7979c97b6b9b62ea5880e2 SHA512 214cb337d547a3a29c603688abc87e87185ae7a0487a1ddf124e269f5b6ea3b20484e701e5c63711b711cab4c1088fd185bd812a60706c50c025f9683299f8df
-EBUILD multipath-tools-0.9.7.ebuild 2042 BLAKE2B b65a1aa569e51449e09ac8d76d8c303ed65f3e18632a724306d7aaed4e2e07d7680106466593c3376a2e927d4969a3242acc488dd6dfb48065cc7a1084ab4ed9 SHA512 9a1b4f74c7245be22abe55ae19ab0ed1c415fa97d1a445eeda79ed2077a5c45f9c179b58a4fd86419bee116d13dca3e57411fb1082d6637c077279fe0f06db5e
+DIST multipath-tools-0.9.8.tar.gz 580531 BLAKE2B 66bc6b78795c08b4fe5f4bc718330be51b073dddb597998f384ccaf746c0b9e53e21d674623df03ed7f9ccd9800fe988add8068e0eaaeace076c00395453ba0a SHA512 4d73bcf6bce769a829c306c609b206ddba65a708620f458106e406dd18d12f9a9d97f400662daa8e6a75c9fdf7decb6dcbda92cb807b6c53522c7b4b2795b627
+EBUILD multipath-tools-0.9.7-r1.ebuild 2186 BLAKE2B a63a8df617a7417cf1a8b99a1e3011cdbe8da57dbc46e6ff8bb396ee04c18a7609a9f5a6eaa71184095be8ad7f7aec1c0b0eb7eb353db75127ea23d3fbcfec2f SHA512 938040f3007e49b94386213beb1d302537b3d3d38edc4616199d7d27a5927c27f8fa5ca32443868d14a4867a6f0b70db83445f2a8b935b81bd06b79d82600785
+EBUILD multipath-tools-0.9.7.ebuild 2111 BLAKE2B 04a8fc8f7f5f0d50859e541b9f2c3fb2eedf40ad46905e77eeb83abdea49d98cdd112558b154da49170d880284d1d0e1aaaebfcc6a4d70fe75ffe479e82a73a3 SHA512 2c52104bb7c0226880e26cf092254dfa99ec79a4b49a12e419f76c5f53c47956a6ab9c89ad5b71a628ce8e472c891254ee6998782b6c593e955a9ab19b66b0be
+EBUILD multipath-tools-0.9.8.ebuild 2186 BLAKE2B a63a8df617a7417cf1a8b99a1e3011cdbe8da57dbc46e6ff8bb396ee04c18a7609a9f5a6eaa71184095be8ad7f7aec1c0b0eb7eb353db75127ea23d3fbcfec2f SHA512 938040f3007e49b94386213beb1d302537b3d3d38edc4616199d7d27a5927c27f8fa5ca32443868d14a4867a6f0b70db83445f2a8b935b81bd06b79d82600785
 MISC metadata.xml 346 BLAKE2B 8c5d2e150c70bdff56b05009f11d40663d9d969b07ecc88ff310fd4e756339d2f9a4a6b351b14c6cebc69ed36f17eb0500a0ba2b34f7c6b75c3864d1e090a46f SHA512 ffb0aab5f2d8bbdf83e0df3cc84cd239649e94e1189ba4702221091469309d3d49783c6943aae27eb34e3373f3e07a571930a361058d9a3b67f725781c47b87e
diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.9.4-remove-Werror.patch b/sys-fs/multipath-tools/files/multipath-tools-0.9.4-remove-Werror.patch
deleted file mode 100644
index 58c8ae291ce8..000000000000
--- a/sys-fs/multipath-tools/files/multipath-tools-0.9.4-remove-Werror.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/Makefile.inc
-+++ b/Makefile.inc
-@@ -79,7 +79,7 @@
- SYSTEMD_LIBDEPS := $(if $(SYSTEMD),$(if $(shell test $(SYSTEMD) -gt 209 && echo 1),-lsystemd,-lsystemd-daemon))
- 
- OPTFLAGS	:= -O2 -g $(STACKPROT) --param=ssp-buffer-size=4
--WARNFLAGS	:= -Werror -Wall -Wextra -Wformat=2 $(WFORMATOVERFLOW) -Werror=implicit-int \
-+WARNFLAGS	:= -Wall -Wextra -Wformat=2 $(WFORMATOVERFLOW) -Werror=implicit-int \
- 		  -Werror=implicit-function-declaration -Werror=format-security \
- 		  $(WNOCLOBBERED) -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS) $(W_URCU_TYPE_LIMITS)
- CPPFLAGS	:= $(FORTIFY_OPT) $(CPPFLAGS) \
---- a/create-config.mk
-+++ b/create-config.mk
-@@ -64,7 +64,7 @@
- # gcc 4.8 compiles blacklist.c only with -Wno-missing-field-initializers
- TEST_MISSING_INITIALIZERS = $(shell \
- 	echo 'struct A {int a, b;}; struct B {struct A a; int b;} b = {.a.a=1};' | \
--		$(CC) -c -Werror -Wmissing-field-initializers -o /dev/null -xc - >/dev/null 2>&1 \
-+		$(CC) -c -Wmissing-field-initializers -o /dev/null -xc - >/dev/null 2>&1 \
- 	|| echo -Wno-missing-field-initializers)
- 
- # gcc 4.8.4 and certain versions of liburcu fail to compile this with -Werror=type-limits
-@@ -123,7 +123,7 @@
- # Evaluates to "option" if yes, and "fallback" otherwise.
- TEST_CC_OPTION = $(shell \
- 	if echo 'int main(void){return 0;}' | \
--		$(CC) -o /dev/null -c -Werror "$(1)" -xc - >/dev/null 2>&1; \
-+		$(CC) -o /dev/null -c "$(1)" -xc - >/dev/null 2>&1; \
- 	then \
- 		echo "$(1)"; \
- 	else \
-@@ -135,11 +135,11 @@
- # but it doesn't seem to make a difference wrt the compilation result.
- FORTIFY_OPT := $(shell \
- 	if /bin/echo -e '$(__HASH__)include <string.h>\nint main(void) { return 0; }' | \
--		$(CC) -o /dev/null $(OPTFLAGS) -c -Werror -D_FORTIFY_SOURCE=3 -xc - 2>/dev/null; \
-+		$(CC) -o /dev/null $(OPTFLAGS) -c -D_FORTIFY_SOURCE=3 -xc - 2>/dev/null; \
- 	then \
- 		echo "-D_FORTIFY_SOURCE=3"; \
- 	elif /bin/echo -e '$(__HASH__)include <string.h>\nint main(void) { return 0; }' | \
--		$(CC) -o /dev/null $(OPTFLAGS) -c -Werror -D_FORTIFY_SOURCE=2 -xc - 2>/dev/null; \
-+		$(CC) -o /dev/null $(OPTFLAGS) -c -D_FORTIFY_SOURCE=2 -xc - 2>/dev/null; \
- 	then \
- 		echo "-D_FORTIFY_SOURCE=2"; \
- 	fi)
diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.9.4-test-fix.patch b/sys-fs/multipath-tools/files/multipath-tools-0.9.4-test-fix.patch
deleted file mode 100644
index c0469a20d122..000000000000
--- a/sys-fs/multipath-tools/files/multipath-tools-0.9.4-test-fix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://listman.redhat.com/archives/dm-devel/2023-March/053587.html
-
-From 2ebbff587e80f3f153b934d3cfcccb8a4bb21568 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Thu, 23 Mar 2023 08:04:49 +0000
-Subject: [PATCH] tests: fix quoting of CFLAGS in Makefile
-
-Otherwise, when CFLAGS/CPPFLAGS have multiple entries (like "-O2 -pipe"), we
-get an error:
-```
-make[1]: Entering directory '/var/tmp/portage/sys-fs/multipath-tools-0.9.4/work/multipath-tools-0.9.4/tests'
-/bin/sh: line 1: -pipe: command not found
-make[1]: *** [Makefile:115: libmultipath.so.0] Error 127
-make[1]: *** Waiting for unfinished jobs....
-```
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/tests/Makefile
-+++ b/tests/Makefile
-@@ -112,7 +112,7 @@ dep_clean:
- # Pass the original values of CFLAGS etc. to the sub-make, which will include
- # Makefile.in again. Otherwise, the flags would be added twice.
- libmultipath.so.0: $(multipathdir)/libmultipath.so.0
--	@CFLAGS=$(ORIG_CFLAGS) CPPFLAGS=$(ORIG_CPPFLAGS) LDFLAGS=$(ORIG_LDFLAGS) \
-+	@CFLAGS="$(ORIG_CFLAGS)" CPPFLAGS="$(ORIG_CPPFLAGS)" LDFLAGS="$(ORIG_LDFLAGS)" \
- 	$(MAKE) -C $(multipathdir) configdir=$(TESTDIR)/conf.d plugindir=$(TESTDIR)/lib test-lib
- 
- # COLON will get expanded during second expansion below
--- 
-2.40.0
-
diff --git a/sys-fs/multipath-tools/multipath-tools-0.9.3-r2.ebuild b/sys-fs/multipath-tools/multipath-tools-0.9.3-r2.ebuild
deleted file mode 100644
index 65869a69983e..000000000000
--- a/sys-fs/multipath-tools/multipath-tools-0.9.3-r2.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info systemd toolchain-funcs udev tmpfiles
-
-DESCRIPTION="Device mapper target autoconfig"
-HOMEPAGE="http://christophe.varoqui.free.fr/"
-SRC_URI="https://github.com/opensvc/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86"
-IUSE="systemd test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/json-c:=
-	dev-libs/libaio
-	dev-libs/userspace-rcu:=
-	>=sys-fs/lvm2-2.02.45
-	>=virtual/libudev-232-r3
-	sys-libs/readline:=
-	systemd? ( sys-apps/systemd )"
-DEPEND="${RDEPEND}
-	test? ( dev-util/cmocka )"
-BDEPEND="virtual/pkgconfig"
-
-CONFIG_CHECK="~DM_MULTIPATH"
-
-src_prepare() {
-	default
-
-	sed -r -i -e '/^(CPPFLAGS|CFLAGS)\>/s,^(CPPFLAGS|CFLAGS)\>[[:space:]]+:=,\1 := $(GENTOO_\1),' \
-		"${S}"/Makefile.inc || die
-}
-
-src_compile() {
-	tc-export CC
-
-	# LIBDM_API_FLUSH involves grepping files in /usr/include,
-	# so force the test to go the way we want #411337.
-	emake \
-		prefix="${EPREFIX}/usr" \
-		plugindir="${EPREFIX}/$(get_libdir)/multipath" \
-		LIB="$(get_libdir)" \
-		LIBDM_API_FLUSH=1 \
-		PKGCONFIG="$(tc-getPKG_CONFIG)" \
-		GENTOO_CFLAGS="${CFLAGS}" \
-		GENTOO_CPPFLAGS="${CPPFLAGS}" \
-		FAKEVAR=1
-}
-
-src_install() {
-	dodir /sbin
-
-	# Please clean this up > 0.9.3: https://github.com/opensvc/multipath-tools/pull/53
-	# $(prefix) doesn't work correctly in makefile in 0.9.3.
-	emake \
-		DESTDIR="${ED}" \
-		prefix="${EPREFIX}" \
-		LIB="$(get_libdir)" \
-		RUN=run \
-		plugindir="${EPREFIX}/$(get_libdir)/multipath" \
-		unitdir="$(systemd_get_systemunitdir)" \
-		libudevdir="${EPREFIX}/$(get_udevdir)" \
-		pkgconfdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig" \
-		GENTOO_CFLAGS="${CFLAGS}" \
-		GENTOO_CPPFLAGS="${CPPFLAGS}" \
-		install
-
-	rmdir "${ED}"/usr/include
-	rmdir "${ED}"/usr/share
-	mv "${ED}"/include "${ED}"/usr/include || die
-	mv "${ED}"/share "${ED}"/usr/share || die
-	einstalldocs
-
-	newinitd "${FILESDIR}"/multipathd-r1.rc multipathd
-	newinitd "${FILESDIR}"/multipath.rc multipath
-
-	find "${ED}" -type f -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	tmpfiles_process /usr/lib/tmpfiles.d/multipath.conf
-	udev_reload
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "If you need multipath on your system, you must"
-		elog "add 'multipath' into your boot runlevel!"
-	fi
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/sys-fs/multipath-tools/multipath-tools-0.9.4-r1.ebuild b/sys-fs/multipath-tools/multipath-tools-0.9.4-r1.ebuild
deleted file mode 100644
index d2fdb19707ca..000000000000
--- a/sys-fs/multipath-tools/multipath-tools-0.9.4-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info systemd tmpfiles toolchain-funcs udev
-
-DESCRIPTION="Device mapper target autoconfig"
-HOMEPAGE="http://christophe.varoqui.free.fr/"
-SRC_URI="https://github.com/opensvc/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~x86"
-IUSE="systemd test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/json-c:=
-	dev-libs/libaio
-	dev-libs/userspace-rcu:=
-	>=sys-fs/lvm2-2.02.45
-	sys-libs/readline:=
-	>=virtual/libudev-232-r3
-	systemd? ( sys-apps/systemd )
-"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-util/cmocka )
-"
-BDEPEND="virtual/pkgconfig"
-
-CONFIG_CHECK="~DM_MULTIPATH"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.4-test-fix.patch
-	"${FILESDIR}"/${PN}-0.9.4-remove-Werror.patch
-)
-
-myemake() {
-	local myemakeargs=(
-		prefix="${EPREFIX}"
-		usr_prefix="${EPREFIX}/usr"
-		LIB="$(get_libdir)"
-		RUN=run
-		plugindir="${EPREFIX}/$(get_libdir)/multipath"
-		unitdir="$(systemd_get_systemunitdir)"
-		libudevdir="${EPREFIX}$(get_udevdir)"
-		GENTOO_CFLAGS="${CFLAGS}"
-		GENTOO_CPPFLAGS="${CPPFLAGS}"
-		FORTIFY_OPT=
-		OPTFLAGS=
-		FAKEVAR=1
-		V=1
-	)
-
-	emake "${myemakeargs[@]}" "$@"
-}
-
-src_prepare() {
-	default
-
-	sed -r -i -e '/^(CPPFLAGS|CFLAGS)\>/s,^(CPPFLAGS|CFLAGS)\>[[:space:]]+:=,\1 := $(GENTOO_\1),' \
-		"${S}"/Makefile.inc || die
-}
-
-src_compile() {
-	tc-export CC
-	myemake
-}
-
-src_test() {
-	myemake test
-}
-
-src_install() {
-	dodir /sbin
-
-	myemake DESTDIR="${ED}" install
-
-	einstalldocs
-
-	newinitd "${FILESDIR}"/multipathd-r1.rc multipathd
-	newinitd "${FILESDIR}"/multipath.rc multipath
-
-	find "${ED}" -type f -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	tmpfiles_process /usr/lib/tmpfiles.d/multipath.conf
-	udev_reload
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "If you need multipath on your system, you must"
-		elog "add 'multipath' into your boot runlevel!"
-	fi
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/sys-fs/multipath-tools/multipath-tools-0.9.7-r1.ebuild b/sys-fs/multipath-tools/multipath-tools-0.9.7-r1.ebuild
index d0757b9e83ff..976d89a45f9d 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.9.7-r1.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.7-r1.ebuild
@@ -68,6 +68,8 @@ src_compile() {
 	tc-export CC
 	# Breaks with always_inline
 	filter-flags -fno-semantic-interposition
+	# Breaks because of use of wrapping (-Wl,-wrap, wrap_*)
+	filter-lto
 	myemake
 }
 
diff --git a/sys-fs/multipath-tools/multipath-tools-0.9.7.ebuild b/sys-fs/multipath-tools/multipath-tools-0.9.7.ebuild
index 2d85d3d1064e..14e7bb7a24d4 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.9.7.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.7.ebuild
@@ -67,6 +67,8 @@ src_compile() {
 	tc-export CC
 	# Breaks with always_inline
 	filter-flags -fno-semantic-interposition
+	# Breaks because of use of wrapping (-Wl,-wrap, wrap_*)
+	filter-lto
 	myemake
 }
 
diff --git a/sys-fs/multipath-tools/multipath-tools-0.9.5.ebuild b/sys-fs/multipath-tools/multipath-tools-0.9.8.ebuild
index 95274e758853..976d89a45f9d 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.9.5.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit linux-info systemd tmpfiles toolchain-funcs udev
+inherit flag-o-matic linux-info systemd tmpfiles toolchain-funcs udev
 
 DESCRIPTION="Device mapper target autoconfig"
 HOMEPAGE="http://christophe.varoqui.free.fr/"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/opensvc/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 IUSE="systemd test"
 RESTRICT="!test? ( test )"
 
@@ -33,7 +33,8 @@ BDEPEND="virtual/pkgconfig"
 CONFIG_CHECK="~DM_MULTIPATH"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.4-remove-Werror.patch
+	"${FILESDIR}"/${PN}-0.9.7-remove-Werror.patch
+	"${FILESDIR}"/${P}-null-pointer-dereference-in-uev_update_path.patch
 )
 
 myemake() {
@@ -65,6 +66,10 @@ src_prepare() {
 
 src_compile() {
 	tc-export CC
+	# Breaks with always_inline
+	filter-flags -fno-semantic-interposition
+	# Breaks because of use of wrapping (-Wl,-wrap, wrap_*)
+	filter-lto
 	myemake
 }