[gentoo-commits] proj/kde:master commit in: profiles/package.mask.d/, Documentation/package.unmask/, ...

["Johannes Huber" <johu@gmx.de>]

commit:     820018dccdc71d90198c390f83bc9aca6a5838f0
Author:     Johannes Huber <johu <AT> gmx <DOT> de>
AuthorDate: Mon Sep 26 23:35:37 2011 +0000
Commit:     Johannes Huber <johu <AT> gmx <DOT> de>
CommitDate: Mon Sep 26 23:58:06 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=820018dc

[app-office/akonadi-server] Bump 1.6.1

(Portage version: 2.2.0_alpha59/git/Linux i686, signed Manifest commit with key DF018462)

---
 .../.kde-live/kdebase-runtime-live                 |    1 -
 Documentation/package.keywords/kde-live.keywords   |    1 -
 Documentation/package.unmask/kde-live              |    1 -
 .../akonadi-server/akonadi-server-1.6.1.ebuild     |   96 ++++++++++++++++++++
 profiles/package.mask                              |    3 +
 profiles/package.mask.d/akonadi-server             |    2 +
 6 files changed, 101 insertions(+), 3 deletions(-)

diff --git a/Documentation/package.keywords/.kde-live/kdebase-runtime-live b/Documentation/package.keywords/.kde-live/kdebase-runtime-live
index 981d4ee..7c0fbe5 100644
--- a/Documentation/package.keywords/.kde-live/kdebase-runtime-live
+++ b/Documentation/package.keywords/.kde-live/kdebase-runtime-live
@@ -1,4 +1,3 @@
-~kde-base/activitymanager-9999 **
 ~kde-base/attica-9999 **
 ~kde-base/drkonqi-9999 **
 ~kde-base/kcmshell-9999 **

diff --git a/Documentation/package.keywords/kde-live.keywords b/Documentation/package.keywords/kde-live.keywords
index 99cea55..79911e9 100644
--- a/Documentation/package.keywords/kde-live.keywords
+++ b/Documentation/package.keywords/kde-live.keywords
@@ -37,7 +37,6 @@
 ~kde-base/libkonq-9999 **
 ~kde-base/nsplugins-9999 **
 ~kde-base/plasma-apps-9999 **
-~kde-base/activitymanager-9999 **
 ~kde-base/attica-9999 **
 ~kde-base/drkonqi-9999 **
 ~kde-base/kcmshell-9999 **

diff --git a/Documentation/package.unmask/kde-live b/Documentation/package.unmask/kde-live
index e989d22..dab762a 100644
--- a/Documentation/package.unmask/kde-live
+++ b/Documentation/package.unmask/kde-live
@@ -37,7 +37,6 @@
 ~kde-base/libkonq-9999
 ~kde-base/nsplugins-9999
 ~kde-base/plasma-apps-9999
-~kde-base/activitymanager-9999
 ~kde-base/attica-9999
 ~kde-base/drkonqi-9999
 ~kde-base/kcmshell-9999

diff --git a/app-office/akonadi-server/akonadi-server-1.6.1.ebuild b/app-office/akonadi-server/akonadi-server-1.6.1.ebuild
new file mode 100644
index 0000000..cc43b6f
--- /dev/null
+++ b/app-office/akonadi-server/akonadi-server-1.6.1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit cmake-utils
+
+DESCRIPTION="The server part of Akonadi"
+HOMEPAGE="http://pim.kde.org/akonadi"
+SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+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 )"
+
+S=${WORKDIR}/${P/-server/}
+
+pkg_setup() {
+	# Set default storage backend in order: SQLite, MySQL, PostgreSQL
+	if use sqlite; then
+		DRIVER="QSQLITE3"
+		AVAILABLE+=" ${driver}"
+	elif use mysql; then
+		DRIVER="QMYSQL"
+		AVAILABLE+=" ${driver}"
+	elif use postgres; then
+		DRIVER="QPSQL"
+		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"
+		$(cmake-utils_use test AKONADI_BUILD_TESTS)
+		$(cmake-utils_use sqlite INSTALL_QSQLITE_IN_QT_PREFIX)
+	)
+
+	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/profiles/package.mask b/profiles/package.mask
index bb22764..72dd45f 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,6 +1,9 @@
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # Edit profiles/package.mask.d/ files instead.
 
+# Available on mirrors, but not announced officially
+~app-office/akonadi-server-1.6.1
+
 # Dennis Schridde <devurandom@gmx.net> (06 Feb 2011)
 # Beta versions of the Ayatana ebuilds
 ~dev-libs/libdbusmenu-0.3.94

diff --git a/profiles/package.mask.d/akonadi-server b/profiles/package.mask.d/akonadi-server
new file mode 100644
index 0000000..5980e7b
--- /dev/null
+++ b/profiles/package.mask.d/akonadi-server
@@ -0,0 +1,2 @@
+# Available on mirrors, but not announced officially
+~app-office/akonadi-server-1.6.1