Removing 3.4.0 prereleases: beta1, beta2. RC1 can also be removed but I want to be sure sparc's finished keywording 3.4.0.

(Portage version: 2.0.51.19)

8 files changed, 0 insertions, 1567 deletions

diff --git a/kde-base/kdebase/files/3.4.0_beta1/kdmrc b/kde-base/kdebase/files/3.4.0_beta1/kdmrc
deleted file mode 100644
index 7b823a660ddd..000000000000
--- a/kde-base/kdebase/files/3.4.0_beta1/kdmrc
+++ /dev/null
@@ -1,524 +0,0 @@
-# KDM master configuration file
-#
-# Definition: the greeter is the login dialog, i.e., the part of KDM
-# which the user sees.
-#
-# You can configure every X-display individually.
-# Every display has a display name, which consists of a host name
-# (which is empty for local displays specified in the Xservers file),
-# a colon, and a display number. Additionally, a display belongs to a
-# display class (which can be ignored in most cases; the control center
-# does not support this feature at all).
-# Sections with display-specific settings have the formal syntax
-# "[X-" host [":" number [ "_" class ]] "-" sub-section "]"
-# You can use the "*" wildcard for host, number, and class. You may omit
-# trailing components; they are assumed to be "*" then.
-# The host part may be a domain specification like ".inf.tu-dresden.de".
-# It may also be "+", which means non-empty, i.e. remote displays only.
-# From which section a setting is actually taken is determined by these
-# rules:
-# - an exact match takes precedence over a partial match (for the host part),
-#   which in turn takes precedence over a wildcard ("+" taking precedence
-#   over "*")
-# - precedence decreases from left to right for equally exact matches
-# Example: display name "myhost:0", class "dpy".
-# [X-myhost:0_dpy] precedes
-# [X-myhost:0_*] (same as [X-myhost:0]) precedes
-# [X-myhost:*_dpy] precedes
-# [X-myhost:*_*] (same as [X-myhost]) precedes
-# [X-+:0_dpy] precedes
-# [X-*:0_dpy] precedes
-# [X-*:0_*] (same as [X-*:0]) precedes
-# [X-*:*_*] (same as [X-*])
-# These sections do NOT match this display:
-# [X-hishost], [X-myhost:0_dec], [X-*:1], [X-:*]
-# If a setting is not found in any matching section, the default is used.
-#
-# Every comment applies to the following section or key. Note that all
-# comments will be lost if you change this file with the kcontrol frontend.
-# The defaults refer to KDM's built-in values, not anything set in this file.
-
-[General]
-# This option exists solely for the purpose of a clean automatic upgrade.
-# Do not even think about changing it!
-ConfigVersion=2.2
-# If the value starts with a slash (/), it specifies the file, where X-servers
-# to be used by KDM are listed; the file is in the usual XDM-Xservers format.
-# Otherwise, it is interpreted like one line of the Xservers file, i.e. it
-# specifies exactly one X-server.
-# Default is ":0 local@tty1 /usr/X11R6/bin/X -nolisten tcp"
-Xservers=_PREFIX_/share/config/kdm/Xservers
-# VTs to allocate to X-servers. A negative number means that the VT will be
-# used only if it is free. If all VTs in this list are used up, the next free
-# one greater than the last one in this list will be allocated.
-# Default is ""
-ServerVTs=-7
-# Where KDM should store its PID (do not store if empty).
-# Default is ""
-PidFile=/var/run/kdm.pid
-# Whether KDM should lock the PID file to prevent having multiple KDM
-# instances running at once. Do not change unless you are brave.
-# Default is true
-#LockPidFile=false
-# Where to store authorization files.
-# Default is "/var/run/xauth"
-#AuthDir=/tmp
-# Whether KDM should automatically re-read configuration files, if it
-# finds them having changed.
-# Default is true
-#AutoRescan=false
-# Additional environment variables KDM should pass on to all programs it runs.
-# LD_LIBRARY_PATH and XCURSOR_THEME are good candidates;
-# otherwise, it should not be necessary very often.
-# Default is ""
-#ExportList=LD_LIBRARY_PATH,ANOTHER_IMPORTANT_VAR
-# A character device KDM should read entropy from.
-# Empty means use the system's preferred entropy device.
-# Default is ""
-#RandomDevice=/dev/altrandom
-# Where the command FiFos should be created; make it empty to disable
-# them.
-# Default is "/var/run/xdmctl"
-#FifoDir=/tmp
-# The group to which the global command FiFo should belong;
-# can be either a name or a numerical ID.
-# Default is 0
-#FifoGroup=xdmctl
-# The directory in which kdm should store persistent working data.
-# Default is "/var/lib/kdm"
-#DataDir=
-# The directory in which KDM should store users' .dmrc files. This is only
-# needed if the home directories are not readable before actually logging in
-# (like with AFS).
-# Default is ""
-#DmrcDir=/nfs-shared/var/dmrcs
-
-[Xdmcp]
-# Whether KDM should listen to incoming XDMCP requests.
-# Default is true
-Enable=false
-# The UDP port on which KDM should listen for XDMCP requests. Do not change.
-# Default is 177
-#Port=177
-# File with the private keys of X-terminals. Required for XDM authentication.
-# Default is ""
-#KeyFile=_PREFIX_/share/config/kdm/kdmkeys
-# XDMCP access control file in the usual XDM-Xaccess format.
-# Default is "_PREFIX_/share/config/kdm/Xaccess"
-#Xaccess=
-# Number of seconds to wait for display to respond after the user has
-# selected a host from the chooser.
-# Default is 15
-#ChoiceTimeout=10
-# Strip domain name from remote display names if it is equal to the local
-# domain.
-# Default is true
-#RemoveDomainname=false
-# Use the numeric IP address of the incoming connection on multihomed hosts
-# instead of the host name.
-# Default is false
-#SourceAddress=true
-# The program which is invoked to dynamically generate replies to XDMCP
-# DirectQuery or BroadcastQuery requests.
-# If empty, no program is invoked and "Willing to manage" is sent.
-# Default is ""
-Willing=_PREFIX_/share/config/kdm/Xwilling
-
-[Shutdown]
-# The command to run to halt the system.
-# Default is "/sbin/halt"
-#HaltCmd=
-# The command to run to reboot the system.
-# Default is "/sbin/reboot"
-#RebootCmd=
-# Whether it is allowed to shut down the system via the global command FiFo.
-# Default is false
-#AllowFifo=true
-# Whether it is allowed to abort active sessions when shutting down the
-# system via the global command FiFo.
-# Default is true
-#AllowFifoNow=false
-# Offer LiLo boot options in shutdown dialog.
-# Default is false
-#UseLilo=true
-# The location of the LiLo binary.
-# Default is "/sbin/lilo"
-#LiloCmd=
-# The location of the LiLo map file.
-# Default is "/boot/map"
-#LiloMap=
-
-# Rough estimations about how many seconds KDM will spend at most on
-# - opening a connection to the X-server (OpenTime) if the attempt
-#   - times out: OpenTimeout
-#   - is refused: OpenRepeat * OpenDelay
-# - starting a local X-server (ServerTime):
-#   ServerAttempts * (ServerTimeout + OpenDelay)
-# - starting a display:
-#   - local display: ServerTime + OpenTime
-#   - foreign display: StartAttempts * OpenTime
-#   - xdmcp display: OpenTime (repeated indefinitely by client)
-
-# Core config for all displays
-[X-*-Core]
-# How long to wait before retrying to connect a display.
-# Default is 15
-#OpenDelay=15
-# How long to wait before timing out a display connection attempt.
-# Default is 120
-#OpenTimeout=120
-# How many connection attempts to make during a start attempt. Note that
-# a timeout aborts the entire start attempt.
-# Default is 5
-#OpenRepeat=5
-# Try at most that many times to start a display. If this fails, the display
-# is disabled.
-# Default is 4
-#StartAttempts=4
-# Ping remote display every that many minutes.
-# Default is 5
-#PingInterval=5
-# Wait for a Pong that many minutes.
-# Default is 5
-#PingTimeout=5
-# The name of this X-server's Xauth file.
-# If empty, a random name in the AuthDir directory will be used.
-# Default is ""
-#AuthFile=
-# Specify a file with X-resources for the greeter, chooser and background.
-# The KDE frontend does not use this file, so you do not need it unless you
-# use another background generator than krootimage.
-# Default is ""
-#Resources=
-# The xrdb program to use to read the above specified recources.
-# Default is "/usr/X11R6/bin/xrdb"
-#Xrdb=
-# A program to run before the greeter is shown. Can be used to start an
-# xconsole or an alternative background generator.
-# Default is ""
-Setup=_PREFIX_/share/config/kdm/Xsetup
-# A program to run before a user session starts. You should invoke sessreg
-# there and optionally change the ownership of the console, etc.
-# Default is ""
-Startup=_PREFIX_/share/config/kdm/Xstartup
-# A program to run after a user session exits. You should invoke sessreg
-# there and optionally change the ownership of the console, etc.
-# Default is ""
-Reset=_PREFIX_/share/config/kdm/Xreset
-# The program which is run as the user which logs in. It is supposed to
-# interpret the session argument (see SessionsDirs) and start an appropriate
-# session according to it.
-# Default is "/usr/X11R6/bin/xterm -ls -T"
-Session=_PREFIX_/share/config/kdm/Xsession
-# The program to run if Session fails.
-# Default is "/usr/X11R6/bin/xterm"
-#FailsafeClient=
-# The PATH for the Session program.
-# Default is "/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin:/usr/games"
-#UserPath=
-# The PATH for Setup, Startup and Reset, etc.
-# Default is "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/X11R6/bin"
-#SystemPath=
-# The default system shell.
-# Default is "/bin/sh"
-#SystemShell=/bin/bash
-# Where to put the user's X-server authorization file if ~/.Xauthority
-# cannot be created.
-# Default is "/tmp"
-#UserAuthDir=
-# Whether to automatically restart sessions after X-server crashes.
-# Note that enabling this makes circumventing screen lockers other than
-# KDE's built-in one possible!
-# Default is false
-#AutoReLogin=true
-# Allow root logins?
-# Default is true
-AllowRootLogin=false
-# Allow to log in, when user has set an empty password?
-# Default is true
-AllowNullPasswd=false
-# Who is allowed to shut down the system. This applies both to the
-# greeter and to the command FiFo.
-# "None" - no "Shutdown..." menu entry is shown at all
-# "Root" - the  password must be entered to shut down
-# "All" - everybody can shut down the machine
-# Default is All
-AllowShutdown=Root
-# Who is allowed to abort active sessions when shutting down.
-# "None" - no forced shutdown is allowed at all
-# "Root" - the  password must be entered to shut down forcibly
-# "All" - everybody can shut down the machine forcibly
-# Default is All
-#AllowSdForceNow=Root
-# The default choice for the shutdown condition/timing.
-# "Schedule" - shut down after all active sessions exit (possibly at once)
-# "TryNow" - shut down, if no active sessions are open; otherwise, do nothing
-# "ForceNow" - shut down unconditionally
-# Default is Schedule
-#DefaultSdMode=ForceNow
-# How to offer shutdown scheduling options:
-# "Never" - not at all
-# "Optional" - as a button in the simple shutdown dialogs
-# "Always" - instead of the simple shutdown dialogs
-# Default is Never
-#ScheduledSd=Optional
-# The directories containing session type definitions in .desktop format.
-# Default is "_PREFIX_/share/apps/kdm/sessions"
-SessionsDirs=/usr/share/xsessions
-# The file (relative to $HOME) to redirect the session output to. This is
-# a printf format string; one %s will be replaced with the display name.
-# Default is ".xsession-errors"
-ClientLogFile=.xsession-errors-%s
-
-# Greeter config for all displays
-[X-*-Greeter]
-# Widget style of the greeter. "" means the built-in default which currently
-# is "Plastik".
-# Default is ""
-#GUIStyle=Windows
-# Widget color scheme of the greeter. "" means the built-in default which
-# currently is yellowish grey with some light blue and yellow elements.
-# Default is ""
-#ColorScheme=Pumpkin
-# What should be shown in the greeter's logo are:
-# "None" - nothing
-# "Logo" - the image specified by LogoPixmap
-# "Clock" - a neat analog clock
-# Default is Clock
-LogoArea=Logo
-# The image to show when LogoArea=Logo.
-# Default is ""
-LogoPixmap=_PREFIX_/share/apps/kdm/pics/kdelogo.png
-# The relative coordinates (X,Y in percent) of the center of the greeter.
-# Default is "50,50"
-#GreeterPos=30,40
-# The screen the greeter should be displayed on in multi-headed and Xinerama
-# setups. The numbering starts with 0. For Xinerama, it corresponds to the
-# listing order in the active ServerLayout section of XF86Config; -1 means
-# to use the upper-left screen, -2 means to use the upper-right screen.
-# Default is 0
-#GreeterScreen=-1
-# The headline in the greeter. The following character pairs are replaced:
-# - %d -> current display
-# - %h -> host name, possibly with domain name
-# - %n -> node name, most probably the host name without domain name
-# - %s -> the operating system
-# - %r -> the operating system's version
-# - %m -> the machine (hardware) type
-# - %% -> a single %
-# Default is "Welcome to %s at %n"
-#GreetString=K Desktop Environment (%n)
-# The font for the greeter headline.
-# Default is "charter,24,bold"
-GreetFont=Sans Serif,24,-1,5,50,0,0,0,0,0
-# The normal font used in the greeter.
-# Default is "helvetica,12"
-StdFont=Sans Serif,12,-1,5,50,0,0,0,0,0
-# The font used for the "Login Failed" message.
-# Default is "helvetica,12,bold"
-FailFont=Sans Serif,12,-1,5,75,0,0,0,0,0
-# Whether the fonts used in the greeter should be antialiased.
-# Default is false
-AntiAliasing=true
-# What to do with the Num Lock modifier for the time the greeter is running:
-# "Off" - turn off
-# "On" - turn on
-# "Keep" - do not change the state
-# Default is Keep
-#NumLock=Off
-# Language and locale to use in the greeter, encoded like $LC_LANG.
-# Default is "en_US"
-#Language=de_DE
-# Enable autocompletion in the username line edit.
-# Default is false
-#UserCompletion=true
-# Enable user list (names along with images) in the greeter.
-# Default is true
-#UserList=false
-# User selection for UserCompletion and UserList:
-# "NotHidden" - all users except those listed in HiddenUsers
-# "Selected" - only the users listed in SelectedUsers
-# Default is NotHidden
-#ShowUsers=Selected
-# For ShowUsers=Selected. @<group> means all users in that group.
-# Default is ""
-#SelectedUsers=root,johndoe
-# For ShowUsers=NotHidden. @<group> means all users in that group.
-# Default is ""
-#HiddenUsers=root
-# Special case of HiddenUsers: users with a non-zero UID less than this number
-# will not be shown as well.
-# Default is 0
-MinShowUID=1000
-# Complement to MinShowUID: users with a UID greater than this number will
-# not be shown as well.
-# Default is 65535
-MaxShowUID=65000
-# If false, the users are listed in the order they appear in /etc/passwd.
-# If true, they are sorted alphabetically.
-# Default is true
-#SortUsers=false
-# Specify, where the users' pictures should be taken from.
-# "AdminOnly" - from <FaceDir>/$USER.face[.icon]
-# "PreferAdmin" - prefer <FaceDir>, fallback on $HOME
-# "PreferUser" - ... and the other way round
-# "UserOnly" - from the user's $HOME/.face[.icon]
-# Default is AdminOnly
-#FaceSource=PreferUser
-# The directory containing the user images if FaceSource is not UserOnly.
-# Default is "_PREFIX_/share/apps/kdm/faces"
-#FaceDir=/usr/share/faces
-# Specify, if/which user should be preselected for log in.
-# "None" - do not preselect any user
-# "Previous" - the user which successfully logged in last time
-# "Default" - the user specified in the DefaultUser option
-# Default is None
-#PreselectUser=Previous
-# If this is true, the password input line is focused automatically if
-# a user is preselected.
-# Default is false
-#FocusPasswd=true
-# The password input fields cloak the typed in text. Specify, how to do it:
-# "OneStar" - <literal>*</literal> is shown for every typed letter
-# "ThreeStars" - <literal>***</literal> is shown for every typed letter
-# "NoEcho" - nothing is shown at all, the cursor does not move
-# Default is OneStar
-#EchoMode=NoEcho
-# If true, krootimage will be automatically started by KDM; otherwise, the
-# Setup script should be used to setup the background.
-# Default is true
-#UseBackground=false
-# The configuration file to be used by krootimage.
-# Default is "_PREFIX_/share/config/kdm/backgroundrc"
-#BackgroundCfg=
-# Hold the X-server grabbed the whole time the greeter is visible. This
-# may be more secure, but it will disable any background and other
-# X-clients started from the Setup script.
-# Default is false
-#GrabServer=true
-# How many seconds to wait for grab to succeed.
-# Default is 3
-#GrabTimeout=3
-# Warn, if display has no X-authorization (local auth cannot be created,
-# XDMCP display wants no auth, or display is foreign from file).
-# Default is true
-#AuthComplain=false
-# Random seed for forging saved session types, etc. of unknown users.
-# This value should be random but constant across the login domain.
-# Default is 0
-ForgingSeed=_RANDOM_
-# Specify conversation plugins for the login dialog. Each plugin can be
-# specified as a base name (which expands to $kde_modulesdir/kgreet_$base)
-# or as a full pathname.
-# Default is "classic"
-#PluginsLogin=sign
-# Same as PluginsLogin, but for the shutdown dialog.
-# Default is "classic"
-#PluginsShutdown=modern
-# A list of options of the form Key=Value. The conversation plugins can query
-# these settings; it is up to them what possible keys are.
-# Default is ""
-#PluginOptions=SomeKey=randomvalue,Foo=bar
-# Show the "Console Login" action in the greeter (when the respective @tty
-# entry exists in Xservers).
-# Default is true
-#AllowConsole=false
-# A program to run while the greeter is visible. It is supposed to preload
-# as much as possible of the session that is going to be started (most
-# probably).
-# Default is ""
-#Preloader=_PREFIX_/bin/preloadkde
-# Whether the greeter should be themed.
-# Default is false
-#UseTheme=true
-# The theme to use for the greeter. Can point to either a directory or an XML
-# file.
-# Default is ""
-#Theme=_PREFIX_/share/apps/kdm/themes/circles
-
-# Core config for local displays
-[X-:*-Core]
-# How often to try to run the X-server. Running includes executing it and
-# waiting for it to come up.
-# Default is 1
-#ServerAttempts=1
-# How long to wait for a local X-server to come up.
-# Default is 15
-#ServerTimeout=15
-# Restart instead of resetting the local X-server after session exit.
-# Use it if the server leaks memory etc.
-# Default is false
-#TerminateServer=true
-# The signal needed to reset the local X-server.
-# Default is 1 (SIGHUP)
-#ResetSignal=1
-# The signal needed to terminate the local X-server.
-# Default is 15 (SIGTERM)
-#TermSignal=15
-# Create X-authorizations for local displays.
-# Default is true
-#Authorize=false
-# Which X-authorization mechanisms should be used.
-# Default is "MIT-MAGIC-COOKIE-1"
-#AuthNames=
-# Need to reset the X-server to make it read initial Xauth file.
-# Default is false
-#ResetForAuth=true
-# See above
-AllowNullPasswd=true
-# See above
-AllowShutdown=All
-# Enable password-less logins on this display. USE WITH EXTREME CARE!
-# Default is false
-#NoPassEnable=true
-# The users that do not need to provide a password to log in. NEVER list root!
-# "*" means all non-root users. @<group> means all users in that group.
-# Default is ""
-#NoPassUsers=fred,ethel
-
-# Greeter config for local displays
-[X-:*-Greeter]
-# See above
-PreselectUser=Previous
-# See above
-FocusPasswd=true
-# Specify whether the greeter of local displays should start up in host chooser
-# (remote) or login (local) mode and whether it is allowed to switch to the
-# other mode.
-# "LocalOnly" - only local login possible
-# "DefaultLocal" - start up in local mode, but allow switching to remote mode
-# "DefaultRemote" - ... and the other way round
-# "RemoteOnly" - only choice of remote host possible
-# Default is LocalOnly
-LoginMode=DefaultLocal
-# A list of hosts to be automatically added to the remote login menu. The
-# special name "*" means broadcast.
-# Default is "*"
-#ChooserHosts=*,ugly,sky,dino,kiste.local,login.crap.com
-# Show the "Restart X Server"/"Close Connection" action in the greeter.
-# Default is true
-AllowClose=false
-
-# Core config for 1st local display
-[X-:0-Core]
-# Enable automatic login. USE WITH EXTREME CARE!
-# Default is false
-#AutoLoginEnable=true
-# The user to log in automatically. NEVER specify !
-# Default is ""
-#AutoLoginUser=fred
-# The password for the user to log in automatically. This is NOT required
-# unless the user is logged into a NIS or Kerberos domain. If you use this
-# option, you should "chmod 600 kdmrc" for obvious reasons.
-# Default is ""
-#AutoLoginPass=secret!
-# See above
-ClientLogFile=.xsession-errors
-
-# Greeter config for 1st local display
-[X-:0-Greeter]
-# See above
-#PreselectUser=Default
-# The user to preselect if PreselectUser=Default.
-# Default is ""
-#DefaultUser=johndoe
diff --git a/kde-base/kdebase/files/3.4.0_beta1/startkde-gentoo.diff b/kde-base/kdebase/files/3.4.0_beta1/startkde-gentoo.diff
deleted file mode 100644
index 9c5c83eb4da7..000000000000
--- a/kde-base/kdebase/files/3.4.0_beta1/startkde-gentoo.diff
+++ /dev/null
@@ -1,121 +0,0 @@
---- startkde.orig	2005-01-04 00:36:08.000000000 +0100
-+++ startkde	2005-01-12 14:28:00.938838000 +0100
-@@ -7,6 +7,104 @@
- # because we still need to do some cleanup.
- trap 'echo GOT SIGHUP' HUP
- 
-+# Gentoo init
-+
-+# Make sure this KDE is used by apps running from our env
-+export PATH="/usr/kde/3.4/bin:${PATH}"
-+unset KDEDIR
-+
-+# KDE stores dotfiles in ~/.kde. To support running different minor versions
-+# (eg 3.3, 3.4, 4.0...) during gradual upgrades, we store each version's
-+# dotfiles in ~/.kdeX.Y. We used to make ~/.kde a symlink to a ~/.kdeX.Y,
-+# but some apps store the real name (with X.Y in it) inside their configfiles,
-+# so when we upgrade (and copy .kdeX.Y to .kdeX.(Y+1)) these files break horribly 
-+# (bug #40698). Therefore we have to move directories around.
-+#
-+# If a user runs two different KDE versions at the same time, mayhem will result.
-+
-+cd ~
-+
-+# Upgrading from the old scheme where .kde is a symlink
-+if [ -h .kde ]; then
-+	rm .kde
-+fi
-+
-+# A kde died unexpectedly and couldn't move away its .kde.
-+# The last running kde's version string is stored in ~/.kde-cur.
-+if [ -d .kde ]; then
-+	if [ ! -r .kde-cur ]; then
-+		echo "!!! ~/.kde-cur does not exist or is not readable." 1>&2
-+		echo "Cannot get rid of ~/.kde directory; abandoning kde configdir management." 1>&2
-+	else
-+		lastver="`cat .kde-cur`"
-+		if [ -e ".kde$lastver" ]; then
-+			echo "!!! ~/.kde$lastver already exists, can't move ~/.kde aside" 1>&2
-+			counter=1
-+			while [ -e ".kde$lastver.backup-$counter" ]; do
-+				echo "!!! Backup dir ~/.kde$lastver.backup-$counter already exists." 1>&2
-+				echo "Find out what's going wrong!" 1>&2
-+				let counter++
-+			done
-+			mv .kde ".kde$lastver.backup-$counter"
-+		fi
-+		rm .kde-cur
-+	fi
-+fi
-+
-+# If we suceeded
-+if [ ! -e .kde ]; then
-+	
-+	# If we have a configdir, activate it.
-+	ourver=3.4
-+	ourdir=.kde$ourver
-+	if [ -e "$ourdir" ]; then
-+		if [ ! -d "$ourdir" ]; then
-+			echo "!!! Configdir $ourdir is not a directory. Something's _really_ wrong. Aborting." 1>&2
-+		else
-+			mv "$ourdir" .kde
-+		fi
-+	
-+	# Otherwise (first run of this version), we copy over the most recent existing configdir.
-+	else
-+		for x in 3.3 3.2 3.1 3.0; do
-+			if [ -d ".kde$x" ]; then
-+				mostrecent=".kde$x"
-+				break
-+			fi
-+		done
-+		if [ -z "$mostrecent" ]; then
-+			echo "No previous configdir found; starting with empty config" 1>&2
-+		else
-+			echo "Copying previous configdir from $mostrecent" 1>&2
-+			cp -pr "$mostrecent" .kde
-+			
-+			# For the upgrade from kde 3.3, which still suffered from bug 40698, lots of little seds are needed.
-+			if [ "$mostrecent" == ".kde3.3" ]; then
-+				for file in share/apps/kdevdocumentation/search/htdig.conf \
-+							share/apps/kalarmd/clients \
-+							share/config/kdevdocumentationrc \
-+							share/config/katesyntaxhighlightingrc \
-+							share/config/ksmserverrc
-+				do
-+					sed -i -e "s:$HOME/.kde3.3:$HOME/.kde:g" -e 's:$HOME/.kde3.3:$HOME/.kde:g' ".kde/$file"
-+				done
-+			fi
-+		fi
-+	fi
-+	
-+	# Remember that we're running in case we die
-+	echo 3.4 > .kde-cur
-+fi
-+
-+# environment friendly
-+unset lastver
-+unset counter
-+unset ourver
-+unset ourdir
-+unset mostrecent
-+
-+# Gentoo init ends
-+
- # Check if a KDE session already is running
- if dcop kdesktop >/dev/null 2>&1; then
- 	echo "KDE seems to be already running on this display."
-@@ -247,4 +345,13 @@
-   done
- done
- 
-+
-+# Gentoo exit
-+
-+# Move the configdir back
-+mv .kde .kde3.4
-+rm .kde-cur
-+
-+# Gentoo exit ends
-+
- echo 'startkde: Done.'  1>&2
diff --git a/kde-base/kdebase/files/3.4.0_beta2/kdmrc b/kde-base/kdebase/files/3.4.0_beta2/kdmrc
deleted file mode 100644
index cfd8ff52ae45..000000000000
--- a/kde-base/kdebase/files/3.4.0_beta2/kdmrc
+++ /dev/null
@@ -1,552 +0,0 @@
-# KDM master configuration file
-#
-# Definition: the greeter is the login dialog, i.e., the part of KDM
-# which the user sees.
-#
-# You can configure every X-display individually.
-# Every display has a display name, which consists of a host name
-# (which is empty for local displays specified in {Static|Reserve}Servers),
-# a colon, and a display number. Additionally, a display belongs to a
-# display class (which can be ignored in most cases; the control center
-# does not support this feature at all).
-# Sections with display-specific settings have the formal syntax
-# "[X-" host [":" number [ "_" class ]] "-" sub-section "]"
-# You can use the "*" wildcard for host, number, and class. You may omit
-# trailing components; they are assumed to be "*" then.
-# The host part may be a domain specification like ".inf.tu-dresden.de".
-# It may also be "+", which means non-empty, i.e. remote displays only.
-# From which section a setting is actually taken is determined by these
-# rules:
-# - an exact match takes precedence over a partial match (for the host part),
-#   which in turn takes precedence over a wildcard ("+" taking precedence
-#   over "*")
-# - precedence decreases from left to right for equally exact matches
-# Example: display name "myhost:0", class "dpy".
-# [X-myhost:0_dpy] precedes
-# [X-myhost:0_*] (same as [X-myhost:0]) precedes
-# [X-myhost:*_dpy] precedes
-# [X-myhost:*_*] (same as [X-myhost]) precedes
-# [X-+:0_dpy] precedes
-# [X-*:0_dpy] precedes
-# [X-*:0_*] (same as [X-*:0]) precedes
-# [X-*:*_*] (same as [X-*])
-# These sections do NOT match this display:
-# [X-hishost], [X-myhost:0_dec], [X-*:1], [X-:*]
-# If a setting is not found in any matching section, the default is used.
-#
-# Every comment applies to the following section or key. Note that all
-# comments will be lost if you change this file with the kcontrol frontend.
-# The defaults refer to KDM's built-in values, not anything set in this file.
-#
-# Special characters need to be backslash-escaped (leading and trailing
-# spaces (\s), tab (\t), linefeed (\n), carriage return (\r) and the
-# backslash itself (\\)).
-# In lists, fields are separated with commas without whitespace in between.
-# Some command strings are subject to simplified sh-style word splitting:
-# single quotes (') and double quotes (") have the usual meaning; the backslash
-# quotes everything (not only special characters). Note that the backslashes
-# need to be doubled because of the two levels of quoting.
-
-[General]
-# This option exists solely for the purpose of a clean automatic upgrade.
-# Do not even think about changing it!
-ConfigVersion=2.3
-# List of permanent displays. Displays with a hostname are foreign. A display
-# class may be specified separated by an underscore.
-# Default is ":0"
-StaticServers=:0
-# List of on-demand displays. See StaticServers for syntax.
-# Default is ""
-ReserveServers=:1,:2,:3
-# VTs to allocate to X-servers. A negative number means that the VT will be
-# used only if it is free. If all VTs in this list are used up, the next free
-# one greater than the last one in this list will be allocated.
-# Default is ""
-ServerVTs=-7
-# TTYs (without /dev/) to monitor for activity while in console mode.
-# Default is ""
-ConsoleTTYs=tty1,tty2,tty3,tty4,tty5,tty6
-# Where KDM should store its PID (do not store if empty).
-# Default is ""
-PidFile=/var/run/kdm.pid
-# Whether KDM should lock the PID file to prevent having multiple KDM
-# instances running at once. Do not change unless you are brave.
-# Default is true
-#LockPidFile=false
-# Where to store authorization files.
-# Default is "/var/run/xauth"
-#AuthDir=/tmp
-# Whether KDM should automatically re-read configuration files, if it
-# finds them having changed.
-# Default is true
-#AutoRescan=false
-# Additional environment variables KDM should pass on to all programs it runs.
-# LD_LIBRARY_PATH and XCURSOR_THEME are good candidates;
-# otherwise, it should not be necessary very often.
-# Default is ""
-#ExportList=LD_LIBRARY_PATH,ANOTHER_IMPORTANT_VAR
-# A character device KDM should read entropy from.
-# Empty means use the system's preferred entropy device.
-# Default is ""
-#RandomDevice=/dev/altrandom
-# Where the command FiFos should be created; make it empty to disable
-# them.
-# Default is "/var/run/xdmctl"
-#FifoDir=/tmp
-# The group to which the global command FiFo should belong;
-# can be either a name or a numerical ID.
-# Default is 0
-#FifoGroup=xdmctl
-# The directory in which KDM should store persistent working data.
-# Default is "/var/lib/kdm"
-#DataDir=
-# The directory in which KDM should store users' .dmrc files. This is only
-# needed if the home directories are not readable before actually logging in
-# (like with AFS).
-# Default is ""
-#DmrcDir=/nfs-shared/var/dmrcs
-
-[Xdmcp]
-# Whether KDM should listen to incoming XDMCP requests.
-# Default is true
-Enable=false
-# The UDP port on which KDM should listen for XDMCP requests. Do not change.
-# Default is 177
-#Port=177
-# File with the private keys of X-terminals. Required for XDM authentication.
-# Default is ""
-#KeyFile=_PREFIX_/share/config/kdm/kdmkeys
-# XDMCP access control file in the usual XDM-Xaccess format.
-# Default is "_PREFIX_/share/config/kdm/Xaccess"
-#Xaccess=
-# Number of seconds to wait for display to respond after the user has
-# selected a host from the chooser.
-# Default is 15
-#ChoiceTimeout=10
-# Strip domain name from remote display names if it is equal to the local
-# domain.
-# Default is true
-#RemoveDomainname=false
-# Use the numeric IP address of the incoming connection on multihomed hosts
-# instead of the host name.
-# Default is false
-#SourceAddress=true
-# The program which is invoked to dynamically generate replies to XDMCP
-# DirectQuery or BroadcastQuery requests.
-# If empty, no program is invoked and "Willing to manage" is sent.
-# Default is ""
-Willing=_PREFIX_/share/config/kdm/Xwilling
-
-[Shutdown]
-# The command (subject to word splitting) to run to halt the system.
-# Default is "/sbin/halt"
-#HaltCmd=
-# The command (subject to word splitting) to run to reboot the system.
-# Default is "/sbin/reboot"
-#RebootCmd=
-# Whether it is allowed to shut down the system via the global command FiFo.
-# Default is false
-#AllowFifo=true
-# Whether it is allowed to abort active sessions when shutting down the
-# system via the global command FiFo.
-# Default is true
-#AllowFifoNow=false
-# The boot manager KDM should use for offering boot options in the
-# shutdown dialog.
-# "None" - no boot manager
-# "Grub" - Grub boot manager
-# "Lilo" - Lilo boot manager (Linux on i386 &amp; x86-64 only)
-# Default is None
-#BootManager=Grub
-
-# Rough estimations about how many seconds KDM will spend at most on
-# - opening a connection to the X-server (OpenTime) if the attempt
-#   - times out: OpenTimeout
-#   - is refused: OpenRepeat * OpenDelay
-# - starting a local X-server (ServerTime):
-#   ServerAttempts * (ServerTimeout + OpenDelay)
-# - starting a display:
-#   - local display: ServerTime + OpenTime
-#   - foreign display: StartAttempts * OpenTime
-#   - XDMCP display: OpenTime (repeated indefinitely by client)
-
-# Core config for all displays
-[X-*-Core]
-# How long to wait before retrying to connect a display.
-# Default is 15
-#OpenDelay=15
-# How long to wait before timing out a display connection attempt.
-# Default is 120
-#OpenTimeout=120
-# How many connection attempts to make during a start attempt. Note that
-# a timeout aborts the entire start attempt.
-# Default is 5
-#OpenRepeat=5
-# Try at most that many times to start a display. If this fails, the display
-# is disabled.
-# Default is 4
-#StartAttempts=4
-# Ping remote display every that many minutes.
-# Default is 5
-#PingInterval=5
-# Wait for a Pong that many minutes.
-# Default is 5
-#PingTimeout=5
-# The name of this X-server's Xauth file.
-# If empty, a random name in the AuthDir directory will be used.
-# Default is ""
-#AuthFile=
-# Specify a file with X-resources for the greeter, chooser and background.
-# The KDE frontend does not use this file, so you do not need it unless you
-# use another background generator than krootimage.
-# Default is ""
-#Resources=
-# The xrdb program to use to read the above specified recources.
-# Subject to word splitting.
-# Default is "/usr/X11R6/bin/xrdb"
-#Xrdb=
-# A program to run before the greeter is shown. Can be used to start an
-# xconsole or an alternative background generator. Subject to word splitting.
-# Default is ""
-Setup=_PREFIX_/share/config/kdm/Xsetup
-# A program to run before a user session starts. Subject to word splitting.
-# Default is ""
-Startup=_PREFIX_/share/config/kdm/Xstartup
-# A program to run after a user session exits. Subject to word splitting.
-# Default is ""
-Reset=_PREFIX_/share/config/kdm/Xreset
-# The program which is run as the user which logs in. It is supposed to
-# interpret the session argument (see SessionsDirs) and start an appropriate
-# session according to it. Subject to word splitting.
-# Default is "/usr/X11R6/bin/xterm -ls -T"
-Session=_PREFIX_/share/config/kdm/Xsession
-# The program to run if Session fails.
-# Default is "/usr/X11R6/bin/xterm"
-#FailsafeClient=
-# The PATH for the Session program.
-# Default is "/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin:/usr/games"
-#UserPath=
-# The PATH for Setup, Startup and Reset, etc.
-# Default is "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/X11R6/bin"
-#SystemPath=
-# The default system shell.
-# Default is "/bin/sh"
-#SystemShell=/bin/bash
-# Where to put the user's X-server authorization file if ~/.Xauthority
-# cannot be created.
-# Default is "/tmp"
-#UserAuthDir=
-# Whether to automatically restart sessions after X-server crashes.
-# Note that enabling this makes circumventing screen lockers other than
-# KDE's built-in one possible!
-# Default is false
-#AutoReLogin=true
-# Allow root logins?
-# Default is true
-AllowRootLogin=false
-# Allow to log in, when user has set an empty password?
-# Default is true
-AllowNullPasswd=false
-# Who is allowed to shut down the system. This applies both to the
-# greeter and to the command FiFo.
-# "None" - no "Shutdown..." menu entry is shown at all
-# "Root" - the root password must be entered to shut down
-# "All" - everybody can shut down the machine
-# Default is All
-AllowShutdown=Root
-# Who is allowed to abort active sessions when shutting down.
-# "None" - no forced shutdown is allowed at all
-# "Root" - the root password must be entered to shut down forcibly
-# "All" - everybody can shut down the machine forcibly
-# Default is All
-#AllowSdForceNow=Root
-# The default choice for the shutdown condition/timing.
-# "Schedule" - shut down after all active sessions exit (possibly at once)
-# "TryNow" - shut down, if no active sessions are open; otherwise, do nothing
-# "ForceNow" - shut down unconditionally
-# Default is Schedule
-#DefaultSdMode=ForceNow
-# How to offer shutdown scheduling options:
-# "Never" - not at all
-# "Optional" - as a button in the simple shutdown dialogs
-# "Always" - instead of the simple shutdown dialogs
-# Default is Never
-#ScheduledSd=Optional
-# The directories containing session type definitions in .desktop format.
-# Default is "_PREFIX_/share/apps/kdm/sessions"
-SessionsDirs=/usr/share/xsessions
-# The file (relative to $HOME) to redirect the session output to. This is
-# a printf format string; one %s will be replaced with the display name.
-# Default is ".xsession-errors"
-ClientLogFile=.xsession-errors-%s
-# Whether KDM's built-in utmp/wtmp/lastlog registration should be used.
-# Default is true
-#UseSessReg=false
-
-# Greeter config for all displays
-[X-*-Greeter]
-# Widget style of the greeter. "" means the built-in default which currently
-# is "Plastik".
-# Default is ""
-#GUIStyle=Windows
-# Widget color scheme of the greeter. "" means the built-in default which
-# currently is yellowish grey with some light blue and yellow elements.
-# Default is ""
-#ColorScheme=Pumpkin
-# What should be shown in the greeter's logo are:
-# "None" - nothing
-# "Logo" - the image specified by LogoPixmap
-# "Clock" - a neat analog clock
-# Default is Clock
-LogoArea=Logo
-# The image to show when LogoArea=Logo.
-# Default is ""
-LogoPixmap=_PREFIX_/share/apps/kdm/pics/kdelogo.png
-# The relative coordinates (X,Y in percent) of the center of the greeter.
-# Default is "50,50"
-#GreeterPos=30,40
-# The screen the greeter should be displayed on in multi-headed and Xinerama
-# setups. The numbering starts with 0. For Xinerama, it corresponds to the
-# listing order in the active ServerLayout section of XF86Config; -1 means
-# to use the upper-left screen, -2 means to use the upper-right screen.
-# Default is 0
-#GreeterScreen=-1
-# The headline in the greeter. The following character pairs are replaced:
-# - %d -> current display
-# - %h -> host name, possibly with domain name
-# - %n -> node name, most probably the host name without domain name
-# - %s -> the operating system
-# - %r -> the operating system's version
-# - %m -> the machine (hardware) type
-# - %% -> a single %
-# Default is "Welcome to %s at %n"
-#GreetString=K Desktop Environment (%n)
-# The font for the greeter headline.
-# Default is "charter,24,bold"
-GreetFont=Sans Serif,24,-1,5,50,0,0,0,0,0
-# The normal font used in the greeter.
-# Default is "helvetica,12"
-StdFont=Sans Serif,12,-1,5,50,0,0,0,0,0
-# The font used for the "Login Failed" message.
-# Default is "helvetica,12,bold"
-FailFont=Sans Serif,12,-1,5,75,0,0,0,0,0
-# Whether the fonts used in the greeter should be antialiased.
-# Default is false
-AntiAliasing=true
-# What to do with the Num Lock modifier for the time the greeter is running:
-# "Off" - turn off
-# "On" - turn on
-# "Keep" - do not change the state
-# Default is Keep
-#NumLock=Off
-# Language and locale to use in the greeter, encoded like $LC_LANG.
-# Default is "en_US"
-#Language=de_DE
-# Enable autocompletion in the username line edit.
-# Default is false
-#UserCompletion=true
-# Enable user list (names along with images) in the greeter.
-# Default is true
-#UserList=false
-# User selection for UserCompletion and UserList:
-# "NotHidden" - all users except those listed in HiddenUsers
-# "Selected" - only the users listed in SelectedUsers
-# Default is NotHidden
-#ShowUsers=Selected
-# For ShowUsers=Selected. @<group> means all users in that group.
-# Default is ""
-#SelectedUsers=root,johndoe
-# For ShowUsers=NotHidden. @<group> means all users in that group.
-# Default is ""
-#HiddenUsers=root
-# Special case of HiddenUsers: users with a non-zero UID less than this number
-# will not be shown as well.
-# Default is 0
-MinShowUID=1000
-# Complement to MinShowUID: users with a UID greater than this number will
-# not be shown as well.
-# Default is 65535
-MaxShowUID=65000
-# If false, the users are listed in the order they appear in /etc/passwd.
-# If true, they are sorted alphabetically.
-# Default is true
-#SortUsers=false
-# Specify, where the users' pictures should be taken from.
-# "AdminOnly" - from <FaceDir>/$USER.face[.icon]
-# "PreferAdmin" - prefer <FaceDir>, fallback on $HOME
-# "PreferUser" - ... and the other way round
-# "UserOnly" - from the user's $HOME/.face[.icon]
-# Default is AdminOnly
-#FaceSource=PreferUser
-# The directory containing the user images if FaceSource is not UserOnly.
-# Default is "_PREFIX_/share/apps/kdm/faces"
-#FaceDir=/usr/share/faces
-# Specify, if/which user should be preselected for log in.
-# "None" - do not preselect any user
-# "Previous" - the user which successfully logged in last time
-# "Default" - the user specified in the DefaultUser option
-# Default is None
-#PreselectUser=Previous
-# If this is true, the password input line is focused automatically if
-# a user is preselected.
-# Default is false
-#FocusPasswd=true
-# The password input fields cloak the typed in text. Specify, how to do it:
-# "OneStar" - <literal>*</literal> is shown for every typed letter
-# "ThreeStars" - <literal>***</literal> is shown for every typed letter
-# "NoEcho" - nothing is shown at all, the cursor does not move
-# Default is OneStar
-#EchoMode=NoEcho
-# If true, krootimage will be automatically started by KDM; otherwise, the
-# Setup script should be used to setup the background.
-# Default is true
-#UseBackground=false
-# The configuration file to be used by krootimage.
-# Default is "_PREFIX_/share/config/kdm/backgroundrc"
-#BackgroundCfg=
-# Hold the X-server grabbed the whole time the greeter is visible. This
-# may be more secure, but it will disable any background and other
-# X-clients started from the Setup script.
-# Default is false
-#GrabServer=true
-# How many seconds to wait for grab to succeed.
-# Default is 3
-#GrabTimeout=3
-# Warn, if display has no X-authorization (local auth cannot be created,
-# XDMCP display wants no auth, or display is foreign from StaticServers).
-# Default is true
-#AuthComplain=false
-# Random seed for forging saved session types, etc. of unknown users.
-# This value should be random but constant across the login domain.
-# Default is 0
-ForgingSeed=_RANDOM_
-# Specify conversation plugins for the login dialog. Each plugin can be
-# specified as a base name (which expands to $kde_modulesdir/kgreet_$base)
-# or as a full pathname.
-# Default is "classic"
-#PluginsLogin=sign
-# Same as PluginsLogin, but for the shutdown dialog.
-# Default is "classic"
-#PluginsShutdown=modern
-# A list of options of the form Key=Value. The conversation plugins can query
-# these settings; it is up to them what possible keys are.
-# Default is ""
-#PluginOptions=SomeKey=randomvalue,Foo=bar
-# Show the "Console Login" action in the greeter (if ServerTTY/ConsoleTTYs
-# is configured).
-# Default is true
-#AllowConsole=false
-# A program to run while the greeter is visible. It is supposed to preload
-# as much as possible of the session that is going to be started (most
-# probably).
-# Default is ""
-Preloader=_PREFIX_/bin/preloadkde
-# Whether the greeter should be themed.
-# Default is false
-#UseTheme=true
-# The theme to use for the greeter. Can point to either a directory or an XML
-# file.
-# Default is ""
-Theme=_PREFIX_/share/apps/kdm/themes/circles
-
-# Core config for local displays
-[X-:*-Core]
-# How often to try to run the X-server. Running includes executing it and
-# waiting for it to come up.
-# Default is 1
-#ServerAttempts=1
-# How long to wait for a local X-server to come up.
-# Default is 15
-#ServerTimeout=15
-# The command line to start the X-server, without display number and VT spec.
-# This string is subject to word splitting.
-# Default is "/usr/X11R6/bin/X"
-ServerCmd=/usr/X11R6/bin/X
-# Additional arguments for the X-servers for local sessions.
-# This string is subject to word splitting.
-# Default is ""
-ServerArgsLocal=-nolisten tcp
-# Additional arguments for the X-servers for remote sessions.
-# This string is subject to word splitting.
-# Default is ""
-#ServerArgsRemote=
-# Restart instead of resetting the local X-server after session exit.
-# Use it if the server leaks memory etc.
-# Default is false
-#TerminateServer=true
-# The signal needed to reset the local X-server.
-# Default is 1 (SIGHUP)
-#ResetSignal=1
-# The signal needed to terminate the local X-server.
-# Default is 15 (SIGTERM)
-#TermSignal=15
-# Create X-authorizations for local displays.
-# Default is true
-#Authorize=false
-# Which X-authorization mechanisms should be used.
-# Default is "MIT-MAGIC-COOKIE-1"
-#AuthNames=
-# Need to reset the X-server to make it read initial Xauth file.
-# Default is false
-#ResetForAuth=true
-# See above
-AllowNullPasswd=true
-# See above
-AllowShutdown=All
-# Enable password-less logins on this display. USE WITH EXTREME CARE!
-# Default is false
-#NoPassEnable=true
-# The users that do not need to provide a password to log in. NEVER list root!
-# "*" means all non-root users. @<group> means all users in that group.
-# Default is ""
-#NoPassUsers=fred,ethel
-
-# Greeter config for local displays
-[X-:*-Greeter]
-# See above
-PreselectUser=Previous
-# See above
-FocusPasswd=true
-# Specify whether the greeter of local displays should start up in host chooser
-# (remote) or login (local) mode and whether it is allowed to switch to the
-# other mode.
-# "LocalOnly" - only local login possible
-# "DefaultLocal" - start up in local mode, but allow switching to remote mode
-# "DefaultRemote" - ... and the other way round
-# "RemoteOnly" - only choice of remote host possible
-# Default is LocalOnly
-LoginMode=DefaultLocal
-# A list of hosts to be automatically added to the remote login menu. The
-# special name "*" means broadcast.
-# Default is "*"
-#ChooserHosts=*,ugly,sky,dino,kiste.local,login.crap.com
-# Show the "Restart X Server"/"Close Connection" action in the greeter.
-# Default is true
-AllowClose=false
-
-# Core config for 1st local display
-[X-:0-Core]
-# The VT the X-server should run on. Better use ServerVTs.
-# Default is 0
-#ServerVT=7
-# Enable automatic login. USE WITH EXTREME CARE!
-# Default is false
-#AutoLoginEnable=true
-# The user to log in automatically. NEVER specify root!
-# Default is ""
-#AutoLoginUser=fred
-# The password for the user to log in automatically. This is NOT required
-# unless the user is logged into a NIS or Kerberos domain. If you use this
-# option, you should "chmod 600 kdmrc" for obvious reasons.
-# Default is ""
-#AutoLoginPass=secret!
-# See above
-ClientLogFile=.xsession-errors
-
-# Greeter config for 1st local display
-[X-:0-Greeter]
-# See above
-#PreselectUser=Default
-# The user to preselect if PreselectUser=Default.
-# Default is ""
-#DefaultUser=johndoe
diff --git a/kde-base/kdebase/files/3.4.0_beta2/startkde-gentoo.diff b/kde-base/kdebase/files/3.4.0_beta2/startkde-gentoo.diff
deleted file mode 100644
index 9c5c83eb4da7..000000000000
--- a/kde-base/kdebase/files/3.4.0_beta2/startkde-gentoo.diff
+++ /dev/null
@@ -1,121 +0,0 @@
---- startkde.orig	2005-01-04 00:36:08.000000000 +0100
-+++ startkde	2005-01-12 14:28:00.938838000 +0100
-@@ -7,6 +7,104 @@
- # because we still need to do some cleanup.
- trap 'echo GOT SIGHUP' HUP
- 
-+# Gentoo init
-+
-+# Make sure this KDE is used by apps running from our env
-+export PATH="/usr/kde/3.4/bin:${PATH}"
-+unset KDEDIR
-+
-+# KDE stores dotfiles in ~/.kde. To support running different minor versions
-+# (eg 3.3, 3.4, 4.0...) during gradual upgrades, we store each version's
-+# dotfiles in ~/.kdeX.Y. We used to make ~/.kde a symlink to a ~/.kdeX.Y,
-+# but some apps store the real name (with X.Y in it) inside their configfiles,
-+# so when we upgrade (and copy .kdeX.Y to .kdeX.(Y+1)) these files break horribly 
-+# (bug #40698). Therefore we have to move directories around.
-+#
-+# If a user runs two different KDE versions at the same time, mayhem will result.
-+
-+cd ~
-+
-+# Upgrading from the old scheme where .kde is a symlink
-+if [ -h .kde ]; then
-+	rm .kde
-+fi
-+
-+# A kde died unexpectedly and couldn't move away its .kde.
-+# The last running kde's version string is stored in ~/.kde-cur.
-+if [ -d .kde ]; then
-+	if [ ! -r .kde-cur ]; then
-+		echo "!!! ~/.kde-cur does not exist or is not readable." 1>&2
-+		echo "Cannot get rid of ~/.kde directory; abandoning kde configdir management." 1>&2
-+	else
-+		lastver="`cat .kde-cur`"
-+		if [ -e ".kde$lastver" ]; then
-+			echo "!!! ~/.kde$lastver already exists, can't move ~/.kde aside" 1>&2
-+			counter=1
-+			while [ -e ".kde$lastver.backup-$counter" ]; do
-+				echo "!!! Backup dir ~/.kde$lastver.backup-$counter already exists." 1>&2
-+				echo "Find out what's going wrong!" 1>&2
-+				let counter++
-+			done
-+			mv .kde ".kde$lastver.backup-$counter"
-+		fi
-+		rm .kde-cur
-+	fi
-+fi
-+
-+# If we suceeded
-+if [ ! -e .kde ]; then
-+	
-+	# If we have a configdir, activate it.
-+	ourver=3.4
-+	ourdir=.kde$ourver
-+	if [ -e "$ourdir" ]; then
-+		if [ ! -d "$ourdir" ]; then
-+			echo "!!! Configdir $ourdir is not a directory. Something's _really_ wrong. Aborting." 1>&2
-+		else
-+			mv "$ourdir" .kde
-+		fi
-+	
-+	# Otherwise (first run of this version), we copy over the most recent existing configdir.
-+	else
-+		for x in 3.3 3.2 3.1 3.0; do
-+			if [ -d ".kde$x" ]; then
-+				mostrecent=".kde$x"
-+				break
-+			fi
-+		done
-+		if [ -z "$mostrecent" ]; then
-+			echo "No previous configdir found; starting with empty config" 1>&2
-+		else
-+			echo "Copying previous configdir from $mostrecent" 1>&2
-+			cp -pr "$mostrecent" .kde
-+			
-+			# For the upgrade from kde 3.3, which still suffered from bug 40698, lots of little seds are needed.
-+			if [ "$mostrecent" == ".kde3.3" ]; then
-+				for file in share/apps/kdevdocumentation/search/htdig.conf \
-+							share/apps/kalarmd/clients \
-+							share/config/kdevdocumentationrc \
-+							share/config/katesyntaxhighlightingrc \
-+							share/config/ksmserverrc
-+				do
-+					sed -i -e "s:$HOME/.kde3.3:$HOME/.kde:g" -e 's:$HOME/.kde3.3:$HOME/.kde:g' ".kde/$file"
-+				done
-+			fi
-+		fi
-+	fi
-+	
-+	# Remember that we're running in case we die
-+	echo 3.4 > .kde-cur
-+fi
-+
-+# environment friendly
-+unset lastver
-+unset counter
-+unset ourver
-+unset ourdir
-+unset mostrecent
-+
-+# Gentoo init ends
-+
- # Check if a KDE session already is running
- if dcop kdesktop >/dev/null 2>&1; then
- 	echo "KDE seems to be already running on this display."
-@@ -247,4 +345,13 @@
-   done
- done
- 
-+
-+# Gentoo exit
-+
-+# Move the configdir back
-+mv .kde .kde3.4
-+rm .kde-cur
-+
-+# Gentoo exit ends
-+
- echo 'startkde: Done.'  1>&2
diff --git a/kde-base/kdebase/files/digest-kdebase-3.4.0_beta1 b/kde-base/kdebase/files/digest-kdebase-3.4.0_beta1
deleted file mode 100644
index ef925f9c3393..000000000000
--- a/kde-base/kdebase/files/digest-kdebase-3.4.0_beta1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 079120d41e7d4f4453b3fb2398f4d4c9 kdebase-3.3.91.tar.bz2 21271893
diff --git a/kde-base/kdebase/files/digest-kdebase-3.4.0_beta2 b/kde-base/kdebase/files/digest-kdebase-3.4.0_beta2
deleted file mode 100644
index a51d9609c703..000000000000
--- a/kde-base/kdebase/files/digest-kdebase-3.4.0_beta2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 67e33c1060229856655bc8c613e4544d kdebase-3.3.92.tar.bz2 22577557
diff --git a/kde-base/kdebase/kdebase-3.4.0_beta1.ebuild b/kde-base/kdebase/kdebase-3.4.0_beta1.ebuild
deleted file mode 100644
index 416464287805..000000000000
--- a/kde-base/kdebase/kdebase-3.4.0_beta1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# 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_beta1.ebuild,v 1.9 2005/02/27 12:30:27 brix Exp $
-
-inherit kde-dist eutils
-
-DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..."
-
-KEYWORDS="~x86 ~amd64"
-IUSE="arts cups java ldap ieee1394 lm_sensors logitech-mouse opengl pam samba ssl"
-
-DEPEND="arts? ( ~kde-base/arts-${PV} )
-	ldap? ( >=net-nds/openldap-2 )
-	pam? ( sys-libs/pam )
-	cups? ( net-print/cups )
-	ssl? ( dev-libs/openssl )
-	opengl? ( virtual/opengl )
-	samba? ( >=net-fs/samba-3.0.4 )
-	java? ( || ( virtual/jdk virtual/jre ) )
-	>=dev-libs/cyrus-sasl-2
-	lm_sensors? ( sys-apps/lm_sensors )
-	logitech-mouse? ( dev-libs/libusb )
-	ieee1394? ( sys-libs/libraw1394 )"
-# TODO:
-# - add support for dbus/hal for 'media:' ioslave:
-#     hal? ( >=sys-apps/dbus-0.22-r3    (for proper Qt support)
-#            >=sys-apps/hal-0.4 )
-#   the 'hal' flag should become global,
-#   since it's already used by 5 ebuilds.
-
-RDEPEND="${DEPEND}
-	sys-apps/eject"
-
-src_unpack() {
-	kde_src_unpack
-	epatch ${FILESDIR}/${PVR}/startkde-gentoo.diff
-}
-
-src_compile() {
-	myconf="$myconf --with-dpms"
-	myconf="$myconf `use_with ldap` `use_with cups`"
-	myconf="$myconf `use_with opengl gl` `use_with ssl`"
-	myconf="$myconf `use_with arts`"
-
-	use pam && myconf="$myconf --with-pam=yes" \
-		|| myconf="$myconf --with-pam=no --with-shadow"
-
-	if use java ; then
-		if has_version virtual/jdk ; then
-			myconf="$myconf --with-java=$(java-config --jdk-home)"
-		else
-			myconf="$myconf --with-java=$(java-config --jre-home)"
-		fi
-	else
-		myconf="$myconf --without-java"
-	fi
-
-	kde_src_compile myconf configure
-	kde_remove_flag kdm/kfrontend -fomit-frame-pointer
-	kde_src_compile make
-}
-
-src_install() {
-	kde_src_install
-	cd ${S}/kdm && make DESTDIR=${D} GENKDMCONF_FLAGS="--no-old --no-backup --no-in-notice" install
-
-	# Collision with kdemultimedia. Will be fixed in beta2.
-	rm -f ${D}/${KDEDIR}/share/icons/crystalsvg/scalable/apps/artsbuilder.svgz
-	rm -f ${D}/${KDEDIR}/share/icons/crystalsvg/scalable/apps/artscontrol.svgz
-
-	if use pam; then
-		insinto /etc/pam.d
-		newins ${FILESDIR}/kde.pam kde
-		newins ${FILESDIR}/kde-np.pam kde-np
-	fi
-
-	# startkde script
-	sed -i -e "s:_KDEDIR_:${KDEDIR}:" ${D}/${KDEDIR}/bin/startkde
-
-	# startup and shutdown scripts
-	dodir ${KDEDIR}/env
-	dodir ${KDEDIR}/shutdown
-
-	insinto ${KDEDIR}/env
-	insopts -m 644
-	doins ${FILESDIR}/agent-startup.sh
-
-	insinto ${KDEDIR}/shutdown
-	insopts -m 755
-	doins ${FILESDIR}/agent-shutdown.sh
-
-	# x11 session script
-	echo "#!/bin/sh
-${KDEDIR}/bin/startkde" > ${T}/kde-${SLOT}
-	exeinto /etc/X11/Sessions
-	doexe ${T}/kde-${SLOT}
-
-	# Create a kde.desktop file for freedesktop-compliant login managers
-	dodir /usr/share/xsessions
-	insinto /usr/share/xsessions
-	sed -e "s:_PREFIX_:${KDEDIR}:" \
-	    -e "s:_VERSION_:${SLOT}:" \
-		${FILESDIR}/kde.desktop > ${T}/kde-${SLOT}.desktop
-	doins ${T}/kde-${SLOT}.desktop
-
-	# Customized kdm configuration file
-	dodir ${KDEDIR}/share/config/kdm
-	insinto ${KDEDIR}/share/config/kdm
-	sed -e "s:_PREFIX_:${KDEDIR}:g" \
-	    -e "s:_RANDOM_:${RANDOM}${RANDOM}:g" \
-		${FILESDIR}/${PVR}/kdmrc > ${T}/kdmrc
-	doins ${T}/kdmrc
-
-	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
-
-	einfo "To enable gpg-agent and/or ssh-agent in KDE sessions,"
-	einfo "edit ${KDEDIR}/env/agent-startup.sh and ${KDEDIR}/shutdown/agent-shutdown.sh"
-}
diff --git a/kde-base/kdebase/kdebase-3.4.0_beta2.ebuild b/kde-base/kdebase/kdebase-3.4.0_beta2.ebuild
deleted file mode 100644
index 21408cdcff20..000000000000
--- a/kde-base/kdebase/kdebase-3.4.0_beta2.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# 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_beta2.ebuild,v 1.5 2005/02/27 12:32:44 brix Exp $
-
-inherit kde-dist eutils
-
-DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..."
-
-KEYWORDS="~x86 ~amd64 ~sparc"
-IUSE="arts cups java ldap ieee1394 lm_sensors logitech-mouse opengl pam samba ssl"
-
-DEPEND="arts? ( ~kde-base/arts-${PV} )
-	pam? ( kde-base/kdebase-pam )
-	ldap? ( >=net-nds/openldap-2 )
-	cups? ( net-print/cups )
-	ssl? ( dev-libs/openssl )
-	opengl? ( virtual/opengl )
-	samba? ( >=net-fs/samba-3.0.4 )
-	java? ( || ( virtual/jdk virtual/jre ) )
-	>=dev-libs/cyrus-sasl-2
-	lm_sensors? ( sys-apps/lm_sensors )
-	logitech-mouse? ( dev-libs/libusb )
-	ieee1394? ( sys-libs/libraw1394 )"
-# TODO:
-# - add support for dbus/hal for 'media:' ioslave:
-#     hal? ( >=sys-apps/dbus-0.22-r3    (for proper Qt support)
-#            >=sys-apps/hal-0.4 )
-
-RDEPEND="${DEPEND}
-	sys-apps/eject"
-
-src_unpack() {
-	kde_src_unpack
-
-	epatch ${FILESDIR}/${PVR}/startkde-gentoo.diff
-
-	# see kde bug 98628. Applied for rc1.
-	epatch ${FILESDIR}/kicker-visibility.diff
-}
-
-src_compile() {
-	myconf="$myconf --with-dpms"
-	myconf="$myconf $(use_with ldap) $(use_with cups)"
-	myconf="$myconf $(use_with opengl gl) $(use_with ssl)"
-	myconf="$myconf $(use_with arts)"
-
-	use pam && myconf="$myconf --with-pam=yes" \
-		|| myconf="$myconf --with-pam=no --with-shadow"
-
-	if use java ; then
-		if has_version virtual/jdk ; then
-			myconf="$myconf --with-java=$(java-config --jdk-home)"
-		else
-			myconf="$myconf --with-java=$(java-config --jre-home)"
-		fi
-	else
-		myconf="$myconf --without-java"
-	fi
-
-	kde_src_compile myconf configure
-	kde_remove_flag kdm/kfrontend -fomit-frame-pointer
-	kde_src_compile make
-}
-
-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
-	dodir ${KDEDIR}/env
-	dodir ${KDEDIR}/shutdown
-
-	insinto ${KDEDIR}/env
-	insopts -m 644
-	doins ${FILESDIR}/agent-startup.sh
-
-	insinto ${KDEDIR}/shutdown
-	insopts -m 755
-	doins ${FILESDIR}/agent-shutdown.sh
-
-	# x11 session script
-	echo "#!/bin/sh
-${KDEDIR}/bin/startkde" > ${T}/kde-${SLOT}
-	exeinto /etc/X11/Sessions
-	doexe ${T}/kde-${SLOT}
-
-	# Create a kde.desktop file for freedesktop-compliant login managers
-	dodir /usr/share/xsessions
-	insinto /usr/share/xsessions
-	sed -e "s:_PREFIX_:${KDEDIR}:" \
-	    -e "s:_VERSION_:${SLOT}:" \
-		${FILESDIR}/kde.desktop > ${T}/kde-${SLOT}.desktop
-	doins ${T}/kde-${SLOT}.desktop
-
-	# Customized kdm configuration file
-	dodir ${KDEDIR}/share/config/kdm
-	insinto ${KDEDIR}/share/config/kdm
-	sed -e "s:_PREFIX_:${KDEDIR}:g" \
-	    -e "s:_RANDOM_:${RANDOM}${RANDOM}:g" \
-		${FILESDIR}/${PVR}/kdmrc > ${T}/kdmrc
-	doins ${T}/kdmrc
-
-	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
-
-	einfo "To enable gpg-agent and/or ssh-agent in KDE sessions,"
-	einfo "edit ${KDEDIR}/env/agent-startup.sh and ${KDEDIR}/shutdown/agent-shutdown.sh"
-}