[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     0626526494dfa356290323670f1a63e436d83f7f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 10 18:24:58 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 10 18:46:11 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=06265264

kde-plasma/plasma-workspace: Rebase startkde-script.patch, drop RDEPENDs

Upstream commit 5374513266ee707dee23ef43db7eba18c7b6cb3b

Thanks-to: Duncan <1i5t5.duncan <AT> cox.net>
Closes: https://bugs.gentoo.org/670810
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../plasma-workspace-5.14.80-startkde-script.patch | 39 ++++++++++++++++++++++
 .../plasma-workspace/plasma-workspace-9999.ebuild  |  4 +--
 2 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.14.80-startkde-script.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.14.80-startkde-script.patch
new file mode 100644
index 0000000000..44e86a0169
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.14.80-startkde-script.patch
@@ -0,0 +1,39 @@
+From bf569560bf195ac4e79d65d4103a7161a6a2f2ac Mon Sep 17 00:00:00 2001
+From: Elias Probst <mail@eliasprobst.eu>
+Date: Sat, 4 Jul 2015 11:33:01 +0200
+Subject: [PATCH] [startkde] Gentoo FHS script support
+
+---
+ startkde/startkde.cmake | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
+index 2585600..9350158 100644
+--- a/startkde/startkde.cmake
++++ b/startkde/startkde.cmake
+@@ -210,6 +210,11 @@ for prefix in `echo $scriptpath`; do
+   done
+ done
+ 
++# Gentoo part for FHS installs
++for file in "@GENTOO_PORTAGE_EPREFIX@/etc/plasma/startup/"*.sh; do
++  test -r "${file}" && . "${file}"
++done
++
+ # Set a left cursor instead of the standard X11 "X" cursor, since I've heard
+ # from some users that they're confused and don't know what to do. This is
+ # especially necessary on slow machines, where starting KDE takes one or two
+@@ -417,6 +422,11 @@ for prefix in `echo "$scriptpath"`; do
+   done
+ done
+ 
++# Gentoo part for FHS installs
++for file in "@GENTOO_PORTAGE_EPREFIX@/etc/plasma/shutdown/"*.sh; do
++  test -r "${file}" && . "${file}"
++done
++
+ unset KDE_FULL_SESSION
+ xprop -root -remove KDE_FULL_SESSION
+ unset KDE_SESSION_VERSION
+-- 
+2.3.6

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
index 7b96ecd714..d3df49e518 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
@@ -100,11 +100,9 @@ RDEPEND="${COMMON_DEPEND}
 	$(add_qt_dep qtpaths)
 	$(add_qt_dep qtquickcontrols 'widgets')
 	app-text/iso-codes
-	x11-apps/mkfontdir
 	x11-apps/xmessage
 	x11-apps/xprop
 	x11-apps/xrdb
-	x11-apps/xset
 	x11-apps/xsetroot
 	systemd? ( sys-apps/dbus[user-session] )
 	!systemd? ( sys-apps/dbus )
@@ -123,7 +121,7 @@ PDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-5.4-startkde-script.patch"
+	"${FILESDIR}/${PN}-5.14.80-startkde-script.patch"
 	"${FILESDIR}/${PN}-5.10-startplasmacompositor-script.patch"
 	"${FILESDIR}/${PN}-5.12.80-tests-optional.patch"
 	"${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch"