Change default backend to mysql wrt bug 441596

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0xF82F92E6

3 files changed, 30 insertions, 27 deletions

diff --git a/app-office/akonadi-server/ChangeLog b/app-office/akonadi-server/ChangeLog
index b3700c908aaf..8369c6a23432 100644
--- a/app-office/akonadi-server/ChangeLog
+++ b/app-office/akonadi-server/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-office/akonadi-server
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.95 2013/02/06 18:52:54 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.96 2013/02/06 18:59:38 alexxy Exp $
+
+  06 Feb 2013; Alexey Shvetsov <alexxy@gentoo.org> akonadi-server-1.9.0.ebuild:
+  Change default backend to mysql wrt bug 441596
 
 *akonadi-server-1.9.0 (06 Feb 2013)
 
diff --git a/app-office/akonadi-server/Manifest b/app-office/akonadi-server/Manifest
index 5af99b8aa7ed..508b6c9a2bf0 100644
--- a/app-office/akonadi-server/Manifest
+++ b/app-office/akonadi-server/Manifest
@@ -7,23 +7,23 @@ DIST akonadi-1.8.1.tar.bz2 213787 SHA256 2b33812801ede762bb9c60d7ab9b0cd98d5552b
 DIST akonadi-1.9.0.tar.bz2 220255 SHA256 6ff5c23e426efc02784d4ab1a6e6dff24c8efe81fd34ec78bb52bb4d7733e013 SHA512 e982f98263ae7cce3af90a7282ead72802ab3c611c3d664ed995e630b036548cbcbacf290fd591e00cbc3584e989bbb9e563ff7736c785609ebd84d011750779 WHIRLPOOL 8df1b77e3725c68e8ecd6f1c937da4124127132980cb58deec937a4dd11032f02f2cf8d5bc775f40e402d2925ae2f0c1d2135330182140838c825bb4451594bc
 EBUILD akonadi-server-1.8.0.ebuild 2641 SHA256 eea2b07c2c2658b301e108482f6887a197db3f10294b383f53a6bc58262c2b82 SHA512 bf05a069c8a15cb49f607d37c63a340a3ea4bd28441caf531934d73642025efae95a465d1b1fbc13c94275be02b2108efb33647fdcf53219d31374cb461787e8 WHIRLPOOL adc01309b9dcf3bc9cdbc98204ee199b6663d27a5d56cb37337ccbe18cc31ab4e6242d0fafbf0b6a9a5db845b6f07c6e8ebecd41765fd09dc4a935e16b150889
 EBUILD akonadi-server-1.8.1.ebuild 2636 SHA256 05f831b300fc556cf1a4844370080e013f231174e94058a2930fcc17379010e3 SHA512 9cebf3363e818864f3be16a656a7105768fa818b9fcfc3eb51eb7f6a882f2eddf0fd0ed556b980d1f3f72f731164a0a86ce91abec8ef65d007724a191e63fb7f WHIRLPOOL 389e721b7606a4059450adb4086ec3b13fcf420b99d26fed3719ace02b8390c587ac26147b8304552302eab654c7a39834b55485da4206a2a613877383394c45
-EBUILD akonadi-server-1.9.0.ebuild 2833 SHA256 296c3bdbf2a3910fa77503c04ce6355d52d1bc5a856e9063307bf9ae1d50bc39 SHA512 e5d86f6e2137c8bf2680cab6c0ec67926067cb909ec731c472a5d09224899aeb3a1f67c8ed7893b1f8c29cb4390313f4004fe777e51b2b2ba6c2b4c0577a3879 WHIRLPOOL 4be3472df0aae2ea5383196f0e8c0373ee25a138e475e69259296953ba1555dd0e9517062884b71037846b29d2b1c6330b53b251a8e4d3dda6b4b7e67128856a
-MISC ChangeLog 13989 SHA256 3e5b49edde8057c4eeac2ccd7f7e0de5eb6fa79cdc9fbfb5782e77ec559b128b SHA512 7257cd45cfed3de3488f2f63fd64a40b97f8a49d01b13d8cbda92ce227ce8db80ca4c370891b8c3574a8c29d1cf4e930616f3ea16baefd0495837c8928102019 WHIRLPOOL 3388b64ae083938577bbad7e41003e59fd0e598884203b9c776586f315aaff317fe574286467f5a620cad97d79942981571af6d9bf298ff44b13799bbc751e19
+EBUILD akonadi-server-1.9.0.ebuild 2845 SHA256 76a851cc0f88c6daa91d0bb8d65db3e3dcb6f57e607c99681636ec30e090cfeb SHA512 780c02f629bf736bd6847f57e274ffa13d0b419926f81551dcece3e4683b855936944befb64e32bfc351dedb9fe8dd0c9c4c9a65fd362a643508a6269cc7bf8b WHIRLPOOL eceb1f57a51176f09e820b0fbd623eaf5983291de36887bf8b9787d2530fc468060105b2ff34ebed044fe542453540f24f5622dd8d6a83a67a5769b01b5c07f8
+MISC ChangeLog 14119 SHA256 fa88fa161b51f57852c536f1f7a6326f446bfd344e1dc52482e2c3b8dc9ad661 SHA512 11dcb1a50e5422e76f61b844e7f36d4fa5ab8f41e0786a0bf6a0a0e4654d1e3d34491470bc5d809bc47ea37c7954b19fe2f1a66c2e4a6da33edd6d7d3ab461c3 WHIRLPOOL 4958d45f5a35c75bbddc4e0a49c718df8322afd60e406d31f4ba838c8b9e720513f3d122831dd97f87b97b9032d876befc46f19661981b5f08c0434a61173c5f
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJREqaTAAoJEOf+E+/4L5Lmr/IQAJJK+Xmc70sD96Gvn5+VFrMm
-ke2/g48gTxRnZ0gkqBiCdhd1z99pfo7sgyWsF31HD8VHuRGC+4wdurBBASd3jksW
-lh6Ojk9h2x9ZCuQZcLtYjhkqrcA7rDOZpBRnJY9U8qmSxBHAChvzrnfqANmcHJKz
-ybbEAqupkp3gk2We3/epDY85nNwRKjH5pZ8YpLFMZMbxA29SF3F6LGnXYOv2nbwU
-8Rd6PMZZy+GtQzUhpkOaXqMTR599dIneWdxIoKUKlYnlfrM9R2prYpigh7MU0ogA
-Pv4Q4Lqx5bszThvuWXsrWoRgfAf5OOPYEQAUChW9/EF1koDoCTK9YrsPB+JGiI+r
-pGIcn8dBNUReFJSujMBNk0XB4tBwWuXgzhkby6F68HY7CpQqI7kS23DsqH/b1z9U
-3xqLDOVjikF2Sq0RJaE1rhjG4bvKqAgAedVpeW/mW44NOkW0aAQG8ZuKbrdA7jh6
-LrvsrguC4BJiuaC06Vzc+EkHEpBpPzK6zcp06H5YUK7GF3vYyMUNniK6h15K6Vm9
-mrAE7sm0wE46rZP1FCsixcSKInqEY0w+OZUuNNsJiN6eeXH8Yg2q8hhZE+BWgLvG
-xz9ecwNSfSzI2zzqKJXwqrLSlQ7tmT8E8nycwCeymXEZZju+EdUXu4EX3cyhg56y
-chAXrkYMMTXCSFlBy8LT
-=CSer
+iQIcBAEBCAAGBQJREqghAAoJEOf+E+/4L5Lm1P8P/2ZVSvRKly6wdYXPqC3OcmKt
+ODtNw/RBA4vG0eoYgU37RXkvVPhUwnAuVgyyqytT5TAQhXOdoyex2Uu+nvoChFLD
+MH08DKFpLV0YNkU2/Q1r7Wq1jBfChqwFH/zD+nehledtDfifW/7SKIGfR+Egeor+
+OtAbwglvsTIqKA8FEC9AQ8dLjDvg08qQMG9Hm2xEvBLbCtY9n09fzeEpJqLKNnd0
+ivB+8iTHfLrs2CuVW6X24loiatlK8/UAQ7gK2GAlvVsLc0zeP0xarGB7SNj1Kv48
+MLF7gdKJhUX3cPXqz9s6BjfhIILFtEvIs66nuiqJzJ6ikI6AsrKAeYfDPuavS3S1
+4oGnDYvvrtULnyfeKidd3tPlUVjqtE7j52gbaFW+Gae2aDHfkXyNEfx7A+5rT9dE
+LnTx3E0F5sc+1x4XgCSF8kxpLVPYhHdRu9oOd7TkDoHMfji5KnvEFP2VyL0J0oKA
+MehAUTBiT8Dc18UhqspBDaBsEAG+030UdfEb/ulNk36/GXc6k7Cah5EKLep8hcDm
+J9nQtCD2E3bGGb80V+DwOZTGrY/2Z9OKzi9kiAAkDVs8OczUx6GPb7vFBeKFkM1D
+k0HAVfVd/H0JC50by28B2Z0TDlLnr9UaXorHC2cG2jLCmBR79N88JzQ78i1gwBMm
+eQgdEfakmLq0IKdyHpiy
+=q5pf
 -----END PGP SIGNATURE-----
diff --git a/app-office/akonadi-server/akonadi-server-1.9.0.ebuild b/app-office/akonadi-server/akonadi-server-1.9.0.ebuild
index ac626e541ec8..d97cc19265ad 100644
--- a/app-office/akonadi-server/akonadi-server-1.9.0.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.9.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.9.0.ebuild,v 1.1 2013/02/06 18:52:54 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.9.0.ebuild,v 1.2 2013/02/06 18:59:38 alexxy Exp $
 
 EAPI=4
 
@@ -22,7 +22,7 @@ HOMEPAGE="http://pim.kde.org/akonadi"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="mysql postgres +sqlite test"
+IUSE="+mysql postgres sqlite test"
 
 CDEPEND="
 	dev-libs/boost
@@ -47,20 +47,20 @@ RESTRICT=test
 PATCHES=( "${FILESDIR}/${P}-qt5.patch" )
 
 pkg_setup() {
-	# Set default storage backend in order: SQLite, MySQL, PostgreSQL
+	# Set default storage backend in order: MySQL, SQLite PostgreSQL
 	# reverse driver check to keep the order
 	if use postgres; then
 		DRIVER="QPSQL"
 		AVAILABLE+=" ${DRIVER}"
 	fi
 
-	if use mysql; then
-		DRIVER="QMYSQL"
+	if use sqlite; then
+		DRIVER="QSQLITE3"
 		AVAILABLE+=" ${DRIVER}"
 	fi
 
-	if use sqlite; then
-		DRIVER="QSQLITE3"
+	if use mysql; then
+		DRIVER="QMYSQL"
 		AVAILABLE+=" ${DRIVER}"
 	fi
 
@@ -72,12 +72,12 @@ pkg_setup() {
 	fi
 
 	# Notify about MySQL not being default anymore
-	if ! use mysql && has_version "<=${CATEGORY}/${PN}-1.4.0[mysql]"; then
+	if ! use sqlite && has_version "<=${CATEGORY}/${PN}-1.4.0[sqlite]"; then
 		ewarn
-		ewarn "MySQL driver is not enabled by default in Gentoo anymore."
-		ewarn "If you intend to use it, please enable mysql USE flag and reinstall"
+		ewarn "The default storage drive has changed from SQLite to MySQL."
+		ewarn "If you want to stay with SQLite, enable the sqlite USE flag and reinstall"
 		ewarn "${CATEGORY}/${PN}."
-		ewarn "Otherwise select different driver in your ~/.config/akonadi/akonadiserverrc."
+		ewarn "Otherwise, select a different driver in your ~/.config/akonadi/akonadiserverrc."
 		ewarn "Available drivers are:${AVAILABLE}"
 	fi
 }