new multi-kdedirs support. see anouncement on gentoo-* in 5 minutes. enjoy!

11 files changed, 243 insertions, 21 deletions

diff --git a/kde-base/kde/kde-2.2.2-r1.ebuild b/kde-base/kde/kde-2.2.2-r1.ebuild
index d225e74eabf9..7f4a03ae8515 100644
--- a/kde-base/kde/kde-2.2.2-r1.ebuild
+++ b/kde-base/kde/kde-2.2.2-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Dan Armak <danarmak@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde/kde-2.2.2-r1.ebuild,v 1.1 2001/12/29 17:41:37 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde/kde-2.2.2-r1.ebuild,v 1.2 2002/01/09 19:13:23 danarmak Exp $
 
 DESCRIPTION="KDE 2.2.1 - merge this to pull in all non-developer kde-base/* packages"
 HOMEPAGE="http://www.kde.org/"
 
 # removed: kdebindings, kdesdk, kdoc since these are developer-only packages
-RDEPEND=`echo ~kde-base/kde{libs,base,addons,admin,artwork,games,graphics,multimedia,network,pim,toys,utils}-${PV}`
+RDEPEND="`echo ~kde-base/kde{libs,base,admin,artwork,games,graphics,multimedia,network,pim,toys,utils,addons}-${PV}`"
 
 
diff --git a/kde-base/kdeaddons/files/digest-kdeaddons-2.2.2-r1 b/kde-base/kdeaddons/files/digest-kdeaddons-2.2.2-r1
new file mode 100644
index 000000000000..bc22c188b673
--- /dev/null
+++ b/kde-base/kdeaddons/files/digest-kdeaddons-2.2.2-r1
@@ -0,0 +1 @@
+MD5 9392da0992f4aede5f6a86840e47fef6 kdeaddons-2.2.2.tar.bz2 503808
diff --git a/kde-base/kdeaddons/kdeaddons-2.2.2-r1.ebuild b/kde-base/kdeaddons/kdeaddons-2.2.2-r1.ebuild
new file mode 100644
index 000000000000..a14c7d3514d9
--- /dev/null
+++ b/kde-base/kdeaddons/kdeaddons-2.2.2-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Dan Armak <danarmak@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/kdeaddons-2.2.2-r1.ebuild,v 1.1 2002/01/09 19:13:23 danarmak Exp $
+. /usr/portage/eclass/inherit.eclass || die
+inherit kde-dist || die
+
+DESCRIPTION="${DESCRIPTION}Addons"
+
+newdepend "~kde-base/kdebase-${PV}
+	~kde-base/kdenetwork-${PV}
+	~kde-base/kdemultimedia-${PV}
+	>=media-libs/libsdl-1.2"
+
diff --git a/kde-base/kdeartwork/kdeartwork-2.2.2.ebuild b/kde-base/kdeartwork/kdeartwork-2.2.2.ebuild
index c83f435dcec0..fc5cbfd25986 100644
--- a/kde-base/kdeartwork/kdeartwork-2.2.2.ebuild
+++ b/kde-base/kdeartwork/kdeartwork-2.2.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Dan Armak <danarmak@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/kdeartwork-2.2.2.ebuild,v 1.2 2001/11/24 13:37:29 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/kdeartwork-2.2.2.ebuild,v 1.3 2002/01/09 19:13:23 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-dist || die
 
 DESCRIPTION="${DESCRIPTION}Artwork"
 
 src_install() {
-	dodir /usr/share/apps/kthememgr/Themes
-	kde_src_install all
+	dodir ${KDEDIR}/share/apps/kthememgr/Themes
+	kde_src_install
 }
diff --git a/kde-base/kdebase/files/digest-kdebase-2.2.2-r1 b/kde-base/kdebase/files/digest-kdebase-2.2.2-r1
new file mode 100644
index 000000000000..a66cb7601fc2
--- /dev/null
+++ b/kde-base/kdebase/files/digest-kdebase-2.2.2-r1
@@ -0,0 +1 @@
+MD5 39635e42056ab2afb8e6f2ff761eea38 kdebase-2.2.2.tar.bz2 12890112
diff --git a/kde-base/kdebase/files/startkde-2.2.2 b/kde-base/kdebase/files/startkde-2.2.2
new file mode 100644
index 000000000000..a16950775c2c
--- /dev/null
+++ b/kde-base/kdebase/files/startkde-2.2.2
@@ -0,0 +1,125 @@
+#!/bin/bash --login
+export KDEDIR="_KDEDIR_"
+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-r1.ebuild b/kde-base/kdebase/kdebase-2.2.2-r1.ebuild
new file mode 100644
index 000000000000..187abcc6a6b4
--- /dev/null
+++ b/kde-base/kdebase/kdebase-2.2.2-r1.ebuild
@@ -0,0 +1,69 @@
+# 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-r1.ebuild,v 1.1 2002/01/09 19:13:23 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 )
+	vorbis? ( >=media-libs/libvorbis-1.0_beta1 )
+	cups? ( net-print/cups )
+	ssl? ( >=dev-libs/openssl-0.9.6b )
+	media-sound/cdparanoia
+	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_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 vorbis					|| 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-${PV} > startkde
+    chmod a+x startkde
+
+    exeinto /usr/X11R6/bin/wm
+    doexe ${FILESDIR}/xsession
+
+    cd ${D}/usr/X11R6/bin/wm
+    echo "#!/bin/sh
+${KDEDIR}/bin/startkde" > kde-${PV}
+    chmod a+x 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
+    
+    dodir ${KDEDIR}/share/templates/.source/emptydir
+  
+}
diff --git a/kde-base/kdelibs/files/digest-kdelibs-2.2.2-r1 b/kde-base/kdelibs/files/digest-kdelibs-2.2.2-r2
index 6748f63e631c..6748f63e631c 100644
--- a/kde-base/kdelibs/files/digest-kdelibs-2.2.2-r1
+++ b/kde-base/kdelibs/files/digest-kdelibs-2.2.2-r2
diff --git a/kde-base/kdelibs/kdelibs-2.2.2-r1.ebuild b/kde-base/kdelibs/kdelibs-2.2.2-r2.ebuild
index d2135168f047..374a095c9da9 100644
--- a/kde-base/kdelibs/kdelibs-2.2.2-r1.ebuild
+++ b/kde-base/kdelibs/kdelibs-2.2.2-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Dan Armak <danarmak@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-2.2.2-r1.ebuild,v 1.1 2001/12/29 17:41:37 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-2.2.2-r2.ebuild,v 1.1 2002/01/09 19:13:23 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde kde.org || die
 #don't inherit kde-dist! it calls need-kde which adds kdelibs to depend -> circular deps!
@@ -37,32 +37,24 @@ DEPEND="$DEPEND
 RDEPEND="$RDEPEND
 	app-text/sgml-common
 	cups? ( net-print/cups )
-	dev-lang/python
-	~kde-base/kde-env-${PV}"
-
-BASE=/usr/kde/2
+	dev-lang/python"
 
 myconf="$myconf --enable-final"
 
 qtver-from-kdever $PV
 need-qt $selected_version
 
+set-kdedir $PV
+
 src_compile() {
     
-	#separate artsd
-	#cd ${S}
-	#cp subdirs subdirs.orig
-	#cat subdirs.orig | grep -v arts > subdirs
-
 	kde_src_compile myconf
 
-	myconf="$myconf --disable-libafm"
 	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"
-	myconf="$myconf --prefix=${BASE}"
-	
+
 	kde_src_compile configure make
 
 }
@@ -74,9 +66,12 @@ src_install() {
 	docinto html
 	dodoc *.html
 	
-	insinto /etc/env.d
-	doins ${FILESDIR}/70kdelibs2
-
+	dodir /etc/env.d
+	echo "KDE2DIR=${KDEDIR}
+PATH=${KDEDIR}/bin
+ROOTPATH=${KDEDIR}/bin
+LDPATH=${KDEDIR}/lib" > ${D}/etc/env.d/70kdelibs-2.2.2
+	
 }
 
 
diff --git a/kde-base/kdoc/files/digest-kdoc-2.2.2-r1 b/kde-base/kdoc/files/digest-kdoc-2.2.2-r1
new file mode 100644
index 000000000000..6e7ef3767e7d
--- /dev/null
+++ b/kde-base/kdoc/files/digest-kdoc-2.2.2-r1
@@ -0,0 +1 @@
+MD5 8837d2c767c8043bc7e526b75be79561 kdoc-2.2.2.tar.bz2 237568
diff --git a/kde-base/kdoc/kdoc-2.2.2-r1.ebuild b/kde-base/kdoc/kdoc-2.2.2-r1.ebuild
new file mode 100644
index 000000000000..e7ac47b9744f
--- /dev/null
+++ b/kde-base/kdoc/kdoc-2.2.2-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Dan Armak <danarmak@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdoc/kdoc-2.2.2-r1.ebuild,v 1.1 2002/01/09 19:13:23 danarmak Exp $
+. /usr/portage/eclass/inherit.eclass || die
+inherit kde-dist || die
+
+DESCRIPTION="${DESCRIPTION}Documentation tools"
+
+newdepend "sys-devel/perl"
+
+src_install() {
+    kde_src_install
+    cd ${D}/${KDEDIR}
+    mv man ${D}/usr
+}
\ No newline at end of file