kde-apps/kdebase-meta: RDEPEND on kdecore-meta, drop USE=display-manager

The same use flag is already part of plasma-meta, remove redundancy.

Package-Manager: portage-2.2.26

7 files changed, 36 insertions, 61 deletions

diff --git a/kde-apps/kdebase-meta/kdebase-meta-15.08.3-r1.ebuild b/kde-apps/kdebase-meta/kdebase-meta-15.08.3-r1.ebuild
deleted file mode 100644
index ec21c6c5cf5..00000000000
--- a/kde-apps/kdebase-meta/kdebase-meta-15.08.3-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit kde5-meta-pkg
-
-DESCRIPTION="Transitional package to pull in plasma-meta plus basic applications"
-KEYWORDS=" ~amd64 ~x86"
-IUSE="+display-manager minimal +wallpapers"
-
-RDEPEND="
-	$(add_kdeapps_dep dolphin)
-	$(add_kdeapps_dep konsole)
-	$(add_kdeapps_dep kwrite)
-	$(add_plasma_dep plasma-meta)
-	wallpapers? ( $(add_kdeapps_dep kde-wallpapers) )
-	!minimal? ( $(add_kdeapps_dep kdebase-runtime-meta 'minimal') )
-	!prefix? ( display-manager? ( || ( x11-misc/lightdm x11-misc/sddm ) ) )
-"
diff --git a/kde-apps/kdebase-meta/kdebase-meta-15.08.3-r2.ebuild b/kde-apps/kdebase-meta/kdebase-meta-15.08.3-r2.ebuild
new file mode 100644
index 00000000000..96f2badd120
--- /dev/null
+++ b/kde-apps/kdebase-meta/kdebase-meta-15.08.3-r2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5-meta-pkg
+
+DESCRIPTION="Transitional package to pull in plasma-meta plus basic applications"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_kdeapps_dep kdecore-meta)
+	$(add_plasma_dep plasma-meta)
+"
diff --git a/kde-apps/kdebase-meta/kdebase-meta-15.12.1-r1.ebuild b/kde-apps/kdebase-meta/kdebase-meta-15.12.1-r1.ebuild
deleted file mode 100644
index 841f3dd2cf3..00000000000
--- a/kde-apps/kdebase-meta/kdebase-meta-15.12.1-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit kde5-meta-pkg
-
-DESCRIPTION="Transitional package to pull in plasma-meta plus basic applications"
-KEYWORDS=" ~amd64 ~x86"
-IUSE="+display-manager minimal +wallpapers"
-
-RDEPEND="
-	$(add_kdeapps_dep dolphin)
-	$(add_kdeapps_dep konsole)
-	$(add_kdeapps_dep kwrite)
-	$(add_plasma_dep plasma-meta)
-	wallpapers? ( $(add_kdeapps_dep kde-wallpapers '' 15.08.3) )
-	!minimal? ( $(add_kdeapps_dep kdebase-runtime-meta 'minimal') )
-	!prefix? ( display-manager? ( || ( x11-misc/lightdm x11-misc/sddm ) ) )
-"
diff --git a/kde-apps/kdebase-meta/kdebase-meta-15.12.1-r2.ebuild b/kde-apps/kdebase-meta/kdebase-meta-15.12.1-r2.ebuild
new file mode 100644
index 00000000000..96f2badd120
--- /dev/null
+++ b/kde-apps/kdebase-meta/kdebase-meta-15.12.1-r2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5-meta-pkg
+
+DESCRIPTION="Transitional package to pull in plasma-meta plus basic applications"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_kdeapps_dep kdecore-meta)
+	$(add_plasma_dep plasma-meta)
+"
diff --git a/kde-apps/kdebase-meta/kdebase-meta-15.12.49.9999.ebuild b/kde-apps/kdebase-meta/kdebase-meta-15.12.49.9999.ebuild
index 1d2b3bdbf9b..7b9908075c3 100644
--- a/kde-apps/kdebase-meta/kdebase-meta-15.12.49.9999.ebuild
+++ b/kde-apps/kdebase-meta/kdebase-meta-15.12.49.9999.ebuild
@@ -8,14 +8,9 @@ inherit kde5-meta-pkg
 
 DESCRIPTION="Transitional package to pull in plasma-meta plus basic applications"
 KEYWORDS=""
-IUSE="+display-manager minimal +wallpapers"
+IUSE=""
 
 RDEPEND="
-	$(add_kdeapps_dep dolphin)
-	$(add_kdeapps_dep konsole)
-	$(add_kdeapps_dep kwrite)
+	$(add_kdeapps_dep kdecore-meta)
 	$(add_plasma_dep plasma-meta)
-	wallpapers? ( $(add_kdeapps_dep kde-wallpapers '' 15.08.3) )
-	!minimal? ( $(add_kdeapps_dep kdebase-runtime-meta 'minimal') )
-	!prefix? ( display-manager? ( || ( 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 1d2b3bdbf9b..7b9908075c3 100644
--- a/kde-apps/kdebase-meta/kdebase-meta-9999.ebuild
+++ b/kde-apps/kdebase-meta/kdebase-meta-9999.ebuild
@@ -8,14 +8,9 @@ inherit kde5-meta-pkg
 
 DESCRIPTION="Transitional package to pull in plasma-meta plus basic applications"
 KEYWORDS=""
-IUSE="+display-manager minimal +wallpapers"
+IUSE=""
 
 RDEPEND="
-	$(add_kdeapps_dep dolphin)
-	$(add_kdeapps_dep konsole)
-	$(add_kdeapps_dep kwrite)
+	$(add_kdeapps_dep kdecore-meta)
 	$(add_plasma_dep plasma-meta)
-	wallpapers? ( $(add_kdeapps_dep kde-wallpapers '' 15.08.3) )
-	!minimal? ( $(add_kdeapps_dep kdebase-runtime-meta 'minimal') )
-	!prefix? ( display-manager? ( || ( x11-misc/lightdm x11-misc/sddm ) ) )
 "
diff --git a/kde-apps/kdebase-meta/metadata.xml b/kde-apps/kdebase-meta/metadata.xml
index 0f092fdcc60..a23f444b67d 100644
--- a/kde-apps/kdebase-meta/metadata.xml
+++ b/kde-apps/kdebase-meta/metadata.xml
@@ -2,9 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>kde</herd>
-	<use>
-		<flag name="display-manager">Pull in a graphical display manager</flag>
-		<flag name="minimal">Disable install of various KDE SC 4 based packages</flag>
-		<flag name="wallpapers">Install the KDE wallpapers</flag>
-	</use>
 </pkgmetadata>