Version bump KDE SC 4.10.0

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0xF82F92E6

4 files changed, 169 insertions, 3 deletions

diff --git a/app-office/akonadi-server/ChangeLog b/app-office/akonadi-server/ChangeLog
index 656fe3bde567..b3700c908aaf 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.94 2012/11/30 15:11:40 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.95 2013/02/06 18:52:54 alexxy Exp $
+
+*akonadi-server-1.9.0 (06 Feb 2013)
+
+  06 Feb 2013; Alexey Shvetsov <alexxy@gentoo.org>
+  +akonadi-server-1.9.0.ebuild, +files/akonadi-server-1.9.0-qt5.patch:
+  Version bump KDE SC 4.10.0
 
   30 Nov 2012; <ago@gentoo.org> akonadi-server-1.8.1.ebuild:
   Stable for ppc, wrt bug #442394
diff --git a/app-office/akonadi-server/Manifest b/app-office/akonadi-server/Manifest
index 75d59f62bf93..5af99b8aa7ed 100644
--- a/app-office/akonadi-server/Manifest
+++ b/app-office/akonadi-server/Manifest
@@ -1,6 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX akonadi-server-1.9.0-qt5.patch 996 SHA256 e4a2ec9a7edc833cd79e3bcdbcb4c7e477191cf71e02a33bd5a2f17bbddc5491 SHA512 50ce0f324f49b68f0b0c583d2af4541be21e08cec76a5bf0b8fffab58b2091f59dfadb1dbe35d798d57afa02b0f64040591189bd38497b4377d80191e81b4d0e WHIRLPOOL fa1178fa0bfb6ccd86e7ed0c9b44189e2cd0a5a6523701ebdcbc8c1bda9b4f4aaa00e0424e8f4f7bbdd99f2d1592405f1c3e1649ee158c8ebca0a51497d0106a
 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
 EBUILD akonadi-server-1.8.0.ebuild 2641 SHA256 eea2b07c2c2658b301e108482f6887a197db3f10294b383f53a6bc58262c2b82 SHA512 bf05a069c8a15cb49f607d37c63a340a3ea4bd28441caf531934d73642025efae95a465d1b1fbc13c94275be02b2108efb33647fdcf53219d31374cb461787e8 WHIRLPOOL adc01309b9dcf3bc9cdbc98204ee199b6663d27a5d56cb37337ccbe18cc31ab4e6242d0fafbf0b6a9a5db845b6f07c6e8ebecd41765fd09dc4a935e16b150889
 EBUILD akonadi-server-1.8.1.ebuild 2636 SHA256 05f831b300fc556cf1a4844370080e013f231174e94058a2930fcc17379010e3 SHA512 9cebf3363e818864f3be16a656a7105768fa818b9fcfc3eb51eb7f6a882f2eddf0fd0ed556b980d1f3f72f731164a0a86ce91abec8ef65d007724a191e63fb7f WHIRLPOOL 389e721b7606a4059450adb4086ec3b13fcf420b99d26fed3719ace02b8390c587ac26147b8304552302eab654c7a39834b55485da4206a2a613877383394c45
-MISC ChangeLog 13797 SHA256 7bc21ad5e1ccd1499e1c8a395f17b6bbeb88fe767f3be8d14f79f6968323883c SHA512 3b3e43104e88203857c3a0352b97db5087a0364f5de788f65ad72d8740a5626433d702046d22ab5c27f0b69007feeeb9beb6f02c382b94a987d058732ea62893 WHIRLPOOL c333132933ae923477f564a8665b9f3ee6e6d271a83cdaa78fcd71128c42c67a85f8215f478a132b693519767c1ea60c088148f1209b0aefba4bf0f8450cd53e
+EBUILD akonadi-server-1.9.0.ebuild 2833 SHA256 296c3bdbf2a3910fa77503c04ce6355d52d1bc5a856e9063307bf9ae1d50bc39 SHA512 e5d86f6e2137c8bf2680cab6c0ec67926067cb909ec731c472a5d09224899aeb3a1f67c8ed7893b1f8c29cb4390313f4004fe777e51b2b2ba6c2b4c0577a3879 WHIRLPOOL 4be3472df0aae2ea5383196f0e8c0373ee25a138e475e69259296953ba1555dd0e9517062884b71037846b29d2b1c6330b53b251a8e4d3dda6b4b7e67128856a
+MISC ChangeLog 13989 SHA256 3e5b49edde8057c4eeac2ccd7f7e0de5eb6fa79cdc9fbfb5782e77ec559b128b SHA512 7257cd45cfed3de3488f2f63fd64a40b97f8a49d01b13d8cbda92ce227ce8db80ca4c370891b8c3574a8c29d1cf4e930616f3ea16baefd0495837c8928102019 WHIRLPOOL 3388b64ae083938577bbad7e41003e59fd0e598884203b9c776586f315aaff317fe574286467f5a620cad97d79942981571af6d9bf298ff44b13799bbc751e19
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJREqaTAAoJEOf+E+/4L5Lmr/IQAJJK+Xmc70sD96Gvn5+VFrMm
+ke2/g48gTxRnZ0gkqBiCdhd1z99pfo7sgyWsF31HD8VHuRGC+4wdurBBASd3jksW
+lh6Ojk9h2x9ZCuQZcLtYjhkqrcA7rDOZpBRnJY9U8qmSxBHAChvzrnfqANmcHJKz
+ybbEAqupkp3gk2We3/epDY85nNwRKjH5pZ8YpLFMZMbxA29SF3F6LGnXYOv2nbwU
+8Rd6PMZZy+GtQzUhpkOaXqMTR599dIneWdxIoKUKlYnlfrM9R2prYpigh7MU0ogA
+Pv4Q4Lqx5bszThvuWXsrWoRgfAf5OOPYEQAUChW9/EF1koDoCTK9YrsPB+JGiI+r
+pGIcn8dBNUReFJSujMBNk0XB4tBwWuXgzhkby6F68HY7CpQqI7kS23DsqH/b1z9U
+3xqLDOVjikF2Sq0RJaE1rhjG4bvKqAgAedVpeW/mW44NOkW0aAQG8ZuKbrdA7jh6
+LrvsrguC4BJiuaC06Vzc+EkHEpBpPzK6zcp06H5YUK7GF3vYyMUNniK6h15K6Vm9
+mrAE7sm0wE46rZP1FCsixcSKInqEY0w+OZUuNNsJiN6eeXH8Yg2q8hhZE+BWgLvG
+xz9ecwNSfSzI2zzqKJXwqrLSlQ7tmT8E8nycwCeymXEZZju+EdUXu4EX3cyhg56y
+chAXrkYMMTXCSFlBy8LT
+=CSer
+-----END PGP SIGNATURE-----
diff --git a/app-office/akonadi-server/akonadi-server-1.9.0.ebuild b/app-office/akonadi-server/akonadi-server-1.9.0.ebuild
new file mode 100644
index 000000000000..ac626e541ec8
--- /dev/null
+++ b/app-office/akonadi-server/akonadi-server-1.9.0.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.0.ebuild,v 1.1 2013/02/06 18:52:54 alexxy 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 ~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
+	>=x11-libs/qt-gui-4.5.0:4[dbus]
+	>=x11-libs/qt-sql-4.5.0:4[mysql?,postgres?]
+	>=x11-libs/qt-test-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: SQLite, MySQL, PostgreSQL
+	# reverse driver check to keep the order
+	if use postgres; then
+		DRIVER="QPSQL"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	if use mysql; then
+		DRIVER="QMYSQL"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	if use sqlite; then
+		DRIVER="QSQLITE3"
+		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 mysql && has_version "<=${CATEGORY}/${PN}-1.4.0[mysql]"; then
+		ewarn
+		ewarn "MySQL driver is not enabled by default in Gentoo anymore."
+		ewarn "If you intend to use it, please enable mysql USE flag and reinstall"
+		ewarn "${CATEGORY}/${PN}."
+		ewarn "Otherwise select 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}"
+}
diff --git a/app-office/akonadi-server/files/akonadi-server-1.9.0-qt5.patch b/app-office/akonadi-server/files/akonadi-server-1.9.0-qt5.patch
new file mode 100644
index 000000000000..132557ad8532
--- /dev/null
+++ b/app-office/akonadi-server/files/akonadi-server-1.9.0-qt5.patch
@@ -0,0 +1,24 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e0efd25..efcdbe0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -21,6 +21,7 @@ option(AKONADI_BUILD_QSQLITE "Build the Sqlite backend." TRUE)
+ option(AKONADI_USE_STRIGI_SEARCH "Build Akonadi with strigi as search engine." FALSE)
+ option(INSTALL_QSQLITE_IN_QT_PREFIX "Install the QSQLite plugin in QT_PLUGIN_DIR" FALSE)
+ option(STATIC_LIBRARY "Build Akonadi as a static library." FALSE)
++OPTION(WITH_QT5 "Build against Qt5." TRUE)
+ 
+ if(NOT DEFINED DATABASE_BACKEND)
+   set(DATABASE_BACKEND "MYSQL" CACHE STRING "The default database backend to use for Akonadi. Can be either MYSQL, POSTGRES or SQLITE")
+@@ -128,7 +129,10 @@ set_default_db_backend(${DATABASE_BACKEND})
+ set(QT_USE_IMPORTED_TARGETS TRUE) # Qt 4 only
+ set(QT_MIN_VERSION 4.6.0)         # Qt 4 only
+ 
+-find_package(Qt5Core QUIET)
++if (WITH_QT5)
++  find_package(Qt5Core QUIET)
++endif()
++
+ if (Qt5Core_FOUND)
+   find_package(Qt5Gui REQUIRED)
+   find_package(Qt5Widgets REQUIRED)