2017-02-11 20:02:54 UTC

11 files changed, 50 insertions, 48 deletions

diff --git a/metadata/md5-cache/media-video/chaplin-1.10-r1 b/metadata/md5-cache/media-video/chaplin-1.10-r2
index 25f0d4b304b9..ef86c8260db3 100644
--- a/metadata/md5-cache/media-video/chaplin-1.10-r1
+++ b/metadata/md5-cache/media-video/chaplin-1.10-r2
@@ -6,9 +6,9 @@ HOMEPAGE=http://www.lallafa.de/bp/chaplin.html
 IUSE=transcode vcd
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
-RDEPEND=>=media-libs/libdvdread-0.9.4 || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) media-video/mjpegtools transcode? ( >=media-video/transcode-0.6.2 ) vcd? ( >=media-video/vcdimager-0.7.2 )
+RDEPEND=>=media-libs/libdvdread-0.9.4 virtual/imagemagick-tools media-video/mjpegtools transcode? ( >=media-video/transcode-0.6.2 ) vcd? ( >=media-video/vcdimager-0.7.2 )
 SLOT=0
 SRC_URI=http://www.lallafa.de/bp/files/chaplin-1.10.tgz
 _eclass_exported_funcs=src_prepare:- src_compile:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=f5e22cd1fcc1d4c293847bb476ef13cc
+_md5_=0f3af480ca7f37bee09dc2000ec91686
diff --git a/metadata/md5-cache/media-video/dvdauthor-0.7.1 b/metadata/md5-cache/media-video/dvdauthor-0.7.1-r1
index 49e828aa57c1..c6c659daa34d 100644
--- a/metadata/md5-cache/media-video/dvdauthor-0.7.1
+++ b/metadata/md5-cache/media-video/dvdauthor-0.7.1-r1
@@ -1,14 +1,15 @@
 DEFINED_PHASES=configure prepare
-DEPEND=>=dev-libs/fribidi-0.19.2 dev-libs/libxml2 >=media-libs/freetype-2 media-libs/libdvdread media-libs/libpng:0= graphicsmagick? ( media-gfx/graphicsmagick ) !graphicsmagick? ( >=media-gfx/imagemagick-5.5.7.14:= ) virtual/pkgconfig
+DEPEND=>=dev-libs/fribidi-0.19.2 dev-libs/libxml2 >=media-libs/freetype-2 media-libs/libdvdread media-libs/libpng:0= graphicsmagick? ( media-gfx/graphicsmagick:= ) imagemagick? ( media-gfx/imagemagick:= ) virtual/pkgconfig
 DESCRIPTION=Tools for generating DVD files to be played on standalone DVD players
 EAPI=6
 HOMEPAGE=http://dvdauthor.sourceforge.net/
-IUSE=graphicsmagick
+IUSE=graphicsmagick +imagemagick
 KEYWORDS=amd64 ppc ppc64 sparc x86
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/fribidi-0.19.2 dev-libs/libxml2 >=media-libs/freetype-2 media-libs/libdvdread media-libs/libpng:0= graphicsmagick? ( media-gfx/graphicsmagick ) !graphicsmagick? ( >=media-gfx/imagemagick-5.5.7.14:= )
+RDEPEND=>=dev-libs/fribidi-0.19.2 dev-libs/libxml2 >=media-libs/freetype-2 media-libs/libdvdread media-libs/libpng:0= graphicsmagick? ( media-gfx/graphicsmagick:= ) imagemagick? ( media-gfx/imagemagick:= )
+REQUIRED_USE=^^ ( graphicsmagick imagemagick )
 SLOT=0
 SRC_URI=mirror://sourceforge/dvdauthor/dvdauthor-0.7.1.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	e0ef2bf8bb6a54693e146ab4085a5ec8	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=dda9f4732d570b219ad92af1bd42d307
+_md5_=3ec40820704fb14fdaf6b6ed9edde13a
diff --git a/metadata/md5-cache/media-video/dvdauthor-0.7.2 b/metadata/md5-cache/media-video/dvdauthor-0.7.2-r1
index 94e61c0e24f3..62e34b4034c9 100644
--- a/metadata/md5-cache/media-video/dvdauthor-0.7.2
+++ b/metadata/md5-cache/media-video/dvdauthor-0.7.2-r1
@@ -1,14 +1,15 @@
 DEFINED_PHASES=configure prepare
-DEPEND=>=dev-libs/fribidi-0.19.2 dev-libs/libxml2 >=media-libs/freetype-2 media-libs/libdvdread media-libs/libpng:0= graphicsmagick? ( media-gfx/graphicsmagick ) !graphicsmagick? ( >=media-gfx/imagemagick-5.5.7.14:= ) virtual/pkgconfig
+DEPEND=>=dev-libs/fribidi-0.19.2 dev-libs/libxml2 >=media-libs/freetype-2 media-libs/libdvdread media-libs/libpng:0= graphicsmagick? ( media-gfx/graphicsmagick:= ) imagemagick? ( media-gfx/imagemagick:= ) virtual/pkgconfig
 DESCRIPTION=Tools for generating DVD files to be played on standalone DVD players
 EAPI=6
 HOMEPAGE=http://dvdauthor.sourceforge.net/
-IUSE=graphicsmagick
+IUSE=graphicsmagick +imagemagick
 KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/fribidi-0.19.2 dev-libs/libxml2 >=media-libs/freetype-2 media-libs/libdvdread media-libs/libpng:0= graphicsmagick? ( media-gfx/graphicsmagick ) !graphicsmagick? ( >=media-gfx/imagemagick-5.5.7.14:= )
+RDEPEND=>=dev-libs/fribidi-0.19.2 dev-libs/libxml2 >=media-libs/freetype-2 media-libs/libdvdread media-libs/libpng:0= graphicsmagick? ( media-gfx/graphicsmagick:= ) imagemagick? ( media-gfx/imagemagick:= )
+REQUIRED_USE=^^ ( graphicsmagick imagemagick )
 SLOT=0
 SRC_URI=mirror://sourceforge/dvdauthor/dvdauthor-0.7.2.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	e0ef2bf8bb6a54693e146ab4085a5ec8	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=580475f86763bb910d670c53dc781088
+_md5_=d8c28fa4909a5226a1ed21778903937f
diff --git a/metadata/md5-cache/media-video/dvdrip-0.98.11-r3 b/metadata/md5-cache/media-video/dvdrip-0.98.11-r3
index 636f7c2c69e3..01ea8b4490b5 100644
--- a/metadata/md5-cache/media-video/dvdrip-0.98.11-r3
+++ b/metadata/md5-cache/media-video/dvdrip-0.98.11-r3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=>=dev-perl/Event-ExecFlow-0.64 >=dev-perl/Event-RPC-0.89 dev-perl/gtk2-perl >=dev-perl/gtk2-ex-formfactory-0.65 >=dev-perl/libintl-perl-1.16 || ( media-gfx/graphicsmagick[imagemagick] media-gfx/imagemagick ) >=media-video/transcode-1.1.0[dvd,jpeg,mp3,ogg,vorbis] >=virtual/perl-podlators-2.5.3 dev-lang/perl:=[-build(-)]
+DEPEND=>=dev-perl/Event-ExecFlow-0.64 >=dev-perl/Event-RPC-0.89 dev-perl/gtk2-perl >=dev-perl/gtk2-ex-formfactory-0.65 >=dev-perl/libintl-perl-1.16 >=media-video/transcode-1.1.0[dvd,jpeg,mp3,ogg,vorbis] virtual/imagemagick-tools >=virtual/perl-podlators-2.5.3 dev-lang/perl:=[-build(-)]
 DESCRIPTION=dvd::rip is a graphical frontend for transcode
 EAPI=5
 HOMEPAGE=http://www.exit1.org/dvdrip/
-IUSE=ffmpeg fping libav mplayer ogg subtitles vcd vorbis xine xvid
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+IUSE=ffmpeg fping mplayer ogg subtitles vcd vorbis xine xvid
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Event-ExecFlow-0.64 >=dev-perl/Event-RPC-0.89 dev-perl/gtk2-perl >=dev-perl/gtk2-ex-formfactory-0.65 >=dev-perl/libintl-perl-1.16 || ( media-gfx/graphicsmagick[imagemagick] media-gfx/imagemagick ) >=media-video/transcode-1.1.0[dvd,jpeg,mp3,ogg,vorbis] >=virtual/perl-podlators-2.5.3 x11-libs/gdk-pixbuf:2[jpeg] x11-libs/gtk+:2 ffmpeg? ( libav? ( media-video/libav ) !libav? ( media-video/ffmpeg:0 ) ) fping? ( >=net-analyzer/fping-2.2 ) mplayer? ( media-video/mplayer ) ogg? ( media-sound/ogmtools ) subtitles? ( media-video/subtitleripper ) vcd? ( media-video/transcode[mjpeg] >=media-video/mjpegtools-1.6.0 ) vorbis? ( media-sound/vorbis-tools ) xine? ( media-video/xine-ui ) xvid? ( media-video/xvid4conf ) >=media-video/lsdvd-0.15 dev-lang/perl:=[-build(-)]
+RDEPEND=>=dev-perl/Event-ExecFlow-0.64 >=dev-perl/Event-RPC-0.89 dev-perl/gtk2-perl >=dev-perl/gtk2-ex-formfactory-0.65 >=dev-perl/libintl-perl-1.16 >=media-video/transcode-1.1.0[dvd,jpeg,mp3,ogg,vorbis] virtual/imagemagick-tools >=virtual/perl-podlators-2.5.3 x11-libs/gdk-pixbuf:2[jpeg] x11-libs/gtk+:2 ffmpeg? ( virtual/ffmpeg ) fping? ( >=net-analyzer/fping-2.2 ) mplayer? ( media-video/mplayer ) ogg? ( media-sound/ogmtools ) subtitles? ( media-video/subtitleripper ) vcd? ( media-video/transcode[mjpeg] >=media-video/mjpegtools-1.6.0 ) vorbis? ( media-sound/vorbis-tools ) xine? ( media-video/xine-ui ) xvid? ( media-video/xvid4conf ) >=media-video/lsdvd-0.15 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://www.exit1.org/dvdrip/dist/dvdrip-0.98.11.tar.gz
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:- src_unpack:perl-module src_prepare:- src_configure:perl-module src_compile:perl-module src_test:perl-module src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	e0ef2bf8bb6a54693e146ab4085a5ec8	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	eb9be4b678c4e71f3f530a767df31912	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=066e76d216cf04425039e02db0e51025
+_md5_=7ea4acb9c70e03267a08ed9924e23633
diff --git a/metadata/md5-cache/media-video/dvdrip-0.98.11-r2 b/metadata/md5-cache/media-video/dvdrip-0.98.11-r4
index 83ecccc62943..02b52820119b 100644
--- a/metadata/md5-cache/media-video/dvdrip-0.98.11-r2
+++ b/metadata/md5-cache/media-video/dvdrip-0.98.11-r4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=>=dev-perl/Event-ExecFlow-0.64 >=dev-perl/Event-RPC-0.89 dev-perl/gtk2-perl >=dev-perl/gtk2-ex-formfactory-0.65 >=dev-perl/libintl-perl-1.16 || ( media-gfx/graphicsmagick[imagemagick] media-gfx/imagemagick ) >=media-video/transcode-1.1.0[dvd,jpeg,mp3,ogg,vorbis] >=virtual/perl-podlators-2.5.3 dev-lang/perl:=[-build(-)]
+DEPEND=>=dev-perl/Event-ExecFlow-0.64 >=dev-perl/Event-RPC-0.89 dev-perl/gtk2-perl >=dev-perl/gtk2-ex-formfactory-0.65 >=dev-perl/libintl-perl-1.16 >=media-video/transcode-1.1.0[dvd,jpeg,mp3,ogg,vorbis] virtual/imagemagick-tools >=virtual/perl-podlators-2.5.3 dev-lang/perl:=[-build(-)]
 DESCRIPTION=dvd::rip is a graphical frontend for transcode
 EAPI=5
 HOMEPAGE=http://www.exit1.org/dvdrip/
-IUSE=ffmpeg fping mplayer ogg subtitles vcd vorbis xine xvid
-KEYWORDS=amd64 ppc ppc64 x86
+IUSE=ffmpeg fping libav mplayer ogg subtitles vcd vorbis xine xvid
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Event-ExecFlow-0.64 >=dev-perl/Event-RPC-0.89 dev-perl/gtk2-perl >=dev-perl/gtk2-ex-formfactory-0.65 >=dev-perl/libintl-perl-1.16 || ( media-gfx/graphicsmagick[imagemagick] media-gfx/imagemagick ) >=media-video/transcode-1.1.0[dvd,jpeg,mp3,ogg,vorbis] >=virtual/perl-podlators-2.5.3 x11-libs/gdk-pixbuf:2[jpeg] x11-libs/gtk+:2 ffmpeg? ( virtual/ffmpeg ) fping? ( >=net-analyzer/fping-2.2 ) mplayer? ( media-video/mplayer ) ogg? ( media-sound/ogmtools ) subtitles? ( media-video/subtitleripper ) vcd? ( media-video/transcode[mjpeg] >=media-video/mjpegtools-1.6.0 ) vorbis? ( media-sound/vorbis-tools ) xine? ( media-video/xine-ui ) xvid? ( media-video/xvid4conf ) >=media-video/lsdvd-0.15 dev-lang/perl:=[-build(-)]
+RDEPEND=>=dev-perl/Event-ExecFlow-0.64 >=dev-perl/Event-RPC-0.89 dev-perl/gtk2-perl >=dev-perl/gtk2-ex-formfactory-0.65 >=dev-perl/libintl-perl-1.16 >=media-video/transcode-1.1.0[dvd,jpeg,mp3,ogg,vorbis] virtual/imagemagick-tools >=virtual/perl-podlators-2.5.3 x11-libs/gdk-pixbuf:2[jpeg] x11-libs/gtk+:2 ffmpeg? ( libav? ( media-video/libav ) !libav? ( media-video/ffmpeg:0 ) ) fping? ( >=net-analyzer/fping-2.2 ) mplayer? ( media-video/mplayer ) ogg? ( media-sound/ogmtools ) subtitles? ( media-video/subtitleripper ) vcd? ( media-video/transcode[mjpeg] >=media-video/mjpegtools-1.6.0 ) vorbis? ( media-sound/vorbis-tools ) xine? ( media-video/xine-ui ) xvid? ( media-video/xvid4conf ) >=media-video/lsdvd-0.15 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://www.exit1.org/dvdrip/dist/dvdrip-0.98.11.tar.gz
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:- src_unpack:perl-module src_prepare:- src_configure:perl-module src_compile:perl-module src_test:perl-module src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	e0ef2bf8bb6a54693e146ab4085a5ec8	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	eb9be4b678c4e71f3f530a767df31912	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=033a6ed2a68d41197be88efa6be7943f
+_md5_=619f3eee9620b393782eff45c19a24d8
diff --git a/metadata/md5-cache/media-video/lives-1.4.6 b/metadata/md5-cache/media-video/lives-1.4.6-r1
index 13091796f021..73be663f8c04 100644
--- a/metadata/md5-cache/media-video/lives-1.4.6
+++ b/metadata/md5-cache/media-video/lives-1.4.6-r1
@@ -6,9 +6,9 @@ HOMEPAGE=http://lives.sf.net
 IUSE=libvisual matroska nls ogg theora
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
-RDEPEND=media-video/mplayer || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) dev-lang/perl >=dev-libs/glib-2.14 >=x11-libs/gtk+-2.16:2 media-libs/libsdl media-libs/libv4l virtual/ffmpeg virtual/jpeg media-sound/sox virtual/cdrtools || ( dev-lang/python:2.7 dev-lang/python:2.6 ) media-plugins/frei0r-plugins media-sound/jack-audio-connection-kit >=media-video/mjpegtools-1.6.2 sys-libs/libavc1394 libvisual? ( media-libs/libvisual ) matroska? ( media-video/mkvtoolnix ) ogg? ( media-sound/ogmtools ) theora? ( media-libs/libtheora )
+RDEPEND=media-video/mplayer dev-lang/perl >=dev-libs/glib-2.14 >=x11-libs/gtk+-2.16:2 media-libs/libsdl media-libs/libv4l virtual/ffmpeg virtual/imagemagick-tools virtual/jpeg media-sound/sox virtual/cdrtools || ( dev-lang/python:2.7 dev-lang/python:2.6 ) media-plugins/frei0r-plugins media-sound/jack-audio-connection-kit >=media-video/mjpegtools-1.6.2 sys-libs/libavc1394 libvisual? ( media-libs/libvisual ) matroska? ( media-video/mkvtoolnix ) ogg? ( media-sound/ogmtools ) theora? ( media-libs/libtheora )
 SLOT=0
 SRC_URI=http://www.xs4all.nl/~salsaman/lives/current/LiVES-1.4.6.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	ea170b525f6a38a006be05c9d9429f13	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=d7a97167249b4d2672a4b24c1e099759
+_md5_=1a75871ade0939a0066b170b3e8fac06
diff --git a/metadata/md5-cache/media-video/peek-0.8.0 b/metadata/md5-cache/media-video/peek-0.8.0-r1
index 4cc81e7ef351..07ea32588adf 100644
--- a/metadata/md5-cache/media-video/peek-0.8.0
+++ b/metadata/md5-cache/media-video/peek-0.8.0-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.38:2 media-video/ffmpeg[X,encode] || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) >=x11-libs/gtk+-3.14:3 || ( dev-lang/vala:0.34 dev-lang/vala:0.32 dev-lang/vala:0.30 dev-lang/vala:0.28 dev-lang/vala:0.26 ) >=sys-devel/gettext-0.19 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info sys-devel/make >=dev-util/cmake-3.6.3
+DEPEND=>=dev-libs/glib-2.38:2 media-video/ffmpeg[X,encode] virtual/imagemagick-tools >=x11-libs/gtk+-3.14:3 || ( dev-lang/vala:0.34 dev-lang/vala:0.32 dev-lang/vala:0.30 dev-lang/vala:0.28 dev-lang/vala:0.26 ) >=sys-devel/gettext-0.19 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info sys-devel/make >=dev-util/cmake-3.6.3
 DESCRIPTION=Simple animated Gif screen recorder
 EAPI=6
 HOMEPAGE=https://github.com/phw/peek
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
-RDEPEND=>=dev-libs/glib-2.38:2 media-video/ffmpeg[X,encode] || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) >=x11-libs/gtk+-3.14:3
+RDEPEND=>=dev-libs/glib-2.38:2 media-video/ffmpeg[X,encode] virtual/imagemagick-tools >=x11-libs/gtk+-3.14:3
 SLOT=0
 SRC_URI=https://github.com/phw/peek/archive/v0.8.0.tar.gz -> peek-0.8.0.tar.gz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_prepare:- src_configure:- src_compile:cmake-utils src_test:cmake-utils src_install:cmake-utils
 _eclasses_=cmake-utils	014267c4475c1a625ecec5b16e0db1e6	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	e0ef2bf8bb6a54693e146ab4085a5ec8	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	c4ea6f9f250b5355e9e948e7007dead0	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	eb9be4b678c4e71f3f530a767df31912	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	vala	ca3f1c504058f5de407febddfae73167	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=9645a6581082191089f1d7898642a197
+_md5_=9dc679e8f11d65119ebfaa24d7418e96
diff --git a/metadata/md5-cache/media-video/tovid-0.35.2 b/metadata/md5-cache/media-video/tovid-0.35.2-r1
index 2dbf43c95e70..07256048acda 100644
--- a/metadata/md5-cache/media-video/tovid-0.35.2
+++ b/metadata/md5-cache/media-video/tovid-0.35.2-r1
@@ -6,10 +6,10 @@ HOMEPAGE=http://tovid.wikia.com/wiki/Tovid_Wiki
 IUSE=python_targets_python2_7
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=app-cdr/dvd+rw-tools dev-tcltk/tix || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[imagemagick,png] ) media-sound/normalize >=media-sound/sox-14.3.2 media-video/dvdauthor >=media-video/mjpegtools-2.0.0 || ( >=media-video/mplayer-1.0_rc4_p20110101[dvdnav] media-video/mpv[libmpv,dvdnav] ) sys-devel/bc virtual/ffmpeg >=dev-lang/python-2.7.5-r2:2.7[tk] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
+RDEPEND=app-cdr/dvd+rw-tools dev-tcltk/tix media-sound/normalize >=media-sound/sox-14.3.2 media-video/dvdauthor >=media-video/mjpegtools-2.0.0 || ( >=media-video/mplayer-1.0_rc4_p20110101[dvdnav] media-video/mpv[libmpv,dvdnav] ) sys-devel/bc virtual/ffmpeg virtual/imagemagick-tools[png] >=dev-lang/python-2.7.5-r2:2.7[tk] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://github.com/tovid-suite/tovid/archive/v0.35.2.tar.gz -> tovid-0.35.2.tar.gz
 _eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:- pkg_setup:- src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:-
 _eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=f33cdf4a3f4c257934bdb50c96a6a2a1
+_md5_=6e270590b92281364e1f3eab78ec2ebb
diff --git a/metadata/md5-cache/media-video/videotrans-1.6.1 b/metadata/md5-cache/media-video/videotrans-1.6.1
deleted file mode 100644
index 927d85348b8b..000000000000
--- a/metadata/md5-cache/media-video/videotrans-1.6.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=virtual/ffmpeg media-video/mplayer media-video/mjpegtools[png] media-video/dvdauthor || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
-DESCRIPTION=A package to convert movies to DVD format and to build DVDs with
-EAPI=4
-HOMEPAGE=http://videotrans.sourceforge.net/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=BSD
-RDEPEND=virtual/ffmpeg media-video/mplayer media-video/mjpegtools[png] media-video/dvdauthor || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) www-client/lynx app-shells/bash sys-devel/bc
-SLOT=0
-SRC_URI=mirror://sourceforge/videotrans/videotrans-1.6.1.tar.bz2
-_eclass_exported_funcs=src_unpack:base src_prepare:- src_configure:base src_compile:base src_install:base
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=96adc418f40760ea02a1fa45271a9671
diff --git a/metadata/md5-cache/media-video/videotrans-1.6.1-r1 b/metadata/md5-cache/media-video/videotrans-1.6.1-r1
index d70842da571d..67b412e58942 100644
--- a/metadata/md5-cache/media-video/videotrans-1.6.1-r1
+++ b/metadata/md5-cache/media-video/videotrans-1.6.1-r1
@@ -1,14 +1,13 @@
-DEFINED_PHASES=prepare
-DEPEND=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 )
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=virtual/ffmpeg media-video/mplayer media-video/mjpegtools[png] media-video/dvdauthor virtual/imagemagick-tools
 DESCRIPTION=A package to convert movies to DVD format and to build DVDs with
-EAPI=5
+EAPI=4
 HOMEPAGE=http://videotrans.sourceforge.net/
-IUSE=libav
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=BSD
-RDEPEND=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 ) www-client/lynx app-shells/bash sys-devel/bc
+RDEPEND=virtual/ffmpeg media-video/mplayer media-video/mjpegtools[png] media-video/dvdauthor virtual/imagemagick-tools www-client/lynx app-shells/bash sys-devel/bc
 SLOT=0
 SRC_URI=mirror://sourceforge/videotrans/videotrans-1.6.1.tar.bz2
-_eclass_exported_funcs=src_prepare:-
-_eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=edbac307d3d9e2313449e02a14422312
+_eclass_exported_funcs=src_unpack:base src_prepare:- src_configure:base src_compile:base src_install:base
+_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=1f747003197996632e807981f322a737
diff --git a/metadata/md5-cache/media-video/videotrans-1.6.1-r2 b/metadata/md5-cache/media-video/videotrans-1.6.1-r2
new file mode 100644
index 000000000000..5f686524ffae
--- /dev/null
+++ b/metadata/md5-cache/media-video/videotrans-1.6.1-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=prepare
+DEPEND=media-video/mplayer media-video/mjpegtools[png] media-video/dvdauthor virtual/imagemagick-tools libav? ( media-video/libav ) !libav? ( media-video/ffmpeg:0 )
+DESCRIPTION=A package to convert movies to DVD format and to build DVDs with
+EAPI=5
+HOMEPAGE=http://videotrans.sourceforge.net/
+IUSE=libav
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=BSD
+RDEPEND=media-video/mplayer media-video/mjpegtools[png] media-video/dvdauthor virtual/imagemagick-tools libav? ( media-video/libav ) !libav? ( media-video/ffmpeg:0 ) www-client/lynx app-shells/bash sys-devel/bc
+SLOT=0
+SRC_URI=mirror://sourceforge/videotrans/videotrans-1.6.1.tar.bz2
+_eclass_exported_funcs=src_prepare:-
+_eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=ee97b2960f6c47c10e8b900bc71d6f02