diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2009-09-10 15:48:22 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-09-10 15:48:22 +0000 |
| commit | 7dff33ed6b76f361d404e578c2f52864d910d46a (patch) | |
| tree | a61cadec7dbc12d3c8d461395e0160a83e1fec5e /media-libs/netpbm | |
| parent | Unmask app-portage/eix because of app-arch/libarchive's app-arch/xz-utils dep. (diff) | |
| download | gentoo-2-7dff33ed6b76f361d404e578c2f52864d910d46a.tar.gz gentoo-2-7dff33ed6b76f361d404e578c2f52864d910d46a.tar.bz2 gentoo-2-7dff33ed6b76f361d404e578c2f52864d910d46a.zip | |
Fix xz-utils vs. lzma-utils deps.
(Portage version: 2.2_rc40/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/netpbm')
| -rw-r--r-- | media-libs/netpbm/ChangeLog | 7 | ||||
| -rw-r--r-- | media-libs/netpbm/netpbm-10.44.00-r1.ebuild | 4 | ||||
| -rw-r--r-- | media-libs/netpbm/netpbm-10.46.00-r1.ebuild | 4 | ||||
| -rw-r--r-- | media-libs/netpbm/netpbm-10.46.00.ebuild | 4 |
4 files changed, 12 insertions, 7 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/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" |