Update live verison to eapi4 and use_required syntax. Fix default configuration section, some setitngs were eaten for me otherwise.

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

3 files changed, 106 insertions, 132 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index a915a39dd51b..e43eaec4de8a 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.776 2011/01/30 11:20:53 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.777 2011/01/30 12:55:54 scarabeus Exp $
+
+  30 Jan 2011; Tomáš Chvátal <scarabeus@gentoo.org> mplayer-9999.ebuild:
+  Update live verison to eapi4 and use_required syntax. Fix default
+  configuration section, some setitngs were eaten for me otherwise.
 
   30 Jan 2011; Tomáš Chvátal <scarabeus@gentoo.org> mplayer-9999.ebuild:
   Fix dependency on vdpau (it specificaly check for headers in libvdpau). Per
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 1a137d5b22b1..f35f7fd72809 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -11,6 +11,6 @@ DIST svgalib_helper-1.9.17-mplayer.tar.gz 7583 RMD160 927ff34f187e4fa9528e2e4820
 EBUILD mplayer-1.0_rc4_p20091026-r1.ebuild 18994 RMD160 703252f6fa80d26861cdfa527b908d46b3e47b2c SHA1 7c313494950845a272a6d9c4032db7c257c8aee1 SHA256 05ecd2470da16c3a01db8807e6cdb07015ef4c722d986398281b87ef900780e6
 EBUILD mplayer-1.0_rc4_p20101114.ebuild 20160 RMD160 d1d9a84a8405113a9b6ff37473c16590054729fc SHA1 6e15165eb69fb4eb4c14f7b059f8c5cd9f1f843e SHA256 5273dce8c77ea476bbf79df746a93c504ba6a7117e40a71522a8ef9f47f47dfa
 EBUILD mplayer-1.0_rc4_p20101219.ebuild 20170 RMD160 eaf9ba0c48f420361e1e9ee678d58f636b7022e4 SHA1 e8d0d50037e34e1d701d9b17a89dd012e219331a SHA256 f8127f97c387ad15636e8c1f7777aee88b6bf54ab9eba197b1775103825f1983
-EBUILD mplayer-9999.ebuild 19948 RMD160 6e6ffc5d540adece2db213daf06606b84760c19f SHA1 6d994b3075d7533fb4e942c15beac832d1b8346f SHA256 b322b2f1fef94677cc5d08f2860aa719242a6da9689ec3994681ef6b43215281
-MISC ChangeLog 136709 RMD160 a360a576e3ee11027a8a150ac7e71e755a1ce8ea SHA1 ce0aabe74d68a7d7a2aa846c2377c982bb3aa3d7 SHA256 e251f3f1c2a295b5342fa076b36445e92e20538f85cba60a2822f9547305eead
+EBUILD mplayer-9999.ebuild 19623 RMD160 a084eb49c6041f1ba5e09b8a91036270bceeeb09 SHA1 7a1b8a6220f262cf3b884dcd85d596422336ded3 SHA256 d6926dba0a7b7a4e33f1672745abf0897492117440ed308d6a7fd0ed61faee43
+MISC ChangeLog 136922 RMD160 9ea64762796f4543c14fea51585f16c0b27de222 SHA1 677a4474c5d7d3d0cd82b52643c40afed84ee230 SHA256 97aaacb7248f15efe5612c0c686c513240a3261c69c91d07157275470230386a
 MISC metadata.xml 4002 RMD160 ffe9c287d3f9757d086dd59a57abbaa50bbf7ff5 SHA1 ffba30bdc398c9515384344d40998e3e333319c4 SHA256 759874a20b3d4a0509f5fb18b9a4809a1e190ac3d3c74d9757faec3a024fd5e6
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 4ffaa4c470aa..176f1409cd01 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 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.89 2011/01/30 11:20:53 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.90 2011/01/30 12:55:54 scarabeus Exp $
 
-EAPI=3
+EAPI=4
 
 ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
 [[ ${PV} = *9999* ]] && SVN_ECLASS="subversion" || SVN_ECLASS=""
@@ -182,6 +182,47 @@ else
 	KEYWORDS=""
 fi
 
+# bindist does not cope with amr codecs (#299405#c6), faac codecs are nonfree, win32codecs are nonfree
+# libcdio support: prefer libcdio over cdparanoia and don't check for cddb w/cdio
+# dvd navigation requires dvd read support
+# ass and freetype font require iconv and ass requires freetype fonts
+# unicode transformations are usefull only with iconv
+# libvorbis require external tremor to work
+# radio requires oss or alsa backend
+# xvmc requires xvideo support
+REQUIRED_USE="bindist? ( !amr !faac !win32codecs )
+	cdio? ( !cdparanoia !cddb )
+	dvdnav? ( dvd )
+	ass? ( iconv truetype )
+	truetype? ( iconv )
+	unicode? ( iconv )
+	vorbis? ( tremor )
+	radio? ( || ( alsa oss ) )
+	xvmc? ( xv )"
+# encoder codecs needs encoder support enabled
+uses="faac x264 xvid toolame twolame"
+for x in ${uses}; do
+	REQUIRED_USE+="
+		${x}? ( encode )
+	"
+done
+# cpu options needs custom-cpuopts enabled
+# but since it is not so fatal we rather ignore them
+#uses="3dnow 3dnowext altivec mmx mmxext shm sse sse2 ssse3"
+#for x in ${uses}; do
+#	REQUIRED_USE+="
+#		${x}? ( custom-cpuopts )
+#	"
+#done
+# xorg options require X useflag enabled
+uses="dga dxr3 ggi opengl osdmenu vdpau vidix xinerama xscreensaver xv xvmc"
+for x in ${uses}; do
+	REQUIRED_USE+="
+		${x}? ( X )
+	"
+done
+unset uses
+
 PATCHES=(
 )
 
@@ -300,15 +341,10 @@ src_configure() {
 		"
 	fi
 
-	# libcdio support: prefer libcdio over cdparanoia
-	# don't check for cddb w/cdio
-	if use cdio; then
-		myconf+=" --disable-cdparanoia"
-	else
-		myconf+=" --disable-libcdio"
-		use cdparanoia || myconf+=" --disable-cdparanoia"
-		use cddb || myconf+=" --disable-cddb"
-	fi
+	use cdio && myconf+=" --disable-cdparanoia"
+	use cdio || myconf+=" --disable-libcdio"
+	use cdparanoia || myconf+=" --disable-cdparanoia"
+	use cddb || myconf+=" --disable-cddb"
 
 	################################
 	# DVD read, navigation support #
@@ -319,15 +355,8 @@ src_configure() {
 	#
 	# use external libdvdcss, dvdread and dvdnav
 	myconf+=" --disable-dvdread-internal --disable-libdvdcss-internal"
-
-	if use dvd; then
-		use dvdnav || myconf+=" --disable-dvdnav"
-	else
-		myconf+="
-			--disable-dvdnav
-			--disable-dvdread
-		"
-	fi
+	use dvd || myconf+=" --disable-dvdread"
+	use dvdnav || myconf+=" --disable-dvdnav"
 
 	#############
 	# Subtitles #
@@ -336,16 +365,14 @@ src_configure() {
 	# SRT/ASS/SSA (subtitles) requires freetype support
 	# freetype support requires iconv
 	# iconv optionally can use unicode
-	if ! use ass && ! use truetype; then
-		myconf+=" --disable-freetype"
-		if ! use iconv; then
-			myconf+="
-				--disable-iconv
-				--charset=noconv
-			"
-		fi
+	use truetype || myconf+=" --disable-freetype"
+	if ! use iconv; then
+		myconf+="
+			--disable-iconv
+			--charset=noconv
+		"
 	fi
-	use iconv && use unicode && myconf+=" --charset=UTF-8"
+	use unicode && myconf+=" --charset=UTF-8"
 
 	#####################################
 	# DVB / Video4Linux / Radio support #
@@ -401,45 +428,24 @@ src_configure() {
 		use ${i} || myconf+=" --disable-lib${i}"
 	done
 	use schroedinger || myconf+=" --disable-libschroedinger-lavc"
-	# 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"
+	use amr || myconf+=" --disable-libopencore_amrnb --disable-libopencore_amrwb"
 
 	uses="faad gif jpeg libmpeg2 live mad mng mpg123 png pnm speex tga theora xanim"
 	for i in ${uses}; do
 		use ${i} || myconf+=" --disable-${i}"
 	done
 	use jpeg2k || myconf+=" --disable-libopenjpeg"
-	if use vorbis || use tremor; then
-		use tremor || myconf+=" --disable-tremor-internal"
-		use vorbis || myconf+=" --disable-libvorbis"
-	else
-		myconf+="
-			--disable-tremor-internal
-			--disable-tremor
-			--disable-libvorbis
-		"
-	fi
+	use tremor && myconf+=" --disable-tremor-internal"
+	use tremor || myconf+=" --disable-tremor-internal --disable-tremor"
+	use vorbis || myconf+=" --disable-libvorbis"
 	use vpx || myconf+=" --disable-libvpx-lavc"
 	# Encoding
+	use encode || myconf+=" --disable-mencoder"
 	uses="faac x264 xvid toolame twolame"
-	if use encode; then
-		for i in ${uses}; do
-			use ${i} || myconf+=" --disable-${i}"
-		done
-		use faac || myconf+=" --disable-faac-lavc"
-		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
-		myconf+=" --disable-mencoder"
-		myconf+=" --disable-faac-lavc"
-		for i in ${uses}; do
-			myconf+=" --disable-${i}"
-			use ${i} && elog "Useflag \"${i}\" require \"encode\" useflag enabled to work."
-		done
-	fi
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	use faac || myconf+=" --disable-faac-lavc"
 
 	#################
 	# Binary codecs #
@@ -465,9 +471,8 @@ src_configure() {
 	if use real; then
 		use x86 && myconf+=" --codecsdir=/opt/RealPlayer/codecs"
 		use amd64 && myconf+=" --codecsdir=/usr/$(get_libdir)/codecs"
-	elif ! use bindist; then
-		myconf+=" $(use_enable win32codecs win32dll)"
 	fi
+	myconf+=" $(use_enable win32codecs win32dll)"
 
 	################
 	# Video Output #
@@ -510,17 +515,13 @@ src_configure() {
 		use ${i} || myconf+=" --disable-${i}"
 	done
 	use pulseaudio || myconf+=" --disable-pulse"
-	if ! use radio; then
-		use oss || myconf+=" --disable-ossaudio"
-	fi
+	use oss || myconf+=" --disable-ossaudio"
 
 	####################
 	# Advanced Options #
 	####################
 	# Platform specific flags, hardcoded on amd64 (see below)
-	if use cpudetection; then
-		myconf+=" --enable-runtime-cpudetection"
-	fi
+	use cpudetection && myconf+=" --enable-runtime-cpudetection"
 
 	# Turning off CPU optimizations usually will break the build.
 	# However, this use flag, if enabled, will allow users to completely
@@ -553,53 +554,17 @@ src_configure() {
 	# X enabled configuration #
 	###########################
 	myconf+=" --disable-gui"
-	if use X; then
-		uses="dxr3 ggi xinerama"
-		for i in ${uses}; do
-			use ${i} || myconf+=" --disable-${i}"
-		done
-		use dga || myconf+=" --disable-dga1 --disable-dga2"
-		use opengl || myconf+=" --disable-gl"
-		use osdmenu && myconf+=" --enable-menu"
-		use vdpau || myconf+=" --disable-vdpau"
-		use video_cards_vesa || myconf+=" --disable-vesa"
-		use vidix || myconf+=" --disable-vidix --disable-vidix-pcidb"
-		use xscreensaver || myconf+=" --disable-xss"
-
-		if use xv; then
-			if use xvmc; then
-				myconf+=" --enable-xvmc --with-xvmclib=XvMCW"
-			else
-				myconf+=" --disable-xvmc"
-			fi
-		else
-			myconf+="
-				--disable-xv
-				--disable-xvmc
-			"
-			use xvmc && elog "Disabling xvmc because it requires \"xv\" useflag enabled."
-		fi
-	else
-		myconf+="
-			--disable-dga1
-			--disable-dga2
-			--disable-dxr3
-			--disable-ggi
-			--disable-gl
-			--disable-vdpau
-			--disable-vidix
-			--disable-vidix-pcidb
-			--disable-xinerama
-			--disable-xss
-			--disable-xv
-			--disable-xvmc
-			--disable-x11
-		"
-		uses="dga dxr3 ggi opengl osdmenu vdpau vidix xinerama xscreensaver xv"
-		for i in ${uses}; do
-			use ${i} && elog "Useflag \"${i}\" require \"X\" useflag enabled to work."
-		done
-	fi
+	uses="dxr3 ggi vdpau vidix xinerama xv xvmc"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	use dga || myconf+=" --disable-dga1 --disable-dga2"
+	use opengl || myconf+=" --disable-gl"
+	use osdmenu && myconf+=" --enable-menu"
+	use video_cards_vesa || myconf+=" --disable-vesa"
+	use vidix || myconf+=" --disable-vidix-pcidb"
+	use xscreensaver || myconf+=" --disable-xss"
+	use xvmc && myconf+=" --with-xvmclib=XvMCW"
 
 	############################
 	# OSX (aqua) configuration #
@@ -626,7 +591,7 @@ src_configure() {
 		--libdir=${EPREFIX}/usr/$(get_libdir)
 		${myconf}"
 
-	CFLAGS="${CFLAGS}" ./configure ${myconf} || die "configure died"
+	CFLAGS="${CFLAGS}" ./configure ${myconf} || die
 }
 
 src_compile() {
@@ -641,10 +606,10 @@ src_compile() {
 			hasq ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=" ${i}"
 		done
 		if [[ -z $BUILT_DOCS ]]; then
-			emake -j1 -C DOCS/xml html-chunked || die "Failed to generate html docs"
+			emake -j1 -C DOCS/xml html-chunked
 		else
 			for i in ${BUILT_DOCS}; do
-				emake -j1 -C DOCS/xml html-chunked-${i} || die "Failed to generate html docs for ${i}"
+				emake -j1 -C DOCS/xml html-chunked-${i}
 			done
 		fi
 	fi
@@ -660,26 +625,26 @@ src_install() {
 		DATADIR="${ED}/usr/share/mplayer" \
 		MANDIR="${ED}/usr/share/man" \
 		INSTALLSTRIP="" \
-		install || die "emake install failed"
+		install
 
-	dodoc AUTHORS Changelog Copyright README etc/codecs.conf || die
+	dodoc AUTHORS Changelog Copyright README etc/codecs.conf
 
 	docinto tech/
-	dodoc DOCS/tech/{*.txt,MAINTAINERS,mpsub.sub,playtree,TODO,wishlist} || die
+	dodoc DOCS/tech/{*.txt,MAINTAINERS,mpsub.sub,playtree,TODO,wishlist}
 	docinto TOOLS/
-	dodoc TOOLS/* || die
+	dodoc TOOLS/*
 	if use real; then
 		docinto tech/realcodecs/
-		dodoc DOCS/tech/realcodecs/* || die
+		dodoc DOCS/tech/realcodecs/*
 		docinto TOOLS/realcodecs/
-		dodoc TOOLS/realcodecs/* || die
+		dodoc TOOLS/realcodecs/*
 	fi
 	docinto tech/mirrors/
-	dodoc DOCS/tech/mirrors/* || die
+	dodoc DOCS/tech/mirrors/*
 
 	if use doc; then
 		docinto html/
-		dohtml -r "${S}"/DOCS/HTML/* || die
+		dohtml -r "${S}"/DOCS/HTML/*
 	fi
 
 	if ! use ass && ! use truetype; then
@@ -695,10 +660,15 @@ src_install() {
 	fi
 
 	insinto /etc/mplayer
-	newins "${S}/etc/example.conf" mplayer.conf || die
-	doins "${S}/etc/input.conf" || die
+	newins "${S}/etc/example.conf" mplayer.conf
+	cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
+# Config options can be section specific, global
+# options should go in the default section
+[default]
+_EOF_
+	doins "${S}/etc/input.conf"
 	if use osdmenu; then
-		doins "${S}/etc/menu.conf" || die
+		doins "${S}/etc/menu.conf"
 	fi
 
 	if use ass || use truetype; then
@@ -717,7 +687,7 @@ _EOF_
 	fi
 
 	dosym ../../../etc/mplayer/mplayer.conf /usr/share/mplayer/mplayer.conf
-	newbin "${S}/TOOLS/midentify.sh" midentify || die
+	newbin "${S}/TOOLS/midentify.sh" midentify
 }
 
 pkg_preinst() {