drop mpv, gentoo version is newer and more stable && add working smtube

10 files changed, 55 insertions, 1553 deletions

diff --git a/media-video/mpv/ChangeLog b/media-video/mpv/ChangeLog
deleted file mode 100644
index a10f3fd9..00000000
--- a/media-video/mpv/ChangeLog
+++ /dev/null
@@ -1,260 +0,0 @@
-# ChangeLog for media-video/mpv
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.58 2014/02/13 17:45:33 tomwij Exp $
-
-*mpv-0.3.5 (13 Feb 2014)
-
-  13 Feb 2014; Tom Wijsman <TomWij@gentoo.org> +mpv-0.3.5.ebuild:
-  Version bump to 0.3.5, proxied commit for Nikoli.
-
-*mpv-0.3.4 (01 Feb 2014)
-
-  01 Feb 2014; Tom Wijsman <TomWij@gentoo.org> +mpv-0.3.4.ebuild:
-  Version bump to 0.3.4, proxied commit for Nikoli.
-
-  25 Jan 2014; Tomáš Chvátal <scarabeus@gentoo.org> -mpv-0.3.2.ebuild,
-  mpv-0.2.4.ebuild, mpv-0.3.3.ebuild, mpv-9999.ebuild:
-  Use subslot deps on libass. Proxy for nikoli. Remove the 0.3.2 as there is no
-  reason for keeping.
-
-  25 Jan 2014; Tomáš Chvátal <scarabeus@gentoo.org> mpv-9999.ebuild:
-  Update sdl switch to match the new name.
-
-*mpv-0.3.3 (16 Jan 2014)
-
-  16 Jan 2014; Michael Weber <xmw@gentoo.org> +mpv-0.3.3.ebuild,
-  -mpv-0.3.1.ebuild:
-  Version bump (proied commit by Nikoli)
-
-  08 Jan 2014; Tom Wijsman <TomWij@gentoo.org> mpv-9999.ebuild:
-  Upstream is now using rst2pdf instead of LaTeX, updated 9999 ebuild; proxied
-  commit for Nikoli.
-
-  08 Jan 2014; Tom Wijsman <TomWij@gentoo.org> -mpv-0.1.7.ebuild,
-  -mpv-0.2.3.ebuild:
-  Remove old, proxied commit for Nikoli.
-
-*mpv-0.3.2 (07 Jan 2014)
-
-  07 Jan 2014; Tom Wijsman <TomWij@gentoo.org> +mpv-0.3.2.ebuild:
-  Version bump to 0.3.2, proxied commit for Nikoli.
-
-*mpv-0.3.1 (03 Jan 2014)
-
-  03 Jan 2014; Jason A. Donenfeld <zx2c4@gentoo.org> +mpv-0.3.1.ebuild,
-  -mpv-0.3.0.ebuild:
-  Version bump for tiny bug fixes.
-
-  31 Dec 2013; Sergey Popov <pinkbyte@gentoo.org> mpv-0.3.0.ebuild,
-  mpv-9999.ebuild:
-  Adjust dependencies, thanks to Nikoli <nikoli AT gmx.us>
-
-*mpv-0.3.0 (29 Dec 2013)
-
-  29 Dec 2013; Tom Wijsman <TomWij@gentoo.org> +mpv-0.3.0.ebuild,
-  mpv-9999.ebuild:
-  Version bump to 0.3.0, proxied commit for Nikoli.
-
-  28 Dec 2013; Maxim Koltsov <maksbotan@gentoo.org> mpv-9999.ebuild:
-  Update DOCS in 9999, thanks to Nikoli
-
-  17 Dec 2013; Tom Wijsman <TomWij@gentoo.org> metadata.xml, mpv-9999.ebuild:
-  Updated live ebuild to cover changes to lircc and caca dependencies, added
-  dvdnav USE flag; fixed bug #494042, proxied commit for Nikoli.
-
-*mpv-0.2.4 (02 Dec 2013)
-
-  02 Dec 2013; Tim Harder <radhermit@gentoo.org> -mpv-0.2.1.ebuild,
-  -mpv-0.2.2.ebuild, +mpv-0.2.4.ebuild:
-  Version bump and remove old (proxied for Nikoli).
-
-  30 Nov 2013; Tom Wijsman <TomWij@gentoo.org> mpv-9999.ebuild:
-  Use simplified configure option for disabling/enabling libquvi support.,
-  proxied commit for Nikoli.
-
-  29 Nov 2013; Sergey Popov <pinkbyte@gentoo.org> mpv-9999.ebuild:
-  Update live ebuild, thanks to Nikoli
-
-  27 Nov 2013; Sergey Popov <pinkbyte@gentoo.org> mpv-9999.ebuild:
-  Remove workaround for building with gcc's PIE per
-  upstream(https://github.com/mpv-player/mpv/issues/361), thanks to Nikoli
-
-  22 Nov 2013; Tom Wijsman <TomWij@gentoo.org> mpv-9999.ebuild:
-  Upstream migrated to waf, migrate 9999 ebuild to git-r3 and made it use https;
-  proxied commit for Nikoli.
-
-*mpv-0.2.3 (16 Nov 2013)
-
-  16 Nov 2013; Tom Wijsman <TomWij@gentoo.org> +mpv-0.2.3.ebuild, metadata.xml,
-  mpv-9999.ebuild:
-  Version bump to 0.2.3, changed mp3 USE flag to mpg123 and restricted mpg123
-  dependency version; also corrected v4l USE flag and added dependency for it on
-  9999 version. Proxied commit for Nikoli.
-
-  11 Nov 2013; Tom Wijsman <TomWij@gentoo.org> mpv-9999.ebuild:
-  Removed support for mng from 9999 as upstream removed support for it, proxied
-  commit for Nikoli.
-
-  03 Nov 2013; Tom Wijsman <TomWij@gentoo.org> -mpv-0.1.6.ebuild:
-  Removed 0.1.6, proxied commit for Nikoli.
-
-*mpv-0.2.2 (03 Nov 2013)
-
-  03 Nov 2013; Ben de Groot <yngwin@gentoo.org> +mpv-0.2.2.ebuild:
-  version bump
-
-*mpv-0.2.1 (20 Oct 2013)
-
-  20 Oct 2013; Tom Wijsman <TomWij@gentoo.org> +mpv-0.2.1.ebuild,
-  -mpv-0.2.0.ebuild:
-  VDPAU is broken in 0.2.0, removed 0.2.0 and version bump to 0.2.1; proxied
-  commit for Nikli.
-
-  19 Oct 2013; Tom Wijsman <TomWij@gentoo.org> mpv-0.1.6.ebuild,
-  mpv-0.1.7.ebuild, mpv-0.2.0.ebuild, mpv-9999.ebuild:
-  Playing things with quvi need libav or ffmpeg with networking support, proxied
-  commit for Nikoli.
-
-  18 Oct 2013; Tom Wijsman <TomWij@gentoo.org> mpv-9999.ebuild:
-  Upstream removed support for gettext, removed localedir configure parameter as
-  it is no longer recognized; proxied commit for Nikoli.
-
-  18 Oct 2013; Jeroen Roovers <jer@gentoo.org> mpv-0.1.6.ebuild,
-  mpv-0.1.7.ebuild, mpv-0.2.0.ebuild, mpv-9999.ebuild:
-  Drop HPPA keywording (bug #488318).
-
-  17 Oct 2013; Tom Wijsman <TomWij@gentoo.org> mpv-0.2.0.ebuild,
-  mpv-9999.ebuild:
-  Fix up a typo in the luajit conditional configure flag, proxied commit for
-  Nikoli; fixes bug #488348.
-
-  17 Oct 2013; Jeroen Roovers <jer@gentoo.org> mpv-0.2.0.ebuild:
-  Drop ~hppa for now (bug #488318).
-
-*mpv-0.2.0 (16 Oct 2013)
-
-  16 Oct 2013; Tom Wijsman <TomWij@gentoo.org> +mpv-0.2.0.ebuild,
-  mpv-9999.ebuild:
-  Version bump to 0.2.0, LICENSE recently switched from GPL-3 to GPL-2; proxied
-  commit for Nikoli, fixes bug #488254.
-
-  05 Oct 2013; Alexander Vershilov <qnikst@gentoo.org> metadata.xml,
-  mpv-9999.ebuild:
-  add lua flag (request and patches by Nikoli)
-
-  30 Sep 2013; Tomáš Chvátal <scarabeus@gentoo.org> mpv-9999.ebuild:
-  Drop AUTHORS file, no longer distributed.
-
-*mpv-0.1.7 (22 Sep 2013)
-
-  22 Sep 2013; Tom Wijsman <TomWij@gentoo.org> +mpv-0.1.7.ebuild:
-  Version bump to 0.1.7, proxied commit for Nikoli.
-
-  21 Sep 2013; Tom Wijsman <TomWij@gentoo.org> metadata.xml, mpv-9999.ebuild:
-  Added doc-pdf USE flag and removed aqua USE flag, proxied commit for Nikoli.
-
-*mpv-0.1.6 (15 Sep 2013)
-
-  15 Sep 2013; Tomáš Chvátal <scarabeus@gentoo.org> +mpv-0.1.6.ebuild,
-  -mpv-0.1.3.ebuild, -mpv-0.1.4.ebuild, -mpv-0.1.5.ebuild:
-  Bump again to latest mpv tagged release. Drop older.
-
-*mpv-0.1.5 (09 Sep 2013)
-
-  09 Sep 2013; Sergey Popov <pinkbyte@gentoo.org> +mpv-0.1.5.ebuild:
-  Version bump, thanks to Nikoli
-
-  02 Sep 2013; Sergey Popov <pinkbyte@gentoo.org> metadata.xml:
-  Change maintainer's email address
-
-*mpv-0.1.4 (02 Sep 2013)
-
-  02 Sep 2013; Sergey Popov <pinkbyte@gentoo.org> +mpv-0.1.4.ebuild:
-  Version bump, wrt bug #481118
-
-  02 Sep 2013; Sergey Popov <pinkbyte@gentoo.org> mpv-9999.ebuild,
-  metadata.xml:
-  Add VAAPI support via USE-flag, wrt bug #481118
-
-*mpv-0.1.3 (25 Aug 2013)
-
-  25 Aug 2013; Tomáš Chvátal <scarabeus@gentoo.org> +mpv-0.1.3.ebuild,
-  -mpv-0.1.2.ebuild:
-  Bump to 0.1.3, drop 0.1.2.
-
-*mpv-0.1.2 (19 Aug 2013)
-
-  19 Aug 2013; Tomáš Chvátal <scarabeus@gentoo.org> +mpv-0.1.2.ebuild,
-  -mpv-0_p20130715.ebuild, mpv-9999.ebuild:
-  Version bump to 0.1.2 release, remove older.
-
-  11 Aug 2013; Alexis Ballier <aballier@gentoo.org> mpv-0_p20130715.ebuild,
-  mpv-9999.ebuild:
-  depend on ffmpeg:0=
-
-  19 Jul 2013; Tom Wijsman <TomWij@gentoo.org> metadata.xml:
-  Clean up of metadata.xml. Do not express assignment in description for normal
-  situations, just list the to be assigned maintainer first as our scripts pick
-  up that one and we don't want to manually correct this every time; herds also
-  maintain a package, so they don't need to be listed twice.
-
-  17 Jul 2013; Tom Wijsman <TomWij@gentoo.org> mpv-0_p20130715.ebuild,
-  mpv-9999.ebuild:
-  Made ffmpeg dependency consistent; that way, it doesn't satisfy and block
-  itself at the same time if the user has a lower version installed. Discovered
-  in topic #964594 on the Gentoo Forums.
-
-*mpv-0_p20130715 (15 Jul 2013)
-
-  15 Jul 2013; Luca Barbato <lu_zero@gentoo.org> +mpv-0_p20130715.ebuild,
-  mpv-9999.ebuild:
-  First snapshot and live ebuild update thanks to Nikoli
-
-  09 Jul 2013; Tomáš Chvátal <scarabeus@gentoo.org> mpv-9999.ebuild:
-  Do not enable debug by default. Patch from Nikoli.
-
-  09 Jul 2013; Tomáš Chvátal <scarabeus@gentoo.org> mpv-9999.ebuild:
-  Few fixes from nikoli. Put ffmpeg deps on top. Use subslot on libav.
-
-  08 Jul 2013; Tom Wijsman <TomWij@gentoo.org> mpv-9999.ebuild:
-  Proxy commit by Nikoli: Explicitly depend on libav-9 and ffmpeg-1.2 instead of
-  virtual/ffmpeg-9, fixes bug #476222. Remove warning about CFLAGS and LDFLAGS,
-  we now append our flags instead of replacing upstream's flags. Removed some
-  configure options which upstream no longer provides, some USE flag behavior
-  was changed as a result. USE flag radio now has correct dependencies, it no
-  longer depends on oss; added threads USE flag.
-
-  08 Jul 2013; Tomáš Chvátal <scarabeus@gentoo.org> metadata.xml:
-  Fix repoman warning.
-
-  08 Jul 2013; Tomáš Chvátal <scarabeus@gentoo.org> mpv-9999.ebuild:
-  Remove networking code switches as the code was dropped.
-
-  05 Jul 2013; Tomáš Chvátal <scarabeus@gentoo.org> metadata.xml,
-  mpv-9999.ebuild:
-  Add few new useflag and enable quvi by default. Thanks to Nikoli for coop.
-
-  15 Jun 2013; Tomáš Chvátal <scarabeus@gentoo.org> mpv-9999.ebuild:
-  Raise dep on libxbcommon. Thanks to Nikoli for patch.
-
-  21 May 2013; Tim Harder <radhermit@gentoo.org> mpv-9999.ebuild:
-  Update DOCS with new readme filename (patch by Nikoli).
-
-  16 May 2013; Tim Harder <radhermit@gentoo.org> mpv-9999.ebuild, metadata.xml:
-  Add vf-dlopen use flag (patch by Nikoli).
-
-  28 Apr 2013; Tomáš Chvátal <scarabeus@gentoo.org> mpv-9999.ebuild:
-  Update wayland useflag usage a bit. Patch by Nikoli.
-
-  27 Apr 2013; Tomáš Chvátal <scarabeus@gentoo.org> mpv-9999.ebuild:
-  Try to enable wayland stuff via useflag.
-
-  27 Apr 2013; Tomáš Chvátal <scarabeus@gentoo.org> mpv-9999.ebuild:
-  Update bit. Patch by Nikoli.
-
-*mpv-9999 (27 Apr 2013)
-
-  27 Apr 2013; Tomáš Chvátal <scarabeus@gentoo.org> +metadata.xml,
-  +mpv-9999.ebuild:
-  Add mpv package which is another mplayer fork. Only live for now snapshots to
-  be added after ffmpeg9 virtual is unmasked. Ebuild provided by Nikoli.
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
deleted file mode 100644
index 3d05da39..00000000
--- a/media-video/mpv/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST mpv-0.2.4.tar.gz 2478152 SHA256 34a12a82b25bf3337d44c26dd8fa750746032c1a8806b85f6b8db652710827bf SHA512 72214d02fc459b1789831e54de2841ff0a8d83c97f1ba76b18d31e970372571569b45a036fe7e7e67d6fa9460f73216cc0f1e1e6149cb24a99c490d5cdfb5ec1 WHIRLPOOL 0cf700e38a2455d5c687b3f6a50e708bc145520e54b45923a465b7ed1e77b0ddd42d86d6a000b0d969506e4bca2973133c99f49db8281acff9fc02e649557141
-DIST mpv-0.3.3.tar.gz 2514706 SHA256 27d0b5ad65ba8056c5ce00bc441cf25b742cf46defcfd6ff597730f53ff2e61d SHA512 1a9e4de41e6215525ba0d195c8d2b9ebc76beea9c1792bfcf3e594219e614fc588134f1669bd7f6a898fa961e0e9c670309cc347c42733e69c9a2a1cadb4536b WHIRLPOOL b5dd879e0477eef6aa36ec003a7012e8364f3ccc05e068e9d59cb48c1e1803e33e5121138bbf1ca60b85c0c48c9293eb563e6e8cf20e11d812066f08af752166
-DIST mpv-0.3.4.tar.gz 2515466 SHA256 3e838a7a0bda448d335926954c7b9b9b0f0066ef10cea49813511fe378494cab SHA512 ad5fee608df74f31f4a5d369f68b4dfca1816f3eda62cc338beda16ff7e77619a17711759fd763aecbdb589597727e401b4f3a8daf5a9d30373199158685dd14 WHIRLPOOL 0e77fa912aef48efba0973aa858e535f9fd79a9d5cc72915745a23db7994018b3bd1a6bf6c95bbac9b3b0bf2f2672eaa3760df780cfa74fff3d74233f5d02d6d
-DIST mpv-0.3.5.tar.gz 2516492 SHA256 0d1506ad448e42cd7c8de15c7d6c23725b62db87f3d0c4029f5b8c523c995f30 SHA512 9dad2f83b3eaee05197c40b257ad0ab84367d6334faa2950ff51e65d435fd9a7798ad4347a26d66e67bd8d0265bd1cd202fd621447f5c9fe2545a2d88d99d937 WHIRLPOOL 409d38fa0206a5dbc1689c8f695c24ccaade0e2b484e1256b128d55282194e92bc38599afaa87c66f4157c4bf549aaa06c101265c9cdefeea0f60675b834d068
-DIST waf-1.7.13 90702 SHA256 03cc750049350ee01cdbc584b70924e333fcc17ba4a2d04648dab1535538a873 SHA512 4388cd200d86d9757db95a138d75655e419fd9372de1dc392025b2ecfb9a0cc95d0b17639689ac293b753355af4baea0fc700ddd5d419755facc4e1dfa009521 WHIRLPOOL db94ba365aa84927942e1d95079f9efe377e646dcb7183d6a80d4b57ebbe195d48d23b7688216bd0b793e2f914e1d83caae3b517e385f891a26f670ebc17ed05
diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml
deleted file mode 100644
index 1f7093d6..00000000
--- a/media-video/mpv/metadata.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer>
-	<email>nikoli@gmx.us</email>
-</maintainer>
-<herd>video</herd>
-<herd>proxy-maintainers</herd>
-<use>
-	<flag name="bluray">Enable playback of Blu-ray filesystems</flag>
-	<flag name="bs2b">Enable Bauer stereophonic-to-binaural headphone filter</flag>
-	<flag name="cdio">Use libcdio for CD support (instead of cdparanoia)</flag>
-	<flag name='doc-pdf'>Build documentation in pdf format</flag>
-	<flag name='dvdnav'>Enable support for DVD navigation using <pkg>media-libs/dvdnav</pkg>.</flag>
-	<flag name="enca">Enables support for charset discovery and conversion using <pkg>app-i18n/enca</pkg></flag>
-	<flag name="libguess">Enables support for charset discovery and conversion using <pkg>app-i18n/libguess</pkg></flag>
-	<flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
-	<flag name="mng">MNG input support</flag>
-	<flag name="mpg123">Enable support for mp3 decoding over <pkg>media-sound/mpg123</pkg> instead of relying on ffmpeg support.</flag>
-	<flag name="postproc">Enable image post-processing via libpostproc</flag>
-	<flag name="pvr">Enable Video4Linux2 MPEG PVR</flag>
-	<flag name="quvi">Enable support for streaming sites using <pkg>media-libs/libquvi</pkg></flag>
-	<flag name="radio">Enable V4L2 radio interface and support</flag>
-	<flag name="shm">Enable support for shm</flag>
-	<flag name="vaapi">Enable VAAPI (Video Acceleration API) for hardware decoding</flag>
-	<flag name="vf-dlopen">Install additional video filters for using with -vf dlopen</flag>
-</use>
-</pkgmetadata>
diff --git a/media-video/mpv/mpv-0.2.4.ebuild b/media-video/mpv/mpv-0.2.4.ebuild
deleted file mode 100644
index 8e19b4ef..00000000
--- a/media-video/mpv/mpv-0.2.4.ebuild
+++ /dev/null
@@ -1,321 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-0.2.4.ebuild,v 1.2 2014/01/25 13:29:24 scarabeus Exp $
-
-EAPI=5
-
-EGIT_REPO_URI="git://github.com/mpv-player/mpv.git"
-
-inherit toolchain-funcs flag-o-matic multilib base pax-utils
-[[ ${PV} == *9999* ]] && inherit git-2
-
-DESCRIPTION="Video player based on MPlayer/mplayer2"
-HOMEPAGE="http://mpv.io/"
-[[ ${PV} == *9999* ]] || \
-SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE="+alsa bluray bs2b +cdio -doc-pdf dvb +dvd +enca encode +iconv jack -joystick
-jpeg ladspa lcms +libass libcaca libguess lirc lua luajit mng +mpg123 -openal +opengl oss
-portaudio +postproc pulseaudio pvr +quvi -radio samba +shm +threads v4l vaapi
-vcd vdpau vf-dlopen wayland +X xinerama +xscreensaver +xv"
-
-REQUIRED_USE="
-	enca? ( iconv )
-	lcms? ( opengl )
-	libguess? ( iconv )
-	luajit? ( lua )
-	opengl? ( || ( wayland X ) )
-	portaudio? ( threads )
-	pvr? ( v4l )
-	radio? ( v4l || ( alsa oss ) )
-	v4l? ( threads )
-	vaapi? ( X )
-	vdpau? ( X )
-	wayland? ( opengl )
-	xinerama? ( X )
-	xscreensaver? ( X )
-	xv? ( X )
-"
-
-RDEPEND+="
-	|| (
-		>=media-video/libav-9:=[encode?,threads?,vaapi?,vdpau?]
-		>=media-video/ffmpeg-1.2:0=[encode?,threads?,vaapi?,vdpau?]
-	)
-	sys-libs/ncurses
-	sys-libs/zlib
-	X? (
-		x11-libs/libXext
-		x11-libs/libXxf86vm
-		opengl? ( virtual/opengl )
-		lcms? ( media-libs/lcms:2 )
-		vaapi? ( x11-libs/libva[X(+)] )
-		vdpau? ( x11-libs/libvdpau )
-		xinerama? ( x11-libs/libXinerama )
-		xscreensaver? ( x11-libs/libXScrnSaver )
-		xv? ( x11-libs/libXv )
-	)
-	alsa? ( media-libs/alsa-lib )
-	bluray? ( media-libs/libbluray )
-	bs2b? ( media-libs/libbs2b )
-	cdio? (
-		|| (
-			dev-libs/libcdio-paranoia
-			<dev-libs/libcdio-0.90[-minimal]
-		)
-	)
-	dvb? ( virtual/linuxtv-dvb-headers )
-	dvd? ( >=media-libs/libdvdread-4.1.3 )
-	enca? ( app-i18n/enca )
-	iconv? ( virtual/libiconv )
-	jack? ( media-sound/jack-audio-connection-kit )
-	jpeg? ( virtual/jpeg )
-	ladspa? ( media-libs/ladspa-sdk )
-	libass? (
-		>=media-libs/libass-0.9.10:=[enca?,fontconfig]
-		virtual/ttf-fonts
-	)
-	libcaca? ( media-libs/libcaca )
-	libguess? ( >=app-i18n/libguess-1.0 )
-	lirc? ( app-misc/lirc )
-	lua? (
-		!luajit? ( >=dev-lang/lua-5.1 )
-		luajit? ( dev-lang/luajit:2 )
-	)
-	mng? ( media-libs/libmng )
-	mpg123? ( media-sound/mpg123 )
-	openal? ( >=media-libs/openal-1.13 )
-	portaudio? ( >=media-libs/portaudio-19_pre20111121 )
-	postproc? (
-		|| (
-			media-libs/libpostproc
-			>=media-video/ffmpeg-1.2:0[encode?,threads?,vaapi?,vdpau?]
-		)
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	quvi? (
-		>=media-libs/libquvi-0.4.1:=
-		|| (
-			>=media-video/libav-9[network]
-			>=media-video/ffmpeg-1.2:0[network]
-		)
-	)
-	samba? ( net-fs/samba )
-	v4l? ( media-libs/libv4l )
-	wayland? (
-		>=dev-libs/wayland-1.0.0
-		media-libs/mesa[egl,wayland]
-		>=x11-libs/libxkbcommon-0.3.0
-	)
-"
-ASM_DEP="dev-lang/yasm"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-lang/perl-5.8
-	dev-python/docutils
-	doc-pdf? (
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-latexextra
-		dev-tex/xcolor
-	)
-	X? (
-		x11-proto/videoproto
-		x11-proto/xf86vidmodeproto
-		xinerama? ( x11-proto/xineramaproto )
-		xscreensaver? ( x11-proto/scrnsaverproto )
-	)
-	amd64? ( ${ASM_DEP} )
-	x86? ( ${ASM_DEP} )
-	x86-fbsd? ( ${ASM_DEP} )
-"
-DOCS=( Copyright README.md etc/example.conf etc/input.conf etc/encoding-example-profiles.conf )
-
-pkg_setup() {
-	if [[ ${PV} == *9999* ]]; then
-		elog
-		elog "This is a live ebuild which installs the latest from upstream's"
-		elog "git repository, and is unsupported by Gentoo."
-		elog "Everything but bugs in the ebuild itself will be ignored."
-		elog
-	fi
-
-	if use !libass; then
-		ewarn
-		ewarn "You've disabled the libass flag. No OSD or subtitles will be displayed."
-	fi
-
-	if use openal; then
-		ewarn
-		ewarn "You've enabled the openal flag. OpenAL is disabled by default,"
-		ewarn "because it supposedly inteferes with some other configure tests"
-		ewarn "and makes them fail silently."
-	fi
-
-	einfo "For additional format support you need to enable the support on your"
-	einfo "libavcodec/libavformat provider:"
-	einfo "    media-video/libav or media-video/ffmpeg"
-}
-
-src_prepare() {
-	# fix path to bash executable in configure scripts
-	sed -i -e "1c\#!${EPREFIX}/bin/bash" \
-		configure version.sh || die
-
-	base_src_prepare
-}
-
-src_configure() {
-	local myconf=""
-	local uses i
-
-	# ebuild uses "use foo || --disable-foo" to forcibly disable
-	# compilation in almost every situation. The reason for this is
-	# because if --enable is used, it will force the build of that option,
-	# regardless of whether the dependency is available or not.
-
-	#####################
-	# Optional features #
-	#####################
-	# SDL output is fallback for platforms where nothing better is available
-	myconf+=" --disable-sdl --disable-sdl2"
-	use encode || myconf+=" --disable-encoding"
-	myconf+=" $(use_enable joystick)"
-	uses="bluray vcd"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use quvi || myconf+=" --disable-libquvi4 --disable-libquvi9"
-	use samba || myconf+=" --disable-smb"
-	use lirc || myconf+=" --disable-lirc --disable-lircc"
-	use lua || myconf+=" --disable-lua"
-	use luajit && myconf+=" --lua=luajit"
-	use doc-pdf || myconf+=" --disable-pdf"
-
-	########
-	# CDDA #
-	########
-	use cdio || myconf+=" --disable-libcdio"
-
-	############
-	# DVD read #
-	############
-	use dvd || myconf+=" --disable-dvdread"
-
-	#############
-	# Subtitles #
-	#############
-	uses="enca iconv libass libguess"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-
-	#####################################
-	# DVB / Video4Linux / Radio support #
-	#####################################
-	use dvb || myconf+=" --disable-dvb"
-	use pvr || myconf+=" --disable-pvr"
-	use v4l || myconf+=" --disable-libv4l2 --disable-tv --disable-tv-v4l2"
-	if use radio; then
-		myconf+=" --enable-radio --enable-radio-capture"
-	else
-		myconf+=" --disable-radio-v4l2"
-	fi
-
-	##########
-	# Codecs #
-	##########
-	uses="jpeg mng mpg123"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-
-	################
-	# Video Output #
-	################
-	use libcaca || myconf+=" --disable-caca"
-	use postproc || myconf+=" --disable-libpostproc"
-
-	################
-	# Audio Output #
-	################
-	myconf+=" --disable-rsound" # media-sound/rsound is in pro-audio overlay only
-	uses="alsa jack ladspa portaudio"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use bs2b || myconf+=" --disable-libbs2b"
-	use openal && myconf+=" --enable-openal"
-	use oss || myconf+=" --disable-ossaudio"
-	use pulseaudio || myconf+=" --disable-pulse"
-
-	####################
-	# Advanced Options #
-	####################
-	# keep build reproducible
-	myconf+=" --disable-build-date"
-	# do not add -g to CFLAGS
-	myconf+=" --disable-debug"
-	use threads || myconf+=" --disable-pthreads"
-
-	# Platform specific flags, hardcoded on amd64 (see below)
-	use shm || myconf+=" --disable-shm"
-
-	if use x86 && gcc-specs-pie; then
-		filter-flags -fPIC -fPIE
-		append-ldflags -nopie
-	fi
-
-	###########################
-	# X enabled configuration #
-	###########################
-	use X || myconf+=" --disable-x11"
-	uses="vaapi vdpau wayland xinerama xv"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use opengl || myconf+=" --disable-gl"
-	use lcms || myconf+=" --disable-lcms2"
-	use xscreensaver || myconf+=" --disable-xss"
-
-	CFLAGS= LDFLAGS= ./configure \
-		--cc="$(tc-getCC)" \
-		--extra-cflags="${CFLAGS}" \
-		--extra-ldflags="${LDFLAGS}" \
-		--pkg-config="$(tc-getPKG_CONFIG)" \
-		--prefix="${EPREFIX}"/usr \
-		--bindir="${EPREFIX}"/usr/bin \
-		--confdir="${EPREFIX}"/etc/${PN} \
-		--mandir="${EPREFIX}"/usr/share/man \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--localedir="${EPREFIX}"/usr/share/locale \
-		${myconf} || die
-
-	MAKEOPTS+=" V=1"
-}
-
-src_compile() {
-	base_src_compile
-
-	if use vf-dlopen; then
-		tc-export CC
-		emake -C TOOLS/vf_dlopen
-	fi
-}
-
-src_install() {
-	base_src_install
-
-	if use luajit; then
-		pax-mark -m "${ED}"usr/bin/mpv
-	fi
-
-	if use vf-dlopen; then
-		exeinto /usr/$(get_libdir)/${PN}
-		doexe TOOLS/vf_dlopen/*.so
-	fi
-}
diff --git a/media-video/mpv/mpv-0.3.3.ebuild b/media-video/mpv/mpv-0.3.3.ebuild
deleted file mode 100644
index de68f286..00000000
--- a/media-video/mpv/mpv-0.3.3.ebuild
+++ /dev/null
@@ -1,236 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-0.3.3.ebuild,v 1.2 2014/01/25 13:29:24 scarabeus Exp $
-
-EAPI=5
-
-EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
-
-inherit base waf-utils pax-utils
-[[ ${PV} == *9999* ]] && inherit git-r3
-
-DESCRIPTION="Video player based on MPlayer/mplayer2"
-HOMEPAGE="http://mpv.io/"
-SRC_URI="https://waf.googlecode.com/files/waf-1.7.13"
-[[ ${PV} == *9999* ]] || \
-SRC_URI+=" https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE="+alsa bluray bs2b +cdio -doc-pdf dvb +dvd dvdnav +enca encode +iconv jack -joystick
-jpeg ladspa lcms +libass libcaca libguess lirc lua luajit +mpg123 -openal +opengl
-oss portaudio +postproc pulseaudio pvr +quvi -radio samba +shm v4l vaapi vcd vdpau
-vf-dlopen wayland +X xinerama +xscreensaver +xv"
-
-REQUIRED_USE="
-	dvdnav? ( dvd )
-	enca? ( iconv )
-	lcms? ( opengl )
-	libguess? ( iconv )
-	luajit? ( lua )
-	opengl? ( || ( wayland X ) )
-	pvr? ( v4l )
-	radio? ( v4l || ( alsa oss ) )
-	vaapi? ( X )
-	vdpau? ( X )
-	wayland? ( opengl )
-	xinerama? ( X )
-	xscreensaver? ( X )
-	xv? ( X )
-"
-
-RDEPEND+="
-	|| (
-		>=media-video/libav-9:=[encode?,threads,vaapi?,vdpau?]
-		>=media-video/ffmpeg-1.2:0=[encode?,threads,vaapi?,vdpau?]
-	)
-	sys-libs/ncurses
-	sys-libs/zlib
-	X? (
-		x11-libs/libXext
-		x11-libs/libXxf86vm
-		opengl? ( virtual/opengl )
-		lcms? ( media-libs/lcms:2 )
-		vaapi? ( >=x11-libs/libva-0.34.0[X(+)] )
-		vdpau? ( >=x11-libs/libvdpau-0.2 )
-		xinerama? ( x11-libs/libXinerama )
-		xscreensaver? ( x11-libs/libXScrnSaver )
-		xv? ( x11-libs/libXv )
-	)
-	alsa? ( media-libs/alsa-lib )
-	bluray? ( >=media-libs/libbluray-0.2.1 )
-	bs2b? ( media-libs/libbs2b )
-	cdio? (
-		|| (
-			dev-libs/libcdio-paranoia
-			<dev-libs/libcdio-0.90[-minimal]
-		)
-	)
-	dvb? ( virtual/linuxtv-dvb-headers )
-	dvd? (
-		>=media-libs/libdvdread-4.1.3
-		dvdnav? ( >=media-libs/libdvdnav-4.2.0 )
-	)
-	enca? ( app-i18n/enca )
-	iconv? ( virtual/libiconv )
-	jack? ( media-sound/jack-audio-connection-kit )
-	jpeg? ( virtual/jpeg )
-	ladspa? ( media-libs/ladspa-sdk )
-	libass? (
-		>=media-libs/libass-0.9.10:=[enca?,fontconfig]
-		virtual/ttf-fonts
-	)
-	libcaca? ( >=media-libs/libcaca-0.99_beta18 )
-	libguess? ( >=app-i18n/libguess-1.0 )
-	lirc? ( app-misc/lirc )
-	lua? (
-		!luajit? ( >=dev-lang/lua-5.1 )
-		luajit? ( dev-lang/luajit:2 )
-	)
-	mpg123? ( >=media-sound/mpg123-1.14.0 )
-	openal? ( >=media-libs/openal-1.13 )
-	portaudio? ( >=media-libs/portaudio-19_pre20111121 )
-	postproc? (
-		|| (
-			media-libs/libpostproc
-			>=media-video/ffmpeg-1.2:0[encode?,threads,vaapi?,vdpau?]
-		)
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	quvi? (
-		>=media-libs/libquvi-0.4.1:=
-		|| (
-			>=media-video/libav-9[network]
-			>=media-video/ffmpeg-1.2:0[network]
-		)
-	)
-	samba? ( net-fs/samba )
-	v4l? ( media-libs/libv4l )
-	wayland? (
-		>=dev-libs/wayland-1.2.0
-		media-libs/mesa[egl,wayland]
-		>=x11-libs/libxkbcommon-0.3.0
-	)
-"
-ASM_DEP="dev-lang/yasm"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-lang/perl-5.8
-	dev-python/docutils
-	doc-pdf? (
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-latexextra
-		dev-tex/xcolor
-	)
-	X? (
-		x11-proto/videoproto
-		x11-proto/xf86vidmodeproto
-		xinerama? ( x11-proto/xineramaproto )
-		xscreensaver? ( x11-proto/scrnsaverproto )
-	)
-	amd64? ( ${ASM_DEP} )
-	x86? ( ${ASM_DEP} )
-	x86-fbsd? ( ${ASM_DEP} )
-"
-DOCS=( Copyright README.md etc/example.conf etc/input.conf )
-
-pkg_setup() {
-	if use !libass; then
-		ewarn
-		ewarn "You've disabled the libass flag. No OSD or subtitles will be displayed."
-	fi
-
-	einfo "For additional format support you need to enable the support on your"
-	einfo "libavcodec/libavformat provider:"
-	einfo "    media-video/libav or media-video/ffmpeg"
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]]; then
-		git-r3_src_unpack
-	else
-		default_src_unpack
-	fi
-
-	cp "${DISTDIR}"/waf-1.7.13 "${S}"/waf || die
-	chmod 0755 "${S}"/waf || die
-}
-
-src_prepare() {
-	base_src_prepare
-}
-
-src_configure() {
-	# keep build reproducible
-	# do not add -g to CFLAGS
-	# SDL output is fallback for platforms where nothing better is available
-	# media-sound/rsound is in pro-audio overlay only
-	waf-utils_src_configure \
-		--disable-build-date \
-		--disable-debug-build \
-		--disable-sdl \
-		--disable-sdl2 \
-		--disable-rsound \
-		$(use_enable encode encoding) \
-		$(use_enable joystick) \
-		$(use_enable bluray libbluray) \
-		$(use_enable vcd) \
-		$(use_enable quvi libquvi) \
-		$(use_enable samba libsmbclient) \
-		$(use_enable lirc) \
-		$(use_enable lua) \
-		$(usex luajit '--lua=luajit' '') \
-		$(use_enable doc-pdf pdf-build) \
-		$(use_enable vf-dlopen vf-dlopen-filters) \
-		$(use_enable cdio cdda) \
-		$(use_enable dvd dvdread) \
-		$(use_enable dvdnav) \
-		$(use_enable enca) \
-		$(use_enable iconv) \
-		$(use_enable libass) \
-		$(use_enable libguess) \
-		$(use_enable dvb) \
-		$(use_enable pvr) \
-		$(use_enable v4l libv4l2) \
-		$(use_enable v4l tv) \
-		$(use_enable v4l tv-v4l2) \
-		$(use_enable radio) \
-		$(use_enable radio radio-capture) \
-		$(use_enable radio radio-v4l2) \
-		$(use_enable mpg123) \
-		$(use_enable jpeg) \
-		$(use_enable libcaca caca) \
-		$(use_enable postproc libpostproc) \
-		$(use_enable alsa) \
-		$(use_enable jack) \
-		$(use_enable ladspa) \
-		$(use_enable portaudio) \
-		$(use_enable bs2b libbs2b) \
-		$(use_enable openal) \
-		$(use_enable oss oss-audio) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable shm) \
-		$(use_enable X x11) \
-		$(use_enable vaapi) \
-		$(use_enable vdpau) \
-		$(use_enable wayland) \
-		$(use_enable xinerama) \
-		$(use_enable xv) \
-		$(use_enable opengl gl) \
-		$(use_enable lcms lcms2) \
-		$(use_enable xscreensaver xss) \
-		--confdir="${EPREFIX}"/etc/${PN} \
-		--mandir="${EPREFIX}"/usr/share/man \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-}
-
-src_install() {
-	waf-utils_src_install
-
-	if use luajit; then
-		pax-mark -m "${ED}"usr/bin/mpv
-	fi
-}
diff --git a/media-video/mpv/mpv-0.3.4.ebuild b/media-video/mpv/mpv-0.3.4.ebuild
deleted file mode 100644
index 7484aa87..00000000
--- a/media-video/mpv/mpv-0.3.4.ebuild
+++ /dev/null
@@ -1,236 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-0.3.4.ebuild,v 1.1 2014/02/01 20:00:50 tomwij Exp $
-
-EAPI=5
-
-EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
-
-inherit base waf-utils pax-utils
-[[ ${PV} == *9999* ]] && inherit git-r3
-
-DESCRIPTION="Video player based on MPlayer/mplayer2"
-HOMEPAGE="http://mpv.io/"
-SRC_URI="https://waf.googlecode.com/files/waf-1.7.13"
-[[ ${PV} == *9999* ]] || \
-SRC_URI+=" https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE="+alsa bluray bs2b +cdio -doc-pdf dvb +dvd dvdnav +enca encode +iconv jack -joystick
-jpeg ladspa lcms +libass libcaca libguess lirc lua luajit +mpg123 -openal +opengl
-oss portaudio +postproc pulseaudio pvr +quvi -radio samba +shm v4l vaapi vcd vdpau
-vf-dlopen wayland +X xinerama +xscreensaver +xv"
-
-REQUIRED_USE="
-	dvdnav? ( dvd )
-	enca? ( iconv )
-	lcms? ( opengl )
-	libguess? ( iconv )
-	luajit? ( lua )
-	opengl? ( || ( wayland X ) )
-	pvr? ( v4l )
-	radio? ( v4l || ( alsa oss ) )
-	vaapi? ( X )
-	vdpau? ( X )
-	wayland? ( opengl )
-	xinerama? ( X )
-	xscreensaver? ( X )
-	xv? ( X )
-"
-
-RDEPEND+="
-	|| (
-		>=media-video/libav-9:=[encode?,threads,vaapi?,vdpau?]
-		>=media-video/ffmpeg-1.2:0=[encode?,threads,vaapi?,vdpau?]
-	)
-	sys-libs/ncurses
-	sys-libs/zlib
-	X? (
-		x11-libs/libXext
-		x11-libs/libXxf86vm
-		opengl? ( virtual/opengl )
-		lcms? ( media-libs/lcms:2 )
-		vaapi? ( >=x11-libs/libva-0.34.0[X(+)] )
-		vdpau? ( >=x11-libs/libvdpau-0.2 )
-		xinerama? ( x11-libs/libXinerama )
-		xscreensaver? ( x11-libs/libXScrnSaver )
-		xv? ( x11-libs/libXv )
-	)
-	alsa? ( media-libs/alsa-lib )
-	bluray? ( >=media-libs/libbluray-0.2.1 )
-	bs2b? ( media-libs/libbs2b )
-	cdio? (
-		|| (
-			dev-libs/libcdio-paranoia
-			<dev-libs/libcdio-0.90[-minimal]
-		)
-	)
-	dvb? ( virtual/linuxtv-dvb-headers )
-	dvd? (
-		>=media-libs/libdvdread-4.1.3
-		dvdnav? ( >=media-libs/libdvdnav-4.2.0 )
-	)
-	enca? ( app-i18n/enca )
-	iconv? ( virtual/libiconv )
-	jack? ( media-sound/jack-audio-connection-kit )
-	jpeg? ( virtual/jpeg )
-	ladspa? ( media-libs/ladspa-sdk )
-	libass? (
-		>=media-libs/libass-0.9.10:=[enca?,fontconfig]
-		virtual/ttf-fonts
-	)
-	libcaca? ( >=media-libs/libcaca-0.99_beta18 )
-	libguess? ( >=app-i18n/libguess-1.0 )
-	lirc? ( app-misc/lirc )
-	lua? (
-		!luajit? ( >=dev-lang/lua-5.1 )
-		luajit? ( dev-lang/luajit:2 )
-	)
-	mpg123? ( >=media-sound/mpg123-1.14.0 )
-	openal? ( >=media-libs/openal-1.13 )
-	portaudio? ( >=media-libs/portaudio-19_pre20111121 )
-	postproc? (
-		|| (
-			media-libs/libpostproc
-			>=media-video/ffmpeg-1.2:0[encode?,threads,vaapi?,vdpau?]
-		)
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	quvi? (
-		>=media-libs/libquvi-0.4.1:=
-		|| (
-			>=media-video/libav-9[network]
-			>=media-video/ffmpeg-1.2:0[network]
-		)
-	)
-	samba? ( net-fs/samba )
-	v4l? ( media-libs/libv4l )
-	wayland? (
-		>=dev-libs/wayland-1.2.0
-		media-libs/mesa[egl,wayland]
-		>=x11-libs/libxkbcommon-0.3.0
-	)
-"
-ASM_DEP="dev-lang/yasm"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-lang/perl-5.8
-	dev-python/docutils
-	doc-pdf? (
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-latexextra
-		dev-tex/xcolor
-	)
-	X? (
-		x11-proto/videoproto
-		x11-proto/xf86vidmodeproto
-		xinerama? ( x11-proto/xineramaproto )
-		xscreensaver? ( x11-proto/scrnsaverproto )
-	)
-	amd64? ( ${ASM_DEP} )
-	x86? ( ${ASM_DEP} )
-	x86-fbsd? ( ${ASM_DEP} )
-"
-DOCS=( Copyright README.md etc/example.conf etc/input.conf )
-
-pkg_setup() {
-	if use !libass; then
-		ewarn
-		ewarn "You've disabled the libass flag. No OSD or subtitles will be displayed."
-	fi
-
-	einfo "For additional format support you need to enable the support on your"
-	einfo "libavcodec/libavformat provider:"
-	einfo "    media-video/libav or media-video/ffmpeg"
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]]; then
-		git-r3_src_unpack
-	else
-		default_src_unpack
-	fi
-
-	cp "${DISTDIR}"/waf-1.7.13 "${S}"/waf || die
-	chmod 0755 "${S}"/waf || die
-}
-
-src_prepare() {
-	base_src_prepare
-}
-
-src_configure() {
-	# keep build reproducible
-	# do not add -g to CFLAGS
-	# SDL output is fallback for platforms where nothing better is available
-	# media-sound/rsound is in pro-audio overlay only
-	waf-utils_src_configure \
-		--disable-build-date \
-		--disable-debug-build \
-		--disable-sdl \
-		--disable-sdl2 \
-		--disable-rsound \
-		$(use_enable encode encoding) \
-		$(use_enable joystick) \
-		$(use_enable bluray libbluray) \
-		$(use_enable vcd) \
-		$(use_enable quvi libquvi) \
-		$(use_enable samba libsmbclient) \
-		$(use_enable lirc) \
-		$(use_enable lua) \
-		$(usex luajit '--lua=luajit' '') \
-		$(use_enable doc-pdf pdf-build) \
-		$(use_enable vf-dlopen vf-dlopen-filters) \
-		$(use_enable cdio cdda) \
-		$(use_enable dvd dvdread) \
-		$(use_enable dvdnav) \
-		$(use_enable enca) \
-		$(use_enable iconv) \
-		$(use_enable libass) \
-		$(use_enable libguess) \
-		$(use_enable dvb) \
-		$(use_enable pvr) \
-		$(use_enable v4l libv4l2) \
-		$(use_enable v4l tv) \
-		$(use_enable v4l tv-v4l2) \
-		$(use_enable radio) \
-		$(use_enable radio radio-capture) \
-		$(use_enable radio radio-v4l2) \
-		$(use_enable mpg123) \
-		$(use_enable jpeg) \
-		$(use_enable libcaca caca) \
-		$(use_enable postproc libpostproc) \
-		$(use_enable alsa) \
-		$(use_enable jack) \
-		$(use_enable ladspa) \
-		$(use_enable portaudio) \
-		$(use_enable bs2b libbs2b) \
-		$(use_enable openal) \
-		$(use_enable oss oss-audio) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable shm) \
-		$(use_enable X x11) \
-		$(use_enable vaapi) \
-		$(use_enable vdpau) \
-		$(use_enable wayland) \
-		$(use_enable xinerama) \
-		$(use_enable xv) \
-		$(use_enable opengl gl) \
-		$(use_enable lcms lcms2) \
-		$(use_enable xscreensaver xss) \
-		--confdir="${EPREFIX}"/etc/${PN} \
-		--mandir="${EPREFIX}"/usr/share/man \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-}
-
-src_install() {
-	waf-utils_src_install
-
-	if use luajit; then
-		pax-mark -m "${ED}"usr/bin/mpv
-	fi
-}
diff --git a/media-video/mpv/mpv-0.3.5.ebuild b/media-video/mpv/mpv-0.3.5.ebuild
deleted file mode 100644
index d7110d9d..00000000
--- a/media-video/mpv/mpv-0.3.5.ebuild
+++ /dev/null
@@ -1,236 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-0.3.5.ebuild,v 1.1 2014/02/13 17:45:33 tomwij Exp $
-
-EAPI=5
-
-EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
-
-inherit base waf-utils pax-utils
-[[ ${PV} == *9999* ]] && inherit git-r3
-
-DESCRIPTION="Video player based on MPlayer/mplayer2"
-HOMEPAGE="http://mpv.io/"
-SRC_URI="https://waf.googlecode.com/files/waf-1.7.13"
-[[ ${PV} == *9999* ]] || \
-SRC_URI+=" https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE="+alsa bluray bs2b +cdio -doc-pdf dvb +dvd dvdnav +enca encode +iconv jack -joystick
-jpeg ladspa lcms +libass libcaca libguess lirc lua luajit +mpg123 -openal +opengl
-oss portaudio +postproc pulseaudio pvr +quvi -radio samba +shm v4l vaapi vcd vdpau
-vf-dlopen wayland +X xinerama +xscreensaver +xv"
-
-REQUIRED_USE="
-	dvdnav? ( dvd )
-	enca? ( iconv )
-	lcms? ( opengl )
-	libguess? ( iconv )
-	luajit? ( lua )
-	opengl? ( || ( wayland X ) )
-	pvr? ( v4l )
-	radio? ( v4l || ( alsa oss ) )
-	vaapi? ( X )
-	vdpau? ( X )
-	wayland? ( opengl )
-	xinerama? ( X )
-	xscreensaver? ( X )
-	xv? ( X )
-"
-
-RDEPEND+="
-	|| (
-		>=media-video/libav-9:=[encode?,threads,vaapi?,vdpau?]
-		>=media-video/ffmpeg-1.2:0=[encode?,threads,vaapi?,vdpau?]
-	)
-	sys-libs/ncurses
-	sys-libs/zlib
-	X? (
-		x11-libs/libXext
-		x11-libs/libXxf86vm
-		opengl? ( virtual/opengl )
-		lcms? ( media-libs/lcms:2 )
-		vaapi? ( >=x11-libs/libva-0.34.0[X(+)] )
-		vdpau? ( >=x11-libs/libvdpau-0.2 )
-		xinerama? ( x11-libs/libXinerama )
-		xscreensaver? ( x11-libs/libXScrnSaver )
-		xv? ( x11-libs/libXv )
-	)
-	alsa? ( media-libs/alsa-lib )
-	bluray? ( >=media-libs/libbluray-0.2.1 )
-	bs2b? ( media-libs/libbs2b )
-	cdio? (
-		|| (
-			dev-libs/libcdio-paranoia
-			<dev-libs/libcdio-0.90[-minimal]
-		)
-	)
-	dvb? ( virtual/linuxtv-dvb-headers )
-	dvd? (
-		>=media-libs/libdvdread-4.1.3
-		dvdnav? ( >=media-libs/libdvdnav-4.2.0 )
-	)
-	enca? ( app-i18n/enca )
-	iconv? ( virtual/libiconv )
-	jack? ( media-sound/jack-audio-connection-kit )
-	jpeg? ( virtual/jpeg )
-	ladspa? ( media-libs/ladspa-sdk )
-	libass? (
-		>=media-libs/libass-0.9.10:=[enca?,fontconfig]
-		virtual/ttf-fonts
-	)
-	libcaca? ( >=media-libs/libcaca-0.99_beta18 )
-	libguess? ( >=app-i18n/libguess-1.0 )
-	lirc? ( app-misc/lirc )
-	lua? (
-		!luajit? ( >=dev-lang/lua-5.1 )
-		luajit? ( dev-lang/luajit:2 )
-	)
-	mpg123? ( >=media-sound/mpg123-1.14.0 )
-	openal? ( >=media-libs/openal-1.13 )
-	portaudio? ( >=media-libs/portaudio-19_pre20111121 )
-	postproc? (
-		|| (
-			media-libs/libpostproc
-			>=media-video/ffmpeg-1.2:0[encode?,threads,vaapi?,vdpau?]
-		)
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	quvi? (
-		>=media-libs/libquvi-0.4.1:=
-		|| (
-			>=media-video/libav-9[network]
-			>=media-video/ffmpeg-1.2:0[network]
-		)
-	)
-	samba? ( net-fs/samba )
-	v4l? ( media-libs/libv4l )
-	wayland? (
-		>=dev-libs/wayland-1.3.0
-		media-libs/mesa[egl,wayland]
-		>=x11-libs/libxkbcommon-0.3.0
-	)
-"
-ASM_DEP="dev-lang/yasm"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-lang/perl-5.8
-	dev-python/docutils
-	doc-pdf? (
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-latexextra
-		dev-tex/xcolor
-	)
-	X? (
-		x11-proto/videoproto
-		x11-proto/xf86vidmodeproto
-		xinerama? ( x11-proto/xineramaproto )
-		xscreensaver? ( x11-proto/scrnsaverproto )
-	)
-	amd64? ( ${ASM_DEP} )
-	x86? ( ${ASM_DEP} )
-	x86-fbsd? ( ${ASM_DEP} )
-"
-DOCS=( Copyright README.md etc/example.conf etc/input.conf )
-
-pkg_setup() {
-	if use !libass; then
-		ewarn
-		ewarn "You've disabled the libass flag. No OSD or subtitles will be displayed."
-	fi
-
-	einfo "For additional format support you need to enable the support on your"
-	einfo "libavcodec/libavformat provider:"
-	einfo "    media-video/libav or media-video/ffmpeg"
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]]; then
-		git-r3_src_unpack
-	else
-		default_src_unpack
-	fi
-
-	cp "${DISTDIR}"/waf-1.7.13 "${S}"/waf || die
-	chmod 0755 "${S}"/waf || die
-}
-
-src_prepare() {
-	base_src_prepare
-}
-
-src_configure() {
-	# keep build reproducible
-	# do not add -g to CFLAGS
-	# SDL output is fallback for platforms where nothing better is available
-	# media-sound/rsound is in pro-audio overlay only
-	waf-utils_src_configure \
-		--disable-build-date \
-		--disable-debug-build \
-		--disable-sdl \
-		--disable-sdl2 \
-		--disable-rsound \
-		$(use_enable encode encoding) \
-		$(use_enable joystick) \
-		$(use_enable bluray libbluray) \
-		$(use_enable vcd) \
-		$(use_enable quvi libquvi) \
-		$(use_enable samba libsmbclient) \
-		$(use_enable lirc) \
-		$(use_enable lua) \
-		$(usex luajit '--lua=luajit' '') \
-		$(use_enable doc-pdf pdf-build) \
-		$(use_enable vf-dlopen vf-dlopen-filters) \
-		$(use_enable cdio cdda) \
-		$(use_enable dvd dvdread) \
-		$(use_enable dvdnav) \
-		$(use_enable enca) \
-		$(use_enable iconv) \
-		$(use_enable libass) \
-		$(use_enable libguess) \
-		$(use_enable dvb) \
-		$(use_enable pvr) \
-		$(use_enable v4l libv4l2) \
-		$(use_enable v4l tv) \
-		$(use_enable v4l tv-v4l2) \
-		$(use_enable radio) \
-		$(use_enable radio radio-capture) \
-		$(use_enable radio radio-v4l2) \
-		$(use_enable mpg123) \
-		$(use_enable jpeg) \
-		$(use_enable libcaca caca) \
-		$(use_enable postproc libpostproc) \
-		$(use_enable alsa) \
-		$(use_enable jack) \
-		$(use_enable ladspa) \
-		$(use_enable portaudio) \
-		$(use_enable bs2b libbs2b) \
-		$(use_enable openal) \
-		$(use_enable oss oss-audio) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable shm) \
-		$(use_enable X x11) \
-		$(use_enable vaapi) \
-		$(use_enable vdpau) \
-		$(use_enable wayland) \
-		$(use_enable xinerama) \
-		$(use_enable xv) \
-		$(use_enable opengl gl) \
-		$(use_enable lcms lcms2) \
-		$(use_enable xscreensaver xss) \
-		--confdir="${EPREFIX}"/etc/${PN} \
-		--mandir="${EPREFIX}"/usr/share/man \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-}
-
-src_install() {
-	waf-utils_src_install
-
-	if use luajit; then
-		pax-mark -m "${ED}"usr/bin/mpv
-	fi
-}
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
deleted file mode 100644
index 1b9ceefe..00000000
--- a/media-video/mpv/mpv-9999.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-9999.ebuild,v 1.39 2014/01/25 13:29:24 scarabeus Exp $
-
-EAPI=5
-
-EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
-
-inherit base waf-utils pax-utils
-[[ ${PV} == *9999* ]] && inherit git-r3
-
-DESCRIPTION="Video player based on MPlayer/mplayer2"
-HOMEPAGE="http://mpv.io/"
-SRC_URI="https://waf.googlecode.com/files/waf-1.7.13"
-[[ ${PV} == *9999* ]] || \
-SRC_URI+=" https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE="+alsa bluray bs2b +cdio -doc-pdf dvb +dvd dvdnav +enca encode +iconv jack -joystick
-jpeg ladspa lcms +libass libcaca libguess lirc lua luajit +mpg123 -openal +opengl
-oss portaudio +postproc pulseaudio pvr +quvi -radio samba +shm v4l vaapi vcd vdpau
-vf-dlopen wayland +X xinerama +xscreensaver +xv"
-
-REQUIRED_USE="
-	dvdnav? ( dvd )
-	enca? ( iconv )
-	lcms? ( opengl )
-	libguess? ( iconv )
-	luajit? ( lua )
-	opengl? ( || ( wayland X ) )
-	pvr? ( v4l )
-	radio? ( v4l || ( alsa oss ) )
-	vaapi? ( X )
-	vdpau? ( X )
-	wayland? ( opengl )
-	xinerama? ( X )
-	xscreensaver? ( X )
-	xv? ( X )
-"
-
-RDEPEND+="
-	|| (
-		>=media-video/libav-9:=[encode?,threads,vaapi?,vdpau?]
-		>=media-video/ffmpeg-1.2:0=[encode?,threads,vaapi?,vdpau?]
-	)
-	sys-libs/ncurses
-	sys-libs/zlib
-	X? (
-		x11-libs/libXext
-		x11-libs/libXxf86vm
-		opengl? ( virtual/opengl )
-		lcms? ( media-libs/lcms:2 )
-		vaapi? ( >=x11-libs/libva-0.34.0[X(+)] )
-		vdpau? ( >=x11-libs/libvdpau-0.2 )
-		xinerama? ( x11-libs/libXinerama )
-		xscreensaver? ( x11-libs/libXScrnSaver )
-		xv? ( x11-libs/libXv )
-	)
-	alsa? ( media-libs/alsa-lib )
-	bluray? ( >=media-libs/libbluray-0.2.1 )
-	bs2b? ( media-libs/libbs2b )
-	cdio? (
-		|| (
-			dev-libs/libcdio-paranoia
-			<dev-libs/libcdio-0.90[-minimal]
-		)
-	)
-	dvb? ( virtual/linuxtv-dvb-headers )
-	dvd? (
-		>=media-libs/libdvdread-4.1.3
-		dvdnav? ( >=media-libs/libdvdnav-4.2.0 )
-	)
-	enca? ( app-i18n/enca )
-	iconv? ( virtual/libiconv )
-	jack? ( media-sound/jack-audio-connection-kit )
-	jpeg? ( virtual/jpeg )
-	ladspa? ( media-libs/ladspa-sdk )
-	libass? (
-		>=media-libs/libass-0.9.10:=[enca?,fontconfig]
-		virtual/ttf-fonts
-	)
-	libcaca? ( >=media-libs/libcaca-0.99_beta18 )
-	libguess? ( >=app-i18n/libguess-1.0 )
-	lirc? ( app-misc/lirc )
-	lua? (
-		!luajit? ( >=dev-lang/lua-5.1 )
-		luajit? ( dev-lang/luajit:2 )
-	)
-	mpg123? ( >=media-sound/mpg123-1.14.0 )
-	openal? ( >=media-libs/openal-1.13 )
-	portaudio? ( >=media-libs/portaudio-19_pre20111121 )
-	postproc? (
-		|| (
-			media-libs/libpostproc
-			>=media-video/ffmpeg-1.2:0[encode?,threads,vaapi?,vdpau?]
-		)
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	quvi? (
-		>=media-libs/libquvi-0.4.1:=
-		|| (
-			>=media-video/libav-9[network]
-			>=media-video/ffmpeg-1.2:0[network]
-		)
-	)
-	samba? ( net-fs/samba )
-	v4l? ( media-libs/libv4l )
-	wayland? (
-		>=dev-libs/wayland-1.2.0
-		media-libs/mesa[egl,wayland]
-		>=x11-libs/libxkbcommon-0.3.0
-	)
-"
-ASM_DEP="dev-lang/yasm"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-lang/perl-5.8
-	dev-python/docutils
-	doc-pdf? ( dev-python/rst2pdf )
-	X? (
-		x11-proto/videoproto
-		x11-proto/xf86vidmodeproto
-		xinerama? ( x11-proto/xineramaproto )
-		xscreensaver? ( x11-proto/scrnsaverproto )
-	)
-	amd64? ( ${ASM_DEP} )
-	x86? ( ${ASM_DEP} )
-	x86-fbsd? ( ${ASM_DEP} )
-"
-DOCS=( Copyright README.md etc/example.conf etc/input.conf )
-
-pkg_setup() {
-	if use !libass; then
-		ewarn
-		ewarn "You've disabled the libass flag. No OSD or subtitles will be displayed."
-	fi
-
-	einfo "For additional format support you need to enable the support on your"
-	einfo "libavcodec/libavformat provider:"
-	einfo "    media-video/libav or media-video/ffmpeg"
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]]; then
-		git-r3_src_unpack
-	else
-		default_src_unpack
-	fi
-
-	cp "${DISTDIR}"/waf-1.7.13 "${S}"/waf || die
-	chmod 0755 "${S}"/waf || die
-}
-
-src_prepare() {
-	base_src_prepare
-}
-
-src_configure() {
-	# keep build reproducible
-	# do not add -g to CFLAGS
-	# SDL output is fallback for platforms where nothing better is available
-	# media-sound/rsound is in pro-audio overlay only
-	waf-utils_src_configure \
-		--disable-build-date \
-		--disable-debug-build \
-		--disable-sdl1 \
-		--disable-sdl2 \
-		--disable-rsound \
-		$(use_enable encode encoding) \
-		$(use_enable joystick) \
-		$(use_enable bluray libbluray) \
-		$(use_enable vcd) \
-		$(use_enable quvi libquvi) \
-		$(use_enable samba libsmbclient) \
-		$(use_enable lirc) \
-		$(use_enable lua) \
-		$(usex luajit '--lua=luajit' '') \
-		$(use_enable doc-pdf pdf-build) \
-		$(use_enable vf-dlopen vf-dlopen-filters) \
-		$(use_enable cdio cdda) \
-		$(use_enable dvd dvdread) \
-		$(use_enable dvdnav) \
-		$(use_enable enca) \
-		$(use_enable iconv) \
-		$(use_enable libass) \
-		$(use_enable libguess) \
-		$(use_enable dvb) \
-		$(use_enable pvr) \
-		$(use_enable v4l libv4l2) \
-		$(use_enable v4l tv) \
-		$(use_enable v4l tv-v4l2) \
-		$(use_enable radio) \
-		$(use_enable radio radio-capture) \
-		$(use_enable radio radio-v4l2) \
-		$(use_enable mpg123) \
-		$(use_enable jpeg) \
-		$(use_enable libcaca caca) \
-		$(use_enable postproc libpostproc) \
-		$(use_enable alsa) \
-		$(use_enable jack) \
-		$(use_enable ladspa) \
-		$(use_enable portaudio) \
-		$(use_enable bs2b libbs2b) \
-		$(use_enable openal) \
-		$(use_enable oss oss-audio) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable shm) \
-		$(use_enable X x11) \
-		$(use_enable vaapi) \
-		$(use_enable vdpau) \
-		$(use_enable wayland) \
-		$(use_enable xinerama) \
-		$(use_enable xv) \
-		$(use_enable opengl gl) \
-		$(use_enable lcms lcms2) \
-		$(use_enable xscreensaver xss) \
-		--confdir="${EPREFIX}"/etc/${PN} \
-		--mandir="${EPREFIX}"/usr/share/man \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-}
-
-src_install() {
-	waf-utils_src_install
-
-	if use luajit; then
-		pax-mark -m "${ED}"usr/bin/mpv
-	fi
-}
diff --git a/media-video/smtube/Manifest b/media-video/smtube/Manifest
new file mode 100644
index 00000000..38ffc75b
--- /dev/null
+++ b/media-video/smtube/Manifest
@@ -0,0 +1 @@
+DIST smtube-15.5.17.tar.bz2 652324 SHA256 cf2f5b0b978c31f0580bf67ea10c95f42c4475ad74fde5031a67856503997149 SHA512 5257f703f84140d70aea8073d0363ce8a1415364ce21b974adba08d86d2324de5600cde7f69bc8b7e3f2fc9650e81e884763524ef33fec139f6f4b16736d8566 WHIRLPOOL 06a8fc0313585e5d6374d3bea723efe913ac822ce446fe5d5d93d7f431eef9b3e97665e243ce7b8bd4cac4132f15d5ea1730403ec223b8823421d647ddc06388
diff --git a/media-video/smtube/smtube-15.5.17.ebuild b/media-video/smtube/smtube-15.5.17.ebuild
new file mode 100644
index 00000000..2cb42877
--- /dev/null
+++ b/media-video/smtube/smtube-15.5.17.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+#
+EAPI=5
+
+PLOCALES="en es de eu fr gl it ja ko pt pt_BR ru sr zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit l10n qt4-r2
+
+DESCRIPTION="YouTube Browser for SMPlayer"
+HOMEPAGE="http://smplayer.sourceforge.net/smtube"
+SRC_URI="mirror://sourceforge/smtube/${P}.tar.bz2"
+KEYWORDS="amd64 x86"
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-qt/qtcore:4
+	dev-qt/qtgui:4"
+RDEPEND="${DEPEND}
+	|| ( media-video/mpv media-video/smplayer media-video/mplayer media-video/vlc kde-base/dragon media-video/totem media-video/gnome-mplayer )"
+
+src_prepare() {
+	eqmake4 src/${PN}.pro
+}
+
+gen_translation() {
+	lrelease ${PN}_${1}.ts
+	eend $? || die "failed to generate $1 translation"
+}
+
+src_compile() {
+	emake
+
+	cd "${S}"/src/translations
+	l10n_for_each_locale_do gen_translation
+}
+
+install_locale() {
+	insinto /usr/share/${PN}/translations
+	doins "${S}"/src/translations/${PN}_${1}.qm
+	eend $? || die "failed to install $1 translation"
+}
+
+src_install() {
+	dobin ${PN}
+	domenu ${PN}.desktop
+	newicon icons/${PN}_64.png ${PN}.png
+	dodoc Changelog
+
+	l10n_for_each_locale_do install_locale
+}