Version bump wrt bug #530796; Thanks to Nikoli

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0xC42EB5D6

5 files changed, 393 insertions, 108 deletions

diff --git a/media-video/mpv/ChangeLog b/media-video/mpv/ChangeLog
index ba60d340006d..7546532f4c2e 100644
--- a/media-video/mpv/ChangeLog
+++ b/media-video/mpv/ChangeLog
@@ -1,6 +1,12 @@
 # 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.105 2014/11/29 11:39:05 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.106 2014/11/29 11:51:06 zlogene Exp $
+
+*mpv-0.7.0 (29 Nov 2014)
+
+  29 Nov 2014; Mikle Kolyada <zlogene@gentoo.org> +mpv-0.7.0.ebuild,
+  metadata.xml, mpv-9999.ebuild:
+  Version bump wrt bug #530796; Thanks to Nikoli
 
   29 Nov 2014; Mikle Kolyada <zlogene@gentoo.org> -mpv-0.4.2.ebuild,
   -mpv-0.5.4.ebuild:
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 77fca5266108..7d2cac80ffeb 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -6,6 +6,7 @@ DIST mpv-0.3.10.tar.gz 2520710 SHA256 ec1d9751f9c43f66e13a988c94748ee2e1d8188498
 DIST mpv-0.3.11.tar.gz 2521150 SHA256 c686adb4820be32ff59bbcd64adaeebd2ac71cad762c50b6105f6e7424d72af2 SHA512 da4a55af98f178624ec66e48e314f045b61aef75fc9b654f39011879b0eb5b59a86870b9ed05bc11b831fbb5ec2084c5e842743d3040a155713a802908816374 WHIRLPOOL 18a6cd9436b3c2b5f18b95c974cbe79ff4c073b1d7403d35b77d091c18dcac9e17b03386a020e1c21db4727bfa3fa8e301f7f7dc3863cdf14fa4f9c653ab6952
 DIST mpv-0.6.1.tar.gz 2599417 SHA256 3a3127bb2989b205c065fbfe33334b1253f857732755706c2675b7b0f6d67f0f SHA512 e8b93088b57f36617d87d7b119ef4cba203cb4ddeb51cb4d3514a6c0ce4b8db3440c76d4ff6161ef221e4c63d6712402d5716da08c0802b839bf0803f01e1ff0 WHIRLPOOL c49d349b3e0673be37da890a2acf2f5e0d335503ddece909531495b09c4a7cbff9a13b6a491baf8dc06789d3fdd49fad209fd76ba8e2d1abbff4f3dab88b4bc6
 DIST mpv-0.6.2.tar.gz 2599876 SHA256 20532f6a2c37fc06711d05b77e3fbafb4759e3de00f0294ca70645e4f68882e8 SHA512 0b595bd8c63618bda19786bbb355a033189e1dfb77da63716eff7d98642f23b248ed147bd62b97a6f7c6c9d0d8c6965f7c402c8c768d2d00b91b2610c74e8eb6 WHIRLPOOL d816eb74f3944ac82d50d908fd65a514231e4a6385c55736703f33ddc5ddd01087ecda45347f247a6a2f93b6fc91e352ffa6dc8fe5b5a3634ef025e06c56a27e
+DIST mpv-0.7.0.tar.gz 2656413 SHA256 1d79482c826ee69b505ffe2d01f12b0226e36adb42a9aa9e20e4294fc86de867 SHA512 2aec6b91f01defe5999bc724b6c48cc6cad2ffd15d01105926fd6ba599318990d8a7904c07f2372d0f2121b9364b1e0a4cf268583c056850835b5991c6a88a45 WHIRLPOOL ae222bb7598a0f35f2891b9b1d81c7601692474957778f47b43f5399e940c9cf4ae49eccd18b0c196f744d5e08d613a1d121a36b7cf5c7296126f52501c879bd
 DIST waf-1.7.15 90909 SHA256 e5ae7028f9b2d8ce1acb9fe1092e8010a90ba764d3ac065ea4e846743290b1d6 SHA512 5d6f75a7a81d369512c6bf70ae14c5275cfdc2b273a5801d7ee928a829ca472aac5ee9f9f2542af6369f34c1648dd12e42112efc29d602527b9ba58a311b4c17 WHIRLPOOL 84048737d1ba746454212e13696ba34d9fc722c74823f719503e29123e33869a49742fba02e24212e3f67e045c5499cf1893bbd191bf8df1dd5cae05a517a17c
 DIST waf-1.7.16 91846 SHA256 b64dc26c882572415fd450b745006107965f3fe17b357e3eb43d6676c9635a61 SHA512 ccdf27cac76f525e11bde20d01c3f81b738b4c990934ee290a390fcf1b278da05047bcee76973c80be4557689344f6df33c13e232b278258745e2f19eeed5ebf WHIRLPOOL 79b59876606a93c7a13548799c8797f40515cbf8bc2944018de758df3e8cd9698e4304d5d26a03ae883195ec02d6e0b12e6fc7160e4ef31446d7c3d05f98983a
 DIST waf-1.8.1 95817 SHA256 ec658116ba0b96629d91fde0b32321849e866e0819f1e835c4c2c7f7ffe1a21d SHA512 d204460b61a8d1af5634ccac486a6693ded0213c7db5ba96d133431f1655e4a1c289b3d0201c7ff785dc36bda4f50dcc56c35e3f06f3c53240683412bd96fcd9 WHIRLPOOL 00f989c82504f3fbb94802dc3bdb23a0b1f45826e0098f2726db066ed69cf12172e30fb1eb0cb21dc04cc1ba0785a5c7b2b992e105ce3b4120621568dbbaa101
@@ -13,15 +14,16 @@ EBUILD mpv-0.3.10.ebuild 6293 SHA256 4b64413e0e85dff7364156f5898a61b6099e7b5e0f2
 EBUILD mpv-0.3.11.ebuild 6340 SHA256 204e76e82a38d54f81c5d78ff61532c318abda72fe9884beef83a0e41ade53c2 SHA512 4da16a4cb8f8ecea58730e334531b7aa381d44358fa560072fb060f846cb71106b3fa6922d504b938249f3a57fe20b4812e0d59f25501dcba7d0168f1c6f1dcc WHIRLPOOL b1ffc9229e4412ebe248c923189937aa388bf4734584eea970a6f93c978ae3ae11855ba68eb3aa0eb6581bb90b813e697bba71efb3f5e83410ff44675bb8ddaa
 EBUILD mpv-0.6.1.ebuild 6158 SHA256 2bc0df65a77ba3f4fab4d32c4f05515ca2bcc9c45cd9136036b1b07b79a8b532 SHA512 6bbb938de5d0d08d0b605d54de200ded183c1fd8716523251bedb67ebf9c04beea9a4f7a8fe244606ffb95e55b8bd619e7927c5982d0d3ec9c418dd4c3bb483c WHIRLPOOL 8b75322a84ea4f33fc05c1b4e5c5a8593a46f0e02422fd42a6ec83427debd1aa68ca29f409a153095e00a19b80a4f9ae969a4dca6b8f3f941b59d04ba78aec0d
 EBUILD mpv-0.6.2.ebuild 6157 SHA256 5568f9506f956453d89b1b95534c3f38ed84b24fcf101f7c7a59a36e70585a68 SHA512 bb1dbce5db75d3f372ed71d93f24a6973ba6a2970de4a778182330745dd50e55b35b3267e24c28119c617fb6785223c4d40eb2c5e355ccf27b1b5205290c88d5 WHIRLPOOL 5ed9aee765f1b53caeb94fc784cec5c46164d508fb24087ccaee720e82f00716bdcb35ebea3622320a5c58a830ecbc175dc108c213a403093ee90863c6d950ac
-EBUILD mpv-9999.ebuild 6067 SHA256 59bf4b60798a1f135cc8f465282431f2e901851417ab2a609b4807f0b4829904 SHA512 60b73997d4eb683e777ec7d0a0f2dbd5bdc5ba653197156e166a8103eef7fc254243e25f236eea859c26408525380b7b74c4fc81412a6c4633aac815b0fd87bb WHIRLPOOL ff2bda8a1ea0691def5413b15c6a0069e9bcbb25273cbabf8aa95d8edcf14bf9301ff878a8b26b441a8abd68f1e6ecf1ed87104f7aa8da44f51c90e1edc3cc0a
-MISC ChangeLog 16437 SHA256 d0f18e6d19868b15a769319658e10fc59808dff24472f4378c38229c15d81867 SHA512 ec81e52f2385e734142b751e912ff6ed9a1824783264df114b611200005585095ed235b00ff63beb4f345f41f98b75ad5811fab6350a7884017ce0a15603c70f WHIRLPOOL 5070922bb1c0ca96cef5d6830af74ffa1fb2a4fdaf713cdf04e0ae37d90a92a57a3724fae53f7efb2a517e78cf57ce289de068056363d434536302c15f510da0
-MISC metadata.xml 1789 SHA256 26fbda27a82c523c5a720c4290984f37529638559808285701dbf39b6d666a58 SHA512 e53cd794948a3d7c741f9044a7b7f30f91403fc7d64a2217b31773c9ebdd328906614e340b97e3d142689f13c65efec8dfb1b01c514a0dd679274d210f3b0391 WHIRLPOOL 7cc740c67d439fbbb4137b9ef6a3268ee7af86de870f9e718b25ed00f2d2ec1cce8314907ec31ca8145f01d0e4f7be4e5704bd1e03a6bf317209b5b2ebe3d874
+EBUILD mpv-0.7.0.ebuild 6723 SHA256 30325bce1f829a00c6f45188b53673c68a30fe83c93dce6934d1918da2677d71 SHA512 43c02bb06147663c68e6a40ae5c5970817b9b45bda4c950e908d28ea1c2a3c5e15ae4834366e74754b37df894fedefce6b42b22d4e3e7fc7937a3ccc2cc731f1 WHIRLPOOL 0b239fdb40ad7a483fbefb36b31045e3454b2073c09273c0a8d466dc18408cb4b46141d2023e1f878c8e89ee88f1e0b55dc0a69d85fce92977ac6b710b7c9044
+EBUILD mpv-9999.ebuild 6703 SHA256 84ee21d0e5a528714e4aa2bee381d7de551ead7a0200df4bc6fecd15399b8818 SHA512 e58d6e5a2d9ea99b1ed734fff64c8622dc0e25fe2b807a6fa6594a39b1297d6bc2154b194a1e3b97c8534175d1dde5fae28660458eff51ceaf0e25b0548e1dcf WHIRLPOOL 5f42025668e07a6d2c4493a6c76a949cfa1825a83deb68add10c2f719961bd7157eb792aeaca6806ae0416e1e0172e812afcf83924db8524ed8359b019ba72ec
+MISC ChangeLog 16615 SHA256 deac355ba09043b050b2dd4c8951ff81556fa32248291a3425a03c5f8b5e9803 SHA512 a6ce1560d5765eccf10f8958025a1a2954fe7cc02fbab10892b403f77f60f43af9edfe0539c39e351d372400f82419977092aad0f34b2047f80d5f0b0194724f WHIRLPOOL 2acc17b45a42d0fce6e867b9efb4d3c802a25fdcb20a8a5fee48710c5e617d19ad37fd82dbfe2e2ca45863a5ca7176b7724ed6911a702992be215785e6eedbde
+MISC metadata.xml 2108 SHA256 39bcc544502d7c993807bd23c19e4ce2fe0fd7f0fe0d58fb7f5e561a2242a1fe SHA512 551dfd3cf8a4cda46e7227884a647397140a32c678d19889ff7a6effafffa6259fea7ed19d82f5755d3e7376a0cbae485e70466ad300ec20b8e8e870baabbe9b WHIRLPOOL b3d918430180d11e4a9b90fbdfddc6ef34a493f413dba70e6115856b4f89d6caf8401cdd56dba269e734940e039da4d83eb8493515c6e664eaa687202643d8f4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iJwEAQEIAAYFAlR5sAIACgkQG9wOWsQutdaxzAQAlD5Ma3gT7erZHjzD02LKHTis
-rtypaoDKxkjz15ovp5Abr+0g73i2Qm4J0WhRwhfclqVq5JepjdgWd5oCby5gOqe7
-d9W1JTu/X9oBkJVe316S0FwHdB8mZO5lxBzjF8KkYClimOb9rrxldEGOc7pKBuWX
-X86OTJuD8OzFk0nYmD8=
-=imxT
+iJwEAQEIAAYFAlR5stMACgkQG9wOWsQutdbpeQP9HKuqWRDC0B/+aeXnsh4WHtHA
+i+EN5WP7rEBby7ZvBitXgpxX2HquoK2VU8NppcWRJsJ028D9BpTUk8GRXrFUnRCm
+V9Ct7RB3XlT0DWlfyO1uIyLLHpkUNyQw3dwRcCk+ZMKy4uao8h0kv066wH96gL4G
+6YYzZGl7BwgKY8xlyMM=
+=l+Sd
 -----END PGP SIGNATURE-----
diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml
index 6cfd8204693f..f16f5f5dcb23 100644
--- a/media-video/mpv/metadata.xml
+++ b/media-video/mpv/metadata.xml
@@ -8,35 +8,26 @@
 <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/libdvdnav</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="bs2b">Enable Bauer stereophonic-to-binaural headphone filter</flag>
+	<flag name="cli">Build mpv CLI player</flag>
+	<flag name="cdio">Enable CDDA support via <pkg>dev-libs/libcdio-paranoia</pkg></flag>
+	<flag name="doc-pdf">Build documentation in pdf format</flag>
+	<flag name="dvdnav">Enable support for DVD navigation using <pkg>media-libs/libdvdnav</pkg></flag>
+	<flag name="egl">Enable EGL backend for X11 OpenGL video output (experimental)</flag>
+	<flag name="enca">Enable support for charset discovery and conversion using <pkg>app-i18n/enca</pkg></flag>
+	<flag name="jpeg">Enable support for saving screenshots to JPEG format</flag>
+	<flag name="libguess">Enable support for charset discovery and conversion using <pkg>app-i18n/libguess</pkg></flag>
 	<flag name="libmpv">Build mpv shared library</flag>
-	<flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of
-		<pkg>dev-lang/lua</pkg></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="lua">Enable Lua scripting, OSC (On Screen Controller) GUI and <pkg>net-misc/youtube-dl</pkg> hook-script</flag>
+	<flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
+	<flag name="mpg123">Enable support for mp3 decoding via <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="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="sdl">Enable video and audio support via
-		<pkg>media-libs/libsdl2</pkg></flag>
+	<flag name="sdl">Enable <pkg>media-libs/libsdl2</pkg> based video and audio outputs</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>
+	<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.7.0.ebuild b/media-video/mpv/mpv-0.7.0.ebuild
new file mode 100644
index 000000000000..7f634f0d543e
--- /dev/null
+++ b/media-video/mpv/mpv-0.7.0.ebuild
@@ -0,0 +1,263 @@
+# 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.7.0.ebuild,v 1.1 2014/11/29 11:51:06 zlogene Exp $
+
+EAPI=5
+
+EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
+
+inherit eutils waf-utils pax-utils fdo-mime gnome2-utils
+[[ ${PV} == *9999* ]] && inherit git-r3
+
+WAF_V="1.8.1"
+
+DESCRIPTION="Video player based on MPlayer/mplayer2"
+HOMEPAGE="http://mpv.io/"
+SRC_URI="http://ftp.waf.io/pub/release/waf-${WAF_V}"
+[[ ${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 +cli -doc-pdf dvb +dvd dvdnav egl +enca encode
++iconv jack -joystick jpeg ladspa lcms +libass libcaca libguess libmpv lirc lua
+luajit +mpg123 -openal +opengl oss -portaudio postproc pulseaudio pvr samba -sdl
+selinux v4l vaapi vdpau vf-dlopen wayland +X xinerama +xscreensaver +xv"
+
+REQUIRED_USE="
+	|| ( cli libmpv )
+	dvdnav? ( dvd )
+	egl? ( opengl X )
+	enca? ( iconv )
+	lcms? ( opengl )
+	libguess? ( iconv )
+	luajit? ( lua )
+	opengl? ( || ( wayland X ) )
+	pvr? ( v4l )
+	vaapi? ( X )
+	vdpau? ( X )
+	wayland? ( opengl )
+	xinerama? ( X )
+	xscreensaver? ( X )
+	xv? ( X )
+"
+
+RDEPEND="
+	|| (
+		>=media-video/libav-10:=[encode?,threads,vaapi?,vdpau?]
+		>=media-video/ffmpeg-2.1.4:0=[encode?,threads,vaapi?,vdpau?]
+	)
+	sys-libs/zlib
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+		>=x11-libs/libXrandr-1.2.0
+		opengl? (
+			virtual/opengl
+			egl? ( media-libs/mesa[egl] )
+		)
+		lcms? ( >=media-libs/lcms-2.6:2 )
+		vaapi? ( >=x11-libs/libva-0.34.0[X(+),opengl?] )
+		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.3.0 )
+	bs2b? ( media-libs/libbs2b )
+	cdio? (
+		dev-libs/libcdio
+		dev-libs/libcdio-paranoia
+	)
+	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:0 )
+	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-10.20140517
+			>=media-video/ffmpeg-2.1.4:0
+		)
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	samba? ( net-fs/samba )
+	sdl? ( media-libs/libsdl2[threads] )
+	v4l? ( media-libs/libv4l )
+	wayland? (
+		>=dev-libs/wayland-1.6.0
+		media-libs/mesa[egl,wayland]
+		>=x11-libs/libxkbcommon-0.3.0
+	)
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=dev-lang/perl-5.8
+	dev-python/docutils
+	doc-pdf? ( dev-python/rst2pdf )
+	X? (
+		x11-proto/videoproto
+		xinerama? ( x11-proto/xineramaproto )
+		xscreensaver? ( x11-proto/scrnsaverproto )
+	)
+"
+RDEPEND+="
+	selinux? ( sec-policy/selinux-mplayer )
+"
+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-${WAF_V} "${S}"/waf || die
+	chmod 0755 "${S}"/waf || die
+}
+
+src_prepare() {
+	epatch_user
+}
+
+src_configure() {
+	local mywafargs=(
+		--confdir="${EPREFIX}"/etc/${PN}
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(usex cli '' '--disable-cplayer')
+		$(use_enable libmpv libmpv-shared)
+		--disable-libmpv-static
+		--disable-build-date	# keep build reproducible
+		--disable-optimize	# do not add '-O2' to CFLAGS
+		--disable-debug-build	# do not add '-g' to CFLAGS
+		$(use_enable doc-pdf pdf-build)
+		$(use_enable vf-dlopen vf-dlopen-filters)
+		$(use_enable cli zsh-comp)
+
+		# optional features
+		$(use_enable iconv)
+		$(use_enable libguess)
+		$(use_enable samba libsmbclient)
+		$(use_enable lua)
+		$(use_enable libass)
+		$(use_enable libass libass-osd)
+		$(use_enable encode encoding)
+		$(use_enable joystick)
+		$(use_enable lirc)
+		$(use_enable bluray libbluray)
+		$(use_enable dvd dvdread)
+		$(use_enable dvdnav)
+		$(use_enable cdio cdda)
+		$(use_enable enca)
+		$(use_enable mpg123)
+		$(use_enable ladspa)
+		$(use_enable bs2b libbs2b)
+		$(use_enable lcms lcms2)
+		--disable-vapoursynth	# vapoursynth is not packaged
+		--disable-vapoursynth-lazy
+		--enable-libavfilter
+		--enable-libavdevice
+		$(use_enable postproc libpostproc)
+		$(usex luajit '--lua=luajit' '')
+
+		# audio outputs
+		$(use_enable sdl sdl2)	# SDL output is fallback for platforms where nothing better is available
+		--disable-sdl1
+		$(use_enable oss oss-audio)
+		--disable-rsound	# media-sound/rsound is in pro-audio overlay only
+		$(use_enable pulseaudio pulse)
+		$(use_enable portaudio)
+		$(use_enable jack)
+		$(use_enable openal)
+		$(use_enable alsa)
+
+		# video outputs
+		$(use_enable wayland)
+		$(use_enable X x11)
+		$(use_enable xscreensaver xss)
+		$(use_enable X xext)
+		$(use_enable xv)
+		$(use_enable xinerama)
+		$(use_enable X xrandr)
+		$(usex X "$(use_enable opengl gl-x11)" '--disable-gl-x11')
+		$(use_enable egl egl-x11)
+		$(usex wayland "$(use_enable opengl gl-wayland)" '--disable-gl-wayland')
+		$(use_enable opengl gl)
+		$(use_enable vdpau)
+		$(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
+		$(use_enable vaapi)
+		$(use_enable vaapi vaapi-vpp)
+		$(usex vaapi "$(use_enable opengl vaapi-glx)" '--disable-vaapi-glx')
+		$(use_enable libcaca caca)
+		$(use_enable jpeg)
+
+		# hwaccels
+		$(use_enable vaapi vaapi-hwaccel)
+		$(use_enable vdpau vdpau-hwaccel)
+
+		# tv features
+		$(use_enable v4l tv)
+		$(use_enable v4l tv-v4l2)
+		$(use_enable v4l libv4l2)
+		$(use_enable pvr)
+		$(use_enable dvb)
+		$(use_enable dvb dvbin)
+	)
+	waf-utils_src_configure "${mywafargs[@]}"
+}
+
+src_install() {
+	waf-utils_src_install
+
+	if use cli && use luajit; then
+		pax-mark -m "${ED}"usr/bin/mpv
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index 9899699ef2ab..51a30a253cca 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -1,6 +1,6 @@
 # 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.59 2014/11/02 12:07:03 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-9999.ebuild,v 1.60 2014/11/29 11:51:06 zlogene Exp $
 
 EAPI=5
 
@@ -21,13 +21,15 @@ 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 libmpv lirc lua luajit +mpg123 -openal +opengl
-oss portaudio postproc pulseaudio pvr samba sdl selinux +shm v4l vaapi vdpau vf-dlopen
-wayland +X xinerama +xscreensaver +xv"
+IUSE="+alsa bluray bs2b cdio +cli -doc-pdf dvb +dvd dvdnav egl +enca encode
++iconv jack -joystick jpeg ladspa lcms +libass libcaca libguess libmpv lirc lua
+luajit +mpg123 -openal +opengl oss -portaudio postproc pulseaudio pvr samba -sdl
+selinux v4l vaapi vdpau vf-dlopen wayland +X xinerama +xscreensaver +xv"
 
 REQUIRED_USE="
+	|| ( cli libmpv )
 	dvdnav? ( dvd )
+	egl? ( opengl X )
 	enca? ( iconv )
 	lcms? ( opengl )
 	libguess? ( iconv )
@@ -42,7 +44,7 @@ REQUIRED_USE="
 	xv? ( X )
 "
 
-RDEPEND+="
+RDEPEND="
 	|| (
 		>=media-video/libav-10:=[encode?,threads,vaapi?,vdpau?]
 		>=media-video/ffmpeg-2.1.4:0=[encode?,threads,vaapi?,vdpau?]
@@ -52,9 +54,12 @@ RDEPEND+="
 		x11-libs/libX11
 		x11-libs/libXext
 		>=x11-libs/libXrandr-1.2.0
-		opengl? ( virtual/opengl )
+		opengl? (
+			virtual/opengl
+			egl? ( media-libs/mesa[egl] )
+		)
 		lcms? ( >=media-libs/lcms-2.6:2 )
-		vaapi? ( >=x11-libs/libva-0.34.0[X(+)] )
+		vaapi? ( >=x11-libs/libva-0.34.0[X(+),opengl?] )
 		vdpau? ( >=x11-libs/libvdpau-0.2 )
 		xinerama? ( x11-libs/libXinerama )
 		xscreensaver? ( x11-libs/libXScrnSaver )
@@ -150,76 +155,94 @@ 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
-	# vapoursynth is not packaged
-	waf-utils_src_configure \
-		--disable-build-date \
-		--disable-optimize \
-		--disable-debug-build \
-		--disable-sdl1 \
-		$(use_enable sdl sdl2) \
-		--disable-rsound \
-		--disable-vapoursynth \
-		$(use_enable encode encoding) \
-		$(use_enable joystick) \
-		$(use_enable bluray libbluray) \
-		$(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 libmpv libmpv-shared) \
-		$(use_enable dvb) \
-		$(use_enable pvr) \
-		$(use_enable v4l libv4l2) \
-		$(use_enable v4l tv) \
-		$(use_enable v4l tv-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 X xext) \
-		$(use_enable X xrandr) \
-		$(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} \
-		--enable-zsh-comp \
-		--zshdir="${EPREFIX}"/usr/share/zsh/site-functions
+	local mywafargs=(
+		--confdir="${EPREFIX}"/etc/${PN}
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(usex cli '' '--disable-cplayer')
+		$(use_enable libmpv libmpv-shared)
+		--disable-libmpv-static
+		--disable-build-date	# keep build reproducible
+		--disable-optimize	# do not add '-O2' to CFLAGS
+		--disable-debug-build	# do not add '-g' to CFLAGS
+		$(use_enable doc-pdf pdf-build)
+		$(use_enable vf-dlopen vf-dlopen-filters)
+		$(use_enable cli zsh-comp)
+
+		# optional features
+		$(use_enable iconv)
+		$(use_enable libguess)
+		$(use_enable samba libsmbclient)
+		$(use_enable lua)
+		$(use_enable libass)
+		$(use_enable libass libass-osd)
+		$(use_enable encode encoding)
+		$(use_enable joystick)
+		$(use_enable lirc)
+		$(use_enable bluray libbluray)
+		$(use_enable dvd dvdread)
+		$(use_enable dvdnav)
+		$(use_enable cdio cdda)
+		$(use_enable enca)
+		$(use_enable mpg123)
+		$(use_enable ladspa)
+		$(use_enable bs2b libbs2b)
+		$(use_enable lcms lcms2)
+		--disable-vapoursynth	# vapoursynth is not packaged
+		--disable-vapoursynth-lazy
+		--enable-libavfilter
+		--enable-libavdevice
+		$(use_enable postproc libpostproc)
+		$(usex luajit '--lua=luajit' '')
+
+		# audio outputs
+		$(use_enable sdl sdl2)	# SDL output is fallback for platforms where nothing better is available
+		--disable-sdl1
+		$(use_enable oss oss-audio)
+		--disable-rsound	# media-sound/rsound is in pro-audio overlay only
+		$(use_enable pulseaudio pulse)
+		$(use_enable portaudio)
+		$(use_enable jack)
+		$(use_enable openal)
+		$(use_enable alsa)
+
+		# video outputs
+		$(use_enable wayland)
+		$(use_enable X x11)
+		$(use_enable xscreensaver xss)
+		$(use_enable X xext)
+		$(use_enable xv)
+		$(use_enable xinerama)
+		$(use_enable X xrandr)
+		$(usex X "$(use_enable opengl gl-x11)" '--disable-gl-x11')
+		$(use_enable egl egl-x11)
+		$(usex wayland "$(use_enable opengl gl-wayland)" '--disable-gl-wayland')
+		$(use_enable opengl gl)
+		$(use_enable vdpau)
+		$(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
+		$(use_enable vaapi)
+		$(use_enable vaapi vaapi-vpp)
+		$(usex vaapi "$(use_enable opengl vaapi-glx)" '--disable-vaapi-glx')
+		$(use_enable libcaca caca)
+		$(use_enable jpeg)
+
+		# hwaccels
+		$(use_enable vaapi vaapi-hwaccel)
+		$(use_enable vdpau vdpau-hwaccel)
+
+		# tv features
+		$(use_enable v4l tv)
+		$(use_enable v4l tv-v4l2)
+		$(use_enable v4l libv4l2)
+		$(use_enable pvr)
+		$(use_enable dvb dvbin)
+	)
+	waf-utils_src_configure "${mywafargs[@]}"
 }
 
 src_install() {
 	waf-utils_src_install
 
-	if use luajit; then
+	if use cli && use luajit; then
 		pax-mark -m "${ED}"usr/bin/mpv
 	fi
 }