Allow use of xz-utils in place of lzma-utils, bug #279871.

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

5 files changed, 24 insertions, 14 deletions

diff --git a/gnome-extra/yelp/ChangeLog b/gnome-extra/yelp/ChangeLog
index 88953c8ec9ec..cf06a8f962e6 100644
--- a/gnome-extra/yelp/ChangeLog
+++ b/gnome-extra/yelp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/yelp
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.215 2009/05/31 18:54:43 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.216 2009/09/10 20:43:14 eva Exp $
+
+  10 Sep 2009; Gilles Dartiguelongue <eva@gentoo.org> yelp-2.24.0.ebuild,
+  yelp-2.24.0-r10.ebuild, yelp-2.26.0.ebuild:
+  Allow use of xz-utils in place of lzma-utils, bug #279871.
 
   31 May 2009; Gilles Dartiguelongue <eva@gentoo.org> yelp-2.26.0.ebuild:
   Remove extra configure flags, bug #270705.
diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest
index ce4c6d0035cf..a50498be07d1 100644
--- a/gnome-extra/yelp/Manifest
+++ b/gnome-extra/yelp/Manifest
@@ -4,15 +4,15 @@ Hash: SHA1
 AUX yelp-2.26.0-automagic-lzma.patch 1326 RMD160 9913b5dba53c1dcbc046e790327339e366e10acd SHA1 9992c4e197a502ab2937f8dcef5bf492b0e128df SHA256 1f5686f0d5ddf716dd7ae9844447344bc19750a695d09b3b4e4580178e18c44f
 DIST yelp-2.24.0.tar.bz2 1023876 RMD160 dad1fe1c4d0adcfff15e6c538f6cfb6b8cf082f5 SHA1 18082b28de342c170978c8433a2ce544361598b2 SHA256 7566177d23c3cac7725981f2d04de22923499318a067044158cff17f43957a0a
 DIST yelp-2.26.0.tar.bz2 1021362 RMD160 5f6f3f7b504d7522a39ba9e55e22cf2ca75589d7 SHA1 c1c3262d77d4515a0fd0a7840307533fda9ed0ea SHA256 0c5a91a206b26ef714e9929404f1711caadcee481299566011b4ae4232d151d0
-EBUILD yelp-2.24.0-r10.ebuild 1569 RMD160 93449d5c410354eb1f7db7f58d5be06bf0d098c3 SHA1 9a0478b0b807aaf15477695a3eabd17170e04a60 SHA256 444516dcf4685fe11725e7c259be3b99d1032652195eb7e6a988fb1cc016c199
-EBUILD yelp-2.24.0.ebuild 1741 RMD160 5ed6db85d6e1c0a9c37a2f1ff779f550956fcd72 SHA1 a1392fee90581ab08c11ed33a8a032b43e9768b5 SHA256 ce8f5a6afb3f3e22b358dd82f218470fb2371efba82bead340e1bcc838f7404d
-EBUILD yelp-2.26.0.ebuild 1648 RMD160 c91eebf2f433cafab9b18aeadaeae3b1e785ded0 SHA1 8102ec8149823ea3b8ed36469b16b7786c842783 SHA256 85cf3965b8603043f649efeff1353767b46d264c636e03fc4029435dcd244ead
-MISC ChangeLog 25880 RMD160 e0d47731c56b5f11a30040a3d984c64709761f5d SHA1 c7c346e244cf4e0aff13dc55580e0e8ff0d9fd83 SHA256 3cc45430f3eb92363691bed5542b40589389b07ab9fa1c5cffea19fa3df58c29
+EBUILD yelp-2.24.0-r10.ebuild 1598 RMD160 773023751a83291be3a3ef97d8348f89299ab730 SHA1 3b0a6dacae4c40181a08d0faaa4e17b433ac657f SHA256 b55735f533db7be32f849f18579f6e2782bdf031a6431d1f3b73ccf714029da8
+EBUILD yelp-2.24.0.ebuild 1765 RMD160 ba139708bc89df59e50dd1eb97c49e6d44abdae6 SHA1 b17cd6fa4e942c8c2b021ef52d296e02838ace76 SHA256 e4cc276a07e45b7d8232b916bd811ec5e1efbb2cc3a8fefd46ebedfb1c34951e
+EBUILD yelp-2.26.0.ebuild 1677 RMD160 d1a00d1a88468dd3d37c1dfe73b5d4e14337a519 SHA1 11a1bb821666f6f6a62bd0879572c96695a98ac8 SHA256 866ef0aaca42095700b6403bf9a9204222a40db69ecbfb7c689ad35348772a9a
+MISC ChangeLog 26062 RMD160 b62adcd05e8ce342a8fbf48de6d9225c3363e8a0 SHA1 77b4b49e690cfbc36d6941fb9c5f0b5c91ebb06a SHA256 20ea3cc789a24ede527e992dde3bb9269da128cfb08804918481f0e39106fe4c
 MISC metadata.xml 364 RMD160 b8d1a4cb0331c368c94ba6f8b72b52396b1728da SHA1 99cf408c018565500005654707a4bd1b1ab28334 SHA256 7f315cc2f1c8d303ba2dfa5c2542ba3b9b65635a3d1b978032f114ce6ebc5a4c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkoi0ngACgkQ1fmVwcYIWAbS+wCfdu8w1XTqNqLuTc0zPbTDrPJ9
-vRYAnA460fQoUHNu8tnlIN8xGKkAus8g
-=+2mf
+iEYEARECAAYFAkqpZPAACgkQ1fmVwcYIWAa9rwCg0Ws+GPiZWpLz/LvcRAM1b+Mm
+oxgAn2OqEt4/gwe15KCpcXs67NlibtWN
+=E/ob
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/yelp/yelp-2.24.0-r10.ebuild b/gnome-extra/yelp/yelp-2.24.0-r10.ebuild
index 5aa5ea6a9da9..7ae25eb7c2b0 100644
--- a/gnome-extra/yelp/yelp-2.24.0-r10.ebuild
+++ b/gnome-extra/yelp/yelp-2.24.0-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.24.0-r10.ebuild,v 1.12 2009/04/27 14:23:15 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.24.0-r10.ebuild,v 1.13 2009/09/10 20:43:14 eva Exp $
 
 EAPI="1"
 
@@ -29,7 +29,9 @@ RDEPEND=">=gnome-base/gconf-2
 	net-libs/xulrunner:1.9
 	sys-libs/zlib
 	app-arch/bzip2
-	lzma? ( app-arch/lzma-utils )
+	lzma? ( || (
+		app-arch/xz-utils
+		app-arch/lzma-utils ) )
 	>=app-text/rarian-0.7
 	>=app-text/scrollkeeper-9999"
 DEPEND="${RDEPEND}
diff --git a/gnome-extra/yelp/yelp-2.24.0.ebuild b/gnome-extra/yelp/yelp-2.24.0.ebuild
index 4b0956d9f891..9a58fad2e1ba 100644
--- a/gnome-extra/yelp/yelp-2.24.0.ebuild
+++ b/gnome-extra/yelp/yelp-2.24.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.24.0.ebuild,v 1.4 2009/04/12 20:34:19 bluebird Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.24.0.ebuild,v 1.5 2009/09/10 20:43:14 eva Exp $
 
 inherit gnome2
 
@@ -28,7 +28,9 @@ RDEPEND=">=gnome-base/gconf-2
 	xulrunner? ( =net-libs/xulrunner-1.8* )
 	sys-libs/zlib
 	app-arch/bzip2
-	lzma? ( app-arch/lzma-utils )
+	lzma? ( || (
+		app-arch/xz-utils
+		app-arch/lzma-utils ) )
 	>=app-text/rarian-0.7
 	>=app-text/scrollkeeper-9999"
 DEPEND="${RDEPEND}
diff --git a/gnome-extra/yelp/yelp-2.26.0.ebuild b/gnome-extra/yelp/yelp-2.26.0.ebuild
index 8449ce517629..a9619ddb6160 100644
--- a/gnome-extra/yelp/yelp-2.26.0.ebuild
+++ b/gnome-extra/yelp/yelp-2.26.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.26.0.ebuild,v 1.2 2009/05/31 18:54:43 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.26.0.ebuild,v 1.3 2009/09/10 20:43:14 eva Exp $
 
 EAPI="1"
 
@@ -31,7 +31,9 @@ RDEPEND=">=gnome-base/gconf-2
 	net-libs/xulrunner:1.9
 	sys-libs/zlib
 	app-arch/bzip2
-	lzma? ( app-arch/lzma-utils )
+	lzma? ( || (
+		app-arch/xz-utils
+		app-arch/lzma-utils ) )
 	>=app-text/rarian-0.7
 	>=app-text/scrollkeeper-9999"
 DEPEND="${RDEPEND}