summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2015-08-16 13:37:20 +0200
committerJohannes Huber <johu@gentoo.org>2015-08-16 13:37:32 +0200
commit65a4b9698753ca208572bb3de757a02db36f054a (patch)
tree98d67dff8758bc3e3cc56d05d91126bab717cb74 /kde-plasma
parentsci-chemistry/autodock_vina: Require thread support in boost, bug #557822 (diff)
downloadgentoo-65a4b9698753ca208572bb3de757a02db36f054a.tar.gz
gentoo-65a4b9698753ca208572bb3de757a02db36f054a.tar.bz2
gentoo-65a4b9698753ca208572bb3de757a02db36f054a.zip
kde-plasma: Allow to build with kde-frameworks/{baloo,kfilemetadata}
Package-Manager: portage-2.2.20.1
Diffstat (limited to 'kde-plasma')
-rw-r--r--kde-plasma/plasma-desktop/plasma-desktop-5.3.2.ebuild2
-rw-r--r--kde-plasma/plasma-mediacenter/plasma-mediacenter-5.3.2.ebuild4
-rw-r--r--kde-plasma/plasma-meta/plasma-meta-5.3.2.ebuild2
-rw-r--r--kde-plasma/plasma-workspace/plasma-workspace-5.3.2.ebuild2
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 2531fafbf262..2c522c5766f4 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 5d8e33548ab1..282658af96ce 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 5a79d6cb306d..e099e1050bd0 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 f3af7ec4acd8..d107c3025440 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)