Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/lvm2/
Date: Fri, 06 Sep 2019 19:44:25
Message-Id: 1567799043.3f9ce3b7b58b39ff5f7707c06a3b4124d27363c3.whissi@gentoo
1 commit: 3f9ce3b7b58b39ff5f7707c06a3b4124d27363c3
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 6 19:43:26 2019 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 6 19:44:03 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f9ce3b7
7
8 sys-fs/lvm2: install man pages when USE=-thin
9
10 Closes: https://bugs.gentoo.org/611340
11 Package-Manager: Portage-2.3.75, Repoman-2.3.17
12 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
13
14 sys-fs/lvm2/{lvm2-2.02.185.ebuild => lvm2-2.02.185-r1.ebuild} | 4 ++--
15 sys-fs/lvm2/lvm2-2.02.186.ebuild | 4 ++--
16 sys-fs/lvm2/{lvm2-2.03.05.ebuild => lvm2-2.03.05-r1.ebuild} | 4 ++--
17 3 files changed, 6 insertions(+), 6 deletions(-)
18
19 diff --git a/sys-fs/lvm2/lvm2-2.02.185.ebuild b/sys-fs/lvm2/lvm2-2.02.185-r1.ebuild
20 similarity index 98%
21 rename from sys-fs/lvm2/lvm2-2.02.185.ebuild
22 rename to sys-fs/lvm2/lvm2-2.02.185-r1.ebuild
23 index 459f918637b..c18e5334dcd 100644
24 --- a/sys-fs/lvm2/lvm2-2.02.185.ebuild
25 +++ b/sys-fs/lvm2/lvm2-2.02.185-r1.ebuild
26 @@ -115,9 +115,9 @@ src_prepare() {
27
28 sed -i -e "s:/usr/bin/true:$(type -P true):" scripts/blk_availability_systemd_red_hat.service.in || die #517514
29
30 - # Without thin-privision-tools, there is nothing to install for target install_man7:
31 + # Don't install thin man page when not requested
32 if ! use thin ; then
33 - sed -i -e '/^install_lvm2/s:install_man7::' man/Makefile.in || die
34 + sed -i -e 's/^\(MAN7+=.*\) $(LVMTHINMAN) \(.*\)$/\1 \2/' man/Makefile.in || die
35 fi
36
37 eautoreconf
38
39 diff --git a/sys-fs/lvm2/lvm2-2.02.186.ebuild b/sys-fs/lvm2/lvm2-2.02.186.ebuild
40 index 459f918637b..c18e5334dcd 100644
41 --- a/sys-fs/lvm2/lvm2-2.02.186.ebuild
42 +++ b/sys-fs/lvm2/lvm2-2.02.186.ebuild
43 @@ -115,9 +115,9 @@ src_prepare() {
44
45 sed -i -e "s:/usr/bin/true:$(type -P true):" scripts/blk_availability_systemd_red_hat.service.in || die #517514
46
47 - # Without thin-privision-tools, there is nothing to install for target install_man7:
48 + # Don't install thin man page when not requested
49 if ! use thin ; then
50 - sed -i -e '/^install_lvm2/s:install_man7::' man/Makefile.in || die
51 + sed -i -e 's/^\(MAN7+=.*\) $(LVMTHINMAN) \(.*\)$/\1 \2/' man/Makefile.in || die
52 fi
53
54 eautoreconf
55
56 diff --git a/sys-fs/lvm2/lvm2-2.03.05.ebuild b/sys-fs/lvm2/lvm2-2.03.05-r1.ebuild
57 similarity index 98%
58 rename from sys-fs/lvm2/lvm2-2.03.05.ebuild
59 rename to sys-fs/lvm2/lvm2-2.03.05-r1.ebuild
60 index 87f738bf20e..e1103033f62 100644
61 --- a/sys-fs/lvm2/lvm2-2.03.05.ebuild
62 +++ b/sys-fs/lvm2/lvm2-2.03.05-r1.ebuild
63 @@ -108,9 +108,9 @@ src_prepare() {
64
65 sed -i -e "s:/usr/bin/true:$(type -P true):" scripts/blk_availability_systemd_red_hat.service.in || die #517514
66
67 - # Without thin-privision-tools, there is nothing to install for target install_man7:
68 + # Don't install thin man page when not requested
69 if ! use thin ; then
70 - sed -i -e '/^install_lvm2/s:install_man7::' man/Makefile.in || die
71 + sed -i -e 's/^\(MAN7+=.*\) $(LVMTHINMAN) \(.*\)$/\1 \2/' man/Makefile.in || die
72 fi
73
74 eautoreconf