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 217151386F3 for ; Wed, 12 Aug 2015 19:04:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B73D7E086F; Wed, 12 Aug 2015 19:04:37 +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 4D3FFE086F for ; Wed, 12 Aug 2015 19:04:37 +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 5E90F3409B9 for ; Wed, 12 Aug 2015 19:04:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1125611B for ; Wed, 12 Aug 2015 19:04:35 +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: <1439406408.ea0edc0e24ddcf5872781b704230fe4e42bb12cf.johu@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/akonadi-server/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild app-office/akonadi-server/akonadi-server-1.13.0.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: ea0edc0e24ddcf5872781b704230fe4e42bb12cf X-VCS-Branch: master Date: Wed, 12 Aug 2015 19:04:35 +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: d01eb009-2ed8-4cf7-858d-7a0e77ecfd5a X-Archives-Hash: 17eeb33d2758b720f7f8672defc31d23 commit: ea0edc0e24ddcf5872781b704230fe4e42bb12cf Author: Johannes Huber gentoo org> AuthorDate: Wed Aug 12 19:06:31 2015 +0000 Commit: Johannes Huber gentoo org> CommitDate: Wed Aug 12 19:06:48 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea0edc0e app-office/akonadi-server: Drop soprano USE flag Part of the Nepomuk removal, was only needed for KDE PIM with Nepomuk support. Package-Manager: portage-2.2.20.1 app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild | 8 +++----- app-office/akonadi-server/akonadi-server-1.13.0.ebuild | 6 ++---- app-office/akonadi-server/metadata.xml | 3 --- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild b/app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild index ee76b60..761effd 100644 --- a/app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild +++ b/app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild @@ -8,7 +8,7 @@ if [[ $PV = *9999* ]]; then scm_eclass=git-r3 EGIT_REPO_URI=( "git://anongit.kde.org/akonadi" ) SRC_URI="" - KEYWORDS="amd64 ppc" + 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" @@ -22,7 +22,7 @@ HOMEPAGE="http://pim.kde.org/akonadi" LICENSE="LGPL-2.1" SLOT="0" -IUSE="+mysql postgres +qt4 qt5 soprano sqlite test" +IUSE="+mysql postgres +qt4 qt5 sqlite test" REQUIRED_USE="^^ ( qt4 qt5 ) || ( sqlite mysql postgres )" @@ -45,9 +45,7 @@ CDEPEND=" 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} @@ -105,8 +103,8 @@ pkg_setup() { src_configure() { local mycmakeargs=( -DINSTALL_QSQLITE_IN_QT_PREFIX=ON + -DWITH_SOPRANO=FALSE $(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) ) diff --git a/app-office/akonadi-server/akonadi-server-1.13.0.ebuild b/app-office/akonadi-server/akonadi-server-1.13.0.ebuild index 235b20b..4d16b22 100644 --- a/app-office/akonadi-server/akonadi-server-1.13.0.ebuild +++ b/app-office/akonadi-server/akonadi-server-1.13.0.ebuild @@ -22,7 +22,7 @@ HOMEPAGE="http://pim.kde.org/akonadi" LICENSE="LGPL-2.1" SLOT="0" -IUSE="+mysql postgres +qt4 qt5 soprano sqlite test" +IUSE="+mysql postgres +qt4 qt5 sqlite test" REQUIRED_USE="^^ ( qt4 qt5 ) || ( sqlite mysql postgres )" @@ -45,9 +45,7 @@ CDEPEND=" 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} @@ -103,8 +101,8 @@ pkg_setup() { src_configure() { local mycmakeargs=( -DINSTALL_QSQLITE_IN_QT_PREFIX=ON + -DWITH_SOPRANO=FALSE $(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) ) 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 -