Bump again to latest mpv tagged release. Drop older.

Package-Manager: portage-2.2.2/cvs/Linux x86_64
Manifest-Sign-Key: 0x8EEE3BE8

5 files changed, 24 insertions, 614 deletions

diff --git a/media-video/mpv/ChangeLog b/media-video/mpv/ChangeLog
index 24bb03fe909c..1cbcfaf5abc5 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.24 2013/09/09 09:05:33 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.25 2013/09/15 12:56:07 scarabeus Exp $
+
+*mpv-0.1.6 (15 Sep 2013)
+
+  15 Sep 2013; Tomáš Chvátal <scarabeus@gentoo.org> +mpv-0.1.6.ebuild,
+  -mpv-0.1.3.ebuild, -mpv-0.1.4.ebuild, -mpv-0.1.5.ebuild:
+  Bump again to latest mpv tagged release. Drop older.
 
 *mpv-0.1.5 (09 Sep 2013)
 
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index a1f941edbe7d..10db24d39e68 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,23 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST mpv-0.1.3.tar.gz 1650206 SHA256 5f06cf484f0826fe3829563d98fff5ebfd2385beed617dcf7be4d1f38373083c SHA512 0867efd92f32fabd6410e88bf1f441ed2b33d5b705550cf3fc2d6d4ecc72d79f97ed0dfcec1a4bae4f9a1701d740c0e08b3453c2816b68c9d72e8b1037b6002f WHIRLPOOL a9cb967b9cbd03e31f2c1fffdf05968e5c876ea68c411887e5dfcab26755cd1312fa689b9a4f84d3db5c42b4f6c0475b2157584e846d34da602c87beaf7143ad
-DIST mpv-0.1.4.tar.gz 1650525 SHA256 ec4a6093b33ed00d3f64a97e2eabbbf45b8e511929c98f3b8043f5effbe8cae7 SHA512 a462bba4f0f1f0394f040877e99d9dd1d5b26f031b5ee6db0cf3f00fb124527d65f2a6d9ef64e8e144c68a5cab92aeaaee75a6321f9024c505ae150f24def991 WHIRLPOOL 332e1449d2ebfdcc87313022df73606ed692e994719e49e5c0540a64ac4d5261ef1cfcef14cb432305d66b42bb695beba2b1e27110461e6259c6ae5f6af203bc
-DIST mpv-0.1.5.tar.gz 1651102 SHA256 64c49559231ef4eb5d6868089f9d42c2aacb46f744a7eb7d453982c528a0679c SHA512 3fcdd38b4f9238251d1db330b9ad33a46e8bb8e25853230c975d15b3f93575793205f597d6deb14fbe51d2c18f213c56961b82838d8e0be852905f2a368c1036 WHIRLPOOL 4bd2da6d4cfb77263676f6d194b0dd83cfc9164e4aa2c8556fbb8f15eb63648f6b24db4c4fdb3f3e0ee9b5474d5a04321bf17b38a8e251e078d253cd9bb0f949
-EBUILD mpv-0.1.3.ebuild 7815 SHA256 85faf33dc18484049dbfd6836338938e7a2af32634a904274c9abf87d08a98ff SHA512 ced28f7e4d1fe643cf8e2cdf02ed0c1e9521811c01a1977f165b8a901ad7a6f55199269482b41947a76bc571c83bb5392a9dab9971ee79acf2bb28590ad9b65a WHIRLPOOL ff70724a0d5984b69abbe5552058345f14b3ca19e6497826d5e2e4d3501214ab5547b0cf7036f56cd03cedb59e47cad9f6c0b27375ca43e9a4b77fc2837489f7
-EBUILD mpv-0.1.4.ebuild 7814 SHA256 241d12d3ba3c1381c45e00da730ec4f9fd898d5bbf5fa42c7c3cdcb26268ae36 SHA512 90417ec158c951bb8ea1838ed344fb16ee497aaca06393587e83f14f06fc2cbb81bf55ba9a4daa8f923700c11d55dd948eed9df96559e26dae31c2266c581579 WHIRLPOOL 7f9b81d7ba254ab3f895a21d45eccafb9d8fabba0ecf0432c4839696e1637c47998ca1eea2e94123520542610b6080bf537827a36aeaa3464c43f7d98b4f32f1
-EBUILD mpv-0.1.5.ebuild 7814 SHA256 930c552f5e62c87a597698631f393bcaafe34b1ba31cb107e85d75253f848ac4 SHA512 9d752630825c7bc81e2e6f84215572fdc3471fb26926a8fcbd591b53591416166cd8eb520e734873fa29d7407a7b5d9859a531c25c4853bba60f4a44f25f4b95 WHIRLPOOL 68990608d173c031a8efe55d70dc133425f9e4ccb88f92fce1862bd26b57f97d32d218d3394347a935c2be52964ad8a277d7d2b238929a5e6d377306438220d6
+DIST mpv-0.1.6.tar.gz 1650956 SHA256 dc9dda1e340e32f3af155fea4f626378008405df36af21d244cedd90a790d569 SHA512 4f27f3028d421cd234202a2abc50bc5ebaddabf345cf13b924f240d2bad195ebfd097e64212ebdcb6e5572d32ab355da550f6af2174f55bb5d9800eb5077ef7b WHIRLPOOL 0a85384dc7374d75b8972ee957cdd6e8346b628ac569291f870af2508d9f745130e0597b7c9ca166b951bc9db73f6b9ae1474653901ea05b7425c80c3e04d277
+EBUILD mpv-0.1.6.ebuild 7815 SHA256 d280d5fa9c1988b53fcf594ce652fcd050980810a65550d3c650dcf102185d11 SHA512 0071534e38a23675e0ce272a3a9831c03b7c2e487466f585d1cb0c75a829e328d44f6cbd0896c90e9ab0b154e26b2622cf3e4e43317682017a81895227be10ca WHIRLPOOL a23cc8fd6931ae34f86cad82c8cbee77bf39f51a3a7c35c4d0a7c8f33438158f8b4ac24123ffd5aa931a7d7b1fab2fc3db42c1e187994ba4e6f30c39312c009b
 EBUILD mpv-9999.ebuild 7895 SHA256 39fed1f7007409060f6dca0bb696933c3f8faed43c71a956ffb040cc47e75014 SHA512 415e07b47e35dcc8bc77d596b00e8f8a615a2282f6236840534d5a5c27839efa728105307703e4b19cc4c7ef73905a40d6141973867e3fd2d49c4614fa41a673 WHIRLPOOL b9c1bb076c7b70587d5d26e94331c7ebc2caaf66792f9d3afeecd90fbab14eb00d2b6eaffb32148f197e308190f57afb8203ae3eabbb052776544ca036811247
-MISC ChangeLog 4158 SHA256 cc5032361e7eac49f143c2dc0a0b3e087756609f812f101462316d48a983ed9b SHA512 b005f28ca70ada0b4f1337f26cb9e1d560703f566c03e80a0c1f6c28398bff3a936fd9722d802679565a3420aff42ce62605e8f96b9562e0d1bb4ea85990ee5c WHIRLPOOL 8b0d1e854af0022bddcd224ad29b031a89fa82dd784de17c5c98d2c24a71dd8e8fb5c6021fbe1e758306b24b7da77699f3e2c4bd20a43f6a9b5dbee382d29469
+MISC ChangeLog 4374 SHA256 53ba15b935687dd76c1e6ca45e004b6305f5acef2348f7bf2588f3d898d0d1ec SHA512 531a6aa003b85af0c020acdb3fd3f3992bc68ec9342bdd286c9628d5e69d9591f9bc9bdf747f64a0c26b6d0c9f1a4aa1b50d9e9fc825bb6046582aa5d9d15d45 WHIRLPOOL 9e91a2f48ab120b5ff707bb35cdd5883fb3e6c2c40c9ab1d95d943da5a42838ed286f00f8aaae73934eaa28ee9484328758664da810a394df4bdcc3f5bdc6bd9
 MISC metadata.xml 1403 SHA256 9f64d052462b5bd0762b7f04bacc9590bec82df12b7a26d103673a1b9d424961 SHA512 c854692efe7ca803abf4a79e17aea7c42756061e9bf51deed745034eb53878dff010beafb11f7cde2868a12fb1880e5e613c9d6047c496b6c7581e76e55d81b9 WHIRLPOOL 09084e7803a35456d9b0f152f832eb29048ceb0eb0310c96788d884294d8aed675d8eeb80833ed4cebd95b217d9c4f3fcbc61669f737e0681aa5915416500ad6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSLY9dAAoJECo/aRed9267jdsH/As5+bT8E4NzEuCNpRt9jY4j
-vuAQG6TbjqxWr+6yuTc0UXjdYE5cz4FSxlWi2KBZQf9RXpS2z7Pst0izGsbVxij8
-gRQ40IuJyV6I71JktJMQ8fU5akBhuJKu8GgFRHiijiD1CSbT7/gKazPljm+LA4jo
-lg1MEENhXTys7RHHMGhcABgI6Von8/WfpoQTeNbexPaZ82Uw4pi7+vxF9OgRIU4Z
-iWuU0T58Pda0u4a9+Ls5jNmLvuYnwuTftD3vELRaeEUd5JyPsDXOWFO9otUDb+Do
-8v4MGtsbKjEvn4SGU9xkHWPAqIfcU9rPQX/QdkOgt7cBZC6QDwgmsFM+3cw1NXI=
-=kQBf
+iQIcBAEBCAAGBQJSNa5wAAoJEOSiRoyO7jvok1MP/0bLaIkqiXyXN5MdrrRbmnQ6
+jbCJYMgGn15a1TEwyQ1BCNXZ7W6ECBt7GlU6gjuY2hKAAHuO62z0al8vDDiZ1zws
+odAfublyqp9aGsYPSQbOvOL7tc8iYDM4Bt+TY2R9P1d2Xh/D1DAP/8innFPDHJiz
+11M4O+ONAI71BSS35MJF2pgeiC1A3Q3uon8HzPIVu6FdntpwvSipoMoS9W10e+sR
+IaH0u2sthDrVBuNVO2zRgrqRw3TrzUttSG9uy+pvuX8D5lDJIqTKuHu5ETnobEKS
+uvNZpqPeAfL3aCE1Tbdfq8y8BLSRbitYI8CrO4Oqz3NoDn0G/Abm/ePcTkbU6pjs
+RhzD4924wdRehm1xEc1HcvdQ9mBMXAeWlYV38B/q1wIWOKC34vfafFpuJR6dEmE/
+LQ8nyxzZ95oreznmyw3A7HM2zn8e7h7rCyjHGVw28uPRG3f+RyyxXE29hS6emiiV
+wyThgUfhafesYtciVjQZlRVE9FxdkMGR+nVres/DQDEpffP4AoQ2ejZpPGOCzWz4
+u93yGr9QMZWGEeI2DEGYBW5Ip5YRQicpMbDMeFIjkCqzdXife9B7ycUwsmwRG0pi
+ORxV7U7HXvq2/wYyNO5Yhqsn3ZKkmbNsuSAmV9fbxuBY/w5l0niR8jxFipmkp+Pg
+h1ZBCf+VgyYGIUbLRwPR
+=ZNdu
 -----END PGP SIGNATURE-----
diff --git a/media-video/mpv/mpv-0.1.4.ebuild b/media-video/mpv/mpv-0.1.4.ebuild
deleted file mode 100644
index 18e6d263cd90..000000000000
--- a/media-video/mpv/mpv-0.1.4.ebuild
+++ /dev/null
@@ -1,299 +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.4.ebuild,v 1.1 2013/09/02 08:11:58 pinkbyte 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 ~hppa ~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:= )
-	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.1.5.ebuild b/media-video/mpv/mpv-0.1.5.ebuild
deleted file mode 100644
index db4f27608294..000000000000
--- a/media-video/mpv/mpv-0.1.5.ebuild
+++ /dev/null
@@ -1,299 +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.5.ebuild,v 1.1 2013/09/09 09:05:33 pinkbyte 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 ~hppa ~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:= )
-	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.1.3.ebuild b/media-video/mpv/mpv-0.1.6.ebuild
index c246c9b29137..6ee6add364ed 100644
--- a/media-video/mpv/mpv-0.1.3.ebuild
+++ b/media-video/mpv/mpv-0.1.6.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.1.3.ebuild,v 1.1 2013/08/25 12:57:01 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-0.1.6.ebuild,v 1.1 2013/09/15 12:56:07 scarabeus Exp $
 
 EAPI=5