Ebuild improvements from Nikoli

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

3 files changed, 29 insertions, 28 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 8528ef7abbdb..4f5132d54591 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,9 @@
 # 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.743 2010/06/01 00:27:28 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.744 2010/06/02 16:25:28 lu_zero Exp $
+
+  02 Jun 2010; Luca Barbato <lu_zero@gentoo.org> mplayer-9999.ebuild:
+  Ebuild improvements from Nikoli <nikoli@lavabit.com> see bug #322377
 
   01 Jun 2010; Luca Barbato <lu_zero@gentoo.org> mplayer-9999.ebuild:
   Change doc deps as reported in bug #317559
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 352ce3a10466..6bc3fb313167 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -8,6 +8,6 @@ DIST mplayer-1.0_rc4_p20100506.tar.bz2 8966725 RMD160 3355600313ac6e6e661acfcdec
 DIST svgalib_helper-1.9.17-mplayer.tar.gz 7583 RMD160 927ff34f187e4fa9528e2e48208173d98b3d1d1b SHA1 bf789706d1d79c695f781644c7ea6d57c3eed4c3 SHA256 a6f803f3df4cd4544751d3a3ee936a8bf0e20e32a452639b3f7c7d9e73e65938
 EBUILD mplayer-1.0_rc4_p20091026-r1.ebuild 18927 RMD160 c7309c7c6ede6bac97c11cad1cc7b0e22aefbd51 SHA1 c86f4c9aaa6988514567767bc956e13990604bce SHA256 33f3781cb30c8fa255720858dca723597a4e58aef5fa2ab61c22dcc295b9b070
 EBUILD mplayer-1.0_rc4_p20100506.ebuild 20207 RMD160 1eb6056f90a443eaca390be0b38f7174ed9137b0 SHA1 e599d0d08f1789dfdcbd6b2b0f694ab14670404d SHA256 7d0a6d38e771f3dd58b93269f6b305712362339afd49ae25a0efbac61e53146e
-EBUILD mplayer-9999.ebuild 20241 RMD160 041c32f3b8b311c41d17705debc4b6eb562e00aa SHA1 c1a58232cd40bca5c8372fb49fc544c3bfb0ebb4 SHA256 98cf2e82b32bbaabadc8a36ad237b77b818f7fff5e55f4af594a0a5d6e73638c
-MISC ChangeLog 131212 RMD160 0a7f3a9ce98ded1edb1d0aa48b8906dd6e64f062 SHA1 b315c09714707ac356aecbc1f10be643f2752700 SHA256 dc85fbad14767e3cc9eb69705ad28457149de542b22f3a100d0a1495054769db
+EBUILD mplayer-9999.ebuild 20098 RMD160 18540a83c9415281e6f2be4fe3ff62710c95e164 SHA1 5fd976d6e2f96f674058500436b21538276ca223 SHA256 5d98b6deae47228f169a0220f73003c6a34464f63f2dd3903405200184456744
+MISC ChangeLog 131354 RMD160 01085d22b366bfbd3013ccabe1628ed9eb57def5 SHA1 d24c661d4eca9b07a58331abe0837b5d16c5eb4c SHA256 a3092825ab109603e28998c2f7faefb124713ec7789e77f21a78316187e9d065
 MISC metadata.xml 3586 RMD160 b9cb0e6ff486e5d3cc87e4d23bf0facb1bfa9b5b SHA1 9e082b1c3ff16683a7f7a3b0fd57eaad70673f24 SHA256 5a31e1c7c36addd4653af26afeacdf5cf527c03c55b1636fe0d9aad19215766e
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index b03a96ad849f..dd8de224ec6c 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.61 2010/06/01 04:31:51 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.62 2010/06/02 16:25:28 lu_zero Exp $
 
 EAPI="2"
 
@@ -62,6 +62,8 @@ X_RDEPS="
 #	nemesi? ( net-libs/libnemesi )
 RDEPEND+="
 	sys-libs/ncurses
+	app-arch/bzip2
+	sys-libs/zlib
 	!bindist? (
 		x86? (
 			win32codecs? ( media-libs/win32codecs )
@@ -142,7 +144,7 @@ RDEPEND+="
 	sdl? ( media-libs/libsdl )
 	speex? ( media-libs/speex )
 	svga? ( media-libs/svgalib )
-	theora? ( media-libs/libtheora )
+	theora? ( media-libs/libtheora[encode?] )
 	truetype? ( ${FONT_RDEPS} )
 	vorbis? ( media-libs/libvorbis )
 	xanim? ( media-video/xanim )
@@ -228,7 +230,13 @@ pkg_setup() {
 }
 
 src_unpack() {
-	[[ ${PV} = *9999* ]] && subversion_src_unpack || unpack ${A}
+	if [[ ${PV} = *9999* ]]; then
+		subversion_src_unpack
+
+		cd "${WORKDIR}"
+	else
+		unpack ${A}
+	fi
 
 	if ! use truetype; then
 		unpack font-arial-iso-8859-1.tar.bz2 \
@@ -291,7 +299,6 @@ src_configure() {
 		use ${i} || myconf+=" --disable-${i}"
 	done
 	use bidi || myconf+=" --disable-fribidi"
-	use encode || myconf+=" --disable-mencoder"
 	use ipv6 || myconf+=" --disable-inet6"
 	use nut || myconf+=" --disable-libnut"
 	use rar || myconf+=" --disable-unrarexec"
@@ -394,15 +401,10 @@ src_configure() {
 	##########
 	# Codecs #
 	##########
-	# Use internal musepack codecs for SV7 and SV8 support
-	myconf+=" --disable-musepack"
-
-	use a52 || myconf+=" --disable-liba52"
+	myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support
 	myconf+=" --disable-faad-internal" # always use system media-libs/faad2
 	use dirac || myconf+=" --disable-libdirac-lavc"
 	use dts || myconf+=" --disable-libdca"
-	use dv || myconf+=" --disable-libdv"
-	use lzo || myconf+=" --disable-liblzo"
 	if ! use mp3; then
 		myconf+="
 			--disable-mp3lame
@@ -410,7 +412,10 @@ src_configure() {
 			--disable-mp3lib
 		"
 	fi
-	use bs2b || myconf+=" --disable-libbs2b"
+	uses="a52 bs2b dv lzo"
+	for i in ${uses}; do
+		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
@@ -435,25 +440,17 @@ src_configure() {
 		"
 	fi
 	# Encoding
+	uses="faac x264 xvid toolame twolame"
 	if use encode; then
-		uses="faac x264 xvid toolame twolame"
 		for i in ${uses}; do
 			use ${i} || myconf+=" --disable-${i}"
 		done
 		use faac || myconf+=" --disable-faac-lavc"
 	else
-		myconf+="
-			--disable-faac-lavc
-			--disable-faac
-			--disable-x264
-			--disable-xvid
-			--disable-x264-lavc
-			--disable-xvid-lavc
-			--disable-twolame
-			--disable-toolame
-		"
-		uses="faac x264 xvid toolame twolame"
+		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
@@ -606,6 +603,7 @@ src_configure() {
 		--disable-xss
 		--disable-xv
 		--disable-xvmc
+		--disable-x11
 		"
 		uses="dga dxr3 ggi opengl osdmenu vdpau vidix xinerama xscreensaver xv"
 		for i in ${uses}; do
@@ -640,14 +638,14 @@ src_compile() {
 		local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN"
 		local BUILT_DOCS=""
 		for i in ${LINGUAS} ; do
-			hasq $i ${ALLOWED_LINGUAS} && BUILT_DOCS+=" $i"
+			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"
 		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} || die "Failed to generate html docs for ${i}"
 			done
 		fi
 	fi