Remove KDE 3.5.10.

(Portage version: 2.2_rc50/cvs/Linux x86_64)

3 files changed, 6 insertions, 155 deletions

diff --git a/kde-base/kdebase-startkde/ChangeLog b/kde-base/kdebase-startkde/ChangeLog
index 091269ded53f..36b4fef22e24 100644
--- a/kde-base/kdebase-startkde/ChangeLog
+++ b/kde-base/kdebase-startkde/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdebase-startkde
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.183 2009/11/12 22:00:50 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.184 2009/11/19 18:46:54 ssuominen Exp $
+
+  19 Nov 2009; Samuli Suominen <ssuominen@gentoo.org>
+  -kdebase-startkde-3.5.10-r5.ebuild,
+  -files/kdebase-startkde-3.5-gentoo.patch:
+  Remove KDE 3.5.10.
 
 *kdebase-startkde-4.3.3-r1 (12 Nov 2009)
 
diff --git a/kde-base/kdebase-startkde/files/kdebase-startkde-3.5-gentoo.patch b/kde-base/kdebase-startkde/files/kdebase-startkde-3.5-gentoo.patch
deleted file mode 100644
index 7a2d0c39f2a1..000000000000
--- a/kde-base/kdebase-startkde/files/kdebase-startkde-3.5-gentoo.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- startkde.orig	2008-08-19 21:56:42.000000000 +0200
-+++ startkde	2008-09-15 14:39:53.000000000 +0200
-@@ -7,6 +7,15 @@
- # because we still need to do some cleanup.
- trap 'echo GOT SIGHUP' HUP
- 
-+# Gentoo: setup environment, filter other slotted KDE installs from PATH
-+_KDEDIR=@REPLACE_PREFIX@
-+#export KDEDIRS=${_KDEDIR}:/usr:/usr/local
-+export PATH=${_KDEDIR}/bin:$(echo ${PATH} | sed 's/$/:/g;s#/usr/kde/[^/]*/s\?bin/\?:##g;s/:$//g')
-+export ROOTPATH=${_KDEDIR}/sbin:${_KDEDIR}/bin:$(echo ${PATH} | sed 's/$/:/g;s#/usr/kde/[^/]*/s\?bin/\?:##g;s/:$//g')
-+export LDPATH=@REPLACE_LIBS@:${LDPATH}
-+export XDG_DATA_DIRS=${_KDEDIR}/share:$(echo ${XDG_DATA_DIRS} | sed 's/$/:/g;s#/usr/kde/[^/]*/share/\?:##g;s/:$//g')
-+# Gentoo part ends
-+
- # Check if a KDE session already is running
- if kcheckrunning >/dev/null 2>&1; then
- 	echo "KDE seems to be already running on this display."
-@@ -14,6 +23,20 @@
- 	exit 1
- fi
- 
-+# Gentoo part:
-+# Scrapped old KDE 3.x -> 3.y update code, but keep symlink code
-+cd ${HOME}
-+if [ -L .kde -o ! -d .kde ]; then
-+	# handle ~/.kde* dirs - separate ones for separate KDEs
-+	rm -f .kde
-+	if [ ! -e .kde3.5 ]; then
-+		mkdir .kde3.5
-+		cd ${HOME}
-+	fi
-+	ln -sf .kde3.5 .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
-@@ -180,6 +203,13 @@
-   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.
-@@ -386,7 +416,7 @@
- # Clean up
- kdeinit_shutdown
- dcopserver_shutdown --wait
--artsshell -q terminate
-+if test -e ${_KDEDIR}/bin/artsshell ; then artsshell -q terminate ; fi
- # KDE4 support
- kde4 kdeinit4_shutdown 2>/dev/null
- 
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-3.5.10-r5.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-3.5.10-r5.ebuild
deleted file mode 100644
index f01b72345c2c..000000000000
--- a/kde-base/kdebase-startkde/kdebase-startkde-3.5.10-r5.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2009 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.10-r5.ebuild,v 1.7 2009/07/12 13:40:00 armin76 Exp $
-
-KMNAME=kdebase
-KMNOMODULE=true
-KMEXTRACTONLY="kdm/kfrontend/sessions/kde.desktop.in startkde"
-EAPI="1"
-inherit multilib kde-meta eutils
-
-DESCRIPTION="startkde script, which starts a complete KDE session, and associated scripts"
-KEYWORDS="alpha amd64 hppa ia64 ~mips 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
-	x11-apps/xprop
-	>=kde-base/kdesktop-${PV}:${SLOT}
-	>=kde-base/kcminit-${PV}:${SLOT}
-	>=kde-base/ksmserver-${PV}:${SLOT}
-	>=kde-base/kwin-${PV}:${SLOT}
-	>=kde-base/kpersonalizer-${PV}:${SLOT}
-	>=kde-base/kreadconfig-${PV}:${SLOT}
-	>=kde-base/ksplashml-${PV}:${SLOT}"
-
-PATCHES=( "${FILESDIR}/${PN}-3.5-gentoo.patch" )
-
-src_compile() {
-	# Patch the startkde script to setup the environment for KDE 4.0
-	# Add our KDEDIR
-	sed -i -e "s#@REPLACE_PREFIX@#${PREFIX}#" \
-		"${S}/startkde" || die "Sed for PREFIX failed."
-
-	# List all the multilib libdirs
-	local _libdir _libdirs
-	for _libdir in $(get_all_libdirs); do
-		_libdirs="${_libdirs}:${PREFIX}/${_libdir}"
-	done
-	_libdirs=${_libdirs#:}
-
-	# Complete LDPATH
-	sed -i -e "s#@REPLACE_LIBS@#${_libdirs}#" \
-		"${S}/startkde" || die "Sed for LDPATH failed."
-}
-
-src_install() {
-	# startkde script
-	exeinto "${KDEDIR}/bin"
-	doexe startkde
-
-	# startup and shutdown scripts
-	exeinto "${KDEDIR}/env"
-	doexe "${FILESDIR}/agent-startup.sh"
-
-	exeinto "${KDEDIR}/shutdown"
-	doexe "${FILESDIR}/agent-shutdown.sh"
-
-	# freedesktop environment variables
-	cat <<EOF > "${T}/xdg.sh"
-export XDG_CONFIG_DIRS="${KDEDIR}/etc/xdg"
-EOF
-	exeinto "${KDEDIR}/env"
-	doexe "${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}"
-
-	# (not really) 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
-	elog "To enable gpg-agent and/or ssh-agent in KDE sessions,"
-	elog "edit ${KDEDIR}/env/agent-startup.sh and"
-	elog "${KDEDIR}/shutdown/agent-shutdown.sh"
-	echo
-}