Ebuild update by Nikoli: cosmetic fixes, added useflag for raspberry pi. Added myself to metadata to make it clear that package is maintained in close collaboration.

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

4 files changed, 68 insertions, 42 deletions

diff --git a/media-video/mpv/ChangeLog b/media-video/mpv/ChangeLog
index a6da3c863a36..023f1965ea48 100644
--- a/media-video/mpv/ChangeLog
+++ b/media-video/mpv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/mpv
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.125 2015/03/28 01:53:34 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.126 2015/03/31 20:23:31 maksbotan Exp $
+
+  31 Mar 2015; Maxim Koltsov <maksbotan@gentoo.org> metadata.xml,
+  mpv-9999.ebuild:
+  Ebuild update by Nikoli: cosmetic fixes, added useflag for raspberry pi. Added
+  myself to metadata to make it clear that package is maintained in close
+  collaboration.
 
   28 Mar 2015; Ben de Groot <yngwin@gentoo.org> -mpv-0.8.0.ebuild,
   -mpv-0.8.2.ebuild, mpv-0.7.3.ebuild, mpv-0.8.3.ebuild, mpv-9999.ebuild:
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 9d600cff05a2..bdb8c2c05108 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -13,25 +13,19 @@ EBUILD mpv-0.3.10.ebuild 6420 SHA256 08c56a8e201a818067b041f6d8a7d1a4c2658c0887f
 EBUILD mpv-0.3.11-r1.ebuild 6516 SHA256 9bc6b73068dfb359185d719c1e002488095798b517daa63e4c58fa960ff98595 SHA512 3e7b68340bf823e844825b7100ef20e0c317d96eb3229f2cb000849cfce9b4c83a1a13d022f6f0bddd8b6d7277328a8020b92b09dcfecf3d1ef6ab301e04103f WHIRLPOOL 657261b5b8c050a6ab1dfcf36322218af05880602273feb346404bdcb5da42c2e66a3cec00b02f4cf3559990580caa17c4c66fa9cfbada0d542c41dd41414e47
 EBUILD mpv-0.7.3.ebuild 6900 SHA256 ff6caed4a74b4aa99eaeeacf7227f09fc5ac3990614e4cabe69650749fe62348 SHA512 ef4f767373455365a76d65e693f0a5d7851cf3e6db63e0afbcdc801dbacfd986528ce54209b1a786f55465a759f4b107da3e0bb74e385413a8b509fb0131ceaf WHIRLPOOL 0e0f4da93dd7fd4384c8f45f9ba7f9d5a08d86ab3ad667372dc6fa29cffb849cec18979bff0802464611e6211d1e77cc26d7153cfd2dadb0981ef4121af14d61
 EBUILD mpv-0.8.3.ebuild 6970 SHA256 fb491f89e51e72798629e39d97eb62f20cdf06e99ff1383f98a5306d084a2e45 SHA512 9821ba1045d1350a1266e0e268e1b6470999af8e528351a67ab00d698acad453a0aa9ec735fb211a96a47bc377999101906ef221eda488d421e9a87dc2b3ff1f WHIRLPOOL 136d02c68fe9c8f4796eabbe68a5c50d19924dfb23013a984b38934ce27c2489dd3798770197c380a170962137dfbbb5a90d53df54920b6a9a90493d7c4368d8
-EBUILD mpv-9999.ebuild 6899 SHA256 e25362a48067fcfce93ecb6285ad90f32e1330124255d6d235e0cad3641d7598 SHA512 b166368972e14730645a12ce82028b1b2be58d2a8abf4579c021f33b4152d594784a45d2c5952007b30b36d77950621d8afa569ad3edc00b0a82d239cfc9a5d8 WHIRLPOOL 000ffffb2955c6190a85ff8fa28e606a91dd2aa6ff9043927e931297c134a3a88e53e6df2cc4843e04a978687496c0afc0c2a36a2191195e6066fa400017c7ca
-MISC ChangeLog 20045 SHA256 9b6eb1e9f7922b0aa9f4f6c79897fdbc8785a57b45f8dd0114b97aae8d10d8cb SHA512 a089c29fd626d6e4c3dc3523cd308c647302546e36ce7074ed4bdcb2552520245b9cd31d57728edb78f1b7c7e57fde9f1a7566d77a7b8b0b3e9ead52796c51eb WHIRLPOOL b9ffcdae2d3756c97ea0a11a7b369ecbc52ac4193d4e2219c1098ca12bf0ff06450d8a2de548bf5103d527a431c1361c31f125214199cf040f2ad2fc7474af9a
-MISC metadata.xml 2188 SHA256 0ccd27419822dafffbb34eded8ed4e8ffe885b01505d5dd4ee1ff5ce44558d99 SHA512 a2dc95b60bae7846cfaa0e07277c1ea6a71ca17d08b648060f9de325ec246f10e0dcc75a0d67c1edf86e32ccc24adcf43592e1ea7343a7f140519dd7aa57ede2 WHIRLPOOL c6999aa295f40a5bd3a48a3db7e145bd2fa99fcc306431bbb8cad8396858bf1637b56983ef7673ec959fd507759e24c42f7e14780c55f3e967cd548a8812746c
+EBUILD mpv-9999.ebuild 7274 SHA256 a7cc1a13c893f23f2d95b34063c9e89d04c69077dd065ebe0473fd12d19b75b2 SHA512 22d5590dfc50391217871882b9847685c00cae06210cedc000c960155d082f4ab1126e1b112dd8f7cb25d731986dc7065ba991a18f7b582c039eb76f392bd88f WHIRLPOOL e61858cb23433dcbe54da03cfd33a0395f196f15ed7acaf376fd6c9cce7e65b2ca6b390b336aa82fc86d15ceb8cae9feba83aeadf30649b97b68ac7c660f07c7
+MISC ChangeLog 20306 SHA256 4348aa995c2a4e71ccc7dc17d3b116fc8ff374a638300cd3b1e3b19ada79e9b2 SHA512 94ee4ffc98213392b4b2564c9d74e04491eac5b0b0eae03edfe4c50c6e719a057d1d822b82cca2595bd34e6418eee5446a6a6aef561953e4869bff4828d59250 WHIRLPOOL b1110a9c1f0a867bb9afbaf34d02639c71c04f05b41767f6b40c98ce98de033cef55376ef5ffb914774025f01c49eaae9eb415ab14e51b31d837ae689e542ff7
+MISC metadata.xml 2322 SHA256 5ebf44b42ec1ae05c0cb88684b1489bf7d8f471fc74bd5499518ad1383f7d603 SHA512 f36362cc378db09e387e0f2e97662993e1ef94a9ffce80aab94113040b6fb5ea245d7111cd0ac2fd2eb993e84de98a0374994226ea09d8beb897b094fb1f2959 WHIRLPOOL cf6f9257748d46cd494b99837e18cda80810e7e2a76f45d43431f0e2ef3d5551d4473d5bc133e46916de7205265892447646370d264e84c9b17efad9e02cdf9c
+MISC metadata.xml.orig 2188 SHA256 0ccd27419822dafffbb34eded8ed4e8ffe885b01505d5dd4ee1ff5ce44558d99 SHA512 a2dc95b60bae7846cfaa0e07277c1ea6a71ca17d08b648060f9de325ec246f10e0dcc75a0d67c1edf86e32ccc24adcf43592e1ea7343a7f140519dd7aa57ede2 WHIRLPOOL c6999aa295f40a5bd3a48a3db7e145bd2fa99fcc306431bbb8cad8396858bf1637b56983ef7673ec959fd507759e24c42f7e14780c55f3e967cd548a8812746c
+MISC mpv-9999.ebuild.orig 7093 SHA256 d81d0de10328117d69f5429184b71e27650588e474fa579471958b3929f13873 SHA512 b001b94598920ca34b0dc8b79931ac1a3790958265408326b42d1bf3bfbe2cd33fd08587d864cc4379b16abfbe1c7fa6c4eb00a77b3c934dcfca965e8720daf0 WHIRLPOOL e063850d89f09c53742683b01650454b8dbff0f4fc4b3db049fcab5cb2adc8acbc22991640187a6d3d24a7632ccf9f272915488bb1abde7cd6248f3d81f0d269
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVFgmlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
-RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOaWEP/R/+l8nTtoY7hsw8d63OOrwU
-bvl0IFoqHTzD7GE4n5ZmQ7vTQCJSSI/PiWvKI/AFuZWpThUdHwjYjCGXfGHuXJgH
-Sn7FExS2HQP1aCJss7ynvo/dNvTVp2t8iVtANCqAMA5U/JLxVUnE32r4Z9apoIPn
-HOSgwguVmdPJihwtZKAnkavyAAdABJRP0bP0DKjvo7tb7S2bIVlqXZHQ50uRRpQz
-i38WsoxfeD5+FLGZoG3E7aRt+xtakCUPDQKpMS+c9TgzyMd4L32rU2c32wlB2yma
-FIPWwi7qa9Z7SmeiJKLbJyEBWtP+ewzoEYvpPcRe5H0BOeWLGecuqgScoHSG8IWN
-e5misBnX2ILtV4uqNwBMSHpzdKejpjws7rw93WY2RQM+1XWczfCOv6JThBWCMY47
-oEEGazbjwHz1l4aIs289BFyAgVHN3UIGolIczc+Sbih044I8zHZ/m3J4JRHWWXEC
-wd/OFJVn5XEGW10ca3JIx7U9carN9304DGLGMrs+VfQUrI3znB9XTGb8XVz/bYh/
-IKDgs9YlvT1aMjQFu7XF4+GeSg4wiPxGPBAlmp6zZtV6MIMQZZtxjDWe02l29+LN
-lQPQ+/dlLmbBXOGMgQTTCY7+scfmr5AXcBQOS5pqC7iW/RZ+o0QAr+mgaD5OxS4K
-wAj36XTxiAIWJvRIKxxn
-=w8b3
+iQEcBAEBCAAGBQJVGwIxAAoJEAmJmMX429reU6cH/RJAP78lS8AQMT7+gxeRGxM4
+IMkIzFyZfHXD3AIL7zN9kBlC1e+qPLUHJapvTSfavMq6OKt4yF3EmU9B+QH/4KvA
+TBH2ftqSIpd5wctnT3x3EiMRtlbi2HaEepsCj6o9GmxbLIU7s5r/zqw1sSm3vQYR
+doFdPeu+/vb5Uj+b1wNrGDK5biwsN8ONEwvtR0x/IqwCGEUAbuzbZOoCLjX73VeX
+D+6B4JU4Hid5LqAJtcms314a6mGAwREKVgEYUDzZk0M8q6dtU5q6X/XovTVkHKEU
+TWjH58rLbXDJw8XUoSoudGxdURpJnNneGJSSH9EelyE0IR1Jp3CyjgPhe8BlWEI=
+=tx3e
 -----END PGP SIGNATURE-----
diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml
index 7d19c999b9d3..2a332e434dd6 100644
--- a/media-video/mpv/metadata.xml
+++ b/media-video/mpv/metadata.xml
@@ -2,6 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer>
+	<email>maksbotan@gentoo.org</email>
+</maintainer>
+<maintainer>
 	<email>yngwin@gentoo.org</email>
 </maintainer>
 <maintainer>
@@ -26,6 +29,7 @@
 	<flag name="mpg123">Enable support for mp3 decoding via <pkg>media-sound/mpg123</pkg> instead of relying on ffmpeg support</flag>
 	<flag name="postproc">Enable image post-processing via libpostproc</flag>
 	<flag name="pvr">Enable Video4Linux2 MPEG PVR</flag>
+	<flag name="raspberry-pi">Enable support for the Raspberry Pi</flag>
 	<flag name="rubberband">Enable high quality pitch correction via <pkg>media-libs/rubberband</pkg></flag>
 	<flag name="quvi">Enable support for streaming sites using <pkg>media-libs/libquvi</pkg></flag>
 	<flag name="radio">Enable V4L2 radio interface and support</flag>
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index 6f55fc458729..6b8918d00c65 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -1,36 +1,34 @@
 # Copyright 1999-2015 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.69 2015/03/28 01:53:34 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-9999.ebuild,v 1.70 2015/03/31 20:23:31 maksbotan Exp $
 
 EAPI=5
+
+EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
+
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 PYTHON_REQ_USE='threads(+)'
+
 inherit eutils python-any-r1 waf-utils pax-utils fdo-mime gnome2-utils
+[[ ${PV} == *9999* ]] && inherit git-r3
 
 WAF_V="1.8.4"
 
 DESCRIPTION="Media player based on MPlayer and mplayer2"
 HOMEPAGE="http://mpv.io/"
 SRC_URI="http://ftp.waf.io/pub/release/waf-${WAF_V}"
-DOCS=( README.md etc/example.conf etc/input.conf )
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI+=" https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-	DOCS+=( RELEASE_NOTES )
-fi
+[[ ${PV} == *9999* ]] || \
+SRC_URI+=" https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 # See Copyright in source tarball and bug #506946. Waf is BSD, libmpv is ISC.
 LICENSE="GPL-2+ BSD ISC"
 SLOT="0"
+[[ ${PV} == *9999* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
 IUSE="+alsa bluray bs2b cdio +cli doc-pdf dvb +dvd dvdnav egl +enca encode
 +iconv jack jpeg ladspa lcms +libass libav libcaca libguess libmpv lua luajit
-openal +opengl oss pulseaudio pvr rubberband samba sdl selinux v4l vaapi vdpau
-vf-dlopen wayland +X xinerama +xscreensaver xv"
+openal +opengl oss pulseaudio pvr raspberry-pi rubberband samba sdl selinux v4l
+vaapi vdpau vf-dlopen wayland +X xinerama +xscreensaver xv"
 
 REQUIRED_USE="
 	|| ( cli libmpv )
@@ -123,29 +121,51 @@ DEPEND="${RDEPEND}
 RDEPEND+="
 	selinux? ( sec-policy/selinux-mplayer )
 "
+DOCS=( Copyright README.md etc/example.conf etc/input.conf )
+[[ ${PV} == *9999* ]] || \
+DOCS+=( RELEASE_NOTES )
 
 pkg_setup() {
-	if ! use libass; then
+	if use !libass; then
+		ewarn
 		ewarn "You've disabled the libass flag. No OSD or subtitles will be displayed."
+		ewarn
 	fi
 
-	if use libav; then
-		einfo "You have enabled media-video/libav instead of media-video/ffmpeg."
-		einfo "Upstream recommends media-video/ffmpeg, as some functionality is not"
-		einfo "provided by media-video/libav. For more information see:"
-		einfo "    https://github.com/mpv-player/mpv/wiki/FFmpeg-versus-Libav"
+	if use openal; then
+		ewarn
+		ewarn "You've enabled the openal audio output which is fallback and is disabled by upstream."
+		ewarn
+	fi
+
+	if use sdl; then
+		ewarn
+		ewarn "You've enabled the sdl video and audio outputs which are fallbacks and are disabled by upstream."
+		ewarn
 	fi
 
 	einfo "For additional format support you need to enable the support on your"
 	einfo "libavcodec/libavformat provider:"
-	einfo "    media-video/ffmpeg or media-video/libav"
+	einfo "    media-video/libav or media-video/ffmpeg"
+	einfo
+	einfo "Selected provider will affect mpv features and behaviour:"
+	einfo "    https://github.com/mpv-player/mpv/wiki/FFmpeg-versus-Libav"
 
 	python-any-r1_pkg_setup
 }
 
-src_prepare() {
+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
 }
 
@@ -216,6 +236,8 @@ src_configure() {
 		$(usex vaapi "$(use_enable opengl vaapi-glx)" '--disable-vaapi-glx')
 		$(use_enable libcaca caca)
 		$(use_enable jpeg)
+		$(use_enable raspberry-pi rpi)
+		$(use_enable raspberry-pi rpi-gles)
 
 		# hwaccels
 		$(use_enable vaapi vaapi-hwaccel)