kde-plasma: Allow to build with kde-frameworks/{baloo,kfilemetadata}

Package-Manager: portage-2.2.20.1

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 2531fafbf2626edbfba0859a98508d21effc30df..2c522c5766f41a73d0078e9e731580ce536ae022 100644 (file)
--- 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 5d8e33548ab1a18c7ebc66c8c8e96b04eef92e3c..282658af96ce002de1b2b4854b4f09230ad809d5 100644 (file)
--- 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 5a79d6cb306de98ebf90d455b42ec2ed9e4d4355..e099e1050bd0e308e5cc3f454f0ac81b3fa2c586 100644 (file)
--- 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 f3af7ec4acd849039cd88aa9b4ff3c5b64fa9d15..d107c3025440d36f1a9b1c301c8ae5e3e377c550 100644 (file)
--- 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)