fix and simplify tremor and vorbis useflags by using external tremor, bug #437594

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

3 files changed, 18 insertions, 23 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 972aad6ee077..0f7d3cf930b5 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.875 2013/02/08 12:55:53 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.876 2013/02/08 13:21:38 aballier Exp $
+
+  08 Feb 2013; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  fix and simplify tremor and vorbis useflags by using external tremor, bug
+  #437594
 
   08 Feb 2013; Alexis Ballier <aballier@gentoo.org>
   -mplayer-1.0_rc4_p20110322-r1.ebuild,
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index a4107614710b..f37b0b20e193 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -15,14 +15,14 @@ DIST font-arial-cp1250.tar.bz2 249705 SHA256 423a07e780bb130cd8e4730715545c5d919
 DIST font-arial-iso-8859-1.tar.bz2 234242 SHA256 9730f481764f367c9089d0166fb6ccf9148808ffbbfeca635cf0e6db75765d29 SHA512 a1d03b6f09c48f48b7733f3bc0402ceab239a9abf88b860d852ea9fe69b4da690208a79d6f29d30204f5b37becf10672e8e8c0bfef201846d80ec54df617d029 WHIRLPOOL 8050362b125d3ca98214526cee2fa685e31487d13a6483c765bfc844bdc5e07beeba2c1ba313458096d43a63edd6c5e80b8b388c2792fc0ec7421e4072d8ca25
 DIST font-arial-iso-8859-2.tar.bz2 222208 SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d WHIRLPOOL 08178087b4ea1dfb2250f4673785e31dd876b06af51c51b2bddc172b23e6e33cbc1b2c6b710a317e42dc05486974b26ed0ad3ca50a185567aa77d49bd1e72aee
 EBUILD mplayer-1.1-r1.ebuild 18690 SHA256 ee01d0277aea2e58c65a86d4096d14afefbe68358580e2f6532ee8073e5981fd SHA512 a18eb7120596edd3fd61fbba02cf291bd1a925049ab03177c1ad73c7fa4fbcaf46564679f8ac9e1217d6cb9f6ebab14b3ffd12cc431cdac9a02e8f1d924de02e WHIRLPOOL 5328af7c25b1b591e549f99ed6bdc1250cb8ec8c44436bed4c4208854117fa83a8874144d6552fcecf0cf97b13a3cc7385d0c6aa6c39f3e9383e10be3c8c08c5
-EBUILD mplayer-9999.ebuild 17671 SHA256 5c53e6df8311dc6f9720dff36bc1398c98081f30d20f353233461b9b1cbe038b SHA512 dfd6379a1b3c5cab08db0df0f85620879611631af9c324179b6810a0448626f061163928a0e3455c3974f4dbd12989576b05cfdd01f74834eb3af619cc10285d WHIRLPOOL 5462428f499009a637b9a84263b83b1b08c868a4b704a83884676448dbcd88833383ca9e924cc90667d0b444818b4f45adde23d69ac113ec5cd662949cd99fb4
-MISC ChangeLog 45798 SHA256 bc1090987af04811f1e3bbde8d475877e3d662922f324b84ed90dcc9734b1e88 SHA512 69bbff688efa862541b2997de1441dd659fb53e861e438126fd6a62ac9c6312a8ebb34af302aa45f8a77d2f9e2c96dd0351e6691388aa3bf5ced7a16310d202a WHIRLPOOL 8fe4dd3ce2ccee3ba52a8b6b57214b5ae9103743aa8e9de7faa9736293bdfa6c384f8262c4e1ac74b0888aef847757504411d40fcf48783374b447b42be9a21f
+EBUILD mplayer-9999.ebuild 17452 SHA256 ced8dd426df8fc02349f3b8ef527708e924e374989cfb8b790e11339861d112d SHA512 900b76a57bc21267f21b87ef167ae13bad1cdb173c232ff41861a229b75612efc0b5c6f73acaad175df67345fa4483bc9928621cc1b087e44890c6cd8415cbbf WHIRLPOOL 5ac4797f92911771889cc23bd6511f953009f937173fe601e14e70a2d47e84230f20fe4e0832cc1173911c74237f6ac0be48a0afa5812b517ead90be82deefc3
+MISC ChangeLog 45958 SHA256 31e81ff1902632b563c1c5d08193ce2abfa7ac4789f36f1a3b7b92ef28dc0814 SHA512 5bf8c17c8b51d44e67b692c3d0a6499b370a6e42161987e74b1777de35b7addb4cf4000a7c16f075a65f6781e227c9c6dcfcbea5d06ca79b25be8a831cfebb38 WHIRLPOOL c677132af8553d29cb54f8293959fa1fd14deaef3753db5b7c9fd425108c786bfe66e01e2508e3a736883ab6fd247a00450c2729ce22edfc84bc4316ac8d8d30
 MISC ChangeLog-2008 107064 SHA256 d9949e0e21fd6fd00f1417201455ee399240ef1010dcf56611ac0fc1f6f9505b SHA512 622543b379b4c44f5845566b4e697bd92dd3e864e2f01a1b0f303c8ae5c7fb5de24839f6503765d51b4a3bfa777d175a7e410383e62ef2bbacf3e87cdc28c705 WHIRLPOOL e731af47505ffa646c92386dfb14acaffc2bb14ab4da74520c0b4dbc15ca5c20aacadbb53c4b91ba8d126a75bf7d2fb61877eeda354064e20c48cf4137bf6a74
 MISC metadata.xml 2727 SHA256 7cf9f1ec64dbbc1ef9671bc7069af78986b509d3dd5238ed033fe9cbc64375e9 SHA512 1581694c3900197e23c2d00a3eb68a467f119811065d80409566b4f4667a287820e4327823f9691777dad76c9f85aa875b2d7ecbf84a5a4850419f496409eb29 WHIRLPOOL 7804b2a423f0b5254bef62aa8694fdbe216436b7f69289b406d1a31ce22f1d44320ad930a504137f6c29e4a956871a7fb26ec3a950395318d289aa98fb3a6925
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEU9dsACgkQvFcC4BYPU0qwIwCgx9jHsfkf4KQCMUimUgDkKqtZ
-VPAAoKj09nT5SwYQa/WvivjqFyu7rP6I
-=pLQC
+iEYEAREIAAYFAlEU++QACgkQvFcC4BYPU0oXrACfWFkZPBq+Bzc9X9hQsx2lie26
+YJYAnimnaMW4vQdTcmUPRz5BBFvI2epc
+=XJro
 -----END PGP SIGNATURE-----
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index ba3da7623d46..f691c916460e 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.134 2012/10/25 12:48:11 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.135 2013/02/08 13:21:38 aballier Exp $
 
 EAPI=4
 
@@ -17,7 +17,7 @@ ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
 +libass libcaca libmpeg2 lirc +live lzo mad md5sum +mmx mmxext mng +mp3 nas
 +network nut openal +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime
 radio +rar +real +rtc rtmp samba +shm sdl +speex sse sse2 ssse3
-tga +theora +tremor +truetype +toolame +twolame +unicode v4l vdpau vidix
+tga +theora tremor +truetype +toolame +twolame +unicode v4l vdpau vidix
 +vorbis win32codecs +X +x264 xanim xinerama +xscreensaver +xv +xvid xvmc
 zoran"
 
@@ -127,9 +127,10 @@ RDEPEND+="
 	sdl? ( media-libs/libsdl )
 	speex? ( media-libs/speex )
 	theora? ( media-libs/libtheora[encode?] )
+	tremor? ( media-libs/tremor )
 	truetype? ( ${FONT_RDEPS} )
 	vdpau? ( x11-libs/libvdpau )
-	vorbis? ( media-libs/libvorbis )
+	vorbis? ( !tremor? ( media-libs/libvorbis ) )
 	X? ( ${X_RDEPS}	)
 	xanim? ( media-video/xanim )
 	xinerama? ( x11-libs/libXinerama )
@@ -172,7 +173,6 @@ fi
 # 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? ( !faac !win32codecs )
@@ -375,26 +375,17 @@ src_configure() {
 			--disable-mpg123
 		"
 	fi
-	uses="a52 bs2b dv gsm lzo rtmp"
+	uses="a52 bs2b dv gsm lzo rtmp vorbis"
 	for i in ${uses}; do
 		use ${i} || myconf+=" --disable-lib${i}"
 	done
 
-	uses="faad gif jpeg libmpeg2 live mad mng png pnm speex tga theora xanim"
+	uses="faad gif jpeg libmpeg2 live mad mng png pnm speex tga theora tremor 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
+
 	# Encoding
 	uses="faac x264 xvid toolame twolame"
 	if use encode; then