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

(Portage version: 2.0.51.19)

4 files changed, 166 insertions, 1 deletions

diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index ad01f66394f3..b4aba54ceedf 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdebase
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.195 2005/05/10 15:46:26 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.196 2005/05/11 19:57:42 greg_g Exp $
+
+*kdebase-3.4.0-r1 (11 May 2005)
+
+  11 May 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdebase-3.4.0-r1-startkde-gentoo.patch, +kdebase-3.4.0-r1.ebuild:
+  Better handling of config files migration (#40698). Fix conflict with the
+  menu from gnome 2.10 (#89870).
 
   10 May 2005; Carsten Lohrke <carlo@gentoo.org> kdebase-3.4.0.ebuild:
   corrected dbus and hal dependencies, #91903
diff --git a/kde-base/kdebase/files/digest-kdebase-3.4.0-r1 b/kde-base/kdebase/files/digest-kdebase-3.4.0-r1
new file mode 100644
index 000000000000..4614ded65270
--- /dev/null
+++ b/kde-base/kdebase/files/digest-kdebase-3.4.0-r1
@@ -0,0 +1 @@
+MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
diff --git a/kde-base/kdebase/files/kdebase-3.4.0-r1-startkde-gentoo.patch b/kde-base/kdebase/files/kdebase-3.4.0-r1-startkde-gentoo.patch
new file mode 100644
index 000000000000..1448491071a1
--- /dev/null
+++ b/kde-base/kdebase/files/kdebase-3.4.0-r1-startkde-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/kdebase-3.4.0-r1.ebuild b/kde-base/kdebase/kdebase-3.4.0-r1.ebuild
new file mode 100644
index 000000000000..33a527146a01
--- /dev/null
+++ b/kde-base/kdebase/kdebase-3.4.0-r1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.4.0-r1.ebuild,v 1.1 2005/05/11 19:57:42 greg_g Exp $
+
+inherit kde-dist eutils
+
+DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..."
+
+KEYWORDS="~x86 ~amd64 ~sparc ~ppc ~ia64"
+IUSE="arts cups java ldap ieee1394 hal lm_sensors logitech-mouse opengl pam samba ssl"
+# hal: enables hal backend for 'media:' ioslave
+
+DEPEND="arts? ( ~kde-base/arts-${PV} )
+	pam? ( kde-base/kdebase-pam )
+	>=dev-libs/cyrus-sasl-2
+	ldap? ( >=net-nds/openldap-2 )
+	cups? ( net-print/cups )
+	ssl? ( dev-libs/openssl )
+	opengl? ( virtual/opengl )
+	samba? ( >=net-fs/samba-3.0.4 )
+	lm_sensors? ( sys-apps/lm_sensors )
+	logitech-mouse? ( >=dev-libs/libusb-0.1.10a )
+	ieee1394? ( sys-libs/libraw1394 )
+	hal? ( =sys-apps/dbus-0.23*
+	       =sys-apps/hal-0.4* )"
+
+RDEPEND="${DEPEND}
+	java? ( || ( virtual/jdk virtual/jre ) )
+	sys-apps/eject"
+
+src_unpack() {
+	kde_src_unpack
+
+	epatch ${FILESDIR}/${PF}-startkde-gentoo.patch
+}
+
+src_compile() {
+	myconf="--with-dpms"
+	myconf="${myconf} $(use_with arts)"
+	myconf="${myconf} $(use_with ldap) $(use_with cups)"
+	myconf="${myconf} $(use_with opengl gl) $(use_with ssl)"
+	myconf="${myconf} $(use_with hal)"
+
+	use pam && myconf="${myconf} --with-pam=yes" \
+		|| myconf="${myconf} --with-pam=no --with-shadow"
+
+	# the java test is problematic (see kde bug 100729) and
+	# useless. All that's needed for java applets to work is
+	# to have the 'java' executable in PATH.
+	myconf="${myconf} --without-java"
+
+	kde_src_compile
+}
+
+src_install() {
+	kde_src_install
+	cd ${S}/kdm && make DESTDIR=${D} GENKDMCONF_FLAGS="--no-old --no-backup --no-in-notice" install
+
+	# 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
+
+	# Customize the kdmrc configuration
+	sed -i -e "s:#SessionsDirs=:SessionsDirs=/usr/share/xsessions\n#SessionsDirs=:" \
+	       -e "s:#GreetFont=:GreetFont=Sans Serif,24,-1,5,50,0,0,0,0,0\n#GreetFont=:" \
+	       -e "s:#StdFont=:StdFont=Sans Serif,12,-1,5,50,0,0,0,0,0\n#StdFont=:" \
+	       -e "s:#FailFont=:FailFont=Sans Serif,12,-1,5,75,0,0,0,0,0\n#FailFont=:" \
+	       -e "s:#AntiAliasing=:AntiAliasing=true\n#AntiAliasing=:" \
+		${D}/${KDEDIR}/share/config/kdm/kdmrc || die
+
+	rmdir ${D}/${KDEDIR}/share/templates/.source/emptydir
+}
+
+pkg_postinst() {
+	# set the default kdm face icon if it's not already set by the system admin
+	if [ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon" ]; then
+		mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces"
+		cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/default1.png" \
+			"${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon"
+	fi
+
+	mkdir -p ${ROOT}${KDEDIR}/share/templates/.source/emptydir
+
+	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
+}