diff options
| author |   Michael Weber <xmw@gentoo.org> | 2013-03-01 08:00:15 +0000 |
|---|---|---|
| committer | Michael Weber <xmw@gentoo.org> | 2013-03-01 08:00:15 +0000 |
| commit | 7adeeac628a187620c18683e82aa1749f0664efd (patch) | |
| tree | f93a57a93a7e2dec452ae77ee269cae260e9ad64 /media-gfx | |
| parent | cleanup and fix building wrt bug 459654 (diff) | |
| download | gentoo-2-7adeeac628a187620c18683e82aa1749f0664efd.tar.gz gentoo-2-7adeeac628a187620c18683e82aa1749f0664efd.tar.bz2 gentoo-2-7adeeac628a187620c18683e82aa1749f0664efd.zip | |
Fix imagemagick dependency.
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/zbar/ChangeLog | 5 | ||||
| -rw-r--r-- | media-gfx/zbar/zbar-0.10-r2.ebuild | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/media-gfx/zbar/ChangeLog b/media-gfx/zbar/ChangeLog index df0085264b09..12921a518100 100644 --- a/media-gfx/zbar/ChangeLog +++ b/media-gfx/zbar/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-gfx/zbar # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/ChangeLog,v 1.7 2013/02/28 11:02:42 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/ChangeLog,v 1.8 2013/03/01 08:00:15 xmw Exp $ + + 01 Mar 2013; Michael Weber <xmw@gentoo.org> zbar-0.10-r2.ebuild: + Fix imagemagick dependency. *zbar-0.10-r2 (28 Feb 2013) diff --git a/media-gfx/zbar/zbar-0.10-r2.ebuild b/media-gfx/zbar/zbar-0.10-r2.ebuild index d6fdafb2120f..e05e7fda064b 100644 --- a/media-gfx/zbar/zbar-0.10-r2.ebuild +++ b/media-gfx/zbar/zbar-0.10-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/zbar-0.10-r2.ebuild,v 1.1 2013/02/28 11:02:42 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/zbar-0.10-r2.ebuild,v 1.2 2013/03/01 08:00:15 xmw Exp $ EAPI=5 PYTHON_DEPEND="2:2.6" @@ -17,7 +17,9 @@ KEYWORDS="~amd64 ~x86" IUSE="gtk imagemagick jpeg python qt4 static-libs +threads v4l X xv" RDEPEND="gtk? ( =dev-libs/glib-2* x11-libs/gtk+:2 ) - imagemagick? ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) + imagemagick? ( + || ( media-gfx/imagemagick + media-gfx/graphicsmagick[imagemagick] ) ) jpeg? ( virtual/jpeg ) python? ( gtk? ( >=dev-python/pygtk-2 ) ) qt4? ( x11-libs/qt-core:4 x11-libs/qt-gui:4 ) |