From 9d25c673334184f46ada0f0748f000d53c7ebebf Mon Sep 17 00:00:00 2001 From: David Seifert Date: Sat, 11 Feb 2017 20:21:53 +0100 Subject: [PATCH] media-libs/vips: Depend on virtual/imagemagick-tools Package-Manager: Portage-2.3.3, Repoman-2.3.1 Closes: https://github.com/gentoo/gentoo/pull/3907 --- .../vips/{vips-7.26.3.ebuild => vips-7.26.3-r1.ebuild} | 5 ++--- .../vips/{vips-7.38.5.ebuild => vips-7.38.5-r1.ebuild} | 7 +++---- 2 files changed, 5 insertions(+), 7 deletions(-) rename media-libs/vips/{vips-7.26.3.ebuild => vips-7.26.3-r1.ebuild} (93%) rename media-libs/vips/{vips-7.38.5.ebuild => vips-7.38.5-r1.ebuild} (91%) diff --git a/media-libs/vips/vips-7.26.3.ebuild b/media-libs/vips/vips-7.26.3-r1.ebuild similarity index 93% rename from media-libs/vips/vips-7.26.3.ebuild rename to media-libs/vips/vips-7.26.3-r1.ebuild index 0ab369802d05..e4f5e8fdbae8 100644 --- a/media-libs/vips/vips-7.26.3.ebuild +++ b/media-libs/vips/vips-7.26.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -25,8 +25,7 @@ RDEPEND=">=dev-libs/glib-2.6:2 sys-libs/zlib >=x11-libs/pango-1.8 fftw? ( sci-libs/fftw:3.0 ) - imagemagick? ( || ( >=media-gfx/imagemagick-5.0.0 - media-gfx/graphicsmagick[imagemagick] ) ) + imagemagick? ( virtual/imagemagick-tools ) lcms? ( media-libs/lcms ) openexr? ( >=media-libs/openexr-1.2.2 ) exif? ( >=media-libs/libexif-0.6 ) diff --git a/media-libs/vips/vips-7.38.5.ebuild b/media-libs/vips/vips-7.38.5-r1.ebuild similarity index 91% rename from media-libs/vips/vips-7.38.5.ebuild rename to media-libs/vips/vips-7.38.5-r1.ebuild index deb05fc9a937..0f628f72e980 100644 --- a/media-libs/vips/vips-7.38.5.ebuild +++ b/media-libs/vips/vips-7.38.5-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$ @@ -21,9 +21,8 @@ RDEPEND=">=dev-libs/glib-2.6:2 dev-libs/libxml2 sys-libs/zlib >=x11-libs/pango-1.8 - fftw? ( sci-libs/fftw:3.0 ) - imagemagick? ( || ( >=media-gfx/imagemagick-5.0.0 - media-gfx/graphicsmagick[imagemagick] ) ) + fftw? ( sci-libs/fftw:3.0= ) + imagemagick? ( virtual/imagemagick-tools ) lcms? ( media-libs/lcms ) matio? ( >=sci-libs/matio-1.3.4 ) openexr? ( >=media-libs/openexr-1.2.2 ) -- 2.26.2