Do not call artsshell, when it isn't installed.

Package-Manager: portage-2.1.1

4 files changed, 107 insertions, 5 deletions

diff --git a/kde-base/kdebase-startkde/ChangeLog b/kde-base/kdebase-startkde/ChangeLog
index 12b99301a8f2..584da467fb6b 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.62 2006/09/17 22:53:12 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.63 2006/09/18 01:14:23 carlo Exp $
+
+*kdebase-startkde-3.5.4-r1 (18 Sep 2006)
+
+  18 Sep 2006; Carsten Lohrke <carlo@gentoo.org>
+  +kdebase-startkde-3.5.4-r1.ebuild:
+  Do not call artsshell, when it isn't installed.
 
   17 Sep 2006; Carsten Lohrke <carlo@gentoo.org>
   -kdebase-startkde-3.4.3.ebuild:
diff --git a/kde-base/kdebase-startkde/Manifest b/kde-base/kdebase-startkde/Manifest
index 06bbcac77577..ce3e10beb9b9 100644
--- a/kde-base/kdebase-startkde/Manifest
+++ b/kde-base/kdebase-startkde/Manifest
@@ -19,6 +19,7 @@ MD5 b39a32f7368059e5587e374927714700 files/kdebase-startkde-3.5.3-xinitrcd.patch
 RMD160 abc33f225160eed8db35d64e6c88099463bb2b20 files/kdebase-startkde-3.5.3-xinitrcd.patch 596
 SHA256 22d894acb04d9bcf2c4b2a072b7d1bbfa0370f51e2b44c0dc1a40e05cca5c497 files/kdebase-startkde-3.5.3-xinitrcd.patch 596
 DIST kdebase-3.5-patchset-01.tar.bz2 5552 RMD160 196f2f57924ccab4109061794d09f579917f4ed1 SHA1 6cf289b7d30f2b7899aac092989cccca5992cecf SHA256 10b635594c7936f618abf3a9b41785fb1cb2c2d2a4be5bb889abff518b8e5ee0
+DIST kdebase-3.5-patchset-03.tar.bz2 21409 RMD160 941b919097d03347b10bccb51db2fa5e89d7ba16 SHA1 9ac59cdfc4cd8d43b6d0e6dbebc5b28d7a33e35f SHA256 59c691754627f78daf7693e82496d808cf1cc31e2d6f32af829ec4ccfd776574
 DIST kdebase-3.5.2.tar.bz2 23590820 RMD160 216ff59c49bb4fee2aa3b7d976ec40a8cccff107 SHA1 16cddd8766c3bd8821044fe9cce66f5291c8412b SHA256 21150b7e553e83487e70e70e3d13ce107c6c5d57133b40f413807887a9e431f7
 DIST kdebase-3.5.3.tar.bz2 23634194 RMD160 ef55c72b97577dd86e5c64bf589ff9b2d556ec07 SHA1 93f1566343af114b24987ee7b8e0e80877b57f25 SHA256 5a2b9bc5e2682684519dbae89b3bd73fbf5de1f1effd3ca072173a9638dc3ff8
 DIST kdebase-3.5.4.tar.bz2 23636847 RMD160 29f763ec9de2cf3437b94567b317642e7df5e295 SHA1 18f2bb3643a40f937bf260d5969d6919aa52abf4 SHA256 71e3b45d91f2237ca5a66858b06e897e1f60e3042d4c54d828ba590daaa5b420
@@ -34,14 +35,18 @@ EBUILD kdebase-startkde-3.5.3.ebuild 2366 RMD160 fdb4b4d39e7916f44e31e2082f11b90
 MD5 8044172505d04ba0438a9020e191773e kdebase-startkde-3.5.3.ebuild 2366
 RMD160 fdb4b4d39e7916f44e31e2082f11b90811e432f8 kdebase-startkde-3.5.3.ebuild 2366
 SHA256 41d562dda652ec2fa6e98d4c08139c850eda39384aa96c11527e6d0dec58c7e1 kdebase-startkde-3.5.3.ebuild 2366
+EBUILD kdebase-startkde-3.5.4-r1.ebuild 2382 RMD160 7770680b9c9c6e3c895b578436409b15a9f85561 SHA1 627bfdf66d32947136a504e03f1f79b6098a3866 SHA256 96a387f1db3d2ea02cf8f12ee3e36f9c554cb7de3fbe777c8728a58ec034f1f5
+MD5 e94ae79fb0865a5046a71e9afa4109d9 kdebase-startkde-3.5.4-r1.ebuild 2382
+RMD160 7770680b9c9c6e3c895b578436409b15a9f85561 kdebase-startkde-3.5.4-r1.ebuild 2382
+SHA256 96a387f1db3d2ea02cf8f12ee3e36f9c554cb7de3fbe777c8728a58ec034f1f5 kdebase-startkde-3.5.4-r1.ebuild 2382
 EBUILD kdebase-startkde-3.5.4.ebuild 2444 RMD160 8dcfb9cb12fe7bd3c95b6238e422da4c58808a01 SHA1 80f66b349f97d700cc7d0464d69358578f46ee03 SHA256 8f45a0d4b4d751382e55b10f16a6fc62ac43ee2190f76fa0df499f67f83c7cf7
 MD5 8834bb443f124b428f26a232d197c416 kdebase-startkde-3.5.4.ebuild 2444
 RMD160 8dcfb9cb12fe7bd3c95b6238e422da4c58808a01 kdebase-startkde-3.5.4.ebuild 2444
 SHA256 8f45a0d4b4d751382e55b10f16a6fc62ac43ee2190f76fa0df499f67f83c7cf7 kdebase-startkde-3.5.4.ebuild 2444
-MISC ChangeLog 9514 RMD160 95deb30caf81c608dcca2dfc985446acdfc43bb2 SHA1 dc5044d0660c278d93198ea8bab2a47e3818abba SHA256 70517973200c425cbd843f539cca3311ca3f6a6df0f1528129c67cfa1cea876e
-MD5 028512e22a57483bb25ee4dcbf4e89bf ChangeLog 9514
-RMD160 95deb30caf81c608dcca2dfc985446acdfc43bb2 ChangeLog 9514
-SHA256 70517973200c425cbd843f539cca3311ca3f6a6df0f1528129c67cfa1cea876e ChangeLog 9514
+MISC ChangeLog 9693 RMD160 6d3a095cb2a9205713969b3a87fae155caf55450 SHA1 4ab1f437af311454e7f8be5e6f106ff581ab9afa SHA256 c21b4c42b799bf12e6a3c66250ab0b837fb1844e06eb275a7d5fa34618b7075f
+MD5 7c1964083158a2f519aa4a5b2d0b745b ChangeLog 9693
+RMD160 6d3a095cb2a9205713969b3a87fae155caf55450 ChangeLog 9693
+SHA256 c21b4c42b799bf12e6a3c66250ab0b837fb1844e06eb275a7d5fa34618b7075f ChangeLog 9693
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -58,3 +63,6 @@ SHA256 3d411f328f154d83705712ff98823e5fac1601a2e982fa88bd6a40f55d47559e files/di
 MD5 c8172fa6fba67717a2d53d6ca1d80241 files/digest-kdebase-startkde-3.5.4 518
 RMD160 26586cb33678167d2274985c40b085df27452b49 files/digest-kdebase-startkde-3.5.4 518
 SHA256 919d4610247e00158fafc2e595322c98ed1c8cf2f9cb1d8694f80bd85e05c51b files/digest-kdebase-startkde-3.5.4 518
+MD5 e412fe194e54f05f8d3c77b2cd54836d files/digest-kdebase-startkde-3.5.4-r1 521
+RMD160 a570272acfcf2790d9e331230f6e5a52acc78f65 files/digest-kdebase-startkde-3.5.4-r1 521
+SHA256 57967b3edb5abfc41e2ac6b719634e3326019f8d3f65de0b0065ed4e8eb2d7e0 files/digest-kdebase-startkde-3.5.4-r1 521
diff --git a/kde-base/kdebase-startkde/files/digest-kdebase-startkde-3.5.4-r1 b/kde-base/kdebase-startkde/files/digest-kdebase-startkde-3.5.4-r1
new file mode 100644
index 000000000000..6f288113b784
--- /dev/null
+++ b/kde-base/kdebase-startkde/files/digest-kdebase-startkde-3.5.4-r1
@@ -0,0 +1,6 @@
+MD5 420445e2dbddfd83ebc25e85a9b9cdda kdebase-3.5-patchset-03.tar.bz2 21409
+RMD160 941b919097d03347b10bccb51db2fa5e89d7ba16 kdebase-3.5-patchset-03.tar.bz2 21409
+SHA256 59c691754627f78daf7693e82496d808cf1cc31e2d6f32af829ec4ccfd776574 kdebase-3.5-patchset-03.tar.bz2 21409
+MD5 882a9729c08b197caef2c8712c980d9c kdebase-3.5.4.tar.bz2 23636847
+RMD160 29f763ec9de2cf3437b94567b317642e7df5e295 kdebase-3.5.4.tar.bz2 23636847
+SHA256 71e3b45d91f2237ca5a66858b06e897e1f60e3042d4c54d828ba590daaa5b420 kdebase-3.5.4.tar.bz2 23636847
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-3.5.4-r1.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-3.5.4-r1.ebuild
new file mode 100644
index 000000000000..8cecb888ba1c
--- /dev/null
+++ b/kde-base/kdebase-startkde/kdebase-startkde-3.5.4-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2006 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.4-r1.ebuild,v 1.1 2006/09/18 01:14:23 carlo Exp $
+
+KMNAME=kdebase
+KMNOMODULE=true
+KMEXTRACTONLY="kdm/kfrontend/sessions/kde.desktop.in startkde"
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta eutils
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/kdebase-3.5-patchset-03.tar.bz2"
+
+DESCRIPTION="startkde script, which starts a complete KDE session, and associated scripts"
+KEYWORDS="~alpha ~amd64 ~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
+		) <virtual/x11-7 )
+$(deprange $PV $MAXKDEVER kde-base/kdesktop)
+$(deprange 3.5.0 $MAXKDEVER kde-base/kcminit)
+$(deprange $PV $MAXKDEVER kde-base/ksmserver)
+$(deprange $PV $MAXKDEVER kde-base/kwin)
+$(deprange $PV $MAXKDEVER kde-base/kpersonalizer)
+$(deprange 3.5.0 $MAXKDEVER kde-base/kreadconfig)
+$(deprange $PV $MAXKDEVER kde-base/ksplashml)"
+
+
+src_compile() {
+	einfo "Nothing to compile"
+}
+
+src_install() {
+	# startkde script
+	exeinto "${KDEDIR}/bin"
+	doexe startkde
+
+	# startup and shutdown scripts
+	insinto "${KDEDIR}/env"
+	doins "${FILESDIR}/agent-startup.sh"
+
+	exeinto "${KDEDIR}/shutdown"
+	doexe "${FILESDIR}/agent-shutdown.sh"
+
+	# freedesktop environment variables
+	cat <<EOF > "${T}/xdg.sh"
+export XDG_DATA_DIRS="${KDEDIR}/share:/usr/share"
+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}"
+
+	# 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
+	einfo "To enable gpg-agent and/or ssh-agent in KDE sessions,"
+	einfo "edit ${KDEDIR}/env/agent-startup.sh and"
+	einfo "${KDEDIR}/shutdown/agent-shutdown.sh"
+	echo
+}