gentoo resync : 28.04.2021

6 files changed, 15 insertions, 122 deletions

diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index fd0bae229b15..3e2bbf2490c0 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -2,15 +2,13 @@ AUX multipath-tools-0.7.5-respect-flags.patch 660 BLAKE2B 1efc793d9741b1a732895c
 AUX multipath-tools-0.8.3-fix-gcc-10-compatibility.patch 434 BLAKE2B 2ebda2c60d3f2dd1152a1a6291d2ef476ad7e2ec96aa05a31353dedd22be7383e93f792498e7d73a017f1a66856caab582946b27df7bcdc50485816c97090710 SHA512 97bba4b041bac4cfa934148136cdd4795a09136d3671ba9c508f1e08516dc7515e3d7ff5ec5c79187f530afc22c46c8a7817449a763b200062f821c168fcb352
 AUX multipath-tools-0.8.3-json-c-0.14.patch 1125 BLAKE2B 70d5d1eb8b96e92f9bd2ec637b460784759e9a68970400d3007a21fcdd4e9ea4d27a9b2ced6c14d6a02d6331f38bce35ca13e5ca13284077f04d701c021b5b69 SHA512 d743ee4f31949ca8c65c536e379781394ab5de79e47e59b0ccef92d5581243edde0de641756ca28c902f6cba0d3c0fd0d51029e0fe3985fb3a353f7e3cf10c77
 AUX multipath-tools-0.8.3-no-gziped-docs.patch 6302 BLAKE2B 4d571d856d47cbb7cf6cf421a142fdb5d93fb891ae3c0c15abe8d74e6aeb35b02cbb70a80cede18f1dbd615581744f4144c0b03791aa6268c10e8bc08922bbeb SHA512 126245660ba589635437be32c7a7e72636e0bdcd72c177a6252b8e0c71e90426d12e78c10314d878d2e5a5b37b51db488c5fab8c1aae4f655650539ef1d1cd83
-AUX multipath-tools-0.8.4-parallel_make_fix.patch 3422 BLAKE2B 763460e1ee8d5df6a6b3ad0b742b3cf617e3f49f7001f7d951ee1f335a94aae773be40712bff26c8d83e380908a3a46bb26d6cf476e7ba6c9f6d33cd78539e13 SHA512 b68b196a3bc833d05d871b5e8d9abb93922a610b86c66f40db8defe446ca741415bb2ffb9083b45159700f5b1d82ba494efdf2407a26d2956e57428d38d5f59a
-AUX multipath-tools-0.8.4-respect-flags.patch 736 BLAKE2B 43530a05c438385a90e198631effe0c90a7789b2ad441260788529bd5b9e9c7f3f085ad396211cf0fbe6842d95cd5f59ad6e358d5f9d302c72449b673660df72 SHA512 f9e3596518011fb8b96323b52292978c46a06ce4c6b273469077507b68bbb25aff087e5b170f8def4621a635676a4fc82ea960e3359b73c5a5d23786903724ed
 AUX multipath-tools-0.8.5-respect-flags.patch 542 BLAKE2B b60dda770d8441bfd4026bb4b0dbcea6590e71b8d3da0d5645983a6e8e4ef5c00c0283682f9de335b029d3817786e6512c852ae411efe0cdd40416eb970f33e0 SHA512 89d9b9ec971a7afd5f80e19d9b8b691763c3f8a093e99a229a09307e44e5661b4952eed86e732279c0820f15b8f4c48b803823cf27830d03ca7213f9a7364c47
 AUX multipath.rc 565 BLAKE2B efb26199eddb75c5e87d1ab40aa8cb4fbaf9f7a2bfd7a20add6d55997d25de9a3dbf0d032c977593c2ee8d447539a34be0294ee3a80a80fb004dc2c51c8c64b5 SHA512 f08833fc3c928900f8c29438208b9715581bae426b1f45c246e8c418b210f7f9d35517ef9ad44db3d88944183b34e3411ece909b56892a9f3b7250fed49e43fe
 AUX multipathd-r1.rc 264 BLAKE2B f08733746c702da27e002b2cb07bbc1a1925002b1592c2f566aa8d66c71da5fd39fd6389636fc49b602f9051190ee5f7f85ad9ff35b924f51a2698e1a6654f0e SHA512 8cf764b59ed4bb13c3c2143cd83ee39bc87eca85c40acb3ed1dcd7cf4c39ecbdea7974b9705231d48377266c034a8623157648b9a99b6cef73617e4b37ad377e
 DIST multipath-tools-0.8.3.tar.gz 465248 BLAKE2B 21a7a18c70150b4422bdd0ae02f26f491845eb06928ab74e631df8c6b3c110d10f43f75b9f8289a7134826c923b7ba58ce54c40497c3b7e6211e53902c8a1b5f SHA512 d9fdc2763f5a1efa15ee07c5d863008c9694623935f62a0e0b56f941df4e0d0ca3f86056fefc9b5ca828b47782127e3d55f2f925b1ed957e02b675bef36f4cae
-DIST multipath-tools-0.8.4.tar.gz 480994 BLAKE2B be8368df049218e2eaa1749e7b1c7a930da15f0311ab549b1bbba9c019dcfe39f90a05fd621e0703301ef1d55c98ac8cc74231d82950d9066f19d8764421704b SHA512 720823188c053c1c50269a30e34a9d69099098495bfd607076bcfa2c079565e3f0580c91783f19d42ed82290c0db98e4e19ef620eca4ee5ec7885c49c72d2307
 DIST multipath-tools-0.8.5.tar.gz 494750 BLAKE2B a42d17a47631107433a1d0a9da69a0bb10d2125cb242d2125d67da18f6bc6231c9233b163dc1d07d88dcba9f912830c047fdee5b42435f59ea2976598a72fd75 SHA512 f62a09107ccb18ffab97139fe2dba3dc22450836d8669c4381a8bce4072672a027a3a1e687f33e374429bffa49b3ba4a54d1e52294044d7bc1f82ed5d5aaf760
-EBUILD multipath-tools-0.8.3-r2.ebuild 2214 BLAKE2B bf6650365f7fe7548f6643e5935752851bc8b89ce0e3276f90d74398e8e198ef9cea082136781f2e89fb1447bdcdc8830478757fc347597af62d5b366ecd87fe SHA512 e01fe5c6c6ecd49c09afb3f9920a15d70d487d11c9a06a3214cd10a91170f557f152a847b867756cc61534edb0f9d3d21f75966e60fa77ca5b7fa7419e26e50c
-EBUILD multipath-tools-0.8.4.ebuild 2214 BLAKE2B 90daeab97f15ecfe9ffae2158825dce22578cf0d77c6bc576ad55d643a88759083c4270c3923d587ce7aa78709f2d14957c16209c745273ef085011b39e4f0aa SHA512 c748accc0babbe40ab7e8c5950a12df281bdf47a700e62d9b24c4737d5df967fbf23e5ca3902cf13c2d86fe9c26b9be8f15d1ac4b5f8d829e6a50382d5615409
-EBUILD multipath-tools-0.8.5.ebuild 2118 BLAKE2B 5020335e17c20232ca0d64aa6d80c089a94ecd85b62fc64bc02269bdb178927c1753df4674d85fb737cfcfbb7a1a67f700f438de7713be9d003a5dda2ba3f684 SHA512 6d94404ecc15976d43852cef103ed209151b17d1e16c78d1fe37fa7e81c0aabec04ae10f19308286a1876bbf5dae9c8363966add61e484b10dad8b68050a49c3
+DIST multipath-tools-0.8.6.tar.gz 519405 BLAKE2B 5aed36550c76bbde0e874e37356b6c5a80a80b876b56dadb69ce09f0fb049a7097fd1c0aca5076f816848e2c2660f96680d7f16d56918a25299017b39f76f777 SHA512 82e5b7307e599ba6b059679c3987a442fb5be4885f0a27c260a99a07cb336b88d48e314b4ec951944e0200e4731522d8da043d98fa566857ecc6d100791c0e38
+EBUILD multipath-tools-0.8.3-r2.ebuild 2198 BLAKE2B a3fecefa7f8f07cb631b281a46bb918af85d5e6981b4244aadedf4e3e3ea18136248a462691e5e05998b56d4acc1b935500aa42859da78e8fb4c80fecfb0d8b7 SHA512 48bd320edd11c0e7fa71883bf9f72d05ea1144fdc9c79dbb1edeb0717c5eb51de408e421707fa80a1b3542ec41dec12b07e20999dbf950a3a7d6c0c9c6f8b11a
+EBUILD multipath-tools-0.8.5.ebuild 2102 BLAKE2B 42ad8f9fe928f0a57ecaf4868d65d3844da06d7de251188996452d9458e061b9462ed7a98785f15c44db94dcebf2840006d6d34a89d55933ec5d2f57d31428f6 SHA512 dc5dadd33046a8bc8c8f90d1f1badf5beae4119ef6d156b07b69dbf463203521a5f5de304ca066a0748d4a5f0dbc13279c4a960d3bdf85af359a9c7eca414156
+EBUILD multipath-tools-0.8.6.ebuild 2083 BLAKE2B 81d32b95ee8a89ad5cd2aa5d11d25490c1c66cd14f03ae9bf156b72e96a6da9cec4acf4f794fd20eed76903bf5b5d6163b26141688188088d0b3a21c4698d0f5 SHA512 0b42a0a299c5008ceefb04c6fa8bb52c90b9aadd32cea0df09928ccbd8bf233583f08ea145228098a17c2ccab4762dd8ab3bb4703471bd89d21192839d3a1b34
 MISC metadata.xml 364 BLAKE2B d1d285f68ff773055f374ad7f6790708b7fed62a0d9787aff638c6ced762ff34d62a94a90d79426dbf4a81d86cf2447f41947d7650d3f1bc366a9d3338af94ce SHA512 91654145796f3e879d14dc7aab2261099dc0e2cb44e7563bf3c006893b81aa0f84fdd52870aaf317197b87e6c4d9e1341e456daeb2f3b40c926bdaf31c797134
diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.8.4-parallel_make_fix.patch b/sys-fs/multipath-tools/files/multipath-tools-0.8.4-parallel_make_fix.patch
deleted file mode 100644
index 651cd04f59fd..000000000000
--- a/sys-fs/multipath-tools/files/multipath-tools-0.8.4-parallel_make_fix.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 041472afebd1e621be1143f2bfb4c5650df171cc Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Mon, 11 May 2020 11:49:58 +0200
-Subject: [PATCH] multipath-tools: Fix parallel make issues
-
-build is broken like this (tested with -j16):
-
-  x86_64-pc-linux-gnu-gcc -Wl,-O1 -Wl,--hash-style=gnu -Wl,--sort-common -Wl,--as-needed -Wl,-z,relro -Wl,-z,now -shared -lpthread -ldevmapper -ldl -L../libmultipath -lmultipath -L../libmpathcmd -lmpathcmd -Wl,-soname=libmpathpersist.so.0 -o libmpathpersist.so.0 mpath_persist.o mpath_updatepr.o mpath_pr_ioctl.o
-  building defaults.o because of defaults.c
-  ...
-  /usr/lib/gcc/x86_64-pc-linux-gnu/9.3.0/../../../../x86_64-pc-linux-gnu/bin/ld: cannot find -lmultipath
-  collect2: error: ld returned 1 exit status
-  make[1]: *** [Makefile:17: libmpathpersist.so.0] Error 1
-  make: *** [Makefile:29: libmpathpersist] Error 2
-  make: *** Waiting for unfinished jobs....
-
-install is broken like this:
-
-  install -m 755 libprio*.so /var/tmp/portage/sys-fs/multipath-tools-0.8.4/image/lib64/multipath
-  install -m 755 libcheckcciss_tur.so libcheckreadsector0.so libchecktur.so libcheckdirectio.so libcheckemc_clariion.so libcheckhp_sw.so libcheckrdac.so /var/tmp/portage/sys-fs/multipath-tools-0.8.4/image/lib64/multipath
-  ...
-  /usr/bin/install: target '/var/tmp/portage/sys-fs/multipath-tools-0.8.4/image/lib64/multipath' is not a directory
-  /usr/bin/install: target '/var/tmp/portage/sys-fs/multipath-tools-0.8.4/image/lib64/multipath' is not a directory
-  make[1]: *** [Makefile:28: install] Error 1
-  make[1]: *** [Makefile:38: install] Error 1
----
- Makefile                           | 3 ++-
- libmultipath/checkers/Makefile     | 1 +
- libmultipath/foreign/Makefile      | 1 +
- libmultipath/prioritizers/Makefile | 1 +
- 4 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 1dee3680..a9ade94f 100644
---- a/Makefile
-+++ b/Makefile
-@@ -29,7 +29,8 @@ $(BUILDDIRS):
- 	$(MAKE) -C $@
- 
- multipath multipathd mpathpersist: libmultipath
--mpathpersist:  libmpathpersist
-+libmpathpersist: libmultipath
-+mpathpersist:  libmultipath libmpathpersist
- 
- $(BUILDDIRS.clean):
- 	$(MAKE) -C ${@:.clean=} clean
-diff --git a/libmultipath/checkers/Makefile b/libmultipath/checkers/Makefile
-index 02caea64..f201ca4c 100644
---- a/libmultipath/checkers/Makefile
-+++ b/libmultipath/checkers/Makefile
-@@ -24,6 +24,7 @@ libcheck%.so: libsg.o %.o
- 	$(CC) $(LDFLAGS) $(SHARED_FLAGS) -o $@ $^
- 
- install:
-+	$(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(libdir)
- 	$(INSTALL_PROGRAM) -m 755 $(LIBS) $(DESTDIR)$(libdir)
- 
- uninstall:
-diff --git a/libmultipath/foreign/Makefile b/libmultipath/foreign/Makefile
-index fae58a0d..567deebd 100644
---- a/libmultipath/foreign/Makefile
-+++ b/libmultipath/foreign/Makefile
-@@ -14,6 +14,7 @@ libforeign-%.so: %.o
- 	$(CC) $(LDFLAGS) $(SHARED_FLAGS) -o $@ $^
- 
- install:
-+	$(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(libdir)
- 	$(INSTALL_PROGRAM) -m 755 $(LIBS) $(DESTDIR)$(libdir)
- 
- uninstall:
-diff --git a/libmultipath/prioritizers/Makefile b/libmultipath/prioritizers/Makefile
-index 9d0fe03c..b0b0b522 100644
---- a/libmultipath/prioritizers/Makefile
-+++ b/libmultipath/prioritizers/Makefile
-@@ -35,6 +35,7 @@ libprio%.so: %.o
- 	$(CC) $(LDFLAGS) $(SHARED_FLAGS) -o $@ $^
- 
- install: $(LIBS)
-+	$(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(libdir)
- 	$(INSTALL_PROGRAM) -m 755 libprio*.so $(DESTDIR)$(libdir)
- 
- uninstall:
--- 
-2.26.2
-
diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.8.4-respect-flags.patch b/sys-fs/multipath-tools/files/multipath-tools-0.8.4-respect-flags.patch
deleted file mode 100644
index 5e5258405b4f..000000000000
--- a/sys-fs/multipath-tools/files/multipath-tools-0.8.4-respect-flags.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- multipath-tools-0.8.4-d491591/Makefile.inc
-+++ multipath-tools-0.8.4-d491591/Makefile.inc
-@@ -99,12 +99,13 @@
- 		  -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS) \
- 		  $(STACKPROT) --param=ssp-buffer-size=4
- CPPFLAGS	:= -Wp,-D_FORTIFY_SOURCE=2 
--CFLAGS		:= $(OPTFLAGS) -DBIN_DIR=\"$(bindir)\" -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\" \
--		   -MMD -MP $(CFLAGS)
-+CFLAGS		?= $(OPTFLAGS)
-+CFLAGS		+= -DBIN_DIR=\"$(bindir)\" -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\" \
-+		   -MMD -MP
- BIN_CFLAGS	= -fPIE -DPIE
- LIB_CFLAGS	= -fPIC
- SHARED_FLAGS	= -shared
--LDFLAGS		= -Wl,-z,relro -Wl,-z,now
-+LDFLAGS		+= -Wl,-z,relro -Wl,-z,now
- BIN_LDFLAGS	= -pie
- 
- # Check whether a function with name $1 has been declared in header file $2.
diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.3-r2.ebuild b/sys-fs/multipath-tools/multipath-tools-0.8.3-r2.ebuild
index ab5b8e5272a9..2949cba6cbb6 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.8.3-r2.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.3-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-inherit linux-info systemd toolchain-funcs udev vcs-snapshot toolchain-funcs
+inherit linux-info systemd toolchain-funcs udev vcs-snapshot
 
 DESCRIPTION="Device mapper target autoconfig"
 HOMEPAGE="http://christophe.varoqui.free.fr/"
diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.5.ebuild b/sys-fs/multipath-tools/multipath-tools-0.8.5.ebuild
index cd850ca74aec..963e074a5ac5 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.8.5.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-inherit linux-info systemd toolchain-funcs udev vcs-snapshot toolchain-funcs
+inherit linux-info systemd toolchain-funcs udev vcs-snapshot
 
 DESCRIPTION="Device mapper target autoconfig"
 HOMEPAGE="http://christophe.varoqui.free.fr/"
diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.4.ebuild b/sys-fs/multipath-tools/multipath-tools-0.8.6.ebuild
index ab4f6f9cd3c8..ba7a9c7725ff 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.8.4.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.6.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-inherit linux-info systemd toolchain-funcs udev vcs-snapshot toolchain-funcs
+inherit linux-info systemd toolchain-funcs udev
 
 DESCRIPTION="Device mapper target autoconfig"
 HOMEPAGE="http://christophe.varoqui.free.fr/"
-SRC_URI="https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=tgz -> ${P}.tar.gz"
+SRC_URI="https://github.com/opensvc/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -34,10 +34,7 @@ CONFIG_CHECK="~DM_MULTIPATH"
 RESTRICT="test"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.8.4-respect-flags.patch
-	"${FILESDIR}"/${PN}-0.8.3-no-gziped-docs.patch
-	"${FILESDIR}"/${PN}-0.8.3-json-c-0.14.patch
-	"${FILESDIR}"/${PN}-0.8.4-parallel_make_fix.patch
+	"${FILESDIR}"/${PN}-0.8.5-respect-flags.patch
 )
 
 get_systemd_pv() {
@@ -83,10 +80,12 @@ src_install() {
 	newinitd "${FILESDIR}"/multipath.rc multipath
 
 	einstalldocs
+
+	find "${ED}" -type f -name "*.la" -delete || die
 }
 
 pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
 		elog "If you need multipath on your system, you must"
 		elog "add 'multipath' into your boot runlevel!"
 	fi