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 BD1211387FD for ; Thu, 11 Sep 2014 21:53:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 76700E088D; Thu, 11 Sep 2014 21:53:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 088F5E088D for ; Thu, 11 Sep 2014 21:53:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C2CD033FCB7 for ; Thu, 11 Sep 2014 21:53:00 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7EA8253E4 for ; Thu, 11 Sep 2014 21:52:59 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1410472109.030c9a707d29f8ab381730d914642de664f36914.johu@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: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 030c9a707d29f8ab381730d914642de664f36914 X-VCS-Branch: master Date: Thu, 11 Sep 2014 21:52:59 +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: 0892cf15-0e8d-4f2f-a122-8680f9757b5e X-Archives-Hash: f6d617a83c775a72e4785f9681457d81 commit: 030c9a707d29f8ab381730d914642de664f36914 Author: Johannes Huber gentoo org> AuthorDate: Thu Sep 11 21:48:29 2014 +0000 Commit: Johannes Huber gentoo org> CommitDate: Thu Sep 11 21:48:29 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=030c9a70 [app-office/akonadi-server] Adapt upstream changes Package-Manager: portage-2.2.12 --- .../akonadi-server/akonadi-server-9999.ebuild | 56 +++++++--------------- app-office/akonadi-server/metadata.xml | 3 -- 2 files changed, 18 insertions(+), 41 deletions(-) diff --git a/app-office/akonadi-server/akonadi-server-9999.ebuild b/app-office/akonadi-server/akonadi-server-9999.ebuild index 93bc60a..d5e29ad 100644 --- a/app-office/akonadi-server/akonadi-server-9999.ebuild +++ b/app-office/akonadi-server/akonadi-server-9999.ebuild @@ -5,8 +5,7 @@ EAPI=5 if [[ $PV = *9999* ]]; then - scm_eclass=git-r3 - EGIT_REPO_URI=( "git://anongit.kde.org/akonadi" ) + EGIT_REPONAME="${PN/-server/}" SRC_URI="" KEYWORDS="" else @@ -15,52 +14,40 @@ else S="${WORKDIR}/${P/-server/}" fi -inherit cmake-utils ${scm_eclass} +KDE_TESTS=true +VIRTUALDBUS_TEST=true +inherit kde5 DESCRIPTION="The server part of Akonadi" HOMEPAGE="http://pim.kde.org/akonadi" LICENSE="LGPL-2.1" SLOT="0" -IUSE="+mysql postgres +qt4 qt5 soprano sqlite test" +IUSE="+mysql postgres sqlite test" -REQUIRED_USE="^^ ( qt4 qt5 ) || ( sqlite mysql postgres )" +REQUIRED_USE="|| ( sqlite mysql postgres )" + +# TODO: new optional dep see ENABLE_ASAN CDEPEND=" - dev-libs/boost:= + 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 x11-misc/shared-mime-info - qt4? ( - >=dev-qt/qtcore-4.8.5:4 - >=dev-qt/qtdbus-4.8.5:4 - >=dev-qt/qtgui-4.8.5:4 - >=dev-qt/qtsql-4.8.5:4[mysql?,postgres?] - >=dev-qt/qttest-4.8.5:4 - ) - 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 - soprano? ( dev-libs/soprano[-qt4,qt5] ) - ) - soprano? ( dev-libs/soprano ) sqlite? ( dev-db/sqlite:3 ) " DEPEND="${CDEPEND} dev-libs/libxslt - >=dev-util/automoc-0.9.88 test? ( sys-apps/dbus ) " RDEPEND="${CDEPEND} postgres? ( dev-db/postgresql-server ) " -RESTRICT="test" - pkg_setup() { # Set default storage backend in order: MySQL, SQLite PostgreSQL # reverse driver check to keep the order @@ -94,19 +81,12 @@ pkg_setup() { src_configure() { local mycmakeargs=( + -DKDE_INSTALL_USE_QT_SYS_PATHS=OFF -DINSTALL_QSQLITE_IN_QT_PREFIX=ON - $(cmake-utils_use test AKONADI_BUILD_TESTS) - $(cmake-utils_use_with soprano) $(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE) - $(cmake-utils_use qt5 QT5_BUILD) ) - cmake-utils_src_configure -} - -src_test() { - export $(dbus-launch) - cmake-utils_src_test + kde5_src_configure } src_install() { @@ -118,7 +98,7 @@ EOF insinto /usr/share/config/akonadi doins "${T}"/akonadiserverrc - cmake-utils_src_install + kde5_src_install } pkg_postinst() { diff --git a/app-office/akonadi-server/metadata.xml b/app-office/akonadi-server/metadata.xml index 3142906..a23f444 100644 --- a/app-office/akonadi-server/metadata.xml +++ b/app-office/akonadi-server/metadata.xml @@ -2,7 +2,4 @@ kde - - Enable deprecated dev-libs/soprano, needed for nepomuk search -