Install QSQLITE3 plugin into same directory as other QtSQL plugins, wrt bug #459876.

Package-Manager: portage-2.1.11.57/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C

3 files changed, 131 insertions, 5 deletions

diff --git a/app-office/akonadi-server/ChangeLog b/app-office/akonadi-server/ChangeLog
index bd2e46645f78..e82ff0ac3dd2 100644
--- a/app-office/akonadi-server/ChangeLog
+++ b/app-office/akonadi-server/ChangeLog
@@ -1,6 +1,13 @@
 # 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.102 2013/03/04 19:14:29 mschiff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.103 2013/03/20 13:38:54 kensington Exp $
+
+*akonadi-server-1.9.1-r1 (20 Mar 2013)
+
+  20 Mar 2013; Michael Palimaka <kensington@gentoo.org>
+  +akonadi-server-1.9.1-r1.ebuild:
+  Install QSQLITE3 plugin into same directory as other QtSQL plugins, wrt bug
+  #459876.
 
   04 Mar 2013; Marc Schiffbauer <mschiff@gentoo.org>
   akonadi-server-1.9.1.ebuild:
diff --git a/app-office/akonadi-server/Manifest b/app-office/akonadi-server/Manifest
index 3b1c80679575..e23f86abff77 100644
--- a/app-office/akonadi-server/Manifest
+++ b/app-office/akonadi-server/Manifest
@@ -9,13 +9,18 @@ DIST akonadi-1.9.1.tar.bz2 220354 SHA256 53ae49a2039cc0454795f14f6c7c08780f39990
 EBUILD akonadi-server-1.8.0.ebuild 2631 SHA256 30056f3dee1883d7c3ef57cbd6e10cc43a2c0c48edcbdafc2a15c8e5b2e17c9b SHA512 43eb333cc885f18cc7a55de457c1c5beafec30dd3cf56f43e5e45a4d854e17ddb1a05be4f365275402badd0ace6c7a1a9953057131a6ba259f0298c0805fa3c3 WHIRLPOOL e7b1e1726034c572991a224d5ba397bb97665e7ae194e2dc4b7bf7c769392d087f0bfa36de9495bc3316ac4042c1e40c9612c42dd2858201a5dfb128ef2f7102
 EBUILD akonadi-server-1.8.1.ebuild 2642 SHA256 de290bfa78962369d7c5ce1f7a890a515145fca65ad6e4763f10969a4f827835 SHA512 e9a7016d9fc0ee35b178666e99d0fbe3028b69e7c25ca17be072456af75655744cc3dbaf9d1bf361c418b62703ddb61a88710a934d580e97c0eb0e36cace1261 WHIRLPOOL e4caf257021fb37aaab80e01575f875407df84e65a444dd69afa31c44bd49bbf6135d5911430cd7d456325cf9387cfdc30a8c9739d69fc7da9e4d712ed1aad45
 EBUILD akonadi-server-1.9.0.ebuild 2848 SHA256 36f2570c5dd80ac532ce0dbd5f54bc51e2b16809e8c1a1205294128331bcf4ba SHA512 8fceb7cda46d8a78adb9ae3c6101c5f1679bd66775a78fea7969a7d9e72506e5c09c30e59e544ea5acc360266b18e170f4061d3354580be12e5a63c1e48d5fba WHIRLPOOL 469839ec4b9a17be586a592cd54bb3326ced0a6ff91b9f163f7c55a83b6ba026dbcc55e19e9f69b177fc53c5c3be612509a8c759547f20a4b08e5321ed9358a0
+EBUILD akonadi-server-1.9.1-r1.ebuild 2896 SHA256 36a7bf3c6948eb830a63ce5d03c5da4261cece75d7de281c951dad5c2e2e97b3 SHA512 5531c235217a3a3cb3e085321b5327533794f149a703102bff131420f83449225c19be672661c0162e157069dd2fb8a42b8cd3de77a0d6817a9b23f957abe591 WHIRLPOOL f643c739e60059634a796bdc70f1afee62bd79d4cefcfdf0984f5771016dbec5a60449cd74892ff737652afc846a2324d30a8d71b4e3b567de1e7bb19d3bfb46
 EBUILD akonadi-server-1.9.1.ebuild 2854 SHA256 7edc480424dcf9142a8727ffcb0a6716c568efdeab83a3e49b1e143b414bf641 SHA512 cbbaade1cc65a56552eb143563285585c6bacfb7473aac8540b4cfbfdff6ace0e839a3b050bcf5b90354c752ff6053c956b2610fc7b8541120b93fc26e9320b9 WHIRLPOOL 6ebd60661122fb07968dd0aa2464bea7562f5cbeea7204a23fc3b14028745c979d8bdbec91d5a8d8755fb6941bd305636cb3940779e54298cab78b9b74957c95
-MISC ChangeLog 14886 SHA256 dc320412df9f22e11aa82768a44d3ccdfe3b3720bc0f1e5e539321ae970d32f2 SHA512 4f78bf0d90fb529ca0e6a15409d2fefac4fa3c132c6fab1dc61407aec02f4b06ac049ec9933562fc4118c10cdb9e636763077d613b5a94c3f99f9e5062f2d85e WHIRLPOOL d22e1145205bb176c2d1ea6476ecda4fe6ffa491add00283396f0d5239735679270005932c258ee5abc8edeff3014184cbfcac68009ae713f11cf60c4042202f
+MISC ChangeLog 15110 SHA256 d6110ddad2d509fb1fdee348d9e5c9c3307543dae139a63b3e17064fe1cb7d71 SHA512 89c6752b7ae10baf2c90480164e0949b635dc7a011048663b796e9ef3fcc17f4b26e3af521c3dbb63ec9ac9c99d466fa4bf221506fa9b5db90e6096edf012e4a WHIRLPOOL 9a5b7072f82235b030a7b4daee2ba3669d5a93d7202800139efc51a4291924a8a607986e8a5f46d3885bbe56aa72807cd6bb351270f1c84fda79abccf75645b2
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iD8DBQFRNPKWKWxsyjWmQTQRCLxzAJ9BAm+CWLARPUaPqbOS3h6Jdl+8GACgrWQ6
-mUhVIfEoqgL/CB9juhtNOaI=
-=C8It
+iQEcBAEBCAAGBQJRSbvVAAoJEMbwO6tnXQ0sC7UIAIbk5PSBKGGcPcb4DBX9cNGj
+MU/6vGMsnIY8HGaEnVfmmXa0VGUc8Kq3OA3dlztrA+eicq2RrJjlpm6ZjQJBcSfb
+TjniWiReDcd3rKJSHbN8w1ia6MN3Adcd5FwEpKqme3bV98wzcc0gqT86suoTGVHu
+x0cf6L4rmhtbIKl/qu8pUeIX8+IOg67ckW3UcSUkN1H9kzlihRxkL2jLakxEljcm
+f9DOckT2c4MLAWbwLde1WXHXswNSzibkpIXYdqZUapfUgvigf4SjmAtNiiu6btPZ
+o820j+b9zDX4jsFFHubrUZ/b6KHXsC0TYcpELoOaJTaqvEzp7Mz1F+2fH0fgAdY=
+=6ipq
 -----END PGP SIGNATURE-----
diff --git a/app-office/akonadi-server/akonadi-server-1.9.1-r1.ebuild b/app-office/akonadi-server/akonadi-server-1.9.1-r1.ebuild
new file mode 100644
index 000000000000..5557d1055deb
--- /dev/null
+++ b/app-office/akonadi-server/akonadi-server-1.9.1-r1.ebuild
@@ -0,0 +1,114 @@
+# 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.1-r1.ebuild,v 1.1 2013/03/20 13:38:54 kensington Exp $
+
+EAPI=4
+
+if [[ $PV = *9999* ]]; then
+	scm_eclass=git-2
+	EGIT_REPO_URI="git://anongit.kde.org/akonadi"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${P/-server/}"
+fi
+
+inherit cmake-utils ${scm_eclass}
+
+DESCRIPTION="The server part of Akonadi"
+HOMEPAGE="http://pim.kde.org/akonadi"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="+mysql postgres sqlite test"
+
+CDEPEND="
+	dev-libs/boost
+	>=dev-libs/soprano-2.6.51
+	>=dev-qt/qtgui-4.5.0:4[dbus]
+	>=dev-qt/qtsql-4.5.0:4[mysql?,postgres?]
+	>=dev-qt/qttest-4.5.0:4
+	x11-misc/shared-mime-info
+"
+DEPEND="${CDEPEND}
+	dev-libs/libxslt
+	>=dev-util/automoc-0.9.88
+"
+RDEPEND="${CDEPEND}
+	postgres? ( dev-db/postgresql-server )
+"
+
+REQUIRED_USE="|| ( sqlite mysql postgres )"
+
+RESTRICT=test
+
+PATCHES=( "${FILESDIR}/${PN}-1.9.0-qt5.patch" )
+
+pkg_setup() {
+	# 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 sqlite; then
+		DRIVER="QSQLITE3"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	if use mysql; then
+		DRIVER="QMYSQL"
+		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 sqlite && has_version "<=${CATEGORY}/${PN}-1.9.0[sqlite]"; then
+		ewarn
+		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 a different driver in your ~/.config/akonadi/akonadiserverrc."
+		ewarn "Available drivers are:${AVAILABLE}"
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DAKONADI_USE_STRIGI_SEARCH=OFF
+		-DINSTALL_QSQLITE_IN_QT_PREFIX=ON
+		-DWITH_QT5=OFF
+		$(cmake-utils_use test AKONADI_BUILD_TESTS)
+		$(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE)
+	)
+
+	cmake-utils_src_configure
+}
+
+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
+
+	cmake-utils_src_install
+}
+
+pkg_postinst() {
+	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: ${AVAILABLE}"
+}