media-video/videotrans: Depend on virtual/imagemagick-tools

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3907

diff --git a/media-video/videotrans/videotrans-1.6.1-r1.ebuild b/media-video/videotrans/videotrans-1.6.1-r1.ebuild
index 7ed341220bf11ffeeb4f636ac4e76f0e6b2e20d9..c451dcdb43d927f7b4780cb263ff08f8613d84ed 100644 (file)
--- a/media-video/videotrans/videotrans-1.6.1-r1.ebuild
+++ b/media-video/videotrans/videotrans-1.6.1-r1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
-inherit eutils
+EAPI=4
+
+inherit base eutils
 
 DESCRIPTION="A package to convert movies to DVD format and to build DVDs with"
 HOMEPAGE="http://videotrans.sourceforge.net/"
@@ -14,29 +15,22 @@ SLOT="0"
 
 KEYWORDS="~amd64 ~ppc ~x86"
 
-IUSE="libav"
+IUSE=""
 
-DEPEND="
+DEPEND="virtual/ffmpeg
        media-video/mplayer
        media-video/mjpegtools[png]
        media-video/dvdauthor
-       || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
-       libav? ( media-video/libav )
-       !libav? ( media-video/ffmpeg:0 )
-"
+       virtual/imagemagick-tools"
 
 RDEPEND="${DEPEND}
        www-client/lynx
        app-shells/bash
-       sys-devel/bc
-"
+       sys-devel/bc"
 
 DOCS="aspects.txt CHANGES THANKS TODO"
 
 src_prepare() {
        # fixing LDFLAGS usage
        sed -i -e 's|^\(LDFLAGS.*=\).*\( @LIBS@.*\)|\1\2 @LDFLAGS@|' src/Makefile.in
-
-       # Debian patch to support libav
-       use libav && epatch "${FILESDIR}"/${P}-libav.patch
 }

diff --git a/media-video/videotrans/videotrans-1.6.1.ebuild b/media-video/videotrans/videotrans-1.6.1-r2.ebuild
similarity index 68%
rename from media-video/videotrans/videotrans-1.6.1.ebuild
rename to media-video/videotrans/videotrans-1.6.1-r2.ebuild
index d1899a77b9fb32e7fc032b1c98187897bf50a18e..f8f75d374fbbaab49db87de44cc8aee4bd159f73 100644 (file)
--- a/media-video/videotrans/videotrans-1.6.1.ebuild
+++ b/media-video/videotrans/videotrans-1.6.1-r2.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
-
-inherit base eutils
+EAPI=5
+inherit eutils
 
 DESCRIPTION="A package to convert movies to DVD format and to build DVDs with"
 HOMEPAGE="http://videotrans.sourceforge.net/"
@@ -15,22 +14,29 @@ SLOT="0"
 
 KEYWORDS="~amd64 ~ppc ~x86"
 
-IUSE=""
+IUSE="libav"
 
-DEPEND="virtual/ffmpeg
+DEPEND="
        media-video/mplayer
        media-video/mjpegtools[png]
        media-video/dvdauthor
-       || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )"
+       virtual/imagemagick-tools
+       libav? ( media-video/libav )
+       !libav? ( media-video/ffmpeg:0 )
+"
 
 RDEPEND="${DEPEND}
        www-client/lynx
        app-shells/bash
-       sys-devel/bc"
+       sys-devel/bc
+"
 
 DOCS="aspects.txt CHANGES THANKS TODO"
 
 src_prepare() {
        # fixing LDFLAGS usage
        sed -i -e 's|^\(LDFLAGS.*=\).*\( @LIBS@.*\)|\1\2 @LDFLAGS@|' src/Makefile.in
+
+       # Debian patch to support libav
+       use libav && epatch "${FILESDIR}"/${P}-libav.patch
 }