diff options
| author |   David Seifert <soap@gentoo.org> | 2017-02-11 20:21:52 +0100 |
|---|---|---|
| committer | David Seifert <soap@gentoo.org> | 2017-02-11 20:44:44 +0100 |
| commit | b9d2f30f03617dabfc30aaf49017ed5336d06981 (patch) | |
| tree | 87268aad9e8866c8b737c87db12ded5d19056a36 | |
| parent | media-gfx/smile: Depend on virtual/imagemagick-tools (diff) | |
| download | gentoo-b9d2f30f03617dabfc30aaf49017ed5336d06981.tar.gz gentoo-b9d2f30f03617dabfc30aaf49017ed5336d06981.tar.bz2 gentoo-b9d2f30f03617dabfc30aaf49017ed5336d06981.zip | |
media-gfx/zbar: Depend on virtual/imagemagick-tools
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3907
| -rw-r--r-- | media-gfx/zbar/zbar-0.10-r6.ebuild (renamed from media-gfx/zbar/zbar-0.10-r5.ebuild) | 6 | ||||
| -rw-r--r-- | media-gfx/zbar/zbar-0.10_p20121015-r1.ebuild (renamed from media-gfx/zbar/zbar-0.10_p20121015.ebuild) | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/media-gfx/zbar/zbar-0.10-r5.ebuild b/media-gfx/zbar/zbar-0.10-r6.ebuild index 34c55306ec3b..f3ca161657e0 100644 --- a/media-gfx/zbar/zbar-0.10-r5.ebuild +++ b/media-gfx/zbar/zbar-0.10-r6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -18,9 +18,7 @@ KEYWORDS="amd64 ~arm 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? ( virtual/imagemagick-tools ) jpeg? ( virtual/jpeg:0 ) python? ( ${PYTHON_DEPS} gtk? ( >=dev-python/pygtk-2[${PYTHON_USEDEP}] ) ) diff --git a/media-gfx/zbar/zbar-0.10_p20121015.ebuild b/media-gfx/zbar/zbar-0.10_p20121015-r1.ebuild index 8a10c4ba8d5f..e0e063cd122c 100644 --- a/media-gfx/zbar/zbar-0.10_p20121015.ebuild +++ b/media-gfx/zbar/zbar-0.10_p20121015-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -18,9 +18,7 @@ KEYWORDS="~amd64 ~arm ~x86" IUSE="gtk imagemagick java jpeg python qt4 static-libs +threads v4l X xv" CDEPEND="gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) - imagemagick? ( - || ( media-gfx/imagemagick - media-gfx/graphicsmagick[imagemagick] ) ) + imagemagick? ( virtual/imagemagick-tools ) jpeg? ( virtual/jpeg:0 ) python? ( ${PYTHON_DEPS} gtk? ( >=dev-python/pygtk-2[${PYTHON_USEDEP}] ) ) |