diff options
-rw-r--r-- | kde-base/kdebase/ChangeLog | 10 | ||||
-rw-r--r-- | kde-base/kdebase/files/digest-kdebase-3.1_rc2 | 1 | ||||
-rw-r--r-- | kde-base/kdebase/files/kscreensaver.pam | 5 | ||||
-rw-r--r-- | kde-base/kdebase/files/startkde-3.1_rc2-gentoo.diff | 61 | ||||
-rw-r--r-- | kde-base/kdebase/kdebase-3.1_rc2-r1.ebuild (renamed from kde-base/kdebase/kdebase-3.1_rc2.ebuild) | 10 |
5 files changed, 15 insertions, 72 deletions
diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog index 5edc340e3ca4..4451c17651d0 100644 --- a/kde-base/kdebase/ChangeLog +++ b/kde-base/kdebase/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for kde-base/kdebase # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.32 2002/11/05 00:03:57 hannes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.33 2002/11/09 22:36:00 danarmak Exp $ + +*kdebase-3.1_rc2-r1 (10 Nov 2002) + + 10 Nov 2002; Dan Armak <danarmak@gentoo.org> ChangeLog : + + This new revision has a static kdmrc file that enables several faetures + not pesent in the default one we had before. Among them are antialiasing + being turned on by default and making kdm use the scripts in /etc/X11/xdm. *kdebase-3.1_rc2 (04 Nov 2002) diff --git a/kde-base/kdebase/files/digest-kdebase-3.1_rc2 b/kde-base/kdebase/files/digest-kdebase-3.1_rc2 deleted file mode 100644 index b9b2a2a03901..000000000000 --- a/kde-base/kdebase/files/digest-kdebase-3.1_rc2 +++ /dev/null @@ -1 +0,0 @@ -MD5 b96f415a3de4ff36b8f507c15d6d9e86 kdebase-3.0.98.tar.bz2 14776973 diff --git a/kde-base/kdebase/files/kscreensaver.pam b/kde-base/kdebase/files/kscreensaver.pam index 9490793c7d53..8e4a1d9f516a 100644 --- a/kde-base/kdebase/files/kscreensaver.pam +++ b/kde-base/kdebase/files/kscreensaver.pam @@ -1,4 +1 @@ -#%PAM-1.0 - -auth required /lib/security/pam_stack.so service=system-auth - +auth required pam_pwdb.so shadow nullok diff --git a/kde-base/kdebase/files/startkde-3.1_rc2-gentoo.diff b/kde-base/kdebase/files/startkde-3.1_rc2-gentoo.diff deleted file mode 100644 index 796065e74678..000000000000 --- a/kde-base/kdebase/files/startkde-3.1_rc2-gentoo.diff +++ /dev/null @@ -1,61 +0,0 @@ ---- startkde 2002-09-16 00:08:25.000000000 +0300 -+++ startkde 2002-10-01 14:02:59.000000000 +0300 -@@ -1,8 +1,28 @@ --#!/bin/sh -+#!/bin/sh --login - # --# DEFAULT KDE STARTUP SCRIPT ( KDE-3.1 ) -+# GENTOO CUSTOMIZED KDE STARTUP SCRIPT ( KDE-3.1 ) - # - -+# Gentoo part: -+export PATH="_KDEDIR_/bin:${PATH}" -+export KDEDIR="_KDEDIR_" -+export KDEDIRS="_KDEDIR_:/usr" # do NOT add env.d's KDEDIRS -+ -+cd ~ -+[ -d .kde ] && mv .kde .kde.backup -+if [ ! -e .kde3.1 ]; then -+ if [ -e .kde3 ]; then -+ cp -r .kde3 .kde3.1 -+ else -+ mkdir .kde3.1 -+ fi -+fi -+ln -sf .kde3.1 .kde -+ -+#export KDEHOME="${HOME}/.kdecvs" -+ -+# Gentoo part ends -+ - # Boot sequence: - # - # kdeinit is used to fork off processes which improves memory usage -@@ -25,12 +45,12 @@ - # especially necessary on slow machines, where starting KDE takes one or two - # minutes until anything appears on the screen. - # --# Set the background to plain grey. -+# Set the background to cyan (Gentoo version change). - # The standard X background is nasty, causing moire effects and exploding - # people's heads. We use colours from the standard KDE palette for those with - # palettised displays. - --test "$XDM_MANAGED" || bkg="-solid #C0C0C0" -+test "$XDM_MANAGED" || bkg="-solid #5477A0" - xsetroot -cursor_name left_ptr $bkg - - # The user's personal KDE directory is usually ~/.kde, but this setting -@@ -134,7 +154,11 @@ - fi - - # the splashscreen and progress indicator --ksplash -+if [ -n "$KSPLASH" ]; then -+ $KSPLASH -+else -+ ksplash -+fi - - # We set LD_BIND_NOW to increase the efficiency of kdeinit. - # kdeinit unsets this variable before loading applications. diff --git a/kde-base/kdebase/kdebase-3.1_rc2.ebuild b/kde-base/kdebase/kdebase-3.1_rc2-r1.ebuild index d80fa8d07403..1513b3fa35e1 100644 --- a/kde-base/kdebase/kdebase-3.1_rc2.ebuild +++ b/kde-base/kdebase/kdebase-3.1_rc2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.1_rc2.ebuild,v 1.1 2002/11/05 00:03:57 hannes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.1_rc2-r1.ebuild,v 1.1 2002/11/09 22:36:00 danarmak Exp $ inherit kde-dist IUSE="ldap pam motif encode oggvorbis cups ssl opengl samba" @@ -52,7 +52,7 @@ src_install() { # startkde script cd ${D}/${KDEDIR}/bin - patch -p0 < ${FILESDIR}/startkde-${PVR}-gentoo.diff || die + patch -p0 < ${FILESDIR}/${PVR}/startkde-gentoo.diff || die mv startkde startkde.orig sed -e "s:_KDEDIR_:${KDEDIR}:" startkde.orig > startkde rm startkde.orig @@ -67,10 +67,10 @@ ${KDEDIR}/bin/startkde" > kde-${PV} doexe kde-${PV} cd ${D}/${KDEDIR}/share/config/kdm || die - mv kdmrc kdmrc.orig sed -e "s:SessionTypes=:SessionTypes=kde-${PV},:" \ - -e "s:Session=${PREFIX}/share/config/kdm/Xsession:Session=/etc/X11/xdm/Xsession:" kdmrc.orig > kdmrc - rm kdmrc.orig + -e "s:Session=${PREFIX}/share/config/kdm/Xsession:Session=/etc/X11/xdm/Xsession:" \ + ${FILESDIR}/${PVR}/kdmrc > kdmrc + cp ${FILESDIR}/${PVR}/backgroundrc . #backup splashscreen images, so they can be put back when unmerging #mosfet or so. |