Add message about upstream recommendation for ffmpeg. Add more license information (bug #506946). Remove useless - for doc-pdf useflag again. Reformat lines for live ebuild. Move some stuff from src_unpack to src_prepare.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x4FDF9CFD2FAC514E!

4 files changed, 61 insertions, 82 deletions

diff --git a/media-video/mpv/ChangeLog b/media-video/mpv/ChangeLog
index 3919cb21d695..2798efdf04fe 100644
--- a/media-video/mpv/ChangeLog
+++ b/media-video/mpv/ChangeLog
@@ -1,6 +1,13 @@
 # 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.122 2015/03/19 02:56:40 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.123 2015/03/19 11:14:36 yngwin Exp $
+
+  19 Mar 2015; Ben de Groot <yngwin@gentoo.org> mpv-0.8.3.ebuild,
+  mpv-9999.ebuild:
+  Add message about upstream recommendation for ffmpeg. Add more license
+  information (bug #506946). Remove useless - for doc-pdf useflag again.
+  Reformat lines for live ebuild. Move some stuff from src_unpack to
+  src_prepare.
 
 *mpv-0.8.3 (19 Mar 2015)
 
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 1568264f6cc4..d3c501472b85 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX mpv-0.3.11-libav-9.patch 291 SHA256 971cdcaf866fcb5f1a93663357c582b474480f5fb1986eb2ba7d0f77b99c15d6 SHA512 2045d9e6550f43bf31b2bd68c35ef57a8bff392d1e70522e4085f275f333fc07cbe8bbbad7f7a7ae2979d177cb347e317e7c7eeb107707206a70016fcc5b8ccf WHIRLPOOL 35666ed94ceb001e62679bbac64a898a74a6e8285876fcbd3c8f40ac58b8978e993702f81e16fa2c98ed773b180d5cb04b5d0358ee3a150e9bbe1a2941764da4
 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
@@ -16,26 +13,7 @@ EBUILD mpv-0.3.11-r1.ebuild 6516 SHA256 9bc6b73068dfb359185d719c1e002488095798b5
 EBUILD mpv-0.7.3.ebuild 6903 SHA256 3c6ebf90c032db239c766fbd4b491d2aecd5df2423202e0dda55410f75f352b2 SHA512 49e0c66d7bd7f7c0e4a48af31c2ec458bcd88678e94e8d54a8202d41239bc2f91027fda6831b6d599c43440356e5e05f2163e6ce679816e9305e351a0c3afbde WHIRLPOOL bf700deff880e221408e4deaaf70fa735f91b8bed9b1af5fa52936c005ef0b12b24ffabda0c3c1963fae2c721dfda7556cc587279765e6bb1c25678aa20f4e8a
 EBUILD mpv-0.8.0.ebuild 6664 SHA256 ca3ff007ce5f123f9c2cb72b0547635ddddb10bd065f57eba394c671c5d7e2be SHA512 81fa70092d806e76c9b311f1dcc4a438cd93efdafe364ecaced78a4193c98d79f595f697076378d424365544ec7f0d572f2ec5453d3568b5090daf3ddd9a5f6e WHIRLPOOL 311483c14a600e511dca532f4668ea0d741bf410d4b75664dbd11c9e7aaf51077e1492d90f429dedce7603f57dd8dfa7f6818a46677955a8316dc32e56e1b24e
 EBUILD mpv-0.8.2.ebuild 6678 SHA256 85b9301176abce1e39b6b780d229bc394add14a6c26c756ba19fd0cbcd2f5a9c SHA512 b4bbf6926b6dd3414253e9fb0eba98c92f67aef8683064158b7da833e4690e879d054726af409a42d0d3e60a48931c4faf4f1d95be852e949fa548a0d11a46c2 WHIRLPOOL 9e172e29e69a84b677f2ea739bdb803b83fe98fbf001917c00c0ebdb96647fb43504ce3f02c6a676d729a3f5d598d26cf571b1ac27b61fd0ee0e39bc26425a83
-EBUILD mpv-0.8.3.ebuild 6736 SHA256 db3f74d8f19ffcedf02a3169d71f47473a12cf79bd66ec4b9d0d1f76fde1a2c9 SHA512 59396b751209f8e5af9268fbc9877bd76872932983827931f9dd6d135747a05a214d1b9f24dd31620fd5f520fbaf6a6d0fb2d8ff6856c2eedb5b149e50c8f1cd WHIRLPOOL 7acd058cc43e1f177761ab2ded00790c605643af215897a3ba2e26eec372ce3f5048149aaf6776f5cad069811db9547ba361d8b637554c65f544a2c561baf4fa
-EBUILD mpv-9999.ebuild 6821 SHA256 c9096481481b36365f5a2dacdfccf56e334c7d1b240755b4febf3699e2413fd6 SHA512 d57f56335871da771a9509cecf6987dd55e0f5842d2a3106bedcb2873eb84c6f9a295d7a3bc63e5824e5e4cd318158262a6574564db61ee32a7483d7e8fba64e WHIRLPOOL 37f550cc4867e5ab296325f67051e442946dda263b29bd46e40635e641ea3144d7655520d21c7104e41af6a8951be3e181e78b3afa3a4dc1aacf050477105e8e
-MISC ChangeLog 19277 SHA256 5da5b2feb56ec5b249a48a227131c2ca67c7f3e5292aadae7dcb6e8accca5536 SHA512 0368d29b3b756b27685a00a914b160a153ed9ba182da1f00d2ea0a17652f0469e3a3c01f46b6a00d8adde48ce9c5124c5f8968d57516b0d489017980dc112fcd WHIRLPOOL b93097854cb058965f6e200392cc13af20f7eb6d287e7e8b31d0b0041672227d7ccf74ea08ec310843b1b331bfee3c6b60d5803a31b17d320d6c4f675ba4d729
+EBUILD mpv-0.8.3.ebuild 6974 SHA256 411654627897de0f8599017a69219b3606abea820a0deb8a99e44ececf7f16ce SHA512 c2fc921250641e6e13503935ca00b55dece9a75a8b75cd36e5ac521bf5479ca47634d6599a53ec39c518524d2217e68a77b671970b8f5728187e4ebdaa3af051 WHIRLPOOL 557ede53c9f17f2c3be65b83403adf1f892de4cfe48eb91d4e88ed4ee2de82d0dde6ce7d0e0f7c8812cb7ad9f0acddaa744c8b943413893ea1e038271798ddb5
+EBUILD mpv-9999.ebuild 7059 SHA256 d01bb06c8e5c657a6d8948bf43871e12699efff41d8e0adb130960db2f0e8547 SHA512 e8b1c752e4959b82b2119661d85488fda43f223db21e768bdc8f254eaffd0afff89bb8740fa1809e3e9b7766a89908dc2ff8a0ce383c7b8b3838ad2b6ea7520a WHIRLPOOL cb0d13c3b1b89cf19b8ac114a99aab15cad2ee4dbb33de66ab1deced1b492cb61eff5c9fecffb740adaabaff255866d762d7396867b9de40401c934c36b4d80c
+MISC ChangeLog 19595 SHA256 afd9d4707bc942d5b995d2d468abbfce487ec5343fcdbdedf62382c47ae1967f SHA512 48df3fa6ae65667a6e32e807e3f4ad74a8fb7e40ea1eebb5b2e4b2f13749644274a16de8fce77b57a65901b69230f10ee15105f427e111fdd56e8b7a7625999a WHIRLPOOL 0a8eee8e74282de232fd27bdb673bd9e8fbc555599108bee88f8468eccd5ac0648fe754b9a5c01c1ad1a518eec5a41c8c6715562171c2150034c2652c1234a0c
 MISC metadata.xml 2127 SHA256 cb2206f35556b84f1736d4e60563ce860e60fe775666aac0587180de0082c304 SHA512 cac0c14687c0c755e924741d91d35f8d6335f0cffab8fec3161a6deb5ec066189acc2f1da613d23c2c9c0aed843b6a8756f99d79e475b6712440c524ce6fc5cd WHIRLPOOL 9719de693c9d76ea914b0094e7dbe7ac495a1e19891c9f5983702ce8ae3dcfe0e92a98924f92a9410403c25549aa0e724cd753b729dad74d43c015b03fc5f48b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
-
-iQJ8BAEBCABmBQJVCjrxXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRCNUJBQjhDOUMzMUI3MTE1NjcwMjIzREMz
-MUFBRUE0NzU5NERCQkVEAAoJEDGq6kdZTbvtHY4QAJvQfLt23KJ+fzkdABHyqRMY
-oHZutMF2JYL7JfxbWtgN/lmmvP1yrMT1RKft2DyOXEGxXErUIO54TW5TPHJatoML
-GBkGHPHdn+bVaPxpdUKBRKNpyDJi94DY76pm0EXEj8H34DUh9mCqo05RAGJ5rx73
-iBW1c8lec+vLxbg3cJ+r+tmoYhp3ekN0vD7+ihcSy814YePQdhCesqq0Jg/n0cNT
-UJwdPyHlChR1Nk44XQPoQ//xQGhs/C9ELldzNTcRVHfLdwTuj/e90UwYE/I9IWC8
-o4lNyMNF1qr6Qh4cjQOLxuWlbJna3iyBpaPJnD9cbXiP/Z6bcxLk3gQUzimkSC1i
-1/D0yJVfioNV5TQRRFh9zI5pXrACfJ4pTeeeKygvGKZYiAnryXVi2GT0zE0PSta7
-Oc5zINNabAS8WUn5+AA48HD4lbtWXlDrfDymKDafJqcqI3PwArspb7O6eLSkFdWI
-0J1ec76IimPTpyeCix/U8b5wh74HWgMSt+Rv6i2MpkC4KgPd08kD6U5aUzV6PvXt
-Hy2J/unZdpT9YLODL0y5P/mp6phQYyFw1xEgsRAx0AUU4dsYcdAc6dC8ztbRi5c8
-Km2EJZ0qHlQvs/o8ZHzOW578tZ+8v8P9jJIs383qPwRozWnU3ur5TdVihpb/SJ8P
-BeAoAexgdD4EuOSVtIAM
-=M2z/
------END PGP SIGNATURE-----
diff --git a/media-video/mpv/mpv-0.8.3.ebuild b/media-video/mpv/mpv-0.8.3.ebuild
index e4868ade25b4..b350aa8dc032 100644
--- a/media-video/mpv/mpv-0.8.3.ebuild
+++ b/media-video/mpv/mpv-0.8.3.ebuild
@@ -1,30 +1,33 @@
 # 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-0.8.3.ebuild,v 1.1 2015/03/19 02:56:40 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-0.8.3.ebuild,v 1.2 2015/03/19 11:14:36 yngwin 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}"
-[[ ${PV} == *9999* ]] || \
-SRC_URI+=" https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+DOCS=( README.md etc/example.conf etc/input.conf )
 
-LICENSE="GPL-2"
+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
+
+# 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
+IUSE="+alsa bluray bs2b cdio +cli doc-pdf dvb +dvd dvdnav egl +enca encode
 +iconv jack -joystick jpeg ladspa lcms +libass libav libcaca libguess libmpv
 lirc lua luajit +mpg123 -openal +opengl oss pulseaudio pvr samba -sdl selinux
 v4l vaapi vdpau vf-dlopen wayland +X xinerama +xscreensaver xv"
@@ -121,35 +124,29 @@ 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
-		ewarn
+	if ! use libass; then
 		ewarn "You've disabled the libass flag. No OSD or subtitles will be displayed."
 	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"
+	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"
+	einfo "    media-video/ffmpeg or media-video/libav"
 
 	python-any-r1_pkg_setup
 }
 
-src_unpack() {
-	if [[ ${PV} == *9999* ]]; then
-		git-r3_src_unpack
-	else
-		default_src_unpack
-	fi
-
+src_prepare() {
 	cp "${DISTDIR}"/waf-${WAF_V} "${S}"/waf || die
 	chmod 0755 "${S}"/waf || die
-}
-
-src_prepare() {
 	epatch_user
 }
 
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index 15bbd41ea0a4..4baca9a3c048 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -1,30 +1,33 @@
 # 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.67 2015/03/19 02:56:40 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-9999.ebuild,v 1.68 2015/03/19 11:14:36 yngwin 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}"
-[[ ${PV} == *9999* ]] || \
-SRC_URI+=" https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+DOCS=( README.md etc/example.conf etc/input.conf )
 
-LICENSE="GPL-2"
+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
+
+# 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
+IUSE="+alsa bluray bs2b cdio +cli doc-pdf dvb +dvd dvdnav egl +enca encode
 +iconv jack -joystick jpeg ladspa lcms +libass libav libcaca libguess libmpv
 lirc lua luajit +mpg123 -openal +opengl oss pulseaudio pvr rubberband samba
 -sdl selinux v4l vaapi vdpau vf-dlopen wayland +X xinerama +xscreensaver xv"
@@ -122,35 +125,29 @@ 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
-		ewarn
+	if ! use libass; then
 		ewarn "You've disabled the libass flag. No OSD or subtitles will be displayed."
 	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"
+	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"
+	einfo "    media-video/ffmpeg or media-video/libav"
 
 	python-any-r1_pkg_setup
 }
 
-src_unpack() {
-	if [[ ${PV} == *9999* ]]; then
-		git-r3_src_unpack
-	else
-		default_src_unpack
-	fi
-
+src_prepare() {
 	cp "${DISTDIR}"/waf-${WAF_V} "${S}"/waf || die
 	chmod 0755 "${S}"/waf || die
-}
-
-src_prepare() {
 	epatch_user
 }