kde-apps/kdebase-meta: port to kde5-meta-pkg.

This drops kde-workspace:4 dependencies in favour of plasma-meta:5 in an
attempt to provide an upgrade path.

Gentoo-bug: 561116

Package-Manager: portage-2.2.20.1

4 files changed, 15 insertions, 122 deletions

diff --git a/kde-apps/kdebase-meta/kdebase-meta-15.08.1.ebuild b/kde-apps/kdebase-meta/kdebase-meta-15.08.1.ebuild
index db4904bde1..af5f30dab1 100644
--- a/kde-apps/kdebase-meta/kdebase-meta-15.08.1.ebuild
+++ b/kde-apps/kdebase-meta/kdebase-meta-15.08.1.ebuild
@@ -3,61 +3,26 @@
 # $Id$
 
 EAPI=5
-inherit kde4-meta-pkg
+
+inherit kde5-meta-pkg
 
 DESCRIPTION="Merge this to pull in all kdebase-derived packages"
 KEYWORDS="~amd64 ~x86"
-IUSE="+display-manager minimal +wallpapers"
+IUSE="+wallpapers"
 
 RDEPEND="
 	$(add_kdeapps_dep dolphin)
-	$(add_kdebase_dep kcheckpass '' 4.11)
-	wallpapers? ( >=kde-apps/kde-wallpapers-15.08.0 )
-	$(add_kdeapps_dep kde-base-artwork)
 	$(add_kdeapps_dep kdebase-runtime-meta)
 	$(add_kdeapps_dep kdialog)
 	$(add_kdeapps_dep keditbookmarks)
-	$(add_kdebase_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_kdebase_dep kscreensaver '' 4.11)
-	$(add_kdebase_dep kstartupconfig '' 4.11)
-	$(add_kdebase_dep kstyles '' 4.11)
-	$(add_kdebase_dep ksystraycmd '' 4.11)
 	$(add_kdeapps_dep kwrite)
 	$(add_kdeapps_dep libkonq)
-	$(add_kdebase_dep liboxygenstyle '' 4.11)
-	$(add_kdebase_dep libplasmaclock '' 4.11)
 	$(add_kdeapps_dep nsplugins)
-	$(add_kdeapps_dep phonon-kde)
-	$(add_kdebase_dep qguiplatformplugin_kde '' 4.11)
-	!minimal? (
-		$(add_kdebase_dep freespacenotifier '' 4.11)
-		$(add_kdebase_dep kcminit '' 4.11)
-		$(add_kdebase_dep kdebase-cursors '' 4.11)
-		$(add_kdebase_dep kdebase-startkde '' 4.11)
-		$(add_kdeapps_dep kdepasswd)
-		$(add_kdebase_dep khotkeys '' 4.11)
-		$(add_kdebase_dep kinfocenter '' 4.11)
-		$(add_kdebase_dep klipper '' 4.11)
-		$(add_kdebase_dep kmenuedit '' 4.11)
-		$(add_kdebase_dep krunner '' 4.11)
-		$(add_kdebase_dep ksmserver '' 4.11)
-		$(add_kdebase_dep ksplash '' 4.11)
-		$(add_kdebase_dep ksysguard '' 4.11)
-		$(add_kdebase_dep kwin '' 4.11)
-		$(add_kdebase_dep kwrited '' 4.11)
-		$(add_kdebase_dep libkworkspace '' 4.11)
-		$(add_kdebase_dep libplasmagenericshell '' 4.11)
-		$(add_kdebase_dep libtaskmanager '' 4.11)
-		$(add_kdeapps_dep plasma-apps)
-		$(add_kdebase_dep plasma-workspace '' 4.11)
-		$(add_kdebase_dep powerdevil '' 4.11)
-		$(add_kdebase_dep solid-actions-kcm '' 4.11)
-		$(add_kdebase_dep systemsettings '' 4.11)
-		!prefix? ( display-manager? ( || ( $(add_kdebase_dep kdm '' 4.11) x11-misc/lightdm x11-misc/sddm ) ) )
-	)
+	$(add_plasma_dep plasma-meta)
+	wallpapers? ( $(add_kdeapps_dep kde-wallpapers '' 15.08.0) )
 "
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 6e6b870830..efd19be730 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,61 +3,26 @@
 # $Id$
 
 EAPI=5
-inherit kde4-meta-pkg
+
+inherit kde5-meta-pkg
 
 DESCRIPTION="Merge this to pull in all kdebase-derived packages"
 KEYWORDS=""
-IUSE="+display-manager minimal +wallpapers"
+IUSE="+wallpapers"
 
 RDEPEND="
 	$(add_kdeapps_dep dolphin)
-	$(add_kdebase_dep kcheckpass '' 4.11)
-	wallpapers? ( >=kde-apps/kde-wallpapers-15.08.0 )
-	$(add_kdeapps_dep kde-base-artwork)
 	$(add_kdeapps_dep kdebase-runtime-meta)
 	$(add_kdeapps_dep kdialog)
 	$(add_kdeapps_dep keditbookmarks)
-	$(add_kdebase_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_kdebase_dep kscreensaver '' 4.11)
-	$(add_kdebase_dep kstartupconfig '' 4.11)
-	$(add_kdebase_dep kstyles '' 4.11)
-	$(add_kdebase_dep ksystraycmd '' 4.11)
 	$(add_kdeapps_dep kwrite)
 	$(add_kdeapps_dep libkonq)
-	$(add_kdebase_dep liboxygenstyle '' 4.11)
-	$(add_kdebase_dep libplasmaclock '' 4.11)
 	$(add_kdeapps_dep nsplugins)
-	$(add_kdeapps_dep phonon-kde)
-	$(add_kdebase_dep qguiplatformplugin_kde '' 4.11)
-	!minimal? (
-		$(add_kdebase_dep freespacenotifier '' 4.11)
-		$(add_kdebase_dep kcminit '' 4.11)
-		$(add_kdebase_dep kdebase-cursors '' 4.11)
-		$(add_kdebase_dep kdebase-startkde '' 4.11)
-		$(add_kdeapps_dep kdepasswd)
-		$(add_kdebase_dep khotkeys '' 4.11)
-		$(add_kdebase_dep kinfocenter '' 4.11)
-		$(add_kdebase_dep klipper '' 4.11)
-		$(add_kdebase_dep kmenuedit '' 4.11)
-		$(add_kdebase_dep krunner '' 4.11)
-		$(add_kdebase_dep ksmserver '' 4.11)
-		$(add_kdebase_dep ksplash '' 4.11)
-		$(add_kdebase_dep ksysguard '' 4.11)
-		$(add_kdebase_dep kwin '' 4.11)
-		$(add_kdebase_dep kwrited '' 4.11)
-		$(add_kdebase_dep libkworkspace '' 4.11)
-		$(add_kdebase_dep libplasmagenericshell '' 4.11)
-		$(add_kdebase_dep libtaskmanager '' 4.11)
-		$(add_kdeapps_dep plasma-apps)
-		$(add_kdebase_dep plasma-workspace '' 4.11)
-		$(add_kdebase_dep powerdevil '' 4.11)
-		$(add_kdebase_dep solid-actions-kcm '' 4.11)
-		$(add_kdebase_dep systemsettings '' 4.11)
-		!prefix? ( display-manager? ( || ( $(add_kdebase_dep kdm '' 4.11) x11-misc/lightdm x11-misc/sddm ) ) )
-	)
+	$(add_plasma_dep plasma-meta)
+	wallpapers? ( $(add_kdeapps_dep kde-wallpapers '' 15.08.0) )
 "
diff --git a/kde-apps/kdebase-meta/kdebase-meta-9999.ebuild b/kde-apps/kdebase-meta/kdebase-meta-9999.ebuild
index 6e6b870830..efd19be730 100644
--- a/kde-apps/kdebase-meta/kdebase-meta-9999.ebuild
+++ b/kde-apps/kdebase-meta/kdebase-meta-9999.ebuild
@@ -3,61 +3,26 @@
 # $Id$
 
 EAPI=5
-inherit kde4-meta-pkg
+
+inherit kde5-meta-pkg
 
 DESCRIPTION="Merge this to pull in all kdebase-derived packages"
 KEYWORDS=""
-IUSE="+display-manager minimal +wallpapers"
+IUSE="+wallpapers"
 
 RDEPEND="
 	$(add_kdeapps_dep dolphin)
-	$(add_kdebase_dep kcheckpass '' 4.11)
-	wallpapers? ( >=kde-apps/kde-wallpapers-15.08.0 )
-	$(add_kdeapps_dep kde-base-artwork)
 	$(add_kdeapps_dep kdebase-runtime-meta)
 	$(add_kdeapps_dep kdialog)
 	$(add_kdeapps_dep keditbookmarks)
-	$(add_kdebase_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_kdebase_dep kscreensaver '' 4.11)
-	$(add_kdebase_dep kstartupconfig '' 4.11)
-	$(add_kdebase_dep kstyles '' 4.11)
-	$(add_kdebase_dep ksystraycmd '' 4.11)
 	$(add_kdeapps_dep kwrite)
 	$(add_kdeapps_dep libkonq)
-	$(add_kdebase_dep liboxygenstyle '' 4.11)
-	$(add_kdebase_dep libplasmaclock '' 4.11)
 	$(add_kdeapps_dep nsplugins)
-	$(add_kdeapps_dep phonon-kde)
-	$(add_kdebase_dep qguiplatformplugin_kde '' 4.11)
-	!minimal? (
-		$(add_kdebase_dep freespacenotifier '' 4.11)
-		$(add_kdebase_dep kcminit '' 4.11)
-		$(add_kdebase_dep kdebase-cursors '' 4.11)
-		$(add_kdebase_dep kdebase-startkde '' 4.11)
-		$(add_kdeapps_dep kdepasswd)
-		$(add_kdebase_dep khotkeys '' 4.11)
-		$(add_kdebase_dep kinfocenter '' 4.11)
-		$(add_kdebase_dep klipper '' 4.11)
-		$(add_kdebase_dep kmenuedit '' 4.11)
-		$(add_kdebase_dep krunner '' 4.11)
-		$(add_kdebase_dep ksmserver '' 4.11)
-		$(add_kdebase_dep ksplash '' 4.11)
-		$(add_kdebase_dep ksysguard '' 4.11)
-		$(add_kdebase_dep kwin '' 4.11)
-		$(add_kdebase_dep kwrited '' 4.11)
-		$(add_kdebase_dep libkworkspace '' 4.11)
-		$(add_kdebase_dep libplasmagenericshell '' 4.11)
-		$(add_kdebase_dep libtaskmanager '' 4.11)
-		$(add_kdeapps_dep plasma-apps)
-		$(add_kdebase_dep plasma-workspace '' 4.11)
-		$(add_kdebase_dep powerdevil '' 4.11)
-		$(add_kdebase_dep solid-actions-kcm '' 4.11)
-		$(add_kdebase_dep systemsettings '' 4.11)
-		!prefix? ( display-manager? ( || ( $(add_kdebase_dep kdm '' 4.11) x11-misc/lightdm x11-misc/sddm ) ) )
-	)
+	$(add_plasma_dep plasma-meta)
+	wallpapers? ( $(add_kdeapps_dep kde-wallpapers '' 15.08.0) )
 "
diff --git a/kde-apps/kdebase-meta/metadata.xml b/kde-apps/kdebase-meta/metadata.xml
index a88b9cba99..783e379c92 100644
--- a/kde-apps/kdebase-meta/metadata.xml
+++ b/kde-apps/kdebase-meta/metadata.xml
@@ -3,8 +3,6 @@
 <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>