Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Andreas HAttel (dilfridge)" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-office/calligra: ChangeLog calligra-2.4.9999.ebuild calligra-9999.ebuild calligra-2.4.0.ebuild
Date: Fri, 06 Apr 2012 21:53:52
Message-Id: 20120406215332.B8E4E2004B@flycatcher.gentoo.org
1 dilfridge 12/04/06 21:53:32
2
3 Modified: ChangeLog calligra-9999.ebuild
4 calligra-2.4.0.ebuild
5 Added: calligra-2.4.9999.ebuild
6 Log:
7 Add bugfix branch live ebuild
8
9 (Portage version: 2.1.10.55/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.31 app-office/calligra/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/calligra/ChangeLog?rev=1.31&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/calligra/ChangeLog?rev=1.31&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/calligra/ChangeLog?r1=1.30&r2=1.31
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v
21 retrieving revision 1.30
22 retrieving revision 1.31
23 diff -u -r1.30 -r1.31
24 --- ChangeLog 6 Apr 2012 21:48:14 -0000 1.30
25 +++ ChangeLog 6 Apr 2012 21:53:32 -0000 1.31
26 @@ -1,6 +1,12 @@
27 # ChangeLog for app-office/calligra
28 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.30 2012/04/06 21:48:14 dilfridge Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.31 2012/04/06 21:53:32 dilfridge Exp $
31 +
32 +*calligra-2.4.9999 (06 Apr 2012)
33 +
34 + 06 Apr 2012; Andreas K. Huettel <dilfridge@g.o> calligra-2.4.0.ebuild,
35 + +calligra-2.4.9999.ebuild, calligra-9999.ebuild:
36 + Add bugfix branch live ebuild
37
38 06 Apr 2012; Andreas K. Huettel <dilfridge@g.o> calligra-2.4.0.ebuild,
39 calligra-9999.ebuild:
40
41
42
43 1.14 app-office/calligra/calligra-9999.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/calligra/calligra-9999.ebuild?rev=1.14&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/calligra/calligra-9999.ebuild?rev=1.14&content-type=text/plain
47 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/calligra/calligra-9999.ebuild?r1=1.13&r2=1.14
48
49 Index: calligra-9999.ebuild
50 ===================================================================
51 RCS file: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v
52 retrieving revision 1.13
53 retrieving revision 1.14
54 diff -u -r1.13 -r1.14
55 --- calligra-9999.ebuild 6 Apr 2012 21:48:14 -0000 1.13
56 +++ calligra-9999.ebuild 6 Apr 2012 21:53:32 -0000 1.14
57 @@ -1,6 +1,6 @@
58 # Copyright 1999-2012 Gentoo Foundation
59 # Distributed under the terms of the GNU General Public License v2
60 -# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v 1.13 2012/04/06 21:48:14 dilfridge Exp $
61 +# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v 1.14 2012/04/06 21:53:32 dilfridge Exp $
62
63 # note: files that need to be checked for dependencies etc:
64 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
65 @@ -20,11 +20,11 @@
66
67 DESCRIPTION="KDE Office Suite"
68 HOMEPAGE="http://www.calligra-suite.org/"
69 -[[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/stable/${P}/${P}.tar.bz2"
70 +[[ ${PV} == *9999 ]] || SRC_URI="mirror://kde/stable/${P}/${P}.tar.bz2"
71
72 LICENSE="GPL-2"
73 SLOT="4"
74 -[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~x86"
75 +[[ ${PV} == *9999 ]] || KEYWORDS="~amd64 ~x86"
76 IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
77 gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr
78 +pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype
79
80
81
82 1.3 app-office/calligra/calligra-2.4.0.ebuild
83
84 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/calligra/calligra-2.4.0.ebuild?rev=1.3&view=markup
85 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/calligra/calligra-2.4.0.ebuild?rev=1.3&content-type=text/plain
86 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/calligra/calligra-2.4.0.ebuild?r1=1.2&r2=1.3
87
88 Index: calligra-2.4.0.ebuild
89 ===================================================================
90 RCS file: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.0.ebuild,v
91 retrieving revision 1.2
92 retrieving revision 1.3
93 diff -u -r1.2 -r1.3
94 --- calligra-2.4.0.ebuild 6 Apr 2012 21:48:14 -0000 1.2
95 +++ calligra-2.4.0.ebuild 6 Apr 2012 21:53:32 -0000 1.3
96 @@ -1,6 +1,6 @@
97 # Copyright 1999-2012 Gentoo Foundation
98 # Distributed under the terms of the GNU General Public License v2
99 -# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.0.ebuild,v 1.2 2012/04/06 21:48:14 dilfridge Exp $
100 +# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.0.ebuild,v 1.3 2012/04/06 21:53:32 dilfridge Exp $
101
102 # note: files that need to be checked for dependencies etc:
103 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
104 @@ -20,11 +20,11 @@
105
106 DESCRIPTION="KDE Office Suite"
107 HOMEPAGE="http://www.calligra-suite.org/"
108 -[[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/stable/${P}/${P}.tar.bz2"
109 +[[ ${PV} == *9999 ]] || SRC_URI="mirror://kde/stable/${P}/${P}.tar.bz2"
110
111 LICENSE="GPL-2"
112 SLOT="4"
113 -[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~x86"
114 +[[ ${PV} == *9999 ]] || KEYWORDS="~amd64 ~x86"
115 IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
116 gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr
117 +pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype
118
119
120
121 1.1 app-office/calligra/calligra-2.4.9999.ebuild
122
123 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/calligra/calligra-2.4.9999.ebuild?rev=1.1&view=markup
124 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/calligra/calligra-2.4.9999.ebuild?rev=1.1&content-type=text/plain
125
126 Index: calligra-2.4.9999.ebuild
127 ===================================================================
128 # Copyright 1999-2012 Gentoo Foundation
129 # Distributed under the terms of the GNU General Public License v2
130 # $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.9999.ebuild,v 1.1 2012/04/06 21:53:32 dilfridge Exp $
131
132 # note: files that need to be checked for dependencies etc:
133 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
134 # krita/CMakeLists.txt
135
136 EGIT_BRANCH="calligra/2.4"
137
138 EAPI=4
139
140 KDE_SCM=git
141 KDE_MINIMAL=4.6.4
142 QT_MINIMAL=4.8.1
143 OPENGL_REQUIRED=optional
144
145 KDE_HANDBOOK=optional
146
147 KDE_LINGUAS_LIVE_OVERRIDE=true
148 inherit kde4-base
149
150 DESCRIPTION="KDE Office Suite"
151 HOMEPAGE="http://www.calligra-suite.org/"
152 [[ ${PV} == *9999 ]] || SRC_URI="mirror://kde/stable/${P}/${P}.tar.bz2"
153
154 LICENSE="GPL-2"
155 SLOT="4"
156 [[ ${PV} == *9999 ]] || KEYWORDS="~amd64 ~x86"
157 IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
158 gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr
159 +pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype
160 +wmf word-perfect xbase +xml +xslt"
161
162 # please do not sort here, order is same as in CMakeLists.txt
163 CAL_FTS="kexi words flow plan stage sheets krita karbon braindump"
164 for cal_ft in ${CAL_FTS}; do
165 IUSE+=" calligra_features_${cal_ft}"
166 done
167 unset cal_ft
168
169 REQUIRED_USE="
170 calligra_features_kexi? ( calligra_features_sheets )
171 calligra_features_words? ( calligra_features_sheets )
172 calligra_features_krita? ( eigen exif lcms )
173 calligra_features_plan? ( kdepim semantic-desktop )
174 calligra_features_sheets? ( eigen )
175 test? ( calligra_features_karbon )
176 "
177
178 RDEPEND="
179 !app-office/karbon
180 !app-office/kexi
181 !app-office/koffice-data
182 !app-office/koffice-l10n
183 !app-office/koffice-libs
184 !app-office/koffice-meta
185 !app-office/kplato
186 !app-office/kpresenter
187 !app-office/krita
188 !app-office/kspread
189 !app-office/kword
190 dev-lang/perl
191 dev-libs/boost
192 dev-libs/libxml2
193 $(add_kdebase_dep knewstuff)
194 media-libs/libpng
195 sys-libs/zlib
196 >=x11-libs/qt-gui-4.8.1-r1
197 attica? ( dev-libs/libattica )
198 crypt? ( app-crypt/qca:2 )
199 eigen? ( dev-cpp/eigen:2 )
200 exif? ( media-gfx/exiv2 )
201 fftw? ( sci-libs/fftw:3.0 )
202 fontconfig? ( media-libs/fontconfig )
203 freetds? ( dev-db/freetds )
204 gif? ( media-libs/giflib )
205 glew? ( media-libs/glew )
206 glib? ( dev-libs/glib:2 )
207 gsf? ( gnome-extra/libgsf )
208 gsl? ( sci-libs/gsl )
209 iconv? ( virtual/libiconv )
210 jpeg? ( virtual/jpeg )
211 jpeg2k? ( media-libs/openjpeg )
212 kdcraw? ( $(add_kdebase_dep libkdcraw) )
213 kdepim? ( $(add_kdebase_dep kdepimlibs) )
214 lcms? ( media-libs/lcms:2 )
215 marble? ( $(add_kdebase_dep marble) )
216 mysql? ( virtual/mysql )
217 okular? ( $(add_kdebase_dep okular) )
218 openctl? ( >=media-libs/opengtl-0.9.15 )
219 openexr? ( media-libs/openexr )
220 pdf? (
221 app-text/poppler
222 media-gfx/pstoedit
223 )
224 postgres? (
225 dev-db/postgresql-base
226 =dev-libs/libpqxx-3*
227 )
228 semantic-desktop? ( dev-libs/soprano $(add_kdebase_dep kdelibs semantic-desktop) )
229 ssl? ( dev-libs/openssl )
230 sybase? ( dev-db/freetds )
231 tiff? ( media-libs/tiff )
232 truetype? ( media-libs/freetype:2 )
233 word-perfect? (
234 app-text/libwpd
235 app-text/libwps
236 app-text/libwpg
237 )
238 xbase? ( dev-db/xbase )
239 xslt? ( dev-libs/libxslt )
240 calligra_features_kexi? (
241 >=dev-db/sqlite-3.7.9:3[extensions]
242 dev-libs/icu
243 )
244 "
245 DEPEND="${RDEPEND}"
246
247 RESTRICT=test
248 # bug 394273
249
250 src_configure() {
251 local cal_ft
252
253 # first write out things we want to hard-enable
254 local mycmakeargs=(
255 "-DWITH_Boost=ON"
256 "-DWITH_LibXml2=ON"
257 "-DWITH_PNG=ON"
258 "-DWITH_ZLIB=ON"
259 "-DGHNS=ON"
260 "-DWITH_X11=ON"
261 "-DWITH_Qt4=ON"
262 "-DQT3SUPPORT=ON" # kde4-base.eclass pulls this in anyway
263 )
264
265 # default disablers
266 mycmakeargs+=(
267 "-DBUILD_mobile=OFF" # we dont suppor mobile gui, maybe arm could
268 "-DWITH_LCMS=OFF" # we use lcms:2
269 "-DCREATIVEONLY=OFF"
270 "-DWITH_TINY=OFF"
271 "-DWITH_CreateResources=OFF" # NOT PACKAGED: http://create.freedesktop.org/
272 "-DWITH_DCMTK=OFF" # NOT PACKAGED: http://www.dcmtk.org/dcmtk.php.en
273 "-DWITH_Spnav=OFF" # NOT PACKAGED: http://spacenav.sourceforge.net/
274 )
275
276 # regular options
277 mycmakeargs+=(
278 $(cmake-utils_use_with attica LibAttica)
279 $(cmake-utils_use_with crypt QCA2)
280 $(cmake-utils_use_with eigen Eigen2)
281 $(cmake-utils_use_with exif Exiv2)
282 $(cmake-utils_use_with fftw FFTW3)
283 $(cmake-utils_use_with fontconfig Fontconfig)
284 $(cmake-utils_use_with freetds FreeTDS)
285 $(cmake-utils_use_with gif GIF2)
286 $(cmake-utils_use_with glew GLEW)
287 $(cmake-utils_use_with glib GLIB2)
288 $(cmake-utils_use_with glib GObject)
289 $(cmake-utils_use_with gsf LIBGSF)
290 $(cmake-utils_use_with gsl GSL)
291 $(cmake-utils_use_with iconv Iconv)
292 $(cmake-utils_use_with jpeg JPEG)
293 $(cmake-utils_use_with jpeg2k OpenJPEG)
294 $(cmake-utils_use_with kdcraw Kdcraw)
295 $(cmake-utils_use_with kdepim KdepimLibs)
296 $(cmake-utils_use_with lcms LCMS2)
297 $(cmake-utils_use_with marble Marble)
298 $(cmake-utils_use_with mysql MySQL)
299 $(cmake-utils_use_with okular Okular)
300 $(cmake-utils_use_with openctl OpenCTL)
301 $(cmake-utils_use_with openexr OpenEXR)
302 $(cmake-utils_use_with opengl OpenGL)
303 $(cmake-utils_use_with pdf Poppler)
304 $(cmake-utils_use_with pdf Pstoedit)
305 $(cmake-utils_use_with postgres PostgreSQL)
306 $(cmake-utils_use_with semantic-desktop Soprano)
307 $(cmake-utils_use semantic-desktop NEPOMUK)
308 $(cmake-utils_use_with ssl OpenSSL)
309 $(cmake-utils_use_with sybase FreeTDS)
310 $(cmake-utils_use_with tiff TIFF)
311 $(cmake-utils_use_with threads Threads)
312 $(cmake-utils_use_with truetype Freetype)
313 $(cmake-utils_use_with word-perfect WPD)
314 $(cmake-utils_use_with word-perfect WPG)
315 $(cmake-utils_use_with xbase XBase)
316 $(cmake-utils_use_with xslt LibXslt)
317 $(cmake-utils_use_build wmf libkowmf)
318 $(cmake-utils_use_build mso libmsooxml)
319 )
320
321 # applications
322 for cal_ft in ${CAL_FTS}; do
323 mycmakeargs+=( $(cmake-utils_use_build calligra_features_${cal_ft} ${cal_ft}) )
324 done
325 mycmakeargs+=( $(cmake-utils_use_build test cstester) )
326
327 # filters
328
329 kde4-base_src_configure
330 }
Report Message
Find on MARC Find on Google Groups