Add back logic to strip -fomit-frame-pointer only when using gcc-2; fixes bug #99813

Package-Manager: portage-2.0.53_rc6

5 files changed, 28 insertions, 17 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 0fabf3db0311..f1a8a2e4f3cc 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/vlc
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.109 2005/10/14 19:31:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.110 2005/10/30 20:32:57 halcy0n Exp $
+
+  30 Oct 2005; Mark Loeser <halcy0n@gentoo.org> vlc-0.8.2-r1.ebuild,
+  vlc-0.8.2-r2.ebuild, vlc-0.8.4_beta1.ebuild:
+  Add back logic to strip -fomit-frame-pointer only when using gcc-2; fixes bug
+  #99813
 
   14 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> vlc-0.8.4_beta1.ebuild:
   Remove comments that are no more needed here as they are on the project page
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index e4eb266f57b7..aa270745f8fc 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,20 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 2aecfc1faef68f3b13ead0bd98ee8254 ChangeLog 21632
+MD5 76addc72c3c43ac772b3c51911d1b472 ChangeLog 21836
 MD5 74246bab222d2b95ef62223ce754e6f6 files/digest-vlc-0.8.1-r1 127
 MD5 260130c48f890b87819fbb2df43836e3 files/digest-vlc-0.8.2-r1 127
 MD5 260130c48f890b87819fbb2df43836e3 files/digest-vlc-0.8.2-r2 127
 MD5 b0d542494faed30ebb0281e6dc7fcfe2 files/digest-vlc-0.8.4_beta1 133
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
 MD5 da5a3e0de24a478fc3dd11344bde4e9e vlc-0.8.1-r1.ebuild 6897
-MD5 2fc9a47b40bdbcd811327f51b9df655a vlc-0.8.2-r1.ebuild 7888
-MD5 3f8ed2f3382202a234c5ae6889008962 vlc-0.8.2-r2.ebuild 7732
-MD5 92ccd46254941c2cb8f4b2d83aa5f18b vlc-0.8.4_beta1.ebuild 8100
+MD5 f16d1ce84737d517fb1e1ee35cadffea vlc-0.8.2-r1.ebuild 7949
+MD5 e7c4b0e374a1b7648ef9b12acf726fe2 vlc-0.8.2-r2.ebuild 7793
+MD5 312d69e901e792fa03397b4a3ec33ae1 vlc-0.8.4_beta1.ebuild 8161
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDUAe8j5H05b2HAEkRAnAHAJwMotTWfbRnA2mHdt3W3rRobDe+4wCfeSJa
-cUx/3++sAJ3HfoFuRGz+CpE=
-=eVm/
+iD8DBQFDZS4GCRZPokWLroQRArDVAJ9PUYJO5gdyxBut6COYAO/j2NYIqACgsaP3
+ZrRqR66oW/ZLCLPD57hOmFA=
+=O8cF
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-0.8.2-r1.ebuild b/media-video/vlc/vlc-0.8.2-r1.ebuild
index 52c900079971..77851a4aad09 100644
--- a/media-video/vlc/vlc-0.8.2-r1.ebuild
+++ b/media-video/vlc/vlc-0.8.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.2-r1.ebuild,v 1.4 2005/09/10 15:39:25 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.2-r1.ebuild,v 1.5 2005/10/30 20:32:57 halcy0n Exp $
 
 # Missing USE-flags due to missing deps:
 # media-vidoe/vlc:tremor - Enables Tremor decoder support
@@ -10,7 +10,7 @@
 # Missing USE-flags due to needed testing
 # media-video/vlc:dirac - Enables experimental dirac codec
 
-inherit libtool eutils wxwidgets flag-o-matic nsplugins multilib autotools
+inherit libtool eutils wxwidgets flag-o-matic nsplugins multilib autotools toolchain-funcs
 
 PATCHLEVEL="7"
 DESCRIPTION="VLC media player - Video player and streamer"
@@ -217,7 +217,9 @@ src_compile () {
 		--disable-slp \
 		${myconf} || die "configuration failed"
 
-	sed -i -e s:"-fomit-frame-pointer":: vlc-config || die "-fomit-frame-pointer patching failed"
+	if [[ $(gcc-major-version) == 2 ]]; then
+		sed -i -e s:"-fomit-frame-pointer":: vlc-config || die "-fomit-frame-pointer patching failed"
+	fi
 
 	emake -j1 || die "make of VLC failed"
 }
diff --git a/media-video/vlc/vlc-0.8.2-r2.ebuild b/media-video/vlc/vlc-0.8.2-r2.ebuild
index 99d748007d5d..208a9f8402d9 100644
--- a/media-video/vlc/vlc-0.8.2-r2.ebuild
+++ b/media-video/vlc/vlc-0.8.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.2-r2.ebuild,v 1.2 2005/10/12 12:10:33 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.2-r2.ebuild,v 1.3 2005/10/30 20:32:57 halcy0n Exp $
 
 # Missing USE-flags due to missing deps:
 # media-vidoe/vlc:tremor - Enables Tremor decoder support
@@ -10,7 +10,7 @@
 # Missing USE-flags due to needed testing
 # media-video/vlc:dirac - Enables experimental dirac codec
 
-inherit libtool eutils wxwidgets flag-o-matic nsplugins multilib autotools
+inherit libtool eutils wxwidgets flag-o-matic nsplugins multilib autotools toolchain-funcs
 
 PATCHLEVEL="7"
 DESCRIPTION="VLC media player - Video player and streamer"
@@ -212,7 +212,9 @@ src_compile () {
 		--disable-hal \
 		${myconf} || die "configuration failed"
 
-	sed -i -e s:"-fomit-frame-pointer":: vlc-config || die "-fomit-frame-pointer patching failed"
+	if [[ $(gcc-major-version) == 2 ]]; then
+		sed -i -e s:"-fomit-frame-pointer":: vlc-config || die "-fomit-frame-pointer patching failed"
+	fi
 
 	emake -j1 || die "make of VLC failed"
 }
diff --git a/media-video/vlc/vlc-0.8.4_beta1.ebuild b/media-video/vlc/vlc-0.8.4_beta1.ebuild
index a23181aa313a..e6ccf660ce0b 100644
--- a/media-video/vlc/vlc-0.8.4_beta1.ebuild
+++ b/media-video/vlc/vlc-0.8.4_beta1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.4_beta1.ebuild,v 1.2 2005/10/14 19:31:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.4_beta1.ebuild,v 1.3 2005/10/30 20:32:57 halcy0n Exp $
 
 # Missing USE-flags due to missing deps:
 # media-vidoe/vlc:tremor - Enables Tremor decoder support
@@ -12,7 +12,7 @@
 # media-video/vlc:avahi - Enables Bonjour service discovery via Avahi
 # media-video/vlc:h264 - Enables H264 encoding support with libx264
 
-inherit libtool eutils wxwidgets flag-o-matic nsplugins multilib autotools
+inherit libtool eutils wxwidgets flag-o-matic nsplugins multilib autotools toolchain-funcs
 
 MY_P="${P/_beta/-test}"
 
@@ -223,7 +223,9 @@ src_compile () {
 		--disable-hal \
 		${myconf} || die "configuration failed"
 
-	sed -i -e s:"-fomit-frame-pointer":: vlc-config || die "-fomit-frame-pointer patching failed"
+	if [[ $(gcc-major-version) == 2 ]]; then
+		sed -i -e s:"-fomit-frame-pointer":: vlc-config || die "-fomit-frame-pointer patching failed"
+	fi
 
 	emake -j1 || die "make of VLC failed"
 }