[gentoo-commits] repo/gentoo:master commit in: media-video/dvdauthor/

[Lars Wendler]

commit:     d61345d2f75d2af77befdc719aa29d147fe67be5
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon May  2 06:51:48 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon May  2 07:51:44 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d61345d2

media-video/dvdauthor: Added slotdep for imagemagick. Bumped to EAPI-6.

Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 media-video/dvdauthor/dvdauthor-0.7.1.ebuild | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/media-video/dvdauthor/dvdauthor-0.7.1.ebuild b/media-video/dvdauthor/dvdauthor-0.7.1.ebuild
index 37e3414..fd97f1b 100644
--- a/media-video/dvdauthor/dvdauthor-0.7.1.ebuild
+++ b/media-video/dvdauthor/dvdauthor-0.7.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 inherit eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="Tools for generating DVD files to be played on standalone DVD players"
@@ -20,7 +20,7 @@ RDEPEND=">=dev-libs/fribidi-0.19.2
 	media-libs/libdvdread
 	media-libs/libpng:0=
 	graphicsmagick? ( media-gfx/graphicsmagick )
-	!graphicsmagick? ( >=media-gfx/imagemagick-5.5.7.14 )"
+	!graphicsmagick? ( >=media-gfx/imagemagick-5.5.7.14:= )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
@@ -28,10 +28,16 @@ S=${WORKDIR}/${PN}
 
 DOCS=( AUTHORS ChangeLog README TODO )
 
+PATCHES=(
+	"${FILESDIR}/${P}-glibc220.patch"
+)
+
 src_prepare() {
-	epatch "${FILESDIR}/${P}-glibc220.patch"
-	use graphicsmagick && \
-		sed -i -e 's:ExportImagePixels:dIsAbLeAuToMaGiC&:' configure
+	default
+	if use graphicsmagick ; then
+		sed -i -e 's:ExportImagePixels:dIsAbLeAuToMaGiC&:' configure \
+			|| die
+	fi
 }
 
 src_configure() {