Ebuild cleanup. Drop gmplayer useflag. Introduce rtmpdump useflag. Thanks to Andrew Savchenko. Fixes bug #336021 and bug #337284.

(Portage version: 2.2_rc91/cvs/Linux x86_64)

2 files changed, 73 insertions, 108 deletions

diff --git a/media-video/mplayer/metadata.xml b/media-video/mplayer/metadata.xml
index da8993e20dd5..428d80faadc6 100644
--- a/media-video/mplayer/metadata.xml
+++ b/media-video/mplayer/metadata.xml
@@ -1,54 +1,55 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
-  <maintainer>
-    <email>media-video@gentoo.org</email>
-  </maintainer>
-  <use>
-    <flag name="3dnowext">Enable 3dnowext cpu instructions</flag>
-    <flag name="amr">Enables Adaptive Multi-Rate format support</flag>
-    <flag name="ass">SRT/SSA/ASS (SubRip / SubStation Alpha) subtitle support</flag>
-    <flag name="bl">Blinkenlights video output</flag>
-    <flag name="bluray">Enable playback of Blu-ray filesystems</flag>
+<herd>video</herd>
+<maintainer>
+	<email>media-video@gentoo.org</email>
+</maintainer>
+<use>
+	<flag name="3dnowext">Enable 3dnowext cpu instructions</flag>
+	<flag name="amr">Enables Adaptive Multi-Rate format support</flag>
+	<flag name="ass">SRT/SSA/ASS (SubRip / SubStation Alpha) subtitle support</flag>
+	<flag name="bl">Blinkenlights video output</flag>
+	<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="cpudetection">Enables runtime CPU detection (useful for bindist, compatibility on other CPUs)</flag>
-    <flag name="custom-cpuopts">Fine-tune custom CPU optimizations (UNSUPPORTED)</flag>
+	<flag name="cdio">Use libcdio for CD support (instead of cdparanoia)</flag>
+	<flag name="cpudetection">Enables runtime CPU detection (useful for bindist, compatibility on other CPUs)</flag>
+	<flag name="custom-cpuopts">Fine-tune custom CPU optimizations (UNSUPPORTED)</flag>
 	<flag name="dirac">Enable Dirac video support (an advanced royalty-free video compression format) via the reference library: dirac.</flag>
-    <flag name="dvdnav">Use forked libdvdnav, navigate menus in GUIs</flag>
-    <flag name="dxr3">Enable DXR3/H+ video output</flag>
-    <flag name="enca">Enables support for charset discovery and conversion</flag>
-    <flag name="external-ffmpeg">Use shared FFmpeg libraries instead of static bundled ones. Discouraged by upstream.</flag>
-    <flag name="faac">Use external faac library for AAC encoding</flag>
-    <flag name="faad">Use external faad library for AAC decoding</flag>
+	<flag name="dvdnav">Use forked libdvdnav, navigate menus in GUIs</flag>
+	<flag name="dxr3">Enable DXR3/H+ video output</flag>
+	<flag name="enca">Enables support for charset discovery and conversion</flag>
+	<flag name="external-ffmpeg">Use shared FFmpeg libraries instead of static bundled ones. Discouraged by upstream.</flag>
+	<flag name="faac">Use external faac library for AAC encoding</flag>
+	<flag name="faad">Use external faad library for AAC decoding</flag>
 	<flag name="gmplayer">Build gmplayer, a GTK+ MPlayer gui (UNSUPPORTED)</flag>
-    <flag name="live">Enables live.com streaming media support</flag>
-    <flag name="md5sum">Enables md5sum video output</flag>
-    <flag name="mmxext">Enables mmx2 support</flag>
-    <flag name="mng">MNG input support</flag>
+	<flag name="live">Enables live.com streaming media support</flag>
+	<flag name="md5sum">Enables md5sum video output</flag>
+	<flag name="mmxext">Enables mmx2 support</flag>
+	<flag name="mng">MNG input support</flag>
 	<flag name="network">Enables network streaming support</flag>
 	<flag name="nut">Enables support for the NUT container format</flag>
 	<flag name="osdmenu">Enables support for on-screen display (OSD) menus</flag>
-    <flag name="pnm">Add PNM video output option, to create PPM/PGM/PGMYUV images</flag>
-    <flag name="pvr">Enable Video4Linux2 MPEG PVR</flag>
-    <flag name="radio">Enable V4L2 radio interface and support</flag>
-    <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="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>
-    <flag name="teletext">Support for TV teletext interface</flag>
-    <flag name="tga">Enables Targa video output</flag>
+	<flag name="pnm">Add PNM video output option, to create PPM/PGM/PGMYUV images</flag>
+	<flag name="pvr">Enable Video4Linux2 MPEG PVR</flag>
+	<flag name="radio">Enable V4L2 radio interface and support</flag>
+	<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="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>
+	<flag name="teletext">Support for TV teletext interface</flag>
+	<flag name="tga">Enables Targa video output</flag>
 	<flag name="toolame">Enable toolame MPEG-2 encoding</flag>
 	<flag name="tremor">Enable internal support for Vorbis</flag>
 	<flag name="twolame">Enable twolame MPEG-2 encoding</flag>
-    <flag name="vdpau">Enables experimental VDPAU support (requires nVidia video cards) to offload MPEG2/MPEG4/VC1/WMV CPU processing to video card</flag>
+	<flag name="vdpau">Enables experimental VDPAU support (requires nVidia video cards) to offload MPEG2/MPEG4/VC1/WMV CPU processing to video card</flag>
 	<flag name="vpx">Enables vp8 codec support using libvpx</flag>
-    <flag name="vidix">Support for vidix video output</flag>
-    <flag name="xanim">Enables support for xanim based codecs</flag>
-    <flag name="xvmc">Enables X-Video Motion Compensation support</flag>
-    <flag name="zoran">Enables ZR360[56]7/ZR36060 video output</flag>
-  </use>
+	<flag name="vidix">Support for vidix video output</flag>
+	<flag name="xanim">Enables support for xanim based codecs</flag>
+	<flag name="xvmc">Enables X-Video Motion Compensation support</flag>
+	<flag name="zoran">Enables ZR360[56]7/ZR36060 video output</flag>
+</use>
 </pkgmetadata>
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index c7343f0862d4..42e360527e99 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.76 2010/10/01 02:44:10 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.77 2010/10/10 08:49:51 scarabeus Exp $
 
 EAPI="2"
 
@@ -14,10 +14,10 @@ inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS}
 IUSE="3dnow 3dnowext +a52 aalib +alsa altivec +ass bidi bindist bl bluray bs2b
 +cddb +cdio cdparanoia cpudetection custom-cpuopts debug dga +dirac directfb
 doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +encode esd +faac +faad fbcon ftp
-gif ggi -gmplayer +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
+gif ggi +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
-samba +shm +schroedinger sdl +speex sse sse2 ssse3 tga +theora +tremor
+rtmpdump 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"
@@ -27,9 +27,6 @@ for x in ${VIDEO_CARDS}; do
 	IUSE+=" video_cards_${x}"
 done
 
-BLUV="1.7"
-SVGV="1.9.17"
-AMR_URI="http://www.3gpp.org/ftp/Specs/archive"
 FONT_URI="
 	mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
 	mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
@@ -41,8 +38,7 @@ else
 	RELEASE_URI="mirror://gentoo/${P}.tbz2"
 fi
 SRC_URI="${RELEASE_URI}
-	!truetype? ( ${FONT_URI} )
-	gmplayer? ( mirror://mplayer/skins/Blue-${BLUV}.tar.bz2 )"
+	!truetype? ( ${FONT_URI} )"
 
 DESCRIPTION="Media Player for Linux"
 HOMEPAGE="http://www.mplayerhq.hu/"
@@ -75,11 +71,6 @@ RDEPEND+="
 			media-libs/libggi
 			media-libs/libggiwmh
 		)
-		gmplayer? (
-			media-libs/libpng
-			x11-libs/gtk+:2
-			x11-libs/libXi
-		)
 		opengl? ( virtual/opengl )
 		vdpau? ( || ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 ) )
 		xinerama? ( x11-libs/libXinerama )
@@ -93,7 +84,7 @@ RDEPEND+="
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
 	amr? ( !bindist? ( media-libs/opencore-amr ) )
-	ass? ( ${FONT_RDEPS} media-libs/libass[enca?] )
+	ass? ( ${FONT_RDEPS} >=media-libs/libass-0.9.10[enca?] )
 	bidi? ( dev-libs/fribidi )
 	bluray? ( media-libs/libbluray )
 	bs2b? ( media-libs/libbs2b )
@@ -139,6 +130,7 @@ RDEPEND+="
 			app-arch/rar
 		)
 	)
+	rtmpdump? ( media-video/rtmpdump )
 	samba? ( net-fs/samba )
 	schroedinger? ( media-libs/schroedinger )
 	sdl? ( media-libs/libsdl )
@@ -161,7 +153,6 @@ DEPEND="${RDEPEND}
 		${X_DEPS}
 		dga? ( x11-proto/xf86dgaproto )
 		dxr3? ( media-video/em8300-libraries )
-		gmplayer? ( x11-proto/xextproto )
 		xinerama? ( x11-proto/xineramaproto )
 		xscreensaver? ( x11-proto/scrnsaverproto )
 	)
@@ -187,44 +178,37 @@ PATCHES=(
 
 pkg_setup() {
 	if [[ ${PV} == *9999* ]]; then
-		elog ""
+		elog
 		elog "This is a live ebuild which installs the latest from upstream's"
 		elog "subversion repository, and is unsupported by Gentoo."
 		elog "Everything but bugs in the ebuild itself will be ignored."
-		elog ""
-	fi
-
-	if use gmplayer; then
-		ewarn ""
-		ewarn "GMPlayer is no longer actively developed upstream"
-		ewarn "and is not supported by Gentoo.  There are alternatives"
-		ewarn "for a GUI frontend: smplayer, gnome-mplayer or kmplayer."
+		elog
 	fi
 
 	if use cpudetection; then
-		ewarn ""
-		ewarn "You've enabled the cpudetection flag.  This feature is"
+		ewarn
+		ewarn "You've enabled the cpudetection flag. This feature is"
 		ewarn "included mainly for people who want to use the same"
 		ewarn "binary on another system with a different CPU architecture."
 		ewarn "MPlayer will already detect your CPU settings by default at"
 		ewarn "buildtime; this flag is used for runtime detection."
 		ewarn "You won't need this turned on if you are only building"
-		ewarn "mplayer for this system.  Also, if your compile fails, try"
+		ewarn "mplayer for this system. Also, if your compile fails, try"
 		ewarn "disabling this use flag."
 	fi
 
 	if use custom-cpuopts; then
-		ewarn ""
+		ewarn
 		ewarn "You are using the custom-cpuopts flag which will"
 		ewarn "specifically allow you to enable / disable certain"
 		ewarn "CPU optimizations."
-		ewarn ""
+		ewarn
 		ewarn "Most desktop users won't need this functionality, but it"
 		ewarn "is included for corner cases like cross-compiling and"
-		ewarn "certain profiles.  If unsure, disable this flag and MPlayer"
+		ewarn "certain profiles. If unsure, disable this flag and MPlayer"
 		ewarn "will automatically detect and use your available CPU"
 		ewarn "optimizations."
-		ewarn ""
+		ewarn
 		ewarn "Using this flag means your build is unsupported, so"
 		ewarn "please make sure your CPU optimization use flags (3dnow"
 		ewarn "3dnowext mmx mmxext sse sse2 ssse3) are properly set."
@@ -245,8 +229,6 @@ src_unpack() {
 			font-arial-iso-8859-2.tar.bz2 \
 			font-arial-cp1250.tar.bz2
 	fi
-
-	use gmplayer && unpack "Blue-${BLUV}.tar.bz2"
 }
 
 src_prepare() {
@@ -270,33 +252,34 @@ src_configure() {
 	[[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/da/dk}"
 
 	# mplayer ebuild uses "use foo || --disable-foo" to forcibly disable
-	# compilation in almost every situation.  The reason for this is
+	# 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#
 	###################
+	# disable svga since we don't want it
+	# disable arts since we don't have kde3
+	# always disable internal ass
 	myconf+="
-		--disable-svga --enable-svgalib_helper
+		--disable-svga --disable-svgalib_helper
+		--disable-ass-internal
 		--disable-arts
 		--disable-kai
 		$(use_enable network networking)
 		$(use_enable joystick)
 	"
-	uses="ass bl enca ftp rtc" # nemesi <- not working with in-tree ebuild
+	uses="ass bl bluray enca ftp rtc" # nemesi <- not working with in-tree ebuild
 	myconf+=" --disable-nemesi" # nemesi automagic disable
-	# upstream includes an internal copy for lazy users.
-	# We want to always use external libs where possible.
-	myconf+=" --disable-ass-internal" # always use system libass
 	for i in ${uses}; do
 		use ${i} || myconf+=" --disable-${i}"
 	done
 	use bidi || myconf+=" --disable-fribidi"
-	use bluray || myconf+=" --disable-bluray"
 	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+="
@@ -415,11 +398,8 @@ src_configure() {
 	# Disable opencore-amr with bindist
 	# https://bugs.gentoo.org/show_bug.cgi?id=299405#c6
 	{ use amr && use !bindist ; } || myconf+=" --disable-libopencore_amrnb --disable-libopencore_amrwb"
-	if ! use png && ! use gmplayer; then
-		myconf+=" --disable-png"
-	fi
 
-	uses="faad gif jpeg live mad mng pnm speex tga theora xanim"
+	uses="faad gif jpeg live mad mng png pnm speex tga theora xanim"
 	for i in ${uses}; do
 		use ${i} || myconf+=" --disable-${i}"
 	done
@@ -442,9 +422,8 @@ src_configure() {
 			use ${i} || myconf+=" --disable-${i}"
 		done
 		use faac || myconf+=" --disable-faac-lavc"
-		if use bindist
-		then
-			use faac && ewarn "faac is nonfree and cannot be distributed; disabling faac support."
+		if use bindist && use faac; then
+			ewarn "faac is nonfree and cannot be distributed; disabling faac support."
 			myconf+=" --disable-faac --disable-faac-lavc"
 		fi
 	else
@@ -481,7 +460,7 @@ src_configure() {
 		use x86 && myconf+=" --codecsdir=/opt/RealPlayer/codecs"
 		use amd64 && myconf+=" --codecsdir=/usr/$(get_libdir)/codecs"
 	elif ! use bindist; then
-			myconf+=" $(use_enable win32codecs win32dll)"
+		myconf+=" $(use_enable win32codecs win32dll)"
 	fi
 
 	################
@@ -536,7 +515,7 @@ src_configure() {
 
 	# Turning off CPU optimizations usually will break the build.
 	# However, this use flag, if enabled, will allow users to completely
-	# specify which ones to use.  If disabled, mplayer will automatically
+	# specify which ones to use. If disabled, mplayer will automatically
 	# enable all CPU optimizations that the host build supports.
 	if use custom-cpuopts; then
 		uses="3dnow 3dnowext altivec mmx mmxext shm sse sse2 ssse3"
@@ -560,6 +539,7 @@ src_configure() {
 	###########################
 	# X enabled configuration #
 	###########################
+	myconf+=" --disable-gui"
 	if use X; then
 		uses="dxr3 ggi xinerama"
 		for i in ${uses}; do
@@ -573,10 +553,6 @@ src_configure() {
 		use vidix || myconf+=" --disable-vidix --disable-vidix-pcidb"
 		use xscreensaver || myconf+=" --disable-xss"
 
-		# GTK gmplayer gui
-		# Unsupported by Gentoo, upstream has dropped development
-		myconf+=" $(use_enable gmplayer gui)"
-
 		if use xv; then
 			if use xvmc; then
 				myconf+=" --enable-xvmc --with-xvmclib=XvMCW"
@@ -641,11 +617,10 @@ src_compile() {
 		for i in ${LINGUAS} ; do
 			hasq ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=" ${i}"
 		done
-		if [[ -z $BUILT_DOCS ]]
-		then
+		if [[ -z $BUILT_DOCS ]]; then
 			emake -j1 -C DOCS/xml html-chunked || die "Failed to generate html docs"
 		else
-			for i in ${BUILT_DOCS} ; do
+			for i in ${BUILT_DOCS}; do
 				emake -j1 -C DOCS/xml html-chunked-${i} || die "Failed to generate html docs for ${i}"
 			done
 		fi
@@ -684,17 +659,6 @@ src_install() {
 		dohtml -r "${S}"/DOCS/HTML/* || die
 	fi
 
-	# Install the default Skin and Gnome menu entry
-	if use gmplayer; then
-		dodir /usr/share/mplayer/skins
-		cp -r "${WORKDIR}/Blue" \
-			"${D}/usr/share/mplayer/skins/default" || die "cp skins died"
-
-		# Fix the symlink
-		rm -rf "${D}/usr/bin/gmplayer"
-		dosym mplayer /usr/bin/gmplayer
-	fi
-
 	if ! use ass && ! use truetype; then
 		dodir /usr/share/mplayer/fonts
 		# Do this generic, as the mplayer people like to change the structure
@@ -714,7 +678,7 @@ src_install() {
 		doins "${S}/etc/menu.conf" || die
 	fi
 
-	if use ass || use truetype;	then
+	if use ass || use truetype; then
 		cat >> "${D}/etc/mplayer/mplayer.conf" << _EOF_
 fontconfig=1
 subfont-osd-scale=4