Fix xz-utils vs. lzma-utils deps.

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

5 files changed, 16 insertions, 11 deletions

diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index 75086a34d16e..dbab44f0b542 100644
--- a/media-libs/netpbm/ChangeLog
+++ b/media-libs/netpbm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/netpbm
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.222 2009/09/07 14:25:43 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.223 2009/09/10 15:48:22 ssuominen Exp $
+
+  10 Sep 2009; Samuli Suominen <ssuominen@gentoo.org>
+  netpbm-10.44.00-r1.ebuild, netpbm-10.46.00.ebuild,
+  netpbm-10.46.00-r1.ebuild:
+  Fix xz-utils vs. lzma-utils deps.
 
   07 Sep 2009; Raúl Porcel <armin76@gentoo.org> netpbm-10.46.00.ebuild:
   ia64/sparc stable wrt #277184
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 27d7a3b8a732..af85094cb34d 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -10,8 +10,8 @@ DIST netpbm-10.33-manpages.tar.bz2 236722 RMD160 5e43836a5f4d16f1ba5ece21e9996db
 DIST netpbm-10.44.00.tar.lzma 1880748 RMD160 8da4bc01241c3b281f63f2105292af8efe492bfb SHA1 6f5d59b878fdebcb3d7243392b56b4d79dc299b5 SHA256 84c9212e3fd6cde274301de1ef063061bfbac050ee57554ccaf29aa657d86a49
 DIST netpbm-10.46.00.tar.lzma 1897731 RMD160 79230ebe58c90f9f6f7d5de13f215ac22c581c18 SHA1 0dee5f49bf1ebd5d08675db21a621f3d7ceea3d0 SHA256 598350fc2b65f268666a711ae50952573c606157727a1fe5295de9bff4e1fd3a
 EBUILD netpbm-10.26.62.ebuild 2895 RMD160 91f714d94c546ec08e8d4fae8a428c23330d0858 SHA1 59a05481b8d6fc4558ea8fb11d8cf9608882e157 SHA256 b90fbb741700ab0020828d19e139d37886bd5d1fc23c9f668617f0de4342bb26
-EBUILD netpbm-10.44.00-r1.ebuild 3993 RMD160 37c38beca30d58121a5b1bfa078805d11ac9a1cc SHA1 8a906fb9dabf52b707c5827e0b2112a64eaa2925 SHA256 f9a77a40c0fe78d68f3dfb6940eaca0454ff04c292ed9b4802d266c6efc9d305
-EBUILD netpbm-10.46.00-r1.ebuild 4344 RMD160 9fd5ef74cdd7916c1b2346de7124dac4a607267a SHA1 8ee4e5bf0eb615080d293f59b16a8b21dc69b645 SHA256 9673931c6a927a88c8232d41dc0ddbcda0e0687da4d0b9e6148c0925d8e16c1c
-EBUILD netpbm-10.46.00.ebuild 4277 RMD160 29f30107d280408f0c3efd33b6c1cebd9002a5a7 SHA1 f2c525d3b2ceb1436ec19fb20247d80057977b10 SHA256 3cc09fb882a0871c980ece8556c2d8d51027e050266314de9e844a8632c0b0f1
-MISC ChangeLog 29892 RMD160 f999cf48f640332ba5e669225c10788fe2c3fcaa SHA1 54f9411a7521ca01895209e15b57f20994ae1633 SHA256 11a7634e072dd01fd146025e10e17a2209b2f55401807c829856f36b9a6022f4
+EBUILD netpbm-10.44.00-r1.ebuild 4021 RMD160 45be6cc452d4efde443caee4b85407de7c727bec SHA1 5d695944450cc3fb2c33a287ebfbb9f519a70ff7 SHA256 32a04baafdf893d144778fbdeed9b9cb5add1bf1817e85b738dd06dbf2724c11
+EBUILD netpbm-10.46.00-r1.ebuild 4372 RMD160 50e7e01fd6171fafa7688231aba1daacdb3ae70a SHA1 247e3530475eef72478a927281fe81318fc40f9b SHA256 0b38ef8c85da292df5957811a36218453e3b6ab386e357636be386fa8eeb7509
+EBUILD netpbm-10.46.00.ebuild 4304 RMD160 57a195c49e688f36f0b580ee4da2f092b2ef645d SHA1 9bce70df1e6b423f9f5d1c2cab8dbc2387829c81 SHA256 e4a1101f879f0975999b4a01c60051fad3bab57b6f50eeb9ce6f2b476fd1ae5d
+MISC ChangeLog 30067 RMD160 d7d9ae69c3be9e8f7b0d14826937ab4f6a109fda SHA1 9403fc12862db0463bff4947e2e9226b7edc1524 SHA256 e70d20afed172e291477c9aa9559370dda839cc9304764b5bbef15b6bf3e1148
 MISC metadata.xml 266 RMD160 de6149ba44458a170c3f6f6d5c015a3b4e5fe3bd SHA1 bb0d212119622779ede27328c6df989b362deac3 SHA256 4db3c087a1641cf4b8ae3750db0fb27bf8ff9a4dcbe496d1c173a9f9c04df75d
diff --git a/media-libs/netpbm/netpbm-10.44.00-r1.ebuild b/media-libs/netpbm/netpbm-10.44.00-r1.ebuild
index a42f08d32600..9bed2b4d1a66 100644
--- a/media-libs/netpbm/netpbm-10.44.00-r1.ebuild
+++ b/media-libs/netpbm/netpbm-10.44.00-r1.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/media-libs/netpbm/netpbm-10.44.00-r1.ebuild,v 1.8 2009/05/05 02:09:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.44.00-r1.ebuild,v 1.9 2009/09/10 15:48:22 ssuominen Exp $
 
 inherit flag-o-matic toolchain-funcs eutils multilib
 
@@ -25,7 +25,7 @@ RDEPEND="jpeg? ( >=media-libs/jpeg-6b )
 	jbig? ( media-libs/jbigkit )
 	rle? ( media-libs/urt )"
 DEPEND="${RDEPEND}
-	app-arch/lzma-utils"
+	|| ( app-arch/xz-utils app-arch/lzma-utils )"
 
 maint_pkg_create() {
 	local base="/usr/local/src"
diff --git a/media-libs/netpbm/netpbm-10.46.00-r1.ebuild b/media-libs/netpbm/netpbm-10.46.00-r1.ebuild
index 34b7c5b71ac7..0f4af753b735 100644
--- a/media-libs/netpbm/netpbm-10.46.00-r1.ebuild
+++ b/media-libs/netpbm/netpbm-10.46.00-r1.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/media-libs/netpbm/netpbm-10.46.00-r1.ebuild,v 1.3 2009/08/28 15:03:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.46.00-r1.ebuild,v 1.4 2009/09/10 15:48:22 ssuominen Exp $
 
 inherit toolchain-funcs eutils multilib
 
@@ -26,7 +26,7 @@ RDEPEND="jpeg? ( >=media-libs/jpeg-7 )
 	rle? ( media-libs/urt )
 	X? ( x11-libs/libX11 )"
 DEPEND="${RDEPEND}
-	app-arch/lzma-utils"
+	|| ( app-arch/xz-utils app-arch/lzma-utils )"
 
 maint_pkg_create() {
 	local base="/usr/local/src"
diff --git a/media-libs/netpbm/netpbm-10.46.00.ebuild b/media-libs/netpbm/netpbm-10.46.00.ebuild
index 4e38262fe2fb..97bbf9714db2 100644
--- a/media-libs/netpbm/netpbm-10.46.00.ebuild
+++ b/media-libs/netpbm/netpbm-10.46.00.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/media-libs/netpbm/netpbm-10.46.00.ebuild,v 1.12 2009/09/07 14:25:43 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.46.00.ebuild,v 1.13 2009/09/10 15:48:21 ssuominen Exp $
 
 inherit toolchain-funcs eutils multilib
 
@@ -26,7 +26,7 @@ RDEPEND="jpeg? ( >=media-libs/jpeg-6b )
 	rle? ( media-libs/urt )
 	X? ( x11-libs/libX11 )"
 DEPEND="${RDEPEND}
-	app-arch/lzma-utils"
+	|| ( app-arch/xz-utils app-arch/lzma-utils )"
 
 maint_pkg_create() {
 	local base="/usr/local/src"