Version bump.

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

3 files changed, 149 insertions, 2 deletions

diff --git a/app-office/akonadi-server/ChangeLog b/app-office/akonadi-server/ChangeLog
index fb9b6b823961..2959d7dccac3 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.116 2013/07/10 04:47:34 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.117 2013/07/10 19:55:01 johu Exp $
+
+*akonadi-server-1.10.0 (10 Jul 2013)
+
+  10 Jul 2013; Johannes Huber <johu@gentoo.org> +akonadi-server-1.10.0.ebuild:
+  Version bump.
 
   10 Jul 2013; Patrick Lauer <patrick@gentoo.org> akonadi-server-1.9.2.ebuild:
   Fixing qtgui deps for qt-4.8.5
diff --git a/app-office/akonadi-server/Manifest b/app-office/akonadi-server/Manifest
index 3a733e609f1e..b721cdfe0344 100644
--- a/app-office/akonadi-server/Manifest
+++ b/app-office/akonadi-server/Manifest
@@ -1,4 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST akonadi-1.10.0.tar.bz2 227714 SHA256 ae64b965da72ce7332b2409f1c6d7475b28c2414aafca1c9bbca60fb8d632a9e SHA512 08a41b1caeb17fb2ba3faa4a81310315d0695c526d8b47b61f0c6f2ad414700ba5c31fe85f936cb218e7e96f72ee4cebdf06291f6b81e4f23d2c651b4d3daf6e WHIRLPOOL ab980907de4c0039c5123eb46c58370cd87082d1c885f8813ce45a017e5a2e7e535e9c63fddc0993daaf20c57570132419feb71e98297faef540a57e35b8fce3
 DIST akonadi-1.9.2.tar.bz2 220599 SHA256 e712f3ee59731d613935df78df1cd65f80680d86d1f6642ff118061cd461bfd9 SHA512 9c281315cbb4801490acb0c6afa8bde6e42a73cfd0ba4ab0cb2b0b50a63ae55d350efcf8535b7f3251d93da0ba63c51e7920c250496fedcb3d90e1d8644c1b7f WHIRLPOOL 3415b70bc03ba451ae4e8216de0eeeb0f0c7f53c4f6433cc21f4725167f24493bee3f6dfe188f7d3633b4f5e4471d3a02ffc5407b90def86c439db6e711a1cce
+EBUILD akonadi-server-1.10.0.ebuild 3096 SHA256 11bd8f20643dfba1ba7a4a3d4927f9b377415aa68519d8221d43c20031d6133f SHA512 81598b1a55f04d89597896ea14b4e616a41d48339b2014bc9e4e8444544476a59c20395e866c9910e900cfd68853da2ea3fd20d9fd5905185004a3e0d86e32bc WHIRLPOOL b823e0bae2311b668f3004f36edcb97035b0a657e4d5d9e33356d5f257ec59f66d3050fb41c371b01859d0437a9d0548067fdd0894712d43250416aa4c3bf999
 EBUILD akonadi-server-1.9.2.ebuild 2677 SHA256 257a0b1eb51370989fee353d085cf60c014ff492f17aa827616461e94625d06b SHA512 2e7e51f572797e8c444f6671b372a96654f8a7ebd37c2264f80d7638ed10500ccbd46b6f533ffeb54e95797d7fef5b1806db3493d0e2281fba6420f107bf640f WHIRLPOOL b4e6815390ef291cc5ffb9cb5568d740ff3a92ce2148747131cfab3649bf675ed8f5a29afa984b65336faa310266eab56aab89abc95a05c282ffae4af80b990f
-MISC ChangeLog 16826 SHA256 c4fca124172ba856e889d8dfbb3204a370db990752ac45d283d213c13ee8ce0c SHA512 d63e47b8af16a22d1e0444c3e192eca2b4210b39a191fd06dffbadbcd02f2d078336216fb0861b7de8926141c575431c5897ca32a5811660c0c989d061ccb547 WHIRLPOOL d2ae997f0017a9bc9864d1b180f79f8963cec274bc2001a1ceb509919d2b570a40a3bffc04bc03adedbbf2f511163be3c9485d378fb58b55549d405dda8b4167
+MISC ChangeLog 16957 SHA256 a7fb703a2bfcecca0aaa1f7869da61b8220ac46ac6ae7bfb673b977c5ef3e3b0 SHA512 d3f616065b151d6312a19e02d29922b43bc0834c4540578da8f48a55d2ef499a0963a8e1c81c82d2c76b435b4344892f7d79ccc3051827e572dd628fe3f27d4a WHIRLPOOL d31850d148eb7adc48c74eb77280397be89be76811e9fca68bdc5a625983a437509f82196ec4bc7688f3473c0cc8b9166477aa7ba91a92a5eb4baf7ac14f3e12
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iQEcBAEBCAAGBQJR3bw4AAoJEO+t9ga+3I3a4BsIAMl58+WnqcnAKflraoa3NgTb
+4s/cpvv7Bj1QMpsS7x948JhgJ/sc06SCbQYzmYgmHUFciJJ+sX8QUkh/0a4+D5Zm
+aVDPtmcnoTFj2lDG+aky67NaBHbGosEcq+c/k1BrbSPShmPwKyegDX9FgfP65qpS
+6rOLeIBxU/slvglWF1gy2TD3AOrXGdma9ovCXddG32PSFNCafUJqkPYF+MKrhOSk
+hkxheK80krdnNfuqQesJLVI6uhqokJv5ovor90UQucpoxzhG09EvzVP7bQbSDYM2
+d0b40ONk3eQ7zOjISqNEFpjBDH8iixYdmgDKn6x4TAEhArKxBrqhkNYN4Bb43so=
+=Sicd
+-----END PGP SIGNATURE-----
diff --git a/app-office/akonadi-server/akonadi-server-1.10.0.ebuild b/app-office/akonadi-server/akonadi-server-1.10.0.ebuild
new file mode 100644
index 000000000000..dab75c071404
--- /dev/null
+++ b/app-office/akonadi-server/akonadi-server-1.10.0.ebuild
@@ -0,0 +1,126 @@
+# 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.10.0.ebuild,v 1.1 2013/07/10 19:55:01 johu Exp $
+
+EAPI=5
+
+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 +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.5.0:4
+		>=dev-qt/qtdbus-4.5.0:4
+		>=dev-qt/qtgui-4.5.0:4[dbus]
+		>=dev-qt/qtsql-4.5.0:4[mysql?,postgres?]
+		>=dev-qt/qttest-4.5.0: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=(
+		-DAKONADI_USE_STRIGI_SEARCH=OFF
+		-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}"
+}