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

(Portage version: 2.2_rc40/cvs/Linux x86_64)

4 files changed, 17 insertions, 7 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/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}