added the KDEDIRS variable to kde2 as well

4 files changed, 222 insertions, 2 deletions

diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index 0534eae72d77..1ea63fdc8d46 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,8 +1,9 @@
 # ChangeLog for kde-base/kdebase
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.6 2002/04/12 13:31:28 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.7 2002/04/13 17:52:05 danarmak Exp $
 
-*kdebase-3.0-r1 (12 Apr 2002)
+  13 Apr 2002; Dan Armak <danarmak@gentoo.org>: add KDEDIRS to the 2.x
+  startkde as well (new revision 2.2.2-r3).
 
   12 Apr 2002;  Seemant Kulleen <seemant@gentoo.org> kdebase-3.0-r1.ebuild
   kdebase-3.0.ebuild kdebase-2.2.2-r2.ebuild :
diff --git a/kde-base/kdebase/files/digest-kdebase-2.2.2-r3 b/kde-base/kdebase/files/digest-kdebase-2.2.2-r3
new file mode 100644
index 000000000000..641154c13377
--- /dev/null
+++ b/kde-base/kdebase/files/digest-kdebase-2.2.2-r3
@@ -0,0 +1 @@
+MD5 39635e42056ab2afb8e6f2ff761eea38 kdebase-2.2.2.tar.bz2 12888455
diff --git a/kde-base/kdebase/files/startkde-2.2.2-r3 b/kde-base/kdebase/files/startkde-2.2.2-r3
new file mode 100644
index 000000000000..3028aebbd49f
--- /dev/null
+++ b/kde-base/kdebase/files/startkde-2.2.2-r3
@@ -0,0 +1,126 @@
+#!/bin/bash --login
+export KDEDIR="_KDEDIR_"
+export KDEDIRS="_KDEDIR_:${KDEDIRS}"
+export PATH="_KDEDIR_/bin:${PATH}"
+rm -rf ~/.kde
+ln -fs ~/.kde2 ~/.kde
+[ -e "~/.kde2" ] || mkdir ~/.kde2
+####################################################
+# DEFAULT GENTOO KDE STARTUP SCRIPT ( KDE-2.2.2 ) ##
+####################################################
+
+#################################
+#Initial cleanup of old sessions#
+#################################
+real_display=`echo $DISPLAY | sed "s/://" | sed "s/\..*//"`
+rm -f ~/.DCOPserver-`/bin/hostname`_$DISPLAY
+
+#####################################
+#Check for space on /tmp and "$HOME"#
+#If not, abort startup		    #
+#####################################
+space_tmp=`df /tmp | xargs | cut -d" " -f11`
+space_home=`df "$HOME" | xargs | cut -d" " -f11`
+
+if [ $space_tmp -lt 50 ]; then
+    echo $"Not enough free disk space on /tmp"
+    exit 1
+fi
+
+if [ $space_home -lt 25 ]; then
+    echo $"Not enough free disk space on "$HOME""
+    exit 1
+fi
+
+############################################
+#Check for write access on /tmp and "$HOME"#
+#If not, abort startup              	   #
+############################################
+testfile_tmp=`mktemp /tmp/KDE.startkde.XXXXXX`
+testfile_home=`mktemp "$HOME"/KDE.startkde.XXXXXX`
+
+if ! echo TEST_TEXT >$testfile_tmp 2>/dev/null ; then
+    echo $"You don't have write permissions for /tmp"
+    exit 1
+fi
+rm -f $testfile_tmp
+
+if ! echo TEST_TEXT >$testfile_home 2>/dev/null ; then
+     echo $"You don't have write permissions for "$HOME""
+     exit 1
+fi
+rm -f $testfile_home
+
+##########################
+#Set Background and stuff#
+##########################
+xsetroot -cursor_name left_ptr -solid '#5477A0'
+
+#####################
+#Set the KDE Home...#
+####################
+kdehome=$HOME/.kde
+test -n "$KDEHOME" && kdehome=$KDEHOME
+
+###########################
+#Activate Font Directories#
+###########################
+usr_odir=$kdehome/share/fonts/override
+usr_fdir=$kdehome/share/fonts
+if test -n "$KDEDIRS"; then
+  kdedirs_first=`echo $KDEDIRS|sed -e 's/:.*//'`
+  sys_odir=$kdedirs_first/share/fonts/override
+  sys_fdir=$kdedirs_first/share/fonts
+else
+  sys_odir=$KDEDIR/share/fonts/override
+  sys_fdir=$KDEDIR/share/fonts
+fi
+
+########################################################
+#Check for newly installed fonts, if we have permission#
+########################################################
+
+test -d $usr_odir && (mkfontdir $usr_odir ; xset +fp $usr_odir)
+test -d $sys_odir && xset +fp $sys_odir
+test -d $usr_fdir && (mkfontdir $usr_fdir ; xset fp+ $usr_fdir)
+test -d $sys_fdir && xset fp+ $sys_fdir
+
+####################################
+# Ask X11 to rebuild its font list.#
+####################################
+xset fp rehash
+
+##################################################################
+#Link "tmp" resource to directory in /tmp                        #
+#Create a dir /tmp/kde-$USER, links $KDEHOME/tmp-$HOSTNAME to it.#
+##################################################################
+lnusertemp tmp >/dev/null
+
+########################################################################
+#Link "socket" resource to directory in /tmp                           #
+#Create a dir /tmp/ksocket-$USER, links $KDEHOME/socket-$HOSTNAME to it#
+########################################################################
+lnusertemp socket >/dev/null
+
+########################
+#Start the splashscreen#
+########################
+ksplash
+
+###########################################################
+#Set LD_BIND_NOW to increase the efficiency of kdeinit.   #
+#kdeinit unsets this variable before loading applications.#
+###########################################################
+# turn it off, it creates aa trouble
+#LD_BIND_NOW=true kdeinit +kcminit +knotify
+kdeinit +kcminit +knotify
+
+###########################################################
+# finally, give the session control to the session manager#
+###########################################################
+ksmserver --restore
+
+##########
+#Clean up#
+##########
+kdeinit_shutdown
diff --git a/kde-base/kdebase/kdebase-2.2.2-r3.ebuild b/kde-base/kdebase/kdebase-2.2.2-r3.ebuild
new file mode 100644
index 000000000000..c7dcdf15c4b9
--- /dev/null
+++ b/kde-base/kdebase/kdebase-2.2.2-r3.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Authors Dan Armak <danarmak@gentoo.org>, Bart Verwilst <verwilst@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-2.2.2-r3.ebuild,v 1.1 2002/04/13 17:52:05 danarmak Exp $
+. /usr/portage/eclass/inherit.eclass || die
+inherit kde-dist
+
+DESCRIPTION="${DESCRIPTION}Base"
+
+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 )
+	lame? ( >=media-sound/lame-3.89b )
+	oggvorbis? ( >=media-libs/libvorbis-1.0_beta1 )
+	cups? ( net-print/cups )
+	ssl? ( >=dev-libs/openssl-0.9.6b )
+	media-libs/lcms"
+#	opengl? ( virtual/opengl )" #this last for opengl screensavers
+#	samba? ( net-fs/samba ) #use flag doesn't exist yet and we don't want such a heavy dep by deafult
+#	lm_sensors? ( ?/lm_sensors ) # ebuild doesn't exist yet
+
+src_unpack() {
+
+    base_src_unpack
+    
+    kde_sandbox_patch ${S}/konsole/src
+
+}
+
+src_compile() {
+    
+    kde_src_compile myconf
+    
+    use ldap	&& myconf="$myconf --with-ldap" || myconf="$myconf --without-ldap"
+    use pam	&& myconf="$myconf --with-pam"	|| myconf="$myconf --with-shadow"
+    use motif					|| myconf="$myconf --without-motif"
+    use lame					|| myconf="$myconf --without-lame"
+    use cups					|| myconf="$myconf --disable-cups"
+    use oggvorbis				|| myconf="$myconf --without-vorbis"
+    #use opengl					||
+    myconf="$myconf --without-gl"
+    use ssl					|| myconf="$myconf --without-ssl"
+    
+    kde_src_compile configure make
+
+}
+
+
+src_install() {
+    
+    kde_src_install
+
+    insinto /etc/pam.d
+    newins ${FILESDIR}/kscreensaver.pam kscreensaver
+    newins kde.pamd kde
+    
+    cd ${D}/${KDEDIR}/bin
+    rm -f ./startkde
+    sed -e "s:_KDEDIR_:${KDEDIR}:" ${FILESDIR}/startkde-${PVF} > startkde
+    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
+    mv kdmrc kdmrc.orig
+    sed -e 's/SessionTypes=/SessionTypes=kde-2.2.2,kde-3.0,xsession,/' kdmrc.orig | cat > kdmrc
+    rm kdmrc.orig
+    
+    rm -rf ${D}/${KDEDIR}/share/templates/.source/emptydir
+    
+}
+
+pkg_postinst() {
+    
+    # an empty dir that would otherwise be unmerged with the previous instance
+    # dodir ${KDEDIR}/share/templates/.source/emptydir
+    # temorary fix (bug #846) until portage tracks merged dirs' mtimes
+    addwrite ${KDEDIR}/share/templates/.source
+    mkdir -p ${KDEDIR}/share/templates/.source/emptydir
+
+}