summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-11-04 04:44:00 +0000
committerZac Medico <zmedico@gentoo.org>2006-11-04 04:44:00 +0000
commiteeb861b575637377253e87006658ae70ffb7da02 (patch)
tree0ed44179d5eaf351248a3793b5115354d6d4f9cf
parent6733c104df676d6a742ca4916fdbed3c53d1d2a7 (diff)
downloadportage-eeb861b575637377253e87006658ae70ffb7da02.tar.gz
portage-eeb861b575637377253e87006658ae70ffb7da02.tar.bz2
portage-eeb861b575637377253e87006658ae70ffb7da02.zip
Revert implicit rdepend behavior back to the way it was in portage-2.0.51. Thanks to vapier for the patch. The original change seems to have been an accidentally hunk (referencing bug #58819) that was committed to cvs along with another patch in revision 1.201.2.32 of ebuild.sh.
svn path=/main/trunk/; revision=4929
-rwxr-xr-xbin/ebuild.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index d028d1a40..f990913fe 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1504,8 +1504,8 @@ export TMPDIR="${T}"
#syntax from getting expanded :)
#check eclass rdepends also.
set -f
-if [ "${RDEPEND-unset}" == "unset" ] && [ "${E_RDEPEND-unset}" == "unset" ] ; then
- export RDEPEND="${DEPEND} ${E_DEPEND}"
+if [ "${RDEPEND-unset}" == "unset" ] ; then
+ export RDEPEND=${DEPEND}
debug-print "RDEPEND: not set... Setting to: ${DEPEND}"
fi