Bump to 0.6.1, thanks to Nikoli.

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0xF8DBDADE

3 files changed, 259 insertions, 9 deletions

diff --git a/media-video/mpv/ChangeLog b/media-video/mpv/ChangeLog
index 2b87451e397f..74281c979c05 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.99 2014/10/12 08:24:20 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.100 2014/10/13 12:43:49 maksbotan Exp $
+
+*mpv-0.6.1 (13 Oct 2014)
+
+  13 Oct 2014; Maxim Koltsov <maksbotan@gentoo.org> +mpv-0.6.1.ebuild:
+  Bump to 0.6.1, thanks to Nikoli.
 
   12 Oct 2014; Maxim Koltsov <maksbotan@gentoo.org> mpv-9999.ebuild:
   Install zsh completion files, bug #522462. Update WAF version, bug #525098.
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 7b5b9c11a854..b965740a4b2e 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.4.2.tar.gz 2564354 SHA256 791e9d60508a6e8b5690fb945ed24ddc805d6150783690cffe567f7ae0146199 SHA512 2d13f115c9ee5193ff79a3cf226a336f65ebabe4a828e75bb3269e39f0ed537d4f7cedc8155359aacc9e8fb31f875570b267567547eb0e0c8983a2c6e572a732 WHIRLPOOL d1db162086b97ca2f5a6edbfe4927626025a45aafb5205d88c02a02f8fa572d6c8f798421f0286bf715ef4eb947372a09d0b3fd6501143bbdd371a1144494d33
 DIST mpv-0.5.4.tar.gz 2579736 SHA256 b793d48938b57f4e37a410f61a98935d5b80b552ad0862983c025aeab71529d9 SHA512 46269ae34b946cedbfdefdaebcd0e4c56737866407670bdf3bf22fea69d53f24255abc06cef665dac6dd4779f25020199d9d3a47caa393f034b81d4bb27e0a5e WHIRLPOOL bb3bb9a72d1ad506dbb73baf809c9103813455882ef765f912f941f5701a08f2ab5bc1e99da4e8dcb0bc9ea6063c654fcf2406e63760247df03cff0fc93b86bd
 DIST mpv-0.6.0.tar.gz 2598489 SHA256 838f999bdeb36f43888ce7627a8b5f4c5bc942c5c94b6898da15bfcd7d3d8ad1 SHA512 b66a48d33f4f1df0492544854d43db4abff332675503a31b82f35d3f5a62f9718d842f1ba1c280e5b049bf022077c0886ee2cfcff2c1b6b96728c62e73d65cc2 WHIRLPOOL 105727b8d0401a0da9d1a225324cab07665241ccda7653f6a78bb9274f04bf66788f2e08ff821707cb9b9cfb271e159f79c0be875ac6da27cd69090a5984722c
+DIST mpv-0.6.1.tar.gz 2599417 SHA256 3a3127bb2989b205c065fbfe33334b1253f857732755706c2675b7b0f6d67f0f SHA512 e8b93088b57f36617d87d7b119ef4cba203cb4ddeb51cb4d3514a6c0ce4b8db3440c76d4ff6161ef221e4c63d6712402d5716da08c0802b839bf0803f01e1ff0 WHIRLPOOL c49d349b3e0673be37da890a2acf2f5e0d335503ddece909531495b09c4a7cbff9a13b6a491baf8dc06789d3fdd49fad209fd76ba8e2d1abbff4f3dab88b4bc6
 DIST waf-1.7.15 90909 SHA256 e5ae7028f9b2d8ce1acb9fe1092e8010a90ba764d3ac065ea4e846743290b1d6 SHA512 5d6f75a7a81d369512c6bf70ae14c5275cfdc2b273a5801d7ee928a829ca472aac5ee9f9f2542af6369f34c1648dd12e42112efc29d602527b9ba58a311b4c17 WHIRLPOOL 84048737d1ba746454212e13696ba34d9fc722c74823f719503e29123e33869a49742fba02e24212e3f67e045c5499cf1893bbd191bf8df1dd5cae05a517a17c
 DIST waf-1.7.16 91846 SHA256 b64dc26c882572415fd450b745006107965f3fe17b357e3eb43d6676c9635a61 SHA512 ccdf27cac76f525e11bde20d01c3f81b738b4c990934ee290a390fcf1b278da05047bcee76973c80be4557689344f6df33c13e232b278258745e2f19eeed5ebf WHIRLPOOL 79b59876606a93c7a13548799c8797f40515cbf8bc2944018de758df3e8cd9698e4304d5d26a03ae883195ec02d6e0b12e6fc7160e4ef31446d7c3d05f98983a
 DIST waf-1.8.1 95817 SHA256 ec658116ba0b96629d91fde0b32321849e866e0819f1e835c4c2c7f7ffe1a21d SHA512 d204460b61a8d1af5634ccac486a6693ded0213c7db5ba96d133431f1655e4a1c289b3d0201c7ff785dc36bda4f50dcc56c35e3f06f3c53240683412bd96fcd9 WHIRLPOOL 00f989c82504f3fbb94802dc3bdb23a0b1f45826e0098f2726db066ed69cf12172e30fb1eb0cb21dc04cc1ba0785a5c7b2b992e105ce3b4120621568dbbaa101
@@ -15,17 +16,18 @@ EBUILD mpv-0.3.11.ebuild 6331 SHA256 62d3b900051619de87d7140cb40cbba88be2d02cc9e
 EBUILD mpv-0.4.2.ebuild 6112 SHA256 34b8dc7a82f06be1cbb703ece91ae4b77fe626a6e542d3e3921af94988fef30e SHA512 b52895bef2b206c5620b66e9b5576e93458a67611b1bb9876a54f9702bac29841ccd91025a190906c10000a104f38c28d68a5687023a9ea0bd91f5a4d12244b1 WHIRLPOOL e2be2581a48eab1b7f47a2254740eadb905218d5a8d949b13d2dac2b7c78e900c5b379344e137e1cdfafe315cfd60a4e4449c3371491f807c7ecf73680fbb7af
 EBUILD mpv-0.5.4.ebuild 6137 SHA256 fd7d3c927f0c919ea8887d4e4592dad1f1a52d32287ca2e133c9a27b214bc86d SHA512 8e878204f44630acf92dc21a829bb81f9844c67fa1f38765f801be7c84a4e70d13a5e474b5a973931abab869d35c33e3f24241804fe80bb4ed121bfe4c3c056f WHIRLPOOL 2d84e4e7f2c71edb16317ceeeda0e4311f76d46400522fd32f3b0699119041ac66fc9919b9ac2f37d343f0e73cfbb3beeef333ccf0c6757fb76a528806f2a504
 EBUILD mpv-0.6.0.ebuild 6149 SHA256 38d40f8c1a092c85724722c0c1803392249e48e2ba53adc2fec8a17766b7d32b SHA512 f91bdb0e2a06ef51ffe2b4c7917bf44af527932aaf75d9230c1708f09e2cc158be374bde35741df065fec9e08e4b25ba52d742a0f3e5bfabff7ac78536d7a4e7 WHIRLPOOL acfe0b19edfbdfff11cc5f43f07d1c770ed223310778273aee75f1223df6a91edecd9410e3495978201e04779ceb9511b72d8b9ef87779b9ceaeda8b17842e61
+EBUILD mpv-0.6.1.ebuild 6149 SHA256 4395ec6380070b9e0c62b7d53b5c889c4264c66034efe924b4cfe4757a1f31f3 SHA512 fc9acdfb8b43e343b3ea1b7ce8e8f23609703d5dbadad5061fd6b46390386e8a2ec6d469c87c0224f800105f71bbb2695dbeace60b46c7648d6d9413b072a164 WHIRLPOOL 2d873f4303f37a516b4711d968a319596d0faed1b07f6702c162c8bea17896d2cc1c6a82caf62095230d746f1c00c7390102ec90c9acf393e754c29cd7e9af33
 EBUILD mpv-9999.ebuild 6225 SHA256 8c765eae4511d25348b47af8b5eedb813441bed9be6f88f905a91657f4b07a0a SHA512 e175cf4ba1f5b640d0b4efc743f11be2e1b04b2676e7b2249a71c33289ecdd026e51e949938ee38d5db75a632f8ce48d42c71ceee9bdfc03fa12ac752860feef WHIRLPOOL 9fa9caeb42b09823d343560918350bc2a8d55813b9478ec8102ef8ebe0b24d56368d037f116c69f4f11ea31d71d9dfc1703631c8487081b5f38e62983f5a305e
-MISC ChangeLog 15509 SHA256 0ebdb7b3fe76ec9b0a94b11e70341daaeff7c4007e4181652cdc29e5392362da SHA512 31a9df65482f3c1f285613da695abb73a00ec9c1828aa2ff37eb05b8e56383028afa6a18b7f14a4b2eed5653bc7bad7825d300c3c642014a0f71e260c3af43c8 WHIRLPOOL 9765d98f5e9f989d47b5ec50b31dfc3d2161881a76b6e194db67b6f9f25fb69bfcccdecf160af6b5da0049da1b8c7e980315164dec4524dd736fef26fd2d134b
+MISC ChangeLog 15643 SHA256 edddb78fdb9aa37f41cc5d857e94209a708babb5ba6c9c5ca04f54e2e6a8f63a SHA512 6d5d6a7b1aca4ec0b3eb5231df7a03d4e1bc4d7cf189938dfb16861c05cd2880965c0f09a6cda1b45744f402db82b72e5c77b81a3f1d8f7d5a2e09e3e824093a WHIRLPOOL dc2eb376c87a76d49d8dc9363b1830c5a6c927a69ecfa8c8c2b4805947c47ab0fa7259109386c2759930ea38ad18dd058229e49eff5539dd1e535c448e317089
 MISC metadata.xml 1789 SHA256 26fbda27a82c523c5a720c4290984f37529638559808285701dbf39b6d666a58 SHA512 e53cd794948a3d7c741f9044a7b7f30f91403fc7d64a2217b31773c9ebdd328906614e340b97e3d142689f13c65efec8dfb1b01c514a0dd679274d210f3b0391 WHIRLPOOL 7cc740c67d439fbbb4137b9ef6a3268ee7af86de870f9e718b25ed00f2d2ec1cce8314907ec31ca8145f01d0e4f7be4e5704bd1e03a6bf317209b5b2ebe3d874
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUOjq2AAoJEAmJmMX429reyMkH/1jkFC2JKeh7h0uRcvOnVKgy
-bnMgjrPytaFBBHEnl8SNxL6fU1VWnQmALdCbn/3lsBfuDB+L4nNA6zolH2ZDVh+4
-Izr9x93IrByNbbe9lRH8mSAKjWwjnmWEa9m5VH3Jo0Efj7TEw9GO8DwF8iJ97Q02
-z/fT2WhfI1/FJNYZJgvquppUNDKuKMUmYPEg4FKX84hiJEx9WV8mVDb+mcuBSm9d
-VqbAvvfg/lHPwZbgxttp18KlnQz/XG2aD4yHEC7nvUdAD90Cy8ZG9VFfSbLzH7+W
-Q5It6uNRV/RE7JTGzlBsKe9hNeuT+1GvJghE0Vb1YXw6yYBO1KoOaA5mQoSn82k=
-=pwP7
+iQEcBAEBCAAGBQJUO8kDAAoJEAmJmMX429ree7wH/Rn3KCCpYGw9cqRWQ9XCznp4
+bd4BVAYtEAEYesWEBgPA7IA0yULEFqp5Nrx8W8eucRSvHLrqjPumQV3W8XnapZNV
+X5+jD+FY107hMujacPHIAg+NzOIk2pMva7Z8/C7RvTxepOMzEoQsjtfDmA9GFSYs
+m9SjmhxB0v5HP9SyKLvT7y48xkvtciqAAQSOoSQeacJTTafdl/ZIQ3iQAYGam085
+OEyf2cBWMa1E7VOVDjmwClJF5KsavSsaDPVGNnGSc+vCM/OyqVBd21/COKt+G2p9
+e2cJHGYopGQXKFdh1kIcTaeA5y7GrvMxUImQsYHn5HmiScDljxuAtPOS9hf1oLY=
+=p69M
 -----END PGP SIGNATURE-----
diff --git a/media-video/mpv/mpv-0.6.1.ebuild b/media-video/mpv/mpv-0.6.1.ebuild
new file mode 100644
index 000000000000..9e7682648fdc
--- /dev/null
+++ b/media-video/mpv/mpv-0.6.1.ebuild
@@ -0,0 +1,243 @@
+# 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.6.1.ebuild,v 1.1 2014/10/13 12:43:49 maksbotan 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.16"
+
+DESCRIPTION="Video player based on MPlayer/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 ~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 libmpv lirc lua luajit +mpg123 -openal +opengl
+oss portaudio postproc pulseaudio pvr +quvi samba sdl selinux +shm v4l vaapi 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 )
+	vaapi? ( X )
+	vdpau? ( X )
+	wayland? ( opengl )
+	xinerama? ( X )
+	xscreensaver? ( X )
+	xv? ( X )
+"
+
+RDEPEND+="
+	|| (
+		>=media-video/libav-10:=[encode?,threads,vaapi?,vdpau?]
+		>=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 )
+		lcms? ( >=media-libs/lcms-2.6: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.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 )
+	portaudio? ( >=media-libs/portaudio-19_pre20111121 )
+	postproc? (
+		|| (
+			>=media-libs/libpostproc-10.20140517
+			>=media-video/ffmpeg-2.1.4:0
+		)
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	quvi? (
+		>=media-libs/libquvi-0.4.1:=
+		|| (
+			>=media-video/libav-10[network]
+			>=media-video/ffmpeg-2.1.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.6.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-python/rst2pdf )
+	X? (
+		x11-proto/videoproto
+		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
+	# vapoursynth is not packaged
+	waf-utils_src_configure \
+		--disable-build-date \
+		--disable-optimize \
+		--disable-debug-build \
+		--disable-sdl1 \
+		$(use_enable sdl sdl2) \
+		--disable-rsound \
+		--disable-vapoursynth \
+		$(use_enable encode encoding) \
+		$(use_enable joystick) \
+		$(use_enable bluray libbluray) \
+		$(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 libmpv libmpv-shared) \
+		$(use_enable dvb) \
+		$(use_enable pvr) \
+		$(use_enable v4l libv4l2) \
+		$(use_enable v4l tv) \
+		$(use_enable v4l tv-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 X xext) \
+		$(use_enable X xrandr) \
+		$(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
+}