From 5c235aa9aec58165a070a2d79b58a8bb3c0f88ba Mon Sep 17 00:00:00 2001
From: David Seifert <soap@gentoo.org>
Date: Sat, 11 Feb 2017 20:21:54 +0100
Subject: 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
---
 media-video/videotrans/videotrans-1.6.1-r1.ebuild | 22 +++++-------
 media-video/videotrans/videotrans-1.6.1-r2.ebuild | 42 +++++++++++++++++++++++
 media-video/videotrans/videotrans-1.6.1.ebuild    | 36 -------------------
 3 files changed, 50 insertions(+), 50 deletions(-)
 create mode 100644 media-video/videotrans/videotrans-1.6.1-r2.ebuild
 delete mode 100644 media-video/videotrans/videotrans-1.6.1.ebuild

(limited to 'media-video/videotrans')

diff --git a/media-video/videotrans/videotrans-1.6.1-r1.ebuild b/media-video/videotrans/videotrans-1.6.1-r1.ebuild
index 7ed341220bf1..c451dcdb43d9 100644
--- 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-r2.ebuild b/media-video/videotrans/videotrans-1.6.1-r2.ebuild
new file mode 100644
index 000000000000..f8f75d374fbb
--- /dev/null
+++ b/media-video/videotrans/videotrans-1.6.1-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="A package to convert movies to DVD format and to build DVDs with"
+HOMEPAGE="http://videotrans.sourceforge.net/"
+SRC_URI="mirror://sourceforge/videotrans/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="libav"
+
+DEPEND="
+	media-video/mplayer
+	media-video/mjpegtools[png]
+	media-video/dvdauthor
+	virtual/imagemagick-tools
+	libav? ( media-video/libav )
+	!libav? ( media-video/ffmpeg:0 )
+"
+
+RDEPEND="${DEPEND}
+	www-client/lynx
+	app-shells/bash
+	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.ebuild
deleted file mode 100644
index d1899a77b9fb..000000000000
--- a/media-video/videotrans/videotrans-1.6.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit base eutils
-
-DESCRIPTION="A package to convert movies to DVD format and to build DVDs with"
-HOMEPAGE="http://videotrans.sourceforge.net/"
-SRC_URI="mirror://sourceforge/videotrans/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE=""
-
-DEPEND="virtual/ffmpeg
-	media-video/mplayer
-	media-video/mjpegtools[png]
-	media-video/dvdauthor
-	|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )"
-
-RDEPEND="${DEPEND}
-	www-client/lynx
-	app-shells/bash
-	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
-}
-- 
cgit v1.2.3-65-gdbad