From: Fabian Groffen <grobian@gentoo.org>
Date: Sat, 14 Apr 2007 19:43:45 +0000 (-0000)
Subject: Change logic to always use deb2targz if deb2targz is available, and fall
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=0cf92ef2140b47b0c05542d3a60865c8bd6da6e3;p=portage.git

Change logic to always use deb2targz if deb2targz is available, and fall
back on ar if unavailable.  This avoids some CHOST logic, which I don't
really get (yet).

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

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index b00ccd555..2fdc726ae 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -373,11 +373,12 @@ unpack() {
 				lha xqf "${srcdir}/${x}" || die "$myfail"
 				;;
 			deb)
-				# unpacking .deb archives can only be done with a GNU
-				# binutils (compatible) ar.  So if we don't have that,
-				# which only is on AIX for the moment, use deb2targz and
-				# unpack that one
-				if [[ ${CHOST} == *-aix* ]]; then
+				# Unpacking .deb archives can not always be done with
+				# `ar`.  For instance on AIX this doesn't work out.  If
+				# we have `deb2targz` installed, prefer it over `ar` for
+				# that reason.  We just make sure on AIX `deb2targz` is
+				# installed.
+				if type -p deb2targz &>/dev/null; then
 					deb2targz "${srcdir}/${x}" || die "$myfail"
 					mv "${srcdir}/${x/.deb/.tar.gz}" data.tar.gz
 				else