Add fix to avoid losing the KDE menu if a recent Gnome version is installed (#89870).

Package-Manager: portage-2.0.51.19

7 files changed, 740 insertions, 2 deletions

diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index 49d67883580d..5b208f5cc339 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kdebase
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.200 2005/06/07 13:00:19 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.201 2005/06/08 16:18:53 greg_g Exp $
+
+*kdebase-3.3.2-r3 (08 Jun 2005)
+
+  08 Jun 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/3.3.2-r3/backgroundrc, +files/3.3.2-r3/kdmrc,
+  +files/3.3.2-r3/startkde-3.3.2-r3-gentoo.diff, +kdebase-3.3.2-r3.ebuild:
+  Add fix to avoid losing the KDE menu if a recent Gnome version is installed
+  (#89870).
 
 *kdebase-3.4.1-r1 (07 Jun 2005)
 
diff --git a/kde-base/kdebase/Manifest b/kde-base/kdebase/Manifest
index 6d2b723706f6..d30ebb6d4433 100644
--- a/kde-base/kdebase/Manifest
+++ b/kde-base/kdebase/Manifest
@@ -3,10 +3,11 @@ MD5 3e5f9d9151b0e949e220754c4466d29c kdebase-3.3.2-r1.ebuild 3843
 MD5 771fb9eceec5b0d9c5bae83af47b7882 kdebase-3.2.3-r3.ebuild 3476
 MD5 f93f6f327b300509d077b23fd30b3332 kdebase-3.4.0.ebuild 3470
 MD5 6efcc94551ae1f4f7c81bc14312ebb0f kdebase-3.4.1.ebuild 3638
-MD5 0733d8cea4fff5969d898a92ffa7eaea ChangeLog 35597
+MD5 de90ee0a8c992cac92af9e7cb9ab387d ChangeLog 35901
 MD5 3f1deb74d1f1de330bf7acfaccaf4ead kdebase-3.3.2-r2.ebuild 3627
 MD5 bf20ec016f7869dcc4db02e00a157513 kdebase-3.4.1-r1.ebuild 3868
 MD5 0f2f33973ed5a7183c9eb24339ee57e5 kdebase-3.4.0-r1.ebuild 3639
+MD5 7a669cd7304dba0cb7dd9b791d2501c5 kdebase-3.3.2-r3.ebuild 3754
 MD5 f7875ce8a2e0dde4822449ec3deac74e files/digest-kdebase-3.4.1 68
 MD5 2b5419b0b173138e22fe03f4157d5660 files/kde-np.pam 379
 MD5 473c39b9f37a35e244d5718bf0006716 files/digest-kdebase-3.3.2-r2 68
@@ -19,6 +20,7 @@ MD5 f06224b0a38152e5d3435b00a70bcf6c files/konsole-3.3.2.patch 1201
 MD5 b048371a651391ef2bb4166e40e6adff files/kde.pam 405
 MD5 bd3cde92164bce3a560d0e62a5895757 files/post-3.2.3-kdebase-smb.diff 496
 MD5 acdc4850637dc2fafa8803790f771164 files/kdebase-3.4.0-r1-startkde-gentoo.patch 1284
+MD5 473c39b9f37a35e244d5718bf0006716 files/digest-kdebase-3.3.2-r3 68
 MD5 78fb451ad534b71fc3e541e9e5759dac files/kde.desktop 3910
 MD5 7c8b44c0407c6051b0c41301c90fac74 files/kdebase-3.4.0-startkde-gentoo.patch 1319
 MD5 49ebf63cda60ba3265f1231f295bc51b files/kdebase-3.4.1-configure.patch 6497
@@ -39,3 +41,6 @@ MD5 3403677f5c4e44815c5a97c507d4f117 files/3.2.3-r3/Xsetup 758
 MD5 0faaf9eacb170e30dae8818f927b2934 files/3.2.3-r3/startkde-3.2.3-r3-gentoo.diff 1923
 MD5 9adecda5cdf6951ea0bcb6515c21a38b files/3.2.3-r3/kdmrc 18202
 MD5 2f1f31f38b93136baeb537500c8cfabc files/3.2.3-r3/backgroundrc 342
+MD5 93b6c3484bb947b8ec75289fcbe47a85 files/3.3.2-r3/startkde-3.3.2-r3-gentoo.diff 1420
+MD5 0e829761448ff4a074404d08399fcab3 files/3.3.2-r3/kdmrc 19864
+MD5 2f1f31f38b93136baeb537500c8cfabc files/3.3.2-r3/backgroundrc 342
diff --git a/kde-base/kdebase/files/3.3.2-r3/backgroundrc b/kde-base/kdebase/files/3.3.2-r3/backgroundrc
new file mode 100644
index 000000000000..d00db3a27bff
--- /dev/null
+++ b/kde-base/kdebase/files/3.3.2-r3/backgroundrc
@@ -0,0 +1,18 @@
+[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.3.2-r3/kdmrc b/kde-base/kdebase/files/3.3.2-r3/kdmrc
new file mode 100644
index 000000000000..c1fe759c0836
--- /dev/null
+++ b/kde-base/kdebase/files/3.3.2-r3/kdmrc
@@ -0,0 +1,525 @@
+# 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".
+# 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. 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.
+# Don't 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'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 -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 (don't 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. Don't change unless you're 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 shouldn't be necessary very often.
+# Default is ""
+#ExportList=LD_LIBRARY_PATH,ANOTHER_IMPORTANT_VAR
+# A file KDM should read entropy from.
+# Default is "/dev/mem"
+#RandomFile=
+# A UNIX domain socket KDM should read entropy from.
+# Default is ""
+#PrngdSocket=/tmp/entropy
+# A TCP socket on localhost KDM should read entropy from.
+# Default is 0
+#PrngdPort=4840
+# 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
+# the FiFos.
+# Default is "/var/run/xdmctl"
+#FifoDir=/tmp
+# To which group the global command FiFo should belong.
+# Can be either a name or a numerical ID.
+# Default is 0
+#FifoGroup=xdmctl
+# The directory kdm should store persistent working data in.
+# Default is "/var/lib/kdm"
+#DataDir=
+# The directory KDM should store users' .dmrc files in. 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 KDM should listen on for XDMCP requests. Don't 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 doesn't care for this, so you don't 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
+# <command>xconsole</command> 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 allowd 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 "Keramik".
+# 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" - don't 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 user name 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" - don't 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 doesn't 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's 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
+
+# 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
+AllowRootLogin=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 don't 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.3.2-r3/startkde-3.3.2-r3-gentoo.diff b/kde-base/kdebase/files/3.3.2-r3/startkde-3.3.2-r3-gentoo.diff
new file mode 100644
index 000000000000..21882f175e84
--- /dev/null
+++ b/kde-base/kdebase/files/3.3.2-r3/startkde-3.3.2-r3-gentoo.diff
@@ -0,0 +1,52 @@
+--- startkde.orig	2005-01-24 16:14:33.346311272 +0100
++++ startkde	2005-01-24 16:15:02.978806448 +0100
+@@ -1,8 +1,33 @@
+ #!/bin/sh
+ #
+-#  DEFAULT KDE STARTUP SCRIPT ( KDE-3.3.2 )
++#  GENTOO CUSTOMIZED STARTUP SCRIPT ( KDE-3.3.2 )
+ #
+ 
++# Gentoo part:
++export PATH="_KDEDIR_/bin:${PATH}"
++
++# handle ~/.kde* dirs - separate ones for separate KDEs
++cd ~
++if [ -e .kde ]; then
++       if [ ! -L .kde ]; then
++               /bin/mv -f .kde .kde.backup
++       else
++               rm -f .kde
++       fi
++fi
++if [ ! -e .kde3.3 ]; then
++       if [ -e .kde3.2 ]; then
++               /bin/cp -r .kde3.2 .kde3.3
++       else
++               /bin/mkdir .kde3.3
++       fi
++fi
++/bin/ln -sf .kde3.3 .kde
++
++#export KDEHOME="${HOME}/.kde3.3"
++
++# Gentoo part ends
++
+ # 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
+@@ -14,12 +39,12 @@
+ 	exit 1
+ fi
+ 
+-# Set the background to plain grey.
++# Set the background to plain cyan.
+ # 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.
+ if test -z "$XDM_MANAGED" || echo "$XDM_MANAGED" | grep ",auto" > /dev/null; then
+-  xsetroot -solid "#C0C0C0"
++  xsetroot -solid "#5477A0"
+ fi
+ 
+ # we have to unset this for Darwin since it will screw up KDE's dynamic-loading
diff --git a/kde-base/kdebase/files/digest-kdebase-3.3.2-r3 b/kde-base/kdebase/files/digest-kdebase-3.3.2-r3
new file mode 100644
index 000000000000..2455650231b9
--- /dev/null
+++ b/kde-base/kdebase/files/digest-kdebase-3.3.2-r3
@@ -0,0 +1 @@
+MD5 edbd721a2a4970977dfe5f45d9e38923 kdebase-3.3.2.tar.bz2 19995043
diff --git a/kde-base/kdebase/kdebase-3.3.2-r3.ebuild b/kde-base/kdebase/kdebase-3.3.2-r3.ebuild
new file mode 100644
index 000000000000..c154ac71286c
--- /dev/null
+++ b/kde-base/kdebase/kdebase-3.3.2-r3.ebuild
@@ -0,0 +1,129 @@
+# 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.3.2-r3.ebuild,v 1.1 2005/06/08 16:18:53 greg_g Exp $
+
+inherit kde-dist eutils
+
+DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..."
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ldap pam cups ssl opengl samba java arts"
+
+DEPEND="arts? ( ~kde-base/arts-${PV//3.3/1.3} )
+	pam? ( kde-base/kdebase-pam )
+	ldap? ( net-nds/openldap )
+	cups? ( net-print/cups )
+	ssl? ( dev-libs/openssl )
+	opengl? ( virtual/opengl )
+	samba? ( >=net-fs/samba-3.0.1 )
+	java? ( || ( virtual/jdk virtual/jre ) )"
+
+RDEPEND="${DEPEND}
+	sys-apps/eject"
+
+src_unpack() {
+	kde_src_unpack
+	epatch ${FILESDIR}/konsole-${PV}.patch
+	epatch ${FILESDIR}/post-3.3.2-kdebase-htmlframes2.patch
+	epatch ${FILESDIR}/${PVR}/startkde-${PVR}-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
+
+	# startkde script
+	sed -i -e "s:_KDEDIR_:${KDEDIR}:" ${D}/${KDEDIR}/bin/startkde
+
+	# startup and shutdown scripts
+	insinto ${KDEDIR}/env
+	doins ${FILESDIR}/agent-startup.sh
+
+	exeinto ${KDEDIR}/shutdown
+	doexe ${FILESDIR}/agent-shutdown.sh
+
+	# freedesktop environment variables
+	cat <<EOF > ${T}/xdg.sh
+export XDG_DATA_DIRS="${KDEDIR}/share:/usr/share"
+export XDG_CONFIG_DIRS="${KDEDIR}/etc/xdg"
+EOF
+	insinto ${KDEDIR}/env
+	doins ${T}/xdg.sh
+
+	# kcontrol modules
+	cd ${D}/${KDEDIR}/etc/xdg/menus
+	ln -s default_kde-settings.menu kde-settings.menu
+	ln -s default_kde-information.menu kde-information.menu
+	ln -s default_kde-screensavers.menu kde-screensavers.menu
+
+	# 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:_PREFIX_:${PREFIX}:g" \
+	    -e "s:_RANDOM_:${RANDOM}${RANDOM}:g" \
+	${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
+
+	# Create a kde.desktop file so that a KDE entry will be present in gdm
+	dodir /usr/share/xsessions
+	insinto /usr/share/xsessions
+	newins ${FILESDIR}/kde.desktop kde-${PV}.desktop
+	sed -i -e "s:_PREFIX_:${KDEDIR}:;s:_VERSION_:${PV}:" \
+		${D}/usr/share/xsessions/kde-${PV}.desktop
+}
+
+pkg_postinst() {
+	mkdir -p ${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"
+}