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 5de2d1aee21165aff37468b4d4d9c19ab5e7212a..a7442cbc31a9bb28a51d7d965833531a5f645e29 100755 (executable)
--- 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 ed077ff6de07ad0712a0a607c4c946d598587ab4..ab72632c7b51f36d1e4c031003f9e371e19667f8 100644 (file)
--- 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 5b8e87d047ab834389b3165b5b9f68e9cb280046..7cbab9ac65adf067c2865718148a7c4ae64f60d6 100755 (executable)
--- 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