Version bump.

Package-Manager: portage-2.2.11-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

3 files changed, 151 insertions, 16 deletions

diff --git a/app-office/akonadi-server/ChangeLog b/app-office/akonadi-server/ChangeLog
index 6b348953f14d..f6e49089b2a6 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.141 2014/04/22 15:44:02 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.142 2014/08/10 11:42:20 johu Exp $
+
+*akonadi-server-1.13.0 (10 Aug 2014)
+
+  10 Aug 2014; Johannes Huber <johu@gentoo.org> +akonadi-server-1.13.0.ebuild:
+  Version bump.
 
 *akonadi-server-1.12.1-r1 (22 Apr 2014)
 
diff --git a/app-office/akonadi-server/Manifest b/app-office/akonadi-server/Manifest
index 066de1fb9303..201b66ef58f7 100644
--- a/app-office/akonadi-server/Manifest
+++ b/app-office/akonadi-server/Manifest
@@ -3,25 +3,27 @@ Hash: SHA256
 
 AUX akonadi-server-1.12.1-db-initialize.patch 1734 SHA256 5ad4ce105a6547f62df16729942ffdb3f845a08e3298b0e5e482e4fb41baf8fc SHA512 14be75191ee689f115bedc3e28655a6c70ca49fa1240a5b82aede5d977949bb4a314192715300f06978515192268b03b171359525a3edc6bbb7c3ed0d5d0ffe0 WHIRLPOOL b659d65e66659250ec29b82b7d7d33352d955c2bc97afc07eb4dfe15a5bff30dc743b693b7dc719bdd2b2b4bebe2fb9abab7fdaa6e39b45eb62e71b1ad2059c9
 DIST akonadi-1.12.1.tar.bz2 251899 SHA256 a073228fda8bdbcf836af32d4b4c44dcbe58a3eac6da4e5a286b42ace9d83145 SHA512 128af06874ec32be4205d8bfcae5ac044d1fade6b2c612cdfe801be20f179f2b70e8a6d48ef0427e4b419b6c1efa8eed3b9d741765750f36fb89e909da8040a2 WHIRLPOOL c83fa6395982b5d06d8f877c833e2b1fe0bd4d3906f4a3f8aa86b78b946019bbea6b5d507026e3675001e82925d144afc1ed51ebfec0ec6e40a6db0571464326
+DIST akonadi-1.13.0.tar.bz2 294198 SHA256 8c7f690002ea22c139f3a64394aef2e816e00ca47fd971af7d54a66087356dd2 SHA512 4bf2026c3807b5493c9f63d0c2bff2e6db00fbe97a4e2c2f707aaa3bf4a848b70dd9657d8fa1743690e8eeefd967de4895c1329c6bb817a1d023fe398285222f WHIRLPOOL edc18247dd864af48395f4e3187f6a52cdaf4737959b317e3decb10caf138b97258a661eeb11a2ad11f2365fdd053a7c6fe63097ba71c24a12417ee71de54afb
 DIST akonadi-server-1.11.0.tar.bz2 235101 SHA256 0cb257509d53927241b71d85c42efb0b5776efc37fc8dc732e75f6813b8a264d SHA512 366f0e4a86038af5eb6603653e599076c66e84f59db57f4c56a89ec265be7e335f3f5d14444030a6f398e2361969ad85bc73357359da7ab8c307ec3c5d80ea40 WHIRLPOOL b050f5e1d5220ec512ab6e57cd083b652f03ef1e391fb336a51888aede7b0faf2f2ab58db6f6e67ee3fd7ceea8efcb54d5c3b1a6c224adf3deb41cb10b3c91d2
 EBUILD akonadi-server-1.11.0.ebuild 3108 SHA256 7eb6ec0976ee9ff59c50a0d6b0a1299d0df20f27a5e2f3016967383814de7f4b SHA512 1d2edf99eb8707d554ae31bdd63b1059a733feaf05088c3536f77a96c8945816e23a39f0a49a250ccf62c528af4e8d591725460d06bf8fca30787547b5a771ed WHIRLPOOL e01b141387807bf33a3827e400783ffef3f03b4c108e6c456628354681b63029a8ee23f7f793b8460e25cac6d3cd3857fff61a6a2e0695c4364f283194fc19cb
 EBUILD akonadi-server-1.12.1-r1.ebuild 3166 SHA256 37cb8cfe22616e41f858c1e833b0ab3711ff2e965b9508afb6bfcca56131cc6f SHA512 877253fde2a3b29afd6bf44eef5a7837150605320b1389a9619f83b2bc168d96b42030477213ded51ce8b83b9a032d38500277c969a6f39b51fbfab20b92e55e WHIRLPOOL 7e45484c5c9df8e02164c15d8434f50d4fe841cc432a17d845b46b258c12d1e99a25b51d0e660e66691690e919d06563ea5b8d85b2f29519c763274a45b3cc4d
-MISC ChangeLog 21016 SHA256 a7628eeb3f0f633ee32d1295db1caedd17fc3594fe3bca20a0480d481506bd3e SHA512 57d8bc62de96ddeb7c4f8b3b81aade80d8fa8b065ce2175dc93b0a3d3ba0436615fc2b6d3e3aa5d0d2bf9aec9a734509174b3986b41c1393b376a52e64550b4e WHIRLPOOL 9fbb80f72aef2d0c5a4c4f41d2dfe204c074d169c73327c515723bac78711a95c368c983abef1405a1f36889fc6ab4703aafc13cd1ddb28844faf5e873f4b315
+EBUILD akonadi-server-1.13.0.ebuild 3128 SHA256 ad99b832f19a11e649f9998a14316fcd091c2f387146468181e210a962a42cf5 SHA512 6e4452046a2b9984bee33d430b440facbd35f75c6c21b9cd1cd6309a23f27a51786351a26f9bd9f263844ad0d00ab5234a013d14c1f122f16c3469483dfd8f76 WHIRLPOOL 47da2b94820cfb0e22ea23c0edaae9b96839bab4d31832f5beaba6fbd3f0a2ff3ec60ebe5afc3e3a0865c2ab14a2d56cb2a6b22a2e1daea567ed03edaacc8343
+MISC ChangeLog 21150 SHA256 c1595bd228de895b50ffdee6639789ffe270c82228a746ebce1699f74f59f56c SHA512 94a4d1ab9d372bbefd2db838dec68ac6b9e5773c4b766143ad4df6db8f9ad470c38cb4b43790bd8d643359ab53d732a7cfa3b0aedefd298b049322cbac03df07 WHIRLPOOL 98b06563460dbc8479939b35dc5676d4281b8070277839c4613488aa0551cf919abdf702f2297e90097d106e9fb644862cc67e9a492d39fc6ad085a963a174e0
 MISC metadata.xml 275 SHA256 0602f046fd341806f78a5850c099f697359bcac7eb67327fafb3339bb44c3700 SHA512 18330303bd7767d1dfc9398a35fd59fea5337227056dba883f25f5624ab9fbebbe3bbee7a3f678f82033c07660f95da7c73325ac5a41fd7fed8db6950c2cfdbd WHIRLPOOL c7e9aa255e46fd3bacfa0a1a036673311fcf0dfdd03f28b7076c5c0361f635293095d2a9210750ece0755591ca3fd2d35a1e28bffa00b92c618a22403cec367b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTVo5EAAoJEGVpnaTzz9K9dDYP/jG2G1HgX1WNBY4frmx+txMq
-K2veA3hTjSFijLjp9YC9bdOEgUY9BvA07xK5PmfWyPNgEKrXad4xQq/4VSMUuJTa
-tBCwU6lCBkA4jyJF3/vzPcO9gu49mzbuwhVkoJn0exfR1fmvElc18m7RPy4X5xnP
-ybuYx5/GFbDndXU+dSAGojDYVS5HqLKW+ikcSHzVkoGq5+xrxaGOOcNPO8ogATAb
-X66uC7RkFmmJgVlJ6D/KVzShhPBIv2qtho71TRpUlvlSpqPzK0Q90QVjn4g7lhy0
-xiIFjBJzkWHwqII1ycdzFp1wCL2bKsgYudI4+PlFD38qGXXJ06q09IjgK0NRDOc9
-l4XV+Ag9wA/bn6+IyqL+c8hbhCzxnayFBd84ICUDHJmZsJXp+OE+6T022Y6R8fOv
-+AIE+j0mH96UaaZ2pHCORTmTfo2dtHvhbtYQK1/l6a0BN4YX0lWP74Z9Rg1RWZgr
-gXpOFOEz8MYto7B5dNggEAtL+CjLp/Z6BPvuoC67dfbJdIOxsMvZng21zBnBcH2w
-d2bFq59vomfZqqMr6U2rrFUGyWqqgjTPq+wYMGrz9MUG2As3mKHhEoRqhXsXtQuE
-vMwGu1YuY1kWovVKx0A0QpFtkI7XXuQE+jx1WwmjkX8sExuRkgT1F6IwQQynjHww
-Lq1G/d5Ed2wovldN2tZD
-=ItQ+
+iQIcBAEBCAAGBQJT51qgAAoJEGVpnaTzz9K9bhMP/03PLviZk76wGtQpquQ/7qyO
+XHoQeLvfsEoRjfATruu7fHVVOFYB8G1+zAQTcUaqRZjeSAW9PInPg8rIX7Xw4L90
+oNpZ0QKnSF0uqNJZpCfKmcpFzZu57DZXCxwCF70gBmAUz5k1Av5wfDXql71R/ek+
+3/5CaSUe9nw93iBEILDQWAcjrTCCC5RnmSlbYvsl3Qiy2vGGS3uBVHW0k8g9dwIg
+ciBh4YvHoBkd/QK7itcV+F7I0S3axPu5DN1+qNgFKH6cgAoAXqn5ZS02ASgTMdPo
+GTNGb19pR2VZV1sd7S45B8L6QM35AP2TR9UNmmRyFgq+Dhc56dp8HL3s6q2QpUlu
+WGyGY3gQ8QtzdcYd1FhkGczsrDTWWzYoTTztNkr9v8sVEsxTbceXfJNxRD2C8fqW
+qzLqQS1WHy5sFBw3qX9glZhdMqfhL/TbfqdbGXRB2o2m9dA5+BiEB20UXzqvF8VV
+4AZvrbaEB4kWu+A4mYyxsEyCm6//RINAPjEBrpFAzyj+QTmoJuxzXOwqcQcj4esV
+TYnEQhVYST0h1Ch4YWhh0E2YBdceX3N7LZQtYAuMySflVpmvJ+wxeTDBom4xr19k
++ICEU5kHST06Z8wvjkat81g8Rx/GIWfsUUMKYx2NOR1EPJKt5OFGTDwkuYvVag21
+oFBu1cy3otLjaFeLPZPy
+=cSu5
 -----END PGP SIGNATURE-----
diff --git a/app-office/akonadi-server/akonadi-server-1.13.0.ebuild b/app-office/akonadi-server/akonadi-server-1.13.0.ebuild
new file mode 100644
index 000000000000..60ea3d8d05dc
--- /dev/null
+++ b/app-office/akonadi-server/akonadi-server-1.13.0.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2014 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.13.0.ebuild,v 1.1 2014/08/10 11:42:20 johu Exp $
+
+EAPI=5
+
+if [[ $PV = *9999* ]]; then
+	scm_eclass=git-r3
+	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 +qt4 qt5 soprano sqlite test"
+
+REQUIRED_USE="^^ ( qt4 qt5 ) || ( sqlite mysql postgres )"
+
+CDEPEND="
+	dev-libs/boost:=
+	x11-misc/shared-mime-info
+	qt4? (
+		>=dev-qt/qtcore-4.8.5:4
+		>=dev-qt/qtdbus-4.8.5:4
+		>=dev-qt/qtgui-4.8.5:4
+		>=dev-qt/qtsql-4.8.5:4[mysql?,postgres?]
+		>=dev-qt/qttest-4.8.5:4
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtsql:5[mysql?,postgres?]
+		dev-qt/qttest:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+		soprano? ( dev-libs/soprano[-qt4,qt5] )
+	)
+	soprano? ( dev-libs/soprano )
+	sqlite? ( dev-db/sqlite:3 )
+"
+DEPEND="${CDEPEND}
+	dev-libs/libxslt
+	>=dev-util/automoc-0.9.88
+	test? ( sys-apps/dbus )
+"
+RDEPEND="${CDEPEND}
+	postgres? ( dev-db/postgresql-server )
+"
+
+RESTRICT="test"
+
+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 MySQL is recommend by upstream
+	if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
+		ewarn
+		ewarn "We strongly recommend you change your Akonadi database backend to MySQL in your"
+		ewarn "user configuration. This is the backend recommended by KDE upstream."
+		ewarn "In particular, kde-base/kmail-4.10 does not work properly with the sqlite"
+		ewarn "backend anymore."
+		ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc."
+		ewarn "Available drivers are:${AVAILABLE}"
+		ewarn
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_QSQLITE_IN_QT_PREFIX=ON
+		$(cmake-utils_use test AKONADI_BUILD_TESTS)
+		$(cmake-utils_use_with soprano)
+		$(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE)
+		$(cmake-utils_use qt5 QT5_BUILD)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	export $(dbus-launch)
+	cmake-utils_src_test
+}
+
+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() {
+	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}"
+}