From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 53A67138216 for ; Mon, 2 May 2016 07:52:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 366FA21C006; Mon, 2 May 2016 07:52:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B2828E0869 for ; Mon, 2 May 2016 07:51:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 41B1D340AB5 for ; Mon, 2 May 2016 07:51:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6DA54329 for ; Mon, 2 May 2016 07:51:55 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1462175504.d61345d2f75d2af77befdc719aa29d147fe67be5.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/dvdauthor/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/dvdauthor/dvdauthor-0.7.1.ebuild X-VCS-Directories: media-video/dvdauthor/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: d61345d2f75d2af77befdc719aa29d147fe67be5 X-VCS-Branch: master Date: Mon, 2 May 2016 07:51:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 703a9cd0-9bbf-40b8-a293-bd264bd84f5d X-Archives-Hash: 874f5eb68729bd4e81e2b409cdcd4175 commit: d61345d2f75d2af77befdc719aa29d147fe67be5 Author: Lars Wendler gentoo org> AuthorDate: Mon May 2 06:51:48 2016 +0000 Commit: Lars Wendler gentoo 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 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() {