Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/
Date: Sat, 01 Jun 2019 17:21:27
Message-Id: 1559409674.048b8a49b5918cb878f67a75ec23aa5c9e9fb54d.slyfox@gentoo
1 commit: 048b8a49b5918cb878f67a75ec23aa5c9e9fb54d
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jun 1 17:20:56 2019 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Sat Jun 1 17:21:14 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=048b8a49
7
8 sys-fs/btrfs-progs: add USE=doc, bug #627418
9
10 USE=-doc will install manpages shipped in tarball,
11 USE=doc will regenerate manpages locally.
12
13 Reported-by: Holger Hoffstätte
14 Closes: https://bugs.gentoo.org/627418
15 Package-Manager: Portage-2.3.67, Repoman-2.3.13
16 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
17
18 sys-fs/btrfs-progs/btrfs-progs-5.1-r1.ebuild | 14 ++++++++++----
19 sys-fs/btrfs-progs/btrfs-progs-9999.ebuild | 14 ++++++++++----
20 2 files changed, 20 insertions(+), 8 deletions(-)
21
22 diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.1-r1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.1-r1.ebuild
23 index 572fe0d9fec..033e0ad66d1 100644
24 --- a/sys-fs/btrfs-progs/btrfs-progs-5.1-r1.ebuild
25 +++ b/sys-fs/btrfs-progs/btrfs-progs-5.1-r1.ebuild
26 @@ -27,7 +27,7 @@ HOMEPAGE="https://btrfs.wiki.kernel.org"
27
28 LICENSE="GPL-2"
29 SLOT="0/${libbtrfs_soname}"
30 -IUSE="+convert python reiserfs static static-libs +zstd"
31 +IUSE="+convert doc python reiserfs static static-libs +zstd"
32
33 RESTRICT=test # tries to mount repared filesystems
34
35 @@ -63,9 +63,11 @@ DEPEND="${RDEPEND}
36 )
37 "
38 BDEPEND="
39 - || ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor )
40 - app-text/docbook-xml-dtd:4.5
41 - app-text/xmlto
42 + doc? (
43 + || ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor )
44 + app-text/docbook-xml-dtd:4.5
45 + app-text/xmlto
46 + )
47 "
48
49 if [[ ${PV} == 9999 ]]; then
50 @@ -99,6 +101,7 @@ src_configure() {
51 local myeconfargs=(
52 --bindir="${EPREFIX}"/sbin
53 $(use_enable convert)
54 + $(use_enable doc documentation)
55 $(use_enable elibc_glibc backtrace)
56 $(use_enable python)
57 $(use_enable static-libs static)
58 @@ -120,4 +123,7 @@ src_install() {
59 emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
60 newbashcomp btrfs-completion btrfs
61 use python && python_optimize
62 +
63 + # install prebuilt subset of manuals
64 + use doc || doman Documentation/*.[58]
65 }
66
67 diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
68 index 35aaf524c91..4680b387969 100644
69 --- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
70 +++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
71 @@ -27,7 +27,7 @@ HOMEPAGE="https://btrfs.wiki.kernel.org"
72
73 LICENSE="GPL-2"
74 SLOT="0/${libbtrfs_soname}"
75 -IUSE="+convert python reiserfs static static-libs +zstd"
76 +IUSE="+convert doc python reiserfs static static-libs +zstd"
77
78 RESTRICT=test # tries to mount repared filesystems
79
80 @@ -63,9 +63,11 @@ DEPEND="${RDEPEND}
81 )
82 "
83 BDEPEND="
84 - || ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor )
85 - app-text/docbook-xml-dtd:4.5
86 - app-text/xmlto
87 + doc? (
88 + || ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor )
89 + app-text/docbook-xml-dtd:4.5
90 + app-text/xmlto
91 + )
92 "
93
94 if [[ ${PV} == 9999 ]]; then
95 @@ -95,6 +97,7 @@ src_configure() {
96 local myeconfargs=(
97 --bindir="${EPREFIX}"/sbin
98 $(use_enable convert)
99 + $(use_enable doc documentation)
100 $(use_enable elibc_glibc backtrace)
101 $(use_enable python)
102 $(use_enable static-libs static)
103 @@ -116,4 +119,7 @@ src_install() {
104 emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
105 newbashcomp btrfs-completion btrfs
106 use python && python_optimize
107 +
108 + # install prebuilt subset of manuals
109 + use doc || doman Documentation/*.[58]
110 }