version bump, new USE=rubberband, fix media-libs/libass dep, bug 540602, proxy for Nikoli

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xAABEFD55

5 files changed, 304 insertions, 17 deletions

diff --git a/media-video/mpv/ChangeLog b/media-video/mpv/ChangeLog
index 0eca061cd935..3919cb21d695 100644
--- a/media-video/mpv/ChangeLog
+++ b/media-video/mpv/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/mpv
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.121 2015/03/12 08:26:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.122 2015/03/19 02:56:40 dlan Exp $
+
+*mpv-0.8.3 (19 Mar 2015)
+
+  19 Mar 2015; Yixun Lan <dlan@gentoo.org> +mpv-0.8.3.ebuild, mpv-9999.ebuild,
+  metadata.xml:
+  version bump, new USE=rubberband, fix media-libs/libass dep, bug 540602,
+  proxy for Nikoli
 
   12 Mar 2015; Jeroen Roovers <jer@gentoo.org> mpv-0.7.3.ebuild,
   mpv-0.8.0.ebuild, mpv-0.8.2.ebuild:
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index ce30ec3b1ece..1568264f6cc4 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -7,6 +7,7 @@ DIST mpv-0.3.11.tar.gz 2521150 SHA256 c686adb4820be32ff59bbcd64adaeebd2ac71cad76
 DIST mpv-0.7.3.tar.gz 2672554 SHA256 88dcdc44264a8e9b9b73a95d03137d51071aea8c269cc19146109bf8f917e8b1 SHA512 220bcfc6d506ada33a725395461d955d6851c4acf117a2b7ab093dd7ecde96bacc507a756388f29eeb7ba231c849b5580e9f4add9c6c080b075f732dc31ffcb3 WHIRLPOOL de9054d25b19e65710830895064fb4f14238d66f3c51a908026ce825acc35860451ece8696099d9194a562622f38bd69233b47338dc90bceb4f4e379f87633c1
 DIST mpv-0.8.0.tar.gz 2661713 SHA256 e3655279450cd37ddf036ab511c0c2070f269f7ce34a44757880bf67db241584 SHA512 b97481e0eaad02bb3402635c4188b53cb10661805a4940ec18d1fe2c3312b7504633324c57d3246ddf90a23ab031f11ae5d5f39dd088f4a40a289a8dc664afe9 WHIRLPOOL 1b2d7cb18df2ba2aa002936e18ee4f071193c18893f67aca09979114930464c119b315d5d7ec7572eeef9b567145c6c9508ea6fbee544cceca9f01e8e00c3ebd
 DIST mpv-0.8.2.tar.gz 2663666 SHA256 a565934bf668b24a946f192f06981664415bd991fd204454b85bb8f7978074a7 SHA512 97b429ca90aca0ab5d9e4bafc154c33e9b8b9ea06660c35280f35da1c56396d05465991643f7333d2c192f558e2b5976dc05642936c88e2e57e38c67e8e58dc4 WHIRLPOOL 29f3ae09c36897fd92bfaa663a587a6b65ee4d5ca7535f537d7ec3b5358980133987bec5d7b5062b917da233292dd258a5c83f8394259dc34a284dbf891c6bae
+DIST mpv-0.8.3.tar.gz 2664730 SHA256 091038c802866848e3647f2a50215fa64ead0dc36f9114457db8b353528689cf SHA512 6b0e1f86032f4f594cee7af7ee7bd577821e948ace442987747a089d32374495abb5cf6bb88c4a1a63db8a36bb4182b30a728f976224263b6a9b4d51e62b1a40 WHIRLPOOL e6de6ff24a0e07cc1dc08f0de585aeb8ef44d1d01d729e088f7d9402b82b5e5318b958083781168ae3e7cc67fce13125d41d79fac997bff5d5888268a52480ba
 DIST waf-1.7.15 90909 SHA256 e5ae7028f9b2d8ce1acb9fe1092e8010a90ba764d3ac065ea4e846743290b1d6 SHA512 5d6f75a7a81d369512c6bf70ae14c5275cfdc2b273a5801d7ee928a829ca472aac5ee9f9f2542af6369f34c1648dd12e42112efc29d602527b9ba58a311b4c17 WHIRLPOOL 84048737d1ba746454212e13696ba34d9fc722c74823f719503e29123e33869a49742fba02e24212e3f67e045c5499cf1893bbd191bf8df1dd5cae05a517a17c
 DIST waf-1.8.1 95817 SHA256 ec658116ba0b96629d91fde0b32321849e866e0819f1e835c4c2c7f7ffe1a21d SHA512 d204460b61a8d1af5634ccac486a6693ded0213c7db5ba96d133431f1655e4a1c289b3d0201c7ff785dc36bda4f50dcc56c35e3f06f3c53240683412bd96fcd9 WHIRLPOOL 00f989c82504f3fbb94802dc3bdb23a0b1f45826e0098f2726db066ed69cf12172e30fb1eb0cb21dc04cc1ba0785a5c7b2b992e105ce3b4120621568dbbaa101
 DIST waf-1.8.4 96179 SHA256 f02035fa5d8814f33f19b2b20d43822ddef6bb39b955ca196c2a247a1f9ffaa8 SHA512 3a132d8b1cba0af0e3df046c0204c5df706fae4e0fac41cf74b53f6cdea6210ed798671c7a3cb3fee70573aacab16d4c0cc699cc4b7aa74c8a416346c5513f4c WHIRLPOOL fe8d7f42e5118a1f9490a0c9add1355c969185376b57d0bab024068dd6e7364632d862bf9432e1209165c5313ae843479ef334f4bd6285db05dfebff9a1b640e
@@ -15,13 +16,26 @@ EBUILD mpv-0.3.11-r1.ebuild 6516 SHA256 9bc6b73068dfb359185d719c1e002488095798b5
 EBUILD mpv-0.7.3.ebuild 6903 SHA256 3c6ebf90c032db239c766fbd4b491d2aecd5df2423202e0dda55410f75f352b2 SHA512 49e0c66d7bd7f7c0e4a48af31c2ec458bcd88678e94e8d54a8202d41239bc2f91027fda6831b6d599c43440356e5e05f2163e6ce679816e9305e351a0c3afbde WHIRLPOOL bf700deff880e221408e4deaaf70fa735f91b8bed9b1af5fa52936c005ef0b12b24ffabda0c3c1963fae2c721dfda7556cc587279765e6bb1c25678aa20f4e8a
 EBUILD mpv-0.8.0.ebuild 6664 SHA256 ca3ff007ce5f123f9c2cb72b0547635ddddb10bd065f57eba394c671c5d7e2be SHA512 81fa70092d806e76c9b311f1dcc4a438cd93efdafe364ecaced78a4193c98d79f595f697076378d424365544ec7f0d572f2ec5453d3568b5090daf3ddd9a5f6e WHIRLPOOL 311483c14a600e511dca532f4668ea0d741bf410d4b75664dbd11c9e7aaf51077e1492d90f429dedce7603f57dd8dfa7f6818a46677955a8316dc32e56e1b24e
 EBUILD mpv-0.8.2.ebuild 6678 SHA256 85b9301176abce1e39b6b780d229bc394add14a6c26c756ba19fd0cbcd2f5a9c SHA512 b4bbf6926b6dd3414253e9fb0eba98c92f67aef8683064158b7da833e4690e879d054726af409a42d0d3e60a48931c4faf4f1d95be852e949fa548a0d11a46c2 WHIRLPOOL 9e172e29e69a84b677f2ea739bdb803b83fe98fbf001917c00c0ebdb96647fb43504ce3f02c6a676d729a3f5d598d26cf571b1ac27b61fd0ee0e39bc26425a83
-EBUILD mpv-9999.ebuild 6619 SHA256 64b5b4ffb8ebd94422e45c66af10a9ae89cd1fa3a80986cf5db0facbb9a81d03 SHA512 82299c5c3b78ef52329ebf04f36d1676ac9d26cd307fc5154b38398867eaebf868c37e561f889d26433f76c37bebdcb9f8fbe224c784771e8434eecb61a07e1c WHIRLPOOL 46bf9fa7e93896c9135bf292d6239a816568059d1e8fb3088c55c35436ba627ec43685768518709e4a33e7a9c6c1c0a4466bd126195d8ad8051a72485af610af
-MISC ChangeLog 19060 SHA256 1d78703867f1d1f46f4764681f13bfc73122cfd54775af5425417cd27f167f1d SHA512 5159ef19b957c67fb385caa5026909e97e9976ebfcd611ebcad841de34f7486b28df643cc5cb545689623985fae634a508d62f0a5d4ccdfd9194612042a48cdc WHIRLPOOL 2493525a863dfc73c6838b8d1a85b296aff61866943e017bf1b50d8b3c0c8161d6f0dc8df4bc4c0405d02f88961f1413a6a788bb8bd6bca2144ad1bc3a3cb229
-MISC metadata.xml 2021 SHA256 142021b8f3982ba79c8fd8e44f755005b8aaf77795e612ef572a3f56e6af555d SHA512 55a5df91a31d13ffbab5b4573f34b9d1c839044cd38fe9d17419feb1b1e1d3e3412a16a39cb6037859842c4710151734c60a77b10f1229ebe976769aa0dce233 WHIRLPOOL 0f5581743746946063daaa567e2ae0cddd46e75b31ea5e92c1ff275461541b9bd1b530b3de02ee0db9210beb2fbdfe52e5b9da72234f5a298da0c8da9a7d4c04
+EBUILD mpv-0.8.3.ebuild 6736 SHA256 db3f74d8f19ffcedf02a3169d71f47473a12cf79bd66ec4b9d0d1f76fde1a2c9 SHA512 59396b751209f8e5af9268fbc9877bd76872932983827931f9dd6d135747a05a214d1b9f24dd31620fd5f520fbaf6a6d0fb2d8ff6856c2eedb5b149e50c8f1cd WHIRLPOOL 7acd058cc43e1f177761ab2ded00790c605643af215897a3ba2e26eec372ce3f5048149aaf6776f5cad069811db9547ba361d8b637554c65f544a2c561baf4fa
+EBUILD mpv-9999.ebuild 6821 SHA256 c9096481481b36365f5a2dacdfccf56e334c7d1b240755b4febf3699e2413fd6 SHA512 d57f56335871da771a9509cecf6987dd55e0f5842d2a3106bedcb2873eb84c6f9a295d7a3bc63e5824e5e4cd318158262a6574564db61ee32a7483d7e8fba64e WHIRLPOOL 37f550cc4867e5ab296325f67051e442946dda263b29bd46e40635e641ea3144d7655520d21c7104e41af6a8951be3e181e78b3afa3a4dc1aacf050477105e8e
+MISC ChangeLog 19277 SHA256 5da5b2feb56ec5b249a48a227131c2ca67c7f3e5292aadae7dcb6e8accca5536 SHA512 0368d29b3b756b27685a00a914b160a153ed9ba182da1f00d2ea0a17652f0469e3a3c01f46b6a00d8adde48ce9c5124c5f8968d57516b0d489017980dc112fcd WHIRLPOOL b93097854cb058965f6e200392cc13af20f7eb6d287e7e8b31d0b0041672227d7ccf74ea08ec310843b1b331bfee3c6b60d5803a31b17d320d6c4f675ba4d729
+MISC metadata.xml 2127 SHA256 cb2206f35556b84f1736d4e60563ce860e60fe775666aac0587180de0082c304 SHA512 cac0c14687c0c755e924741d91d35f8d6335f0cffab8fec3161a6deb5ec066189acc2f1da613d23c2c9c0aed843b6a8756f99d79e475b6712440c524ce6fc5cd WHIRLPOOL 9719de693c9d76ea914b0094e7dbe7ac495a1e19891c9f5983702ce8ae3dcfe0e92a98924f92a9410403c25549aa0e724cd753b729dad74d43c015b03fc5f48b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlUBTcYACgkQVWmRsqeSphNs/ACdEMcg8/0FomhOJni3x7+LDSUI
-MPYAn2f1RN7kAJd/OQ1phfgZlPDlpcX9
-=CVhe
+iQJ8BAEBCABmBQJVCjrxXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRCNUJBQjhDOUMzMUI3MTE1NjcwMjIzREMz
+MUFBRUE0NzU5NERCQkVEAAoJEDGq6kdZTbvtHY4QAJvQfLt23KJ+fzkdABHyqRMY
+oHZutMF2JYL7JfxbWtgN/lmmvP1yrMT1RKft2DyOXEGxXErUIO54TW5TPHJatoML
+GBkGHPHdn+bVaPxpdUKBRKNpyDJi94DY76pm0EXEj8H34DUh9mCqo05RAGJ5rx73
+iBW1c8lec+vLxbg3cJ+r+tmoYhp3ekN0vD7+ihcSy814YePQdhCesqq0Jg/n0cNT
+UJwdPyHlChR1Nk44XQPoQ//xQGhs/C9ELldzNTcRVHfLdwTuj/e90UwYE/I9IWC8
+o4lNyMNF1qr6Qh4cjQOLxuWlbJna3iyBpaPJnD9cbXiP/Z6bcxLk3gQUzimkSC1i
+1/D0yJVfioNV5TQRRFh9zI5pXrACfJ4pTeeeKygvGKZYiAnryXVi2GT0zE0PSta7
+Oc5zINNabAS8WUn5+AA48HD4lbtWXlDrfDymKDafJqcqI3PwArspb7O6eLSkFdWI
+0J1ec76IimPTpyeCix/U8b5wh74HWgMSt+Rv6i2MpkC4KgPd08kD6U5aUzV6PvXt
+Hy2J/unZdpT9YLODL0y5P/mp6phQYyFw1xEgsRAx0AUU4dsYcdAc6dC8ztbRi5c8
+Km2EJZ0qHlQvs/o8ZHzOW578tZ+8v8P9jJIs383qPwRozWnU3ur5TdVihpb/SJ8P
+BeAoAexgdD4EuOSVtIAM
+=M2z/
 -----END PGP SIGNATURE-----
diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml
index e62dca6f3607..94adf50c302e 100644
--- a/media-video/mpv/metadata.xml
+++ b/media-video/mpv/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
 <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>
@@ -23,6 +23,7 @@
 	<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="rubberband">Enable high quality pitch correction via <pkg>media-libs/rubberband</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 <pkg>media-libs/libsdl2</pkg> based video and audio outputs</flag>
diff --git a/media-video/mpv/mpv-0.8.3.ebuild b/media-video/mpv/mpv-0.8.3.ebuild
new file mode 100644
index 000000000000..e4868ade25b4
--- /dev/null
+++ b/media-video/mpv/mpv-0.8.3.ebuild
@@ -0,0 +1,260 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-0.8.3.ebuild,v 1.1 2015/03/19 02:56:40 dlan Exp $
+
+EAPI=5
+
+EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit eutils python-any-r1 waf-utils pax-utils fdo-mime gnome2-utils
+[[ ${PV} == *9999* ]] && inherit git-r3
+
+WAF_V="1.8.4"
+
+DESCRIPTION="Media player based on MPlayer and 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 ~arm64 ~hppa ~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 libav libcaca libguess libmpv
+lirc lua luajit +mpg123 -openal +opengl oss 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="
+	libav? ( >=media-video/libav-10:0=[encode?,threads,vaapi?,vdpau?] )
+	!libav? ( >=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-1.0.18 )
+	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 )
+	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}
+	${PYTHON_DEPS}
+	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 )
+[[ ${PV} == *9999* ]] || \
+DOCS+=( RELEASE_NOTES )
+
+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"
+
+	python-any-r1_pkg_setup
+}
+
+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
+		--disable-test		# avoid dev-util/cmocka automagic
+		$(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
+		$(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 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 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 45e47066b2a5..15bbd41ea0a4 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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.66 2015/02/22 06:16:18 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-9999.ebuild,v 1.67 2015/03/19 02:56:40 dlan Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ inherit eutils python-any-r1 waf-utils pax-utils fdo-mime gnome2-utils
 
 WAF_V="1.8.4"
 
-DESCRIPTION="Video player based on MPlayer/mplayer2"
+DESCRIPTION="Media player based on MPlayer and mplayer2"
 HOMEPAGE="http://mpv.io/"
 SRC_URI="http://ftp.waf.io/pub/release/waf-${WAF_V}"
 [[ ${PV} == *9999* ]] || \
@@ -23,11 +23,11 @@ SRC_URI+=" https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.g
 LICENSE="GPL-2"
 SLOT="0"
 [[ ${PV} == *9999* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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 libav libcaca libguess libmpv
-lirc lua luajit +mpg123 -openal +opengl oss pulseaudio pvr samba -sdl selinux
-v4l vaapi vdpau vf-dlopen wayland +X xinerama +xscreensaver +xv"
+lirc lua luajit +mpg123 -openal +opengl oss pulseaudio pvr rubberband samba
+-sdl selinux v4l vaapi vdpau vf-dlopen wayland +X xinerama +xscreensaver xv"
 
 REQUIRED_USE="
 	|| ( cli libmpv )
@@ -48,8 +48,8 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	libav? ( >=media-video/libav-10:0=[encode?,threads,vaapi?,vdpau?] )
-	!libav? ( >=media-video/ffmpeg-2.1.4:0=[encode?,threads,vaapi?,vdpau?] )
+	libav? ( >=media-video/libav-11:0=[encode?,threads,vaapi?,vdpau?] )
+	!libav? ( >=media-video/ffmpeg-2.4.0:0=[encode?,threads,vaapi?,vdpau?] )
 	sys-libs/zlib
 	X? (
 		x11-libs/libX11
@@ -84,7 +84,7 @@ RDEPEND="
 	jpeg? ( virtual/jpeg:0 )
 	ladspa? ( media-libs/ladspa-sdk )
 	libass? (
-		>=media-libs/libass-0.9.10:=[enca?,fontconfig]
+		>=media-libs/libass-0.12.1:=[enca?,fontconfig]
 		virtual/ttf-fonts
 	)
 	libcaca? ( >=media-libs/libcaca-0.99_beta18 )
@@ -97,6 +97,7 @@ RDEPEND="
 	mpg123? ( >=media-sound/mpg123-1.14.0 )
 	openal? ( >=media-libs/openal-1.13 )
 	pulseaudio? ( media-sound/pulseaudio )
+	rubberband? ( >=media-libs/rubberband-1.8.0 )
 	samba? ( net-fs/samba )
 	sdl? ( media-libs/libsdl2[threads] )
 	v4l? ( media-libs/libv4l )
@@ -122,6 +123,8 @@ RDEPEND+="
 	selinux? ( sec-policy/selinux-mplayer )
 "
 DOCS=( Copyright README.md etc/example.conf etc/input.conf )
+[[ ${PV} == *9999* ]] || \
+DOCS+=( RELEASE_NOTES )
 
 pkg_setup() {
 	if use !libass; then
@@ -161,6 +164,7 @@ src_configure() {
 		--disable-build-date	# keep build reproducible
 		--disable-optimize	# do not add '-O2' to CFLAGS
 		--disable-debug-build	# do not add '-g' to CFLAGS
+		--disable-test		# avoid dev-util/cmocka automagic
 		$(use_enable doc-pdf pdf-build)
 		$(use_enable vf-dlopen vf-dlopen-filters)
 		$(use_enable cli zsh-comp)
@@ -182,6 +186,7 @@ src_configure() {
 		$(use_enable enca)
 		$(use_enable mpg123)
 		$(use_enable ladspa)
+		$(use_enable rubberband)
 		$(use_enable bs2b libbs2b)
 		$(use_enable lcms lcms2)
 		--disable-vapoursynth	# vapoursynth is not packaged