commit: 872af6e859353e079a9e6b62667d4bd68d8609e3
Author: Matthew Dawson <matthew <AT> mjdsystems <DOT> ca>
AuthorDate: Sat Aug 9 00:27:05 2014 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Aug 9 19:21:50 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=872af6e8
[kde-base/kdebase-meta] Add minimal flag to allow Plasma 5 to be co-installed
Package-Manager: portage-2.2.8-r1
---
kde-base/kdebase-meta/kdebase-meta-4.13.97.ebuild | 50 +++++++++++-----------
.../kdebase-meta/kdebase-meta-4.14.49.9999.ebuild | 50 +++++++++++-----------
kde-base/kdebase-meta/metadata.xml | 1 +
3 files changed, 53 insertions(+), 48 deletions(-)
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..f65da48 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="minimal +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) )
+ !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_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 solid-actions-kcm '' 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..2b4927a 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="minimal +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) )
+ !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_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 solid-actions-kcm '' 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..f0d366a 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="minimal">Install a Plasma 5 compatible subset of
the package</flag>
<flag name="wallpapers">Install the KDE wallpapers</flag>
</use>
</pkgmetadata>