Replaced doins with doexe and correctd the source of the scripts - fixes bug 252976.

Removed old revisions of 3.5.10.
(Portage version: 2.2_rc19/cvs/Linux 2.6.27-gentoo-r2 x86_64)

3 files changed, 15 insertions, 118 deletions

diff --git a/kde-base/kdebase-startkde/ChangeLog b/kde-base/kdebase-startkde/ChangeLog
index 8aaeeaa7c1e2..4f07d8311ecb 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.135 2008/11/16 05:01:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.136 2008/12/31 02:19:09 jmbsvicetto Exp $
+
+*kdebase-startkde-3.5.10-r5 (31 Dec 2008)
+
+  31 Dec 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  -kdebase-startkde-3.5.10-r3.ebuild, -kdebase-startkde-3.5.10-r4.ebuild,
+  +kdebase-startkde-3.5.10-r5.ebuild:
+  Replaced doins with doexe and correctd the source of the scripts - fixes
+  bug 252976. Removed old revisions of 3.5.10.
 
   15 Nov 2008; Mike Frysinger <vapier@gentoo.org>
   kdebase-startkde-4.1.3.ebuild:
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
deleted file mode 100644
index f47fdc02b7f1..000000000000
--- a/kde-base/kdebase-startkde/kdebase-startkde-3.5.10-r3.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# 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
-}
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-3.5.10-r4.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-3.5.10-r5.ebuild
index 817b2323aa9d..090b2c569f6e 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-3.5.10-r4.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-3.5.10-r5.ebuild
@@ -1,6 +1,6 @@
 # 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-r4.ebuild,v 1.1 2008/10/12 00:56:08 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-3.5.10-r5.ebuild,v 1.1 2008/12/31 02:19:09 jmbsvicetto Exp $
 
 KMNAME=kdebase
 KMNOMODULE=true
@@ -55,18 +55,18 @@ src_install() {
 	doexe startkde
 
 	# startup and shutdown scripts
-	insinto "${KDEDIR}/env"
-	doins "${WORKDIR}/patches/agent-startup.sh"
+	exeinto "${KDEDIR}/env"
+	doexe "${FILESDIR}/agent-startup.sh"
 
 	exeinto "${KDEDIR}/shutdown"
-	doexe "${WORKDIR}/patches/agent-shutdown.sh"
+	doexe "${FILESDIR}/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"
+	exeinto "${KDEDIR}/env"
+	doexe "${T}/xdg.sh"
 
 	# x11 session script
 	cat <<EOF > "${T}/kde-${SLOT}"