Add patch to fix bug #77504.

(Portage version: 2.1.1_pre1)

4 files changed, 117 insertions, 1 deletions

diff --git a/kde-base/kdebase-startkde/ChangeLog b/kde-base/kdebase-startkde/ChangeLog
index 894c65003e41..ec4e6c080a21 100644
--- a/kde-base/kdebase-startkde/ChangeLog
+++ b/kde-base/kdebase-startkde/ChangeLog
@@ -1,6 +1,13 @@
 # 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.56 2006/06/11 15:02:31 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.57 2006/06/17 15:24:19 flameeyes Exp $
+
+*kdebase-startkde-3.5.3-r1 (17 Jun 2006)
+
+  17 Jun 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kdebase-startkde-3.5.3-xinitrcd.patch,
+  +kdebase-startkde-3.5.3-r1.ebuild:
+  Add patch to fix bug #77504.
 
   11 Jun 2006; Carsten Lohrke <carlo@gentoo.org>
   kdebase-startkde-3.5.2.ebuild:
diff --git a/kde-base/kdebase-startkde/files/digest-kdebase-startkde-3.5.3-r1 b/kde-base/kdebase-startkde/files/digest-kdebase-startkde-3.5.3-r1
new file mode 100644
index 000000000000..c57a28129d29
--- /dev/null
+++ b/kde-base/kdebase-startkde/files/digest-kdebase-startkde-3.5.3-r1
@@ -0,0 +1,6 @@
+MD5 3e2318954d6f810815147acf0377e1e9 kdebase-3.5-patchset-01.tar.bz2 5552
+RMD160 196f2f57924ccab4109061794d09f579917f4ed1 kdebase-3.5-patchset-01.tar.bz2 5552
+SHA256 10b635594c7936f618abf3a9b41785fb1cb2c2d2a4be5bb889abff518b8e5ee0 kdebase-3.5-patchset-01.tar.bz2 5552
+MD5 9cb6b8291c4f3f986e16f72129e8fcd0 kdebase-3.5.3.tar.bz2 23634194
+RMD160 ef55c72b97577dd86e5c64bf589ff9b2d556ec07 kdebase-3.5.3.tar.bz2 23634194
+SHA256 5a2b9bc5e2682684519dbae89b3bd73fbf5de1f1effd3ca072173a9638dc3ff8 kdebase-3.5.3.tar.bz2 23634194
diff --git a/kde-base/kdebase-startkde/files/kdebase-startkde-3.5.3-xinitrcd.patch b/kde-base/kdebase-startkde/files/kdebase-startkde-3.5.3-xinitrcd.patch
new file mode 100644
index 000000000000..88a7e1baf467
--- /dev/null
+++ b/kde-base/kdebase-startkde/files/kdebase-startkde-3.5.3-xinitrcd.patch
@@ -0,0 +1,18 @@
+Index: kdebase-startkde-3.5.3/startkde
+===================================================================
+--- kdebase-startkde-3.5.3.orig/startkde
++++ kdebase-startkde-3.5.3/startkde
+@@ -188,6 +188,13 @@ for prefix in `echo "$exepath" | sed -n 
+   done
+ done
+ 
++# Source scripts in /etc/X11/xinit/xinitrc.d/ for system-level defined stuff
++if test -d "/etc/X11/xinit/xinitrc.d/"; then
++  for file in "/etc/X11/xinit/xinitrc.d/"*; do
++    test -x "$file" && . "$file"
++  done
++fi
++
+ # Activate the kde font directories.
+ #
+ # There are 4 directories that may be used for supplying fonts for KDE.
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-3.5.3-r1.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-3.5.3-r1.ebuild
new file mode 100644
index 000000000000..92599ff9d2e4
--- /dev/null
+++ b/kde-base/kdebase-startkde/kdebase-startkde-3.5.3-r1.ebuild
@@ -0,0 +1,85 @@
+# 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.3-r1.ebuild,v 1.1 2006/06/17 15:24:19 flameeyes 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-01.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="$RDEPEND
+	|| ( (
+			x11-apps/xmessage
+			x11-apps/xsetroot
+			x11-apps/xset
+			x11-apps/xrandr
+			x11-apps/mkfontdir
+		) virtual/x11 )
+$(deprange $PV $MAXKDEVER kde-base/kdesktop)
+$(deprange $PV $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)"
+
+PATCHES="${FILESDIR}/${P}-xinitrcd.patch"
+
+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
+}