Fix for gcc-4.1, bug #145273

Package-Manager: portage-2.1-r2

5 files changed, 105 insertions, 30 deletions

diff --git a/games-simulation/flightgear/ChangeLog b/games-simulation/flightgear/ChangeLog
index 50aa0d915187..082fd3dc2f7c 100644
--- a/games-simulation/flightgear/ChangeLog
+++ b/games-simulation/flightgear/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-simulation/flightgear
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/flightgear/ChangeLog,v 1.23 2006/04/08 01:45:49 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/flightgear/ChangeLog,v 1.24 2006/08/29 13:47:06 tupone Exp $
+
+  29 Aug 2006; <tupone@gentoo.org> +files/flightgear-0.9.9-gcc41.patch,
+  flightgear-0.9.9.ebuild:
+  Fixing build with gcc-4.1, bug #145273 by Paulo Jorge de Oliveira Cantante de
+  Matos
 
 *flightgear-0.9.10 (08 Apr 2006)
 
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
index 9b371a289f36..442c91f5b8f8 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1,46 +1,67 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 0167ac77be6f4938e489a00bd405d61a ChangeLog 4886
-RMD160 407101d44eac4ce98be98c4db4fb7af2e5c549fc ChangeLog 4886
-SHA256 7a3214d125dffc9744fe6ba2fb78bbf26e4c314377625ee4d630112d5c17f3f0 ChangeLog 4886
-MD5 d5d311dc07c723d9ff44578e7c5a2bf4 files/digest-flightgear-0.9.10 518
-RMD160 220167dbfd4bbcbcd7324ef8be4a90a09caac50f files/digest-flightgear-0.9.10 518
-SHA256 dcbff79a4ab297cc409177f1560d0ce632f8d9fb411fae4d6472e591ef1f7e5e files/digest-flightgear-0.9.10 518
-MD5 791042f02ab42bb5ce5b38d24c9be717 files/digest-flightgear-0.9.4 139
-RMD160 f2768da970526d85bb57bcb474e3aa53aa5b6b18 files/digest-flightgear-0.9.4 139
-SHA256 74a0a6e6aebdd9cc6daada08ad174c748a5116241df46ad7fe7d98a491c2a06b files/digest-flightgear-0.9.4 139
-MD5 e77a8fdf3764bab350ecb01d917fb43a files/digest-flightgear-0.9.5 139
-RMD160 3ec8c43303b8df36e08d676cf8e8db21918c01bf files/digest-flightgear-0.9.5 139
-SHA256 1b99023bb058e728fdf803fb02e8cb081cd267e28c103e7ecfdc12b2655c63d6 files/digest-flightgear-0.9.5 139
-MD5 71196a8e0d1fe4b810caf1f80abc485c files/digest-flightgear-0.9.8 139
-RMD160 f44451e2a3ad7d3359ed8b319112b89f6b191173 files/digest-flightgear-0.9.8 139
-SHA256 b0dcfef60e526cabac5a0d386012ea30f582e451f2d178b98e9297350e2b996c files/digest-flightgear-0.9.8 139
-MD5 bf3c4c4e935f9fe6955b78b12d5c3218 files/digest-flightgear-0.9.9 139
-RMD160 614c9f484b71fcd3fe866ee1370736bca1012033 files/digest-flightgear-0.9.9 139
-SHA256 687119576352b35ac46f9ff66f1974a6847b4205bdafcda2452b0749523a2da9 files/digest-flightgear-0.9.9 139
+AUX flightgear-0.9.9-gcc41.patch 1343 RMD160 78ac19e5fd26770fa3732b30ffd0b731c5634e6e SHA1 ea7c4251b2edac2c193ebe2a493bf26f33b1ec29 SHA256 b7ae20e68660031d53e454b36c53c671a5e6fc6d980fe957309ebb319bb7066e
+MD5 77fd0409bee3c2b1ea042782fefd39da files/flightgear-0.9.9-gcc41.patch 1343
+RMD160 78ac19e5fd26770fa3732b30ffd0b731c5634e6e files/flightgear-0.9.9-gcc41.patch 1343
+SHA256 b7ae20e68660031d53e454b36c53c671a5e6fc6d980fe957309ebb319bb7066e files/flightgear-0.9.9-gcc41.patch 1343
+DIST FlightGear-0.9.10.tar.gz 2072135 RMD160 ebf268c350912b03f215088e108a29d0128bb347 SHA1 29911b9c17cece50a9e7d501f2259c89c0fa44ba SHA256 6307ad26e4141d27dcd66962f9c8e117206197a468b4f8bc99a6a31deb2e4992
+DIST FlightGear-0.9.4.tar.gz 1392573
+DIST FlightGear-0.9.5.tar.gz 1531258
+DIST FlightGear-0.9.8.tar.gz 1644191
+DIST FlightGear-0.9.9.tar.gz 1771791 RMD160 ccf95c96531c9a2ed3eae0ccd90816c0a1f72737 SHA1 230b73263e598eef48b11f0defa28452d7e45ca4 SHA256 46597145e087d116e479bf9048c06a0c84107ebda62420d783104831e4775c6a
+DIST fgfs-base-0.9.10.tar.bz2 146866758 RMD160 33fd5fe53d5b8091ec85526f3047b89bb43f8621 SHA1 4fc61a0791613e95f23c733cf32f7ac107478dfc SHA256 7770a7bd9f2bfa6475e414f4a83438c6e1e29abf12bd1b30045e3cc1732698eb
+DIST fgfs-base-0.9.4.tar.bz2 69067194
+DIST fgfs-base-0.9.5.tar.bz2 77686837
+DIST fgfs-base-0.9.8.tar.bz2 74122557
+DIST fgfs-base-0.9.9.tar.bz2 85943212 RMD160 607f901c19251596705f61a7110431cf5c8d6193 SHA1 cf61183c174afc5fc1936c1c9880a11f1784c329 SHA256 5524223a0b7ef51c3cd565b441c5e858bb8f902f077c5512d44787a6e04fe5ad
+EBUILD flightgear-0.9.10.ebuild 1155 RMD160 fc9cd00d01f417ee6a257fb5ba8c0abe90bbd8ef SHA1 392c93ce69c82765e944b2b4374a88e6b0a77aa4 SHA256 56bb1c2f2be9004457ff617b285292ec3e8acff6550d8cd4655d824bd4aa9a02
 MD5 468f9caf9c67333ea9326d283d7cc28d flightgear-0.9.10.ebuild 1155
 RMD160 fc9cd00d01f417ee6a257fb5ba8c0abe90bbd8ef flightgear-0.9.10.ebuild 1155
 SHA256 56bb1c2f2be9004457ff617b285292ec3e8acff6550d8cd4655d824bd4aa9a02 flightgear-0.9.10.ebuild 1155
+EBUILD flightgear-0.9.4.ebuild 1295 RMD160 c6d50f8b100dcb1bc32b6b5aa5da1b7e562331a0 SHA1 26ba2518d9f90c77aec538e84f9f466b55b0f46a SHA256 09ba719711a66f1e8c6dddc475610e9cdba26c1a43d40b787156fbe6f4c56a2f
 MD5 c7c9b825f26cfceeaad1dfac7f864b74 flightgear-0.9.4.ebuild 1295
 RMD160 c6d50f8b100dcb1bc32b6b5aa5da1b7e562331a0 flightgear-0.9.4.ebuild 1295
 SHA256 09ba719711a66f1e8c6dddc475610e9cdba26c1a43d40b787156fbe6f4c56a2f flightgear-0.9.4.ebuild 1295
+EBUILD flightgear-0.9.5.ebuild 1358 RMD160 8ad164c18c63be925fd04547c6e3d7f30bd6c211 SHA1 e65045a25c9415d9d932e89c4b14640baf097a53 SHA256 ab940e12ce9bfa226d319baab79c6f413c33fc9d0f62f0178f727211e09548b2
 MD5 4c0bd1367e6e63e1a19393d0d30909cd flightgear-0.9.5.ebuild 1358
 RMD160 8ad164c18c63be925fd04547c6e3d7f30bd6c211 flightgear-0.9.5.ebuild 1358
 SHA256 ab940e12ce9bfa226d319baab79c6f413c33fc9d0f62f0178f727211e09548b2 flightgear-0.9.5.ebuild 1358
+EBUILD flightgear-0.9.8.ebuild 1153 RMD160 eca04ccee2f9cc4de6b5f8ac06ecb835f17d1b7d SHA1 bd9df6b2e44e08734a3c36c028d5d7cb1a9c9a6f SHA256 b74f6e169e7e8fdcf2d2824458f4f2ce32a7a46b60a73ee522ce6c304ecbe334
 MD5 a5ca3114a3e7745f4e2446368741da43 flightgear-0.9.8.ebuild 1153
 RMD160 eca04ccee2f9cc4de6b5f8ac06ecb835f17d1b7d flightgear-0.9.8.ebuild 1153
 SHA256 b74f6e169e7e8fdcf2d2824458f4f2ce32a7a46b60a73ee522ce6c304ecbe334 flightgear-0.9.8.ebuild 1153
-MD5 0a52e3890aaef1816957fcf1adb05746 flightgear-0.9.9.ebuild 1152
-RMD160 e521bdb356926c2afcf18324337802699db627b0 flightgear-0.9.9.ebuild 1152
-SHA256 3651829218e69aa6b2fa6a3c070ef9ca7c8b09a7ad8701f7d78651f8e55f0d3f flightgear-0.9.9.ebuild 1152
+EBUILD flightgear-0.9.9.ebuild 1199 RMD160 645c64dee3ede8636884a78c334bbc19f710c1a2 SHA1 d574b698325694936e4493a2fa8d44999418ef32 SHA256 5760861ace4d884f972d8ba8c5231a5d00b8449b40d713b9bf987e6b639b8947
+MD5 e3dc20245d5d9b7b31fd03dd76b31c63 flightgear-0.9.9.ebuild 1199
+RMD160 645c64dee3ede8636884a78c334bbc19f710c1a2 flightgear-0.9.9.ebuild 1199
+SHA256 5760861ace4d884f972d8ba8c5231a5d00b8449b40d713b9bf987e6b639b8947 flightgear-0.9.9.ebuild 1199
+MISC ChangeLog 5074 RMD160 7bd51c3cbc819d47578a439112d5d877d46a2042 SHA1 6c2eaf51795688711a91d5b9cde3a23b70f243b2 SHA256 c52f44c7cce7cc508322080eebbb51b725ebe698d52285ad9304b4185b660121
+MD5 463648a222b80a8b86340fcb608aff5c ChangeLog 5074
+RMD160 7bd51c3cbc819d47578a439112d5d877d46a2042 ChangeLog 5074
+SHA256 c52f44c7cce7cc508322080eebbb51b725ebe698d52285ad9304b4185b660121 ChangeLog 5074
+MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
+MD5 d5d311dc07c723d9ff44578e7c5a2bf4 files/digest-flightgear-0.9.10 518
+RMD160 220167dbfd4bbcbcd7324ef8be4a90a09caac50f files/digest-flightgear-0.9.10 518
+SHA256 dcbff79a4ab297cc409177f1560d0ce632f8d9fb411fae4d6472e591ef1f7e5e files/digest-flightgear-0.9.10 518
+MD5 791042f02ab42bb5ce5b38d24c9be717 files/digest-flightgear-0.9.4 139
+RMD160 f2768da970526d85bb57bcb474e3aa53aa5b6b18 files/digest-flightgear-0.9.4 139
+SHA256 74a0a6e6aebdd9cc6daada08ad174c748a5116241df46ad7fe7d98a491c2a06b files/digest-flightgear-0.9.4 139
+MD5 e77a8fdf3764bab350ecb01d917fb43a files/digest-flightgear-0.9.5 139
+RMD160 3ec8c43303b8df36e08d676cf8e8db21918c01bf files/digest-flightgear-0.9.5 139
+SHA256 1b99023bb058e728fdf803fb02e8cb081cd267e28c103e7ecfdc12b2655c63d6 files/digest-flightgear-0.9.5 139
+MD5 71196a8e0d1fe4b810caf1f80abc485c files/digest-flightgear-0.9.8 139
+RMD160 f44451e2a3ad7d3359ed8b319112b89f6b191173 files/digest-flightgear-0.9.8 139
+SHA256 b0dcfef60e526cabac5a0d386012ea30f582e451f2d178b98e9297350e2b996c files/digest-flightgear-0.9.8 139
+MD5 61c2b34c6164a561ef7cadd2c497f20a files/digest-flightgear-0.9.9 509
+RMD160 20f948d2e182b2ff4b34cf26e7160af2fd996a98 files/digest-flightgear-0.9.9 509
+SHA256 a9bd6e050708e80baa6a2d4323b1ca843c3a15be812248c85f023660b1d59faa files/digest-flightgear-0.9.9 509
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFENxXf2CTtIKiFlQIRAhBBAKCyE4i/RMdsj2UtXpBvNMO+ay77DACffRa+
-E0wreYXaHudF4uWQc0lXkuw=
-=rCwS
+iD8DBQFE9EV/2CTtIKiFlQIRAmL6AJ9ah+nOdgXnAVm4er7EjPmc60ZKYACeM6A8
+p/ukliYpzy8nj3TqN5Kqivk=
+=wvoF
 -----END PGP SIGNATURE-----
diff --git a/games-simulation/flightgear/files/digest-flightgear-0.9.9 b/games-simulation/flightgear/files/digest-flightgear-0.9.9
index e143d8d23351..385d8c01b54a 100644
--- a/games-simulation/flightgear/files/digest-flightgear-0.9.9
+++ b/games-simulation/flightgear/files/digest-flightgear-0.9.9
@@ -1,2 +1,6 @@
 MD5 c1bff0cc9eda34f2a31ec9cd4e5216e6 FlightGear-0.9.9.tar.gz 1771791
+RMD160 ccf95c96531c9a2ed3eae0ccd90816c0a1f72737 FlightGear-0.9.9.tar.gz 1771791
+SHA256 46597145e087d116e479bf9048c06a0c84107ebda62420d783104831e4775c6a FlightGear-0.9.9.tar.gz 1771791
 MD5 c262f7022479c249c486a195d6755579 fgfs-base-0.9.9.tar.bz2 85943212
+RMD160 607f901c19251596705f61a7110431cf5c8d6193 fgfs-base-0.9.9.tar.bz2 85943212
+SHA256 5524223a0b7ef51c3cd565b441c5e858bb8f902f077c5512d44787a6e04fe5ad fgfs-base-0.9.9.tar.bz2 85943212
diff --git a/games-simulation/flightgear/files/flightgear-0.9.9-gcc41.patch b/games-simulation/flightgear/files/flightgear-0.9.9-gcc41.patch
new file mode 100644
index 000000000000..51bb4ebf5094
--- /dev/null
+++ b/games-simulation/flightgear/files/flightgear-0.9.9-gcc41.patch
@@ -0,0 +1,44 @@
+--- src/Environment/fgclouds.hxx.old	2006-08-29 13:30:28.000000000 +0200
++++ src/Environment/fgclouds.hxx	2006-08-29 13:30:43.000000000 +0200
+@@ -53,7 +53,7 @@
+ 
+ 	void update_metar_properties( FGMetar *m );
+ 
+-	void FGClouds::update_env_config ();
++	void update_env_config ();
+ 
+ 	int update_event;
+ 	SGSoundSample *snd_lightning;
+--- src/Environment/environment_ctrl.cxx.old	2006-08-29 13:32:25.000000000 +0200
++++ src/Environment/environment_ctrl.cxx	2006-08-29 13:32:01.000000000 +0200
+@@ -702,6 +702,8 @@
+ 
+ 
+ #if defined(ENABLE_THREADS) && ENABLE_THREADS
++void
++metar_cleanup_handler( void* arg );
+ /**
+  *
+  */
+--- src/Traffic/SchedFlight.hxx.old	2006-08-29 14:10:18.000000000 +0200
++++ src/Traffic/SchedFlight.hxx	2006-08-29 14:10:50.000000000 +0200
+@@ -67,7 +67,7 @@
+   FGScheduledFlight();
+   FGScheduledFlight(const FGScheduledFlight &other);
+   //  FGScheduledFlight(const string);
+-  FGScheduledFlight::FGScheduledFlight(const string& cs,
++  FGScheduledFlight(const string& cs,
+ 		     const string& fr,
+ 		     const string& depPrt,
+ 		     const string& arrPrt,
+--- src/Scenery/FGTileLoader.cxx.old	2006-08-29 14:16:12.000000000 +0200
++++ src/Scenery/FGTileLoader.cxx	2006-08-29 14:16:44.000000000 +0200
+@@ -156,6 +156,8 @@
+ 
+ 
+ #if defined(ENABLE_THREADS) && ENABLE_THREADS
++void 
++cleanup_handler( void* arg );
+ /**
+  * 
+  */
diff --git a/games-simulation/flightgear/flightgear-0.9.9.ebuild b/games-simulation/flightgear/flightgear-0.9.9.ebuild
index 448605c8bf65..c529473cc684 100644
--- a/games-simulation/flightgear/flightgear-0.9.9.ebuild
+++ b/games-simulation/flightgear/flightgear-0.9.9.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/flightgear/flightgear-0.9.9.ebuild,v 1.1 2005/12/07 16:30:03 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/flightgear/flightgear-0.9.9.ebuild,v 1.2 2006/08/29 13:47:06 tupone Exp $
 
-inherit flag-o-matic games
+inherit eutils flag-o-matic games
 
 MY_PN=FlightGear
 MY_P=${MY_PN}-${PV}
@@ -25,8 +25,9 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	mv ../data ./data
+	epatch "${FILESDIR}/${P}"-gcc41.patch
 }
 
 src_compile() {