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

Gentoo Archives: gentoo-commits

From: "Johannes Huber (johu)" <johu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-office/akonadi-server: akonadi-server-1.5.2-r1.ebuild metadata.xml akonadi-server-1.6.2-r1.ebuild ChangeLog akonadi-server-1.3.1.ebuild
Date: Tue, 20 Dec 2011 23:44:08
Message-Id: 20111220234358.178262004B@flycatcher.gentoo.org
1 johu 11/12/20 23:43:58
2
3 Modified: metadata.xml ChangeLog
4 Added: akonadi-server-1.5.2-r1.ebuild
5 akonadi-server-1.6.2-r1.ebuild
6 Removed: akonadi-server-1.3.1.ebuild
7 Log:
8 Remove old. Rev bump fix available driver array fill, bug #395165.
9 Thanks to jer to show the root path of the solution.
10
11 (Portage version: 2.2.0_alpha81/cvs/Linux i686)
12
13 Revision Changes Path
14 1.3 app-office/akonadi-server/metadata.xml
15
16 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/akonadi-server/metadata.xml?rev=1.3&view=markup
17 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/akonadi-server/metadata.xml?rev=1.3&content-type=text/plain
18 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/akonadi-server/metadata.xml?r1=1.2&r2=1.3
19
20 Index: metadata.xml
21 ===================================================================
22 RCS file: /var/cvsroot/gentoo-x86/app-office/akonadi-server/metadata.xml,v
23 retrieving revision 1.2
24 retrieving revision 1.3
25 diff -u -r1.2 -r1.3
26 --- metadata.xml 15 May 2010 15:59:26 -0000 1.2
27 +++ metadata.xml 20 Dec 2011 23:43:57 -0000 1.3
28 @@ -2,7 +2,4 @@
29 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
30 <pkgmetadata>
31 <herd>kde</herd>
32 -<use>
33 - <flag name="server">Use locally installed database server.</flag>
34 -</use>
35 </pkgmetadata>
36
37
38
39 1.65 app-office/akonadi-server/ChangeLog
40
41 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/akonadi-server/ChangeLog?rev=1.65&view=markup
42 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/akonadi-server/ChangeLog?rev=1.65&content-type=text/plain
43 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/akonadi-server/ChangeLog?r1=1.64&r2=1.65
44
45 Index: ChangeLog
46 ===================================================================
47 RCS file: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v
48 retrieving revision 1.64
49 retrieving revision 1.65
50 diff -u -r1.64 -r1.65
51 --- ChangeLog 7 Dec 2011 22:06:37 -0000 1.64
52 +++ ChangeLog 20 Dec 2011 23:43:57 -0000 1.65
53 @@ -1,6 +1,16 @@
54 # ChangeLog for app-office/akonadi-server
55 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
56 -# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.64 2011/12/07 22:06:37 hwoarang Exp $
57 +# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.65 2011/12/20 23:43:57 johu Exp $
58 +
59 +*akonadi-server-1.6.2-r1 (20 Dec 2011)
60 +*akonadi-server-1.5.2-r1 (20 Dec 2011)
61 +
62 + 20 Dec 2011; Johannes Huber <johu@g.o> +akonadi-server-1.5.2-r1.ebuild,
63 + +akonadi-server-1.6.2-r1.ebuild, -akonadi-server-1.3.1.ebuild,
64 + -files/akonadi-server-1.6.0_Fix_crash_on_agent_launcher_exit.patch,
65 + metadata.xml:
66 + Remove old. Rev bump fix available driver array fill, bug #395165. Thanks to
67 + jer to show the root path of the solution.
68
69 07 Dec 2011; Markos Chandras <hwoarang@g.o>
70 akonadi-server-1.6.2.ebuild:
71
72
73
74 1.1 app-office/akonadi-server/akonadi-server-1.5.2-r1.ebuild
75
76 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/akonadi-server/akonadi-server-1.5.2-r1.ebuild?rev=1.1&view=markup
77 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/akonadi-server/akonadi-server-1.5.2-r1.ebuild?rev=1.1&content-type=text/plain
78
79 Index: akonadi-server-1.5.2-r1.ebuild
80 ===================================================================
81 # Copyright 1999-2011 Gentoo Foundation
82 # Distributed under the terms of the GNU General Public License v2
83 # $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.5.2-r1.ebuild,v 1.1 2011/12/20 23:43:57 johu Exp $
84
85 EAPI=4
86
87 inherit cmake-utils
88
89 DESCRIPTION="The server part of Akonadi"
90 HOMEPAGE="http://pim.kde.org/akonadi"
91 SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
92
93 LICENSE="LGPL-2.1"
94 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
95 SLOT="0"
96 IUSE="mysql postgres +sqlite test"
97
98 CDEPEND="
99 dev-libs/boost
100 >=dev-libs/soprano-2.2
101 >=x11-libs/qt-gui-4.5.0:4[dbus]
102 >=x11-libs/qt-sql-4.5.0:4[mysql?,postgres?]
103 >=x11-libs/qt-test-4.5.0:4
104 x11-misc/shared-mime-info
105 "
106 DEPEND="${CDEPEND}
107 dev-libs/libxslt
108 >=dev-util/automoc-0.9.88
109 "
110 RDEPEND="${CDEPEND}
111 postgres? ( dev-db/postgresql-server )
112 "
113
114 REQUIRED_USE="|| ( sqlite mysql postgres )"
115
116 S=${WORKDIR}/${P/-server/}
117
118 pkg_setup() {
119 # Set default storage backend in order: SQLite, MySQL, PostgreSQL
120 # reverse driver check to keep the order
121
122 if use postgres; then
123 DRIVER="QPSQL"
124 AVAILABLE+=" ${DRIVER}"
125 fi
126
127 if use mysql; then
128 DRIVER="QMYSQL"
129 AVAILABLE+=" ${DRIVER}"
130 fi
131
132 if use sqlite; then
133 DRIVER="QSQLITE3"
134 AVAILABLE+=" ${DRIVER}"
135 fi
136
137 # Notify about driver name change
138 if use sqlite && has_version "<=${CATEGORY}/${PN}-1.4.0[sqlite]"; then
139 ewarn
140 ewarn "SQLite driver name changed from QSQLITE to QSQLITE3."
141 ewarn "Please edit your ~/.config/akonadi/akonadiserverrc."
142 fi
143
144 # Notify about MySQL not being default anymore
145 if ! use mysql && has_version "<=${CATEGORY}/${PN}-1.4.0[mysql]"; then
146 ewarn
147 ewarn "MySQL driver is not enabled by default in Gentoo anymore."
148 ewarn "If you intend to use it, please enable mysql USE flag and reinstall"
149 ewarn "${CATEGORY}/${PN}."
150 ewarn "Otherwise select different driver in your ~/.config/akonadi/akonadiserverrc."
151 ewarn "Available drivers are:${AVAILABLE}"
152 fi
153 }
154
155 src_configure() {
156 local mycmakeargs=(
157 "-DAKONADI_USE_STRIGI_SEARCH=OFF"
158 $(cmake-utils_use test AKONADI_BUILD_TESTS)
159 $(cmake-utils_use sqlite INSTALL_QSQLITE_IN_QT_PREFIX)
160 )
161
162 cmake-utils_src_configure
163 }
164
165 src_install() {
166 # Who knows, maybe it accidentally fixes our permission issues
167 cat <<-EOF > "${T}"/akonadiserverrc
168 [%General]
169 Driver=${DRIVER}
170 EOF
171 insinto /usr/share/config/akonadi
172 doins "${T}"/akonadiserverrc
173
174 cmake-utils_src_install
175 }
176
177 pkg_postinst() {
178 echo
179 elog "${DRIVER} has been set as your default akonadi storage backend."
180 elog "You can override it in your ~/.config/akonadi/akonadiserverrc."
181 elog "Available drivers are: ${AVAILABLE}"
182 }
183
184
185
186 1.1 app-office/akonadi-server/akonadi-server-1.6.2-r1.ebuild
187
188 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/akonadi-server/akonadi-server-1.6.2-r1.ebuild?rev=1.1&view=markup
189 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/akonadi-server/akonadi-server-1.6.2-r1.ebuild?rev=1.1&content-type=text/plain
190
191 Index: akonadi-server-1.6.2-r1.ebuild
192 ===================================================================
193 # Copyright 1999-2011 Gentoo Foundation
194 # Distributed under the terms of the GNU General Public License v2
195 # $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.6.2-r1.ebuild,v 1.1 2011/12/20 23:43:57 johu Exp $
196
197 EAPI=4
198
199 inherit cmake-utils
200
201 DESCRIPTION="The server part of Akonadi"
202 HOMEPAGE="http://pim.kde.org/akonadi"
203 SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
204
205 LICENSE="LGPL-2.1"
206 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
207 SLOT="0"
208 IUSE="mysql postgres +sqlite test"
209
210 CDEPEND="
211 dev-libs/boost
212 >=dev-libs/soprano-2.6.51
213 >=x11-libs/qt-gui-4.5.0:4[dbus]
214 >=x11-libs/qt-sql-4.5.0:4[mysql?,postgres?]
215 >=x11-libs/qt-test-4.5.0:4
216 x11-misc/shared-mime-info
217 "
218 DEPEND="${CDEPEND}
219 dev-libs/libxslt
220 >=dev-util/automoc-0.9.88
221 "
222 RDEPEND="${CDEPEND}
223 postgres? ( dev-db/postgresql-server )
224 "
225
226 REQUIRED_USE="|| ( sqlite mysql postgres )"
227
228 S=${WORKDIR}/${P/-server/}
229
230 pkg_setup() {
231 # Set default storage backend in order: SQLite, MySQL, PostgreSQL
232 # reverse driver check to keep the order
233
234 if use postgres; then
235 DRIVER="QPSQL"
236 AVAILABLE+=" ${DRIVER}"
237 fi
238
239 if use mysql; then
240 DRIVER="QMYSQL"
241 AVAILABLE+=" ${DRIVER}"
242 fi
243
244 if use sqlite; then
245 DRIVER="QSQLITE3"
246 AVAILABLE+=" ${DRIVER}"
247 fi
248
249 # Notify about driver name change
250 if use sqlite && has_version "<=${CATEGORY}/${PN}-1.4.0[sqlite]"; then
251 ewarn
252 ewarn "SQLite driver name changed from QSQLITE to QSQLITE3."
253 ewarn "Please edit your ~/.config/akonadi/akonadiserverrc."
254 fi
255
256 # Notify about MySQL not being default anymore
257 if ! use mysql && has_version "<=${CATEGORY}/${PN}-1.4.0[mysql]"; then
258 ewarn
259 ewarn "MySQL driver is not enabled by default in Gentoo anymore."
260 ewarn "If you intend to use it, please enable mysql USE flag and reinstall"
261 ewarn "${CATEGORY}/${PN}."
262 ewarn "Otherwise select different driver in your ~/.config/akonadi/akonadiserverrc."
263 ewarn "Available drivers are:${AVAILABLE}"
264 fi
265 }
266
267 src_configure() {
268 local mycmakeargs=(
269 "-DAKONADI_USE_STRIGI_SEARCH=OFF"
270 $(cmake-utils_use test AKONADI_BUILD_TESTS)
271 $(cmake-utils_use sqlite INSTALL_QSQLITE_IN_QT_PREFIX)
272 )
273
274 cmake-utils_src_configure
275 }
276
277 src_install() {
278 # Who knows, maybe it accidentally fixes our permission issues
279 cat <<-EOF > "${T}"/akonadiserverrc
280 [%General]
281 Driver=${DRIVER}
282 EOF
283 insinto /usr/share/config/akonadi
284 doins "${T}"/akonadiserverrc
285
286 cmake-utils_src_install
287 }
288
289 pkg_postinst() {
290 echo
291 elog "${DRIVER} has been set as your default akonadi storage backend."
292 elog "You can override it in your ~/.config/akonadi/akonadiserverrc."
293 elog "Available drivers are: ${AVAILABLE}"
294 }
Report Message
Find on MARC Find on Google Groups