Add few new useflag and enable quvi by default. Thanks to Nikoli for coop.

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

4 files changed, 30 insertions, 24 deletions

diff --git a/media-video/mpv/ChangeLog b/media-video/mpv/ChangeLog
index 01ea37428ec4..afa8e8b0cbd7 100644
--- a/media-video/mpv/ChangeLog
+++ b/media-video/mpv/ChangeLog
@@ -1,6 +1,10 @@
 # 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.7 2013/06/15 08:17:57 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.8 2013/07/05 21:12:29 scarabeus Exp $
+
+  05 Jul 2013; Tomáš Chvátal <scarabeus@gentoo.org> metadata.xml,
+  mpv-9999.ebuild:
+  Add few new useflag and enable quvi by default. Thanks to Nikoli for coop.
 
   15 Jun 2013; Tomáš Chvátal <scarabeus@gentoo.org> mpv-9999.ebuild:
   Raise dep on libxbcommon. Thanks to Nikoli for patch.
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 23fdb83dba64..a47a6d22a239 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-EBUILD mpv-9999.ebuild 7931 SHA256 266f5116b52bc33191cd17ec6c8841ebb9ce1848162d2aabe75261835f744104 SHA512 c5421be279217b410a9d52544418c366bd250d49d5b895ea2cb9fc886c090a12916ed8d2ad8fce2ed603038c6fef930bcf9604f62f2648955f3566c6ed74d481 WHIRLPOOL bb9c52c5bd03ed24c6cfe34211c057accf2f7a87aedb9b652f0ef49c569d8ca5023574b1888f439decf2d829ffafb556ad19fbf7c6fe628ec6e010f44e094897
-MISC ChangeLog 1201 SHA256 06797bd2a116436c7822235ddbaa573ae2376584b929ae4cad3b2a7cfa59c2dc SHA512 e4020f29c9c4f6b920006934dc3b1b21ae3037fa4df4089819d30ffb47ddaa2c19502698d432292a0ab2455a75010b4e6c1b83637907f69973c13fdc1e10bba5 WHIRLPOOL 3659238c4264657fccc76d9116e98cacbd0029b66edcc478caffea46bcbfa05f3a72d34b0677b68d652aff30923e5186502a71dd854866cc881e1d1d457344cf
-MISC metadata.xml 1360 SHA256 baed10c560d914f4fbea4b0f6f4793257df7723bfbb883b2a0b667b197aada6e SHA512 66aa3cd62883aafb2c85bb15a7fe807aa5ccb782cfe0c042d2dca7d6df59758256dc39173068ee1742c41c7809ae746a75754c692cebc4af22db34b9d3e10740 WHIRLPOOL b98a20622a37aa3b9d7190f347a18b40ec1d11a2957e72ba1ef368da655a43ceec101346d479202165e49f879813d226a18c3d2a905f63fc9c130f7695666b98
+EBUILD mpv-9999.ebuild 8011 SHA256 5f1a0f988d8cb650c65d336ea66afa9801757e189dd515b51970588af8685269 SHA512 fc539a04572dfbf6ba794c034b486b5d100957dcc67f6a68408d401b3682dc2192f65f3dfcbfee19b3429b35f90a9e45ba2371dc0ca8d839a384df032dd7b616 WHIRLPOOL f6bce36364bb109b008467749e732e9bbd1ed185a8f1e7d8e2e09469067bbac22a206f80489beb538026354c3f903770f09f98cd8461c886a23747788de74d70
+MISC ChangeLog 1367 SHA256 3e80b3b24270297e76bb6445d6515e67da5fb85ce0588f1aa82534baf576cfbc SHA512 70707a78dfb25c5a7d8fc595febbfdc581c693bb449e2fdfff10d3c61374d3c24c1f3f51caab109252ba42a9c784f8ac3e460acedd57a95932c7cdcc31903f05 WHIRLPOOL b4075b6583ffad6d03d942564e4eb23b2217935cc731df2bc8a40e04aeede51b0d6abb724078858d776ee2e12b50c4af27fe1b407fd3843b800f10ca48f001c4
+MISC metadata.xml 1509 SHA256 3abe12c40e8873343cf3d1b1121e07008614a57a242295ae700600bae48f8e61 SHA512 0693a9b7b3a76a23dc8cc0d0255fed2b124a10a36c0f2c274b7cd2431681143811842a728a340203ccad5812dfdb6c6638083740f0d60bbb3bd61dbbce4691b7 WHIRLPOOL f167a3c5e38065a5d8a18d65430d84ed97d1fe40393ab584c5ed9e74e4e9a98713ddeedf64afc9d141d6bf64f696d1b9ea424cf30d494fd44687f28e9d183298
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRvCNZAAoJEOSiRoyO7jvo1nUQAKYot16twlNwshk7hixa95qq
-Wa0VaEdcP8KfbrmFP70qObygTYkWCJMBxaeW5g0YaS1DPM9u5ZVQzVgmh0tF6e1b
-wr4DF28FdXSyTb4Ne7XDZCu6q9XvO5ebqbAeVmPMw8dxf1FC35WP8GHNcZlEU9QQ
-cOfLumtaC1fQh5WdfiXjCekholMAl7jb0qqWXsXrvPzoTw8JmItkY0eE7jv5AHPb
-3QlPW5aQ5cjYZs3zZVjJ7PfRLWIP29yfvVn2fdB2pkb0PmiH89r0PsH/cKQCV4wU
-r+wTB425vJZURhj6nIOPh1C5XNJ7pRmjB/LQBsts6TOJlBAwJUbs6a5aari4wbqQ
-/UuInMJVMFfKjF5e10np7sNDMmuYaIwOwcjcrh+5SY84rtg1pNMqACTxbkF+U8ZR
-CqiRhXordSdLyyZEEwR3/2O3gkjifYs9cIp0wEdps59riITccKXasgaf9YBydnXg
-qa1CwpD+OsVThqHuAFpL+UoNKjuRf1dCTij0fs+BDE871tieyrt5frxbZYbmF7yc
-YUuTRucf2bGWi+Ei7C5C3BzwwGh+wLA1rEolYyfdyeh2nS1BTRicVQkPefNOTKgi
-AIkpVUTyZ8OT6vRE53gTPGEOzEPLDWg38hDFPFI/BKO/k8Rz0Wkgi355cBVrTCVK
-MX3wMCbLp2tfib4/XwJR
-=9M1d
+iQIcBAEBCAAGBQJR1za9AAoJEOSiRoyO7jvo0poP/jjESchpnM+3mLhxfpzN/zFm
+SN9CNOp2UQI/wTGxpoB2HPWeVUO/CxqPMkAUd8SILxCnAiiYqPE2U0KO2fraU2/R
+aEZtFhsrsLnH/EpodNaigCPLT+EpXQfh3pU1qQFy/rp2efsFShG+KNtviL8x09Al
+LLPZxCh0IvR0QCYf1VW/vKTGV98borOxVyTOrZKBV7GRrykcly4OrLhcy+6FOUCU
+mgOlRBIUImRphlv7CTJZTkwF6ndvtGuHFgQhz24CEEj1jsq6I29ovNUA6doCM7jr
+fp8J2tO2/IG6RQWjuSZik2LGM5mZZEeJoBf9medbTZCU0fVldWgV8IMKbxTqdSaw
+3Nk/MTT0A4giGab9Ah+9m1Xi+Eq6L5+q0UeRVKg7zm/uTybF5GCc3MsA+6RF3zms
+00WH2FuZMulNPs473MBHQ4d0cD2MNL4WhfjV2n4J0Qg0gX6Dgvl9YyR6nPm9QaQ7
+TEZBUN9O+MpvvNviCjNkjEr3FnhDiDQcgjviQxr4R724/laXSgC9+kWtyg/qVVSl
+FexUU2YNGlXgg5Ec+UlRNs8AkChRQM+P1Oa9faT0Ky8U5LPPpe9h9i+7hxxnmuj4
+TMHzgNq/Nxe9xx69gnu1AbZCm0SiOUH8Fuoml1p1OL2akgegFzk4UkUb3cTgERhv
+Txakq7zEOnGR2Qn45xAU
+=5v2H
 -----END PGP SIGNATURE-----
diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml
index 66d39428e738..784ec54087be 100644
--- a/media-video/mpv/metadata.xml
+++ b/media-video/mpv/metadata.xml
@@ -14,7 +14,8 @@
 	<flag name="bluray">Enable playback of Blu-ray filesystems</flag>
 	<flag name="bs2b">Enable Bauer stereophonic-to-binaural headphone filter</flag>
 	<flag name="cdio">Use libcdio for CD support (instead of cdparanoia)</flag>
-	<flag name="enca">Enables support for charset discovery and conversion</flag>
+	<flag name="enca">Enables support for charset discovery and conversion using <pkg>app-i18n/enca</pkg></flag>
+	<flag name="libguess">Enables support for charset discovery and conversion using <pkg>app-i18n/libguess</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="network">Enables network streaming support</flag>
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index a3fb33caad2e..217eea7f102d 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.7 2013/06/15 08:17:57 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-9999.ebuild,v 1.8 2013/07/05 21:12:29 scarabeus Exp $
 
 EAPI=5
 
@@ -19,8 +19,8 @@ SLOT="0"
 [[ ${PV} == *9999* ]] || \
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
 IUSE="+alsa aqua bluray bs2b cddb +cdio debug +dts dvb +dvd +enca encode fbcon ftp
-+iconv ipv6 jack joystick jpeg kernel_linux ladspa lcms +libass libcaca lirc mng +mp3
-+network -openal +opengl oss portaudio +postproc pulseaudio pvr quvi radio samba +shm
++iconv ipv6 jack joystick jpeg kernel_linux ladspa lcms +libass libcaca libguess lirc mng +mp3
++network -openal +opengl oss portaudio +postproc pulseaudio pvr +quvi radio samba +shm
 v4l vcd vdpau vf-dlopen wayland +X xinerama +xscreensaver +xv"
 
 REQUIRED_USE="
@@ -70,6 +70,7 @@ RDEPEND+="
 		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 )
@@ -82,7 +83,7 @@ RDEPEND+="
 		)
 	)
 	pulseaudio? ( media-sound/pulseaudio )
-	quvi? ( >=media-libs/libquvi-0.4.1 )
+	quvi? ( >=media-libs/libquvi-0.4.1:= )
 	samba? ( net-fs/samba )
 	wayland? (
 		>=dev-libs/wayland-1.0.0
@@ -160,12 +161,12 @@ src_configure() {
 	use encode || myconf+=" --disable-encoding"
 	use network || myconf+=" --disable-networking"
 	myconf+=" $(use_enable joystick)"
-	uses="bluray enca ftp libass vcd"
+	uses="bluray enca ftp libass libguess vcd"
 	for i in ${uses}; do
 		use ${i} || myconf+=" --disable-${i}"
 	done
 	use ipv6 || myconf+=" --disable-inet6"
-	use quvi || myconf+=" --disable-libquvi"
+	use quvi || myconf+=" --disable-libquvi4 --disable-libquvi9"
 	use samba || myconf+=" --disable-smb"
 	if ! use lirc; then
 		myconf+="