Version bump to remove KDEDIRS and add kdeglobals as discussed in bug 237718.

(Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64)

3 files changed, 121 insertions, 2 deletions

diff --git a/kde-base/kdebase-startkde/ChangeLog b/kde-base/kdebase-startkde/ChangeLog
index 8e4b6bfc8be1..109cf31689c4 100644
--- a/kde-base/kdebase-startkde/ChangeLog
+++ b/kde-base/kdebase-startkde/ChangeLog
@@ -1,6 +1,14 @@
 # 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.128 2008/10/02 12:10:25 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.129 2008/10/04 20:39:36 cryos Exp $
+
+*kdebase-startkde-3.5.10-r3 (04 Oct 2008)
+
+  04 Oct 2008; Marcus D. Hanwell <cryos@gentoo.org>
+  files/kdebase-startkde-3.5-gentoo.patch,
+  +kdebase-startkde-3.5.10-r3.ebuild:
+  Version bump to remove KDEDIRS and add kdeglobals as discussed in bug
+  237718.
 
 *kdebase-startkde-4.1.2 (02 Oct 2008)
 
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
index 17373e56c76a..7a2d0c39f2a1 100644
--- a/kde-base/kdebase-startkde/files/kdebase-startkde-3.5-gentoo.patch
+++ b/kde-base/kdebase-startkde/files/kdebase-startkde-3.5-gentoo.patch
@@ -6,7 +6,7 @@
  
 +# Gentoo: setup environment, filter other slotted KDE installs from PATH
 +_KDEDIR=@REPLACE_PREFIX@
-+export KDEDIRS=${_KDEDIR}:/usr:/usr/local
++#export KDEDIRS=${_KDEDIR}:/usr:/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}
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-3.5.10-r3.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-3.5.10-r3.ebuild
new file mode 100644
index 000000000000..f47fdc02b7f1
--- /dev/null
+++ b/kde-base/kdebase-startkde/kdebase-startkde-3.5.10-r3.ebuild
@@ -0,0 +1,111 @@
+# 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-r3.ebuild,v 1.1 2008/10/04 20:39:36 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"
+
+	# kdeglobals needed to make third party apps installed in /usr work
+	cat <<EOF > "${T}/kdeglobals"
+[Directories][\$i]
+dir_lib=/usr/$(get_libdir)
+dir_apps=/usr/share/applnk
+dir_data=/usr/share/apps
+dir_icon=/usr/share/icons
+dir_module=/usr/$(get_libdir)/kde3
+dir_config=/usr/share/config
+dir_kcfg=/usr/share/config.kcfg
+dir_exe=/usr/bin
+dir_mime=/usr/share/mimelnk
+dir_services=/usr/share/services
+dir_servicetypes=/usr/share/servicetypes
+dir_templates=/usr/share/templates
+EOF
+	insinto ${KDEDIR}/share/config
+	doins "${T}/kdeglobals"
+}
+
+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
+}