Version bump to 0.3.0, proxied commit for Nikoli.

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

4 files changed, 260 insertions, 18 deletions

diff --git a/media-video/mpv/ChangeLog b/media-video/mpv/ChangeLog
index 7b760de476f5..0dd330e4354b 100644
--- a/media-video/mpv/ChangeLog
+++ b/media-video/mpv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/mpv
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.47 2013/12/28 20:22:12 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.48 2013/12/29 19:11:34 tomwij Exp $
+
+*mpv-0.3.0 (29 Dec 2013)
+
+  29 Dec 2013; Tom Wijsman <TomWij@gentoo.org> +mpv-0.3.0.ebuild,
+  mpv-9999.ebuild:
+  Version bump to 0.3.0, proxied commit for Nikoli.
 
   28 Dec 2013; Maxim Koltsov <maksbotan@gentoo.org> mpv-9999.ebuild:
   Update DOCS in 9999, thanks to Nikoli
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 97136da97901..f6d636fac192 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -4,22 +4,23 @@ Hash: SHA256
 DIST mpv-0.1.7.tar.gz 1651651 SHA256 989cb7518baf3ee641748bf1f7f335cf68730943b0dd77490170a5ceb36a63e1 SHA512 17a9a98f4cf47f604851cedd74bb86f8b3d6553b1906d198bcc430419b27cf038729b091df318c6db3fbf4b64f40758c4f79da7212c585d878aff77a25105790 WHIRLPOOL 21ea955e0e212536ae7e76c2f03bdc057b4cf4c4214df80ea9ab8ec6f6ffcae1fa4cdb4bb7f6ece85aa6c0a4430c2d0255f79bf9bec51ad919c508c7fdcdafb7
 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.0.tar.gz 2512852 SHA256 256896c573a3cbe5917b824c58dc9ec4f5a844b314298206aaaf7928c06ccf6b SHA512 baa91af473ad746ba313cf12a43ae03424923efd2489c16b45dab7213c9153b8ad7039162b63904930693df7636e901064aa125f0b48d4d2be35c019db1bc237 WHIRLPOOL ea9b454d572657aa213a2cf9b5f86b01cbf6553d562ad977b7d7207eacc77a231bdb15d956bbbe6ef95a06d4ec8333b056241ae3983f54847d91c3bd1ff15d34
 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-9999.ebuild 6047 SHA256 d9928107fe141102a05b4053385daf8276cd34f302e11fc8e875c5291449f8c2 SHA512 c3a640ecf90bc983c97a3674b940e70d3d50250c01f7dd2952858725861515a847255f806d1f1ce4efa7f52fb39c12b229acd7541d39e18b7efcb8ead304a7bc WHIRLPOOL a38fed32039d3bf1f55194781cc0ce4f8d6f0fb1dbe46b86f1e693117280dd8aaed1213501fe0e2ab0c01dd89adeb5e16a5e032766ff515212c076366080b368
-MISC ChangeLog 8129 SHA256 8d7a52cbca7ba6c57399a8902c29505babe90d5de94182093cfeae4880b5c18b SHA512 ac96a08d8d628f2e2f634794750b7e77b9240ed2e76c5f7a9d2f0bace533cc8c64cf79c6f0a317aa3b357899abdf89d1e422608f74c3909923a4fd57d328609a WHIRLPOOL e6b31ba77478828ee019c40d0255269a8a260a376057ffab04b3bfca760983e74fe01d77acead30b9103fea73882249be2253efce3fa8a15bfb210175f36c429
+EBUILD mpv-0.3.0.ebuild 6017 SHA256 a45f2890234d805b041a6f03b42e8504a84bf614a8c08dd7e135cda4651b292c SHA512 e2be3271d7e412eab933bfae7c1bd9c0157e9861d3cb6437ad1d006e3693e36c31e5c789114a5b64eb292d778997101a4306de324f48da5114f8543397ea31a9 WHIRLPOOL bb1b6b9c8a003e2bfe8f0f24b33015cb1da3d0daf2207f3323e7155ac13b7ef33eb96e9e9c26a2a38f6b2c27a2f576d0aa3fc4a68dde992143a4b20753e4f247
+EBUILD mpv-9999.ebuild 6017 SHA256 22753ff309abd794523b2bf2d243e1af2d3ec41dc028d395eea60f3498d51c42 SHA512 600c68a3febb1e918b745a59b7160c562920168b2120611aa6c32d2bd67e2f91ff8ada34cc0282249f2189d68eee7b1a64cf156bd05965664c996066e09d3f2a WHIRLPOOL 71e9fa02b6481d2085db399e1c1d6579a216e79577cb286b37e1ea190bf658fd5d17850b7c553a88ae4d1a6dd701b073a86413d5a6d97c04310343aff2b8e9f9
+MISC ChangeLog 8290 SHA256 7f203f0aed5d72ce27ae978fca7a8c7d3ccd582a732610c1783ad91948f8b878 SHA512 29be1e32f02b847857f4e27c4a74443d49099020ab540e7ce1d3e0a6bbc0d37dd1c9830a0af07b15cd22bde863fa267f0ed47d408aa5320c1db8382830882a6a WHIRLPOOL 99cf2278c8fdf1b7f78457bc101f61c39593e385883cd781fda59346598f0905f81fc081f948753de9ecf1a69f6985df324dc33ea2929e7d873040950c9aef77
 MISC metadata.xml 1791 SHA256 1006842c5f7ee8c398af09e2aeeb6d45417fc7486ccca85d364cc7e593d1983d SHA512 f1564879972f7d4d641b97fc5d3b8b6a837849d8e794f5b13b8db5703840861da2c40a73cf42ed2ae16f3bcf7d268d34a82b723f019a374bd527f146a8d65a18 WHIRLPOOL 1c46c7f890933028dac485cba6cb1e0e67e333349a5eb4bcbfb99315f96bd65a7110979da8b45140969ec928aad5cece7e55acff33434a435c26dda4c9cf327f
-MISC mpv-9999.ebuild.orig 6079 SHA256 4444d01db5442772585dd2b84ecf25b2b9fa4cf2a6fb37227319eeeb874ac2a0 SHA512 2c270b2d3bcb0b074f3572fa6be897adc31b5db3e2ef8a844e9e07fe22c27bf9a0ca3e5098924e7dd3a6e25b74fecdd93fe08874ba2260d78fd44ab456b9f081 WHIRLPOOL 28348366d516626bf7b0c37413e2a33b8a58977c500ef9efd11b0a64d28473762b2c12beb2501bdcf87618d8f8284bc2f7eb4f73ca33e91b42553d41ca1d645e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSvzLhAAoJEAmJmMX429revQEH/2fHzwkh1ReheOzWRhd9Twlr
-RPd4MFNnAb7+hK6Hgzh7fZJrc8zARY5OGVbBHyyLwpyiR82k6hkUiEyVyAfeWohc
-2vq2NlOEXORa38nwFefbE9PYlpZehwN3LccfP89w47iQdzV4pSzZ4NSRuTs2SoUI
-sWTQ7w49Y/zN1DgGbfVXpDW1YZfpPnT2vpXM56CwHwKDePh4p2avWggPRstUVtPD
-LTBHaImoohTWDPX5NBU0Fe4+C2UrmxuqiRqEduhOoKJkeQrymYPViDKMjm4KfTwq
-p4UyZdUASwXDCvMmOWqEcccn/SqAfFw1LWZZTscCk3P/IVnhbIJSXUEvFtZ1siI=
-=N7SB
+iQEcBAEBCAAGBQJSwHPUAAoJEJWyH81tNOV9IQAH/2w7Mh7MY4zWaZ9xVmwsit3k
+OHphwc1iTdhpC88EzM9y2w+z7dzJFztLY9yrXgF6T6q/Or27PnlU3OBummXUk57K
+DXkLt9dOT/YRD13ibHIC0hT+Md7NuVWomGZR0PT24KwSv0IWM/IwHr9QLUKHUDAO
+Zcgb7ZklncPLSp4DZq1NexRjrMJ3eEwHqEDpq6oag0D2l6WAIIievikT/KfBvYmR
++dOxnrf213VqP65pmG3KvmR/aYJXrmPLZemnBuzPhR3s1x8D1CW3ISR8MqTDI7JV
+44xfnJHPa1hoGbBQrqhAZAf7UzYIimDE72TwAzw96wqdAesAmZyx5SFt0eqhKbY=
+=uGh5
 -----END PGP SIGNATURE-----
diff --git a/media-video/mpv/mpv-0.3.0.ebuild b/media-video/mpv/mpv-0.3.0.ebuild
new file mode 100644
index 000000000000..22d86661fe91
--- /dev/null
+++ b/media-video/mpv/mpv-0.3.0.ebuild
@@ -0,0 +1,236 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-0.3.0.ebuild,v 1.1 2013/12/29 19:11:34 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[X(+)] )
+		vdpau? ( x11-libs/libvdpau )
+		xinerama? ( x11-libs/libXinerama )
+		xscreensaver? ( x11-libs/libXScrnSaver )
+		xv? ( x11-libs/libXv )
+	)
+	alsa? ( media-libs/alsa-lib )
+	bluray? ( media-libs/libbluray )
+	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.0.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
+}
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index c625945f8b94..b9b87b868569 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.33 2013/12/28 20:22:12 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-9999.ebuild,v 1.34 2013/12/29 19:11:34 tomwij Exp $
 
 EAPI=5
 
@@ -11,10 +11,9 @@ inherit base waf-utils pax-utils
 
 DESCRIPTION="Video player based on MPlayer/mplayer2"
 HOMEPAGE="http://mpv.io/"
-[[ ${PV} == *9999* ]] || \
-SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-[[ ${PV} == *9999* ]] && \
 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"
@@ -152,12 +151,12 @@ pkg_setup() {
 src_unpack() {
 	if [[ ${PV} == *9999* ]]; then
 		git-r3_src_unpack
-
-		cp "${DISTDIR}"/waf-1.7.13 "${S}"/waf || die
-		chmod 0755 "${S}"/waf || die
 	else
 		default_src_unpack
 	fi
+
+	cp "${DISTDIR}"/waf-1.7.13 "${S}"/waf || die
+	chmod 0755 "${S}"/waf || die
 }
 
 src_prepare() {