Replace lzo with xz-utils, bug 424045 by Andrey Volkov.

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

4 files changed, 23 insertions, 9 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 5bd33b9c5ac3..2bf86c390584 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.220 2012/06/29 04:35:33 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.221 2012/06/29 15:34:20 floppym Exp $
+
+  29 Jun 2012; Mike Gilbert <floppym@gentoo.org> grub-2.00.ebuild,
+  grub-9999.ebuild:
+  Replace lzo with xz-utils, bug 424045 by Andrey Volkov.
 
   29 Jun 2012; Jeff Horelick <jdhore@gentoo.org> grub-2.00.ebuild:
   Keyword ~x86 wrt bug 424019
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 6243c4d010f0..600bf47804d5 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 1.99-call_proper_grub_probe.patch 536 RMD160 28e914f6ef8e2d9eb73316fa8e5d29b6541d806f SHA1 91237ebbe574baf48d05302c01422c0f0b5c8b49 SHA256 0e27b4ba6a0deedef2f65822e3b76aea4a817cb7219b01c29c8f682c450bd5e8
 AUX 1.99-do_not_stat_so_often.patch 1731 RMD160 ed04af18876c27ca6a85d627d2082a773add19c8 SHA1 ee1936e26f2a3f564195385465752ccee7d29713 SHA256 a33fdbcab7fa4ad66b26598d9a6f1703f419229058c1e9c9c14edb6272783727
 AUX 1.99-improve_devmapper.patch 7134 RMD160 a8dbf91626c607f5fec85235a2042b7e82ffd8d2 SHA1 d3684f80d5f319059ccee1f6822b5a96dd467258 SHA256 b12624944d129820966146d55693b325d48d5d56901727142e386be082661778
@@ -47,8 +50,15 @@ EBUILD grub-0.97-r8.ebuild 8948 RMD160 16358e22e4806fce95513bc4faff3ba01ababd21
 EBUILD grub-0.97-r9.ebuild 9053 RMD160 23b5973daff5607e8e35d9746cef8c86a1de0a1b SHA1 944114e731617a4b967d0539377c59f1a8667871 SHA256 b6411eb5c379cc6b9120f1f727733d9724c4257405c3a7a1935b2aa573085726
 EBUILD grub-0.97.ebuild 4238 RMD160 498e38af891b8e1a147356f4e1c97ca12c2a6429 SHA1 1bd9a4792eaca92500c0c40e9dedda8fead92c27 SHA256 d93dd5dca80c822e0659007b827966fb69c7f702b13ba672b4c3f486af54cee1
 EBUILD grub-1.99-r2.ebuild 8413 RMD160 77c4579d76acd48b3a1d5f4784fb512df3002007 SHA1 ed90c12ebc31d4729230fa6daf67b5d310c2c131 SHA256 13a1281843b801804a5f2dc491cd21d6ac4d068c59e739015dc949a51011f585
-EBUILD grub-2.00.ebuild 7543 RMD160 5ae8c3fa4d9389af49d7fb3325ece3cc1e92a243 SHA1 ee8e259a8a4a3a23159cbf844deea5072532e2f9 SHA256 53a0e30a7456b34a3717b3a038df4dcdb7e0fccc0e8e2d2a77f81317c9b4dfcc
+EBUILD grub-2.00.ebuild 7549 RMD160 3995c31354bc0755c547a20f78a5141f23d7de04 SHA1 49bd0e3006499d2beab10afa1501a6d9f215df05 SHA256 ffc52d72d8b6a0b473c194b911f7383be3124400eae555e614be5827a201a666
 EBUILD grub-2.00_beta6.ebuild 7140 RMD160 a514ef13f06d98a97469f4e7e8ede54b81dae133 SHA1 36b3cf0674c1c4170bceb50015f4e58d00f61dfd SHA256 8026d9d32d21863e5427cac5b641fbc5f799662437bd9a40daa3f9a377a0de68
-EBUILD grub-9999.ebuild 7540 RMD160 74bdc1def6b47c9fb2e91ac2e0c3874dc0465b14 SHA1 07e7330cff99c346af117cfe474382f49c8d0fd0 SHA256 1399f7bcd50e2f9df24ed02a8e8f300c28d92ce14301568bbc8f8637d9699850
-MISC ChangeLog 43598 RMD160 9daa8361bd71498ad2d30195f04379fb008aabf3 SHA1 00dcc6a6b8244b9f6647f7648c93ce1224f85e91 SHA256 3fb1634ea918d85e8e77d21cb182625d53eb127732980831e9275ae87db5a2e1
+EBUILD grub-9999.ebuild 7550 RMD160 0538abfa79ff3a1660f93ef658050529f389002c SHA1 0e01163bf325103446258b053c182f1b883e4089 SHA256 174fb859195b6fef23b9aec079256724b84dec8191acfdd4839a955143b7dc87
+MISC ChangeLog 43745 RMD160 2a510c0eb451729ef35d5e75231581c58289ab3a SHA1 fa9f0607661b0db74dc0047218b344cb0348fb70 SHA256 e4cab18e6d0499a534d830fac0fe856b724c20f9d5c5f909900de5299b2499f7
 MISC metadata.xml 607 RMD160 4d6c4e92248479483d0ca45a34567921ad970b86 SHA1 fd20ee64f83670b9bd29b2cbe9a93508af9fe0bd SHA256 5deec975010a509f536573e173aa1918e0c5b8993191064d1fd7914edc0c13e8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAk/tywIACgkQC77qH+pIQ6RxxwEAydM5fUhctcRVISS0gADxhPGk
+0isJOmVCj4QkzkR0zUQBAJeZvjBR+rI+DigEWRGbfHRuzI6E2spIsuDakv1o2cHJ
+=l9LN
+-----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/grub-2.00.ebuild b/sys-boot/grub/grub-2.00.ebuild
index 778c1e1edc18..7c70bb19f2dc 100644
--- a/sys-boot/grub/grub-2.00.ebuild
+++ b/sys-boot/grub/grub-2.00.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v 1.6 2012/06/29 04:35:33 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v 1.7 2012/06/29 15:34:20 floppym Exp $
 
 EAPI=4
 
@@ -50,7 +50,7 @@ REQUIRED_USE="grub_platforms_qemu? ( truetype )"
 # os-prober: Used on runtime to detect other OSes
 # xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
 RDEPEND="
-	dev-libs/lzo
+	app-arch/xz-utils
 	>=sys-libs/ncurses-5.2-r5
 	debug? (
 		sdl? ( media-libs/libsdl )
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 25fdb8ab3609..4db838fa210b 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.72 2012/06/29 03:10:31 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.73 2012/06/29 15:34:20 floppym Exp $
 
 EAPI=4
 
@@ -17,7 +17,7 @@ else
 		SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
 		mirror://gentoo/${MY_P}.tar.xz"
 	fi
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~x86"
 	S=${WORKDIR}/${MY_P}
 fi
 
@@ -50,7 +50,7 @@ REQUIRED_USE="grub_platforms_qemu? ( truetype )"
 # os-prober: Used on runtime to detect other OSes
 # xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
 RDEPEND="
-	dev-libs/lzo
+	app-arch/xz-utils
 	>=sys-libs/ncurses-5.2-r5
 	debug? (
 		sdl? ( media-libs/libsdl )