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 3CAF11385B0 for ; Sun, 16 Aug 2015 11:35:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B836214088; Sun, 16 Aug 2015 11:35:13 +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 49AD214088 for ; Sun, 16 Aug 2015 11:35:13 +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 1F256340961 for ; Sun, 16 Aug 2015 11:35:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DD7B9116 for ; Sun, 16 Aug 2015 11:35:08 +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: <1439725052.65a4b9698753ca208572bb3de757a02db36f054a.johu@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-mediacenter/, kde-plasma/plasma-desktop/, ... X-VCS-Repository: repo/gentoo X-VCS-Files: kde-plasma/plasma-desktop/plasma-desktop-5.3.2.ebuild kde-plasma/plasma-mediacenter/plasma-mediacenter-5.3.2.ebuild kde-plasma/plasma-meta/plasma-meta-5.3.2.ebuild kde-plasma/plasma-workspace/plasma-workspace-5.3.2.ebuild X-VCS-Directories: kde-plasma/plasma-meta/ kde-plasma/plasma-desktop/ kde-plasma/plasma-mediacenter/ kde-plasma/plasma-workspace/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 65a4b9698753ca208572bb3de757a02db36f054a X-VCS-Branch: master Date: Sun, 16 Aug 2015 11:35:08 +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: 47e58d0e-393e-4cce-96de-87b0392e9502 X-Archives-Hash: 30dfb135b34289106d0d309b9a1d0d09 commit: 65a4b9698753ca208572bb3de757a02db36f054a Author: Johannes Huber gentoo org> AuthorDate: Sun Aug 16 11:37:20 2015 +0000 Commit: Johannes Huber gentoo org> CommitDate: Sun Aug 16 11:37:32 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65a4b969 kde-plasma: Allow to build with kde-frameworks/{baloo,kfilemetadata} Package-Manager: portage-2.2.20.1 kde-plasma/plasma-desktop/plasma-desktop-5.3.2.ebuild | 2 +- kde-plasma/plasma-mediacenter/plasma-mediacenter-5.3.2.ebuild | 4 ++-- kde-plasma/plasma-meta/plasma-meta-5.3.2.ebuild | 2 -- kde-plasma/plasma-workspace/plasma-workspace-5.3.2.ebuild | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.3.2.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.3.2.ebuild index 2531faf..2c522c5 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-5.3.2.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-5.3.2.ebuild @@ -13,7 +13,7 @@ KEYWORDS="~amd64" IUSE="+fontconfig gtk2 gtk3 legacy-systray pulseaudio +qt4 touchpad usb" COMMON_DEPEND=" - $(add_plasma_dep baloo) + || ( $(add_plasma_dep baloo) $(add_frameworks_dep baloo) ) $(add_plasma_dep kwin) $(add_plasma_dep plasma-workspace) $(add_frameworks_dep attica) diff --git a/kde-plasma/plasma-mediacenter/plasma-mediacenter-5.3.2.ebuild b/kde-plasma/plasma-mediacenter/plasma-mediacenter-5.3.2.ebuild index 5d8e335..282658a 100644 --- a/kde-plasma/plasma-mediacenter/plasma-mediacenter-5.3.2.ebuild +++ b/kde-plasma/plasma-mediacenter/plasma-mediacenter-5.3.2.ebuild @@ -25,8 +25,8 @@ DEPEND=" dev-qt/qtxml:5 media-libs/taglib semantic-desktop? ( - $(add_plasma_dep baloo) - $(add_plasma_dep kfilemetadata) + || ( $(add_plasma_dep baloo) $(add_frameworks_dep baloo) ) + || ( $(add_plasma_dep kfilemetadata) $(add_frameworks_dep kfilemetadata) ) ) " RDEPEND="${DEPEND} diff --git a/kde-plasma/plasma-meta/plasma-meta-5.3.2.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.3.2.ebuild index 5a79d6c..e099e10 100644 --- a/kde-plasma/plasma-meta/plasma-meta-5.3.2.ebuild +++ b/kde-plasma/plasma-meta/plasma-meta-5.3.2.ebuild @@ -15,12 +15,10 @@ KEYWORDS="~amd64" IUSE="bluetooth +display-manager gtk +sddm networkmanager +wallpapers" RDEPEND=" - $(add_plasma_dep baloo) $(add_plasma_dep breeze) $(add_plasma_dep kde-cli-tools) $(add_plasma_dep kdecoration) $(add_plasma_dep kdeplasma-addons) - $(add_plasma_dep kfilemetadata) $(add_plasma_dep khelpcenter) $(add_plasma_dep khotkeys) $(add_plasma_dep kinfocenter) diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.3.2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.3.2.ebuild index f3af7ec..d107c30 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.3.2.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.3.2.ebuild @@ -15,7 +15,7 @@ KEYWORDS="~amd64" IUSE="dbus +drkonqi gps prison qalculate +systemmonitor" COMMON_DEPEND=" - $(add_plasma_dep baloo) + || ( $(add_plasma_dep baloo) $(add_frameworks_dep baloo) ) $(add_plasma_dep kwayland) $(add_plasma_dep kwin) $(add_plasma_dep libkscreen)