Version bump and remove old (proxied for Nikoli).

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

4 files changed, 25 insertions, 342 deletions

diff --git a/media-video/mpv/ChangeLog b/media-video/mpv/ChangeLog
index 1292723b05e9..3e32056431ef 100644
--- a/media-video/mpv/ChangeLog
+++ b/media-video/mpv/ChangeLog
@@ -1,6 +1,12 @@
 # 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.44 2013/11/30 07:27:39 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.45 2013/12/02 23:51:37 radhermit Exp $
+
+*mpv-0.2.4 (02 Dec 2013)
+
+  02 Dec 2013; Tim Harder <radhermit@gentoo.org> -mpv-0.2.1.ebuild,
+  -mpv-0.2.2.ebuild, +mpv-0.2.4.ebuild:
+  Version bump and remove old (proxied for Nikoli).
 
   30 Nov 2013; Tom Wijsman <TomWij@gentoo.org> mpv-9999.ebuild:
   Use simplified configure option for disabling/enabling libquvi support.,
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index b182c36368d4..d9872f77547d 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -2,25 +2,23 @@
 Hash: SHA256
 
 DIST mpv-0.1.7.tar.gz 1651651 SHA256 989cb7518baf3ee641748bf1f7f335cf68730943b0dd77490170a5ceb36a63e1 SHA512 17a9a98f4cf47f604851cedd74bb86f8b3d6553b1906d198bcc430419b27cf038729b091df318c6db3fbf4b64f40758c4f79da7212c585d878aff77a25105790 WHIRLPOOL 21ea955e0e212536ae7e76c2f03bdc057b4cf4c4214df80ea9ab8ec6f6ffcae1fa4cdb4bb7f6ece85aa6c0a4430c2d0255f79bf9bec51ad919c508c7fdcdafb7
-DIST mpv-0.2.1.tar.gz 2475744 SHA256 95594fe529d09eba918393cb04547d4a7ebbb6c73f9ae12dfd0a2506a1f2d8e1 SHA512 2a5c87950c7950f79537c155cc444ff13a462a8ab5b5a03419e5f9cc4706a5d030798801243284e24ffa34a4d8a216bdd134d91defde28aacaa5d3b2c4c538c1 WHIRLPOOL 33a1c2dea318199ccdc5ce44f90c7bc2359204c6dd1eeaf911e9ac216f6fe683c087f8c9ffe176b31982973114b174612f1df4f9611db7abd3c85b768f8bc10a
-DIST mpv-0.2.2.tar.gz 2477517 SHA256 0bbb1537880b6f8d0bb2469ff12c6961150f20c2ab13f17f267051accbb27bf7 SHA512 e90a29d5b24c657ec91b5de03b250f08dd0bf13c472643e410ae9bfb203bb2a24a596c2d3dd7331243c26f22c703e7caa311b7370b7f7783b7d00e06be3b0e71 WHIRLPOOL 5502b451c6935dfd0cbf647cca9936e6e4c235557a1ba86f4c7c4ff6b639b2e6a503e2b21455fa5b64c1841eaa46bbeb87acd5288412dc0e9db44d26e58fc423
 DIST mpv-0.2.3.tar.gz 2477398 SHA256 6a0fe8b889dabdde68011dd0d3694dd36a747fc88d64f9ac9aa1e5c5d51d210c SHA512 db111172f9c483c07ad79e020d9cf92ccc93b73dcbb05d28be7165a4591ae5c415b7cc4d806f859857263857af96249590076b4ba09eb01b29601bdc20c45846 WHIRLPOOL 7280c762267bba7034c5c426979ae26bd64ad3d4316b8fbaa2ae895b3c0bf4e51d36a614fefba4286532c16569ae3fb8da7ffd21d8ef6ab45903a2b9118513f3
+DIST mpv-0.2.4.tar.gz 2478152 SHA256 34a12a82b25bf3337d44c26dd8fa750746032c1a8806b85f6b8db652710827bf SHA512 72214d02fc459b1789831e54de2841ff0a8d83c97f1ba76b18d31e970372571569b45a036fe7e7e67d6fa9460f73216cc0f1e1e6149cb24a99c490d5cdfb5ec1 WHIRLPOOL 0cf700e38a2455d5c687b3f6a50e708bc145520e54b45923a465b7ed1e77b0ddd42d86d6a000b0d969506e4bca2973133c99f49db8281acff9fc02e649557141
 DIST waf-1.7.13 90702 SHA256 03cc750049350ee01cdbc584b70924e333fcc17ba4a2d04648dab1535538a873 SHA512 4388cd200d86d9757db95a138d75655e419fd9372de1dc392025b2ecfb9a0cc95d0b17639689ac293b753355af4baea0fc700ddd5d419755facc4e1dfa009521 WHIRLPOOL db94ba365aa84927942e1d95079f9efe377e646dcb7183d6a80d4b57ebbe195d48d23b7688216bd0b793e2f914e1d83caae3b517e385f891a26f670ebc17ed05
 EBUILD mpv-0.1.7.ebuild 7893 SHA256 5808a37468bd31d56647ad389a6bea9a225ae5386861b39e70f9e8026b4b2b54 SHA512 c430b2dbd03254350651ecf66b69397fbdf657af49903128dfb33418396727c59d991e22ce00925960f526b41aab378846a156a6699b6679aa2521cc5ff46336 WHIRLPOOL 8ff09600acc35f35874525f886e0b15f280ab7b94a51ba24218dd2df5b0278b4c49b38c9c2dfe0912c38b043a262076c2bf6041c2c6fd41d79f57213c34268bd
-EBUILD mpv-0.2.1.ebuild 8295 SHA256 1c9864aa21e9177637ec356df1e949ae4f552c38198bc69f1c2fdf0d3acd9c37 SHA512 40628fad2eee2901d313217daa3d8ba4a3b10984fbc16c04932e82facf3758146bf269464c632fd3cc29128e9ee1faed1b3fcea4330b930c6b886e1459428afc WHIRLPOOL ade51c0139f4fc55d0ed1fb16e43df38811602ae152843464f061a993c14789bcc6eb1211134596315387013ac5f6931739555f3a84e22ff58670ce480daff52
-EBUILD mpv-0.2.2.ebuild 8295 SHA256 141348925326998d503a9d5103fdcf6c333bbfd1df0ebe7153d4d7ac86581d36 SHA512 fa911fb1370a594ebd562301322f02dfb4975c8c6f8574b74f06c83ed138a0cfb311a61d97307da08e44c1dedaa77371d6564989aec062c4afcdfb9e5afda64f WHIRLPOOL 9f30b5d6aea07d3954e6dc0cf5e39382c5ba5dde4ccfb5e5b74e87304622cc5193ef0abd8c0f7e95f77514e2b9fe7fa50a001345c48fca9ab00f2ad3063dca3f
 EBUILD mpv-0.2.3.ebuild 8270 SHA256 599442eeeefee7bfa46181eb1a792fd740535aa162093e9580f704a817c9267d SHA512 b131dd0130f4417d3cff4d08bc5e181b83c007e6de8c418eae8636bc8b29cfd1a7215369cdbe50d5c71aa23161560e97a94c91f5e9fbb83b905532b04e14c5c1 WHIRLPOOL 96c9221a60f794a4f2fd62ca501827b1bc29329ef4da842758a9ecd768333f46b7805077d66b72a374e27d0c0ea46bf069c2bd5b5bdf11510110a0dd29df8983
+EBUILD mpv-0.2.4.ebuild 8320 SHA256 532586cdc64722f589541986de36f63ed7a8a909a3fa9e991fb8652a60b550f0 SHA512 cdd4c4c91b85674800aad3454a4bb7e0ddb2f8523a1d7bbdd89a1f969dee467a480ec1ee0456d7f6536fdc5cee6cc446f7b9bd8134e3932d7a2407685c913bab WHIRLPOOL 0c464e8d423ad69ad146dbf571eb593fb53fa7903a0a19f150e6df0dc7eb13576c3bc467792b6b1e5e178c0295574e4a93151fcff8c7ffc63053506e21a0dc2c
 EBUILD mpv-9999.ebuild 5999 SHA256 5a7c1db728b37252d3a344c92beff6a08ef50fc7d3b790ca690dfa9af8fb7daf SHA512 764aa92352e1d81ebc98a30b6b3e36453fa7c42d66e76a05a1fecef2c5a2355292e94cd5a6ae426ef9250534385055614b8c65f6037bcdacddf1964d413e9017 WHIRLPOOL 9c653abeac65191362c6b73cfd62bf7b0f7dc3ac2ffe2612e1f3848da94e592e045b4afdef93056cab16d782006157056bc016cd60f79b36424946a8344b354c
-MISC ChangeLog 7608 SHA256 a5f7d507d8fd58f3c224af4d3a2eaac706e3983c09899cd5a7054368014fc38a SHA512 fa8f9f6ab021daab837a277aba01c5292af7efdec5f3226c1d37b7b67689da3009e2282a419ff52fd54792c6be1a255e22e689225a981b562f44dca82b865d45 WHIRLPOOL eeacbf3283e18a34677dcc3d7484dba69c2bd88dab5012b3983227e1026e3aa0fff599e8ee64b0ff39d8a162c1c980cf209428ca9d320645b787eec531f2c171
+MISC ChangeLog 7798 SHA256 6dd002f8d6a33f23b03610285e5163574e55dc04afb51e6491a3ad37f7929f12 SHA512 55d4810894bd14ceda38a7723fa1c2db9372524aa014b6cf9b393f6f628e2c59db23b8177065f3815afe263a8e00db4721a2fc0a946901194f7ce998c757f865 WHIRLPOOL 084662d886fad2efd1397bbff5aa5c341208b2ad298d22d360d8ffad1e70afd47ff0d3a6137b691853b1843d250b0a181302dd73ae4dfcd94da4825d42815efa
 MISC metadata.xml 1693 SHA256 055d3d622637c9cef8eb1a95f7c1c43676bd3ce583954fc259b7fea91011f7e8 SHA512 4c492dd0978a94be30600b84ac2b0bb6371a37facdc3a74bfc4b14031947ea39825ab30c03cde783c5277cb248f714d81971e4493106f9a4e5588ec8c3e73d0d WHIRLPOOL 0476560ed7b77fa8390cf73fd672e27b2e929546554cbf237e9d5e8b4ebdce48e2011b86de22ea2cbb72234b656c6a7e38a82d3b47329686ddab366a22cda3fe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSmZMjAAoJEJWyH81tNOV9p9gH/0tw4enQ2hH+NYh1XGSJyO5o
-plGUtKw2SYYiOgn+Ki+puRCGVkjU/AcE4vGLRN3Sr1fyw3+hDZftwsXOZnbz/Q7p
-Iv/YrLf5wo1qQ16UmHvzn9dst5ZCpkV2N/7gczgvjmzsGNByc0jOCeqfqKxaFvOY
-Ze67/nNuW+nS1WWp8V1BvxdjoN7iHnOVU/sAYZO4gDTctu/GfMjKGaqIoxB35jm5
-6UkX7uRD1Pcx5wYvm1X5zBuFj1aChB+BXZx3lgQyBdeCf3FsgNktaqis0dQx55U2
-VntKC2ZA5Hyousyl3wCv9UWuJ1nzQqKvykjsy0mc5mWo59XkkpV5Y6/LJsqWYFs=
-=ER+J
+iQEcBAEBCAAGBQJSnR0NAAoJEEqz6FtPBkyj1BQIAJh+cOdVn/74orxQO/ZuQKZc
+jpOUOpvu1LyyuC7P73T4SSFmgopIAXGteXZhmW8FlX1mYLZsZKtFmwoRUdYhzc3e
+ZGTiKXFUrmmHOrQRiObOSCt1P1sN2tUswj4EBnDFRK6YqF2XpH0/HssoXvo5QHyG
+hSJBZ/nvPttwQjgQJopOlBAKsxBi4rUIV+GtzG9CknMBY8qfPIJngxRtdxnCngi/
+RC9IzYXFd9KhmjDVWi3gvwsxCor2UiaRH8aXwv9PRpVKc1xYjFnnez+4oyCPRZEu
+9JCPm7mdlNwA4pCFc5m11SK5Mp/CpyNHZsiBlJBE6q9WxiqvyG1hbbO5pAvUxeo=
+=VtwT
 -----END PGP SIGNATURE-----
diff --git a/media-video/mpv/mpv-0.2.2.ebuild b/media-video/mpv/mpv-0.2.2.ebuild
deleted file mode 100644
index e31c57aeea59..000000000000
--- a/media-video/mpv/mpv-0.2.2.ebuild
+++ /dev/null
@@ -1,321 +0,0 @@
-# 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.2.ebuild,v 1.1 2013/11/03 12:55:18 yngwin 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 ~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:=
-		|| (
-			>=media-video/libav-9[network]
-			>=media-video/ffmpeg-1.2:0[network]
-		)
-	)
-	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 luajit && 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-0.2.1.ebuild b/media-video/mpv/mpv-0.2.4.ebuild
index 74e472fe587c..a2453f02067f 100644
--- a/media-video/mpv/mpv-0.2.1.ebuild
+++ b/media-video/mpv/mpv-0.2.4.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-0.2.1.ebuild,v 1.1 2013/10/20 17:16:25 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-0.2.4.ebuild,v 1.1 2013/12/02 23:51:37 radhermit Exp $
 
 EAPI=5
 
@@ -18,9 +18,9 @@ LICENSE="GPL-2"
 SLOT="0"
 [[ ${PV} == *9999* ]] || \
 KEYWORDS="~alpha ~amd64 ~arm ~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
+IUSE="+alsa bluray bs2b +cdio -doc-pdf dvb +dvd +enca encode +iconv jack -joystick
+jpeg ladspa lcms +libass libcaca libguess lirc lua luajit mng +mpg123 -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="
@@ -87,7 +87,7 @@ RDEPEND+="
 		luajit? ( dev-lang/luajit:2 )
 	)
 	mng? ( media-libs/libmng )
-	mp3? ( media-sound/mpg123 )
+	mpg123? ( media-sound/mpg123 )
 	openal? ( >=media-libs/openal-1.13 )
 	portaudio? ( >=media-libs/portaudio-19_pre20111121 )
 	postproc? (
@@ -105,6 +105,7 @@ RDEPEND+="
 		)
 	)
 	samba? ( net-fs/samba )
+	v4l? ( media-libs/libv4l )
 	wayland? (
 		>=dev-libs/wayland-1.0.0
 		media-libs/mesa[egl,wayland]
@@ -218,7 +219,7 @@ src_configure() {
 	#####################################
 	use dvb || myconf+=" --disable-dvb"
 	use pvr || myconf+=" --disable-pvr"
-	use v4l || myconf+=" --disable-tv --disable-tv-v4l2"
+	use v4l || myconf+=" --disable-libv4l2 --disable-tv --disable-tv-v4l2"
 	if use radio; then
 		myconf+=" --enable-radio --enable-radio-capture"
 	else
@@ -228,8 +229,7 @@ src_configure() {
 	##########
 	# Codecs #
 	##########
-	use mp3 || myconf+=" --disable-mpg123"
-	uses="jpeg mng"
+	uses="jpeg mng mpg123"
 	for i in ${uses}; do
 		use ${i} || myconf+=" --disable-${i}"
 	done