1 |
commit: a8ca444b5c267f52cbdd3eae6946ac4de3eea739 |
2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
3 |
AuthorDate: Sat Feb 6 17:25:49 2016 +0000 |
4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Feb 22 17:05:15 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8ca444b |
7 |
|
8 |
dev-libs/liborcus: Add USE=spreadsheet-model,tools (bugs 571964, 571966) |
9 |
|
10 |
Further changes: |
11 |
EAPI=6 |
12 |
0.7.1 and 0.9.2 - pin required mdds slot 0 and liborcus version |
13 |
9999 - pin required mdds slot 1 |
14 |
|
15 |
Package-Manager: portage-2.2.27 |
16 |
|
17 |
...liborcus-0.7.1.ebuild => liborcus-0.7.1-r1.ebuild} | 19 +++++++++++-------- |
18 |
dev-libs/liborcus/liborcus-0.7.1.ebuild | 6 +++--- |
19 |
...liborcus-0.9.2.ebuild => liborcus-0.9.2-r1.ebuild} | 17 ++++++++++------- |
20 |
dev-libs/liborcus/liborcus-9999.ebuild | 8 +++++--- |
21 |
dev-libs/liborcus/metadata.xml | 7 +++++++ |
22 |
5 files changed, 36 insertions(+), 21 deletions(-) |
23 |
|
24 |
diff --git a/dev-libs/liborcus/liborcus-0.7.1.ebuild b/dev-libs/liborcus/liborcus-0.7.1-r1.ebuild |
25 |
similarity index 64% |
26 |
copy from dev-libs/liborcus/liborcus-0.7.1.ebuild |
27 |
copy to dev-libs/liborcus/liborcus-0.7.1-r1.ebuild |
28 |
index 7c68d4c..3612205 100644 |
29 |
--- a/dev-libs/liborcus/liborcus-0.7.1.ebuild |
30 |
+++ b/dev-libs/liborcus/liborcus-0.7.1-r1.ebuild |
31 |
@@ -1,12 +1,12 @@ |
32 |
-# Copyright 1999-2015 Gentoo Foundation |
33 |
+# Copyright 1999-2016 Gentoo Foundation |
34 |
# Distributed under the terms of the GNU General Public License v2 |
35 |
# $Id$ |
36 |
|
37 |
-EAPI=5 |
38 |
+EAPI=6 |
39 |
|
40 |
EGIT_REPO_URI="git://gitlab.com/orcus/orcus.git" |
41 |
|
42 |
-[[ ${PV} == 9999 ]] && GITECLASS="git-2 autotools" |
43 |
+[[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools" |
44 |
inherit eutils ${GITECLASS} |
45 |
unset GITECLASS |
46 |
|
47 |
@@ -17,27 +17,30 @@ HOMEPAGE="https://gitlab.com/orcus/orcus" |
48 |
LICENSE="MIT" |
49 |
SLOT="0" |
50 |
[[ ${PV} == 9999 ]] || \ |
51 |
-KEYWORDS="amd64 ~arm ~ppc x86" |
52 |
+KEYWORDS="~amd64 ~arm ~ppc ~x86" |
53 |
|
54 |
-IUSE="static-libs" |
55 |
+IUSE="+spreadsheet-model static-libs tools" |
56 |
|
57 |
RDEPEND=" |
58 |
>=dev-libs/boost-1.51.0:= |
59 |
- >=dev-libs/libixion-0.9:= |
60 |
sys-libs/zlib:= |
61 |
+ spreadsheet-model? ( =dev-libs/libixion-0.9*:= ) |
62 |
" |
63 |
DEPEND="${RDEPEND} |
64 |
- >=dev-util/mdds-0.8.1 |
65 |
+ >=dev-util/mdds-0.8.1:0 |
66 |
" |
67 |
|
68 |
src_prepare() { |
69 |
+ eapply_user |
70 |
[[ ${PV} == 9999 ]] && eautoreconf |
71 |
} |
72 |
|
73 |
src_configure() { |
74 |
econf \ |
75 |
--disable-werror \ |
76 |
- $(use_enable static-libs static) |
77 |
+ $(use_enable spreadsheet-model) \ |
78 |
+ $(use_enable static-libs static) \ |
79 |
+ $(use_with tools) |
80 |
} |
81 |
|
82 |
src_install() { |
83 |
|
84 |
diff --git a/dev-libs/liborcus/liborcus-0.7.1.ebuild b/dev-libs/liborcus/liborcus-0.7.1.ebuild |
85 |
index 7c68d4c..87cbf36 100644 |
86 |
--- a/dev-libs/liborcus/liborcus-0.7.1.ebuild |
87 |
+++ b/dev-libs/liborcus/liborcus-0.7.1.ebuild |
88 |
@@ -1,4 +1,4 @@ |
89 |
-# Copyright 1999-2015 Gentoo Foundation |
90 |
+# Copyright 1999-2016 Gentoo Foundation |
91 |
# Distributed under the terms of the GNU General Public License v2 |
92 |
# $Id$ |
93 |
|
94 |
@@ -23,11 +23,11 @@ IUSE="static-libs" |
95 |
|
96 |
RDEPEND=" |
97 |
>=dev-libs/boost-1.51.0:= |
98 |
- >=dev-libs/libixion-0.9:= |
99 |
+ =dev-libs/libixion-0.9*:= |
100 |
sys-libs/zlib:= |
101 |
" |
102 |
DEPEND="${RDEPEND} |
103 |
- >=dev-util/mdds-0.8.1 |
104 |
+ >=dev-util/mdds-0.8.1:0 |
105 |
" |
106 |
|
107 |
src_prepare() { |
108 |
|
109 |
diff --git a/dev-libs/liborcus/liborcus-0.9.2.ebuild b/dev-libs/liborcus/liborcus-0.9.2-r1.ebuild |
110 |
similarity index 70% |
111 |
rename from dev-libs/liborcus/liborcus-0.9.2.ebuild |
112 |
rename to dev-libs/liborcus/liborcus-0.9.2-r1.ebuild |
113 |
index 6668627..8a6c9f2 100644 |
114 |
--- a/dev-libs/liborcus/liborcus-0.9.2.ebuild |
115 |
+++ b/dev-libs/liborcus/liborcus-0.9.2-r1.ebuild |
116 |
@@ -1,8 +1,8 @@ |
117 |
-# Copyright 1999-2015 Gentoo Foundation |
118 |
+# Copyright 1999-2016 Gentoo Foundation |
119 |
# Distributed under the terms of the GNU General Public License v2 |
120 |
# $Id$ |
121 |
|
122 |
-EAPI=5 |
123 |
+EAPI=6 |
124 |
|
125 |
EGIT_REPO_URI="https://gitlab.com/orcus/orcus.git" |
126 |
|
127 |
@@ -15,31 +15,34 @@ HOMEPAGE="https://gitlab.com/orcus/orcus/blob/master/README.md" |
128 |
[[ ${PV} == 9999 ]] || SRC_URI="http://kohei.us/files/orcus/src/${P}.tar.xz" |
129 |
|
130 |
LICENSE="MIT" |
131 |
-SLOT="0/0.10" |
132 |
+SLOT="0/0.10" # based on SONAME of liborcus.so |
133 |
|
134 |
#[[ ${PV} == 9999 ]] || \ |
135 |
#KEYWORDS="~amd64 ~arm ~ppc ~x86" |
136 |
KEYWORDS="" |
137 |
|
138 |
-IUSE="static-libs" |
139 |
+IUSE="+spreadsheet-model static-libs tools" |
140 |
|
141 |
RDEPEND=" |
142 |
>=dev-libs/boost-1.51.0:= |
143 |
- =dev-libs/libixion-0.9*:= |
144 |
sys-libs/zlib:= |
145 |
+ spreadsheet-model? ( =dev-libs/libixion-0.9*:= ) |
146 |
" |
147 |
DEPEND="${RDEPEND} |
148 |
- >=dev-util/mdds-0.11 |
149 |
+ >=dev-util/mdds-0.11:0 |
150 |
" |
151 |
|
152 |
src_prepare() { |
153 |
+ eapply_user |
154 |
[[ ${PV} == 9999 ]] && eautoreconf |
155 |
} |
156 |
|
157 |
src_configure() { |
158 |
econf \ |
159 |
--disable-werror \ |
160 |
- $(use_enable static-libs static) |
161 |
+ $(use_enable spreadsheet-model) \ |
162 |
+ $(use_enable static-libs static) \ |
163 |
+ $(use_with tools) |
164 |
} |
165 |
|
166 |
src_install() { |
167 |
|
168 |
diff --git a/dev-libs/liborcus/liborcus-9999.ebuild b/dev-libs/liborcus/liborcus-9999.ebuild |
169 |
index e87413f..64a4c24 100644 |
170 |
--- a/dev-libs/liborcus/liborcus-9999.ebuild |
171 |
+++ b/dev-libs/liborcus/liborcus-9999.ebuild |
172 |
@@ -20,13 +20,13 @@ LICENSE="MIT" |
173 |
SLOT="0/0.11" # based on SONAME of liborcus.so |
174 |
[[ ${PV} == 9999 ]] || \ |
175 |
KEYWORDS="~amd64 ~arm ~ppc ~x86" |
176 |
-IUSE="python static-libs" |
177 |
+IUSE="python +spreadsheet-model static-libs tools" |
178 |
|
179 |
RDEPEND=" |
180 |
>=dev-libs/boost-1.51.0:= |
181 |
- =dev-libs/libixion-9999:= |
182 |
sys-libs/zlib:= |
183 |
python? ( ${PYTHON_DEPS} ) |
184 |
+ spreadsheet-model? ( =dev-libs/libixion-9999:= ) |
185 |
" |
186 |
DEPEND="${RDEPEND} |
187 |
dev-util/mdds:1 |
188 |
@@ -47,7 +47,9 @@ src_configure() { |
189 |
econf \ |
190 |
--disable-werror \ |
191 |
$(use_enable python) \ |
192 |
- $(use_enable static-libs static) |
193 |
+ $(use_enable spreadsheet-model) \ |
194 |
+ $(use_enable static-libs static) \ |
195 |
+ $(use_with tools) |
196 |
} |
197 |
|
198 |
src_install() { |
199 |
|
200 |
diff --git a/dev-libs/liborcus/metadata.xml b/dev-libs/liborcus/metadata.xml |
201 |
index 13ce236..76fa89e 100644 |
202 |
--- a/dev-libs/liborcus/metadata.xml |
203 |
+++ b/dev-libs/liborcus/metadata.xml |
204 |
@@ -5,4 +5,11 @@ |
205 |
<email>office@g.o</email> |
206 |
<name>Gentoo Office project</name> |
207 |
</maintainer> |
208 |
+ <use> |
209 |
+ <flag name="spreadsheet-model">Enable the spreadsheet model implementation</flag> |
210 |
+ <flag name="tools">Build miscellaneous tools</flag> |
211 |
+ </use> |
212 |
+ <upstream> |
213 |
+ <remote-id type="gitlab">orcus/orcus</remote-id> |
214 |
+ </upstream> |
215 |
</pkgmetadata> |