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

before reading the changelog.

14 files changed, 37 insertions, 54 deletions

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
     
 }