Remove old, proxied commit for Nikoli.

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

6 files changed, 17 insertions, 643 deletions

diff --git a/media-video/mpv/ChangeLog b/media-video/mpv/ChangeLog
index 7543b299b150..95cc39066132 100644
--- a/media-video/mpv/ChangeLog
+++ b/media-video/mpv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mpv
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.51 2014/01/07 17:48:32 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.52 2014/01/08 12:00:42 tomwij Exp $
+
+  08 Jan 2014; Tom Wijsman <TomWij@gentoo.org> -mpv-0.1.7.ebuild,
+  -mpv-0.2.3.ebuild:
+  Remove old, proxied commit for Nikoli.
 
 *mpv-0.3.2 (07 Jan 2014)
 
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 56b2bdb8e24a..4cdfeaf76bd7 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,28 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST mpv-0.1.7.tar.gz 1651651 SHA256 989cb7518baf3ee641748bf1f7f335cf68730943b0dd77490170a5ceb36a63e1 SHA512 17a9a98f4cf47f604851cedd74bb86f8b3d6553b1906d198bcc430419b27cf038729b091df318c6db3fbf4b64f40758c4f79da7212c585d878aff77a25105790 WHIRLPOOL 21ea955e0e212536ae7e76c2f03bdc057b4cf4c4214df80ea9ab8ec6f6ffcae1fa4cdb4bb7f6ece85aa6c0a4430c2d0255f79bf9bec51ad919c508c7fdcdafb7
-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 mpv-0.3.1.tar.gz 2513567 SHA256 ddd365039faf0d26076633c118e854f4cf7b09e7de20f340e70bc24278fae4ae SHA512 55415fffdb4a6a9b0012f7c6efa2b665fbead12e1c511c6c4bd15bdba8ae0f5ee6b8183ef82cebb1cbb9e48dcd59d72913a7cfb3b408dc1db6fdc79dec0c20ab WHIRLPOOL 7fa3cb0bf375cac963009fb8840a51b6730b8e24005106cdfe6afa29ba637bd5728ed75c4991606a07e37bcbd57eb63b7ce62de5fd6e74286ee33263444f1268
 DIST mpv-0.3.2.tar.gz 2513998 SHA256 a22b0c447b9208b337883013f14e56df426c3f0ebe3601bdb8be29e1f387edef SHA512 516b7f3555f04b723a5f7632052bb82f9e79746efa31120f35c327e6138511ed6656a1d5ab0f9d1de22ba7dc65dbf313dcb0a698a18c8bb03bfa003a30575b2a WHIRLPOOL 206aa201fb9e6579030b719ef41eb00a8f2c61ddb955486a652023a7ce969a521bad70e7723d2ec887c93fa9db8e0bc44d5b117c3b7e31b9dcec16ac1773c752
 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.3.ebuild 8270 SHA256 599442eeeefee7bfa46181eb1a792fd740535aa162093e9580f704a817c9267d SHA512 b131dd0130f4417d3cff4d08bc5e181b83c007e6de8c418eae8636bc8b29cfd1a7215369cdbe50d5c71aa23161560e97a94c91f5e9fbb83b905532b04e14c5c1 WHIRLPOOL 96c9221a60f794a4f2fd62ca501827b1bc29329ef4da842758a9ecd768333f46b7805077d66b72a374e27d0c0ea46bf069c2bd5b5bdf11510110a0dd29df8983
 EBUILD mpv-0.2.4.ebuild 8320 SHA256 532586cdc64722f589541986de36f63ed7a8a909a3fa9e991fb8652a60b550f0 SHA512 cdd4c4c91b85674800aad3454a4bb7e0ddb2f8523a1d7bbdd89a1f969dee467a480ec1ee0456d7f6536fdc5cee6cc446f7b9bd8134e3932d7a2407685c913bab WHIRLPOOL 0c464e8d423ad69ad146dbf571eb593fb53fa7903a0a19f150e6df0dc7eb13576c3bc467792b6b1e5e178c0295574e4a93151fcff8c7ffc63053506e21a0dc2c
 EBUILD mpv-0.3.1.ebuild 6039 SHA256 1e8d708846e1713deabf1328eb518162f6d4c244db64f0e16b864101c1f18237 SHA512 c698220e4543a3bc3e04630445ea25ed11483c42aea6ebd4f9e07afe641c3c8f8ca804d6e55005864915a0e491c35817a1f200a8fb7e6ccd7fb2105e70132dc6 WHIRLPOOL 9b20170735293d06f2352be8aa9215cbbb2978aaabbf8f7aa6edec118aa5aeb13549e68de6ed3dabcc72986c4991f5d6b445c4a426002bbd00b787cc37281701
 EBUILD mpv-0.3.2.ebuild 6040 SHA256 f5829745f914cf73e04fe777f4c702e0c3944b61ffbf816b53347fe6ee837a35 SHA512 b8fbd31bdd49c3931e2a25a8eac65a12b213df38257cff1a57d2a254340800a4fdd23669326a4039e16dd03b2369f6539b5ec02b5819f0b2b77333474db1e1ca WHIRLPOOL 9916ddff151f13127db6131539a96ab9f81a43e05cdff29bd685228c0dd0e76de94cea931240d0a4129c59b16d44d59506c59b73788f3ef85b79f7d6e9741399
-EBUILD mpv-9999.ebuild 6042 SHA256 405c04547160a32491b6922f15eee589888b00391d421e2953d2f6465fe21ce4 SHA512 cdd3b04a04fface05cc89c66fdd170180ca937162afdb37a2040553dbd57eaf02618c497965050d036dbe3a2ecaef8a6205ad4e64d900c46d32d6d6e6577d26e WHIRLPOOL 44c7fd08aaed1a293e762b7e60bb74a2b090efa000f51991541e5dbf33a51fdc0aa33504fb0bcf8d60f467583a53b94447340895b771f32264964f7f1e44cb00
-MISC ChangeLog 8737 SHA256 569cd72b9b6d63b8658783258b0b0740a1109c78f8b4df78abb247a3ef82f49b SHA512 47f8e739210132cb152e3c7c21d0c3cc971012f63e54a7c3f7965852eccaaff78ff9a67ea8247281f5b0666c51a564d816715596aa7daed7969da07b769847c7 WHIRLPOOL 842d893ff09c7a2d51fd540a942ca781527b536f80756d0170911ae44cb198342acbc1e77fab428c670e954e04344e42af822a0b1bf8c2a27ebc9949505961b7
-MISC metadata.xml 1791 SHA256 1006842c5f7ee8c398af09e2aeeb6d45417fc7486ccca85d364cc7e593d1983d SHA512 f1564879972f7d4d641b97fc5d3b8b6a837849d8e794f5b13b8db5703840861da2c40a73cf42ed2ae16f3bcf7d268d34a82b723f019a374bd527f146a8d65a18 WHIRLPOOL 1c46c7f890933028dac485cba6cb1e0e67e333349a5eb4bcbfb99315f96bd65a7110979da8b45140969ec928aad5cece7e55acff33434a435c26dda4c9cf327f
+EBUILD mpv-9999.ebuild 6040 SHA256 740f96dad0ae3e1d9597fe4d3a5724741d236534f19fff54a445257355cd0a4c SHA512 5c6fd1bae53b98ed5d9366078705ff7d3e29e5862a5102526020895608fcd7321be7a1d018925168a856e865f5766cb815b2895509d98770d5521930d2c37955 WHIRLPOOL 3d7bb61441ad38e6a5aebe784c3774ec5200168916e990b806973b7e453cff8c1cd5555febb74eb0dff881ef2bb56e3f141f0640143f16c695c01bae618787c2
+MISC ChangeLog 8866 SHA256 8b034a418686304d538b1b73c889bde7787876eeba0af4bb65b7ed5706503ae4 SHA512 6908c0b17e2fe612205cd54b61bf7dd127a0569f667a98a4fdaeb5095585b3da6007cd1b375fd06d5ea61c6c8af27c1d45db7984d2f99982f07d18a1ddbd6a71 WHIRLPOOL 325ca3f2787f14d01ef3de2cf0addedea2b747854aec2ba1d4f6bed2e03de947f1aa5cd562ccb3492b75aec68ee997322da4701ab292ea60b0805d25ea3290a9
+MISC metadata.xml 1661 SHA256 2e8026e86e0c8b31c7f93760e7cb0782925da84d19f0c8c5232bfc563a1e5c60 SHA512 a42639aad3a825b181180df2175731b6a107eb4a8f42c6c61271778eb74346f913547d356c975f9cfffa8f6a1676a26122e3aa47d2c2afcc06e190f92f9072cd WHIRLPOOL f2fe7eb56b885bfdcec71e509ad034a467e69481c0974bb8bc5332161e98f507164f81e31ba16631f62271feeabf69a1d813a670875262d5311e92cd5c87cfdd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSzD3MAAoJEJWyH81tNOV9CzgH/2gMtaKy+QiEu+L1pv/KkzSo
-whf9xorW7zYm1Nuec8ylqJwCsXbVOmrVuyWW4mj1Q7OAikEcMQXBrYSfIJR3EKod
-HB8hQ08kBS8rW0SlIyiBpwqMrtaMZx4D+y4tMNjl7lNhxbtl19VQsnwrO3+2XZdq
-HDV7lXnliDYfEyHOxF7BeKXUmKCHYa1679uWnY0LUm36UYV6kEJ17bqspfrbmOfr
-S5M7PXfuGARkvGow6BqEn1cbY91o7rUpNU/lq2YjYnXpMCUV0wxlx3Qyu1X147TU
-Lsr0ak2Tzz8qgB1RNv1OhYjPS3xsJZbTTWpF0UVKirnEkTT0fmJzW8eOYpvhvf4=
-=zics
+iQEcBAEBCAAGBQJSzT3FAAoJEJWyH81tNOV96A8IALzlXcG3iV96dQLN1on9tBbF
+Z2nrmSX0q8jxpKK2Zg4gMhCawF+8DWni22CyPNSKpoeHFOfdtsIOVrpDqXtrGmG4
+uDBqZwUJR5xp8fkQStLDDM4QaP/mjEo6ZT8vXG/E6p/cRHwFR2Y8UFVkI7PozzA1
+1FRVB92Wj+iJDaiGfUOFT1oacLmvK2qa4ezgO8UPwFjKlYj7VXwc4Nuz+WllM8ku
+TGixhwbdAUXNUL3EHbR6e50Wp9eLtSFK0Qz4p8oJ7nWr0SqSRAJELW2hV6oydG/y
+Olro4F72I7BnOS9yYAOtfmi6rN/tp/ECvsoDuNbCybQsvy7OodZV1Nr1TTUtNzA=
+=Wnit
 -----END PGP SIGNATURE-----
diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml
index ebb7cb6bd00f..1f7093d6bf61 100644
--- a/media-video/mpv/metadata.xml
+++ b/media-video/mpv/metadata.xml
@@ -16,7 +16,6 @@
 	<flag name="libguess">Enables support for charset discovery and conversion using <pkg>app-i18n/libguess</pkg></flag>
 	<flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
 	<flag name="mng">MNG input support</flag>
-	<flag name="mp3">Enable support for mp3 decoding over <pkg>media-sound/mpg123</pkg> instead of relying on ffmpeg support.</flag>
 	<flag name="mpg123">Enable support for mp3 decoding over <pkg>media-sound/mpg123</pkg> instead of relying on ffmpeg support.</flag>
 	<flag name="postproc">Enable image post-processing via libpostproc</flag>
 	<flag name="pvr">Enable Video4Linux2 MPEG PVR</flag>
diff --git a/media-video/mpv/mpv-0.1.7.ebuild b/media-video/mpv/mpv-0.1.7.ebuild
deleted file mode 100644
index 7bca1764ccb1..000000000000
--- a/media-video/mpv/mpv-0.1.7.ebuild
+++ /dev/null
@@ -1,305 +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.1.7.ebuild,v 1.3 2013/10/19 22:54:39 tomwij Exp $
-
-EAPI=5
-
-EGIT_REPO_URI="git://github.com/mpv-player/mpv.git"
-
-inherit toolchain-funcs flag-o-matic multilib base
-[[ ${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-3"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE="+alsa aqua bluray bs2b +cdio dvb +dvd +enca encode +iconv jack joystick
-jpeg ladspa lcms +libass libcaca libguess lirc mng +mp3 -openal +opengl oss
-portaudio +postproc pulseaudio pvr +quvi radio samba +shm +threads v4l vcd
-vdpau vf-dlopen wayland +X xinerama +xscreensaver +xv"
-
-REQUIRED_USE="
-	enca? ( iconv )
-	lcms? ( opengl )
-	libguess? ( iconv )
-	opengl? ( || ( aqua wayland X ) )
-	portaudio? ( threads )
-	pvr? ( v4l )
-	radio? ( v4l || ( alsa oss ) )
-	v4l? ( threads )
-	vdpau? ( X )
-	wayland? ( opengl )
-	xinerama? ( X )
-	xscreensaver? ( X )
-	xv? ( X )
-"
-
-RDEPEND+="
-	|| (
-		>=media-video/libav-9:=[encode?,threads?,vdpau?]
-		>=media-video/ffmpeg-1.2:0=[encode?,threads?,vdpau?]
-	)
-	sys-libs/ncurses
-	sys-libs/zlib
-	X? (
-		x11-libs/libXext
-		x11-libs/libXxf86vm
-		opengl? ( virtual/opengl )
-		lcms? ( media-libs/lcms:2 )
-		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 )
-	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?,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
-	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=( AUTHORS 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"
-
-	########
-	# 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="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"
-
-	############################
-	# OSX (aqua) configuration #
-	############################
-	use aqua && myconf+=" --enable-macosx-bundle"
-
-	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 \
-		--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 vf-dlopen; then
-		exeinto /usr/$(get_libdir)/${PN}
-		doexe TOOLS/vf_dlopen/*.so
-	fi
-}
diff --git a/media-video/mpv/mpv-0.2.3.ebuild b/media-video/mpv/mpv-0.2.3.ebuild
deleted file mode 100644
index 234f2f86ff32..000000000000
--- a/media-video/mpv/mpv-0.2.3.ebuild
+++ /dev/null
@@ -1,320 +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.3.ebuild,v 1.1 2013/11/16 13:43:07 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 ~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 +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="
-	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 )
-	mpg123? ( 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 #
-	##########
-	uses="jpeg mng mpg123"
-	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 fdf2c7c38126..af55303f75a9 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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.35 2013/12/31 11:23:39 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-9999.ebuild,v 1.36 2014/01/08 12:00:42 tomwij Exp $
 
 EAPI=5