Add game-music-emu support and bump pulseaudio dep

Package-Manager: portage-2.2.0_alpha4/cvs/Linux x86_64

4 files changed, 17 insertions, 11 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index f878079894de..9ee53c64faa0 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.637 2010/11/04 21:48:06 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.638 2010/11/07 18:13:16 aballier Exp $
+
+  07 Nov 2010; Alexis Ballier <aballier@gentoo.org> vlc-9999.ebuild,
+  metadata.xml:
+  Add game-music-emu support and bump pulseaudio dep
 
   04 Nov 2010; Alexis Ballier <aballier@gentoo.org> -vlc-1.0.6.ebuild:
   remove old
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index d05edc7db377..d5481fea37e0 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -8,13 +8,13 @@ DIST vlc-patches-89.tar.bz2 3370 RMD160 da3c173817f6666abfaaef5762af58f3810e5180
 EBUILD vlc-1.1.4.1.ebuild 11981 RMD160 e2c6701494dac52d8a784b234722d6367630242e SHA1 bc8df5385a9d19269a611c06287a2a8ef10f8d34 SHA256 2f104f95fc1405b549fee1da8e57cd5d1762e3040d940584b2869ac0ca50253b
 EBUILD vlc-1.1.4.ebuild 11973 RMD160 0c2b9fcddbcbfa56f9f8f9ae6a32d29a276eef43 SHA1 2dbf8285b9c6c1d44c23f2d8c5ac91c27e640654 SHA256 159648e61b2582d293c23f06d5110a0419203ffae3175243d5796ef2335647a5
 EBUILD vlc-1.1.9999.ebuild 11984 RMD160 e0554550408d3df1c358460a0f3effd05d4ce1c5 SHA1 19027954cb6c4b7f3ed17d4bdab8fa7db8f06f22 SHA256 3df51cac786625c83c7df6bf6ecc68d02cebc3364077e3e52cb4647d27b447e4
-EBUILD vlc-9999.ebuild 10814 RMD160 fbbd13fea15c28e34d8ab7cd24f5c14a97671736 SHA1 fefcff4bac9cc307fc5174b7bc649584f5fce5ea SHA256 74e7b3bdf0c6e7f96ca4c1d3afbc86d1bd2ed2a13580fc457e70587a4db4c322
-MISC ChangeLog 97581 RMD160 defbfaa5dd4284385f179ce8d76afb3446942fd3 SHA1 eec1378a7544618ac5ef207d9c531bed9c997141 SHA256 dad9787e9ce96be3e32e32359179adfb4f4a6b38c1d21c9ab42bc7e07f23e513
-MISC metadata.xml 3932 RMD160 d436aeaef3cef12dfcb4cecb25506388455c2acc SHA1 bb08496b46f7898b234b31cc43fbd202fb27d6eb SHA256 699a45b0f512fbcecfd79ce4985dd6b2fc7819f88d23d9036653285e67d5ee30
+EBUILD vlc-9999.ebuild 10830 RMD160 b6130126617d25dadbcb1ba235a5285c3776fabe SHA1 9aa935e8e57db6d161a343b6958423265155f01d SHA256 f9f6515084142862eaaaef705d655c47b149b5a00c4f731a702936e917f1c6cd
+MISC ChangeLog 97720 RMD160 502d2c28998e839ef01b43b2b0aa222c65eec9d1 SHA1 17eea7ced9995a5cc7c7ff9cf2a8fcaee0705eb6 SHA256 d4b8a8fc0a50d2adb76ce5b1d7224c7c2269b78585f145615e19483562c5e4c2
+MISC metadata.xml 4063 RMD160 ecd11ef650db7e63b863f4319f974f9165ced0d5 SHA1 b9249bb4d089a61764efbfa95ca55519e099b399 SHA256 26d8c09b002cfb12f0e888a416b81f200bd9145709f5fc8133e43c47084a455c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzTKhwACgkQvFcC4BYPU0r/CQCdGcE55raOCBAhmyxH+Wl4sGyk
-MlIAnjih/sNEMm/3trKj64GlBO34NcvU
-=xODO
+iEYEARECAAYFAkzW7EIACgkQvFcC4BYPU0qE4ACggdX13z77V2ZHD/nAu9Qs03qV
+UXwAoKEEUwEVTkMS+jfdB/FPRle5EVaD
+=n9Vj
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml
index dcd9de1aa18a..b6d8042c5ed8 100644
--- a/media-video/vlc/metadata.xml
+++ b/media-video/vlc/metadata.xml
@@ -12,6 +12,7 @@
     <flag name="dirac">Enable Dirac video support (an advanced royalty-free video compression format) via the reference library: dirac.</flag>
     <flag name="fluidsynth">Enables Fluidsynth MIDI software synthesis (with external sound fonts).</flag>
     <flag name="gcrypt">Enables cryptography support via libgcrypt.</flag>
+    <flag name="gme">Enables support for <pkg>media-libs/game-music-emu</pkg> for playing various video game music formats.</flag>
     <flag name="gnome">Adds support for GNOME's filesystem abstraction layer, <pkg>gnome-base/gnome-vfs</pkg>. This flag is not GUI-related.</flag>
     <flag name="httpd">Enables a web based interface for vlc.</flag>
     <flag name="id3tag">Enables id3tag metadata reader plugin.</flag>
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 7d413427646f..2ffa32558edc 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.98 2010/10/16 17:13:54 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.99 2010/11/07 18:13:16 aballier Exp $
 
 EAPI="3"
 
@@ -47,7 +47,7 @@ else
 fi
 IUSE="a52 aac aalib alsa altivec atmo avahi bidi cdda cddb dbus dc1394
 	debug dirac directfb dts dvb dvd elibc_glibc fbcon fluidsynth +ffmpeg flac fontconfig
-	+gcrypt gnome gnutls httpd ieee1394 jack kate kde libass libcaca
+	+gcrypt gme gnome gnutls httpd ieee1394 jack kate kde libass libcaca
 	libnotify libproxy libtiger libv4l2 lirc live lua matroska mmx
 	modplug mp3 mpeg mtp musepack ncurses ogg opengl optimisememory oss
 	png projectm pulseaudio pvr +qt4 remoteosd rtsp run-as-root samba
@@ -77,6 +77,7 @@ RDEPEND="
 		fluidsynth? ( media-sound/fluidsynth )
 		fontconfig? ( media-libs/fontconfig )
 		gcrypt? ( >=dev-libs/libgcrypt-1.2.0 )
+		gme? ( media-libs/game-music-emu )
 		gnome? ( gnome-base/gnome-vfs )
 		gnutls? ( >=net-libs/gnutls-1.7.4 >=dev-libs/libgcrypt-1.2.0 )
 		ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 )
@@ -101,8 +102,7 @@ RDEPEND="
 		opengl? ( virtual/opengl || ( <x11-libs/libX11-1.3.99.901[xcb] >=x11-libs/libX11-1.3.99.901 ) )
 		png? ( media-libs/libpng sys-libs/zlib )
 		projectm? ( media-libs/libprojectm )
-		pulseaudio? ( >=media-sound/pulseaudio-0.9.11
-			!X? ( >=media-sound/pulseaudio-0.9.11[-X] ) )
+		pulseaudio? ( >=media-sound/pulseaudio-0.9.22 )
 		qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libX11 )
 		remoteosd? ( >=dev-libs/libgcrypt-1.2.0 )
 		samba? ( || ( >=net-fs/samba-3.4.6[smbclient] <net-fs/samba-3.4 ) )
@@ -236,6 +236,7 @@ src_configure() {
 		$(use_enable flac) \
 		$(use_enable fluidsynth) \
 		$(use_enable fontconfig) \
+		$(use_enable gme) \
 		$(use_enable gnome gnomevfs) \
 		$(use_enable gnutls) \
 		$(use_enable httpd) \