Add patch to fix bug #77504.

Package-Manager: portage-2.1.1_pre1

5 files changed, 142 insertions, 5 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/Manifest b/kde-base/kdebase-startkde/Manifest
index 6100642613db..a5ed4bd81828 100644
--- a/kde-base/kdebase-startkde/Manifest
+++ b/kde-base/kdebase-startkde/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX agent-shutdown.sh 320 RMD160 aca937be56a69b274c0756eca91456e00a91442b SHA1 65ce34500d82b2de0168b38058c9b198913d6a21 SHA256 1e53f9fc9155b38d8bb0ac36c8564898dbabc33f9ecaca933216a0ace4e30b33
 MD5 38116c7e3963674ec4a3c0948904ec3b files/agent-shutdown.sh 320
 RMD160 aca937be56a69b274c0756eca91456e00a91442b files/agent-shutdown.sh 320
@@ -14,6 +17,10 @@ AUX kdebase-startkde-3.4.2-gentoo.patch 1284 RMD160 ed121f7b31d54262af7fd85995bb
 MD5 acdc4850637dc2fafa8803790f771164 files/kdebase-startkde-3.4.2-gentoo.patch 1284
 RMD160 ed121f7b31d54262af7fd85995bb2a258c9e2590 files/kdebase-startkde-3.4.2-gentoo.patch 1284
 SHA256 047293bb0cdcaf19ec21fb8381c304306a4753023f8e7c82ede8fabab862cc48 files/kdebase-startkde-3.4.2-gentoo.patch 1284
+AUX kdebase-startkde-3.5.3-xinitrcd.patch 596 RMD160 abc33f225160eed8db35d64e6c88099463bb2b20 SHA1 bcc9ffbaa6a3c247867a9f1417aa40f750e0d5e5 SHA256 22d894acb04d9bcf2c4b2a072b7d1bbfa0370f51e2b44c0dc1a40e05cca5c497
+MD5 b39a32f7368059e5587e374927714700 files/kdebase-startkde-3.5.3-xinitrcd.patch 596
+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.4.3.tar.bz2 22425835 RMD160 7af02903b0fc750e7b9778391ef8948b54f69ce7 SHA1 87b72aaf291fdb78fa9feb9acf4476d41485e486 SHA256 d7802446a046ed647e5d068b7c4a21cfdb9c883b31de65838f106c5b5d4b8b1c
 DIST kdebase-3.5-patchset-01.tar.bz2 5552 RMD160 196f2f57924ccab4109061794d09f579917f4ed1 SHA1 6cf289b7d30f2b7899aac092989cccca5992cecf SHA256 10b635594c7936f618abf3a9b41785fb1cb2c2d2a4be5bb889abff518b8e5ee0
 DIST kdebase-3.5.2.tar.bz2 23590820 RMD160 216ff59c49bb4fee2aa3b7d976ec40a8cccff107 SHA1 16cddd8766c3bd8821044fe9cce66f5291c8412b SHA256 21150b7e553e83487e70e70e3d13ce107c6c5d57133b40f413807887a9e431f7
@@ -26,14 +33,18 @@ EBUILD kdebase-startkde-3.5.2.ebuild 2356 RMD160 95b892108c5c1337e8c832000d713d8
 MD5 36eca6ff64f74e29f3051ca340aa9aed kdebase-startkde-3.5.2.ebuild 2356
 RMD160 95b892108c5c1337e8c832000d713d8cb4bae873 kdebase-startkde-3.5.2.ebuild 2356
 SHA256 251dddaf326bd6ccee4fb800d24314cba2423f4f27e0e6f04b7493346274a3c2 kdebase-startkde-3.5.2.ebuild 2356
+EBUILD kdebase-startkde-3.5.3-r1.ebuild 2409 RMD160 38d6417c5b02df629e71a60e659c88ceefc63a0c SHA1 7f229c52757df54a331b4df410ef9849890ca454 SHA256 78b8805fbb05c9f05bd6dd979eeae009a19d80570273a682f9b1551c1162bd58
+MD5 36e67f0353ed5143818b326f1b7f0f6f kdebase-startkde-3.5.3-r1.ebuild 2409
+RMD160 38d6417c5b02df629e71a60e659c88ceefc63a0c kdebase-startkde-3.5.3-r1.ebuild 2409
+SHA256 78b8805fbb05c9f05bd6dd979eeae009a19d80570273a682f9b1551c1162bd58 kdebase-startkde-3.5.3-r1.ebuild 2409
 EBUILD kdebase-startkde-3.5.3.ebuild 2359 RMD160 46704a96c1af1a3deb544e46188bebcb34b0b8bd SHA1 b4ca813bc55325b845a5688eb5c0aa4b37f1379a SHA256 6bb8d1bbec9304a241866645e748dcb1f967282c687c07937d728c77786f2e45
 MD5 fd5d57ccdc307d5ef0471c7d9290ae56 kdebase-startkde-3.5.3.ebuild 2359
 RMD160 46704a96c1af1a3deb544e46188bebcb34b0b8bd kdebase-startkde-3.5.3.ebuild 2359
 SHA256 6bb8d1bbec9304a241866645e748dcb1f967282c687c07937d728c77786f2e45 kdebase-startkde-3.5.3.ebuild 2359
-MISC ChangeLog 8590 RMD160 51509a2a1d97adb6163bef1be672131fe8fa44cd SHA1 f06fb9266a4851693d0008a66da544d229010fdb SHA256 d12227a02a5f8ba89fa5bbf95e94429e95e9d7a8fd3a735aad73c82d97ba05ec
-MD5 3393c79cfc26af42864aa4170f334f93 ChangeLog 8590
-RMD160 51509a2a1d97adb6163bef1be672131fe8fa44cd ChangeLog 8590
-SHA256 d12227a02a5f8ba89fa5bbf95e94429e95e9d7a8fd3a735aad73c82d97ba05ec ChangeLog 8590
+MISC ChangeLog 8806 RMD160 39a5228002dc1d82774f2f61aeb8d211fb0c6757 SHA1 30166a6110c886958e24ad2c1153c15c6c41dde2 SHA256 d5efd696eef876516a70a7524a34ae02795ac265a840e579aeba17b37b64b8cf
+MD5 99bf575941d0009c2a837f99b94d7fc5 ChangeLog 8806
+RMD160 39a5228002dc1d82774f2f61aeb8d211fb0c6757 ChangeLog 8806
+SHA256 d5efd696eef876516a70a7524a34ae02795ac265a840e579aeba17b37b64b8cf ChangeLog 8806
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -47,3 +58,13 @@ SHA256 b97b52aca9ba44a197617cc7a6c53e4dd3109aa5a7bbe5b55d9b5a082d361f82 files/di
 MD5 9ac2db0ffd1dd385ceaba456f341146f files/digest-kdebase-startkde-3.5.3 518
 RMD160 c47af94094e7e7f03e4c49271c2f6e5c538d332d files/digest-kdebase-startkde-3.5.3 518
 SHA256 3d411f328f154d83705712ff98823e5fac1601a2e982fa88bd6a40f55d47559e files/digest-kdebase-startkde-3.5.3 518
+MD5 9ac2db0ffd1dd385ceaba456f341146f files/digest-kdebase-startkde-3.5.3-r1 518
+RMD160 c47af94094e7e7f03e4c49271c2f6e5c538d332d files/digest-kdebase-startkde-3.5.3-r1 518
+SHA256 3d411f328f154d83705712ff98823e5fac1601a2e982fa88bd6a40f55d47559e files/digest-kdebase-startkde-3.5.3-r1 518
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFElB61AiZjviIA2XgRAs01AKCTc18UWZjWTgpeFL6+XOBs1DEMRgCeLBE+
+zKcBnDE8VhAQub6EzwRIb+k=
+=rd0E
+-----END PGP SIGNATURE-----
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
+}