Version bump, thanks to Nikoli

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xC42EB5D6

3 files changed, 256 insertions, 7 deletions

diff --git a/media-video/mpv/ChangeLog b/media-video/mpv/ChangeLog
index 9c9bdf190e6a..73a209c88847 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.88 2014/07/20 19:24:30 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.89 2014/07/27 13:28:06 zlogene Exp $
+
+*mpv-0.4.2 (27 Jul 2014)
+
+  27 Jul 2014; Mikle Kolyada <zlogene@gentoo.org> +mpv-0.4.2.ebuild:
+  Version bump, thanks to Nikoli
 
   20 Jul 2014; Mikle Kolyada <zlogene@gentoo.org> mpv-9999.ebuild:
   Respect cflags, thanks to Nikoli
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 84b01b805abc..a44db46119ad 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -5,20 +5,22 @@ AUX mpv-0.3.11-libav-9.patch 291 SHA256 971cdcaf866fcb5f1a93663357c582b474480f5f
 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.4.1.tar.gz 2562004 SHA256 969511267ad443235ac60a947fc40b5fb93fbd97670e23e42705cd39f8f71273 SHA512 154a27198c1690d5d1b3c097163e97eff6f375496c9fb7f7958936c84c776afd78b392df8e136798a1f5a1fc4924af3069cc7dbef36bfa8ff84aff9d7a0b8735 WHIRLPOOL 44b51ac78d2791ad3bb76f58a1b54329b18243f8fb0b42084ce9ffc9054109404830cea71de14a08b60649df08d834170b60a9804c128434ee361c856796d332
+DIST mpv-0.4.2.tar.gz 2564354 SHA256 791e9d60508a6e8b5690fb945ed24ddc805d6150783690cffe567f7ae0146199 SHA512 2d13f115c9ee5193ff79a3cf226a336f65ebabe4a828e75bb3269e39f0ed537d4f7cedc8155359aacc9e8fb31f875570b267567547eb0e0c8983a2c6e572a732 WHIRLPOOL d1db162086b97ca2f5a6edbfe4927626025a45aafb5205d88c02a02f8fa572d6c8f798421f0286bf715ef4eb947372a09d0b3fd6501143bbdd371a1144494d33
 DIST waf-1.7.15 90909 SHA256 e5ae7028f9b2d8ce1acb9fe1092e8010a90ba764d3ac065ea4e846743290b1d6 SHA512 5d6f75a7a81d369512c6bf70ae14c5275cfdc2b273a5801d7ee928a829ca472aac5ee9f9f2542af6369f34c1648dd12e42112efc29d602527b9ba58a311b4c17 WHIRLPOOL 84048737d1ba746454212e13696ba34d9fc722c74823f719503e29123e33869a49742fba02e24212e3f67e045c5499cf1893bbd191bf8df1dd5cae05a517a17c
 DIST waf-1.7.16 91846 SHA256 b64dc26c882572415fd450b745006107965f3fe17b357e3eb43d6676c9635a61 SHA512 ccdf27cac76f525e11bde20d01c3f81b738b4c990934ee290a390fcf1b278da05047bcee76973c80be4557689344f6df33c13e232b278258745e2f19eeed5ebf WHIRLPOOL 79b59876606a93c7a13548799c8797f40515cbf8bc2944018de758df3e8cd9698e4304d5d26a03ae883195ec02d6e0b12e6fc7160e4ef31446d7c3d05f98983a
 EBUILD mpv-0.3.10.ebuild 6282 SHA256 890aeeca73c3e544ed2b2d7ec8feffa7c6e19f1ef0cc22e42ec2536f41e93e63 SHA512 0d823df2a1e2d6825bb0c07c5f4aed5a7198970adfa750a3b1914817b0e8432202dfd3afb512dde1c6f1f5b537ee2168b832ca20c54c9c7cf1882cef21f5f8d2 WHIRLPOOL db426efcc6313857a69ab03d1037cd2789528fcaa2598d8c1e580b50a160a9f3da3f9c4ebbf8805a5e61ed9615cd519acfe5203fd4aa13a3872faf40128a6694
 EBUILD mpv-0.3.11.ebuild 6331 SHA256 62d3b900051619de87d7140cb40cbba88be2d02cc9e02d87b727659abb19beac SHA512 b95d2bfbcaa4f4d14f41132d6875f4d95707f415371d48d9e9ad348089dbd789f630c6e0d824b6941b486c60466da1330733c30c137b9c968a25f131e77aded6 WHIRLPOOL 1a78a4040251d7e0e31ec90da619c4cfca1d149f3e19aa684c1ee2b96713c1c778ceef8361d3a985282e1be1d6b660b25008177787078923b11edf6816a7c6fe
 EBUILD mpv-0.4.1.ebuild 6114 SHA256 7c336617a066ad3888c02cb1809f7adef8b7fc764cf0c03855fc25608ec30f88 SHA512 cccbc85327d103d5134a711c873e75a5feb2f329a461df3e4c098962c96ba98222924191aff7135ee421bcba61d27b8fe0baee217663172e902987c6e81a64cb WHIRLPOOL 8ce6f3a7f1a738aa5b568bf68d180a1497cdc24c02cc41a31e37fdcece8b51a0c8033f82fd546f81dcd855c4df1c0ae88b2f14b059550b7d24a7ef2eb3e2d102
+EBUILD mpv-0.4.2.ebuild 6112 SHA256 34b8dc7a82f06be1cbb703ece91ae4b77fe626a6e542d3e3921af94988fef30e SHA512 b52895bef2b206c5620b66e9b5576e93458a67611b1bb9876a54f9702bac29841ccd91025a190906c10000a104f38c28d68a5687023a9ea0bd91f5a4d12244b1 WHIRLPOOL e2be2581a48eab1b7f47a2254740eadb905218d5a8d949b13d2dac2b7c78e900c5b379344e137e1cdfafe315cfd60a4e4449c3371491f807c7ecf73680fbb7af
 EBUILD mpv-9999.ebuild 6135 SHA256 5a61a4a912214b26f5323fd4a0f1d5d576c3ec6d5aae8c4d7b6936bd670cad37 SHA512 969b014ec8081f78a6551de26cc1fca38a788dd3028e6b5092579ef19c306c2ffc7055c52e9572e0f22a4e004886d8aaa6f7e0afe587ea65ec08e2d202c94275 WHIRLPOOL c9dea0c1aafb96baf5b41fac914887ea00f4e28867e27c4c00efa806c86b7b82f88c41059d17601c8415d2e890f997712ea042dc9ae1b14bcd60ad28d7c31edd
-MISC ChangeLog 14085 SHA256 31dd30c214d1f94b7a935b863ac7faa3ff1395329001874433859a16405cc407 SHA512 f645334bfaf1fdcc0e0d694745ce8fcc810c3ee8abc08de20dd24d8c5ee1b991c0390807f6b7fd45e79deb5192f52623297fdc405752873fe1f5dcd010fb5909 WHIRLPOOL 68270efadedfc4f4e2e2bd49d0aff97094152cdca443d6ff76d29cff68644aa14739ea14124774fb9db4c34387f1272344cbd08ffbae66e234912a263441ba15
+MISC ChangeLog 14214 SHA256 0af697592a3da64936f5c596639aa6100a380faa300ed381e89e958d3ae490c4 SHA512 49f5c4d06703073d03d300488efb1bb856eb9a5aa8e40445e56a07627e9a6fadbea290fd75aa1af5b121e8a22491695e7a0449fad98a3ec5666a3c601bea9ef3 WHIRLPOOL bb9c43306518ff4139167a850c7ea7ab8450ea55d6c77537b4a5386f57ac32aceb36f8cb14cc0468b6ffdba14f3f3ef77ed988e23e0026ba18512ff6772a626e
 MISC metadata.xml 1789 SHA256 26fbda27a82c523c5a720c4290984f37529638559808285701dbf39b6d666a58 SHA512 e53cd794948a3d7c741f9044a7b7f30f91403fc7d64a2217b31773c9ebdd328906614e340b97e3d142689f13c65efec8dfb1b01c514a0dd679274d210f3b0391 WHIRLPOOL 7cc740c67d439fbbb4137b9ef6a3268ee7af86de870f9e718b25ed00f2d2ec1cce8314907ec31ca8145f01d0e4f7be4e5704bd1e03a6bf317209b5b2ebe3d874
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iJwEAQEIAAYFAlPMGKkACgkQG9wOWsQutdZ4lgQAtl4YXATk34j1io44w0XZENXV
-Diwx+nX88FIQOYDUbaJwh/BNtTN/hj1t/GVUssGAdgUWn+smuZNH/P5nqbQWLIqa
-leZg5EW4LQPGp3NNrZ3W3g43FH5yrdpwJRxDYt8+9JqRMlC3IWFx+VhbAA1j/0pe
-Y2MjLtVH6vz3Wq7ShBc=
-=QPGB
+iJwEAQEIAAYFAlPU/6IACgkQG9wOWsQutdZJbwP8D9YQfnWp8YjQz4ftEq7ZPsl/
+ewhMctKXqTt8++OqEXfpc6AhNh+6ZoNI6oJPW9KCFZ65MoqTjkxxWYj6lVtD5rRX
+UVFk3u56/Uu0UnvASgewc3Lqxpf3tJfiWvfvQoG0KKduzt5BjthBBwEPZSI8q10e
+VaxS6HD9TOURud3aywg=
+=FWBZ
 -----END PGP SIGNATURE-----
diff --git a/media-video/mpv/mpv-0.4.2.ebuild b/media-video/mpv/mpv-0.4.2.ebuild
new file mode 100644
index 000000000000..269dafc84ceb
--- /dev/null
+++ b/media-video/mpv/mpv-0.4.2.ebuild
@@ -0,0 +1,242 @@
+# 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.4.2.ebuild,v 1.1 2014/07/27 13:28:06 zlogene 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/ncurses
+	sys-libs/zlib
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXxf86vm
+		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.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-python/rst2pdf )
+	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
+	# vapoursynth is not packaged
+	waf-utils_src_configure \
+		--disable-build-date \
+		--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 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
+}