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