8 files changed, 144 insertions, 5 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index ec3c2ee51386..e22861938a43 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/loop-aes/Manifest b/sys-fs/loop-aes/Manifest
index 4ad24fdb45bf..d480b1feaeb7 100644
--- a/sys-fs/loop-aes/Manifest
+++ b/sys-fs/loop-aes/Manifest
@@ -1,6 +1,6 @@
 AUX loop-aes-3.7w-build-initrd_explicit-losetup.patch 944 BLAKE2B 1fe676ac40df6a08c2e75769fba02fd627ac3411e1657ece64bcf368111b5e9180c9ee5fc392dc3a0bd58299dbffd18cd49a1ba4738bf798915869594f4749ca SHA512 d4f04cec3c39885464e3254366d1c0959ed778c8f60b4353669061b5fecb03c0bc23ecfb9b8cdfc8d143ff5e386d935183e9bb68942d526822ab4f0ebacd06a4
-DIST loop-AES-v3.7y.tar.bz2 404257 BLAKE2B b54c38abf9e85b5482a1d0795dc4b41301c9a06dfcfd088999e85ce7ca1adf4a91975482b05bf5eaa7efe7a4a96980475a89c8b98bfcb9f1edceeb5e435fd6ff SHA512 d5882974900ca376cd72bd893ff02670801ffb39286112cb1058adc687c560a2ac8fc4440966db46cf9eb614ed6a79da1e80af1c9588871b451af877b203e86f
 DIST loop-AES-v3.7z.tar.bz2 403715 BLAKE2B 44a64f6f071a2263ba9aec7e9d576ede4761ef12cdded1725f897fdf8f8c8aa0a841bd34380d020159d1509cd78b7f80fd8c0f7f340cc5b35d16690aacfa6e0b SHA512 a682ab0b45b1a7e2f06bcc63555551a08fb6c4af1f8917c72816a07030fa07a041be7620ad20722404186dc5056b01d8ac98aaf85face6bf68336d8608a2dae3
-EBUILD loop-aes-3.7y.ebuild 1605 BLAKE2B d0dfb52dc4805fc6c5940b2323d77f51518ac61931a261d0f6d242c67303d609a480a5b87a9c278bab624deb8f3d7bd44c506b9c52329a95798e7350a65818ed SHA512 68ee6b62b7bfe5a0539c75d56dc24fbf5cabed442abb09fc172f5dc17b1e4c7f9775953a2b7daabca5d457487010ef1f19596a9ab9fd515531c785d6802fffae
+DIST loop-AES-v3.8a.tar.bz2 404078 BLAKE2B fc4bd2999c3cc9fdbdc5e69e57bcad6304f9101773911af0ad8b9d1271837b7da07c7adfbf38355d82dd8e0a5b13a8ab38613e90b964ff07e3e6ace4ade4a688 SHA512 cf89281e964257040bb17c85078a711199126e9624f9b0b019b30115568752c54c07ef77d67f5cc5a0165cad320dd7be7fa3144584d7ef02ad395f1cae9ffcd0
 EBUILD loop-aes-3.7z.ebuild 1605 BLAKE2B d0dfb52dc4805fc6c5940b2323d77f51518ac61931a261d0f6d242c67303d609a480a5b87a9c278bab624deb8f3d7bd44c506b9c52329a95798e7350a65818ed SHA512 68ee6b62b7bfe5a0539c75d56dc24fbf5cabed442abb09fc172f5dc17b1e4c7f9775953a2b7daabca5d457487010ef1f19596a9ab9fd515531c785d6802fffae
+EBUILD loop-aes-3.8a.ebuild 1605 BLAKE2B e4fce9e0aaff2a7d7d64f97a5d98d2920223a81312c5e1c4f5ef04d86f3eeac64d9e8455b988fc5c3b79a02805624ba2fb99188cc4b2e964fa4ace483a58162f SHA512 d9a16207329909f4b9b2cea2e98798c7a629fc0c57a865461670d2fb63d31195ca49a61d50f9e0f5ac904e22d255c21d13a00134c625a9b8cbc2325f93e18a2a
 MISC metadata.xml 648 BLAKE2B 283db8a905c756bf44779739a188d2555ff87bdf77ff46ef2d0d947661633a45a0b163a1ad3a7bcc00a50e6502e01886178245af2c73d86947adda24c948c37a SHA512 8fa7faf71248ce5dc0c217869a2109ea3275c84de1b5f4b898fe97be5c0c4c91d38405699b41a8e591336993d52d69357becba2b2a7f15369dc5e0508c4788b4
diff --git a/sys-fs/loop-aes/loop-aes-3.7y.ebuild b/sys-fs/loop-aes/loop-aes-3.8a.ebuild
index 27b95ca5fd2c..4854a6549c10 100644
--- a/sys-fs/loop-aes/loop-aes-3.7y.ebuild
+++ b/sys-fs/loop-aes/loop-aes-3.8a.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index fafc7f53300c..64d4ef09bf69 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -31,5 +31,5 @@ AUX lvmpolld.initd-2.02.183 348 BLAKE2B cba0419add6591320dc60ef7616b66706e042b56
 DIST LVM2.2.03.17.tgz 2726793 BLAKE2B 425e52fe2d7832f8440203d2b6ffc3a097903abea8be07bbbf4864001d5f55083954e561a92b0fe4fc467533e465af3958b25cf33d2693f50f077dc3d9b74bd2 SHA512 ce9f4c10a7e89b397fa021098976117c062227da4f25996296dd3678c0aeb826edf9b7e4f5d3992f42156865ae47cb98671ec37a26868710174a473b42cc70a9
 DIST LVM2.2.03.19.tgz 2732219 BLAKE2B 7a5bd024312f149d95361ea24a282c8c68e371687fe8f7c853fa0748ce854bc991cdade999835666a5ece569e80dd9be85d4fae7fc5cc75b912de00f170cf66e SHA512 a40691f6f4c9300c95784be0fcb055a2b8e07bfdc87f000f2357ccb54fdb814a679fb79f5c9790a7440ef538e9997e46d56e539814bfdf138b4e76603aeb2994
 EBUILD lvm2-2.03.17-r2.ebuild 9952 BLAKE2B 875bc183ee4e0e9f81c57e3b5faab740dd71ae421713f15497e94fb249d09200be653c8121ecd7c80e9c15a7ad1492ce33538b3b083c19c5164d8867f303e829 SHA512 4891ac05e9f3418b3f5c11f8a9d75d33842316e1be980a9cf6cb42222e34199541b6c6c929c213fa9c4c4f6b89a2b5c9c53dbb586f55c09ec8105902289fa944
-EBUILD lvm2-2.03.19.ebuild 9249 BLAKE2B 64b923666f987adea1956fcb4f374456b7a87b4277fd05c16cf83150fdbc461c314ea653db4915fd97d04eb4a06df3af30dfa78b8921adad9b8bca7056b830c1 SHA512 d6340341d0b027b10baeaa0a7429f990d268310760b3229726830530a87a9e35886ad4dcfef62aebca3eefc9430bcf2a7bb8aa78fb498aebc114028739ab527e
+EBUILD lvm2-2.03.19.ebuild 9246 BLAKE2B f430a7900e08d35924f6523d33e547774d8080f82cedc19cd6e7c3ebf4923f380ef20cce54b71806b89d143ff34ff122b5237647b3d2875a35f6063750cce3d6 SHA512 546bb9bbf506ef63e2cd0eec15b47e1c63c1515b17997b55cbf08d7847ba67c46292ab2898164acb8295fbdc9af4aa003db61ec2879530564262bfdc73f8f260
 MISC metadata.xml 922 BLAKE2B 8688e31c04a110d0e522a13724896a2a7c22a9ce33d8d4384a7fbfb54e3c42c231d3b5791ceda976453d54062c5a8318cd514979fcad177ab1ff2a01b791ca65 SHA512 423e499010daffc24141021bc5328b83f9e39e1534bb30fdbbf6839f4ed426897d764d0ca6d0e96267bc67986d3a2cfa9cc5ec3f0e3b2e7aa5ef34095de95a61
diff --git a/sys-fs/lvm2/lvm2-2.03.19.ebuild b/sys-fs/lvm2/lvm2-2.03.19.ebuild
index f318272b48ea..8af2f68290c9 100644
--- a/sys-fs/lvm2/lvm2-2.03.19.ebuild
+++ b/sys-fs/lvm2/lvm2-2.03.19.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN^^}.${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="lvm lvm2create-initrd readline sanlock selinux static static-libs systemd thin +udev"
 REQUIRED_USE="
 	static? ( !systemd !udev )
diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index 46818f931e07..b8febd225516 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -1,5 +1,8 @@
+AUX multipath-tools-0.9.4-test-fix.patch 1258 BLAKE2B 3b381e1e0690edf77503e2774651fb1c8a58348821e089315db71054fbf8c8a8cee68c037b52c43cd3703c5e42254a63d7b562b13f19b9809edff630404b2d2c SHA512 f24b75a6d0b198c2639d4933b89c48a9530563b399e8554e0349bb7848acb4197a55541ddab588d120e92cac00725ab7a029c438813b666a78f8d7a6c5ec8753
 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
 EBUILD multipath-tools-0.9.3-r2.ebuild 2430 BLAKE2B 4e00be11956c5b7afc44dcad8e608b312a44aade65971951e48faa7fb1d492e84fa285548ad9740018e7ec4b49ecae29638989f03f3d6cbdb47d9d6ded201072 SHA512 9b99079b9090b73b2c8154cd389579919c1bdfd9275f01af679c244436a07bf969c12264655658a19e145cc496d7954a780ade5e6b2d53ca2bf80b0606a0da1a
+EBUILD multipath-tools-0.9.4.ebuild 2138 BLAKE2B ad219653716ab00064e4c93405dfd0125a0d531831ef14fbaafdfea85763d7f21ba578d3409dbb09c9f7b5fdac36a0ddc911d9021a55cde7040052960e0c087f SHA512 3aa527439968a83d48e1ba312f47cd9424f9d21b3dd3d7cce83dfd763d10be3e0796c1e10702fdd8287fed2dd264ab3c91e0df33d5e26d62f71b3aa8913e2775
 MISC metadata.xml 346 BLAKE2B 8c5d2e150c70bdff56b05009f11d40663d9d969b07ecc88ff310fd4e756339d2f9a4a6b351b14c6cebc69ed36f17eb0500a0ba2b34f7c6b75c3864d1e090a46f SHA512 ffb0aab5f2d8bbdf83e0df3cc84cd239649e94e1189ba4702221091469309d3d49783c6943aae27eb34e3373f3e07a571930a361058d9a3b67f725781c47b87e
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
new file mode 100644
index 000000000000..c0469a20d122
--- /dev/null
+++ b/sys-fs/multipath-tools/files/multipath-tools-0.9.4-test-fix.patch
@@ -0,0 +1,31 @@
+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.4.ebuild b/sys-fs/multipath-tools/multipath-tools-0.9.4.ebuild
new file mode 100644
index 000000000000..a0a952eec775
--- /dev/null
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.4.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic 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
+)
+
+myemake() {
+	local myemakeargs=(
+		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}"
+		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
+
+	append-flags -Wno-error
+
+	myemake
+}
+
+src_test() {
+	myemake test
+}
+
+src_install() {
+	dodir /sbin
+
+	myemake DESTDIR="${ED}" 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
+}