eclasses v5 and ebuilds to match :-) see the gentoo-dev message; do not edit any inheriting ebuilds

before reading the changelog.

45 files changed, 469 insertions, 182 deletions

diff --git a/app-admin/ktail/ktail-0.5.1-r1.ebuild b/app-admin/ktail/ktail-0.5.1-r1.ebuild
index e12f80fa6b98..757f8bb71bb2 100644
--- a/app-admin/ktail/ktail-0.5.1-r1.ebuild
+++ b/app-admin/ktail/ktail-0.5.1-r1.ebuild
@@ -1,11 +1,11 @@
 # 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/app-admin/ktail/ktail-0.5.1-r1.ebuild,v 1.2 2001/11/16 12:50:41 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ktail/ktail-0.5.1-r1.ebuild,v 1.3 2001/12/23 21:35:15 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-base || die
 
-need-kdelibs 2
+need-kde 2
 
 DESCRIPTION="ktail monitors multiple files and/or command output in one window."
 
diff --git a/app-cdr/cdbakeoven/cdbakeoven-1.7.1-r1.ebuild b/app-cdr/cdbakeoven/cdbakeoven-1.7.1-r1.ebuild
index 94138a851394..cf0c6002383d 100644
--- a/app-cdr/cdbakeoven/cdbakeoven-1.7.1-r1.ebuild
+++ b/app-cdr/cdbakeoven/cdbakeoven-1.7.1-r1.ebuild
@@ -5,8 +5,7 @@
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-base || die
 
-need-kdelibs 2.2
-need-qt 2.2
+need-kde 2.2
 
 DESCRIPTION="CDBakeOven, KDE CD Writing Software"
 SRC_URI="http://prdownloads.sourceforge.net/cdbakeoven/cdbakeoven_generic-${PV}.tar.bz2"
@@ -14,15 +13,12 @@ HOMEPAGE="http://cdbakeoven.sourceforge.net"
 
 S=${WORKDIR}/cdbakeoven_generic-${PV}
 
-NEWDEPEND=">=kde-base/kdebase-2.2
+newdepend ">=kde-base/kdebase-2.2
 	>=media-libs/libogg-1.0_rc2
 	>=media-sound/mpg123-0.59
 	>=media-sound/cdparanoia-3.9.8
 	>=app-cdr/cdrtools-1.11"
 
-DEPEND="$DEPEND $NEWDEPEND"
-RDEPEND="$RDEPEND $NEWDEPEND"
-
 src_unpack() {
 
     base_src_unpack
diff --git a/app-cdr/k3b/k3b-0.5.1.ebuild b/app-cdr/k3b/k3b-0.5.1.ebuild
index 15c92d56e435..a7ef00a3870e 100644
--- a/app-cdr/k3b/k3b-0.5.1.ebuild
+++ b/app-cdr/k3b/k3b-0.5.1.ebuild
@@ -1,25 +1,18 @@
 # 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/app-cdr/k3b/k3b-0.5.1.ebuild,v 1.1 2001/12/10 19:13:31 verwilst Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-0.5.1.ebuild,v 1.2 2001/12/23 21:35:15 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-base || die
 
-need-kdelibs 2.2
-need-qt 2.2
+need-kde 2.2
 
 DESCRIPTION="K3b, KDE CD Writing Software"
 SRC_URI="http://prdownloads.sourceforge.net/k3b/${P}.tar.gz"
 HOMEPAGE="http://k3b.sourceforge.net"
 
-S=${WORKDIR}/${P}
-
-NEWDEPEND=">=media-sound/mpg123-0.59
+newdepend ">=media-sound/mpg123-0.59
 	>=media-sound/cdparanoia-3.9.8
 	>=app-cdr/cdrtools-1.11
 	>=app-cdr/cdrdao-1.1.5
 	>=media-libs/id3lib-3.8.0_pre2"
-
-DEPEND="$DEPEND $NEWDEPEND"
-RDEPEND="$RDEPEND $NEWDEPEND"
-
diff --git a/app-cdr/koncd/koncd-1.0_rc1.ebuild b/app-cdr/koncd/koncd-1.0_rc1.ebuild
index 0647bc760305..614bde7a48e7 100644
--- a/app-cdr/koncd/koncd-1.0_rc1.ebuild
+++ b/app-cdr/koncd/koncd-1.0_rc1.ebuild
@@ -1,19 +1,18 @@
 # 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/app-cdr/koncd/koncd-1.0_rc1.ebuild,v 1.3 2001/11/16 12:50:41 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/koncd/koncd-1.0_rc1.ebuild,v 1.4 2001/12/23 21:35:15 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-base || die
 
-need-kdelibs 2.2
+need-kde 2.2
 
 S=${WORKDIR}/koncd-1.0rc1
 DESCRIPTION="A KDE frontend to cdr apps; very powerful"
 SRC_URI="http://www.koncd.org/download/koncd-1.0rc1.tar.gz"
 HOMEPAGE="http://www.koncd.org/"
 
-DEPEND="$DEPEND >=app-cdr/cdrtools-1.11"
-RDEPEND="$RDEPEND >=app-cdr/cdrtools-1.11"
+newdepend ">=app-cdr/cdrtools-1.11"
 
 src_unpack() {
     base_src_unpack
diff --git a/app-cdr/kreatecd/kreatecd-1.1.0.ebuild b/app-cdr/kreatecd/kreatecd-1.1.0.ebuild
index 1a08fab10f76..12e1cf6b5fff 100644
--- a/app-cdr/kreatecd/kreatecd-1.1.0.ebuild
+++ b/app-cdr/kreatecd/kreatecd-1.1.0.ebuild
@@ -1,19 +1,17 @@
 # Copyright 1999-2001 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/app-cdr/kreatecd/kreatecd-1.1.0.ebuild,v 1.1 2001/12/06 17:57:21 verwilst Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/kreatecd/kreatecd-1.1.0.ebuild,v 1.2 2001/12/23 21:35:15 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-base || die
 
-need-kdelibs 2.2
-need-qt 2.2
+need-kde 2.2
 
-S=${WORKDIR}/${P}
 DESCRIPTION="KreateCD 1.1.0"
 SRC_URI="http://prdownloads.sourceforge.net/kreatecd/${P}.tar.bz2"
 HOMEPAGE="http://www.kreatecd.de"
 
-DEPEND="$DEPEND >=app-cdr/cdrtools-1.11 
-	>=media-sound/mpg123-0.59
-        >=media-sound/cdparanoia-3.9.8"
-RDEPEND="$RDEPEND >=app-cdr/cdrtools-1.11"
+DEPEND="$DEPEND
+			>=media-sound/mpg123-0.59
+			>=media-sound/cdparanoia-3.9.8"
+newdepend ">=app-cdr/cdrtools-1.11"
diff --git a/app-editors/ktexmaker2/ktexmaker2-1.5.ebuild b/app-editors/ktexmaker2/ktexmaker2-1.5.ebuild
index 274b7e7c20d4..1acfe79be619 100644
--- a/app-editors/ktexmaker2/ktexmaker2-1.5.ebuild
+++ b/app-editors/ktexmaker2/ktexmaker2-1.5.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Philippe Namias <pnamias@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-editors/ktexmaker2/ktexmaker2-1.5.ebuild,v 1.2 2001/11/16 12:50:41 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/ktexmaker2/ktexmaker2-1.5.ebuild,v 1.3 2001/12/23 21:35:15 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-base || die
 
-need-kdelibs 2.1.1
+need-kde 2.1.1
 
 DESCRIPTION="A Latex Editor and TeX shell for kde2"
 SRC_URI="http://xm1.net.free.fr/linux/${P}.tar.gz"
diff --git a/app-editors/quanta/quanta-2.0.1.ebuild b/app-editors/quanta/quanta-2.0.1.ebuild
index 490024597ddd..c58138f5581f 100644
--- a/app-editors/quanta/quanta-2.0.1.ebuild
+++ b/app-editors/quanta/quanta-2.0.1.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Dan Armak <danarmak@gentoo.org>, Bart Verwilst <verwilst@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-editors/quanta/quanta-2.0.1.ebuild,v 1.2 2001/12/13 22:29:49 verwilst Exp $ 
+# $Header: /var/cvsroot/gentoo-x86/app-editors/quanta/quanta-2.0.1.ebuild,v 1.3 2001/12/23 21:35:15 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass
 inherit kde-base || die
 
-need-kdelibs 2.1
+need-kde 2.1
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Quanta - HTML editor for KDE2"
 
 SRC_URI="http://prdownloads.sourceforge.net/quanta/${P}.tar.bz2
diff --git a/app-misc/kcpuload/kcpuload-1.90-r2.ebuild b/app-misc/kcpuload/kcpuload-1.90-r2.ebuild
index 6de27fd0957a..791c80e1ed36 100644
--- a/app-misc/kcpuload/kcpuload-1.90-r2.ebuild
+++ b/app-misc/kcpuload/kcpuload-1.90-r2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Author Philippe Namias <pnamias@gentoo.org> 
-# $Header: /var/cvsroot/gentoo-x86/app-misc/kcpuload/kcpuload-1.90-r2.ebuild,v 1.2 2001/11/16 12:50:41 danarmak Exp $
+# Author Philippe Namias <pnamias@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/app-misc/kcpuload/kcpuload-1.90-r2.ebuild,v 1.3 2001/12/23 21:35:15 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-base || die
 
-need-kdelibs 2.1.1
+need-kde 2.1.1
 
 DESCRIPTION="A CPU applet for KDE2"
 SRC_URI="http://kde.quakenet.eu.org/files/${P}.tar.gz"
diff --git a/app-misc/krusader/krusader-1.0_rc1.ebuild b/app-misc/krusader/krusader-1.0_rc1.ebuild
index 76ac3edd5990..1c13963b764a 100644
--- a/app-misc/krusader/krusader-1.0_rc1.ebuild
+++ b/app-misc/krusader/krusader-1.0_rc1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Authors Karl Trygve Kalleberg <karltk@gentoo.org>, Bart Verwilst <verwilst@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-misc/krusader/krusader-1.0_rc1.ebuild,v 1.1 2001/12/19 12:03:07 verwilst Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/krusader/krusader-1.0_rc1.ebuild,v 1.2 2001/12/23 21:35:15 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-base || die
 
 S="${WORKDIR}/krusader-0.99-RC1"
-need-kdelibs 2.1
+need-kde 2.1
 
 DESCRIPTION="An oldschool Filemanager for KDE"
 SRC_URI="http://krusader.sourceforge.net/distributions/krusader-rc1.tar.gz"
diff --git a/app-misc/kstars/kstars-0.6-r1.ebuild b/app-misc/kstars/kstars-0.6-r1.ebuild
index 58f078480516..e4be9f284242 100644
--- a/app-misc/kstars/kstars-0.6-r1.ebuild
+++ b/app-misc/kstars/kstars-0.6-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Donny Davies <woodchip@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-misc/kstars/kstars-0.6-r1.ebuild,v 1.2 2001/11/16 12:50:41 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/kstars/kstars-0.6-r1.ebuild,v 1.3 2001/12/23 21:35:15 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-base || die
 
-need-kdelibs 2.1
+need-kde 2.1
 
 DESCRIPTION="A fun and educational desktop planetarium program for KDE2"
 HOMEPAGE="http://kstars.sourceforge.net"
diff --git a/app-office/koffice/koffice-1.1.1.ebuild b/app-office/koffice/koffice-1.1.1.ebuild
index f4b027934685..aa0b0f5ddd52 100644
--- a/app-office/koffice/koffice-1.1.1.ebuild
+++ b/app-office/koffice/koffice-1.1.1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2000 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/app-office/koffice/koffice-1.1.1.ebuild,v 1.4 2001/12/19 15:38:55 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.1.1.ebuild,v 1.5 2001/12/23 21:35:15 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-base || die
 
-need-kdelibs 2.2
+need-kde 2.2.2
 
 DESCRIPTION="KDE ${PV} - KOffice"
 
@@ -28,25 +28,25 @@ src_unpack() {
 }
 
 src_compile() {
-    
+
     myconf="$myconf --enable-all"
     kde_src_compile myconf
-    
+
     #the dir kchar/kdchart cannot be compiled with the -fomit-frame-pointer flag present
     CXXFLAGS2="$CXXFLAGS"
     CFLAGS2="$CFLAGS"
-    
+
     CFLAGS=${CFLAGS/-fomit-frame-pointer}
     CXXFLAGS=${CXXFLAGS/-fomit-frame-pointer}
     cd ${S}
     kde_src_compile configure
     cd ${S}/kchart/kdchart
     make
-    
+
     CFLAGS="$CFLAGS2"
     CXXFLAGS="$CXXFLAGS2"
     cd ${S}
-    kde_src_compile configure 
+    kde_src_compile configure
     make LIBPYTHON="`python-config --libs`"
 
 }
diff --git a/app-office/koffice/koffice-1.1.ebuild b/app-office/koffice/koffice-1.1.ebuild
index 2b63e8f21148..462202a71176 100644
--- a/app-office/koffice/koffice-1.1.ebuild
+++ b/app-office/koffice/koffice-1.1.ebuild
@@ -1,11 +1,11 @@
 # 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/app-office/koffice/koffice-1.1.ebuild,v 1.10 2001/12/08 17:27:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.1.ebuild,v 1.11 2001/12/23 21:35:15 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-base || die
 
-need-kdelibs 2.2
+need-kde 2.2
 
 DESCRIPTION="KDE ${PV} - KOffice"
 
@@ -34,4 +34,4 @@ src_compile() {
     cd ${S} 
     make LIBPYTHON="`python-config --libs`"
 
-}
\ No newline at end of file
+}
diff --git a/app-text/kfilereplace/kfilereplace-0.6.1.ebuild b/app-text/kfilereplace/kfilereplace-0.6.1.ebuild
index 19e01d6f729f..2e7e65b59e39 100644
--- a/app-text/kfilereplace/kfilereplace-0.6.1.ebuild
+++ b/app-text/kfilereplace/kfilereplace-0.6.1.ebuild
@@ -1,15 +1,16 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Philippe Namias <pnamias@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-text/kfilereplace/kfilereplace-0.6.1.ebuild,v 1.1 2001/12/11 20:32:36 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/kfilereplace/kfilereplace-0.6.1.ebuild,v 1.2 2001/12/23 21:35:15 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass
 inherit kde-base || die
 
+need-kde 2.1.1
+
 DESCRIPTION="A multifile replace utility"
 SRC_URI="http://download.sourceforge.net/kfilereplace/${P}.tar.bz2"
 HOMEPAGE="http://kfilereplace.sourceforge.net"
 
 DEPEND="$DEPEND sys-devel/perl"
 
-need-kdelibs 2.1.1
 
diff --git a/dev-util/cervisia/cervisia-1.4.1.ebuild b/dev-util/cervisia/cervisia-1.4.1.ebuild
index edd16cdceb25..23e4cabaec72 100644
--- a/dev-util/cervisia/cervisia-1.4.1.ebuild
+++ b/dev-util/cervisia/cervisia-1.4.1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Philippe Namias <pnamias@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cervisia/cervisia-1.4.1.ebuild,v 1.2 2001/11/16 12:50:41 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cervisia/cervisia-1.4.1.ebuild,v 1.3 2001/12/23 21:35:15 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-base || die
 
-need-kdelibs 2
+need-kde 2
 
 DESCRIPTION="A CVS Client for KDE"
 SRC_URI="http://prdownloads.sourceforge.net/cervisia/${P}.tar.gz"
diff --git a/dev-util/kdbg/kdbg-1.2.2.ebuild b/dev-util/kdbg/kdbg-1.2.2.ebuild
index c68b69971c07..b246dcee1808 100644
--- a/dev-util/kdbg/kdbg-1.2.2.ebuild
+++ b/dev-util/kdbg/kdbg-1.2.2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdbg/kdbg-1.2.2.ebuild,v 1.3 2001/11/16 12:50:41 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdbg/kdbg-1.2.2.ebuild,v 1.4 2001/12/23 21:35:15 danarmak Exp $
  . /usr/portage/eclass/inherit.eclass || die
 inherit kde-base || die
 
-need-kdelibs 2
+need-kde 2
 
 DESCRIPTION="A Graphical Debugger Interface to gdb"
 SRC_URI="http://prdownloads.sourceforge.net/kdbg/${P}.tar.gz"
diff --git a/dev-util/kdestudio/kdestudio-2.0.0-r1.ebuild b/dev-util/kdestudio/kdestudio-2.0.0-r1.ebuild
index de957632e57d..868c227a42c4 100644
--- a/dev-util/kdestudio/kdestudio-2.0.0-r1.ebuild
+++ b/dev-util/kdestudio/kdestudio-2.0.0-r1.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.1 2001/12/15 19:37:29 danarmak Exp $
+# $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 $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-base
 
@@ -10,8 +10,7 @@ DESCRIPTION="KDE 2.x IDE"
 
 SRC_URI="ftp://ftp.rygannon.com/pub/KDE_Studio/source/${P}.tar.gz"
 
-need-kdelibs 2.1
-need-qt 2.3
+need-kde 2.1
 
 src_install() {
 
diff --git a/dev-util/kdevelop/kdevelop-2.0.2.ebuild b/dev-util/kdevelop/kdevelop-2.0.2.ebuild
index d9c690962e74..797fedd9f92f 100644
--- a/dev-util/kdevelop/kdevelop-2.0.2.ebuild
+++ b/dev-util/kdevelop/kdevelop-2.0.2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2001 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/kdevelop/kdevelop-2.0.2.ebuild,v 1.1 2001/11/22 17:32:27 verwilst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-2.0.2.ebuild,v 1.2 2001/12/23 21:35:15 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-base || die
 
-need-kdelibs 2.2
+need-kde 2.2
 
 DESCRIPTION="KDevelop ${PV}"
 HOMEPAGE="www.kdevelop.org"
@@ -16,18 +16,10 @@ SRC_URI="ftp://ftp.kde.org/pub/$SRC_PATH
 	 ftp://ftp.sourceforge.net/pub/mirrors/$SRC_PATH"
 
 DEPEND="$DEPEND
-	>=kde-base/kdebase-2.2
 	sys-devel/flex
-	sys-devel/perl
-	>=kde-base/kdoc-2.2.1
-	>=dev-util/kdbg-1.2.1
-	>=net-www/htdig-3.1.5
-	>=app-text/enscript-1.6.1
-	>=app-text/a2ps-4.13b
-	>=dev-util/ctags-5.0.1
-	>=app-text/sgmltools-lite-3.0.3"
+	sys-devel/perl"
 
-RDEPEND="$RDEPEND
+newdepend ">=kde-base/kdebase-2.2
 	>=kde-base/kdoc-2.2.1
 	>=dev-util/kdbg-1.2.1
         >=net-www/htdig-3.1.5
diff --git a/eclass/doc/news.txt b/eclass/doc/news.txt
index df3a1acc8157..05209d7b6800 100644
--- a/eclass/doc/news.txt
+++ b/eclass/doc/news.txt
@@ -1,4 +1,49 @@
 23/12
+v5
+This adds full support for multi-version coexistence, e.g. kde/qt 2/3/...
+There have been many many changes. Some of the are:
+
+A good conformist inheriting ebuild shuold now look something like this:
+------------
+# 4 header lines
+. /usr/portage/eclass/inherit.eclass || die
+inherit kde-something || die	# inherit kde-base for most ebuilds, kde-dst/kde-i18n etc. for others
+need-kde x.y.z	# must be present!
+
+# any code after this is not required and extends/overrides only
+need-qt x.y.z
+myconf="$myconf --mysetting=yes"
+<change other variables, functions>
+------------
+
+depend.eclass has been merged into kde.eclass due to cross-dependencies between the two.
+
+Note: need-kdelibs() is now called need-kde().
+
+need-kdelibs() exports:
+KDEVER			version number required/matching
+KDEMAJORVER		major version component (2, 3...)
+KDEVER[]			array with components of KDEVER as elements (output of separate-string())
+					major is element 0, minor is element 1... alpha, beta, pre, rc are resolved to
+					-4, -3, -2, -1. There are always 5 elements; any missing ones are set to 0.
+					
+If/when you want to do some kde2/3 specific stuff, just branch based on $KDEMAJORVER and/or $KDEVER, $KDEVER[].
+
+need-kdelibs() also adds KDEVER to DEPEND/RDEPEND and calls set-kdedir() which hasn't changed since v4.9.
+need-kdelibs() also calls qtver-from-kdever(), a new function that matches a qt version number to the supplied
+kde version number. Then need-kdelibs() calls need-qt() with the version number supplied by qtver-from-kdever().
+
+If you need a non-standard qt version, you can call need-q(0 yourself (after calling need-kde()) to override.
+need-qt() works exactly the same as need-kdelibs().
+
+Again: you must call need-kde, and you must supply *some* version.
+
+All inheriting ebuilds have been updated to use the new scheme.
+
+Only ebuilds inheriting from kde-base or directly from kde need to call need-kde(); the kde-dist, kde-i18n
+and koffice-i18n eclasses do it for you.
+
+23/12
 v4.9
 This extends depend.eclass a lot, adds function select-version(). I will now work on eclasses
 that will support qt/kde 2/3/... equally well and that will be v5. I will also update and clarify
diff --git a/eclass/doc/todo.txt b/eclass/doc/todo.txt
index 3c18bfe36c1b..ea68d8e437e6 100644
--- a/eclass/doc/todo.txt
+++ b/eclass/doc/todo.txt
@@ -4,4 +4,4 @@
 - eclasses that support kde/qt 2/3/... equally well, without a default major number.
 - cvs/cvsup support :-)
 - update docs
-
+- sort out local var declares
diff --git a/eclass/kde-base.eclass b/eclass/kde-base.eclass
index 0232a883d5d1..818b8c3dc5fa 100644
--- a/eclass/kde-base.eclass
+++ b/eclass/kde-base.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-base.eclass,v 1.11 2001/11/16 12:50:41 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-base.eclass,v 1.12 2001/12/23 21:35:15 danarmak Exp $
 # This is the kde ebuild for std. kde-dependant apps which follow configure/make/make install
 # procedures and have std. configure options.
 inherit c kde || die
@@ -10,9 +10,6 @@ ECLASS=kde-base
 DESCRIPTION="Based on the $ECLASS eclass"
 HOMEPAGE="http://apps.kde.com/"
 
-# always need *some* qt and kdelibs
-need-qt
-need-kdelibs
 
 
 
diff --git a/eclass/kde-dist.eclass b/eclass/kde-dist.eclass
index c3b995efc963..bd49b1050e9f 100644
--- a/eclass/kde-dist.eclass
+++ b/eclass/kde-dist.eclass
@@ -1,15 +1,15 @@
 # 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-dist.eclass,v 1.5 2001/12/11 20:41:03 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-dist.eclass,v 1.6 2001/12/23 21:35:15 danarmak Exp $
 # This is the kde-dist eclass for >=2.2.1 kde base packages. Don't use for kdelibs though :-)
 # Don't use it for e.g. kdevelop, koffice because of their separate versionnig schemes.
 inherit kde-base kde.org || die
 ECLASS=kde-dist
 
+need-kde $PV
+
 DESCRIPTION="KDE ${PV} - "
 HOMEPAGE="http://www.kde.org/"
 
-need-kdelibs ${PV}
-
 myconf="$myconf --enable-final"
diff --git a/eclass/kde-i18n.eclass b/eclass/kde-i18n.eclass
index bcab6a684c30..b86094f6f74b 100644
--- a/eclass/kde-i18n.eclass
+++ b/eclass/kde-i18n.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-i18n.eclass,v 1.6 2001/12/11 20:41:03 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-i18n.eclass,v 1.7 2001/12/23 21:35:15 danarmak Exp $
 inherit kde kde.org || die
 ECLASS=kde-i18n
 
@@ -9,7 +9,7 @@ S=${WORKDIR}/${PN}
 DESCRIPTION="KDE ${PV} - i18n: ${PN}"
 HOMEPAGE="http://www.kde.org/"
 
-need-kdelibs ${PV}
+need-kde ${PV}
 
 PROVIDE="virtual/kde-i18n-${PV}"
 
diff --git a/eclass/kde.eclass b/eclass/kde.eclass
index a3cdce6ed62d..044d2a612e1b 100644
--- a/eclass/kde.eclass
+++ b/eclass/kde.eclass
@@ -1,9 +1,9 @@
 # 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.21 2001/12/23 14:25:28 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.22 2001/12/23 21:35:15 danarmak Exp $
 # The kde eclass is inherited by all kde-* eclasses. Few ebuilds inherit straight from here.
-inherit autoconf base depend || die
+inherit autoconf base || die
 ECLASS=kde
 
 DESCRIPTION="Based on the $ECLASS eclass"
@@ -14,6 +14,26 @@ DEPEND="$DEPEND kde-base/kdelibs
 				objprelink? ( >=dev-util/objprelink-0-r1 )"
 RDEPEND="$RDEPEND kde-base/kdelibs"
 
+# resolution function: kde version -> qt version
+# wish we had something like python dictionaries here :-)
+# gets kde version in $1 and returns matching qt version in $matching_qt_ver
+# if none matches, returns -1
+qtver-from-kdever() {
+
+	debug-print-function $FUNCNAME $*
+
+	case "$1" in
+		2_* | 2 | 2.0*)		matching_qt_ver=2;;
+		2.1*)			matching_qt_ver=2.1;;
+		2.2*)			matching_qt_ver=2.3.1;;
+		3_* | 3 | 3.0*)		matching_qt_ver=3.0.1;;
+		*)				matching_qt_ver=-1
+	esac
+
+	debug-print "$FUNCNAME: resolved KDE version $1 to QT version $matching_qt_ver"
+
+}
+
 kde-objprelink-patch() {
 	debug-print-function $FUNCNAME $*
 	if [ "`use objprelink`" ]; then
@@ -48,8 +68,6 @@ kde_src_compile() {
 	case $1 in
 		myconf)
 			debug-print-section myconf
-			set-kdedir $kde_version
-			set-qtdir $qt_version
 			myconf="$myconf --host=${CHOST} --with-x --enable-mitshm --with-xinerama --prefix=/usr --with-qt-dir=${QTDIR}"
 			use qtmt 	&& myconf="$myconf --enable-mt"
 			use objprelink	&& myconf="$myconf --enable-objprelink" || myconf="$myconf --disable-objprelink"
@@ -57,7 +75,7 @@ kde_src_compile() {
 			;;
 		configure)
 			debug-print-section configure
-			debug-print "configure: myconf=$myconf"
+			debug-print "$FUNCNAME::configure: myconf=$myconf"
 			./configure ${myconf} || die
 			;;
 		make)
@@ -104,7 +122,285 @@ kde_src_install() {
 
 EXPORT_FUNCTIONS src_compile src_install
 
+# This used to be depend.eclass. At some point I realized it might as well be called kd-depend.eclass. And then
+# because functions fom there needed functions from here and vice versa I merged them.
+
+#---------------
+
+# This provides the need-kde and need-qt functions, which handle setting KDEDIR
+# and QTDIR for the multi-qt and multi-kdelibs schemes. The functions set-kdedir and
+# set-qtdir are called from kde.eclass; the need-* functions from the ebuild.
+
+# A helper function that takes a dot-separated string and builds an array from its parts.
+# We need this for version comparisons becaus bash can't compare e.g. 2.2.2 and 2.12.3.
+# array created is called version_parts
+# 1st parameter: string to separate
+# 2nd parameter: separator char(s) (optional, defaults to "._" dot and underscore)
+# 3rd parameter: name of array to create (optional, defaults to "version")
+# 4th parameter: minimal number of version parts (optional, defaults to 0). If after
+# separation this number is not reached, the necessary amount of parts is added with value 0.
+# This is a very ugly kludge as there is also a 0th element of the array which isn't counted on
+# purpose, because that's how we want it to be. In short, you shouldn't use this outside depend.eclass :-)
+separate-string() {
+
+    debug-print-function $FUNCNAME $*
+
+    [ -n "$3" ] && arr="$3" || arr="version"
+    [ -n "$2" ] && sep="$2" || sep="._"
+    [ -n "$4" ] && min="$4" || min=0
+    IFSBACKUP=$IFS
+    IFS=$sep
+
+    local index
+    index=0
+    for x in $1
+    do
+	eval $arr[$index]=$x
+	debug-print "$FUNCNAME: adding to array, index = $index, value = $x"
+	let "index+=1"
+    done
+
+    while [ "$index" -le "$min" ] # <= not < because $index ends up being larger by 1 than the amount of elements in the array
+    do
+	eval $arr[$index]=0
+	debug-print "$FUNCNAME: adding to array, index = $index, value = 0"
+	let "index+=1"
+    done
+
+    debug-print
+
+    IFS=$IFSBACKUP
+
+}
+
+# The version comparison/selection function. Uses separate-string() to break down
+# version numbers into their components and selects the one to use. Assumes *some*
+# good version is installed, as we add the requirment to DEPEND/RDEPEND. Is used for
+# both qt and kdelibs.
+# 1st parameter: required (minimal) version
+# 2nd parameter: list of space-separated versions to choose from
+select-version() {
+
+    debug-print-function $FUNCNAME $*
+
+    # 2d arrays in bash are troublesome, so we do this:
+    # sanity check - make sure we've got all parameters
+    if [ $# != 2 ]; then
+	echo "!!! Error: $FUNCNAME did not get all required parameters.
+!!! You can check what it did get with eclass debug output."
+	exit 1
+    fi
+
+    # to facilitate handling of release types (alpha,beta,pre,rc) we replace them with numbers
+    local needed list
+    needed="`echo $1 | sed -e 's/alpha/-4./' \
+		       -e 's/beta/-3./' \
+		       -e 's/pre/-2./' \
+		       -e 's/rc/-1./' `"
+    list="`echo $2 | sed -e 's/alpha/-4./' \
+		       -e 's/beta/-3./' \
+		       -e 's/pre/-2./' \
+		       -e 's/rc/-1./' `"
+
+    # because we're going to separate each version number into its components,
+    # once we've selected one it'll be difficult to "unseparate" it, recreatg e.g.
+    # beta/alpha/underscores etc. So we prepend a ser. number to each. Since we
+    # don't know the length/number of parts in a version number at this stage,
+    # we can't append the index but must prepend it. Then it'll live as part 0
+    # of the separated version number, while we'll deal with parts 1 through 5.
+    local index templist
+    index=1
+    templist="$list"
+    list=""
+    for x in $templist; do
+	list="${list} ${index}.${x}"
+	let "index+=1"
+    done
+
+    debug-print "$FUNCNAME: after parsing, list = $list"
+
+    # parse required version number $1 -> array "req"
+    separate-string 0.$1 ._ req 5
+    debug-print "$FUNCNAME: for \$1 = $1, we've got back a req with contents = ${req[*]}"
+
+    # init array "best" to major,-1,-1 so that any alternative is better (major is
+    # major version number of needed). give it a nonexistent index.
+    declare -a best
+    best=( 0 ${req[1]} -10 -10 -10 -10 -10 )
+
+    # for each version number in $list:
+    local x ver
+    for ver in $list
+    do
+	# parse version number -> array "cur"
+	separate-string $ver ._ cur 5
+	debug-print "$FUNCNAME: for ver = $ver, we've got back a cur with contents = ${cur[*]}"
+
+	# check if it satisfies the requirements. if not, pass to the next x.
+	# 1. major version numer is = to that of req
+	[ ${cur[1]} -eq ${req[1]} ] || continue
+
+	# 2. check whether minor version and revision of cur are >= those of best
+	# if = continue checking (lower levels), if > select right away, if < break
+	# we typically have upto 5 levels: major, minor, revision,
+	# release type (alpha, beta...), release type number (beta1, beta2...)
+	for x in 2 3 4 5
+	do
+	    debug-print "$FUNCNAME: will compare place $x. in cur: ${cur[$x]}, in best: ${best[$x]}"
+	    if [ "${cur[$x]}" -gt "${best[$x]}" ]; then
+		debug-print "$FUNCNAME: comparison result is >"
+		# set best to equal cur
+		best=( "${cur[@]}" )
+		continue 2 # next iteration of outer loop
+	    elif [ "${cur[$x]}" -lt "${best[$x]}" ]; then
+		debug-print "$FUNCNAME: comparison result is <"
+		continue 2 # next iteration of outer loop
+	    # this is all implicitly done
+	    else # [ ${cur[2]} -eq ${best[2]} ]
+		debug-print "$FUNCNAME: comparison result is ="
+	    #	# see if we've reached the last iteration
+	    #	if [ "$x" = "5" ]; then
+	    #	# this is exactly the version we need, i.e. req = cur.
+	    #	# so we don't have to do anything at all :-)
+	    #	fi
+	    # continue # next iteration of this loop
+	    #fi
+	fi
+	done
+
+    done
+
+    # find the coresponding "unseparated" version number in the orig. $list using
+    # the indexes we planted
+    local result count
+    index=${best[0]}
+    debug-print "$FUNCNAME: best has index number $index \
+compare with $list \
+search for it in $2"
+    count=1
+    for x in $2; do
+	if [ "$count" = "$index" ]; then
+	    result=$x
+	    break
+	fi
+	let "count+=1"
+    done
+
+    if [ -z "$result" ]; then
+	# we're in serious troble
+	echo "!!! Error: $FUNCNAME could not find/select a satisfying version number!
+!!! If this surprises you, it shouldn't have happened. If you're using
+!!! the prerelease kde3 ebuilds make sure you have the latest kdelibs3
+!!! and qt3 emerged. If you do have them, or don't know what i'm talking
+!!! about, report this as a bug."
+	exit 1
+    fi
+
+    # strip all spaces
+    result="${result// }"
 
+    # return, tired but satisfied
+    selected_version=$result
+    debug-print "$FUNCNAME: final result: returning selected_version = $selected_version"
+
+}
+
+set-kdedir() {
+
+	debug-print-function $FUNCNAME $*
+
+	biglist="`ls -d1 /usr/lib/kdelibs-*`"
+	debug-print "$FUNCNAME: \$biglist:
+${biglist}"
+
+	# filter $biglist to create $list
+	list=""
+	for x in $biglist; do
+	    # strip path, leave version number
+	    x="`echo $x | sed -e 's:/usr/lib/kdelibs-::'`"
+	    list="$list $x"
+	done
+
+	debug-print "$FUNCNAME: filtered \$biglist and got this \$list:
+$list"
+
+	# select version
+	select-version $KDEVER "$list"
+
+	# check and set
+	if [ -z "$selected_version" ]; then
+	    echo "!!! $FUNCNAME: no match returned by select-version! Please report."
+	else
+	    export KDEDIR="/usr/lib/kdelibs-$selected_version"
+	fi
+
+}
+
+need-kde() {
+
+	KDEVER="$1"
+	debug-print-function $FUNCNAME $*
+	debug-print "$FUNCNAME: version number is $KDEVER"
+
+	separate-string $KDEVER ._ KDEVER 5
+
+	KDEMAJORVER=KDEVER[0]
+
+	newdepend ">=kde-base/kdelibs-$KDEVER"
+
+	set-kdedir
+
+	qtver-from-kdever $KDEVER
+	need-qt $matching_qt_ver
+
+}
+
+set-qtdir() {
+
+	debug-print-function $FUNCNAME $*
+
+	biglist="`ls -d1 /usr/lib/qt-x11-*`"
+	debug-print "$FUNCNAME: \$biglist:
+${biglist}"
+
+	# filter $biglist to create $list
+	list=""
+	for x in $biglist; do
+	    # strip path, leave version number
+	    x="`echo $x | sed -e 's:/usr/lib/qt-x11-::'`"
+	    list="$list $x"
+	done
+
+	debug-print "$FUNCNAME: filtered \$biglist and got this \$list:
+$list"
+
+	# select version
+	select-version $QTVER "$list"
+
+	# check and set
+	if [ -z "$selected_version" ]; then
+	    echo "!!! $FUNCNAME: no match returned by select-version! Please report."
+	else
+	    export QTDIR="/usr/lib/qt-x11-$selected_version"
+	fi
+
+}
+
+need-qt() {
+
+	QTVER="$1"
+	debug-print-function $FUNCNAME $*
+	debug-print "$FUNCNAME: version number is $QTVER"
+
+	separate-string $QTVER ._ QTVER 5
+
+	QTMAJORVER=QTVER[0]
+
+	newdepend ">=x11-libs/qt-x11-$QTVER"
+
+	set-qtdir
+
+}
 
 
 
diff --git a/eclass/koffice-i18n.eclass b/eclass/koffice-i18n.eclass
index 4d5cdf3cefa1..96ad251e16bd 100644
--- a/eclass/koffice-i18n.eclass
+++ b/eclass/koffice-i18n.eclass
@@ -1,10 +1,15 @@
 # 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/koffice-i18n.eclass,v 1.3 2001/12/11 20:41:03 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/koffice-i18n.eclass,v 1.4 2001/12/23 21:35:15 danarmak Exp $
 inherit kde || die
 ECLASS=koffice-i18n
 
+case $PV in
+	1 | 1_* | 1.1*) 	need-kde 2.2;;
+	1.2*)			need-kde 3;;
+esac
+
 SRC_PATH="kde/stable/koffice-${PV}/src/${P}.tar.bz2"
 SRC_URI="ftp://ftp.kde.org/pub/$SRC_PATH
 	 ftp://ftp.fh-heilbronn.de/pub/mirrors/$SRC_PATH
diff --git a/kde-base/kdeadmin/kdeadmin-2.2.2.ebuild b/kde-base/kdeadmin/kdeadmin-2.2.2.ebuild
index 773c176f982a..fbc8d43fcf24 100644
--- a/kde-base/kdeadmin/kdeadmin-2.2.2.ebuild
+++ b/kde-base/kdeadmin/kdeadmin-2.2.2.ebuild
@@ -1,19 +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/kdeadmin/kdeadmin-2.2.2.ebuild,v 1.3 2001/12/08 12:09:35 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/kdeadmin-2.2.2.ebuild,v 1.4 2001/12/23 21:35:15 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-dist || die
 
 DESCRIPTION="${DESCRIPTION}Administration"
 
-NEWDEPEND=">=app-arch/rpm-3.0.5
+newdepend ">=app-arch/rpm-3.0.5
 	dev-libs/popt
 	pam? ( >=sys-libs/pam-0.72 )"
 
-DEPEND="$DEPEND $NEWDEPEND"
-RDEPEND="$RDEPEND $NEWDEPEND"
-
 src_compile() {
 
 	kde_src_compile myconf
diff --git a/kde-base/kdebindings/kdebindings-2.2.2.ebuild b/kde-base/kdebindings/kdebindings-2.2.2.ebuild
index bf172c650934..f4578e523739 100644
--- a/kde-base/kdebindings/kdebindings-2.2.2.ebuild
+++ b/kde-base/kdebindings/kdebindings-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/kdebindings/kdebindings-2.2.2.ebuild,v 1.2 2001/12/15 02:19:52 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings/kdebindings-2.2.2.ebuild,v 1.3 2001/12/23 21:35:15 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-dist || die
 
 DESCRIPTION="${DESCRIPTION}Bindings"
 
-NEWDEPEND=">=kde-base/kdebase-${PV}
+newdepend ">=kde-base/kdebase-${PV}
 	>=x11-libs/gtk+-1.2.10-r4
 	sys-devel/perl
 	python? ( dev-lang/python )
@@ -16,9 +16,6 @@ NEWDEPEND=">=kde-base/kdebase-${PV}
 	>=dev-libs/glib-1.2.6
 	>=kde-base/kdenetwork-${PV}"
 
-DEPEND="$DEPEND $NEWDEPEND"
-RDEPEND="$RDEPEND $NEWDEPEND"
-
 src_compile() {
 
 	kde_src_compile myconf
diff --git a/kde-base/kdegraphics/kdegraphics-2.2.2.ebuild b/kde-base/kdegraphics/kdegraphics-2.2.2.ebuild
index c2b56f339638..7ed7592bc91a 100644
--- a/kde-base/kdegraphics/kdegraphics-2.2.2.ebuild
+++ b/kde-base/kdegraphics/kdegraphics-2.2.2.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/kdegraphics/kdegraphics-2.2.2.ebuild,v 1.1 2001/11/22 17:32:27 verwilst Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-2.2.2.ebuild,v 1.2 2001/12/23 21:35:15 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-dist || die
 
@@ -9,10 +9,11 @@ DESCRIPTION="${DESCRIPTION}Graphics"
 
 DEPEND="$DEPEND sys-devel/perl
 	media-gfx/sane-backends
-	tex? ( >=app-text/tetex-1.0.7 )
-        gphoto2? ( =media-gfx/gphoto-2.0_beta1 >=media-libs/libgpio-20010607 )"
+	tex? ( >=app-text/tetex-1.0.7 )"
+
+
+newdepend "gphoto2? ( =media-gfx/gphoto-2.0_beta1 >=media-libs/libgpio-20010607 )"
 
-RDEPEND="$RDEPEND gphoto2? ( =media-gfx/gphoto-2.0_beta1 >=media-libs/libgpio-20010607 )"
 
 src_compile() {
 
diff --git a/kde-base/kdemultimedia/kdemultimedia-2.2.2.ebuild b/kde-base/kdemultimedia/kdemultimedia-2.2.2.ebuild
index b89ad4b020e4..ba7a50457baf 100644
--- a/kde-base/kdemultimedia/kdemultimedia-2.2.2.ebuild
+++ b/kde-base/kdemultimedia/kdemultimedia-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/kdemultimedia/kdemultimedia-2.2.2.ebuild,v 1.4 2001/12/08 12:09:35 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-2.2.2.ebuild,v 1.5 2001/12/23 21:35:15 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-dist || die
 
 DESCRIPTION="${DESCRIPTION}Multimedia"
 
-NEWDEPEND=">=sys-libs/ncurses-5.2
+newdepend ">=sys-libs/ncurses-5.2
     >=media-sound/cdparanoia-3.9.8
     >=media-libs/libvorbis-1.0_beta4
 	>=media-video/xanim-2.80.1
@@ -19,9 +19,6 @@ NEWDEPEND=">=sys-libs/ncurses-5.2
 	slang? ( >=sys-libs/slang-1.4.4 )"
 #	tcltk? ( =dev-lang/tcl-tk.8.0.5-r2 )
 
-DEPEND="$DEPEND $NEWDEPEND"
-RDEPEND="$RDEPEND $NEWDEPEND"
-
 src_unpack() {
 
     base_src_unpack all patch
diff --git a/kde-base/kdepim/kdepim-2.2.2.ebuild b/kde-base/kdepim/kdepim-2.2.2.ebuild
index 1ca998f3fc12..c99ce355f1dd 100644
--- a/kde-base/kdepim/kdepim-2.2.2.ebuild
+++ b/kde-base/kdepim/kdepim-2.2.2.ebuild
@@ -1,18 +1,18 @@
 # 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/kdepim/kdepim-2.2.2.ebuild,v 1.1 2001/11/22 17:32:27 verwilst Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-2.2.2.ebuild,v 1.2 2001/12/23 21:35:15 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-dist || die
 
 DESCRIPTION="${DESCRIPTION}PIM"
 
-DEPEND="$DEPEND >=dev-libs/pilot-link-0.9.0 sys-devel/perl"
+DEPEND="$DEPEND sys-devel/perl"
 
-RDEPEND="$RDEPEND >=dev-libs/pilot-link-0.9.0"
+newdepend ">=dev-libs/pilot-link-0.9.0"
 
 src_install() {
-	kde_src_install all
+	kde_src_install
 	docinto html
 	dodoc *.html
 }
diff --git a/media-gfx/kuickshow/kuickshow-0.8-r2.ebuild b/media-gfx/kuickshow/kuickshow-0.8-r2.ebuild
index 899e1e7ad49f..5de838064380 100644
--- a/media-gfx/kuickshow/kuickshow-0.8-r2.ebuild
+++ b/media-gfx/kuickshow/kuickshow-0.8-r2.ebuild
@@ -1,21 +1,18 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Philippe Namias <pnamias@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/kuickshow/kuickshow-0.8-r2.ebuild,v 1.2 2001/11/16 12:50:42 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kuickshow/kuickshow-0.8-r2.ebuild,v 1.3 2001/12/23 21:35:15 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-base || die
 
-need-kdelibs 2.1.1
+need-kde 2.1.1
 
 DESCRIPTION="Kuickshow image loader for kde2"
 SRC_URI="http://prdownloads.sourceforge.net/kuickshow/${P}.tgz"
 HOMEPAGE="http://kuickshow.sourceforge.net/"
 
-DEPEND="$DEPEND
-		sys-apps/which
-		>=media-libs/imlib-1.9.10"
-RDEPEND="$RDEPEND
-		>=media-libs/imlib-1.9.10"
+DEPEND="$DEPEND sys-apps/which"
+newdepend ">=media-libs/imlib-1.9.10"
 
 src_compile() {
 	CXXFLAGS="-I/usr/X11R6/include ${CXXFLAGS}"
diff --git a/media-sound/xmms-arts/xmms-arts-0.4-r2.ebuild b/media-sound/xmms-arts/xmms-arts-0.4-r2.ebuild
index 38914046df12..dcee311142da 100644
--- a/media-sound/xmms-arts/xmms-arts-0.4-r2.ebuild
+++ b/media-sound/xmms-arts/xmms-arts-0.4-r2.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 Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms-arts/xmms-arts-0.4-r2.ebuild,v 1.2 2001/12/10 18:31:51 verwilst Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms-arts/xmms-arts-0.4-r2.ebuild,v 1.3 2001/12/23 21:35:15 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
-inherit kde || die
+inherit kde-base || die
 
 # Note: we set many vars e.g. DEPEND insteaed of extending them because this isn't a proper KDE app,
 # it only links against arts. So we need set-kdedir, but almost nothing else. So make sure it continues
@@ -13,16 +13,11 @@ DESCRIPTION="This output plugin allows xmms to work with arts, KDE's sound syste
 SRC_URI="http://stukach.com/hosted/m.i.a/xmmsarts/xmmsarts-0.4.tar.gz"
 # HOMEPAGE="http://home.earthlink.net/~bheath/xmms-arts/" #disappeared from the 'net?
 
-DEPEND="virtual/glibc
-	sys-devel/gcc
-	>=media-sound/xmms-1.2.5-r1
-	sys-devel/autoconf"
-	
-RDEPEND="virtual/glibc
+newdepend "virtual/glibc
 	sys-devel/gcc
 	 >=media-sound/xmms-1.2.5-r1"
 
-need-kdelibs 2.1
+need-kde 2.1
 	 
 src_unpack() {
 	unpack ${A}
diff --git a/net-im/kinkatta/kinkatta-1.00.ebuild b/net-im/kinkatta/kinkatta-1.00.ebuild
index 58002a4acfb3..0cc19c6bf991 100644
--- a/net-im/kinkatta/kinkatta-1.00.ebuild
+++ b/net-im/kinkatta/kinkatta-1.00.ebuild
@@ -5,7 +5,8 @@
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-base || die
 
-S=${WORKDIR}/${P}
+need-kde 2.2
+
 DESCRIPTION="KDE AIM Messenger"
 SRC_URI="http://ftp1.sourceforge.net/kinkatta/${P}.tar.gz"
 
diff --git a/net-im/kmerlin/kmerlin-0.3.1.ebuild b/net-im/kmerlin/kmerlin-0.3.1.ebuild
index 912362fe1da4..49f8fb21bf43 100644
--- a/net-im/kmerlin/kmerlin-0.3.1.ebuild
+++ b/net-im/kmerlin/kmerlin-0.3.1.ebuild
@@ -1,14 +1,12 @@
 # Copyright 1999-2001 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/kmerlin/kmerlin-0.3.1.ebuild,v 1.7 2001/12/06 18:03:46 verwilst Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kmerlin/kmerlin-0.3.1.ebuild,v 1.8 2001/12/23 21:35:16 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-base || die
 
-need-kdelibs 2.1
-need-qt 2.2
+need-kde 2.1
 
-S=${WORKDIR}/${P}
 DESCRIPTION="KMerlin 0.3.1"
 SRC_URI="http://prdownloads.sourceforge.net/kmsn/kmerlin-0.3.1.tar.gz"
 HOMEPAGE="http://kmerlin.olsd.de"
diff --git a/net-im/kxicq2/kxicq2-0.7.ebuild b/net-im/kxicq2/kxicq2-0.7.ebuild
index 96faa6ea6dfa..0735d088bda2 100644
--- a/net-im/kxicq2/kxicq2-0.7.ebuild
+++ b/net-im/kxicq2/kxicq2-0.7.ebuild
@@ -1,12 +1,11 @@
 # 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/kxicq2/kxicq2-0.7.ebuild,v 1.2 2001/12/10 21:14:42 verwilst Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kxicq2/kxicq2-0.7.ebuild,v 1.3 2001/12/23 21:35:16 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-base || die
 
-need-kdelibs 2.1
-need-qt 2.1
+need-kde 2.1
 
 S="${WORKDIR}/kxicq2-0.7.b4"
 SRC_URI="http://apps.kde.com/nf/2/counter/vid/4702/dld0/kxicq2-0.7.b4.tar.gz"
diff --git a/net-mail/kbiff/kbiff-3.5.4.ebuild b/net-mail/kbiff/kbiff-3.5.4.ebuild
index ff26bda90688..fc0c68da0b6f 100644
--- a/net-mail/kbiff/kbiff-3.5.4.ebuild
+++ b/net-mail/kbiff/kbiff-3.5.4.ebuild
@@ -1,20 +1,14 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Grant Goodyear <g2boojum@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-mail/kbiff/kbiff-3.5.4.ebuild,v 1.1 2001/12/10 17:26:28 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/kbiff/kbiff-3.5.4.ebuild,v 1.2 2001/12/23 21:35:16 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-base || die
 
-need-kdelibs 2.2
-need-qt 2.2
+need-kde 2.2
 
 DESCRIPTION="KDE new mail notification utility (biff)"
 SRC_URI="http://devel-home.kde.org/~granroth/${PN}/${P}.tar.bz2"
 HOMEPAGE="http://www.granroth.org/kbiff/"
 
-S=${WORKDIR}/${P}
-
-NEWDEPEND=">=kde-base/kdebase-2.2"
-
-DEPEND="$DEPEND $NEWDEPEND"
-RDEPEND="$RDEPEND $NEWDEPEND"
+newdepend ">=kde-base/kdebase-2.2"
diff --git a/net-misc/guarddog/guarddog-1.9.9.ebuild b/net-misc/guarddog/guarddog-1.9.9.ebuild
index 06458f1e73de..dafd9a7c88ee 100644
--- a/net-misc/guarddog/guarddog-1.9.9.ebuild
+++ b/net-misc/guarddog/guarddog-1.9.9.ebuild
@@ -1,17 +1,15 @@
 # Copyright 1999-2001 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-misc/guarddog/guarddog-1.9.9.ebuild,v 1.1 2001/12/22 22:38:43 verwilst Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/guarddog/guarddog-1.9.9.ebuild,v 1.2 2001/12/23 21:35:16 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-base || die
 
-need-kdelibs 2.2
-need-qt 2.2
+need-kde 2.2
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Guarddog ${PV}"
 SRC_URI="http://www.simonzone.com/software/guarddog/${P}.tar.gz"
 HOMEPAGE="http://www.simonzone.com/software/guarddog/"
 
-DEPEND="$DEPEND >=sys-apps/iptables-1.2.4"
-RDEPEND="$RDEPEND >=sys-apps/iptables-1.2.4"
+newdepend ">=sys-apps/iptables-1.2.4"
+
diff --git a/net-misc/kift/kift-0.7.0.ebuild b/net-misc/kift/kift-0.7.0.ebuild
index 73010470d24c..d57e5b71b935 100644
--- a/net-misc/kift/kift-0.7.0.ebuild
+++ b/net-misc/kift/kift-0.7.0.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2001 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-misc/kift/kift-0.7.0.ebuild,v 1.1 2001/12/07 13:00:37 verwilst Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/kift/kift-0.7.0.ebuild,v 1.2 2001/12/23 21:35:16 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-base || die
 
-need-kdelibs 2.1
+need-kde 2.1
 
-S=${WORKDIR}/${P}
 
 DESCRIPTION="KDE interface for giFT"
 HOMEPAGE="http://kift.sourceforge.net"
 
-DEPEND="$DEPEND >=net-misc/gift-0.9.7"
+newdepend "$DEPEND >=net-misc/gift-0.9.7"
 
 SRC_URI="http://prdownloads.sourceforge.net/kift/${P}.tar.gz"
diff --git a/net-misc/kmago/kmago-1.1.2-r1.ebuild b/net-misc/kmago/kmago-1.1.2-r1.ebuild
index b3c748844111..a0bf2d55dcdb 100644
--- a/net-misc/kmago/kmago-1.1.2-r1.ebuild
+++ b/net-misc/kmago/kmago-1.1.2-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Philippe Namias <pnamias@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-misc/kmago/kmago-1.1.2-r1.ebuild,v 1.2 2001/11/16 12:50:42 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/kmago/kmago-1.1.2-r1.ebuild,v 1.3 2001/12/23 21:35:16 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-base || die
 
-need-kdelibs 2.1.1
+need-kde 2.1.1
 
 DESCRIPTION="A Download Apllication for KDE2 based on wget"
 SRC_URI="http://download.sourceforge.net/kmago/${P}.tar.gz"
diff --git a/net-misc/knetfilter/knetfilter-2.2.3.ebuild b/net-misc/knetfilter/knetfilter-2.2.3.ebuild
index e8fec1cd8820..887b0434db65 100644
--- a/net-misc/knetfilter/knetfilter-2.2.3.ebuild
+++ b/net-misc/knetfilter/knetfilter-2.2.3.ebuild
@@ -1,12 +1,11 @@
 # 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-misc/knetfilter/knetfilter-2.2.3.ebuild,v 1.1 2001/12/18 12:53:28 verwilst Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/knetfilter/knetfilter-2.2.3.ebuild,v 1.2 2001/12/23 21:35:16 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-base || die
 
-need-kdelibs 2.2
-need-qt 2.2
+need-kde 2.2
 
 S=${WORKDIR}/${PN}
 DESCRIPTION="KNetFilter ${PV} - Manage Iptables firewalls with this KDE app"
diff --git a/net-misc/knetload/knetload-1.91-r2.ebuild b/net-misc/knetload/knetload-1.91-r2.ebuild
index 4b1466cb7773..7a4e76986fae 100644
--- a/net-misc/knetload/knetload-1.91-r2.ebuild
+++ b/net-misc/knetload/knetload-1.91-r2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Philippe Namias <pnamias@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-misc/knetload/knetload-1.91-r2.ebuild,v 1.2 2001/11/16 12:50:42 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/knetload/knetload-1.91-r2.ebuild,v 1.3 2001/12/23 21:35:16 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-base || die
 
-need-kdelibs 2.1.1
+need-kde 2.1.1
 
 DESCRIPTION="A Network applet for KDE2"
 SRC_URI="http://kde.quakenet.eu.org/files/${P}.tar.gz"
diff --git a/net-misc/komba2/komba2-0.7.2.ebuild b/net-misc/komba2/komba2-0.7.2.ebuild
index 19d1578256dd..b2cd5bdcff09 100644
--- a/net-misc/komba2/komba2-0.7.2.ebuild
+++ b/net-misc/komba2/komba2-0.7.2.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2001 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-misc/komba2/komba2-0.7.2.ebuild,v 1.1 2001/11/28 15:16:14 verwilst Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/komba2/komba2-0.7.2.ebuild,v 1.2 2001/12/23 21:35:16 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-base || die
 
-S=${WORKDIR}/${P}
+need-kde 2.2
 
 DESCRIPTION="Windows(Samba) network administrating tool for KDE"
 HOMEPAGE="http://zeus.fh-brandenburg.de/~schwanz/php/komba.php3"
 
-DEPEND="$DEPEND >=net-fs/samba-2.2"
+newdepend "$DEPEND >=net-fs/samba-2.2"
 
 SRC_URI="http://zeus.fh-brandenburg.de/~schwanz/files/${P}.tar.gz"
diff --git a/net-misc/ktelnet2/ktelnet2-0.43.ebuild b/net-misc/ktelnet2/ktelnet2-0.43.ebuild
index 59b261e956d0..8cfd6e2ff0e1 100644
--- a/net-misc/ktelnet2/ktelnet2-0.43.ebuild
+++ b/net-misc/ktelnet2/ktelnet2-0.43.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Philippe Namias <pnamias@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ktelnet2/ktelnet2-0.43.ebuild,v 1.2 2001/11/16 12:50:42 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ktelnet2/ktelnet2-0.43.ebuild,v 1.3 2001/12/23 21:35:16 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-base || die
 
-need-kdelibs 2.1.1
+need-kde 2.1.1
 
 DESCRIPTION="A Putty like for KDE"
 SRC_URI="http://www.spaghetti-code.de/download/ktelnet/${P}.tgz"
diff --git a/net-misc/qtella/qtella-0.3.3.ebuild b/net-misc/qtella/qtella-0.3.3.ebuild
index 611f443f9000..1da15ec70882 100644
--- a/net-misc/qtella/qtella-0.3.3.ebuild
+++ b/net-misc/qtella/qtella-0.3.3.ebuild
@@ -1,11 +1,12 @@
 # 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-misc/qtella/qtella-0.3.3.ebuild,v 1.1 2001/12/17 12:38:06 verwilst Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/qtella/qtella-0.3.3.ebuild,v 1.2 2001/12/23 21:35:16 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-base || die
 
-S=${WORKDIR}/${P}
+need-kde 2.2
+
 SRC_URI="http://prdownloads.sourceforge.net/qtella/${P}.tar.gz"
 
 HOMEPAGE="http://www.qtella.net"
diff --git a/net-print/kups/kups-1.0-r1.ebuild b/net-print/kups/kups-1.0-r1.ebuild
index ceadba68f5b5..b70d3ee01f2e 100644
--- a/net-print/kups/kups-1.0-r1.ebuild
+++ b/net-print/kups/kups-1.0-r1.ebuild
@@ -1,20 +1,17 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/net-print/kups/kups-1.0-r1.ebuild,v 1.2 2001/11/16 12:50:42 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/kups/kups-1.0-r1.ebuild,v 1.3 2001/12/23 21:35:16 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-base || die
 
-need-kdelibs 2.1.1
+need-kde 2.1.1
 
 DESCRIPTION="A CUPS front-end for KDE"
 SRC_URI="ftp://cups.sourceforge.net/pub/cups/kups/${P}.tar.gz"
 HOMEPAGE="http://cups.sourceforge.net/kups/"
 
-DEPEND="$DEPEND
-		>=net-print/qtcups-2.0"
-RDEPEND="$RDEPEND
-		>=net-print/qtcups-2.0"
+newdepend ">=net-print/qtcups-2.0"
 
 src_compile() {
 
diff --git a/x11-misc/bbkeysconf/bbkeysconf-1.3-r3.ebuild b/x11-misc/bbkeysconf/bbkeysconf-1.3-r3.ebuild
index a2842624ed54..95eaa76ebc64 100644
--- a/x11-misc/bbkeysconf/bbkeysconf-1.3-r3.ebuild
+++ b/x11-misc/bbkeysconf/bbkeysconf-1.3-r3.ebuild
@@ -1,22 +1,19 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Joe Bormolini <lordjoe@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbkeysconf/bbkeysconf-1.3-r3.ebuild,v 1.2 2001/12/16 19:57:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbkeysconf/bbkeysconf-1.3-r3.ebuild,v 1.3 2001/12/23 21:35:16 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
-inherit base depend || die
+inherit kde base || die		# note: base is intended to override kde!
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Configure bbkeys"
 SRC_URI="http://movingparts.thelinuxcommunity.org/bbkeys/${P}.tar.gz"
 HOMEPAGE="http://movingparts.thelinuxcommunity.org"
 
-DEPEND=">=x11-wm/blackbox-0.61
-	>=x11-misc/bbkeys-0.8.2"
+newdepend ">=x11-wm/blackbox-0.61 >=x11-misc/bbkeys-0.8.2"
 
 src_compile() {
-    
+
     need-qt 2.3.1
-    set-qtdir
     make MOC=${QTDIR}/bin/moc CXXFLAGS="-g ${CXXFLAGS} -I${QTDIR}/include" LIBS="-L/usr/X11R6/lib -L${QTDIR}/lib -lqt -lX11" || die
     
 }