Revert "[kde-apps/kdebase-meta] Update for KDE Applications."

This reverts commit 25da2233af7acd6e2a743d4d04dd0acbcec88413.

3 files changed, 80 insertions, 8 deletions

diff --git a/kde-apps/kdebase-meta/kdebase-meta-15.08.49.9999.ebuild b/kde-apps/kdebase-meta/kdebase-meta-15.08.49.9999.ebuild
index 2f71bd1e0f..3dcd10a172 100644
--- a/kde-apps/kdebase-meta/kdebase-meta-15.08.49.9999.ebuild
+++ b/kde-apps/kdebase-meta/kdebase-meta-15.08.49.9999.ebuild
@@ -3,26 +3,61 @@
 # $Id$
 
 EAPI=5
-
-inherit kde5-meta-pkg
+inherit kde4-meta-pkg
 
 DESCRIPTION="Merge this to pull in all kdebase-derived packages"
 KEYWORDS=""
-IUSE="+wallpapers"
+IUSE="+display-manager minimal +wallpapers"
 
 RDEPEND="
 	$(add_kdeapps_dep dolphin)
+	$(add_kdeapps_dep kcheckpass '' 4.11)
+	wallpapers? ( $(add_kdeapps_dep kde-wallpapers '' 4.11) )
+	$(add_kdeapps_dep kde-base-artwork)
 	$(add_kdeapps_dep kdebase-runtime-meta)
 	$(add_kdeapps_dep kdialog)
 	$(add_kdeapps_dep keditbookmarks)
+	$(add_kdeapps_dep kephal '' 4.11)
 	$(add_kdeapps_dep kfind)
 	$(add_kdeapps_dep kfmclient)
 	$(add_kdeapps_dep konq-plugins)
 	$(add_kdeapps_dep konqueror)
 	$(add_kdeapps_dep konsole)
+	$(add_kdeapps_dep kscreensaver '' 4.11)
+	$(add_kdeapps_dep kstartupconfig '' 4.11)
+	$(add_kdeapps_dep kstyles '' 4.11)
+	$(add_kdeapps_dep ksystraycmd '' 4.11)
 	$(add_kdeapps_dep kwrite)
 	$(add_kdeapps_dep libkonq)
+	$(add_kdeapps_dep liboxygenstyle '' 4.11)
+	$(add_kdeapps_dep libplasmaclock '' 4.11)
 	$(add_kdeapps_dep nsplugins)
+	$(add_kdeapps_dep phonon-kde)
 	$(add_kdeapps_dep plasma-apps)
-	wallpapers? ( $(add_kdeapps_dep kde-wallpapers) )
+	$(add_kdeapps_dep qguiplatformplugin_kde '' 4.11)
+	!minimal? (
+		$(add_kdeapps_dep freespacenotifier '' 4.11)
+		$(add_kdeapps_dep kcminit '' 4.11)
+		$(add_kdeapps_dep kdebase-cursors '' 4.11)
+		$(add_kdeapps_dep kdebase-startkde '' 4.11)
+		$(add_kdeapps_dep kdepasswd)
+		$(add_kdeapps_dep khotkeys '' 4.11)
+		$(add_kdeapps_dep kinfocenter '' 4.11)
+		$(add_kdeapps_dep klipper '' 4.11)
+		$(add_kdeapps_dep kmenuedit '' 4.11)
+		$(add_kdeapps_dep krunner '' 4.11)
+		$(add_kdeapps_dep ksmserver '' 4.11)
+		$(add_kdeapps_dep ksplash '' 4.11)
+		$(add_kdeapps_dep ksysguard '' 4.11)
+		$(add_kdeapps_dep kwin '' 4.11)
+		$(add_kdeapps_dep kwrited '' 4.11)
+		$(add_kdebase_dep libkworkspace '' 4.11)
+		$(add_kdeapps_dep libplasmagenericshell '' 4.11)
+		$(add_kdeapps_dep libtaskmanager '' 4.11)
+		$(add_kdeapps_dep plasma-workspace '' 4.11)
+		$(add_kdeapps_dep powerdevil '' 4.11)
+		$(add_kdeapps_dep solid-actions-kcm '' 4.11)
+		$(add_kdeapps_dep systemsettings '' 4.11)
+		!prefix? ( display-manager? ( || ( $(add_kdeapps_dep kdm '' 4.11) x11-misc/lightdm x11-misc/sddm ) ) )
+	)
 "
diff --git a/kde-apps/kdebase-meta/kdebase-meta-9999.ebuild b/kde-apps/kdebase-meta/kdebase-meta-9999.ebuild
index 2f71bd1e0f..3dcd10a172 100644
--- a/kde-apps/kdebase-meta/kdebase-meta-9999.ebuild
+++ b/kde-apps/kdebase-meta/kdebase-meta-9999.ebuild
@@ -3,26 +3,61 @@
 # $Id$
 
 EAPI=5
-
-inherit kde5-meta-pkg
+inherit kde4-meta-pkg
 
 DESCRIPTION="Merge this to pull in all kdebase-derived packages"
 KEYWORDS=""
-IUSE="+wallpapers"
+IUSE="+display-manager minimal +wallpapers"
 
 RDEPEND="
 	$(add_kdeapps_dep dolphin)
+	$(add_kdeapps_dep kcheckpass '' 4.11)
+	wallpapers? ( $(add_kdeapps_dep kde-wallpapers '' 4.11) )
+	$(add_kdeapps_dep kde-base-artwork)
 	$(add_kdeapps_dep kdebase-runtime-meta)
 	$(add_kdeapps_dep kdialog)
 	$(add_kdeapps_dep keditbookmarks)
+	$(add_kdeapps_dep kephal '' 4.11)
 	$(add_kdeapps_dep kfind)
 	$(add_kdeapps_dep kfmclient)
 	$(add_kdeapps_dep konq-plugins)
 	$(add_kdeapps_dep konqueror)
 	$(add_kdeapps_dep konsole)
+	$(add_kdeapps_dep kscreensaver '' 4.11)
+	$(add_kdeapps_dep kstartupconfig '' 4.11)
+	$(add_kdeapps_dep kstyles '' 4.11)
+	$(add_kdeapps_dep ksystraycmd '' 4.11)
 	$(add_kdeapps_dep kwrite)
 	$(add_kdeapps_dep libkonq)
+	$(add_kdeapps_dep liboxygenstyle '' 4.11)
+	$(add_kdeapps_dep libplasmaclock '' 4.11)
 	$(add_kdeapps_dep nsplugins)
+	$(add_kdeapps_dep phonon-kde)
 	$(add_kdeapps_dep plasma-apps)
-	wallpapers? ( $(add_kdeapps_dep kde-wallpapers) )
+	$(add_kdeapps_dep qguiplatformplugin_kde '' 4.11)
+	!minimal? (
+		$(add_kdeapps_dep freespacenotifier '' 4.11)
+		$(add_kdeapps_dep kcminit '' 4.11)
+		$(add_kdeapps_dep kdebase-cursors '' 4.11)
+		$(add_kdeapps_dep kdebase-startkde '' 4.11)
+		$(add_kdeapps_dep kdepasswd)
+		$(add_kdeapps_dep khotkeys '' 4.11)
+		$(add_kdeapps_dep kinfocenter '' 4.11)
+		$(add_kdeapps_dep klipper '' 4.11)
+		$(add_kdeapps_dep kmenuedit '' 4.11)
+		$(add_kdeapps_dep krunner '' 4.11)
+		$(add_kdeapps_dep ksmserver '' 4.11)
+		$(add_kdeapps_dep ksplash '' 4.11)
+		$(add_kdeapps_dep ksysguard '' 4.11)
+		$(add_kdeapps_dep kwin '' 4.11)
+		$(add_kdeapps_dep kwrited '' 4.11)
+		$(add_kdebase_dep libkworkspace '' 4.11)
+		$(add_kdeapps_dep libplasmagenericshell '' 4.11)
+		$(add_kdeapps_dep libtaskmanager '' 4.11)
+		$(add_kdeapps_dep plasma-workspace '' 4.11)
+		$(add_kdeapps_dep powerdevil '' 4.11)
+		$(add_kdeapps_dep solid-actions-kcm '' 4.11)
+		$(add_kdeapps_dep systemsettings '' 4.11)
+		!prefix? ( display-manager? ( || ( $(add_kdeapps_dep kdm '' 4.11) x11-misc/lightdm x11-misc/sddm ) ) )
+	)
 "
diff --git a/kde-apps/kdebase-meta/metadata.xml b/kde-apps/kdebase-meta/metadata.xml
index 783e379c92..a88b9cba99 100644
--- a/kde-apps/kdebase-meta/metadata.xml
+++ b/kde-apps/kdebase-meta/metadata.xml
@@ -3,6 +3,8 @@
 <pkgmetadata>
 	<herd>kde</herd>
 	<use>
+		<flag name="display-manager">Pull in a graphical display manager</flag>
+		<flag name="minimal">Install a Plasma 5 compatible subset of the package</flag>
 		<flag name="wallpapers">Install the KDE wallpapers</flag>
 	</use>
 </pkgmetadata>