Move to new unpacker eclass.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

6 files changed, 35 insertions, 53 deletions

diff --git a/sys-apps/sandbox/ChangeLog b/sys-apps/sandbox/ChangeLog
index c4dae54cb21a..1452b4a2ca8b 100644
--- a/sys-apps/sandbox/ChangeLog
+++ b/sys-apps/sandbox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/sandbox
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/ChangeLog,v 1.160 2012/02/02 15:12:53 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/ChangeLog,v 1.161 2012/02/05 04:50:08 vapier Exp $
+
+  05 Feb 2012; Mike Frysinger <vapier@gentoo.org> sandbox-1.6-r2.ebuild,
+  sandbox-2.3-r1.ebuild, sandbox-2.4.ebuild, sandbox-2.5.ebuild:
+  Move to new unpacker eclass.
 
   02 Feb 2012; Samuli Suominen <ssuominen@gentoo.org> sandbox-2.5.ebuild:
   ppc/ppc64 stable wrt #389981
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index bfa294856675..185fc97206ea 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -9,20 +9,26 @@ DIST sandbox-1.6.tar.lzma 307014 RMD160 abdcfbbf137304f87c2cb184a4650bf652555ef6
 DIST sandbox-2.3.tar.xz 344260 RMD160 929485e4fb51737dc2fc1fe656efc505c3b78eec SHA1 c1eff87f4f608aa613a6905d2111790ac57fe091 SHA256 8670f7508453c2fd300ca29ad2eb457691c3df01c4c22fa27d4a7c880fd291d5
 DIST sandbox-2.4.tar.xz 344664 RMD160 43593c13c27881ebe17ae47c6ea0c40870f8351c SHA1 8d8b7ccc61baa881a90071c4cdc533f6918d21f4 SHA256 450599cb3052296d42f81a04dbbda82d220415fc2d16f5dc6e26b042d580fd3e
 DIST sandbox-2.5.tar.xz 355680 RMD160 f6eb0d681d5280c6ced5cd6bfd4da74e25ce129f SHA1 bfa2456d3a8b9f35b460f733b97a1fe7f00c5ca5 SHA256 c0e98767fb70750d79591a6d08f81d5c2f13ce783bf94bd90677022e9103878a
-EBUILD sandbox-1.6-r2.ebuild 2807 RMD160 34f50316548b2e9d98b5dfb70d99e3e380302672 SHA1 bba36e5a8fa8ea20c1e45febc5aeb56296d12cc9 SHA256 0d9c59cc9c328ad90f1ca93130b7975f09c827f55910a590ff2b2c314661b287
-EBUILD sandbox-2.3-r1.ebuild 2877 RMD160 9c1335c54192c0214a6eac9e4e9da649f16450d6 SHA1 b6cd28f55b2f69168fb789c5f542fa7056e12c71 SHA256 0b95ed925d80aa116e1ea6a9f261aa8c005326988d9ab3a1559ad799abd9d9cb
-EBUILD sandbox-2.4.ebuild 2810 RMD160 e5fb4928a9764f73e58c5b4c0879bb9f1e5e6ba7 SHA1 d14f1d582c4d9dd1acdebd96b8e1805522e510d9 SHA256 61d74f81d3215f1028c2f24b1436e2d4e3632d5cdaf4125f42884e55b98c63a4
-EBUILD sandbox-2.5.ebuild 2810 RMD160 7711ec09bfca2da9352636d63167fc6de7b9fbb2 SHA1 237a89a3b2ef4d3c2c54cfb8f13de2b8af29aa26 SHA256 b86a88ef7221231624b898298896d573e3b4f6cbc3e8e94368af5a5f9c6d4d0b
-MISC ChangeLog 22169 RMD160 13d569be6be534ff58b3586a6987ec67b9db9b74 SHA1 4ba481280943b29d9d09e3206d8b29369ccd2369 SHA256 83c63ade69a6b14d6c0fff2d77dea2e8425b78dfb6002533e239a87d1ed393bb
+EBUILD sandbox-1.6-r2.ebuild 2674 RMD160 f603fb52322997a79e21a2e9a4ea9a553e1be697 SHA1 46b26abbf8c1b0051860d471fb870ae9d302bd93 SHA256 b3b4462c919005d220c46a3551be224bf33c9294c6fc6af3a1ffa68c91015514
+EBUILD sandbox-2.3-r1.ebuild 2713 RMD160 178286b857e23c52777207404b097efacec98c53 SHA1 4a5aae8a23d3c0ec2452c8248576e59f4e3d92de SHA256 58eb10e050f4321b703d71cfdd8d83de61ab76e748046dde724e64ca21dc253f
+EBUILD sandbox-2.4.ebuild 2639 RMD160 061703c6a84348cbe51c1e2ad3037e93151c2296 SHA1 e93d4767e9c50c4737527ae26c1b0529e743d8ce SHA256 d5b852481f07dbbf5b1f5f4761a4c16137aea8f4d8f047c27edd898cc713272e
+EBUILD sandbox-2.5.ebuild 2638 RMD160 4c643ddd8af466bb39dffd1622bd89738865080b SHA1 08851ae0c0bd68cf295d8886d90face7907e6852 SHA256 0d52c9fe4a81706e99694433c3edf5b54ed71168062261bb66ef26add6aacb7e
+MISC ChangeLog 22336 RMD160 0baad78bc0f8a9b1254a690a558065f23fab0ce1 SHA1 4df512dc0ab88a4417f942c3791ff0e2c6fa3aad SHA256 31470c4bec96534b6bc3cfe8ff1e2eab1b54bf2e6d5715d666da74f73db185cb
 MISC metadata.xml 316 RMD160 7a59e0a8ebd42e830f5ec1b52f58855a78fddd3f SHA1 b86a1426d32e1a47371f1c21545aab672987bef1 SHA256 488f8a1ba1e1d07a159d22ac198aefee5dfa9ded04de2969019f177161abef1b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPKqdVAAoJEEdUh39IaPFNphcH/ivQ4iBqV9xRlk0zNxD37yFJ
-wbNg8eOc9J9ePIzvTTWSzYLvJnm9pv/P1prYCj9I2n8Es5idxNEWDksbH+wNqsI2
-CoA4Q8vONNJspR44v445IAdVswrcDkJLBkDxWhlKacGgUJA5iAJtnMX5axV36Gbc
-hndl/HgHoZoOIqzAGr2ccwGWqBlKclHdfNhCZ9zkF9dsysIEiYNkEu9HPRN0ptdD
-Bl6471jNUh5GSPhJjnH+umpHHv7DzN7qF2n05IkhbNeDY8WzdzJDWfKA7u61LivH
-PJMVA4VcSz6EMSkc200UuQ2socD0OXlXnmle0q4pYTwxldwDhC7OIWkDIg10FPY=
-=S1RD
+iQIcBAEBAgAGBQJPLgqaAAoJELEHsLL7fEFWURsP/2gPgTddXlnyqeR8JNr7JYUo
+5gbJpMvu3tC2488x+hmG+TZnwvG2/8PNq8xk6c4U4BGVC1lKGD/8gQjDveA5GEgY
+f5wVxQnIy9jT7RLnzjxVHsLcnuPxe9tKL+Ok+7S9rRBTs65EbG8dRsxz1gcYr2e8
+HvZ47DKE5iFlf3wk2jjPEuvd/OfKmERpJ87gcQSMKOH5LUmkJY2yWBDbfuTBXAaC
+s705csepdsUsEbpbududX2P0fF1h19nZI52FoLFjvpgcszIvaPUu4Am8PuvpdNpc
+VHaonAO5eh5uHW1Hto2OGbbaRG7GNLrojK1b4F50AaCFZQ0BS5WYnXNDZ5QcPvbU
+T00luA4tUX6DLpiBws6+05xRPK2H5ECH71GDhZeP5/220fTsyuYcnos3QXPTiiKK
+nZoteIosNypZ/UHmQr3qurdWUlir4pyQbh4E7A9wJ8eXHNy/IXEv6r9kVXCG1xac
++p7s+1nR0XBUM2Pk+d2+TnZIZqm7mjalT0l1298Z60pZ9vTrc6TZOf+KRFRkiQUT
+TWAL9F2VavB7ln8Eg+L8fSQW84ynE+nqe2ZWarU5hwyhRP6/OZZXRPE/TfJBrO++
+pW3/YMza+EIt6lE3Nf88P2vDKvit9J25zdnxx9BwxRhX306tevITgu6CCUBjwIY0
+BkCOchEA6rIK3Lh5hpXQ
+=x105
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/sandbox/sandbox-1.6-r2.ebuild b/sys-apps/sandbox/sandbox-1.6-r2.ebuild
index 007a7c16fac3..866cf5a13a55 100644
--- a/sys-apps/sandbox/sandbox-1.6-r2.ebuild
+++ b/sys-apps/sandbox/sandbox-1.6-r2.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-1.6-r2.ebuild,v 1.15 2010/08/15 05:22:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-1.6-r2.ebuild,v 1.16 2012/02/05 04:50:08 vapier Exp $
 
 #
 # don't monkey with this ebuild unless contacting portage devs.
 # period.
 #
 
-inherit eutils flag-o-matic toolchain-funcs multilib
+inherit eutils flag-o-matic toolchain-funcs multilib unpacker
 
 DESCRIPTION="sandbox'd LD_PRELOAD hack"
 HOMEPAGE="http://www.gentoo.org/"
@@ -32,11 +32,7 @@ sandbox_death_notice() {
 }
 
 src_unpack() {
-	unpack ${A}
-	if [[ ! -d ${S} ]] ; then
-		# When upgrading from older version, lzma unpack may not work #271543
-		lzma -dc "${DISTDIR}/${A}" | tar xf - || die
-	fi
+	unpacker_src_unpack
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-disable-qa-static.patch
 	epatch "${FILESDIR}"/${P}-disable-pthread.patch
diff --git a/sys-apps/sandbox/sandbox-2.3-r1.ebuild b/sys-apps/sandbox/sandbox-2.3-r1.ebuild
index 29bced571513..ede162c916d8 100644
--- a/sys-apps/sandbox/sandbox-2.3-r1.ebuild
+++ b/sys-apps/sandbox/sandbox-2.3-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-2.3-r1.ebuild,v 1.9 2010/11/30 16:27:28 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-2.3-r1.ebuild,v 1.10 2012/02/05 04:50:08 vapier Exp $
 
 #
 # don't monkey with this ebuild unless contacting portage devs.
 # period.
 #
 
-inherit eutils flag-o-matic toolchain-funcs multilib
+inherit eutils flag-o-matic toolchain-funcs multilib unpacker
 
 DESCRIPTION="sandbox'd LD_PRELOAD hack"
 HOMEPAGE="http://www.gentoo.org/"
@@ -33,14 +33,6 @@ sandbox_death_notice() {
 
 sb_get_install_abis() { use multilib && get_install_abis || echo ${ABI:-default} ; }
 
-src_unpack() {
-	unpack ${A}
-	if [[ ! -d ${S} ]] ; then
-		# When upgrading from older version, xz unpack may not work #271543
-		xz -dc "${DISTDIR}/${A}" | tar xf - || die
-	fi
-}
-
 src_compile() {
 	filter-lfs-flags #90228
 
diff --git a/sys-apps/sandbox/sandbox-2.4.ebuild b/sys-apps/sandbox/sandbox-2.4.ebuild
index 1dc39a7fa685..b008ab347725 100644
--- a/sys-apps/sandbox/sandbox-2.4.ebuild
+++ b/sys-apps/sandbox/sandbox-2.4.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-2.4.ebuild,v 1.10 2011/05/10 16:00:47 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-2.4.ebuild,v 1.11 2012/02/05 04:50:08 vapier Exp $
 
 #
 # don't monkey with this ebuild unless contacting portage devs.
 # period.
 #
 
-inherit eutils flag-o-matic toolchain-funcs multilib
+inherit eutils flag-o-matic toolchain-funcs multilib unpacker
 
 DESCRIPTION="sandbox'd LD_PRELOAD hack"
 HOMEPAGE="http://www.gentoo.org/"
@@ -33,14 +33,6 @@ sandbox_death_notice() {
 
 sb_get_install_abis() { use multilib && get_install_abis || echo ${ABI:-default} ; }
 
-src_unpack() {
-	unpack ${A}
-	if [[ ! -d ${S} ]] ; then
-		# When upgrading from older version, xz unpack may not work #271543
-		xz -dc "${DISTDIR}/${A}" | tar xof - || die
-	fi
-}
-
 src_compile() {
 	filter-lfs-flags #90228
 
diff --git a/sys-apps/sandbox/sandbox-2.5.ebuild b/sys-apps/sandbox/sandbox-2.5.ebuild
index 553185d66c33..be4fe93547f4 100644
--- a/sys-apps/sandbox/sandbox-2.5.ebuild
+++ b/sys-apps/sandbox/sandbox-2.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-2.5.ebuild,v 1.8 2012/02/02 15:12:53 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-2.5.ebuild,v 1.9 2012/02/05 04:50:08 vapier Exp $
 
 #
 # don't monkey with this ebuild unless contacting portage devs.
 # period.
 #
 
-inherit eutils flag-o-matic toolchain-funcs multilib
+inherit eutils flag-o-matic toolchain-funcs multilib unpacker
 
 DESCRIPTION="sandbox'd LD_PRELOAD hack"
 HOMEPAGE="http://www.gentoo.org/"
@@ -33,14 +33,6 @@ sandbox_death_notice() {
 
 sb_get_install_abis() { use multilib && get_install_abis || echo ${ABI:-default} ; }
 
-src_unpack() {
-	unpack ${A}
-	if [[ ! -d ${S} ]] ; then
-		# When upgrading from older version, xz unpack may not work #271543
-		xz -dc "${DISTDIR}/${A}" | tar xof - || die
-	fi
-}
-
 src_compile() {
 	filter-lfs-flags #90228