Bump to 0.4.0, bug #516458, add libmpv use flag, bug #516742. Thanks to Nikoli.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xF8DBDADE

7 files changed, 531 insertions, 14 deletions

diff --git a/media-video/mpv/ChangeLog b/media-video/mpv/ChangeLog
index 5e6f15ed3ab1..bce40579b6d5 100644
--- a/media-video/mpv/ChangeLog
+++ b/media-video/mpv/ChangeLog
@@ -1,6 +1,15 @@
 # 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.82 2014/07/08 18:16:27 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.83 2014/07/09 16:27:38 maksbotan Exp $
+
+*mpv-0.4.0 (09 Jul 2014)
+*mpv-0.3.11 (09 Jul 2014)
+
+  09 Jul 2014; Maxim Koltsov <maksbotan@gentoo.org>
+  +files/mpv-0.3.11-libav-9.patch, +mpv-0.3.11.ebuild, +mpv-0.4.0.ebuild,
+  metadata.xml, mpv-9999.ebuild:
+  Bump to 0.4.0, bug #516458, add libmpv use flag, bug #516742. Thanks to
+  Nikoli.
 
   08 Jul 2014; Mikle Kolyada <zlogene@gentoo.org> mpv-0.3.10.ebuild:
   amd64 stable wrt bug #514906
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 4405b7251ecd..d6dd33750edd 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,19 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX mpv-0.3.11-libav-9.patch 291 SHA256 971cdcaf866fcb5f1a93663357c582b474480f5fb1986eb2ba7d0f77b99c15d6 SHA512 2045d9e6550f43bf31b2bd68c35ef57a8bff392d1e70522e4085f275f333fc07cbe8bbbad7f7a7ae2979d177cb347e317e7c7eeb107707206a70016fcc5b8ccf WHIRLPOOL 35666ed94ceb001e62679bbac64a898a74a6e8285876fcbd3c8f40ac58b8978e993702f81e16fa2c98ed773b180d5cb04b5d0358ee3a150e9bbe1a2941764da4
 DIST mpv-0.3.10.tar.gz 2520710 SHA256 ec1d9751f9c43f66e13a988c94748ee2e1d8188498001f905213c9ccdf573fce SHA512 fdf84439747e24b4278f09427fc22d6497d2105cf94cd3c45dfb134af917f81c4748d618e962fb13a9db2b7a260a88a409590d10aae71ac987831bc3d293196e WHIRLPOOL d9a4eb6f01ee965b915e9064d75f710dd922a0db1e8a6b9655c844548bbde37c1cca1efd495c5d0f160b4b3823947c13e08e4634c6907fbd44abe758d0a6c552
+DIST mpv-0.3.11.tar.gz 2521150 SHA256 c686adb4820be32ff59bbcd64adaeebd2ac71cad762c50b6105f6e7424d72af2 SHA512 da4a55af98f178624ec66e48e314f045b61aef75fc9b654f39011879b0eb5b59a86870b9ed05bc11b831fbb5ec2084c5e842743d3040a155713a802908816374 WHIRLPOOL 18a6cd9436b3c2b5f18b95c974cbe79ff4c073b1d7403d35b77d091c18dcac9e17b03386a020e1c21db4727bfa3fa8e301f7f7dc3863cdf14fa4f9c653ab6952
+DIST mpv-0.4.0.tar.gz 2561446 SHA256 61bb893306fd4e0633d366b60ef0f5988af898dd49e6e87f69cbbe9dcfb49ece SHA512 67356b8e0bbff0ac2162ffb898e74aef81220e3da177a007b0243d9bf884c79b67460c2fe171ce1d78105c094965df4cfe4b4e2b6c04e3f95f366604e50bffa4 WHIRLPOOL d0b89c694f07fc0e89072e9749721c8a51b91f7f081cb915bb7c14e1682d300e4476078ae2154894542c36c3eca2e3913ea48056b3558bca850ad54e71cee8df
 DIST waf-1.7.15 90909 SHA256 e5ae7028f9b2d8ce1acb9fe1092e8010a90ba764d3ac065ea4e846743290b1d6 SHA512 5d6f75a7a81d369512c6bf70ae14c5275cfdc2b273a5801d7ee928a829ca472aac5ee9f9f2542af6369f34c1648dd12e42112efc29d602527b9ba58a311b4c17 WHIRLPOOL 84048737d1ba746454212e13696ba34d9fc722c74823f719503e29123e33869a49742fba02e24212e3f67e045c5499cf1893bbd191bf8df1dd5cae05a517a17c
 DIST waf-1.7.16 91846 SHA256 b64dc26c882572415fd450b745006107965f3fe17b357e3eb43d6676c9635a61 SHA512 ccdf27cac76f525e11bde20d01c3f81b738b4c990934ee290a390fcf1b278da05047bcee76973c80be4557689344f6df33c13e232b278258745e2f19eeed5ebf WHIRLPOOL 79b59876606a93c7a13548799c8797f40515cbf8bc2944018de758df3e8cd9698e4304d5d26a03ae883195ec02d6e0b12e6fc7160e4ef31446d7c3d05f98983a
 EBUILD mpv-0.3.10.ebuild 6287 SHA256 66686d6ab4acfd3f87d6e5dbe8c4e0edf5e58179acbfcf8381ed9922154fdb54 SHA512 e53e6242c742a611468728f05688055a3ea8c29b9e26c1bcc668576625ea218a4a7c0f1de04e423dd5eaf73b72f2e6ebcaa19dddace10a367b97e870348b3e6a WHIRLPOOL af46848b35cb3d3a3fb688ec5274f9af8cda3679a73540b6897e4f0983c4045d1f63874135ec9356c3fb44d1d8dca6d6e3a61c457756344446b3a12836f880a1
-EBUILD mpv-9999.ebuild 6184 SHA256 0d54ca1a7247d8b244c0de94afb56685c7ed54268aee839a1e73dfe91ec132d6 SHA512 8c2c5681ac91626d1a378c6d52a30b311d824498c96c2ec6053a16ceedf7b9f5c23a2cee1a457e253b5e9535416ef093d0fc7c8183101c801d14486d0c766f86 WHIRLPOOL 85ad2a992ce905b7362533a9d8d04a2c1f4c989b901bea1f561996c4b6825ca8674ae5217447ff16518e4390a995b370a3b83f00c98fd3a64b06284039f19684
-MISC ChangeLog 13146 SHA256 46a2bb3bc958babed8f8c5db79b75b1ae63f47d42e23a54f7c10f5d83ea5b60b SHA512 85a0f76ef5b7e897552dc86dcd76f82de45449e6c53e40469bf7316939a7d93d1e2ebc9ca1642e4964af5f7fdb1211ad07a83c9ed0f6dcb406ca93c6d24596c0 WHIRLPOOL 611d1c50fd3bd582cdc7627c8fa28e9537384f3458ffe25f44bc40594503c7dcdf17957f72b2389502db8ca2c31998dff1f852af2079ba7f852f79c9a841edb5
-MISC metadata.xml 1736 SHA256 0e4d2c19d37d4a7ac26b3fff974ad552ac10eccd805299fdbcfbb3dc70f104de SHA512 ed48c6ac83a88acb31f4686e3a34701ac0e45b12e4d61a7af352a4288057fe03d60fc0fa26b92ec54a016a4757af08d4609246f41f6626d4ff5cee9b04c176f8 WHIRLPOOL c7eab998ed1551b8286780d05103a2f7f9a77b37d85e320f5b2be5f68fa47eaef64337a5b2ecd0b0a0f851eda92b0b8de8bf3d3964192a48342483752d62aaa3
+EBUILD mpv-0.3.11.ebuild 6331 SHA256 62d3b900051619de87d7140cb40cbba88be2d02cc9e02d87b727659abb19beac SHA512 b95d2bfbcaa4f4d14f41132d6875f4d95707f415371d48d9e9ad348089dbd789f630c6e0d824b6941b486c60466da1330733c30c137b9c968a25f131e77aded6 WHIRLPOOL 1a78a4040251d7e0e31ec90da619c4cfca1d149f3e19aa684c1ee2b96713c1c778ceef8361d3a985282e1be1d6b660b25008177787078923b11edf6816a7c6fe
+EBUILD mpv-0.4.0.ebuild 6068 SHA256 6d2f0d199149c9ff46d3c51ed375de29a466abeeac290398fbe4dfb6329bb44d SHA512 7545421416f7433fbf1c119bf2d8626d87a8e3b596455a8e5e43741c1199942b4f188cbdf300fffa80a09c50d3e31fbe5e832e18d50fa13a6fe43bf031a3ab87 WHIRLPOOL 4f9d382b5b0e0145fdd4b992406f2d46c877f3d08f7e482ae852b185db4e631d490535cc5c9059ee8bd87e5d6c175d8ea870517a30093f8088c0d426a283e240
+EBUILD mpv-9999.ebuild 6068 SHA256 7c3eef997b3ac2e7491cbcfef7ac257650d50f746805852f49f1e60de1f8e15a SHA512 a8c1da8691e24fc8dee5b26cddc3fef76dea38ffbfd783b7c619eeb562d85f50db69b38e247c657be054e339ddeb3ecaa0d88205aed280f2e690442ab3193195 WHIRLPOOL 32352544cea1e96de4b0d637a5fee6a23cb54a04dde22d1e4d06cd273ae03fd7e8167683637d28b899aed3eac6a36c5e4211e6da77d8e1131d101b27bfb0b329
+MISC ChangeLog 13444 SHA256 11e9d76444adc0391dd3f8dcccb92bb2deda0e97479a33cc93f1e0a93c9748b7 SHA512 2a946c327b5d24f7b4b91f316b9598a9e41f85788fc25697421c1d93cb50d7d573b96ae0ed5d577805abda78c753f70dd4657ec714fb912e1e90b73ac21b51dd WHIRLPOOL 3d2fa0ec6991d04408de479b401afd4688628c1f47a31d053fd722bae1f04e7a6aea23eb546906da017eaec2951b9bf34a3c03576c3cd1e14c7686691b1385d2
+MISC metadata.xml 1792 SHA256 80e52b9165e182b2c1e9f20da64c1654389211ccaca77f49b455a9986f750f4f SHA512 f40994dc8a9b489939df7474a530fbed9b5b606750808b8ce090cb0720e864ebb6b1aa5dbdf057d12b231ca7f3727262c7e6565b81036b417b5821950caa0471 WHIRLPOOL e5708d7662065673b458d40ea84bc81e6c03973fc43b4aae5aac0ee179407c86f2f918a1b91eb54f1c16d561b7220416c10d5c6f64772ba31efa962fb93d956b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iJwEAQEIAAYFAlO8NrkACgkQG9wOWsQutdaeQgP/b8L0OG/mcLkUp5H9+P+nqBJO
-77NAIIbtnIxeSUEOO50gh0Q/GsjLZQYK1OevQGg3VRhscO6d6tI9OG13dL9XOPpb
-L2FrjVwW9UZvGJJ2pd5NmLQzuZ4AuzuymfP9TE1s9jaDVH4hWCc8ZVrLFGgak7KR
-HzrWgGY+6j67BJPWY98=
-=vR3Z
+iQEcBAEBCAAGBQJTvWz+AAoJEAmJmMX429renXgIAIEKoZbLrosam9iZjNE2ox9w
+NASYbc3fJC6acBWRP2QhSTTXtgNlOp8aoQTOTOwD4vs+0gj681Fphgd3gLWUV6L+
+WKcnhoPpRp8BS8OAoHp/9N/3gBnZNbv78QFl32qTXueg5b9wVY/YOth3Lr3+Dp6/
+BMgefIp248WMd4vWNeTiSt/nQE2GM7sXbxG/LJa/Gn+CJ1Fk/cnQpCFIWJlhgJn2
+vbkJz79zZh6mssYmRKVyt1Zjn6jVcFQ9RhM9TmTTEiQSMW9/0VHtDh07ko4zAHWt
+HL6qA3VIBG72XbZrWk8yd/PWi0dPxnZy+3ZWh8nJ04TFFmK0rpQ/kMt+oHJ71cA=
+=YKEg
 -----END PGP SIGNATURE-----
diff --git a/media-video/mpv/files/mpv-0.3.11-libav-9.patch b/media-video/mpv/files/mpv-0.3.11-libav-9.patch
new file mode 100644
index 000000000000..7ab6516ebf90
--- /dev/null
+++ b/media-video/mpv/files/mpv-0.3.11-libav-9.patch
@@ -0,0 +1,12 @@
+diff --git a/demux/demux.c b/demux/demux.c
+index 0649175..bd16a7a 100644
+--- a/demux/demux.c
++++ b/demux/demux.c
+@@ -43,6 +43,7 @@
+ #include "audio/format.h"
+ 
+ #include <libavcodec/avcodec.h>
++#include <libavutil/mem.h>
+ 
+ // Demuxer list
+ extern const struct demuxer_desc demuxer_desc_edl;
\ No newline at end of file
diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml
index 5fb8b8dae633..872433c8ce03 100644
--- a/media-video/mpv/metadata.xml
+++ b/media-video/mpv/metadata.xml
@@ -19,6 +19,7 @@
 		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="libmpv">Build libmpv 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
diff --git a/media-video/mpv/mpv-0.3.11.ebuild b/media-video/mpv/mpv-0.3.11.ebuild
new file mode 100644
index 000000000000..c74be5b59e79
--- /dev/null
+++ b/media-video/mpv/mpv-0.3.11.ebuild
@@ -0,0 +1,250 @@
+# 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.11.ebuild,v 1.1 2014/07/09 16:27:38 maksbotan 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.7.15"
+
+DESCRIPTION="Video player based on MPlayer/mplayer2"
+HOMEPAGE="http://mpv.io/"
+SRC_URI="https://waf.googlecode.com/files/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 -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 sdl selinux +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.10:=[encode?,threads,vaapi?,vdpau?]
+		>=media-video/ffmpeg-1.2.4:0=[encode?,threads,vaapi?,vdpau?]
+	)
+	sys-libs/ncurses
+	sys-libs/zlib
+	X? (
+		x11-libs/libX11
+		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
+		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
+			>=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.10[network]
+			>=media-video/ffmpeg-1.2.4:0[network]
+		)
+	)
+	samba? ( net-fs/samba )
+	sdl? ( media-libs/libsdl2[threads] )
+	selinux? ( sec-policy/selinux-mplayer )
+	v4l? ( media-libs/libv4l )
+	wayland? (
+		>=dev-libs/wayland-1.3.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-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 )
+	)
+"
+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 "${FILESDIR}/${P}-libav-9.patch"
+	epatch_user
+}
+
+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 \
+		$(use_enable sdl 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
+}
+
+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-0.4.0.ebuild b/media-video/mpv/mpv-0.4.0.ebuild
new file mode 100644
index 000000000000..0e44a5ea6543
--- /dev/null
+++ b/media-video/mpv/mpv-0.4.0.ebuild
@@ -0,0 +1,241 @@
+# 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.4.0.ebuild,v 1.1 2014/07/09 16:27:38 maksbotan 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.7.16"
+
+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 -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 samba sdl selinux +shm v4l vaapi 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 )
+	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/ncurses
+	sys-libs/zlib
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXxf86vm
+		opengl? ( virtual/opengl )
+		lcms? ( >=media-libs/lcms-2.6: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.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 )
+	quvi? (
+		>=media-libs/libquvi-0.4.1:=
+		|| (
+			>=media-video/libav-10[network]
+			>=media-video/ffmpeg-2.1.4:0[network]
+		)
+	)
+	samba? ( net-fs/samba )
+	sdl? ( media-libs/libsdl2[threads] )
+	selinux? ( sec-policy/selinux-mplayer )
+	v4l? ( media-libs/libv4l )
+	wayland? (
+		>=dev-libs/wayland-1.3.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
+		x11-proto/xf86vidmodeproto
+		xinerama? ( x11-proto/xineramaproto )
+		xscreensaver? ( x11-proto/scrnsaverproto )
+	)
+"
+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() {
+	# 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-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 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 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
+}
+
+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 a0857eaec704..a4f0d29cd528 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.52 2014/06/20 09:48:36 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-9999.ebuild,v 1.53 2014/07/09 16:27:38 maksbotan Exp $
 
 EAPI=5
 
@@ -21,7 +21,7 @@ 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 examples +iconv jack -joystick
+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 samba sdl selinux +shm v4l vaapi vdpau
 vf-dlopen wayland +X xinerama +xscreensaver +xv"
@@ -29,7 +29,6 @@ vf-dlopen wayland +X xinerama +xscreensaver +xv"
 REQUIRED_USE="
 	dvdnav? ( dvd )
 	enca? ( iconv )
-	examples? ( lua )
 	lcms? ( opengl )
 	libguess? ( iconv )
 	luajit? ( lua )
@@ -170,8 +169,6 @@ src_configure() {
 		$(use_enable sdl sdl2) \
 		--disable-rsound \
 		--disable-vapoursynth \
-		$(use_enable examples libmpv-shared) \
-		$(use_enable examples client-api-examples) \
 		$(use_enable encode encoding) \
 		$(use_enable joystick) \
 		$(use_enable bluray libbluray) \