Tweak the PATH, ROOTHPATH and XDG_DATA_DIRS variables, thanks to Matthias Dahl <ua_bugz_gentoo@mortal-soul.de> in bug 237718. Also tweaked KDEDIRS to remove /usr as this was never used.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64

4 files changed, 167 insertions, 2 deletions

diff --git a/kde-base/kdebase-startkde/ChangeLog b/kde-base/kdebase-startkde/ChangeLog
index d05a94744fab..91835001c3a0 100644
--- a/kde-base/kdebase-startkde/ChangeLog
+++ b/kde-base/kdebase-startkde/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for kde-base/kdebase-startkde
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.125 2008/09/13 23:57:59 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.126 2008/09/27 18:02:17 cryos Exp $
+
+*kdebase-startkde-3.5.10-r1 (27 Sep 2008)
+
+  27 Sep 2008; Marcus D. Hanwell <cryos@gentoo.org>
+  +files/kdebase-startkde-3.5-gentoo.patch,
+  +kdebase-startkde-3.5.10-r1.ebuild:
+  Tweak the PATH, ROOTHPATH and XDG_DATA_DIRS variables, thanks to Matthias
+  Dahl <ua_bugz_gentoo@mortal-soul.de> in bug 237718. Also tweaked KDEDIRS
+  to remove /usr as this was never used.
 
 *kdebase-startkde-3.5.10 (13 Sep 2008)
 
diff --git a/kde-base/kdebase-startkde/Manifest b/kde-base/kdebase-startkde/Manifest
index eb0bc4a76024..ad5dcb672743 100644
--- a/kde-base/kdebase-startkde/Manifest
+++ b/kde-base/kdebase-startkde/Manifest
@@ -1,15 +1,17 @@
 AUX agent-shutdown.sh 323 RMD160 9a0451c1e58e688c022ecd2b37f08cac433b187d SHA1 1abb7a1503a80d95e4db34fa7fe58accce6e8109 SHA256 6a2d645ef38d3db9d36166fac699848d07eb166f71a646d7f1466efeb394eb11
 AUX agent-startup.sh 955 RMD160 bbe8abb4734bb7364edc45265b10ae2a2887db66 SHA1 f7dfd044b6f09e5ad0f04842e51c7f9e62fad718 SHA256 c63fd6233b1711ede4fbb5b30460c5b1ddee840f0f5123db953ee3ab298da8f9
 AUX gentoo-startkde.patch 2117 RMD160 5905ab727f2d7e66733b459da2997707ff269396 SHA1 b425a63453116c1a68060548b4fab1fde29dad4e SHA256 0609638a4c1a67e2406b1a0d23a032e80791182e4bd4b632ee3949c19f516a97
+AUX kdebase-startkde-3.5-gentoo.patch 2010 RMD160 4bf1af5998320f1dd24da6b77640b3c9b34c9d84 SHA1 664f7a3cd7fa968494860ed010dad49f39909e6d SHA256 ec9a2c42f958474158ba57f5dd57e97401c6e81a666ecefbba2029a23b33d7cc
 DIST kdebase-3.5-patchset-08.tar.bz2 23090 RMD160 c78298981aa5d0a6295b40160860e10e9ade1ff8 SHA1 22715c39a1769a7cbdf3e0ff73425459eadab01d SHA256 2dc4cd3842f07644769555c821445f945262db62b51f92ba55610146d16c499a
 DIST kdebase-3.5-patchset-13.tar.bz2 26504 RMD160 b723ba39de234131c3081be714d2919c5e5e38b5 SHA1 77d04b90d92ada8078263f2720f5e30d5ffdaa6e SHA256 78dc069a6d007d1dbf97147c368e7a4fda0dee5d41b15c471fde0589f0c377e0
 DIST kdebase-3.5.10.tar.bz2 24339704 RMD160 5845e94fbb8b5b64934d62dc9bd3b580d26d07bc SHA1 1a72e4170a0a953ed70c0693a034947d87b6efbd SHA256 77aa9d8f28c532f2e7a5157a7f4ba8df1001f00fa1cb72cb70b388b3d0e16b61
 DIST kdebase-3.5.9.tar.bz2 24239563 RMD160 2552d850e62efd044c178e2eb04efdcce90e4a33 SHA1 a6a19e0b26ed7a2b138a4a7594c8486e26610de8 SHA256 6e958803055928cda73273996696e5f7aaad803a3854853f4ec44428c49c831e
 DIST kdebase-workspace-4.0.4.tar.bz2 29604848 RMD160 df9868f650138dc77d6d7f87666a0f4375dcee73 SHA1 c5a3078e602f78ac6a262761b24ad16f3d01e7a7 SHA256 8e641f7e53474d9b39bde9fe183bb5c1f43c11f72a02d271f16fcead5b74b76c
 DIST kdebase-workspace-4.0.5.tar.bz2 29690232 RMD160 bf234c0633dc3c2ae22d59c0d51234bcb829eb50 SHA1 702236af68f60f43fb07a9289ebee71f1626cc53 SHA256 2c59ed8884d5adf09f84a4f295aecf86cb381d5a3f72bed13ab0c3889f765e3e
+EBUILD kdebase-startkde-3.5.10-r1.ebuild 2658 RMD160 f2332888f1176b55c312d661e2e368f4164cc418 SHA1 528dfb75b739a47cdcdf109db42cd0bea79f6703 SHA256 402dc614ad7b14dcfdc1e6e6810800c54f24d7501ff8b3cd2a8c2994d3ae892b
 EBUILD kdebase-startkde-3.5.10.ebuild 2676 RMD160 129bed36c79475cc6fa1ad2bcccbf8fe2301b500 SHA1 510e24a5bed17cf5bbc58eb92b81b84639b4ade5 SHA256 f00386eac6ed5fc751b59b358be1e746d025f874cb36d0dbadd4047a7b67cca7
 EBUILD kdebase-startkde-3.5.9.ebuild 2655 RMD160 b94be06d7482e08542c16ff2809a8fdc4bf4a5a1 SHA1 400376a3fc0fc9456e01519beda9b257e8a3aa85 SHA256 3eda0945a65f82c11cb58c7d1231bdbdea8d4a63dfb86abe2dd7b6942a9b598a
 EBUILD kdebase-startkde-4.0.4.ebuild 2887 RMD160 a7312c58372b89d84a23e13a2af73da529e43993 SHA1 08e3e12e2aadcb3d6afa7d6c6aca5d4229443baa SHA256 92603ed36d974ed00288039041299b0d28a363294e566c326a7f0a460c6f54a0
 EBUILD kdebase-startkde-4.0.5.ebuild 2891 RMD160 ec208da6e2574b9c8467c4812c27f79bef38b887 SHA1 bfd9375af217c7eb7a64ad134d56efc4ae7b99a3 SHA256 37fb8fd8e38605e0a6b86c6994922158f5969f05a48b9ac5c0996aa3ba8807c7
-MISC ChangeLog 18977 RMD160 403189e335581d61d06f49168be5ef061f703d77 SHA1 5d4e4f2a1cc105d2eaa31ac28d1220f49b341989 SHA256 3aac54ed84aca896589c28c44c8bc48e7ab48f9a900b8db3344bc14865ab6bab
+MISC ChangeLog 19347 RMD160 8d16ee360784352956ef0f9fd18ac7cfb374fdbe SHA1 4490376ca62108f1fb989b0f1e5d8cea2ded3e44 SHA256 f4669dcc15f828dcbe0841df7ae8c2442f3ba594613aefd9e23e75e53e635d8b
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kdebase-startkde/files/kdebase-startkde-3.5-gentoo.patch b/kde-base/kdebase-startkde/files/kdebase-startkde-3.5-gentoo.patch
new file mode 100644
index 000000000000..21d5f90b09a8
--- /dev/null
+++ b/kde-base/kdebase-startkde/files/kdebase-startkde-3.5-gentoo.patch
@@ -0,0 +1,62 @@
+--- startkde.orig	2008-08-19 21:56:42.000000000 +0200
++++ startkde	2008-09-15 14:39:53.000000000 +0200
+@@ -7,6 +7,15 @@
+ # because we still need to do some cleanup.
+ trap 'echo GOT SIGHUP' HUP
+ 
++# Gentoo: setup environment, filter other slotted KDE installs from PATH
++_KDEDIR=@REPLACE_PREFIX@
++export KDEDIRS=${_KDEDIR}:/usr/local
++export PATH=${_KDEDIR}/bin:$(echo ${PATH} | sed 's/$/:/g;s#/usr/kde/[^/]*/s\?bin/\?:##g;s/:$//g')
++export ROOTPATH=${_KDEDIR}/sbin:${_KDEDIR}/bin:$(echo ${PATH} | sed 's/$/:/g;s#/usr/kde/[^/]*/s\?bin/\?:##g;s/:$//g')
++export LDPATH=@REPLACE_LIBS@:${LDPATH}
++export XDG_DATA_DIRS=${_KDEDIR}/share:$(echo ${XDG_DATA_DIRS} | sed 's/$/:/g;s#/usr/kde/[^/]*/share/\?:##g;s/:$//g')
++# Gentoo part ends
++
+ # Check if a KDE session already is running
+ if kcheckrunning >/dev/null 2>&1; then
+ 	echo "KDE seems to be already running on this display."
+@@ -14,6 +23,20 @@
+ 	exit 1
+ fi
+ 
++# Gentoo part:
++# Scrapped old KDE 3.x -> 3.y update code, but keep symlink code
++cd ${HOME}
++if [ -L .kde -o ! -d .kde ]; then
++	# handle ~/.kde* dirs - separate ones for separate KDEs
++	rm -f .kde
++	if [ ! -e .kde3.5 ]; then
++		mkdir .kde3.5
++		cd ${HOME}
++	fi
++	ln -sf .kde3.5 .kde
++fi
++# Gentoo part ends
++
+ # Set the background to plain grey.
+ # The standard X background is nasty, causing moire effects and exploding
+ # people's heads. We use colours from the standard KDE palette for those with
+@@ -180,6 +203,13 @@
+   done
+ done
+ 
++# Source scripts in /etc/X11/xinit/xinitrc.d/ for system-level defined stuff
++if test -d "/etc/X11/xinit/xinitrc.d/"; then
++  for file in "/etc/X11/xinit/xinitrc.d/"*; do
++    test -x "$file" && . "$file"
++  done
++fi
++
+ # Activate the kde font directories.
+ #
+ # There are 4 directories that may be used for supplying fonts for KDE.
+@@ -386,7 +416,7 @@
+ # Clean up
+ kdeinit_shutdown
+ dcopserver_shutdown --wait
+-artsshell -q terminate
++if test -e ${_KDEDIR}/bin/artsshell ; then artsshell -q terminate ; fi
+ # KDE4 support
+ kde4 kdeinit4_shutdown 2>/dev/null
+ 
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-3.5.10-r1.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-3.5.10-r1.ebuild
new file mode 100644
index 000000000000..a68a987aa45a
--- /dev/null
+++ b/kde-base/kdebase-startkde/kdebase-startkde-3.5.10-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-3.5.10-r1.ebuild,v 1.1 2008/09/27 18:02:18 cryos Exp $
+
+KMNAME=kdebase
+KMNOMODULE=true
+KMEXTRACTONLY="kdm/kfrontend/sessions/kde.desktop.in startkde"
+EAPI="1"
+inherit multilib kde-meta eutils
+
+DESCRIPTION="startkde script, which starts a complete KDE session, and associated scripts"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+# The kde apps called from the startkde script.
+# kdesktop, kicker etc are started because they put files in $KDEDIR/share/autostart
+# and so in theory they aren't strictly necessary deps.
+RDEPEND="x11-apps/xmessage
+		x11-apps/xsetroot
+		x11-apps/xset
+		x11-apps/xrandr
+		x11-apps/mkfontdir
+		x11-apps/xprop
+>=kde-base/kdesktop-${PV}:${SLOT}
+>=kde-base/kcminit-${PV}:${SLOT}
+>=kde-base/ksmserver-${PV}:${SLOT}
+>=kde-base/kwin-${PV}:${SLOT}
+>=kde-base/kpersonalizer-${PV}:${SLOT}
+>=kde-base/kreadconfig-${PV}:${SLOT}
+>=kde-base/ksplashml-${PV}:${SLOT}"
+
+PATCHES=( "${FILESDIR}/${PN}-3.5-gentoo.patch" )
+
+src_compile() {
+	# Patch the startkde script to setup the environment for KDE 4.0
+	# Add our KDEDIR
+	sed -i -e "s#@REPLACE_PREFIX@#${PREFIX}#" \
+		"${S}/startkde" || die "Sed for PREFIX failed."
+
+	# List all the multilib libdirs
+	local _libdir _libdirs
+	for _libdir in $(get_all_libdirs); do
+		_libdirs="${_libdirs}:${PREFIX}/${_libdir}"
+	done
+	_libdirs=${_libdirs#:}
+
+	# Complete LDPATH
+	sed -i -e "s#@REPLACE_LIBS@#${_libdirs}#" \
+		"${S}/startkde" || die "Sed for LDPATH failed."
+}
+
+src_install() {
+	# startkde script
+	exeinto "${KDEDIR}/bin"
+	doexe startkde
+
+	# startup and shutdown scripts
+	insinto "${KDEDIR}/env"
+	doins "${WORKDIR}/patches/agent-startup.sh"
+
+	exeinto "${KDEDIR}/shutdown"
+	doexe "${WORKDIR}/patches/agent-shutdown.sh"
+
+	# freedesktop environment variables
+	cat <<EOF > "${T}/xdg.sh"
+export XDG_CONFIG_DIRS="${KDEDIR}/etc/xdg"
+EOF
+	insinto "${KDEDIR}/env"
+	doins "${T}/xdg.sh"
+
+	# x11 session script
+	cat <<EOF > "${T}/kde-${SLOT}"
+#!/bin/sh
+exec ${KDEDIR}/bin/startkde
+EOF
+	exeinto /etc/X11/Sessions
+	doexe "${T}/kde-${SLOT}"
+
+	# (not really) freedesktop compliant session script
+	sed -e "s:@KDE_BINDIR@:${KDEDIR}/bin:g;s:Name=KDE:Name=KDE ${SLOT}:" \
+		"${S}/kdm/kfrontend/sessions/kde.desktop.in" > "${T}/kde-${SLOT}.desktop"
+	insinto /usr/share/xsessions
+	doins "${T}/kde-${SLOT}.desktop"
+}
+
+pkg_postinst () {
+	echo
+	elog "To enable gpg-agent and/or ssh-agent in KDE sessions,"
+	elog "edit ${KDEDIR}/env/agent-startup.sh and"
+	elog "${KDEDIR}/shutdown/agent-shutdown.sh"
+	echo
+}