From: Fabian Groffen <grobian@gentoo.org>
Date: Thu, 8 Jan 2009 20:02:34 +0000 (-0000)
Subject:    Merged from trunk -r12371:12375
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=8365a5389fc74c5e291b955baf47f80081850a37;p=portage.git

   Merged from trunk -r12371:12375

   | 12373    | dont force people to match leading $D in STRIP_MASK         |
   | SpankMan |                                                             |

   | 12374    | export STRIP_MASK automatically                             |
   | SpankMan |                                                             |

   | 12375    | - tell the user where we unpacked the source                |
   | solar    |                                                             |

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

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 5de2d1aee..a7442cbc3 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -700,7 +700,7 @@ dyn_unpack() {
 	vecho ">>> Unpacking source..."
 	ebuild_phase src_unpack
 	touch "${PORTAGE_BUILDDIR}/.unpacked" || die "IO Failure -- Failed 'touch .unpacked' in ${PORTAGE_BUILDDIR}"
-	vecho ">>> Source unpacked."
+	vecho ">>> Source unpacked in ${WORKDIR}"
 	cd "${PORTAGE_BUILDDIR}"
 
 	[ "$(type -t post_src_unpack)" == "function" ] && qa_call post_src_unpack
diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index ed077ff6d..ab72632c7 100644
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -44,6 +44,7 @@ install_symlink_html_docs() {
 install_qa_check() {
 	cd "${ED}" || die "cd failed"
 
+	export STRIP_MASK
 	prepall
 	ecompressdir --dequeue
 	ecompress --dequeue
diff --git a/bin/prepstrip b/bin/prepstrip
index 5b8e87d04..7cbab9ac6 100755
--- a/bin/prepstrip
+++ b/bin/prepstrip
@@ -122,7 +122,7 @@ do
 		set -o noglob
 		strip_this=true
 		for m in $(eval echo ${STRIP_MASK}) ; do
-			[[ ${x} == ${m} ]] && strip_this=false && break
+			[[ /${x#${D}} == ${m} ]] && strip_this=false && break
 		done
 		set +o noglob
 	else