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

Removed old revisions of 3.5.10.
Package-Manager: portage-2.2_rc19/cvs/Linux 2.6.27-gentoo-r2 x86_64

4 files changed, 17 insertions, 131 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/Manifest b/kde-base/kdebase-startkde/Manifest
index 49c82fe76360..c4ea33f9d863 100644
--- a/kde-base/kdebase-startkde/Manifest
+++ b/kde-base/kdebase-startkde/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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
@@ -11,18 +8,10 @@ DIST kdebase-3.5.10.tar.bz2 24339704 RMD160 5845e94fbb8b5b64934d62dc9bd3b580d26d
 DIST kdebase-3.5.9.tar.bz2 24239563 RMD160 2552d850e62efd044c178e2eb04efdcce90e4a33 SHA1 a6a19e0b26ed7a2b138a4a7594c8486e26610de8 SHA256 6e958803055928cda73273996696e5f7aaad803a3854853f4ec44428c49c831e
 DIST kdebase-workspace-4.1.2.tar.bz2 47500082 RMD160 7491748580f3f40e4646a28af8f64caccc919bdd SHA1 46a2c14edfca05deb271a047bed292f7d71b8c5b SHA256 4d3273c7e1bb767136e9f4e8eb8717489d4d36eaa0fbd7d391515760d28cb804
 DIST kdebase-workspace-4.1.3.tar.bz2 47502802 RMD160 c897891f2480fcb840b2525acd342df49ce78bbc SHA1 889ed1ded023d4b88695c3d1cda78a71926974f4 SHA256 d0312234a8a94bdb4d011226018d9ddbde0ae46a3bb46f73cd015169e476e59d
-EBUILD kdebase-startkde-3.5.10-r3.ebuild 3196 RMD160 25fbd44ddc05235f04533d363dfbb84523f486c8 SHA1 c8425dc89c5a5f3d8cf5f4ef9cb0259545ae9c26 SHA256 7029f24ad0e90a142c56cf356a4b7bd5fe30bb741d1fcc816f56ec057e1aabfd
-EBUILD kdebase-startkde-3.5.10-r4.ebuild 2660 RMD160 709dbcacc1adc1c2691b373424df386a7a3696e5 SHA1 54019cb75cada21e278f8c962517753c17cad73c SHA256 878c066def8ec2b1813210650a4d5eef2d8dc56263e7c3e34c70b69b5640c46e
+EBUILD kdebase-startkde-3.5.10-r5.ebuild 2652 RMD160 3ce015a75594ca8ce4f9caf626daa91a59a4c50e SHA1 990243f9d996f6506669da80f66cfa40ed85a67a SHA256 23deaed26146ed1b18dd1bd723637e19df85372b70ddece5b0739819ba9d9269
 EBUILD kdebase-startkde-3.5.9.ebuild 2655 RMD160 b94be06d7482e08542c16ff2809a8fdc4bf4a5a1 SHA1 400376a3fc0fc9456e01519beda9b257e8a3aa85 SHA256 3eda0945a65f82c11cb58c7d1231bdbdea8d4a63dfb86abe2dd7b6942a9b598a
 EBUILD kdebase-startkde-4.1.2-r1.ebuild 4066 RMD160 b1ddf3ce417a76337dc0c742ef3fe2d2ee1ec207 SHA1 77e218044f6b6663cf51822829c2fc97f52a1432 SHA256 0d6ccd4d7ee86fe22e2cce5dce0b38b924997787fccef74408d173a9d5159ab8
 EBUILD kdebase-startkde-4.1.2.ebuild 3899 RMD160 671d8ac35dc249b0f2c88ab1ea3df52230c381ab SHA1 0368abeca00b946468408e659682d39e01e6fc31 SHA256 1b607e64065b956a35e98d8a032c3a756d2aa1c0d5f30cb546c98143d155709c
 EBUILD kdebase-startkde-4.1.3.ebuild 4070 RMD160 927aa5a79267904e70454a536100c91900c36ffe SHA1 2a9ab17624e5639f253a9e3117babcd7fc7130db SHA256 ad5122f36c3ef61b59c0cf1f46831d9067dfae28db5797100b66f196fdf9d8b4
-MISC ChangeLog 21218 RMD160 50fc2df9018c8786fa45bc7a1d42de42e229519c SHA1 d59c54b408d674403e77fbede2d151947fc25a8d SHA256 887bb1b6fc3e05cceeb4b510f8816252fe9d3600604bc7cee1d7fa42d744849e
+MISC ChangeLog 21568 RMD160 6e638c7bbac2fb2568af5ff3a51871ecc7e7f92a SHA1 1ba576d368e1110d991e99e36a7f9c10d52ae0bd SHA256 9b2dad88588aaebac97213c5217b0c5add2842b1b7ed0da714a2897cf0cf0846
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkkfqSEACgkQ67wieSYcaxcdawCdEOxAQmE9qJYB7ATRRiAhLOXC
-AXYAn0w7+rNf3YZeY/pKp+3IWuTGLTJ5
-=g9RZ
------END PGP SIGNATURE-----
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}"