4 files changed, 53 insertions, 11 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index e22861938a43..f4ec83ce8f2d 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 b8febd225516..62d9943e4a1f 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -1,8 +1,9 @@
+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.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
+EBUILD multipath-tools-0.9.4-r1.ebuild 2005 BLAKE2B 5564c476fd0eb956b5dd6d9de557b5ce0141d633f8dfb77ef370581986e48f15f6ed900d4e7a66ea2722d9c7f42b71c41511d91721f52f29d4f78fe89a102aef SHA512 e4a6f29aff16a3a07de25b38fc432e53a0c5632a012f70e72b33b45b9c34484b388c8918132a887e51df471634b55003d5d4ca0ebdd6785fbd786ca9b6a5ad8d
 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
new file mode 100644
index 000000000000..58c8ae291ce8
--- /dev/null
+++ b/sys-fs/multipath-tools/files/multipath-tools-0.9.4-remove-Werror.patch
@@ -0,0 +1,45 @@
+--- 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/multipath-tools-0.9.4.ebuild b/sys-fs/multipath-tools/multipath-tools-0.9.4-r1.ebuild
index a0a952eec775..2338eec21604 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.9.4.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit flag-o-matic linux-info systemd tmpfiles toolchain-funcs udev
+inherit linux-info systemd tmpfiles toolchain-funcs udev
 
 DESCRIPTION="Device mapper target autoconfig"
 HOMEPAGE="http://christophe.varoqui.free.fr/"
@@ -34,19 +34,22 @@ 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)"
-		pkgconfdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
+		libudevdir="${EPREFIX}$(get_udevdir)"
 		GENTOO_CFLAGS="${CFLAGS}"
 		GENTOO_CPPFLAGS="${CPPFLAGS}"
+		FORTIFY_OPT=
+		OPTFLAGS=
 		FAKEVAR=1
 		V=1
 	)
@@ -63,9 +66,6 @@ src_prepare() {
 
 src_compile() {
 	tc-export CC
-
-	append-flags -Wno-error
-
 	myemake
 }
 
@@ -78,10 +78,6 @@ src_install() {
 
 	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