Version bump. Required for KDE SC 4.8.0.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

3 files changed, 117 insertions, 9 deletions

diff --git a/app-office/akonadi-server/ChangeLog b/app-office/akonadi-server/ChangeLog
index 564f2f99035c..eae78eeed909 100644
--- a/app-office/akonadi-server/ChangeLog
+++ b/app-office/akonadi-server/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/akonadi-server
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.69 2012/01/22 01:07:08 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.70 2012/01/25 14:51:10 johu Exp $
+
+*akonadi-server-1.7.0 (25 Jan 2012)
+
+  25 Jan 2012; Johannes Huber <johu@gentoo.org> +akonadi-server-1.7.0.ebuild:
+  Version bump. Required for KDE SC 4.8.0.
 
   22 Jan 2012; Johannes Huber <johu@gentoo.org> -akonadi-server-1.5.2-r1.ebuild,
   -akonadi-server-1.6.2.ebuild:
diff --git a/app-office/akonadi-server/Manifest b/app-office/akonadi-server/Manifest
index 5f417b1eef9c..b25840ec5956 100644
--- a/app-office/akonadi-server/Manifest
+++ b/app-office/akonadi-server/Manifest
@@ -3,18 +3,20 @@ Hash: SHA512
 
 DIST akonadi-1.5.2.tar.bz2 209050 RMD160 51c4658fef5e9d638b2446d7e62f57d339225a7f SHA1 c5d24a2c553ec26e975ab51f98cf74a8a64af633 SHA256 4a4299ff360998c897a528f557013519cceb29be88ee4f235dd88aad41964e68
 DIST akonadi-1.6.2.tar.bz2 211347 RMD160 d4f923054a794ecbb03fd6a13db4c9e69a57975c SHA1 f02302686f6e50be240d1e73280c00a10c8ccf11 SHA256 29e5cffbc806b30ded70ba486e71a2aaf0e7b9ea1a798881b2e9bf25535b1696
+DIST akonadi-1.7.0.tar.bz2 210281 RMD160 0125b31a02143be7e50f427162bc9e7d0421a94d SHA1 794be377ed42d6ec906a3c9eb36af28493d7ea56 SHA256 bfb9228d83c1dfe1787883682afc4b9ac8b35096888a2b1ba0d3bc604d96b580
 EBUILD akonadi-server-1.5.2.ebuild 2584 RMD160 4f6887690b628625bf47de41f23950c92bc1b381 SHA1 c0b02f63b700c88ba6689aaf15c35f21d32f5f4e SHA256 34062df58567a7f3056c25db5d9679a1d8639b26ae9874b5bc60cf0cd475a6a1
 EBUILD akonadi-server-1.6.2-r1.ebuild 2621 RMD160 c2993992ef09fb392baf53408f39ccfc9e1cc6cc SHA1 cf2ad6cf43525794f1282c281a7ea8831f18a7a5 SHA256 2048d1c0ddb9c386aaba1e1567c8df46d325290698497d28030113c372645592
-MISC ChangeLog 10693 RMD160 9e57455278821bf4a9ac5c896c8f560fe56d20da SHA1 8cb4907fa157370d0628c0861400af61e66b5621 SHA256 5f805396d9ba608c7b15de20657c5643b64791464db05baa893abf20f372c5c3
+EBUILD akonadi-server-1.7.0.ebuild 2595 RMD160 482a8513c09e6f57652f2b824c0c7e15487c1b13 SHA1 86358eba8401483ee8d6e08ee6eaaf257f8b6abe SHA256 3fb055a4ab2735cec19dcee7afc117bc2254f4545b61a09872094adc9039565f
+MISC ChangeLog 10852 RMD160 a340531a9df5e9285bff8a556f82b95f741f0e13 SHA1 bbe17d5c2643fe925a075e0cd02676a4a43b1bcc SHA256 35e9b09cc38ff5cb64a5f5a7cc4434664454fb1fd7a5a0b82375735b1f13253e
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPG2IYAAoJEO+t9ga+3I3alTQIANSCHzHOTY5hfPA1AGN4E3yt
-GdG9cBPwmD/BO6nC9gaLdDhC73HE4NghXGSRSL7116KeUr3ig0LV5/a0nsrCw7/Z
-JQgAskDYFJEJI3pOEV/d00NAFVSDvQ7KKR4TxGpBINoOUsVwxg2KcxWUzg1u9c8D
-vNP7gso4WOCWQ9Kn7wvAlmJVvLPfDY5NUVBH2Ed4DflIChlIeVMfzpkpcR9479hP
-7UBJ1xEWYzLLQLbedOIEhMLMZCxPkSi1haLPCKw5gfzoM0F065cAyI+TbBGBMmim
-rcu4BF9/7JoLgfsI4oipGmUTc+FS2iaPwa4f2OGGvufC2N1D2ktASSf3YNC1MLo=
-=BgIL
+iQEcBAEBCgAGBQJPIBarAAoJEO+t9ga+3I3aAHUH/12Kdg7PSTnTrlXDJ8ymD36/
+3R7W2ZkthQxIwUYTpHHcpFy1TE7tF3ussZtA8vgmFbqf1iSbF8TYKmzbyqKsPaPY
+LTTeYQf8A3uqIhjxqIxOnknrzwiUhcEWcSmS8epXOX0nHnTgyXTq6Y8fAdyQ/Zr1
+Ra2P78jy/BDs5z4XmJE4xmn/xZADVvoFsG4H6HkjmxQMcH3d+fPuEUUTHDZz4+dO
+qlDRpCPt3zJ/4iwuR57k8n8gBLqHy3A4zSEPVfSfTR+F+Q1Ahb2EGcNzRKK0xQhz
+BODCG/kCe7j09CRKtaJzuAmBdVZQHcxCnJ4xCyMmKslOZ/pS6E5KlTvQPAZXNBo=
+=gXSq
 -----END PGP SIGNATURE-----
diff --git a/app-office/akonadi-server/akonadi-server-1.7.0.ebuild b/app-office/akonadi-server/akonadi-server-1.7.0.ebuild
new file mode 100644
index 000000000000..e0393deca50f
--- /dev/null
+++ b/app-office/akonadi-server/akonadi-server-1.7.0.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2012 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.7.0.ebuild,v 1.1 2012/01/25 14:51:10 johu Exp $
+
+EAPI=4
+
+inherit cmake-utils
+
+DESCRIPTION="The server part of Akonadi"
+HOMEPAGE="http://pim.kde.org/akonadi"
+SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="mysql postgres +sqlite test"
+
+CDEPEND="
+	dev-libs/boost
+	>=dev-libs/soprano-2.6.51
+	>=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}
+	postgres? ( dev-db/postgresql-server )
+"
+
+REQUIRED_USE="|| ( sqlite mysql postgres )"
+
+S=${WORKDIR}/${P/-server/}
+
+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}"
+	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_configure() {
+	local mycmakeargs=(
+		-DAKONADI_USE_STRIGI_SEARCH=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}"
+}