Version bump to 0.2.0, LICENSE recently switched from GPL-3 to GPL-2; proxied commit for Nikoli, fixes bug #488254.

Package-Manager: portage-HEAD/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x6D34E57D

4 files changed, 337 insertions, 15 deletions

diff --git a/media-video/mpv/ChangeLog b/media-video/mpv/ChangeLog
index dddbe9d953f0..b2aef3303cd9 100644
--- a/media-video/mpv/ChangeLog
+++ b/media-video/mpv/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/mpv
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.29 2013/10/05 07:51:39 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.30 2013/10/16 17:07:27 tomwij Exp $
+
+*mpv-0.2.0 (16 Oct 2013)
+
+  16 Oct 2013; Tom Wijsman <TomWij@gentoo.org> +mpv-0.2.0.ebuild,
+  mpv-9999.ebuild:
+  Version bump to 0.2.0, LICENSE recently switched from GPL-3 to GPL-2; proxied
+  commit for Nikoli, fixes bug #488254.
 
   05 Oct 2013; Alexander Vershilov <qnikst@gentoo.org> metadata.xml,
   mpv-9999.ebuild:
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 7ac7d2425b5f..c1e01f6dce01 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -3,21 +3,21 @@ Hash: SHA256
 
 DIST mpv-0.1.6.tar.gz 1650956 SHA256 dc9dda1e340e32f3af155fea4f626378008405df36af21d244cedd90a790d569 SHA512 4f27f3028d421cd234202a2abc50bc5ebaddabf345cf13b924f240d2bad195ebfd097e64212ebdcb6e5572d32ab355da550f6af2174f55bb5d9800eb5077ef7b WHIRLPOOL 0a85384dc7374d75b8972ee957cdd6e8346b628ac569291f870af2508d9f745130e0597b7c9ca166b951bc9db73f6b9ae1474653901ea05b7425c80c3e04d277
 DIST mpv-0.1.7.tar.gz 1651651 SHA256 989cb7518baf3ee641748bf1f7f335cf68730943b0dd77490170a5ceb36a63e1 SHA512 17a9a98f4cf47f604851cedd74bb86f8b3d6553b1906d198bcc430419b27cf038729b091df318c6db3fbf4b64f40758c4f79da7212c585d878aff77a25105790 WHIRLPOOL 21ea955e0e212536ae7e76c2f03bdc057b4cf4c4214df80ea9ab8ec6f6ffcae1fa4cdb4bb7f6ece85aa6c0a4430c2d0255f79bf9bec51ad919c508c7fdcdafb7
+DIST mpv-0.2.0.tar.gz 2475493 SHA256 574293d341cbeeeeea1ad9d425d8e6ae319c31c985c5386fa03be6037c673bf1 SHA512 a68ebd5f001bffb14b56f941563742212b60d55ce57ae2db0f2f065992fd6459c5e897910231e2e0ee2e48b837d5895aac3814b15008cb902e991e7d2ea65df1 WHIRLPOOL c6248c4176a97c6a9d6648e7b1e74145559b6ff55b954eabe6c8e1854c2de0604103c6e829e8ceedaa91b96cd793c41dd83020d4c745f06b5144d67e9e00de7b
 EBUILD mpv-0.1.6.ebuild 7815 SHA256 d280d5fa9c1988b53fcf594ce652fcd050980810a65550d3c650dcf102185d11 SHA512 0071534e38a23675e0ce272a3a9831c03b7c2e487466f585d1cb0c75a829e328d44f6cbd0896c90e9ab0b154e26b2622cf3e4e43317682017a81895227be10ca WHIRLPOOL a23cc8fd6931ae34f86cad82c8cbee77bf39f51a3a7c35c4d0a7c8f33438158f8b4ac24123ffd5aa931a7d7b1fab2fc3db42c1e187994ba4e6f30c39312c009b
 EBUILD mpv-0.1.7.ebuild 7812 SHA256 520c9bcd3b7b7aaef3222a4b731be43132af211c4fecd04e52ee39282adae1a9 SHA512 2b991b664636bfdea521549e78e0c27edb5b91f797f902edf06e3b81c3702fdfc8a2952f2379ba4aa2b202eb476f311108576651948a136d33383765cf250eb6 WHIRLPOOL e8c1e1b08de0fc13a6faca13d96203bf5adf68e1ccee4386d203741808890df8bd02d85c29c1fb7ab5fb272d13faabba0ca63176186324094d2c23a702efb3e3
-EBUILD mpv-9999.ebuild 8211 SHA256 4403956680120eff8ecd39f4c1dc57b388c2ef0c89227cc64b683f59a4c70a93 SHA512 5c467ba1f8ebf9fa8171cd1fe1013d98f0c4ec601d697a2945e1f2dc09a587ec4d1d3838415519eda9d64d606f63fb4bd6e4345f619b00d36f11cb12b4fafa6a WHIRLPOOL fff006a485e9025769e08c3b605a9abb8a0d6a3d8bd399a80dd2d58ae403cea11cb9827c6ec21f514dc0bc3592317381fe3ca2005012c82e26f90d2f6fc5a06f
-MISC ChangeLog 4927 SHA256 6c57cbf32ae5c1bdfb64140f037fe24de58394350c759178ef462d729f734088 SHA512 d9cd0ea75374a8a32c66bf44c6d5b3d621ba4b16fb4e418dd0f1c26f33126449b2b3110e4e260e24f03ee04e21193a6eea3bafa5181c1d528e6e1400fc897667 WHIRLPOOL 8c3cac4beae3b58dae1ad9ce94f09d238261a3302a7d86d7c0023c973eb0114187c8dd9271320788743c439662b3bf7543a51559b1639436d1f36e41e76018c6
+EBUILD mpv-0.2.0.ebuild 8211 SHA256 7e8d6f03de8053fdc9356cfd8e1a09c121804e90323bfc337fa0d1fcba58a6ef SHA512 8774b72ed01fc6e5cd8cc3181a3c8141ac966f159568d43f9fe13a985bb2f67901591fcad44394c3a21186e807ace9c563cede029a1e0fe96b4a600ef9bd8306 WHIRLPOOL 6374c53360403a17d37922f2b7b49c2e437cade7dc11759390ee71e3c6815aa8c3386c5c3c3d9bf15cf0403565f59fce9d606875df1344b5df19469966bc4e50
+EBUILD mpv-9999.ebuild 8211 SHA256 f19c296797c01d1c56e9ad1323a97a7a48fbfe6d922a32303664d91a8e21f836 SHA512 d7e8db71850e61b985a00b1f2334060221c7ddb85e86107c2c3943a1d931a06578f8b6d47ef4cc460c0b064fdb3eb5ab5c53c86455e4d978c62074cfbb7a3585 WHIRLPOOL 3a4fcaa28b2f17e7933a9f17275fb7b7d08d445aca74cd6ecd32ac9e2a0a088ca0f8a31d5de7f9d074cb5f3a2c0f19ee38cd692f8e92a1c37d82120e4a33d956
+MISC ChangeLog 5159 SHA256 905ae8733ae3823b550f94670f8baab780c64911f859959032ef5d19f87c5cc8 SHA512 2f0ef8ee8e6ed9d864b2d5eeefd987e8b133286be1297efbf713f6d34106dc40f423e1eb50118dff236ab7d27da9973cd516b4fa51e53e2b0db593736a72bcb8 WHIRLPOOL 605eb6fa7d31aa73067e705f34ecb7d24c8f120067c125dcf30f213545562fdec30030691ae2b88b56505053de7735fe9956160c17cccf38ca70dea655b43aa7
 MISC metadata.xml 1560 SHA256 5473774c48f57b41d897eb472dae9ac54f21b3263217f40717ce0663d7b261a2 SHA512 6ec943f8a1b971e68d6e53c12137bcd9a6f3e3837599ddd0918eb551bcd462ac83e89891671e3046d8f0d7cbbeac0d3062efefdb5ecab8f50e05dd29f4531772 WHIRLPOOL 8803b31e81e4d278815863a13cf78af4dfc69b5bcbfa0f56d99958163c2b0a7307d9892d247cb46d82d1a2ad2ced05f2b016eb8f3c1a9c23bd56aceab0fee20e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQF8BAEBCABmBQJST8UZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwMTlGQTEwRTVCMUJCNjdFRDM5Qzg3RjdF
-QUQ1MEQ2NEQ4RDM1NzFBAAoJEOrVDWTY01caEf0IAMfZssJsL1DQ2bybTwwD1FwN
-w2hcA8WQ51aw/mD9sujG54MU70hZphedlLbjw6uFwDjnvpsc6UfpENfNxbhO7vpu
-mPzSig0uw67e8eoBdzXEIe1051M+P8lSykl6f1eUM6P4TDSrOgU53741swbOmZyj
-2A1kNr9S/Yp/cb1fX2Q7c8ljSIjdHUhQSxqy0ALUTkeB2NTnls8YxDKkqkq4UFSj
-IsyWsWI3MNXvDtC74PuzEqJybvIPjqCb4ob/1ADtM7ARZUxYXxm1YqCspBT+vNnK
-sjqE8+y1gLUswkDXETUho++gU1kfEhw771WAKuJiMmyKXUojP1PxFGBghEJ/2Yc=
-=EkYu
+iQEcBAEBCAAGBQJSXsfOAAoJEJWyH81tNOV9zzIIALQiXILHecCrxMFzf2Fk0nyG
+i+nCeBxy/4HxintcI19xZKdFoXNm8oRrfx1/cPTZ2gYIjRa36vQKxM3GRkqK3X8n
+y3wj2ze5AvgSZSon9JIWKtttsATMRMcmmxzRz5aFZTj6hqM3czxYoqv53VjNN2hQ
+OmD+Tge6Dx08bkP94DEysTqmafMcJtd6G9uHFwcYqKxu577EKXF9j0dGDmDuPjBO
+vXk6nu14YUcNYMnMxlxak68ShLKvc62i4rpyvPaxso/0dJmR5ACzcFFWrRF6102k
+n6KhThqVpAJolae1FmQufBT+WjBdgKAM798H1n8auvLYV3C1tapm4s1Z4wiG8KI=
+=JT6u
 -----END PGP SIGNATURE-----
diff --git a/media-video/mpv/mpv-0.2.0.ebuild b/media-video/mpv/mpv-0.2.0.ebuild
new file mode 100644
index 000000000000..0baeffa882c8
--- /dev/null
+++ b/media-video/mpv/mpv-0.2.0.ebuild
@@ -0,0 +1,315 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-0.2.0.ebuild,v 1.1 2013/10/16 17:07:27 tomwij Exp $
+
+EAPI=5
+
+EGIT_REPO_URI="git://github.com/mpv-player/mpv.git"
+
+inherit toolchain-funcs flag-o-matic multilib base pax-utils
+[[ ${PV} == *9999* ]] && inherit git-2
+
+DESCRIPTION="Video player based on MPlayer/mplayer2"
+HOMEPAGE="http://mpv.io/"
+[[ ${PV} == *9999* ]] || \
+SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+[[ ${PV} == *9999* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+IUSE="+alsa bluray bs2b +cdio doc-pdf dvb +dvd +enca encode +iconv jack joystick
+jpeg ladspa lcms +libass libcaca libguess lirc lua luajit mng +mp3 -openal +opengl oss
+portaudio +postproc pulseaudio pvr +quvi radio samba +shm +threads v4l vaapi
+vcd vdpau vf-dlopen wayland +X xinerama +xscreensaver +xv"
+
+REQUIRED_USE="
+	enca? ( iconv )
+	lcms? ( opengl )
+	libguess? ( iconv )
+	luajit? ( lua )
+	opengl? ( || ( wayland X ) )
+	portaudio? ( threads )
+	pvr? ( v4l )
+	radio? ( v4l || ( alsa oss ) )
+	v4l? ( threads )
+	vaapi? ( X )
+	vdpau? ( X )
+	wayland? ( opengl )
+	xinerama? ( X )
+	xscreensaver? ( X )
+	xv? ( X )
+"
+
+RDEPEND+="
+	|| (
+		>=media-video/libav-9:=[encode?,threads?,vaapi?,vdpau?]
+		>=media-video/ffmpeg-1.2:0=[encode?,threads?,vaapi?,vdpau?]
+	)
+	sys-libs/ncurses
+	sys-libs/zlib
+	X? (
+		x11-libs/libXext
+		x11-libs/libXxf86vm
+		opengl? ( virtual/opengl )
+		lcms? ( media-libs/lcms:2 )
+		vaapi? ( x11-libs/libva[X(+)] )
+		vdpau? ( x11-libs/libvdpau )
+		xinerama? ( x11-libs/libXinerama )
+		xscreensaver? ( x11-libs/libXScrnSaver )
+		xv? ( x11-libs/libXv )
+	)
+	alsa? ( media-libs/alsa-lib )
+	bluray? ( media-libs/libbluray )
+	bs2b? ( media-libs/libbs2b )
+	cdio? (
+		|| (
+			dev-libs/libcdio-paranoia
+			<dev-libs/libcdio-0.90[-minimal]
+		)
+	)
+	dvb? ( virtual/linuxtv-dvb-headers )
+	dvd? ( >=media-libs/libdvdread-4.1.3 )
+	enca? ( app-i18n/enca )
+	iconv? ( virtual/libiconv )
+	jack? ( media-sound/jack-audio-connection-kit )
+	jpeg? ( virtual/jpeg )
+	ladspa? ( media-libs/ladspa-sdk )
+	libass? (
+		>=media-libs/libass-0.9.10[enca?,fontconfig]
+		virtual/ttf-fonts
+	)
+	libcaca? ( media-libs/libcaca )
+	libguess? ( >=app-i18n/libguess-1.0 )
+	lirc? ( app-misc/lirc )
+	lua? (
+		!luajit? ( >=dev-lang/lua-5.1 )
+		luajit? ( dev-lang/luajit:2 )
+	)
+	mng? ( media-libs/libmng )
+	mp3? ( media-sound/mpg123 )
+	openal? ( >=media-libs/openal-1.13 )
+	portaudio? ( >=media-libs/portaudio-19_pre20111121 )
+	postproc? (
+		|| (
+			media-libs/libpostproc
+			>=media-video/ffmpeg-1.2:0[encode?,threads?,vaapi?,vdpau?]
+		)
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	quvi? ( >=media-libs/libquvi-0.4.1:= )
+	samba? ( net-fs/samba )
+	wayland? (
+		>=dev-libs/wayland-1.0.0
+		media-libs/mesa[egl,wayland]
+		>=x11-libs/libxkbcommon-0.3.0
+	)
+"
+ASM_DEP="dev-lang/yasm"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=dev-lang/perl-5.8
+	dev-python/docutils
+	doc-pdf? (
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-latexextra
+		dev-tex/xcolor
+	)
+	X? (
+		x11-proto/videoproto
+		x11-proto/xf86vidmodeproto
+		xinerama? ( x11-proto/xineramaproto )
+		xscreensaver? ( x11-proto/scrnsaverproto )
+	)
+	amd64? ( ${ASM_DEP} )
+	x86? ( ${ASM_DEP} )
+	x86-fbsd? ( ${ASM_DEP} )
+"
+DOCS=( Copyright README.md etc/example.conf etc/input.conf etc/encoding-example-profiles.conf )
+
+pkg_setup() {
+	if [[ ${PV} == *9999* ]]; then
+		elog
+		elog "This is a live ebuild which installs the latest from upstream's"
+		elog "git repository, and is unsupported by Gentoo."
+		elog "Everything but bugs in the ebuild itself will be ignored."
+		elog
+	fi
+
+	if use !libass; then
+		ewarn
+		ewarn "You've disabled the libass flag. No OSD or subtitles will be displayed."
+	fi
+
+	if use openal; then
+		ewarn
+		ewarn "You've enabled the openal flag. OpenAL is disabled by default,"
+		ewarn "because it supposedly inteferes with some other configure tests"
+		ewarn "and makes them fail silently."
+	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"
+}
+
+src_prepare() {
+	# fix path to bash executable in configure scripts
+	sed -i -e "1c\#!${EPREFIX}/bin/bash" \
+		configure version.sh || die
+
+	base_src_prepare
+}
+
+src_configure() {
+	local myconf=""
+	local uses i
+
+	# ebuild uses "use foo || --disable-foo" to forcibly disable
+	# compilation in almost every situation. The reason for this is
+	# because if --enable is used, it will force the build of that option,
+	# regardless of whether the dependency is available or not.
+
+	#####################
+	# Optional features #
+	#####################
+	# SDL output is fallback for platforms where nothing better is available
+	myconf+=" --disable-sdl --disable-sdl2"
+	use encode || myconf+=" --disable-encoding"
+	myconf+=" $(use_enable joystick)"
+	uses="bluray vcd"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	use quvi || myconf+=" --disable-libquvi4 --disable-libquvi9"
+	use samba || myconf+=" --disable-smb"
+	use lirc || myconf+=" --disable-lirc --disable-lircc"
+	use lua || myconf+=" --disable-lua"
+	use lua && myconf+=" --lua=luajit"
+	use doc-pdf || myconf+=" --disable-pdf"
+
+	########
+	# CDDA #
+	########
+	use cdio || myconf+=" --disable-libcdio"
+
+	############
+	# DVD read #
+	############
+	use dvd || myconf+=" --disable-dvdread"
+
+	#############
+	# Subtitles #
+	#############
+	uses="enca iconv libass libguess"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+
+	#####################################
+	# DVB / Video4Linux / Radio support #
+	#####################################
+	use dvb || myconf+=" --disable-dvb"
+	use pvr || myconf+=" --disable-pvr"
+	use v4l || myconf+=" --disable-tv --disable-tv-v4l2"
+	if use radio; then
+		myconf+=" --enable-radio --enable-radio-capture"
+	else
+		myconf+=" --disable-radio-v4l2"
+	fi
+
+	##########
+	# Codecs #
+	##########
+	use mp3 || myconf+=" --disable-mpg123"
+	uses="jpeg mng"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+
+	################
+	# Video Output #
+	################
+	use libcaca || myconf+=" --disable-caca"
+	use postproc || myconf+=" --disable-libpostproc"
+
+	################
+	# Audio Output #
+	################
+	myconf+=" --disable-rsound" # media-sound/rsound is in pro-audio overlay only
+	uses="alsa jack ladspa portaudio"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	use bs2b || myconf+=" --disable-libbs2b"
+	use openal && myconf+=" --enable-openal"
+	use oss || myconf+=" --disable-ossaudio"
+	use pulseaudio || myconf+=" --disable-pulse"
+
+	####################
+	# Advanced Options #
+	####################
+	# keep build reproducible
+	myconf+=" --disable-build-date"
+	# do not add -g to CFLAGS
+	myconf+=" --disable-debug"
+	use threads || myconf+=" --disable-pthreads"
+
+	# Platform specific flags, hardcoded on amd64 (see below)
+	use shm || myconf+=" --disable-shm"
+
+	if use x86 && gcc-specs-pie; then
+		filter-flags -fPIC -fPIE
+		append-ldflags -nopie
+	fi
+
+	###########################
+	# X enabled configuration #
+	###########################
+	use X || myconf+=" --disable-x11"
+	uses="vaapi vdpau wayland xinerama xv"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	use opengl || myconf+=" --disable-gl"
+	use lcms || myconf+=" --disable-lcms2"
+	use xscreensaver || myconf+=" --disable-xss"
+
+	CFLAGS= LDFLAGS= ./configure \
+		--cc="$(tc-getCC)" \
+		--extra-cflags="${CFLAGS}" \
+		--extra-ldflags="${LDFLAGS}" \
+		--pkg-config="$(tc-getPKG_CONFIG)" \
+		--prefix="${EPREFIX}"/usr \
+		--bindir="${EPREFIX}"/usr/bin \
+		--confdir="${EPREFIX}"/etc/${PN} \
+		--mandir="${EPREFIX}"/usr/share/man \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--localedir="${EPREFIX}"/usr/share/locale \
+		${myconf} || die
+
+	MAKEOPTS+=" V=1"
+}
+
+src_compile() {
+	base_src_compile
+
+	if use vf-dlopen; then
+		tc-export CC
+		emake -C TOOLS/vf_dlopen
+	fi
+}
+
+src_install() {
+	base_src_install
+
+	if use luajit; then
+		pax-mark -m "${ED}"usr/bin/mpv
+	fi
+
+	if use vf-dlopen; then
+		exeinto /usr/$(get_libdir)/${PN}
+		doexe TOOLS/vf_dlopen/*.so
+	fi
+}
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index 3e49200e1dd0..5b0d513fa595 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.20 2013/10/05 07:51:39 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-9999.ebuild,v 1.21 2013/10/16 17:07:27 tomwij Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://mpv.io/"
 [[ ${PV} == *9999* ]] || \
 SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-3"
+LICENSE="GPL-2"
 SLOT="0"
 [[ ${PV} == *9999* ]] || \
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"