[patch] Make the meta packages compatibile with Plasma 5

0004-Adjust-meta-packages-to-allow-co-existance-with-Plas.patch (text/plain), 30.30 KB, created by Matthew Dawson on 2014-08-04 21:11:26 UTC

From c74afe72e99bda8845481600909dc6c005afc0a7 Mon Sep 17 00:00:00 2001
From: Matthew Dawson <[e-mail]>
Date: Mon, 4 Aug 2014 01:14:16 -0400
Subject: [PATCH 4/6] Adjust meta packages to allow co-existance with Plasma 5.

Have meta packages not install extra packages that come from Plasma 5,
avoiding conflicts.
---
 kde-base/kde-meta/kde-meta-4.13.3.ebuild           | 33 ++++++++++++
 kde-base/kde-meta/kde-meta-4.13.97.ebuild          |  4 +-
 kde-base/kde-meta/kde-meta-4.14.49.9999.ebuild     |  4 +-
 kde-base/kde-meta/kde-meta-4.9999.ebuild           |  4 +-
 kde-base/kde-meta/metadata.xml                     |  1 +
 .../kdeartwork-meta/kdeartwork-meta-4.13.3.ebuild  | 21 ++++++++
 .../kdeartwork-meta/kdeartwork-meta-4.13.97.ebuild |  4 +-
 .../kdeartwork-meta-4.14.49.9999.ebuild            |  4 +-
 .../kdeartwork-meta/kdeartwork-meta-4.9999.ebuild  |  3 +-
 kde-base/kdeartwork-meta/metadata.xml              |  3 ++
 kde-base/kdebase-meta/kdebase-meta-4.13.3.ebuild   | 63 ++++++++++++++++++++++
 kde-base/kdebase-meta/kdebase-meta-4.13.97.ebuild  | 48 +++++++++--------
 .../kdebase-meta/kdebase-meta-4.14.49.9999.ebuild  | 48 +++++++++--------
 kde-base/kdebase-meta/kdebase-meta-4.9999.ebuild   | 48 +++++++++--------
 kde-base/kdebase-meta/metadata.xml                 |  1 +
 .../kdebase-runtime-meta-4.13.3.ebuild             | 53 ++++++++++++++++++
 .../kdebase-runtime-meta-4.13.97.ebuild            | 17 +++---
 .../kdebase-runtime-meta-4.14.49.9999.ebuild       | 17 +++---
 .../kdebase-runtime-meta-4.9999.ebuild             | 17 +++---
 kde-base/kdebase-runtime-meta/metadata.xml         |  1 +
 20 files changed, 296 insertions(+), 98 deletions(-)
 create mode 100644 kde-base/kde-meta/kde-meta-4.13.3.ebuild
 create mode 100644 kde-base/kdeartwork-meta/kdeartwork-meta-4.13.3.ebuild
 create mode 100644 kde-base/kdebase-meta/kdebase-meta-4.13.3.ebuild
 create mode 100644 kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.13.3.ebuild

diff --git a/kde-base/kde-meta/kde-meta-4.13.3.ebuild b/kde-base/kde-meta/kde-meta-4.13.3.ebuild
new file mode 100644
index 0000000..7efc4a9
--- /dev/null
+++ b/kde-base/kde-meta/kde-meta-4.13.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-meta/kde-meta-4.13.3.ebuild,v 1.1 2014/07/16 17:40:31 johu Exp $
+
+EAPI=5
+inherit kde4-meta-pkg
+
+DESCRIPTION="KDE - merge this to pull in all split kde-base/* packages"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="accessibility kdepim nls plasma5 sdk"
+
+RDEPEND="
+	$(add_kdebase_dep kate)
+	$(add_kdebase_dep kdeadmin-meta)
+	$(add_kdebase_dep kdeartwork-meta)
+	$(add_kdebase_dep kdebase-meta)
+	$(add_kdebase_dep kdeedu-meta)
+	$(add_kdebase_dep kdegames-meta)
+	$(add_kdebase_dep kdegraphics-meta)
+	$(add_kdebase_dep kdemultimedia-meta)
+	$(add_kdebase_dep kdenetwork-meta)
+	$(add_kdebase_dep kdetoys-meta)
+	$(add_kdebase_dep kdeutils-meta)
+	accessibility? ( $(add_kdebase_dep kdeaccessibility-meta) )
+	kdepim? ( $(add_kdebase_dep kdepim-meta "" 4.4.11.1) )
+	nls? ( $(add_kdebase_dep kde-l10n) )
+	sdk? (
+		$(add_kdebase_dep kdebindings-meta)
+		$(add_kdebase_dep kdesdk-meta)
+		$(add_kdebase_dep kdewebdev-meta)
+	)
+	!plasma5? ( $(add_kdebase_dep kdeplasma-addons) )
+"
diff --git a/kde-base/kde-meta/kde-meta-4.13.97.ebuild b/kde-base/kde-meta/kde-meta-4.13.97.ebuild
index 4896e26..d19dcf1 100644
--- a/kde-base/kde-meta/kde-meta-4.13.97.ebuild
+++ b/kde-base/kde-meta/kde-meta-4.13.97.ebuild
@@ -7,7 +7,7 @@ inherit kde4-meta-pkg
 
 DESCRIPTION="KDE - merge this to pull in all split kde-base/* packages"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="accessibility kdepim nls sdk"
+IUSE="accessibility kdepim nls plasma5 sdk"
 
 RDEPEND="
 	$(add_kdebase_dep kate '' 4.14)
@@ -19,7 +19,6 @@ RDEPEND="
 	$(add_kdebase_dep kdegraphics-meta)
 	$(add_kdebase_dep kdemultimedia-meta)
 	$(add_kdebase_dep kdenetwork-meta)
-	$(add_kdebase_dep kdeplasma-addons)
 	$(add_kdebase_dep kdetoys-meta)
 	$(add_kdebase_dep kdeutils-meta)
 	accessibility? ( $(add_kdebase_dep kdeaccessibility-meta) )
@@ -30,4 +29,5 @@ RDEPEND="
 		$(add_kdebase_dep kdesdk-meta)
 		$(add_kdebase_dep kdewebdev-meta)
 	)
+	!plasma5? ( $(add_kdebase_dep kdeplasma-addons) )
 "
diff --git a/kde-base/kde-meta/kde-meta-4.14.49.9999.ebuild b/kde-base/kde-meta/kde-meta-4.14.49.9999.ebuild
index 0eda034..acbaed3 100644
--- a/kde-base/kde-meta/kde-meta-4.14.49.9999.ebuild
+++ b/kde-base/kde-meta/kde-meta-4.14.49.9999.ebuild
@@ -7,7 +7,7 @@ inherit kde4-meta-pkg
 
 DESCRIPTION="KDE - merge this to pull in all split kde-base/* packages"
 KEYWORDS=""
-IUSE="accessibility kdepim nls sdk"
+IUSE="accessibility kdepim nls plasma5 sdk"
 
 RDEPEND="
 	$(add_kdebase_dep kate '' 4.14)
@@ -19,7 +19,6 @@ RDEPEND="
 	$(add_kdebase_dep kdegraphics-meta)
 	$(add_kdebase_dep kdemultimedia-meta)
 	$(add_kdebase_dep kdenetwork-meta)
-	$(add_kdebase_dep kdeplasma-addons)
 	$(add_kdebase_dep kdetoys-meta)
 	$(add_kdebase_dep kdeutils-meta)
 	accessibility? ( $(add_kdebase_dep kdeaccessibility-meta) )
@@ -30,4 +29,5 @@ RDEPEND="
 		$(add_kdebase_dep kdesdk-meta)
 		$(add_kdebase_dep kdewebdev-meta)
 	)
+	!plasma5? ( $(add_kdebase_dep kdeplasma-addons) )
 "
diff --git a/kde-base/kde-meta/kde-meta-4.9999.ebuild b/kde-base/kde-meta/kde-meta-4.9999.ebuild
index 0eda034..acbaed3 100644
--- a/kde-base/kde-meta/kde-meta-4.9999.ebuild
+++ b/kde-base/kde-meta/kde-meta-4.9999.ebuild
@@ -7,7 +7,7 @@ inherit kde4-meta-pkg
 
 DESCRIPTION="KDE - merge this to pull in all split kde-base/* packages"
 KEYWORDS=""
-IUSE="accessibility kdepim nls sdk"
+IUSE="accessibility kdepim nls plasma5 sdk"
 
 RDEPEND="
 	$(add_kdebase_dep kate '' 4.14)
@@ -19,7 +19,6 @@ RDEPEND="
 	$(add_kdebase_dep kdegraphics-meta)
 	$(add_kdebase_dep kdemultimedia-meta)
 	$(add_kdebase_dep kdenetwork-meta)
-	$(add_kdebase_dep kdeplasma-addons)
 	$(add_kdebase_dep kdetoys-meta)
 	$(add_kdebase_dep kdeutils-meta)
 	accessibility? ( $(add_kdebase_dep kdeaccessibility-meta) )
@@ -30,4 +29,5 @@ RDEPEND="
 		$(add_kdebase_dep kdesdk-meta)
 		$(add_kdebase_dep kdewebdev-meta)
 	)
+	!plasma5? ( $(add_kdebase_dep kdeplasma-addons) )
 "
diff --git a/kde-base/kde-meta/metadata.xml b/kde-base/kde-meta/metadata.xml
index 1c74039..c3c1b8f 100644
--- a/kde-base/kde-meta/metadata.xml
+++ b/kde-base/kde-meta/metadata.xml
@@ -4,6 +4,7 @@
 	<herd>kde</herd>
 	<use>
 		<flag name="kdepim">Pull in KDE PIM</flag>
+		<flag name="plasma5">Install Plasma 5 compatibile subset of the package.</flag>
 		<flag name="sdk">Pull in developer-specific meta-packages</flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-base/kdeartwork-meta/kdeartwork-meta-4.13.3.ebuild b/kde-base/kdeartwork-meta/kdeartwork-meta-4.13.3.ebuild
new file mode 100644
index 0000000..3c820f9
--- /dev/null
+++ b/kde-base/kdeartwork-meta/kdeartwork-meta-4.13.3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-meta/kdeartwork-meta-4.13.3.ebuild,v 1.1 2014/07/16 17:41:00 johu Exp $
+
+EAPI=5
+inherit kde4-meta-pkg
+
+DESCRIPTION="kdeartwork - merge this to pull in all kdeartwork-derived packages"
+KEYWORDS=" ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="plasma5"
+
+RDEPEND="
+	$(add_kdebase_dep kdeartwork-colorschemes)
+	$(add_kdebase_dep kdeartwork-desktopthemes)
+	$(add_kdebase_dep kdeartwork-emoticons)
+	$(add_kdebase_dep kdeartwork-iconthemes)
+	$(add_kdebase_dep kdeartwork-kscreensaver)
+	$(add_kdebase_dep kdeartwork-wallpapers)
+	$(add_kdebase_dep kdeartwork-weatherwallpapers)
+	!plasma5? ( $(add_kdebase_dep kdeartwork-styles) )
+"
diff --git a/kde-base/kdeartwork-meta/kdeartwork-meta-4.13.97.ebuild b/kde-base/kdeartwork-meta/kdeartwork-meta-4.13.97.ebuild
index 6bb4b1c..665f5de 100644
--- a/kde-base/kdeartwork-meta/kdeartwork-meta-4.13.97.ebuild
+++ b/kde-base/kdeartwork-meta/kdeartwork-meta-4.13.97.ebuild
@@ -7,7 +7,7 @@ inherit kde4-meta-pkg
 
 DESCRIPTION="kdeartwork - merge this to pull in all kdeartwork-derived packages"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
+IUSE="plasma5"
 
 RDEPEND="
 	$(add_kdebase_dep kdeartwork-colorschemes)
@@ -15,7 +15,7 @@ RDEPEND="
 	$(add_kdebase_dep kdeartwork-emoticons)
 	$(add_kdebase_dep kdeartwork-iconthemes)
 	$(add_kdebase_dep kdeartwork-kscreensaver)
-	$(add_kdebase_dep kdeartwork-styles)
 	$(add_kdebase_dep kdeartwork-wallpapers)
 	$(add_kdebase_dep kdeartwork-weatherwallpapers)
+	!plasma5? ( $(add_kdebase_dep kdeartwork-styles) )
 "
diff --git a/kde-base/kdeartwork-meta/kdeartwork-meta-4.14.49.9999.ebuild b/kde-base/kdeartwork-meta/kdeartwork-meta-4.14.49.9999.ebuild
index a934b38..b342542 100644
--- a/kde-base/kdeartwork-meta/kdeartwork-meta-4.14.49.9999.ebuild
+++ b/kde-base/kdeartwork-meta/kdeartwork-meta-4.14.49.9999.ebuild
@@ -7,7 +7,7 @@ inherit kde4-meta-pkg
 
 DESCRIPTION="kdeartwork - merge this to pull in all kdeartwork-derived packages"
 KEYWORDS=""
-IUSE=""
+IUSE="plasma5"
 
 RDEPEND="
 	$(add_kdebase_dep kdeartwork-colorschemes)
@@ -15,7 +15,7 @@ RDEPEND="
 	$(add_kdebase_dep kdeartwork-emoticons)
 	$(add_kdebase_dep kdeartwork-iconthemes)
 	$(add_kdebase_dep kdeartwork-kscreensaver)
-	$(add_kdebase_dep kdeartwork-styles)
 	$(add_kdebase_dep kdeartwork-wallpapers)
 	$(add_kdebase_dep kdeartwork-weatherwallpapers)
+	!plasma5? ( $(add_kdebase_dep kdeartwork-styles) )
 "
diff --git a/kde-base/kdeartwork-meta/kdeartwork-meta-4.9999.ebuild b/kde-base/kdeartwork-meta/kdeartwork-meta-4.9999.ebuild
index a934b38..8bc3fc6 100644
--- a/kde-base/kdeartwork-meta/kdeartwork-meta-4.9999.ebuild
+++ b/kde-base/kdeartwork-meta/kdeartwork-meta-4.9999.ebuild
@@ -7,7 +7,7 @@ inherit kde4-meta-pkg
 
 DESCRIPTION="kdeartwork - merge this to pull in all kdeartwork-derived packages"
 KEYWORDS=""
-IUSE=""
+IUSE="plasma5"
 
 RDEPEND="
 	$(add_kdebase_dep kdeartwork-colorschemes)
@@ -18,4 +18,5 @@ RDEPEND="
 	$(add_kdebase_dep kdeartwork-styles)
 	$(add_kdebase_dep kdeartwork-wallpapers)
 	$(add_kdebase_dep kdeartwork-weatherwallpapers)
+	!plasma5? ( $(add_kdebase_dep kdeartwork-styles) )
 "
diff --git a/kde-base/kdeartwork-meta/metadata.xml b/kde-base/kdeartwork-meta/metadata.xml
index a23f444..be07290 100644
--- a/kde-base/kdeartwork-meta/metadata.xml
+++ b/kde-base/kdeartwork-meta/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>kde</herd>
+	<use>
+		<flag name="plasma5">Install Plasma 5 compatibile subset of the package.</flag>
+	</use>
 </pkgmetadata>
diff --git a/kde-base/kdebase-meta/kdebase-meta-4.13.3.ebuild b/kde-base/kdebase-meta/kdebase-meta-4.13.3.ebuild
new file mode 100644
index 0000000..b6d7e34
--- /dev/null
+++ b/kde-base/kdebase-meta/kdebase-meta-4.13.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-meta/kdebase-meta-4.13.3.ebuild,v 1.1 2014/07/16 17:40:45 johu Exp $
+
+EAPI=5
+inherit kde4-meta-pkg
+
+DESCRIPTION="Merge this to pull in all kdebase-derived packages"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="plasma5 +wallpapers"
+
+RDEPEND="
+	$(add_kdebase_dep dolphin)
+	$(add_kdebase_dep kcheckpass '' 4.11)
+	wallpapers? ( $(add_kdebase_dep kde-wallpapers '' 4.11) )
+	$(add_kdebase_dep kde-base-artwork)
+	$(add_kdebase_dep kdebase-runtime-meta)
+	$(add_kdebase_dep kdialog)
+	$(add_kdebase_dep keditbookmarks)
+	$(add_kdebase_dep kephal '' 4.11)
+	$(add_kdebase_dep kfind)
+	$(add_kdebase_dep kfmclient)
+	$(add_kdebase_dep konq-plugins)
+	$(add_kdebase_dep konqueror)
+	$(add_kdebase_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_kdebase_dep kwrite)
+	$(add_kdebase_dep libkonq)
+	$(add_kdebase_dep liboxygenstyle '' 4.11)
+	$(add_kdebase_dep libplasmaclock '' 4.11)
+	$(add_kdebase_dep nsplugins)
+	$(add_kdebase_dep phonon-kde)
+	$(add_kdebase_dep plasma-apps)
+	$(add_kdebase_dep qguiplatformplugin_kde '' 4.11)
+	$(add_kdebase_dep solid-actions-kcm '' 4.11)
+	!plasma5? (
+		$(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_kdebase_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_kdebase_dep plasma-workspace '' 4.11)
+		$(add_kdebase_dep powerdevil '' 4.11)
+		$(add_kdebase_dep systemsettings '' 4.11)
+		!prefix? ( $(add_kdebase_dep kdm '' 4.11) )
+	)
+"
diff --git a/kde-base/kdebase-meta/kdebase-meta-4.13.97.ebuild b/kde-base/kdebase-meta/kdebase-meta-4.13.97.ebuild
index 627ec91..3cfd8c4 100644
--- a/kde-base/kdebase-meta/kdebase-meta-4.13.97.ebuild
+++ b/kde-base/kdebase-meta/kdebase-meta-4.13.97.ebuild
@@ -7,55 +7,57 @@ inherit kde4-meta-pkg
 
 DESCRIPTION="Merge this to pull in all kdebase-derived packages"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+wallpapers"
+IUSE="plasma5 +wallpapers"
 
 RDEPEND="
 	$(add_kdebase_dep dolphin)
-	$(add_kdebase_dep freespacenotifier '' 4.11)
 	$(add_kdebase_dep kcheckpass '' 4.11)
-	$(add_kdebase_dep kcminit '' 4.11)
 	wallpapers? ( $(add_kdebase_dep kde-wallpapers '' 4.11) )
 	$(add_kdebase_dep kde-base-artwork)
-	$(add_kdebase_dep kdebase-cursors '' 4.11)
 	$(add_kdebase_dep kdebase-runtime-meta)
-	$(add_kdebase_dep kdebase-startkde '' 4.11)
-	$(add_kdebase_dep kdepasswd)
 	$(add_kdebase_dep kdialog)
 	$(add_kdebase_dep keditbookmarks)
 	$(add_kdebase_dep kephal '' 4.11)
 	$(add_kdebase_dep kfind)
 	$(add_kdebase_dep kfmclient)
-	$(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 konq-plugins)
 	$(add_kdebase_dep konqueror)
 	$(add_kdebase_dep konsole)
-	$(add_kdebase_dep krunner '' 4.11)
 	$(add_kdebase_dep kscreensaver '' 4.11)
-	$(add_kdebase_dep ksmserver '' 4.11)
-	$(add_kdebase_dep ksplash '' 4.11)
 	$(add_kdebase_dep kstartupconfig '' 4.11)
 	$(add_kdebase_dep kstyles '' 4.11)
-	$(add_kdebase_dep ksysguard '' 4.11)
 	$(add_kdebase_dep ksystraycmd '' 4.11)
-	$(add_kdebase_dep kwin '' 4.11)
 	$(add_kdebase_dep kwrite '' 4.14)
-	$(add_kdebase_dep kwrited '' 4.11)
 	$(add_kdebase_dep libkonq)
-	$(add_kdebase_dep libkworkspace '' 4.11)
 	$(add_kdebase_dep liboxygenstyle '' 4.11)
 	$(add_kdebase_dep libplasmaclock '' 4.11)
-	$(add_kdebase_dep libplasmagenericshell '' 4.11)
-	$(add_kdebase_dep libtaskmanager '' 4.11)
 	$(add_kdebase_dep nsplugins)
 	$(add_kdebase_dep phonon-kde)
 	$(add_kdebase_dep plasma-apps)
-	$(add_kdebase_dep plasma-workspace '' 4.11)
-	$(add_kdebase_dep powerdevil '' 4.11)
 	$(add_kdebase_dep qguiplatformplugin_kde '' 4.11)
 	$(add_kdebase_dep solid-actions-kcm '' 4.11)
-	$(add_kdebase_dep systemsettings '' 4.11)
-	!prefix? ( $(add_kdebase_dep kdm '' 4.11) )
+	!plasma5? (
+		$(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_kdebase_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_kdebase_dep plasma-workspace '' 4.11)
+		$(add_kdebase_dep powerdevil '' 4.11)
+		$(add_kdebase_dep systemsettings '' 4.11)
+		!prefix? ( $(add_kdebase_dep kdm '' 4.11) )
+	)
 "
diff --git a/kde-base/kdebase-meta/kdebase-meta-4.14.49.9999.ebuild b/kde-base/kdebase-meta/kdebase-meta-4.14.49.9999.ebuild
index f27c483..bf71659 100644
--- a/kde-base/kdebase-meta/kdebase-meta-4.14.49.9999.ebuild
+++ b/kde-base/kdebase-meta/kdebase-meta-4.14.49.9999.ebuild
@@ -7,55 +7,57 @@ inherit kde4-meta-pkg
 
 DESCRIPTION="Merge this to pull in all kdebase-derived packages"
 KEYWORDS=""
-IUSE="+wallpapers"
+IUSE="plasma5 +wallpapers"
 
 RDEPEND="
 	$(add_kdebase_dep dolphin)
-	$(add_kdebase_dep freespacenotifier '' 4.11)
 	$(add_kdebase_dep kcheckpass '' 4.11)
-	$(add_kdebase_dep kcminit '' 4.11)
 	wallpapers? ( $(add_kdebase_dep kde-wallpapers '' 4.11) )
 	$(add_kdebase_dep kde-base-artwork)
-	$(add_kdebase_dep kdebase-cursors '' 4.11)
 	$(add_kdebase_dep kdebase-runtime-meta)
-	$(add_kdebase_dep kdebase-startkde '' 4.11)
-	$(add_kdebase_dep kdepasswd)
 	$(add_kdebase_dep kdialog)
 	$(add_kdebase_dep keditbookmarks)
 	$(add_kdebase_dep kephal '' 4.11)
 	$(add_kdebase_dep kfind)
 	$(add_kdebase_dep kfmclient)
-	$(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 konq-plugins)
 	$(add_kdebase_dep konqueror)
 	$(add_kdebase_dep konsole)
-	$(add_kdebase_dep krunner '' 4.11)
 	$(add_kdebase_dep kscreensaver '' 4.11)
-	$(add_kdebase_dep ksmserver '' 4.11)
-	$(add_kdebase_dep ksplash '' 4.11)
 	$(add_kdebase_dep kstartupconfig '' 4.11)
 	$(add_kdebase_dep kstyles '' 4.11)
-	$(add_kdebase_dep ksysguard '' 4.11)
 	$(add_kdebase_dep ksystraycmd '' 4.11)
-	$(add_kdebase_dep kwin '' 4.11)
 	$(add_kdebase_dep kwrite '' 4.14)
-	$(add_kdebase_dep kwrited '' 4.11)
 	$(add_kdebase_dep libkonq)
-	$(add_kdebase_dep libkworkspace '' 4.11)
 	$(add_kdebase_dep liboxygenstyle '' 4.11)
 	$(add_kdebase_dep libplasmaclock '' 4.11)
-	$(add_kdebase_dep libplasmagenericshell '' 4.11)
-	$(add_kdebase_dep libtaskmanager '' 4.11)
 	$(add_kdebase_dep nsplugins)
 	$(add_kdebase_dep phonon-kde)
 	$(add_kdebase_dep plasma-apps)
-	$(add_kdebase_dep plasma-workspace '' 4.11)
-	$(add_kdebase_dep powerdevil '' 4.11)
 	$(add_kdebase_dep qguiplatformplugin_kde '' 4.11)
 	$(add_kdebase_dep solid-actions-kcm '' 4.11)
-	$(add_kdebase_dep systemsettings '' 4.11)
-	!prefix? ( $(add_kdebase_dep kdm '' 4.11) )
+	!plasma5? (
+		$(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_kdebase_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_kdebase_dep plasma-workspace '' 4.11)
+		$(add_kdebase_dep powerdevil '' 4.11)
+		$(add_kdebase_dep systemsettings '' 4.11)
+		!prefix? ( $(add_kdebase_dep kdm '' 4.11) )
+	)
 "
diff --git a/kde-base/kdebase-meta/kdebase-meta-4.9999.ebuild b/kde-base/kdebase-meta/kdebase-meta-4.9999.ebuild
index f27c483..bf71659 100644
--- a/kde-base/kdebase-meta/kdebase-meta-4.9999.ebuild
+++ b/kde-base/kdebase-meta/kdebase-meta-4.9999.ebuild
@@ -7,55 +7,57 @@ inherit kde4-meta-pkg
 
 DESCRIPTION="Merge this to pull in all kdebase-derived packages"
 KEYWORDS=""
-IUSE="+wallpapers"
+IUSE="plasma5 +wallpapers"
 
 RDEPEND="
 	$(add_kdebase_dep dolphin)
-	$(add_kdebase_dep freespacenotifier '' 4.11)
 	$(add_kdebase_dep kcheckpass '' 4.11)
-	$(add_kdebase_dep kcminit '' 4.11)
 	wallpapers? ( $(add_kdebase_dep kde-wallpapers '' 4.11) )
 	$(add_kdebase_dep kde-base-artwork)
-	$(add_kdebase_dep kdebase-cursors '' 4.11)
 	$(add_kdebase_dep kdebase-runtime-meta)
-	$(add_kdebase_dep kdebase-startkde '' 4.11)
-	$(add_kdebase_dep kdepasswd)
 	$(add_kdebase_dep kdialog)
 	$(add_kdebase_dep keditbookmarks)
 	$(add_kdebase_dep kephal '' 4.11)
 	$(add_kdebase_dep kfind)
 	$(add_kdebase_dep kfmclient)
-	$(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 konq-plugins)
 	$(add_kdebase_dep konqueror)
 	$(add_kdebase_dep konsole)
-	$(add_kdebase_dep krunner '' 4.11)
 	$(add_kdebase_dep kscreensaver '' 4.11)
-	$(add_kdebase_dep ksmserver '' 4.11)
-	$(add_kdebase_dep ksplash '' 4.11)
 	$(add_kdebase_dep kstartupconfig '' 4.11)
 	$(add_kdebase_dep kstyles '' 4.11)
-	$(add_kdebase_dep ksysguard '' 4.11)
 	$(add_kdebase_dep ksystraycmd '' 4.11)
-	$(add_kdebase_dep kwin '' 4.11)
 	$(add_kdebase_dep kwrite '' 4.14)
-	$(add_kdebase_dep kwrited '' 4.11)
 	$(add_kdebase_dep libkonq)
-	$(add_kdebase_dep libkworkspace '' 4.11)
 	$(add_kdebase_dep liboxygenstyle '' 4.11)
 	$(add_kdebase_dep libplasmaclock '' 4.11)
-	$(add_kdebase_dep libplasmagenericshell '' 4.11)
-	$(add_kdebase_dep libtaskmanager '' 4.11)
 	$(add_kdebase_dep nsplugins)
 	$(add_kdebase_dep phonon-kde)
 	$(add_kdebase_dep plasma-apps)
-	$(add_kdebase_dep plasma-workspace '' 4.11)
-	$(add_kdebase_dep powerdevil '' 4.11)
 	$(add_kdebase_dep qguiplatformplugin_kde '' 4.11)
 	$(add_kdebase_dep solid-actions-kcm '' 4.11)
-	$(add_kdebase_dep systemsettings '' 4.11)
-	!prefix? ( $(add_kdebase_dep kdm '' 4.11) )
+	!plasma5? (
+		$(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_kdebase_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_kdebase_dep plasma-workspace '' 4.11)
+		$(add_kdebase_dep powerdevil '' 4.11)
+		$(add_kdebase_dep systemsettings '' 4.11)
+		!prefix? ( $(add_kdebase_dep kdm '' 4.11) )
+	)
 "
diff --git a/kde-base/kdebase-meta/metadata.xml b/kde-base/kdebase-meta/metadata.xml
index 783e379..7a5dcd8 100644
--- a/kde-base/kdebase-meta/metadata.xml
+++ b/kde-base/kdebase-meta/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<herd>kde</herd>
 	<use>
+		<flag name="plasma5">Install Plasma 5 compatibile subset of the package.</flag>
 		<flag name="wallpapers">Install the KDE wallpapers</flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.13.3.ebuild b/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.13.3.ebuild
new file mode 100644
index 0000000..8abb1f6
--- /dev/null
+++ b/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.13.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.13.3.ebuild,v 1.1 2014/07/16 17:41:00 johu Exp $
+
+EAPI=5
+inherit kde4-meta-pkg
+
+DESCRIPTION="Merge this to pull in all kdebase-runtime-derived packages"
+KEYWORDS=" ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+crash-reporter +handbook nepomuk plasma5"
+
+RDEPEND="
+	$(add_kdebase_dep kcmshell)
+	$(add_kdebase_dep kdebase-data)
+	$(add_kdebase_dep kdebase-desktoptheme)
+	$(add_kdebase_dep kdebase-menu)
+	$(add_kdebase_dep kdebase-menu-icons)
+	$(add_kdebase_dep kdebugdialog)
+	$(add_kdebase_dep kdesu)
+	$(add_kdebase_dep kdontchangethehostname)
+	$(add_kdebase_dep keditfiletype)
+	$(add_kdebase_dep kfile)
+	$(add_kdebase_dep kglobalaccel)
+	$(add_kdebase_dep kiconfinder)
+	$(add_kdebase_dep kimgio)
+	$(add_kdebase_dep kioclient)
+	$(add_kdebase_dep kmimetypefinder)
+	$(add_kdebase_dep knewstuff)
+	$(add_kdebase_dep kpasswdserver)
+	$(add_kdebase_dep kquitapp)
+	$(add_kdebase_dep kstart)
+	$(add_kdebase_dep ktimezoned)
+	$(add_kdebase_dep ktraderclient)
+	$(add_kdebase_dep kuiserver)
+	$(add_kdebase_dep kurifilter-plugins)
+	$(add_kdebase_dep kwalletd)
+	$(add_kdebase_dep kwalletmanager)
+	$(add_kdebase_dep plasma-runtime)
+	$(add_kdebase_dep renamedlg-plugins)
+	$(add_kdebase_dep solid-runtime)
+	crash-reporter? ( $(add_kdebase_dep drkonqi ) )
+	handbook? ( || (
+		$(add_kdebase_dep khelpcenter)
+		kde-base/khelpcenter:5[kde4_compat]
+	) )
+	nepomuk? ( $(add_kdebase_dep nepomuk) )
+	!plasma5? (
+		$(add_kdebase_dep attica)
+		$(add_kdebase_dep kcontrol)
+		$(add_kdebase_dep kdebase-kioslaves)
+		$(add_kdebase_dep knetattach)
+	)
+"
diff --git a/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.13.97.ebuild b/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.13.97.ebuild
index 7ed9506..ade9ee1 100644
--- a/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.13.97.ebuild
+++ b/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.13.97.ebuild
@@ -7,15 +7,12 @@ inherit kde4-meta-pkg
 
 DESCRIPTION="Merge this to pull in all kdebase-runtime-derived packages"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+crash-reporter +handbook nepomuk"
+IUSE="+crash-reporter +handbook nepomuk plasma5"
 
 RDEPEND="
-	$(add_kdebase_dep attica)
 	$(add_kdebase_dep kcmshell)
-	$(add_kdebase_dep kcontrol)
 	$(add_kdebase_dep kdebase-data)
 	$(add_kdebase_dep kdebase-desktoptheme)
-	$(add_kdebase_dep kdebase-kioslaves)
 	$(add_kdebase_dep kdebase-menu)
 	$(add_kdebase_dep kdebase-menu-icons)
 	$(add_kdebase_dep kdebugdialog)
@@ -28,7 +25,6 @@ RDEPEND="
 	$(add_kdebase_dep kimgio)
 	$(add_kdebase_dep kioclient)
 	$(add_kdebase_dep kmimetypefinder)
-	$(add_kdebase_dep knetattach)
 	$(add_kdebase_dep knewstuff)
 	$(add_kdebase_dep kpasswdserver)
 	$(add_kdebase_dep kquitapp)
@@ -43,6 +39,15 @@ RDEPEND="
 	$(add_kdebase_dep renamedlg-plugins)
 	$(add_kdebase_dep solid-runtime)
 	crash-reporter? ( $(add_kdebase_dep drkonqi ) )
-	handbook? ( $(add_kdebase_dep khelpcenter) )
+	handbook? ( || (
+		$(add_kdebase_dep khelpcenter)
+		kde-base/khelpcenter:5[kde4_compat]
+	) )
 	nepomuk? ( $(add_kdebase_dep nepomuk) )
+	!plasma5? (
+		$(add_kdebase_dep attica)
+		$(add_kdebase_dep kcontrol)
+		$(add_kdebase_dep kdebase-kioslaves)
+		$(add_kdebase_dep knetattach)
+	)
 "
diff --git a/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.14.49.9999.ebuild b/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.14.49.9999.ebuild
index 9bb6d84..2f5e09b 100644
--- a/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.14.49.9999.ebuild
+++ b/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.14.49.9999.ebuild
@@ -7,15 +7,12 @@ inherit kde4-meta-pkg
 
 DESCRIPTION="Merge this to pull in all kdebase-runtime-derived packages"
 KEYWORDS=""
-IUSE="+crash-reporter +handbook nepomuk"
+IUSE="+crash-reporter +handbook nepomuk plasma5"
 
 RDEPEND="
-	$(add_kdebase_dep attica)
 	$(add_kdebase_dep kcmshell)
-	$(add_kdebase_dep kcontrol)
 	$(add_kdebase_dep kdebase-data)
 	$(add_kdebase_dep kdebase-desktoptheme)
-	$(add_kdebase_dep kdebase-kioslaves)
 	$(add_kdebase_dep kdebase-menu)
 	$(add_kdebase_dep kdebase-menu-icons)
 	$(add_kdebase_dep kdebugdialog)
@@ -28,7 +25,6 @@ RDEPEND="
 	$(add_kdebase_dep kimgio)
 	$(add_kdebase_dep kioclient)
 	$(add_kdebase_dep kmimetypefinder)
-	$(add_kdebase_dep knetattach)
 	$(add_kdebase_dep knewstuff)
 	$(add_kdebase_dep kpasswdserver)
 	$(add_kdebase_dep kquitapp)
@@ -43,6 +39,15 @@ RDEPEND="
 	$(add_kdebase_dep renamedlg-plugins)
 	$(add_kdebase_dep solid-runtime)
 	crash-reporter? ( $(add_kdebase_dep drkonqi ) )
-	handbook? ( $(add_kdebase_dep khelpcenter) )
+	handbook? ( || (
+		$(add_kdebase_dep khelpcenter)
+		kde-base/khelpcenter:5[kde4_compat]
+	) )
 	nepomuk? ( $(add_kdebase_dep nepomuk) )
+	!plasma5? (
+		$(add_kdebase_dep attica)
+		$(add_kdebase_dep kcontrol)
+		$(add_kdebase_dep kdebase-kioslaves)
+		$(add_kdebase_dep knetattach)
+	)
 "
diff --git a/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.9999.ebuild b/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.9999.ebuild
index 9bb6d84..2f5e09b 100644
--- a/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.9999.ebuild
+++ b/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.9999.ebuild
@@ -7,15 +7,12 @@ inherit kde4-meta-pkg
 
 DESCRIPTION="Merge this to pull in all kdebase-runtime-derived packages"
 KEYWORDS=""
-IUSE="+crash-reporter +handbook nepomuk"
+IUSE="+crash-reporter +handbook nepomuk plasma5"
 
 RDEPEND="
-	$(add_kdebase_dep attica)
 	$(add_kdebase_dep kcmshell)
-	$(add_kdebase_dep kcontrol)
 	$(add_kdebase_dep kdebase-data)
 	$(add_kdebase_dep kdebase-desktoptheme)
-	$(add_kdebase_dep kdebase-kioslaves)
 	$(add_kdebase_dep kdebase-menu)
 	$(add_kdebase_dep kdebase-menu-icons)
 	$(add_kdebase_dep kdebugdialog)
@@ -28,7 +25,6 @@ RDEPEND="
 	$(add_kdebase_dep kimgio)
 	$(add_kdebase_dep kioclient)
 	$(add_kdebase_dep kmimetypefinder)
-	$(add_kdebase_dep knetattach)
 	$(add_kdebase_dep knewstuff)
 	$(add_kdebase_dep kpasswdserver)
 	$(add_kdebase_dep kquitapp)
@@ -43,6 +39,15 @@ RDEPEND="
 	$(add_kdebase_dep renamedlg-plugins)
 	$(add_kdebase_dep solid-runtime)
 	crash-reporter? ( $(add_kdebase_dep drkonqi ) )
-	handbook? ( $(add_kdebase_dep khelpcenter) )
+	handbook? ( || (
+		$(add_kdebase_dep khelpcenter)
+		kde-base/khelpcenter:5[kde4_compat]
+	) )
 	nepomuk? ( $(add_kdebase_dep nepomuk) )
+	!plasma5? (
+		$(add_kdebase_dep attica)
+		$(add_kdebase_dep kcontrol)
+		$(add_kdebase_dep kdebase-kioslaves)
+		$(add_kdebase_dep knetattach)
+	)
 "
diff --git a/kde-base/kdebase-runtime-meta/metadata.xml b/kde-base/kdebase-runtime-meta/metadata.xml
index 5bac366..c970a80 100644
--- a/kde-base/kdebase-runtime-meta/metadata.xml
+++ b/kde-base/kdebase-runtime-meta/metadata.xml
@@ -5,5 +5,6 @@
 	<use>
 		<flag name="crash-reporter">Builds a gui tool to submit crash information to the upstream backtracker</flag>
 		<flag name="nepomuk">Enable Nepomuk based semantic desktop support (deprecated)</flag>
+		<flag name="plasma5">Install Plasma 5 compatibile subset of the package.</flag>
 	</use>
 </pkgmetadata>
-- 
1.8.5.5