From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 1 Jun 2006 13:46:57 +0000 (-0000)
Subject: Fix unpack so that it works with 7z archives for bug #135134.  Thanks to Paul Bredbur... 
X-Git-Tag: v2.1~29
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0e8b9c2d130f99e7d6e832876f6df224596fa854;p=portage.git

Fix unpack so that it works with 7z archives for bug #135134.  Thanks to Paul Bredbury <brebs@sent.com> for the initial patch.

svn path=/main/trunk/; revision=3447
---

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index bfe9e072d..49cea8de8 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -399,6 +399,14 @@ unpack() {
 					bzip2 -dc "${srcdir}${x}" > ${x%.*} || die "$myfail"
 				fi
 				;;
+			7Z|7z)
+				local my_output
+				my_output="$(7z x -y "${srcdir}/${x}")"
+				if [ $? -ne 0 ]; then
+					echo "${my_output}" >&2
+					die "$myfail"
+				fi
+				;;
 			RAR|rar)
 				unrar x -idq "${srcdir}/${x}" || die "$myfail"
 				;;