Apply patch from bug #25013 to replace calls to newdepend and newrdepend

with variable setting (DEPEND=, RDEPEND=).

22 files changed, 61 insertions, 61 deletions

diff --git a/eclass/check-kernel.eclass b/eclass/check-kernel.eclass
index f7b04a9585d9..771b4e176949 100644
--- a/eclass/check-kernel.eclass
+++ b/eclass/check-kernel.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/check-kernel.eclass,v 1.1 2003/08/02 20:48:24 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/check-kernel.eclass,v 1.2 2004/04/11 05:46:09 mr_bones_ Exp $
 
 # Author: Martin Schlemmer <azarah@gentoo.org>
 # Eclass'd by: Seemant Kulleen <seemant@gentoo.org>
@@ -14,7 +14,7 @@ INHERITED="${INHERITED} ${ECLASS}"
 EXPORT_FUNCTIONS check_version_h get_KV_info \
 	is_2_4_kernel is_2_5_kernel is_2_6_kernel
 
-newdepend "sys-apps/gawk"
+DEPEND="sys-apps/gawk"
 
 check_version_h() {
 	if [ ! -f "${ROOT}/usr/src/linux/include/linux/version.h" ]
diff --git a/eclass/common-lisp.eclass b/eclass/common-lisp.eclass
index 5ecb71e12b6a..259d3d8fce6a 100644
--- a/eclass/common-lisp.eclass
+++ b/eclass/common-lisp.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/common-lisp.eclass,v 1.6 2004/03/09 17:52:56 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/common-lisp.eclass,v 1.7 2004/04/11 05:46:09 mr_bones_ Exp $
 #
 # Author Matthew Kennedy <mkennedy@gentoo.org>
 #
@@ -12,7 +12,7 @@ ECLASS=common-lisp
 INHERITED="$INHERITED $ECLASS"
 
 CLPACKAGE=
-newdepend "dev-lisp/common-lisp-controller"
+DEPEND="dev-lisp/common-lisp-controller"
 
 common-lisp_pkg_postinst() {
 	if [ -z "${CLPACKAGE}" ]; then
diff --git a/eclass/db4-fix.eclass b/eclass/db4-fix.eclass
index 352e356b52dd..0c6b93bf1581 100644
--- a/eclass/db4-fix.eclass
+++ b/eclass/db4-fix.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/db4-fix.eclass,v 1.2 2003/05/25 21:06:23 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/db4-fix.eclass,v 1.3 2004/04/11 05:46:09 mr_bones_ Exp $
 #
 # Author: Paul de Vrieze <pauldv@gentoo.org>
 #
@@ -12,7 +12,7 @@
 ECLASS=db4-fix
 INHERITED="$INHERITED $ECLASS"
 
-newdepend "sys-apps/sed"
+DEPEND="sys-apps/sed"
 
 DESCRIPTION="Based on the ${ECLASS} eclass"
 
diff --git a/eclass/distutils.eclass b/eclass/distutils.eclass
index 4a4d576eb560..30ec1d9e0c59 100644
--- a/eclass/distutils.eclass
+++ b/eclass/distutils.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/distutils.eclass,v 1.22 2003/11/25 09:44:18 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils.eclass,v 1.23 2004/04/11 05:46:09 mr_bones_ Exp $
 #
 # Author: Jon Nelson <jnelson@gentoo.org>
 # Current Maintainer: Alastair Tse <liquidx@gentoo.org>
@@ -27,10 +27,10 @@ INHERITED="$INHERITED $ECLASS"
 # This helps make it possible to add extensions to python slots.
 # Normally only a -py21- ebuild would set PYTHON_SLOT_VERSION.
 if [ "${PYTHON_SLOT_VERSION}" = 2.1 ] ; then 
-	newdepend "=dev-lang/python-2.1*"
+	DEPEND="=dev-lang/python-2.1*"
 	python="python2.1"
 else
-	newdepend "virtual/python"
+	DEPEND="virtual/python"
 	python="python"
 fi
 
diff --git a/eclass/ebook.eclass b/eclass/ebook.eclass
index 47aedecc7246..b1e503614123 100644
--- a/eclass/ebook.eclass
+++ b/eclass/ebook.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ebook.eclass,v 1.14 2004/03/05 00:10:35 jhuebel Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ebook.eclass,v 1.15 2004/04/11 05:46:09 mr_bones_ Exp $
 #
 # Author Francisco Gimeno <kikov@fco-gimeno.com>
 # Mantainer José Alberto Suárez López <bass@gentoo.org>
@@ -63,9 +63,7 @@ if [ "${DEVHELPROOT}" = "" ]; then
 	DEVHELPROOT="usr/share/devhelp"
 fi
 if [ "${RDEPEND}" = "" ]; then
-	# FIXME: newdepend sets both DEPEND and RDEPEND
-	# this should be changed to newrdepend, but that doesn't exist right now.
-	newdepend ">=dev-util/devhelp-0.6"
+	RDEPEND=">=dev-util/devhelp-0.6"
 fi
 if [ "${DESCRIPTION}" = "" ]; then
 	DESCRIPTION="${P} ebook based in $ECLASS eclass"
diff --git a/eclass/freedict.eclass b/eclass/freedict.eclass
index c5a53cfe9b83..0ee3724b5f0e 100644
--- a/eclass/freedict.eclass
+++ b/eclass/freedict.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/freedict.eclass,v 1.5 2004/02/17 07:36:54 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/freedict.eclass,v 1.6 2004/04/11 05:46:09 mr_bones_ Exp $
 
 # Author: Seemant Kulleen <seemant@gentoo.org>
 # This eclass exists to ease the installation of freedict translation
@@ -24,7 +24,7 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ~ppc ~sparc ~alpha ~mips ~hppa"
 
-newdepend "app-text/dictd"
+DEPEND="app-text/dictd"
 
 freedict_src_install() {
 	insinto /usr/lib/dict
diff --git a/eclass/gnat.eclass b/eclass/gnat.eclass
index efbb60f53624..225724e4d988 100644
--- a/eclass/gnat.eclass
+++ b/eclass/gnat.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnat.eclass,v 1.4 2003/12/12 05:04:44 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnat.eclass,v 1.5 2004/04/11 05:46:09 mr_bones_ Exp $
 #
 # Author: David Holm <dholm@telia.com>
 #
@@ -13,7 +13,7 @@ inherit flag-o-matic
 
 INHERITED="$INHERITED $ECLASS"
 
-newdepend dev-lang/gnat
+DEPEND="dev-lang/gnat"
 
 DESCRIPTION="Based on the ${ECLASS} eclass"
 
diff --git a/eclass/gnuconfig.eclass b/eclass/gnuconfig.eclass
index c9bc4d9f1cdf..3dc693bd335c 100644
--- a/eclass/gnuconfig.eclass
+++ b/eclass/gnuconfig.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnuconfig.eclass,v 1.13 2003/09/08 02:10:46 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnuconfig.eclass,v 1.14 2004/04/11 05:46:09 mr_bones_ Exp $
 #
 # Author: Will Woods <wwoods@gentoo.org>
 #
@@ -19,7 +19,7 @@
 ECLASS=gnuconfig
 INHERITED="$INHERITED $ECLASS"
 
-newdepend "sys-devel/gnuconfig
+DEPEND="sys-devel/gnuconfig
 	!bootstrap? ( sys-devel/libtool )"
 
 DESCRIPTION="Based on the ${ECLASS} eclass"
diff --git a/eclass/gnustep.eclass b/eclass/gnustep.eclass
index 740616111813..1d001aa10dee 100644
--- a/eclass/gnustep.eclass
+++ b/eclass/gnustep.eclass
@@ -1,15 +1,17 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep.eclass,v 1.6 2003/10/26 09:12:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep.eclass,v 1.7 2004/04/11 05:46:09 mr_bones_ Exp $
 
 ECLASS=gnustep
 INHERITED="$INHERITED $ECLASS"
 
 DESCRIPTION="Based on the gnustep eclass."
 
-newdepend /c
-newdepend dev-util/gnustep-make
-newdepend dev-util/gnustep-base
+DEPEND="dev-util/gnustep-make
+	dev-util/gnustep-base
+	sys-devel/gcc
+	virtual/glibc"
+RDEPEND="virtual/glibc"
 
 getsourcedir() {
 	if [ ! -d "${S}" ] ; then
@@ -25,10 +27,10 @@ getsourcedir() {
 
 need-gnustep-gui() {
 	if [ "$1" ] ; then
-		newdepend ">=dev-util/gnustep-gui-$1"
+		DEPEND="${DEPEND} >=dev-util/gnustep-gui-$1"
 		RDEPEND="${RDEPEND} >=dev-util/gnustep-back-$1"
 	else
-		newdepend "dev-util/gnustep-gui"
+		DEPEND="${DEPEND} dev-util/gnustep-gui"
 		RDEPEND="${RDEPEND} dev-util/gnustep-back"
 	fi
 }
diff --git a/eclass/gst-plugins.eclass b/eclass/gst-plugins.eclass
index 668c0a458637..1bc4035ad194 100644
--- a/eclass/gst-plugins.eclass
+++ b/eclass/gst-plugins.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins.eclass,v 1.11 2004/03/29 15:36:16 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins.eclass,v 1.12 2004/04/11 05:46:09 mr_bones_ Exp $
 
 # Author : foser <foser@gentoo.org>
 
@@ -55,7 +55,8 @@ SLOT=${PV_MAJ_MIN}
 
 S=${WORKDIR}/${MY_P}
 
-newdepend "=media-libs/${MY_P}*" ">=sys-apps/sed-4"
+DEPEND="=media-libs/${MY_P}*
+	>=sys-apps/sed-4"
 
 ###
 # internal functions
diff --git a/eclass/kde-functions.eclass b/eclass/kde-functions.eclass
index adb287a789f9..dc59bb359bb8 100644
--- a/eclass/kde-functions.eclass
+++ b/eclass/kde-functions.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.64 2003/11/11 12:49:40 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.65 2004/04/11 05:46:09 mr_bones_ Exp $
 #
 # Author Dan Armak <danarmak@gentoo.org>
 #
@@ -97,25 +97,25 @@ need-kde() {
 		# goes to show this code is awfully inflexible, i guess.
 		# maybe i should look at relocating it...
 		if [ "$PV" == "3.0.3" ]; then
-			newdepend "=kde-base/kdelibs-3.0.3*"
+			DEPEND="${DEPEND} =kde-base/kdelibs-3.0.3*"
 		elif [ "$PV" == "3.1.3" ]; then
-			newdepend "=kde-base/kdelibs-3.1.3*"
+			DEPEND="${DEPEND} =kde-base/kdelibs-3.1.3*"
 		elif [ "$PV" == "3.1.2" ]; then
-			newdepend "=kde-base/kdelibs-3.1.2*"
+			DEPEND="${DEPEND} =kde-base/kdelibs-3.1.2*"
 		elif [ "$PV" == "3.1.1" ]; then
-			newdepend "=kde-base/kdelibs-3.1.1*"
+			DEPEND="${DEPEND} =kde-base/kdelibs-3.1.1*"
 		elif [ "$PV" == "2.2.2" ]; then
-			newdepend "=kde-base/kdelibs-2.2.2*"
+			DEPEND="${DEPEND} =kde-base/kdelibs-2.2.2*"
 		else
-			newdepend "~kde-base/kdelibs-${KDEVER}"
+			DEPEND="${DEPEND} ~kde-base/kdelibs-${KDEVER}"
 		fi
 	else
 		# everything else only needs a minimum version
 		if [ "$KDEMAJORVER" == "2" ]; then
-			newdepend "=kde-base/kdelibs-2.2*"
+			DEPEND="${DEPEND} =kde-base/kdelibs-2.2*"
 		else
 			min-kde-ver $KDEVER
-			newdepend ">=kde-base/kdelibs-${selected_version}"
+			DEPEND="${DEPEND} >=kde-base/kdelibs-${selected_version}"
 		fi
 	fi
 
@@ -127,7 +127,6 @@ need-kde() {
 	else
 		SLOT="0"
 	fi
-
 }
 
 set-kdedir() {
@@ -229,8 +228,8 @@ need-qt() {
 	QT=qt
 
 	case $QTVER in
-	    2*)	newdepend "=x11-libs/${QT}-2.3*" ;;
-	    3*)	newdepend ">=x11-libs/${QT}-${QTVER}" ;;
+	    2*)	DEPEND="${DEPEND} =x11-libs/${QT}-2.3*" ;;
+	    3*)	DEPEND="${DEPEND} >=x11-libs/${QT}-${QTVER}" ;;
 	    *)	echo "!!! error: $FUNCNAME() called with invalid parameter: \"$QTVER\", please report bug" && exit 1;;
 	esac
 
diff --git a/eclass/kde.eclass b/eclass/kde.eclass
index 913ecf3c728d..cc68eddf4fa2 100644
--- a/eclass/kde.eclass
+++ b/eclass/kde.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.93 2004/02/24 13:50:07 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.94 2004/04/11 05:46:09 mr_bones_ Exp $
 #
 # Author Dan Armak <danarmak@gentoo.org>
 #
@@ -21,7 +21,7 @@ DEPEND=">=sys-devel/automake-1.7.0
 	dev-lang/perl" # perl is used for makefile generation
 
 # all kde apps need this one
-newdepend "~kde-base/kde-env-3"
+DEPEND="${DEPEND} ~kde-base/kde-env-3"
 
 # overridden in other places like kde-dist, kde-source and some individual ebuilds
 SLOT="0"
diff --git a/eclass/libtool.eclass b/eclass/libtool.eclass
index f2b9f535f2e1..350d5fe80c4d 100644
--- a/eclass/libtool.eclass
+++ b/eclass/libtool.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.25 2004/02/11 19:33:14 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.26 2004/04/11 05:46:09 mr_bones_ Exp $
 #
 # Author: Martin Schlemmer <azarah@gentoo.org>
 #
@@ -10,7 +10,7 @@
 ECLASS="libtool"
 INHERITED="${INHERITED} ${ECLASS}"
 
-newdepend "!bootstrap? ( sys-devel/libtool )"
+DEPEND="!bootstrap? ( sys-devel/libtool )"
 
 DESCRIPTION="Based on the ${ECLASS} eclass"
 
diff --git a/eclass/matrox.eclass b/eclass/matrox.eclass
index 0cc011859cb8..5e1e9daceebf 100644
--- a/eclass/matrox.eclass
+++ b/eclass/matrox.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/matrox.eclass,v 1.1 2003/12/29 17:17:26 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/matrox.eclass,v 1.2 2004/04/11 05:46:09 mr_bones_ Exp $
 #
 # Author: Donnie Berkholz <spyderous@gentoo.org>
 #
@@ -18,7 +18,7 @@ LICENSE="Matrox"
 SLOT="${KV}"
 RESTRICT="fetch nostrip"
 
-newrdepend ">=x11-base/xfree-4.2.0
+RDEPEND=">=x11-base/xfree-4.2.0
 	virtual/linux-sources"
 
 matrox_pkg_setup() {
diff --git a/eclass/pcmcia.eclass b/eclass/pcmcia.eclass
index ecc90f17cef5..63f2300c27db 100644
--- a/eclass/pcmcia.eclass
+++ b/eclass/pcmcia.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/pcmcia.eclass,v 1.2 2004/02/07 23:44:23 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/pcmcia.eclass,v 1.3 2004/04/11 05:46:09 mr_bones_ Exp $
 
 # pcmcia.eclass - This eclass facilities writing ebuilds for driver packages 
 # that may need to build against the pcmcia-cs drivers, depending on kernel
@@ -46,7 +46,7 @@ SRC_URI="pcmcia?	( mirror://sourceforge/pcmcia-cs/${PCMCIA_BASE_VERSION}.tar.gz
 # kernel's, but it's here to remind me in case it does become an issue
 #ppc? ( http://dev.gentoo.org/~latexer/files/patches/${PCMCIA_BASE_VERSION}-ppc-fix.diff.gz ) )
 
-newdepend "pcmcia?	( >=sys-apps/${PCMCIA_BASE_VERSION} )"
+DEPEND="pcmcia? ( >=sys-apps/${PCMCIA_BASE_VERSION} )"
 
 PCMCIA_SOURCE_DIR="${WORKDIR}/${PCMCIA_BASE_VERSION}"
 
diff --git a/eclass/rpm.eclass b/eclass/rpm.eclass
index e2836289867c..2aeb075ab492 100644
--- a/eclass/rpm.eclass
+++ b/eclass/rpm.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/rpm.eclass,v 1.8 2003/08/31 19:43:05 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/rpm.eclass,v 1.9 2004/04/11 05:46:09 mr_bones_ Exp $
 
 # Author : Alastair Tse <liquidx@gentoo.org> (21 Jun 2003)
 #
@@ -33,7 +33,7 @@ INHERITED="$INHERITED $ECLASS"
 
 USE_RPMOFFSET_ONLY=${USE_RPMOFFSET_ONLY-""}
 
-newdepend ">=app-arch/rpm2targz-9.0-r1"
+DEPEND=">=app-arch/rpm2targz-9.0-r1"
 
 # extracts the contents of the RPM in ${WORKDIR}
 rpm_unpack() {
diff --git a/eclass/selinux-policy.eclass b/eclass/selinux-policy.eclass
index 9a6fbe8f11d5..c4e6403c40ed 100644
--- a/eclass/selinux-policy.eclass
+++ b/eclass/selinux-policy.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/selinux-policy.eclass,v 1.7 2004/01/26 08:42:06 carpaski Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/selinux-policy.eclass,v 1.8 2004/04/11 05:46:09 mr_bones_ Exp $
 
 # Eclass for installing SELinux policy, and optionally
 # reloading the policy
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN/selinux-}"
 
 IUSE=""
 
-newrdepend ">=sec-policy/selinux-base-policy-20030729"
+RDEPEND=">=sec-policy/selinux-base-policy-20030729"
 
 [ -z "${POLICYDIR}" ] && POLICYDIR="/etc/security/selinux/src/policy"
 
diff --git a/eclass/ssl-cert.eclass b/eclass/ssl-cert.eclass
index 940c4aecc248..abf2d54d0433 100644
--- a/eclass/ssl-cert.eclass
+++ b/eclass/ssl-cert.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.2 2004/04/01 22:08:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.3 2004/04/11 05:46:09 mr_bones_ Exp $
 #
 # Author: Max Kalika <max@gentoo.org>
 #
@@ -12,7 +12,7 @@ INHERITED="$INHERITED $ECLASS"
 
 # Conditionally depend on OpenSSL: allows inheretence
 # without pulling extra packages if not needed
-newdepend "ssl? ( dev-libs/openssl )"
+DEPEND="ssl? ( dev-libs/openssl )"
 
 # Initializes variables and generates the needed 
 # OpenSSL configuration file and a CA serial file
diff --git a/eclass/stardict.eclass b/eclass/stardict.eclass
index 635e893bc13a..a812b93b83e8 100644
--- a/eclass/stardict.eclass
+++ b/eclass/stardict.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/stardict.eclass,v 1.3 2004/01/09 01:10:55 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/stardict.eclass,v 1.4 2004/04/11 05:46:09 mr_bones_ Exp $
 
 # Author : Alastair Tse <liquidx@gentoo.org>
 #
@@ -34,7 +34,7 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86"
 
-newdepend ">=app-dicts/stardict-2.1"
+DEPEND=">=app-dicts/stardict-2.1"
 
 S=${WORKDIR}/${DICT_P}
 
diff --git a/eclass/subversion.eclass b/eclass/subversion.eclass
index 9701a3782696..9983c5c0cce7 100644
--- a/eclass/subversion.eclass
+++ b/eclass/subversion.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.8 2004/04/05 14:25:28 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.9 2004/04/11 05:46:09 mr_bones_ Exp $
 
 ## --------------------------------------------------------------------------- #
 # Author: Akinori Hattori <hattya@gentoo.org>
@@ -29,7 +29,7 @@ DESCRIPTION="Based on the ${ECLASS} eclass"
 
 ## -- add subversion in DEPEND
 #
-newdepend "dev-util/subversion"
+DEPEND="dev-util/subversion"
 
 
 ## -- ESVN_STORE_DIR:  subversion sources store directory
diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass
index 43ee1a57aeb2..ed2ee1aeec86 100644
--- a/eclass/virtualx.eclass
+++ b/eclass/virtualx.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.14 2003/06/21 02:29:45 jje Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.15 2004/04/11 05:46:09 mr_bones_ Exp $
 #
 # Author: Martin Schlemmer <azarah@gentoo.org>
 #
@@ -8,7 +8,7 @@
 
 ECLASS=virtualx
 INHERITED="$INHERITED $ECLASS"
-newdepend virtual/x11
+DEPEND="virtual/x11"
 
 DESCRIPTION="Based on the $ECLASS eclass"
 
diff --git a/eclass/xemacs-packages.eclass b/eclass/xemacs-packages.eclass
index 0f7ac85f98ca..783c9139bfd8 100644
--- a/eclass/xemacs-packages.eclass
+++ b/eclass/xemacs-packages.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xemacs-packages.eclass,v 1.6 2003/07/22 01:47:50 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xemacs-packages.eclass,v 1.7 2004/04/11 05:46:09 mr_bones_ Exp $
 #
 # xemacs-packages eclass inherited by all xemacs packages
 # $PKG_CAT need's to be set before inheriting xemacs-packages
@@ -9,7 +9,7 @@ ECLASS=xemacs-packages
 INHERITED="${INHERITED} ${ECLASS}"
 EXPORT_FUNCTIONS src_unpack src_install
 
-newdepend "virtual/xemacs"
+DEPEND="virtual/xemacs"
 
 [ -z "$HOMEPAGE" ]    && HOMEPAGE="http://xemacs.org/"
 [ -z "$LICENSE" ]     && LICENSE="GPL-2"