Change name of X11 session script to match FDO session script name

Package-Manager: portage--svn/cvs/Linux i686

3 files changed, 151 insertions, 2 deletions

diff --git a/kde-base/kdebase-startkde/ChangeLog b/kde-base/kdebase-startkde/ChangeLog
index 686b516e4c0b..091269ded53f 100644
--- a/kde-base/kdebase-startkde/ChangeLog
+++ b/kde-base/kdebase-startkde/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdebase-startkde
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.182 2009/11/09 10:06:27 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.183 2009/11/12 22:00:50 abcd Exp $
+
+*kdebase-startkde-4.3.3-r1 (12 Nov 2009)
+
+  12 Nov 2009; Jonathan Callen <abcd@gentoo.org>
+  +kdebase-startkde-4.3.3-r1.ebuild:
+  Change name of X11 session script to match FDO session script name
 
   09 Nov 2009; Jonathan Callen <abcd@gentoo.org>
   -files/gentoo-startkde4.patch:
diff --git a/kde-base/kdebase-startkde/Manifest b/kde-base/kdebase-startkde/Manifest
index 3236664cedcf..f08090f0fe6b 100644
--- a/kde-base/kdebase-startkde/Manifest
+++ b/kde-base/kdebase-startkde/Manifest
@@ -7,6 +7,7 @@ DIST kdebase-workspace-4.3.1.tar.bz2 62286316 RMD160 1db4e5428a497efff6910b5e144
 DIST kdebase-workspace-4.3.3.tar.bz2 62496238 RMD160 48ab90a519c7811e9fe4aa4e77f06134d2dc4afa SHA1 2839e913cecef8ead0685bd50e9515ccd8bc0a9d SHA256 b66b4e3eefe88edfd9ddd0501b2b6eece39b85fd78f2320967b937f2529c6d3b
 EBUILD kdebase-startkde-3.5.10-r5.ebuild 2646 RMD160 5d294fea9284e4a75cfe5323e24684aa166b6da3 SHA1 896e94876025bb0c981cbf4fec57959909422e8d SHA256 3c43c05444695e7d012ecc6e6fb2f98ad10991a11103de3127d1810eecd6c85c
 EBUILD kdebase-startkde-4.3.1.ebuild 4047 RMD160 e3e5e25ae65813adae6b61786acb0922c1896017 SHA1 06c59af2415d58facef2f4cf0e8c3fc915383c00 SHA256 4387e7a870a4d15ec8a68359352c8c07dc460c369d35158270bb09b82693fdc1
+EBUILD kdebase-startkde-4.3.3-r1.ebuild 3884 RMD160 f73e5aee8bc88369dc30e9874eea141306803595 SHA1 92f1bb543c684954ece2e427721ad59e859a5b3d SHA256 8edafb048a7f16d325789ea8081dae15953b1e38dcb4bbdcbc0cd86d5d8a460c
 EBUILD kdebase-startkde-4.3.3.ebuild 3709 RMD160 2dde0c92f95d6f4bdd8a479280cb24324d3b0ff0 SHA1 158f13fb86fedd79fb536afeb7aa85f1aa58702e SHA256 fdf083196367651b6a1f9909df5c9a24630a2a65e131f4800515ae01ebee22a9
-MISC ChangeLog 27958 RMD160 aac9d0e47883983875aebcfdee8e9d9b3a00581f SHA1 5d455cb58e5d7035cb486d5f1e2e2dcf38ac22cf SHA256 d45dc1e4fd18e100208ad5ba6c04361ae57400d811c5827be1aa754237ad048e
+MISC ChangeLog 28156 RMD160 d75584d627d1eb6ed50ebf9fd06ac5f58b9faed2 SHA1 2c5b8799e3e7865dab507cac01cfa9f348238a6a SHA256 0c7708ce81180f9eaef473d6bd65597a3688cd51e44bf9a5339a679bf622e66f
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.3.3-r1.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.3.3-r1.ebuild
new file mode 100644
index 000000000000..f62d4a300d23
--- /dev/null
+++ b/kde-base/kdebase-startkde/kdebase-startkde-4.3.3-r1.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-4.3.3-r1.ebuild,v 1.1 2009/11/12 22:00:50 abcd Exp $
+
+EAPI="2"
+
+KMNAME="kdebase-workspace"
+KMNOMODULE="true"
+inherit kde4-meta multilib
+
+DESCRIPTION="Startkde script, which starts a complete KDE session, and associated scripts"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+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-desktoptheme)
+	$(add_kdebase_dep kdebase-kioslaves)
+	$(add_kdebase_dep kdebase-wallpapers)
+	$(add_kdebase_dep keditfiletype)
+	$(add_kdebase_dep kfmclient)
+	$(add_kdebase_dep kglobalaccel)
+	$(add_kdebase_dep kmimetypefinder)
+	$(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 kstyles)
+	$(add_kdebase_dep ktimezoned)
+	$(add_kdebase_dep kurifilter-plugins)
+	$(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/
+	safestartkde.cmake
+	startkde.cmake
+"
+
+PATCHES=("${FILESDIR}/gentoo-startkde4-1.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="${_libdirs}:${KDEDIR}/${_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."
+}
+
+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
+	cat <<-EOF > "${T}/${KDE_X}"
+	#!/bin/sh
+	exec ${KDEDIR}/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}:${KDEDIR}/bin:g;s:Name=KDE:Name=KDE ${SLOT}:" \
+		"${S}/kdm/kfrontend/sessions/kde.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 ${KDEDIR}/env/agent-startup.sh and"
+		elog "${KDEDIR}/shutdown/agent-shutdown.sh"
+	else
+		elog "edit /etc/kde/startup/agent-startup.sh and"
+		elog "/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}\""
+}