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

["Tomas Chvatal" <scarabeus@gentoo.org>]

commit:     931201b0de1580449aee27faa986036785bc934e
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 17 16:54:58 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Thu Feb 17 16:54:58 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=931201b0

app-office/akonadi-server migrate to git2 and eapi4.

---
 .../akonadi-server/akonadi-server-9999.ebuild      |   27 ++++++++-----------
 1 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/app-office/akonadi-server/akonadi-server-9999.ebuild b/app-office/akonadi-server/akonadi-server-9999.ebuild
index b66717e..3535345 100644
--- a/app-office/akonadi-server/akonadi-server-9999.ebuild
+++ b/app-office/akonadi-server/akonadi-server-9999.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
-inherit cmake-utils git
+inherit cmake-utils git-2
 
 DESCRIPTION="The server part of Akonadi"
 HOMEPAGE="http://pim.kde.org/akonadi"
@@ -33,7 +33,7 @@ RDEPEND="${CDEPEND}
 	)
 "
 
-S="${WORKDIR}/${P/-server/}"
+REQUIRED_USE="^^ ( sqlite mysql postgres )"
 
 pkg_setup() {
 	# Set default storage backend in order: SQLite, MySQL, PostgreSQL
@@ -41,10 +41,12 @@ pkg_setup() {
 	if use sqlite; then
 		driver="QSQLITE3"
 		available+=" ${driver}"
-	elif use mysql; then
+	fi
+	if use mysql; then
 		driver="QMYSQL"
 		available+=" ${driver}"
-	elif use postgres; then
+	fi
+	if use postgres; then
 		driver="QPSQL"
 		available+=" ${driver}"
 	fi
@@ -80,15 +82,8 @@ EOF
 }
 
 pkg_postinst() {
-	if use mysql || use postgres || use sqlite; then
-		elog
-		elog "${driver} has been set as your default akonadi storage backend."
-		elog "You can override it in your ~/.config/akonadi/akonadiserverrc."
-		elog "Available drivers are: QMYSQL, QPSQL, QSQLITE3"
-	else
-		ewarn
-		ewarn "You have decided to build ${PN} with"
-		ewarn "'mysql', 'postgres' and 'sqlite' USE flags disabled."
-		ewarn "${PN} will not be functional."
-	fi
+	echo
+	elog "${driver} has been set as your default akonadi storage backend."
+	elog "You can override it in your ~/.config/akonadi/akonadiserverrc."
+	elog "Available drivers are: QMYSQL, QPSQL, QSQLITE3"
 }