1 |
commit: 1253e0f0671412b16a920f9749dc2495681ad448 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Aug 12 12:30:36 2017 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Aug 12 12:30:36 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=1253e0f0 |
7 |
|
8 |
kde-apps/akonadi: Drop USE=sqlite, cleanup ebuild |
9 |
|
10 |
Sync with tree. |
11 |
|
12 |
Package-Manager: Portage-2.3.6, Repoman-2.3.3 |
13 |
|
14 |
kde-apps/akonadi/akonadi-17.08.0.ebuild | 52 +++++++++------------------ |
15 |
kde-apps/akonadi/akonadi-17.08.49.9999.ebuild | 47 +++++++----------------- |
16 |
kde-apps/akonadi/akonadi-9999.ebuild | 47 +++++++----------------- |
17 |
3 files changed, 43 insertions(+), 103 deletions(-) |
18 |
|
19 |
diff --git a/kde-apps/akonadi/akonadi-17.08.0.ebuild b/kde-apps/akonadi/akonadi-17.08.0.ebuild |
20 |
index 0994b20e33..c11ecfc98e 100644 |
21 |
--- a/kde-apps/akonadi/akonadi-17.08.0.ebuild |
22 |
+++ b/kde-apps/akonadi/akonadi-17.08.0.ebuild |
23 |
@@ -11,11 +11,12 @@ inherit kde5 |
24 |
|
25 |
DESCRIPTION="Storage service for PIM data and libraries for PIM apps" |
26 |
HOMEPAGE="https://pim.kde.org/akonadi" |
27 |
+ |
28 |
KEYWORDS="~amd64 ~arm ~x86" |
29 |
LICENSE="LGPL-2.1+" |
30 |
-IUSE="+mysql postgres sqlite tools xml" |
31 |
+IUSE="+mysql postgres tools xml" |
32 |
|
33 |
-REQUIRED_USE="|| ( sqlite mysql postgres ) test? ( tools )" |
34 |
+REQUIRED_USE="|| ( mysql postgres ) test? ( tools )" |
35 |
|
36 |
# drop qtgui subslot operator when QT_MINIMAL >= 5.9.0 |
37 |
COMMON_DEPEND=" |
38 |
@@ -40,7 +41,6 @@ COMMON_DEPEND=" |
39 |
$(add_qt_dep qtwidgets) |
40 |
$(add_qt_dep qtxml) |
41 |
x11-misc/shared-mime-info |
42 |
- sqlite? ( dev-db/sqlite:3 ) |
43 |
xml? ( dev-libs/libxml2 ) |
44 |
" |
45 |
DEPEND="${COMMON_DEPEND} |
46 |
@@ -51,7 +51,10 @@ DEPEND="${COMMON_DEPEND} |
47 |
RDEPEND="${COMMON_DEPEND} |
48 |
!kde-apps/kdepim-l10n |
49 |
!kde-apps/kdepimlibs |
50 |
- mysql? ( virtual/mysql ) |
51 |
+ mysql? ( |
52 |
+ virtual/mysql |
53 |
+ !>=dev-db/mariadb-10.2 |
54 |
+ ) |
55 |
postgres? ( dev-db/postgresql ) |
56 |
" |
57 |
|
58 |
@@ -61,42 +64,18 @@ RESTRICT+=" test" |
59 |
PATCHES=( "${FILESDIR}/${PN}-17.03.80-mysql56-crash.patch" ) |
60 |
|
61 |
pkg_setup() { |
62 |
- # Set default storage backend in order: MySQL, SQLite PostgreSQL |
63 |
+ # Set default storage backend in order: MySQL, PostgreSQL |
64 |
# reverse driver check to keep the order |
65 |
- if use postgres; then |
66 |
- DRIVER="QPSQL" |
67 |
- AVAILABLE+=" ${DRIVER}" |
68 |
- fi |
69 |
- |
70 |
- if use sqlite; then |
71 |
- DRIVER="QSQLITE3" |
72 |
- AVAILABLE+=" ${DRIVER}" |
73 |
- fi |
74 |
- |
75 |
- if use mysql; then |
76 |
- DRIVER="QMYSQL" |
77 |
- AVAILABLE+=" ${DRIVER}" |
78 |
- fi |
79 |
- |
80 |
- # Notify about MySQL is recommend by upstream |
81 |
- if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then |
82 |
- ewarn |
83 |
- ewarn "We strongly recommend you change your Akonadi database backend to MySQL in your" |
84 |
- ewarn "user configuration. This is the backend recommended by KDE upstream." |
85 |
- ewarn "In particular, kde-apps/kmail-4.10 does not work properly with the sqlite" |
86 |
- ewarn "backend anymore." |
87 |
- ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc." |
88 |
- ewarn "Available drivers are:${AVAILABLE}" |
89 |
- ewarn |
90 |
- fi |
91 |
+ use postgres && DRIVER="QPSQL" |
92 |
+ use mysql && DRIVER="QMYSQL" |
93 |
+ kde5_pkg_setup |
94 |
} |
95 |
|
96 |
src_configure() { |
97 |
local mycmakeargs=( |
98 |
- -DAKONADI_BUILD_QSQLITE=$(usex sqlite) |
99 |
+ -DAKONADI_BUILD_QSQLITE=OFF |
100 |
-DBUILD_TOOLS=$(usex tools) |
101 |
$(cmake-utils_use_find_package xml LibXml2) |
102 |
- -DKDE_INSTALL_USE_QT_SYS_PATHS=ON |
103 |
) |
104 |
|
105 |
kde5_src_configure |
106 |
@@ -115,7 +94,10 @@ EOF |
107 |
} |
108 |
|
109 |
pkg_postinst() { |
110 |
+ kde5_pkg_postinst |
111 |
+ elog "You can select the storage backend in ~/.config/akonadi/akonadiserverrc." |
112 |
+ elog "Available drivers are:" |
113 |
+ use postgres && elog " QPSQL" |
114 |
+ use mysql && elog " QMYSQL" |
115 |
elog "${DRIVER} has been set as your default akonadi storage backend." |
116 |
- elog "You can override it in your ~/.config/akonadi/akonadiserverrc." |
117 |
- elog "Available drivers are: ${AVAILABLE}" |
118 |
} |
119 |
|
120 |
diff --git a/kde-apps/akonadi/akonadi-17.08.49.9999.ebuild b/kde-apps/akonadi/akonadi-17.08.49.9999.ebuild |
121 |
index 0da9f2e8d0..575f051e83 100644 |
122 |
--- a/kde-apps/akonadi/akonadi-17.08.49.9999.ebuild |
123 |
+++ b/kde-apps/akonadi/akonadi-17.08.49.9999.ebuild |
124 |
@@ -11,11 +11,12 @@ inherit kde5 |
125 |
|
126 |
DESCRIPTION="Storage service for PIM data and libraries for PIM apps" |
127 |
HOMEPAGE="https://pim.kde.org/akonadi" |
128 |
+ |
129 |
KEYWORDS="" |
130 |
LICENSE="LGPL-2.1+" |
131 |
-IUSE="+mysql postgres sqlite tools xml" |
132 |
+IUSE="+mysql postgres tools xml" |
133 |
|
134 |
-REQUIRED_USE="|| ( sqlite mysql postgres ) test? ( tools )" |
135 |
+REQUIRED_USE="|| ( mysql postgres ) test? ( tools )" |
136 |
|
137 |
# drop qtgui subslot operator when QT_MINIMAL >= 5.9.0 |
138 |
COMMON_DEPEND=" |
139 |
@@ -40,7 +41,6 @@ COMMON_DEPEND=" |
140 |
$(add_qt_dep qtwidgets) |
141 |
$(add_qt_dep qtxml) |
142 |
x11-misc/shared-mime-info |
143 |
- sqlite? ( dev-db/sqlite:3 ) |
144 |
xml? ( dev-libs/libxml2 ) |
145 |
" |
146 |
DEPEND="${COMMON_DEPEND} |
147 |
@@ -61,42 +61,18 @@ RESTRICT+=" test" |
148 |
PATCHES=( "${FILESDIR}/${PN}-17.03.80-mysql56-crash.patch" ) |
149 |
|
150 |
pkg_setup() { |
151 |
- # Set default storage backend in order: MySQL, SQLite PostgreSQL |
152 |
+ # Set default storage backend in order: MySQL, PostgreSQL |
153 |
# reverse driver check to keep the order |
154 |
- if use postgres; then |
155 |
- DRIVER="QPSQL" |
156 |
- AVAILABLE+=" ${DRIVER}" |
157 |
- fi |
158 |
- |
159 |
- if use sqlite; then |
160 |
- DRIVER="QSQLITE3" |
161 |
- AVAILABLE+=" ${DRIVER}" |
162 |
- fi |
163 |
- |
164 |
- if use mysql; then |
165 |
- DRIVER="QMYSQL" |
166 |
- AVAILABLE+=" ${DRIVER}" |
167 |
- fi |
168 |
- |
169 |
- # Notify about MySQL is recommend by upstream |
170 |
- if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then |
171 |
- ewarn |
172 |
- ewarn "We strongly recommend you change your Akonadi database backend to MySQL in your" |
173 |
- ewarn "user configuration. This is the backend recommended by KDE upstream." |
174 |
- ewarn "In particular, kde-apps/kmail-4.10 does not work properly with the sqlite" |
175 |
- ewarn "backend anymore." |
176 |
- ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc." |
177 |
- ewarn "Available drivers are:${AVAILABLE}" |
178 |
- ewarn |
179 |
- fi |
180 |
+ use postgres && DRIVER="QPSQL" |
181 |
+ use mysql && DRIVER="QMYSQL" |
182 |
+ kde5_pkg_setup |
183 |
} |
184 |
|
185 |
src_configure() { |
186 |
local mycmakeargs=( |
187 |
- -DAKONADI_BUILD_QSQLITE=$(usex sqlite) |
188 |
+ -DAKONADI_BUILD_QSQLITE=OFF |
189 |
-DBUILD_TOOLS=$(usex tools) |
190 |
$(cmake-utils_use_find_package xml LibXml2) |
191 |
- -DKDE_INSTALL_USE_QT_SYS_PATHS=ON |
192 |
) |
193 |
|
194 |
kde5_src_configure |
195 |
@@ -115,7 +91,10 @@ EOF |
196 |
} |
197 |
|
198 |
pkg_postinst() { |
199 |
+ kde5_pkg_postinst |
200 |
+ elog "You can select the storage backend in ~/.config/akonadi/akonadiserverrc." |
201 |
+ elog "Available drivers are:" |
202 |
+ use postgres && elog " QPSQL" |
203 |
+ use mysql && elog " QMYSQL" |
204 |
elog "${DRIVER} has been set as your default akonadi storage backend." |
205 |
- elog "You can override it in your ~/.config/akonadi/akonadiserverrc." |
206 |
- elog "Available drivers are: ${AVAILABLE}" |
207 |
} |
208 |
|
209 |
diff --git a/kde-apps/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild |
210 |
index 0da9f2e8d0..575f051e83 100644 |
211 |
--- a/kde-apps/akonadi/akonadi-9999.ebuild |
212 |
+++ b/kde-apps/akonadi/akonadi-9999.ebuild |
213 |
@@ -11,11 +11,12 @@ inherit kde5 |
214 |
|
215 |
DESCRIPTION="Storage service for PIM data and libraries for PIM apps" |
216 |
HOMEPAGE="https://pim.kde.org/akonadi" |
217 |
+ |
218 |
KEYWORDS="" |
219 |
LICENSE="LGPL-2.1+" |
220 |
-IUSE="+mysql postgres sqlite tools xml" |
221 |
+IUSE="+mysql postgres tools xml" |
222 |
|
223 |
-REQUIRED_USE="|| ( sqlite mysql postgres ) test? ( tools )" |
224 |
+REQUIRED_USE="|| ( mysql postgres ) test? ( tools )" |
225 |
|
226 |
# drop qtgui subslot operator when QT_MINIMAL >= 5.9.0 |
227 |
COMMON_DEPEND=" |
228 |
@@ -40,7 +41,6 @@ COMMON_DEPEND=" |
229 |
$(add_qt_dep qtwidgets) |
230 |
$(add_qt_dep qtxml) |
231 |
x11-misc/shared-mime-info |
232 |
- sqlite? ( dev-db/sqlite:3 ) |
233 |
xml? ( dev-libs/libxml2 ) |
234 |
" |
235 |
DEPEND="${COMMON_DEPEND} |
236 |
@@ -61,42 +61,18 @@ RESTRICT+=" test" |
237 |
PATCHES=( "${FILESDIR}/${PN}-17.03.80-mysql56-crash.patch" ) |
238 |
|
239 |
pkg_setup() { |
240 |
- # Set default storage backend in order: MySQL, SQLite PostgreSQL |
241 |
+ # Set default storage backend in order: MySQL, PostgreSQL |
242 |
# reverse driver check to keep the order |
243 |
- if use postgres; then |
244 |
- DRIVER="QPSQL" |
245 |
- AVAILABLE+=" ${DRIVER}" |
246 |
- fi |
247 |
- |
248 |
- if use sqlite; then |
249 |
- DRIVER="QSQLITE3" |
250 |
- AVAILABLE+=" ${DRIVER}" |
251 |
- fi |
252 |
- |
253 |
- if use mysql; then |
254 |
- DRIVER="QMYSQL" |
255 |
- AVAILABLE+=" ${DRIVER}" |
256 |
- fi |
257 |
- |
258 |
- # Notify about MySQL is recommend by upstream |
259 |
- if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then |
260 |
- ewarn |
261 |
- ewarn "We strongly recommend you change your Akonadi database backend to MySQL in your" |
262 |
- ewarn "user configuration. This is the backend recommended by KDE upstream." |
263 |
- ewarn "In particular, kde-apps/kmail-4.10 does not work properly with the sqlite" |
264 |
- ewarn "backend anymore." |
265 |
- ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc." |
266 |
- ewarn "Available drivers are:${AVAILABLE}" |
267 |
- ewarn |
268 |
- fi |
269 |
+ use postgres && DRIVER="QPSQL" |
270 |
+ use mysql && DRIVER="QMYSQL" |
271 |
+ kde5_pkg_setup |
272 |
} |
273 |
|
274 |
src_configure() { |
275 |
local mycmakeargs=( |
276 |
- -DAKONADI_BUILD_QSQLITE=$(usex sqlite) |
277 |
+ -DAKONADI_BUILD_QSQLITE=OFF |
278 |
-DBUILD_TOOLS=$(usex tools) |
279 |
$(cmake-utils_use_find_package xml LibXml2) |
280 |
- -DKDE_INSTALL_USE_QT_SYS_PATHS=ON |
281 |
) |
282 |
|
283 |
kde5_src_configure |
284 |
@@ -115,7 +91,10 @@ EOF |
285 |
} |
286 |
|
287 |
pkg_postinst() { |
288 |
+ kde5_pkg_postinst |
289 |
+ elog "You can select the storage backend in ~/.config/akonadi/akonadiserverrc." |
290 |
+ elog "Available drivers are:" |
291 |
+ use postgres && elog " QPSQL" |
292 |
+ use mysql && elog " QMYSQL" |
293 |
elog "${DRIVER} has been set as your default akonadi storage backend." |
294 |
- elog "You can override it in your ~/.config/akonadi/akonadiserverrc." |
295 |
- elog "Available drivers are: ${AVAILABLE}" |
296 |
} |