ebuild improvements, thanks to Nikoli and kensington

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

5 files changed, 32 insertions, 31 deletions

diff --git a/media-video/mpv/ChangeLog b/media-video/mpv/ChangeLog
index 13871eafaa0e..0cfac8066b16 100644
--- a/media-video/mpv/ChangeLog
+++ b/media-video/mpv/ChangeLog
@@ -1,6 +1,10 @@
 # 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.132 2015/05/04 13:15:21 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.133 2015/05/04 15:21:35 yngwin Exp $
+
+  04 May 2015; Ben de Groot <yngwin@gentoo.org> mpv-0.8.3.ebuild,
+  mpv-0.9.1.ebuild, mpv-9999.ebuild:
+  ebuild improvements, thanks to Nikoli and kensington
 
   04 May 2015; Ben de Groot <yngwin@gentoo.org> metadata.xml:
   Make my de facto primary maintainer role more explicit
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index b76bf0e448f4..fc531832c3ef 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -8,27 +8,27 @@ DIST mpv-0.9.1.tar.gz 2698031 SHA256 5d23688575d2cc4484f7feef628c690f68016e38562
 DIST waf-1.7.15 90909 SHA256 e5ae7028f9b2d8ce1acb9fe1092e8010a90ba764d3ac065ea4e846743290b1d6 SHA512 5d6f75a7a81d369512c6bf70ae14c5275cfdc2b273a5801d7ee928a829ca472aac5ee9f9f2542af6369f34c1648dd12e42112efc29d602527b9ba58a311b4c17 WHIRLPOOL 84048737d1ba746454212e13696ba34d9fc722c74823f719503e29123e33869a49742fba02e24212e3f67e045c5499cf1893bbd191bf8df1dd5cae05a517a17c
 DIST waf-1.8.4 96179 SHA256 f02035fa5d8814f33f19b2b20d43822ddef6bb39b955ca196c2a247a1f9ffaa8 SHA512 3a132d8b1cba0af0e3df046c0204c5df706fae4e0fac41cf74b53f6cdea6210ed798671c7a3cb3fee70573aacab16d4c0cc699cc4b7aa74c8a416346c5513f4c WHIRLPOOL fe8d7f42e5118a1f9490a0c9add1355c969185376b57d0bab024068dd6e7364632d862bf9432e1209165c5313ae843479ef334f4bd6285db05dfebff9a1b640e
 EBUILD mpv-0.3.10.ebuild 6420 SHA256 08c56a8e201a818067b041f6d8a7d1a4c2658c0887f595fc3e3d2944241359fa SHA512 d6b92efcfb388a3d92109247b2fc50effbe94f78c0e420004d646f3101689f85138eef568a1d53ee4c6098161fd1effba97173cfff1bfa59a278b4d343312357 WHIRLPOOL 576f26fbac334b0447c84af43e4e54cdd1e8360ffad8aedffa0ab2c534a44382b5d5f127680ee41c3671d53333aa2c15f79f237922db3a9b418b544ca5cb4e54
-EBUILD mpv-0.8.3.ebuild 6969 SHA256 6c0e6d47ee7652404515fc3883347e6400b2664dbe37c32dad5b1dc42f48ed82 SHA512 baf645f2a94fa8da0465d1e2677baad4f35ba3ed6ea036ecb16a60ec94651f1db795809e0c86357f99595a69b06acee9bed63fb5c0fbdc7902c33c953969d476 WHIRLPOOL 3f453f220b9ab5ec77f4f72310bf01e2b9a23d7bb4acf047d8e4e2840523b04f1faaeed4081e97387c5acf0c89acd8465c2c943d289385b4dbb1166d032642b2
-EBUILD mpv-0.9.1.ebuild 7207 SHA256 0356ec83e4bb8d5754b2850521ce6b8cca4fbf78f51dfbb7e56f5e2771d10315 SHA512 4666418950eb1f995519d9ab3d5e2f558437fb5c4c4f0b196f8fc7d6cc3f008d78819dea6817bea6585d834eca03d05a6034652a95498f3b3016693268c68c25 WHIRLPOOL 0c97b02b5f189bcffe896465dff40a40c4d271f65006542f9b2da6fb7a7bd067de000668ff2785a4b36f0efebc35e483ed3cfe55f4a08ff0653dff58debbc398
-EBUILD mpv-9999.ebuild 7207 SHA256 04794ea7d92838ca0cf0df2c8cb2516a3d2c03014fe97af74ff80535e83c872a SHA512 7e5c682f105453d1b94c4cbd7cef14814ccf83d77f29672a209f276248701b5f3f400138ca7f6ec38c571c6c75081a9672650408eb44cbaf09f3adc0255f67cf WHIRLPOOL 4ab68b6be64f020d5392a6b2ae736b5b0b56e1572f8010534732b7c68543f44f42331ecdcef61f02d9bfc52104821cee534ed84282f5813c251fe440646c6736
-MISC ChangeLog 21146 SHA256 b5abc7fdb2c78cdcd4409ab95ba68fca6e5871a1cd85eb682a34b8f87472b11e SHA512 60c41559b020ac16192892a11f57226712b6346940a2a2f6001627920f175e7896c522b9b99001f8fc754814e68ecd97c2bb9f99e726f5ba3ede3c6afc88ab6f WHIRLPOOL 568d6300662f84f07ea2783fb583be564b86460315bfd0f383802063d53ed25d71d87a0f727d3f3aae78ef0b27e908827f356fabfcac0352077804115dcc998f
+EBUILD mpv-0.8.3.ebuild 6872 SHA256 67b77d01282f23c288ce520475516732b006571b20cf31cb4a4e95a6bc241e93 SHA512 33a0ef1f5f0d624f6bdc6c7259db00856af9126f2087e1b98f96a761fd2e84f03673e39f3e74ef6f34f1030125a578709a8bc1cc6b2a1eeabf92258bf7b9cb98 WHIRLPOOL a4981d7fde7679df9b75a3d7cecc9ca81ca2d605dfa182f748b7bb3687fd8cad0f6cee553c2e36544bbb5b0c24ca0d706b864d7b83224837cf96593940c296cd
+EBUILD mpv-0.9.1.ebuild 7214 SHA256 7d4c90b6f8e47b8c60a911621267150557373035ea08cc52ca0e291b68a8125b SHA512 01e7dda0c197618e30c2e3d206f4d4a839d9505a2bde5df28172810778ffaa904b1c826450d467cb27040c9526a3bfd2396c10e4f9834fa38a7f12b8df728a29 WHIRLPOOL 4910f6120b9ff5c6cfc6dd30f7bbe98247b1438846b0ad021d49a124656a6d802935d6c0c11fa1841781d3236f0263189ffa10beb6f2c7639c0967f23706d1ea
+EBUILD mpv-9999.ebuild 7214 SHA256 791baa350b08a3ada32f8dd4fb7d74a85259493275d9cb3464a0c2ebefb8727f SHA512 f2b0da86285601548c68ce77f914dd7c1ce15cd3ea259465dd4e52bb7fcc0129d82b465a480491e0ca7f87a1fbee4b586bc77e309b8fb5642ba7c11a551e2a2a WHIRLPOOL 8f0f6012799a1fb8e674327412429071702f3d05512f93eea242a5872d4049fdd2f0110bc0143eeec3ab91ae2558410fad32c0fc5b3337450b06b4ea16926ac6
+MISC ChangeLog 21305 SHA256 97705130cd1c65bdc514e46c4218ff808b0ea6fc429a0141adf024a2c646c7db SHA512 c767864a812bbd8167e13e455bd5649c7290645aeb47f1372318e25277b07a86d03954e4fbd6b067ed2cda25beeb35bea333e1274b98eb25a4494f40ee7a01b7 WHIRLPOOL 2651fbc66a601c634d507e64921275e7d7a2544784ce6134f63a40049222063c731690122352cffb7deaa12b56905feec52e96636a9dbe597926622ede50bf91
 MISC metadata.xml 2467 SHA256 4c5bc9b0c5b81f14901795d8acc1444b208ad8a746c3c54a97a9515b1610d692 SHA512 2c9197f8a75501acbf07e3c017e64857d69873697fc61e870a9a552769e3df6a546c06cee48cab509bdda6bfedf128f6d5b325282de20a90a79d397f4daaad87 WHIRLPOOL 1646ea6ff0bd42d9182cd795510417f813b9ed00c914468f087a0061023b031e98882a311ab917e07dc3779e4a45b9728151d7056a74a47326cb9d0eeb488479
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 
-iQJ8BAEBCABmBQJVR3DsXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVR46CXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
-RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOk98QAKfoDTKy1IveX2OUQ99DB7ld
-ec4Os86NvS36zsd1CGodUtrRRSsrDxt+o777m+Fs/VuSUUmM/I4inEU3dqPxzcTb
-Nwg+kBxY0jg6YkQm0BZDkjK/RZdu3tp9chggVcjfPVRV3r8P46OcHwvYAncX8Uvs
-OqO+7C6LfcywnN/6D0EelOVQrJiCicSNzSE9Da6Nlk7rQ03TqJt10Gl77bm7mQlI
-bVt9uJQT7eNQp+ORtYVYhrxrqZaxXqLsevyuqhZ0y4cDfTe8ZpkXyIoJR++Km2t/
-mHnf3CASNHDAgzat079h8w+m5yP/IiL2ZP4D/apOyvSLEH+qOYTF820f6nETSMQd
-yz1kfuo+cYIUS7AhJF3mDiFaCYzbihplKCPdhyqz5iGywQ8A8UKJmVgrQQ3u3vqW
-k+XtwRbndKnaC2B2/srruM/1wlbfdYvcPN+sM4B9mmjga1rzE6P3bzmUkIUe0BfL
-K+7eWdIao+zT+KU3u3Qg6KqsiVqmQv8DQzgNdyXCDuB2YqdcKWHAx+3hzmM+nVqr
-fzqCose7R6AnPB9AzMMNeXw+Gk9GO/rvw+hqOO17tl/Cv9pkbBaTjhTVYpfjIGPf
-ruhMYGNWb7njX8aTTWhsNWbJNG29AsSRMdgF0ZpTl3ub6LG2lZYc3p3uXQl6WbNF
-mEfWO75P4g9a+BiMRgeB
-=efoc
+RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFO57kQAKiJ5iVDMPZxqoabBCsWKU8W
+q/3Z9wh7OWhlzO3OkVoSgIQWnxZYApUHjrg15R10zaSNGekbkNaXlV1xh/g749Yk
+iqo8EgTHECF5iB9YVuymtqz4o/5uF3Z5Hcv7lL6lKVvQJ1wuK7+5ZlEMqL1fL4QF
+i0yNt0owzeAnypgeI5sETldGlJSys6lmVJMHoyhmKkdWYUwA3XUIEVG/9w58Xl2y
+XW2ZlruepXvWRI9z5s8SYi7GTv5U9HS3ngC611Iy2FhgdrLGvdGcjTrQI/zOR9bP
+cLZK0Xvo0b1SrXwO0IrKWl+2jGArVzCle1ck1l17XJGJBFOjQ4IBfy2FaEqYTkRX
+8i2eQta0ghg15ggHz1sVjeItkRNB9foFM9EgrYH7B6+Dm67ASaFGnuh6i97YLsDn
+ECwIp5svrukBD7CeovxXsSKvIwMhsOibbeZKCNC9Tm8s0z6xBkioBqz83IvVLgWe
+t76LeAfOaDJYxOZS8tEimhk9eXAuahtu9UElZ9iJgP+30enVPn2+OXw2yPw9M5aF
+98Pl9XSgtWTfUkB1KRuo9G07/tdfCpvkKzkYF9xLbQ+RStCbxlB32x7GbU+jlv4k
+KWh2ZBNbXTxszwItaBsxrxFTRzWGuCZgX2GZyQI8bTnrPNI3CvZ7ituoFxuIRnYV
+5Zmq/rkh8VVFGDflYPMj
+=0Mbg
 -----END PGP SIGNATURE-----
diff --git a/media-video/mpv/mpv-0.8.3.ebuild b/media-video/mpv/mpv-0.8.3.ebuild
index 9a0bc9492d37..0fa2ca0152a4 100644
--- a/media-video/mpv/mpv-0.8.3.ebuild
+++ b/media-video/mpv/mpv-0.8.3.ebuild
@@ -1,6 +1,6 @@
 # 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.4 2015/05/03 06:52:22 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-0.8.3.ebuild,v 1.5 2015/05/04 15:21:35 yngwin Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -127,14 +127,13 @@ RDEPEND+="
 
 pkg_setup() {
 	if ! use libass; then
-		ewarn "You've disabled the libass flag. No OSD or subtitles will be displayed."
+		ewarn "You have 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"
+		einfo "provided by media-video/libav."
 	fi
 
 	einfo "For additional format support you need to enable the support on your"
diff --git a/media-video/mpv/mpv-0.9.1.ebuild b/media-video/mpv/mpv-0.9.1.ebuild
index 5c26391a4d19..44ce387e128b 100644
--- a/media-video/mpv/mpv-0.9.1.ebuild
+++ b/media-video/mpv/mpv-0.9.1.ebuild
@@ -1,6 +1,6 @@
 # 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.9.1.ebuild,v 1.4 2015/05/04 12:47:36 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-0.9.1.ebuild,v 1.5 2015/05/04 15:21:35 yngwin Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -17,7 +17,6 @@ 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"
@@ -63,7 +62,7 @@ RDEPEND="
 			egl? ( media-libs/mesa[egl] )
 		)
 		lcms? ( >=media-libs/lcms-2.6:2 )
-		vaapi? ( >=x11-libs/libva-0.34.0[X(+),opengl?] )
+		vaapi? ( >=x11-libs/libva-0.34.0[X(+)] )
 		vdpau? ( >=x11-libs/libvdpau-0.2 )
 		xinerama? ( x11-libs/libXinerama )
 		xscreensaver? ( x11-libs/libXScrnSaver )
@@ -94,7 +93,7 @@ RDEPEND="
 	libcaca? ( >=media-libs/libcaca-0.99_beta18 )
 	libguess? ( >=app-i18n/libguess-1.0 )
 	lua? (
-		!luajit? ( =dev-lang/lua-5.1*:= )
+		!luajit? ( || ( =dev-lang/lua-5.1*:= =dev-lang/lua-5.2*:= ) )
 		luajit? ( dev-lang/luajit:2 )
 	)
 	openal? ( >=media-libs/openal-1.13 )
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index e126c1c08c57..95c1cd18a31c 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -1,6 +1,6 @@
 # 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.72 2015/05/04 12:47:36 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-9999.ebuild,v 1.73 2015/05/04 15:21:35 yngwin Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -17,7 +17,6 @@ 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"
@@ -63,7 +62,7 @@ RDEPEND="
 			egl? ( media-libs/mesa[egl] )
 		)
 		lcms? ( >=media-libs/lcms-2.6:2 )
-		vaapi? ( >=x11-libs/libva-0.34.0[X(+),opengl?] )
+		vaapi? ( >=x11-libs/libva-0.34.0[X(+)] )
 		vdpau? ( >=x11-libs/libvdpau-0.2 )
 		xinerama? ( x11-libs/libXinerama )
 		xscreensaver? ( x11-libs/libXScrnSaver )
@@ -94,7 +93,7 @@ RDEPEND="
 	libcaca? ( >=media-libs/libcaca-0.99_beta18 )
 	libguess? ( >=app-i18n/libguess-1.0 )
 	lua? (
-		!luajit? ( =dev-lang/lua-5.1*:= )
+		!luajit? ( || ( =dev-lang/lua-5.1*:= =dev-lang/lua-5.2*:= ) )
 		luajit? ( dev-lang/luajit:2 )
 	)
 	openal? ( >=media-libs/openal-1.13 )