public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/kde:master commit in: kde-apps/kdebase-meta/
@ 2014-11-29 17:26 Michael Palimaka
  0 siblings, 0 replies; 8+ messages in thread
From: Michael Palimaka @ 2014-11-29 17:26 UTC (permalink / raw
  To: gentoo-commits

commit:     25da2233af7acd6e2a743d4d04dd0acbcec88413
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 29 17:26:56 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Nov 29 17:26:56 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=25da2233

[kde-apps/kdebase-meta] Update for KDE Applications.

Package-Manager: portage-2.2.14

---
 kde-apps/kdebase-meta/kdebase-meta-14.11.97.ebuild | 43 ++--------------------
 kde-apps/kdebase-meta/kdebase-meta-9999.ebuild     | 43 ++--------------------
 kde-apps/kdebase-meta/metadata.xml                 |  2 -
 3 files changed, 8 insertions(+), 80 deletions(-)

diff --git a/kde-apps/kdebase-meta/kdebase-meta-14.11.97.ebuild b/kde-apps/kdebase-meta/kdebase-meta-14.11.97.ebuild
index 55fa00f..3ff04ac 100644
--- a/kde-apps/kdebase-meta/kdebase-meta-14.11.97.ebuild
+++ b/kde-apps/kdebase-meta/kdebase-meta-14.11.97.ebuild
@@ -3,61 +3,26 @@
 # $Header: $
 
 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_kdeapps_dep kcheckpass '' 4.11)
-	wallpapers? ( $(add_kdeapps_dep kde-wallpapers '' 4.11) )
-	$(add_kdeapps_dep kde-base-artwork)
 	$(add_kdeapps_dep kdebase-runtime-meta)
 	$(add_kdeapps_dep kdialog)
 	$(add_kdeapps_dep keditbookmarks)
-	$(add_kdeapps_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_kdeapps_dep kscreensaver '' 4.11)
-	$(add_kdeapps_dep kstartupconfig '' 4.11)
-	$(add_kdeapps_dep kstyles '' 4.11)
-	$(add_kdeapps_dep ksystraycmd '' 4.11)
 	$(add_kdeapps_dep kwrite)
 	$(add_kdeapps_dep libkonq)
-	$(add_kdeapps_dep liboxygenstyle '' 4.11)
-	$(add_kdeapps_dep libplasmaclock '' 4.11)
 	$(add_kdeapps_dep nsplugins)
-	$(add_kdeapps_dep phonon-kde)
 	$(add_kdeapps_dep plasma-apps)
-	$(add_kdeapps_dep qguiplatformplugin_kde '' 4.11)
-	!minimal? (
-		$(add_kdeapps_dep freespacenotifier '' 4.11)
-		$(add_kdeapps_dep kcminit '' 4.11)
-		$(add_kdeapps_dep kdebase-cursors '' 4.11)
-		$(add_kdeapps_dep kdebase-startkde '' 4.11)
-		$(add_kdeapps_dep kdepasswd)
-		$(add_kdeapps_dep khotkeys '' 4.11)
-		$(add_kdeapps_dep kinfocenter '' 4.11)
-		$(add_kdeapps_dep klipper '' 4.11)
-		$(add_kdeapps_dep kmenuedit '' 4.11)
-		$(add_kdeapps_dep krunner '' 4.11)
-		$(add_kdeapps_dep ksmserver '' 4.11)
-		$(add_kdeapps_dep ksplash '' 4.11)
-		$(add_kdeapps_dep ksysguard '' 4.11)
-		$(add_kdeapps_dep kwin '' 4.11)
-		$(add_kdeapps_dep kwrited '' 4.11)
-		$(add_kdebase_dep libkworkspace '' 4.11)
-		$(add_kdeapps_dep libplasmagenericshell '' 4.11)
-		$(add_kdeapps_dep libtaskmanager '' 4.11)
-		$(add_kdeapps_dep plasma-workspace '' 4.11)
-		$(add_kdeapps_dep powerdevil '' 4.11)
-		$(add_kdeapps_dep solid-actions-kcm '' 4.11)
-		$(add_kdeapps_dep systemsettings '' 4.11)
-		!prefix? ( display-manager? ( || ( $(add_kdeapps_dep kdm '' 4.11) x11-misc/lightdm x11-misc/sddm ) ) )
-	)
+	wallpapers? ( $(add_kdeapps_dep kde-wallpapers) )
 "

diff --git a/kde-apps/kdebase-meta/kdebase-meta-9999.ebuild b/kde-apps/kdebase-meta/kdebase-meta-9999.ebuild
index 55fa00f..3ff04ac 100644
--- a/kde-apps/kdebase-meta/kdebase-meta-9999.ebuild
+++ b/kde-apps/kdebase-meta/kdebase-meta-9999.ebuild
@@ -3,61 +3,26 @@
 # $Header: $
 
 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_kdeapps_dep kcheckpass '' 4.11)
-	wallpapers? ( $(add_kdeapps_dep kde-wallpapers '' 4.11) )
-	$(add_kdeapps_dep kde-base-artwork)
 	$(add_kdeapps_dep kdebase-runtime-meta)
 	$(add_kdeapps_dep kdialog)
 	$(add_kdeapps_dep keditbookmarks)
-	$(add_kdeapps_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_kdeapps_dep kscreensaver '' 4.11)
-	$(add_kdeapps_dep kstartupconfig '' 4.11)
-	$(add_kdeapps_dep kstyles '' 4.11)
-	$(add_kdeapps_dep ksystraycmd '' 4.11)
 	$(add_kdeapps_dep kwrite)
 	$(add_kdeapps_dep libkonq)
-	$(add_kdeapps_dep liboxygenstyle '' 4.11)
-	$(add_kdeapps_dep libplasmaclock '' 4.11)
 	$(add_kdeapps_dep nsplugins)
-	$(add_kdeapps_dep phonon-kde)
 	$(add_kdeapps_dep plasma-apps)
-	$(add_kdeapps_dep qguiplatformplugin_kde '' 4.11)
-	!minimal? (
-		$(add_kdeapps_dep freespacenotifier '' 4.11)
-		$(add_kdeapps_dep kcminit '' 4.11)
-		$(add_kdeapps_dep kdebase-cursors '' 4.11)
-		$(add_kdeapps_dep kdebase-startkde '' 4.11)
-		$(add_kdeapps_dep kdepasswd)
-		$(add_kdeapps_dep khotkeys '' 4.11)
-		$(add_kdeapps_dep kinfocenter '' 4.11)
-		$(add_kdeapps_dep klipper '' 4.11)
-		$(add_kdeapps_dep kmenuedit '' 4.11)
-		$(add_kdeapps_dep krunner '' 4.11)
-		$(add_kdeapps_dep ksmserver '' 4.11)
-		$(add_kdeapps_dep ksplash '' 4.11)
-		$(add_kdeapps_dep ksysguard '' 4.11)
-		$(add_kdeapps_dep kwin '' 4.11)
-		$(add_kdeapps_dep kwrited '' 4.11)
-		$(add_kdebase_dep libkworkspace '' 4.11)
-		$(add_kdeapps_dep libplasmagenericshell '' 4.11)
-		$(add_kdeapps_dep libtaskmanager '' 4.11)
-		$(add_kdeapps_dep plasma-workspace '' 4.11)
-		$(add_kdeapps_dep powerdevil '' 4.11)
-		$(add_kdeapps_dep solid-actions-kcm '' 4.11)
-		$(add_kdeapps_dep systemsettings '' 4.11)
-		!prefix? ( display-manager? ( || ( $(add_kdeapps_dep kdm '' 4.11) x11-misc/lightdm x11-misc/sddm ) ) )
-	)
+	wallpapers? ( $(add_kdeapps_dep kde-wallpapers) )
 "

diff --git a/kde-apps/kdebase-meta/metadata.xml b/kde-apps/kdebase-meta/metadata.xml
index a88b9cb..783e379 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>


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/kdebase-meta/
@ 2015-09-01 18:06 Michael Palimaka
  0 siblings, 0 replies; 8+ messages in thread
From: Michael Palimaka @ 2015-09-01 18:06 UTC (permalink / raw
  To: gentoo-commits

commit:     8da5b06dcb3649226730ea82d0de62cfe25cc330
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  1 17:59:40 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Sep  1 17:59:40 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=8da5b06d

Revert "[kde-apps/kdebase-meta] Update for KDE Applications."

This reverts commit 25da2233af7acd6e2a743d4d04dd0acbcec88413.

 .../kdebase-meta/kdebase-meta-15.08.49.9999.ebuild | 43 ++++++++++++++++++++--
 kde-apps/kdebase-meta/kdebase-meta-9999.ebuild     | 43 ++++++++++++++++++++--
 kde-apps/kdebase-meta/metadata.xml                 |  2 +
 3 files changed, 80 insertions(+), 8 deletions(-)

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

diff --git a/kde-apps/kdebase-meta/metadata.xml b/kde-apps/kdebase-meta/metadata.xml
index 783e379..a88b9cb 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">Install a Plasma 5 compatible subset of the package</flag>
 		<flag name="wallpapers">Install the KDE wallpapers</flag>
 	</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/kdebase-meta/
@ 2015-09-20 15:48 Manuel Rüger
  0 siblings, 0 replies; 8+ messages in thread
From: Manuel Rüger @ 2015-09-20 15:48 UTC (permalink / raw
  To: gentoo-commits

commit:     d489ee45e8304e057a471cbafb58387a04260426
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Sep 19 15:39:55 2015 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Sun Sep 20 15:48:26 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d489ee45

kde-apps/kdebase-meta: Move kde-apps/plasma-apps behind USE=-minimal

Though no blocker, it has no use on a plasma 5 system and needlessly
pulls in kde-apps/libkonq:4. In plasma 5 it is part of plasma-desktop.

Package-Manager: portage-2.2.20.1

 kde-apps/kdebase-meta/kdebase-meta-15.08.1.ebuild       | 2 +-
 kde-apps/kdebase-meta/kdebase-meta-15.08.49.9999.ebuild | 2 +-
 kde-apps/kdebase-meta/kdebase-meta-9999.ebuild          | 2 +-
 3 files changed, 3 insertions(+), 3 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 48f1213..db4904b 100644
--- a/kde-apps/kdebase-meta/kdebase-meta-15.08.1.ebuild
+++ b/kde-apps/kdebase-meta/kdebase-meta-15.08.1.ebuild
@@ -33,7 +33,6 @@ RDEPEND="
 	$(add_kdebase_dep libplasmaclock '' 4.11)
 	$(add_kdeapps_dep nsplugins)
 	$(add_kdeapps_dep phonon-kde)
-	$(add_kdeapps_dep plasma-apps)
 	$(add_kdebase_dep qguiplatformplugin_kde '' 4.11)
 	!minimal? (
 		$(add_kdebase_dep freespacenotifier '' 4.11)
@@ -54,6 +53,7 @@ RDEPEND="
 		$(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)

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 1fedf2e..6e6b870 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
@@ -33,7 +33,6 @@ RDEPEND="
 	$(add_kdebase_dep libplasmaclock '' 4.11)
 	$(add_kdeapps_dep nsplugins)
 	$(add_kdeapps_dep phonon-kde)
-	$(add_kdeapps_dep plasma-apps)
 	$(add_kdebase_dep qguiplatformplugin_kde '' 4.11)
 	!minimal? (
 		$(add_kdebase_dep freespacenotifier '' 4.11)
@@ -54,6 +53,7 @@ RDEPEND="
 		$(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)

diff --git a/kde-apps/kdebase-meta/kdebase-meta-9999.ebuild b/kde-apps/kdebase-meta/kdebase-meta-9999.ebuild
index 1fedf2e..6e6b870 100644
--- a/kde-apps/kdebase-meta/kdebase-meta-9999.ebuild
+++ b/kde-apps/kdebase-meta/kdebase-meta-9999.ebuild
@@ -33,7 +33,6 @@ RDEPEND="
 	$(add_kdebase_dep libplasmaclock '' 4.11)
 	$(add_kdeapps_dep nsplugins)
 	$(add_kdeapps_dep phonon-kde)
-	$(add_kdeapps_dep plasma-apps)
 	$(add_kdebase_dep qguiplatformplugin_kde '' 4.11)
 	!minimal? (
 		$(add_kdebase_dep freespacenotifier '' 4.11)
@@ -54,6 +53,7 @@ RDEPEND="
 		$(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)


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/kdebase-meta/
@ 2015-09-20 15:48 Manuel Rüger
  0 siblings, 0 replies; 8+ messages in thread
From: Manuel Rüger @ 2015-09-20 15:48 UTC (permalink / raw
  To: gentoo-commits

commit:     9e705e1c57538c5c75dc2d005bbdb4773552fbac
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu Sep 17 22:51:02 2015 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Sun Sep 20 15:48:26 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9e705e1c

kde-apps/kdebase-meta: Fix RDEPENDs

Package-Manager: portage-2.2.20.1

 kde-apps/kdebase-meta/kdebase-meta-15.08.1.ebuild  | 62 +++++++++++-----------
 .../kdebase-meta/kdebase-meta-15.08.49.9999.ebuild | 62 +++++++++++-----------
 kde-apps/kdebase-meta/kdebase-meta-9999.ebuild     | 62 +++++++++++-----------
 3 files changed, 93 insertions(+), 93 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 98f6c61..48f1213 100644
--- a/kde-apps/kdebase-meta/kdebase-meta-15.08.1.ebuild
+++ b/kde-apps/kdebase-meta/kdebase-meta-15.08.1.ebuild
@@ -11,53 +11,53 @@ IUSE="+display-manager minimal +wallpapers"
 
 RDEPEND="
 	$(add_kdeapps_dep dolphin)
-	$(add_kdeapps_dep kcheckpass '' 4.11)
-	wallpapers? ( $(add_kdeapps_dep kde-wallpapers '' 15.08.0) )
+	$(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_kdeapps_dep kephal '' 4.11)
+	$(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_kdeapps_dep kscreensaver '' 4.11)
-	$(add_kdeapps_dep kstartupconfig '' 4.11)
-	$(add_kdeapps_dep kstyles '' 4.11)
-	$(add_kdeapps_dep ksystraycmd '' 4.11)
+	$(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_kdeapps_dep liboxygenstyle '' 4.11)
-	$(add_kdeapps_dep libplasmaclock '' 4.11)
+	$(add_kdebase_dep liboxygenstyle '' 4.11)
+	$(add_kdebase_dep libplasmaclock '' 4.11)
 	$(add_kdeapps_dep nsplugins)
 	$(add_kdeapps_dep phonon-kde)
 	$(add_kdeapps_dep plasma-apps)
-	$(add_kdeapps_dep qguiplatformplugin_kde '' 4.11)
+	$(add_kdebase_dep qguiplatformplugin_kde '' 4.11)
 	!minimal? (
-		$(add_kdeapps_dep freespacenotifier '' 4.11)
-		$(add_kdeapps_dep kcminit '' 4.11)
-		$(add_kdeapps_dep kdebase-cursors '' 4.11)
-		$(add_kdeapps_dep kdebase-startkde '' 4.11)
+		$(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_kdeapps_dep khotkeys '' 4.11)
-		$(add_kdeapps_dep kinfocenter '' 4.11)
-		$(add_kdeapps_dep klipper '' 4.11)
-		$(add_kdeapps_dep kmenuedit '' 4.11)
-		$(add_kdeapps_dep krunner '' 4.11)
-		$(add_kdeapps_dep ksmserver '' 4.11)
-		$(add_kdeapps_dep ksplash '' 4.11)
-		$(add_kdeapps_dep ksysguard '' 4.11)
-		$(add_kdeapps_dep kwin '' 4.11)
-		$(add_kdeapps_dep kwrited '' 4.11)
+		$(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_kdeapps_dep libplasmagenericshell '' 4.11)
-		$(add_kdeapps_dep libtaskmanager '' 4.11)
-		$(add_kdeapps_dep plasma-workspace '' 4.11)
-		$(add_kdeapps_dep powerdevil '' 4.11)
-		$(add_kdeapps_dep solid-actions-kcm '' 4.11)
-		$(add_kdeapps_dep systemsettings '' 4.11)
-		!prefix? ( display-manager? ( || ( $(add_kdeapps_dep kdm '' 4.11) x11-misc/lightdm x11-misc/sddm ) ) )
+		$(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? ( display-manager? ( || ( $(add_kdebase_dep kdm '' 4.11) x11-misc/lightdm x11-misc/sddm ) ) )
 	)
 "

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 4372e3b..1fedf2e 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
@@ -11,53 +11,53 @@ IUSE="+display-manager minimal +wallpapers"
 
 RDEPEND="
 	$(add_kdeapps_dep dolphin)
-	$(add_kdeapps_dep kcheckpass '' 4.11)
-	wallpapers? ( $(add_kdeapps_dep kde-wallpapers '' 15.08.0) )
+	$(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_kdeapps_dep kephal '' 4.11)
+	$(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_kdeapps_dep kscreensaver '' 4.11)
-	$(add_kdeapps_dep kstartupconfig '' 4.11)
-	$(add_kdeapps_dep kstyles '' 4.11)
-	$(add_kdeapps_dep ksystraycmd '' 4.11)
+	$(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_kdeapps_dep liboxygenstyle '' 4.11)
-	$(add_kdeapps_dep libplasmaclock '' 4.11)
+	$(add_kdebase_dep liboxygenstyle '' 4.11)
+	$(add_kdebase_dep libplasmaclock '' 4.11)
 	$(add_kdeapps_dep nsplugins)
 	$(add_kdeapps_dep phonon-kde)
 	$(add_kdeapps_dep plasma-apps)
-	$(add_kdeapps_dep qguiplatformplugin_kde '' 4.11)
+	$(add_kdebase_dep qguiplatformplugin_kde '' 4.11)
 	!minimal? (
-		$(add_kdeapps_dep freespacenotifier '' 4.11)
-		$(add_kdeapps_dep kcminit '' 4.11)
-		$(add_kdeapps_dep kdebase-cursors '' 4.11)
-		$(add_kdeapps_dep kdebase-startkde '' 4.11)
+		$(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_kdeapps_dep khotkeys '' 4.11)
-		$(add_kdeapps_dep kinfocenter '' 4.11)
-		$(add_kdeapps_dep klipper '' 4.11)
-		$(add_kdeapps_dep kmenuedit '' 4.11)
-		$(add_kdeapps_dep krunner '' 4.11)
-		$(add_kdeapps_dep ksmserver '' 4.11)
-		$(add_kdeapps_dep ksplash '' 4.11)
-		$(add_kdeapps_dep ksysguard '' 4.11)
-		$(add_kdeapps_dep kwin '' 4.11)
-		$(add_kdeapps_dep kwrited '' 4.11)
+		$(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_kdeapps_dep libplasmagenericshell '' 4.11)
-		$(add_kdeapps_dep libtaskmanager '' 4.11)
-		$(add_kdeapps_dep plasma-workspace '' 4.11)
-		$(add_kdeapps_dep powerdevil '' 4.11)
-		$(add_kdeapps_dep solid-actions-kcm '' 4.11)
-		$(add_kdeapps_dep systemsettings '' 4.11)
-		!prefix? ( display-manager? ( || ( $(add_kdeapps_dep kdm '' 4.11) x11-misc/lightdm x11-misc/sddm ) ) )
+		$(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? ( display-manager? ( || ( $(add_kdebase_dep kdm '' 4.11) 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 4372e3b..1fedf2e 100644
--- a/kde-apps/kdebase-meta/kdebase-meta-9999.ebuild
+++ b/kde-apps/kdebase-meta/kdebase-meta-9999.ebuild
@@ -11,53 +11,53 @@ IUSE="+display-manager minimal +wallpapers"
 
 RDEPEND="
 	$(add_kdeapps_dep dolphin)
-	$(add_kdeapps_dep kcheckpass '' 4.11)
-	wallpapers? ( $(add_kdeapps_dep kde-wallpapers '' 15.08.0) )
+	$(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_kdeapps_dep kephal '' 4.11)
+	$(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_kdeapps_dep kscreensaver '' 4.11)
-	$(add_kdeapps_dep kstartupconfig '' 4.11)
-	$(add_kdeapps_dep kstyles '' 4.11)
-	$(add_kdeapps_dep ksystraycmd '' 4.11)
+	$(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_kdeapps_dep liboxygenstyle '' 4.11)
-	$(add_kdeapps_dep libplasmaclock '' 4.11)
+	$(add_kdebase_dep liboxygenstyle '' 4.11)
+	$(add_kdebase_dep libplasmaclock '' 4.11)
 	$(add_kdeapps_dep nsplugins)
 	$(add_kdeapps_dep phonon-kde)
 	$(add_kdeapps_dep plasma-apps)
-	$(add_kdeapps_dep qguiplatformplugin_kde '' 4.11)
+	$(add_kdebase_dep qguiplatformplugin_kde '' 4.11)
 	!minimal? (
-		$(add_kdeapps_dep freespacenotifier '' 4.11)
-		$(add_kdeapps_dep kcminit '' 4.11)
-		$(add_kdeapps_dep kdebase-cursors '' 4.11)
-		$(add_kdeapps_dep kdebase-startkde '' 4.11)
+		$(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_kdeapps_dep khotkeys '' 4.11)
-		$(add_kdeapps_dep kinfocenter '' 4.11)
-		$(add_kdeapps_dep klipper '' 4.11)
-		$(add_kdeapps_dep kmenuedit '' 4.11)
-		$(add_kdeapps_dep krunner '' 4.11)
-		$(add_kdeapps_dep ksmserver '' 4.11)
-		$(add_kdeapps_dep ksplash '' 4.11)
-		$(add_kdeapps_dep ksysguard '' 4.11)
-		$(add_kdeapps_dep kwin '' 4.11)
-		$(add_kdeapps_dep kwrited '' 4.11)
+		$(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_kdeapps_dep libplasmagenericshell '' 4.11)
-		$(add_kdeapps_dep libtaskmanager '' 4.11)
-		$(add_kdeapps_dep plasma-workspace '' 4.11)
-		$(add_kdeapps_dep powerdevil '' 4.11)
-		$(add_kdeapps_dep solid-actions-kcm '' 4.11)
-		$(add_kdeapps_dep systemsettings '' 4.11)
-		!prefix? ( display-manager? ( || ( $(add_kdeapps_dep kdm '' 4.11) x11-misc/lightdm x11-misc/sddm ) ) )
+		$(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? ( display-manager? ( || ( $(add_kdebase_dep kdm '' 4.11) x11-misc/lightdm x11-misc/sddm ) ) )
 	)
 "


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/kdebase-meta/
@ 2015-09-22 13:21 Michael Palimaka
  0 siblings, 0 replies; 8+ messages in thread
From: Michael Palimaka @ 2015-09-22 13:21 UTC (permalink / raw
  To: gentoo-commits

commit:     33be0c862fa3e7345cbc95ba8fb572a2785586c9
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 22 13:20:23 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Sep 22 13:21:32 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=33be0c86

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

 kde-apps/kdebase-meta/kdebase-meta-15.08.1.ebuild  | 45 +++-------------------
 .../kdebase-meta/kdebase-meta-15.08.49.9999.ebuild | 45 +++-------------------
 kde-apps/kdebase-meta/kdebase-meta-9999.ebuild     | 45 +++-------------------
 kde-apps/kdebase-meta/metadata.xml                 |  2 -
 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 db4904b..af5f30d 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 6e6b870..efd19be 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 6e6b870..efd19be 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 a88b9cb..783e379 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>


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/kdebase-meta/
@ 2016-01-16 18:11 Michael Palimaka
  0 siblings, 0 replies; 8+ messages in thread
From: Michael Palimaka @ 2016-01-16 18:11 UTC (permalink / raw
  To: gentoo-commits

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>


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/kdebase-meta/
@ 2016-01-18 18:16 Michael Palimaka
  0 siblings, 0 replies; 8+ messages in thread
From: Michael Palimaka @ 2016-01-18 18:16 UTC (permalink / raw
  To: gentoo-commits

commit:     44acc4528aa5e799ef7c91db20dd62d97d260500
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Jan 18 17:35:32 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Jan 18 18:16:39 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=44acc452

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

 .../kdebase-meta/kdebase-meta-15.08.3-r1.ebuild     | 21 ---------------------
 .../kdebase-meta/kdebase-meta-15.08.3-r2.ebuild     | 16 ++++++++++++++++
 .../kdebase-meta/kdebase-meta-15.12.1-r1.ebuild     | 21 ---------------------
 .../kdebase-meta/kdebase-meta-15.12.1-r2.ebuild     | 16 ++++++++++++++++
 .../kdebase-meta/kdebase-meta-15.12.49.9999.ebuild  |  9 ++-------
 kde-apps/kdebase-meta/kdebase-meta-9999.ebuild      |  9 ++-------
 kde-apps/kdebase-meta/metadata.xml                  |  5 -----
 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 ec21c6c..0000000
--- 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 0000000..96f2bad
--- /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 841f3dd..0000000
--- 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 0000000..96f2bad
--- /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 1d2b3bd..7b99080 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 1d2b3bd..7b99080 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 0f092fd..a23f444 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>


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/kdebase-meta/
@ 2018-06-10 16:29 Johannes Huber
  0 siblings, 0 replies; 8+ messages in thread
From: Johannes Huber @ 2018-06-10 16:29 UTC (permalink / raw
  To: gentoo-commits

commit:     627a3e215fc3a74be420b5fd296f2803654d7517
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 10 16:23:57 2018 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Jun 10 16:23:57 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=627a3e21

kde-apps/kdebase-meta: EAPI 7

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 kde-apps/kdebase-meta/kdebase-meta-18.04.49.9999.ebuild | 2 +-
 kde-apps/kdebase-meta/kdebase-meta-9999.ebuild          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-apps/kdebase-meta/kdebase-meta-18.04.49.9999.ebuild b/kde-apps/kdebase-meta/kdebase-meta-18.04.49.9999.ebuild
index b1a9260f97..a52b44fab4 100644
--- a/kde-apps/kdebase-meta/kdebase-meta-18.04.49.9999.ebuild
+++ b/kde-apps/kdebase-meta/kdebase-meta-18.04.49.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit kde5-meta-pkg
 

diff --git a/kde-apps/kdebase-meta/kdebase-meta-9999.ebuild b/kde-apps/kdebase-meta/kdebase-meta-9999.ebuild
index b1a9260f97..a52b44fab4 100644
--- a/kde-apps/kdebase-meta/kdebase-meta-9999.ebuild
+++ b/kde-apps/kdebase-meta/kdebase-meta-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit kde5-meta-pkg
 


^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2018-06-10 16:29 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-20 15:48 [gentoo-commits] proj/kde:master commit in: kde-apps/kdebase-meta/ Manuel Rüger
  -- strict thread matches above, loose matches on Subject: below --
2018-06-10 16:29 Johannes Huber
2016-01-18 18:16 Michael Palimaka
2016-01-16 18:11 Michael Palimaka
2015-09-22 13:21 Michael Palimaka
2015-09-20 15:48 Manuel Rüger
2015-09-01 18:06 Michael Palimaka
2014-11-29 17:26 Michael Palimaka

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox