Update blocker to allow newer versions of app-arch/lzma #218459.

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

4 files changed, 19 insertions, 16 deletions

diff --git a/app-arch/xz-utils/ChangeLog b/app-arch/xz-utils/ChangeLog
index 216430703528..e1984a3709d2 100644
--- a/app-arch/xz-utils/ChangeLog
+++ b/app-arch/xz-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-arch/xz-utils
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/ChangeLog,v 1.19 2010/10/26 14:18:45 vapier Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/ChangeLog,v 1.20 2011/01/06 02:49:41 vapier Exp $
+
+  06 Jan 2011; Mike Frysinger <vapier@gentoo.org> xz-utils-5.0.0.ebuild,
+  xz-utils-9999.ebuild:
+  Update blocker to allow newer versions of app-arch/lzma #218459.
 
 *xz-utils-5.0.0 (26 Oct 2010)
 
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index a72c29e937f1..aa4e98c33a76 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -4,14 +4,14 @@ Hash: SHA256
 DIST xz-4.999.9beta.tar.gz 1037541 RMD160 1253ce01746c748c8549effa5041224044919c4e SHA1 9627de3997ddcdb02f8d327e84b2cf1941ecd230 SHA256 fa3901d1c034842da47fec1a24a9b5a5bd435f5ecfbb444c168512e2daddb86f
 DIST xz-5.0.0.tar.gz 1232154 RMD160 c336b081bdd056290f18903b0b0c3b657b141d58 SHA1 bcce697d7f09584f0feb21e35b13a15ba7417a1f SHA256 eba9211990a642fc2c35ea02618b710c7fa898d78ccca48b546a07bdde03c44d
 EBUILD xz-utils-4.999.9_beta.ebuild 1464 RMD160 02e22e11458de34fc93fdcf0d2fc447a0261e41e SHA1 6e51b404d3e2cd3e0b8a1bf13c6c63584eb5a5e2 SHA256 a0f2d0c5734466bc350856cb7e9e948b4232ae63d5b42ad150d2d522bdf8fbea
-EBUILD xz-utils-5.0.0.ebuild 1600 RMD160 aacd4c009b2b82108d9f882ddf43287ba91e5394 SHA1 c90d6179a8f51afb7485fdf775bc37f86f5f68fd SHA256 08f5d319c1a88cae33609325a83a65dfb696a904acfefd74eaa17deb98b7a9c3
-EBUILD xz-utils-9999.ebuild 1467 RMD160 20b363f105910e2a83e45e11cc839fbc6f1460a6 SHA1 c4b8b5c84644de80dd2f20b0879da4261a69f763 SHA256 d3cd55661bb8222e83ceed82fab190c669247e677ae88098f4aa65f04374b2e2
-MISC ChangeLog 2756 RMD160 0d668b32eea9c69b65206c428e4c8705185c0d08 SHA1 9726b77b2475e18e29f59b7b006a54d6cf23493f SHA256 68885eda663d275768314447b5e5e50bbda9fe1063c8e4ca8765a342e2c9f0cb
+EBUILD xz-utils-5.0.0.ebuild 1606 RMD160 2201fcac7f3f8f498cb2daeee2071c4e28806b5e SHA1 a52911b888b40eb41ba6ef5be61a456c33a4de4b SHA256 26d240bfce49e154112998187a47794fa4773d18027c050d1b6bd14c83790b04
+EBUILD xz-utils-9999.ebuild 1450 RMD160 bd12e6b5488799efc51079dfe46c216bf7e1f259 SHA1 d5ffafebb23a847265a2b8361ffa25a08190564c SHA256 0d8e59a302af0aa34e662a2bf03060066dc84d09eb31f19d55b2f33b3350efe8
+MISC ChangeLog 2921 RMD160 247821076279a0d7c92cbb1e5b9de4c1fde77b7a SHA1 699e7647a7e88be27924fd709806a7098bb75058 SHA256 28be7cca4113dc6866cf5121fd82be4fe50ad0cccee347247247a0d272d5425e
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAkzG6MYACgkQTwhj9JtAlp7pxQEAjjEAq1QQEOjNlQ12BJoqJIxK
-3SAmssMkcXenvjF2z7gBAKoqJUFCCYBE2V6v2jl+IVG/1sKdLkPMHj+l7HZDpAzI
-=JkTV
+iF4EAREIAAYFAk0lO8YACgkQaC/OocHi7JYPrgD+K/PROXmicTWvtBfHgOxkuF9H
+tDCoXUpHndDXqVvUcvgA/1qhYyN/uz8NGxEFWm5GS2q0MoF/5aJSgDVM79J/ITxB
+=+/xG
 -----END PGP SIGNATURE-----
diff --git a/app-arch/xz-utils/xz-utils-5.0.0.ebuild b/app-arch/xz-utils/xz-utils-5.0.0.ebuild
index 0b116782d254..8fb5e9fbc4c4 100644
--- a/app-arch/xz-utils/xz-utils-5.0.0.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/xz-utils-5.0.0.ebuild,v 1.2 2010/10/26 14:43:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/xz-utils-5.0.0.ebuild,v 1.3 2011/01/06 02:49:41 vapier Exp $
 
 # Remember: we cannot leverage autotools in this ebuild in order
 #           to avoid circular deps with autotools
@@ -29,7 +29,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE="nls static-libs +threads"
 
-RDEPEND="!app-arch/lzma
+RDEPEND="!<app-arch/lzma-4.63
 	!app-arch/lzma-utils
 	!<app-arch/p7zip-4.57"
 DEPEND="${RDEPEND}
diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild
index f6c8566eab79..5fc4019b7096 100644
--- a/app-arch/xz-utils/xz-utils-9999.ebuild
+++ b/app-arch/xz-utils/xz-utils-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/xz-utils-9999.ebuild,v 1.6 2010/06/19 00:36:37 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/xz-utils-9999.ebuild,v 1.7 2011/01/06 02:49:41 vapier Exp $
 
 # Remember: we cannot leverage autotools in this ebuild in order
 #           to avoid circular deps with autotools
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN/-utils}-${PV/_}"
 	SRC_URI="http://tukaani.org/xz/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 	S=${WORKDIR}/${MY_P}
 	EXTRA_DEPEND=
 fi
@@ -29,7 +29,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE="nls static-libs +threads"
 
-RDEPEND="!app-arch/lzma
+RDEPEND="!<app-arch/lzma-4.63
 	!app-arch/lzma-utils
 	!<app-arch/p7zip-4.57"
 DEPEND="${RDEPEND}
@@ -44,7 +44,6 @@ fi
 
 src_configure() {
 	econf \
-		--enable-dynamic=yes \
 		$(use_enable nls) \
 		$(use_enable threads) \
 		$(use_enable static-libs static)