From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 99D71198005 for ; Mon, 11 Mar 2013 16:21:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 38A62E05F1; Mon, 11 Mar 2013 16:21:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B01ABE05F1 for ; Mon, 11 Mar 2013 16:21:25 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 80A4033D7C7 for ; Mon, 11 Mar 2013 16:21:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id BAF96E4079 for ; Mon, 11 Mar 2013 16:21:21 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1363018828.35e8e60c7e469359540fb3c4a209844b66fd5d81.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/ X-VCS-Repository: proj/kde X-VCS-Files: app-office/akonadi-server/akonadi-server-9999.ebuild app-office/akonadi-server/metadata.xml X-VCS-Directories: app-office/akonadi-server/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 35e8e60c7e469359540fb3c4a209844b66fd5d81 X-VCS-Branch: master Date: Mon, 11 Mar 2013 16:21:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ae9ba831-3e55-4038-9553-2764d6e6cd6d X-Archives-Hash: 1b22bf56176d44afcb5d9709ac2e04b2 commit: 35e8e60c7e469359540fb3c4a209844b66fd5d81 Author: Michael Palimaka gentoo org> AuthorDate: Mon Mar 11 16:20:28 2013 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Mon Mar 11 16:20:28 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=35e8e60c [app-office/akonadi-server] Add framework for Qt5 support. Note that this depends on soprano[qt5] which is still a work-in-progress upstream. Package-Manager: portage-2.1.11.55 --- .../akonadi-server/akonadi-server-9999.ebuild | 34 ++++++++++++++----- app-office/akonadi-server/metadata.xml | 5 ++- 2 files changed, 29 insertions(+), 10 deletions(-) diff --git a/app-office/akonadi-server/akonadi-server-9999.ebuild b/app-office/akonadi-server/akonadi-server-9999.ebuild index 1ad2369..311aba1 100644 --- a/app-office/akonadi-server/akonadi-server-9999.ebuild +++ b/app-office/akonadi-server/akonadi-server-9999.ebuild @@ -22,15 +22,33 @@ HOMEPAGE="http://pim.kde.org/akonadi" LICENSE="LGPL-2.1" SLOT="0" -IUSE="+mysql postgres sqlite test" +IUSE="+mysql postgres +qt4 qt5 sqlite test" + +REQUIRED_USE="^^ ( qt4 qt5 ) || ( sqlite mysql postgres )" 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 + 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 @@ -40,9 +58,7 @@ RDEPEND="${CDEPEND} postgres? ( dev-db/postgresql-server ) " -REQUIRED_USE="|| ( sqlite mysql postgres )" - -RESTRICT=test +RESTRICT="test" pkg_setup() { # Set default storage backend in order: MySQL, SQLite PostgreSQL @@ -69,7 +85,7 @@ pkg_setup() { ewarn "Please edit your ~/.config/akonadi/akonadiserverrc." fi - # Notify about MySQL not being default anymore + # Notify about SQLite 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." @@ -85,6 +101,7 @@ src_configure() { -DAKONADI_USE_STRIGI_SEARCH=OFF $(cmake-utils_use test AKONADI_BUILD_TESTS) $(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE) + $(cmake-utils_use_find_package qt5 Qt5Core) ) cmake-utils_src_configure @@ -103,7 +120,6 @@ EOF } 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/metadata.xml b/app-office/akonadi-server/metadata.xml index 8d1e86a..f5a3d63 100644 --- a/app-office/akonadi-server/metadata.xml +++ b/app-office/akonadi-server/metadata.xml @@ -1,5 +1,8 @@ -kde + kde + + Adds support for the Qt GUI/Application Toolkit version 5.x +