Switch to unpacker eclass for xz.

(Portage version: 2.2.0_alpha144/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)

3 files changed, 18 insertions, 14 deletions

diff --git a/sys-devel/libtool/ChangeLog b/sys-devel/libtool/ChangeLog
index 767ac82ff036..1855bafae37c 100644
--- a/sys-devel/libtool/ChangeLog
+++ b/sys-devel/libtool/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/libtool
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.199 2012/04/26 13:07:54 aballier Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.200 2013/01/15 04:29:33 vapier Exp $
+
+  15 Jan 2013; Mike Frysinger <vapier@gentoo.org> libtool-2.4.2.ebuild,
+  libtool-9999.ebuild:
+  Switch to unpacker eclass for xz.
 
   26 Apr 2012; Alexis Ballier <aballier@gentoo.org> libtool-2.4.2.ebuild,
   libtool-9999.ebuild:
diff --git a/sys-devel/libtool/libtool-2.4.2.ebuild b/sys-devel/libtool/libtool-2.4.2.ebuild
index 7f8fa65d86b1..bc89c312fad5 100644
--- a/sys-devel/libtool/libtool-2.4.2.ebuild
+++ b/sys-devel/libtool/libtool-2.4.2.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-2.4.2.ebuild,v 1.5 2012/04/26 13:07:54 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-2.4.2.ebuild,v 1.6 2013/01/15 04:29:33 vapier Exp $
 
 EAPI="2" #356089
 
 LIBTOOLIZE="true" #225559
 WANT_LIBTOOL="none"
-inherit eutils autotools multilib
+inherit eutils autotools multilib unpacker
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://git.savannah.gnu.org/${PN}.git
@@ -39,8 +39,7 @@ src_unpack() {
 		cd "${S}"
 		./bootstrap || die
 	else
-		xz -dc "${DISTDIR}"/${A} > ${P}.tar #356089
-		unpack ./${P}.tar
+		unpacker_src_unpack
 	fi
 }
 
@@ -78,8 +77,9 @@ src_install() {
 	# for crappy packages that utilize the system libtool, so undo that.
 	dosed '1,/^build_old_libs=/{/^build_old_libs=/{s:=.*:=yes:}}' /usr/bin/libtool || die
 
+	local x
 	for x in $(find "${D}" -name config.guess -o -name config.sub) ; do
-		rm -f "${x}" ; ln -sf /usr/share/gnuconfig/${x##*/} "${x}"
+		ln -sf /usr/share/gnuconfig/${x##*/} "${x}" || die
 	done
 }
 
diff --git a/sys-devel/libtool/libtool-9999.ebuild b/sys-devel/libtool/libtool-9999.ebuild
index e0f792c08a7d..ddf3bad4b6eb 100644
--- a/sys-devel/libtool/libtool-9999.ebuild
+++ b/sys-devel/libtool/libtool-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-9999.ebuild,v 1.12 2012/04/26 13:07:54 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-9999.ebuild,v 1.13 2013/01/15 04:29:33 vapier Exp $
 
 EAPI="2" #356089
 
 LIBTOOLIZE="true" #225559
 WANT_LIBTOOL="none"
-inherit eutils autotools multilib
+inherit eutils autotools multilib unpacker
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://git.savannah.gnu.org/${PN}.git
@@ -38,8 +38,7 @@ src_unpack() {
 		cd "${S}"
 		./bootstrap || die
 	else
-		xz -dc "${DISTDIR}"/${A} > ${P}.tar #356089
-		unpack ./${P}.tar
+		unpacker_src_unpack
 	fi
 }
 
@@ -77,8 +76,9 @@ src_install() {
 	# for crappy packages that utilize the system libtool, so undo that.
 	dosed '1,/^build_old_libs=/{/^build_old_libs=/{s:=.*:=yes:}}' /usr/bin/libtool || die
 
+	local x
 	for x in $(find "${D}" -name config.guess -o -name config.sub) ; do
-		rm -f "${x}" ; ln -sf /usr/share/gnuconfig/${x##*/} "${x}"
+		ln -sf /usr/share/gnuconfig/${x##*/} "${x}"
 	done
 }