Fix xz-utils vs. lzma-utils deps.

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

5 files changed, 18 insertions, 13 deletions

diff --git a/app-arch/rpm2targz/ChangeLog b/app-arch/rpm2targz/ChangeLog
index 33f9538781ff..8a40086b2de9 100644
--- a/app-arch/rpm2targz/ChangeLog
+++ b/app-arch/rpm2targz/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-arch/rpm2targz
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm2targz/ChangeLog,v 1.77 2009/04/29 12:04:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm2targz/ChangeLog,v 1.78 2009/09/10 15:56:20 ssuominen Exp $
+
+  10 Sep 2009; Samuli Suominen <ssuominen@gentoo.org>
+  rpm2targz-9.0.0.0g.ebuild, rpm2targz-9.0.0.2g.ebuild,
+  rpm2targz-9.0.0.3g.ebuild:
+  Fix xz-utils vs. lzma-utils deps.
 
   29 Apr 2009; Jeroen Roovers <jer@gentoo.org> rpm2targz-9.0.0.3g.ebuild:
   Stable for HPPA (bug #264429).
diff --git a/app-arch/rpm2targz/Manifest b/app-arch/rpm2targz/Manifest
index 0ac73703b875..95a202d83a62 100644
--- a/app-arch/rpm2targz/Manifest
+++ b/app-arch/rpm2targz/Manifest
@@ -12,8 +12,8 @@ DIST rpm2targz-9.0.0.2g.tar.lzma 4049 RMD160 ff59999bb1c9bb44eab9cd76a722033e6cb
 DIST rpm2targz-9.0.0.3g.tar.lzma 4299 RMD160 632f83052df1ba9fb966eb06dd7cc81fdeb1b1c4 SHA1 54c1c976823e1040845be143750c559e263c50c3 SHA256 f1ad994f203afac966dd45edff66a9bd18de28a0d512810e21f4809b6e51e071
 DIST rpm2targz-9.0.tar.gz 2639 RMD160 443f405a17dc6fd4128ed98e2aeb0d6cb6a3a8bf SHA1 b62685f5330e4a15998a99a9f560689a67bfdfb9 SHA256 ddc2a8728edaf137f887a7cf0404c46df1454c758052e9323ec878fa0b2c9c56
 EBUILD rpm2targz-9.0-r7.ebuild 1765 RMD160 34ccc6f5b73206315bb86bc8134f7550e3b7fc6a SHA1 1ac8dc1c3cd6769da6045d3ba0c53505ce4b94b5 SHA256 e0ac2690d8bfa048d744c41eea8befa0cdb6da3b34b0c052a63240500e88a332
-EBUILD rpm2targz-9.0.0.0g.ebuild 824 RMD160 72ff8c878b10c2a14ec47f347bbee6adbc4fad88 SHA1 8f808637d299b98030f6e977b03e7ecacaac246b SHA256 abd042e2ead85ff8750d8b0bb6cda8bbffb29fa22895b311cf3ffefe339c9292
-EBUILD rpm2targz-9.0.0.2g.ebuild 824 RMD160 2abb685a1380e65fe21843d56e05023b2ec8d18b SHA1 b5b9c5d7a0e4e04429d0663d812d74bf5b989fde SHA256 94826dfd1ded23c3d3bf90a3e7ee2f8698aad909a962327ab8aea60b24691186
-EBUILD rpm2targz-9.0.0.3g.ebuild 852 RMD160 6070450a180efb83c02d0201028c52b087a9dc09 SHA1 43ec588a5686f1c623028cb15292762352ef102e SHA256 f9c6bf45706b44ddfa8f680189469e579f39f9e601de83cb8f20bb92f4ce5edd
-MISC ChangeLog 10298 RMD160 9868f290ae48e517b5507e8a5bcd4a702e824eda SHA1 06c9abd76efb3e928b4552bfa843620789db4a96 SHA256 dfd6574b44f799a2521c8cfb2a838f5948f4e9c04b4ff89881fc082b7c210d5a
+EBUILD rpm2targz-9.0.0.0g.ebuild 852 RMD160 e97b24157174b3d49e1370d2bc6aeec7e91a005b SHA1 dd19dd6ce26ebd6b85412754bccf19b7b95db5c2 SHA256 ca0a5733e325a25c2d208f136320b7b30777ea9f0ce66b1919e1e68504ca8feb
+EBUILD rpm2targz-9.0.0.2g.ebuild 852 RMD160 a9085900abf31d46662dd8a01eaf294cb5073721 SHA1 cf82fe728f6b59c874354be1fe3d7f263b8f6215 SHA256 b32228f7e0a0884a7aa4a41c5e73e39350d2dae9d58bd47709edd1f395b6e8f7
+EBUILD rpm2targz-9.0.0.3g.ebuild 883 RMD160 7147a0dc62d303c8d5192f3134dc90fbb1bbeb89 SHA1 ec9aaccaf529c1d24fe35621500582a9bd6c7586 SHA256 400e520c0ae6281b63844fc39b06f4e211eda2af4f0692ed224d4fcefb87f25b
+MISC ChangeLog 10480 RMD160 22ceca81b911c899bccdab1fd1923de4b7874ed4 SHA1 3c97407ba0b12e1991e128e8d489fcb07c1ae9f3 SHA256 ecd9c407f05be94d3b768804daa605bc2dbc5d1ad32829a0b5a7fdb5d1a4d348
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
diff --git a/app-arch/rpm2targz/rpm2targz-9.0.0.0g.ebuild b/app-arch/rpm2targz/rpm2targz-9.0.0.0g.ebuild
index 0257bb2b640d..6d5463b4ec21 100644
--- a/app-arch/rpm2targz/rpm2targz-9.0.0.0g.ebuild
+++ b/app-arch/rpm2targz/rpm2targz-9.0.0.0g.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm2targz/rpm2targz-9.0.0.0g.ebuild,v 1.1 2008/05/31 21:16:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm2targz/rpm2targz-9.0.0.0g.ebuild,v 1.2 2009/09/10 15:56:20 ssuominen Exp $
 
 inherit toolchain-funcs eutils
 
@@ -17,7 +17,7 @@ IUSE="userland_GNU"
 #       so we don't explicitly set it as a dependency.
 RDEPEND="app-arch/cpio"
 DEPEND="${DEPEND}
-	app-arch/lzma-utils"
+	|| ( app-arch/xz-utils app-arch/lzma-utils )"
 
 src_install() {
 	emake install DESTDIR="${D}" || die
diff --git a/app-arch/rpm2targz/rpm2targz-9.0.0.2g.ebuild b/app-arch/rpm2targz/rpm2targz-9.0.0.2g.ebuild
index 3351ad41d442..a0d047077a5a 100644
--- a/app-arch/rpm2targz/rpm2targz-9.0.0.2g.ebuild
+++ b/app-arch/rpm2targz/rpm2targz-9.0.0.2g.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm2targz/rpm2targz-9.0.0.2g.ebuild,v 1.1 2008/08/29 04:12:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm2targz/rpm2targz-9.0.0.2g.ebuild,v 1.2 2009/09/10 15:56:20 ssuominen Exp $
 
 inherit toolchain-funcs eutils
 
@@ -17,7 +17,7 @@ IUSE="userland_GNU"
 #       so we don't explicitly set it as a dependency.
 RDEPEND="app-arch/cpio"
 DEPEND="${DEPEND}
-	app-arch/lzma-utils"
+	|| ( app-arch/xz-utils app-arch/lzma-utils )"
 
 src_install() {
 	emake install DESTDIR="${D}" || die
diff --git a/app-arch/rpm2targz/rpm2targz-9.0.0.3g.ebuild b/app-arch/rpm2targz/rpm2targz-9.0.0.3g.ebuild
index fee8496917d0..209350333d73 100644
--- a/app-arch/rpm2targz/rpm2targz-9.0.0.3g.ebuild
+++ b/app-arch/rpm2targz/rpm2targz-9.0.0.3g.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/app-arch/rpm2targz/rpm2targz-9.0.0.3g.ebuild,v 1.6 2009/04/29 12:04:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm2targz/rpm2targz-9.0.0.3g.ebuild,v 1.7 2009/09/10 15:56:20 ssuominen Exp $
 
 inherit toolchain-funcs
 
@@ -17,7 +17,7 @@ IUSE="userland_GNU"
 #       so we don't explicitly set it as a dependency.
 RDEPEND="app-arch/cpio"
 DEPEND="${DEPEND}
-	app-arch/lzma-utils"
+	|| ( app-arch/xz-utils app-arch/lzma-utils )"
 
 src_compile() {
 	emake CC="$(tc-getCC)" || die