summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2016-06-21 22:04:45 +0200
committerMichał Górny <mgorny@gentoo.org>2016-06-21 22:06:07 +0200
commitcc1960e291f3db6f34aeea84839876da8a974fa4 (patch)
tree03826d7804fcebbb40c079842a0726f51e74ca29
parentapp-vim/breakpts: Clean up old. (diff)
parentmedia-video/mpv: remove --disable-gpl3 configure option from 9999 (diff)
downloadgentoo-cc1960e291f3db6f34aeea84839876da8a974fa4.tar.gz
gentoo-cc1960e291f3db6f34aeea84839876da8a974fa4.tar.bz2
gentoo-cc1960e291f3db6f34aeea84839876da8a974fa4.zip
media-video/mpv: Merge := in || dep fixes and -9999 updates
Pull-Request: https://github.com/gentoo/gentoo/pull/1710
-rw-r--r--media-video/mpv/mpv-0.17.0-r5.ebuild2
-rw-r--r--media-video/mpv/mpv-0.9.2-r1.ebuild2
-rw-r--r--media-video/mpv/mpv-9999.ebuild6
3 files changed, 4 insertions, 6 deletions
diff --git a/media-video/mpv/mpv-0.17.0-r5.ebuild b/media-video/mpv/mpv-0.17.0-r5.ebuild
index 7540eba8cd36..bee4c3b8816f 100644
--- a/media-video/mpv/mpv-0.17.0-r5.ebuild
+++ b/media-video/mpv/mpv-0.17.0-r5.ebuild
@@ -87,7 +87,7 @@ COMMON_DEPEND="
)
libcaca? ( >=media-libs/libcaca-0.99_beta18 )
lua? (
- !luajit? ( || ( =dev-lang/lua-5.1*:= =dev-lang/lua-5.2*:= ) )
+ !luajit? ( <dev-lang/lua-5.3:= )
luajit? ( dev-lang/luajit:2 )
)
openal? ( >=media-libs/openal-1.13 )
diff --git a/media-video/mpv/mpv-0.9.2-r1.ebuild b/media-video/mpv/mpv-0.9.2-r1.ebuild
index c75f1304dc18..088b68639e63 100644
--- a/media-video/mpv/mpv-0.9.2-r1.ebuild
+++ b/media-video/mpv/mpv-0.9.2-r1.ebuild
@@ -95,7 +95,7 @@ RDEPEND="
libcaca? ( >=media-libs/libcaca-0.99_beta18 )
libguess? ( >=app-i18n/libguess-1.0 )
lua? (
- !luajit? ( || ( =dev-lang/lua-5.1*:= =dev-lang/lua-5.2*:= ) )
+ !luajit? ( <dev-lang/lua-5.3:= )
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 38dd341b9302..ccb8073b91a4 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -23,7 +23,7 @@ else
inherit git-r3
fi
SRC_URI+=" https://waf.io/waf-${WAF_PV}"
-DOCS+=( CONTRIBUTING.md README.md )
+DOCS+=( README.md )
# See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC.
LICENSE="GPL-2+ BSD ISC"
@@ -84,7 +84,7 @@ COMMON_DEPEND="
)
libcaca? ( >=media-libs/libcaca-0.99_beta18 )
lua? (
- !luajit? ( || ( =dev-lang/lua-5.1*:= =dev-lang/lua-5.2*:= ) )
+ !luajit? ( <dev-lang/lua-5.3:= )
luajit? ( dev-lang/luajit:2 )
)
openal? ( >=media-libs/openal-1.13 )
@@ -143,8 +143,6 @@ src_configure() {
--confdir="${EPREFIX}/etc/${PN}"
--docdir="${EPREFIX}/usr/share/doc/${PF}"
- --disable-gpl3 # Unclear license info. See Gentoo bug 571728.
-
$(usex cli '' '--disable-cplayer')
$(use_enable libmpv libmpv-shared)