From e1a2a0fdc08dc1deb019baf2fa98e1a133830e9a Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
Date: Fri, 3 Jul 2009 21:26:07 +0000
Subject: Don't set RDEPEND=${RDEPEND-${DEPEND}} for EAPI=3 and simplify
 setting it for lower EAPIs.

svn path=/main/trunk/; revision=13768
---
 bin/ebuild.sh | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'bin')

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 32fa21c65..c032ae95e 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1758,13 +1758,10 @@ _source_ebuild() {
 			rm "$PORTAGE_BUILDDIR/.ebuild_changed"
 	fi
 
-	# This next line is not the same as export RDEPEND=${RDEPEND:-${DEPEND}}
-	# That will test for unset *or* NULL (""). We want just to set for unset...
-	# turn off glob expansion from here on in to prevent *'s and ? in the
-	# DEPEND syntax from getting expanded :)
-	set -f
-	if [ "${RDEPEND-unset}" == "unset" ] ; then
-		export RDEPEND=${DEPEND}
+	[[ -n $EAPI ]] || EAPI=0
+
+	if has "$EAPI" 0 1 2 ; then
+		export RDEPEND=${RDEPEND-${DEPEND}}
 		debug-print "RDEPEND: not set... Setting to: ${DEPEND}"
 	fi
 
@@ -1775,9 +1772,6 @@ _source_ebuild() {
 	PDEPEND="${PDEPEND} ${E_PDEPEND}"
 
 	unset ECLASS E_IUSE E_DEPEND E_RDEPEND E_PDEPEND
-	set +f
-
-	[[ -n $EAPI ]] || EAPI=0
 
 	# alphabetically ordered by $EBUILD_PHASE value
 	local f valid_phases
-- 
cgit v1.2.3-1-g7c22