5 files changed, 261 insertions, 6 deletions
diff --git a/kde-base/kdebase-startkde/Manifest b/kde-base/kdebase-startkde/Manifest
index 77db501df1a..ea13b3da558 100644
--- a/kde-base/kdebase-startkde/Manifest
+++ b/kde-base/kdebase-startkde/Manifest
@@ -1,6 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX agent-shutdown.sh 323 RMD160 9a0451c1e58e688c022ecd2b37f08cac433b187d SHA1 1abb7a1503a80d95e4db34fa7fe58accce6e8109 SHA256 6a2d645ef38d3db9d36166fac699848d07eb166f71a646d7f1466efeb394eb11
 AUX agent-startup.sh 955 RMD160 bbe8abb4734bb7364edc45265b10ae2a2887db66 SHA1 f7dfd044b6f09e5ad0f04842e51c7f9e62fad718 SHA256 c63fd6233b1711ede4fbb5b30460c5b1ddee840f0f5123db953ee3ab298da8f9
 AUX gentoo-startkde4-3.patch 2589 RMD160 777b2cb0918493242023ed248be01d50ac0e526a SHA1 af57698fe5f6bdd13e7defa935a93618153c4de1 SHA256 796b516105aff26ff139b21f4472ba5dbd41599652c35ad5ca191a9d9ff6e5ef
-EBUILD kdebase-startkde-4.6.9999.ebuild 3548 RMD160 6ac837e28939a2dd34514249e1bad02b3c5ea99f SHA1 6a6e756225c3b85aa87402e51ab84dc708f7e305 SHA256 361db0326bdf28bab33bbefb880055c09ab8a568d7d9a8418ed7b873805ea24b
-EBUILD kdebase-startkde-9999.ebuild 3509 RMD160 fe7808470e3665a72b7bcb34d2ce88ebc3d634ac SHA1 0daae01349702ee4caea43d53f8e0a6e1a7c479e SHA256 b24c2f96a3f69c5d66268027cef3bf679779db680bc5d780b26cf58dde43674d
+AUX sessionfile 1956 RMD160 2ca096f3cee11cf4414e74ec1551ded57b18961c SHA1 eeb45f382a1a4d68110175ccf24c7bf60682b498 SHA256 ff65678fec6b660c499aa900699471c2aea4af4629c5f28985e571aa0f7e94c2
+DIST kdebase-workspace-4.6.1.tar.bz2 69489744 RMD160 9170d1e5a47a9684fcf517ff0be33ef457986cdc SHA1 e37691d88ddbf92cc95ec39849a1331404c84fd5 SHA256 b2c113aec1e5c79b31f2dcac718ba94d142fe39e8e9640d13d19c2dcbf5fae98
+EBUILD kdebase-startkde-4.6.1-r2.ebuild 3643 RMD160 b6940cf4b740b64af05520095edfe23c2a9f42b3 SHA1 a66fd3fab5f5c3d95df273d425086a235f61b45e SHA256 027bdfeea5a6fb837944c9ce219b9ed306e0bfb75a91ccad808678a3d4e138a2
+EBUILD kdebase-startkde-4.6.9999.ebuild 3591 RMD160 ece7020d61a1510db9b4f6f07d09c297427ee8a2 SHA1 88cfd25518638b794dd5362986d1b99e2a45f47a SHA256 f1a83de122dbb7c81544c796bcd2c726298f8f5d78d0be5a12a453b6d7f03c49
+EBUILD kdebase-startkde-9999.ebuild 3552 RMD160 9c4516212cc83d645c296db507277fa695366447 SHA1 53e4cc0cc6550e0016163ef0532d5f8f15f074b3 SHA256 deaa2512e9e1507bdf16ef7726c7c75014e68ff396f03b0ef292614c8f17416c
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCgAGBQJNjjEfAAoJENwGBM22xffeYNMP/0LstMKmgkSJze/AZtloY2BA
+k/AyjcF8iBvNoPPHBLMxVW3xf+udGhkeP5p81LouC4Df1mJDLT9gg6ktC7wYpHX3
+14Tm+9HaWmgi/7cQ9hf2xpme4zFK3mDn03XEH3DZ+z/xR19VzZw/cKCZgS3x/5qt
+da0qNi6zXD81AXsy8vapp1dqSu3PkhszFvFyMAsaJ+3Ok9Zpeuox9LwSpayQmrDa
+ZDJEvbDNSlPLoyTyDSMqMJ861y4T31LeEcl+cSNVMSSOb2qWn56InRPJFG0QRR1D
+oz0BKsJ184CTtjrGYkJdVXGjGCRO32kn9FmmTi/sTRaoVfPbZXgPo3PJHoNKx9Mo
+8LcBwBYhegBRM6pG5HZ1AixrALvXvfRE81YFfm2zkGJ2jfxJXYP4VFWm0cUOqd5G
+B+ZsvOAF4wFu7SXm50W/fVXzBYYOznOmFyb1Hjakgcshi/FO6n2/TUCYIV7kqiGh
+bVDolyqtiRB9xiIvJdNhBW7dex0Mi4Sm9WGunKtjZgD521AJtmJp+LdIFWbbpwJl
+fDgXW2MN2O0UkPREmcszblNBgY+XfE7slazPaeadtpDZC0TsCSh0tGjDRigTLMgd
+g2Hg/ruR81rvx1SLA1Tbn+3OulHO6O3CrNEh31fgR6itK7NhCFqP1BnZBV+gBnsY
+iTILHKMb3M/Pjc3NE935
+=nuXB
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdebase-startkde/files/sessionfile b/kde-base/kdebase-startkde/files/sessionfile
new file mode 100755
index 00000000000..bab47c26273
--- /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.1-r2.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.6.1-r2.ebuild
new file mode 100644
index 00000000000..e98f87d17a4
--- /dev/null
+++ b/kde-base/kdebase-startkde/kdebase-startkde-4.6.1-r2.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+
+KMNAME="kdebase-workspace"
+KMNOMODULE="true"
+inherit kde4-meta multilib prefix
+
+DESCRIPTION="Startkde script, which starts a complete KDE session, and associated scripts"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+# The KDE apps called from the startkde script.
+# These provide the most minimal KDE desktop.
+RDEPEND="
+	$(add_kdebase_dep kcminit)
+	$(add_kdebase_dep kdebase-runtime-meta)
+	$(add_kdebase_dep kdebase-wallpapers)
+	$(add_kdebase_dep kfmclient)
+	$(add_kdebase_dep knotify)
+	$(add_kdebase_dep kreadconfig)
+	$(add_kdebase_dep krunner)
+	$(add_kdebase_dep ksmserver)
+	$(add_kdebase_dep ksplash)
+	$(add_kdebase_dep kstartupconfig)
+	$(add_kdebase_dep kwin)
+	$(add_kdebase_dep phonon-kde)
+	$(add_kdebase_dep plasma-apps)
+	$(add_kdebase_dep plasma-workspace)
+	$(add_kdebase_dep systemsettings)
+	x11-apps/mkfontdir
+	x11-apps/xmessage
+	x11-apps/xprop
+	x11-apps/xrandr
+	x11-apps/xrdb
+	x11-apps/xsetroot
+	x11-apps/xset
+"
+
+KMEXTRACTONLY="
+	ConfigureChecks.cmake
+	kdm/
+	startkde.cmake
+"
+
+PATCHES=("${FILESDIR}/gentoo-startkde4-3.patch")
+
+src_prepare() {
+	kde4-meta_src_prepare
+
+	# Patch the startkde script to setup the environment for KDE
+	# List all the multilib libdirs
+	local _libdir _libdirs=
+	for _libdir in $(get_all_libdirs); do
+		_libdirs+=":${EKDEDIR}/${_libdir}"
+	done
+	_libdirs=${_libdirs#:}
+
+	# Sort the LDFLAGS out if necessary
+	if use kdeprefix; then
+		sed -e "s#@REPLACE_LDFLAGS@#export LDFLAGS=${_libdirs}:\$LDFLAGS#" \
+			-i startkde.cmake || die "Sed for LDPATH failed."
+	else
+		sed -e "s#@REPLACE_LDFLAGS@##" \
+			-i startkde.cmake || die "sed for LDPATH failed"
+	fi
+
+	# Complete LDPATH
+	sed -e "s#@REPLACE_LIBDIR@#$(get_libdir)#" \
+		-i startkde.cmake || die "Sed for REPLACE_LIBDIR failed."
+	# Now fix the prefix
+	sed -e "s#@REPLACE_PREFIX@#${KDEDIR}#" \
+		-i startkde.cmake || die "Sed for REPLACE_PREFIX failed."
+	# ... and fix ${EPREFIX}
+	eprefixify startkde.cmake
+}
+
+src_install() {
+	kde4-meta_src_install
+
+	# startup and shutdown scripts
+	if use kdeprefix; then
+		insinto "${KDEDIR}/env"
+	else
+		insinto "/etc/kde/startup"
+	fi
+	doins "${FILESDIR}/agent-startup.sh" || die "doexe agent-startup.sh failed"
+
+	if use kdeprefix; then
+		exeinto "${KDEDIR}/shutdown"
+	else
+		exeinto "/etc/kde/shutdown"
+	fi
+	doexe "${FILESDIR}/agent-shutdown.sh" || die "doexe agent-shutdown.sh failed"
+
+	if use kdeprefix; then
+		KDE_X="KDE-${SLOT}"
+	else
+		KDE_X="KDE-4"
+	fi
+
+	# x11 session script
+	cp "${FILESDIR}/sessionfile" "${T}/${KDE_X}" || die
+	cat <<-EOF >> "${T}/${KDE_X}"
+	exec "${EKDEDIR}/bin/startkde"
+	EOF
+	exeinto /etc/X11/Sessions
+	doexe "${T}/${KDE_X}" || die "doexe ${KDE_X} failed"
+
+	# freedesktop compliant session script
+	sed -e "s:\${KDE4_BIN_INSTALL_DIR}:${EKDEDIR}/bin:g;s:Name=KDE:Name=KDE ${SLOT}:" \
+		"${S}/kdm/kfrontend/sessions/kde-plasma.desktop.cmake" > "${T}/${KDE_X}.desktop"
+	insinto /usr/share/xsessions
+	doins "${T}/${KDE_X}.desktop" || die "doins ${KDE_X}.desktop failed"
+}
+
+pkg_postinst () {
+	kde4-meta_pkg_postinst
+
+	echo
+	elog "To enable gpg-agent and/or ssh-agent in KDE sessions,"
+	if use kdeprefix; then
+		elog "edit ${EKDEDIR}/env/agent-startup.sh and"
+		elog "${EKDEDIR}/shutdown/agent-shutdown.sh"
+	else
+		elog "edit ${EPREFIX}/etc/kde/startup/agent-startup.sh and"
+		elog "${EPREFIX}/etc/kde/shutdown/agent-shutdown.sh"
+	fi
+	echo
+	elog "The name of the session script has changed."
+	elog "If you currently have XSESSION=\"kde-${SLOT}\" in your"
+	elog "configuration files, you will need to change it to"
+	elog "XSESSION=\"${KDE_X}\""
+}
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 013a8986fb7..c3362c357b2 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 c8fcffab59b..9686a498a63 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