From 587d31cbd5b7dac519b3d9b98949970ba037e5f8 Mon Sep 17 00:00:00 2001
From: Kito <kito@gentoo.org>
Date: Sat, 3 Dec 2005 21:36:12 +0000
Subject: [PATCH] Clean out more CDEPEND stuff.

svn path=/main/branches/prefix/; revision=2337
---
 bin/ebuild.sh | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index ac55a95ae..e065e5f67 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1054,7 +1054,6 @@ dyn_compile() {
 	echo "$CATEGORY"       > CATEGORY
 	echo "$CBUILD"         > CBUILD
 	echo "$CC"             > CC
-	echo "$CDEPEND"        > CDEPEND
 	echo "$CFLAGS"         > CFLAGS
 	echo "$CHOST"          > CHOST
 	echo "$CTARGET"        > CTARGET
@@ -1363,7 +1362,8 @@ dyn_preinst() {
 	
 	[ "$(type -t pre_pkg_preinst)" == "function" ] && pre_pkg_preinst
 
-	D=${IMAGE} pkg_preinst
+	declare -r D=${IMAGE}
+	pkg_preinst
 
 	# hopefully this will someday allow us to get rid of the no* feature flags
 	# we don't want globbing for initial expansion, but afterwards, we do
@@ -1631,7 +1631,6 @@ inherit() {
 	local B_IUSE
 	local B_DEPEND
 	local B_RDEPEND
-	local B_CDEPEND
 	local B_PDEPEND
 	while [ "$1" ]; do
 		location="${ECLASSDIR}/${1}.eclass"
@@ -1668,13 +1667,12 @@ inherit() {
 		set -f
 
 		# Retain the old data and restore it later.
-		unset B_IUSE B_DEPEND B_RDEPEND B_CDEPEND B_PDEPEND
+		unset B_IUSE B_DEPEND B_RDEPEND B_PDEPEND
 		[ "${IUSE-unset}"    != "unset" ] && B_IUSE="${IUSE}"
 		[ "${DEPEND-unset}"  != "unset" ] && B_DEPEND="${DEPEND}"
 		[ "${RDEPEND-unset}" != "unset" ] && B_RDEPEND="${RDEPEND}"
-		[ "${CDEPEND-unset}" != "unset" ] && B_CDEPEND="${CDEPEND}"
 		[ "${PDEPEND-unset}" != "unset" ] && B_PDEPEND="${PDEPEND}"
-		unset   IUSE   DEPEND   RDEPEND   CDEPEND   PDEPEND
+		unset IUSE DEPEND RDEPEND PDEPEND
 		#turn on glob expansion
 		set +f
 		
@@ -1689,7 +1687,6 @@ inherit() {
 		[ "${IUSE-unset}"    != "unset" ] && export E_IUSE="${E_IUSE} ${IUSE}"
 		[ "${DEPEND-unset}"  != "unset" ] && export E_DEPEND="${E_DEPEND} ${DEPEND}"
 		[ "${RDEPEND-unset}" != "unset" ] && export E_RDEPEND="${E_RDEPEND} ${RDEPEND}"
-		[ "${CDEPEND-unset}" != "unset" ] && export E_CDEPEND="${E_CDEPEND} ${CDEPEND}"
 		[ "${PDEPEND-unset}" != "unset" ] && export E_PDEPEND="${E_PDEPEND} ${PDEPEND}"
 
 		[ "${B_IUSE-unset}"    != "unset" ] && IUSE="${B_IUSE}"
@@ -1701,9 +1698,6 @@ inherit() {
 		[ "${B_RDEPEND-unset}" != "unset" ] && RDEPEND="${B_RDEPEND}"
 		[ "${B_RDEPEND-unset}" != "unset" ] || unset RDEPEND
 
-		[ "${B_CDEPEND-unset}" != "unset" ] && CDEPEND="${B_CDEPEND}"
-		[ "${B_CDEPEND-unset}" != "unset" ] || unset CDEPEND
-
 		[ "${B_PDEPEND-unset}" != "unset" ] && PDEPEND="${B_PDEPEND}"
 		[ "${B_PDEPEND-unset}" != "unset" ] || unset PDEPEND
 
@@ -1771,11 +1765,6 @@ newrdepend() {
 	do_newdepend RDEPEND $1
 }
 
-newcdepend() {
-	debug-print-function newcdepend $*
-	do_newdepend CDEPEND $1
-}
-
 newpdepend() {
 	debug-print-function newpdepend $*
 	do_newdepend PDEPEND $1
-- 
2.26.2