Replace rtmpdump with rtmp useflag. As is done in ffmpeg and xbmc.

Package-Manager: portage-2.2_rc91/cvs/Linux x86_64

4 files changed, 13 insertions, 10 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 25949637b5f4..f56371328b2d 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.762 2010/10/10 13:46:33 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.763 2010/10/10 19:43:25 scarabeus Exp $
+
+  10 Oct 2010; Tomáš Chvátal <scarabeus@gentoo.org> mplayer-9999.ebuild,
+  metadata.xml:
+  Replace rtmpdump with rtmp useflag. As is done in ffmpeg and xbmc.
 
   10 Oct 2010; Tomáš Chvátal <scarabeus@gentoo.org> mplayer-9999.ebuild:
   EAPI3fy for prefix support.
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 1c499ea4a62b..b9256fc3f97d 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -10,6 +10,6 @@ DIST svgalib_helper-1.9.17-mplayer.tar.gz 7583 RMD160 927ff34f187e4fa9528e2e4820
 EBUILD mplayer-1.0_rc4_p20091026-r1.ebuild 18995 RMD160 fa5ca9232abb6950549ca6c2451dac48df3ebd62 SHA1 32f991515d16adacd04d0f4e11a601de0ea0e972 SHA256 72ae257b4c3d903d3fef8953691f39b256a64c6ffa3b62711c5a341ec2b20d82
 EBUILD mplayer-1.0_rc4_p20100506.ebuild 20273 RMD160 e55bf61b411d66b2b8f26c237feb3217415df44e SHA1 7bee75c501fadb2fe7a2c406e441faf3ac0bf638 SHA256 3eb7a7cc77d11c17bd6641be595d9037b24ac19096eefc7807dd661562baba14
 EBUILD mplayer-1.0_rc4_p20100612.ebuild 20255 RMD160 f3e11ef97eed0f62f507ca209bfdcc9edbbf853d SHA1 39deee8a1ffcb78f6795319f5c1bad89e1ff08be SHA256 4dac0c77e803da44f86b15080d924b87f3c4dc4037c167bbf86c4241e2e0c5e6
-EBUILD mplayer-9999.ebuild 20123 RMD160 35c0e29096896096d531daefddf2350d17a914c8 SHA1 86447bbf152759eb7f3105124274470c2d1b4f03 SHA256 a5f5752a6049327022c82abcdd89312c90a88955be6c458ea29c59c9d5426198
-MISC ChangeLog 134212 RMD160 6f7d9b479cd18738dca3b9766fc0777acd91525e SHA1 73dcde6e5d9d6c5cc3dca40a994092e19374871b SHA256 8190d31ed8208ec79d6c3097c84dfe24f996b462203b7b828098ec1fc5fe1063
-MISC metadata.xml 3667 RMD160 af0ab93fc70c06dc43870f65461ee62c4d84ddd3 SHA1 2c10e08f18bc8338a331c28bed5c7fd929496117 SHA256 3e69ab7339d1499dbbbe38e22a65b8fc74bee9ad235c80744fbab10efc76a108
+EBUILD mplayer-9999.ebuild 20074 RMD160 7fa4d0088782c75837fa04e368befa19738de9e2 SHA1 50869e7eabf48300da415cae9507bf196846490e SHA256 b398bfd9343578e9a8bb541d20a971a84c865edae4f7817fb76a501161e03325
+MISC ChangeLog 134374 RMD160 57f71354cb2a7b2dd70e7d898bc1a7d1d84a830e SHA1 3aaea5d0cda24f3f6ec4a58993ddb25d6925c88a SHA256 d8064d37d9ebff2d394f13fc9aa9064a4e20a6911a6d5d8cd620954e8fa398a9
+MISC metadata.xml 3663 RMD160 13ae5725c38ebca3a8c96030b5ee9860c0cd111c SHA1 20cfe44eda534451641ab55fb790230bd14b1c5c SHA256 2a435064c022be90b65273068d55d3693012b03702a79d94c221dc920555d5f8
diff --git a/media-video/mplayer/metadata.xml b/media-video/mplayer/metadata.xml
index 428d80faadc6..f958a2b9391c 100644
--- a/media-video/mplayer/metadata.xml
+++ b/media-video/mplayer/metadata.xml
@@ -36,7 +36,7 @@
 	<flag name="rar">Enable Unique RAR File Library</flag>
 	<flag name="real">Adds real audo/video support</flag>
 	<flag name="rtc">Enables usage of the linux real time clock. The alternative is software emulation of rtc</flag>
-	<flag name="rtmpdump">Enables RTMPDump Streaming Media support</flag>
+	<flag name="rtmp">Enables RTMPDump Streaming Media support</flag>
 	<flag name="schroedinger">Enable Dirac video support (an advanced royalty-free video compression format) via libschroedinger (high-speed implementation in C of the Dirac codec).</flag>
 	<flag name="shm">Enable support for shm</flag>
 	<flag name="ssse3">faster floating point optimization for SSSE3 capable chips (Intel Core 2 and later chips)</flag>
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 9737da6e14a8..c831f7560daa 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-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/mplayer/mplayer-9999.ebuild,v 1.80 2010/10/10 13:46:33 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.81 2010/10/10 19:43:25 scarabeus Exp $
 
 EAPI=3
 
@@ -18,7 +18,7 @@ directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +encode esd +faac +faad fbcon
 ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
 libcaca lirc +live lzo mad md5sum +mmx mmxext mng +mp3 nas +network nut openal
 amr +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime radio +rar +real +rtc
-rtmpdump samba +shm +schroedinger sdl +speex sse sse2 ssse3 tga +theora +tremor
+rtmp samba +shm +schroedinger sdl +speex sse sse2 ssse3 tga +theora +tremor
 +truetype +toolame +twolame +unicode v4l v4l2 vdpau vidix +vorbis vpx
 win32codecs +X +x264 xanim xinerama +xscreensaver +xv +xvid xvmc zoran"
 [[ ${PV} == *9999* ]] && IUSE+=" external-ffmpeg"
@@ -132,7 +132,7 @@ RDEPEND+="
 			app-arch/rar
 		)
 	)
-	rtmpdump? ( media-video/rtmpdump )
+	rtmp? ( media-video/rtmpdump )
 	samba? ( net-fs/samba )
 	schroedinger? ( media-libs/schroedinger )
 	sdl? ( media-libs/libsdl )
@@ -284,7 +284,6 @@ src_configure() {
 	use ipv6 || myconf+=" --disable-inet6"
 	use nut || myconf+=" --disable-libnut"
 	use rar || myconf+=" --disable-unrarexec"
-	use rtmpdump || myconf+=" --disable-librtmp"
 	use samba || myconf+=" --disable-smb"
 	if ! use lirc; then
 		myconf+="
@@ -393,7 +392,7 @@ src_configure() {
 			--disable-mp3lib
 		"
 	fi
-	uses="a52 bs2b dv gsm lzo"
+	uses="a52 bs2b dv gsm lzo rtmp"
 	for i in ${uses}; do
 		use ${i} || myconf+=" --disable-lib${i}"
 	done