[gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/

[Johannes Huber]

commit:     a670f9dda42f718daad1538d6b5975d8dc59edf7
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 21 00:02:10 2011 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Dec 21 00:02:10 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=a670f9dd

[app-office/akonadi-server] Fix driver array fill, bug 395165

(Portage version: 2.2.0_alpha81/git/Linux i686, unsigned Manifest commit)

---
 .../akonadi-server/akonadi-server-9999.ebuild      |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app-office/akonadi-server/akonadi-server-9999.ebuild b/app-office/akonadi-server/akonadi-server-9999.ebuild
index 92291b8..1be8867 100644
--- a/app-office/akonadi-server/akonadi-server-9999.ebuild
+++ b/app-office/akonadi-server/akonadi-server-9999.ebuild
@@ -35,15 +35,20 @@ REQUIRED_USE="|| ( sqlite mysql postgres )"
 
 pkg_setup() {
 	# Set default storage backend in order: SQLite, MySQL, PostgreSQL
+	# reverse driver check to keep the order
+	if use postgres; then
+		DRIVER="QPSQL"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	if use mysql; then
+		DRIVER="QMYSQL"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
 	if use sqlite; then
 		DRIVER="QSQLITE3"
-		AVAILABLE+=" ${driver}"
-	elif use mysql; then
-		DRIVER="QMYSQL"
-		AVAILABLE+=" ${driver}"
-	elif use postgres; then
-		DRIVER="QPSQL"
-		AVAILABLE+=" ${driver}"
+		AVAILABLE+=" ${DRIVER}"
 	fi
 
 	# Notify about driver name change