Gentoo Archives: gentoo-commits

From: "Michael Palimaka (kensington)" <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-office/calligra: calligra-2.6.3.ebuild calligra-2.5.3.ebuild calligra-9999.ebuild ChangeLog
Date: Thu, 30 May 2013 11:56:10
Message-Id: 20130530115603.137412171D@flycatcher.gentoo.org
1 kensington 13/05/30 11:56:03
2
3 Modified: calligra-2.6.3.ebuild calligra-2.5.3.ebuild
4 calligra-9999.ebuild ChangeLog
5 Log:
6 Add USE dependency default in preparation for the removal of the semantic-desktop USE flag. Remove semantic-desktop USE flag from testing versions.
7
8 (Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)
9
10 Revision Changes Path
11 1.4 app-office/calligra/calligra-2.6.3.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/calligra/calligra-2.6.3.ebuild?rev=1.4&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/calligra/calligra-2.6.3.ebuild?rev=1.4&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/calligra/calligra-2.6.3.ebuild?r1=1.3&r2=1.4
16
17 Index: calligra-2.6.3.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.6.3.ebuild,v
20 retrieving revision 1.3
21 retrieving revision 1.4
22 diff -u -r1.3 -r1.4
23 --- calligra-2.6.3.ebuild 27 Apr 2013 12:29:59 -0000 1.3
24 +++ calligra-2.6.3.ebuild 30 May 2013 11:56:02 -0000 1.4
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2013 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.6.3.ebuild,v 1.3 2013/04/27 12:29:59 scarabeus Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.6.3.ebuild,v 1.4 2013/05/30 11:56:02 kensington Exp $
30
31 # note: files that need to be checked for dependencies etc:
32 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
33 @@ -44,8 +44,8 @@
34
35 IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
36 gsl +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +okular opengtl openexr
37 -+pdf postgres +semantic-desktop spacenav +ssl sybase test tiff +threads +truetype
38 -word-perfect xbase +xml +xslt"
39 ++pdf postgres spacenav +ssl sybase test tiff +threads +truetype word-perfect xbase
40 ++xml +xslt"
41
42 # please do not sort here, order is same as in CMakeLists.txt
43 CAL_FTS="author kexi words flow plan stage sheets krita karbon braindump"
44 @@ -59,7 +59,7 @@
45 calligra_features_kexi? ( calligra_features_sheets )
46 calligra_features_words? ( calligra_features_sheets )
47 calligra_features_krita? ( eigen exif lcms )
48 - calligra_features_plan? ( kdepim semantic-desktop )
49 + calligra_features_plan? ( kdepim )
50 calligra_features_sheets? ( eigen )
51 test? ( calligra_features_karbon )
52 "
53 @@ -76,9 +76,11 @@
54 !app-office/krita
55 !app-office/kspread
56 !app-office/kword
57 + $(add_kdebase_dep kdelibs 'semantic-desktop(+)')
58 dev-lang/perl
59 dev-libs/boost
60 dev-libs/libxml2
61 + dev-libs/soprano
62 $(add_kdebase_dep knewstuff)
63 media-libs/libpng
64 sys-libs/zlib
65 @@ -99,7 +101,7 @@
66 jpeg? ( virtual/jpeg )
67 jpeg2k? ( media-libs/openjpeg )
68 kdcraw? ( $(add_kdebase_dep libkdcraw) )
69 - kdepim? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') )
70 + kdepim? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop(+)') )
71 lcms? ( media-libs/lcms:2 )
72 marble? ( $(add_kdebase_dep marble) )
73 mysql? ( virtual/mysql )
74 @@ -115,7 +117,6 @@
75 dev-db/postgresql-base
76 dev-libs/libpqxx
77 )
78 - semantic-desktop? ( dev-libs/soprano $(add_kdebase_dep kdelibs semantic-desktop) )
79 spacenav? ( dev-libs/libspnav )
80 ssl? ( dev-libs/openssl )
81 sybase? ( dev-db/freetds )
82 @@ -201,8 +202,6 @@
83 $(cmake-utils_use_with pdf Pstoedit)
84 $(cmake-utils_use_with postgres PostgreSQL)
85 $(cmake-utils_use_build postgres pqxx)
86 - $(cmake-utils_use_with semantic-desktop Soprano)
87 - $(cmake-utils_use semantic-desktop NEPOMUK)
88 $(cmake-utils_use_with spacenav Spnav)
89 $(cmake-utils_use_with ssl OpenSSL)
90 $(cmake-utils_use_with sybase FreeTDS)
91
92
93
94 1.4 app-office/calligra/calligra-2.5.3.ebuild
95
96 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/calligra/calligra-2.5.3.ebuild?rev=1.4&view=markup
97 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/calligra/calligra-2.5.3.ebuild?rev=1.4&content-type=text/plain
98 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/calligra/calligra-2.5.3.ebuild?r1=1.3&r2=1.4
99
100 Index: calligra-2.5.3.ebuild
101 ===================================================================
102 RCS file: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.5.3.ebuild,v
103 retrieving revision 1.3
104 retrieving revision 1.4
105 diff -u -r1.3 -r1.4
106 --- calligra-2.5.3.ebuild 2 Mar 2013 19:34:55 -0000 1.3
107 +++ calligra-2.5.3.ebuild 30 May 2013 11:56:02 -0000 1.4
108 @@ -1,6 +1,6 @@
109 # Copyright 1999-2013 Gentoo Foundation
110 # Distributed under the terms of the GNU General Public License v2
111 -# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.5.3.ebuild,v 1.3 2013/03/02 19:34:55 hwoarang Exp $
112 +# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.5.3.ebuild,v 1.4 2013/05/30 11:56:02 kensington Exp $
113
114 # note: files that need to be checked for dependencies etc:
115 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
116 @@ -101,7 +101,7 @@
117 jpeg? ( virtual/jpeg )
118 jpeg2k? ( media-libs/openjpeg )
119 kdcraw? ( $(add_kdebase_dep libkdcraw) )
120 - kdepim? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') )
121 + kdepim? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop(+)') )
122 lcms? ( media-libs/lcms:2 )
123 marble? ( $(add_kdebase_dep marble) )
124 mysql? ( virtual/mysql )
125 @@ -117,7 +117,7 @@
126 dev-db/postgresql-base
127 dev-libs/libpqxx
128 )
129 - semantic-desktop? ( dev-libs/soprano $(add_kdebase_dep kdelibs semantic-desktop) )
130 + semantic-desktop? ( dev-libs/soprano $(add_kdebase_dep kdelibs 'semantic-desktop(+)') )
131 spacenav? ( dev-libs/libspnav )
132 ssl? ( dev-libs/openssl )
133 sybase? ( dev-db/freetds )
134
135
136
137 1.37 app-office/calligra/calligra-9999.ebuild
138
139 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/calligra/calligra-9999.ebuild?rev=1.37&view=markup
140 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/calligra/calligra-9999.ebuild?rev=1.37&content-type=text/plain
141 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/calligra/calligra-9999.ebuild?r1=1.36&r2=1.37
142
143 Index: calligra-9999.ebuild
144 ===================================================================
145 RCS file: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v
146 retrieving revision 1.36
147 retrieving revision 1.37
148 diff -u -r1.36 -r1.37
149 --- calligra-9999.ebuild 27 Apr 2013 12:29:59 -0000 1.36
150 +++ calligra-9999.ebuild 30 May 2013 11:56:02 -0000 1.37
151 @@ -1,6 +1,6 @@
152 # Copyright 1999-2013 Gentoo Foundation
153 # Distributed under the terms of the GNU General Public License v2
154 -# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v 1.36 2013/04/27 12:29:59 scarabeus Exp $
155 +# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v 1.37 2013/05/30 11:56:02 kensington Exp $
156
157 # note: files that need to be checked for dependencies etc:
158 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
159 @@ -44,8 +44,8 @@
160
161 IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
162 gsl +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +okular opengtl openexr
163 -+pdf postgres +semantic-desktop spacenav +ssl sybase test tiff +threads +truetype
164 -word-perfect xbase +xml +xslt"
165 ++pdf postgres spacenav +ssl sybase test tiff +threads +truetype word-perfect xbase
166 ++xml +xslt"
167
168 # please do not sort here, order is same as in CMakeLists.txt
169 CAL_FTS="author kexi words flow plan stage sheets krita karbon braindump"
170 @@ -59,7 +59,7 @@
171 calligra_features_kexi? ( calligra_features_sheets )
172 calligra_features_words? ( calligra_features_sheets )
173 calligra_features_krita? ( eigen exif lcms )
174 - calligra_features_plan? ( kdepim semantic-desktop )
175 + calligra_features_plan? ( kdepim )
176 calligra_features_sheets? ( eigen )
177 test? ( calligra_features_karbon )
178 "
179 @@ -76,9 +76,11 @@
180 !app-office/krita
181 !app-office/kspread
182 !app-office/kword
183 + $(add_kdebase_dep kdelibs 'semantic-desktop(+)')
184 dev-lang/perl
185 dev-libs/boost
186 dev-libs/libxml2
187 + dev-libs/soprano
188 $(add_kdebase_dep knewstuff)
189 media-libs/libpng
190 sys-libs/zlib
191 @@ -99,7 +101,7 @@
192 jpeg? ( virtual/jpeg )
193 jpeg2k? ( media-libs/openjpeg )
194 kdcraw? ( $(add_kdebase_dep libkdcraw) )
195 - kdepim? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') )
196 + kdepim? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop(+)') )
197 lcms? ( media-libs/lcms:2 )
198 marble? ( $(add_kdebase_dep marble) )
199 mysql? ( virtual/mysql )
200 @@ -115,7 +117,6 @@
201 dev-db/postgresql-base
202 dev-libs/libpqxx
203 )
204 - semantic-desktop? ( dev-libs/soprano $(add_kdebase_dep kdelibs semantic-desktop) )
205 spacenav? ( dev-libs/libspnav )
206 ssl? ( dev-libs/openssl )
207 sybase? ( dev-db/freetds )
208 @@ -201,8 +202,6 @@
209 $(cmake-utils_use_with pdf Pstoedit)
210 $(cmake-utils_use_with postgres PostgreSQL)
211 $(cmake-utils_use_build postgres pqxx)
212 - $(cmake-utils_use_with semantic-desktop Soprano)
213 - $(cmake-utils_use semantic-desktop NEPOMUK)
214 $(cmake-utils_use_with spacenav Spnav)
215 $(cmake-utils_use_with ssl OpenSSL)
216 $(cmake-utils_use_with sybase FreeTDS)
217
218
219
220 1.85 app-office/calligra/ChangeLog
221
222 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/calligra/ChangeLog?rev=1.85&view=markup
223 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/calligra/ChangeLog?rev=1.85&content-type=text/plain
224 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/calligra/ChangeLog?r1=1.84&r2=1.85
225
226 Index: ChangeLog
227 ===================================================================
228 RCS file: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v
229 retrieving revision 1.84
230 retrieving revision 1.85
231 diff -u -r1.84 -r1.85
232 --- ChangeLog 27 Apr 2013 12:29:59 -0000 1.84
233 +++ ChangeLog 30 May 2013 11:56:02 -0000 1.85
234 @@ -1,6 +1,11 @@
235 # ChangeLog for app-office/calligra
236 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
237 -# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.84 2013/04/27 12:29:59 scarabeus Exp $
238 +# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.85 2013/05/30 11:56:02 kensington Exp $
239 +
240 + 30 May 2013; Michael Palimaka <kensington@g.o> calligra-2.5.3.ebuild,
241 + calligra-2.6.3.ebuild, calligra-9999.ebuild:
242 + Add USE dependency default in preparation for the removal of the semantic-
243 + desktop USE flag. Remove semantic-desktop USE flag from testing versions.
244
245 27 Apr 2013; Tomáš Chvátal <scarabeus@g.o> calligra-2.6.3.ebuild,
246 calligra-9999.ebuild: