fix bugs #6519, #5953 with a new masked kdebase revision. cf bugzilla items and upcoming gentoo-dev post.

6 files changed, 182 insertions, 3 deletions

diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index 6103521991ad..e0482e5b797d 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,19 @@
 # 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.24 2002/09/29 15:07:24 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.25 2002/10/01 14:17:06 danarmak Exp $
+
+*kdebase-3.0.3-r1 (01 Oct 2002)
+
+  01 Oct 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Fix bug #6519 (ksplash-ml installation problems). See the bugzilla page for
+  full info. Briefly, you can set $KSPLASH in your profile to the full path
+  of a ksplash-replacement binary of your choice. By default, ksplash-ml
+  is used if installed (actually it sets $KSPLASH in env.d), otherwise the
+  default kde ksplash. You will need the latest revision of ksplash-ml and
+  ksplash-ml-themes as well. All this is masked for now.
+  Also fix the remaining part of bug #5953 - use a new and better kde.pam
+  file. See the bugzilla page for details.
 
   29 Aug 2002; Martin Schlemmer <azarah@gentoo.org> kscreensaver.pam :
   Update to use system-auth. Bug #5953.
diff --git a/kde-base/kdebase/files/digest-kdebase-3.0.3-r1 b/kde-base/kdebase/files/digest-kdebase-3.0.3-r1
new file mode 100644
index 000000000000..58eb734f81d7
--- /dev/null
+++ b/kde-base/kdebase/files/digest-kdebase-3.0.3-r1
@@ -0,0 +1 @@
+MD5 a1c6cb06468608318c5e59e362773360 kdebase-3.0.3.tar.bz2 13112153
diff --git a/kde-base/kdebase/files/kde.pam b/kde-base/kdebase/files/kde.pam
new file mode 100644
index 000000000000..c50acb182045
--- /dev/null
+++ b/kde-base/kdebase/files/kde.pam
@@ -0,0 +1,12 @@
+#%PAM-1.0
+
+auth       required     /lib/security/pam_stack.so service=system-auth
+auth       required     /lib/security/pam_nologin.so
+
+account    required     /lib/security/pam_stack.so service=system-auth
+
+password   required     /lib/security/pam_stack.so service=system-auth
+
+session    required     /lib/security/pam_stack.so service=system-auth
+
+session    optional     /lib/security/pam_console.so
diff --git a/kde-base/kdebase/files/startkde-3.0.3-r1-gentoo.diff b/kde-base/kdebase/files/startkde-3.0.3-r1-gentoo.diff
new file mode 100644
index 000000000000..8724807c8986
--- /dev/null
+++ b/kde-base/kdebase/files/startkde-3.0.3-r1-gentoo.diff
@@ -0,0 +1,55 @@
+--- startkde	2002-08-07 19:55:10.000000000 +0300
++++ startkde	2002-09-30 15:38:37.000000000 +0300
+@@ -1,8 +1,21 @@
+-#!/bin/sh
++#!/bin/sh --login
+ #
+-#  DEFAULT KDE STARTUP SCRIPT ( KDE-3.0.3 )
++#  GENTOO CUSTOMIZED KDE STARTUP SCRIPT ( KDE-3.0.3 )
+ #
+ 
++# Gentoo part:
++export PATH="_KDEDIR_/bin:${PATH}"
++export KDEDIR="_KDEDIR_"
++export KDEDIRS="_KDEDIR_:/usr" # do NOT include env.d's $KDEDIRS
++
++cd ~
++[ -d .kde ] && mv .kde .kde.backup
++[ -e .kde3 ] || mkdir .kde3
++ln -sf .kde3 .kde
++export KDEHOME="${HOME}/.kde3"
++
++# Gentoo part ends
++
+ # Boot sequence:
+ #
+ # kdeinit is used to fork off processes which improves memory usage
+@@ -25,12 +38,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
+@@ -131,7 +144,12 @@
+ fi
+ 
+ # the splashscreen and progress indicator
+-ksplash
++# Gentoo addition: run $KSPLASH if set, otherwise just the default '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.0.3-r1.ebuild b/kde-base/kdebase/kdebase-3.0.3-r1.ebuild
new file mode 100644
index 000000000000..24322cf2ccb3
--- /dev/null
+++ b/kde-base/kdebase/kdebase-3.0.3-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.0.3-r1.ebuild,v 1.1 2002/10/01 14:17:06 danarmak Exp $
+inherit kde-dist
+
+DESCRIPTION="KDE $PV - base packages: the desktop, panel, window manager, konqueror..."
+
+KEYWORDS="x86 ppc"
+
+newdepend ">=media-sound/cdparanoia-3.9.8
+	ldap? ( >=net-nds/openldap-1.2 )
+	pam? ( >=sys-libs/pam-0.73 )
+	motif? ( >=x11-libs/openmotif-2.1.30 )
+	encode? ( >=media-sound/lame-3.89b )
+	oggvorbis? ( >=media-libs/libvorbis-1.0_beta1 )
+	cups? ( net-print/cups )
+	ssl? ( >=dev-libs/openssl-0.9.6b )
+	opengl? ( virtual/opengl )
+	samba? ( net-fs/samba )" 
+#	lm_sensors? ( ?/lm_sensors ) # ebuild doesn't exist yet
+
+myconf="$myconf --with-dpms --with-cdparanoia"
+
+use ldap	&& myconf="$myconf --with-ldap" 	|| myconf="$myconf --without-ldap"
+use pam		&& myconf="$myconf --with-pam"		|| myconf="$myconf --with-shadow"
+use motif	&& myconf="$myconf --with-motif"	|| myconf="$myconf --without-motif"
+use encode	&& myconf="$myconf --with-lame"		|| myconf="$myconf --without-lame"
+use cups	&& myconf="$myconf --with-cups"		|| myconf="$myconf --disable-cups"
+use oggvorbis 	&& myconf="$myconf --with-vorbis"	|| myconf="$myconf --without-vorbis"
+use opengl	&& myconf="$myconf --with-gl"		|| myconf="$myconf --without-gl"
+use ssl		&& myconf="$myconf --with-ssl"		|| myconf="$myconf --without-ssl"
+use pam		&& myconf="$myconf --with-pam=yes"	|| myconf="$myconf --with-pam=no --with-shadow"
+
+src_compile() {
+
+    kde_src_compile myconf configure
+    kde_remove_flag kdm/kfrontend -fomit-frame-pointer
+    kde_src_compile make
+
+}
+
+src_install() {
+
+    kde_src_install
+
+    # cf bug #5953
+    insinto /etc/pam.d
+    newins ${FILESDIR}/kscreensaver.pam kscreensaver
+    newins ${FILESDIR}/kde.pam kde
+
+    # startkde script
+    cd ${D}/${KDEDIR}/bin
+    patch -p0 < ${FILESDIR}/startkde-${PVR}-gentoo.diff || die
+    mv startkde startkde.orig
+    sed -e "s:_KDEDIR_:${KDEDIR}:" startkde.orig > startkde
+    rm startkde.orig
+    chmod a+x startkde
+
+    # x11 session script
+    cd ${T}
+    echo "#!/bin/sh
+${KDEDIR}/bin/startkde" > kde-${PV}
+    chmod a+x kde-${PV}
+    # old scheme - compatibility
+    exeinto /usr/X11R6/bin/wm
+    doexe kde-${PV}
+    # new scheme - for now >=xfree-4.2-r3 only
+    exeinto /etc/X11/Sessions
+    doexe kde-${PV}
+
+    cd ${D}/${KDEDIR}/share/config/kdm || die
+    mv kdmrc kdmrc.orig
+    sed -e "s:SessionTypes=:SessionTypes=kde-$PV,:" kdmrc.orig > kdmrc
+    rm kdmrc.orig
+
+    #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
+    mkdir -p ${D}/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/kdebase/kdebase-3.1_beta1.ebuild b/kde-base/kdebase/kdebase-3.1_beta1.ebuild
index a929f6c89e63..7cdff01bf6df 100644
--- a/kde-base/kdebase/kdebase-3.1_beta1.ebuild
+++ b/kde-base/kdebase/kdebase-3.1_beta1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.1_beta1.ebuild,v 1.3 2002/09/27 20:32:26 bjb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.1_beta1.ebuild,v 1.4 2002/10/01 14:17:06 danarmak Exp $
 inherit kde-dist
 
 DESCRIPTION="KDE $PV - base packages: the desktop, panel, window manager, konqueror..."
@@ -44,9 +44,10 @@ src_install() {
 
     kde_src_install
 
+    # cf bug #5953
     insinto /etc/pam.d
     newins ${FILESDIR}/kscreensaver.pam kscreensaver
-    newins kde.pamd kde
+    newins ${FILESDIR}/kde.pam kde
 
     # startkde script
     cd ${D}/${KDEDIR}/bin