Version bump to 0.3.10, proxied commit for Nikoli.

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

3 files changed, 272 insertions, 2 deletions

diff --git a/media-video/mpv/ChangeLog b/media-video/mpv/ChangeLog
index 20de6b5d4386..2ea92c7bbdb5 100644
--- a/media-video/mpv/ChangeLog
+++ b/media-video/mpv/ChangeLog
@@ -1,6 +1,9 @@
 # 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.75 2014/05/17 20:58:32 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.76 2014/05/25 10:37:50 tomwij Exp $
+
+  25 May 2014; Tom Wijsman <TomWij@gentoo.org> :
+  Version bump to 0.3.10, proxied commit for Nikoli.
 
   17 May 2014; Luca Barbato <lu_zero@gentoo.org> mpv-9999.ebuild:
   Update from Nikoli
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 5408c7367ee0..0fb82739db41 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,3 +1,7 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST mpv-0.3.10.tar.gz 2520710 SHA256 ec1d9751f9c43f66e13a988c94748ee2e1d8188498001f905213c9ccdf573fce SHA512 fdf84439747e24b4278f09427fc22d6497d2105cf94cd3c45dfb134af917f81c4748d618e962fb13a9db2b7a260a88a409590d10aae71ac987831bc3d293196e WHIRLPOOL d9a4eb6f01ee965b915e9064d75f710dd922a0db1e8a6b9655c844548bbde37c1cca1efd495c5d0f160b4b3823947c13e08e4634c6907fbd44abe758d0a6c552
 DIST mpv-0.3.5.tar.gz 2516492 SHA256 0d1506ad448e42cd7c8de15c7d6c23725b62db87f3d0c4029f5b8c523c995f30 SHA512 9dad2f83b3eaee05197c40b257ad0ab84367d6334faa2950ff51e65d435fd9a7798ad4347a26d66e67bd8d0265bd1cd202fd621447f5c9fe2545a2d88d99d937 WHIRLPOOL 409d38fa0206a5dbc1689c8f695c24ccaade0e2b484e1256b128d55282194e92bc38599afaa87c66f4157c4bf549aaa06c101265c9cdefeea0f60675b834d068
 DIST mpv-0.3.6.tar.gz 2517831 SHA256 50521211d249c7b5e7943a548bdd387201b949b0c72492c8ab36a95c68d096f6 SHA512 4f94f0fa4d6ee2d070da1adcd0801d8f1ae5893407cfd422c412526449aeeed45fbb953463393779fde869d68351c5d93416bfe9e2f3dfc2c74ccdf7a746f91f WHIRLPOOL becf4a6519a2927495a37aedc890cc7a5217e670ba5080648749199f54be49ebb5424d5a1d87c84feba50144fa9e7629be06767965626709ba6b135f9c1043c9
 DIST mpv-0.3.7.tar.gz 2520085 SHA256 351098923a1830d1792c985018b8788d05285af05d70c5044508f2f6b6acbce2 SHA512 452128df418e50c19cf86041decf77202082fc82997aee36ae95e5c0d447dd1e30fcbe9c28d6ec52b0415252b74791152ec485ddc918a1f010d9cc7b9a0f4b29 WHIRLPOOL fc029b3598b0dc7622a1dce91187a156db03fe6f19101109483251f2e59144b75fb1ae7ef2e61174f724d97cfe616c643d9f38a5c85965ad4bf1a525a078a047
@@ -5,11 +9,25 @@ DIST mpv-0.3.8.tar.gz 2520113 SHA256 6bcc9be4ec79854c17aafe6ffea2863ee8d25692735
 DIST mpv-0.3.9.tar.gz 2520490 SHA256 16bef041dfdeab2608e2b77adcbed31aa62d2e100c3a8d1a69eb4ba7b9d4778d SHA512 47e7674f3197466f9fae5e092cbf2d8c4c18282e3c2528f70cfe3cd23d6cda7a85809fd7ceaca2838b82ebe70cc6d1bedd56c20e25b37e25d51c74478504bbd9 WHIRLPOOL 631aa19834615b4500f8f3f52dbb8a338ba47602a26ca82dc80b0161fa82d651bdfeca150c301570b14f8b95124f9682fa9edd8db928a0d6d8caf772dff56c4e
 DIST waf-1.7.13 90702 SHA256 03cc750049350ee01cdbc584b70924e333fcc17ba4a2d04648dab1535538a873 SHA512 4388cd200d86d9757db95a138d75655e419fd9372de1dc392025b2ecfb9a0cc95d0b17639689ac293b753355af4baea0fc700ddd5d419755facc4e1dfa009521 WHIRLPOOL db94ba365aa84927942e1d95079f9efe377e646dcb7183d6a80d4b57ebbe195d48d23b7688216bd0b793e2f914e1d83caae3b517e385f891a26f670ebc17ed05
 DIST waf-1.7.15 90909 SHA256 e5ae7028f9b2d8ce1acb9fe1092e8010a90ba764d3ac065ea4e846743290b1d6 SHA512 5d6f75a7a81d369512c6bf70ae14c5275cfdc2b273a5801d7ee928a829ca472aac5ee9f9f2542af6369f34c1648dd12e42112efc29d602527b9ba58a311b4c17 WHIRLPOOL 84048737d1ba746454212e13696ba34d9fc722c74823f719503e29123e33869a49742fba02e24212e3f67e045c5499cf1893bbd191bf8df1dd5cae05a517a17c
+EBUILD mpv-0.3.10.ebuild 6287 SHA256 e3a95d88bea00bb0272834423969cd6df44f963140428fef4e61e8a995690650 SHA512 af385ac83a365bbe091a3291e52d1a35dfabe94dec35686d0d5b073b041c83042cce4e347d73e8db81f104a8e952a9f1c0fa4023c032fbe91a2d7c182892b9f6 WHIRLPOOL 91c5d6aa3ddff2fc22ad5c70d64a73470107753c73e4ad5a084a19bc43b8e22f90d87ce09923f33e488debffc90f1efa89afbbde89bd40ad30aaa72662399619
 EBUILD mpv-0.3.5.ebuild 6090 SHA256 eb6babafd533be9194f9c1f77cddbb5283165a5c9bf533fdf7d3483cd58c8927 SHA512 91c8089bfa31f5c37fbf88968fcd16d764a5f03ff27242237f4e0d7df84fca34fc19a00dd470fabb423e5ae92b602749394b1306a15c5e647fee7a5da0fc87b9 WHIRLPOOL aa235db1e58a3fa16111332517c193966e611ae2e38b2d133f5b97d011fa53dd426e7f7f1ff1e60cf16fbdc1aff021947e12d32b6b430fbb3c211006c6041496
 EBUILD mpv-0.3.6.ebuild 6110 SHA256 2d6bde9d8c523a7734f7bd182e99d137871d92e37090c06145c4c82976d0ce36 SHA512 b263d08f18c8e56c129719145e440ceb94874e8af5ecf00bdb5c8b7b10acd4d3af6c3bbaaa1fb8c73528c22934b60f1d4e50e0ef7c8adc20a3d1831f4acc1c06 WHIRLPOOL fab9c3af18b8bfdbf80ee4b04608a2d10ede8c4b81a7517ca198f5bb8a0952142061d8c00e5f0207d47dd59245c672bc88aadad1db362554147c7150b49c2040
 EBUILD mpv-0.3.7.ebuild 6319 SHA256 d496398ec35eedbab8229afd377b998ca46a87a694a472901f337ef645a38015 SHA512 8ead17b84899a2d5a7b430499f09d9cfb711bf2a4d056c00e75f72f99ea32d40d90f62348060694ea0fafccb577765a2445e0b428dd072e126b9522ec66176fa WHIRLPOOL 39319ad4020654e04f53c1266b1b5240215d129d6a6d5cea9ad8c398d027119a30aac199bd7c8ade6502673d9162223a4c87fa26bbb882915b6ef458853f59f9
 EBUILD mpv-0.3.8.ebuild 6289 SHA256 4aab0459147ccfde4b392f568b1ffd51531bc2786f1392519ad978f8e0cb652a SHA512 c60534acd493d6dd1020182b8e8357f0e624a984e71de1bbdf50f1a9f0425260a95c163d70f51e1e590425f0183c6772d0fa41bb7f5a68fb0b0b9b8c276021fe WHIRLPOOL 3a7dbeaf55e2476a18e703d37566ea1acdc799f46a78b6e2b9c17357d42c12fd0e8597933d472c6acd8f55e6b980c2a83c36d26bb1116235270f1b2ce1393175
 EBUILD mpv-0.3.9.ebuild 6289 SHA256 a60c90fd8cc798ab2249583e5920eb476d1770d83a80de10360556d04e560484 SHA512 f9928cda778c7d7fa92f7bdb95f5e695fd4f2ec3f11552a7919b0b3066241c5cb0a14f721149dd51763792e477e1e4b6fe086c0e8fa20fd825e92a86c5dfceea WHIRLPOOL da801aac16f0e355693d5079b6fac36279f97a8cae1cde666df45fbdcb050745ea65167e95aef4c9e84fb75876214fe14c7f8f4c0a0dabdeb6ced274d8dab704
 EBUILD mpv-9999.ebuild 6206 SHA256 c3ae690ce2d01061b058e95890d7804517f2f67bdaa28a6e6a8ba60e3116913a SHA512 900d645bff54bce69dbaecc232510548bcb84adec8f8bb0d556760facf0fa200c0ac0f2c95c4ce40e5ce2a40afc541e73fa80699cf7cea770216eecc5c686daa WHIRLPOOL 8b26355b5d3f6f2bd2e4406c7f616d4a21e30ae9683b5dcbad78035b20873815f3635e0ac7996c92a5a5c227a52c1a018f9b2a3347bf4d616ee94ced2c08e7ab
-MISC ChangeLog 12278 SHA256 31725ff997ac1a76a2ef784e7f7349fb4841425176bc125219b452bc778e1ab9 SHA512 5f742fca63d26ec1dd3da6cf34497ab1a77ed429605e747eadd55e161eaebf63eeb368492942f8ce01f8cd2649df2469ee6e4b355f91fc7b7a67d37cfad816ba WHIRLPOOL ef2fa3a8751b0ea34bae9d7d34c6802d61f2a0dca645f817594e2ec3a47692b69e4ac0330cfbb8971271def01994e00708678cc234065acd83faf0189565a695
+MISC ChangeLog 12380 SHA256 975eca7713038c3d47019380669d34695f2675154c0ba5f42ad2d1933457b512 SHA512 eb1a86198715ce26f2e48f6b5f7b4133a8a07595d472a4d9ded6b4dca6f68d43ba5078895ae5da58ef4d1f6ac3985e84c94cc5dbef8554405c94ce8fc389d31f WHIRLPOOL 15d75ea159f8121a03866b4c324179aa4fbaabeae8d659034603c19f81ea41334b1654fe08642d08e6b4b8c0be3035dce66bfaa357835fde8a3216ae78fa9ed3
 MISC metadata.xml 1736 SHA256 0e4d2c19d37d4a7ac26b3fff974ad552ac10eccd805299fdbcfbb3dc70f104de SHA512 ed48c6ac83a88acb31f4686e3a34701ac0e45b12e4d61a7af352a4288057fe03d60fc0fa26b92ec54a016a4757af08d4609246f41f6626d4ff5cee9b04c176f8 WHIRLPOOL c7eab998ed1551b8286780d05103a2f7f9a77b37d85e320f5b2be5f68fa47eaef64337a5b2ecd0b0a0f851eda92b0b8de8bf3d3964192a48342483752d62aaa3
+MISC mpv-9999.ebuild.orig 6206 SHA256 c3ae690ce2d01061b058e95890d7804517f2f67bdaa28a6e6a8ba60e3116913a SHA512 900d645bff54bce69dbaecc232510548bcb84adec8f8bb0d556760facf0fa200c0ac0f2c95c4ce40e5ce2a40afc541e73fa80699cf7cea770216eecc5c686daa WHIRLPOOL 8b26355b5d3f6f2bd2e4406c7f616d4a21e30ae9683b5dcbad78035b20873815f3635e0ac7996c92a5a5c227a52c1a018f9b2a3347bf4d616ee94ced2c08e7ab
+MISC mpv-9999.ebuild.rej 1701 SHA256 63fccae975dabb2b087c432261a3473a35b7d9330dd5cfeffb88d86cb02cf1d9 SHA512 50345642bae75de78dcb256ff9245f6c67177991c16b2a4f9b05e875be0fba8d830ad3adf43569585a2f9db0e1ad1b68bee1f49b882b1bed84285fa9ecd190ec WHIRLPOOL 069986466329034afa3eaeb3b31534c95523d08f59ee35393aeeb3c76f16152e24061fcb4288db7e456b1f5f8d0d5c933b8128954b0b1c3fa92a938649154e68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQEcBAEBCAAGBQJTgcfhAAoJEJWyH81tNOV9puUIAMV7OVuiUd+qbO+1GPVxHLJL
+XnMiNTEaC2qsXGjvSy71DbxqEhjwibF3Q/g3e076JJwcQn+8IvvvEgjNjfJZJuDG
+Xeaba+FxX/j25yNSd06inqeCuG25vtGRyH6IGaPVhF0uDFTpvs/J4h6EJnbF09lG
+uU3Q0HTlh1Pu3IM6IkpGaxwO9gnS1UEKp0lEpu0hf98Jr7YObNNw1V+H1UBb4P30
+JSV4TRkFBDe24E8ODmChPMS7cRhgD1SVa9AKbijrZb0lh46KHaadgXw6bT6t+KhF
+oQUleyBZFIMw0RYvygDfYnpDi0eS5D5/FK3BNO2zRpsfG/rAyNBeDXffisdjmFc=
+=71jZ
+-----END PGP SIGNATURE-----
diff --git a/media-video/mpv/mpv-0.3.10.ebuild b/media-video/mpv/mpv-0.3.10.ebuild
new file mode 100644
index 000000000000..6be5b3e01d71
--- /dev/null
+++ b/media-video/mpv/mpv-0.3.10.ebuild
@@ -0,0 +1,249 @@
+# 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.10.ebuild,v 1.1 2014/05/25 10:37:50 tomwij 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_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
+}