[patch] patch to fix all the eclasses.

eclass.patch (text/plain), 19.08 KB, created by Mr. Bones. (RETIRED) on 2004-03-30 20:05:41 UTC

Index: check-kernel.eclass
===================================================================
RCS file: /home/cvsroot/gentoo-x86/eclass/check-kernel.eclass,v
retrieving revision 1.1
diff -u -b -B -r1.1 check-kernel.eclass
--- check-kernel.eclass	2 Aug 2003 20:48:24 -0000	1.1
+++ check-kernel.eclass	31 Mar 2004 04:04:36 -0000
@@ -14,7 +14,7 @@
 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="${DEPEND} sys-apps/gawk"
 
 check_version_h() {
 	if [ ! -f "${ROOT}/usr/src/linux/include/linux/version.h" ]
Index: common-lisp.eclass
===================================================================
RCS file: /home/cvsroot/gentoo-x86/eclass/common-lisp.eclass,v
retrieving revision 1.6
diff -u -b -B -r1.6 common-lisp.eclass
--- common-lisp.eclass	9 Mar 2004 17:52:56 -0000	1.6
+++ common-lisp.eclass	31 Mar 2004 04:04:36 -0000
@@ -12,7 +12,7 @@
 INHERITED="$INHERITED $ECLASS"
 
 CLPACKAGE=
-newdepend "dev-lisp/common-lisp-controller"
+DEPEND="${DEPEND} dev-lisp/common-lisp-controller"
 
 common-lisp_pkg_postinst() {
 	if [ -z "${CLPACKAGE}" ]; then
Index: db4-fix.eclass
===================================================================
RCS file: /home/cvsroot/gentoo-x86/eclass/db4-fix.eclass,v
retrieving revision 1.2
diff -u -b -B -r1.2 db4-fix.eclass
--- db4-fix.eclass	25 May 2003 21:06:23 -0000	1.2
+++ db4-fix.eclass	31 Mar 2004 04:04:36 -0000
@@ -12,7 +12,7 @@
 ECLASS=db4-fix
 INHERITED="$INHERITED $ECLASS"
 
-newdepend "sys-apps/sed"
+DEPEND="${DEPEND} sys-apps/sed"
 
 DESCRIPTION="Based on the ${ECLASS} eclass"
 
Index: distutils.eclass
===================================================================
RCS file: /home/cvsroot/gentoo-x86/eclass/distutils.eclass,v
retrieving revision 1.22
diff -u -b -B -r1.22 distutils.eclass
--- distutils.eclass	25 Nov 2003 09:44:18 -0000	1.22
+++ distutils.eclass	31 Mar 2004 04:04:36 -0000
@@ -27,10 +27,10 @@
 # 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="${DEPEND} =dev-lang/python-2.1*"
 	python="python2.1"
 else
-	newdepend "virtual/python"
+	DEPEND="${DEPEND} virtual/python"
 	python="python"
 fi
 
Index: ebook.eclass
===================================================================
RCS file: /home/cvsroot/gentoo-x86/eclass/ebook.eclass,v
retrieving revision 1.14
diff -u -b -B -r1.14 ebook.eclass
--- ebook.eclass	5 Mar 2004 00:10:35 -0000	1.14
+++ ebook.eclass	31 Mar 2004 04:04:36 -0000
@@ -63,9 +63,7 @@
 	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="${RDEPEND} >=dev-util/devhelp-0.6"
 fi
 if [ "${DESCRIPTION}" = "" ]; then
 	DESCRIPTION="${P} ebook based in $ECLASS eclass"
Index: elisp.eclass
===================================================================
RCS file: /home/cvsroot/gentoo-x86/eclass/elisp.eclass,v
retrieving revision 1.9
diff -u -b -B -r1.9 elisp.eclass
--- elisp.eclass	6 Oct 2003 06:38:33 -0000	1.9
+++ elisp.eclass	31 Mar 2004 04:04:36 -0000
@@ -20,12 +20,9 @@
 SRC_URI="http://cvs.gentoo.org/~mkennedy/app-emacs/${P}.el.bz2"
 if [ "${SIMPLE_ELISP}" = 't' ]; then
 	S="${WORKDIR}/"
-#else
-#   Use default value
-#	S="${WORKDIR}/${P}"
 fi
 
-newdepend "virtual/emacs"
+DEPEND="${DEPEND} virtual/emacs"
 IUSE=""
 
 elisp_src_unpack() {
Index: freedict.eclass
===================================================================
RCS file: /home/cvsroot/gentoo-x86/eclass/freedict.eclass,v
retrieving revision 1.5
diff -u -b -B -r1.5 freedict.eclass
--- freedict.eclass	17 Feb 2004 07:36:54 -0000	1.5
+++ freedict.eclass	31 Mar 2004 04:04:36 -0000
@@ -24,7 +24,7 @@
 LICENSE="GPL-2"
 KEYWORDS="x86 ~ppc ~sparc ~alpha ~mips ~hppa"
 
-newdepend "app-text/dictd"
+DEPEND="${DEPEND} app-text/dictd"
 
 freedict_src_install() {
 	insinto /usr/lib/dict
Index: gnat.eclass
===================================================================
RCS file: /home/cvsroot/gentoo-x86/eclass/gnat.eclass,v
retrieving revision 1.4
diff -u -b -B -r1.4 gnat.eclass
--- gnat.eclass	12 Dec 2003 05:04:44 -0000	1.4
+++ gnat.eclass	31 Mar 2004 04:04:36 -0000
@@ -13,7 +13,7 @@
 
 INHERITED="$INHERITED $ECLASS"
 
-newdepend dev-lang/gnat
+DEPEND="${DEPEND} dev-lang/gnat"
 
 DESCRIPTION="Based on the ${ECLASS} eclass"
 
Index: gnuconfig.eclass
===================================================================
RCS file: /home/cvsroot/gentoo-x86/eclass/gnuconfig.eclass,v
retrieving revision 1.13
diff -u -b -B -r1.13 gnuconfig.eclass
--- gnuconfig.eclass	8 Sep 2003 02:10:46 -0000	1.13
+++ gnuconfig.eclass	31 Mar 2004 04:04:36 -0000
@@ -19,7 +19,8 @@
 ECLASS=gnuconfig
 INHERITED="$INHERITED $ECLASS"
 
-newdepend "sys-devel/gnuconfig
+DEPEND="${DEPEND}
+	sys-devel/gnuconfig
 	!bootstrap? ( sys-devel/libtool )"
 
 DESCRIPTION="Based on the ${ECLASS} eclass"
Index: gnustep.eclass
===================================================================
RCS file: /home/cvsroot/gentoo-x86/eclass/gnustep.eclass,v
retrieving revision 1.6
diff -u -b -B -r1.6 gnustep.eclass
--- gnustep.eclass	26 Oct 2003 09:12:36 -0000	1.6
+++ gnustep.eclass	31 Mar 2004 04:04:36 -0000
@@ -7,9 +7,13 @@
 
 DESCRIPTION="Based on the gnustep eclass."
 
-newdepend /c
-newdepend dev-util/gnustep-make
-newdepend dev-util/gnustep-base
+DEPEND="${DEPEND}
+	dev-util/gnustep-make
+	dev-util/gnustep-base
+	sys-devel/gcc
+	virtual/glibc"
+RDEPEND="${RDEPEND}
+	virtual/glibc"
 
 getsourcedir() {
 	if [ ! -d "${S}" ] ; then
@@ -25,10 +29,10 @@
 
 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
 }
Index: gst-plugins.eclass
===================================================================
RCS file: /home/cvsroot/gentoo-x86/eclass/gst-plugins.eclass,v
retrieving revision 1.11
diff -u -b -B -r1.11 gst-plugins.eclass
--- gst-plugins.eclass	29 Mar 2004 15:36:16 -0000	1.11
+++ gst-plugins.eclass	31 Mar 2004 04:04:36 -0000
@@ -55,7 +55,7 @@
 
 S=${WORKDIR}/${MY_P}
 
-newdepend "=media-libs/${MY_P}*" ">=sys-apps/sed-4"
+DEPEND="${DEPEND} =media-libs/${MY_P}* >=sys-apps/sed-4"
 
 ###
 # internal functions
Index: iiimf.eclass
===================================================================
RCS file: /home/cvsroot/gentoo-x86/eclass/iiimf.eclass,v
retrieving revision 1.3
diff -u -b -B -r1.3 iiimf.eclass
--- iiimf.eclass	14 Sep 2003 01:38:51 -0000	1.3
+++ iiimf.eclass	31 Mar 2004 04:04:36 -0000
@@ -27,7 +27,7 @@
 
 IUSE="debug"
 
-newdepend "virtual/glibc"
+DEPEND="${DEPEND} virtual/glibc"
 
 S="${WORKDIR}/${IMSDK}/${PN}"
 
Index: kde-functions.eclass
===================================================================
RCS file: /home/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v
retrieving revision 1.64
diff -u -b -B -r1.64 kde-functions.eclass
--- kde-functions.eclass	11 Nov 2003 12:49:40 -0000	1.64
+++ kde-functions.eclass	31 Mar 2004 04:04:36 -0000
@@ -97,25 +97,25 @@
 		# 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
 
@@ -229,8 +229,8 @@
 	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
 
Index: kde.eclass
===================================================================
RCS file: /home/cvsroot/gentoo-x86/eclass/kde.eclass,v
retrieving revision 1.93
diff -u -b -B -r1.93 kde.eclass
--- kde.eclass	24 Feb 2004 13:50:07 -0000	1.93
+++ kde.eclass	31 Mar 2004 04:04:36 -0000
@@ -21,7 +21,7 @@
 	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"
Index: latex-package.eclass
===================================================================
RCS file: /home/cvsroot/gentoo-x86/eclass/latex-package.eclass,v
retrieving revision 1.16
diff -u -b -B -r1.16 latex-package.eclass
--- latex-package.eclass	27 Mar 2004 19:08:16 -0000	1.16
+++ latex-package.eclass	31 Mar 2004 04:04:36 -0000
@@ -48,7 +48,7 @@
 inherit base
 INHERITED="$INHERITED $ECLASS"
 
-newdepend "virtual/tetex
+DEPEND="${DEPEND} virtual/tetex
        >=sys-apps/texinfo-4.2-r5"
 ECLASS=latex-package
 HOMEPAGE="http://www.tug.org/"
Index: libtool.eclass
===================================================================
RCS file: /home/cvsroot/gentoo-x86/eclass/libtool.eclass,v
retrieving revision 1.25
diff -u -b -B -r1.25 libtool.eclass
--- libtool.eclass	11 Feb 2004 19:33:14 -0000	1.25
+++ libtool.eclass	31 Mar 2004 04:04:36 -0000
@@ -10,7 +10,7 @@
 ECLASS="libtool"
 INHERITED="${INHERITED} ${ECLASS}"
 
-newdepend "!bootstrap? ( sys-devel/libtool )"
+DEPEND="${DEPEND} !bootstrap? ( sys-devel/libtool )"
 
 DESCRIPTION="Based on the ${ECLASS} eclass"
 
Index: matrox.eclass
===================================================================
RCS file: /home/cvsroot/gentoo-x86/eclass/matrox.eclass,v
retrieving revision 1.1
diff -u -b -B -r1.1 matrox.eclass
--- matrox.eclass	29 Dec 2003 17:17:26 -0000	1.1
+++ matrox.eclass	31 Mar 2004 04:04:36 -0000
@@ -18,7 +18,8 @@
 SLOT="${KV}"
 RESTRICT="fetch nostrip"
 
-newrdepend ">=x11-base/xfree-4.2.0
+RDEPEND="${RDEPEND}
+	>=x11-base/xfree-4.2.0
 	virtual/linux-sources"
 
 matrox_pkg_setup() {
Index: pcmcia.eclass
===================================================================
RCS file: /home/cvsroot/gentoo-x86/eclass/pcmcia.eclass,v
retrieving revision 1.2
diff -u -b -B -r1.2 pcmcia.eclass
--- pcmcia.eclass	7 Feb 2004 23:44:23 -0000	1.2
+++ pcmcia.eclass	31 Mar 2004 04:04:36 -0000
@@ -46,7 +46,7 @@
 # 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="${DEPEND} pcmcia? ( >=sys-apps/${PCMCIA_BASE_VERSION} )"
 
 PCMCIA_SOURCE_DIR="${WORKDIR}/${PCMCIA_BASE_VERSION}"
 
Index: perl-module.eclass
===================================================================
RCS file: /home/cvsroot/gentoo-x86/eclass/perl-module.eclass,v
retrieving revision 1.57
diff -u -b -B -r1.57 perl-module.eclass
--- perl-module.eclass	5 Mar 2004 10:30:33 -0000	1.57
+++ perl-module.eclass	31 Mar 2004 04:04:36 -0000
@@ -15,8 +15,7 @@
 	src_compile src_install src_test \
 	perlinfo updatepod
 
-
-newdepend ">=dev-lang/perl-5.8.0-r12"
+DEPEND="${DEPEND} >=dev-lang/perl-5.8.0-r12"
 SRC_PREP="no"
 SRC_TEST="skip"
 
Index: rpm.eclass
===================================================================
RCS file: /home/cvsroot/gentoo-x86/eclass/rpm.eclass,v
retrieving revision 1.8
diff -u -b -B -r1.8 rpm.eclass
--- rpm.eclass	31 Aug 2003 19:43:05 -0000	1.8
+++ rpm.eclass	31 Mar 2004 04:04:36 -0000
@@ -33,7 +33,7 @@
 
 USE_RPMOFFSET_ONLY=${USE_RPMOFFSET_ONLY-""}
 
-newdepend ">=app-arch/rpm2targz-9.0-r1"
+DEPEND="${DEPEND} >=app-arch/rpm2targz-9.0-r1"
 
 # extracts the contents of the RPM in ${WORKDIR}
 rpm_unpack() {
Index: ruby-gnome2.eclass
===================================================================
RCS file: /home/cvsroot/gentoo-x86/eclass/ruby-gnome2.eclass,v
retrieving revision 1.6
diff -u -b -B -r1.6 ruby-gnome2.eclass
--- ruby-gnome2.eclass	23 Jan 2004 07:27:07 -0000	1.6
+++ ruby-gnome2.eclass	31 Mar 2004 04:04:36 -0000
@@ -27,13 +27,13 @@
 SLOT="0"
 
 if [[ ${PV} == 0.5.0 ]]; then
-	newdepend ">=dev-lang/ruby-1.6"
-	newrdepend ">=dev-lang/ruby-1.6"
+	DEPEND="${DEPEND} >=dev-lang/ruby-1.6"
+	RDEPEND="${RDEPEND} >=dev-lang/ruby-1.6"
 else
 	# Not necessarily true, but nobody's testing the newer ruby-gnome2
 	# with the older ruby...
-	newdepend ">=dev-lang/ruby-1.8"
-	newrdepend ">=dev-lang/ruby-1.8"
+	DEPEND="${DEPEND} >=dev-lang/ruby-1.8"
+	RDEPEND="${RDEPEND} >=dev-lang/ruby-1.8"
 fi
 
 ruby-gnome2_src_compile() {
Index: ruby.eclass
===================================================================
RCS file: /home/cvsroot/gentoo-x86/eclass/ruby.eclass,v
retrieving revision 1.26
diff -u -b -B -r1.26 ruby.eclass
--- ruby.eclass	19 Mar 2004 18:34:47 -0000	1.26
+++ ruby.eclass	31 Mar 2004 04:04:36 -0000
@@ -47,7 +47,7 @@
 SLOT="0"
 LICENSE="Ruby"
 
-newdepend ">=dev-lang/ruby-1.6.8"
+DEPEND="${DEPEND} >=dev-lang/ruby-1.6.8"
 
 [[ -z "${RUBY}" ]] && export RUBY=/usr/bin/ruby
 
Index: selinux-policy.eclass
===================================================================
RCS file: /home/cvsroot/gentoo-x86/eclass/selinux-policy.eclass,v
retrieving revision 1.7
diff -u -b -B -r1.7 selinux-policy.eclass
--- selinux-policy.eclass	26 Jan 2004 08:42:06 -0000	1.7
+++ selinux-policy.eclass	31 Mar 2004 04:04:36 -0000
@@ -17,7 +17,7 @@
 
 IUSE=""
 
-newrdepend ">=sec-policy/selinux-base-policy-20030729"
+RDEPEND="${RDEPEND} >=sec-policy/selinux-base-policy-20030729"
 
 [ -z "${POLICYDIR}" ] && POLICYDIR="/etc/security/selinux/src/policy"
 
Index: sgml-catalog.eclass
===================================================================
RCS file: /home/cvsroot/gentoo-x86/eclass/sgml-catalog.eclass,v
retrieving revision 1.6
diff -u -b -B -r1.6 sgml-catalog.eclass
--- sgml-catalog.eclass	12 Apr 2003 16:15:03 -0000	1.6
+++ sgml-catalog.eclass	31 Mar 2004 04:04:36 -0000
@@ -7,7 +7,7 @@
 inherit base
 INHERITED="$INHERITED $ECLASS"
 
-newdepend ">=app-text/sgml-common-0.6.3-r2"
+DEPEND="${DEPEND} >=app-text/sgml-common-0.6.3-r2"
 ECLASS=sgml-catalog
 
 declare -a toinstall
Index: ssl-cert.eclass
===================================================================
RCS file: /home/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v
retrieving revision 1.1
diff -u -b -B -r1.1 ssl-cert.eclass
--- ssl-cert.eclass	30 Oct 2003 17:14:37 -0000	1.1
+++ ssl-cert.eclass	31 Mar 2004 04:04:36 -0000
@@ -12,7 +12,7 @@
 
 # Conditionally depend on OpenSSL: allows inheretence
 # without pulling extra packages if not needed
-newdepend "ssl? ( dev-libs/openssl )"
+DEPEND="${DEPEND} ssl? ( dev-libs/openssl )"
 
 # Initializes variables and generates the needed 
 # OpenSSL configuration file and a CA serial file
Index: stardict.eclass
===================================================================
RCS file: /home/cvsroot/gentoo-x86/eclass/stardict.eclass,v
retrieving revision 1.3
diff -u -b -B -r1.3 stardict.eclass
--- stardict.eclass	9 Jan 2004 01:10:55 -0000	1.3
+++ stardict.eclass	31 Mar 2004 04:04:36 -0000
@@ -34,7 +34,7 @@
 LICENSE="GPL-2"
 KEYWORDS="~x86"
 
-newdepend ">=app-dicts/stardict-2.1"
+DEPEND="${DEPEND} >=app-dicts/stardict-2.1"
 
 S=${WORKDIR}/${DICT_P}
 
Index: subversion.eclass
===================================================================
RCS file: /home/cvsroot/gentoo-x86/eclass/subversion.eclass,v
retrieving revision 1.7
diff -u -b -B -r1.7 subversion.eclass
--- subversion.eclass	1 Mar 2004 16:37:31 -0000	1.7
+++ subversion.eclass	31 Mar 2004 04:04:36 -0000
@@ -27,7 +27,7 @@
 
 ## -- add subversion in DEPEND
 #
-newdepend "dev-util/subversion"
+DEPEND="${DEPEND} dev-util/subversion"
 
 
 ## -- ESVN_STORE_DIR:  subversion sources store directory
Index: tetex.eclass
===================================================================
RCS file: /home/cvsroot/gentoo-x86/eclass/tetex.eclass,v
retrieving revision 1.6
diff -u -b -B -r1.6 tetex.eclass
--- tetex.eclass	21 Feb 2004 12:20:06 -0000	1.6
+++ tetex.eclass	31 Mar 2004 04:04:36 -0000
@@ -34,7 +34,8 @@
 LICENSE="GPL-2"
 KEYWORDS="~ia64 ~x86 ~ppc ~sparc ~alpha ~amd64"
 
-newdepend "!app-text/tetex
+DEPEND="${DEPEND}
+	!app-text/tetex
 	!app-text/ptex
 	!app-text/cstetex
 	sys-apps/ed
@@ -43,7 +44,8 @@
 	>=media-libs/libpng-1.2.1
 	sys-libs/ncurses
 	>=net-libs/libwww-5.3.2-r1"
-newrdepend "!app-text/tetex
+RDEPEND="${RDEPEND}
+	!app-text/tetex
 	!app-text/ptex
 	!app-text/cstetex
 	sys-apps/ed
Index: tla.eclass
===================================================================
RCS file: /home/cvsroot/gentoo-x86/eclass/tla.eclass,v
retrieving revision 1.2
diff -u -b -B -r1.2 tla.eclass
--- tla.eclass	7 Mar 2004 18:48:32 -0000	1.2
+++ tla.eclass	31 Mar 2004 04:04:36 -0000
@@ -58,7 +58,7 @@
 # --- end ebuild-configurable settings ---
 
 # add tla to deps
-newdepend "dev-util/tla"
+DEPEND="${DEPEND} dev-util/tla"
 
 # registers archives mentioned in $ETLA_ARCHIVES
 tla_register_archives() {
Index: virtualx.eclass
===================================================================
RCS file: /home/cvsroot/gentoo-x86/eclass/virtualx.eclass,v
retrieving revision 1.14
diff -u -b -B -r1.14 virtualx.eclass
--- virtualx.eclass	21 Jun 2003 02:29:45 -0000	1.14
+++ virtualx.eclass	31 Mar 2004 04:04:36 -0000
@@ -8,7 +8,7 @@
 
 ECLASS=virtualx
 INHERITED="$INHERITED $ECLASS"
-newdepend virtual/x11
+DEPEND="${DEPEND} virtual/x11"
 
 DESCRIPTION="Based on the $ECLASS eclass"
 
Index: xemacs-packages.eclass
===================================================================
RCS file: /home/cvsroot/gentoo-x86/eclass/xemacs-packages.eclass,v
retrieving revision 1.6
diff -u -b -B -r1.6 xemacs-packages.eclass
--- xemacs-packages.eclass	22 Jul 2003 01:47:50 -0000	1.6
+++ xemacs-packages.eclass	31 Mar 2004 04:04:36 -0000
@@ -9,7 +9,7 @@
 INHERITED="${INHERITED} ${ECLASS}"
 EXPORT_FUNCTIONS src_unpack src_install
 
-newdepend "virtual/xemacs"
+DEPEND="${DEPEND} virtual/xemacs"
 
 [ -z "$HOMEPAGE" ]    && HOMEPAGE="http://xemacs.org/"
 [ -z "$LICENSE" ]     && LICENSE="GPL-2"
Index: zproduct.eclass
===================================================================
RCS file: /home/cvsroot/gentoo-x86/eclass/zproduct.eclass,v
retrieving revision 1.10
diff -u -b -B -r1.10 zproduct.eclass
--- zproduct.eclass	29 Dec 2003 13:09:12 -0000	1.10
+++ zproduct.eclass	31 Mar 2004 04:04:36 -0000
@@ -14,7 +14,8 @@
 #HOMEPAGE=""
 #SRC_URI=""
 
-newrdepend ">=net-zope/zope-2.6.0-r2
+RDEPEND="${RDEPEND}
+	>=net-zope/zope-2.6.0-r2
 	app-admin/zprod-manager"
 
 IUSE=""