Only use replace-flags on gcc-4.4+; fix svn revision; less strict on sdl use flag

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

3 files changed, 19 insertions, 15 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index bfec057dafda..b8b4853e911d 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.679 2009/09/24 14:25:02 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.680 2009/09/25 16:46:09 beandog Exp $
+
+*mplayer-1.0_rc4_p20090919-r2 (25 Sep 2009)
+
+  25 Sep 2009; Steve Dibb <beandog@gentoo.org>
+  +mplayer-1.0_rc4_p20090919-r2.ebuild:
+  Only use replace-flags on gcc-4.4+; fix svn revision; less strict on sdl
+  use flag
 
   24 Sep 2009; Raúl Porcel <armin76@gentoo.org>
   mplayer-1.0_rc2_p20090731-r1.ebuild, mplayer-1.0_rc4_p20090919-r1.ebuild:
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 1d9e5ec9f4ab..eb6f252d289e 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -12,7 +12,7 @@ DIST svgalib_helper-1.9.17-mplayer.tar.gz 7583 RMD160 927ff34f187e4fa9528e2e4820
 EBUILD mplayer-1.0_rc2_p20090322.ebuild 19438 RMD160 1d62d123f9f290239c013618af8518eaac4116b3 SHA1 651460991a16b05802b184c8d64af2a4775dd051 SHA256 51eed17bc8c82f38a4169c5428fd38e6ca81dc495549c3bd9f5dfefd394b9f80
 EBUILD mplayer-1.0_rc2_p20090731-r1.ebuild 18929 RMD160 e09c9707855e6a7b034e6ca42296569e624272c8 SHA1 9eba91571125c7d4a4fff28d6190b73786748550 SHA256 0f7cd619a9a3829b4d53398c719a200c809cc546bede97575d1f6fcc5f923076
 EBUILD mplayer-1.0_rc2_p20090731.ebuild 18809 RMD160 b8f5753922f99883774185c92e4acfd07af6b8a0 SHA1 454e7e433b3241bc91168687401f1722370429db SHA256 cafcb42cdf20360b6f9ee338263f8692f5158c28c69551f309173fcdff1303dc
-EBUILD mplayer-1.0_rc4_p20090919-r1.ebuild 19108 RMD160 7dc1eac39582c8e276f28ab4eded47627ef22e43 SHA1 0f3d6105905d0039dfa5b4971bc5f4e93064f391 SHA256 048997c5c60ab410129c6c8b42254263bb26f7c3187350db889abdbc4d0f1108
+EBUILD mplayer-1.0_rc4_p20090919-r2.ebuild 19048 RMD160 8d4baec3fbdf468e17832d8a2c8aa7f1e208c6ed SHA1 9d8de408bb0765474e1473fec8c2d0700824c416 SHA256 ced5c7113a8ebc15c57bb18ae7ff47c9e6e901582775a59e1c3a84a05fede191
 EBUILD mplayer-9999.ebuild 20148 RMD160 8240f26bb00fc3f7ed9c04d85e01b21d31de886f SHA1 5c59663a78044798ee791b687a1ee9fe2263ab9b SHA256 3ac96f9b00c2377178afe0bd1f46961a37767e273176b89623d6ad410f7a4f40
-MISC ChangeLog 120528 RMD160 3abbbc22b61e72fc3036d1af22bbce31567759c9 SHA1 e1a282304cf23c84332ddaec73b2429bc9ca195b SHA256 9eae1cef1733e7d6f89a5c5434771bdc2547e9cab3fc13533a1ebf070190eb29
+MISC ChangeLog 120747 RMD160 458d90f8c6b6dbb81d961f6f27539b43662bc53d SHA1 208563483b46aed6d7270c58f82551cb91b3ecba SHA256 1cfdf654a9d32c1f65d6393f2c9fabe1daad9526861ccebf5240e7b34d57a898
 MISC metadata.xml 3795 RMD160 7ccde76f30e7bdf191aa2ad2f929856574039774 SHA1 329b521610f9167e2b859daa1d81c2d5c528e0ee SHA256 a6a39dc9cee02fd8b25c40a4ea0337ff85aae26a787d68780151478b975ff0e1
diff --git a/media-video/mplayer/mplayer-1.0_rc4_p20090919-r1.ebuild b/media-video/mplayer/mplayer-1.0_rc4_p20090919-r2.ebuild
index 2eab719638f6..f89413126c36 100644
--- a/media-video/mplayer/mplayer-1.0_rc4_p20090919-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.0_rc4_p20090919-r2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc4_p20090919-r1.ebuild,v 1.3 2009/09/24 14:25:02 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc4_p20090919-r2.ebuild,v 1.1 2009/09/25 16:46:09 beandog Exp $
 
 EAPI=2
-inherit eutils flag-o-matic multilib
+inherit eutils flag-o-matic multilib toolchain-funcs
 
-MPLAYER_REVISION=SVN-r29463
+MPLAYER_REVISION=SVN-r29699
 
 IUSE="3dnow 3dnowext +a52 +aac aalib +alsa altivec +ass
 bidi bindist bl +cddb +cdio cdparanoia cpudetection
@@ -48,9 +48,7 @@ RDEPEND="sys-libs/ncurses
 			)
 	)
 	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib
-		sdl? ( media-libs/libsdl[alsa] )
-	)
+	alsa? ( media-libs/alsa-lib )
 	opencore-amr? ( media-libs/opencore-amr )
 	openal? ( media-libs/openal )
 	bidi? ( dev-libs/fribidi )
@@ -82,7 +80,6 @@ RDEPEND="sys-libs/ncurses
 	mng? ( media-libs/libmng )
 	nas? ( media-libs/nas )
 	nut? ( >=media-libs/libnut-661 )
-	oss? ( sdl? ( media-libs/libsdl[oss] ) )
 	png? ( media-libs/libpng )
 	pnm? ( media-libs/netpbm )
 	pulseaudio? ( media-sound/pulseaudio )
@@ -91,6 +88,7 @@ RDEPEND="sys-libs/ncurses
 		app-arch/rar ) )
 	samba? ( net-fs/samba )
 	schroedinger? ( media-libs/schroedinger )
+	sdl? ( media-libs/libsdl )
 	speex? ( media-libs/speex )
 	svga? ( media-libs/svgalib )
 	theora? ( media-libs/libtheora )
@@ -109,9 +107,7 @@ RDEPEND="sys-libs/ncurses
 			x11-libs/libXext
 			x11-libs/libXi
 			x11-libs/gtk+:2 )
-		opengl? ( virtual/opengl
-			sdl? ( media-libs/libsdl[opengl] ) )
-		sdl? ( media-libs/libsdl[X] )
+		opengl? ( virtual/opengl )
 		truetype? ( media-libs/freetype:2
 			media-libs/fontconfig )
 		video_cards_nvidia? (
@@ -126,7 +122,6 @@ RDEPEND="sys-libs/ncurses
 		xv? ( x11-libs/libXv
 			x11-libs/libXxf86vm
 			x11-libs/libXext
-			sdl? ( media-libs/libsdl[xv] )
 			xvmc? ( x11-libs/libXvMC ) )
 	)"
 
@@ -490,7 +485,9 @@ src_configure() {
 	# This version of MPlayer will segfault on Matroska playback
 	# w/gcc-4.4.1.  Remove in the future, prefer to keep upstream's
 	# optimizations.
-	replace-flags -O* -O2
+	if [ $(gcc-major-version) = 4 ] && [ $(gcc-minor-version) -gt 3 ]; then
+		replace-flags -O* -O2
+	fi
 	filter-flags -fPIC -fPIE
 	append-flags -D__STDC_LIMIT_MACROS
 	if use x86 || use x86-fbsd; then