Version bump.

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

3 files changed, 122 insertions, 9 deletions

diff --git a/app-office/akonadi-server/ChangeLog b/app-office/akonadi-server/ChangeLog
index e8bffdc7c56b..ed1bfd82b3c1 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.109 2013/04/03 08:01:11 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.110 2013/05/08 18:38:22 johu Exp $
+
+*akonadi-server-1.9.2 (08 May 2013)
+
+  08 May 2013; Johannes Huber <johu@gentoo.org> +akonadi-server-1.9.2.ebuild:
+  Version bump.
 
   03 Apr 2013; Michael Palimaka <kensington@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 e229c3a04bc6..cf00c4a467b9 100644
--- a/app-office/akonadi-server/Manifest
+++ b/app-office/akonadi-server/Manifest
@@ -3,17 +3,19 @@ Hash: SHA256
 
 AUX akonadi-server-1.9.0-qt5.patch 996 SHA256 e4a2ec9a7edc833cd79e3bcdbcb4c7e477191cf71e02a33bd5a2f17bbddc5491 SHA512 50ce0f324f49b68f0b0c583d2af4541be21e08cec76a5bf0b8fffab58b2091f59dfadb1dbe35d798d57afa02b0f64040591189bd38497b4377d80191e81b4d0e WHIRLPOOL fa1178fa0bfb6ccd86e7ed0c9b44189e2cd0a5a6523701ebdcbc8c1bda9b4f4aaa00e0424e8f4f7bbdd99f2d1592405f1c3e1649ee158c8ebca0a51497d0106a
 DIST akonadi-1.9.1.tar.bz2 220354 SHA256 53ae49a2039cc0454795f14f6c7c08780f39990652c45843f4266654c99a20f0 SHA512 dacb8015a1a9a1988f45f1ad91503d7aebf8afc9c1c5e1182b8fd6fcf0aa8e6317e7d302a0f7de5f5569dbb36006c5d37cb6d581b543685cde023dc71e7d54ef WHIRLPOOL 7a0f8202c00c07834f2c627462f8f45ac8b85230d2ade381888c6b77316cea8b743b9b634924ff09d6e1a6965177f81753c0315169f250e060ea00ce6e4e2b1e
+DIST akonadi-1.9.2.tar.bz2 220599 SHA256 e712f3ee59731d613935df78df1cd65f80680d86d1f6642ff118061cd461bfd9 SHA512 9c281315cbb4801490acb0c6afa8bde6e42a73cfd0ba4ab0cb2b0b50a63ae55d350efcf8535b7f3251d93da0ba63c51e7920c250496fedcb3d90e1d8644c1b7f WHIRLPOOL 3415b70bc03ba451ae4e8216de0eeeb0f0c7f53c4f6433cc21f4725167f24493bee3f6dfe188f7d3633b4f5e4471d3a02ffc5407b90def86c439db6e711a1cce
 EBUILD akonadi-server-1.9.1-r1.ebuild 3167 SHA256 6fe95c4ee6b11d02f88d700d637f2bd8a0a0ad3d452706cc9f9b8096825eccd4 SHA512 4f4c7629ccf8e66aeee65b75b7382c97c995561ea0a6120e12c81d43f3a2d54855b64347cb9f8fe904c3b36e983ec7a0ff852b76d795b7de82f4b738a22023fc WHIRLPOOL ac32f3f7793a8510bedbfa9432439f669f77b340a2cfcd84247201af52a1aa789c1f9c0af242bac838af00679b225188e464b8dc964196100b017eb035e076e6
-MISC ChangeLog 15991 SHA256 e69f1b1007c1acf33326c20556695e2bd714e61fe09bf68e974ca3ffd93fef8d SHA512 94caf59d9e1a338320c6cc481b4550c6311c697bc6eb96e6d14517a1ff97d0b25bed0558daf67e33daaae1fe85584b8ef5c280f576f660cd949d55476ce0b2a8 WHIRLPOOL 1b8e587a50e36f4efafec0de6cbc52d0b73ceff97ac9c97185b98ec0b2f7f250c31f751f14847fcae208af28c4c7f02e7fe954c5d60a2ea04a9d4481c23b6977
+EBUILD akonadi-server-1.9.2.ebuild 2675 SHA256 ae366b56ee5ce27530365b0ee088b1b64ad3c5c820554d54354cc78d2ace37e1 SHA512 35aab65fb72022c36f9978f9e0e842b7f5c870995fcee0f595b71b969afa24dec1e44b83de6d4fe133796ec119f26af267055ba6cea0eeaf0c4ef22da1614052 WHIRLPOOL 0802b0893025c81e5ebb6a541c12651bf5d3d9ff88315ebed4a7b302e05883a1c9f735a7482cacd225fcd0fb423fa85df7ef5d11d099b9a4b9529d7d8b901d9f
+MISC ChangeLog 16117 SHA256 a0869ef05f66afa2e1ed38b8c21cde9b7edfebc76035a72e90c1a294e9104d1a SHA512 4197012d3d6b47bbb43a4d32b5a26ad0890b8b4fe0991194c113ed80763ff9217a6074c97c15e97e99fe87d21f7b11b792ac79d1ea8f22998ed8983248e9dc05 WHIRLPOOL c93c912642accee4dcd4ad6e5ef964b980b709acdf104ffaa4237792d6d6d7afa185899230aeeba68a4434e8c4267de61ecedaf1977de433f2e08ebddb32e547
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRW+GnAAoJEMbwO6tnXQ0sB2AH/0tjVo3OhYZc6B/TxibpaWLO
-HWNMERYhPjGpTqO5n5J/BkG/h0XiufnGbgp2ZyO7ChQQvPGxYZXOOa3qa1RuaQwK
-d63Y4ZRW4PhJoTPG0eiDlrp9hC466F/HWWJCITemiVx+nomvODc3eaFnX5Xg4qB/
-XzBIZdV7k1KyqymywQw4aUtlD35b3I/CfPHeMRybvz8Lnr1oLsvo00R+ApjveDAq
-E5S0mV0YNvHRimymnDPeeZcNOBkPfDZnkF+iMPOhrEZLBGoldFxa2piGfrpvGY1A
-fJYnAZejaPi+FUHd4EzkYC98F89YG5csZAPo1ILdBQ2Q+ffiR2/fv9asKORPRLQ=
-=eptz
+iQEcBAEBCAAGBQJRipunAAoJEO+t9ga+3I3acpoH/1ZJPoFGhetRlh6OmsHd4Kez
+B7JSUMPCa0QwY7YjHFuhb4rBHjB2DSJxZCDTr7zJ4najWGgybSR2FMZ8Bfg8O4I5
+WhZxXWklpF0BmdCvw9Cldj8DFAMsUSBPxzOq5GInJOhZAP4Mkl/HwkoulAxJnnqw
+Z83fU7s2ucHefAkF7B7jbK/FmAmgu9li1lBBH8Cm2EQ7UDKIu87rbV2BEnaK9twb
+zNy5lgWWrBeSz2VcEjPFGGmFlmEfiQ99YmzF40++lzb9t5KkbfW6r2W6d94n8Xqq
+uxg5LPjvZNTbrVduALXiBY0L3YU75e6zPVt+/45VZdFxAmrbDVTC5iJx2EBGjEg=
+=j6PA
 -----END PGP SIGNATURE-----
diff --git a/app-office/akonadi-server/akonadi-server-1.9.2.ebuild b/app-office/akonadi-server/akonadi-server-1.9.2.ebuild
new file mode 100644
index 000000000000..3869a45141b2
--- /dev/null
+++ b/app-office/akonadi-server/akonadi-server-1.9.2.ebuild
@@ -0,0 +1,106 @@
+# 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.2.ebuild,v 1.1 2013/05/08 18:38:22 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 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"
+
+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
+		-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() {
+	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}"
+}