Better handling of config files migration (#40698). Fix conflict with the menu from gnome 2.10 (#89870).

Package-Manager: portage-2.0.51.19

5 files changed, 135 insertions, 6 deletions

diff --git a/kde-base/kdebase-startkde/ChangeLog b/kde-base/kdebase-startkde/ChangeLog
index 91f779c43a93..4a41ec790da1 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.11 2005/04/27 19:28:08 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.12 2005/05/11 20:03:54 greg_g Exp $
+
+*kdebase-startkde-3.4.0-r1 (11 May 2005)
+
+  11 May 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdebase-startkde-3.4.0-r1-gentoo.patch,
+  +kdebase-startkde-3.4.0-r1.ebuild:
+  Better handling of config files migration (#40698). Fix conflict with the
+  menu from gnome 2.10 (#89870).
 
   27 Apr 2005; Markus Rothe <corsair@gentoo.org>
   kdebase-startkde-3.4.0.ebuild:
diff --git a/kde-base/kdebase-startkde/Manifest b/kde-base/kdebase-startkde/Manifest
index 12345d56e6c1..8e04b20f2e40 100644
--- a/kde-base/kdebase-startkde/Manifest
+++ b/kde-base/kdebase-startkde/Manifest
@@ -1,7 +1,10 @@
-MD5 58ce45cb69358631f2608031625a802e ChangeLog 2312
-MD5 320bd932cfd313bc424ed088f74affc4 kdebase-startkde-3.4.0.ebuild 2023
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
-MD5 38116c7e3963674ec4a3c0948904ec3b files/agent-shutdown.sh 320
-MD5 016f5ae82399f6d6c1b9f82aa80ac831 files/agent-startup.sh 550
-MD5 54e17e8f38d377972c220f10357c9b2f files/digest-kdebase-startkde-3.4.0 68
+MD5 9decb7640879be08572adb13d0a922a5 ChangeLog 2599
+MD5 e32db45bdac5895cc710d1a79cda006c kdebase-startkde-3.4.0-r1.ebuild 2180
+MD5 320bd932cfd313bc424ed088f74affc4 kdebase-startkde-3.4.0.ebuild 2023
 MD5 935f613bbd080ed37bf3bb15835411ad files/startkde-3.4.0-gentoo.diff 1286
+MD5 54e17e8f38d377972c220f10357c9b2f files/digest-kdebase-startkde-3.4.0 68
+MD5 15928046d136b4f684cfeb1c83f696da files/kdebase-startkde-3.4.0-r1-gentoo.patch 1270
+MD5 54e17e8f38d377972c220f10357c9b2f files/digest-kdebase-startkde-3.4.0-r1 68
+MD5 016f5ae82399f6d6c1b9f82aa80ac831 files/agent-startup.sh 550
+MD5 38116c7e3963674ec4a3c0948904ec3b files/agent-shutdown.sh 320
diff --git a/kde-base/kdebase-startkde/files/digest-kdebase-startkde-3.4.0-r1 b/kde-base/kdebase-startkde/files/digest-kdebase-startkde-3.4.0-r1
new file mode 100644
index 000000000000..4614ded65270
--- /dev/null
+++ b/kde-base/kdebase-startkde/files/digest-kdebase-startkde-3.4.0-r1
@@ -0,0 +1 @@
+MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
diff --git a/kde-base/kdebase-startkde/files/kdebase-startkde-3.4.0-r1-gentoo.patch b/kde-base/kdebase-startkde/files/kdebase-startkde-3.4.0-r1-gentoo.patch
new file mode 100644
index 000000000000..1448491071a1
--- /dev/null
+++ b/kde-base/kdebase-startkde/files/kdebase-startkde-3.4.0-r1-gentoo.patch
@@ -0,0 +1,43 @@
+diff -Nur kdebase-3.4.0.orig/startkde kdebase-3.4.0/startkde
+--- kdebase-3.4.0.orig/startkde	2005-03-04 12:20:04.000000000 +0100
++++ kdebase-3.4.0/startkde	2005-05-11 14:56:43.000000000 +0200
+@@ -14,6 +14,39 @@
+ 	exit 1
+ fi
+ 
++# Gentoo part:
++export PATH="/usr/kde/3.4/bin:${PATH}"
++
++cd ${HOME}
++if [ -L .kde -o ! -d .kde ]; then
++	# handle ~/.kde* dirs - separate ones for separate KDEs
++	rm -f .kde
++	if [ ! -e .kde3.4 ]; then
++		# migrate old config files
++		if [ -e .kde3.3 ]; then
++			cp -r .kde3.3 .kde3.4
++		elif [ -e .kde3.2 ]; then
++			cp -r .kde3.2 .kde3.4
++		else
++			mkdir .kde3.4
++		fi
++		cd .kde3.4
++		for file in share/apps/kdevdocumentation/search/htdig.conf \
++			    share/apps/kalarmd/clients \
++			    share/config/kresources/calendar/stdrc \
++			    share/config/*rc; do
++			if [ -e "${file}" ]; then
++				sed -i -e "s:$HOME/\.kde3\.[23]:$HOME/\.kde3\.4:g" \
++				       -e 's:$HOME/\.kde3\.[23]:$HOME/\.kde3\.4:g' \
++				       -e 's:/usr/kde/3\.[23]/:/usr/kde/3\.4/:g' \
++					"${file}"
++			fi
++		done
++	fi
++	ln -sf .kde3.4 .kde
++fi
++# Gentoo part ends
++
+ # Set the background to plain grey.
+ # The standard X background is nasty, causing moire effects and exploding
+ # people's heads. We use colours from the standard KDE palette for those with
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-3.4.0-r1.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-3.4.0-r1.ebuild
new file mode 100644
index 000000000000..c4ef7f729f68
--- /dev/null
+++ b/kde-base/kdebase-startkde/kdebase-startkde-3.4.0-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2005 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.4.0-r1.ebuild,v 1.1 2005/05/11 20:03:54 greg_g Exp $
+
+KMNAME=kdebase
+KMNOMODULE=true
+KMEXTRACTONLY="kdm/kfrontend/sessions/kde.desktop.in startkde"
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta eutils
+
+DESCRIPTION="startkde script, which starts a complete KDE session, and associated scripts"
+KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~ppc64"
+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
+$(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 $PV $MAXKDEVER kde-base/kreadconfig)
+$(deprange $PV $MAXKDEVER kde-base/ksplashml)"
+
+src_compile() {
+	einfo "Nothing to compile"
+}
+
+src_install() {
+	# startkde script
+	epatch ${FILESDIR}/${PF}-gentoo.patch
+	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
+}