[gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-mediacenter/, kde-plasma/plasma-desktop/, ...

[gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-mediacenter/, kde-plasma/plasma-desktop/, ...

[Johannes Huber]

commit:     65a4b9698753ca208572bb3de757a02db36f054a
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 16 11:37:20 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> 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)