Version bump.

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

5 files changed, 155 insertions, 22 deletions

diff --git a/app-office/akonadi-server/ChangeLog b/app-office/akonadi-server/ChangeLog
index a87c45019729..0a1ca02ba6ac 100644
--- a/app-office/akonadi-server/ChangeLog
+++ b/app-office/akonadi-server/ChangeLog
@@ -1,6 +1,12 @@
 # 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.132 2013/12/22 12:11:02 johu Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.133 2014/03/29 19:48:49 johu Exp $
+
+*akonadi-server-1.12.0 (29 Mar 2014)
+
+  29 Mar 2014; Johannes Huber <johu@gentoo.org> +akonadi-server-1.12.0.ebuild,
+  akonadi-server-1.10.3.ebuild, akonadi-server-1.11.0.ebuild:
+  Version bump.
 
   22 Dec 2013; Johannes Huber <johu@gentoo.org> -akonadi-server-1.9.2.ebuild:
   Remove old.
diff --git a/app-office/akonadi-server/Manifest b/app-office/akonadi-server/Manifest
index 0269f51c67f5..4550bcda1103 100644
--- a/app-office/akonadi-server/Manifest
+++ b/app-office/akonadi-server/Manifest
@@ -1,26 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+DIST akonadi-1.12.0.tar.bz2 250974 SHA256 35243793b73e8028973c101c68ef80a8a54be0fe9aa562c9473e73b4657fea26 SHA512 62bf31552fabb6b722aa9c8ebc112a5af1fcc6c2a962b75c0ff4a79ad4999c03169f0e2a993ed382b753d578a69950aae6b28d255d58f5496978fc2d4207b7ba WHIRLPOOL 4746a0a70ea44813c8e0278ee4be3471957e0c1a5e5ace3507be2866223acc92f2c69e6ed0c4f9ac634afe41fe73168ba593e188dc46d9584a37bfa1895cf0a7
 DIST akonadi-server-1.10.3.tar.bz2 228633 SHA256 a8f66eec479c235ec67e77befac50c42743f627663fe2bb49238e82e6fbfffb0 SHA512 836917f3fb8ec5388d7145402fb1b55ca00d14d78f92d0105fecc6c052e99d497e17a2484f581b9d2f20433220a9343e6b4bff8ad34e48767e6a42d309572c66 WHIRLPOOL 468908b64e66a826e17dc8f5dca3f907bfcd09669810f9f1aca96b7f812ebc2c0138a6f840a5e5f8d0734cc05eecddeebafe8affe32994c2ed7bb76c2c309b38
 DIST akonadi-server-1.11.0.tar.bz2 235101 SHA256 0cb257509d53927241b71d85c42efb0b5776efc37fc8dc732e75f6813b8a264d SHA512 366f0e4a86038af5eb6603653e599076c66e84f59db57f4c56a89ec265be7e335f3f5d14444030a6f398e2361969ad85bc73357359da7ab8c307ec3c5d80ea40 WHIRLPOOL b050f5e1d5220ec512ab6e57cd083b652f03ef1e391fb336a51888aede7b0faf2f2ab58db6f6e67ee3fd7ceea8efcb54d5c3b1a6c224adf3deb41cb10b3c91d2
-EBUILD akonadi-server-1.10.3.ebuild 3110 SHA256 72c7b016da78480d5a9a8bf7af77e96dd4c5a6bb3a166129a57a93d44921cce7 SHA512 93e6092b981be81c7c0799d0b9d7cb8dfe3f40ebbf73f87af2eb09eae80f49b9b8ba2d61f4a8f4532eff95708aafc8c20df786482b783e4b31d46465c8ad4d11 WHIRLPOOL c4c9c19b52799b287312d079a3abd8c8cfa332688b74a1d33881dfa0f8970f7b08b9c17cc1c3025dadd473f8588e0e58c115b270e8892a42e03676543200055a
-EBUILD akonadi-server-1.11.0.ebuild 3113 SHA256 f2ecbe18edb6732ca9ca75469bf353eed2732d31a08007398142f79c574ec35d SHA512 73cbf6b99bc56d77f282584208fe59faaf1133acda5566e92ab3f60a1284c181d123595d1d4af0eec22df88f3f4d7254030e32ee0610047c954d412fb8afe4cd WHIRLPOOL 994b4067755c25068bafbb56c54a973490378f1d6469b42655ab12dfb54a7910901a8c894de1f507a7acde905bde76d05d573e8471afc0d98676a46dae88cca0
-MISC ChangeLog 19655 SHA256 37e8242a120e58df1ab9f6430615ef4dc7512df1af77a6f6f3fb02b12ee0de5f SHA512 9f6fad8ae681c417b0465c334073f0a535c5ad24f87d4960841fffe70d1a4c4973db87050b0c633e686169e535263bca8a3318a1afdfd63572faa7f558501a85 WHIRLPOOL 861cbf22d41ffcd8db38c1a36bf98e7f3f86b9be53e5ae53c9ef275ba0632bd4efa3b7e6ede7a03c9925da87e5f427a0939921a85dc1564f2ab48893769ba861
+EBUILD akonadi-server-1.10.3.ebuild 3111 SHA256 29bd5ca98f2b929220543ff37899c3122dce8e31e278d146133e3efe8996d1eb SHA512 8e388ffc6c72f43b5f49a6cdc596d906e2b2c7f72ada297221a006f8b68298c10e59c8fd5a1009a5067f6c5803fa1c4f0bb325acb3f850c3bdb29c712a21f356 WHIRLPOOL 263856ee50cebf5d27425907cbdd2b3d8233c5a956d1d83f5eaaab0eed8a5210be1b93becd54a3e34c53071e0be64486f74ac0ce092fe3ee90ee62cce2664daa
+EBUILD akonadi-server-1.11.0.ebuild 3113 SHA256 5f3dbb8776a7c709e80c474a8f6006b3678e9d8f70e2bc906caf9a2cb1e5f8c1 SHA512 3847daaf105c3de48dcdf60b2a580e79c74cbfe4b2bab4076c2360fe2ac42ece32c96a4e652c89f0733deecb9977ee034a62c95fa45b92d209b52528ce46b93c WHIRLPOOL b624aced38497f39acb81af24518c66e4f14a2d89627b78850e234d3b93515cd51107a8346c779c64f3d57f3bbcbe78ceb2d85fdccc1f02d1e453bb38a1c09e0
+EBUILD akonadi-server-1.12.0.ebuild 3061 SHA256 1880bf45cab91575059edc48720aef0ebeb67a79b2f47d0c51ba9193cb2f3729 SHA512 ac73124c834641980de22dbd5a398978dc577284260a23cf8d4091606e3e036c1aed35d5648cab4b3c086f0318a82b5f5289ebd8b96c27fb213f696eb0d5ec52 WHIRLPOOL 012b1795973932ef69b5fdef6c9c3d5cdfb9477ed2790295c5204942447dbd79624d97be7bea704511fc2d8c84c756b9310d69be1f4318726d2b720c7f81a6ec
+MISC ChangeLog 19851 SHA256 2fb54c61d08639eac71b3bc2f24236c2f82dcad85c6e232654cc8186bef9219b SHA512 0b9ad26f36ee0dd282a1cdad6cd4f6b018fac8eeb7576657114bc40fb5fdb26270c90ac862dded0aac3b3d36cacbaa05f124ca42e17f0701a63bcec39dcc374a WHIRLPOOL 5da5deba2b012115ccaa9e773c0e6061f1931a592172d35823806725a14765349e324cceb6c05e5af9071e8cf615d54e33c9eed9d19bbf050c1cb1f391649b49
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSttbXAAoJEGVpnaTzz9K92/oP/18E5UeKusXlv9GqvgK+5Z6X
-/MHh2qDKtJHHL73WzJaapTV43b4JsoEzJni+hyqpj+htlrXAu6sJOqDMiNrN/gBL
-xP/8I/wICfXMbJhZLWoj/diHh2JCipXt9UK6pvh9cfSyv9vl9SYTFbOdax+IKPT4
-3yAYn7DfuzsFDK6aRZ33B3tgCmR6Dxrsz1/3UnyGWWEs4PPaL+ADw1pZdNQylPzY
-cbN4m96fEbskZ8MjV0NSNcJFcXHGFX48gAFCvl7R0c/BNWeXvIaJQNWuYf4qdPBO
-Koc00rSyfB6Qf1423L/2Q+tNVEilpNEodYmNfjVzB0HO5yLN24lTk+ppM6dP1w+I
-QDEsPd0pTI/0JRaoJb5btnUdQvJXn59pDX8ZcKOKl+w0E4hLO/pjrzceGLydg2jb
-GDodSdcuBABRQZqsyTKdwAKJKNgO0bHRbVxeg2d9qV5k+5gvV685eV9yjnNR1/2v
-WTqQotzzaYBA7TA9XL1Kkh7SpoZxou/ZbQ7R6lgRTKJcAjKIv/99dr+LoT5UJsRW
-KFv+khdnoUZItUPF5IXWRZv1SFvHEtFiPlsRphwakA0o1BVmVaogzcb2x7T4xDRH
-jdG1y3W/+6LV9tyYSuQ3U4d7vhYXDnG/+PVfhKt756w8sjxsf3jcMzhfLB0t/MLj
-Asehvz9ZFMROgHdgTmZH
-=hir8
+iQIcBAEBCAAGBQJTNyOlAAoJEGVpnaTzz9K9IpIQAJITUXswMMB+k6URM3uZiEo2
+p1iNdlJjx9QRo7ypFC8i5PrZgPzMNDdksWYSHREGtOkFC4+binJsh3NLvPWtrTcm
+E12JPudewvMC25j53zMnCNXQN5lIxVMAdE5ZboRshUVnKqYl910oBg4zVu7k5o0a
+pWq8PBYwKHDLWU2MTh1yjHUQPcUg3xjxIJ158t//AbBik8SBVXc4++ZQEhDR4uNY
+wilrhQ40v/d7XL7iK57DYOPfRAFM1u/F39s3lDYaJBNenGLFPHRKomAZEHm+V8jQ
+/2Qo/b8QKdCK00+PM5QuBa/VnT9fkqulP0wXCGWeMdztIzuPf9cPk3cbebJ952KN
+yBxn78Zq33cuhGa4CatvyJYmHiFeijct5KMtzqNQQ2+XAvJTr84fHleCvY80X5T2
+dRIOLIuY2l3KQPPPFdPDrQKvFPHOo4li0iFxA8LVlFO4YTMifn8HSrTUtKTNzKpA
+l78oleX4QL1sKorRNMlqSdO2tJ7r3JMX14E3B5jbh+xqouWBqCDx3oEPHT8avUWc
+1MsDx6kbxqV6qgjecNpn4xYMGxdp2++3QcGZQI1R7MWvlNstt8CuhrlBTDlbnGXo
+3qeIOFz14IkQ2jzxW2Sv5DjjWJA3/QJGXuHdKebZTWBkP4w8EtZgJKbEVJ18T6g6
+egYcDYXMpyfCsy5T2F87
+=8eIb
 -----END PGP SIGNATURE-----
diff --git a/app-office/akonadi-server/akonadi-server-1.10.3.ebuild b/app-office/akonadi-server/akonadi-server-1.10.3.ebuild
index a08b4bfcc479..177a33795eb6 100644
--- a/app-office/akonadi-server/akonadi-server-1.10.3.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.10.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.10.3.ebuild,v 1.6 2013/12/11 20:31:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.10.3.ebuild,v 1.7 2014/03/29 19:48:49 johu Exp $
 
 EAPI=5
 
diff --git a/app-office/akonadi-server/akonadi-server-1.11.0.ebuild b/app-office/akonadi-server/akonadi-server-1.11.0.ebuild
index 95e9e3da66c3..1cc832884723 100644
--- a/app-office/akonadi-server/akonadi-server-1.11.0.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.11.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.11.0.ebuild,v 1.1 2013/12/18 18:02:26 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.11.0.ebuild,v 1.2 2014/03/29 19:48:49 johu Exp $
 
 EAPI=5
 
diff --git a/app-office/akonadi-server/akonadi-server-1.12.0.ebuild b/app-office/akonadi-server/akonadi-server-1.12.0.ebuild
new file mode 100644
index 000000000000..696a78258c6b
--- /dev/null
+++ b/app-office/akonadi-server/akonadi-server-1.12.0.ebuild
@@ -0,0 +1,125 @@
+# 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.12.0.ebuild,v 1.1 2014/03/29 19:48:49 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 sqlite test"
+
+REQUIRED_USE="^^ ( qt4 qt5 ) || ( sqlite mysql postgres )"
+
+CDEPEND="
+	dev-libs/boost:=
+	>=dev-libs/soprano-2.6.51
+	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-libs/soprano-2.6.51[-qt4,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
+	)
+	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 )
+"
+
+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 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}"
+}