This is the big multi-kdelibs & eclasses v4 commit. have fun, send bugreports!

12 files changed, 41 insertions, 44 deletions

diff --git a/app-admin/ktail/ktail-0.5.1-r1.ebuild b/app-admin/ktail/ktail-0.5.1-r1.ebuild
index 2cbd691c450a..e12f80fa6b98 100644
--- a/app-admin/ktail/ktail-0.5.1-r1.ebuild
+++ b/app-admin/ktail/ktail-0.5.1-r1.ebuild
@@ -1,10 +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/app-admin/ktail/ktail-0.5.1-r1.ebuild,v 1.1 2001/10/09 18:17:20 danarmak Exp $
+# $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 $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-base || die
 
+need-kdelibs 2
+
 DESCRIPTION="ktail monitors multiple files and/or command output in one window."
 
 SRC_URI="http://www.franken.de/users/duffy1/rjakob/${P}.tar.gz"
diff --git a/app-cdr/cdbakeoven/cdbakeoven-1.6.1-r1.ebuild b/app-cdr/cdbakeoven/cdbakeoven-1.6.1-r1.ebuild
index 56dfbe7f1c23..06f403f53016 100644
--- a/app-cdr/cdbakeoven/cdbakeoven-1.6.1-r1.ebuild
+++ b/app-cdr/cdbakeoven/cdbakeoven-1.6.1-r1.ebuild
@@ -1,19 +1,20 @@
 # 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/cdbakeoven/cdbakeoven-1.6.1-r1.ebuild,v 1.1 2001/11/08 17:39:38 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdbakeoven/cdbakeoven-1.6.1-r1.ebuild,v 1.2 2001/11/16 12:50:41 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde || die
 
+need-kdelibs 2.2
+need-qt 2.3
+
 DESCRIPTION="CDBakeOven, KDE CD Writing Software"
 SRC_URI="http://prdownloads.sourceforge.net/cdbakeoven/cdbakeoven-generic-${PV}.tar.bz2"
 HOMEPAGE="http://cdbakeoven.sourceforge.net"
 
 S=${WORKDIR}/cdbakeoven-generic-${PV}
 
-NEWDEPEND=">=x11-libs/qt-x11-2.2
-	>=kde-base/kdelibs-2.2
-	>=kde-base/kdebase-2.2"
+NEWDEPEND=">=kde-base/kdebase-2.2"
 
 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 a250bcbaa763..0647bc760305 100644
--- a/app-cdr/koncd/koncd-1.0_rc1.ebuild
+++ b/app-cdr/koncd/koncd-1.0_rc1.ebuild
@@ -1,17 +1,19 @@
 # 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.2 2001/11/07 23:38:14 verwilst Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/koncd/koncd-1.0_rc1.ebuild,v 1.3 2001/11/16 12:50:41 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-base || die
 
+need-kdelibs 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 >=kde-base/kdelibs-2.2 >=app-cdr/cdrtools-1.11"
-RDEPEND="$RDEPEND >=kde-base/kdelibs-2.2"
+DEPEND="$DEPEND >=app-cdr/cdrtools-1.11"
+RDEPEND="$RDEPEND >=app-cdr/cdrtools-1.11"
 
 src_unpack() {
     base_src_unpack
diff --git a/app-editors/ktexmaker2/ktexmaker2-1.5.ebuild b/app-editors/ktexmaker2/ktexmaker2-1.5.ebuild
index 55d0df449cd3..274b7e7c20d4 100644
--- a/app-editors/ktexmaker2/ktexmaker2-1.5.ebuild
+++ b/app-editors/ktexmaker2/ktexmaker2-1.5.ebuild
@@ -1,14 +1,15 @@
 # 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.1 2001/10/03 22:20:18 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/ktexmaker2/ktexmaker2-1.5.ebuild,v 1.2 2001/11/16 12:50:41 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-base || die
 
+need-kdelibs 2.1.1
+
 DESCRIPTION="A Latex Editor and TeX shell for kde2"
 SRC_URI="http://xm1.net.free.fr/linux/${P}.tar.gz"
 HOMEPAGE="http://xm1.net.free.fr/linux/"
 
-DEPEND="$DEPEND >=kde-base/kdelibs-2.1.1 sys-devel/perl"
-RDEPEND="$RDEPEND >=kde-base/kdelibs-2.1.1"
+DEPEND="$DEPEND sys-devel/perl"
 
diff --git a/app-editors/quanta/quanta-2.0_pre2-r1.ebuild b/app-editors/quanta/quanta-2.0_pre2-r1.ebuild
index ebd22ecdf527..67ec672327e4 100644
--- a/app-editors/quanta/quanta-2.0_pre2-r1.ebuild
+++ b/app-editors/quanta/quanta-2.0_pre2-r1.ebuild
@@ -1,10 +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/app-editors/quanta/quanta-2.0_pre2-r1.ebuild,v 1.2 2001/11/05 13:54:04 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/quanta/quanta-2.0_pre2-r1.ebuild,v 1.3 2001/11/16 12:50:41 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass
 inherit kde || die
 
+need-kdelibs 2.1
+
 S=${WORKDIR}/quanta
 DESCRIPTION="Quanta - HTML editor for KDE2"
 
@@ -16,11 +18,6 @@ SRC_URI="http://prdownloads.sourceforge.net/quanta/quanta-2.0-pr2.tar.bz2
 
 HOMEPAGE="http://quanta.sourceforge.net"
 
-DEPEND="$DEPEND
-	>=kde-base/kdelibs-2.1"
-RDEPEND="$RDEPEND
-	>=kde-base/kdelibs-2.1"
-
 src_unpack() {
     base_src_unpack
     kde-objprelink-patch
diff --git a/app-misc/kcpuload/kcpuload-1.90-r2.ebuild b/app-misc/kcpuload/kcpuload-1.90-r2.ebuild
index 903c4243b320..6de27fd0957a 100644
--- a/app-misc/kcpuload/kcpuload-1.90-r2.ebuild
+++ b/app-misc/kcpuload/kcpuload-1.90-r2.ebuild
@@ -1,13 +1,13 @@
 # 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.1 2001/10/03 22:20:18 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/kcpuload/kcpuload-1.90-r2.ebuild,v 1.2 2001/11/16 12:50:41 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-base || die
 
+need-kdelibs 2.1.1
+
 DESCRIPTION="A CPU applet for KDE2"
 SRC_URI="http://kde.quakenet.eu.org/files/${P}.tar.gz"
 HOMEPAGE="http://kde.quakenet.eu.org/kcpuload.shtml"
 
-DEPEND="$DEPEND >=kde-base/kdelibs-2.1.1"
-RDEPEND="$RDEPEND >=kde-base/kdelibs-2.1.1"
diff --git a/app-misc/krusader/krusader-0.95-r1.ebuild b/app-misc/krusader/krusader-0.95-r1.ebuild
index dd4bc788174a..14d4a8c51ed0 100644
--- a/app-misc/krusader/krusader-0.95-r1.ebuild
+++ b/app-misc/krusader/krusader-0.95-r1.ebuild
@@ -1,14 +1,13 @@
 # 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/app-misc/krusader/krusader-0.95-r1.ebuild,v 1.1 2001/10/03 22:20:18 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/krusader/krusader-0.95-r1.ebuild,v 1.2 2001/11/16 12:50:41 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-base || die
 
+need-kdelibs 2.0
+
 DESCRIPTION="A Filemanager for KDE"
 SRC_URI="http://krusader.sourceforge.net/distributions/${P}-1.tar.gz"
 HOMEPAGE="http:/krusader.sourceforge.net/"
 
-DEPEND="$DEPEND >=kde-base/kdelibs-2.0"
-RDEPEND="$RDEPEND >=kde-base/kdelibs-2.0"
-
diff --git a/app-misc/kstars/kstars-0.6-r1.ebuild b/app-misc/kstars/kstars-0.6-r1.ebuild
index f7d9218511eb..58f078480516 100644
--- a/app-misc/kstars/kstars-0.6-r1.ebuild
+++ b/app-misc/kstars/kstars-0.6-r1.ebuild
@@ -1,17 +1,16 @@
 # 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.1 2001/10/03 22:20:18 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/kstars/kstars-0.6-r1.ebuild,v 1.2 2001/11/16 12:50:41 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-base || die
 
+need-kdelibs 2.1
+
 DESCRIPTION="A fun and educational desktop planetarium program for KDE2"
 HOMEPAGE="http://kstars.sourceforge.net"
 SRC_URI="http://prdownloads.sourceforge.net/${PN}/${P}.tar.gz"
 
-DEPEND="$DEPEND >=kde-base/kdelibs-2.1"
-RDEPEND="$RDEPEND >=kde-base/kdelibs-2.1"
-
 src_install () {
     # ugh. hopefully the authors next release will be fixed.
     patch -p0 < ${FILESDIR}/destdir-icons.diff || die "bad patchfile"
diff --git a/app-office/koffice/koffice-1.1.ebuild b/app-office/koffice/koffice-1.1.ebuild
index 43e4e3b93cc9..11789037b645 100644
--- a/app-office/koffice/koffice-1.1.ebuild
+++ b/app-office/koffice/koffice-1.1.ebuild
@@ -1,10 +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/app-office/koffice/koffice-1.1.ebuild,v 1.8 2001/10/20 16:09:14 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.1.ebuild,v 1.9 2001/11/16 12:50:41 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-base || die
 
+need-kdelibs 2.2
+
 DESCRIPTION="KDE ${PV} - KOffice"
 
 HOMEPAGE="http://www.koffice.org/"
@@ -16,15 +18,11 @@ SRC_URI="ftp://ftp.kde.org/pub/$SRC_PATH
 	 ftp://ftp.sourceforge.net/pub/mirrors/$SRC_PATH"
 
 DEPEND="$DEPEND
-	>=kde-base/kdelibs-2.2
 	>=dev-lang/python-2.0-r5"
 #	>=sys-devel/automake-1.4
 #	>=sys-devel/autoconf-1.13"
 	# hm. This was in achim's original. are these versions superior to the ones we have by default in a current-day rc6?
 
-RDEPEND="$RDEPEND
-	>=kde-base/kdelibs-2.2"
-
 src_unpack() {
 	base_src_unpack all patch
 	kde-objprelink-patch
diff --git a/dev-util/cervisia/cervisia-1.4.1.ebuild b/dev-util/cervisia/cervisia-1.4.1.ebuild
index bd7f418cb070..edd16cdceb25 100644
--- a/dev-util/cervisia/cervisia-1.4.1.ebuild
+++ b/dev-util/cervisia/cervisia-1.4.1.ebuild
@@ -1,17 +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/dev-util/cervisia/cervisia-1.4.1.ebuild,v 1.1 2001/10/03 22:20:18 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cervisia/cervisia-1.4.1.ebuild,v 1.2 2001/11/16 12:50:41 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-base || die
 
+need-kdelibs 2
+
 DESCRIPTION="A CVS Client for KDE"
 SRC_URI="http://prdownloads.sourceforge.net/cervisia/${P}.tar.gz"
 HOMEPAGE="http://cervisia.sourceforge.net"
 
-DEPEND="$DEPEND >=kde-base/kdelibs-2.0"
-RDEPEND="$RDEPEND >=kde-base/kdelibs-2.0"
-
 
 
 
diff --git a/dev-util/kdbg/kdbg-1.2.2.ebuild b/dev-util/kdbg/kdbg-1.2.2.ebuild
index f1f163b19198..c68b69971c07 100644
--- a/dev-util/kdbg/kdbg-1.2.2.ebuild
+++ b/dev-util/kdbg/kdbg-1.2.2.ebuild
@@ -1,17 +1,16 @@
 # 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.2 2001/11/10 12:45:09 hallski Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdbg/kdbg-1.2.2.ebuild,v 1.3 2001/11/16 12:50:41 danarmak Exp $
  . /usr/portage/eclass/inherit.eclass || die
 inherit kde-base || die
 
+need-kdelibs 2
+
 DESCRIPTION="A Graphical Debugger Interface to gdb"
 SRC_URI="http://prdownloads.sourceforge.net/kdbg/${P}.tar.gz"
 HOMEPAGE="http://members.nextra.at/johsixt/kdbg.html"
 
-DEPEND="$DEPEND >=kde-base/kdelibs-2.0.1"
-RDEPEND="$RDEPEND >=kde-base/kdelibs-2.0.1"
-
 src_compile() {
 
 	kde_src_compile myconf
diff --git a/dev-util/kdevelop/kdevelop-2.0.1-r2.ebuild b/dev-util/kdevelop/kdevelop-2.0.1-r2.ebuild
index a230dab65436..5b585da350f6 100644
--- a/dev-util/kdevelop/kdevelop-2.0.1-r2.ebuild
+++ b/dev-util/kdevelop/kdevelop-2.0.1-r2.ebuild
@@ -1,10 +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/dev-util/kdevelop/kdevelop-2.0.1-r2.ebuild,v 1.2 2001/11/04 00:17:07 verwilst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-2.0.1-r2.ebuild,v 1.3 2001/11/16 12:50:41 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-base || die
 
+need-kdelibs 2.2
+
 DESCRIPTION="KDevelop ${PV}"
 HOMEPAGE="www.kdevelop.org"
 
@@ -14,7 +16,6 @@ SRC_URI="ftp://ftp.kde.org/pub/$SRC_PATH
 	 ftp://ftp.sourceforge.net/pub/mirrors/$SRC_PATH"
 
 DEPEND="$DEPEND
-	>=kde-base/kdelibs-2.2
 	>=kde-base/kdebase-2.2
 	sys-devel/flex
 	sys-devel/perl
@@ -27,7 +28,6 @@ DEPEND="$DEPEND
 	>=app-text/sgmltools-lite-3.0.3"
 
 RDEPEND="$RDEPEND
-	>=kde-base/kdelibs-2.2
 	>=kde-base/kdoc-2.2.1
 	>=dev-util/kdbg-1.2.1
         >=net-www/htdig-3.1.5