x86 stable and version cleanup

11 files changed, 21 insertions, 690 deletions

diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index 8b0279d224b6..cb5ab8d3a015 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdebase
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.119 2004/03/09 12:23:12 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.120 2004/03/12 20:44:19 caleb Exp $
+
+  12 Mar 2004; Caleb Tennis <caleb@gentoo.org> kdebase-3.1.4.ebuild,
+  kdebase-3.2.0.ebuild, kdebase-3.2.1.ebuild, files/focus-patch.diff,
+  files/kdebase-3.1.4-amd64-accessviol.patch, files/konq-crash-patch.diff,
+  files/3.1.4/backgroundrc, files/3.1.4/kdmrc,
+  files/3.1.4/startkde-3.1.4-gentoo.diff:
+  x86 stable and version cleanup
 
 *kdebase-3.2.1 (09 Mar 2004)
 
diff --git a/kde-base/kdebase/files/3.1.4/backgroundrc b/kde-base/kdebase/files/3.1.4/backgroundrc
deleted file mode 100644
index d00db3a27bff..000000000000
--- a/kde-base/kdebase/files/3.1.4/backgroundrc
+++ /dev/null
@@ -1,18 +0,0 @@
-[Desktop0]
-BackgroundMode=VerticalGradient
-BlendBalance=100
-BlendMode=NoBlending
-ChangeInterval=60
-Color1=14,120,131
-Color2=67,174,192
-CurrentWallpaper=0
-LastChange=0
-MinOptimizationDepth=1
-MultiWallpaperMode=NoMulti
-Pattern=fish
-Program=
-ReverseBlending=false
-UseSHM=false
-Wallpaper=default_blue.jpg
-WallpaperList=
-WallpaperMode=NoWallpaper
diff --git a/kde-base/kdebase/files/3.1.4/kdmrc b/kde-base/kdebase/files/3.1.4/kdmrc
deleted file mode 100644
index 1d5018fc119d..000000000000
--- a/kde-base/kdebase/files/3.1.4/kdmrc
+++ /dev/null
@@ -1,413 +0,0 @@
-# KDM configuration example.
-# Note, that all comments will be lost if you change this file with
-# the kcontrol frontend.
-#
-# 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".
-# 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
-# - 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_*] (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.
-# 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.
-# Don't even think about changing it!
-ConfigVersion=2.0
-# If "false", KDM won't daemonize after startup. Note, that you needn't to
-# use this if you start KDM from inittab, as KDM won't daemonize in this case
-# automatically. Default is true.
-#DaemonMode=false
-# 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's 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 vt7"
-# XXX i'm planning to absorb this file into kdmrc, but i'm not sure how to
-# do this best.
-Xservers=/etc/X11/xdm/Xservers
-# Where KDM should store its PID. Default is "" (don't store)
-PidFile=/var/run/xdm-pid
-# Whether KDM should lock the pid file to prevent having multiple KDM
-# instances running at once. Leave it "true", unless you're brave.
-#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. Just keep it "true".
-#AutoRescan=false
-# Additional environment variables KDM should pass on to kdm_config, kdm_greet,
-# Xsetup, Xstartup, Xsession, and Xreset. LD_LIBRARY_PATH is a good candidate;
-# otherwise it shouldn't be necessary very often.
-#ExportList=SOME_VAR,ANOTHER_IMPORTANT_VAR
-# Where the command FiFos should be created. Make it empty to disable
-# the FiFos. Default is /var/run/xdmctl
-#FifoDir=/tmp
-# To which group the command FiFos should belong.
-# Default is -1 (effectively root)
-#FifoGroup=xdmctl
-
-[Xdmcp]
-# Whether KDM should listen to XDMCP requests. Default is true.
-Enable=false
-# The UDP port KDM should listen on for XDMCP requests. Don't change the 177.
-#Port=177
-# File with the private keys of X-terminals. Required for XDM authentication.
-# Default is ""
-#KeyFile=/usr/kde/3.1/share/config/kdm/kdmkeys
-# XDMCP access control file in the usual XDM-Xaccess format.
-# Default is /usr/kde/3.1/share/config/kdm/Xaccess
-# XXX i'm planning to absorb this file into kdmrc, but i'm not sure how to
-# do this best.
-Xaccess=/etc/X11/xdm/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 instead of the
-# host name. Use this on multihomed hosts. Default is false
-#SourceAddress=true
-# The program which is invoked to dynamically generate replies to XDMCP
-# BroadcastQuery requests.
-# By default no program is invoked and "Willing to manage" is sent.
-Willing=/etc/X11/xdm/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 one can shut down the system via the global command FiFo.
-# Default is false
-#AllowFifo=true
-# Whether one can abort still running 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):
-#   OpenRepeat * (OpenTimeout + OpenDelay)
-# - starting a local X-server (ServerTime): ServerAttempts * ServerTimeout
-# - starting a display:
-#   - local display: StartAttempts * (ServerTime + OpenTime)
-#   - remote/foreign display: StartAttempts * OpenTime
-
-# Core config for all displays
-[X-*-Core]
-# How long to wait before retrying to start the display after various
-# errors. Default is 15
-#OpenDelay=
-# How long to wait before timing out XOpenDisplay. Default is 120
-#OpenTimeout=
-# How often to try the XOpenDisplay. Default is 5
-#OpenRepeat=
-# Try at most that many times to start a display. If this fails, the display
-# is disabled. Default is 4
-#StartAttempts=
-# The StartAttempt counter is reset after that many seconds. Default is 30
-#StartInterval=
-# Ping remote display every that many minutes. Default is 5
-#PingInterval=
-# Wait for a Pong that many minutes. Default is 5
-#PingTimeout=
-# 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=
-# The signal needed to terminate the local X-server. Default is 15 (SIGTERM)
-#TermSignal=
-# Need to reset the X-server to make it read initial Xauth file.
-# Default is false
-#ResetForAuth=true
-# 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=
-# The name of this X-server's Xauth file. Default is "", which means, that
-# a random name in the AuthDir directory will be used.
-#AuthFile=
-# Specify a file with X-resources for the greeter, chooser and background.
-# The KDE frontend doesn't care for this, so you don't need it unless you
-# use an alternative chooser or another background generator than kdmdesktop.
-# Default is ""
-Resources=/etc/X11/xdm/Xresources
-# 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. You should start kdmdesktop
-# there. Also, xconsole can be started by this script.
-# Default is ""
-Setup=/etc/X11/xdm/Xsetup_0
-# 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=/usr/kde/3.1/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=/usr/kde/3.1/share/config/kdm/Xreset
-# The program which is run as the user which logs in. It is supposed to
-# interpret the session argument (see SessionTypes) and start an appropriate
-# session according to it.
-# Default is /usr/X11R6/bin/xterm -ls -T
-Session=/etc/X11/xdm/Xsession
-# The program to run if Session fails.
-# Default is /usr/X11R6/bin/xterm
-#FailsafeClient=
-# The PATH for the Session program. Default is
-# /bin:/usr/bin:/usr/X11R6/bin:/usr/local/bin
-#UserPath=/usr/kde/3.1/bin:/bin:/usr/bin:/usr/X11R6/bin:/usr/local/bin
-# The PATH for Setup, Startup and Reset, etc. Default is
-# /sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin:/usr/local/bin
-#SystemPath=/usr/kde/3.1/bin:/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin:/usr/local/bin
-# 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=
-# The host chooser program to use.
-# Default is /usr/kde/3.1/bin/chooser
-# XXX this is going to be integrated into the greeter (probably).
-#Chooser=
-# If "true", KDM will automatically restart a session after an X-server
-# crash (or if it is killed by Alt-Ctrl-BackSpace). Note, that enabling
-# this opens a security hole: a secured display lock can be circumvented
-# (unless you use KDE's built-in screen lock). 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. Default is All
-# "None" - no "Shutdown..." button is shown at all
-# "Root" - the root password must be entered to shut down
-# "All" - everybody can shut down the machine (Default)
-AllowShutdown=Root
-# Who is allowed to abort all still running sessions when shutting down.
-# Same options as for AllowShutdown. Default is All
-#AllowSdForceNow=Root
-# The default choice for the shutdown condition/timing.
-# "Schedule" - shutdown after all sessions exit (possibly at once) (Default)
-# "TryNow" - shutdown, if no sessions are open, otherwise do nothing
-# "ForceNow" - shutdown unconditionally
-#DefaultSdMode=ForceNow
-# If this is false the user must select the shutdown condition/timing already
-# in the shutdown dialog. If this is true he won't be bothered with the options,
-# but will be asked what to do if sessions are actually open. Default is true
-# NOTE: the interaction is currently not implemented. If this is set to true,
-# a normal forced shutdown will happen (without caring for the AllowSdForceNow
-# option!), i.e., KDM will behave exactly as before KDE 3.0.
-#InteractiveSd=false
-# Where (relatively to the user's home directory) to store the last
-# selected session. Default is .wmrc
-#SessSaveFile=
-
-# Greeter config for all displays
-[X-*-Greeter]
-# Session types the users can select. It is advisable to have "default" and
-# "failsafe" listed herein, which is also the default.
-# Note, that the meaning of this value is entirely up to your Session program.
-SessionTypes=Xsession,kde-3.0.4,kde-3.1_rc2,
-# Widget Style of the greeter:
-# Default, Windows, Platinum, Motif, MotifPlus, CDE, SGI, and any styles you
-# may have installed, e.g., HighColor; Default is "Default"
-GUIStyle=Keramik
-# Widget Colors of the greeter:
-# Default, and any color schemes you may have installed. Default is "Default"
-#ColorScheme=Pumpkin
-# What should be shown righthand of the input lines:
-# "Logo" - the image specified by LogoPixmap (Default)
-# "Clock" - a neat analog clock
-# "None" - nothing
-LogoArea=None
-# The image to show when LogoArea=Logo. Default is kdelogo.png
-LogoPixmap=
-# Normally, the greeter is centered on the screen. Use this, if you want
-# it to appear elsewhere on the screen. Default is false
-#GreeterPosFixed=true
-#GreeterPosX=200
-#GreeterPosY=100
-# 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 headline. Default is charter,24,bold
-GreetFont=verdana,24,5,0,50,0
-# The normal font used in the greeter. Default is helvetica,12
-StdFont=verdana,12,5,0,50,0
-# The font used for the "Login Failed" message. Default is helvetica,12,bold
-FailFont=verdana,12,5,0,75,0
-# Whether the fonts shown 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:
-# "On" -> - turn on
-# "Off" -> - turn off
-# "Keep" -> - don't change the state (Default)
-#NumLock=Off
-# Language to use in the greeter. Default is en_US
-#Language=de_DE
-# Specify, which user names (along with pictures) should be shown in the
-# greeter.
-# "NotHidden" - all users except those listed in HiddenUsers (Default)
-# "Selected" - only the users listed in SelectedUsers
-# "None" - no user list will be shown at all
-#ShowUsers=None
-# For ShowUsers=Selected. Default is ""
-#SelectedUsers=root,johndoe
-# For ShowUsers=NotHidden. Default is ""
-#HiddenUsers=root
-# Special case of HiddenUsers: users with a UID less than this number
-# (except root) 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 $KDEDIR/share/apps/kdm/pics/users/$USER.png (Default)
-# "UserOnly" - from the user's $HOME/.face
-# "PreferAdmin" - prefer $USER.png; fallback on $HOME/.face
-# "PreferUser" - ... and the other way round
-FaceSource=PreferUser
-# Specify, if/which user should be preselected for log in.
-# Note, that enabling this feature can be considered a security hole,
-# as it presents a valid login name to a potential attacker, so he "only"
-# needs to guess the password.
-# "None" - don't preselect any user (Default)
-# "Previous" - the user which successfully logged in last time
-# "Default" - the user specified in the DefaultUser field
-#PreselectUser=Previous
-# The user to preselect if PreselectUser=Default
-#DefaultUser=ethel
-# 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:
-# "NoEcho" - nothing is shown at all, the cursor doesn't move
-# "OneStar" - "*" is shown for every typed letter (Default)
-# "ThreeStars" - "***" is shown for every typed letter
-#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 /usr/kde/3.1/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=
-# Warn, if local X-authorization cannot be created. Default is true
-# XXX this is a dummy currently
-AuthComplain=true
-
-# 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=
-# How long to wait for a local X-server to come up. Default is 15
-#ServerTimeout=
-# See above
-AllowShutdown=All
-# See above
-AllowRootLogin=true
-# See above
-AllowNullPasswd=true
-# Enable password-less logins on this display. USE WITH EXTREME CARE!
-# Default is false
-#NoPassEnable=true
-# The users that don't need to provide a password to log in. NEVER list root!
-#NoPassUsers=fred,ethel
-
-# Greeter config for local displays
-[X-:*-Greeter]
-# See above
-#AuthComplain=false
-# The screen the greeter should be displayed on in multi-headed setups.
-# The numbering starts with 0 and 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
-
-# Core config for 1st local display
-[X-:0-Core]
-# Enable automatic login on this display. USE WITH EXTREME CARE!
-# Default is false
-#AutoLoginEnable=true
-# The user to log in automatically. NEVER specify root!
-#AutoLoginUser=fred
-# The password for the user to log in automatically. This is NOT required
-# unless the user is to be logged into a NIS or Kerberos domain. If you use
-# it, you should "chmod 600 kdmrc" for obvious reasons.
-#AutoLoginPass=secret!
-# The session for the user to log in automatically. This becomes useless after
-# the user's first login, as the last used session will take precedence.
-#AutoLoginSession=kde
-# If "true", the auto-login is truly automatic, i.e., the user is logged in
-# when KDM comes up. If "false", the auto-login must be initiated by crashing
-# the X-server with Alt-Ctrl-BackSpace. Default is true
-#AutoLogin1st=false
-# See above
-Authorize=true
-
-# Greeter config for 1st local display
-[X-:0-Greeter]
-# See above
-#PreselectUser=Default
-# See above
-#DefaultUser=johndoe
-
-[X-:1-Core]
-# See above
-Authorize=true
-
diff --git a/kde-base/kdebase/files/3.1.4/startkde-3.1.4-gentoo.diff b/kde-base/kdebase/files/3.1.4/startkde-3.1.4-gentoo.diff
deleted file mode 100644
index b5347bec54cf..000000000000
--- a/kde-base/kdebase/files/3.1.4/startkde-3.1.4-gentoo.diff
+++ /dev/null
@@ -1,67 +0,0 @@
---- startkde	2003-03-12 18:20:54.000000000 +0100
-+++ startkde	2003-03-12 18:26:10.000000000 +0100
-@@ -1,12 +1,34 @@
--#!/bin/sh
-+#!/bin/sh --login
- #
--#  DEFAULT KDE STARTUP SCRIPT ( KDE-3.1.4 )
-+#  GENTOO CUSTOMIZED KDE STARTUP SCRIPT ( KDE-3.1.4 )
- #
- 
- # When the X server dies we get a HUP signal from xinit. We must ignore it
- # because we still need to do some cleanup.
- trap 'echo GOT SIGHUP' HUP
- 
-+# Gentoo part:
-+export PATH="_KDEDIR_/bin:${PATH}"
-+export KDEDIR="_KDEDIR_"
-+# Use env.d's KDEDIRS. They should only include locations like /usr though, not
-+# actual KDE installations
-+
-+# handle ~/.kde* dirs - separate ones for separate KDEs
-+cd ~
-+[ -d .kde ] && /bin/mv .kde .kde.backup
-+if [ ! -e .kde3.1 ]; then
-+	if [ -e .kde3 ]; then
-+		/bin/cp -r .kde3 .kde3.1
-+	else
-+		/bin/mkdir .kde3.1
-+	fi
-+fi
-+/bin/ln -sf .kde3.1 .kde
-+
-+#export KDEHOME="${HOME}/.kdecvs"
-+
-+# Gentoo part ends
-+
- # Boot sequence:
- #
- # kdeinit is used to fork off processes which improves memory usage
-@@ -29,12 +51,12 @@
- # especially necessary on slow machines, where starting KDE takes one or two
- # minutes until anything appears on the screen.
- #
--# Set the background to plain grey.
-+# Set the background to cyan (Gentoo version change).
- # 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
- # palettised displays.
- 
--test "$XDM_MANAGED" || bkg="-solid #C0C0C0"
-+test "$XDM_MANAGED" || bkg="-solid #5477A0"
- xsetroot -cursor_name left_ptr $bkg
- 
- # The user's personal KDE directory is usually ~/.kde, but this setting
-@@ -140,7 +162,11 @@
- fi
- 
- # the splashscreen and progress indicator
--ksplash
-+if [ -n "$KSPLASH" ]; then
-+	$KSPLASH
-+else
-+	ksplash
-+fi
- 
- # We set LD_BIND_NOW to increase the efficiency of kdeinit.
- # kdeinit unsets this variable before loading applications.
diff --git a/kde-base/kdebase/files/digest-kdebase-3.1.4 b/kde-base/kdebase/files/digest-kdebase-3.1.4
deleted file mode 100644
index 29754eac6624..000000000000
--- a/kde-base/kdebase/files/digest-kdebase-3.1.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e6859ad85b176e11ce997490786c124d kdebase-3.1.4.tar.bz2 15192052
diff --git a/kde-base/kdebase/files/focus-patch.diff b/kde-base/kdebase/files/focus-patch.diff
deleted file mode 100644
index f4ff04812c77..000000000000
--- a/kde-base/kdebase/files/focus-patch.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdesktop/lockeng.cc 29 Nov 2002 15:09:11 -0000 1.53.2.1 
-+++ kdesktop/lockeng.cc 16 Sep 2003 13:57:40 -0000 1.53.2.2 
-@@ -277,6 +277,9 @@ bool SaverEngine::x11Event(XEvent *event
- 	    {
- 	    if (!event->xkey.send_event && mXAutoLock && mState == Waiting)
-     		mXAutoLock->keyPressed();
-+            // don't futher process key events that were received only because XAutoLock wants them
-+            if (!event->xkey.send_event && mXAutoLock && !QWidget::find( event->xkey.window ))
-+                return true;
- 	    break;
- 	    }
diff --git a/kde-base/kdebase/files/kdebase-3.1.4-amd64-accessviol.patch b/kde-base/kdebase/files/kdebase-3.1.4-amd64-accessviol.patch
deleted file mode 100644
index 1aa072cdce14..000000000000
--- a/kde-base/kdebase/files/kdebase-3.1.4-amd64-accessviol.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ruN kdebase-3.1.4.old/kcontrol/input/Makefile.am kdebase-3.1.4/kcontrol/input/Makefile.am
---- kdebase-3.1.4.old/kcontrol/input/Makefile.am	2003-07-13 19:23:29.000000000 +0000
-+++ kdebase-3.1.4/kcontrol/input/Makefile.am	2003-10-07 14:50:52.259457944 +0000
-@@ -23,4 +23,4 @@
- 
- install-data-hook:
- 	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/fonts/override
--	-mkfontdir $(DESTDIR)$(prefix)/share/fonts/override
-+#	-mkfontdir $(DESTDIR)$(prefix)/share/fonts/override
-diff -ruN kdebase-3.1.4.old/kcontrol/input/Makefile.in kdebase-3.1.4/kcontrol/input/Makefile.in
---- kdebase-3.1.4.old/kcontrol/input/Makefile.in	2003-09-10 14:59:11.000000000 +0000
-+++ kdebase-3.1.4/kcontrol/input/Makefile.in	2003-10-07 14:50:35.119063680 +0000
-@@ -923,7 +923,7 @@
- 
- install-data-hook:
- 	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/fonts/override
--	-mkfontdir $(DESTDIR)$(prefix)/share/fonts/override
-+#	-mkfontdir $(DESTDIR)$(prefix)/share/fonts/override
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/kde-base/kdebase/files/konq-crash-patch.diff b/kde-base/kdebase/files/konq-crash-patch.diff
deleted file mode 100644
index a609fccc2103..000000000000
--- a/kde-base/kdebase/files/konq-crash-patch.diff
+++ /dev/null
@@ -1,35 +0,0 @@
---- konqueror/konq_mainwindow.cc	28 Jul 2003 23:36:04 -0000	1.1083.2.33
-+++ konqueror/konq_mainwindow.cc	8 Aug 2003 20:47:07 -0000
-@@ -419,20 +419,25 @@
-   }
- 
-   KonqView *view = _view;
--  if ( !view  && !req.newTab)
--    view = m_currentView; /* Note, this can be 0L, e.g. on startup */
--  else if ( !view && req.newTab ) {
-+  if ( !view && req.newTab ) {
-     view = m_pViewManager->addTab(QString::null,
-                                   QString::null,
-                                   false
-                                   );
--    view->frame()->setTitle( _url.host() , 0L);
-+    if( view ){
-+        view->frame()->setTitle( _url.host() , 0L);
- 
--    if ( req.newTabInFront )
--        m_pViewManager->showTab( view );
-+        if ( req.newTabInFront )
-+            m_pViewManager->showTab( view );
- 
--    updateViewActions();
-+        updateViewActions();
-+    }else{//It appears that the view profile does not support tabs.
-+        req.newTab=false;
-+    }
-+    
-   }
-+  if ( !view  && !req.newTab)
-+    view = m_currentView; /* Note, this can be 0L, e.g. on startup */
- 
-   if ( view )
-   {
diff --git a/kde-base/kdebase/kdebase-3.1.4.ebuild b/kde-base/kdebase/kdebase-3.1.4.ebuild
deleted file mode 100644
index 70e68e3b2f2d..000000000000
--- a/kde-base/kdebase/kdebase-3.1.4.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.1.4.ebuild,v 1.16 2004/01/13 16:52:53 agriffis Exp $
-inherit kde-dist eutils
-
-IUSE="ldap pam motif encode oggvorbis cups ssl opengl samba java"
-DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..."
-
-KEYWORDS="x86 ppc sparc alpha hppa amd64"
-
-DEPEND=">=media-sound/cdparanoia-3.9.8
-	ldap? ( >=net-nds/openldap-1.2 )
-	pam? ( >=sys-libs/pam-0.73 )
-	motif? ( x11-libs/openmotif )
-	encode? ( >=media-sound/lame-3.89b )
-	oggvorbis? ( >=media-libs/libvorbis-1.0_beta1 )
-	cups? ( net-print/cups )
-	ssl? ( >=dev-libs/openssl-0.9.6b )
-	opengl? ( virtual/opengl )
-	samba? ( net-fs/samba )
-	java? ( || ( virtual/jdk virtual/jre ) )
-	>=media-libs/freetype-2
-	dev-util/pkgconfig"
-
-RDEPEND="$DEPEND sys-apps/eject"
-
-myconf="$myconf --with-dpms --with-cdparanoia"
-
-use ldap	&& myconf="$myconf --with-ldap" 	|| myconf="$myconf --without-ldap"
-use motif	&& myconf="$myconf --with-motif"	|| myconf="$myconf --without-motif"
-use encode	&& myconf="$myconf --with-lame"		|| myconf="$myconf --without-lame"
-use cups	&& myconf="$myconf --with-cups"		|| myconf="$myconf --disable-cups"
-use oggvorbis 	&& myconf="$myconf --with-vorbis"	|| myconf="$myconf --without-vorbis"
-use opengl	&& myconf="$myconf --with-gl"		|| myconf="$myconf --without-gl"
-use ssl		&& myconf="$myconf --with-ssl"		|| myconf="$myconf --without-ssl"
-use pam		&& myconf="$myconf --with-pam=yes"	|| myconf="$myconf --with-pam=no --with-shadow"
-use java	&& myconf="$myconf --with-java=$(java-config --jdk-home)"	|| myconf="$myconf --without-java"
-
-PATCHES=""
-
-src_unpack() {
-	kde_src_unpack
-	epatch ${FILESDIR}/focus-patch.diff
-	epatch ${FILESDIR}/konq-crash-patch.diff
-	use amd64 && epatch ${FILESDIR}/kdebase-3.1.4-amd64-accessviol.patch
-	#cd ${S} && aclocal
-}
-
-src_compile() {
-	#rm -f configure configure.in # to make sure the fontconfig patch takes effect
-	kde_src_compile myconf
-	#kde_fix_head_instances acinclude.m4 aclocal.m4 admin/cvs.sh admin/libtool.m4.in
-	kde_src_compile configure
-	kde_remove_flag kdm/kfrontend -fomit-frame-pointer
-	#kde_fix_head_instances klipper/klipperrc.desktop
-	kde_src_compile make
-}
-
-src_install() {
-
-	kde_src_install
-
-	# cf bug #5953
-	insinto /etc/pam.d
-	#newins ${FILESDIR}/kscreensaver.pam kscreensaver
-	newins ${FILESDIR}/kde.pam kde
-
-	# startkde script
-	cd ${D}/${KDEDIR}/bin
-	epatch ${FILESDIR}/${PVR}/startkde-${PVR}-gentoo.diff
-	mv startkde startkde.orig
-	sed -e "s:_KDEDIR_:${KDEDIR}:" startkde.orig > startkde
-	rm startkde.orig
-	chmod a+x startkde
-
-	# x11 session script
-	cd ${T}
-	echo "#!/bin/sh
-${KDEDIR}/bin/startkde" > kde-${PV}
-	chmod a+x kde-${PV}
-	exeinto /etc/X11/Sessions
-	doexe kde-${PV}
-
-	cd ${D}/${KDEDIR}/share/config/kdm || die
-	sed -e "s:SessionTypes=:SessionTypes=kde-${PV},:" \
-	-e "s:Session=${PREFIX}/share/config/kdm/Xsession:Session=/etc/X11/xdm/Xsession:" \
-	${FILESDIR}/${PVR}/kdmrc > kdmrc
-	cp ${FILESDIR}/${PVR}/backgroundrc .
-
-	#backup splashscreen images, so they can be put back when unmerging
-	#mosfet or so.
-	if [ ! -d ${KDEDIR}/share/apps/ksplash.default ]
-	then
-		cd ${D}/${KDEDIR}/share/apps
-		cp -rf ksplash/ ksplash.default
-	fi
-
-	# Show gnome icons when choosing new icon for desktop shortcut
-	dodir /usr/share/pixmaps
-	mv ${D}/${KDEDIR}/share/apps/kdesktop/pics/* ${D}/usr/share/pixmaps/
-	rm -rf ${D}/${KDEDIR}/share/apps/kdesktop/pics/
-	cd ${D}/${KDEDIR}/share/apps/kdesktop/
-	ln -sf /usr/share/pixmaps/ pics
-
-	rmdir ${D}/${KDEDIR}/share/templates/.source/emptydir
-
-}
-
-pkg_postinst() {
-	mkdir -p ${KDEDIR}/share/templates/.source/emptydir
-
-einfo "If you want to floppy:/ kioslave to work, please emerge the mtools package."
-einfo "This ioslave allows you to use fat/vfat filesystems (not only on floppies)"
-einfo "without mounting them. If you don't know what this is for, you can probably"
-einfo "go with the usual mounting method."
-
-}
diff --git a/kde-base/kdebase/kdebase-3.2.0.ebuild b/kde-base/kdebase/kdebase-3.2.0.ebuild
index 92c612149bb3..73bcb7a6f313 100644
--- a/kde-base/kdebase/kdebase-3.2.0.ebuild
+++ b/kde-base/kdebase/kdebase-3.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.2.0.ebuild,v 1.11 2004/03/03 03:11:39 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.2.0.ebuild,v 1.12 2004/03/12 20:44:20 caleb Exp $
 
 inherit kde-dist
 
@@ -35,12 +35,19 @@ src_compile() {
 	myconf="$myconf `use_with encode lame` `use_with cups`"
 	myconf="$myconf `use_with opengl gl` `use_with ssl`"
 
+	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
+
 	use pam \
 		&& myconf="$myconf --with-pam=yes" \
 		|| myconf="$myconf --with-pam=no --with-shadow"
-	use java \
-		&& myconf="$myconf --with-java=$(java-config --jdk-home)" \
-		|| myconf="$myconf --without-java"
 
 	kde_src_compile myconf configure
 	kde_remove_flag kdm/kfrontend -fomit-frame-pointer
diff --git a/kde-base/kdebase/kdebase-3.2.1.ebuild b/kde-base/kdebase/kdebase-3.2.1.ebuild
index a9e5921cd040..46f07f676c94 100644
--- a/kde-base/kdebase/kdebase-3.2.1.ebuild
+++ b/kde-base/kdebase/kdebase-3.2.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.2.1.ebuild,v 1.3 2004/03/11 04:27:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.2.1.ebuild,v 1.4 2004/03/12 20:44:20 caleb Exp $
 
 inherit kde-dist
 
 DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..."
 
-KEYWORDS="~x86 ~ppc ~sparc ~alpha hppa ~amd64 ~ia64"
+KEYWORDS="x86 ~ppc ~sparc ~alpha hppa ~amd64 ~ia64"
 IUSE="ldap pam motif encode cups ssl opengl samba java"
 
 DEPEND="media-sound/cdparanoia