GCC4 compile fix

(Portage version: 2.0.51.21-r1)

3 files changed, 28 insertions, 24 deletions

diff --git a/gnome-base/gnome-vfs/ChangeLog b/gnome-base/gnome-vfs/ChangeLog
index 85571ffa812f..b9e67b212406 100644
--- a/gnome-base/gnome-vfs/ChangeLog
+++ b/gnome-base/gnome-vfs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for gnome-base/gnome-vfs
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.146 2005/05/08 20:01:44 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.147 2005/05/14 06:36:23 halcy0n Exp $
+
+  14 May 2005; Mark Loeser <halcy0n@gentoo.org> gnome-vfs-1.0.5-r4.ebuild:
+  GCC4 needs the same patch needed by GCC 3.4.
 
   08 May 2005; Aron Griffis <agriffis@gentoo.org> gnome-vfs-2.8.4-r1.ebuild:
   stable on ia64
diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest
index cf6ea68910a4..fb257e43fa6f 100644
--- a/gnome-base/gnome-vfs/Manifest
+++ b/gnome-base/gnome-vfs/Manifest
@@ -1,32 +1,32 @@
-MD5 e77c78abdddca4a02fd259b927623ad0 gnome-vfs-2.10.0-r1.ebuild 1973
-MD5 74eb8497c6e42ce41662bd9f1de40b97 gnome-vfs-2.10.1.ebuild 1971
-MD5 d29d9cf8d7faf835e2e59cf2d64eabcc gnome-vfs-2.8.3-r1.ebuild 2204
-MD5 3f31e708c7ae2f7d071eae7e08197c0c gnome-vfs-2.8.4.ebuild 2229
-MD5 6f7f36e3f1b690e37e99ac985342f52b gnome-vfs-1.0.5-r4.ebuild 2017
-MD5 a6c0e4fd5056d056279862d6730500da gnome-vfs-2.8.1-r2.ebuild 2224
+MD5 72eb022386b2c9890376d757d7febf7b ChangeLog 17383
+MD5 e5c392a89829e864886bf08bd05a4919 gnome-vfs-1.0.5-r3.ebuild 1943
 MD5 4def153476697efaf9a0ef379b5d2f01 gnome-vfs-2.10.0.ebuild 1898
 MD5 ce61b31cbeaa511b66b4e4eab483e282 gnome-vfs-2.6.1.1.ebuild 1751
-MD5 e5c392a89829e864886bf08bd05a4919 gnome-vfs-1.0.5-r3.ebuild 1943
-MD5 72eb022386b2c9890376d757d7febf7b ChangeLog 17383
+MD5 a6c0e4fd5056d056279862d6730500da gnome-vfs-2.8.1-r2.ebuild 2224
+MD5 d29d9cf8d7faf835e2e59cf2d64eabcc gnome-vfs-2.8.3-r1.ebuild 2204
+MD5 3f31e708c7ae2f7d071eae7e08197c0c gnome-vfs-2.8.4.ebuild 2229
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 e77c78abdddca4a02fd259b927623ad0 gnome-vfs-2.10.0-r1.ebuild 1973
 MD5 52f612abe908014c2230ae6c0baf12f9 gnome-vfs-2.8.4-r1.ebuild 2302
+MD5 57f12318dbfe9690e7069440a898610b gnome-vfs-1.0.5-r4.ebuild 2058
+MD5 74eb8497c6e42ce41662bd9f1de40b97 gnome-vfs-2.10.1.ebuild 1971
+MD5 a88e201c8f2ec5444db0bea2e8c302b4 files/digest-gnome-vfs-1.0.5-r3 68
+MD5 2bebfc7d172b325dc37efef679cbf545 files/digest-gnome-vfs-2.10.0 70
+MD5 6126fab0b179eb680b819593f4bf1412 files/digest-gnome-vfs-2.6.1.1 71
 MD5 b1346620d53413ed5a6e5309c14c228c files/digest-gnome-vfs-2.8.1-r2 69
 MD5 87c1b9929fce8975fc0f9aedb3cab3f0 files/digest-gnome-vfs-2.8.3-r1 154
-MD5 b49e57b668d5b8951bd6b7fe5808e175 files/digest-gnome-vfs-2.8.4-r1 154
+MD5 b49e57b668d5b8951bd6b7fe5808e175 files/digest-gnome-vfs-2.8.4 154
+MD5 2cd7247981f899f8e3674866efec39d1 files/gnome-vfs-2.8.1-eggdesktop.patch 2104
+MD5 76bd9665c0d55d08fcf71c2085ce3b9b files/gnome-vfs-2.8.1-howl_config.patch 950
+MD5 879f26aea1c97096745b3bcce181f5f7 files/gnome-vfs-2.8.1-reiser4_support.patch 1432
 MD5 09f0fab6d414a859d0f979bef3e10dfb files/gnome-vfs-2.8.3-reiser4_support.patch 710
+MD5 2bebfc7d172b325dc37efef679cbf545 files/digest-gnome-vfs-2.10.0-r1 70
+MD5 b49e57b668d5b8951bd6b7fe5808e175 files/digest-gnome-vfs-2.8.4-r1 154
 MD5 ba8ad5c040af8bd498c9ec71ac1df40e files/gnome-vfs-2-CAN-2005-0706.patch 490
-MD5 2bebfc7d172b325dc37efef679cbf545 files/digest-gnome-vfs-2.10.0 70
-MD5 d20a2ead9fd45768a182fe24423b0842 files/digest-gnome-vfs-2.10.1 70
-MD5 6126fab0b179eb680b819593f4bf1412 files/digest-gnome-vfs-2.6.1.1 71
-MD5 a88e201c8f2ec5444db0bea2e8c302b4 files/digest-gnome-vfs-1.0.5-r3 68
 MD5 a88e201c8f2ec5444db0bea2e8c302b4 files/digest-gnome-vfs-1.0.5-r4 68
-MD5 76bd9665c0d55d08fcf71c2085ce3b9b files/gnome-vfs-2.8.1-howl_config.patch 950
-MD5 2cd7247981f899f8e3674866efec39d1 files/gnome-vfs-2.8.1-eggdesktop.patch 2104
-MD5 b49e57b668d5b8951bd6b7fe5808e175 files/digest-gnome-vfs-2.8.4 154
-MD5 2bebfc7d172b325dc37efef679cbf545 files/digest-gnome-vfs-2.10.0-r1 70
-MD5 879f26aea1c97096745b3bcce181f5f7 files/gnome-vfs-2.8.1-reiser4_support.patch 1432
-MD5 7320d4ac9d4f99766075061daa53ea63 files/1.0/gnome-vfs-1.0.5-gtkdoc_fixes.patch 4892
-MD5 25d42b1a4cf935fbedd3465bc4a8dd7c files/1.0/gnome-vfs-1.0.5-proxy.patch 2863
-MD5 2ae3110a6e6fb30cfa593e4210535dc2 files/1.0/gnome-vfs-1.0.5-gcc3.4.patch 837
+MD5 d20a2ead9fd45768a182fe24423b0842 files/digest-gnome-vfs-2.10.1 70
 MD5 4072a11c3c98c493cbc0bb851176fb44 files/1.0/gnome-vfs-1.0.5-codeset.patch 1762
 MD5 071edd844b13f596a2f7d986b4512521 files/1.0/gnome-vfs-1.0.5-fix-segfault.patch 430
+MD5 2ae3110a6e6fb30cfa593e4210535dc2 files/1.0/gnome-vfs-1.0.5-gcc3.4.patch 837
+MD5 7320d4ac9d4f99766075061daa53ea63 files/1.0/gnome-vfs-1.0.5-gtkdoc_fixes.patch 4892
+MD5 25d42b1a4cf935fbedd3465bc4a8dd7c files/1.0/gnome-vfs-1.0.5-proxy.patch 2863
diff --git a/gnome-base/gnome-vfs/gnome-vfs-1.0.5-r4.ebuild b/gnome-base/gnome-vfs/gnome-vfs-1.0.5-r4.ebuild
index 31e8a988e269..fc7adb1b7f7e 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-1.0.5-r4.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-1.0.5-r4.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/gnome-base/gnome-vfs/gnome-vfs-1.0.5-r4.ebuild,v 1.7 2005/04/12 17:00:18 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-1.0.5-r4.ebuild,v 1.8 2005/05/14 06:36:23 halcy0n Exp $
 
 inherit eutils libtool gcc
 
@@ -44,7 +44,8 @@ src_unpack() {
 	epatch ${FILESDIR}/1.0/${P}-fix-segfault.patch
 
 	#apply both patches to compile with gcc-3.4 closing bug #53075
-	if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]
+	if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ] \
+		|| [ "`gcc-major-version`" -ge "4" ]
 	then
 		epatch ${FILESDIR}/1.0/${P}-gcc3.4.patch
 	fi