[gentoo-commits] portage r13768 - main/trunk/bin

[gentoo-commits] portage r13768 - main/trunk/bin

[Arfrever Frehtes Taifersar Arahesis (arfrever)]

Author: arfrever
Date: 2009-07-03 21:26:07 +0000 (Fri, 03 Jul 2009)
New Revision: 13768

Modified:
   main/trunk/bin/ebuild.sh
Log:
Don't set RDEPEND=${RDEPEND-${DEPEND}} for EAPI=3 and simplify setting it for lower EAPIs.


Modified: main/trunk/bin/ebuild.sh
===================================================================
--- main/trunk/bin/ebuild.sh	2009-07-03 20:29:39 UTC (rev 13767)
+++ main/trunk/bin/ebuild.sh	2009-07-03 21:26:07 UTC (rev 13768)
@@ -1758,13 +1758,10 @@
 			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,10 +1772,7 @@
 	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
 	case "$EAPI" in