1 |
commit: 0369fd931feeec7800ed7a9114f2df747f5cc98c |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Apr 20 23:53:37 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Apr 21 11:30:58 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0369fd93 |
7 |
|
8 |
dev-cpp/libcmis: Add USE tools |
9 |
|
10 |
Package-Manager: Portage-2.3.64, Repoman-2.3.12 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
...libcmis-9999.ebuild => libcmis-0.5.2-r1.ebuild} | 28 ++++++++-------------- |
14 |
dev-cpp/libcmis/libcmis-9999.ebuild | 28 ++++++++-------------- |
15 |
dev-cpp/libcmis/metadata.xml | 3 ++- |
16 |
3 files changed, 22 insertions(+), 37 deletions(-) |
17 |
|
18 |
diff --git a/dev-cpp/libcmis/libcmis-9999.ebuild b/dev-cpp/libcmis/libcmis-0.5.2-r1.ebuild |
19 |
similarity index 66% |
20 |
copy from dev-cpp/libcmis/libcmis-9999.ebuild |
21 |
copy to dev-cpp/libcmis/libcmis-0.5.2-r1.ebuild |
22 |
index 33f9f92173e..a060dbb78ee 100644 |
23 |
--- a/dev-cpp/libcmis/libcmis-9999.ebuild |
24 |
+++ b/dev-cpp/libcmis/libcmis-0.5.2-r1.ebuild |
25 |
@@ -1,4 +1,4 @@ |
26 |
-# Copyright 1999-2018 Gentoo Authors |
27 |
+# Copyright 1999-2019 Gentoo Authors |
28 |
# Distributed under the terms of the GNU General Public License v2 |
29 |
|
30 |
EAPI=7 |
31 |
@@ -6,11 +6,9 @@ EAPI=7 |
32 |
if [[ ${PV} = 9999 ]]; then |
33 |
EGIT_REPO_URI="https://github.com/tdf/libcmis.git" |
34 |
inherit git-r3 |
35 |
-elif [[ ${PV} = *_pre* ]]; then |
36 |
- COMMIT=738528d790b2b1d52d9b72d673842969a852815d |
37 |
- SRC_URI="https://github.com/tdf/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" |
38 |
else |
39 |
SRC_URI="https://github.com/tdf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
40 |
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" |
41 |
fi |
42 |
inherit autotools flag-o-matic |
43 |
|
44 |
@@ -20,18 +18,8 @@ HOMEPAGE="https://github.com/tdf/libcmis" |
45 |
LICENSE="|| ( GPL-2 LGPL-2 MPL-1.1 )" |
46 |
SLOT="0.5" |
47 |
|
48 |
-# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061 |
49 |
-[[ ${PV} == 9999 ]] || \ |
50 |
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" |
51 |
+IUSE="man static-libs test tools" |
52 |
|
53 |
-IUSE="man static-libs test" |
54 |
- |
55 |
-RDEPEND=" |
56 |
- dev-libs/boost:= |
57 |
- dev-libs/libxml2 |
58 |
- net-misc/curl |
59 |
-" |
60 |
-DEPEND="${RDEPEND}" |
61 |
BDEPEND=" |
62 |
virtual/pkgconfig |
63 |
man? ( |
64 |
@@ -43,11 +31,15 @@ BDEPEND=" |
65 |
dev-util/cppunit |
66 |
) |
67 |
" |
68 |
+DEPEND=" |
69 |
+ dev-libs/boost:= |
70 |
+ dev-libs/libxml2 |
71 |
+ net-misc/curl |
72 |
+" |
73 |
+RDEPEND="${DEPEND}" |
74 |
|
75 |
RESTRICT="test" |
76 |
|
77 |
-[[ ${PV} = *_pre* ]] && S="${WORKDIR}/${PN}-${COMMIT}" |
78 |
- |
79 |
src_prepare() { |
80 |
default |
81 |
eautoreconf |
82 |
@@ -63,7 +55,7 @@ src_configure() { |
83 |
$(use_with man) |
84 |
$(use_enable static-libs static) |
85 |
$(use_enable test tests) |
86 |
- --enable-client |
87 |
+ $(use_enable tools client) |
88 |
) |
89 |
econf "${myeconfargs[@]}" |
90 |
} |
91 |
|
92 |
diff --git a/dev-cpp/libcmis/libcmis-9999.ebuild b/dev-cpp/libcmis/libcmis-9999.ebuild |
93 |
index 33f9f92173e..a060dbb78ee 100644 |
94 |
--- a/dev-cpp/libcmis/libcmis-9999.ebuild |
95 |
+++ b/dev-cpp/libcmis/libcmis-9999.ebuild |
96 |
@@ -1,4 +1,4 @@ |
97 |
-# Copyright 1999-2018 Gentoo Authors |
98 |
+# Copyright 1999-2019 Gentoo Authors |
99 |
# Distributed under the terms of the GNU General Public License v2 |
100 |
|
101 |
EAPI=7 |
102 |
@@ -6,11 +6,9 @@ EAPI=7 |
103 |
if [[ ${PV} = 9999 ]]; then |
104 |
EGIT_REPO_URI="https://github.com/tdf/libcmis.git" |
105 |
inherit git-r3 |
106 |
-elif [[ ${PV} = *_pre* ]]; then |
107 |
- COMMIT=738528d790b2b1d52d9b72d673842969a852815d |
108 |
- SRC_URI="https://github.com/tdf/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" |
109 |
else |
110 |
SRC_URI="https://github.com/tdf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
111 |
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" |
112 |
fi |
113 |
inherit autotools flag-o-matic |
114 |
|
115 |
@@ -20,18 +18,8 @@ HOMEPAGE="https://github.com/tdf/libcmis" |
116 |
LICENSE="|| ( GPL-2 LGPL-2 MPL-1.1 )" |
117 |
SLOT="0.5" |
118 |
|
119 |
-# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061 |
120 |
-[[ ${PV} == 9999 ]] || \ |
121 |
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" |
122 |
+IUSE="man static-libs test tools" |
123 |
|
124 |
-IUSE="man static-libs test" |
125 |
- |
126 |
-RDEPEND=" |
127 |
- dev-libs/boost:= |
128 |
- dev-libs/libxml2 |
129 |
- net-misc/curl |
130 |
-" |
131 |
-DEPEND="${RDEPEND}" |
132 |
BDEPEND=" |
133 |
virtual/pkgconfig |
134 |
man? ( |
135 |
@@ -43,11 +31,15 @@ BDEPEND=" |
136 |
dev-util/cppunit |
137 |
) |
138 |
" |
139 |
+DEPEND=" |
140 |
+ dev-libs/boost:= |
141 |
+ dev-libs/libxml2 |
142 |
+ net-misc/curl |
143 |
+" |
144 |
+RDEPEND="${DEPEND}" |
145 |
|
146 |
RESTRICT="test" |
147 |
|
148 |
-[[ ${PV} = *_pre* ]] && S="${WORKDIR}/${PN}-${COMMIT}" |
149 |
- |
150 |
src_prepare() { |
151 |
default |
152 |
eautoreconf |
153 |
@@ -63,7 +55,7 @@ src_configure() { |
154 |
$(use_with man) |
155 |
$(use_enable static-libs static) |
156 |
$(use_enable test tests) |
157 |
- --enable-client |
158 |
+ $(use_enable tools client) |
159 |
) |
160 |
econf "${myeconfargs[@]}" |
161 |
} |
162 |
|
163 |
diff --git a/dev-cpp/libcmis/metadata.xml b/dev-cpp/libcmis/metadata.xml |
164 |
index afb9c075be7..02623876d9c 100644 |
165 |
--- a/dev-cpp/libcmis/metadata.xml |
166 |
+++ b/dev-cpp/libcmis/metadata.xml |
167 |
@@ -6,7 +6,8 @@ |
168 |
<name>Gentoo Office project</name> |
169 |
</maintainer> |
170 |
<use> |
171 |
- <flag name="man">Build and install man pages.</flag> |
172 |
+ <flag name="man">Build and install man pages</flag> |
173 |
+ <flag name="tools">Build client tool for testing and viewing features</flag> |
174 |
</use> |
175 |
<upstream> |
176 |
<remote-id type="github">tdf/libcmis</remote-id> |