[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2024-04-29 Thread Sam James
commit: c901d1300a4ab79bf254baca968168123a2768a4
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 29 13:40:06 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 29 13:40:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c901d130

sys-fs/multipath-tools: Stabilize 0.9.8 amd64, #930904

Signed-off-by: Sam James  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.9.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/multipath-tools/multipath-tools-0.9.8.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.9.8.ebuild
index 78991d89fd2a..6e3559c6b390 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.9.8.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.8.ebuild
@@ -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 )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2024-04-29 Thread Sam James
commit: 9b5a18bb5eafea4e69e11efc81626f13f3cc50c4
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 29 13:40:05 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 29 13:40:05 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b5a18bb

sys-fs/multipath-tools: Stabilize 0.9.8 x86, #930904

Signed-off-by: Sam James  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.9.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/multipath-tools/multipath-tools-0.9.8.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.9.8.ebuild
index 981485927388..78991d89fd2a 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.9.8.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.8.ebuild
@@ -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 )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2024-04-29 Thread Arthur Zamarin
commit: b387887595288e5d2037a86433b8a9affb1ec6bd
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Apr 29 08:05:18 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Apr 29 08:05:18 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3878875

sys-fs/multipath-tools: Stabilize 0.9.8 arm64, #930904

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.9.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/multipath-tools/multipath-tools-0.9.8.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.9.8.ebuild
index 143d638f7190..981485927388 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.9.8.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.8.ebuild
@@ -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 )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2024-04-29 Thread Jakov Smolić
commit: 75afe737cacdd5496f1f0f61775798faff4160ec
Author: Jakov Smolić  gentoo  org>
AuthorDate: Mon Apr 29 07:50:32 2024 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Mon Apr 29 07:50:32 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75afe737

sys-fs/multipath-tools: Stabilize 0.9.8 ppc, #930904

Signed-off-by: Jakov Smolić  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.9.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/multipath-tools/multipath-tools-0.9.8.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.9.8.ebuild
index b13cccacf786..7662e081cb32 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.9.8.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.8.ebuild
@@ -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 )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2024-04-29 Thread Jakov Smolić
commit: 4e94b90e3dc2f20396162fbef1232eca881e8760
Author: Jakov Smolić  gentoo  org>
AuthorDate: Mon Apr 29 07:50:33 2024 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Mon Apr 29 07:50:33 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e94b90e

sys-fs/multipath-tools: Stabilize 0.9.8 ppc64, #930904

Signed-off-by: Jakov Smolić  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.9.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/multipath-tools/multipath-tools-0.9.8.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.9.8.ebuild
index 7662e081cb32..143d638f7190 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.9.8.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.8.ebuild
@@ -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 )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2024-03-17 Thread Sam James
commit: 4f7c4603f9f0e36fee98fd6260fd257e54aa0bf3
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 18 04:45:19 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 18 04:45:19 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f7c4603

sys-fs/multipath-tools: Stabilize 0.9.7-r1 amd64, #927156

Signed-off-by: Sam James  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.9.7-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 97060344d0db..af967fb2c612 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
@@ -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 )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2024-03-17 Thread Sam James
commit: a2dcd3aa48c53ef51deb1dc2b77b163bf0a78b23
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 18 04:45:18 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 18 04:45:18 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2dcd3aa

sys-fs/multipath-tools: Stabilize 0.9.7-r1 x86, #927156

Signed-off-by: Sam James  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.9.7-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 161e3555f617..97060344d0db 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
@@ -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 )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2024-03-17 Thread Arthur Zamarin
commit: 1ee9af5e5825e9a8feb838c8a898db80271d0043
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Mar 17 12:57:47 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Mar 17 12:57:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ee9af5e

sys-fs/multipath-tools: Stabilize 0.9.7-r1 ppc, #927156

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.9.7-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 92bddbe08199..161e3555f617 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
@@ -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 )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2024-03-17 Thread Sam James
commit: fe33a9f48b2aad3f2bd7f09976fba17c1fa2d90e
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar 17 10:42:00 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 17 10:42:00 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe33a9f4

sys-fs/multipath-tools: Stabilize 0.9.7-r1 ppc64, #927156

Signed-off-by: Sam James  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.9.7-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 4d09320bfc62..92bddbe08199 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
@@ -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 )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2024-03-17 Thread Sam James
commit: cae95f75ead772b6319ff03c06b5f1df765387d2
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar 17 06:01:53 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 17 06:34:27 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cae95f75

sys-fs/multipath-tools: add bug ref for filter-lto

Signed-off-by: Sam James  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.9.7-r1.ebuild | 1 +
 sys-fs/multipath-tools/multipath-tools-0.9.7.ebuild| 1 +
 sys-fs/multipath-tools/multipath-tools-0.9.8.ebuild| 1 +
 3 files changed, 3 insertions(+)

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 86b7a0392e81..4d09320bfc62 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
@@ -69,6 +69,7 @@ src_compile() {
# Breaks with always_inline
filter-flags -fno-semantic-interposition
# Breaks because of use of wrapping (-Wl,-wrap, wrap_*)
+   # https://github.com/opensvc/multipath-tools/issues/18
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 14e7bb7a24d4..6e3559c6b390 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.9.7.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.7.ebuild
@@ -68,6 +68,7 @@ src_compile() {
# Breaks with always_inline
filter-flags -fno-semantic-interposition
# Breaks because of use of wrapping (-Wl,-wrap, wrap_*)
+   # https://github.com/opensvc/multipath-tools/issues/18
filter-lto
myemake
 }

diff --git a/sys-fs/multipath-tools/multipath-tools-0.9.8.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.9.8.ebuild
index 976d89a45f9d..c89a4159292e 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.9.8.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.8.ebuild
@@ -69,6 +69,7 @@ src_compile() {
# Breaks with always_inline
filter-flags -fno-semantic-interposition
# Breaks because of use of wrapping (-Wl,-wrap, wrap_*)
+   # https://github.com/opensvc/multipath-tools/issues/18
filter-lto
myemake
 }



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2024-03-17 Thread Arthur Zamarin
commit: e870e2fa65370c1bc931cd4d41df5fb6fccf8371
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Mar 17 06:09:05 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Mar 17 06:09:05 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e870e2fa

sys-fs/multipath-tools: Stabilize 0.9.7-r1 arm64, #927156

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.9.7-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 976d89a45f9d..86b7a0392e81 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
@@ -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 )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2024-03-17 Thread Sam James
commit: b711a7a20e8b85a794d9d706cd1a76d4e4401b45
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar 17 05:52:59 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 17 05:52:59 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b711a7a2

sys-fs/multipath-tools: filter LTO

It uses -Wl,--wrap and wrap_*. openSUSE filter LTO too.

Bug: https://bugs.gentoo.org/880567
Signed-off-by: Sam James  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.9.7-r1.ebuild | 2 ++
 sys-fs/multipath-tools/multipath-tools-0.9.7.ebuild| 2 ++
 2 files changed, 4 insertions(+)

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
 }
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/files/, sys-fs/multipath-tools/

2024-03-17 Thread Sam James
commit: f5571a9c2763ad38c6ded1f7216ecb18fafd8355
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar 17 05:55:44 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 17 05:59:51 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5571a9c

sys-fs/multipath-tools: drop 0.9.3-r2, 0.9.4-r1, 0.9.5

Signed-off-by: Sam James  gentoo.org>

 sys-fs/multipath-tools/Manifest|   3 -
 .../multipath-tools-0.9.4-remove-Werror.patch  |  45 -
 .../files/multipath-tools-0.9.4-test-fix.patch |  31 ---
 .../multipath-tools-0.9.3-r2.ebuild|  97 
 .../multipath-tools-0.9.4-r1.ebuild| 101 -
 .../multipath-tools/multipath-tools-0.9.5.ebuild   | 100 
 6 files changed, 377 deletions(-)

diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index 1d6e24d94da3..315789729117 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -1,4 +1 @@
-DIST multipath-tools-0.9.3.tar.gz 552442 BLAKE2B 
e2065119cdd68bd8c2b4420bd0de9ce370601597972dba32c076bfc4df6d0a1a65356454a2f96f95f27cf681387685edcbac2eb41258d4a7049a1ef62cdf0949
 SHA512 
4faa2ee5a96a9d5d752219931ebc885cb70ed6b022d45ede985ad7919c043a3aee166e6f126d32dffd187c5c32d5cbce91747d87d0b7e2f7f68b279583da
-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

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..
--- 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 \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 \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 

[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2024-03-17 Thread Sam James
commit: 2fe7a10e0618f823d3142affbd565bad41c13e8a
Author: Brahmajit Das  gmail  com>
AuthorDate: Thu Mar  7 06:17:29 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 17 06:00:19 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fe7a10e

sys-fs/multipath-tools: add 0.9.8

Also fix error: implicit declaration of function basename

Closes: https://bugs.gentoo.org/926145
Signed-off-by: Brahmajit Das  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35648
Signed-off-by: Sam James  gentoo.org>

 sys-fs/multipath-tools/Manifest|   1 +
 .../multipath-tools/multipath-tools-0.9.8.ebuild   | 105 +
 2 files changed, 106 insertions(+)

diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index 315789729117..4be7fb5a794c 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -1 +1,2 @@
 DIST multipath-tools-0.9.7.tar.gz 570416 BLAKE2B 
ed3f47d648685f691a69d83ad36f39b279f3a5b1cf1cb15151841ea26d629df3a33ab9a186bbf6922264805cc3bc37d09f22e611215f1972e33b26e08ff71bc2
 SHA512 
0f4c97179a3de5a0c77893fec229eb183293fed8e5e01a9945b261845ccf5d13f8ef2c2ff0c17c9345217d236275caed4765422ec95aed80821f11658bf96e26
+DIST multipath-tools-0.9.8.tar.gz 580531 BLAKE2B 
66bc6b78795c08b4fe5f4bc718330be51b073dddb597998f384ccaf746c0b9e53e21d674623df03ed7f9ccd9800fe988add8068e0eaaeace076c00395453ba0a
 SHA512 
4d73bcf6bce769a829c306c609b206ddba65a708620f458106e406dd18d12f9a9d97f400662daa8e6a75c9fdf7decb6dcbda92cb807b6c53522c7b4b2795b627

diff --git a/sys-fs/multipath-tools/multipath-tools-0.9.8.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.9.8.ebuild
new file mode 100644
index ..976d89a45f9d
--- /dev/null
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.8.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2024 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.7-remove-Werror.patch
+   "${FILESDIR}"/${P}-null-pointer-dereference-in-uev_update_path.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
+   # Breaks with always_inline
+   filter-flags -fno-semantic-interposition
+   # Breaks because of use of wrapping (-Wl,-wrap, wrap_*)
+   filter-lto
+   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
+}



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/files/, sys-fs/multipath-tools/

2024-02-22 Thread Patrick McLean
commit: 5d080387eead3b713ae6e98fb36dda7c0b184c4d
Author: Patrick McLean  gentoo  org>
AuthorDate: Thu Feb 22 19:57:17 2024 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Thu Feb 22 19:57:17 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d080387

sys-fs/multipath-tools: Revbump, fix segfault (bug #925189)

Closes: https://bugs.gentoo.org/925189
Signed-off-by: Patrick McLean  gentoo.org>

 ...ll-pointer-dereference-in-uev_update_path.patch |  28 ++
 .../multipath-tools-0.9.7-r1.ebuild| 103 +
 2 files changed, 131 insertions(+)

diff --git 
a/sys-fs/multipath-tools/files/multipath-tools-0.9.7-null-pointer-dereference-in-uev_update_path.patch
 
b/sys-fs/multipath-tools/files/multipath-tools-0.9.7-null-pointer-dereference-in-uev_update_path.patch
new file mode 100644
index ..0210563bd7c0
--- /dev/null
+++ 
b/sys-fs/multipath-tools/files/multipath-tools-0.9.7-null-pointer-dereference-in-uev_update_path.patch
@@ -0,0 +1,28 @@
+From fc8b102c666d7fbad9242dea43a64941399a1c0d Mon Sep 17 00:00:00 2001
+From: Benjamin Marzinski 
+Date: Tue, 16 Jan 2024 20:19:11 -0500
+Subject: [PATCH] multipathd: fix null pointer dereference in uev_update_path
+
+The Auto-resize code added a check that deferences pp->mpp without
+checking that it's non-NULL. Fix it.
+
+Fixes: 981b83ad1 ("multipathd: Add auto_resize config option")
+Signed-off-by: Benjamin Marzinski 
+Reviewed-by: Martin Wilck 
+---
+ multipathd/main.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/multipathd/main.c b/multipathd/main.c
+index 74f6cd92..fbc3f8da 100644
+--- a/multipathd/main.c
 b/multipathd/main.c
+@@ -1630,7 +1630,7 @@ uev_update_path (struct uevent *uev, struct vectors * 
vecs)
+   }
+   }
+   }
+-  if (auto_resize != AUTO_RESIZE_NEVER &&
++  if (auto_resize != AUTO_RESIZE_NEVER && mpp &&
+   !mpp->wait_for_udev) {
+   struct pathgroup *pgp;
+   struct path *pp2;

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
new file mode 100644
index ..d0757b9e83ff
--- /dev/null
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.7-r1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2024 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.7-remove-Werror.patch
+   "${FILESDIR}"/${P}-null-pointer-dereference-in-uev_update_path.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
+   # Breaks with always_inline
+   filter-flags -fno-semantic-interposition
+   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() {
+ 

[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2024-01-17 Thread Sam James
commit: 683beb484d45738b236b58b84daeb1eabe3ea503
Author: Sam James  gentoo  org>
AuthorDate: Thu Jan 18 00:27:32 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan 18 00:27:32 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=683beb48

sys-fs/multipath-tools: Stabilize 0.9.7 x86, #922272

Signed-off-by: Sam James  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.9.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 7988ffae19e7..5ff6afa62cce 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.9.7.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.7.ebuild
@@ -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 )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2024-01-16 Thread Sam James
commit: 1bf2296d8a4e9d2756bc1138f6e2b9c3772f3114
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan 17 06:32:40 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 17 06:33:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bf2296d

sys-fs/multipath-tools: Stabilize 0.9.7 amd64, #922272

Signed-off-by: Sam James  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.9.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 7cfea6b6bd07..7988ffae19e7 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.9.7.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.7.ebuild
@@ -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 )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2024-01-16 Thread Sam James
commit: e16bd25ea1937bf37422f8f06b79b3a0a09abf09
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan 17 05:54:55 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 17 05:54:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e16bd25e

sys-fs/multipath-tools: Stabilize 0.9.7 arm64, #922272

Signed-off-by: Sam James  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.9.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 6d29aa336fb8..7cfea6b6bd07 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.9.7.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.7.ebuild
@@ -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 )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2024-01-16 Thread Sam James
commit: b08100d8dc7eade2b8ef3d07c658d26a6674f0ec
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan 17 05:49:16 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 17 05:49:16 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b08100d8

sys-fs/multipath-tools: Stabilize 0.9.7 ppc64, #922272

Signed-off-by: Sam James  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.9.7.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 c0f5549b9f60..6d29aa336fb8 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.9.7.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -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 )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/files/, sys-fs/multipath-tools/

2023-11-29 Thread Sam James
commit: 5e721d53305d991c725ba026c81e752fd22039e4
Author: Sam James  gentoo  org>
AuthorDate: Thu Nov 30 03:33:43 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Nov 30 03:33:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e721d53

sys-fs/multipath-tools: add 0.9.7

Signed-off-by: Sam James  gentoo.org>

 sys-fs/multipath-tools/Manifest|   1 +
 .../multipath-tools-0.9.7-remove-Werror.patch  |  49 ++
 .../multipath-tools/multipath-tools-0.9.7.ebuild   | 102 +
 3 files changed, 152 insertions(+)

diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index a763dadedd39..1d6e24d94da3 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -1,3 +1,4 @@
 DIST multipath-tools-0.9.3.tar.gz 552442 BLAKE2B 
e2065119cdd68bd8c2b4420bd0de9ce370601597972dba32c076bfc4df6d0a1a65356454a2f96f95f27cf681387685edcbac2eb41258d4a7049a1ef62cdf0949
 SHA512 
4faa2ee5a96a9d5d752219931ebc885cb70ed6b022d45ede985ad7919c043a3aee166e6f126d32dffd187c5c32d5cbce91747d87d0b7e2f7f68b279583da
 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

diff --git 
a/sys-fs/multipath-tools/files/multipath-tools-0.9.7-remove-Werror.patch 
b/sys-fs/multipath-tools/files/multipath-tools-0.9.7-remove-Werror.patch
new file mode 100644
index ..449746e1f661
--- /dev/null
+++ b/sys-fs/multipath-tools/files/multipath-tools-0.9.7-remove-Werror.patch
@@ -0,0 +1,49 @@
+diff --git a/Makefile.inc b/Makefile.inc
+index 6b45430..c47f82f 100644
+--- a/Makefile.inc
 b/Makefile.inc
+@@ -96,7 +96,7 @@ MODPROBE_UNIT := $(shell test "0$(SYSTEMD)" -lt 245 
2>/dev/null || \
+   echo "modprobe@dm_multipath.service")
+ 
+ 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) $(D_URCU_VERSION) \
+diff --git a/create-config.mk b/create-config.mk
+index 4d318b9..1d4ff2d 100644
+--- a/create-config.mk
 b/create-config.mk
+@@ -64,7 +64,7 @@ check_var = $(shell \
+ # 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
+@@ -136,7 +136,7 @@ SYSTEMD := $(strip $(or $(shell $(PKG_CONFIG) --modversion 
libsystemd 2>/dev/nul
+ # 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 \
+@@ -148,11 +148,11 @@ TEST_CC_OPTION = $(shell \
+ # but it doesn't seem to make a difference wrt the compilation result.
+ FORTIFY_OPT := $(shell \
+   if /bin/echo -e '$(__HASH__)include \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 \nint main(void) { 
return 0; }' | \
+-  $(CC) -o /dev/null $(OPTFLAGS) -c -Werror -D_FORTIFY_SOURCE=2 
-xc - 

[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2023-08-03 Thread Arthur Zamarin
commit: 5eefedc3828221d764c511ff4f5e4da408790fdf
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu Aug  3 10:27:55 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Aug  3 10:27:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5eefedc3

sys-fs/multipath-tools: Stabilize 0.9.5 ppc, #904926

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.9.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/multipath-tools/multipath-tools-0.9.5.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.9.5.ebuild
index 68a0ebacd489..95274e758853 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.9.5.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.5.ebuild
@@ -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 )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2023-07-18 Thread Sam James
commit: 2ab73730fa6c6ade0d2bd16ed0e04a3f8df94f9a
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul 18 21:07:40 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul 18 21:07:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ab73730

sys-fs/multipath-tools: Stabilize 0.9.5 x86, #904926

Signed-off-by: Sam James  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.9.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/multipath-tools/multipath-tools-0.9.5.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.9.5.ebuild
index f33e95f72bf8..68a0ebacd489 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.9.5.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.5.ebuild
@@ -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 )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2023-07-17 Thread Sam James
commit: 7cb9281669c9773f9475e31b06e8eaa50d5938ee
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 17 21:55:47 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 17 21:55:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cb92816

sys-fs/multipath-tools: Stabilize 0.9.5 amd64, #904926

Signed-off-by: Sam James  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.9.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/multipath-tools/multipath-tools-0.9.5.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.9.5.ebuild
index c9d0c000f332..f33e95f72bf8 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.9.5.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.5.ebuild
@@ -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 )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2023-07-17 Thread Jakov Smolić
commit: b2488897affa0746b296d7688cb0be926df52b4f
Author: Jakov Smolić  gentoo  org>
AuthorDate: Mon Jul 17 07:46:24 2023 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Mon Jul 17 07:46:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2488897

sys-fs/multipath-tools: Stabilize 0.9.5 ppc64, #904926

Signed-off-by: Jakov Smolić  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.9.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/multipath-tools/multipath-tools-0.9.5.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.9.5.ebuild
index 28275e84451c..c9d0c000f332 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.9.5.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.5.ebuild
@@ -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 )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2023-06-10 Thread Sam James
commit: 0228108a321499f77cbc1a51d358d89c8ceb4fd0
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun 10 19:05:42 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun 10 19:05:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0228108a

sys-fs/multipath-tools: Stabilize 0.9.5 arm64, #904926

Signed-off-by: Sam James  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.9.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/multipath-tools/multipath-tools-0.9.5.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.9.5.ebuild
index 086fdd911be5..28275e84451c 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.9.5.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.5.ebuild
@@ -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 )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2023-04-23 Thread Sam James
commit: e15f6ba5d67459faff090252c50a9233c8de01bb
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 23 20:36:59 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 23 20:36:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e15f6ba5

sys-fs/multipath-tools: Stabilize 0.9.4-r1 ppc64, #904926

Signed-off-by: Sam James  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.9.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index b7c7162a456e..d2fdb19707ca 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.9.4-r1.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.4-r1.ebuild
@@ -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 )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2023-04-23 Thread Sam James
commit: 8672a2b5b8df34869625704104e0e93e54e313b3
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 23 20:02:46 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 23 20:02:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8672a2b5

sys-fs/multipath-tools: Stabilize 0.9.4-r1 arm64, #904926

Signed-off-by: Sam James  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.9.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index 2338eec21604..b7c7162a456e 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.9.4-r1.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.4-r1.ebuild
@@ -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 )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2023-04-07 Thread Sam James
commit: 4335a54bb403a097486edbd2817ff8727b6efe09
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr  7 09:36:34 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr  7 09:36:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4335a54b

sys-fs/multipath-tools: add 0.9.5

Signed-off-by: Sam James  gentoo.org>

 sys-fs/multipath-tools/Manifest|   1 +
 .../multipath-tools/multipath-tools-0.9.5.ebuild   | 100 +
 2 files changed, 101 insertions(+)

diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index f0b00aab1bea..a763dadedd39 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -1,2 +1,3 @@
 DIST multipath-tools-0.9.3.tar.gz 552442 BLAKE2B 
e2065119cdd68bd8c2b4420bd0de9ce370601597972dba32c076bfc4df6d0a1a65356454a2f96f95f27cf681387685edcbac2eb41258d4a7049a1ef62cdf0949
 SHA512 
4faa2ee5a96a9d5d752219931ebc885cb70ed6b022d45ede985ad7919c043a3aee166e6f126d32dffd187c5c32d5cbce91747d87d0b7e2f7f68b279583da
 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

diff --git a/sys-fs/multipath-tools/multipath-tools-0.9.5.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.9.5.ebuild
new file mode 100644
index ..086fdd911be5
--- /dev/null
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.5.ebuild
@@ -0,0 +1,100 @@
+# 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-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
+}



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2023-03-23 Thread Mike Gilbert
commit: fd7626e3647bc6b81d7b538e4b690845ff2fa32f
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Mar 23 17:12:32 2023 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Thu Mar 23 17:12:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd7626e3

sys-fs/multipath-tools: prevent Makefile.inc from overriding CFLAGS

Closes: https://bugs.gentoo.org/902823
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.9.4-r1.ebuild | 2 ++
 1 file changed, 2 insertions(+)

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
index a6d47abdd5b7..2338eec21604 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.9.4-r1.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.4-r1.ebuild
@@ -48,6 +48,8 @@ myemake() {
libudevdir="${EPREFIX}$(get_udevdir)"
GENTOO_CFLAGS="${CFLAGS}"
GENTOO_CPPFLAGS="${CPPFLAGS}"
+   FORTIFY_OPT=
+   OPTFLAGS=
FAKEVAR=1
V=1
)



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/files/, sys-fs/multipath-tools/

2023-03-23 Thread David Seifert
commit: 1bb1ddae1e788f78eb2f7dd47f2f2f92e5fc7a94
Author: David Seifert  gentoo  org>
AuthorDate: Thu Mar 23 15:54:48 2023 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu Mar 23 15:54:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bb1ddae

sys-fs/multipath-tools: remove -Werror from build

Closes: https://bugs.gentoo.org/902811
Signed-off-by: David Seifert  gentoo.org>

 .../multipath-tools-0.9.4-remove-Werror.patch  | 45 ++
 .../multipath-tools-0.9.4-r1.ebuild|  6 +--
 2 files changed, 47 insertions(+), 4 deletions(-)

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 ..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 \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 \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-r1.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.9.4-r1.ebuild
index 8fbf1e4ee6b4..a6d47abdd5b7 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.9.4-r1.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,6 +34,7 @@ CONFIG_CHECK="~DM_MULTIPATH"
 
 PATCHES=(
"${FILESDIR}"/${PN}-0.9.4-test-fix.patch
+   "${FILESDIR}"/${PN}-0.9.4-remove-Werror.patch
 )
 
 myemake() {
@@ -63,9 +64,6 @@ src_prepare() {
 
 src_compile() {
tc-export CC
-
-   append-flags -Wno-error
-
myemake
 }
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2023-03-23 Thread Mike Gilbert
commit: b0874f66ad6380825b69309eb6deb5c69c345912
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Mar 23 15:38:06 2023 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Thu Mar 23 15:40:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0874f66

sys-fs/multipath-tools: pass usr_prefix to make

Signed-off-by: Mike Gilbert  gentoo.org>

 ...ltipath-tools-0.9.4.ebuild => multipath-tools-0.9.4-r1.ebuild} | 8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

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
similarity index 88%
rename from sys-fs/multipath-tools/multipath-tools-0.9.4.ebuild
rename to sys-fs/multipath-tools/multipath-tools-0.9.4-r1.ebuild
index a0a952eec775..8fbf1e4ee6b4 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.9.4.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.4-r1.ebuild
@@ -39,12 +39,12 @@ PATCHES=(
 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}"
FAKEVAR=1
@@ -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



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/, sys-fs/multipath-tools/files/

2023-03-23 Thread Sam James
commit: c0774867a0d5379c2bd726c659a62eae46eeac20
Author: Sam James  gentoo  org>
AuthorDate: Thu Mar 23 08:50:45 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Mar 23 08:55:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0774867

sys-fs/multipath-tools: add 0.9.4

Closes: https://bugs.gentoo.org/889644
Signed-off-by: Sam James  gentoo.org>

 sys-fs/multipath-tools/Manifest|   1 +
 .../files/multipath-tools-0.9.4-test-fix.patch |  31 ++
 .../multipath-tools/multipath-tools-0.9.4.ebuild   | 105 +
 3 files changed, 137 insertions(+)

diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index a3d16d489def..f0b00aab1bea 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -1 +1,2 @@
 DIST multipath-tools-0.9.3.tar.gz 552442 BLAKE2B 
e2065119cdd68bd8c2b4420bd0de9ce370601597972dba32c076bfc4df6d0a1a65356454a2f96f95f27cf681387685edcbac2eb41258d4a7049a1ef62cdf0949
 SHA512 
4faa2ee5a96a9d5d752219931ebc885cb70ed6b022d45ede985ad7919c043a3aee166e6f126d32dffd187c5c32d5cbce91747d87d0b7e2f7f68b279583da
+DIST multipath-tools-0.9.4.tar.gz 554381 BLAKE2B 
297f002e23312415467d8c4935da3b7f449318cd68120c719f40f0f45a9ebebc27f1297b918068b63471b65f72c08ce3cc6cad9b7bafcb646bb163c6486194ea
 SHA512 
5e0dcea610fc215e345444c04453a38f39c73e493c2bc53f6b3a90cd701266aabdf7c4693dfc321099af836d0019bf27355e265ad5db5deff48f8bb94ed4719d

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 ..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 
+Date: Thu, 23 Mar 2023 08:04:49 +
+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 
+--- 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 ..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),' \
+ 

[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2023-01-03 Thread Sam James
commit: 6170bcae6a911697812969d6b4e095d07c740fae
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan  4 04:54:17 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan  4 04:56:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6170bcae

sys-fs/multipath-tools: restore 0.9.3-r2

Dropped accidentally.

Reported at 
https://github.com/flatcar/portage-stable/pull/401#issuecomment-1369035847.

Fixes: 69322f09c73a949705b50485ab26552491d8a3cd~1
Signed-off-by: Sam James  gentoo.org>

 .../multipath-tools-0.9.3-r2.ebuild| 97 ++
 1 file changed, 97 insertions(+)

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
new file mode 100644
index ..65869a69983e
--- /dev/null
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.3-r2.ebuild
@@ -0,0 +1,97 @@
+# 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
+}



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2023-01-03 Thread Sam James
commit: 816055e2387bc79b730315f51a067b54965919f0
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan  4 04:54:30 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan  4 04:56:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=816055e2

sys-fs/multipath-tools: drop 0.9.3

Signed-off-by: Sam James  gentoo.org>

 .../multipath-tools/multipath-tools-0.9.3.ebuild   | 95 --
 1 file changed, 95 deletions(-)

diff --git a/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild
deleted file mode 100644
index 6fa03671b730..
--- a/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2022 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" \
-   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 \
-   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
-}



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/files/, sys-fs/multipath-tools/

2022-12-26 Thread Sam James
commit: 69322f09c73a949705b50485ab26552491d8a3cd
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec 26 08:30:28 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec 26 08:33:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69322f09

sys-fs/multipath-tools: drop 0.8.9, 0.9.0, 0.9.3-r2

Signed-off-by: Sam James  gentoo.org>

 sys-fs/multipath-tools/Manifest|  2 -
 .../multipath-tools-0.8.7-respect-flags.patch  | 14 
 .../multipath-tools-0.9.0-respect-flags.patch  | 15 
 sys-fs/multipath-tools/metadata.xml|  3 -
 .../multipath-tools/multipath-tools-0.8.9.ebuild   | 88 
 .../multipath-tools/multipath-tools-0.9.0.ebuild   | 76 -
 .../multipath-tools-0.9.3-r2.ebuild| 97 --
 7 files changed, 295 deletions(-)

diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index da55c0c395c3..a3d16d489def 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -1,3 +1 @@
-DIST multipath-tools-0.8.9.tar.gz 534866 BLAKE2B 
b5ebf3c393f6b60e85678ac07378ae07056b6777409fc1bc4f4133cdd3f8c75a3d76f6e9342208df7fed8fe7812b089eba8f6b769e47e1dd6c8b7fd321bdbd30
 SHA512 
25f2a5d436af6a343804988cef45ca1574d4a981655a2b91563ddb89138619158befdf5af92d836a17c95d6dcf901072b614473c2129274e5dcdb1a1d64edb4d
-DIST multipath-tools-0.9.0.tar.gz 537311 BLAKE2B 
e7d4958d24d1e19da2b80be23585ad37f6b0c1b66dc1377014d825ddd2be10ea3b8c30162cb7a23b120427bf0c957c6cad8560018e1cb058c284f37afd5d50d4
 SHA512 
6c417f6d1d116fa43bedb9f77769ece9cbb7b35b78a9b3558c41df2360e52a65a07314b12ab7e4a7bbc867b9755250de9db96a2f7eb4a6a37f0b0b3f0bbc840e
 DIST multipath-tools-0.9.3.tar.gz 552442 BLAKE2B 
e2065119cdd68bd8c2b4420bd0de9ce370601597972dba32c076bfc4df6d0a1a65356454a2f96f95f27cf681387685edcbac2eb41258d4a7049a1ef62cdf0949
 SHA512 
4faa2ee5a96a9d5d752219931ebc885cb70ed6b022d45ede985ad7919c043a3aee166e6f126d32dffd187c5c32d5cbce91747d87d0b7e2f7f68b279583da

diff --git 
a/sys-fs/multipath-tools/files/multipath-tools-0.8.7-respect-flags.patch 
b/sys-fs/multipath-tools/files/multipath-tools-0.8.7-respect-flags.patch
deleted file mode 100644
index 43c03883ee07..
--- a/sys-fs/multipath-tools/files/multipath-tools-0.8.7-respect-flags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
 a/Makefile.inc
-+++ b/Makefile.inc
-@@ -101,8 +101,9 @@ OPTFLAGS   := -O2 -g $(STACKPROT) --param=ssp-buffer-size=4
- WARNFLAGS := -Werror -Wall -Wextra -Wformat=2 $(WFORMATOVERFLOW) 
-Werror=implicit-int \
- -Werror=implicit-function-declaration -Werror=format-security 
\
- $(WNOCLOBBERED) -Werror=cast-qual 
$(ERROR_DISCARDED_QUALIFIERS)
--CPPFLAGS  := -Wp,-D_FORTIFY_SOURCE=2
--CFLAGS:= --std=gnu99 $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe 
\
-+CPPFLAGS  ?= -Wp,-D_FORTIFY_SOURCE=2
-+CFLAGS?= --std=gnu99 $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe
-+CFLAGS+= --std=gnu99 \
-  -DBIN_DIR=\"$(bindir)\" -DLIB_STRING=\"${LIB}\" 
-DRUN_DIR=\"${RUN}\" \
-  -MMD -MP
- BIN_CFLAGS= -fPIE -DPIE

diff --git 
a/sys-fs/multipath-tools/files/multipath-tools-0.9.0-respect-flags.patch 
b/sys-fs/multipath-tools/files/multipath-tools-0.9.0-respect-flags.patch
deleted file mode 100644
index f2b6dca05776..
--- a/sys-fs/multipath-tools/files/multipath-tools-0.9.0-respect-flags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
 a/Makefile.inc
-+++ b/Makefile.inc
-@@ -140,10 +140,9 @@
- WARNFLAGS := -Werror -Wall -Wextra -Wformat=2 $(WFORMATOVERFLOW) 
-Werror=implicit-int \
- -Werror=implicit-function-declaration -Werror=format-security 
\
- $(WNOCLOBBERED) -Werror=cast-qual 
$(ERROR_DISCARDED_QUALIFIERS)
--CPPFLAGS  := $(FORTIFY_OPT) \
-- -DBIN_DIR=\"$(bindir)\" -DMULTIPATH_DIR=\"$(plugindir)\" 
-DRUN_DIR=\"${RUN}\" \
-+CPPFLAGS  += -DBIN_DIR=\"$(bindir)\" -DMULTIPATH_DIR=\"$(plugindir)\" 
-DRUN_DIR=\"${RUN}\" \
-  -DCONFIG_DIR=\"$(configdir)\" 
-DEXTRAVERSION=\"$(EXTRAVERSION)\" -MMD -MP
--CFLAGS:= --std=gnu99 $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe
-+CFLAGS+= -std=gnu99 $(WARNFLAGS)
- BIN_CFLAGS= -fPIE -DPIE
- LIB_CFLAGS= -fPIC
- SHARED_FLAGS  = -shared

diff --git a/sys-fs/multipath-tools/metadata.xml 
b/sys-fs/multipath-tools/metadata.xml
index 1cbf200d6c5b..019e77364d43 100644
--- a/sys-fs/multipath-tools/metadata.xml
+++ b/sys-fs/multipath-tools/metadata.xml
@@ -5,9 +5,6 @@
base-sys...@gentoo.org
Gentoo Base System

-   
-   Enable Rados block device support via 
sys-cluster/ceph
-   

opensvc/multipath-tools


diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild
deleted file mode 100644

[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2022-12-01 Thread Sam James
commit: b7d704bb699c8e4a9ea411ec19e6421a0f51c812
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec  1 17:41:45 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec  1 17:41:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7d704bb

sys-fs/multipath-tools: Stabilize 0.9.3-r2 x86, #883807

Signed-off-by: Sam James  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.9.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index 133cc8376fc7..ff744e92c05d 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.9.3-r2.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.3-r2.ebuild
@@ -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 )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2022-12-01 Thread Jakov Smolić
commit: a15d06418198c694857d81353bc0ef79c604f5da
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Dec  1 15:52:43 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Dec  1 15:52:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a15d0641

sys-fs/multipath-tools: Stabilize 0.9.3-r2 amd64, #883807

Signed-off-by: Jakov Smolić  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.9.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index 18028e3485d9..133cc8376fc7 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.9.3-r2.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.3-r2.ebuild
@@ -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 )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2022-12-01 Thread Jakov Smolić
commit: 521a8f49a2539c5d9c9305327228b99057aa36c9
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Dec  1 15:40:20 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Dec  1 15:40:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=521a8f49

sys-fs/multipath-tools: Stabilize 0.9.3-r2 ppc64, #883807

Signed-off-by: Jakov Smolić  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.9.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index 4b047c602547..18028e3485d9 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.9.3-r2.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.3-r2.ebuild
@@ -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 )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2022-12-01 Thread Jakov Smolić
commit: 7755c2b1fb57a8dae3e29a736d9551372ff81c85
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Dec  1 09:23:11 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Dec  1 09:23:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7755c2b1

sys-fs/multipath-tools: Stabilize 0.9.3-r2 arm64, #883807

Signed-off-by: Jakov Smolić  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.9.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index 90f9abb6b0c4..da0aae4abb94 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.9.3-r2.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.3-r2.ebuild
@@ -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 )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2022-12-01 Thread Jakov Smolić
commit: ab8937def8db0b034a73f8eeb89afb4ba384a918
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Dec  1 09:23:14 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Dec  1 09:23:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab8937de

sys-fs/multipath-tools: Stabilize 0.9.3-r2 ppc, #883807

Signed-off-by: Jakov Smolić  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.9.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index da0aae4abb94..4b047c602547 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.9.3-r2.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.3-r2.ebuild
@@ -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 )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2022-11-30 Thread Sam James
commit: a240ce593ed71a0a9588b22025ea6885cbaa5d76
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec  1 00:45:35 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec  1 00:45:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a240ce59

sys-fs/multipath-tools: further plugindir fixes

Bug: https://bugs.gentoo.org/883759
Signed-off-by: Sam James  gentoo.org>

 ...multipath-tools-0.9.3-r1.ebuild => multipath-tools-0.9.3-r2.ebuild} | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sys-fs/multipath-tools/multipath-tools-0.9.3-r1.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.9.3-r2.ebuild
similarity index 95%
rename from sys-fs/multipath-tools/multipath-tools-0.9.3-r1.ebuild
rename to sys-fs/multipath-tools/multipath-tools-0.9.3-r2.ebuild
index 5a5243a4ebda..90f9abb6b0c4 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.9.3-r1.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.3-r2.ebuild
@@ -43,6 +43,7 @@ src_compile() {
# 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)" \
@@ -61,7 +62,7 @@ src_install() {
prefix="${EPREFIX}" \
LIB="$(get_libdir)" \
RUN=run \
-   plugindir="$(get_libdir)//multipath" \
+   plugindir="${EPREFIX}/$(get_libdir)/multipath" \
unitdir="$(systemd_get_systemunitdir)" \
libudevdir="${EPREFIX}/$(get_udevdir)" \
pkgconfdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig" \



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2022-11-30 Thread Sam James
commit: 9f3e6a838fad8b4acab856a88d9fb7e3809cbd44
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec  1 00:38:12 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec  1 00:38:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f3e6a83

sys-fs/multipath-tools: destabilize 0.9.3-r1

Signed-off-by: Sam James  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.9.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/multipath-tools/multipath-tools-0.9.3-r1.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.9.3-r1.ebuild
index 99c183634c13..5a5243a4ebda 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.9.3-r1.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.3-r1.ebuild
@@ -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 )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2022-11-30 Thread Sam James
commit: 540b5786ee8bbc26fffab9523866ac6e36719aec
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec  1 00:37:46 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec  1 00:37:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=540b5786

sys-fs/multipath-tools: fix plugin path

Bug: https://bugs.gentoo.org/883759
Signed-off-by: Sam James  gentoo.org>

 .../multipath-tools-0.9.3-r1.ebuild| 96 ++
 1 file changed, 96 insertions(+)

diff --git a/sys-fs/multipath-tools/multipath-tools-0.9.3-r1.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.9.3-r1.ebuild
new file mode 100644
index ..99c183634c13
--- /dev/null
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.3-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2022 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" \
+   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="$(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
+}



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2022-11-24 Thread Sam James
commit: ab840db288d84813a5108cf276d817ebff0700a5
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov 25 06:09:15 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 25 06:09:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab840db2

sys-fs/multipath-tools: Stabilize 0.9.3 ppc64, #882869

Signed-off-by: Sam James  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild
index 1abcc01edd9f..6fa03671b730 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild
@@ -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 )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2022-11-24 Thread Sam James
commit: 29fb9b06783917ffbbd967b5f287e6694d4eb80c
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov 25 06:01:45 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 25 06:01:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29fb9b06

sys-fs/multipath-tools: Stabilize 0.9.3 ppc, #882869

Signed-off-by: Sam James  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild
index d7e473da6738..1abcc01edd9f 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild
@@ -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 )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2022-11-24 Thread Sam James
commit: 49f509f120e3e621548bcdb5c796068718a044a5
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov 25 05:22:32 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 25 05:22:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49f509f1

sys-fs/multipath-tools: Stabilize 0.9.3 x86, #882869

Signed-off-by: Sam James  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild
index 967a6b772ef2..d7e473da6738 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild
@@ -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 )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2022-11-24 Thread Sam James
commit: 3db6d2078935944fb9628cb71cf8dc7b2777af21
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov 25 05:16:59 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 25 05:16:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3db6d207

sys-fs/multipath-tools: Stabilize 0.9.3 arm64, #882869

Signed-off-by: Sam James  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild
index a6f1a2a9294e..967a6b772ef2 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild
@@ -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 )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2022-11-24 Thread Sam James
commit: e826f61e2c40faeba66677d6e3966f734d087544
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov 25 05:16:58 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 25 05:16:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e826f61e

sys-fs/multipath-tools: Stabilize 0.9.3 amd64, #882869

Signed-off-by: Sam James  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild
index 9edc596d1197..a6f1a2a9294e 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild
@@ -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 )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2022-10-30 Thread Sam James
commit: 4700792d0f60249c0079b19bbf324906a89f43ec
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct 30 21:31:49 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 30 21:32:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4700792d

sys-fs/multipath-tools: add note for Makefile hack

It should be fixed upstream in 0.9.3.

Signed-off-by: Sam James  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild
index 74c4e010e73a..9edc596d1197 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild
@@ -29,11 +29,9 @@ BDEPEND="virtual/pkgconfig"
 
 CONFIG_CHECK="~DM_MULTIPATH"
 
-PATCHES=( )
-
 src_prepare() {
default
-   # life is too short for some trivial patches
+
sed -r -i -e 
'/^(CPPFLAGS|CFLAGS)\>/s,^(CPPFLAGS|CFLAGS)\>[[:space:]]+:=,\1 := 
$(GENTOO_\1),' \
"${S}"/Makefile.inc || die
 }
@@ -55,7 +53,9 @@ src_compile() {
 
 src_install() {
dodir /sbin
-   # upstream makefile has terrible $(prefix) choices
+
+   # 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}" \
@@ -67,6 +67,7 @@ src_install() {
GENTOO_CFLAGS="${CFLAGS}" \
GENTOO_CPPFLAGS="${CPPFLAGS}" \
install
+
rmdir "${ED}"/usr/include
rmdir "${ED}"/usr/share
mv "${ED}"/include "${ED}"/usr/include || die



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2022-10-29 Thread Robin H. Johnson
commit: 4035f35583fab2b3f22c09d2f2894f4b8f20cee0
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Oct 30 03:10:43 2022 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Sun Oct 30 04:35:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4035f355

sys-fs/multipath-tools: bump

Signed-off-by: Robin H. Johnson  gentoo.org>
Reference: https://bugs.gentoo.org/show_bug.cgi?id=878763

 sys-fs/multipath-tools/Manifest|  1 +
 .../multipath-tools/multipath-tools-0.9.3.ebuild   | 83 ++
 2 files changed, 84 insertions(+)

diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index 480f8d568d21..da55c0c395c3 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -1,2 +1,3 @@
 DIST multipath-tools-0.8.9.tar.gz 534866 BLAKE2B 
b5ebf3c393f6b60e85678ac07378ae07056b6777409fc1bc4f4133cdd3f8c75a3d76f6e9342208df7fed8fe7812b089eba8f6b769e47e1dd6c8b7fd321bdbd30
 SHA512 
25f2a5d436af6a343804988cef45ca1574d4a981655a2b91563ddb89138619158befdf5af92d836a17c95d6dcf901072b614473c2129274e5dcdb1a1d64edb4d
 DIST multipath-tools-0.9.0.tar.gz 537311 BLAKE2B 
e7d4958d24d1e19da2b80be23585ad37f6b0c1b66dc1377014d825ddd2be10ea3b8c30162cb7a23b120427bf0c957c6cad8560018e1cb058c284f37afd5d50d4
 SHA512 
6c417f6d1d116fa43bedb9f77769ece9cbb7b35b78a9b3558c41df2360e52a65a07314b12ab7e4a7bbc867b9755250de9db96a2f7eb4a6a37f0b0b3f0bbc840e
+DIST multipath-tools-0.9.3.tar.gz 552442 BLAKE2B 
e2065119cdd68bd8c2b4420bd0de9ce370601597972dba32c076bfc4df6d0a1a65356454a2f96f95f27cf681387685edcbac2eb41258d4a7049a1ef62cdf0949
 SHA512 
4faa2ee5a96a9d5d752219931ebc885cb70ed6b022d45ede985ad7919c043a3aee166e6f126d32dffd187c5c32d5cbce91747d87d0b7e2f7f68b279583da

diff --git a/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild
new file mode 100644
index ..937105680154
--- /dev/null
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info systemd 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
+   >=virtual/libudev-232-r3
+   sys-libs/readline:=
+   systemd? ( sys-apps/systemd )"
+DEPEND="${RDEPEND}
+   test? ( dev-util/cmocka )"
+BDEPEND="virtual/pkgconfig"
+
+CONFIG_CHECK="~DM_MULTIPATH"
+
+PATCHES=( )
+
+src_prepare() {
+   default
+   # life is too short for some trivial patches
+   sed -r -i -e '/^(CPPFLAGS|CFLAGS)/s,:=,+=,' \
+   "${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}" \
+   LIB="$(get_libdir)" \
+   LIBDM_API_FLUSH=1 \
+   PKGCONFIG="$(tc-getPKG_CONFIG)"
+}
+
+src_install() {
+   dodir /sbin /usr/share/man/man{3,5,8}
+   emake \
+   DESTDIR="${D}" \
+   prefix="${EPREFIX}" \
+   LIB="$(get_libdir)" \
+   RUN=run \
+   unitdir="$(systemd_get_systemunitdir)" \
+   libudevdir='$(prefix)'/$(get_udevdir) \
+   pkgconfdir='$(prefix)/usr/$(LIB)/pkgconfig' \
+   install
+   einstalldocs
+
+   newinitd "${FILESDIR}"/multipathd-r1.rc multipathd
+   newinitd "${FILESDIR}"/multipath.rc multipath
+
+   find "${ED}" -type f -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+   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
+}



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2022-10-29 Thread Robin H. Johnson
commit: 9199809d660b52e6f4e960fc1bea889bea15cdaa
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Oct 30 04:35:20 2022 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Sun Oct 30 04:35:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9199809d

sys-fs/multipath-tools: bump

Signed-off-by: Robin H. Johnson  gentoo.org>
Reference: https://bugs.gentoo.org/show_bug.cgi?id=878763

 .../multipath-tools/multipath-tools-0.9.3.ebuild   | 27 +++---
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild
index 937105680154..74c4e010e73a 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit linux-info systemd toolchain-funcs udev
+inherit linux-info systemd toolchain-funcs udev tmpfiles
 
 DESCRIPTION="Device mapper target autoconfig"
 HOMEPAGE="http://christophe.varoqui.free.fr/;
@@ -34,7 +34,7 @@ PATCHES=( )
 src_prepare() {
default
# life is too short for some trivial patches
-   sed -r -i -e '/^(CPPFLAGS|CFLAGS)/s,:=,+=,' \
+   sed -r -i -e 
'/^(CPPFLAGS|CFLAGS)\>/s,^(CPPFLAGS|CFLAGS)\>[[:space:]]+:=,\1 := 
$(GENTOO_\1),' \
"${S}"/Makefile.inc || die
 }
 
@@ -44,23 +44,33 @@ src_compile() {
# LIBDM_API_FLUSH involves grepping files in /usr/include,
# so force the test to go the way we want #411337.
emake \
-   prefix="${EPREFIX}" \
+   prefix="${EPREFIX}/usr" \
LIB="$(get_libdir)" \
LIBDM_API_FLUSH=1 \
-   PKGCONFIG="$(tc-getPKG_CONFIG)"
+   PKGCONFIG="$(tc-getPKG_CONFIG)" \
+   GENTOO_CFLAGS="${CFLAGS}" \
+   GENTOO_CPPFLAGS="${CPPFLAGS}" \
+   FAKEVAR=1
 }
 
 src_install() {
-   dodir /sbin /usr/share/man/man{3,5,8}
+   dodir /sbin
+   # upstream makefile has terrible $(prefix) choices
emake \
-   DESTDIR="${D}" \
+   DESTDIR="${ED}" \
prefix="${EPREFIX}" \
LIB="$(get_libdir)" \
RUN=run \
unitdir="$(systemd_get_systemunitdir)" \
-   libudevdir='$(prefix)'/$(get_udevdir) \
-   pkgconfdir='$(prefix)/usr/$(LIB)/pkgconfig' \
+   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
@@ -70,6 +80,7 @@ src_install() {
 }
 
 pkg_postinst() {
+   tmpfiles_process /usr/lib/tmpfiles.d/multipath.conf
udev_reload
 
if [[ -z ${REPLACING_VERSIONS} ]] ; then



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/files/, sys-fs/multipath-tools/

2022-07-02 Thread David Seifert
commit: 8dc26a90c1f885be27e37e59d752b690ee919264
Author: David Seifert  gentoo  org>
AuthorDate: Sat Jul  2 13:15:55 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Jul  2 13:15:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dc26a90

sys-fs/multipath-tools: add 0.9.0

Bug: https://bugs.gentoo.org/852173
Signed-off-by: David Seifert  gentoo.org>

 sys-fs/multipath-tools/Manifest|  1 +
 .../multipath-tools-0.9.0-respect-flags.patch  | 15 +
 .../multipath-tools/multipath-tools-0.9.0.ebuild   | 76 ++
 3 files changed, 92 insertions(+)

diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index 55dc9b865d23..480f8d568d21 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -1 +1,2 @@
 DIST multipath-tools-0.8.9.tar.gz 534866 BLAKE2B 
b5ebf3c393f6b60e85678ac07378ae07056b6777409fc1bc4f4133cdd3f8c75a3d76f6e9342208df7fed8fe7812b089eba8f6b769e47e1dd6c8b7fd321bdbd30
 SHA512 
25f2a5d436af6a343804988cef45ca1574d4a981655a2b91563ddb89138619158befdf5af92d836a17c95d6dcf901072b614473c2129274e5dcdb1a1d64edb4d
+DIST multipath-tools-0.9.0.tar.gz 537311 BLAKE2B 
e7d4958d24d1e19da2b80be23585ad37f6b0c1b66dc1377014d825ddd2be10ea3b8c30162cb7a23b120427bf0c957c6cad8560018e1cb058c284f37afd5d50d4
 SHA512 
6c417f6d1d116fa43bedb9f77769ece9cbb7b35b78a9b3558c41df2360e52a65a07314b12ab7e4a7bbc867b9755250de9db96a2f7eb4a6a37f0b0b3f0bbc840e

diff --git 
a/sys-fs/multipath-tools/files/multipath-tools-0.9.0-respect-flags.patch 
b/sys-fs/multipath-tools/files/multipath-tools-0.9.0-respect-flags.patch
new file mode 100644
index ..f2b6dca05776
--- /dev/null
+++ b/sys-fs/multipath-tools/files/multipath-tools-0.9.0-respect-flags.patch
@@ -0,0 +1,15 @@
+--- a/Makefile.inc
 b/Makefile.inc
+@@ -140,10 +140,9 @@
+ WARNFLAGS := -Werror -Wall -Wextra -Wformat=2 $(WFORMATOVERFLOW) 
-Werror=implicit-int \
+ -Werror=implicit-function-declaration -Werror=format-security 
\
+ $(WNOCLOBBERED) -Werror=cast-qual 
$(ERROR_DISCARDED_QUALIFIERS)
+-CPPFLAGS  := $(FORTIFY_OPT) \
+- -DBIN_DIR=\"$(bindir)\" -DMULTIPATH_DIR=\"$(plugindir)\" 
-DRUN_DIR=\"${RUN}\" \
++CPPFLAGS  += -DBIN_DIR=\"$(bindir)\" -DMULTIPATH_DIR=\"$(plugindir)\" 
-DRUN_DIR=\"${RUN}\" \
+  -DCONFIG_DIR=\"$(configdir)\" 
-DEXTRAVERSION=\"$(EXTRAVERSION)\" -MMD -MP
+-CFLAGS:= --std=gnu99 $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe
++CFLAGS+= -std=gnu99 $(WARNFLAGS)
+ BIN_CFLAGS= -fPIE -DPIE
+ LIB_CFLAGS= -fPIC
+ SHARED_FLAGS  = -shared

diff --git a/sys-fs/multipath-tools/multipath-tools-0.9.0.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.9.0.ebuild
new file mode 100644
index ..c3ba08e79c7e
--- /dev/null
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info systemd 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
+   >=virtual/libudev-232-r3
+   sys-libs/readline:=
+   systemd? ( sys-apps/systemd )"
+DEPEND="${RDEPEND}
+   test? ( dev-util/cmocka )"
+BDEPEND="virtual/pkgconfig"
+
+CONFIG_CHECK="~DM_MULTIPATH"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.9.0-respect-flags.patch )
+
+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}" \
+   LIB="$(get_libdir)" \
+   LIBDM_API_FLUSH=1 \
+   PKGCONFIG="$(tc-getPKG_CONFIG)"
+}
+
+src_install() {
+   dodir /sbin /usr/share/man/man{3,5,8}
+   emake \
+   DESTDIR="${D}" \
+   prefix="${EPREFIX}" \
+   LIB="$(get_libdir)" \
+   RUN=run \
+   unitdir="$(systemd_get_systemunitdir)" \
+   libudevdir='$(prefix)'/$(get_udevdir) \
+   pkgconfdir='$(prefix)/usr/$(LIB)/pkgconfig' \
+   install
+   einstalldocs
+
+   newinitd "${FILESDIR}"/multipathd-r1.rc multipathd
+   newinitd "${FILESDIR}"/multipath.rc multipath
+
+   find "${ED}" -type f -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+   udev_reload
+
+   if [[ -z ${REPLACING_VERSIONS} ]] ; then
+   elog "If you need multipath on your system, you must"
+   elog "add 

[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/, sys-fs/multipath-tools/files/

2022-06-21 Thread David Seifert
commit: 13a6aa70c9ce95cee331058dbce0ddd5977eebfc
Author: David Seifert  gentoo  org>
AuthorDate: Tue Jun 21 09:40:55 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Tue Jun 21 09:40:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13a6aa70

sys-fs/multipath-tools: drop 0.8.6-r1, 0.8.7, 0.8.8

Signed-off-by: David Seifert  gentoo.org>

 sys-fs/multipath-tools/Manifest|   4 -
 .../multipath-tools-0.8.5-respect-flags.patch  |  12 --
 ...ltipath-tools-0.8.6-no-compress-man-pages.patch | 226 -
 .../multipath-tools-0.8.6-r1.ebuild|  88 
 .../multipath-tools/multipath-tools-0.8.7.ebuild   |  89 
 .../multipath-tools/multipath-tools-0.8.8.ebuild   |  90 
 6 files changed, 509 deletions(-)

diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index b3e04b797c89..55dc9b865d23 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -1,5 +1 @@
-DIST multipath-tools-0.8.6.tar.gz 519405 BLAKE2B 
5aed36550c76bbde0e874e37356b6c5a80a80b876b56dadb69ce09f0fb049a7097fd1c0aca5076f816848e2c2660f96680d7f16d56918a25299017b39f76f777
 SHA512 
82e5b7307e599ba6b059679c3987a442fb5be4885f0a27c260a99a07cb336b88d48e314b4ec951944e0200e4731522d8da043d98fa566857ecc6d100791c0e38
-DIST multipath-tools-0.8.7.tar.gz 523535 BLAKE2B 
3f59af86f5b9f9ea524bf0c36e4a4bc3e01f557f2e18486b5278fe10e3bcf10dbc7568768c0e95529885bcdca6bcf04021ad5261bd1e6a3aeae5eb95b9d54801
 SHA512 
c01aea837b13429d17688455b813947342ca1cabba19b22e13ce640c77e68335a6d410280a8298595e239131e6fcbb655fa6de5ff9857eac99aa175046a450cd
-DIST multipath-tools-0.8.8-no-compress-man-pages.patch.bz2 2493 BLAKE2B 
08d77d6524861a590e07e3e9eedb1039c9b15b589becd912f17f37f728a751c7566699540c025aa1f8a0b2e04db551b0093d066f6e340a15309794fdde197483
 SHA512 
662f32ba5437be2a3cfffc5a466dccb7923668eeef5f23112b31d6c1b43eca2917579729e975cfbe4cd60ecfaf547f534d304626ac19d165bb2f1a3ae4bb1cc6
-DIST multipath-tools-0.8.8.tar.gz 527412 BLAKE2B 
15e24a04ff1c41c8562033ca22214c015ab4c4a9e9833323830b665793c1964b6fcb7b710761bf501f0e99d461d6e6c7dfe80851a0ded4d99693a1561490598f
 SHA512 
f09932da93b6ab06f0f911b09c605ea931fb8cb8b5530efd21a41056fb48e944fc245dfe20096b2746ce1c9ebb5b548e1182079a3b52659d33263a441969
 DIST multipath-tools-0.8.9.tar.gz 534866 BLAKE2B 
b5ebf3c393f6b60e85678ac07378ae07056b6777409fc1bc4f4133cdd3f8c75a3d76f6e9342208df7fed8fe7812b089eba8f6b769e47e1dd6c8b7fd321bdbd30
 SHA512 
25f2a5d436af6a343804988cef45ca1574d4a981655a2b91563ddb89138619158befdf5af92d836a17c95d6dcf901072b614473c2129274e5dcdb1a1d64edb4d

diff --git 
a/sys-fs/multipath-tools/files/multipath-tools-0.8.5-respect-flags.patch 
b/sys-fs/multipath-tools/files/multipath-tools-0.8.5-respect-flags.patch
deleted file mode 100644
index 20d9fef6f3f1..
--- a/sys-fs/multipath-tools/files/multipath-tools-0.8.5-respect-flags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
 multipath-tools-0.8.5-eecfcba/Makefile.inc
-+++ multipath-tools-0.8.5-eecfcba/Makefile.inc
-@@ -98,7 +98,8 @@
- -Werror=implicit-function-declaration -Werror=format-security 
\
- $(WNOCLOBBERED) -Werror=cast-qual 
$(ERROR_DISCARDED_QUALIFIERS)
- CPPFLAGS  := -Wp,-D_FORTIFY_SOURCE=2 
--CFLAGS:= --std=gnu99 $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe 
\
-+CFLAGS?= $(OPTFLAGS) $(WARNFLAGS) -pipe
-+CFLAGS+= --std=gnu99 \
-  -DBIN_DIR=\"$(bindir)\" -DLIB_STRING=\"${LIB}\" 
-DRUN_DIR=\"${RUN}\" \
-  -MMD -MP
- BIN_CFLAGS= -fPIE -DPIE

diff --git 
a/sys-fs/multipath-tools/files/multipath-tools-0.8.6-no-compress-man-pages.patch
 
b/sys-fs/multipath-tools/files/multipath-tools-0.8.6-no-compress-man-pages.patch
deleted file mode 100644
index d8521436d955..
--- 
a/sys-fs/multipath-tools/files/multipath-tools-0.8.6-no-compress-man-pages.patch
+++ /dev/null
@@ -1,226 +0,0 @@
-From 80cca1a75f24ee239ace5577d49ccfec511480ca Mon Sep 17 00:00:00 2001
-From: Sam James 
-Date: Mon, 12 Jul 2021 06:04:04 +0100
-Subject: [PATCH] Don't compress man pages
-

- kpartx/Makefile  |  5 ++---
- libdmmp/Makefile | 13 -
- libmpathpersist/Makefile | 14 +-
- mpathpersist/Makefile|  5 ++---
- multipath/Makefile   | 10 --
- multipathd/Makefile  |  5 ++---
- 6 files changed, 19 insertions(+), 33 deletions(-)
-
-diff --git a/kpartx/Makefile b/kpartx/Makefile
-index 2906a98..cd351a4 100644
 a/kpartx/Makefile
-+++ b/kpartx/Makefile
-@@ -21,7 +21,6 @@ all: $(EXEC)
- 
- $(EXEC): $(OBJS)
-   $(CC) $(CFLAGS) $(OBJS) -o $(EXEC) $(LDFLAGS) $(LIBDEPS)
--  $(GZIP) $(EXEC).8 > $(EXEC).8.gz
- 
- install: $(EXEC) $(EXEC).8
-   $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
-@@ -33,11 +32,11 @@ install: $(EXEC) $(EXEC).8
-   $(INSTALL_PROGRAM) -m 644 kpartx.rules 
$(DESTDIR)$(libudevdir)/rules.d/66-kpartx.rules
-   

[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2022-05-19 Thread WANG Xuerui
commit: a1031ab4a1f8f3cf2fb3c252ebed2a03c5e5
Author: WANG Xuerui  gentoo  org>
AuthorDate: Thu May 19 11:18:19 2022 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Thu May 19 11:18:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1031ab4

sys-fs/multipath-tools: keyword 0.8.9 for ~loong

Signed-off-by: WANG Xuerui  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild
index 55bb66af418a..4d67993c2e86 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild
@@ -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 ppc ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86"
 IUSE="systemd rbd test"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2022-05-05 Thread Jakov Smolić
commit: cd67046ba4fa9092f50ba28799970eed7cc8be3e
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu May  5 07:06:00 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu May  5 07:06:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd67046b

sys-fs/multipath-tools: Stabilize 0.8.9 arm64, #841548

Signed-off-by: Jakov Smolić  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild
index 469441fe3715..55bb66af418a 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild
@@ -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 ppc ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv x86"
 IUSE="systemd rbd test"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2022-04-29 Thread Sam James
commit: 2f01b4812a4388a550a6a731e2d7eb2cba89e17f
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr 29 19:20:26 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr 29 19:20:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f01b481

sys-fs/multipath-tools: Stabilize 0.8.9 ppc64, #841548

Signed-off-by: Sam James  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild
index 94287e5ef9a9..469441fe3715 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild
@@ -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 ppc ~ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv x86"
 IUSE="systemd rbd test"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2022-04-29 Thread Sam James
commit: 78b7787d99518bedfea54704411800b98593ba81
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr 29 19:19:38 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr 29 19:19:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78b7787d

sys-fs/multipath-tools: Stabilize 0.8.9 ppc, #841548

Signed-off-by: Sam James  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild
index b83215e308a0..94287e5ef9a9 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild
@@ -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 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~riscv x86"
 IUSE="systemd rbd test"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2022-04-29 Thread Jakov Smolić
commit: c108555d766305a7544db595e9b63c24e5c21fb3
Author: Jakov Smolić  gentoo  org>
AuthorDate: Fri Apr 29 08:29:20 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Fri Apr 29 08:29:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c108555d

sys-fs/multipath-tools: Stabilize 0.8.9 x86, #841548

Signed-off-by: Jakov Smolić  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild
index 7aa805ea644a..b83215e308a0 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild
@@ -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 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv x86"
 IUSE="systemd rbd test"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2022-04-29 Thread Jakov Smolić
commit: e281833a03e66bdcf30625f85de0736f820d2e54
Author: Jakov Smolić  gentoo  org>
AuthorDate: Fri Apr 29 08:28:13 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Fri Apr 29 08:28:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e281833a

sys-fs/multipath-tools: Stabilize 0.8.9 amd64, #841548

Signed-off-by: Jakov Smolić  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild
index 232f231a81dd..7aa805ea644a 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild
@@ -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 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="systemd rbd test"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2022-03-22 Thread Sam James
commit: cd9a778fc96d27f3c56d845949344873e674dd11
Author: Sam James  gentoo  org>
AuthorDate: Tue Mar 22 22:48:07 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar 22 23:26:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd9a778f

sys-fs/multipath-tools: add 0.8.9

Signed-off-by: Sam James  gentoo.org>

 sys-fs/multipath-tools/Manifest|  1 +
 .../multipath-tools/multipath-tools-0.8.9.ebuild   | 88 ++
 2 files changed, 89 insertions(+)

diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index d2ac6728b539..b3e04b797c89 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -2,3 +2,4 @@ DIST multipath-tools-0.8.6.tar.gz 519405 BLAKE2B 
5aed36550c76bbde0e874e37356b6c5
 DIST multipath-tools-0.8.7.tar.gz 523535 BLAKE2B 
3f59af86f5b9f9ea524bf0c36e4a4bc3e01f557f2e18486b5278fe10e3bcf10dbc7568768c0e95529885bcdca6bcf04021ad5261bd1e6a3aeae5eb95b9d54801
 SHA512 
c01aea837b13429d17688455b813947342ca1cabba19b22e13ce640c77e68335a6d410280a8298595e239131e6fcbb655fa6de5ff9857eac99aa175046a450cd
 DIST multipath-tools-0.8.8-no-compress-man-pages.patch.bz2 2493 BLAKE2B 
08d77d6524861a590e07e3e9eedb1039c9b15b589becd912f17f37f728a751c7566699540c025aa1f8a0b2e04db551b0093d066f6e340a15309794fdde197483
 SHA512 
662f32ba5437be2a3cfffc5a466dccb7923668eeef5f23112b31d6c1b43eca2917579729e975cfbe4cd60ecfaf547f534d304626ac19d165bb2f1a3ae4bb1cc6
 DIST multipath-tools-0.8.8.tar.gz 527412 BLAKE2B 
15e24a04ff1c41c8562033ca22214c015ab4c4a9e9833323830b665793c1964b6fcb7b710761bf501f0e99d461d6e6c7dfe80851a0ded4d99693a1561490598f
 SHA512 
f09932da93b6ab06f0f911b09c605ea931fb8cb8b5530efd21a41056fb48e944fc245dfe20096b2746ce1c9ebb5b548e1182079a3b52659d33263a441969
+DIST multipath-tools-0.8.9.tar.gz 534866 BLAKE2B 
b5ebf3c393f6b60e85678ac07378ae07056b6777409fc1bc4f4133cdd3f8c75a3d76f6e9342208df7fed8fe7812b089eba8f6b769e47e1dd6c8b7fd321bdbd30
 SHA512 
25f2a5d436af6a343804988cef45ca1574d4a981655a2b91563ddb89138619158befdf5af92d836a17c95d6dcf901072b614473c2129274e5dcdb1a1d64edb4d

diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild
new file mode 100644
index ..232f231a81dd
--- /dev/null
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit linux-info systemd 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 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="systemd rbd 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:0=
+   rbd? ( sys-cluster/ceph )
+   systemd? ( sys-apps/systemd )
+"
+DEPEND="${RDEPEND}
+   test? ( dev-util/cmocka )"
+BDEPEND="virtual/pkgconfig"
+
+CONFIG_CHECK="~DM_MULTIPATH"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-0.8.7-respect-flags.patch
+)
+
+src_prepare() {
+   default
+
+   # The upstream lacks any way to configure the build at present
+   # and ceph is a huge dependency, so we're using sed to make it
+   # optional until the upstream has a proper configure system
+   if ! use rbd ; then
+   sed \
+   -e "s/libcheckrbd.so/# libcheckrbd.so/" \
+   -e "s/-lrados//" \
+   -i libmultipath/checkers/Makefile \
+   || die
+   fi
+}
+
+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 \
+   LIB="${EPREFIX}/$(get_libdir)" \
+   LIBDM_API_FLUSH=1 \
+   PKGCONFIG="$(tc-getPKG_CONFIG)"
+}
+
+src_install() {
+   dodir /sbin /usr/share/man/man{3,5,8}
+   emake \
+   DESTDIR="${D}" \
+   LIB="${EPREFIX}/$(get_libdir)" \
+   RUN=run \
+   unitdir="$(systemd_get_systemunitdir)" \
+   libudevdir='${prefix}'/"$(get_udevdir)" \
+   pkgconfdir='${prefix}'/usr/'${LIB}'/pkgconfig \
+   install
+
+   newinitd "${FILESDIR}"/multipathd-r1.rc multipathd
+   newinitd "${FILESDIR}"/multipath.rc multipath
+
+   einstalldocs
+
+   find "${ED}" -type f -name "*.la" -delete || die
+}
+
+pkg_postinst() {
+   if [[ -z ${REPLACING_VERSIONS} ]] ; then
+   elog "If you need multipath on your system, you must"
+   elog "add 'multipath' into your boot runlevel!"
+   fi
+}



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2022-01-23 Thread Yixun Lan
commit: 659259e31f11f84a40be6b3806e9bfc059be45b4
Author: Yongxiang Liang  gmail  com>
AuthorDate: Sun Jan  9 12:02:25 2022 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Sun Jan 23 08:04:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=659259e3

sys-fs/multipath-tools: keyword ~riscv

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Yongxiang Liang  gmail.com>
Signed-off-by: Yixun Lan  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.8.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.8.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.8.8.ebuild
index 303eac62b7c9..f0a18e273bed 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.8.8.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-0.8.8-n
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="systemd rbd test"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2021-12-31 Thread Sam James
commit: 44f7577fa69164461cd3a07844fd0843d76f8c39
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan  1 04:23:52 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan  1 04:28:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44f7577f

sys-fs/multipath-tools: add 0.8.8

Signed-off-by: Sam James  gentoo.org>

 sys-fs/multipath-tools/Manifest|  2 +
 .../multipath-tools/multipath-tools-0.8.8.ebuild   | 90 ++
 2 files changed, 92 insertions(+)

diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index 0a206de7b658..d2ac6728b539 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -1,2 +1,4 @@
 DIST multipath-tools-0.8.6.tar.gz 519405 BLAKE2B 
5aed36550c76bbde0e874e37356b6c5a80a80b876b56dadb69ce09f0fb049a7097fd1c0aca5076f816848e2c2660f96680d7f16d56918a25299017b39f76f777
 SHA512 
82e5b7307e599ba6b059679c3987a442fb5be4885f0a27c260a99a07cb336b88d48e314b4ec951944e0200e4731522d8da043d98fa566857ecc6d100791c0e38
 DIST multipath-tools-0.8.7.tar.gz 523535 BLAKE2B 
3f59af86f5b9f9ea524bf0c36e4a4bc3e01f557f2e18486b5278fe10e3bcf10dbc7568768c0e95529885bcdca6bcf04021ad5261bd1e6a3aeae5eb95b9d54801
 SHA512 
c01aea837b13429d17688455b813947342ca1cabba19b22e13ce640c77e68335a6d410280a8298595e239131e6fcbb655fa6de5ff9857eac99aa175046a450cd
+DIST multipath-tools-0.8.8-no-compress-man-pages.patch.bz2 2493 BLAKE2B 
08d77d6524861a590e07e3e9eedb1039c9b15b589becd912f17f37f728a751c7566699540c025aa1f8a0b2e04db551b0093d066f6e340a15309794fdde197483
 SHA512 
662f32ba5437be2a3cfffc5a466dccb7923668eeef5f23112b31d6c1b43eca2917579729e975cfbe4cd60ecfaf547f534d304626ac19d165bb2f1a3ae4bb1cc6
+DIST multipath-tools-0.8.8.tar.gz 527412 BLAKE2B 
15e24a04ff1c41c8562033ca22214c015ab4c4a9e9833323830b665793c1964b6fcb7b710761bf501f0e99d461d6e6c7dfe80851a0ded4d99693a1561490598f
 SHA512 
f09932da93b6ab06f0f911b09c605ea931fb8cb8b5530efd21a41056fb48e944fc245dfe20096b2746ce1c9ebb5b548e1182079a3b52659d33263a441969

diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.8.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.8.8.ebuild
new file mode 100644
index ..303eac62b7c9
--- /dev/null
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.8.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit linux-info systemd 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"
+SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-0.8.8-no-compress-man-pages.patch.bz2;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="systemd rbd 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:0=
+   rbd? ( sys-cluster/ceph )
+   systemd? ( sys-apps/systemd )
+"
+DEPEND="${RDEPEND}
+   test? ( dev-util/cmocka )"
+BDEPEND="virtual/pkgconfig"
+
+CONFIG_CHECK="~DM_MULTIPATH"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-0.8.7-respect-flags.patch
+   "${WORKDIR}"/${PN}-0.8.8-no-compress-man-pages.patch
+)
+
+src_prepare() {
+   default
+
+   # The upstream lacks any way to configure the build at present
+   # and ceph is a huge dependency, so we're using sed to make it
+   # optional until the upstream has a proper configure system
+   if ! use rbd ; then
+   sed \
+   -e "s/libcheckrbd.so/# libcheckrbd.so/" \
+   -e "s/-lrados//" \
+   -i libmultipath/checkers/Makefile \
+   || die
+   fi
+}
+
+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 \
+   LIB="${EPREFIX}/$(get_libdir)" \
+   LIBDM_API_FLUSH=1 \
+   PKGCONFIG="$(tc-getPKG_CONFIG)"
+}
+
+src_install() {
+   dodir /sbin /usr/share/man/man{3,5,8}
+   emake \
+   DESTDIR="${D}" \
+   LIB="${EPREFIX}/$(get_libdir)" \
+   RUN=run \
+   unitdir="$(systemd_get_systemunitdir)" \
+   libudevdir='${prefix}'/"$(get_udevdir)" \
+   pkgconfdir='${prefix}'/usr/'${LIB}'/pkgconfig \
+   install
+
+   newinitd "${FILESDIR}"/multipathd-r1.rc multipathd
+   newinitd "${FILESDIR}"/multipath.rc multipath
+
+   einstalldocs
+
+   find "${ED}" -type f -name "*.la" -delete || die
+}
+
+pkg_postinst() {
+   if [[ -z ${REPLACING_VERSIONS} ]] ; then
+   elog "If you need multipath on your system, you must"
+

[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2021-12-05 Thread Sam James
commit: 7c340c9bf525bf559f85a57cd795e71ddd23a951
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec  5 18:36:33 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec  5 18:36:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c340c9b

sys-fs/multipath-tools: Stabilize 0.8.7 ppc, #828264

Signed-off-by: Sam James  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.8.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.7.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.8.7.ebuild
index 8cb60e532019..8e27d72203e6 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.8.7.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.7.ebuild
@@ -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 ~ppc ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86"
 IUSE="systemd rbd test"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2021-12-05 Thread Sam James
commit: ac8eb7a44b57ab50ccde7f1f34341371023f7f9d
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec  5 18:29:49 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec  5 18:29:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac8eb7a4

sys-fs/multipath-tools: Stabilize 0.8.7 x86, #828264

Signed-off-by: Sam James  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.8.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.7.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.8.7.ebuild
index cdd34d774b22..3fa1724a90fb 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.8.7.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.7.ebuild
@@ -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 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
 IUSE="systemd rbd test"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2021-12-04 Thread Sam James
commit: 7d0bcd807c503ff93905c0583992d95150a3f045
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec  5 03:44:41 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec  5 03:44:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d0bcd80

sys-fs/multipath-tools: Stabilize 0.8.7 amd64, #828264

Signed-off-by: Sam James  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.8.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.7.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.8.7.ebuild
index b078cc97d9d7..cdd34d774b22 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.8.7.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.7.ebuild
@@ -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 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="systemd rbd test"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/, sys-fs/multipath-tools/files/

2021-09-19 Thread Sam James
commit: a71d4395773257f18b8b61624bf006097b072c92
Author: Sam James  gentoo  org>
AuthorDate: Mon Sep 20 04:12:31 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Sep 20 04:12:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a71d4395

sys-fs/multipath-tools: add 0.8.7

Signed-off-by: Sam James  gentoo.org>

 sys-fs/multipath-tools/Manifest|  1 +
 .../multipath-tools-0.8.7-respect-flags.patch  | 14 
 .../multipath-tools/multipath-tools-0.8.7.ebuild   | 89 ++
 3 files changed, 104 insertions(+)

diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index 8ccd861e78f..0a206de7b65 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -1 +1,2 @@
 DIST multipath-tools-0.8.6.tar.gz 519405 BLAKE2B 
5aed36550c76bbde0e874e37356b6c5a80a80b876b56dadb69ce09f0fb049a7097fd1c0aca5076f816848e2c2660f96680d7f16d56918a25299017b39f76f777
 SHA512 
82e5b7307e599ba6b059679c3987a442fb5be4885f0a27c260a99a07cb336b88d48e314b4ec951944e0200e4731522d8da043d98fa566857ecc6d100791c0e38
+DIST multipath-tools-0.8.7.tar.gz 523535 BLAKE2B 
3f59af86f5b9f9ea524bf0c36e4a4bc3e01f557f2e18486b5278fe10e3bcf10dbc7568768c0e95529885bcdca6bcf04021ad5261bd1e6a3aeae5eb95b9d54801
 SHA512 
c01aea837b13429d17688455b813947342ca1cabba19b22e13ce640c77e68335a6d410280a8298595e239131e6fcbb655fa6de5ff9857eac99aa175046a450cd

diff --git 
a/sys-fs/multipath-tools/files/multipath-tools-0.8.7-respect-flags.patch 
b/sys-fs/multipath-tools/files/multipath-tools-0.8.7-respect-flags.patch
new file mode 100644
index 000..43c03883ee0
--- /dev/null
+++ b/sys-fs/multipath-tools/files/multipath-tools-0.8.7-respect-flags.patch
@@ -0,0 +1,14 @@
+--- a/Makefile.inc
 b/Makefile.inc
+@@ -101,8 +101,9 @@ OPTFLAGS   := -O2 -g $(STACKPROT) --param=ssp-buffer-size=4
+ WARNFLAGS := -Werror -Wall -Wextra -Wformat=2 $(WFORMATOVERFLOW) 
-Werror=implicit-int \
+ -Werror=implicit-function-declaration -Werror=format-security 
\
+ $(WNOCLOBBERED) -Werror=cast-qual 
$(ERROR_DISCARDED_QUALIFIERS)
+-CPPFLAGS  := -Wp,-D_FORTIFY_SOURCE=2
+-CFLAGS:= --std=gnu99 $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe 
\
++CPPFLAGS  ?= -Wp,-D_FORTIFY_SOURCE=2
++CFLAGS?= --std=gnu99 $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe
++CFLAGS+= --std=gnu99 \
+  -DBIN_DIR=\"$(bindir)\" -DLIB_STRING=\"${LIB}\" 
-DRUN_DIR=\"${RUN}\" \
+  -MMD -MP
+ BIN_CFLAGS= -fPIE -DPIE

diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.7.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.8.7.ebuild
new file mode 100644
index 000..b078cc97d9d
--- /dev/null
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.7.ebuild
@@ -0,0 +1,89 @@
+# 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
+
+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 ~ppc ~ppc64 ~x86"
+IUSE="systemd rbd 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:0=
+   rbd? ( sys-cluster/ceph )
+   systemd? ( sys-apps/systemd )
+"
+DEPEND="${RDEPEND}
+   test? ( dev-util/cmocka )"
+BDEPEND="virtual/pkgconfig"
+
+CONFIG_CHECK="~DM_MULTIPATH"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-0.8.7-respect-flags.patch
+   "${FILESDIR}"/${PN}-0.8.6-no-compress-man-pages.patch
+)
+
+src_prepare() {
+   default
+
+   # The upstream lacks any way to configure the build at present
+   # and ceph is a huge dependency, so we're using sed to make it
+   # optional until the upstream has a proper configure system
+   if ! use rbd ; then
+   sed \
+   -e "s/libcheckrbd.so/# libcheckrbd.so/" \
+   -e "s/-lrados//" \
+   -i libmultipath/checkers/Makefile \
+   || die
+   fi
+}
+
+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 \
+   LIB="${EPREFIX}/$(get_libdir)" \
+   LIBDM_API_FLUSH=1 \
+   PKGCONFIG="$(tc-getPKG_CONFIG)"
+}
+
+src_install() {
+   dodir /sbin /usr/share/man/man{3,5,8}
+   emake \
+   DESTDIR="${D}" \
+   LIB="${EPREFIX}/$(get_libdir)" \
+   RUN=run \
+   unitdir="$(systemd_get_systemunitdir)" \
+   libudevdir='${prefix}'/"$(get_udevdir)" \
+ 

[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2021-09-04 Thread David Seifert
commit: b96fc81d63111dd856fc4b30711b2fe4ab3f53d4
Author: David Seifert  gentoo  org>
AuthorDate: Sat Sep  4 17:34:19 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Sep  4 17:34:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b96fc81d

sys-fs/multipath-tools: drop 0.8.6

Signed-off-by: David Seifert  gentoo.org>

 .../multipath-tools/multipath-tools-0.8.6.ebuild   | 92 --
 1 file changed, 92 deletions(-)

diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.6.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.8.6.ebuild
deleted file mode 100644
index 490dda93c85..000
--- a/sys-fs/multipath-tools/multipath-tools-0.8.6.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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
-
-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 ppc ppc64 x86"
-IUSE="systemd rbd"
-
-BDEPEND="virtual/pkgconfig"
-
-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:0=
-   rbd? ( sys-cluster/ceph )
-   systemd? ( sys-apps/systemd )
-"
-
-DEPEND="${RDEPEND}"
-
-CONFIG_CHECK="~DM_MULTIPATH"
-
-RESTRICT="test"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-0.8.5-respect-flags.patch
-)
-
-get_systemd_pv() {
-   use systemd && \
-   $(tc-getPKG_CONFIG) --modversion systemd
-}
-
-src_prepare() {
-   default
-
-   # The upstream lacks any way to configure the build at present
-   # and ceph is a huge dependency, so we're using sed to make it
-   # optional until the upstream has a proper configure system
-   if ! use rbd ; then
-   sed \
-   -e "s/libcheckrbd.so/# libcheckrbd.so/" \
-   -e "s/-lrados//" \
-   -i libmultipath/checkers/Makefile \
-   || die
-   fi
-}
-
-src_compile() {
-   # LIBDM_API_FLUSH involves grepping files in /usr/include,
-   # so force the test to go the way we want #411337.
-   emake \
-   CC="$(tc-getCC)" \
-   LIBDM_API_FLUSH=1 SYSTEMD="$(get_systemd_pv)"
-}
-
-src_install() {
-   dodir /sbin /usr/share/man/man{3,5,8}
-   emake \
-   DESTDIR="${D}" \
-   RUN=run \
-   SYSTEMD=$(get_systemd_pv) \
-   unitdir="$(systemd_get_systemunitdir)" \
-   libudevdir='${prefix}'/"$(get_udevdir)" \
-   pkgconfdir='${prefix}'/usr/'${LIB}'/pkgconfig \
-   install
-
-   newinitd "${FILESDIR}"/multipathd-r1.rc multipathd
-   newinitd "${FILESDIR}"/multipath.rc multipath
-
-   einstalldocs
-
-   find "${ED}" -type f -name "*.la" -delete || die
-}
-
-pkg_postinst() {
-   if [[ -z ${REPLACING_VERSIONS} ]] ; then
-   elog "If you need multipath on your system, you must"
-   elog "add 'multipath' into your boot runlevel!"
-   fi
-}



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2021-08-04 Thread Agostino Sarubbo
commit: 0c9d264b75791a3810944848ea5df2a76bd17a10
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Aug  4 06:38:23 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Aug  4 06:38:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c9d264b

sys-fs/multipath-tools: amd64 stable wrt bug #801121

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.8.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.6-r1.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.8.6-r1.ebuild
index 846aa744261..e8862ae6779 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.8.6-r1.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.6-r1.ebuild
@@ -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 ppc ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 x86"
 IUSE="systemd rbd test"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2021-08-01 Thread Agostino Sarubbo
commit: 03b039f725e9717468ab12f6a307ee44da7b2a93
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Aug  2 04:02:20 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Aug  2 04:02:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03b039f7

sys-fs/multipath-tools: ppc stable wrt bug #801121

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.8.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.6-r1.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.8.6-r1.ebuild
index b40dd1c778f..846aa744261 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.8.6-r1.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.6-r1.ebuild
@@ -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 ~ppc ppc64 x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ppc ppc64 x86"
 IUSE="systemd rbd test"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2021-08-01 Thread Sam James
commit: 709f336b1f2b927f87bff34692631cdc5ead434d
Author: Sam James  gentoo  org>
AuthorDate: Mon Aug  2 02:24:42 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug  2 02:24:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=709f336b

sys-fs/multipath-tools: Stabilize 0.8.6-r1 arm64, #801121

Signed-off-by: Sam James  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.8.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.6-r1.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.8.6-r1.ebuild
index 7a3d1e0718c..b40dd1c778f 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.8.6-r1.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.6-r1.ebuild
@@ -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 ~ppc ppc64 x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ppc64 x86"
 IUSE="systemd rbd test"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2021-08-01 Thread Sam James
commit: 558e575ed6eb662d321342cb6829fbe6b36cecdb
Author: Sam James  gentoo  org>
AuthorDate: Sun Aug  1 17:40:08 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Aug  1 17:44:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=558e575e

sys-fs/multipath-tools: Stabilize 0.8.6-r1 x86, #801121

Signed-off-by: Sam James  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.8.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.6-r1.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.8.6-r1.ebuild
index 1efadc2048f..7a3d1e0718c 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.8.6-r1.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.6-r1.ebuild
@@ -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 ~ppc ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 x86"
 IUSE="systemd rbd test"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2021-08-01 Thread Agostino Sarubbo
commit: 1a7e7e3bf1adee8bf0cabf5e83332c22248fdf22
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Aug  1 08:08:08 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Aug  1 08:08:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a7e7e3b

sys-fs/multipath-tools: ppc64 stable wrt bug #801121

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.8.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.6-r1.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.8.6-r1.ebuild
index 8dff4dda6bf..1efadc2048f 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.8.6-r1.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.6-r1.ebuild
@@ -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 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 ~x86"
 IUSE="systemd rbd test"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/, sys-fs/multipath-tools/files/

2021-05-26 Thread David Seifert
commit: 3381fddc644bbd30231d73c7e5818555f33d2da8
Author: David Seifert  gentoo  org>
AuthorDate: Wed May 26 08:33:08 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Wed May 26 08:33:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3381fddc

sys-fs/multipath-tools: drop 0.8.3-r2

Signed-off-by: David Seifert  gentoo.org>

 sys-fs/multipath-tools/Manifest|   1 -
 .../multipath-tools-0.7.5-respect-flags.patch  |  19 ---
 ...path-tools-0.8.3-fix-gcc-10-compatibility.patch |  11 --
 .../files/multipath-tools-0.8.3-json-c-0.14.patch  |  28 
 .../multipath-tools-0.8.3-no-gziped-docs.patch | 175 -
 .../multipath-tools-0.8.3-r2.ebuild|  93 ---
 6 files changed, 327 deletions(-)

diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index 752b9ac0800..8ccd861e78f 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -1,2 +1 @@
-DIST multipath-tools-0.8.3.tar.gz 465248 BLAKE2B 
21a7a18c70150b4422bdd0ae02f26f491845eb06928ab74e631df8c6b3c110d10f43f75b9f8289a7134826c923b7ba58ce54c40497c3b7e6211e53902c8a1b5f
 SHA512 
d9fdc2763f5a1efa15ee07c5d863008c9694623935f62a0e0b56f941df4e0d0ca3f86056fefc9b5ca828b47782127e3d55f2f925b1ed957e02b675bef36f4cae
 DIST multipath-tools-0.8.6.tar.gz 519405 BLAKE2B 
5aed36550c76bbde0e874e37356b6c5a80a80b876b56dadb69ce09f0fb049a7097fd1c0aca5076f816848e2c2660f96680d7f16d56918a25299017b39f76f777
 SHA512 
82e5b7307e599ba6b059679c3987a442fb5be4885f0a27c260a99a07cb336b88d48e314b4ec951944e0200e4731522d8da043d98fa566857ecc6d100791c0e38

diff --git 
a/sys-fs/multipath-tools/files/multipath-tools-0.7.5-respect-flags.patch 
b/sys-fs/multipath-tools/files/multipath-tools-0.7.5-respect-flags.patch
deleted file mode 100644
index fef55ce31e9..000
--- a/sys-fs/multipath-tools/files/multipath-tools-0.7.5-respect-flags.patch
+++ /dev/null
@@ -1,19 +0,0 @@
 multipath-tools-0.7.5/Makefile.inc
-+++ multipath-tools-0.7.5/Makefile.inc
-@@ -91,12 +91,13 @@
- -Wp,-D_FORTIFY_SOURCE=2 $(STACKPROT) \
- --param=ssp-buffer-size=4
- 
--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/files/multipath-tools-0.8.3-fix-gcc-10-compatibility.patch
 
b/sys-fs/multipath-tools/files/multipath-tools-0.8.3-fix-gcc-10-compatibility.patch
deleted file mode 100644
index 18ed8d65e0f..000
--- 
a/sys-fs/multipath-tools/files/multipath-tools-0.8.3-fix-gcc-10-compatibility.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 a/libmultipath/structs.h
-+++ b/libmultipath/structs.h
-@@ -106,7 +106,7 @@ enum yes_no_undef_states {
-  * _FIND_MULTIPATHS_F must have the same value as YNU_YES.
-  * Generate a compile time error if that isn't the case.
-  */
--char ___error1___[-(_FIND_MULTIPATHS_F != YNU_YES)];
-+extern char ___error1___[-(_FIND_MULTIPATHS_F != YNU_YES)];
- 
- #define find_multipaths_on(conf) \
-   (!!((conf)->find_multipaths & _FIND_MULTIPATHS_F))

diff --git 
a/sys-fs/multipath-tools/files/multipath-tools-0.8.3-json-c-0.14.patch 
b/sys-fs/multipath-tools/files/multipath-tools-0.8.3-json-c-0.14.patch
deleted file mode 100644
index 34d02f7b5d7..000
--- a/sys-fs/multipath-tools/files/multipath-tools-0.8.3-json-c-0.14.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 8438a9cd8d7ed88645fa8e6a8f19c0fd9ae872a7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= 
-Date: Mon, 13 Apr 2020 19:22:02 +0200
-Subject: [PATCH] Add support for upcoming json-c 0.14.0.
-
-TRUE/FALSE are not defined anymore.  1 and 0 are used instead.
-This is backwards compatible, as earlier versions of json-c are
-using the same integer values in their present definitions.

- libdmmp/libdmmp_private.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libdmmp/libdmmp_private.h b/libdmmp/libdmmp_private.h
-index ac85b63f..4378962b 100644
 a/libdmmp/libdmmp_private.h
-+++ b/libdmmp/libdmmp_private.h
-@@ -82,7 +82,7 @@ static out_type func_name(struct dmmp_context *ctx, const 
char *var_name) { \
- do { \
-   json_type j_type = json_type_null; \
-   json_object *j_obj_tmp = NULL; \
--  if (json_object_object_get_ex(j_obj, key, _obj_tmp) != TRUE) { \
-+  if (json_object_object_get_ex(j_obj, key, _obj_tmp) != 1) { \
-   _error(ctx, "Invalid JSON output from multipathd IPC: " \
-  

[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2021-05-26 Thread Sam James
commit: 4d4d6435be27b1041731dfb0a5631ce27a5e4bda
Author: Sam James  gentoo  org>
AuthorDate: Wed May 26 08:04:53 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 26 08:10:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d4d6435

sys-fs/multipath-tools: Stabilize 0.8.6 ppc64, #791640

Signed-off-by: Sam James  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.8.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.6.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.8.6.ebuild
index 8020d16d041..490dda93c85 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.8.6.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.6.ebuild
@@ -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 ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 x86"
 IUSE="systemd rbd"
 
 BDEPEND="virtual/pkgconfig"



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2021-05-26 Thread Sam James
commit: 41f6db5f3339a2c6dae852bc58cee171b5d837b3
Author: Sam James  gentoo  org>
AuthorDate: Wed May 26 08:02:09 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 26 08:03:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41f6db5f

sys-fs/multipath-tools: Stabilize 0.8.6 ppc, #791640

Signed-off-by: Sam James  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.8.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.6.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.8.6.ebuild
index 4cae3f46309..8020d16d041 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.8.6.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.6.ebuild
@@ -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 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 x86"
 IUSE="systemd rbd"
 
 BDEPEND="virtual/pkgconfig"



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2021-05-23 Thread Sam James
commit: 20920c10edca5543821f41781191d77b849cf02b
Author: Sam James  gentoo  org>
AuthorDate: Mon May 24 00:04:35 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May 24 00:04:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20920c10

sys-fs/multipath-tools: Stabilize 0.8.6 arm64, #791640

Signed-off-by: Sam James  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.8.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.6.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.8.6.ebuild
index d26e4dccc00..4cae3f46309 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.8.6.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.6.ebuild
@@ -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 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
 IUSE="systemd rbd"
 
 BDEPEND="virtual/pkgconfig"



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2021-05-23 Thread Agostino Sarubbo
commit: 7250360f7c80afa390be9a34040eb32c4a398325
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun May 23 23:03:56 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun May 23 23:03:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7250360f

sys-fs/multipath-tools: x86 stable wrt bug #791640

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.8.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.6.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.8.6.ebuild
index f0f90861c5c..d26e4dccc00 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.8.6.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.6.ebuild
@@ -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 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
 IUSE="systemd rbd"
 
 BDEPEND="virtual/pkgconfig"



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2021-05-23 Thread Agostino Sarubbo
commit: a5aec49c6b4d9e86d6cb45c8e3f16a729e8bed97
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun May 23 22:26:13 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun May 23 22:27:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5aec49c

sys-fs/multipath-tools: amd64 stable wrt bug #791640

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.8.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.6.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.8.6.ebuild
index ba7a9c7725f..f0f90861c5c 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.8.6.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.6.ebuild
@@ -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 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="systemd rbd"
 
 BDEPEND="virtual/pkgconfig"



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2021-05-14 Thread David Seifert
commit: 1f470755f28d6fe4e606c40314db3cc5e9817c6b
Author: David Seifert  gentoo  org>
AuthorDate: Fri May 14 22:13:38 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri May 14 22:13:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f470755

sys-fs/multipath-tools: drop 0.8.5

Signed-off-by: David Seifert  gentoo.org>

 sys-fs/multipath-tools/Manifest|  1 -
 .../multipath-tools/multipath-tools-0.8.5.ebuild   | 91 --
 2 files changed, 92 deletions(-)

diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index 5890da6bae6..752b9ac0800 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -1,3 +1,2 @@
 DIST multipath-tools-0.8.3.tar.gz 465248 BLAKE2B 
21a7a18c70150b4422bdd0ae02f26f491845eb06928ab74e631df8c6b3c110d10f43f75b9f8289a7134826c923b7ba58ce54c40497c3b7e6211e53902c8a1b5f
 SHA512 
d9fdc2763f5a1efa15ee07c5d863008c9694623935f62a0e0b56f941df4e0d0ca3f86056fefc9b5ca828b47782127e3d55f2f925b1ed957e02b675bef36f4cae
-DIST multipath-tools-0.8.5.tar.gz 494750 BLAKE2B 
a42d17a47631107433a1d0a9da69a0bb10d2125cb242d2125d67da18f6bc6231c9233b163dc1d07d88dcba9f912830c047fdee5b42435f59ea2976598a72fd75
 SHA512 
f62a09107ccb18ffab97139fe2dba3dc22450836d8669c4381a8bce4072672a027a3a1e687f33e374429bffa49b3ba4a54d1e52294044d7bc1f82ed5d5aaf760
 DIST multipath-tools-0.8.6.tar.gz 519405 BLAKE2B 
5aed36550c76bbde0e874e37356b6c5a80a80b876b56dadb69ce09f0fb049a7097fd1c0aca5076f816848e2c2660f96680d7f16d56918a25299017b39f76f777
 SHA512 
82e5b7307e599ba6b059679c3987a442fb5be4885f0a27c260a99a07cb336b88d48e314b4ec951944e0200e4731522d8da043d98fa566857ecc6d100791c0e38

diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.5.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.8.5.ebuild
deleted file mode 100644
index 963e074a5ac..000
--- a/sys-fs/multipath-tools/multipath-tools-0.8.5.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# 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
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="systemd rbd"
-
-BDEPEND="virtual/pkgconfig"
-
-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:0=
-   rbd? ( sys-cluster/ceph )
-   systemd? ( sys-apps/systemd )
-"
-
-DEPEND="${RDEPEND}"
-
-CONFIG_CHECK="~DM_MULTIPATH"
-
-RESTRICT="test"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-0.8.5-respect-flags.patch
-   "${FILESDIR}"/${PN}-0.8.3-no-gziped-docs.patch
-)
-
-get_systemd_pv() {
-   use systemd && \
-   $(tc-getPKG_CONFIG) --modversion systemd
-}
-
-src_prepare() {
-   default
-
-   # The upstream lacks any way to configure the build at present
-   # and ceph is a huge dependency, so we're using sed to make it
-   # optional until the upstream has a proper configure system
-   if ! use rbd ; then
-   sed \
-   -e "s/libcheckrbd.so/# libcheckrbd.so/" \
-   -e "s/-lrados//" \
-   -i libmultipath/checkers/Makefile \
-   || die
-   fi
-}
-
-src_compile() {
-   # LIBDM_API_FLUSH involves grepping files in /usr/include,
-   # so force the test to go the way we want #411337.
-   emake \
-   CC="$(tc-getCC)" \
-   LIBDM_API_FLUSH=1 SYSTEMD="$(get_systemd_pv)"
-}
-
-src_install() {
-   dodir /sbin /usr/share/man/man{3,5,8}
-   emake \
-   DESTDIR="${D}" \
-   RUN=run \
-   SYSTEMD=$(get_systemd_pv) \
-   unitdir="$(systemd_get_systemunitdir)" \
-   libudevdir='${prefix}'/"$(get_udevdir)" \
-   pkgconfdir='${prefix}'/usr/'${LIB}'/pkgconfig \
-   install
-
-   newinitd "${FILESDIR}"/multipathd-r1.rc multipathd
-   newinitd "${FILESDIR}"/multipath.rc multipath
-
-   einstalldocs
-}
-
-pkg_postinst() {
-   if [[ -z ${REPLACING_VERSIONS} ]]; then
-   elog "If you need multipath on your system, you must"
-   elog "add 'multipath' into your boot runlevel!"
-   fi
-}



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2021-04-21 Thread Sam James
commit: 6535d34b53d50fe55b67a29391cdaf3e977991e7
Author: Sam James  gentoo  org>
AuthorDate: Wed Apr 21 10:20:09 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Apr 21 18:50:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6535d34b

sys-fs/multipath-tools: drop duplicate toolchain-funcs inherit

Signed-off-by: Sam James  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.8.3-r2.ebuild | 4 ++--
 sys-fs/multipath-tools/multipath-tools-0.8.5.ebuild| 4 ++--
 sys-fs/multipath-tools/multipath-tools-0.8.6.ebuild| 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

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 ab5b8e5272a..2949cba6cbb 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 cd850ca74ae..963e074a5ac 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.6.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.8.6.ebuild
index 94634cdaa2a..ba7a9c7725f 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.8.6.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit linux-info systemd toolchain-funcs udev toolchain-funcs
+inherit linux-info systemd toolchain-funcs udev
 
 DESCRIPTION="Device mapper target autoconfig"
 HOMEPAGE="http://christophe.varoqui.free.fr/;



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2021-04-06 Thread Lars Wendler
commit: 1d5e4d144cac86df362a5535cf388aae65de0b79
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Apr  6 10:16:09 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Apr  6 10:17:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d5e4d14

sys-fs/multipath-tools: Bump to version 0.8.6

Signed-off-by: Lars Wendler  gentoo.org>

 sys-fs/multipath-tools/Manifest|  1 +
 .../multipath-tools/multipath-tools-0.8.6.ebuild   | 92 ++
 2 files changed, 93 insertions(+)

diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index 3791f6de0fa..bc6aed9719d 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -1,3 +1,4 @@
 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
+DIST multipath-tools-0.8.6.tar.gz 519405 BLAKE2B 
5aed36550c76bbde0e874e37356b6c5a80a80b876b56dadb69ce09f0fb049a7097fd1c0aca5076f816848e2c2660f96680d7f16d56918a25299017b39f76f777
 SHA512 
82e5b7307e599ba6b059679c3987a442fb5be4885f0a27c260a99a07cb336b88d48e314b4ec951944e0200e4731522d8da043d98fa566857ecc6d100791c0e38

diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.6.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.8.6.ebuild
new file mode 100644
index 000..94634cdaa2a
--- /dev/null
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.6.ebuild
@@ -0,0 +1,92 @@
+# 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 toolchain-funcs
+
+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 ~ppc ~ppc64 ~x86"
+IUSE="systemd rbd"
+
+BDEPEND="virtual/pkgconfig"
+
+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:0=
+   rbd? ( sys-cluster/ceph )
+   systemd? ( sys-apps/systemd )
+"
+
+DEPEND="${RDEPEND}"
+
+CONFIG_CHECK="~DM_MULTIPATH"
+
+RESTRICT="test"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-0.8.5-respect-flags.patch
+)
+
+get_systemd_pv() {
+   use systemd && \
+   $(tc-getPKG_CONFIG) --modversion systemd
+}
+
+src_prepare() {
+   default
+
+   # The upstream lacks any way to configure the build at present
+   # and ceph is a huge dependency, so we're using sed to make it
+   # optional until the upstream has a proper configure system
+   if ! use rbd ; then
+   sed \
+   -e "s/libcheckrbd.so/# libcheckrbd.so/" \
+   -e "s/-lrados//" \
+   -i libmultipath/checkers/Makefile \
+   || die
+   fi
+}
+
+src_compile() {
+   # LIBDM_API_FLUSH involves grepping files in /usr/include,
+   # so force the test to go the way we want #411337.
+   emake \
+   CC="$(tc-getCC)" \
+   LIBDM_API_FLUSH=1 SYSTEMD="$(get_systemd_pv)"
+}
+
+src_install() {
+   dodir /sbin /usr/share/man/man{3,5,8}
+   emake \
+   DESTDIR="${D}" \
+   RUN=run \
+   SYSTEMD=$(get_systemd_pv) \
+   unitdir="$(systemd_get_systemunitdir)" \
+   libudevdir='${prefix}'/"$(get_udevdir)" \
+   pkgconfdir='${prefix}'/usr/'${LIB}'/pkgconfig \
+   install
+
+   newinitd "${FILESDIR}"/multipathd-r1.rc multipathd
+   newinitd "${FILESDIR}"/multipath.rc multipath
+
+   einstalldocs
+
+   find "${ED}" -type f -name "*.la" -delete || die
+}
+
+pkg_postinst() {
+   if [[ -z ${REPLACING_VERSIONS} ]] ; then
+   elog "If you need multipath on your system, you must"
+   elog "add 'multipath' into your boot runlevel!"
+   fi
+}



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/, sys-fs/multipath-tools/files/

2021-04-06 Thread Lars Wendler
commit: cc3d8bbdd85180c7356fbfc1075b90cd201c7e4b
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Apr  6 10:16:55 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Apr  6 10:17:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc3d8bbd

sys-fs/multipath-tools: Removed old

Signed-off-by: Lars Wendler  gentoo.org>

 sys-fs/multipath-tools/Manifest|  1 -
 .../multipath-tools-0.8.4-parallel_make_fix.patch  | 85 
 .../multipath-tools-0.8.4-respect-flags.patch  | 19 -
 .../multipath-tools/multipath-tools-0.8.4.ebuild   | 93 --
 4 files changed, 198 deletions(-)

diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index bc6aed9719d..5890da6bae6 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -1,4 +1,3 @@
 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
 DIST multipath-tools-0.8.6.tar.gz 519405 BLAKE2B 
5aed36550c76bbde0e874e37356b6c5a80a80b876b56dadb69ce09f0fb049a7097fd1c0aca5076f816848e2c2660f96680d7f16d56918a25299017b39f76f777
 SHA512 
82e5b7307e599ba6b059679c3987a442fb5be4885f0a27c260a99a07cb336b88d48e314b4ec951944e0200e4731522d8da043d98fa566857ecc6d100791c0e38

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 651cd04f59f..000
--- 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 
-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) 

[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/, sys-fs/multipath-tools/files/

2020-11-14 Thread Lars Wendler
commit: 43452e990badd711455dab87c52b3fc48bcca2dc
Author: Lars Wendler  gentoo  org>
AuthorDate: Sat Nov 14 10:56:08 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sat Nov 14 10:56:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43452e99

sys-fs/multipath-tools: Bump to version 0.8.5

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Lars Wendler  gentoo.org>

 sys-fs/multipath-tools/Manifest|  1 +
 .../multipath-tools-0.8.5-respect-flags.patch  | 12 +++
 .../multipath-tools/multipath-tools-0.8.5.ebuild   | 91 ++
 3 files changed, 104 insertions(+)

diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index dd78e5e9f42..3791f6de0fa 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -1,2 +1,3 @@
 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

diff --git 
a/sys-fs/multipath-tools/files/multipath-tools-0.8.5-respect-flags.patch 
b/sys-fs/multipath-tools/files/multipath-tools-0.8.5-respect-flags.patch
new file mode 100644
index 000..20d9fef6f3f
--- /dev/null
+++ b/sys-fs/multipath-tools/files/multipath-tools-0.8.5-respect-flags.patch
@@ -0,0 +1,12 @@
+--- multipath-tools-0.8.5-eecfcba/Makefile.inc
 multipath-tools-0.8.5-eecfcba/Makefile.inc
+@@ -98,7 +98,8 @@
+ -Werror=implicit-function-declaration -Werror=format-security 
\
+ $(WNOCLOBBERED) -Werror=cast-qual 
$(ERROR_DISCARDED_QUALIFIERS)
+ CPPFLAGS  := -Wp,-D_FORTIFY_SOURCE=2 
+-CFLAGS:= --std=gnu99 $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe 
\
++CFLAGS?= $(OPTFLAGS) $(WARNFLAGS) -pipe
++CFLAGS+= --std=gnu99 \
+  -DBIN_DIR=\"$(bindir)\" -DLIB_STRING=\"${LIB}\" 
-DRUN_DIR=\"${RUN}\" \
+  -MMD -MP
+ BIN_CFLAGS= -fPIE -DPIE

diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.5.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.8.5.ebuild
new file mode 100644
index 000..cd850ca74ae
--- /dev/null
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.5.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2020 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
+
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="systemd rbd"
+
+BDEPEND="virtual/pkgconfig"
+
+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:0=
+   rbd? ( sys-cluster/ceph )
+   systemd? ( sys-apps/systemd )
+"
+
+DEPEND="${RDEPEND}"
+
+CONFIG_CHECK="~DM_MULTIPATH"
+
+RESTRICT="test"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-0.8.5-respect-flags.patch
+   "${FILESDIR}"/${PN}-0.8.3-no-gziped-docs.patch
+)
+
+get_systemd_pv() {
+   use systemd && \
+   $(tc-getPKG_CONFIG) --modversion systemd
+}
+
+src_prepare() {
+   default
+
+   # The upstream lacks any way to configure the build at present
+   # and ceph is a huge dependency, so we're using sed to make it
+   # optional until the upstream has a proper configure system
+   if ! use rbd ; then
+   sed \
+   -e "s/libcheckrbd.so/# libcheckrbd.so/" \
+   -e "s/-lrados//" \
+   -i libmultipath/checkers/Makefile \
+   || die
+   fi
+}
+
+src_compile() {
+   # LIBDM_API_FLUSH involves grepping files in /usr/include,
+   # so force the test to go the way we want #411337.
+   emake \
+   CC="$(tc-getCC)" \
+   LIBDM_API_FLUSH=1 SYSTEMD="$(get_systemd_pv)"
+}
+
+src_install() {
+   dodir /sbin 

[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/files/

2020-09-20 Thread Conrad Kostecki
commit: 61f92e7f736c979765f2effe4258b0a4052d2d40
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sun Sep 20 14:01:09 2020 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Sep 20 14:58:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61f92e7f

sys-fs/multipath-tools: remove unused file

Closes: https://github.com/gentoo/gentoo/pull/17616
Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: Michael Mair-Keimberger  gmail.com>
Signed-off-by: Conrad Kostecki  gentoo.org>

 sys-fs/multipath-tools/files/rc-multipathd | 20 
 1 file changed, 20 deletions(-)

diff --git a/sys-fs/multipath-tools/files/rc-multipathd 
b/sys-fs/multipath-tools/files/rc-multipathd
deleted file mode 100644
index d4d440f2c91..000
--- a/sys-fs/multipath-tools/files/rc-multipathd
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-   need localmount
-   after modules
-}
-
-start() {
-   ebegin "Starting multipathd"
-   start-stop-daemon --start --quiet --exec /sbin/multipathd
-   eend $?
-}
-
-stop() {
-   ebegin "Stopping multipathd"
-   start-stop-daemon --stop --quiet --pidfile /var/run/multipathd.pid
-   eend $?
-}



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/, sys-fs/multipath-tools/files/

2020-09-15 Thread Lars Wendler
commit: 2953ae544c1f20301c7017c2323b167a8287d8c2
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Sep 15 09:49:30 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Sep 15 09:49:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2953ae54

sys-fs/multipath-tools: Removed old

Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: Lars Wendler  gentoo.org>

 sys-fs/multipath-tools/Manifest|  2 -
 ...path-tools-0.6.2-ignore-modprobe-failures.patch | 25 --
 .../files/multipath-tools-0.6.4-sysmacros.patch| 60 -
 .../multipath-tools-0.6.4-r1.ebuild| 99 --
 .../multipath-tools/multipath-tools-0.7.9.ebuild   | 94 
 5 files changed, 280 deletions(-)

diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index b6fc606d5e1..dd78e5e9f42 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -1,4 +1,2 @@
-DIST multipath-tools-0.6.4.tar.gz 285448 BLAKE2B 
1b63c4e712e682965c595ed988a6590e181abd4d37779b72b52f4e415d4caba33df518a1ea1e3b460d15b5a78f4db5a75c1066439eb40c503023007c1f70752a
 SHA512 
ec35c6c26c3b233ebece7136ea99dd4c0dff2927e7b543e7091219dc7065fe87e609a1eda9ab6d08399d44fe882d70c8dbe6be9ab175d154c5dd2d12ee1d86ea
-DIST multipath-tools-0.7.9.tar.gz 419377 BLAKE2B 
29003b7ce2d673eb59d869e2165028654361ca31f49b8e810d90611db249a5183492959d3aef778b870df7c1d283004bda88f3cc6f760569247f1ccc61617379
 SHA512 
6b237f148c239938b9f46a1a8118fc070372d5f2cfe2021c26ad9ca15d37e8866390168b6a4f13adcc5538001354247e072559a0add33ce1fe8245ae64ed0a3c
 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

diff --git 
a/sys-fs/multipath-tools/files/multipath-tools-0.6.2-ignore-modprobe-failures.patch
 
b/sys-fs/multipath-tools/files/multipath-tools-0.6.2-ignore-modprobe-failures.patch
deleted file mode 100644
index cb785899c2e..000
--- 
a/sys-fs/multipath-tools/files/multipath-tools-0.6.2-ignore-modprobe-failures.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 100588046ad59176b9779c73212aea63be5aace4 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert 
-Date: Mon, 12 Sep 2016 17:26:38 -0400
-Subject: [PATCH] multipathd.service: ignore modprobe failures
-

- multipathd/multipathd.service | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/multipathd/multipathd.service b/multipathd/multipathd.service
-index e3d6f91..d26577f 100644
 a/multipathd/multipathd.service
-+++ b/multipathd/multipathd.service
-@@ -11,7 +11,7 @@ Conflicts=shutdown.target
- Type=notify
- NotifyAccess=main
- LimitCORE=infinity
--ExecStartPre=/sbin/modprobe -a scsi_dh_alua scsi_dh_emc scsi_dh_rdac 
dm-multipath
-+ExecStartPre=-/sbin/modprobe -a scsi_dh_alua scsi_dh_emc scsi_dh_rdac 
dm-multipath
- ExecStart=/sbin/multipathd -d -s
- ExecReload=/sbin/multipathd reconfigure
- 
--- 
-2.10.0
-

diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.6.4-sysmacros.patch 
b/sys-fs/multipath-tools/files/multipath-tools-0.6.4-sysmacros.patch
deleted file mode 100644
index 99a12fc7b78..000
--- a/sys-fs/multipath-tools/files/multipath-tools-0.6.4-sysmacros.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff --git a/kpartx/dasd.c b/kpartx/dasd.c
-index 1206e45..f50c1bd 100644
 a/kpartx/dasd.c
-+++ b/kpartx/dasd.c
-@@ -28,6 +28,7 @@
- #include 
- #include 
- #include 
-+#include 
- #include 
- #include 
- #include 
-diff --git a/kpartx/kpartx.c b/kpartx/kpartx.c
-index d31fea8..3452787 100644
 a/kpartx/kpartx.c
-+++ b/kpartx/kpartx.c
-@@ -28,6 +28,7 @@
- #include 
- #include 
- #include 
-+#include 
- #include 
- #include 
- #include 
-diff --git a/libmultipath/checkers/tur.c b/libmultipath/checkers/tur.c
-index 4d6c3c2..d9a9e67 100644
 a/libmultipath/checkers/tur.c
-+++ b/libmultipath/checkers/tur.c
-@@ -11,6 +11,7 @@
- #include 
- #include 
- #include 
-+#include 
- #include 
- #include 
- #include 
-diff --git a/libmultipath/devmapper.c b/libmultipath/devmapper.c
-index 4f8ef13..9c0b240 100644
 a/libmultipath/devmapper.c
-+++ b/libmultipath/devmapper.c
-@@ -12,6 +12,7 @@
- #include 
- #include 
- #include 
-+#include 
- 
- #include "checkers.h"
- #include "vector.h"
-diff --git a/libmultipath/util.c b/libmultipath/util.c
-index 03a5738..1841f35 100644
 a/libmultipath/util.c
-+++ b/libmultipath/util.c
-@@ -4,6 +4,7 @@
- #include 
- #include 
- #include 

[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2020-08-19 Thread Sam James
commit: 74478a83128fa5a9374a7b597b9e3fd2400575dc
Author: Sam James  gentoo  org>
AuthorDate: Wed Aug 19 22:35:35 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug 19 22:35:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74478a83

sys-fs/multipath-tools: arm64 stable (bug #738056)

Package-Manager: Portage-3.0.3, Repoman-3.0.0
Signed-off-by: Sam James  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.8.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 d1edcd936a9..ab5b8e5272a 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
@@ -11,7 +11,7 @@ 
SRC_URI="https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 x86"
 IUSE="systemd rbd"
 
 BDEPEND="virtual/pkgconfig"



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2020-05-11 Thread Lars Wendler
commit: c283b0e7b4a945652f383223a83f3cd6d405e295
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon May 11 11:52:58 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon May 11 11:53:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c283b0e7

sys-fs/multipath-tools: Removed old

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Lars Wendler  gentoo.org>

 sys-fs/multipath-tools/Manifest|  2 -
 .../multipath-tools/multipath-tools-0.8.1.ebuild   | 94 --
 .../multipath-tools/multipath-tools-0.8.2.ebuild   | 94 --
 .../multipath-tools-0.8.3-r1.ebuild| 91 -
 .../multipath-tools/multipath-tools-0.8.3.ebuild   | 89 
 5 files changed, 370 deletions(-)

diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index 03297803016..b6fc606d5e1 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -1,6 +1,4 @@
 DIST multipath-tools-0.6.4.tar.gz 285448 BLAKE2B 
1b63c4e712e682965c595ed988a6590e181abd4d37779b72b52f4e415d4caba33df518a1ea1e3b460d15b5a78f4db5a75c1066439eb40c503023007c1f70752a
 SHA512 
ec35c6c26c3b233ebece7136ea99dd4c0dff2927e7b543e7091219dc7065fe87e609a1eda9ab6d08399d44fe882d70c8dbe6be9ab175d154c5dd2d12ee1d86ea
 DIST multipath-tools-0.7.9.tar.gz 419377 BLAKE2B 
29003b7ce2d673eb59d869e2165028654361ca31f49b8e810d90611db249a5183492959d3aef778b870df7c1d283004bda88f3cc6f760569247f1ccc61617379
 SHA512 
6b237f148c239938b9f46a1a8118fc070372d5f2cfe2021c26ad9ca15d37e8866390168b6a4f13adcc5538001354247e072559a0add33ce1fe8245ae64ed0a3c
-DIST multipath-tools-0.8.1.tar.gz 447883 BLAKE2B 
c840ede03fd15763cd947a71596bf3a2e5935433d956208225f4fd6ed55074e2d9709f8b0e6c059a58d44b6649f52b3564d6651ea1af6186138357ba37f86b14
 SHA512 
1f87f974aace746ecac8af6ae330de16affe49cc89a5660b28be3b1c4a69f822da01042432176e64b5de6ad3a6568044954fdce8e3aa31e85611a595a4939947
-DIST multipath-tools-0.8.2.tar.gz 458879 BLAKE2B 
a5aae1c9b211c788b658cf53e1c966bb9dd39dbe3e81058d6c758ba11cfd77ebfbc9d70bfde5b41d00fb1d4fbf31f3d2e6d58c69179e8842b9f5b8e9edd0b755
 SHA512 
c809e652479a8b6b141fd69810dbba316d93368ec6cf1c57f479ccde50e3ccf0bebe1b62e9db4791135aec45a90761f9100635f0ffa4b175ce9c2d82ebcea5c9
 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

diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.1.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.8.1.ebuild
deleted file mode 100644
index 956caa89e08..000
--- a/sys-fs/multipath-tools/multipath-tools-0.8.1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit linux-info systemd toolchain-funcs udev vcs-snapshot toolchain-funcs
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="systemd rbd"
-
-RDEPEND="
-   dev-libs/json-c:=
-   dev-libs/libaio
-   dev-libs/userspace-rcu:=
-   >=sys-fs/lvm2-2.02.45
-   >=virtual/udev-171
-   sys-libs/readline:0=
-   rbd? ( sys-cluster/ceph )
-   systemd? ( sys-apps/systemd )
-"
-DEPEND="
-   ${RDEPEND}
-   virtual/pkgconfig
-"
-
-CONFIG_CHECK="~DM_MULTIPATH"
-
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.7.5-respect-flags.patch )
-
-get_systemd_pv() {
-   use systemd && \
-   $(tc-getPKG_CONFIG) --modversion systemd
-}
-
-pkg_pretend() {
-   linux-info_pkg_setup
-}
-
-pkg_setup() {
-   linux-info_pkg_setup
-}
-
-src_prepare() {
-   default
-
-   # The upstream lacks any way to configure the build at present
-   # and ceph is a huge dependency, so we're using sed to make it
-   # optional until the upstream has a proper configure system
-   if ! use rbd ; then
-   sed \
-   -e "s/libcheckrbd.so/# libcheckrbd.so/" \
-   -e "s/-lrados//" \
-   -i libmultipath/checkers/Makefile \
-   || die
-   fi
-}
-
-src_compile() {
-   # LIBDM_API_FLUSH involves grepping files in /usr/include,
-   # so force the test to go the way we 

[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/files/, sys-fs/multipath-tools/

2020-05-11 Thread Lars Wendler
commit: eb22b954c177b5c1e2b6ed5c7cdd02f40f40d757
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon May 11 11:51:43 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon May 11 11:53:12 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb22b954

sys-fs/multipath-tools: Bump to version 0.8.4

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Lars Wendler  gentoo.org>

 sys-fs/multipath-tools/Manifest|  1 +
 .../multipath-tools-0.8.4-parallel_make_fix.patch  | 85 
 .../multipath-tools-0.8.4-respect-flags.patch  | 19 +
 .../multipath-tools/multipath-tools-0.8.4.ebuild   | 93 ++
 4 files changed, 198 insertions(+)

diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index fa9c2ed1f14..03297803016 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -3,3 +3,4 @@ DIST multipath-tools-0.7.9.tar.gz 419377 BLAKE2B 
29003b7ce2d673eb59d869e21650286
 DIST multipath-tools-0.8.1.tar.gz 447883 BLAKE2B 
c840ede03fd15763cd947a71596bf3a2e5935433d956208225f4fd6ed55074e2d9709f8b0e6c059a58d44b6649f52b3564d6651ea1af6186138357ba37f86b14
 SHA512 
1f87f974aace746ecac8af6ae330de16affe49cc89a5660b28be3b1c4a69f822da01042432176e64b5de6ad3a6568044954fdce8e3aa31e85611a595a4939947
 DIST multipath-tools-0.8.2.tar.gz 458879 BLAKE2B 
a5aae1c9b211c788b658cf53e1c966bb9dd39dbe3e81058d6c758ba11cfd77ebfbc9d70bfde5b41d00fb1d4fbf31f3d2e6d58c69179e8842b9f5b8e9edd0b755
 SHA512 
c809e652479a8b6b141fd69810dbba316d93368ec6cf1c57f479ccde50e3ccf0bebe1b62e9db4791135aec45a90761f9100635f0ffa4b175ce9c2d82ebcea5c9
 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

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
new file mode 100644
index 000..651cd04f59f
--- /dev/null
+++ b/sys-fs/multipath-tools/files/multipath-tools-0.8.4-parallel_make_fix.patch
@@ -0,0 +1,85 @@
+From 041472afebd1e621be1143f2bfb4c5650df171cc Mon Sep 17 00:00:00 2001
+From: Lars Wendler 
+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
+--- 

[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2020-05-04 Thread Agostino Sarubbo
commit: f720653be2eeea4f437a2bed33b782b7f475e0a8
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon May  4 13:31:48 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon May  4 13:31:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f720653b

sys-fs/multipath-tools: ppc64 stable wrt bug #720856

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.8.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 95b0ce38bef..d1edcd936a9 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
@@ -11,7 +11,7 @@ 
SRC_URI="https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86"
 IUSE="systemd rbd"
 
 BDEPEND="virtual/pkgconfig"



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2020-05-04 Thread Agostino Sarubbo
commit: a944b1fd72405968afbabf0edb18694bd677ff45
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon May  4 13:29:18 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon May  4 13:29:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a944b1fd

sys-fs/multipath-tools: amd64 stable wrt bug #720856

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.8.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 03860689a6a..95b0ce38bef 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
@@ -11,7 +11,7 @@ 
SRC_URI="https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 x86"
 IUSE="systemd rbd"
 
 BDEPEND="virtual/pkgconfig"



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2020-05-04 Thread Agostino Sarubbo
commit: f42967a3f567429f13c6751ec1b48f3026302aab
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon May  4 06:43:10 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon May  4 06:43:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f42967a3

sys-fs/multipath-tools: x86 stable wrt bug #720856

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.8.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 1e0cb069259..03860689a6a 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
@@ -11,7 +11,7 @@ 
SRC_URI="https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 x86"
 IUSE="systemd rbd"
 
 BDEPEND="virtual/pkgconfig"



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2020-05-04 Thread Agostino Sarubbo
commit: 36a22292d79c2ea0b7838afe62fff3b31635e9bc
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon May  4 06:42:18 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon May  4 06:42:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36a22292

sys-fs/multipath-tools: ppc stable wrt bug #720856

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-fs/multipath-tools/multipath-tools-0.8.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 718daba1fda..1e0cb069259 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
@@ -11,7 +11,7 @@ 
SRC_URI="https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~x86"
 IUSE="systemd rbd"
 
 BDEPEND="virtual/pkgconfig"



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/files/, sys-fs/multipath-tools/

2020-05-03 Thread Thomas Deutschmann
commit: c7b201a70998ff0db1f1cd4187004e684d6aa10a
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun May  3 19:18:28 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun May  3 19:18:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7b201a7

sys-fs/multipath-tools: fix building against GCC 10

Closes: https://bugs.gentoo.org/706670
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann  gentoo.org>

 .../multipath-tools-0.8.3-fix-gcc-10-compatibility.patch  | 11 +++
 sys-fs/multipath-tools/multipath-tools-0.8.3-r2.ebuild|  1 +
 2 files changed, 12 insertions(+)

diff --git 
a/sys-fs/multipath-tools/files/multipath-tools-0.8.3-fix-gcc-10-compatibility.patch
 
b/sys-fs/multipath-tools/files/multipath-tools-0.8.3-fix-gcc-10-compatibility.patch
new file mode 100644
index 000..18ed8d65e0f
--- /dev/null
+++ 
b/sys-fs/multipath-tools/files/multipath-tools-0.8.3-fix-gcc-10-compatibility.patch
@@ -0,0 +1,11 @@
+--- a/libmultipath/structs.h
 b/libmultipath/structs.h
+@@ -106,7 +106,7 @@ enum yes_no_undef_states {
+  * _FIND_MULTIPATHS_F must have the same value as YNU_YES.
+  * Generate a compile time error if that isn't the case.
+  */
+-char ___error1___[-(_FIND_MULTIPATHS_F != YNU_YES)];
++extern char ___error1___[-(_FIND_MULTIPATHS_F != YNU_YES)];
+ 
+ #define find_multipaths_on(conf) \
+   (!!((conf)->find_multipaths & _FIND_MULTIPATHS_F))

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 feb9ba35c84..718daba1fda 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
@@ -37,6 +37,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-0.7.5-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.3-fix-gcc-10-compatibility.patch
 )
 
 get_systemd_pv() {



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/files/, sys-fs/multipath-tools/

2020-05-02 Thread Thomas Deutschmann
commit: 6e3a04d1532db375c74b38c71963316ef4a466f0
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sat May  2 07:28:43 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sat May  2 07:28:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e3a04d1

sys-fs/multipath-tools: add json-c-0.14 support

Closes: https://bugs.gentoo.org/720330
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann  gentoo.org>

 .../files/multipath-tools-0.8.3-json-c-0.14.patch  | 28 +++
 .../multipath-tools-0.8.3-r2.ebuild| 92 ++
 2 files changed, 120 insertions(+)

diff --git 
a/sys-fs/multipath-tools/files/multipath-tools-0.8.3-json-c-0.14.patch 
b/sys-fs/multipath-tools/files/multipath-tools-0.8.3-json-c-0.14.patch
new file mode 100644
index 000..34d02f7b5d7
--- /dev/null
+++ b/sys-fs/multipath-tools/files/multipath-tools-0.8.3-json-c-0.14.patch
@@ -0,0 +1,28 @@
+From 8438a9cd8d7ed88645fa8e6a8f19c0fd9ae872a7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= 
+Date: Mon, 13 Apr 2020 19:22:02 +0200
+Subject: [PATCH] Add support for upcoming json-c 0.14.0.
+
+TRUE/FALSE are not defined anymore.  1 and 0 are used instead.
+This is backwards compatible, as earlier versions of json-c are
+using the same integer values in their present definitions.
+---
+ libdmmp/libdmmp_private.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libdmmp/libdmmp_private.h b/libdmmp/libdmmp_private.h
+index ac85b63f..4378962b 100644
+--- a/libdmmp/libdmmp_private.h
 b/libdmmp/libdmmp_private.h
+@@ -82,7 +82,7 @@ static out_type func_name(struct dmmp_context *ctx, const 
char *var_name) { \
+ do { \
+   json_type j_type = json_type_null; \
+   json_object *j_obj_tmp = NULL; \
+-  if (json_object_object_get_ex(j_obj, key, _obj_tmp) != TRUE) { \
++  if (json_object_object_get_ex(j_obj, key, _obj_tmp) != 1) { \
+   _error(ctx, "Invalid JSON output from multipathd IPC: " \
+  "key '%s' not found", key); \
+   rc = DMMP_ERR_IPC_ERROR; \
+-- 
+2.26.0
+

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
new file mode 100644
index 000..feb9ba35c84
--- /dev/null
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.3-r2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2020 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
+
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="systemd rbd"
+
+BDEPEND="virtual/pkgconfig"
+
+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:0=
+   rbd? ( sys-cluster/ceph )
+   systemd? ( sys-apps/systemd )
+"
+
+DEPEND="${RDEPEND}"
+
+CONFIG_CHECK="~DM_MULTIPATH"
+
+RESTRICT="test"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-0.7.5-respect-flags.patch
+   "${FILESDIR}"/${PN}-0.8.3-no-gziped-docs.patch
+   "${FILESDIR}"/${PN}-0.8.3-json-c-0.14.patch
+)
+
+get_systemd_pv() {
+   use systemd && \
+   $(tc-getPKG_CONFIG) --modversion systemd
+}
+
+src_prepare() {
+   default
+
+   # The upstream lacks any way to configure the build at present
+   # and ceph is a huge dependency, so we're using sed to make it
+   # optional until the upstream has a proper configure system
+   if ! use rbd ; then
+   sed \
+   -e "s/libcheckrbd.so/# libcheckrbd.so/" \
+   -e "s/-lrados//" \
+   -i libmultipath/checkers/Makefile \
+   || die
+   fi
+}
+
+src_compile() {
+   # LIBDM_API_FLUSH involves grepping files in /usr/include,
+   # so force the test to go the way we want #411337.
+   emake \
+   CC="$(tc-getCC)" \
+   LIBDM_API_FLUSH=1 SYSTEMD="$(get_systemd_pv)"
+}
+
+src_install() {
+   dodir /sbin /usr/share/man/man{5,8}
+   emake \
+   DESTDIR="${D}" \
+   RUN=run \
+   SYSTEMD=$(get_systemd_pv) \
+   unitdir="$(systemd_get_systemunitdir)" \
+   libudevdir='${prefix}'/"$(get_udevdir)" \
+   pkgconfdir='${prefix}'/usr/'${LIB}'/pkgconfig \
+   install
+
+   newinitd "${FILESDIR}"/multipathd-r1.rc multipathd
+   newinitd "${FILESDIR}"/multipath.rc multipath
+
+   einstalldocs
+}
+
+pkg_postinst() {
+   if [[ -z ${REPLACING_VERSIONS} ]]; then
+   elog "If you need multipath 

[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/, sys-fs/multipath-tools/files/

2019-11-27 Thread Thomas Deutschmann
commit: 9fff7e7bd17fb3b933a3845e69099c70e037d142
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Nov 27 20:55:53 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Nov 27 20:57:40 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fff7e7b

sys-fs/multipath-tools: rev bump

- Fix pkgconfig file install location

- Set run dir to /run

- Update multipathd runscript

- Require >=libudev-232 for sys/sysmacros.h.

Closes: https://bugs.gentoo.org/685314
Closes: https://bugs.gentoo.org/698422
Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: Thomas Deutschmann  gentoo.org>

 sys-fs/multipath-tools/files/multipathd-r1.rc  | 12 +++
 .../multipath-tools-0.8.3-r1.ebuild| 91 ++
 2 files changed, 103 insertions(+)

diff --git a/sys-fs/multipath-tools/files/multipathd-r1.rc 
b/sys-fs/multipath-tools/files/multipathd-r1.rc
new file mode 100644
index 000..59de1e6f71a
--- /dev/null
+++ b/sys-fs/multipath-tools/files/multipathd-r1.rc
@@ -0,0 +1,12 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="/sbin/multipathd"
+pidfile="/run/multipathd.pid"
+start_stop_daemon_args="--wait 1000"
+
+depend() {
+   need localmount
+   after modules
+}

diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.3-r1.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.8.3-r1.ebuild
new file mode 100644
index 000..ac5a16737ab
--- /dev/null
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.3-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2019 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
+
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="systemd rbd"
+
+BDEPEND="virtual/pkgconfig"
+
+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:0=
+   rbd? ( sys-cluster/ceph )
+   systemd? ( sys-apps/systemd )
+"
+
+DEPEND="${RDEPEND}"
+
+CONFIG_CHECK="~DM_MULTIPATH"
+
+RESTRICT="test"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-0.7.5-respect-flags.patch
+   "${FILESDIR}"/${PN}-0.8.3-no-gziped-docs.patch
+)
+
+get_systemd_pv() {
+   use systemd && \
+   $(tc-getPKG_CONFIG) --modversion systemd
+}
+
+src_prepare() {
+   default
+
+   # The upstream lacks any way to configure the build at present
+   # and ceph is a huge dependency, so we're using sed to make it
+   # optional until the upstream has a proper configure system
+   if ! use rbd ; then
+   sed \
+   -e "s/libcheckrbd.so/# libcheckrbd.so/" \
+   -e "s/-lrados//" \
+   -i libmultipath/checkers/Makefile \
+   || die
+   fi
+}
+
+src_compile() {
+   # LIBDM_API_FLUSH involves grepping files in /usr/include,
+   # so force the test to go the way we want #411337.
+   emake \
+   CC="$(tc-getCC)" \
+   LIBDM_API_FLUSH=1 SYSTEMD="$(get_systemd_pv)"
+}
+
+src_install() {
+   dodir /sbin /usr/share/man/man{5,8}
+   emake \
+   DESTDIR="${D}" \
+   RUN=run \
+   SYSTEMD=$(get_systemd_pv) \
+   unitdir="$(systemd_get_systemunitdir)" \
+   libudevdir='${prefix}'/"$(get_udevdir)" \
+   pkgconfdir='${prefix}'/usr/'${LIB}'/pkgconfig \
+   install
+
+   newinitd "${FILESDIR}"/multipathd-r1.rc multipathd
+   newinitd "${FILESDIR}"/multipath.rc multipath
+
+   einstalldocs
+}
+
+pkg_postinst() {
+   if [[ -z ${REPLACING_VERSIONS} ]]; then
+   elog "If you need multipath on your system, you must"
+   elog "add 'multipath' into your boot runlevel!"
+   fi
+}



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/, sys-fs/multipath-tools/files/

2019-10-02 Thread Thomas Deutschmann
commit: cf57bf37514572a8c126e2c840c45cd66fb81ba8
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Oct  2 21:42:36 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Oct  2 21:43:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf57bf37

sys-fs/multipath-tools: bump to v0.8.3

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann  gentoo.org>

 sys-fs/multipath-tools/Manifest|   1 +
 .../multipath-tools-0.8.3-no-gziped-docs.patch | 175 +
 .../multipath-tools/multipath-tools-0.8.3.ebuild   |  89 +++
 3 files changed, 265 insertions(+)

diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index 827222b72f6..fa9c2ed1f14 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -2,3 +2,4 @@ DIST multipath-tools-0.6.4.tar.gz 285448 BLAKE2B 
1b63c4e712e682965c595ed988a6590
 DIST multipath-tools-0.7.9.tar.gz 419377 BLAKE2B 
29003b7ce2d673eb59d869e2165028654361ca31f49b8e810d90611db249a5183492959d3aef778b870df7c1d283004bda88f3cc6f760569247f1ccc61617379
 SHA512 
6b237f148c239938b9f46a1a8118fc070372d5f2cfe2021c26ad9ca15d37e8866390168b6a4f13adcc5538001354247e072559a0add33ce1fe8245ae64ed0a3c
 DIST multipath-tools-0.8.1.tar.gz 447883 BLAKE2B 
c840ede03fd15763cd947a71596bf3a2e5935433d956208225f4fd6ed55074e2d9709f8b0e6c059a58d44b6649f52b3564d6651ea1af6186138357ba37f86b14
 SHA512 
1f87f974aace746ecac8af6ae330de16affe49cc89a5660b28be3b1c4a69f822da01042432176e64b5de6ad3a6568044954fdce8e3aa31e85611a595a4939947
 DIST multipath-tools-0.8.2.tar.gz 458879 BLAKE2B 
a5aae1c9b211c788b658cf53e1c966bb9dd39dbe3e81058d6c758ba11cfd77ebfbc9d70bfde5b41d00fb1d4fbf31f3d2e6d58c69179e8842b9f5b8e9edd0b755
 SHA512 
c809e652479a8b6b141fd69810dbba316d93368ec6cf1c57f479ccde50e3ccf0bebe1b62e9db4791135aec45a90761f9100635f0ffa4b175ce9c2d82ebcea5c9
+DIST multipath-tools-0.8.3.tar.gz 465248 BLAKE2B 
21a7a18c70150b4422bdd0ae02f26f491845eb06928ab74e631df8c6b3c110d10f43f75b9f8289a7134826c923b7ba58ce54c40497c3b7e6211e53902c8a1b5f
 SHA512 
d9fdc2763f5a1efa15ee07c5d863008c9694623935f62a0e0b56f941df4e0d0ca3f86056fefc9b5ca828b47782127e3d55f2f925b1ed957e02b675bef36f4cae

diff --git 
a/sys-fs/multipath-tools/files/multipath-tools-0.8.3-no-gziped-docs.patch 
b/sys-fs/multipath-tools/files/multipath-tools-0.8.3-no-gziped-docs.patch
new file mode 100644
index 000..534a8d33df8
--- /dev/null
+++ b/sys-fs/multipath-tools/files/multipath-tools-0.8.3-no-gziped-docs.patch
@@ -0,0 +1,175 @@
+Do not gzip docs
+
+--- a/kpartx/Makefile
 b/kpartx/Makefile
+@@ -21,7 +21,6 @@ all: $(EXEC)
+ 
+ $(EXEC): $(OBJS)
+   $(CC) $(CFLAGS) $(OBJS) -o $(EXEC) $(LDFLAGS) $(LIBDEPS)
+-  $(GZIP) $(EXEC).8 > $(EXEC).8.gz
+ 
+ install: $(EXEC) $(EXEC).8
+   $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
+@@ -33,11 +32,11 @@ install: $(EXEC) $(EXEC).8
+   $(INSTALL_PROGRAM) -m 644 kpartx.rules 
$(DESTDIR)$(libudevdir)/rules.d/66-kpartx.rules
+   $(INSTALL_PROGRAM) -m 644 del-part-nodes.rules 
$(DESTDIR)$(libudevdir)/rules.d/68-del-part-nodes.rules
+   $(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir)
+-  $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir)
++  $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(man8dir)
+ 
+ uninstall:
+   $(RM) $(DESTDIR)$(bindir)/$(EXEC)
+-  $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz
++  $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8
+   $(RM) $(DESTDIR)$(libudevdir)/kpartx_id
+   $(RM) $(DESTDIR)$(libudevdir)/rules.d/11-dm-parts.rules
+   $(RM) $(DESTDIR)$(libudevdir)/rules.d/66-kpartx.rules
+--- a/libdmmp/Makefile
 b/libdmmp/Makefile
+@@ -40,7 +40,7 @@ install:
+   $(DESTDIR)$(pkgconfdir)/$(PKGFILE)
+   perl -i -pe 's|__INCLUDEDIR__|$(includedir)|g' \
+   $(DESTDIR)$(pkgconfdir)/$(PKGFILE)
+-  @for file in docs/man/*.3.gz; do \
++  @for file in docs/man/*.3; do \
+   $(INSTALL_PROGRAM) -m 644 -D \
+   $$file \
+   $(DESTDIR)$(man3dir)/ || exit $?; \
+@@ -69,11 +69,11 @@ check: all
+ speed_test: all
+   $(MAKE) -C test speed_test
+ 
+-doc: docs/man/$(EXTRA_MAN_FILES).gz
++doc: docs/man/$(EXTRA_MAN_FILES)
+ 
+ TEMPFILE := $(shell mktemp)
+ 
+-docs/man/$(EXTRA_MAN_FILES).gz: $(HEADERS)
++docs/man/$(EXTRA_MAN_FILES): $(HEADERS)
+   @for file in $(EXTRA_MAN_FILES); do \
+   $(INSTALL_PROGRAM) -v -m 644 -D docs/$$file docs/man/$$file; \
+   done
+@@ -82,10 +82,7 @@ docs/man/$(EXTRA_MAN_FILES).gz: $(HEADERS)
+   perl docs/kernel-doc -man "$(TEMPFILE)" | \
+   perl docs/split-man.pl docs/man
+   -rm -f "$(TEMPFILE)"
+-  @for file in docs/man/*.3; do \
+-  gzip -f $$file; \
+-  done
+-  find docs/man -type f -name \*[0-9].gz
++  find docs/man -type f -name \*.[0-9]
+ 
+ dep_clean:
+   $(RM) $(OBJS:.o=.d)
+--- a/libmpathpersist/Makefile
 

[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2019-07-08 Thread Lars Wendler
commit: 1d7e73a89036e628131b3a90a8229b003300fa16
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Jul  8 08:22:03 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Jul  8 08:22:48 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d7e73a8

sys-fs/multipath-tools: Bump to version 0.8.2

Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Lars Wendler  gentoo.org>

 sys-fs/multipath-tools/Manifest|  1 +
 .../multipath-tools/multipath-tools-0.8.2.ebuild   | 94 ++
 2 files changed, 95 insertions(+)

diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index 4e8a400621d..7f7d1847e5e 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -2,3 +2,4 @@ DIST multipath-tools-0.6.4.tar.gz 285448 BLAKE2B 
1b63c4e712e682965c595ed988a6590
 DIST multipath-tools-0.7.9.tar.gz 419377 BLAKE2B 
29003b7ce2d673eb59d869e2165028654361ca31f49b8e810d90611db249a5183492959d3aef778b870df7c1d283004bda88f3cc6f760569247f1ccc61617379
 SHA512 
6b237f148c239938b9f46a1a8118fc070372d5f2cfe2021c26ad9ca15d37e8866390168b6a4f13adcc5538001354247e072559a0add33ce1fe8245ae64ed0a3c
 DIST multipath-tools-0.8.0.tar.gz 447076 BLAKE2B 
10a93a2654decd2377414188013d2141e34288fe119fa7c54047d95b825ef9ae64b20de1067d3f37a904b58be587997842f7a62088701fe1c1e6a078283b56e4
 SHA512 
8b6081109e535d0e392233bcedda930bc6d4b529ebe23bc45b276026311bc997e3cf8b39c1a86e4962c464faa69512202c0f6fb3d1f06c6445f8141853ad1bc4
 DIST multipath-tools-0.8.1.tar.gz 447883 BLAKE2B 
c840ede03fd15763cd947a71596bf3a2e5935433d956208225f4fd6ed55074e2d9709f8b0e6c059a58d44b6649f52b3564d6651ea1af6186138357ba37f86b14
 SHA512 
1f87f974aace746ecac8af6ae330de16affe49cc89a5660b28be3b1c4a69f822da01042432176e64b5de6ad3a6568044954fdce8e3aa31e85611a595a4939947
+DIST multipath-tools-0.8.2.tar.gz 458879 BLAKE2B 
a5aae1c9b211c788b658cf53e1c966bb9dd39dbe3e81058d6c758ba11cfd77ebfbc9d70bfde5b41d00fb1d4fbf31f3d2e6d58c69179e8842b9f5b8e9edd0b755
 SHA512 
c809e652479a8b6b141fd69810dbba316d93368ec6cf1c57f479ccde50e3ccf0bebe1b62e9db4791135aec45a90761f9100635f0ffa4b175ce9c2d82ebcea5c9

diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.2.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.8.2.ebuild
new file mode 100644
index 000..fe7820dee26
--- /dev/null
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-info systemd toolchain-funcs udev vcs-snapshot toolchain-funcs
+
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="systemd rbd"
+
+RDEPEND="
+   dev-libs/json-c:=
+   dev-libs/libaio
+   dev-libs/userspace-rcu:=
+   >=sys-fs/lvm2-2.02.45
+   >=virtual/udev-171
+   sys-libs/readline:0=
+   rbd? ( sys-cluster/ceph )
+   systemd? ( sys-apps/systemd )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   virtual/pkgconfig
+"
+
+CONFIG_CHECK="~DM_MULTIPATH"
+
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.7.5-respect-flags.patch )
+
+get_systemd_pv() {
+   use systemd && \
+   $(tc-getPKG_CONFIG) --modversion systemd
+}
+
+pkg_pretend() {
+   linux-info_pkg_setup
+}
+
+pkg_setup() {
+   linux-info_pkg_setup
+}
+
+src_prepare() {
+   default
+
+   # The upstream lacks any way to configure the build at present
+   # and ceph is a huge dependency, so we're using sed to make it
+   # optional until the upstream has a proper configure system
+   if ! use rbd ; then
+   sed \
+   -e "s/libcheckrbd.so/# libcheckrbd.so/" \
+   -e "s/-lrados//" \
+   -i libmultipath/checkers/Makefile \
+   || die
+   fi
+}
+
+src_compile() {
+   # LIBDM_API_FLUSH involves grepping files in /usr/include,
+   # so force the test to go the way we want #411337.
+   emake \
+   CC="$(tc-getCC)" \
+   LIBDM_API_FLUSH=1 SYSTEMD="$(get_systemd_pv)"
+}
+
+src_install() {
+   dodir /sbin /usr/share/man/man{5,8}
+   emake \
+   DESTDIR="${D}" \
+   SYSTEMD=$(get_systemd_pv) \
+   unitdir="$(systemd_get_systemunitdir)" \
+   libudevdir='${prefix}'/"$(get_udevdir)" \
+   install
+
+   newinitd "${FILESDIR}"/rc-multipathd multipathd
+   newinitd "${FILESDIR}"/multipath.rc multipath
+
+   einstalldocs
+}
+
+pkg_postinst() {
+   if [[ -z ${REPLACING_VERSIONS} ]]; then
+   elog "If you need multipath on your system, you must"
+   elog "add 'multipath' into your boot runlevel!"
+   fi
+}



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2019-07-08 Thread Lars Wendler
commit: 48f8b5afbab1a377a648ef5f21e6ef02650b140a
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Jul  8 08:22:35 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Jul  8 08:22:49 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48f8b5af

sys-fs/multipath-tools: Removed old.

Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Lars Wendler  gentoo.org>

 sys-fs/multipath-tools/Manifest|  1 -
 .../multipath-tools/multipath-tools-0.8.0.ebuild   | 94 --
 2 files changed, 95 deletions(-)

diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index 7f7d1847e5e..827222b72f6 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -1,5 +1,4 @@
 DIST multipath-tools-0.6.4.tar.gz 285448 BLAKE2B 
1b63c4e712e682965c595ed988a6590e181abd4d37779b72b52f4e415d4caba33df518a1ea1e3b460d15b5a78f4db5a75c1066439eb40c503023007c1f70752a
 SHA512 
ec35c6c26c3b233ebece7136ea99dd4c0dff2927e7b543e7091219dc7065fe87e609a1eda9ab6d08399d44fe882d70c8dbe6be9ab175d154c5dd2d12ee1d86ea
 DIST multipath-tools-0.7.9.tar.gz 419377 BLAKE2B 
29003b7ce2d673eb59d869e2165028654361ca31f49b8e810d90611db249a5183492959d3aef778b870df7c1d283004bda88f3cc6f760569247f1ccc61617379
 SHA512 
6b237f148c239938b9f46a1a8118fc070372d5f2cfe2021c26ad9ca15d37e8866390168b6a4f13adcc5538001354247e072559a0add33ce1fe8245ae64ed0a3c
-DIST multipath-tools-0.8.0.tar.gz 447076 BLAKE2B 
10a93a2654decd2377414188013d2141e34288fe119fa7c54047d95b825ef9ae64b20de1067d3f37a904b58be587997842f7a62088701fe1c1e6a078283b56e4
 SHA512 
8b6081109e535d0e392233bcedda930bc6d4b529ebe23bc45b276026311bc997e3cf8b39c1a86e4962c464faa69512202c0f6fb3d1f06c6445f8141853ad1bc4
 DIST multipath-tools-0.8.1.tar.gz 447883 BLAKE2B 
c840ede03fd15763cd947a71596bf3a2e5935433d956208225f4fd6ed55074e2d9709f8b0e6c059a58d44b6649f52b3564d6651ea1af6186138357ba37f86b14
 SHA512 
1f87f974aace746ecac8af6ae330de16affe49cc89a5660b28be3b1c4a69f822da01042432176e64b5de6ad3a6568044954fdce8e3aa31e85611a595a4939947
 DIST multipath-tools-0.8.2.tar.gz 458879 BLAKE2B 
a5aae1c9b211c788b658cf53e1c966bb9dd39dbe3e81058d6c758ba11cfd77ebfbc9d70bfde5b41d00fb1d4fbf31f3d2e6d58c69179e8842b9f5b8e9edd0b755
 SHA512 
c809e652479a8b6b141fd69810dbba316d93368ec6cf1c57f479ccde50e3ccf0bebe1b62e9db4791135aec45a90761f9100635f0ffa4b175ce9c2d82ebcea5c9

diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.0.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.8.0.ebuild
deleted file mode 100644
index 956caa89e08..000
--- a/sys-fs/multipath-tools/multipath-tools-0.8.0.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit linux-info systemd toolchain-funcs udev vcs-snapshot toolchain-funcs
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="systemd rbd"
-
-RDEPEND="
-   dev-libs/json-c:=
-   dev-libs/libaio
-   dev-libs/userspace-rcu:=
-   >=sys-fs/lvm2-2.02.45
-   >=virtual/udev-171
-   sys-libs/readline:0=
-   rbd? ( sys-cluster/ceph )
-   systemd? ( sys-apps/systemd )
-"
-DEPEND="
-   ${RDEPEND}
-   virtual/pkgconfig
-"
-
-CONFIG_CHECK="~DM_MULTIPATH"
-
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.7.5-respect-flags.patch )
-
-get_systemd_pv() {
-   use systemd && \
-   $(tc-getPKG_CONFIG) --modversion systemd
-}
-
-pkg_pretend() {
-   linux-info_pkg_setup
-}
-
-pkg_setup() {
-   linux-info_pkg_setup
-}
-
-src_prepare() {
-   default
-
-   # The upstream lacks any way to configure the build at present
-   # and ceph is a huge dependency, so we're using sed to make it
-   # optional until the upstream has a proper configure system
-   if ! use rbd ; then
-   sed \
-   -e "s/libcheckrbd.so/# libcheckrbd.so/" \
-   -e "s/-lrados//" \
-   -i libmultipath/checkers/Makefile \
-   || die
-   fi
-}
-
-src_compile() {
-   # LIBDM_API_FLUSH involves grepping files in /usr/include,
-   # so force the test to go the way we want #411337.
-   emake \
-   CC="$(tc-getCC)" \
-   LIBDM_API_FLUSH=1 SYSTEMD="$(get_systemd_pv)"
-}
-
-src_install() {
-   dodir /sbin /usr/share/man/man{5,8}
-   emake \
-   DESTDIR="${D}" \
-   SYSTEMD=$(get_systemd_pv) \
-   unitdir="$(systemd_get_systemunitdir)" \
-   libudevdir='${prefix}'/"$(get_udevdir)" \
-   install
-
-   newinitd "${FILESDIR}"/rc-multipathd multipathd
-   newinitd "${FILESDIR}"/multipath.rc multipath
-
-   

[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2019-04-23 Thread Lars Wendler
commit: f25b8d6968d3235a831aadb2ab4cc47209a0442d
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Apr 23 08:09:40 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Apr 23 08:10:01 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f25b8d69

sys-fs/multipath-tools: Bump to version 0.8.1

Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 sys-fs/multipath-tools/Manifest|  1 +
 .../multipath-tools/multipath-tools-0.8.1.ebuild   | 94 ++
 2 files changed, 95 insertions(+)

diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index 89382fcf9fd..4e8a400621d 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -1,3 +1,4 @@
 DIST multipath-tools-0.6.4.tar.gz 285448 BLAKE2B 
1b63c4e712e682965c595ed988a6590e181abd4d37779b72b52f4e415d4caba33df518a1ea1e3b460d15b5a78f4db5a75c1066439eb40c503023007c1f70752a
 SHA512 
ec35c6c26c3b233ebece7136ea99dd4c0dff2927e7b543e7091219dc7065fe87e609a1eda9ab6d08399d44fe882d70c8dbe6be9ab175d154c5dd2d12ee1d86ea
 DIST multipath-tools-0.7.9.tar.gz 419377 BLAKE2B 
29003b7ce2d673eb59d869e2165028654361ca31f49b8e810d90611db249a5183492959d3aef778b870df7c1d283004bda88f3cc6f760569247f1ccc61617379
 SHA512 
6b237f148c239938b9f46a1a8118fc070372d5f2cfe2021c26ad9ca15d37e8866390168b6a4f13adcc5538001354247e072559a0add33ce1fe8245ae64ed0a3c
 DIST multipath-tools-0.8.0.tar.gz 447076 BLAKE2B 
10a93a2654decd2377414188013d2141e34288fe119fa7c54047d95b825ef9ae64b20de1067d3f37a904b58be587997842f7a62088701fe1c1e6a078283b56e4
 SHA512 
8b6081109e535d0e392233bcedda930bc6d4b529ebe23bc45b276026311bc997e3cf8b39c1a86e4962c464faa69512202c0f6fb3d1f06c6445f8141853ad1bc4
+DIST multipath-tools-0.8.1.tar.gz 447883 BLAKE2B 
c840ede03fd15763cd947a71596bf3a2e5935433d956208225f4fd6ed55074e2d9709f8b0e6c059a58d44b6649f52b3564d6651ea1af6186138357ba37f86b14
 SHA512 
1f87f974aace746ecac8af6ae330de16affe49cc89a5660b28be3b1c4a69f822da01042432176e64b5de6ad3a6568044954fdce8e3aa31e85611a595a4939947

diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.1.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.8.1.ebuild
new file mode 100644
index 000..956caa89e08
--- /dev/null
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-info systemd toolchain-funcs udev vcs-snapshot toolchain-funcs
+
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="systemd rbd"
+
+RDEPEND="
+   dev-libs/json-c:=
+   dev-libs/libaio
+   dev-libs/userspace-rcu:=
+   >=sys-fs/lvm2-2.02.45
+   >=virtual/udev-171
+   sys-libs/readline:0=
+   rbd? ( sys-cluster/ceph )
+   systemd? ( sys-apps/systemd )
+"
+DEPEND="
+   ${RDEPEND}
+   virtual/pkgconfig
+"
+
+CONFIG_CHECK="~DM_MULTIPATH"
+
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.7.5-respect-flags.patch )
+
+get_systemd_pv() {
+   use systemd && \
+   $(tc-getPKG_CONFIG) --modversion systemd
+}
+
+pkg_pretend() {
+   linux-info_pkg_setup
+}
+
+pkg_setup() {
+   linux-info_pkg_setup
+}
+
+src_prepare() {
+   default
+
+   # The upstream lacks any way to configure the build at present
+   # and ceph is a huge dependency, so we're using sed to make it
+   # optional until the upstream has a proper configure system
+   if ! use rbd ; then
+   sed \
+   -e "s/libcheckrbd.so/# libcheckrbd.so/" \
+   -e "s/-lrados//" \
+   -i libmultipath/checkers/Makefile \
+   || die
+   fi
+}
+
+src_compile() {
+   # LIBDM_API_FLUSH involves grepping files in /usr/include,
+   # so force the test to go the way we want #411337.
+   emake \
+   CC="$(tc-getCC)" \
+   LIBDM_API_FLUSH=1 SYSTEMD="$(get_systemd_pv)"
+}
+
+src_install() {
+   dodir /sbin /usr/share/man/man{5,8}
+   emake \
+   DESTDIR="${D}" \
+   SYSTEMD=$(get_systemd_pv) \
+   unitdir="$(systemd_get_systemunitdir)" \
+   libudevdir='${prefix}'/"$(get_udevdir)" \
+   install
+
+   newinitd "${FILESDIR}"/rc-multipathd multipathd
+   newinitd "${FILESDIR}"/multipath.rc multipath
+
+   einstalldocs
+}
+
+pkg_postinst() {
+   if [[ -z ${REPLACING_VERSIONS} ]]; then
+   elog "If you need multipath on your system, you must"
+   elog "add 'multipath' into your boot runlevel!"
+   fi
+}



[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/

2019-02-18 Thread Lars Wendler
commit: 67105a63d812586834119ae480b794ee22603855
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Feb 18 09:28:51 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Feb 18 09:28:51 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67105a63

sys-fs/multipath-tools: Removed old.

Package-Manager: Portage-2.3.61, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 sys-fs/multipath-tools/Manifest|  1 -
 .../multipath-tools/multipath-tools-0.7.8.ebuild   | 94 --
 2 files changed, 95 deletions(-)

diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index 88fb7ce0adf..89382fcf9fd 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -1,4 +1,3 @@
 DIST multipath-tools-0.6.4.tar.gz 285448 BLAKE2B 
1b63c4e712e682965c595ed988a6590e181abd4d37779b72b52f4e415d4caba33df518a1ea1e3b460d15b5a78f4db5a75c1066439eb40c503023007c1f70752a
 SHA512 
ec35c6c26c3b233ebece7136ea99dd4c0dff2927e7b543e7091219dc7065fe87e609a1eda9ab6d08399d44fe882d70c8dbe6be9ab175d154c5dd2d12ee1d86ea
-DIST multipath-tools-0.7.8.tar.gz 415900 BLAKE2B 
04c237e91f8e56484603d5b5ec7504da6be1caf9564d21a9fa4be7268fbb88089b8446c959b57f859eb9696f39cbb82bffdcd3d0a6716da6487bedd5c18c0d8b
 SHA512 
500a51f9e8c5cc0ad04cc69c39f657e8058a08750d506b447c4a1131ad7308d43de19d79e98fa8254c56cd7eb1e832c8ccbc439ce94054db7eeebcdf2bf225cb
 DIST multipath-tools-0.7.9.tar.gz 419377 BLAKE2B 
29003b7ce2d673eb59d869e2165028654361ca31f49b8e810d90611db249a5183492959d3aef778b870df7c1d283004bda88f3cc6f760569247f1ccc61617379
 SHA512 
6b237f148c239938b9f46a1a8118fc070372d5f2cfe2021c26ad9ca15d37e8866390168b6a4f13adcc5538001354247e072559a0add33ce1fe8245ae64ed0a3c
 DIST multipath-tools-0.8.0.tar.gz 447076 BLAKE2B 
10a93a2654decd2377414188013d2141e34288fe119fa7c54047d95b825ef9ae64b20de1067d3f37a904b58be587997842f7a62088701fe1c1e6a078283b56e4
 SHA512 
8b6081109e535d0e392233bcedda930bc6d4b529ebe23bc45b276026311bc997e3cf8b39c1a86e4962c464faa69512202c0f6fb3d1f06c6445f8141853ad1bc4

diff --git a/sys-fs/multipath-tools/multipath-tools-0.7.8.ebuild 
b/sys-fs/multipath-tools/multipath-tools-0.7.8.ebuild
deleted file mode 100644
index c4898d34da4..000
--- a/sys-fs/multipath-tools/multipath-tools-0.7.8.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit linux-info systemd toolchain-funcs udev vcs-snapshot toolchain-funcs
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="systemd rbd"
-
-RDEPEND="
-   dev-libs/json-c:=
-   dev-libs/libaio
-   dev-libs/userspace-rcu:=
-   >=sys-fs/lvm2-2.02.45
-   >=virtual/udev-171
-   sys-libs/readline:0=
-   rbd? ( sys-cluster/ceph )
-   systemd? ( sys-apps/systemd )
-"
-DEPEND="
-   ${RDEPEND}
-   virtual/pkgconfig
-"
-
-CONFIG_CHECK="~DM_MULTIPATH"
-
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.7.5-respect-flags.patch )
-
-get_systemd_pv() {
-   use systemd && \
-   $(tc-getPKG_CONFIG) --modversion systemd
-}
-
-pkg_pretend() {
-   linux-info_pkg_setup
-}
-
-pkg_setup() {
-   linux-info_pkg_setup
-}
-
-src_prepare() {
-   default
-
-   # The upstream lacks any way to configure the build at present
-   # and ceph is a huge dependency, so we're using sed to make it
-   # optional until the upstream has a proper configure system
-   if ! use rbd ; then
-   sed \
-   -e "s/libcheckrbd.so/# libcheckrbd.so/" \
-   -e "s/-lrados//" \
-   -i libmultipath/checkers/Makefile \
-   || die
-   fi
-}
-
-src_compile() {
-   # LIBDM_API_FLUSH involves grepping files in /usr/include,
-   # so force the test to go the way we want #411337.
-   emake \
-   CC="$(tc-getCC)" \
-   LIBDM_API_FLUSH=1 SYSTEMD="$(get_systemd_pv)"
-}
-
-src_install() {
-   dodir /sbin /usr/share/man/man{5,8}
-   emake \
-   DESTDIR="${D}" \
-   SYSTEMD=$(get_systemd_pv) \
-   unitdir="$(systemd_get_systemunitdir)" \
-   libudevdir='${prefix}'/"$(get_udevdir)" \
-   install
-
-   newinitd "${FILESDIR}"/rc-multipathd multipathd
-   newinitd "${FILESDIR}"/multipath.rc multipath
-
-   einstalldocs
-}
-
-pkg_postinst() {
-   if [[ -z ${REPLACING_VERSIONS} ]]; then
-   elog "If you need multipath on your system, you must"
-   elog "add 'multipath' into your boot runlevel!"
-   fi
-}



  1   2   >