Manually decompress the lzma archive if host PM cannot #271543.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 37 insertions, 11 deletions

diff --git a/sys-apps/sandbox/ChangeLog b/sys-apps/sandbox/ChangeLog
index c2701cc0b4fd..4f7fc292cc16 100644
--- a/sys-apps/sandbox/ChangeLog
+++ b/sys-apps/sandbox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/sandbox
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/ChangeLog,v 1.132 2009/11/21 14:02:47 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/ChangeLog,v 1.133 2010/08/15 05:22:23 vapier Exp $
+
+  15 Aug 2010; Mike Frysinger <vapier@gentoo.org> sandbox-1.6-r2.ebuild,
+  sandbox-2.2.ebuild:
+  Manually decompress the lzma archive if host PM cannot #271543.
 
   21 Nov 2009; Raúl Porcel <armin76@gentoo.org> sandbox-2.2.ebuild:
   Mark 2.2 -sparc as it doesn't work very well, bug #293632
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index 5a1f3de103b9..4b542a811f1b 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 0001-libsandbox-handle-more-at-functions.patch 1473 RMD160 ae83a5ce443be6845a48f79cda0c95756a9fb8d5 SHA1 3a85ce88b9846ccbec773f8fd68798b5c9d0c3f9 SHA256 7681e867bb4dea26d165f9a066dca798519e2fd57b49c7b31c0c2fc254037523
 AUX 09sandbox 37 RMD160 75e8b6114feb9c3186fe983e9cf7544b67519d37 SHA1 d1d52cd3076c632f8c7d88c8bcd45f045922bd4e SHA256 73e9e9d12ba54f1c649813ec86107924050528852c890a8ba1e2853796781bbe
 AUX sandbox-1.2.18.1-open-cloexec.patch 492 RMD160 01ea2af19e02d2c011a89bcbe3744bcb3804afd2 SHA1 4c3af0fe648ce52713b4fb52fb5ed85c73a4e298 SHA256 922cf7277af89bbfa03633f515beeb309b4bd53e9856504f714f7833821b54cf
@@ -14,8 +17,15 @@ DIST sandbox-2.2.tar.lzma 334751 RMD160 f6214009295df0a05e171329f0070eecc3b90f4f
 EBUILD sandbox-1.2.18.1-r2.ebuild 3060 RMD160 e9c70adcff5a8fcb6d2f859d3b94629f2dd43392 SHA1 6a97f8384cf8a8dfa09ac86610464c831c9ba154 SHA256 24b164abace873d2483cb95fcafc6ef0cd47e356d9fbabbc2a23641dd2e8c167
 EBUILD sandbox-1.2.18.1-r3.ebuild 3219 RMD160 3b3a08f69aaf4b09458ddad1196ccbda14b2f57c SHA1 f01b174bf4055ff414a009c2b8fbb100713f39cb SHA256 c8ad82468d13716809f8c4667c316da5b9784e92100a6e7fe483d948bd8da85e
 EBUILD sandbox-1.2.20_alpha2-r1.ebuild 2638 RMD160 e0b26ffd54aa036168678bac8388a326de51deac SHA1 9a4e6f3b05d17e4d2893bbfe427ef3a2840f34c5 SHA256 7f64e7626f9d197c2d0d54254f19e902e8bf49561e2fb5d332e4ff727a69bad5
-EBUILD sandbox-1.6-r2.ebuild 2684 RMD160 bad88e734075d6c7316047dac19096b5dbc8a24a SHA1 799dbdcffcd7468329eccfb070b14e0b528182f2 SHA256 889e561b9e71a30867cb8f9abb543c5a220ea1870905c333a5ae003b54b35878
+EBUILD sandbox-1.6-r2.ebuild 2807 RMD160 34f50316548b2e9d98b5dfb70d99e3e380302672 SHA1 bba36e5a8fa8ea20c1e45febc5aeb56296d12cc9 SHA256 0d9c59cc9c328ad90f1ca93130b7975f09c827f55910a590ff2b2c314661b287
 EBUILD sandbox-2.1.ebuild 2600 RMD160 f68ab24a24a12f492cbf6e1f8b9a5549178ceb04 SHA1 b5b6716ac51f490c47f3829b5485026d9039b782 SHA256 d78c0e1bf2730b699a0c4a1bc20ea87017b93b46de5ca3581778c32d15108f5d
-EBUILD sandbox-2.2.ebuild 2601 RMD160 66d7f65c0cf8b2a514f6333f3062269633094efe SHA1 9875126e0f615df012c373d41168c8723be83a54 SHA256 c8dee4dad3af5d59260a0fa5ea7d5c4c30da0b453343ec159ecbd65e7aac6064
-MISC ChangeLog 18860 RMD160 e81c401694da15c107d4042e0c285f92fbfab194 SHA1 d29d8203cfb33b02fb768671192fc215b9a05d88 SHA256 a7ea9bd3194ba1c9baae62a5f697aa822138040df2f327f3fe940bd1edd658d3
+EBUILD sandbox-2.2.ebuild 2754 RMD160 219e1fb4a49b901bfaad5589007415fdca744e44 SHA1 aaba793b314eeddbde69e804ed6ef9fca7f59f85 SHA256 2cbdebb1603c221cb37348c2bd773f0e059bd18c95f47e1f1ac3fcb48870592f
+MISC ChangeLog 19021 RMD160 a2a996aa25fa838b32d9225e7946c0476e9847c3 SHA1 a781c681c2b325fb66e33187a166d89ee525629f SHA256 f2e63c7360e1cef3e897cc08a9c9896e14b8c2f17669760570fbfea830a11c89
 MISC metadata.xml 337 RMD160 c70000494a436cc0f8256d428f86d42b0fdf6017 SHA1 d81a50fa4047e6c0ecf1ab16e4fa6214895c5e9c SHA256 575b378bf8db5526847e6839a3351ec72769d75ed1c5b392559d57f6e6b4294f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iF4EAREIAAYFAkxnehYACgkQTwhj9JtAlp6x7QD9GYMoYet3FBj5Dw8LDh1NyDBs
+MZwIiK6hWlye9rs0BDwA/icsrCuImbpJCzhuur+Pg7KPLW8Unq7yspaAPtbtOx+u
+=ZGZT
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/sandbox/sandbox-1.6-r2.ebuild b/sys-apps/sandbox/sandbox-1.6-r2.ebuild
index 0c16ee7111f2..007a7c16fac3 100644
--- a/sys-apps/sandbox/sandbox-1.6-r2.ebuild
+++ b/sys-apps/sandbox/sandbox-1.6-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.14 2009/09/08 17:49:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-1.6-r2.ebuild,v 1.15 2010/08/15 05:22:23 vapier Exp $
 
 #
 # don't monkey with this ebuild unless contacting portage devs.
@@ -19,7 +19,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
 IUSE=""
 
-DEPEND="|| ( app-arch/xz-utils app-arch/lzma-utils )
+DEPEND="app-arch/xz-utils
 	>=app-misc/pax-utils-0.1.19" #265376
 RDEPEND=""
 
@@ -33,6 +33,10 @@ 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
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-disable-qa-static.patch
 	epatch "${FILESDIR}"/${P}-disable-pthread.patch
diff --git a/sys-apps/sandbox/sandbox-2.2.ebuild b/sys-apps/sandbox/sandbox-2.2.ebuild
index f55ca5b3ad04..af2ff9e1b982 100644
--- a/sys-apps/sandbox/sandbox-2.2.ebuild
+++ b/sys-apps/sandbox/sandbox-2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-2.2.ebuild,v 1.2 2009/11/21 14:02:47 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-2.2.ebuild,v 1.3 2010/08/15 05:22:23 vapier Exp $
 
 #
 # don't monkey with this ebuild unless contacting portage devs.
@@ -19,7 +19,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh -sparc ~x86 ~sparc-fbsd -x86-fbsd"
 IUSE="multilib"
 
-DEPEND="|| ( app-arch/xz-utils app-arch/lzma-utils )
+DEPEND="app-arch/xz-utils
 	>=app-misc/pax-utils-0.1.19" #265376
 RDEPEND=""
 
@@ -33,6 +33,14 @@ 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, lzma unpack may not work #271543
+		lzma -dc "${DISTDIR}/${A}" | tar xf - || die
+	fi
+}
+
 src_compile() {
 	filter-lfs-flags #90228