version bump; remove old

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x4FDF9CFD2FAC514E!

4 files changed, 72 insertions, 314 deletions

diff --git a/media-video/mpv/ChangeLog b/media-video/mpv/ChangeLog
index 023f1965ea48..f3966a6158a5 100644
--- a/media-video/mpv/ChangeLog
+++ b/media-video/mpv/ChangeLog
@@ -1,6 +1,12 @@
 # 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.126 2015/03/31 20:23:31 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.127 2015/05/03 05:28:08 yngwin Exp $
+
+*mpv-0.9.1 (03 May 2015)
+
+  03 May 2015; Ben de Groot <yngwin@gentoo.org> +mpv-0.9.1.ebuild,
+  -mpv-0.3.11-r1.ebuild, -mpv-0.7.3.ebuild:
+  version bump; remove old
 
   31 Mar 2015; Maxim Koltsov <maksbotan@gentoo.org> metadata.xml,
   mpv-9999.ebuild:
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index bdb8c2c05108..cad3650471c4 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -3,29 +3,32 @@ 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.7.3.tar.gz 2672554 SHA256 88dcdc44264a8e9b9b73a95d03137d51071aea8c269cc19146109bf8f917e8b1 SHA512 220bcfc6d506ada33a725395461d955d6851c4acf117a2b7ab093dd7ecde96bacc507a756388f29eeb7ba231c849b5580e9f4add9c6c080b075f732dc31ffcb3 WHIRLPOOL de9054d25b19e65710830895064fb4f14238d66f3c51a908026ce825acc35860451ece8696099d9194a562622f38bd69233b47338dc90bceb4f4e379f87633c1
 DIST mpv-0.8.3.tar.gz 2664730 SHA256 091038c802866848e3647f2a50215fa64ead0dc36f9114457db8b353528689cf SHA512 6b0e1f86032f4f594cee7af7ee7bd577821e948ace442987747a089d32374495abb5cf6bb88c4a1a63db8a36bb4182b30a728f976224263b6a9b4d51e62b1a40 WHIRLPOOL e6de6ff24a0e07cc1dc08f0de585aeb8ef44d1d01d729e088f7d9402b82b5e5318b958083781168ae3e7cc67fce13125d41d79fac997bff5d5888268a52480ba
+DIST mpv-0.9.1.tar.gz 2698031 SHA256 5d23688575d2cc4484f7feef628c690f68016e385622201894d02cb238ea179e SHA512 8abba7e3b2e9f2bf71edc0d772a1910b29f6acdd9c2d33de34ef4ee3fe4b57f3a145aff9dadfe9d9806059cc022fd19237a25e5a3976b8a7c01f8915f020c86b WHIRLPOOL ce35c41a3e2956ba43e8a906992c515722eb7708d7403741ab0099ce9110895b7b62e8b0952a0fbb6e2cc5cf3102ec93c8e2974f2fec6af06bf6bbd80f66dafc
 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
 EBUILD mpv-0.3.10.ebuild 6420 SHA256 08c56a8e201a818067b041f6d8a7d1a4c2658c0887f595fc3e3d2944241359fa SHA512 d6b92efcfb388a3d92109247b2fc50effbe94f78c0e420004d646f3101689f85138eef568a1d53ee4c6098161fd1effba97173cfff1bfa59a278b4d343312357 WHIRLPOOL 576f26fbac334b0447c84af43e4e54cdd1e8360ffad8aedffa0ab2c534a44382b5d5f127680ee41c3671d53333aa2c15f79f237922db3a9b418b544ca5cb4e54
-EBUILD mpv-0.3.11-r1.ebuild 6516 SHA256 9bc6b73068dfb359185d719c1e002488095798b517daa63e4c58fa960ff98595 SHA512 3e7b68340bf823e844825b7100ef20e0c317d96eb3229f2cb000849cfce9b4c83a1a13d022f6f0bddd8b6d7277328a8020b92b09dcfecf3d1ef6ab301e04103f WHIRLPOOL 657261b5b8c050a6ab1dfcf36322218af05880602273feb346404bdcb5da42c2e66a3cec00b02f4cf3559990580caa17c4c66fa9cfbada0d542c41dd41414e47
-EBUILD mpv-0.7.3.ebuild 6900 SHA256 ff6caed4a74b4aa99eaeeacf7227f09fc5ac3990614e4cabe69650749fe62348 SHA512 ef4f767373455365a76d65e693f0a5d7851cf3e6db63e0afbcdc801dbacfd986528ce54209b1a786f55465a759f4b107da3e0bb74e385413a8b509fb0131ceaf WHIRLPOOL 0e0f4da93dd7fd4384c8f45f9ba7f9d5a08d86ab3ad667372dc6fa29cffb849cec18979bff0802464611e6211d1e77cc26d7153cfd2dadb0981ef4121af14d61
 EBUILD mpv-0.8.3.ebuild 6970 SHA256 fb491f89e51e72798629e39d97eb62f20cdf06e99ff1383f98a5306d084a2e45 SHA512 9821ba1045d1350a1266e0e268e1b6470999af8e528351a67ab00d698acad453a0aa9ec735fb211a96a47bc377999101906ef221eda488d421e9a87dc2b3ff1f WHIRLPOOL 136d02c68fe9c8f4796eabbe68a5c50d19924dfb23013a984b38934ce27c2489dd3798770197c380a170962137dfbbb5a90d53df54920b6a9a90493d7c4368d8
+EBUILD mpv-0.9.1.ebuild 7153 SHA256 69124653002b346703c87995b1251c233d715efdd1bfe7e101e46552a55c4375 SHA512 696567f998e0ebb7716e8158c5cc88ecd74df95619cf1d7bbc808aaa62a2fe86d52e095d7c6671b6ebff12cc59f8c03232948388a395cd5a9691d4d65bb5d43d WHIRLPOOL 0a9727a42a14b99df6b9e7c938adffd134b62bdb81984ada48787ecb9b8a4eccbbba0047563513ab0cef785a6bc06de58e8603f9d3a6be0734f3ef65d5924ec2
 EBUILD mpv-9999.ebuild 7274 SHA256 a7cc1a13c893f23f2d95b34063c9e89d04c69077dd065ebe0473fd12d19b75b2 SHA512 22d5590dfc50391217871882b9847685c00cae06210cedc000c960155d082f4ab1126e1b112dd8f7cb25d731986dc7065ba991a18f7b582c039eb76f392bd88f WHIRLPOOL e61858cb23433dcbe54da03cfd33a0395f196f15ed7acaf376fd6c9cce7e65b2ca6b390b336aa82fc86d15ceb8cae9feba83aeadf30649b97b68ac7c660f07c7
-MISC ChangeLog 20306 SHA256 4348aa995c2a4e71ccc7dc17d3b116fc8ff374a638300cd3b1e3b19ada79e9b2 SHA512 94ee4ffc98213392b4b2564c9d74e04491eac5b0b0eae03edfe4c50c6e719a057d1d822b82cca2595bd34e6418eee5446a6a6aef561953e4869bff4828d59250 WHIRLPOOL b1110a9c1f0a867bb9afbaf34d02639c71c04f05b41767f6b40c98ce98de033cef55376ef5ffb914774025f01c49eaae9eb415ab14e51b31d837ae689e542ff7
+MISC ChangeLog 20468 SHA256 d3d70e228bfae9f8db56e518bb465c0db145d16b48548cb7ba69644386a00386 SHA512 f682a810342b52a28ad37ec0741715cbc5d59e317abf339ca3e5980d2cb392901b17b3cda80c939156f3288ca9cf528a6c2e45725e92f84ad267f21bc3433358 WHIRLPOOL d17f77b4c642d40043a16bc6222f59f41e4d7df32cd71b86dcce07d75ca438d89e93e4f34e82d386680315c76dedf4d17661fad4706842f1b0fe1b5a9dd2233a
 MISC metadata.xml 2322 SHA256 5ebf44b42ec1ae05c0cb88684b1489bf7d8f471fc74bd5499518ad1383f7d603 SHA512 f36362cc378db09e387e0f2e97662993e1ef94a9ffce80aab94113040b6fb5ea245d7111cd0ac2fd2eb993e84de98a0374994226ea09d8beb897b094fb1f2959 WHIRLPOOL cf6f9257748d46cd494b99837e18cda80810e7e2a76f45d43431f0e2ef3d5551d4473d5bc133e46916de7205265892447646370d264e84c9b17efad9e02cdf9c
-MISC metadata.xml.orig 2188 SHA256 0ccd27419822dafffbb34eded8ed4e8ffe885b01505d5dd4ee1ff5ce44558d99 SHA512 a2dc95b60bae7846cfaa0e07277c1ea6a71ca17d08b648060f9de325ec246f10e0dcc75a0d67c1edf86e32ccc24adcf43592e1ea7343a7f140519dd7aa57ede2 WHIRLPOOL c6999aa295f40a5bd3a48a3db7e145bd2fa99fcc306431bbb8cad8396858bf1637b56983ef7673ec959fd507759e24c42f7e14780c55f3e967cd548a8812746c
-MISC mpv-9999.ebuild.orig 7093 SHA256 d81d0de10328117d69f5429184b71e27650588e474fa579471958b3929f13873 SHA512 b001b94598920ca34b0dc8b79931ac1a3790958265408326b42d1bf3bfbe2cd33fd08587d864cc4379b16abfbe1c7fa6c4eb00a77b3c934dcfca965e8720daf0 WHIRLPOOL e063850d89f09c53742683b01650454b8dbff0f4fc4b3db049fcab5cb2adc8acbc22991640187a6d3d24a7632ccf9f272915488bb1abde7cd6248f3d81f0d269
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iQEcBAEBCAAGBQJVGwIxAAoJEAmJmMX429reU6cH/RJAP78lS8AQMT7+gxeRGxM4
-IMkIzFyZfHXD3AIL7zN9kBlC1e+qPLUHJapvTSfavMq6OKt4yF3EmU9B+QH/4KvA
-TBH2ftqSIpd5wctnT3x3EiMRtlbi2HaEepsCj6o9GmxbLIU7s5r/zqw1sSm3vQYR
-doFdPeu+/vb5Uj+b1wNrGDK5biwsN8ONEwvtR0x/IqwCGEUAbuzbZOoCLjX73VeX
-D+6B4JU4Hid5LqAJtcms314a6mGAwREKVgEYUDzZk0M8q6dtU5q6X/XovTVkHKEU
-TWjH58rLbXDJw8XUoSoudGxdURpJnNneGJSSH9EelyE0IR1Jp3CyjgPhe8BlWEI=
-=tx3e
+iQJ8BAEBCABmBQJVRbHtXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
+RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFO6T0P/16TR6ihRw7lqWK3b7eQH+RT
+htbS7ZBZWe2XZGGtpe4s/8hUr5dgsA/wP+2XcPbGE54ycxzqt0fwUIUyKv23tVNR
+YMjIeQVhQPz3uxtYIWI3k38BBqL6KJAfM4G6Luvm+DOgy+NwvtVQPKP1K2CG2BM7
+l/y427uPNKzwnS58ynJDNEdBuDKO4W8cv37vbKONJE3jYjnlGN0/8Xm7WsLqdcea
+4dh3gIXQoz2btTG/wKBXqAjhf0eLv++J/s9xJUzK3y5Yb9uZxlYWThWE1hIxmpyr
+PDbxwMEAL5rP5PCyrxL6b9dWQ82N9ICUqMTsmmHGiaF5ZvDp/JV7N60VGZjLh/ZG
+LXShvVbRwYRges/IC1IzvKKhGFtmdoFIsHQaWM7h979ar0vVfITrwoQxuYGAuI1A
+Oe6mXm2gdlFl35PCiy0v24obsrqJfUeX4/ts4rmhSOcwMb9UY4feCrvqRcUlIrzU
+7WAdCO4U7VXfzzRzfL1wntc22xaD0rHE3O3yrtSKuzKpVLIJBxDBpLEX+j9pk5Vg
+HGxtfGkfTfKDKAoBH/1VMvzOT1vQUQk282pIgQbPJdW6ExQxUiWK+bAjSu+IUkgP
+IYkk9kGDo0R88ZNCc/qG5hV36A3TcuARVNnLHlFl25jiTnlMd9GrRCZSpMNVn2k5
+6V3hAEukc7MObKMbhM+2
+=3ZLg
 -----END PGP SIGNATURE-----
diff --git a/media-video/mpv/mpv-0.3.11-r1.ebuild b/media-video/mpv/mpv-0.3.11-r1.ebuild
deleted file mode 100644
index d27022d2bb00..000000000000
--- a/media-video/mpv/mpv-0.3.11-r1.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# 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.3.11-r1.ebuild,v 1.2 2015/02/22 06:16:18 yngwin 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.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 libav 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+="
-	libav? ( >=media-video/libav-9.10:0=[encode?,threads,vaapi?,vdpau?] )
-	!libav? ( >=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? (
-		libav? ( media-libs/libpostproc:0= )
-		!libav? ( >=media-video/ffmpeg-1.2:0=[encode?,threads,vaapi?,vdpau?] )
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	quvi? (
-		>=media-libs/libquvi-0.4.1:=
-		libav? ( >=media-video/libav-9.10:0=[network] )
-		!libav? ( >=media-video/ffmpeg-1.2.4:0=[network] )
-	)
-	samba? ( net-fs/samba )
-	sdl? ( media-libs/libsdl2[threads] )
-	v4l? ( media-libs/libv4l )
-	wayland? (
-		>=dev-libs/wayland-1.3.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-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 )
-	)
-"
-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"
-
-	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 "${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.7.3.ebuild b/media-video/mpv/mpv-0.9.1.ebuild
index 73b9d27f2916..a7f1329f8f6f 100644
--- a/media-video/mpv/mpv-0.7.3.ebuild
+++ b/media-video/mpv/mpv-0.9.1.ebuild
@@ -1,32 +1,36 @@
 # 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.7.3.ebuild,v 1.5 2015/03/28 01:53:34 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-0.9.1.ebuild,v 1.1 2015/05/03 05:28:08 yngwin 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.1"
+WAF_V="1.8.4"
 
-DESCRIPTION="Free, open source, and cross-platform media player (fork of 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* ]] || \
-SRC_URI+=" https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+DOCS=( README.md etc/example.conf etc/input.conf )
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI+=" https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+	DOCS+=( RELEASE_NOTES )
+fi
 
-LICENSE="GPL-2"
+# See Copyright in source tarball and bug #506946. Waf is BSD, libmpv is ISC.
+LICENSE="GPL-2+ BSD ISC"
 SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~hppa ~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 portaudio postproc pulseaudio pvr
-samba sdl selinux v4l vaapi vdpau vf-dlopen wayland +X xinerama +xscreensaver
-+xv"
++iconv jack jpeg ladspa lcms +libass libav libcaca libguess libmpv lua luajit
+openal +opengl oss pulseaudio pvr raspberry-pi rubberband samba sdl selinux
+v4l vaapi vdpau vf-dlopen wayland +X xinerama +xscreensaver xv"
 
 REQUIRED_USE="
 	|| ( cli libmpv )
@@ -47,8 +51,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
@@ -83,24 +87,18 @@ 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 )
 	libguess? ( >=app-i18n/libguess-1.0 )
-	lirc? ( app-misc/lirc )
 	lua? (
-		!luajit? ( >=dev-lang/lua-5.1:= )
+		!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? (
-		libav? ( >=media-libs/libpostproc-10.20140517:0= )
-		!libav? ( >=media-video/ffmpeg-2.1.4:0= )
-	)
 	pulseaudio? ( media-sound/pulseaudio )
+	rubberband? ( >=media-libs/rubberband-1.8.0 )
 	samba? ( net-fs/samba )
 	sdl? ( media-libs/libsdl2[threads] )
 	v4l? ( media-libs/libv4l )
@@ -125,14 +123,28 @@ DEPEND="${RDEPEND}
 RDEPEND+="
 	selinux? ( sec-policy/selinux-mplayer )
 "
-DOCS=( Copyright README.md etc/example.conf etc/input.conf )
 
 pkg_setup() {
-	if use !libass; then
-		ewarn
+	if ! use libass; then
 		ewarn "You've disabled the libass flag. No OSD or subtitles will be displayed."
 	fi
 
+	if use libav; then
+		einfo "You have enabled media-video/libav instead of media-video/ffmpeg."
+		einfo "Upstream recommends media-video/ffmpeg, as some functionality is not"
+		einfo "provided by media-video/libav."
+	fi
+
+	if use openal; then
+		ewarn "You have enabled the openal audio output which is a fallback"
+		ewarn "and disabled by upstream."
+	fi
+
+	if use sdl; then
+		ewarn "You have enabled the sdl video and audio outputs which are fallbacks"
+		ewarn "and are disabled by upstream."
+	fi
+
 	einfo "For additional format support you need to enable the support on your"
 	einfo "libavcodec/libavformat provider:"
 	einfo "    media-video/ffmpeg or media-video/libav"
@@ -140,18 +152,9 @@ pkg_setup() {
 	python-any-r1_pkg_setup
 }
 
-src_unpack() {
-	if [[ ${PV} == *9999* ]]; then
-		git-r3_src_unpack
-	else
-		default_src_unpack
-	fi
-
+src_prepare() {
 	cp "${DISTDIR}"/waf-${WAF_V} "${S}"/waf || die
 	chmod 0755 "${S}"/waf || die
-}
-
-src_prepare() {
 	epatch_user
 }
 
@@ -165,6 +168,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)
@@ -177,22 +181,19 @@ src_configure() {
 		$(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 rubberband)
 		$(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
@@ -201,7 +202,6 @@ src_configure() {
 		$(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)
@@ -225,6 +225,8 @@ src_configure() {
 		$(usex vaapi "$(use_enable opengl vaapi-glx)" '--disable-vaapi-glx')
 		$(use_enable libcaca caca)
 		$(use_enable jpeg)
+		$(use_enable raspberry-pi rpi)
+		$(use_enable raspberry-pi rpi-gles)
 
 		# hwaccels
 		$(use_enable vaapi vaapi-hwaccel)
@@ -235,7 +237,6 @@ src_configure() {
 		$(use_enable v4l tv-v4l2)
 		$(use_enable v4l libv4l2)
 		$(use_enable pvr)
-		$(use_enable dvb)
 		$(use_enable dvb dvbin)
 	)
 	waf-utils_src_configure "${mywafargs[@]}"