Version bump

Package-Manager: portage-2.2.0_alpha165/cvs/Linux x86_64
Manifest-Sign-Key: 0x296C6CCA35A64134

3 files changed, 126 insertions, 17 deletions

diff --git a/app-office/akonadi-server/ChangeLog b/app-office/akonadi-server/ChangeLog
index cdfb2dcd6091..568dc879be5c 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.100 2013/03/02 19:34:29 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.101 2013/03/04 19:11:06 mschiff Exp $
+
+*akonadi-server-1.9.1 (04 Mar 2013)
+
+  04 Mar 2013; Marc Schiffbauer <mschiff@gentoo.org>
+  +akonadi-server-1.9.1.ebuild:
+  Version bump
 
   02 Mar 2013; Markos Chandras <hwoarang@gentoo.org>
   akonadi-server-1.8.0.ebuild, akonadi-server-1.8.1.ebuild,
diff --git a/app-office/akonadi-server/Manifest b/app-office/akonadi-server/Manifest
index 4771cf8c7382..7c1aa5a6adba 100644
--- a/app-office/akonadi-server/Manifest
+++ b/app-office/akonadi-server/Manifest
@@ -5,27 +5,17 @@ AUX akonadi-server-1.9.0-qt5.patch 996 SHA256 e4a2ec9a7edc833cd79e3bcdbcb4c7e477
 DIST akonadi-1.8.0.tar.bz2 213413 SHA256 1644040ccc62c39325127cd32d19e846f62ffb1efa90b8d5e6a137a2545fa66d SHA512 9f995d90d84c8fa7bf51691b4bdabda69e64578dc7a2f0ee0b20979ef3da9e2128625c34b4ce84e5feb79c61615df7299905b2eeded9abcbe8deb22817e1821e WHIRLPOOL 492d184fa20a09e1f68438da8519e176731b1c2d66e01b8a2dfc940da24f167ae33bd00a51900444a18a6203a2165e4e70ef4a1c2db34ac4cc0660744f7a9230
 DIST akonadi-1.8.1.tar.bz2 213787 SHA256 2b33812801ede762bb9c60d7ab9b0cd98d5552b0c58e28f215ffdc941b48c347 SHA512 8b33d9b2ee845e6ab8e01879f36b5a33c3ef1901490718859646f5b8a7ceffd6def1e788a218741023408991fef4c6cbb4769f125927801951515171ddbc6a7c WHIRLPOOL f20493ff6f1e3ae024dc47dfe7cb8f386fb4ce812cd30bd8132e09b75dc09fc884f41b9545ec46f6828b4582b7ee84f64c9586763eb5f221d3eb02da9e5e86f4
 DIST akonadi-1.9.0.tar.bz2 220255 SHA256 6ff5c23e426efc02784d4ab1a6e6dff24c8efe81fd34ec78bb52bb4d7733e013 SHA512 e982f98263ae7cce3af90a7282ead72802ab3c611c3d664ed995e630b036548cbcbacf290fd591e00cbc3584e989bbb9e563ff7736c785609ebd84d011750779 WHIRLPOOL 8df1b77e3725c68e8ecd6f1c937da4124127132980cb58deec937a4dd11032f02f2cf8d5bc775f40e402d2925ae2f0c1d2135330182140838c825bb4451594bc
+DIST akonadi-1.9.1.tar.bz2 220354 SHA256 53ae49a2039cc0454795f14f6c7c08780f39990652c45843f4266654c99a20f0 SHA512 dacb8015a1a9a1988f45f1ad91503d7aebf8afc9c1c5e1182b8fd6fcf0aa8e6317e7d302a0f7de5f5569dbb36006c5d37cb6d581b543685cde023dc71e7d54ef WHIRLPOOL 7a0f8202c00c07834f2c627462f8f45ac8b85230d2ade381888c6b77316cea8b743b9b634924ff09d6e1a6965177f81753c0315169f250e060ea00ce6e4e2b1e
 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
-MISC ChangeLog 14647 SHA256 456cf6b7339b0bcdfc905d8472c3aa069f11fd636e295a1f4311fbac0d105924 SHA512 fb24c429455ec3ffb432dbdfdb7fd724f2c12af8c70f06ea9e413f9dabe0d21a1b2bc254f183fc714d18f80eca6a3ce813f9c132bf490197ea2b0645783d23e5 WHIRLPOOL ca4a259ebcc1b279e6dc78fc1785c95f0065ea39d8bf1696efc3058d0046cde730b3a57bcb2a8ae1e54717f236ed621302b820c682eb7c2a6b795e01b146a888
+EBUILD akonadi-server-1.9.1.ebuild 2847 SHA256 607a6905dce613129903cfbbc48cc983e77fd272b6dd216f4d07bcfebf120a14 SHA512 bfd6337f703dfedcae5a911a8c5c9e04cad9cd13d2b847227e156faca38c35bafd1fa4752f2fdd97618fdee389dd5bbc2730468d9e54ceea738f06e24e013382 WHIRLPOOL 7a45b001b43d393d7a51a55ab496a8b5684461329d3835afdfde9ac5cb8aec7709af829cfbc75e681fcc85b6a72c9364d3fe2be7aa7613177752672428bbd597
+MISC ChangeLog 14784 SHA256 b381f74f201b76e5602befdcde6f1083fa5a5563017be52381962b87706a2252 SHA512 d50ebb4bafb0ca17a04f1bf1434ef975670595d2c111c4af9a12a102d3387af05d89448188597d4478b631543d826f134e15069d4aa5229e5c606466b860e274 WHIRLPOOL 0df45b330eb814d7116f1b9b0a33743df1065acc186f06e4f7abd4c5550dfda0e2ee0b0b3c63678320da236556e7ce07852a503863590df9a49953ff04d3908d
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRMlRDXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun880IYP/jHoo3oDP4iWiAZSttLbq/3l
-xv3I/oVouavMGU+C/W+awfeyr8JUUsC85i1+INVwsDYNgGHHNA4RjTRh4WyQ5dqE
-6hcxqCQlcsiI9wXmgd5WfVLezZyjvc5Eb22Qm8ju2tqdhAJtSYAMBNMki7uCd8Gp
-UKLzSI7HZLbDn8hBfeDo5tb1hMbi9A54bIouVEgdmATQx4YIbizquZcxiY9nTyBd
-lr2yHD9RoQTU/vwe3DVRYe7a9FJrkzrYUpF0V8h9Y6vgEDk6BrVy5W3Bo/dnzaW8
-rzvEe6cToczz9/Xfh9DgxzReCZCdDJ0gQ3vIJ35aHae8vg2Kzpcb/bC6Dq3OOkZq
-NAdaRZUnUZUTYgwmEspyCYTtpHcFxTFIXnS1C9Hp4gZvRUIIqFKXJpsJ+8iqlgvj
-MhDjUaNAbfiGI0OjjbqMbDOf7MIxMmGVmFt4og9D8RVCjtkWzfSueJCRKh6Ag8MX
-hVAB6bM1sUmZVBdrFeSjgFOIIx3NNdANbwQ+pjL4EPEFOK7OweAFdX+V+8pjGnae
-gi3XMupIIVVDwg5i0iN2l9UJGIalwqSrH05J/JvZrwutUw87+zj/qsrR/fYDzOKw
-w6iejCnPS5b0pN0oWvfuYNCedQFdakVRa9KbgvN6cCZYI50yQ/K01PDl9YW++vNj
-D57dthBaL2N7uLVuZaVu
-=MCAl
+iD8DBQFRNPHOKWxsyjWmQTQRCNAoAJ9R/jKotP+704drWTBK/iy/zd4Z8ACfQU9j
+Gf+9qlD52R7Bqpm56F8wJ+s=
+=pHBq
 -----END PGP SIGNATURE-----
diff --git a/app-office/akonadi-server/akonadi-server-1.9.1.ebuild b/app-office/akonadi-server/akonadi-server-1.9.1.ebuild
new file mode 100644
index 000000000000..32cfec9c3fa7
--- /dev/null
+++ b/app-office/akonadi-server/akonadi-server-1.9.1.ebuild
@@ -0,0 +1,113 @@
+# 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.ebuild,v 1.1 2013/03/04 19:11:06 mschiff 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}/${P}-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
+		-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}"
+}