commit: 9d318ba57d53c6d4b964df6a87d6c3ce4df30c16
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu Jan 7 22:32:01 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Jan 16 18:11:17 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=9d318ba5
kde-apps/kdebase-meta: Make it an upgrade path for Plasma 5 migration
Package-Manager: portage-2.2.26
.../kdebase-meta/kdebase-meta-15.08.3-r1.ebuild | 21 ++++++++++++++++
kde-apps/kdebase-meta/kdebase-meta-15.08.3.ebuild | 28 ----------------------
.../kdebase-meta/kdebase-meta-15.12.1-r1.ebuild | 21 ++++++++++++++++
kde-apps/kdebase-meta/kdebase-meta-15.12.1.ebuild | 28 ----------------------
.../kdebase-meta/kdebase-meta-15.12.49.9999.ebuild | 17 ++++---------
kde-apps/kdebase-meta/kdebase-meta-9999.ebuild | 17 ++++---------
kde-apps/kdebase-meta/metadata.xml | 2 ++
7 files changed, 54 insertions(+), 80 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
new file mode 100644
index 0000000..ec21c6c
--- /dev/null
+++ b/kde-apps/kdebase-meta/kdebase-meta-15.08.3-r1.ebuild
@@ -0,0 +1,21 @@
+# 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.ebuild
b/kde-apps/kdebase-meta/kdebase-meta-15.08.3.ebuild
deleted file mode 100644
index 702655e..0000000
--- a/kde-apps/kdebase-meta/kdebase-meta-15.08.3.ebuild
+++ /dev/null
@@ -1,28 +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="Merge this to pull in all kdebase-derived packages"
-KEYWORDS=" ~amd64 ~x86"
-IUSE="+wallpapers"
-
-RDEPEND="
- $(add_kdeapps_dep dolphin)
- $(add_kdeapps_dep kdebase-runtime-meta)
- $(add_kdeapps_dep kdialog)
- $(add_kdeapps_dep keditbookmarks)
- $(add_kdeapps_dep kfind)
- $(add_kdeapps_dep kfmclient)
- $(add_kdeapps_dep konq-plugins)
- $(add_kdeapps_dep konqueror)
- $(add_kdeapps_dep konsole)
- $(add_kdeapps_dep kwrite)
- $(add_kdeapps_dep libkonq)
- $(add_kdeapps_dep nsplugins)
- $(add_plasma_dep plasma-meta)
- wallpapers? ( $(add_kdeapps_dep kde-wallpapers '' 15.08.0) )
-"
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
new file mode 100644
index 0000000..841f3dd
--- /dev/null
+++ b/kde-apps/kdebase-meta/kdebase-meta-15.12.1-r1.ebuild
@@ -0,0 +1,21 @@
+# 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.ebuild
b/kde-apps/kdebase-meta/kdebase-meta-15.12.1.ebuild
deleted file mode 100644
index 702655e..0000000
--- a/kde-apps/kdebase-meta/kdebase-meta-15.12.1.ebuild
+++ /dev/null
@@ -1,28 +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="Merge this to pull in all kdebase-derived packages"
-KEYWORDS=" ~amd64 ~x86"
-IUSE="+wallpapers"
-
-RDEPEND="
- $(add_kdeapps_dep dolphin)
- $(add_kdeapps_dep kdebase-runtime-meta)
- $(add_kdeapps_dep kdialog)
- $(add_kdeapps_dep keditbookmarks)
- $(add_kdeapps_dep kfind)
- $(add_kdeapps_dep kfmclient)
- $(add_kdeapps_dep konq-plugins)
- $(add_kdeapps_dep konqueror)
- $(add_kdeapps_dep konsole)
- $(add_kdeapps_dep kwrite)
- $(add_kdeapps_dep libkonq)
- $(add_kdeapps_dep nsplugins)
- $(add_plasma_dep plasma-meta)
- wallpapers? ( $(add_kdeapps_dep kde-wallpapers '' 15.08.0) )
-"
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 f3a7978..1d2b3bd 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
@@ -6,23 +6,16 @@ EAPI=5
inherit kde5-meta-pkg
-DESCRIPTION="Merge this to pull in all kdebase-derived packages"
+DESCRIPTION="Transitional package to pull in plasma-meta plus basic
applications"
KEYWORDS=""
-IUSE="+wallpapers"
+IUSE="+display-manager minimal +wallpapers"
RDEPEND="
$(add_kdeapps_dep dolphin)
- $(add_kdeapps_dep kdebase-runtime-meta)
- $(add_kdeapps_dep kdialog)
- $(add_kdeapps_dep keditbookmarks)
- $(add_kdeapps_dep kfind)
- $(add_kdeapps_dep kfmclient)
- $(add_kdeapps_dep konq-plugins)
- $(add_kdeapps_dep konqueror)
$(add_kdeapps_dep konsole)
$(add_kdeapps_dep kwrite)
- $(add_kdeapps_dep libkonq)
- $(add_kdeapps_dep nsplugins)
$(add_plasma_dep plasma-meta)
- wallpapers? ( $(add_kdeapps_dep kde-wallpapers '' 15.08.0) )
+ 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 f3a7978..1d2b3bd 100644
--- a/kde-apps/kdebase-meta/kdebase-meta-9999.ebuild
+++ b/kde-apps/kdebase-meta/kdebase-meta-9999.ebuild
@@ -6,23 +6,16 @@ EAPI=5
inherit kde5-meta-pkg
-DESCRIPTION="Merge this to pull in all kdebase-derived packages"
+DESCRIPTION="Transitional package to pull in plasma-meta plus basic
applications"
KEYWORDS=""
-IUSE="+wallpapers"
+IUSE="+display-manager minimal +wallpapers"
RDEPEND="
$(add_kdeapps_dep dolphin)
- $(add_kdeapps_dep kdebase-runtime-meta)
- $(add_kdeapps_dep kdialog)
- $(add_kdeapps_dep keditbookmarks)
- $(add_kdeapps_dep kfind)
- $(add_kdeapps_dep kfmclient)
- $(add_kdeapps_dep konq-plugins)
- $(add_kdeapps_dep konqueror)
$(add_kdeapps_dep konsole)
$(add_kdeapps_dep kwrite)
- $(add_kdeapps_dep libkonq)
- $(add_kdeapps_dep nsplugins)
$(add_plasma_dep plasma-meta)
- wallpapers? ( $(add_kdeapps_dep kde-wallpapers '' 15.08.0) )
+ 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 783e379..0f092fd 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">Disable install of various KDE SC 4 based
packages</flag>
<flag name="wallpapers">Install the KDE wallpapers</flag>
</use>
</pkgmetadata>
