Version bump to 0.3.2, proxied commit for Nikoli.

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

3 files changed, 252 insertions, 15 deletions

diff --git a/media-video/mpv/ChangeLog b/media-video/mpv/ChangeLog
index 6df410ef173f..7543b299b150 100644
--- a/media-video/mpv/ChangeLog
+++ b/media-video/mpv/ChangeLog
@@ -1,6 +1,11 @@
 # 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.50 2014/01/03 15:07:58 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.51 2014/01/07 17:48:32 tomwij Exp $
+
+*mpv-0.3.2 (07 Jan 2014)
+
+  07 Jan 2014; Tom Wijsman <TomWij@gentoo.org> +mpv-0.3.2.ebuild:
+  Version bump to 0.3.2, proxied commit for Nikoli.
 
 *mpv-0.3.1 (03 Jan 2014)
 
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index eb9625afad74..56b2bdb8e24a 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -5,28 +5,24 @@ DIST mpv-0.1.7.tar.gz 1651651 SHA256 989cb7518baf3ee641748bf1f7f335cf68730943b0d
 DIST mpv-0.2.3.tar.gz 2477398 SHA256 6a0fe8b889dabdde68011dd0d3694dd36a747fc88d64f9ac9aa1e5c5d51d210c SHA512 db111172f9c483c07ad79e020d9cf92ccc93b73dcbb05d28be7165a4591ae5c415b7cc4d806f859857263857af96249590076b4ba09eb01b29601bdc20c45846 WHIRLPOOL 7280c762267bba7034c5c426979ae26bd64ad3d4316b8fbaa2ae895b3c0bf4e51d36a614fefba4286532c16569ae3fb8da7ffd21d8ef6ab45903a2b9118513f3
 DIST mpv-0.2.4.tar.gz 2478152 SHA256 34a12a82b25bf3337d44c26dd8fa750746032c1a8806b85f6b8db652710827bf SHA512 72214d02fc459b1789831e54de2841ff0a8d83c97f1ba76b18d31e970372571569b45a036fe7e7e67d6fa9460f73216cc0f1e1e6149cb24a99c490d5cdfb5ec1 WHIRLPOOL 0cf700e38a2455d5c687b3f6a50e708bc145520e54b45923a465b7ed1e77b0ddd42d86d6a000b0d969506e4bca2973133c99f49db8281acff9fc02e649557141
 DIST mpv-0.3.1.tar.gz 2513567 SHA256 ddd365039faf0d26076633c118e854f4cf7b09e7de20f340e70bc24278fae4ae SHA512 55415fffdb4a6a9b0012f7c6efa2b665fbead12e1c511c6c4bd15bdba8ae0f5ee6b8183ef82cebb1cbb9e48dcd59d72913a7cfb3b408dc1db6fdc79dec0c20ab WHIRLPOOL 7fa3cb0bf375cac963009fb8840a51b6730b8e24005106cdfe6afa29ba637bd5728ed75c4991606a07e37bcbd57eb63b7ce62de5fd6e74286ee33263444f1268
+DIST mpv-0.3.2.tar.gz 2513998 SHA256 a22b0c447b9208b337883013f14e56df426c3f0ebe3601bdb8be29e1f387edef SHA512 516b7f3555f04b723a5f7632052bb82f9e79746efa31120f35c327e6138511ed6656a1d5ab0f9d1de22ba7dc65dbf313dcb0a698a18c8bb03bfa003a30575b2a WHIRLPOOL 206aa201fb9e6579030b719ef41eb00a8f2c61ddb955486a652023a7ce969a521bad70e7723d2ec887c93fa9db8e0bc44d5b117c3b7e31b9dcec16ac1773c752
 DIST waf-1.7.13 90702 SHA256 03cc750049350ee01cdbc584b70924e333fcc17ba4a2d04648dab1535538a873 SHA512 4388cd200d86d9757db95a138d75655e419fd9372de1dc392025b2ecfb9a0cc95d0b17639689ac293b753355af4baea0fc700ddd5d419755facc4e1dfa009521 WHIRLPOOL db94ba365aa84927942e1d95079f9efe377e646dcb7183d6a80d4b57ebbe195d48d23b7688216bd0b793e2f914e1d83caae3b517e385f891a26f670ebc17ed05
 EBUILD mpv-0.1.7.ebuild 7893 SHA256 5808a37468bd31d56647ad389a6bea9a225ae5386861b39e70f9e8026b4b2b54 SHA512 c430b2dbd03254350651ecf66b69397fbdf657af49903128dfb33418396727c59d991e22ce00925960f526b41aab378846a156a6699b6679aa2521cc5ff46336 WHIRLPOOL 8ff09600acc35f35874525f886e0b15f280ab7b94a51ba24218dd2df5b0278b4c49b38c9c2dfe0912c38b043a262076c2bf6041c2c6fd41d79f57213c34268bd
 EBUILD mpv-0.2.3.ebuild 8270 SHA256 599442eeeefee7bfa46181eb1a792fd740535aa162093e9580f704a817c9267d SHA512 b131dd0130f4417d3cff4d08bc5e181b83c007e6de8c418eae8636bc8b29cfd1a7215369cdbe50d5c71aa23161560e97a94c91f5e9fbb83b905532b04e14c5c1 WHIRLPOOL 96c9221a60f794a4f2fd62ca501827b1bc29329ef4da842758a9ecd768333f46b7805077d66b72a374e27d0c0ea46bf069c2bd5b5bdf11510110a0dd29df8983
 EBUILD mpv-0.2.4.ebuild 8320 SHA256 532586cdc64722f589541986de36f63ed7a8a909a3fa9e991fb8652a60b550f0 SHA512 cdd4c4c91b85674800aad3454a4bb7e0ddb2f8523a1d7bbdd89a1f969dee467a480ec1ee0456d7f6536fdc5cee6cc446f7b9bd8134e3932d7a2407685c913bab WHIRLPOOL 0c464e8d423ad69ad146dbf571eb593fb53fa7903a0a19f150e6df0dc7eb13576c3bc467792b6b1e5e178c0295574e4a93151fcff8c7ffc63053506e21a0dc2c
 EBUILD mpv-0.3.1.ebuild 6039 SHA256 1e8d708846e1713deabf1328eb518162f6d4c244db64f0e16b864101c1f18237 SHA512 c698220e4543a3bc3e04630445ea25ed11483c42aea6ebd4f9e07afe641c3c8f8ca804d6e55005864915a0e491c35817a1f200a8fb7e6ccd7fb2105e70132dc6 WHIRLPOOL 9b20170735293d06f2352be8aa9215cbbb2978aaabbf8f7aa6edec118aa5aeb13549e68de6ed3dabcc72986c4991f5d6b445c4a426002bbd00b787cc37281701
+EBUILD mpv-0.3.2.ebuild 6040 SHA256 f5829745f914cf73e04fe777f4c702e0c3944b61ffbf816b53347fe6ee837a35 SHA512 b8fbd31bdd49c3931e2a25a8eac65a12b213df38257cff1a57d2a254340800a4fdd23669326a4039e16dd03b2369f6539b5ec02b5819f0b2b77333474db1e1ca WHIRLPOOL 9916ddff151f13127db6131539a96ab9f81a43e05cdff29bd685228c0dd0e76de94cea931240d0a4129c59b16d44d59506c59b73788f3ef85b79f7d6e9741399
 EBUILD mpv-9999.ebuild 6042 SHA256 405c04547160a32491b6922f15eee589888b00391d421e2953d2f6465fe21ce4 SHA512 cdd3b04a04fface05cc89c66fdd170180ca937162afdb37a2040553dbd57eaf02618c497965050d036dbe3a2ecaef8a6205ad4e64d900c46d32d6d6e6577d26e WHIRLPOOL 44c7fd08aaed1a293e762b7e60bb74a2b090efa000f51991541e5dbf33a51fdc0aa33504fb0bcf8d60f467583a53b94447340895b771f32264964f7f1e44cb00
-MISC ChangeLog 8591 SHA256 a87770baceaad974af4dbd6ea66a7605875cc5e69ee9de6780dde89417d75b9e SHA512 cdaf08340cda1f6ef5e6858836e4cad76736a133b5fb02420cd37ea688be8e22b045465cebbb4e0a46976b86559951980a99c36326c03bc1e92913497969be1b WHIRLPOOL de3dd9e75103af97d1f15f953fd7a42e6ef61f166788ba5e058a65b4b5445dc7692cc78422cb7e4b8c161761a32227aab62924167d1b8007c45b3fe36fff55ea
+MISC ChangeLog 8737 SHA256 569cd72b9b6d63b8658783258b0b0740a1109c78f8b4df78abb247a3ef82f49b SHA512 47f8e739210132cb152e3c7c21d0c3cc971012f63e54a7c3f7965852eccaaff78ff9a67ea8247281f5b0666c51a564d816715596aa7daed7969da07b769847c7 WHIRLPOOL 842d893ff09c7a2d51fd540a942ca781527b536f80756d0170911ae44cb198342acbc1e77fab428c670e954e04344e42af822a0b1bf8c2a27ebc9949505961b7
 MISC metadata.xml 1791 SHA256 1006842c5f7ee8c398af09e2aeeb6d45417fc7486ccca85d364cc7e593d1983d SHA512 f1564879972f7d4d641b97fc5d3b8b6a837849d8e794f5b13b8db5703840861da2c40a73cf42ed2ae16f3bcf7d268d34a82b723f019a374bd527f146a8d65a18 WHIRLPOOL 1c46c7f890933028dac485cba6cb1e0e67e333349a5eb4bcbfb99315f96bd65a7110979da8b45140969ec928aad5cece7e55acff33434a435c26dda4c9cf327f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSxtJPAAoJEEn8cBKl3gOumboQAIKaOFl0u3lW3XyHYrVCf81v
-rogUdUnmVNfsCuoa+V3dfHnZAl3yVrg/J7FItfkXvZVu9HWikwC/fcddc93ZdWIV
-ncjbRbNZM9MgQixjDySaENJxN/Ic88WqTvDqUPxIh44h9nefQtK3RmCeYqSxmse3
-8Q7UPTA+pEloF+4kxhILK9Gz4VRKbOJB0FjtA6L5Yf2BDmboMsU95A7XsX1oMuY6
-qYevV24dqYwyw+hdm+PbPG0cP7bvBcVXjAd4VxzKBJAWHB0nGVcrmOSJx5lVQok8
-ml8Cb4SUQO63CgePbGTqf2zFUSz7PhqS+YUbJeXCaDvfKI4VpDsD6xtgWs8ckC/0
-f70iplpvTYnSqS1p2G+G74YaysutG5/VtuTWdQ5MD37UnZKojFvxwrm7Ky/bBkXA
-WoGXYLVosHB/7fOE+XCiDxhBShWW4cCc06WGssGb231f4a0LpR4M3uk8yDm/b1bx
-2/v1VgAB0ldFylkNUJkGNMQx8xvxfB13jbeHCCecO8jwxgslLODKVacZIRP3gfKJ
-EK0a1FLgumTG3TO6f4EqCViOnWSEpQ/pl/ZCasVhdL9zpj7M1FCyNvJ0TZVDw6Q/
-MgZ2nrfsjfcS8LImsSuiKQGx/ZvyL+yRFbG9wdAtrE5eRvEg5ABrs7rylB5IDRnm
-54fIvmSRB8V3lVZJbxbZ
-=obmS
+iQEcBAEBCAAGBQJSzD3MAAoJEJWyH81tNOV9CzgH/2gMtaKy+QiEu+L1pv/KkzSo
+whf9xorW7zYm1Nuec8ylqJwCsXbVOmrVuyWW4mj1Q7OAikEcMQXBrYSfIJR3EKod
+HB8hQ08kBS8rW0SlIyiBpwqMrtaMZx4D+y4tMNjl7lNhxbtl19VQsnwrO3+2XZdq
+HDV7lXnliDYfEyHOxF7BeKXUmKCHYa1679uWnY0LUm36UYV6kEJ17bqspfrbmOfr
+S5M7PXfuGARkvGow6BqEn1cbY91o7rUpNU/lq2YjYnXpMCUV0wxlx3Qyu1X147TU
+Lsr0ak2Tzz8qgB1RNv1OhYjPS3xsJZbTTWpF0UVKirnEkTT0fmJzW8eOYpvhvf4=
+=zics
 -----END PGP SIGNATURE-----
diff --git a/media-video/mpv/mpv-0.3.2.ebuild b/media-video/mpv/mpv-0.3.2.ebuild
new file mode 100644
index 000000000000..ac87f5d79767
--- /dev/null
+++ b/media-video/mpv/mpv-0.3.2.ebuild
@@ -0,0 +1,236 @@
+# 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.2.ebuild,v 1.1 2014/01/07 17:48:32 tomwij Exp $
+
+EAPI=5
+
+EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
+
+inherit base waf-utils pax-utils
+[[ ${PV} == *9999* ]] && inherit git-r3
+
+DESCRIPTION="Video player based on MPlayer/mplayer2"
+HOMEPAGE="http://mpv.io/"
+SRC_URI="https://waf.googlecode.com/files/waf-1.7.13"
+[[ ${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 +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:=[encode?,threads,vaapi?,vdpau?]
+		>=media-video/ffmpeg-1.2:0=[encode?,threads,vaapi?,vdpau?]
+	)
+	sys-libs/ncurses
+	sys-libs/zlib
+	X? (
+		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-paranoia
+			<dev-libs/libcdio-0.90[-minimal]
+		)
+	)
+	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 )
+	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[network]
+			>=media-video/ffmpeg-1.2:0[network]
+		)
+	)
+	samba? ( net-fs/samba )
+	v4l? ( media-libs/libv4l )
+	wayland? (
+		>=dev-libs/wayland-1.2.0
+		media-libs/mesa[egl,wayland]
+		>=x11-libs/libxkbcommon-0.3.0
+	)
+"
+ASM_DEP="dev-lang/yasm"
+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 )
+	)
+	amd64? ( ${ASM_DEP} )
+	x86? ( ${ASM_DEP} )
+	x86-fbsd? ( ${ASM_DEP} )
+"
+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-1.7.13 "${S}"/waf || die
+	chmod 0755 "${S}"/waf || die
+}
+
+src_prepare() {
+	base_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
+	waf-utils_src_configure \
+		--disable-build-date \
+		--disable-debug-build \
+		--disable-sdl \
+		--disable-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
+}