From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 23 Sep 2011 17:12:19 +0000 (-0700)
Subject: unpack: handle non-gz files from deb2targz
X-Git-Tag: v2.2.0_alpha60~37
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=dd7c57ecb90949ce3306394cfe262566b87351ca;p=portage.git

unpack: handle non-gz files from deb2targz

This will fix bug #384147.
---

diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
index a033fa837..ab597ffa7 100644
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@ -340,7 +340,11 @@ unpack() {
 						# doesn't inadvertently install it.
 						rm -f "$y"
 					fi
-					mv -f "${y%.deb}".tar.gz data.tar.gz || die "$myfail"
+					local tarfile
+					for tarfile in "${y%.deb}".tar.* ; do
+						mv -f "${tarfile}" data.tar.${tarfile##*.} || \
+							die "$myfail"
+					done
 				else
 					ar x "$srcdir$x" || die "$myfail"
 				fi