commit: 58c9b056731ab991ea6e03ac5120266a83a3b99c
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Jul 9 10:41:38 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Jul 9 21:26:55 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58c9b056
kde-base/kdebase-startkde: Merge kdebase-runtime-meta here
Gets rid of slot 5 dependency.
Package-Manager: portage-2.2.28
Signed-off-by: Johannes Huber <johu <AT> gentoo.org>
...2.ebuild => kdebase-startkde-4.11.22-r2.ebuild} | 49 ++++++++++++++++++----
.../kdebase-startkde-4.11.22.ebuild | 44 ++++++++++++++++---
kde-base/kdebase-startkde/metadata.xml | 15 +++----
3 files changed, 89 insertions(+), 19 deletions(-)
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.11.22.ebuild
b/kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild
similarity index 61%
copy from kde-base/kdebase-startkde/kdebase-startkde-4.11.22.ebuild
copy to kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild
index eabe8d1..1d17106 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-4.11.22.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild
@@ -9,26 +9,58 @@ KMNOMODULE="true"
inherit kde4-meta prefix
DESCRIPTION="Startkde script, which starts a complete KDE session, and
associated scripts"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-IUSE="+wallpapers"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="crash-reporter +handbook +wallpapers"
# The KDE apps called from the startkde script.
# These provide the most minimal KDE desktop.
RDEPEND="
- $(add_kdebase_dep kcminit)
+ $(add_kdeapps_dep attica)
+ $(add_kdeapps_dep kcmshell)
+ $(add_kdeapps_dep kcontrol)
+ $(add_kdeapps_dep kdebase-data)
+ $(add_kdeapps_dep kdebase-desktoptheme)
+ $(add_kdeapps_dep kdebase-kioslaves)
+ $(add_kdeapps_dep kdebase-menu)
+ $(add_kdeapps_dep kdebase-menu-icons)
+ $(add_kdeapps_dep kdebugdialog)
+ $(add_kdeapps_dep kdesu)
+ $(add_kdeapps_dep kdontchangethehostname)
+ $(add_kdeapps_dep keditfiletype)
+ $(add_kdeapps_dep kfile)
$(add_kdeapps_dep kfmclient)
+ $(add_kdeapps_dep kglobalaccel)
+ $(add_kdeapps_dep kiconfinder)
+ $(add_kdeapps_dep kimgio)
+ $(add_kdeapps_dep kioclient)
+ $(add_kdeapps_dep kmimetypefinder)
+ $(add_kdeapps_dep knetattach)
+ $(add_kdeapps_dep knewstuff)
+ $(add_kdeapps_dep knotify)
$(add_kdeapps_dep knotify)
+ $(add_kdeapps_dep kpasswdserver)
+ $(add_kdeapps_dep kquitapp)
$(add_kdeapps_dep kreadconfig)
+ $(add_kdeapps_dep kstart)
+ $(add_kdeapps_dep ktimezoned)
+ $(add_kdeapps_dep ktraderclient)
+ $(add_kdeapps_dep kuiserver)
+ $(add_kdeapps_dep kurifilter-plugins)
+ $(add_kdeapps_dep kwalletd)
+ $(add_kdeapps_dep kwalletmanager)
+ $(add_kdeapps_dep phonon-kde)
+ $(add_kdeapps_dep plasma-apps)
+ $(add_kdeapps_dep plasma-runtime)
+ $(add_kdeapps_dep renamedlg-plugins)
+ $(add_kdeapps_dep solid-runtime)
+ $(add_kdebase_dep kcminit)
$(add_kdebase_dep krunner)
$(add_kdebase_dep ksmserver)
$(add_kdebase_dep ksplash)
$(add_kdebase_dep kstartupconfig)
$(add_kdebase_dep kwin)
- $(add_kdeapps_dep phonon-kde)
- $(add_kdeapps_dep plasma-apps)
$(add_kdebase_dep plasma-workspace)
$(add_kdebase_dep systemsettings)
- kde-apps/kdebase-runtime-meta:5
x11-apps/mkfontdir
x11-apps/xmessage
x11-apps/xprop
@@ -36,7 +68,9 @@ RDEPEND="
x11-apps/xrdb
x11-apps/xsetroot
x11-apps/xset
- wallpapers? ( $(add_kdeapps_dep kde-wallpapers '' 15.08.3) )
+ crash-reporter? ( $(add_kdeapps_dep drkonqi ) )
+ handbook? ( kde-apps/khelpcenter:* )
+ wallpapers? ( kde-apps/kde-wallpapers:* )
"
KMEXTRACTONLY="
@@ -48,6 +82,7 @@ KMEXTRACTONLY="
PATCHES=(
"${FILESDIR}/gentoo-startkde4-4.patch"
"${FILESDIR}/${PN}-kscreen.patch"
+ "${FILESDIR}/${PN}-kwalletd-pam.patch"
)
src_prepare() {
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.11.22.ebuild
b/kde-base/kdebase-startkde/kdebase-startkde-4.11.22.ebuild
index eabe8d1..6181680 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-4.11.22.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-4.11.22.ebuild
@@ -10,25 +10,57 @@ inherit kde4-meta prefix
DESCRIPTION="Startkde script, which starts a complete KDE session, and
associated scripts"
KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-IUSE="+wallpapers"
+IUSE="crash-reporter +handbook +wallpapers"
# The KDE apps called from the startkde script.
# These provide the most minimal KDE desktop.
RDEPEND="
- $(add_kdebase_dep kcminit)
+ $(add_kdeapps_dep attica)
+ $(add_kdeapps_dep kcmshell)
+ $(add_kdeapps_dep kcontrol)
+ $(add_kdeapps_dep kdebase-data)
+ $(add_kdeapps_dep kdebase-desktoptheme)
+ $(add_kdeapps_dep kdebase-kioslaves)
+ $(add_kdeapps_dep kdebase-menu)
+ $(add_kdeapps_dep kdebase-menu-icons)
+ $(add_kdeapps_dep kdebugdialog)
+ $(add_kdeapps_dep kdesu)
+ $(add_kdeapps_dep kdontchangethehostname)
+ $(add_kdeapps_dep keditfiletype)
+ $(add_kdeapps_dep kfile)
$(add_kdeapps_dep kfmclient)
+ $(add_kdeapps_dep kglobalaccel)
+ $(add_kdeapps_dep kiconfinder)
+ $(add_kdeapps_dep kimgio)
+ $(add_kdeapps_dep kioclient)
+ $(add_kdeapps_dep kmimetypefinder)
+ $(add_kdeapps_dep knetattach)
+ $(add_kdeapps_dep knewstuff)
+ $(add_kdeapps_dep knotify)
$(add_kdeapps_dep knotify)
+ $(add_kdeapps_dep kpasswdserver)
+ $(add_kdeapps_dep kquitapp)
$(add_kdeapps_dep kreadconfig)
+ $(add_kdeapps_dep kstart)
+ $(add_kdeapps_dep ktimezoned)
+ $(add_kdeapps_dep ktraderclient)
+ $(add_kdeapps_dep kuiserver)
+ $(add_kdeapps_dep kurifilter-plugins)
+ $(add_kdeapps_dep kwalletd)
+ $(add_kdeapps_dep kwalletmanager)
+ $(add_kdeapps_dep phonon-kde)
+ $(add_kdeapps_dep plasma-apps)
+ $(add_kdeapps_dep plasma-runtime)
+ $(add_kdeapps_dep renamedlg-plugins)
+ $(add_kdeapps_dep solid-runtime)
+ $(add_kdebase_dep kcminit)
$(add_kdebase_dep krunner)
$(add_kdebase_dep ksmserver)
$(add_kdebase_dep ksplash)
$(add_kdebase_dep kstartupconfig)
$(add_kdebase_dep kwin)
- $(add_kdeapps_dep phonon-kde)
- $(add_kdeapps_dep plasma-apps)
$(add_kdebase_dep plasma-workspace)
$(add_kdebase_dep systemsettings)
- kde-apps/kdebase-runtime-meta:5
x11-apps/mkfontdir
x11-apps/xmessage
x11-apps/xprop
@@ -36,6 +68,8 @@ RDEPEND="
x11-apps/xrdb
x11-apps/xsetroot
x11-apps/xset
+ crash-reporter? ( $(add_kdeapps_dep drkonqi ) )
+ handbook? ( kde-apps/khelpcenter:* )
wallpapers? ( $(add_kdeapps_dep kde-wallpapers '' 15.08.3) )
"
diff --git a/kde-base/kdebase-startkde/metadata.xml
b/kde-base/kdebase-startkde/metadata.xml
index 0f5bf96..33a8a55 100644
--- a/kde-base/kdebase-startkde/metadata.xml
+++ b/kde-base/kdebase-startkde/metadata.xml
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
<pkgmetadata>
-<maintainer type="project">
- <email>[email protected]</email>
- <name>Gentoo KDE Project</name>
- </maintainer>
- <use>
- <flag name="wallpapers">Install the KDE wallpapers</flag>
- </use>
+ <maintainer type="project">
+ <email>[email protected]</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
+ <use>
+ <flag name="crash-reporter">Builds a gui tool to submit crash
information to the upstream backtracker</flag>
+ <flag name="wallpapers">Install the KDE wallpapers</flag>
+ </use>
</pkgmetadata>
