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

24 files changed, 372 insertions, 53 deletions

diff --git a/dev-util/kdestudio/files/digest-kdestudio-2.0.0-r1 b/dev-util/kdestudio/files/digest-kdestudio-2.0.0-r2
index ddd731eee82b..ddd731eee82b 100644
--- a/dev-util/kdestudio/files/digest-kdestudio-2.0.0-r1
+++ b/dev-util/kdestudio/files/digest-kdestudio-2.0.0-r2
diff --git a/dev-util/kdestudio/kdestudio-2.0.0-r1.ebuild b/dev-util/kdestudio/kdestudio-2.0.0-r2.ebuild
index 868c227a42c4..b3f6b3ad0c43 100644
--- a/dev-util/kdestudio/kdestudio-2.0.0-r1.ebuild
+++ b/dev-util/kdestudio/kdestudio-2.0.0-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Bart Verwilst <verwilst@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdestudio/kdestudio-2.0.0-r1.ebuild,v 1.2 2001/12/23 21:35:15 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdestudio/kdestudio-2.0.0-r2.ebuild,v 1.1 2002/01/09 19:13:23 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-base
 
@@ -12,11 +12,3 @@ SRC_URI="ftp://ftp.rygannon.com/pub/KDE_Studio/source/${P}.tar.gz"
 
 need-kde 2.1
 
-src_install() {
-
-    kde_src_install
-    
-    cd ${D}
-    mv -f usr/lib/kdelibs-*/lib/* usr/lib
-    
-}
diff --git a/dev-util/uml/files/digest-uml-1.0.1-r1 b/dev-util/uml/files/digest-uml-1.0.1-r1
new file mode 100644
index 000000000000..a423c88253ee
--- /dev/null
+++ b/dev-util/uml/files/digest-uml-1.0.1-r1
@@ -0,0 +1 @@
+MD5 8e1183734f97c8d4275ba6e7eb5c84f9 uml-1.0.1.tar.gz 901120
diff --git a/dev-util/uml/uml-1.0.1-r1.ebuild b/dev-util/uml/uml-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..d8f865a5ef5c
--- /dev/null
+++ b/dev-util/uml/uml-1.0.1-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Holger Brueckner <darks@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/dev-util/uml/uml-1.0.1-r1.ebuild,v 1.1 2002/01/09 19:13:23 danarmak Exp $
+. /usr/portage/eclass/inherit.eclass || die
+inherit kde-base
+ 
+DESCRIPTION="KDE 2.2 UML Drawing Utility"
+SRC_URI="http://prdownloads.sourceforge.net/uml/${P}.tar.gz"
+HOMEPAGE="http://uml.sourceforge.net"
+
+newdepend ">=kde-base/kdebase-2.2 virtual/glibc"
+
+need-kde 2.2
+
+src_compile() {
+	kde_src_compile myconf
+	myconf="$myconf --mandir=${D}/usr/share/man"
+	kde_src_compile configure make
+}
+
diff --git a/eclass/kde.eclass b/eclass/kde.eclass
index 2cc446187492..dbfd943ff177 100644
--- a/eclass/kde.eclass
+++ b/eclass/kde.eclass
@@ -1,7 +1,7 @@
 # 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/eclass/kde.eclass,v 1.32 2002/01/08 10:29:43 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.33 2002/01/09 19:13:23 danarmak Exp $
 # The kde eclass is inherited by all kde-* eclasses. Few ebuilds inherit straight from here.
 inherit autoconf base
 ECLASS=kde
@@ -20,7 +20,12 @@ kde_src_compile() {
 	case $1 in
 		myconf)
 			debug-print-section myconf
-			myconf="$myconf --host=${CHOST} --with-x --enable-mitshm --with-xinerama --prefix=${KDEDIR} --with-qt-dir=${QTDIR}"
+			myconf="$myconf --host=${CHOST} --with-x --enable-mitshm --with-xinerama --with-qt-dir=${QTDIR} --with-kde-dir=${KDEDIR}"
+			case $KDEMAJORVER in
+			    2) myconf="$myconf --prefix=${KDE2DIR}";;
+			    3) myconf="$myconf --prefix=${KDE3DIR}";;
+			    *) echo "!!! $ECLASS: $FUNCNAME: myconf: could not set --prefix based on \$KDEMAJOVER=\"$KDEMAJORVER\"" && exit 1;;
+			esac
 			use qtmt 	&& myconf="$myconf --enable-mt"
 			[ -n "$DEBUG" ] && myconf="$myconf --enable-debug"	|| myconf="$myconf --disable-debug"
 			debug-print "$FUNCNAME: myconf: set to ${myconf}"
@@ -201,7 +206,7 @@ min-kde-ver() {
 	debug-print-function $FUNCNAME $*
 
 	case $1 in
-	    2*)	selected_version="2.2.2-r1";;
+	    2*)	selected_version="2.2.2-r2";;
 	    3*)	selected_version="3.0";;
 	    *)	echo "!!! error: $FUNCNAME() (kde.eclass) called with invalid parameter: \"$1\", please report bug" && exit 1;;
 	esac
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
diff --git a/media-gfx/pixieplus-kde/files/digest-pixieplus-kde-0.2 b/media-gfx/pixieplus-kde/files/digest-pixieplus-kde-0.2-r1
index 65f598612e90..65f598612e90 100644
--- a/media-gfx/pixieplus-kde/files/digest-pixieplus-kde-0.2
+++ b/media-gfx/pixieplus-kde/files/digest-pixieplus-kde-0.2-r1
diff --git a/media-gfx/pixieplus-kde/pixieplus-kde-0.2.ebuild b/media-gfx/pixieplus-kde/pixieplus-kde-0.2-r1.ebuild
index 28dd0c0509dc..d6486704e309 100644
--- a/media-gfx/pixieplus-kde/pixieplus-kde-0.2.ebuild
+++ b/media-gfx/pixieplus-kde/pixieplus-kde-0.2-r1.ebuild
@@ -1,21 +1,15 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Grant Goodyear <g2boojum@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixieplus-kde/pixieplus-kde-0.2.ebuild,v 1.1 2002/01/04 19:08:24 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixieplus-kde/pixieplus-kde-0.2-r1.ebuild,v 1.1 2002/01/09 19:13:23 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
-inherit kde-base || die
+inherit kde-base 
 
 need-kde 2.2
-S=${WORKDIR}/${P}
 DESCRIPTION="Mosfet's KDE image/photo viewer, editor, and manager"
 SRC_URI="http://www.mosfet.org/pixie/${P}.tar.gz"
 HOMEPAGE="http://www.mosfet.org/pixie"
 
-newdepend ">=kde-base/kdebase-2.1"
+newdepend ">=kde-base/kdebase-2.2"
 
 
-src_compile() {
-	make -f Makefile.cvs || die "make -f Makefile.cvs failed"
-	kde_src_compile
-}
-
diff --git a/media-sound/apollo/apollo-1.1.1-r1.ebuild b/media-sound/apollo/apollo-1.1.1-r1.ebuild
index fe18d6398a80..a0694145b6fe 100644
--- a/media-sound/apollo/apollo-1.1.1-r1.ebuild
+++ b/media-sound/apollo/apollo-1.1.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Karl Trygve Kalleberg <karltk@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/apollo/apollo-1.1.1-r1.ebuild,v 1.1 2001/12/29 17:41:37 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/apollo/apollo-1.1.1-r1.ebuild,v 1.2 2002/01/09 19:13:24 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die 
-use kde && ( inherit kde-base || die )
+use kde && inherit kde-base
 
 S=${WORKDIR}/${P}-1
 DESCRIPTION="A Qt-based front-end to mpg123"
@@ -21,7 +21,7 @@ src_unpack() {
    unpack apollo-src-1.1.1-1.tar.bz2
    cd ${S}
    mv install.sh install.sh.orig
-   cat install.sh.orig | sed -e 's:$PREFIX/local:$PREFIX:g' > install.sh
+   cat install.sh.orig | sed -e 's:$PREFIX/local:$PREFIX:g' -e 's:BINDIR=$dir::' > install.sh
 }
 
 src_compile() {
@@ -34,8 +34,7 @@ src_install () {
 
     if [ "`use kde`" ]
     then
-        myconf="$myconf --with-kde=${KDEDIR}"
-        dodir /usr/share/applnk/Multimedia
+        myconf="$myconf --with-kde=${D}/${KDEDIR}"
     fi
     
     dodir usr/bin
diff --git a/net-im/licq/files/digest-licq-1.0.4-r1 b/net-im/licq/files/digest-licq-1.0.4-r1
new file mode 100644
index 000000000000..827ef1fcfd0d
--- /dev/null
+++ b/net-im/licq/files/digest-licq-1.0.4-r1
@@ -0,0 +1 @@
+MD5 df3e50c1b03aa0cf2ecd1c27af3588e7 licq-1.0.4.tar.bz2 1720320
diff --git a/net-im/licq/licq-1.0.4-r1.ebuild b/net-im/licq/licq-1.0.4-r1.ebuild
new file mode 100644
index 000000000000..b1bde3ea7df4
--- /dev/null
+++ b/net-im/licq/licq-1.0.4-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Bart Verwilst <verwilst@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.0.4-r1.ebuild,v 1.1 2002/01/09 19:13:24 danarmak Exp $
+. /usr/portage/eclass/inherit.eclass || die
+use kde && inherit kde-base
+
+S=${WORKDIR}/${P}
+
+SRC_URI="http://download.sourceforge.net/licq/${P}.tar.bz2"
+DESCRIPTION="KDE/QT ICQ Client with v6 support only (UDP)" 
+
+DEPEND="$DEPEND
+	ssl? ( >=dev-libs/openssl-0.9.6 )"
+
+use kde && need-kde 2.1
+use kde && need-qt 2.2.2
+
+src_unpack() {
+    cd ${WORKDIR}
+    unpack ${A}
+}
+
+src_compile() {
+	local first_conf
+
+	cd ${S}
+	make -f Makefile.cvs || die
+
+	use ssl			|| first_conf = "${first_conf} --disable-openssl"
+	use socks5		&& first_conf = "${first_conf} --enable-socks5"
+	
+	./configure --host=${CHOST} --prefix=/usr ${first_conf} || die
+	emake || die
+
+	if [ "`use qt`" ] 
+	then
+	    
+	    export QTDIR=/usr/qt/2
+	    cd plugins/qt-gui-1.0.4
+	    make -f Makefile.cvs || die
+	    use kde && kde_src_compile myconf
+	    use kde && second_conf="${second_conf} ${myconf} --with-kde"
+	    # note! watch the --prefix=/usr placement; licq itself installs into /usr, but the
+	    # optional kde/qt interface (to which second_conf belogns) installs its files in 
+	    # $KDE2DIR/{lib,share}/licq
+	    ./configure --host=${CHOST} --prefix=/usr ${second_conf} || die
+	    emake || die
+
+	fi
+
+}
+
+src_install() {
+
+	cd ${S}
+	make DESTDIR=${D} install || die
+	if [ "`use qt`" ] 
+	then
+	  cd plugins/qt-gui-1.0.4
+	  make DESTDIR=${D} install || die	
+	fi
+
+}
diff --git a/net-irc/kvirc/kvirc-2.1.1-r1.ebuild b/net-irc/kvirc/kvirc-2.1.1-r1.ebuild
index 3dd7762de1a7..1eaf7abafdb7 100644
--- a/net-irc/kvirc/kvirc-2.1.1-r1.ebuild
+++ b/net-irc/kvirc/kvirc-2.1.1-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Prakash Shetty (Crux) <ps@gnuos.org>
-# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-2.1.1-r1.ebuild,v 1.1 2001/12/29 17:41:37 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-2.1.1-r1.ebuild,v 1.2 2002/01/09 19:13:24 danarmak Exp $
 use kde && . /usr/portage/eclass/inherit.eclass
 use kde && inherit kde-base
 
@@ -15,11 +15,16 @@ DEPEND="$DEPEND virtual/glibc
 
 use kde && need-kde 2.1
 
+src_unpack() {
+    cd ${WORKDIR}
+    unpack ${A}
+}
+
 src_compile() {
     use kde && myconf="${myconf} --with-kde-support"
     
     use kde && kde_src_compile myconf
-    KDEDIR=/usr/kde/2 ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info \
+    ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info \
 	--host=${CHOST} ${myconf} || die
 
     make kvirc || die
@@ -29,12 +34,9 @@ src_install () {
     make install DESTDIR=${D} || die
     make docs DESTDIR=${D} || die
 
-    rm -rf ${D}/usr/man
+    rm -rf ${D}/${KDEDIR}/man
     doman data/man/kvirc.1
 
     dodoc ChangeLog INSTALL README TODO
     
-    cd ${D}/usr
-    mv kde/2/share/* share/
-    rm -rf kde
 }
diff --git a/x11-misc/mosfet-liquid-widgets/files/digest-mosfet-liquid-widgets-0.7-r3 b/x11-misc/mosfet-liquid-widgets/files/digest-mosfet-liquid-widgets-0.7-r3
new file mode 100644
index 000000000000..f480bd62aff6
--- /dev/null
+++ b/x11-misc/mosfet-liquid-widgets/files/digest-mosfet-liquid-widgets-0.7-r3
@@ -0,0 +1 @@
+MD5 b7211795f3f8165734a894cc125e386b mosfet-liquid0.7.tar.gz 303104
diff --git a/x11-misc/mosfet-liquid-widgets/mosfet-liquid-widgets-0.7-r3.ebuild b/x11-misc/mosfet-liquid-widgets/mosfet-liquid-widgets-0.7-r3.ebuild
new file mode 100644
index 000000000000..797acd8c8f39
--- /dev/null
+++ b/x11-misc/mosfet-liquid-widgets/mosfet-liquid-widgets-0.7-r3.ebuild
@@ -0,0 +1,17 @@
+# 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/x11-misc/mosfet-liquid-widgets/mosfet-liquid-widgets-0.7-r3.ebuild,v 1.1 2002/01/09 19:13:24 danarmak Exp $
+. /usr/portage/eclass/inherit.eclass || die
+inherit kde-base || die
+
+need-kde 2.2
+
+PN=mosfet-liquid
+S=${WORKDIR}/${PN}${PV}
+DESCRIPTION="Mosfet's High-Permormance Liquid Widgets and Style for KDE2.2+"
+SRC_URI="http://www.mosfet.org/${PN}${PV}.tar.gz"
+
+HOMEPAGE="http://www.mosfet.org/liquid.html"
+
+newdepend ">=kde-base/kdebase-2.2"