Touchups and love from Nikoli. Remove overshadowed ebuilds.

(Portage version: 2.2.0_alpha187/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)

4 files changed, 152 insertions, 781 deletions

diff --git a/media-video/mplayer2/ChangeLog b/media-video/mplayer2/ChangeLog
index 0d4f9e59b555..77f7f74d8a9e 100644
--- a/media-video/mplayer2/ChangeLog
+++ b/media-video/mplayer2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/mplayer2
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.107 2013/06/29 19:19:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.108 2013/07/09 16:06:35 scarabeus Exp $
+
+*mplayer2-2.0_p20130428-r1 (09 Jul 2013)
+
+  09 Jul 2013; Tomáš Chvátal <scarabeus@gentoo.org>
+  +mplayer2-2.0_p20130428-r1.ebuild, -mplayer2-2.0_p20120828.ebuild,
+  -mplayer2-2.0_p20130428.ebuild, mplayer2-9999.ebuild:
+  Touchups and love from Nikoli. Remove overshadowed ebuilds.
 
   29 Jun 2013; Agostino Sarubbo <ago@gentoo.org> mplayer2-2.0_p20130126.ebuild:
   Stable for ppc64, wrt bug #473220
diff --git a/media-video/mplayer2/mplayer2-2.0_p20120828.ebuild b/media-video/mplayer2/mplayer2-2.0_p20120828.ebuild
deleted file mode 100644
index cdad2e8008f9..000000000000
--- a/media-video/mplayer2/mplayer2-2.0_p20120828.ebuild
+++ /dev/null
@@ -1,510 +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/mplayer2/mplayer2-2.0_p20120828.ebuild,v 1.18 2013/06/13 19:32:28 ulm Exp $
-
-EAPI=4
-
-[[ ${PV} = *9999* ]] && VCS_ECLASS="git-2" || VCS_ECLASS=""
-
-inherit python toolchain-funcs eutils flag-o-matic multilib base ${VCS_ECLASS}
-
-NAMESUF="${PN/mplayer/}"
-DESCRIPTION="Media Player for Linux"
-HOMEPAGE="http://www.mplayer2.org/"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="git://git.mplayer2.org/mplayer2.git"
-else
-	RELEASE_URI="http://dev.gentooexperimental.org/~scarabeus/${P}.tar.xz"
-fi
-SRC_URI="${RELEASE_URI}
-	!truetype? (
-		mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
-		mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
-		mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2
-	)
-"
-
-LICENSE="GPL-3"
-SLOT="0"
-if [[ ${PV} == *9999* ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux"
-fi
-IUSE="+a52 aalib +alsa aqua bidi bl bluray bs2b cddb +cdio
-	cpudetection debug directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +faad
-	fbcon ftp gif ggi +iconv ipv6 jack joystick jpeg kernel_linux ladspa
-	+libass libcaca lirc mad md5sum mng +mp3 nas +network nut +opengl oss png pnm
-	portaudio postproc pulseaudio pvr quvi radio +rar +rtc samba
-	sdl +speex tga +theora +truetype +unicode v4l vdpau +vorbis +X
-	xanim xinerama +xscreensaver +xv xvid"
-IUSE+=" symlink"
-
-CPU_FEATURES="3dnow 3dnowext altivec +mmx mmxext +shm sse sse2 ssse3"
-for x in ${CPU_FEATURES}; do
-	IUSE+=" ${x}"
-done
-
-VIDEO_CARDS="s3virge mga tdfx"
-for x in ${VIDEO_CARDS}; do
-	IUSE+=" video_cards_${x}"
-done
-
-REQUIRED_USE="
-	cddb? ( cdio network )
-	dvdnav? ( dvd )
-	dxr3? ( X )
-	ggi? ( X )
-	libass? ( truetype )
-	opengl? ( || ( X aqua ) )
-	radio? ( || ( dvb v4l ) )
-	truetype? ( iconv )
-	vdpau? ( X )
-	xinerama? ( X )
-	xscreensaver? ( X )
-	xv? ( X )
-"
-
-# Rar: althrought -gpl version is nice, it cant do most functions normal rars can
-#	nemesi? ( net-libs/libnemesi )
-RDEPEND+="
-	sys-libs/ncurses
-	sys-libs/zlib
-	X? (
-		x11-libs/libXext
-		x11-libs/libXxf86vm
-		ggi? (
-			media-libs/libggi
-			media-libs/libggiwmh
-		)
-		opengl? ( virtual/opengl )
-		vdpau? ( x11-libs/libvdpau )
-		xinerama? ( x11-libs/libXinerama )
-		xscreensaver? ( x11-libs/libXScrnSaver )
-		xv? (
-			x11-libs/libXv
-		)
-	)
-	a52? ( media-libs/a52dec )
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	bidi? ( dev-libs/fribidi )
-	bluray? ( media-libs/libbluray )
-	bs2b? ( media-libs/libbs2b )
-	cdio? ( dev-libs/libcdio )
-	directfb? ( dev-libs/DirectFB )
-	dts? ( media-libs/libdca )
-	dv? ( media-libs/libdv )
-	dvb? ( virtual/linuxtv-dvb-headers )
-	dvd? (
-		>=media-libs/libdvdread-4.1.3
-		dvdnav? ( >=media-libs/libdvdnav-4.1.3 )
-	)
-	enca? ( app-i18n/enca )
-	faad? ( media-libs/faad2 )
-	gif? ( media-libs/giflib )
-	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] )
-	libcaca? ( media-libs/libcaca )
-	lirc? ( app-misc/lirc )
-	mad? ( media-libs/libmad )
-	mng? ( media-libs/libmng )
-	mp3? ( media-sound/mpg123 )
-	nas? ( media-libs/nas )
-	nut? ( >=media-libs/libnut-661 )
-	png? ( media-libs/libpng )
-	pnm? ( media-libs/netpbm )
-	portaudio? ( >=media-libs/portaudio-19_pre20111121 )
-	postproc? ( || ( media-libs/libpostproc <media-video/libav-0.8.2-r1 media-video/ffmpeg ) )
-	pulseaudio? ( media-sound/pulseaudio )
-	quvi? ( media-libs/libquvi )
-	rar? (
-		|| (
-			app-arch/unrar
-			app-arch/rar
-		)
-	)
-	samba? ( net-fs/samba )
-	sdl? ( media-libs/libsdl )
-	speex? ( media-libs/speex )
-	theora? ( media-libs/libtheora )
-	truetype? (
-		media-libs/fontconfig
-		>=media-libs/freetype-2.2.1:2
-		virtual/ttf-fonts
-	)
-	vorbis? ( media-libs/libvorbis )
-	xanim? ( media-video/xanim )
-	xvid? ( media-libs/xvid )
-	>=virtual/ffmpeg-0.10.2
-	symlink? ( !media-video/mplayer )
-"
-ASM_DEP="dev-lang/yasm"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-lang/python-2.7
-	sys-devel/gettext
-	X? (
-		x11-proto/videoproto
-		x11-proto/xf86vidmodeproto
-		dxr3? ( media-video/em8300-libraries )
-		xinerama? ( x11-proto/xineramaproto )
-		xscreensaver? ( x11-proto/scrnsaverproto )
-	)
-	amd64? ( ${ASM_DEP} )
-	doc? (
-		dev-libs/libxslt app-text/docbook-xml-dtd
-		app-text/docbook-xsl-stylesheets
-	)
-	x86? ( ${ASM_DEP} )
-	x86-fbsd? ( ${ASM_DEP} )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-py2compat.patch"
-	"${FILESDIR}/${PN}-2.0_p20120828-ffmpeg.patch"
-)
-
-pkg_setup() {
-	if [[ ${PV} == *9999* ]]; then
-		elog
-		elog "This is a live ebuild which installs the latest from upstream's"
-		elog "${VCS_ECLASS} repository, and is unsupported by Gentoo."
-		elog "Everything but bugs in the ebuild itself will be ignored."
-		elog
-	fi
-
-	if use cpudetection; then
-		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 "disabling this use flag."
-	fi
-
-	einfo "For various format support you need to enable the support on your ffmpeg package:"
-	einfo "    media-video/libav or media-video/ffmpeg"
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=434356#c4
-	python_pkg_setup
-	major=$(python_get_version --major)
-	minor=$(python_get_version --minor)
-	[[ ( ${major} -eq 2 && ${minor} -ge 7 ) || ${major} -ge 3 ]] \
-			|| die "Please eselect Python 2.7 or later"
-}
-
-src_prepare() {
-	# fix path to bash executable in configure scripts
-	local bash_scripts="configure version.sh"
-	sed -i -e "1c\#!${EPREFIX}/bin/bash" \
-		${bash_scripts} || die
-
-	if [[ -n ${NAMESUF} ]]; then
-		sed -e "/^EXESUF/s,= \$_exesuf$,= ${NAMESUF}\$_exesuf," \
-			-i configure || die
-		sed -e "\, -m 644 DOCS/man/en/mplayer,i\	mv DOCS/man/en/mplayer.1 DOCS/man/en/${PN}.1" \
-			-e "\, -m 644 DOCS/man/\$(lang)/mplayer,i\	mv DOCS/man/\$(lang)/mplayer.1 DOCS/man/\$(lang)/${PN}.1" \
-			-e "s/er.1/er${NAMESUF}.1/g" \
-			-i Makefile || die
-		sed -e "s/mplayer/${PN}/" \
-			-i TOOLS/midentify.sh || die
-	fi
-
-	base_src_prepare
-}
-
-src_configure() {
-	local myconf=""
-	local uses i
-
-	# set LINGUAS
-	[[ -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
-	# 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 tremor, it needs libvorbisidec and is for FPU-less systems only
-	myconf+="
-		--disable-svga
-		--disable-tremor
-		$(use_enable network networking)
-		$(use_enable joystick)
-	"
-	uses="bl bluray enca ftp libass rtc" # nemesi <- not working with in-tree ebuild
-	myconf+=" --disable-nemesi" # nemesi automagic disable
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use bidi || myconf+=" --disable-fribidi"
-	use ipv6 || myconf+=" --disable-inet6"
-	use nut || myconf+=" --disable-libnut"
-	use quvi || myconf+=" --disable-libquvi"
-	use rar || myconf+=" --disable-unrarexec"
-	use samba || myconf+=" --disable-smb"
-	if ! use lirc; then
-		myconf+="
-			--disable-lirc
-			--disable-lircc
-			--disable-apple-ir
-		"
-	fi
-
-	########
-	# CDDA #
-	########
-	use cddb || myconf+=" --disable-cddb"
-	use cdio || myconf+=" --disable-libcdio"
-
-	################################
-	# DVD read, navigation support #
-	################################
-	#
-	# dvdread - accessing a DVD
-	# dvdnav - navigation of menus
-	#
-	# use external libdvdcss, dvdread and dvdnav
-	myconf+=" --disable-dvdread-internal --disable-libdvdcss-internal"
-	use dvd || myconf+=" --disable-dvdread"
-	use dvdnav || myconf+=" --disable-dvdnav"
-
-	#############
-	# Subtitles #
-	#############
-	# SRT/ASS/SSA (subtitles) requires freetype support
-	# freetype support requires iconv
-	# iconv optionally can use unicode
-	use truetype || myconf+=" --disable-freetype"
-	use iconv || myconf+=" --disable-iconv --charset=noconv"
-	use iconv && use unicode && myconf+=" --charset=UTF-8"
-
-	#####################################
-	# DVB / Video4Linux / Radio support #
-	#####################################
-	myconf+=" --disable-tv-bsdbt848"
-	# broken upstream, won't work with recent kernels
-	myconf+=" --disable-ivtv"
-	# v4l1 is gone since linux-headers-2.6.38
-	myconf+=" --disable-tv-v4l1"
-	if { use dvb || use v4l || use pvr || use radio; }; then
-		use dvb || myconf+=" --disable-dvb"
-		use pvr || myconf+=" --disable-pvr"
-		use v4l || myconf+=" --disable-tv-v4l2"
-		if use radio && { use dvb || use v4l; }; then
-			myconf+="
-				--enable-radio
-				--disable-radio-capture
-			"
-		else
-			myconf+="
-				--disable-radio-v4l2
-				--disable-radio-bsdbt848
-			"
-		fi
-	else
-		myconf+="
-			--disable-tv
-			--disable-tv-v4l2
-			--disable-radio
-			--disable-radio-v4l2
-			--disable-radio-bsdbt848
-			--disable-dvb
-			--disable-v4l2
-			--disable-pvr"
-	fi
-
-	##########
-	# Codecs #
-	##########
-	myconf+=" --disable-musepack" # deprecated, libavcodec Musepack decoder is preferred
-	use dts || myconf+=" --disable-libdca"
-	use mp3 || myconf+=" --disable-mpg123"
-	uses="a52 bs2b dv vorbis"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-lib${i}"
-	done
-	uses="faad gif jpeg mad mng png pnm speex tga theora xanim xvid"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	myconf+=" --disable-live" # >=live-2012 are broken
-
-	#################
-	# Binary codecs #
-	#################
-	myconf+=" --disable-qtx --disable-real --disable-win32dll"
-
-	################
-	# Video Output #
-	################
-	uses="directfb md5sum sdl"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use aalib || myconf+=" --disable-aa"
-	use fbcon || myconf+=" --disable-fbdev"
-	use fbcon && use video_cards_s3virge && myconf+=" --enable-s3fb"
-	use libcaca || myconf+=" --disable-caca"
-	use postproc || myconf+=" --disable-libpostproc"
-
-	if ! use kernel_linux || ! use video_cards_mga; then
-		 myconf+=" --disable-mga --disable-xmga"
-	fi
-
-	if use video_cards_tdfx; then
-		myconf+="
-			$(use_enable video_cards_tdfx tdfxvid)
-			$(use_enable fbcon tdfxfb)
-		"
-	else
-		myconf+="
-			--disable-3dfx
-			--disable-tdfxvid
-			--disable-tdfxfb
-		"
-	fi
-
-	# sun card, disable by default, see bug #258729
-	myconf+=" --disable-xvr100"
-
-	################
-	# Audio Output #
-	################
-	myconf+=" --disable-rsound" # media-sound/rsound is in pro-audio overlay only
-	uses="alsa jack ladspa nas portaudio"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	#use openal && myconf+=" --enable-openal" # build fails
-	use pulseaudio || myconf+=" --disable-pulse"
-	if ! use radio; then
-		use oss || myconf+=" --disable-ossaudio"
-	fi
-
-	####################
-	# Advanced Options #
-	####################
-	# Platform specific flags, hardcoded on amd64 (see below)
-	use cpudetection && myconf+=" --enable-runtime-cpudetection"
-
-	for i in ${CPU_FEATURES//+/}; do
-		myconf+=" $(use_enable ${i})"
-	done
-
-	use debug && myconf+=" --enable-debug=3"
-
-	if use x86 && gcc-specs-pie; then
-		filter-flags -fPIC -fPIE
-		append-ldflags -nopie
-	fi
-
-	###########################
-	# X enabled configuration #
-	###########################
-	myconf+=" --disable-dga1 --disable-dga2 --disable-vesa"
-	uses="dxr3 ggi vdpau xinerama xv"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use opengl || myconf+=" --disable-gl"
-	use xscreensaver || myconf+=" --disable-xss"
-
-	############################
-	# OSX (aqua) configuration #
-	############################
-	if use aqua; then
-		myconf+="
-			--enable-macosx-finder
-			--enable-macosx-bundle
-		"
-	fi
-
-	./configure \
-		--cc="$(tc-getCC)" \
-		--pkg-config="$(tc-getPKG_CONFIG)" \
-		--prefix="${EPREFIX}"/usr \
-		--bindir="${EPREFIX}"/usr/bin \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--confdir="${EPREFIX}"/etc/${PN} \
-		--datadir="${EPREFIX}"/usr/share/${PN} \
-		--mandir="${EPREFIX}"/usr/share/man \
-		--localedir="${EPREFIX}"/usr/share/locale \
-		--enable-translation \
-		${myconf} || die
-}
-
-src_compile() {
-	# enable verbose build, bug #448196
-	base_src_compile V=1
-	use doc && emake -j1 -C DOCS/xml html-chunked
-}
-
-src_install() {
-	local i
-
-	emake \
-		DESTDIR="${D}" \
-		INSTALLSTRIP="" \
-		install
-
-	dodoc AUTHORS Copyright README etc/codecs.conf
-
-	docinto tech/
-	dodoc DOCS/tech/{*.txt,mpsub.sub,playtree}
-	docinto TOOLS/
-	dodoc -r TOOLS
-
-	if use doc; then
-		docinto html/
-		dohtml -r "${S}"/DOCS/HTML/*
-	fi
-
-	if ! use truetype; then
-		dodir /usr/share/${PN}/fonts
-		# Do this generic, as the mplayer people like to change the structure
-		# of their zips ...
-		for i in $(find "${WORKDIR}/" -type d -name 'font-arial-*'); do
-			cp -pPR "${i}" "${ED}/usr/share/${PN}/fonts"
-		done
-		# Fix the font symlink ...
-		rm -rf "${ED}/usr/share/${PN}/font"
-		dosym fonts/font-arial-14-iso-8859-1 /usr/share/${PN}/font
-	fi
-
-	insinto /etc/${PN}
-	newins "${S}/etc/example.conf" mplayer.conf
-	cat >> "${ED}/etc/${PN}/mplayer.conf" << _EOF_
-# Config options can be section specific, global
-# options should go in the default section
-[default]
-_EOF_
-	doins "${S}/etc/input.conf"
-
-	# set unrar path when required
-	if use rar; then
-		cat >> "${ED}/etc/${PN}/mplayer.conf" << _EOF_
-unrarexec=${EPREFIX}/usr/bin/unrar
-_EOF_
-	fi
-	dosym ../../../etc/${PN}/mplayer.conf /usr/share/${PN}/mplayer.conf
-
-	newbin "${S}/TOOLS/midentify.sh" midentify${NAMESUF}
-
-	if [[ -n ${NAMESUF} ]] && use symlink; then
-		dosym "${PN}" /usr/bin/mplayer
-		dosym "midentify${NAMESUF}" /usr/bin/midentify
-	fi
-}
diff --git a/media-video/mplayer2/mplayer2-2.0_p20130428.ebuild b/media-video/mplayer2/mplayer2-2.0_p20130428-r1.ebuild
index 75210929f6ee..dd301df53ee7 100644
--- a/media-video/mplayer2/mplayer2-2.0_p20130428.ebuild
+++ b/media-video/mplayer2/mplayer2-2.0_p20130428-r1.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/mplayer2/mplayer2-2.0_p20130428.ebuild,v 1.4 2013/06/13 19:32:28 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20130428-r1.ebuild,v 1.1 2013/07/09 16:06:35 scarabeus Exp $
 
 EAPI=5
 
@@ -22,15 +22,14 @@ LICENSE="GPL-3"
 SLOT="0"
 [[ ${PV} == *9999* ]] || \
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE="+a52 +alsa aqua bluray bs2b cddb +cdio cpudetection debug directfb doc
-+dts +dv dvb +dvd +dvdnav +enca +faad fbcon ftp gif +iconv ipv6 jack joystick
-jpeg kernel_linux ladspa lcms +libass libcaca lirc mad md5sum mng +mp3 +network
-nut +opengl oss png pnm portaudio +postproc pulseaudio pvr quvi radio +rar +rtc
-samba sdl +speex tga +theora +unicode v4l vcd vdpau +vorbis +X xanim xinerama
-+xscreensaver +xv xvid yuv4mpeg"
+IUSE="+alsa aqua bluray bs2b cddb +cdio cpudetection debug directfb doc dvb +dvd
++dvdnav +enca ftp gif +iconv ipv6 jack joystick jpeg ladspa lcms +libass libcaca
+lirc md5sum mng +mp3 +network +opengl oss png pnm portaudio +postproc pulseaudio
+pvr +quvi radio samba +shm tga +threads +unicode v4l vcd vdpau +X xinerama
++xscreensaver +xv yuv4mpeg"
 IUSE+=" symlink"
 
-CPU_FEATURES="3dnow 3dnowext altivec +mmx mmxext +shm sse sse2 ssse3"
+CPU_FEATURES="3dnow 3dnowext altivec +mmx mmxext sse sse2 ssse3"
 for x in ${CPU_FEATURES}; do
 	IUSE+=" ${x}"
 done
@@ -38,17 +37,19 @@ done
 REQUIRED_USE="
 	cddb? ( cdio network )
 	dvdnav? ( dvd )
+	enca? ( iconv )
 	lcms? ( opengl )
-	libass? ( iconv )
 	opengl? ( || ( aqua X ) )
-	radio? ( || ( dvb v4l ) )
+	portaudio? ( threads )
+	pvr? ( v4l )
+	radio? ( v4l || ( alsa oss ) )
+	v4l? ( threads )
 	vdpau? ( X )
 	xinerama? ( X )
 	xscreensaver? ( X )
 	xv? ( X )
 "
 
-# Rar: althrought -gpl version is nice, it cant do most functions normal rars can
 RDEPEND+="
 	sys-libs/ncurses
 	sys-libs/zlib
@@ -62,7 +63,6 @@ RDEPEND+="
 		xscreensaver? ( x11-libs/libXScrnSaver )
 		xv? ( x11-libs/libXv )
 	)
-	a52? ( media-libs/a52dec )
 	alsa? ( media-libs/alsa-lib )
 	bluray? ( media-libs/libbluray )
 	bs2b? ( media-libs/libbs2b )
@@ -73,15 +73,12 @@ RDEPEND+="
 		)
 	)
 	directfb? ( dev-libs/DirectFB )
-	dts? ( media-libs/libdca )
-	dv? ( media-libs/libdv )
 	dvb? ( virtual/linuxtv-dvb-headers )
 	dvd? (
 		>=media-libs/libdvdread-4.1.3
 		dvdnav? ( >=media-libs/libdvdnav-4.1.3 )
 	)
 	enca? ( app-i18n/enca )
-	faad? ( media-libs/faad2 )
 	gif? ( media-libs/giflib )
 	iconv? ( virtual/libiconv )
 	jack? ( media-sound/jack-audio-connection-kit )
@@ -93,10 +90,8 @@ RDEPEND+="
 	)
 	libcaca? ( media-libs/libcaca )
 	lirc? ( app-misc/lirc )
-	mad? ( media-libs/libmad )
 	mng? ( media-libs/libmng )
 	mp3? ( media-sound/mpg123 )
-	nut? ( >=media-libs/libnut-661 )
 	png? ( media-libs/libpng )
 	pnm? ( media-libs/netpbm )
 	portaudio? ( >=media-libs/portaudio-19_pre20111121 )
@@ -108,20 +103,8 @@ RDEPEND+="
 	)
 	pulseaudio? ( media-sound/pulseaudio )
 	quvi? ( >=media-libs/libquvi-0.4.1 )
-	rar? (
-		|| (
-			app-arch/unrar
-			app-arch/rar
-		)
-	)
 	samba? ( net-fs/samba )
-	sdl? ( media-libs/libsdl )
-	speex? ( media-libs/speex )
-	theora? ( media-libs/libtheora )
-	vorbis? ( media-libs/libvorbis )
-	xanim? ( media-video/xanim )
-	xvid? ( media-libs/xvid )
-	>=virtual/ffmpeg-9
+	>=virtual/ffmpeg-9[threads?,vdpau?]
 	symlink? ( !media-video/mplayer )
 "
 ASM_DEP="dev-lang/yasm"
@@ -129,7 +112,6 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	${PYTHON_DEPS}
 	dev-python/docutils
-	sys-devel/gettext
 	X? (
 		x11-proto/videoproto
 		x11-proto/xf86vidmodeproto
@@ -138,12 +120,14 @@ DEPEND="${RDEPEND}
 	)
 	amd64? ( ${ASM_DEP} )
 	doc? (
-		dev-libs/libxslt app-text/docbook-xml-dtd
+		dev-libs/libxslt
+		app-text/docbook-xml-dtd
 		app-text/docbook-xsl-stylesheets
 	)
 	x86? ( ${ASM_DEP} )
 	x86-fbsd? ( ${ASM_DEP} )
 "
+DOCS=( AUTHORS Copyright README etc/example.conf etc/input.conf etc/codecs.conf )
 
 PATCHES=(
 	"${FILESDIR}/${PN}-py2compat.patch"
@@ -158,6 +142,11 @@ pkg_setup() {
 		elog
 	fi
 
+	if use !libass; then
+		ewarn
+		ewarn "You've disabled the libass flag. No OSD or subtitles will be displayed."
+	fi
+
 	if use cpudetection; then
 		ewarn
 		ewarn "You've enabled the cpudetection flag. This feature is"
@@ -170,11 +159,6 @@ pkg_setup() {
 		ewarn "disabling this use flag."
 	fi
 
-	if use !libass; then
-		ewarn
-		ewarn "You've disabled the libass flag. No OSD or subtitles will be displayed."
-	fi
-
 	einfo "For various format support you need to enable the support on your ffmpeg package:"
 	einfo "    media-video/libav or media-video/ffmpeg"
 
@@ -183,9 +167,12 @@ pkg_setup() {
 
 src_prepare() {
 	# fix path to bash executable in configure scripts
-	local bash_scripts="configure version.sh"
 	sed -i -e "1c\#!${EPREFIX}/bin/bash" \
-		${bash_scripts} || die
+		configure version.sh || die
+
+	sed -e 's/ $(INSTALLSTRIP)//' \
+		-e '/$(INSTALL) -d $(LIBDIR)/d' \
+		-i Makefile || die
 
 	if [[ -n ${NAMESUF} ]]; then
 		sed -e "/^EXESUF/s,= \$_exesuf$,= ${NAMESUF}\$_exesuf," \
@@ -201,36 +188,30 @@ src_configure() {
 	local myconf=""
 	local uses i
 
-	# mplayer ebuild uses "use foo || --disable-foo" to forcibly disable
+	# 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#
-	###################
-	# disable tremor, it needs libvorbisidec and is for FPU-less systems only
+	#####################
+	# Optional features #
+	#####################
+	# rtc is useless and /dev/rtc0 is only readable for root
+	myconf+=" --disable-rtc"
+	# SDL output is fallback for platforms where nothing better is available
+	myconf+=" --disable-sdl"
 	myconf+="
-		--disable-tremor
 		$(use_enable network networking)
 		$(use_enable joystick)
 	"
-	uses="bluray enca ftp libass rtc vcd"
+	uses="bluray ftp vcd"
 	for i in ${uses}; do
 		use ${i} || myconf+=" --disable-${i}"
 	done
 	use ipv6 || myconf+=" --disable-inet6"
-	use nut || myconf+=" --disable-libnut"
 	use quvi || myconf+=" --disable-libquvi"
-	use rar || myconf+=" --disable-unrarexec"
 	use samba || myconf+=" --disable-smb"
-	if ! use lirc; then
-		myconf+="
-			--disable-lirc
-			--disable-lircc
-			--disable-apple-ir
-		"
-	fi
+	use lirc || myconf+=" --disable-lirc --disable-lircc --disable-apple-ir"
 
 	########
 	# CDDA #
@@ -253,53 +234,40 @@ src_configure() {
 	#############
 	# Subtitles #
 	#############
-	#
+	uses="enca libass"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
 	# iconv optionally can use unicode
 	use iconv || myconf+=" --disable-iconv --charset=noconv"
 	use iconv && use unicode && myconf+=" --charset=UTF-8"
+	# obscure and not maintained feature
+	myconf+=" --disable-unrarexec"
 
 	#####################################
 	# DVB / Video4Linux / Radio support #
 	#####################################
-	myconf+=" --disable-tv-bsdbt848"
-	if { use dvb || use v4l || use pvr || use radio; }; then
-		use dvb || myconf+=" --disable-dvb"
-		use pvr || myconf+=" --disable-pvr"
-		use v4l || myconf+=" --disable-tv-v4l2"
-		if use radio && { use dvb || use v4l; }; then
-			myconf+="
-				--enable-radio
-				--disable-radio-capture
-			"
-		else
-			myconf+="
-				--disable-radio-v4l2
-				--disable-radio-bsdbt848
-			"
-		fi
+	# BSD legacy TV/radio support, FreeBSD actually supports V4L2, and V4L2 supports this chip.
+	myconf+=" --disable-tv-bsdbt848 --disable-radio-bsdbt848"
+	use dvb || myconf+=" --disable-dvb"
+	use pvr || myconf+=" --disable-pvr"
+	use v4l || myconf+=" --disable-tv --disable-tv-v4l2 --disable-v4l2"
+	if use radio; then
+		myconf+=" --enable-radio --enable-radio-capture"
 	else
-		myconf+="
-			--disable-tv
-			--disable-tv-v4l2
-			--disable-radio
-			--disable-radio-v4l2
-			--disable-radio-bsdbt848
-			--disable-dvb
-			--disable-v4l2
-			--disable-pvr"
+		myconf+=" --disable-radio-v4l2"
 	fi
 
 	##########
 	# Codecs #
 	##########
-	myconf+=" --disable-musepack" # deprecated, libavcodec Musepack decoder is preferred
-	use dts || myconf+=" --disable-libdca"
-	use mp3 || myconf+=" --disable-mpg123"
-	uses="a52 bs2b dv vorbis"
+	# better demuxers and decoders are provided by libav and ffmpeg
+	uses="faad liba52 libdca libdv libnut libvorbis mad musepack speex theora tremor xanim xvid"
 	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-lib${i}"
+		myconf+=" --disable-${i}"
 	done
-	uses="faad gif jpeg mad mng png pnm speex tga theora xanim xvid"
+	use mp3 || myconf+=" --disable-mpg123"
+	uses="gif jpeg mng png pnm tga"
 	for i in ${uses}; do
 		use ${i} || myconf+=" --disable-${i}"
 	done
@@ -312,7 +280,7 @@ src_configure() {
 	################
 	# Video Output #
 	################
-	uses="directfb md5sum sdl yuv4mpeg"
+	uses="directfb md5sum yuv4mpeg"
 	for i in ${uses}; do
 		use ${i} || myconf+=" --disable-${i}"
 	done
@@ -327,17 +295,19 @@ src_configure() {
 	for i in ${uses}; do
 		use ${i} || myconf+=" --disable-${i}"
 	done
+	use bs2b || myconf+=" --disable-libbs2b"
 	#use openal && myconf+=" --enable-openal" # build fails
+	use oss || myconf+=" --disable-ossaudio"
 	use pulseaudio || myconf+=" --disable-pulse"
-	if ! use radio; then
-		use oss || myconf+=" --disable-ossaudio"
-	fi
 
 	####################
 	# Advanced Options #
 	####################
+	use threads || myconf+=" --disable-pthreads"
+
 	# Platform specific flags, hardcoded on amd64 (see below)
 	use cpudetection && myconf+=" --enable-runtime-cpudetection"
+	use shm || myconf+=" --disable-shm"
 
 	for i in ${CPU_FEATURES//+/}; do
 		myconf+=" $(use_enable ${i})"
@@ -365,23 +335,18 @@ src_configure() {
 	############################
 	# OSX (aqua) configuration #
 	############################
-	if use aqua; then
-		myconf+="
-			--enable-macosx-finder
-			--enable-macosx-bundle
-		"
-	fi
+	use aqua && myconf+=" --enable-macosx-bundle --enable-macosx-finder"
 
-	./configure \
+	CFLAGS= LDFLAGS= ./configure \
 		--cc="$(tc-getCC)" \
+		--extra-cflags="${CFLAGS}" \
+		--extra-ldflags="${LDFLAGS}" \
 		--pkg-config="$(tc-getPKG_CONFIG)" \
 		--prefix="${EPREFIX}"/usr \
 		--bindir="${EPREFIX}"/usr/bin \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
 		--confdir="${EPREFIX}"/etc/${PN} \
 		--mandir="${EPREFIX}"/usr/share/man \
 		--localedir="${EPREFIX}"/usr/share/locale \
-		--enable-translation \
 		${myconf} || die
 
 	MAKEOPTS+=" V=1"
@@ -393,50 +358,22 @@ src_compile() {
 }
 
 src_install() {
-	local i
-
-	emake \
-		DESTDIR="${D}" \
-		INSTALLSTRIP="" \
-		install
-
-	dodoc AUTHORS Copyright README etc/codecs.conf
-
-	docinto tech/
-	dodoc DOCS/tech/{*.txt,mpsub.sub,playtree}
-	docinto TOOLS/
-	dodoc -r TOOLS
+	base_src_install
 
 	if use doc; then
-		docinto html/
-		dohtml -r "${S}"/DOCS/HTML/*
-	fi
-
-	insinto /etc/${PN}
-	newins "${S}/etc/example.conf" mplayer.conf
-	cat >> "${ED}/etc/${PN}/mplayer.conf" << _EOF_
-# Config options can be section specific, global
-# options should go in the default section
-[default]
-_EOF_
-	doins "${S}/etc/input.conf"
-
-	# set unrar path when required
-	if use rar; then
-		cat >> "${ED}/etc/${PN}/mplayer.conf" << _EOF_
-unrarexec=${EPREFIX}/usr/bin/unrar
-_EOF_
+		rm -r TOOLS/osxbundle* DOCS/tech/{Doxyfile,realcodecs} || die
+		dodoc -r TOOLS DOCS/tech
+		dohtml -r DOCS/HTML/*
 	fi
-	dosym ../../../etc/${PN}/mplayer.conf /usr/share/${PN}/mplayer.conf
 
-	newbin "${S}/TOOLS/midentify.sh" midentify${NAMESUF}
+	newbin TOOLS/midentify.sh midentify${NAMESUF}
 
 	if [[ -n ${NAMESUF} ]]; then
 		mv "${ED}/usr/share/man/man1/mplayer.1" "${ED}/usr/share/man/man1/mplayer${NAMESUF}.1" || die
 
 		if use symlink; then
-			dosym "${PN}" /usr/bin/mplayer
-			dosym "midentify${NAMESUF}" /usr/bin/midentify
+			dosym ${PN} /usr/bin/mplayer
+			dosym midentify${NAMESUF} /usr/bin/midentify
 		fi
 	fi
 }
diff --git a/media-video/mplayer2/mplayer2-9999.ebuild b/media-video/mplayer2/mplayer2-9999.ebuild
index d632231a07f5..fdabd3175a00 100644
--- a/media-video/mplayer2/mplayer2-9999.ebuild
+++ b/media-video/mplayer2/mplayer2-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/mplayer2/mplayer2-9999.ebuild,v 1.59 2013/06/13 19:32:28 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.60 2013/07/09 16:06:35 scarabeus Exp $
 
 EAPI=5
 
@@ -22,15 +22,14 @@ LICENSE="GPL-3"
 SLOT="0"
 [[ ${PV} == *9999* ]] || \
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE="+a52 +alsa aqua bluray bs2b cddb +cdio cpudetection debug directfb doc
-+dts +dv dvb +dvd +dvdnav +enca +faad fbcon ftp gif +iconv ipv6 jack joystick
-jpeg kernel_linux ladspa lcms +libass libcaca lirc mad md5sum mng +mp3 +network
-nut +opengl oss png pnm portaudio +postproc pulseaudio pvr quvi radio +rar +rtc
-samba sdl +speex tga +theora +unicode v4l vcd vdpau +vorbis +X xanim xinerama
-+xscreensaver +xv xvid yuv4mpeg"
+IUSE="+alsa aqua bluray bs2b cddb +cdio cpudetection debug directfb doc dvb +dvd
++dvdnav +enca ftp gif +iconv ipv6 jack joystick jpeg ladspa lcms +libass libcaca
+lirc md5sum mng +mp3 +network +opengl oss png pnm portaudio +postproc pulseaudio
+pvr +quvi radio samba +shm tga +threads +unicode v4l vcd vdpau +X xinerama
++xscreensaver +xv yuv4mpeg"
 IUSE+=" symlink"
 
-CPU_FEATURES="3dnow 3dnowext altivec +mmx mmxext +shm sse sse2 ssse3"
+CPU_FEATURES="3dnow 3dnowext altivec +mmx mmxext sse sse2 ssse3"
 for x in ${CPU_FEATURES}; do
 	IUSE+=" ${x}"
 done
@@ -38,17 +37,19 @@ done
 REQUIRED_USE="
 	cddb? ( cdio network )
 	dvdnav? ( dvd )
+	enca? ( iconv )
 	lcms? ( opengl )
-	libass? ( iconv )
 	opengl? ( || ( aqua X ) )
-	radio? ( || ( dvb v4l ) )
+	portaudio? ( threads )
+	pvr? ( v4l )
+	radio? ( v4l || ( alsa oss ) )
+	v4l? ( threads )
 	vdpau? ( X )
 	xinerama? ( X )
 	xscreensaver? ( X )
 	xv? ( X )
 "
 
-# Rar: althrought -gpl version is nice, it cant do most functions normal rars can
 RDEPEND+="
 	sys-libs/ncurses
 	sys-libs/zlib
@@ -62,7 +63,6 @@ RDEPEND+="
 		xscreensaver? ( x11-libs/libXScrnSaver )
 		xv? ( x11-libs/libXv )
 	)
-	a52? ( media-libs/a52dec )
 	alsa? ( media-libs/alsa-lib )
 	bluray? ( media-libs/libbluray )
 	bs2b? ( media-libs/libbs2b )
@@ -73,15 +73,12 @@ RDEPEND+="
 		)
 	)
 	directfb? ( dev-libs/DirectFB )
-	dts? ( media-libs/libdca )
-	dv? ( media-libs/libdv )
 	dvb? ( virtual/linuxtv-dvb-headers )
 	dvd? (
 		>=media-libs/libdvdread-4.1.3
 		dvdnav? ( >=media-libs/libdvdnav-4.1.3 )
 	)
 	enca? ( app-i18n/enca )
-	faad? ( media-libs/faad2 )
 	gif? ( media-libs/giflib )
 	iconv? ( virtual/libiconv )
 	jack? ( media-sound/jack-audio-connection-kit )
@@ -93,10 +90,8 @@ RDEPEND+="
 	)
 	libcaca? ( media-libs/libcaca )
 	lirc? ( app-misc/lirc )
-	mad? ( media-libs/libmad )
 	mng? ( media-libs/libmng )
 	mp3? ( media-sound/mpg123 )
-	nut? ( >=media-libs/libnut-661 )
 	png? ( media-libs/libpng )
 	pnm? ( media-libs/netpbm )
 	portaudio? ( >=media-libs/portaudio-19_pre20111121 )
@@ -108,20 +103,8 @@ RDEPEND+="
 	)
 	pulseaudio? ( media-sound/pulseaudio )
 	quvi? ( >=media-libs/libquvi-0.4.1 )
-	rar? (
-		|| (
-			app-arch/unrar
-			app-arch/rar
-		)
-	)
 	samba? ( net-fs/samba )
-	sdl? ( media-libs/libsdl )
-	speex? ( media-libs/speex )
-	theora? ( media-libs/libtheora )
-	vorbis? ( media-libs/libvorbis )
-	xanim? ( media-video/xanim )
-	xvid? ( media-libs/xvid )
-	>=virtual/ffmpeg-9
+	>=virtual/ffmpeg-9[threads?,vdpau?]
 	symlink? ( !media-video/mplayer )
 "
 ASM_DEP="dev-lang/yasm"
@@ -129,7 +112,6 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	${PYTHON_DEPS}
 	dev-python/docutils
-	sys-devel/gettext
 	X? (
 		x11-proto/videoproto
 		x11-proto/xf86vidmodeproto
@@ -138,12 +120,14 @@ DEPEND="${RDEPEND}
 	)
 	amd64? ( ${ASM_DEP} )
 	doc? (
-		dev-libs/libxslt app-text/docbook-xml-dtd
+		dev-libs/libxslt
+		app-text/docbook-xml-dtd
 		app-text/docbook-xsl-stylesheets
 	)
 	x86? ( ${ASM_DEP} )
 	x86-fbsd? ( ${ASM_DEP} )
 "
+DOCS=( AUTHORS Copyright README etc/example.conf etc/input.conf etc/codecs.conf )
 
 PATCHES=(
 	"${FILESDIR}/${PN}-py2compat.patch"
@@ -158,6 +142,11 @@ pkg_setup() {
 		elog
 	fi
 
+	if use !libass; then
+		ewarn
+		ewarn "You've disabled the libass flag. No OSD or subtitles will be displayed."
+	fi
+
 	if use cpudetection; then
 		ewarn
 		ewarn "You've enabled the cpudetection flag. This feature is"
@@ -170,11 +159,6 @@ pkg_setup() {
 		ewarn "disabling this use flag."
 	fi
 
-	if use !libass; then
-		ewarn
-		ewarn "You've disabled the libass flag. No OSD or subtitles will be displayed."
-	fi
-
 	einfo "For various format support you need to enable the support on your ffmpeg package:"
 	einfo "    media-video/libav or media-video/ffmpeg"
 
@@ -183,9 +167,12 @@ pkg_setup() {
 
 src_prepare() {
 	# fix path to bash executable in configure scripts
-	local bash_scripts="configure version.sh"
 	sed -i -e "1c\#!${EPREFIX}/bin/bash" \
-		${bash_scripts} || die
+		configure version.sh || die
+
+	sed -e 's/ $(INSTALLSTRIP)//' \
+		-e '/$(INSTALL) -d $(LIBDIR)/d' \
+		-i Makefile || die
 
 	if [[ -n ${NAMESUF} ]]; then
 		sed -e "/^EXESUF/s,= \$_exesuf$,= ${NAMESUF}\$_exesuf," \
@@ -201,36 +188,30 @@ src_configure() {
 	local myconf=""
 	local uses i
 
-	# mplayer ebuild uses "use foo || --disable-foo" to forcibly disable
+	# 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#
-	###################
-	# disable tremor, it needs libvorbisidec and is for FPU-less systems only
+	#####################
+	# Optional features #
+	#####################
+	# rtc is useless and /dev/rtc0 is only readable for root
+	myconf+=" --disable-rtc"
+	# SDL output is fallback for platforms where nothing better is available
+	myconf+=" --disable-sdl"
 	myconf+="
-		--disable-tremor
 		$(use_enable network networking)
 		$(use_enable joystick)
 	"
-	uses="bluray enca ftp libass rtc vcd"
+	uses="bluray ftp vcd"
 	for i in ${uses}; do
 		use ${i} || myconf+=" --disable-${i}"
 	done
 	use ipv6 || myconf+=" --disable-inet6"
-	use nut || myconf+=" --disable-libnut"
 	use quvi || myconf+=" --disable-libquvi"
-	use rar || myconf+=" --disable-unrarexec"
 	use samba || myconf+=" --disable-smb"
-	if ! use lirc; then
-		myconf+="
-			--disable-lirc
-			--disable-lircc
-			--disable-apple-ir
-		"
-	fi
+	use lirc || myconf+=" --disable-lirc --disable-lircc --disable-apple-ir"
 
 	########
 	# CDDA #
@@ -253,53 +234,40 @@ src_configure() {
 	#############
 	# Subtitles #
 	#############
-	#
+	uses="enca libass"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
 	# iconv optionally can use unicode
 	use iconv || myconf+=" --disable-iconv --charset=noconv"
 	use iconv && use unicode && myconf+=" --charset=UTF-8"
+	# obscure and not maintained feature
+	myconf+=" --disable-unrarexec"
 
 	#####################################
 	# DVB / Video4Linux / Radio support #
 	#####################################
-	myconf+=" --disable-tv-bsdbt848"
-	if { use dvb || use v4l || use pvr || use radio; }; then
-		use dvb || myconf+=" --disable-dvb"
-		use pvr || myconf+=" --disable-pvr"
-		use v4l || myconf+=" --disable-tv-v4l2"
-		if use radio && { use dvb || use v4l; }; then
-			myconf+="
-				--enable-radio
-				--disable-radio-capture
-			"
-		else
-			myconf+="
-				--disable-radio-v4l2
-				--disable-radio-bsdbt848
-			"
-		fi
+	# BSD legacy TV/radio support, FreeBSD actually supports V4L2, and V4L2 supports this chip.
+	myconf+=" --disable-tv-bsdbt848 --disable-radio-bsdbt848"
+	use dvb || myconf+=" --disable-dvb"
+	use pvr || myconf+=" --disable-pvr"
+	use v4l || myconf+=" --disable-tv --disable-tv-v4l2 --disable-v4l2"
+	if use radio; then
+		myconf+=" --enable-radio --enable-radio-capture"
 	else
-		myconf+="
-			--disable-tv
-			--disable-tv-v4l2
-			--disable-radio
-			--disable-radio-v4l2
-			--disable-radio-bsdbt848
-			--disable-dvb
-			--disable-v4l2
-			--disable-pvr"
+		myconf+=" --disable-radio-v4l2"
 	fi
 
 	##########
 	# Codecs #
 	##########
-	myconf+=" --disable-musepack" # deprecated, libavcodec Musepack decoder is preferred
-	use dts || myconf+=" --disable-libdca"
-	use mp3 || myconf+=" --disable-mpg123"
-	uses="a52 bs2b dv vorbis"
+	# better demuxers and decoders are provided by libav and ffmpeg
+	uses="faad liba52 libdca libdv libnut libvorbis mad musepack speex theora tremor xanim xvid"
 	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-lib${i}"
+		myconf+=" --disable-${i}"
 	done
-	uses="faad gif jpeg mad mng png pnm speex tga theora xanim xvid"
+	use mp3 || myconf+=" --disable-mpg123"
+	uses="gif jpeg mng png pnm tga"
 	for i in ${uses}; do
 		use ${i} || myconf+=" --disable-${i}"
 	done
@@ -312,7 +280,7 @@ src_configure() {
 	################
 	# Video Output #
 	################
-	uses="directfb md5sum sdl yuv4mpeg"
+	uses="directfb md5sum yuv4mpeg"
 	for i in ${uses}; do
 		use ${i} || myconf+=" --disable-${i}"
 	done
@@ -327,17 +295,19 @@ src_configure() {
 	for i in ${uses}; do
 		use ${i} || myconf+=" --disable-${i}"
 	done
+	use bs2b || myconf+=" --disable-libbs2b"
 	#use openal && myconf+=" --enable-openal" # build fails
+	use oss || myconf+=" --disable-ossaudio"
 	use pulseaudio || myconf+=" --disable-pulse"
-	if ! use radio; then
-		use oss || myconf+=" --disable-ossaudio"
-	fi
 
 	####################
 	# Advanced Options #
 	####################
+	use threads || myconf+=" --disable-pthreads"
+
 	# Platform specific flags, hardcoded on amd64 (see below)
 	use cpudetection && myconf+=" --enable-runtime-cpudetection"
+	use shm || myconf+=" --disable-shm"
 
 	for i in ${CPU_FEATURES//+/}; do
 		myconf+=" $(use_enable ${i})"
@@ -365,23 +335,18 @@ src_configure() {
 	############################
 	# OSX (aqua) configuration #
 	############################
-	if use aqua; then
-		myconf+="
-			--enable-macosx-finder
-			--enable-macosx-bundle
-		"
-	fi
+	use aqua && myconf+=" --enable-macosx-bundle --enable-macosx-finder"
 
-	./configure \
+	CFLAGS= LDFLAGS= ./configure \
 		--cc="$(tc-getCC)" \
+		--extra-cflags="${CFLAGS}" \
+		--extra-ldflags="${LDFLAGS}" \
 		--pkg-config="$(tc-getPKG_CONFIG)" \
 		--prefix="${EPREFIX}"/usr \
 		--bindir="${EPREFIX}"/usr/bin \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
 		--confdir="${EPREFIX}"/etc/${PN} \
 		--mandir="${EPREFIX}"/usr/share/man \
 		--localedir="${EPREFIX}"/usr/share/locale \
-		--enable-translation \
 		${myconf} || die
 
 	MAKEOPTS+=" V=1"
@@ -393,50 +358,22 @@ src_compile() {
 }
 
 src_install() {
-	local i
-
-	emake \
-		DESTDIR="${D}" \
-		INSTALLSTRIP="" \
-		install
-
-	dodoc AUTHORS Copyright README etc/codecs.conf
-
-	docinto tech/
-	dodoc DOCS/tech/{*.txt,mpsub.sub,playtree}
-	docinto TOOLS/
-	dodoc -r TOOLS
+	base_src_install
 
 	if use doc; then
-		docinto html/
-		dohtml -r "${S}"/DOCS/HTML/*
-	fi
-
-	insinto /etc/${PN}
-	newins "${S}/etc/example.conf" mplayer.conf
-	cat >> "${ED}/etc/${PN}/mplayer.conf" << _EOF_
-# Config options can be section specific, global
-# options should go in the default section
-[default]
-_EOF_
-	doins "${S}/etc/input.conf"
-
-	# set unrar path when required
-	if use rar; then
-		cat >> "${ED}/etc/${PN}/mplayer.conf" << _EOF_
-unrarexec=${EPREFIX}/usr/bin/unrar
-_EOF_
+		rm -r TOOLS/osxbundle* DOCS/tech/{Doxyfile,realcodecs} || die
+		dodoc -r TOOLS DOCS/tech
+		dohtml -r DOCS/HTML/*
 	fi
-	dosym ../../../etc/${PN}/mplayer.conf /usr/share/${PN}/mplayer.conf
 
-	newbin "${S}/TOOLS/midentify.sh" midentify${NAMESUF}
+	newbin TOOLS/midentify.sh midentify${NAMESUF}
 
 	if [[ -n ${NAMESUF} ]]; then
 		mv "${ED}/usr/share/man/man1/mplayer.1" "${ED}/usr/share/man/man1/mplayer${NAMESUF}.1" || die
 
 		if use symlink; then
-			dosym "${PN}" /usr/bin/mplayer
-			dosym "midentify${NAMESUF}" /usr/bin/midentify
+			dosym ${PN} /usr/bin/mplayer
+			dosym midentify${NAMESUF} /usr/bin/midentify
 		fi
 	fi
 }