Removed 0.1.6, proxied commit for Nikoli.

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

3 files changed, 12 insertions, 324 deletions

diff --git a/media-video/mpv/ChangeLog b/media-video/mpv/ChangeLog
index a1ce54513900..e9e99d197636 100644
--- a/media-video/mpv/ChangeLog
+++ b/media-video/mpv/ChangeLog
@@ -1,6 +1,9 @@
 # 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.37 2013/11/03 12:55:18 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.38 2013/11/03 13:45:08 tomwij Exp $
+
+  03 Nov 2013; Tom Wijsman <TomWij@gentoo.org> -mpv-0.1.6.ebuild:
+  Removed 0.1.6, proxied commit for Nikoli.
 
 *mpv-0.2.2 (03 Nov 2013)
 
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index ed5d5a76b863..f300ddad3f86 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,33 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 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.1.tar.gz 2475744 SHA256 95594fe529d09eba918393cb04547d4a7ebbb6c73f9ae12dfd0a2506a1f2d8e1 SHA512 2a5c87950c7950f79537c155cc444ff13a462a8ab5b5a03419e5f9cc4706a5d030798801243284e24ffa34a4d8a216bdd134d91defde28aacaa5d3b2c4c538c1 WHIRLPOOL 33a1c2dea318199ccdc5ce44f90c7bc2359204c6dd1eeaf911e9ac216f6fe683c087f8c9ffe176b31982973114b174612f1df4f9611db7abd3c85b768f8bc10a
 DIST mpv-0.2.2.tar.gz 2477517 SHA256 0bbb1537880b6f8d0bb2469ff12c6961150f20c2ab13f17f267051accbb27bf7 SHA512 e90a29d5b24c657ec91b5de03b250f08dd0bf13c472643e410ae9bfb203bb2a24a596c2d3dd7331243c26f22c703e7caa311b7370b7f7783b7d00e06be3b0e71 WHIRLPOOL 5502b451c6935dfd0cbf647cca9936e6e4c235557a1ba86f4c7c4ff6b639b2e6a503e2b21455fa5b64c1841eaa46bbeb87acd5288412dc0e9db44d26e58fc423
-EBUILD mpv-0.1.6.ebuild 7893 SHA256 9ce46d32cab663f30f7af18c450dfe33b73f5d977cdac37f6ca22d3a588c6ca1 SHA512 8ccd2923c26b87bd535a70a39681fb604c22beec0c5af6ef4092af2827b03fe4b2c1ff157dc325d6001b245637737528af91a0a2f9dc11300d4311a23fe44bd0 WHIRLPOOL be9be27f78c0ce4168d6b7295827b3012d760145e958b1ef04d59ad9d1474bd869f15a05aa128a88d8dc90d8ff736bfb6f496ec12fc6be7d526f9eb471b7d0df
 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-9999.ebuild 8249 SHA256 2ead7a6b6f3012d44fede9aa1a65d32fc83980d3c60a7d6ebfd2803bbc6cc028 SHA512 e87ecbda6155fcac0f94ec89560e26f085b9f554e9c168f69d18ea711fdd6a246a609701943339d24b861efc9f66d8f38fd16b879423d73319b7f2bef4e0c6b9 WHIRLPOOL 65dd5dcacce433c302e288e25ddd1cf2d1f33710d35ece2bbef5d2d5e10897a546298555079fd24642168f542961ae54fc7d479fb980722c61934b50e6cf2772
-MISC ChangeLog 6357 SHA256 f746572046fbebf33841ecbc59e5ac84f0de33547946e87c911445571f082be8 SHA512 c637cc123562416e8849145003aca1165fadbea3efce71d0538b555e1610c86ebf6b3a3f4307f2e03749a73f57c87054b94c56604663149bd231fd23817b5ae8 WHIRLPOOL 8d2df7e762cb949d01073aaee352e4ca62d8ebed5dc0efa54def35b71ccefd5f2c52d4e71050d12005783a5e1f8555e3dc64ce3be5bce803d30547af139d479c
+MISC ChangeLog 6468 SHA256 bb17a506d4001ccd49044a7bf4709e01389075552bd3d3093b920352539ef150 SHA512 c981a3b3c042e54edf85428d36e739d3837ecd562c85db565fa2934aede70cebadd5e79755ec161a10cff074838a10668797ddaec1718bffdcc89f984ef6d2a7 WHIRLPOOL 51530db9e84755119d8b8ed03dfd86eef39e1b6594348d5f1be9cd83875c5c1431278d2747c8e746472e07fa7a953b06fec13ea759595d152a2f7b2f9bf129f2
 MISC metadata.xml 1560 SHA256 5473774c48f57b41d897eb472dae9ac54f21b3263217f40717ce0663d7b261a2 SHA512 6ec943f8a1b971e68d6e53c12137bcd9a6f3e3837599ddd0918eb551bcd462ac83e89891671e3046d8f0d7cbbeac0d3062efefdb5ecab8f50e05dd29f4531772 WHIRLPOOL 8803b31e81e4d278815863a13cf78af4dfc69b5bcbfa0f56d99958163c2b0a7307d9892d247cb46d82d1a2ad2ced05f2b016eb8f3c1a9c23bd56aceab0fee20e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSdke4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGODRENkQ2QkI1MzlEMURGNTkyNjYxNjUy
-QjI0NzRBRDQzQ0UyOTZFAAoJECskdK1DziluF3UP/2n+PuFTGm1+MB7bB9t/px+e
-aQhMFq8iIiu+7DB4SwUuFDej3AKbzwWkYtQKgJY0NSLEVagXTTrh0nYXEgNF7BO6
-pAJh04dLSeijEKR+ZpbwGYSSREAVnU+EnztgkQ8OX6W++r00mv38aDSy941JrYjX
-9y6So8gzTpsSLUd30tFDeVgz+fB/rI2rH+ytuDe+G81ImUPoNIAYNPLDVCuM0yJM
-sCL8QZITXgelv88B4LhPBbEeJ5DWtxyVkEx85SM4PWR0RMRTG70/blbUR/UEiS/Q
-KwwSV5g7QFH1PfIK01HVVJUgKAlvRNRRg7IYtmE/AjeeqvNal2v99n3jVW32aIO1
-ohXsa8QP5TsRtn+ZoEIVRectn+Nkux/ypNoZ5ZGZuxLo8tDSeSkv+76+Q49jiBvV
-1jX9ENc396gbAR9f1t/36QHfhthqg3vmCrvQzr2xHk9OID0l3Ci1DUoOstG7BZA8
-hYyqMKIvt8z3NEzsxw5XF5Dth0kJCkiyQPMsVdFyTbmwHXkBtmxziaolccbT+hUV
-JdeV32RzmIL40l4xXCjy3OCMOlSeovryOAIey4fW4mHlollux5wkRTf5bOxak56S
-P11JxzOf+8Pk7cUimY3/BmFNKFKa8oToTAoW+1mK6qR2AeNfSAMgClY86OT6/FHG
-UVDWpZ1ccaFUsGg43+ic
-=PX5Y
+iQEcBAEBCAAGBQJSdlNFAAoJEJWyH81tNOV9IBsIAKBl3+4pjojkHeBO3NsO6dUO
+5kPE8PB0venQVE0UTRqE2+zwENjQbKMQCIgaNYqucXAcVWhY3RvHPcS82uMmi6yv
+t8B/zMTNPRN3k9vd6w4pC8S+yKfu7cgc+U71rAhFHFsooGXsH6euCdbjdZfXx5JW
+/ajpE6nGXKzNMaTSN/xfYkIy5z9wUs0teJ5zGU3uYt7a3Vuq7SE5TBdK961R2pWk
+owm0sK1nt+Pha0NxhfqyU7EdOlj5DRNte1RaNMhuZ1iAygXbm4zGlp7aTRHdNP8/
+p0ESiLnFWiYMcYAv3iNMH+OPxJk284crvoO6K/i7QrwOJxYW6Llelg5LwPvSXWs=
+=UT8J
 -----END PGP SIGNATURE-----
diff --git a/media-video/mpv/mpv-0.1.6.ebuild b/media-video/mpv/mpv-0.1.6.ebuild
deleted file mode 100644
index 2f0dce138070..000000000000
--- a/media-video/mpv/mpv-0.1.6.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.6.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
-}