[gentoo-commits] proj/kde:master commit in: kde-base/kdebase-startkde/, kde-base/kdebase-startkde/files/

[gentoo-commits] proj/kde:master commit in: kde-base/kdebase-startkde/, kde-base/kdebase-startkde/files/

[Tomas Chvatal]

commit:     0370cfc8e5289006af9d2c35ada2177a38fb2daa
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 24 12:22:08 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Thu Mar 24 12:22:08 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=0370cfc8

kde-base/kdebase-startkde Fixup xdg_dirs mangling so they are not added twice.

---
 .../kdebase-startkde/files/4.5.0-fix_malloc.patch  |   22 --------------------
 ...-startkde4-2.patch => gentoo-startkde4-3.patch} |   18 ++++++++++------
 .../kdebase-startkde-4.6.9999.ebuild               |    2 +-
 .../kdebase-startkde/kdebase-startkde-9999.ebuild  |    2 +-
 4 files changed, 13 insertions(+), 31 deletions(-)

diff --git a/kde-base/kdebase-startkde/files/4.5.0-fix_malloc.patch b/kde-base/kdebase-startkde/files/4.5.0-fix_malloc.patch
deleted file mode 100644
index c08d1c0..0000000
--- a/kde-base/kdebase-startkde/files/4.5.0-fix_malloc.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -urN kdebase-workspace-4.5.0/startkde.cmake kdebase-workspace-4.5.0.new//startkde.cmake
---- kdebase-workspace-4.5.0/startkde.cmake	2010-03-10 11:42:55.000000000 +0100
-+++ kdebase-workspace-4.5.0.new//startkde.cmake	2010-08-11 19:04:48.786127814 +0200
-@@ -36,18 +36,6 @@
- # we have to unset this for Darwin since it will screw up KDE's dynamic-loading
- unset DYLD_FORCE_FLAT_NAMESPACE
- 
--# Enable lightweight memory corruption checker if not already set
--# -- this is for trunk only, we remove it for releases
--if [ "x$MALLOC_CHECK_" = "x" ] && [ -x /lib/libc.so.6 ]; then
--    # Extract the first two components of the version from the output.
--    glibc_version=$(LC_ALL=C /lib/libc.so.6 | sed -e 's/[^0-9]*\([0-9]\.[0-9]\+\).*/\1/;s/\.\([0-9]\)$/.0\1/;q')
--
--    MALLOC_CHECK_=2 # Default to 2 unless glibc 2.9 or higher.
--    test $glibc_version \> 2.08 && MALLOC_CHECK_=3
--
--    export MALLOC_CHECK_
--fi
--
- # in case we have been started with full pathname spec without being in PATH
- bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
- if [ -n "$bindir" ]; then

diff --git a/kde-base/kdebase-startkde/files/gentoo-startkde4-2.patch b/kde-base/kdebase-startkde/files/gentoo-startkde4-3.patch
similarity index 82%
rename from kde-base/kdebase-startkde/files/gentoo-startkde4-2.patch
rename to kde-base/kdebase-startkde/files/gentoo-startkde4-3.patch
index f23dc02..90c1ea2 100644
--- a/kde-base/kdebase-startkde/files/gentoo-startkde4-2.patch
+++ b/kde-base/kdebase-startkde/files/gentoo-startkde4-3.patch
@@ -1,7 +1,6 @@
-diff -Naur kdebase-startkde-4.2.0-orig/startkde.cmake kdebase-startkde-4.2.0/startkde.cmake
---- kdebase-startkde-4.2.0-orig/startkde.cmake	2009-01-17 05:00:28.000000000 -0600
-+++ kdebase-startkde-4.2.0/startkde.cmake	2009-02-21 12:52:02.000000000 -0600
-@@ -7,6 +7,35 @@
+--- startkde.cmake.old	2011-03-24 13:07:04.919889148 +0100
++++ startkde.cmake	2011-03-24 13:14:42.033174445 +0100
+@@ -13,6 +13,40 @@
  # because we still need to do some cleanup.
  trap 'echo GOT SIGHUP' HUP
  
@@ -12,7 +11,12 @@ diff -Naur kdebase-startkde-4.2.0-orig/startkde.cmake kdebase-startkde-4.2.0/sta
 +fi
 +@REPLACE_LDPATH@
 +export STRIGI_PLUGIN_PATH="${_KDEDIR}/@REPLACE_LIBDIR@/strigi:${STRIGI_PLUGIN_PATH}"
-+export XDG_DATA_DIRS=${_KDEDIR}/share:$(echo ${XDG_DATA_DIRS} | sed 's/$/:/g;s#@GENTOO_PORTAGE_EPREFIX@/usr/kde/[^/]*/share/\?:##g;s/:$//g')
++xdgs=$(echo ${XDG_DATA_DIRS} | sed 's/$/:/g;s#@GENTOO_PORTAGE_EPREFIX@/usr/kde/[^/]*/share/\?:##g;s/:$//g')
++if [ "$xdgs" != *"${_KDEDIR}/share"* ]; then
++	xdgs="${_KDEDIR}/share:${xdgs}"
++fi
++export XDG_DATA_DIRS=${xdgs}
++unset xdgs
 +
 +if [ -z "$HOME" ]; then
 +	xmessage "HOME is unset. Your user config seems to be broken. Aborting."
@@ -37,7 +41,7 @@ diff -Naur kdebase-startkde-4.2.0-orig/startkde.cmake kdebase-startkde-4.2.0/sta
  # Check if a KDE session already is running and whether it's possible to connect to X
  kcheckrunning
  kcheckrunning_result=$?
-@@ -214,6 +243,13 @@
+@@ -187,6 +221,13 @@
    done
  done
  
@@ -51,7 +55,7 @@ diff -Naur kdebase-startkde-4.2.0-orig/startkde.cmake kdebase-startkde-4.2.0/sta
  # Set the path for Qt plugins provided by KDE
  if test -n "$QT_PLUGIN_PATH"; then
    QT_PLUGIN_PATH="$QT_PLUGIN_PATH:`kde4-config --path qtplugins`"
-@@ -427,6 +463,13 @@
+@@ -400,6 +441,13 @@
    done
  done
  

diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.6.9999.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.6.9999.ebuild
index a013174..013a898 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-4.6.9999.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-4.6.9999.ebuild
@@ -45,7 +45,7 @@ KMEXTRACTONLY="
 	startkde.cmake
 "
 
-PATCHES=("${FILESDIR}/gentoo-startkde4-2.patch")
+PATCHES=("${FILESDIR}/gentoo-startkde4-3.patch")
 
 src_prepare() {
 	kde4-meta_src_prepare

diff --git a/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild
index 9440d8e..c8fcffa 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild
@@ -44,7 +44,7 @@ KMEXTRACTONLY="
 	startkde.cmake
 "
 
-PATCHES=("${FILESDIR}/gentoo-startkde4-2.patch")
+PATCHES=("${FILESDIR}/gentoo-startkde4-3.patch")
 
 src_prepare() {
 	kde4-meta_src_prepare

[gentoo-commits] proj/kde:master commit in: kde-base/kdebase-startkde/, kde-base/kdebase-startkde/files/

[Andreas K. Huettel]

commit:     6bcb69c64b3e898f5508955a5d9344760ed9ad20
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sat Mar 26 18:31:59 2011 +0000
Commit:     Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 18:31:59 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=6bcb69c6

[kde-base/kdebase-startkde] Added session startup file from xinit with minor modifications. Please test.

(Portage version: 2.1.9.44/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

---
 kde-base/kdebase-startkde/files/sessionfile        |   96 ++++++++++++++++++++
 ...999.ebuild => kdebase-startkde-4.6.1-r2.ebuild} |    6 +-
 .../kdebase-startkde-4.6.9999.ebuild               |    4 +-
 .../kdebase-startkde/kdebase-startkde-9999.ebuild  |    4 +-
 4 files changed, 103 insertions(+), 7 deletions(-)

diff --git a/kde-base/kdebase-startkde/files/sessionfile b/kde-base/kdebase-startkde/files/sessionfile
new file mode 100755
index 0000000..bab47c2
--- /dev/null
+++ b/kde-base/kdebase-startkde/files/sessionfile
@@ -0,0 +1,96 @@
+#!/bin/sh
+# $XConsortium: Xsession /main/10 1995/12/18 18:21:28 gildea $
+
+# source of this file: x11-apps/xinit-1.3.0-r2
+
+case $# in
+1)
+	case $1 in
+	failsafe)
+		exec xterm -geometry 80x24-0-0
+		;;
+	esac
+esac
+
+# redirect errors to a file in user's home directory if we can
+for errfile in "$HOME/.xsession-errors" "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER"
+do
+	if ( cp /dev/null "$errfile" 2> /dev/null )
+	then
+		chmod 600 "$errfile"
+		exec > "$errfile" 2>&1
+		break
+	fi
+done
+
+# clean up after xbanner
+if which freetemp 2> /dev/null ; then
+	freetemp
+fi
+
+userresources=$HOME/.Xresources 
+usermodmap=$HOME/.Xmodmap 
+userxkbmap=$HOME/.Xkbmap
+
+sysresources=/etc/X11/Xresources 
+sysmodmap=/etc/X11/Xmodmap 
+sysxkbmap=/etc/X11/Xkbmap
+
+rh6sysresources=/etc/X11/xinit/Xresources 
+rh6sysmodmap=/etc/X11/xinit/Xmodmap 
+
+
+# merge in defaults
+if [ -f "$rh6sysresources" ]; then
+    xrdb -merge "$rh6sysresources"
+fi
+
+if [ -f "$sysresources" ]; then
+    xrdb -merge "$sysresources"
+fi
+
+if [ -f "$userresources" ]; then
+    xrdb -merge "$userresources"
+fi
+
+# merge in keymaps
+if [ -f "$sysxkbmap" ]; then
+    setxkbmap `cat "$sysxkbmap"`
+    XKB_IN_USE=yes
+fi
+
+if [ -f "$userxkbmap" ]; then
+    setxkbmap `cat "$userxkbmap"`
+    XKB_IN_USE=yes
+fi
+
+#
+# Eeek, this seems like too much magic here
+#
+if [ -z "$XKB_IN_USE" -a ! -L /etc/X11/X ]; then
+    if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then
+       xkbsymbols=`sed -n -e 's/^[     ]*XkbSymbols[   ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config`
+       if [ -n "$xkbsymbols" ]; then
+           setxkbmap -symbols "$xkbsymbols"
+           XKB_IN_USE=yes
+       fi
+    fi
+fi
+
+# xkb and xmodmap don't play nice together
+if [ -z "$XKB_IN_USE" ]; then
+    if [ -f "$rh6sysmodmap" ]; then
+       xmodmap "$rh6sysmodmap"
+    fi
+
+    if [ -f "$sysmodmap" ]; then
+       xmodmap "$sysmodmap"
+    fi
+
+    if [ -f "$usermodmap" ]; then
+       xmodmap "$usermodmap"
+    fi
+fi
+
+unset XKB_IN_USE
+

diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.6.9999.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.6.1-r2.ebuild
similarity index 95%
copy from kde-base/kdebase-startkde/kdebase-startkde-4.6.9999.ebuild
copy to kde-base/kdebase-startkde/kdebase-startkde-4.6.1-r2.ebuild
index 013a898..e98f87d 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-4.6.9999.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-4.6.1-r2.ebuild
@@ -9,7 +9,7 @@ KMNOMODULE="true"
 inherit kde4-meta multilib prefix
 
 DESCRIPTION="Startkde script, which starts a complete KDE session, and associated scripts"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 # The KDE apps called from the startkde script.
@@ -102,8 +102,8 @@ src_install() {
 	fi
 
 	# x11 session script
-	cat <<-EOF > "${T}/${KDE_X}"
-	#!/bin/sh
+	cp "${FILESDIR}/sessionfile" "${T}/${KDE_X}" || die
+	cat <<-EOF >> "${T}/${KDE_X}"
 	exec "${EKDEDIR}/bin/startkde"
 	EOF
 	exeinto /etc/X11/Sessions

diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.6.9999.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.6.9999.ebuild
index 013a898..c3362c3 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-4.6.9999.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-4.6.9999.ebuild
@@ -102,8 +102,8 @@ src_install() {
 	fi
 
 	# x11 session script
-	cat <<-EOF > "${T}/${KDE_X}"
-	#!/bin/sh
+	cp "${FILESDIR}/sessionfile" "${T}/${KDE_X}" || die
+	cat <<-EOF >> "${T}/${KDE_X}"
 	exec "${EKDEDIR}/bin/startkde"
 	EOF
 	exeinto /etc/X11/Sessions

diff --git a/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild
index c8fcffa..9686a49 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild
@@ -101,8 +101,8 @@ src_install() {
 	fi
 
 	# x11 session script
-	cat <<-EOF > "${T}/${KDE_X}"
-	#!/bin/sh
+	cp "${FILESDIR}/sessionfile" "${T}/${KDE_X}" || die
+	cat <<-EOF >> "${T}/${KDE_X}"
 	exec "${EKDEDIR}/bin/startkde"
 	EOF
 	exeinto /etc/X11/Sessions

[gentoo-commits] proj/kde:master commit in: kde-base/kdebase-startkde/, kde-base/kdebase-startkde/files/

[Marc Schiffbauer]

commit:     b172b02e599f3ee8fad05f4c93d32889ae1ec41c
Author:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  5 13:07:38 2011 +0000
Commit:     Marc Schiffbauer <marc <AT> schiffbauer <DOT> net>
CommitDate: Tue Jul  5 13:07:38 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b172b02e

[kde-base/kdebase-startkde] Do not set MALLOC_CHECK_. Fixes bug #374077. Thx to Nikos Chantziaras

(Portage version: 2.2.0_alpha43/git/Linux x86_64, signed Manifest commit with key 0x35A64134)

---
 .../kdebase-startkde_do_not_set_MALLOC_CHECK.patch |   21 ++++++++++++++++++++
 .../kdebase-startkde-4.6.90.ebuild                 |    5 +++-
 2 files changed, 25 insertions(+), 1 deletions(-)

diff --git a/kde-base/kdebase-startkde/files/kdebase-startkde_do_not_set_MALLOC_CHECK.patch b/kde-base/kdebase-startkde/files/kdebase-startkde_do_not_set_MALLOC_CHECK.patch
new file mode 100644
index 0000000..8c62f8c
--- /dev/null
+++ b/kde-base/kdebase-startkde/files/kdebase-startkde_do_not_set_MALLOC_CHECK.patch
@@ -0,0 +1,21 @@
+--- a/startkde.cmake
++++ b/startkde.cmake
+@@ -36,18 +36,6 @@ fi
+ # we have to unset this for Darwin since it will screw up KDE's dynamic-loading
+ unset DYLD_FORCE_FLAT_NAMESPACE
+ 
+-# Enable lightweight memory corruption checker if not already set
+-# -- this is for trunk only, we remove it for releases
+-if [ "x$MALLOC_CHECK_" = "x" ] && [ -x /lib/libc.so.6 ]; then
+-    # Extract the first two components of the version from the output.
+-    glibc_version=$(LC_ALL=C /lib/libc.so.6 | sed -e 's/[^0-9]*\([0-9]\.[0-9]\+\).*/\1/;s/\.\([0-9]\)$/.0\1/;q')
+-
+-    MALLOC_CHECK_=2 # Default to 2 unless glibc 2.9 or higher.
+-    test $glibc_version \> 2.08 && MALLOC_CHECK_=3
+-
+-    export MALLOC_CHECK_
+-fi
+-
+ # in case we have been started with full pathname spec without being in PATH
+ bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
+ if [ -n "$bindir" ]; then

diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.6.90.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.6.90.ebuild
index 14f6fa9..7bf3eb4 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-4.6.90.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-4.6.90.ebuild
@@ -45,7 +45,10 @@ KMEXTRACTONLY="
 	startkde.cmake
 "
 
-PATCHES=("${FILESDIR}/gentoo-startkde4-4.patch")
+PATCHES=(
+	"${FILESDIR}/gentoo-startkde4-4.patch"
+	"${FILESDIR}/kdebase-startkde_do_not_set_MALLOC_CHECK.patch"
+)
 
 src_prepare() {
 	kde4-meta_src_prepare

[gentoo-commits] proj/kde:master commit in: kde-base/kdebase-startkde/, kde-base/kdebase-startkde/files/

[Jonathan Callen]

commit:     ff970431bb0db3643e8c66a492fdcea8e0a217cc
Author:     Jonathan Callen <abcd <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 29 19:58:46 2011 +0000
Commit:     Jonathan Callen <abcd <AT> gentoo <DOT> org>
CommitDate: Sat Oct 29 19:59:03 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=ff970431

[kde-base/kdebase-startkde] Upstream changed a variable

---
 .../kdebase-startkde_do_not_set_MALLOC_CHECK.patch |   21 --------------------
 .../kdebase-startkde/kdebase-startkde-9999.ebuild  |    2 +-
 2 files changed, 1 insertions(+), 22 deletions(-)

diff --git a/kde-base/kdebase-startkde/files/kdebase-startkde_do_not_set_MALLOC_CHECK.patch b/kde-base/kdebase-startkde/files/kdebase-startkde_do_not_set_MALLOC_CHECK.patch
deleted file mode 100644
index 8c62f8c..0000000
--- a/kde-base/kdebase-startkde/files/kdebase-startkde_do_not_set_MALLOC_CHECK.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/startkde.cmake
-+++ b/startkde.cmake
-@@ -36,18 +36,6 @@ fi
- # we have to unset this for Darwin since it will screw up KDE's dynamic-loading
- unset DYLD_FORCE_FLAT_NAMESPACE
- 
--# Enable lightweight memory corruption checker if not already set
--# -- this is for trunk only, we remove it for releases
--if [ "x$MALLOC_CHECK_" = "x" ] && [ -x /lib/libc.so.6 ]; then
--    # Extract the first two components of the version from the output.
--    glibc_version=$(LC_ALL=C /lib/libc.so.6 | sed -e 's/[^0-9]*\([0-9]\.[0-9]\+\).*/\1/;s/\.\([0-9]\)$/.0\1/;q')
--
--    MALLOC_CHECK_=2 # Default to 2 unless glibc 2.9 or higher.
--    test $glibc_version \> 2.08 && MALLOC_CHECK_=3
--
--    export MALLOC_CHECK_
--fi
--
- # in case we have been started with full pathname spec without being in PATH
- bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
- if [ -n "$bindir" ]; then

diff --git a/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild
index 7df5355..7e9525c 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild
@@ -71,7 +71,7 @@ src_install() {
 	doexe "${T}/KDE-4"
 
 	# freedesktop compliant session script
-	sed -e "s:\${KDE4_BIN_INSTALL_DIR}:${EPREFIX}/usr/bin:g" \
+	sed -e "s:\${BIN_INSTALL_DIR}:${EPREFIX}/usr/bin:g" \
 		"${S}/kdm/kfrontend/sessions/kde-plasma.desktop.cmake" > "${T}/KDE-4.desktop"
 	insinto /usr/share/xsessions
 	doins "${T}/KDE-4.desktop"

[gentoo-commits] proj/kde:master commit in: kde-base/kdebase-startkde/, kde-base/kdebase-startkde/files/

[Michael Palimaka]

commit:     f43a9f34e3d0223a96a60ac9a7506608b665ce26
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  3 18:01:11 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Oct  3 18:01:11 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=f43a9f34

[kde-base/kdebase-startkde] Fix KDE failing to start wrt bug #524266.

Solves regression introduced by f7f5d84c85b6c7f946b94808849648b4cb6ea667.

Package-Manager: portage-2.2.12

---
 .../files/kdebase-startkde-kscreen.patch             | 20 ++++++++++++++++++++
 .../kdebase-startkde-4.11.49.9999.ebuild             |  5 ++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/kde-base/kdebase-startkde/files/kdebase-startkde-kscreen.patch b/kde-base/kdebase-startkde/files/kdebase-startkde-kscreen.patch
new file mode 100644
index 0000000..65644af
--- /dev/null
+++ b/kde-base/kdebase-startkde/files/kdebase-startkde-kscreen.patch
@@ -0,0 +1,20 @@
+Only try to run krandrstartup if it exists wrt bug #524266.
+
+After f7f5d84c85b6c7f946b94808849648b4cb6ea667, krandrstartup is no longer
+available if kde-base/systemsettings is built with USE="kscreen". Otherwise,
+KDE will fail to start
+
+Source: http://pkgs.fedoraproject.org/cgit/kde-workspace.git/tree/startkde.cmake
+diff --git a/startkde.cmake b/startkde.cmake
+index afc2cfb..4220e64 100644
+--- a/startkde.cmake
++++ b/startkde.cmake
+@@ -105,7 +105,7 @@ if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize"
+     fi
+ fi
+ 
+-. krandrstartup
++KRANDRSTARTUP=`which krandrstartup 2>/dev/null` && . $KRANDRSTARTUP
+ 
+ if test "$kcmfonts_general_forcefontdpi" -ne 0; then
+     xrdb -quiet -merge -nocpp <<EOF

diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.11.49.9999.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.11.49.9999.ebuild
index c0e4019..373e2dc 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-4.11.49.9999.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-4.11.49.9999.ebuild
@@ -45,7 +45,10 @@ KMEXTRACTONLY="
 	startkde.cmake
 "
 
-PATCHES=("${FILESDIR}/gentoo-startkde4-4.patch")
+PATCHES=(
+	"${FILESDIR}/gentoo-startkde4-4.patch"
+	"${FILESDIR}/${PN}-kscreen.patch"
+)
 
 src_prepare() {
 	kde4-meta_src_prepare