Gentoo Archives: gentoo-commits

From: Thomas Beierlein <tomjbe@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/
Date: Sat, 08 Dec 2018 14:13:04
Message-Id: 1544278033.c69b5abed22691e5bf09d86da9a5fab35ff346d4.tomjbe@gentoo
1 commit: c69b5abed22691e5bf09d86da9a5fab35ff346d4
2 Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 8 14:07:13 2018 +0000
4 Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 8 14:07:13 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c69b5abe
7
8 media-radio/xastir: Depend on <media-gfx/imagemagick-7 (Bug #672640)
9
10 Reported-by: Daniel M. Weeks <dan <AT> danweeks.net>
11 Closes: https://bugs.gentoo.org/672640
12 Package-Manager: Portage-2.3.52, Repoman-2.3.12
13 Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>
14
15 media-radio/xastir/xastir-2.0.8-r1.ebuild | 8 ++++----
16 1 file changed, 4 insertions(+), 4 deletions(-)
17
18 diff --git a/media-radio/xastir/xastir-2.0.8-r1.ebuild b/media-radio/xastir/xastir-2.0.8-r1.ebuild
19 index dd75bd2aeb9..d4421c5da9b 100644
20 --- a/media-radio/xastir/xastir-2.0.8-r1.ebuild
21 +++ b/media-radio/xastir/xastir-2.0.8-r1.ebuild
22 @@ -1,4 +1,4 @@
23 -# Copyright 1999-2017 Gentoo Foundation
24 +# Copyright 1999-2018 Gentoo Authors
25 # Distributed under the terms of the GNU General Public License v2
26
27 EAPI=5
28 @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
29 LICENSE="GPL-2"
30 SLOT="0"
31 KEYWORDS="amd64 x86"
32 -IUSE="festival gdal geotiff graphicsmagick"
33 +IUSE="festival gdal geotiff +graphicsmagick"
34
35 DEPEND=">=x11-libs/motif-2.3:0
36 x11-libs/libXt
37 @@ -22,7 +22,7 @@ DEPEND=">=x11-libs/motif-2.3:0
38 net-misc/curl
39 sys-libs/db:4.8
40 sci-libs/shapelib
41 - !graphicsmagick? ( media-gfx/imagemagick:=[-hdri,-q32] )
42 + !graphicsmagick? ( <media-gfx/imagemagick-7:0=[-hdri,-q32] )
43 graphicsmagick? ( media-gfx/graphicsmagick:=[-q32] )
44 geotiff? ( sci-libs/proj
45 sci-libs/libgeotiff
46 @@ -36,7 +36,7 @@ src_prepare() {
47 epatch "${FILESDIR}"/${P}-scripts.diff
48
49 # fix __FORTIFY_SOURCE warning (bug #337365)
50 - epatch "${FILESDIR}"/${PN}-2.0.4-fortify.diff
51 + epatch "${FILESDIR}"/${PN}-2.0.4-fortify.diff
52
53 # do not use builtin shapelib if sci-libs/shapelib is not installed
54 # instead build without shapelib support (bug #430704)