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

Gentoo Archives: gentoo-commits

From: "Maciej Mrozowski (reavertm)" <reavertm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-office/akonadi-server: akonadi-server-1.4.0.ebuild ChangeLog akonadi-server-1.4.0-r2.ebuild akonadi-server-1.4.0-r1.ebuild
Date: Wed, 08 Sep 2010 13:43:47
Message-Id: 20100908134340.B10DF20051@flycatcher.gentoo.org
1 reavertm 10/09/08 13:43:40
2
3 Modified: akonadi-server-1.4.0.ebuild ChangeLog
4 Added: akonadi-server-1.4.0-r2.ebuild
5 Removed: akonadi-server-1.4.0-r1.ebuild
6 Log:
7 Remove assert that requires exact sqlite version 3.6.23
8
9 (Portage version: 2.2_rc77/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.2 app-office/akonadi-server/akonadi-server-1.4.0.ebuild
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/akonadi-server/akonadi-server-1.4.0.ebuild?rev=1.2&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/akonadi-server/akonadi-server-1.4.0.ebuild?rev=1.2&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/akonadi-server/akonadi-server-1.4.0.ebuild?r1=1.1&r2=1.2
17
18 Index: akonadi-server-1.4.0.ebuild
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.4.0.ebuild,v
21 retrieving revision 1.1
22 retrieving revision 1.2
23 diff -u -r1.1 -r1.2
24 --- akonadi-server-1.4.0.ebuild 6 Sep 2010 02:58:06 -0000 1.1
25 +++ akonadi-server-1.4.0.ebuild 8 Sep 2010 13:43:40 -0000 1.2
26 @@ -1,6 +1,6 @@
27 # Copyright 1999-2010 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29 -# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.4.0.ebuild,v 1.1 2010/09/06 02:58:06 tampakrap Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.4.0.ebuild,v 1.2 2010/09/08 13:43:40 reavertm Exp $
31
32 EAPI="2"
33
34 @@ -35,6 +35,10 @@
35
36 S="${WORKDIR}/${P/-server/}"
37
38 +PATCHES=(
39 + "${FILESDIR}/${P}-remove-sqlite-version-assert.patch"
40 +)
41 +
42 src_install() {
43 # Set default storage backend in order: MySQL, PostgreSQL, SQLite
44 if use mysql; then
45
46
47
48 1.47 app-office/akonadi-server/ChangeLog
49
50 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/akonadi-server/ChangeLog?rev=1.47&view=markup
51 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/akonadi-server/ChangeLog?rev=1.47&content-type=text/plain
52 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/akonadi-server/ChangeLog?r1=1.46&r2=1.47
53
54 Index: ChangeLog
55 ===================================================================
56 RCS file: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v
57 retrieving revision 1.46
58 retrieving revision 1.47
59 diff -u -r1.46 -r1.47
60 --- ChangeLog 7 Sep 2010 17:59:23 -0000 1.46
61 +++ ChangeLog 8 Sep 2010 13:43:40 -0000 1.47
62 @@ -1,6 +1,14 @@
63 # ChangeLog for app-office/akonadi-server
64 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
65 -# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.46 2010/09/07 17:59:23 reavertm Exp $
66 +# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.47 2010/09/08 13:43:40 reavertm Exp $
67 +
68 +*akonadi-server-1.4.0-r2 (08 Sep 2010)
69 +
70 + 08 Sep 2010; Maciej Mrozowski <reavertm@g.o>
71 + akonadi-server-1.4.0.ebuild, -akonadi-server-1.4.0-r1.ebuild,
72 + +akonadi-server-1.4.0-r2.ebuild,
73 + +files/akonadi-server-1.4.0-remove-sqlite-version-assert.patch:
74 + Remove assert that requires exact sqlite version 3.6.23
75
76 07 Sep 2010; Maciej Mrozowski <reavertm@g.o>
77 -akonadi-server-1.2.1.ebuild:
78
79
80
81 1.1 app-office/akonadi-server/akonadi-server-1.4.0-r2.ebuild
82
83 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/akonadi-server/akonadi-server-1.4.0-r2.ebuild?rev=1.1&view=markup
84 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/akonadi-server/akonadi-server-1.4.0-r2.ebuild?rev=1.1&content-type=text/plain
85
86 Index: akonadi-server-1.4.0-r2.ebuild
87 ===================================================================
88 # Copyright 1999-2010 Gentoo Foundation
89 # Distributed under the terms of the GNU General Public License v2
90 # $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.4.0-r2.ebuild,v 1.1 2010/09/08 13:43:40 reavertm Exp $
91
92 EAPI="2"
93
94 inherit cmake-utils
95
96 DESCRIPTION="The server part of Akonadi"
97 HOMEPAGE="http://pim.kde.org/akonadi"
98 SRC_URI="http://download.akonadi-project.org/${P/-server/}.tar.bz2"
99
100 LICENSE="LGPL-2.1"
101 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
102 SLOT="0"
103 IUSE="mysql postgres +sqlite +server"
104
105 CDEPEND="
106 dev-libs/boost
107 >=dev-libs/soprano-2.2
108 >=x11-libs/qt-gui-4.5.0:4[dbus]
109 >=x11-libs/qt-sql-4.5.0:4[mysql?,postgres?]
110 >=x11-libs/qt-test-4.5.0:4
111 x11-misc/shared-mime-info
112 "
113 DEPEND="${CDEPEND}
114 dev-libs/libxslt
115 >=dev-util/automoc-0.9.88
116 "
117 RDEPEND="${CDEPEND}
118 server? (
119 postgres? ( dev-db/postgresql-server )
120 )
121 "
122
123 S="${WORKDIR}/${P/-server/}"
124
125 PATCHES=(
126 "${FILESDIR}/${P}-remove-sqlite-version-assert.patch"
127 )
128
129 pkg_setup() {
130 # Set default storage backend in order: SQLite, MySQL, PostgreSQL
131 local available
132 if use sqlite; then
133 driver="QSQLITE3"
134 available+=" ${driver}"
135 elif use mysql; then
136 driver="QMYSQL"
137 available+=" ${driver}"
138 elif use postgres; then
139 driver="QPSQL"
140 available+=" ${driver}"
141 fi
142
143 # Notify about driver name change
144 if use sqlite && has_version "<=${CATEGORY}/${PN}-1.4.0[sqlite]"; then
145 ewarn
146 ewarn "SQLite driver name changed from QSQLITE to QSQLITE3."
147 ewarn "Please edit your ~/.config/akonadi/akonadiserverrc."
148 fi
149
150 # Notify about MySQL not being default anymore
151 if ! use mysql && has_version "<=${CATEGORY}/${PN}-1.4.0[mysql]"; then
152 ewarn
153 ewarn "MySQL driver is not enabled by default in Gentoo anymore."
154 ewarn "If you intend to use it, please enable mysql USE flag and reinstall"
155 ewarn "${CATEGORY}/${PN}."
156 ewarn "Otherwise select different driver in your ~/.config/akonadi/akonadiserverrc."
157 ewarn "Available drivers are:${available}"
158 fi
159 }
160
161 src_install() {
162 # Who knows, maybe it accidentally fixes our permission issues
163 cat <<-EOF > "${T}"/akonadiserverrc
164 [%General]
165 Driver=${driver}
166 EOF
167 insinto /usr/share/config/akonadi
168 doins "${T}"/akonadiserverrc || die "doins failed"
169
170 cmake-utils_src_install
171 }
172
173 pkg_postinst() {
174 if use mysql || use postgres || use sqlite; then
175 elog
176 elog "${driver} has been set as your default akonadi storage backend."
177 elog "You can override it in your ~/.config/akonadi/akonadiserverrc."
178 elog "Available drivers are: QMYSQL, QPSQL, QSQLITE3"
179 else
180 ewarn
181 ewarn "You have decided to build ${PN} with"
182 ewarn "'mysql', 'postgres' and 'sqlite' USE flags disabled."
183 ewarn "${PN} will not be functional."
184 fi
185 }
Report Message
Find on MARC Find on Google Groups