new beta

36 files changed, 988 insertions, 8 deletions

diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index 83979bdd648a..29c207ec7025 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kdebase
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.136 2004/07/08 22:25:12 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.137 2004/07/23 11:58:18 caleb Exp $
+
+*kdebase-3.3.0_beta2 (23 Jul 2004)
+
+  23 Jul 2004; Caleb Tennis <caleb@gentoo.org> +files/3.3.0_beta2/Xsetup,
+  +files/3.3.0_beta2/backgroundrc, +files/3.3.0_beta2/kdmrc,
+  +files/3.3.0_beta2/startkde-3.3.0_beta2-gentoo.diff,
+  +kdebase-3.3.0_beta2.ebuild:
+  new beta
 
 *kdebase-3.3.0_beta1 (08 Jul 2004)
 
diff --git a/kde-base/kdebase/Manifest b/kde-base/kdebase/Manifest
index 7ee493498e72..1505ba03a021 100644
--- a/kde-base/kdebase/Manifest
+++ b/kde-base/kdebase/Manifest
@@ -5,6 +5,7 @@ MD5 1346582446d8d61097aaed2115b05adf kdebase-3.2.2.ebuild 3346
 MD5 3a42711432882f7dfe32aeec2f454ed7 kdebase-3.2.1.ebuild 3653
 MD5 997acbe41c84a6caae8518d950434205 ChangeLog 24179
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
+MD5 fb63e65daeb5f0077560878b63aec90b kdebase-3.3.0_beta2.ebuild 3277
 MD5 b48e5f8d54a613ad906d06a21e8349a2 kdebase-3.1.5.ebuild 3623
 MD5 ffad4f0170b80acc01e931ea21d3d4d4 files/utils.h.diff 343
 MD5 9b4df4afee8c5f857c91799f415a4ab2 files/kdebase-3.1.5-amd64-accessviol.patch 836
@@ -14,6 +15,7 @@ MD5 6eb40b28a36f889d0f1919cdbf160ef7 files/kscreensaver.pam 79
 MD5 17b088965016d9c796e570741837a2b3 files/detectwidget.cpp.diff 422
 MD5 2b5419b0b173138e22fe03f4157d5660 files/kde-np.pam 379
 MD5 090ab4e741b412f257c084f3ca8325ec files/digest-kdebase-3.3.0_beta1 69
+MD5 93966c9ed1c9c8d61604f5cffb8bf9b8 files/digest-kdebase-3.3.0_beta2 69
 MD5 78ebd13a55a30a97f9a65da56b015a34 files/digest-kdebase-3.1.5 68
 MD5 c0cb6e59bf4bbd19caa7b9435f253ff3 files/digest-kdebase-3.2.0 68
 MD5 7b4a3c4a318e02c24c0ebacb4264bcdd files/digest-kdebase-3.2.1 68
@@ -43,3 +45,7 @@ MD5 9adecda5cdf6951ea0bcb6515c21a38b files/3.3.0_beta1/kdmrc 18202
 MD5 2f1f31f38b93136baeb537500c8cfabc files/3.3.0_beta1/backgroundrc 342
 MD5 3403677f5c4e44815c5a97c507d4f117 files/3.3.0_beta1/Xsetup 758
 MD5 fd94a04c116a96b4fdee387b7921699e files/3.3.0_beta1/startkde-3.3.0_beta1-gentoo.diff 1561
+MD5 fd94a04c116a96b4fdee387b7921699e files/3.3.0_beta2/startkde-3.3.0_beta2-gentoo.diff 1561
+MD5 9adecda5cdf6951ea0bcb6515c21a38b files/3.3.0_beta2/kdmrc 18202
+MD5 2f1f31f38b93136baeb537500c8cfabc files/3.3.0_beta2/backgroundrc 342
+MD5 3403677f5c4e44815c5a97c507d4f117 files/3.3.0_beta2/Xsetup 758
diff --git a/kde-base/kdebase/files/3.3.0_beta2/Xsetup b/kde-base/kdebase/files/3.3.0_beta2/Xsetup
new file mode 100644
index 000000000000..427ed61d709b
--- /dev/null
+++ b/kde-base/kdebase/files/3.3.0_beta2/Xsetup
@@ -0,0 +1,36 @@
+#! /bin/sh
+# Xsetup - run as root before the login dialog appears
+
+#xconsole -geometry 480x130-0-0 -notify -verbose -fn fixed -exitOnFail -file /dev/xconsole &
+
+SESSIONDIR="_PREFIX_/share/config/kdm/sessions"
+
+session_to_desktop_entry()
+{
+SESSION=$1
+SESSIONFILE="/etc/X11/Sessions/${SESSION}"
+
+if [ ! -d ${SESSIONDIR} ]; then
+	echo "cannot create ${SESSION}.desktop:"	
+	echo "directory ${SESSIONDIR} does not exist."
+	return;
+fi
+
+if [ ! -e ${SESSIONDIR}/${SESSION}.desktop ]; then
+
+cat > "${SESSIONDIR}/${SESSION}.desktop" <<EOF
+[Desktop Entry]
+Type=XSession
+Exec=${SESSIONFILE}
+TryExec=${SESSIONFILE}
+Name=${SESSION}
+EOF
+
+fi
+}
+
+echo "Creating menu entries for kdm in ${SESSIONDIR}..."
+
+for i in `ls /etc/X11/Sessions/`; do
+	session_to_desktop_entry $i
+done
diff --git a/kde-base/kdebase/files/3.3.0_beta2/backgroundrc b/kde-base/kdebase/files/3.3.0_beta2/backgroundrc
new file mode 100644
index 000000000000..d00db3a27bff
--- /dev/null
+++ b/kde-base/kdebase/files/3.3.0_beta2/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.0_beta2/kdmrc b/kde-base/kdebase/files/3.3.0_beta2/kdmrc
new file mode 100644
index 000000000000..ba853ca21534
--- /dev/null
+++ b/kde-base/kdebase/files/3.3.0_beta2/kdmrc
@@ -0,0 +1,417 @@
+# 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.1
+# 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=_PREFIX_/share/config/kdm/Xservers
+# Where KDM should store its PID. Default is "" (don't store)
+PidFile=/var/run/kdm.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
+# The directory kdm should store persistent working data in.
+# Default is /var/lib/kdm
+#DataDir=/var/lib/kdm
+# 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 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=_PREFIX_/share/config/kdm/kdmkeys
+# XDMCP access control file in the usual XDM-Xaccess format.
+# Default is _PREFIX_/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=
+# 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=_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 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=
+# 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=_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
+# /bin:/usr/bin:/usr/X11R6/bin:/usr/local/bin
+#UserPath=_PREFIX_/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=_PREFIX_:/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=
+# 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
+# The directories containing session type definitions in .desktop format.
+# Default is _PREFIX_/share/apps/kdm/sessions
+SessionsDirs=_PREFIX_/share/config/kdm/sessions
+
+# 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 quite greyish. Default is ""
+#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,20,bold
+#GreetFont=charter,20,5,0,50,0
+# The normal font used in the greeter. Default is helvetica,10
+#StdFont=helvetica,10,5,0,50,0
+# The font used for the "Login Failed" message. Default is helvetica,10,bold
+#FailFont=helvetica,10,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 <FaceDir>/$USER.face[.icon] (Default)
+# "UserOnly" - from the user's $HOME/.face[.icon]
+# "PreferAdmin" - prefer <FaceDir>, fallback on $HOME
+# "PreferUser" - ... and the other way round
+#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.
+# 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 _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=
+# Use this number as a random seed when forging saved session types, etc. of
+# unknown users. This is used to avoid telling an attacker about existing users
+# by reverse conclusion. This value should be random but constant across the
+# login domain. Default is 0
+ForgingSeed=_RANDOM_
+# Specify greeter plugins that can be used to obtain authentication data.
+# This can be a plugin's base name (expands to $kde_modulesdir/kgreet_$base)
+# or a full pathname. Default is classic
+#PluginsLogin=sign
+# Same as PluginsLogin, but for the shutdown dialog.
+#PluginsShutdown=modern
+
+# 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!
+# Default is ""
+#NoPassUsers=fred,ethel
+
+# Greeter config for local displays
+[X-:*-Greeter]
+# Warn, if local X-authorization cannot be created. Default is true
+# XXX this is a dummy currently
+#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
+# 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 (Default)
+# "RemoteOnly" - only choice of remote host possible
+# "DefaultLocal" - start up in local mode, but allow switch to remote mode
+# "DefaultRemote" - ... and the other way round
+#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
+
+# 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! Default is ""
+#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. Default is ""
+#AutoLoginPass=secret!
+
+# Greeter config for 1st local display
+[X-:0-Greeter]
+# See above
+#PreselectUser=Default
+# See above
+#DefaultUser=johndoe
+
diff --git a/kde-base/kdebase/files/3.3.0_beta2/startkde-3.3.0_beta2-gentoo.diff b/kde-base/kdebase/files/3.3.0_beta2/startkde-3.3.0_beta2-gentoo.diff
new file mode 100644
index 000000000000..4c8234623b36
--- /dev/null
+++ b/kde-base/kdebase/files/3.3.0_beta2/startkde-3.3.0_beta2-gentoo.diff
@@ -0,0 +1,51 @@
+--- startkde.orig	2004-05-24 19:52:04.536984592 -0500
++++ startkde	2004-05-24 19:53:32.712579864 -0500
+@@ -1,8 +1,31 @@
+-#!/bin/sh
++#!/bin/sh --login
+ #
+-#  DEFAULT KDE STARTUP SCRIPT ( KDE-3.3 )
++#  GENTOO CUSTOMIZED KDE STARTUP SCRIPT ( KDE-3.3 )
+ #
+ 
++# 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.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
+@@ -144,12 +167,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 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.
+ 
+-test "$XDM_MANAGED" || bkg="-solid #C0C0C0"
++test "$XDM_MANAGED" || bkg="-solid #5477A0"
+ xsetroot -cursor_name left_ptr $bkg
+ 
+ # Get Ghostscript to look into user's KDE fonts dir for additional Fontmap
diff --git a/kde-base/kdebase/files/digest-kdebase-3.3.0_beta2 b/kde-base/kdebase/files/digest-kdebase-3.3.0_beta2
new file mode 100644
index 000000000000..186522a9c3a1
--- /dev/null
+++ b/kde-base/kdebase/files/digest-kdebase-3.3.0_beta2
@@ -0,0 +1 @@
+MD5 550f3e52c733c842f645f0480cedc60e kdebase-3.2.92.tar.bz2 18102640
diff --git a/kde-base/kdebase/kdebase-3.3.0_beta2.ebuild b/kde-base/kdebase/kdebase-3.3.0_beta2.ebuild
new file mode 100644
index 000000000000..a32022d74b4c
--- /dev/null
+++ b/kde-base/kdebase/kdebase-3.3.0_beta2.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.3.0_beta2.ebuild,v 1.1 2004/07/23 11:58:18 caleb Exp $
+
+inherit kde-dist eutils
+
+DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..."
+
+KEYWORDS="~x86 ~amd64"
+IUSE="ldap pam motif encode cups ssl opengl samba java arts"
+
+DEPEND="media-sound/cdparanoia
+	ldap? ( net-nds/openldap )
+	pam? ( sys-libs/pam )
+	motif? ( x11-libs/openmotif )
+	encode? ( media-sound/lame )
+	cups? ( net-print/cups )
+	ssl? ( dev-libs/openssl )
+	opengl? ( virtual/opengl )
+	samba? ( net-fs/samba )
+	java? ( || ( virtual/jdk virtual/jre ) )
+	arts? ( ~kde-base/arts-${PV//3.3/1.3} )
+	>=media-libs/freetype-2"
+RDEPEND="${DEPEND}
+	sys-apps/eject"
+
+src_unpack() {
+	kde_src_unpack
+}
+
+src_compile() {
+	myconf="$myconf --with-dpms --with-cdparanoia"
+	myconf="$myconf `use_with ldap` `use_with motif`"
+	myconf="$myconf `use_with encode lame` `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" install
+
+	insinto /etc/pam.d
+	newins ${FILESDIR}/kde.pam kde
+	newins ${FILESDIR}/kde-np.pam kde-np
+
+	# 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
+
+	# 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
+	dodir ${KDEDIR}/share/config/kdm/sessions
+	sed -e "s:_PREFIX_:${PREFIX}:g" \
+	    -e "s:_RANDOM_:${RANDOM}${RANDOM}:g" \
+	${FILESDIR}/${PVR}/kdmrc > kdmrc
+	sed -e "s:_PREFIX_:${PREFIX}:g" ${FILESDIR}/${PVR}/Xsetup > Xsetup
+
+	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
+}
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index c1b4a7b52fd6..d74fac51f762 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.147 2004/07/17 22:00:58 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.148 2004/07/23 11:56:26 caleb Exp $
+
+*kdelibs-3.3.0_beta2 (23 Jul 2004)
+
+  23 Jul 2004; Caleb Tennis <caleb@gentoo.org> +kdelibs-3.3.0_beta2.ebuild:
+  new beta
 
 *kdelibs-3.3.0_beta1 (08 Jul 2004)
 
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index d8a452326c95..19bb6fb133b1 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -3,6 +3,7 @@ MD5 2f58e1c51efb89082af89b80505983be kdelibs-3.2.0.ebuild 2404
 MD5 8ae427fb79ac0bded83e551819b42719 kdelibs-3.2.2.ebuild 2495
 MD5 0259c3f239449f381dde6ee6a4619312 kdelibs-3.1.5-r1.ebuild 2056
 MD5 b707cac51f1876562c5dc8552788d09f kdelibs-3.2.2-r1.ebuild 2611
+MD5 ea2fc3d5af599959b728a203eaa047af kdelibs-3.3.0_beta2.ebuild 2552
 MD5 bdbfa9147fb7f9dcb231ab624515d0c9 kdelibs-3.2.1.ebuild 2418
 MD5 0f0199c8ac44e5e9bf7acca24ce18578 kdelibs-3.2.3.ebuild 2452
 MD5 f2942d8ba47c3a60a191964b65609451 ChangeLog 23175
@@ -10,6 +11,7 @@ MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 52e0e955204a77781505d33b9a3c341d files/post-3.2.2-kdelibs-ktelnetservice.patch 974
 MD5 285676023bab94666dfec728231cfcd1 files/kdelibs-3.2.2-su.cpp.diff 383
 MD5 58daf143839865233492a463061c4194 files/digest-kdelibs-3.3.0_beta1 69
+MD5 948208805447d9e9f84325f61f921a82 files/digest-kdelibs-3.3.0_beta2 69
 MD5 3f21fc4e8ddbf79459bfa8f2df1a5e15 files/animated-gif-fix.patch 317
 MD5 ee0b53e6fbaea17ae3543638dc09ca34 files/digest-kdelibs-3.2.0 68
 MD5 2c0a17ac5767265af5bcfb2f892f66ec files/digest-kdelibs-3.2.1 68
@@ -19,6 +21,7 @@ MD5 41d30ba8cf8d36ad3caebeedb1ddfd0e files/kdelibs-3.1.5-kjs-alphaev6-gcc3-worka
 MD5 7cebc1abb3141287db618486fd679b32 files/post-3.2.2-kdelibs-kapplication.patch 882
 MD5 76ef4c7d472a5e3659219ee223f12cb5 files/qt-3.3-printfix.patch 333
 MD5 bde52aa0bba055c4f678540ec20bfe5a files/post-3.1.5-kdelibs-ktelnetservice.patch 968
+MD5 1fe1e2962c66be271d3cc297cfecf374 files/47kdepaths-3.3.0 117
 MD5 8fea98dc672d5c85b217bcb8bcec9214 files/post-3.1.5-kdelibs-kapplication.patch 653
 MD5 1e53bd5071cc4fe6ba67fda7252a1cf2 files/digest-kdelibs-3.1.5-r1 68
 MD5 6176dc207f5ba91edee9b04ab111afe5 files/digest-kdelibs-3.2.2-r1 68
diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.3.0_beta2 b/kde-base/kdelibs/files/digest-kdelibs-3.3.0_beta2
new file mode 100644
index 000000000000..6f5c946f252c
--- /dev/null
+++ b/kde-base/kdelibs/files/digest-kdelibs-3.3.0_beta2
@@ -0,0 +1 @@
+MD5 0f4a20ef8c38f3300fba5d1624cca0c8 kdelibs-3.2.92.tar.bz2 15702191
diff --git a/kde-base/kdelibs/kdelibs-3.3.0_beta2.ebuild b/kde-base/kdelibs/kdelibs-3.3.0_beta2.ebuild
new file mode 100644
index 000000000000..fcfbe3d53c64
--- /dev/null
+++ b/kde-base/kdelibs/kdelibs-3.3.0_beta2.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.3.0_beta2.ebuild,v 1.1 2004/07/23 11:56:26 caleb Exp $
+
+inherit kde eutils
+set-kdedir 3.3
+
+MY_PV=3.2.92
+S=${WORKDIR}/${PN}-${MY_PV}
+
+DESCRIPTION="KDE libraries needed by all kde programs"
+HOMEPAGE="http//www.kde.org/"
+SRC_URI="mirror://kde/unstable/${MY_PV}/src/${PN}-${MY_PV}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="3.3"
+KEYWORDS="~x86 ~amd64"
+IUSE="alsa cups ipv6 ssl doc ldap arts"
+
+# kde.eclass has kdelibs in DEPEND, and we can't have that in here.
+# so we recreate the entire DEPEND from scratch.
+DEPEND=">=sys-devel/autoconf-2.58
+	>=sys-devel/automake-1.8
+	>=app-arch/bzip2
+	>=dev-libs/libxslt-1.1.4
+	>=dev-libs/libxml2-2.6.6
+	>=dev-libs/libpcre-4.2
+	ssl? ( >=dev-libs/openssl-0.9.7d )
+	alsa? ( media-libs/alsa-lib virtual/alsa )
+	arts? ( ~kde-base/arts-1.3.0_beta2 )
+	cups? ( >=net-print/cups-1.1.19 )
+	ldap? ( >=net-nds/openldap-2.1.26 )
+	media-libs/tiff
+	>=app-admin/fam-2.7.0
+	virtual/ghostscript
+	media-libs/libart_lgpl
+	sys-devel/gettext
+	>=x11-libs/qt-3.3.2"
+RDEPEND="${DEPEND}
+	app-text/sgml-common
+	cups? ( net-print/cups )
+	doc? ( app-doc/doxygen )
+	dev-lang/python"
+
+src_unpack() {
+	kde_src_unpack
+}
+
+src_compile() {
+	kde_src_compile myconf
+
+	myconf="$myconf --with-distribution=Gentoo --enable-libfam --enable-dnotify"
+	myconf="$myconf `use_with alsa` `use_enable cups` `use_with arts`"
+
+	use ipv6	|| myconf="$myconf --with-ipv6-lookup=no"
+	use ssl		&& myconf="$myconf --with-ssl-dir=/usr"	|| myconf="$myconf --without-ssl"
+	use alsa	&& myconf="$myconf --with-alsa" || myconf="$myconf --without-alsa"
+	use cups	&& myconf="$myconf --enable-cups" || myconf="$myconf --disable-cups"
+
+	use x86 && myconf="$myconf --enable-fast-malloc=full"
+
+	kde_src_compile configure make
+
+	use doc && make apidox
+}
+
+src_install() {
+	kde_src_install
+	dohtml *.html
+
+	if use doc ; then
+		einfo "Copying API documentation..."
+		dodir ${KDEDIR}/share/doc/HTML/en/kdelibs-apidocs
+		cp -r ${S}/apidocs/* ${D}/$KDEDIR/share/doc/HTML/en/kdelibs-apidocs
+	else
+		rm -r ${D}/$KDEDIR/share/doc/HTML/en/kdelibs-apidocs
+	fi
+
+	# needed to fix lib64 issues on amd64, see bug #45669
+	use amd64 && ln -s ${KDEDIR}/lib ${D}/${KDEDIR}/lib64
+
+
+	if ! use arts ; then
+
+        dodir /etc/env.d
+
+	echo "PATH=${PREFIX}/bin
+ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin
+LDPATH=${PREFIX}/lib
+CONFIG_PROTECT=${PREFIX}/share/config" > ${D}/etc/env.d/47kdepaths-3.3.0 # number goes down with version upgra$
+
+        echo "KDEDIR=$PREFIX" > ${D}/etc/env.d/58kdedir-3.3.0 # number goes up with version upgrade
+
+	fi
+
+}
+
+pkg_postinst() {
+	if use doc ; then
+		rm $KDEDIR/share/doc/HTML/en/kdelibs-apidocs/common
+		ln -sf $KDEDIR/share/doc/HTML/en/common \
+			$KDEDIR/share/doc/HTML/en/kdelibs-apidocs/common
+	fi
+}
diff --git a/kde-base/kdemultimedia/ChangeLog b/kde-base/kdemultimedia/ChangeLog
index 343f8f234e6e..de894ea0ad5a 100644
--- a/kde-base/kdemultimedia/ChangeLog
+++ b/kde-base/kdemultimedia/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for kde-base/kdemultimedia
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.112 2004/07/08 22:38:29 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.113 2004/07/23 12:07:38 caleb Exp $
+
+*kdemultimedia-3.3.0_beta2 (23 Jul 2004)
+
+  23 Jul 2004; Caleb Tennis <caleb@gentoo.org>
+  +kdemultimedia-3.3.0_beta2.ebuild:
+  new beta
+
+*kdemultimedia-3.3.0_beta1 (08 Jul 2004)
+
+  08 Jul 2004; Caleb Tennis <caleb@gentoo.org>
+  -kdemultimedia-3.3.0_alpha1.ebuild, +kdemultimedia-3.3.0_beta1.ebuild:
+  New beta, remove alpha
 
 *kdemultimedia-3.3.0_beta1 (08 Jul 2004)
 
diff --git a/kde-base/kdemultimedia/Manifest b/kde-base/kdemultimedia/Manifest
index b67e84b695c2..27716be41662 100644
--- a/kde-base/kdemultimedia/Manifest
+++ b/kde-base/kdemultimedia/Manifest
@@ -1,11 +1,12 @@
 MD5 728a544c6c7320d96abb3c6ac20a9671 kdemultimedia-3.2.1.ebuild 2286
+MD5 4a1cc86a93b6f146330f9be401506eee kdemultimedia-3.3.0_beta2.ebuild 1430
 MD5 6f17211987d69d64b045e7920d823648 kdemultimedia-3.1.5.ebuild 2690
 MD5 f8c2a8c78bf6ae233f97a859ea5cc000 kdemultimedia-3.2.3.ebuild 1457
 MD5 78a5d756b72f651a8038451801e9bee6 kdemultimedia-3.2.0.ebuild 2255
 MD5 4a1cc86a93b6f146330f9be401506eee kdemultimedia-3.3.0_beta1.ebuild 1430
 MD5 6affdbc1c02d7034aecca744fb5128a4 kdemultimedia-3.2.2.ebuild 2290
 MD5 cb93ab2aa47f5cfa2918e4d596a3569a kdemultimedia-3.2.2-r1.ebuild 1460
-MD5 753f6e2a159b8708953fa0f0217defd4 ChangeLog 16207
+MD5 1df87637566c90384e3faa6d86148bdf ChangeLog 16395
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 a39413062132d248ceae0b20ed262e79 files/flac-patch.diff 450
 MD5 373aaabfcb29c89281c6880b2a784c2a files/digest-kdemultimedia-3.2.2-r1 73
@@ -13,6 +14,7 @@ MD5 441c0251c7db96f19b27f29861f65ee9 files/kdemultimedia-3.1.5-alpha.diff 300
 MD5 fe58e9a2bdef8ba1e3b8268714ff5fa7 files/kdemultimedia-3.1.5-ln-sf.diff 1278
 MD5 55cd599c61d48ca121ef4c96a905b6d1 files/kdemultimedia-3.1.5-gentoo-timidity.diff 590
 MD5 effaacba30e9499648ddac465505f7a9 files/digest-kdemultimedia-3.3.0_beta1 74
+MD5 379d2823bdbc488daa9b9483e8b4911e files/digest-kdemultimedia-3.3.0_beta2 74
 MD5 239528cb3f6dd1fcc4e2bc4fd2ba9ba8 files/digest-kdemultimedia-3.1.5 73
 MD5 498d3a9ec387535d759af9fd59f3dc07 files/digest-kdemultimedia-3.2.0 73
 MD5 d000b32f6bf7a0e95a7ccfe6ec89fe69 files/digest-kdemultimedia-3.2.1 73
diff --git a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.3.0_beta2 b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.3.0_beta2
new file mode 100644
index 000000000000..e2b2f0928c27
--- /dev/null
+++ b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.3.0_beta2
@@ -0,0 +1 @@
+MD5 226cd47b41097d3503d2f4aa76a4ec6d kdemultimedia-3.2.92.tar.bz2 5322676
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.3.0_beta2.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.3.0_beta2.ebuild
new file mode 100644
index 000000000000..b5cab8d636e1
--- /dev/null
+++ b/kde-base/kdemultimedia/kdemultimedia-3.3.0_beta2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.3.0_beta2.ebuild,v 1.1 2004/07/23 12:07:38 caleb Exp $
+
+inherit kde-dist flag-o-matic
+
+DESCRIPTION="KDE multimedia apps: noatun, kscd, artsbuilder..."
+
+KEYWORDS="~x86 ~amd64"
+IUSE="flac encode oggvorbis alsa gstreamer"
+
+DEPEND="~kde-base/kdebase-${PV}
+	media-sound/cdparanoia
+	flac? ( media-libs/flac )
+	encode? ( media-sound/lame )
+	oggvorbis? ( media-libs/libvorbis media-libs/libogg )
+	>=media-libs/xine-lib-1_beta12
+	alsa? ( media-libs/alsa-lib )
+	gstreamer? ( media-libs/gstreamer )
+	media-sound/trm
+	media-libs/taglib
+	!media-sound/juk"
+
+src_unpack() {
+	kde_src_unpack
+}
+
+src_compile() {
+	replace-flags -O3 -O2
+	# Still persists with 3.2.1 - kaboodle
+	filter-flags "-fno-default-inline"
+
+	myconf="$myconf --with-xine-prefix=/usr"
+
+	# make -j2 fails, at least on ppc
+	use ppc && export MAKEOPTS="$MAKEOPTS -j1"
+	use hppa && append-flags -ffunction-sections
+
+	# alsa 0.9 not supported
+	use alsa	&& myconf="$myconf --with-alsa --with-arts-alsa" || myconf="$myconf --without-alsa --disable-alsa"
+	use oggvorbis	&& myconf="$myconf --with-vorbis=/usr"		|| myconf="$myconf --without-vorbis"
+	use encode	&& myconf="$myconf --with-lame=/usr" || myconf="$myconf --without-lame"
+
+	myconf="$myconf --disable-strict --disable-warnings"
+
+	kde_src_compile
+}
diff --git a/kde-base/kdenetwork/ChangeLog b/kde-base/kdenetwork/ChangeLog
index a01290261508..80497e46dd3c 100644
--- a/kde-base/kdenetwork/ChangeLog
+++ b/kde-base/kdenetwork/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdenetwork
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.94 2004/07/08 22:29:01 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.95 2004/07/23 12:00:56 caleb Exp $
+
+*kdenetwork-3.3.0_beta2 (23 Jul 2004)
+
+  23 Jul 2004; Caleb Tennis <caleb@gentoo.org> +kdenetwork-3.3.0_beta2.ebuild:
+  new beta
 
 *kdenetwork-3.3.0_beta1 (08 Jul 2004)
 
diff --git a/kde-base/kdenetwork/Manifest b/kde-base/kdenetwork/Manifest
index b983ec5799b6..912ded99111a 100644
--- a/kde-base/kdenetwork/Manifest
+++ b/kde-base/kdenetwork/Manifest
@@ -1,6 +1,7 @@
 MD5 5fad807a1848e3d0688c7ae5df908de2 kdenetwork-3.1.5.ebuild 898
 MD5 c59bfc64f8eaf6f5517206ee29fa8ea2 kdenetwork-3.2.3.ebuild 1239
 MD5 8ca1ddb44e1789e711218d60395307b3 kdenetwork-3.2.0.ebuild 1182
+MD5 6263d1a7a55fca0dd5140896546f7edb kdenetwork-3.3.0_beta2.ebuild 1205
 MD5 3bece517a429d8a402d85ffc30a37427 kdenetwork-3.2.2.ebuild 1276
 MD5 014a3b36d623ffa1a409e675314f1fc0 kdenetwork-3.2.3-r1.ebuild 1308
 MD5 162893bd364ae85477fc80c09d740434 kdenetwork-3.3.0_beta1.ebuild 1238
@@ -9,6 +10,7 @@ MD5 13b04b9cec08a4d7c3d7f6c48a813c77 kdenetwork-3.2.1.ebuild 1201
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 732cc856c1e48585781d79173f5d271b files/lisa 538
 MD5 4f84c45c43422b26ef562d178a38276f files/digest-kdenetwork-3.3.0_beta1 71
+MD5 f910504292edd249a0808c7be50ac52e files/digest-kdenetwork-3.3.0_beta2 71
 MD5 28c3ba792f8a0ce436216062cefa7908 files/reslisa 549
 MD5 93d1b5a88409a2adfec615de70dcaf70 files/linuxwirelesswidget.cpp.diff 796
 MD5 3939e85ee43aba114cc3ece4194145b6 files/reslisa.conf 340
diff --git a/kde-base/kdenetwork/files/digest-kdenetwork-3.3.0_beta2 b/kde-base/kdenetwork/files/digest-kdenetwork-3.3.0_beta2
new file mode 100644
index 000000000000..e28355403c5d
--- /dev/null
+++ b/kde-base/kdenetwork/files/digest-kdenetwork-3.3.0_beta2
@@ -0,0 +1 @@
+MD5 5174eecb675328350334b539f19b906a kdenetwork-3.2.92.tar.bz2 6930863
diff --git a/kde-base/kdenetwork/kdenetwork-3.3.0_beta2.ebuild b/kde-base/kdenetwork/kdenetwork-3.3.0_beta2.ebuild
new file mode 100644
index 000000000000..c6ec87fcd631
--- /dev/null
+++ b/kde-base/kdenetwork/kdenetwork-3.3.0_beta2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.3.0_beta2.ebuild,v 1.1 2004/07/23 12:00:56 caleb Exp $
+
+inherit kde-dist
+
+DESCRIPTION="KDE network apps: kopete, kppp, kget..."
+
+KEYWORDS="~x86 ~amd64"
+IUSE="slp samba wifi jabber ssl"
+
+DEPEND="~kde-base/kdebase-${PV}
+	slp? ( net-libs/openslp )
+	samba? ( net-fs/samba )
+	jabber? ( net-dns/libidn )
+	ssl? ( app-crypt/qca-tls )
+	!net-im/kopete
+	wifi? ( net-wireless/wireless-tools )"
+
+src_unpack() {
+	kde_src_unpack
+}
+
+src_compile() {
+	myconf="$myconf `use_enable slp`"
+	use wifi || DO_NOT_COMPILE="$DO_NOT_COMPILE wifi"
+	kde_src_compile
+}
+
+src_install() {
+	kde_src_install
+
+	chmod +s ${D}/${KDEDIR}/bin/reslisa
+
+	# empty config file needed for lisa to work with default settings
+	touch ${D}/etc/lisarc
+
+	# lisa, reslisa initscripts
+	dodir /etc/init.d
+	sed -e "s:_KDEDIR_:${KDEDIR}:g" ${FILESDIR}/lisa > ${D}/etc/init.d/lisa
+	sed -e "s:_KDEDIR_:${KDEDIR}:g" ${FILESDIR}/reslisa > ${D}/etc/init.d/reslisa
+	chmod +x ${D}/etc/init.d/*
+
+	insinto /etc/conf.d
+	newins ${FILESDIR}/lisa.conf lisa
+	newins ${FILESDIR}/reslisa.conf reslisa
+}
diff --git a/kde-base/kdepim/ChangeLog b/kde-base/kdepim/ChangeLog
index 3eb15e081f18..7c16c89999c4 100644
--- a/kde-base/kdepim/ChangeLog
+++ b/kde-base/kdepim/ChangeLog
diff --git a/kde-base/kdepim/Manifest b/kde-base/kdepim/Manifest
index e13ae747bde6..bb391b31773f 100644
--- a/kde-base/kdepim/Manifest
+++ b/kde-base/kdepim/Manifest
@@ -3,6 +3,7 @@ MD5 f9049d980674aeedde2b3eb573fcec38 kdepim-3.3.0_beta1.ebuild 743
 MD5 7c4a7a6d20b2d286487dc73308fd13d5 kdepim-3.1.5.ebuild 789
 MD5 ba6bda455b0e875f86471c6a5970b091 kdepim-3.2.3.ebuild 744
 MD5 9b804c502e4f3943f9321f8e1455675d kdepim-3.2.2.ebuild 763
+MD5 f9049d980674aeedde2b3eb573fcec38 kdepim-3.3.0_beta2.ebuild 743
 MD5 439c052a48463fcb9f2705938c4808f8 ChangeLog 11619
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 3df6e3d6d47af72ca3d907200f819709 kdepim-3.2.1.ebuild 844
@@ -13,5 +14,6 @@ MD5 318e6b50444a5837fed2a5ea9ecc57e9 files/digest-kdepim-3.2.3 66
 MD5 bf481282b9583a3e4095dcdef1aee22c files/KMail-inboxEater-BRANCH.diff 1619
 MD5 6f3f2b21eacb5869a9cbb821ffcf48a6 files/kpilot-parallel-make-fix.patch 737
 MD5 1065344a2c69e768f9c5765ec6ba811f files/digest-kdepim-3.3.0_beta1 67
+MD5 c15bea29d0b5aa57597bcaa4a13168de files/digest-kdepim-3.3.0_beta2 67
 MD5 bafdafa3d2488fa1168ccbb4a981dd87 files/digest-kdepim-3.2.0-r2 66
 MD5 ee45bc53826f95bcf3a3367db4d3845e files/kmfilter.cpp.patch 1528
diff --git a/kde-base/kdepim/files/digest-kdepim-3.3.0_beta2 b/kde-base/kdepim/files/digest-kdepim-3.3.0_beta2
new file mode 100644
index 000000000000..03c576c431ac
--- /dev/null
+++ b/kde-base/kdepim/files/digest-kdepim-3.3.0_beta2
@@ -0,0 +1 @@
+MD5 2bd3c4404947be37510fa349673dd0b1 kdepim-3.2.92.tar.bz2 9081907
diff --git a/kde-base/kdepim/kdepim-3.3.0_beta2.ebuild b/kde-base/kdepim/kdepim-3.3.0_beta2.ebuild
new file mode 100644
index 000000000000..1a1b458c3d8e
--- /dev/null
+++ b/kde-base/kdepim/kdepim-3.3.0_beta2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.3.0_beta2.ebuild,v 1.1 2004/07/23 12:04:31 caleb Exp $
+
+inherit kde-dist
+
+DESCRIPTION="KDE PIM (Personal Information Management) apps: korganizer, kmail, knode..."
+
+KEYWORDS="~x86 ~amd64"
+IUSE="pda crypt ldap"
+
+DEPEND="~kde-base/kdenetwork-${PV}
+	pda? ( app-pda/pilot-link dev-libs/libmal )
+	ldap? ( net-nds/openldap )
+	crypt? ( app-crypt/cryptplug app-crypt/gnupg )"
+
+src_unpack() {
+	kde_src_unpack
+}
+
+src_compile() {
+	use pda && myconf="$myconf --with-extra-includes=/usr/include/libpisock"
+	kde_src_compile
+}
+
+src_install() {
+	kde_src_install
+	docinto html
+	dodoc *.html
+}
diff --git a/kde-base/kdesdk/ChangeLog b/kde-base/kdesdk/ChangeLog
index 46314e0c1c73..483c08d22de5 100644
--- a/kde-base/kdesdk/ChangeLog
+++ b/kde-base/kdesdk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdesdk
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/ChangeLog,v 1.57 2004/07/08 22:36:09 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/ChangeLog,v 1.58 2004/07/23 12:12:36 caleb Exp $
+
+*kdesdk-3.3.0_beta2 (23 Jul 2004)
+
+  23 Jul 2004; Caleb Tennis <caleb@gentoo.org> +kdesdk-3.3.0_beta2.ebuild:
+  new beta
 
 *kdesdk-3.3.0_beta1 (08 Jul 2004)
 
diff --git a/kde-base/kdesdk/Manifest b/kde-base/kdesdk/Manifest
index 4e5c24282b7b..afbc0aa70a10 100644
--- a/kde-base/kdesdk/Manifest
+++ b/kde-base/kdesdk/Manifest
@@ -1,3 +1,4 @@
+MD5 99f034575b551b217e9e9f8996b4087d kdesdk-3.3.0_beta2.ebuild 429
 MD5 f1f347f9132b974eed2bf2bc221521f9 kdesdk-3.1.5.ebuild 312
 MD5 ec3f742cbe8d0cf58511f40d8fd97209 kdesdk-3.2.3.ebuild 450
 MD5 407a1c665d5d6aeef6fd4f9ff18136be kdesdk-3.2.0.ebuild 455
@@ -12,3 +13,4 @@ MD5 987fda649492ff31b91ea57bf0992c3a files/digest-kdesdk-3.2.1 66
 MD5 37c02f7f880e015c0c12dfd29e22dde1 files/digest-kdesdk-3.2.2 66
 MD5 5d548fa64f7fd6d2883d96488a8615c2 files/digest-kdesdk-3.2.3 66
 MD5 bf8a3be07d19abb2f7084e93030288e2 files/digest-kdesdk-3.3.0_beta1 67
+MD5 980f1f50d11fcf6a7d0ca7bfe98c3cac files/digest-kdesdk-3.3.0_beta2 67
diff --git a/kde-base/kdesdk/files/digest-kdesdk-3.3.0_beta2 b/kde-base/kdesdk/files/digest-kdesdk-3.3.0_beta2
new file mode 100644
index 000000000000..560a2a0c73cb
--- /dev/null
+++ b/kde-base/kdesdk/files/digest-kdesdk-3.3.0_beta2
@@ -0,0 +1 @@
+MD5 96a9ea71cf65da05aa5c4147ec3e55f2 kdesdk-3.2.92.tar.bz2 4388394
diff --git a/kde-base/kdesdk/kdesdk-3.3.0_beta2.ebuild b/kde-base/kdesdk/kdesdk-3.3.0_beta2.ebuild
new file mode 100644
index 000000000000..ce69c4fd504c
--- /dev/null
+++ b/kde-base/kdesdk/kdesdk-3.3.0_beta2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/kdesdk-3.3.0_beta2.ebuild,v 1.1 2004/07/23 12:12:36 caleb Exp $
+inherit kde-dist
+
+IUSE=""
+DESCRIPTION="KDE SDK: kbabel, ..."
+KEYWORDS="~x86 ~amd64"
+
+DEPEND="!dev-util/kcachegrind
+	x86? ( >=dev-util/calltree-0.9.1 )
+	media-gfx/graphviz
+	sys-devel/flex"
+
+RDEPEND="$DEPEND"
diff --git a/kde-base/kdeutils/ChangeLog b/kde-base/kdeutils/ChangeLog
index 4cf826aa1e78..d66922ec0abd 100644
--- a/kde-base/kdeutils/ChangeLog
+++ b/kde-base/kdeutils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdeutils
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/ChangeLog,v 1.78 2004/07/08 22:33:34 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/ChangeLog,v 1.79 2004/07/23 12:11:12 caleb Exp $
+
+*kdeutils-3.3.0_beta2 (23 Jul 2004)
+
+  23 Jul 2004; Caleb Tennis <caleb@gentoo.org> +kdeutils-3.3.0_beta2.ebuild:
+  New beta
 
 *kdeutils-3.3.0_beta1 (08 Jul 2004)
 
diff --git a/kde-base/kdeutils/Manifest b/kde-base/kdeutils/Manifest
index 3e237c145798..fdf0daa43e70 100644
--- a/kde-base/kdeutils/Manifest
+++ b/kde-base/kdeutils/Manifest
@@ -1,3 +1,4 @@
+MD5 800d0421767a5a630e1c66bea1f280a6 kdeutils-3.3.0_beta2.ebuild 366
 MD5 2c7957107be161b3f7d441298d617d7a kdeutils-3.2.1.ebuild 397
 MD5 53684aef9a08451bd9262dcea20ba3a9 kdeutils-3.1.5.ebuild 381
 MD5 52c0f3117d7aaa84f879ef2762bcb526 kdeutils-3.2.3.ebuild 440
@@ -7,6 +8,7 @@ MD5 4c0a7868d1c0904614a94be126722075 kdeutils-3.2.2.ebuild 526
 MD5 b6b98bf932c07590f8778d5cbef4a32b ChangeLog 8888
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 952c40f755e6e95c5a5ec885dc039d63 files/digest-kdeutils-3.3.0_beta1 69
+MD5 a6bc35ef457064aa5074e30dcbcc23ad files/digest-kdeutils-3.3.0_beta2 69
 MD5 40be85c9e2811d00aea01f19a6b743ee files/digest-kdeutils-3.1.5 68
 MD5 8d2bf90b91493ae30edaf1de4f3eefa6 files/digest-kdeutils-3.2.0 68
 MD5 7840ed5d5d2d46305c181af5c6354484 files/digest-kdeutils-3.2.1 68
diff --git a/kde-base/kdeutils/files/digest-kdeutils-3.3.0_beta2 b/kde-base/kdeutils/files/digest-kdeutils-3.3.0_beta2
new file mode 100644
index 000000000000..81ffb5df5c9c
--- /dev/null
+++ b/kde-base/kdeutils/files/digest-kdeutils-3.3.0_beta2
@@ -0,0 +1 @@
+MD5 394b104c6d701ef9731e07ddbf0c52f8 kdeutils-3.2.92.tar.bz2 2202506
diff --git a/kde-base/kdeutils/kdeutils-3.3.0_beta2.ebuild b/kde-base/kdeutils/kdeutils-3.3.0_beta2.ebuild
new file mode 100644
index 000000000000..040f2a921ee3
--- /dev/null
+++ b/kde-base/kdeutils/kdeutils-3.3.0_beta2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-3.3.0_beta2.ebuild,v 1.1 2004/07/23 12:11:12 caleb Exp $
+
+inherit kde-dist eutils
+
+DESCRIPTION="KDE utilities"
+
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+DEPEND="~kde-base/kdebase-${PV}
+	app-crypt/gnupg"
diff --git a/kde-base/kdewebdev/ChangeLog b/kde-base/kdewebdev/ChangeLog
index da8a055173c7..6a9383a29da5 100644
--- a/kde-base/kdewebdev/ChangeLog
+++ b/kde-base/kdewebdev/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdewebdev
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdewebdev/ChangeLog,v 1.4 2004/07/17 22:00:58 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdewebdev/ChangeLog,v 1.5 2004/07/23 12:09:40 caleb Exp $
+
+*kdewebdev-3.3.0_beta2 (23 Jul 2004)
+
+  23 Jul 2004; Caleb Tennis <caleb@gentoo.org> +kdewebdev-3.3.0_beta2.ebuild:
+  New beta
 
 *kdewebdev-3.3.0_beta1 (08 Jul 2004)
 
diff --git a/kde-base/kdewebdev/Manifest b/kde-base/kdewebdev/Manifest
index e5153ed455fd..c64dea55c894 100644
--- a/kde-base/kdewebdev/Manifest
+++ b/kde-base/kdewebdev/Manifest
@@ -1,4 +1,6 @@
+MD5 f5f7f31863d1b1c976d392127f5717a5 kdewebdev-3.3.0_beta2.ebuild 397
 MD5 f5f7f31863d1b1c976d392127f5717a5 kdewebdev-3.3.0_beta1.ebuild 397
 MD5 ec44932e375fffba5adf2ef5481c425d ChangeLog 530
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 c305f63b152b00aa4fa663cb14c348e4 files/digest-kdewebdev-3.3.0_beta1 70
+MD5 ff97db4add93349cd1f0ba7dc3583e3c files/digest-kdewebdev-3.3.0_beta2 70
diff --git a/kde-base/kdewebdev/files/digest-kdewebdev-3.3.0_beta2 b/kde-base/kdewebdev/files/digest-kdewebdev-3.3.0_beta2
new file mode 100644
index 000000000000..53538e9cfaf7
--- /dev/null
+++ b/kde-base/kdewebdev/files/digest-kdewebdev-3.3.0_beta2
@@ -0,0 +1 @@
+MD5 eb6c0e00d02339ace62f577811bb992f kdewebdev-3.2.92.tar.bz2 4655965
diff --git a/kde-base/kdewebdev/kdewebdev-3.3.0_beta2.ebuild b/kde-base/kdewebdev/kdewebdev-3.3.0_beta2.ebuild
new file mode 100644
index 000000000000..708026ec69ee
--- /dev/null
+++ b/kde-base/kdewebdev/kdewebdev-3.3.0_beta2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdewebdev/kdewebdev-3.3.0_beta2.ebuild,v 1.1 2004/07/23 12:09:40 caleb Exp $
+
+inherit kde-dist eutils
+
+DESCRIPTION="KDE web development - Quanta"
+KEYWORDS="~x86 ~amd64"
+IUSE="doc"
+DEPEND="~kde-base/kdebase-${PV}
+	doc? ( app-doc/quanta-docs )"