cleaned up gcc 3.4.x fixes to re-close bug 55202

4 files changed, 42 insertions, 39 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 24b92069aa06..f024fb064c83 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/xine-lib
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.131 2004/06/29 22:47:00 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.132 2004/07/06 19:30:47 lv Exp $
+
+  06 Jul 2004; Travis Tilley <lv@gentoo.org> xine-lib-1_rc4-r1.ebuild,
+  xine-lib-1_rc5-r2.ebuild:
+  cleaned up gcc 3.4.x fixes to re-close bug 55202
 
   30 Jun 2004; Michael Hanselmann <hansmi@gentoo.org>
   xine-lib-1_rc5-r2.ebuild:
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index e971372fc5d9..c9fa98f7ffd9 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,41 +1,31 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 24744855c2705284a492b1923be3bd1e ChangeLog 22550
-MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
 MD5 3d849500b17b5ad075102cf70d75b7c4 xine-lib-0.9.13-r3.ebuild 3354
 MD5 c639cbd78aac77ed3cff247df68d2608 xine-lib-1_rc2.ebuild 3934
-MD5 21f16ff9e27523f78078b77e1bd41c54 xine-lib-1_rc3-r1.ebuild 4042
-MD5 1bb6b8212dd040e9486991b4ee4ad2e2 xine-lib-1_rc4-r1.ebuild 4863
 MD5 342f5acc8a2e99672e90f384dc6abf8e xine-lib-1_rc4.ebuild 4462
-MD5 b2877222dd2c90f3e239af9f6d32ea09 xine-lib-1_rc5-r2.ebuild 5026
-MD5 f1570a69c99207f65b5cdf1d154bbcd4 files/digest-xine-lib-0.9.13-r3 68
-MD5 f90bfe4a0ee80eecb38fc34022ccab7e files/digest-xine-lib-1_rc2 67
+MD5 2fd27c5f65681f65010d1d34540deda9 xine-lib-1_rc4-r1.ebuild 4975
+MD5 21f16ff9e27523f78078b77e1bd41c54 xine-lib-1_rc3-r1.ebuild 4042
+MD5 df0a3afffd5bd9158dc005a5b0f352b7 xine-lib-1_rc5-r2.ebuild 5097
+MD5 3b8093cad4cc0c4f362dc8c46c791d49 ChangeLog 22697
+MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+MD5 bcd5f2b8999f92c2f7215009f5ae1490 files/configure-64bit-define.patch 221
+MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc5-configure-sparc.patch 587
+MD5 5d3bbb085af2a8dcaa429c1376a52c50 files/xine-lib-1-rc4-sparc_missing_include.patch 464
 MD5 5e99bec89f5cc4f0d00bcd61430d67cb files/protect-CFLAGS.patch-1_rc2 597
 MD5 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc3 597
-MD5 beea8b4dacbd153e4c6b06e57ee711d2 files/xine-lib-0.9.12-r2-directfb.patch 746
-MD5 279ee4d06acc78adef09fe7ae4a64980 files/xine-lib-0.9.13-kxine.patch 9041
-MD5 0cf698a9ff87a3595140d92df7b900b6 files/xine-lib-configure.patch 342
+MD5 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc4 597
+MD5 5ddf5d90566965b047828407dcc0f5d1 files/xine-lib-1rc4-libtool1.5.6.shrext_cmds.patch 331
 MD5 aa54582a91933533008c1211dcbcfb35 files/xine-lib-disable-directfb.patch 4169
+MD5 e35c6e1b7a7cd3f4e268b1fb876cbeb5 files/protect-CFLAGS.patch-1_rc5-r1 316
+MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-2.6.patch 594
 MD5 dcb0c79c0bb106397aad42f6d936627d files/xineconfig.patch-0.9.13 601
+MD5 279ee4d06acc78adef09fe7ae4a64980 files/xine-lib-0.9.13-kxine.patch 9041
 MD5 e9819170d90442f5072d18dda93a8f5c files/digest-xine-lib-1_rc3-r1 68
-MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-2.6.patch 594
-MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc3-configure-sparc.patch 587
-MD5 3cbdef8aa211184b96474addb4f7c5d6 files/xine-lib-gcc34.patch 423
-MD5 ae644beadf7c9218bdbd3ed27865918a files/digest-xine-lib-1_rc4 67
-MD5 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc4 597
-MD5 5d3bbb085af2a8dcaa429c1376a52c50 files/xine-lib-1-rc4-sparc_missing_include.patch 464
-MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc4-configure-sparc.patch 587
-MD5 5ddf5d90566965b047828407dcc0f5d1 files/xine-lib-1rc4-libtool1.5.6.shrext_cmds.patch 331
 MD5 4927f9e562e68f539a5f3a6e4711d873 files/digest-xine-lib-1_rc4-r1 68
-MD5 bcd5f2b8999f92c2f7215009f5ae1490 files/configure-64bit-define.patch 221
-MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc5-configure-sparc.patch 587
 MD5 044cbe825fc480693aec675808e4c679 files/digest-xine-lib-1_rc5-r2 67
-MD5 e35c6e1b7a7cd3f4e268b1fb876cbeb5 files/protect-CFLAGS.patch-1_rc5-r1 316
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.8 (GNU/Linux)
-
-iD8DBQFA4hVuHTu7gpaalycRAkXnAKDNZEgksYumKUZcOAVL/xx5jZB8JQCg4sxG
-alCCtKfyeQeRpmcBngkFLP0=
-=TVK/
------END PGP SIGNATURE-----
+MD5 0cf698a9ff87a3595140d92df7b900b6 files/xine-lib-configure.patch 342
+MD5 beea8b4dacbd153e4c6b06e57ee711d2 files/xine-lib-0.9.12-r2-directfb.patch 746
+MD5 f1570a69c99207f65b5cdf1d154bbcd4 files/digest-xine-lib-0.9.13-r3 68
+MD5 f90bfe4a0ee80eecb38fc34022ccab7e files/digest-xine-lib-1_rc2 67
+MD5 ae644beadf7c9218bdbd3ed27865918a files/digest-xine-lib-1_rc4 67
+MD5 3cbdef8aa211184b96474addb4f7c5d6 files/xine-lib-gcc34.patch 423
+MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc3-configure-sparc.patch 587
+MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc4-configure-sparc.patch 587
diff --git a/media-libs/xine-lib/xine-lib-1_rc4-r1.ebuild b/media-libs/xine-lib/xine-lib-1_rc4-r1.ebuild
index 183e43d06459..5386a0eb10b8 100644
--- a/media-libs/xine-lib/xine-lib-1_rc4-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1_rc4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc4-r1.ebuild,v 1.18 2004/06/29 19:33:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc4-r1.ebuild,v 1.19 2004/07/06 19:30:47 lv Exp $
 
 inherit eutils flag-o-matic gcc libtool
 
@@ -84,9 +84,14 @@ src_compile() {
 	filter-flags -momit-leaf-frame-pointer #46339
 	filter-flags -funroll-all-loops #55420
 	filter-flags -fno-unit-at-a-time #55202
-	[ "`gcc-fullversion`" == "3.4.0" ] && append-flags -fno-web #49509
 
-	is-flag -O? || append-flags -O1 #31243
+	if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]; then
+		append-flags -fno-web #49509
+		filter-flags -fno-unit-at-a-time #55202
+		append-flags -funit-at-a-time #55202
+	fi
+
+	replace-flags -O0 -O1 #31243
 
 	# fix build errors with sse2 #49482
 	if use x86 ; then
diff --git a/media-libs/xine-lib/xine-lib-1_rc5-r2.ebuild b/media-libs/xine-lib/xine-lib-1_rc5-r2.ebuild
index c65e1cc2031b..b3e27d4cad7c 100644
--- a/media-libs/xine-lib/xine-lib-1_rc5-r2.ebuild
+++ b/media-libs/xine-lib/xine-lib-1_rc5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc5-r2.ebuild,v 1.8 2004/06/30 01:20:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc5-r2.ebuild,v 1.9 2004/07/06 19:30:47 lv Exp $
 
 inherit eutils flag-o-matic gcc libtool
 
@@ -83,10 +83,14 @@ src_compile() {
 	filter-flags -fforce-addr
 	filter-flags -momit-leaf-frame-pointer #46339
 	filter-flags -funroll-all-loops #55420
-	filter-flags -fno-unit-at-a-time #55202
-	[ "`gcc-fullversion`" == "3.4.0" ] && append-flags -fno-web #49509
 
-	is-flag -O? || append-flags -O1 #31243
+	if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]; then
+		append-flags -fno-web #49509
+		filter-flags -fno-unit-at-a-time #55202
+		append-flags -funit-at-a-time #55202
+	fi
+
+	replace-flags -O0 -O1 #31243
 
 	# fix build errors with sse2 #49482
 	if use x86 ; then