Version bump by Nikoli from Freenode

Package-Manager: portage-2.2.13/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

3 files changed, 259 insertions, 9 deletions

diff --git a/media-video/mpv/ChangeLog b/media-video/mpv/ChangeLog
index ce97a97317ed..0d89f566edea 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.95 2014/08/27 14:27:47 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.96 2014/09/26 06:22:42 ssuominen Exp $
+
+*mpv-0.5.4 (26 Sep 2014)
+
+  26 Sep 2014; Samuli Suominen <ssuominen@gentoo.org> +mpv-0.5.4.ebuild:
+  Version bump by Nikoli from Freenode
 
 *mpv-0.5.1 (27 Aug 2014)
 
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 61eef24dff20..02b23d3f6a9f 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.0.tar.gz 2577656 SHA256 263d105c1707ae5fb9eedac030b4f8f4e6e3f9c000c074c615397a54bb61b59e SHA512 d0ad5e8e55582e8a998b751d7786bc82fd0be09043dd993f6eb3c564492990a923dbb1dfa72f145758515924aa922a3877cfa90c7139b508b324216dd9f8e9a7 WHIRLPOOL 278d81452a3fb2d563620f52244c54a88bf418e93afbb8a5ee14b3c35751587e235be8f4f22c2eae093061787beeaefba465ef65ca85817e631eec5359a67e86
 DIST mpv-0.5.1.tar.gz 2578630 SHA256 c15073221efa9ec91a067dcbc801b71b5b9bd77e907eaf1e97fd5e9a4eaf256f SHA512 9d063364438d6f00954f412d8f7e9d8af2b0d4e2101f8cbe5feab1f7841e1b61ed2e95063cd2de5ff6f4946fdd570d98892d5d1a685f12e5ac70f3cfe8755e88 WHIRLPOOL 6e4fef71ebd00343f10e795e8d112df441e345d18370c1c4a0b4b476ac3c6711fa4e1743ace36c730ba77e58cf38f81247b8eb1414c6d9397e0a90e027521d75
+DIST mpv-0.5.4.tar.gz 2579736 SHA256 b793d48938b57f4e37a410f61a98935d5b80b552ad0862983c025aeab71529d9 SHA512 46269ae34b946cedbfdefdaebcd0e4c56737866407670bdf3bf22fea69d53f24255abc06cef665dac6dd4779f25020199d9d3a47caa393f034b81d4bb27e0a5e WHIRLPOOL bb3bb9a72d1ad506dbb73baf809c9103813455882ef765f912f941f5701a08f2ab5bc1e99da4e8dcb0bc9ea6063c654fcf2406e63760247df03cff0fc93b86bd
 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 6279 SHA256 62c087acd83826e80c055935aeaa312c1184fc8354542f0662014825175d0fd6 SHA512 3f7e77160a433326985f352cf1a52fdb0504587f48caa02074918b6911d7ec84b4a6d16ac0fd5679041fb42202ae4a32cdcf5cf8f99ad178b27811c0da06e27d WHIRLPOOL 6c0c58daed89d7c4235fcc77c3ad90642b328dc7490b766479609d5e6fc52708283fae849aa0362343d6c98bf3296bf50cf50b0c48d880ddbb24a06ea07869a3
@@ -14,17 +15,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.0.ebuild 6137 SHA256 2062fe1be568a3c3309aa7fb2d645edd19c96800899da8c31b426850bec11f26 SHA512 9b8757164aaab83ff06e41734ebfc5f5cb9cf12bfcc2d5852fd8628630af1598e456e6ea992ed8e79dbed123f666ab51df3c91c12c893d5af207ddbf4b7983d4 WHIRLPOOL d928aa8c5fa75a9d34d633506655314e44c6bcebd59a3e9bc0f74dbd4b299f04336c78f3907b15aaf1556392fd8383eb8e6301296fd489785beed3a4fa25f3c0
 EBUILD mpv-0.5.1.ebuild 6137 SHA256 b256f85bcaadff59b3776cab5e2b9c98081bf3bcefbbc4d9dfa48dd765a51fb0 SHA512 a8d86bbee4ececd39318dea4b9ba16da51fd828113a13ba6b239b3d1aa020d4b4b0d73241f4d627b4acdeb71219b5252257ecb8029a61720276ee16bc6d5f7ee WHIRLPOOL a2e9ac69fe9e2469bc72eba3aa993ac13e585585f57ef76639485fc0df946d94ddbdfde1a6cc378d6bbe99acdba77e4f7b43b325b343e25024fd6b2187e7d42e
+EBUILD mpv-0.5.4.ebuild 6137 SHA256 fd7d3c927f0c919ea8887d4e4592dad1f1a52d32287ca2e133c9a27b214bc86d SHA512 8e878204f44630acf92dc21a829bb81f9844c67fa1f38765f801be7c84a4e70d13a5e474b5a973931abab869d35c33e3f24241804fe80bb4ed121bfe4c3c056f WHIRLPOOL 2d84e4e7f2c71edb16317ceeeda0e4311f76d46400522fd32f3b0699119041ac66fc9919b9ac2f37d343f0e73cfbb3beeef333ccf0c6757fb76a528806f2a504
 EBUILD mpv-9999.ebuild 6135 SHA256 5a61a4a912214b26f5323fd4a0f1d5d576c3ec6d5aae8c4d7b6936bd670cad37 SHA512 969b014ec8081f78a6551de26cc1fca38a788dd3028e6b5092579ef19c306c2ffc7055c52e9572e0f22a4e004886d8aaa6f7e0afe587ea65ec08e2d202c94275 WHIRLPOOL c9dea0c1aafb96baf5b41fac914887ea00f4e28867e27c4c00efa806c86b7b82f88c41059d17601c8415d2e890f997712ea042dc9ae1b14bcd60ad28d7c31edd
-MISC ChangeLog 14926 SHA256 0450906d4840c0dbee3d9eb5bdb8e2b7fbb1a1df6f06025bf0ec9855cfd0a8e7 SHA512 49fbb3ed246dcd37638b16b5b8d4efdd02e5e647512dbbc4b71892c73bf681b527b54623ea9e29dd356a8730486a746ad8b6716d365bffb64d4d44c90afa6957 WHIRLPOOL a60762bdc9ecdc2c575ea274531de081b82c228d7002617a5313940fbd26ea1fc396c2fbb4cb3233d4da964271baa15beb9303146441871a0366f9e0cfeaf1c5
+MISC ChangeLog 15065 SHA256 ad89b8cc39688f0d367ee8d5b12659d4e5d94bde01178f38e444e4901622e4f2 SHA512 0d9e58dcb54f0fd98ec834e6f2cfe448dd121e67cbfa2aacfc271a21e4dccd9954bfb1c2a44578ecb526728bfddd7a06cd62ced6b4ccaf1617611062b42b9371 WHIRLPOOL 5597643b7346b61aaa257034ee377be9c4cfdeb803b62764ee887087e7dd0407627de73f6c4ac3893faab49938751ece4d005058118ef889b801e7e9df798c8a
 MISC metadata.xml 1789 SHA256 26fbda27a82c523c5a720c4290984f37529638559808285701dbf39b6d666a58 SHA512 e53cd794948a3d7c741f9044a7b7f30f91403fc7d64a2217b31773c9ebdd328906614e340b97e3d142689f13c65efec8dfb1b01c514a0dd679274d210f3b0391 WHIRLPOOL 7cc740c67d439fbbb4137b9ef6a3268ee7af86de870f9e718b25ed00f2d2ec1cce8314907ec31ca8145f01d0e4f7be4e5704bd1e03a6bf317209b5b2ebe3d874
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJT/erdAAoJEAmJmMX429reDJEH/j7Lf3WuYff7+eQATHz565xb
-XDG7yL4M9QL4QbUuJMJvX8yyAugIKYIFII2ZLFFErUsoxjgwFdU2iNsj51WyrgeD
-GXB0FgFe7vSfSttmqf2gDf2gl0xRxiIBfIbR99E6KZHKp7vGlQMqOMFgk1e48tW1
-pWDt2pKVpwYnq24DC7D0eFgBEJhNlG3ZcVwaKoZYew/KaMooy6k+1mpnlbuyyCpr
-WzTUo5h40o5rvfJ6Y4WVUr0DPguVztBsbkmHw83e3IFUWOzudfbh23fx6RjAjDos
-GKPmBXdYdwY/g+2uuQGhhMic5EIEIHV7mHhuEgI0vNEozOqF9+/+yvGvi7FzYrY=
-=x6yo
+iQEcBAEBCAAGBQJUJQYzAAoJEEdUh39IaPFNW2oH/17pcZUyuauFOjJNSRYR2POK
+aBC3QUo0scdp3wUSx7sxQ0yv5XdrQq8U9G1DBQrJilMdx+iKAIzbQ55x2sSYFHvQ
+2tqF9hT9x0pVBJkIAgfi78UTFtx8tfwqUxVSb9hWofsfkLjP+EWhf/f0xfdqeO1T
+TFExndnG2i4DG00oIUtT40DB7Xjv2ykqkeZ8xSjlqYBCqOXLq2Li8opQsvC3qE+L
+aHCcgjWSJ4/rocBjL2Z2CbvlFw6WfHmN83NI/prVu92C9zSanV8GjNzxTH5WIZCB
+UYxcCpMh8Tk6YD8WN9GzNmr04zxIMnXdmRqZ+O8q6y4f1drjK9pXV1vgGH7NW3I=
+=fpZR
 -----END PGP SIGNATURE-----
diff --git a/media-video/mpv/mpv-0.5.4.ebuild b/media-video/mpv/mpv-0.5.4.ebuild
new file mode 100644
index 000000000000..5f737aaac382
--- /dev/null
+++ b/media-video/mpv/mpv-0.5.4.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.5.4.ebuild,v 1.1 2014/09/26 06:22:42 ssuominen 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-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 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
+}