[gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/

["Thomas Beierlein" <tomjbe@gentoo.org>]

commit:     c69b5abed22691e5bf09d86da9a5fab35ff346d4
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  8 14:07:13 2018 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Sat Dec  8 14:07:13 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c69b5abe

media-radio/xastir: Depend on <media-gfx/imagemagick-7 (Bug #672640)

Reported-by:  Daniel M. Weeks <dan <AT> danweeks.net>
Closes: https://bugs.gentoo.org/672640
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>

 media-radio/xastir/xastir-2.0.8-r1.ebuild | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-radio/xastir/xastir-2.0.8-r1.ebuild b/media-radio/xastir/xastir-2.0.8-r1.ebuild
index dd75bd2aeb9..d4421c5da9b 100644
--- a/media-radio/xastir/xastir-2.0.8-r1.ebuild
+++ b/media-radio/xastir/xastir-2.0.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="festival gdal geotiff graphicsmagick"
+IUSE="festival gdal geotiff +graphicsmagick"
 
 DEPEND=">=x11-libs/motif-2.3:0
 	x11-libs/libXt
@@ -22,7 +22,7 @@ DEPEND=">=x11-libs/motif-2.3:0
 	net-misc/curl
 	sys-libs/db:4.8
 	sci-libs/shapelib
-	!graphicsmagick? ( media-gfx/imagemagick:=[-hdri,-q32] )
+	!graphicsmagick? ( <media-gfx/imagemagick-7:0=[-hdri,-q32] )
 	graphicsmagick? ( media-gfx/graphicsmagick:=[-q32] )
 	geotiff? ( sci-libs/proj
 		sci-libs/libgeotiff
@@ -36,7 +36,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-scripts.diff
 
 	# fix __FORTIFY_SOURCE warning (bug #337365)
-	epatch 	"${FILESDIR}"/${PN}-2.0.4-fortify.diff
+	epatch "${FILESDIR}"/${PN}-2.0.4-fortify.diff
 
 	# do not use builtin shapelib if sci-libs/shapelib is not installed
 	# instead build without shapelib support (bug #430704)