From: Fabian Groffen <grobian@gentoo.org>
Date: Sat, 14 Oct 2006 14:12:01 +0000 (-0000)
Subject: Merged from trunk 4676:4677
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=45d15acea0a735a97bd6b411d1c85db6fb8256be;p=portage.git

Merged from trunk 4676:4677


svn path=/main/branches/prefix/; revision=4687
---

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 408ce7cdc..11f4a2814 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1605,6 +1605,11 @@ fi
 # this can be left out of ebd variants, since they're unaffected.
 unset EBUILD_DEATH_HOOKS
 
+# *DEPEND and IUSE will be set during the sourcing of the ebuild.  In order to
+# ensure correct interaction between ebuilds and eclasses, they need to be
+# unset before this process of interaction begins.
+unset DEPEND RDEPEND PDEPEND IUSE
+
 source ${EBUILD} || die "error sourcing ebuild"
 if ! hasq depend $EBUILD_PHASE; then
 	RESTRICT="${PORTAGE_RESTRICT}"
diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index e97b4c63e..8ba1e90e7 100644
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -383,7 +383,7 @@ dyn_package() {
 	# Sandbox is disabled in case the user wants to use a symlink
 	# for $PKGDIR and/or $PKGDIR/All.
 	export SANDBOX_ON="0"
-	tar cpvf - ./ | bzip2 -f > "${pkg_tmp}" || die "Failed to create tarball"
+	tar -cf - . | bzip2 -f > "${pkg_tmp}" || die "Failed to create tarball"
 	cd ..
 	export PYTHONPATH=${PORTAGE_PYM_PATH:-/usr/lib/portage/pym}
 	python -c "import xpak; t=xpak.tbz2('${pkg_tmp}'); t.recompose('${PORTAGE_BUILDDIR}/build-info')"