From: Caleb Tennis Date: Thu, 9 Dec 2004 01:50:30 +0000 (+0000) Subject: Version bump X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6f8b641224ba222016ff8fed4c45a04482b4f409;p=gentoo.git Version bump --- diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog index 84ef7e7a2869..45480ad1c6a9 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.160 2004/12/06 23:56:48 jhuebel Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.161 2004/12/09 01:50:30 caleb Exp $ + +*kdebase-3.3.2 (08 Dec 2004) + + 08 Dec 2004; Caleb Tennis +files/kde.desktop, + +files/konsole-3.3.2.patch, +files/3.3.2/Xsetup, + +files/3.3.2/backgroundrc, +files/3.3.2/kdmrc, + +files/3.3.2/startkde-3.3.2-gentoo.diff, +kdebase-3.3.2.ebuild: + Version bump 06 Dec 2004; Jason Huebel kdebase-3.3.1.ebuild: stable on amd64 diff --git a/kde-base/kdebase/Manifest b/kde-base/kdebase/Manifest index 0f50d5a2452f..e284d2c62add 100644 --- a/kde-base/kdebase/Manifest +++ b/kde-base/kdebase/Manifest @@ -1,50 +1,58 @@ -MD5 bf24a9ba5849586c4b1cc6127189eb25 ChangeLog 28248 -MD5 76529aebe0f8884acc70558112902b72 kdebase-3.1.5.ebuild 3622 +MD5 38b7f46b86b7fc8f9ded108ccfb3b6a8 kdebase-3.3.1.ebuild 3313 +MD5 b6100281c86de3f02563c27080ea4c39 kdebase-3.2.3-r1.ebuild 3369 MD5 212bf2c2a704a5229147c98aa5fa49eb kdebase-3.2.0.ebuild 3344 MD5 1346582446d8d61097aaed2115b05adf kdebase-3.2.2.ebuild 3346 -MD5 b6100281c86de3f02563c27080ea4c39 kdebase-3.2.3-r1.ebuild 3369 MD5 6dd7d881b8b679fdda9f1b6c548154ed kdebase-3.3.0.ebuild 3429 -MD5 38b7f46b86b7fc8f9ded108ccfb3b6a8 kdebase-3.3.1.ebuild 3313 +MD5 a94385b19fc8cc9bd9675a7c36670be5 kdebase-3.3.2.ebuild 3925 +MD5 900a7b3d41d73f19b10fa4945e32071e ChangeLog 28525 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161 -MD5 e9930c666b8cf91e75350fdf4a5d6c58 files/3.3.0-kwinrules-Makefile.am.diff 839 -MD5 7b19cedba543f3d94c0884ff3d921081 files/3.3.0-sasl-fix.diff 2419 +MD5 76529aebe0f8884acc70558112902b72 kdebase-3.1.5.ebuild 3622 +MD5 ffad4f0170b80acc01e931ea21d3d4d4 files/utils.h.diff 343 +MD5 9b4df4afee8c5f857c91799f415a4ab2 files/kdebase-3.1.5-amd64-accessviol.patch 836 +MD5 b048371a651391ef2bb4166e40e6adff files/kde.pam 405 +MD5 78fb451ad534b71fc3e541e9e5759dac files/kde.desktop 3910 +MD5 160f44a51f4308c9c21052fd21c7d04d files/kdebase-3.2.0-kcontrol.patch 699 +MD5 6eb40b28a36f889d0f1919cdbf160ef7 files/kscreensaver.pam 79 +MD5 daa284d6a1f62c5c73deb8aeda9df57d files/digest-kdebase-3.2.3-r1 68 MD5 ca0fc4bf60b72dd1b8d42cb7e2be5a75 files/agent-shutdown.sh 204 -MD5 510d05672fcad238e92db44fbfa65f89 files/agent-startup.sh 209 +MD5 f06224b0a38152e5d3435b00a70bcf6c files/konsole-3.3.2.patch 1201 MD5 17b088965016d9c796e570741837a2b3 files/detectwidget.cpp.diff 422 +MD5 2b5419b0b173138e22fe03f4157d5660 files/kde-np.pam 379 +MD5 510d05672fcad238e92db44fbfa65f89 files/agent-startup.sh 209 MD5 78ebd13a55a30a97f9a65da56b015a34 files/digest-kdebase-3.1.5 68 MD5 c0cb6e59bf4bbd19caa7b9435f253ff3 files/digest-kdebase-3.2.0 68 MD5 7a15aed698aee6f910a32b6fb7a1e8dd files/digest-kdebase-3.2.2 68 -MD5 daa284d6a1f62c5c73deb8aeda9df57d files/digest-kdebase-3.2.3-r1 68 MD5 2c1b42d8cf9bd8799c241c21d0ab93ef files/digest-kdebase-3.3.0 68 MD5 2fc37f547444702199d6e33634d44c20 files/digest-kdebase-3.3.1 68 -MD5 2b5419b0b173138e22fe03f4157d5660 files/kde-np.pam 379 -MD5 b048371a651391ef2bb4166e40e6adff files/kde.pam 405 -MD5 9b4df4afee8c5f857c91799f415a4ab2 files/kdebase-3.1.5-amd64-accessviol.patch 836 -MD5 160f44a51f4308c9c21052fd21c7d04d files/kdebase-3.2.0-kcontrol.patch 699 +MD5 473c39b9f37a35e244d5718bf0006716 files/digest-kdebase-3.3.2 68 +MD5 7b19cedba543f3d94c0884ff3d921081 files/3.3.0-sasl-fix.diff 2419 MD5 2eb15d4b93c483b634ea34475d91e79b files/kdebase-3.2.2-genkdmconf.c.diff 1082 -MD5 6eb40b28a36f889d0f1919cdbf160ef7 files/kscreensaver.pam 79 MD5 a60fd1628607d4abdeb930662d126171 files/post-3.2.3-kdebase-htmlframes.patch 6728 -MD5 ffad4f0170b80acc01e931ea21d3d4d4 files/utils.h.diff 343 -MD5 2f1f31f38b93136baeb537500c8cfabc files/3.1.5/backgroundrc 342 +MD5 e9930c666b8cf91e75350fdf4a5d6c58 files/3.3.0-kwinrules-Makefile.am.diff 839 MD5 7db6d7353b1bfbb47d44e9df63be1410 files/3.1.5/kdmrc 17661 +MD5 2f1f31f38b93136baeb537500c8cfabc files/3.1.5/backgroundrc 342 MD5 5074351f4d8a0b3870a60751f58aaa06 files/3.1.5/startkde-3.1.5-gentoo.diff 1878 +MD5 9adecda5cdf6951ea0bcb6515c21a38b files/3.2.0/kdmrc 18202 MD5 2f1f31f38b93136baeb537500c8cfabc files/3.2.0/backgroundrc 342 MD5 3403677f5c4e44815c5a97c507d4f117 files/3.2.0/Xsetup 758 -MD5 9adecda5cdf6951ea0bcb6515c21a38b files/3.2.0/kdmrc 18202 MD5 0faaf9eacb170e30dae8818f927b2934 files/3.2.0/startkde-3.2.0-gentoo.diff 1923 -MD5 2f1f31f38b93136baeb537500c8cfabc files/3.2.2/backgroundrc 342 -MD5 3403677f5c4e44815c5a97c507d4f117 files/3.2.2/Xsetup 758 MD5 9adecda5cdf6951ea0bcb6515c21a38b files/3.2.2/kdmrc 18202 MD5 0faaf9eacb170e30dae8818f927b2934 files/3.2.2/startkde-3.2.2-gentoo.diff 1923 -MD5 2f1f31f38b93136baeb537500c8cfabc files/3.2.3-r1/backgroundrc 342 -MD5 3403677f5c4e44815c5a97c507d4f117 files/3.2.3-r1/Xsetup 758 -MD5 9adecda5cdf6951ea0bcb6515c21a38b files/3.2.3-r1/kdmrc 18202 -MD5 0faaf9eacb170e30dae8818f927b2934 files/3.2.3-r1/startkde-3.2.3-r1-gentoo.diff 1923 +MD5 2f1f31f38b93136baeb537500c8cfabc files/3.2.2/backgroundrc 342 +MD5 3403677f5c4e44815c5a97c507d4f117 files/3.2.2/Xsetup 758 +MD5 9adecda5cdf6951ea0bcb6515c21a38b files/3.3.0/kdmrc 18202 MD5 2f1f31f38b93136baeb537500c8cfabc files/3.3.0/backgroundrc 342 MD5 3403677f5c4e44815c5a97c507d4f117 files/3.3.0/Xsetup 758 -MD5 9adecda5cdf6951ea0bcb6515c21a38b files/3.3.0/kdmrc 18202 MD5 e0c938e08649001554fc8354fcd0e4e6 files/3.3.0/startkde-3.3.0-gentoo.diff 1504 +MD5 b029faa02a7b77a388eb0370999f8dd7 files/3.3.1/startkde-3.3.1-gentoo.diff 1544 +MD5 928f7208882e2a90d9cb633dcfa9abf9 files/3.3.1/kdmrc 19878 MD5 2f1f31f38b93136baeb537500c8cfabc files/3.3.1/backgroundrc 342 MD5 3403677f5c4e44815c5a97c507d4f117 files/3.3.1/Xsetup 758 -MD5 928f7208882e2a90d9cb633dcfa9abf9 files/3.3.1/kdmrc 19878 -MD5 b029faa02a7b77a388eb0370999f8dd7 files/3.3.1/startkde-3.3.1-gentoo.diff 1544 +MD5 928f7208882e2a90d9cb633dcfa9abf9 files/3.3.2/kdmrc 19878 +MD5 2f1f31f38b93136baeb537500c8cfabc files/3.3.2/backgroundrc 342 +MD5 3403677f5c4e44815c5a97c507d4f117 files/3.3.2/Xsetup 758 +MD5 e4c7caf47cbddd4251ee76f0fe4070ba files/3.3.2/startkde-3.3.2-gentoo.diff 1544 +MD5 0faaf9eacb170e30dae8818f927b2934 files/3.2.3-r1/startkde-3.2.3-r1-gentoo.diff 1923 +MD5 9adecda5cdf6951ea0bcb6515c21a38b files/3.2.3-r1/kdmrc 18202 +MD5 2f1f31f38b93136baeb537500c8cfabc files/3.2.3-r1/backgroundrc 342 +MD5 3403677f5c4e44815c5a97c507d4f117 files/3.2.3-r1/Xsetup 758 diff --git a/kde-base/kdebase/files/3.3.2/Xsetup b/kde-base/kdebase/files/3.3.2/Xsetup new file mode 100644 index 000000000000..427ed61d709b --- /dev/null +++ b/kde-base/kdebase/files/3.3.2/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" <xconsole or an alternative background generator. +# Default is "" +Setup=_PREFIX_/share/config/kdm/Xsetup +# A program to run before a user session starts. You should invoke sessreg +# there and optionally change the ownership of the console, etc. +# Default is "" +Startup=_PREFIX_/share/config/kdm/Xstartup +# A program to run after a user session exits. You should invoke sessreg +# there and optionally change the ownership of the console, etc. +# Default is "" +Reset=_PREFIX_/share/config/kdm/Xreset +# The program which is run as the user which logs in. It is supposed to +# interpret the session argument (see SessionsDirs) and start an appropriate +# session according to it. +# Default is "/usr/X11R6/bin/xterm -ls -T" +Session=_PREFIX_/share/config/kdm/Xsession +# The program to run if Session fails. +# Default is "/usr/X11R6/bin/xterm" +#FailsafeClient= +# The PATH for the Session program. +# Default is "/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin:/usr/games" +#UserPath= +# The PATH for Setup, Startup and Reset, etc. +# Default is "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/X11R6/bin" +#SystemPath= +# The default system shell. +# Default is "/bin/sh" +#SystemShell=/bin/bash +# Where to put the user's X-server authorization file if ~/.Xauthority +# cannot be created. +# Default is "/tmp" +#UserAuthDir= +# Whether to automatically restart sessions after X-server crashes. +# Note that enabling this makes circumventing screen lockers other than +# KDE's built-in one possible! +# Default is false +#AutoReLogin=true +# Allow root logins? +# Default is true +AllowRootLogin=false +# Allow to log in, when user has set an empty password? +# Default is true +AllowNullPasswd=false +# Who is allowed to shut down the system. This applies both to the +# greeter and to the command FiFo. +# "None" - no "Shutdown..." menu entry is shown at all +# "Root" - the password must be entered to shut down +# "All" - everybody can shut down the machine +# Default is All +AllowShutdown=Root +# Who is allowed to abort active sessions when shutting down. +# "None" - no forced shutdown is 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=_PREFIX_/share/config/kdm/sessions +# 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. @ means all users in that group. +# Default is "" +#SelectedUsers=root,johndoe +# For ShowUsers=NotHidden. @ 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 /$USER.face[.icon] +# "PreferAdmin" - prefer , 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" - * is shown for every typed letter +# "ThreeStars" - *** 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. @ 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/startkde-3.3.2-gentoo.diff b/kde-base/kdebase/files/3.3.2/startkde-3.3.2-gentoo.diff new file mode 100644 index 000000000000..1025aaac225f --- /dev/null +++ b/kde-base/kdebase/files/3.3.2/startkde-3.3.2-gentoo.diff @@ -0,0 +1,55 @@ +--- startkde.orig 2004-10-12 18:38:29.300671568 -0500 ++++ startkde 2004-10-12 18:40:23.766270152 -0500 +@@ -1,8 +1,36 @@ + #!/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}" ++export KDEDIR="_KDEDIR_" ++# Use env.d's KDEDIRS. They should only include locations like /usr$ ++# actual KDE installations ++ ++# 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 +42,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 b/kde-base/kdebase/files/digest-kdebase-3.3.2 new file mode 100644 index 000000000000..2455650231b9 --- /dev/null +++ b/kde-base/kdebase/files/digest-kdebase-3.3.2 @@ -0,0 +1 @@ +MD5 edbd721a2a4970977dfe5f45d9e38923 kdebase-3.3.2.tar.bz2 19995043 diff --git a/kde-base/kdebase/files/kde.desktop b/kde-base/kdebase/files/kde.desktop new file mode 100644 index 000000000000..fe9b697a2db1 --- /dev/null +++ b/kde-base/kdebase/files/kde.desktop @@ -0,0 +1,45 @@ +[Desktop Entry] +Encoding=UTF-8 +Type=XSession +Exec=_PREFIX_/bin/startkde +TryExec=_PREFIX_/bin/startkde +Name=KDE _VERSION_ +Name[hi]=केडीई +Name[mn]=КДЭ +Name[ta]=Kஏற்றக் காவலன் +Name[xh]=iKDE +Name[xx]=xxKDExx +Comment=The K Desktop Environment. A powerful Open Source graphical desktop environment +Comment[bs]=K Desktop Environment. Moćan grafički desktop otvorenog izvornog koda +Comment[ca]=L'entorn d'escriptori K. Un poderós entorn d'escriptori gràfic de Codi Font Obert +Comment[cy]=Yr Amgylchedd Penbwrdd K. Amgylchedd penbwrdd graffegol pwerus, sy'n gôd-agored. +Comment[da]=K Skrivebordsmiljøet. Et kraftigt, åbent, grafisk skrivebordsmiljø +Comment[de]=Das K Desktop Environment. Eine mächtige, graphische Arbeitsumgebung und Open Source / Freie Software +Comment[el]=Το K Desktop Environment. Ένα πανίσχυρο ελεύθερης προέλευσης γραφικό περιβάλλον επιφάνειας εργασίας +Comment[es]=El Entorno de Escritorio K, un potente entorno de escritorio gráfico realizado de código abierto +Comment[et]=K töölaua keskkond on võimas vaba tarkvara graafiline töölaua keskkond +Comment[fi]=KDE-työpöytäympäristö (K Desktop Environment) on tehokas avoimen lähdekoodin graafinen työpöytäympäristö +Comment[fr]=The K Desktop Environment. Un environnement de bureau graphique, puissant et Open Source +Comment[he]=The K Desktop Environment. סביבת עבודה גרפית, בעלת-עוצמה בקוד פתוח +Comment[hi]=के डेस्कटॉप वातावरण. एक शक्तिशाली, ओपन सोर्स चित्रमय डेस्कटॉप वातावरण +Comment[hu]=A KDE grafikus munkakörnyezet, egy szabad forráskódú grafikus ablakkezelő környezet +Comment[it]=L'ambiente desktop KDE. Un potente ambiente desktop grafico Open Source +Comment[mn]=The K Desktop Environment. Хүчирхэг нээлттэй эх код бүхий график дэлгэцийн орчин +Comment[nb]=K Desktop Environment. Et kraftig grafisk skrivebordsmiljø med åpen kildekode. +Comment[nl]=De K Desktop Environment, een krachtige open source grafische desktop environment +Comment[nn]=K Desktop Environment. Eit kraftig grafisk skrivebordsmiljø med open kjeldekode. +Comment[pl]=Środowisko KDE. Potężne środowisko graficzne Wolnego Oprogramowania. +Comment[pt]=O K Desktop Environment. Um ambiente gráfico open source poderoso +Comment[pt_BR]=Acrônimo para K Desktop Environment (ou Ambiente de Trabalho K). Um poderoso ambiente de trabalho gráfico de código aberto +Comment[ro]=K Desktop Environment. Un mediu grafic cu surse deschise, foarte puternic +Comment[sk]=The K Desktop Environment. Výkonné, voľne šíriteľné grafické pracovné prostredie +Comment[sl]=Namizno okolje K. Zmogljivo grafično namizno okolje odprte kode +Comment[sr]=K Desktop Environment (KDE). Моћно графичко радно окружење отвореног кода +Comment[sv]=K-skrivbordsmiljön. En kraftfull grafisk skrivbordsmiljö med öppen källkod +Comment[ta]= Kமேல்மேசை சூழல். சக்திவாய்ந்த திறந்த ஆணைமூல சித்திர வகை மேல்மேசை சூழல் +Comment[tr]=KDE Masaüstü Yöneticisi. Güçlü bir grafiksel masaüstü ortamı +Comment[uk]=The K Desktop Environment. Потужне графічне середовище з відкритими текстами +Comment[uz]=KDE (K Desktop Environment) - кучли Open Source график иш столи муҳити +Comment[vi]=môi trường desktop K, môi trường desktop đồ hoạ mã nguồn mở rất mạnh +Comment[xx]=xxThe K Desktop Environment. A powerful Open Source graphical desktop environmentxx +Comment[zh_CN]=K 桌面环境。强大的开放源代码图形桌面环境 diff --git a/kde-base/kdebase/files/konsole-3.3.2.patch b/kde-base/kdebase/files/konsole-3.3.2.patch new file mode 100644 index 000000000000..81496ed42c0c --- /dev/null +++ b/kde-base/kdebase/files/konsole-3.3.2.patch @@ -0,0 +1,30 @@ +--- kdebase/konsole/konsole/konsole.cpp 16 Nov 2004 16:46:00 -0000 1.472.2.6 ++++ kdebase/konsole/konsole/konsole.cpp 1 Dec 2004 17:05:30 -0000 1.472.2.7 +@@ -2381,11 +2381,11 @@ void Konsole::addSession(TESession* s) + createSessionTab(te, SmallIconSet(s->IconName()), newTitle); + setSchema(s->schemaNo()); + tabwidget->setCurrentPage(tabwidget->count()-1); +- disableMasterModeConnections(); // no duplicate connections, remove old +- enableMasterModeConnections(); +- } +- if( tabwidget ) +- m_removeSessionButton->setEnabled(tabwidget->count()>1); ++ disableMasterModeConnections(); // no duplicate connections, remove old ++ enableMasterModeConnections(); ++ if(m_removeSessionButton) ++ m_removeSessionButton->setEnabled(tabwidget->count()>1); ++ } + } + + QString Konsole::currentSession() +@@ -2827,8 +2827,8 @@ void Konsole::doneSession(TESession* s) + rootxpms.remove(s->widget()); + } + delete s->widget(); +- if( tabwidget ) +- m_removeSessionButton->setEnabled(tabwidget->count()>1); ++ if (m_removeSessionButton) ++ m_removeSessionButton->setEnabled(tabwidget->count()>1); + } + session2action.remove(s); + action2session.remove(ra); diff --git a/kde-base/kdebase/kdebase-3.3.2.ebuild b/kde-base/kdebase/kdebase-3.3.2.ebuild new file mode 100644 index 000000000000..a92b4715046f --- /dev/null +++ b/kde-base/kdebase/kdebase-3.3.2.ebuild @@ -0,0 +1,134 @@ +# 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.2.ebuild,v 1.1 2004/12/09 01:50:30 caleb Exp $ + +inherit kde-dist eutils + +DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..." + +KEYWORDS="~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~alpha" +IUSE="ldap pam cups ssl opengl samba java arts" + +DEPEND="arts? ( ~kde-base/arts-${PV//3.3/1.3} ) + ldap? ( net-nds/openldap ) + pam? ( sys-libs/pam ) + 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}/${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" install + + insinto /etc/pam.d + newins ${FILESDIR}/kde.pam kde + newins ${FILESDIR}/kde-np.pam kde-np + + # startkde script + cd ${D}/${KDEDIR}/bin + mv startkde startkde.orig + sed -e "s:_KDEDIR_:${KDEDIR}:" startkde.orig > startkde + rm startkde.orig + chmod a+x startkde + + # startup and shutdown scripts + dodir ${KDEDIR}/env + dodir ${KDEDIR}/shutdown + cp -a ${FILESDIR}/agent-startup.sh ${D}/${KDEDIR}/env + cp -a ${FILESDIR}/agent-shutdown.sh ${D}/${KDEDIR}/shutdown + + # 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 + + # 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 + + dodir ${D}/${KDEDIR}/share/services/searchprovider + insinto ${D}/${KDEDIR}/share/services/searchprovider + newins ${FILESDIR}/pgo.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" +}