Enable SQLite backend as default one, fix SQLite driver name (QSQLITE3 is new one, adjust qt-sql USE dep)

Package-Manager: portage-2.2_rc75/cvs/Linux x86_64

3 files changed, 108 insertions, 2 deletions

diff --git a/app-office/akonadi-server/ChangeLog b/app-office/akonadi-server/ChangeLog
index e8b7d871da8e..a6195a9e6482 100644
--- a/app-office/akonadi-server/ChangeLog
+++ b/app-office/akonadi-server/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-office/akonadi-server
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.44 2010/09/06 02:58:06 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.45 2010/09/07 17:45:48 reavertm Exp $
+
+  07 Sep 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  +akonadi-server-1.4.0-r1.ebuild:
+  Enable SQLite backend as default one, fix SQLite driver name (QSQLITE3 is
+  new one, adjust qt-sql USE dep)
+
+*akonadi-server-1.4.0-r1 (07 Sep 2010)
+
+  07 Sep 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  +akonadi-server-1.4.0-r1.ebuild:
+  Use sqlite backend as default
 
   06 Sep 2010; Theo Chatzimichos <tampakrap@gentoo.org>
   +akonadi-server-1.4.0.ebuild:
diff --git a/app-office/akonadi-server/Manifest b/app-office/akonadi-server/Manifest
index 5312dcec8383..67c783357722 100644
--- a/app-office/akonadi-server/Manifest
+++ b/app-office/akonadi-server/Manifest
@@ -3,6 +3,7 @@ DIST akonadi-1.3.1.tar.bz2 193500 RMD160 487408ad3ac49983b9151aba358225f203ed19a
 DIST akonadi-1.4.0.tar.bz2 229349 RMD160 a69885807127684aa40e6203bd76cc09275dc427 SHA1 a83943aa46537fee4e07953fedf29f5c13487937 SHA256 85da6b75ce069874520e078cc5f75f2f4ebd91ae184bcb78eb203f8f7d812ea5
 EBUILD akonadi-server-1.2.1.ebuild 1932 RMD160 7064dc59e5210216ba7f5b491035fe3bfb2b71a0 SHA1 1d7085ad551fd1c027d98a2834fca390fb7376e0 SHA256 df99289161ea05a42d5d12212bd9b3670b224b29eab3a884f20f0855a95153a7
 EBUILD akonadi-server-1.3.1.ebuild 2150 RMD160 dc2be0043c0c6ed61cc0f336ca48176a5e6d4bf9 SHA1 64cb63a490ab8309d5101fdc3771a44ff29c4c27 SHA256 6b02302e1b7ab386950a600d5454bf12f79ce7f8e52c778e638a7040a296878f
+EBUILD akonadi-server-1.4.0-r1.ebuild 2617 RMD160 a861b2cfa6ac1516e9446b5ccec9da8304cca39c SHA1 830f7b0337480f027b87f94da137eea31e58dec1 SHA256 548338510e5fafb2cce054f0e4125fdd347e90289278d7748fffdb5f93224732
 EBUILD akonadi-server-1.4.0.ebuild 2156 RMD160 b440cfa87409934b0e99067d51b995f6c2bd80a8 SHA1 91e41c997d6aac832731a5471c15efb1e4965dae SHA256 1f2d73cd014eb73c5d18509323d0362eba7df4f520976aa1b01816804afb134c
-MISC ChangeLog 6133 RMD160 ec2f7c5bb172862d6f4db6c413b76ff3cde8f1dc SHA1 f01453a020b7e9d346137966c8bb6e5d9c3b045e SHA256 982cce888d456af3229d7b3d11b71a1116e1df382127976808cc38b9f6c9eb45
+MISC ChangeLog 6494 RMD160 efcb3dc0d1d7e31b2c9a747c23015f917af4edd4 SHA1 6f8c5344a66c05da3419d76fccec43393cb99cd9 SHA256 c666c8f407adef800b899c78affc5cd898c35792ff73e2804063a920e04a65a4
 MISC metadata.xml 236 RMD160 c5cc6cb9745f9f6e3c7358482117892cbc866eb2 SHA1 d1bd263bd36cfc701e7ae12fb77e24d3f6556a88 SHA256 3bf214b7d5dabbbd8f2d607f6166647d91c5d0b7f166a4d5615da31995da06b6
diff --git a/app-office/akonadi-server/akonadi-server-1.4.0-r1.ebuild b/app-office/akonadi-server/akonadi-server-1.4.0-r1.ebuild
new file mode 100644
index 000000000000..8399a11472de
--- /dev/null
+++ b/app-office/akonadi-server/akonadi-server-1.4.0-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2010 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.4.0-r1.ebuild,v 1.1 2010/09/07 17:45:48 reavertm Exp $
+
+EAPI="2"
+
+inherit cmake-utils
+
+DESCRIPTION="The server part of Akonadi"
+HOMEPAGE="http://pim.kde.org/akonadi"
+SRC_URI="http://download.akonadi-project.org/${P/-server/}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="mysql postgres +sqlite +server"
+
+CDEPEND="
+	dev-libs/boost
+	>=dev-libs/soprano-2.2
+	>=x11-libs/qt-gui-4.5.0:4[dbus]
+	>=x11-libs/qt-sql-4.5.0:4[mysql?,postgres?]
+	>=x11-libs/qt-test-4.5.0:4
+	x11-misc/shared-mime-info
+"
+DEPEND="${CDEPEND}
+	dev-libs/libxslt
+	>=dev-util/automoc-0.9.88
+"
+RDEPEND="${CDEPEND}
+	server? (
+		postgres? ( dev-db/postgresql-server )
+	)
+"
+
+S="${WORKDIR}/${P/-server/}"
+
+pkg_setup() {
+	# Set default storage backend in order: SQLite, MySQL, PostgreSQL
+	local available
+	if use sqlite; then
+		driver="QSQLITE3"
+		available+=" ${driver}"
+	elif use mysql; then
+		driver="QMYSQL"
+		available+=" ${driver}"
+	elif use postgres; then
+		driver="QPSQL"
+		available+=" ${driver}"
+	fi
+
+	# Notify about driver name change
+	if use sqlite && has_version "<=${CATEGORY}/${PN}-1.4.0[sqlite]"; then
+		ewarn
+		ewarn "SQLite driver name changed from QSQLITE to QSQLITE3."
+		ewarn "Please edit your ~/.config/akonadi/akonadiserverrc."
+	fi
+
+	# Notify about MySQL not being default anymore
+	if ! use mysql && has_version "<=${CATEGORY}/${PN}-1.4.0[mysql]"; 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 "${CATEGORY}/${PN}."
+		ewarn "Otherwise select different driver in your ~/.config/akonadi/akonadiserverrc."
+		ewarn "Available drivers are:${available}"
+	fi
+}
+
+src_install() {
+	# Who knows, maybe it accidentally fixes our permission issues
+	cat <<-EOF > "${T}"/akonadiserverrc
+[%General]
+Driver=${driver}
+EOF
+	insinto /usr/share/config/akonadi
+	doins "${T}"/akonadiserverrc || die "doins failed"
+
+	cmake-utils_src_install
+}
+
+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
+}