From 35ededeb2d9617fd3ff5f1f3b8aec7987979c48f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Wed, 11 Feb 2015 17:50:23 +0100
Subject: [PATCH] split up kde-world to kf5-world and plasma-world
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 recipes-kde/packagegroups/kde-world.bb    | 96 ++---------------------
 recipes-kde/packagegroups/kf5-world.bb    | 90 +++++++++++++++++++++
 recipes-kde/packagegroups/plasma-world.bb | 57 ++++++++++++++
 3 files changed, 152 insertions(+), 91 deletions(-)
 create mode 100644 recipes-kde/packagegroups/kf5-world.bb
 create mode 100644 recipes-kde/packagegroups/plasma-world.bb

diff --git a/recipes-kde/packagegroups/kde-world.bb b/recipes-kde/packagegroups/kde-world.bb
index fe4c9fbf..a9434157 100644
--- a/recipes-kde/packagegroups/kde-world.bb
+++ b/recipes-kde/packagegroups/kde-world.bb
@@ -4,102 +4,16 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d
 
 inherit packagegroup distro_features_check
 
-RDEPENDS_${PN} = "         \
-    kjs \
-    kunitconversion \
-    kjobwidgets \
-    kpackage \
-    kcompletion \
-    kauth \
-    kpty \
-    kcrash \
-    kdoctools \
-    ktextwidgets \
-    kiconthemes \
-    kemoticons \
-    kio \
-    knotifyconfig \
-    kdewebkit \
-    kcmutils \
-    kwallet \
-    kdesignerplugin \
-    knotifications \
-    kinit \
-    kded \
-    knewstuff \
-    kactivities \
-    kdesu \
-    kdeclarative \
-    ktexteditor \
-    kglobalaccel \
-    plasma-framework \
-    kservice \
-    kconfigwidgets \
-    kbookmarks \
-    kparts \
-    kxmlgui \
-    kfilemetadata \
-    krunner \
-    kdelibs4support \
-    kjsembed \
-    kitemmodels \
-    kconfig \
-    networkmanager-qt \
-    kdbusaddons \
-    kdnssd \
-    attica \
-    kimageformats \
-    kidletime \
-    kwindowsystem \
-    sonnet \
-    kplotting \
-    kcoreaddons \
-    kcodecs \
-    threadweaver \
-    kitemviews \
-    ki18n \
-    kguiaddons \
-    solid \
-    karchive \
-    kwidgetsaddons \
-    libksysguard \
-    polkit-qt-1 \
+RDEPENDS_${PN} = " \
+    kf5-world \
+    plasma-world \
+    \
     extra-cmake-modules \ 
-    libkscreen \
     phonon \
-    baloo \
-    plasma-workspace \
-    kdecoration \
-    plasma-nm \
-    breeze \
-    kde-cli-tools \
-    kdeplasma-addons \
-    khtml \
-    khelpcenter \
-    kinfocenter \
-    kio-extras \
-    kmenuedit \
-    kscreen \
-    ksshaskpass \
-    ksysguard \
-    kwrited \
-    libmm-qt \
-    milou \
-    muon \
-    oxygen-fonts \
-    oxygen \
-    frameworkintegration \
-    plasma-desktop \
-    plasma-workspace-wallpapers \
-    polkit-kde-agent-1 \
-    powerdevil \
-    systemsettings \
-    kwayland \
+    polkit-qt-1 \
     \
     kate \
     oxygen-icons \
-    \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "kwin khotkeys kde-gtk-config sddm-kcm", "",d)} \
 "
 
 
diff --git a/recipes-kde/packagegroups/kf5-world.bb b/recipes-kde/packagegroups/kf5-world.bb
new file mode 100644
index 00000000..e13b8e95
--- /dev/null
+++ b/recipes-kde/packagegroups/kf5-world.bb
@@ -0,0 +1,90 @@
+SUMMARY = "All KF5 packages - just for build test"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690"
+
+inherit packagegroup distro_features_check
+
+TIER_1 = " \
+    attica \
+    karchive \
+    kcodecs \
+    kconfig \
+    kcoreaddons \
+    kdbusaddons \
+    kdnssd \
+    kguiaddons \
+    ki18n \
+    kidletime \
+    kimageformats \
+    kitemmodels \
+    kitemviews \
+    kplotting \
+    kwidgetsaddons \
+    kwindowsystem \
+    networkmanager-qt \
+    solid \
+    sonnet \
+    threadweaver \
+"
+
+TIER_2 = " \
+    kauth \
+    kcompletion \
+    kcrash \
+    kdoctools \
+    kjobwidgets \
+    kpackage \
+    kpty \
+    kunitconversion \
+"
+
+TIER_3 = " \
+    kactivities \
+    kbookmarks \
+    kcmutils \
+    kconfigwidgets \
+    kdeclarative \
+    kded \
+    kdesignerplugin \
+    kdesu \
+    kdewebkit \
+    kemoticons \
+    kglobalaccel \
+    kiconthemes \
+    kinit \
+    kio \
+    knewstuff \
+    knotifications \
+    knotifyconfig \
+    kparts \
+    kservice \
+    ktexteditor \
+    ktextwidgets \
+    kwallet \
+    kxmlgui \
+    plasma-framework \
+"
+
+TIER_4 = " \
+    frameworkintegration \
+"
+
+PORTING_AIDS_TIER_1 = " \
+    kjs \
+"
+
+PORTING_AIDS_TIER_3 = " \
+    kdelibs4support \
+    khtml \
+    kjsembed \
+    krunner \
+"
+
+RDEPENDS_${PN} = " \
+    ${TIER_1} \
+    ${TIER_2} \
+    ${TIER_3} \
+    ${TIER_4} \
+    ${PORTING_AIDS_TIER_1} \
+    ${PORTING_AIDS_TIER_3} \
+"
diff --git a/recipes-kde/packagegroups/plasma-world.bb b/recipes-kde/packagegroups/plasma-world.bb
new file mode 100644
index 00000000..fed0f12a
--- /dev/null
+++ b/recipes-kde/packagegroups/plasma-world.bb
@@ -0,0 +1,57 @@
+SUMMARY = "All KF5 packages - just for build test"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690"
+
+inherit packagegroup distro_features_check
+
+TIER_1 = " \
+    kdecoration \
+"
+
+TIER_2 = " \
+    kfilemetadata \
+"
+
+TIER_3 = " \
+    baloo \
+    plasma-workspace \
+"
+
+UNTIER = " \
+    breeze \
+    kde-cli-tools \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "kde-gtk-config", "",d)} \
+    kdeplasma-addons \
+    khelpcenter \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "khotkeys", "",d)} \
+    kinfocenter \
+    kio-extras \
+    kmenuedit \
+    kscreen \
+    ksshaskpass \
+    ksysguard \
+    kwayland \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "kwin", "",d)} \
+    kwrited \
+    libkscreen \
+    libksysguard \
+    libmm-qt \
+    milou \
+    muon \
+    oxygen \
+    oxygen-fonts \
+    plasma-desktop \
+    plasma-nm \
+    plasma-workspace-wallpapers \
+    polkit-kde-agent-1 \
+    powerdevil \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "sddm-kcm", "",d)} \
+    systemsettings \
+"
+
+RDEPENDS_${PN} = " \
+    ${TIER_1} \
+    ${TIER_2} \
+    ${TIER_3} \
+    ${UNTIER} \
+"