Undo regressions in formatting and ewarn/einfo messages. Undo ~hppa keywording of...
authorBen de Groot <yngwin@gentoo.org>
Mon, 4 May 2015 12:47:44 +0000 (12:47 +0000)
committerBen de Groot <yngwin@gentoo.org>
Mon, 4 May 2015 12:47:44 +0000 (12:47 +0000)
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x4FDF9CFD2FAC514E!

media-video/mpv/ChangeLog
media-video/mpv/Manifest
media-video/mpv/mpv-0.9.1.ebuild
media-video/mpv/mpv-9999.ebuild

index 5f4769aeed0f77737ff85b97997095bcf487876b..7de68c814d6fe0bd4d7abef10a7b242ee95b5901 100644 (file)
@@ -1,6 +1,11 @@
 # 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.130 2015/05/03 21:38:11 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.131 2015/05/04 12:47:36 yngwin Exp $
+
+  04 May 2015; Ben de Groot <yngwin@gentoo.org> mpv-0.9.1.ebuild,
+  mpv-9999.ebuild:
+  Undo regressions in formatting and ewarn/einfo messages. Undo ~hppa keywording
+  of live version.
 
   03 May 2015; Maxim Koltsov <maksbotan@gentoo.org> metadata.xml,
   mpv-0.9.1.ebuild, mpv-9999.ebuild:
index fcd670e8f2fd97a28b91c1ca501cd0faf0e29725..8a689e5aa13274e09af3b513038d754fd5c77250 100644 (file)
@@ -9,18 +9,26 @@ DIST waf-1.7.15 90909 SHA256 e5ae7028f9b2d8ce1acb9fe1092e8010a90ba764d3ac065ea4e
 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 7316 SHA256 a678f480e95a1a7cc6d4308364ee63b620b8c9a16c5271e186c3e05af3b6b711 SHA512 cff01b6fc713e21e30d99f07a420d3fdc35e859c47d7c738e972d1b5a28145458137b2c2b00ca5c521dcf870fbdac02b146a3a3f343866b315adc68cef323804 WHIRLPOOL f2ac7c210039bb70829bfbcc844040b342e7552d741f0c49e89ed65e8066b7bf37e874a624b40549bdda4e8b96c1561ef4028393afa049b7fbefdad9efc28c1c
-EBUILD mpv-9999.ebuild 7316 SHA256 403a88dc5893c1be9f503a07486a25b5670d7e53170b8765340ee316977282a3 SHA512 22bfe45646c4172056258c910fb224a4e18fe8e17151076eea741696dcfe58f3fca38354bc3cccac43170c2fcbadd3959143e8a2009f95351ccbc8aa8ac2e099 WHIRLPOOL 7edd44df991c92d18d7a3e74dd2d449808e68fe8f2e6e85a7ba3d8d91db0e35b57752d50cd1dbe3150b29be19943ecf5a25a3758e45947e9d5712cf773e16ef6
-MISC ChangeLog 20843 SHA256 45ff9b729cb4758002270a24ffe99047216200afca96b2bcf0dbcbe5ddfe0586 SHA512 41456766e8c541cc28052aa80fa01dbbed4309181a1576a58015202c0f3edd8f8c1c496dbb4348ca285b9ed61a299c099e5aee9725828f55bd4e64d3685f087d WHIRLPOOL 7198fe27526a5ab2a4a4000f7435fd72f06d64e99ae319e98de62c1d03dcaa01d48189601c199791cc5c9777335ff005c941280251c2cbbdf652daea44505144
+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 21026 SHA256 031fdf4da21d6b41e49fbb2b23ee121f0dba9ba32e032167f814f998f03db74f SHA512 6f1f29f97372aa61b9af5d8df26b3a5fa509dfb89fd254c798fadb34a27b2c2114636d79685951815c89f55364f9b146d69d65f586b8bdcfb1a8d0eff5736bbf WHIRLPOOL 22cee9dc77a2e38e934ca67e9960f6e259b9ba949d59d0dbf211d7e90b064597173800eaaed41035b113261a5245de56829ed0745087d364a7e11550ecc271d7
 MISC metadata.xml 2420 SHA256 2f1aed0d12795edd2b5abc0e22578606cd8ad9013e7f8d7c0ee6708305275582 SHA512 08e0f2a7f68c83baf945d8e5f0b4c558fd71a94182a85436219e3df4c4b39dcd8ab6bb49e631348a842ea53b8b5c19c9900c4e6eaf8267c798486fbe50a28774 WHIRLPOOL 4bad5cde76b9d9e1385a59c04bc15c9b7926523b863c6c24575933629e02b579463335997963e27a772920ed9f710aeeb0d020ef0b879161736b025ec68d6f2f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iQEcBAEBCAAGBQJVRpUjAAoJEAmJmMX429reaYQIAKsU2FGDBftXnl4ZzPGwRS+7
-Dpief4NaZylAr5Iu8+K31vtMrKpv4ZEowT8F3pS/lsqbn9ebeoipJFD7lRCoUis7
-vuijsFi0S5zxby96PwFqE5AwhV9YOu6WMRJEYlXcHJFCoDUBiYWoxvKWxyduKjxi
-5fH3Gc3WG9NJF5G9wuYSADD2CoW/0cs5zkGDBjNPHk/6DHnlNhRpdb95b6R3p5B0
-fUGlTKR02uq6gW1fDgEBtejRhqxG9BajWWGLf6XdlD1VjOevpjz6j7IlnyxYGO8W
-rLIg/7SduAYmwsZMtDzv1pvrzKGD++kUpJpvhVEqSO7uxOOUy84NtguzhAaFbtE=
-=43bk
+iQJ8BAEBCABmBQJVR2pqXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
+RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOEHsP/0wvSrJD0cONsfnXBNBa78JZ
+learnqhVWh7iq2sfLcOTPBXTLcdftfbT+15YcT0MhX9CJNKpYry4D5KTFbYdSjQQ
+OpO/SZq95qvOF/Tgmjl+Ul90gHh2P91KZbbAL3/jo25mOTJ5WKR7EBu+DlcD8Rfx
+USX4c5PS2L3ThhxMmN1CLhtSxDrEbpzh3iNvvjm+h4M/SrE1l6g98KwsvaQdkSyk
+aWqEYyWNrkEz7r7n0AH+XsaSa+lF0BpZRsndUvoowgQk0qjmeydnRelm5Sc5hIPo
+W6gLrfr5Hzg99RMwRHqL22LB+ltvujDfNrJxORDCc+F6DVYEl/hzkRhbLJoj/8m1
+PPW+cKaYw9N243ZcTxY7IikVSOVNu/elPDy4yLKykFnuOrGU9+TqO4gESEOHoR/b
+0WfLOWQ7brJcq2nDb0xeY1hbXhuBf8H8GWA8vTeRl6Py0o/cGVOCCPm4EhGcwrkt
+5E17NPj/zVKnUvnmuJZv70NazchDycC+PxuRSWW7J03sEjdUMdVnJAEvhw1QwIaC
+6P/fL8gtDSL1W6IOBEHB86A+Dq0MwA8kvbDN+wKkSruamQmK6m8K/ZceyTj3KGvh
+S3ud78hlhriNxa+85c3E98NFn4LQfJRtFEY+HlfWmcvAqilDpvSIWd8/p809Eu5C
+bQJB5cWDh+g6M5qLhgaC
+=/HfK
 -----END PGP SIGNATURE-----
index 5a7474e5064505179253a80b4f4f50cabac2c19f..5c26391a4d19df19442fbfc49cea319d2343f72b 100644 (file)
@@ -1,30 +1,32 @@
 # 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.3 2015/05/03 21:38:11 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-0.9.1.ebuild,v 1.4 2015/05/04 12:47: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 )
+
+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 drm dvb +dvd dvdnav egl +enca encode
 +iconv jack jpeg ladspa lcms +libass libav libcaca libguess libmpv lua luajit
 openal +opengl oss pulseaudio pvr raspberry-pi rubberband samba sdl selinux v4l
@@ -61,7 +63,7 @@ RDEPEND="
                        egl? ( media-libs/mesa[egl] )
                )
                lcms? ( >=media-libs/lcms-2.6:2 )
-               vaapi? ( >=x11-libs/libva-0.34.0[X(+)] )
+               vaapi? ( >=x11-libs/libva-0.34.0[X(+),opengl?] )
                vdpau? ( >=x11-libs/libvdpau-0.2 )
                xinerama? ( x11-libs/libXinerama )
                xscreensaver? ( x11-libs/libXScrnSaver )
@@ -92,7 +94,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*:= )
                luajit? ( dev-lang/luajit:2 )
        )
        openal? ( >=media-libs/openal-1.13 )
@@ -122,51 +124,38 @@ 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
-               ewarn "You've disabled the libass flag. No OSD or subtitles will be displayed."
-               ewarn
+       if ! use libass; then
+               ewarn "You have disabled the libass flag. No OSD or subtitles will be displayed."
        fi
 
        if use openal; then
-               ewarn
-               ewarn "You've enabled the openal audio output which is fallback and is disabled by upstream."
-               ewarn
+               ewarn "You have enabled the openal audio output which is a fallback"
+               ewarn "and disabled by upstream."
        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
+               ewarn "You have enabled the sdl video and audio outputs which are fallbacks"
+               ewarn "and disabled by upstream."
+       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."
        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
-       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_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
 }
 
index ac5dcf4433ebc918a9f36e3bb3923d68bf000b0e..e126c1c08c572d196ba7471b43ccc1eea9319800 100644 (file)
@@ -1,30 +1,32 @@
 # 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.71 2015/05/03 21:38:11 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-9999.ebuild,v 1.72 2015/05/04 12:47: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 )
+
+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 drm dvb +dvd dvdnav egl +enca encode
 +iconv jack jpeg ladspa lcms +libass libav libcaca libguess libmpv lua luajit
 openal +opengl oss pulseaudio pvr raspberry-pi rubberband samba sdl selinux v4l
@@ -61,7 +63,7 @@ RDEPEND="
                        egl? ( media-libs/mesa[egl] )
                )
                lcms? ( >=media-libs/lcms-2.6:2 )
-               vaapi? ( >=x11-libs/libva-0.34.0[X(+)] )
+               vaapi? ( >=x11-libs/libva-0.34.0[X(+),opengl?] )
                vdpau? ( >=x11-libs/libvdpau-0.2 )
                xinerama? ( x11-libs/libXinerama )
                xscreensaver? ( x11-libs/libXScrnSaver )
@@ -92,7 +94,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*:= )
                luajit? ( dev-lang/luajit:2 )
        )
        openal? ( >=media-libs/openal-1.13 )
@@ -122,51 +124,38 @@ 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
-               ewarn "You've disabled the libass flag. No OSD or subtitles will be displayed."
-               ewarn
+       if ! use libass; then
+               ewarn "You have disabled the libass flag. No OSD or subtitles will be displayed."
        fi
 
        if use openal; then
-               ewarn
-               ewarn "You've enabled the openal audio output which is fallback and is disabled by upstream."
-               ewarn
+               ewarn "You have enabled the openal audio output which is a fallback"
+               ewarn "and disabled by upstream."
        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
+               ewarn "You have enabled the sdl video and audio outputs which are fallbacks"
+               ewarn "and disabled by upstream."
+       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."
        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
-       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_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
 }