gcc-4.1 fix, bug #127404

(Portage version: 2.1_pre7-r4)

5 files changed, 53 insertions, 7 deletions

diff --git a/dev-games/simgear/ChangeLog b/dev-games/simgear/ChangeLog
index 31df5144745d..ac4a9c38481c 100644
--- a/dev-games/simgear/ChangeLog
+++ b/dev-games/simgear/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-games/simgear
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/simgear/ChangeLog,v 1.19 2005/12/07 16:28:28 seemant Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/simgear/ChangeLog,v 1.20 2006/04/04 18:46:46 tupone Exp $
+
+  04 Apr 2006; <Tupone@gentoo.org> +files/simgear-0.3.9-gcc41.patch,
+  simgear-0.3.9.ebuild:
+  gcc-4.1 fix, bug #127404 by Avuton Olrich
 
 *simgear-0.3.9 (07 Dec 2005)
 
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index 8d8dfd95d8e0..e834772b11f3 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -1,8 +1,27 @@
-MD5 ea1664f2c0f900cbaf8d8f03ff40ef26 ChangeLog 3525
+MD5 8a1425f70eec92b5f87e60135f765f1c ChangeLog 3663
+RMD160 4588e0dfdf8a501147c939b9534a05d3c8d0dbbe ChangeLog 3663
+SHA256 df68b5534e6ad55d439fdda538dc1492d85bf227ab5870324a98c3beabeb4091 ChangeLog 3663
 MD5 467a17adbf9275141feb5d5be30f0bb4 files/digest-simgear-0.3.6 65
+RMD160 bb52cd87590a63985734a0076b26d7638e567c69 files/digest-simgear-0.3.6 65
+SHA256 a95228727a3c4be14209108ec87c0fff44bb7c13a1881b8359df6c1db89afb1a files/digest-simgear-0.3.6 65
 MD5 a705ff430986a8734a54873e12a6e5cf files/digest-simgear-0.3.8 65
-MD5 854e9a945f6a5e52aa25524918086e38 files/digest-simgear-0.3.9 65
+RMD160 0d97cc601adb36ecc2570dbbf66ec25154bb845a files/digest-simgear-0.3.8 65
+SHA256 d0650986cd5c69a25a424cb411f253629d6f0985cce72ac778f5ef1300da23ef files/digest-simgear-0.3.8 65
+MD5 75204492a52a2be8eceb4ca253314c86 files/digest-simgear-0.3.9 241
+RMD160 c06d585f3cd55bd45cf53091f7fd2812a461c744 files/digest-simgear-0.3.9 241
+SHA256 73196fac0457137e655bb467a37f091ffc2b36eb2910ed507191a38c96854426 files/digest-simgear-0.3.9 241
+MD5 2e8f7f95fa0a2247ad533d991a019933 files/simgear-0.3.9-gcc41.patch 503
+RMD160 b79a59c64adc38b806c379e110ceb65ecc092d12 files/simgear-0.3.9-gcc41.patch 503
+SHA256 7538cdb107e65f5540ad862dd39aba001713e87c84134ed487540244326ccb6e files/simgear-0.3.9-gcc41.patch 503
 MD5 d1a4776c70e916317e93f7b34e541be5 metadata.xml 538
+RMD160 ad9da47ba8d1df3750dfedc20cb0d385d9118084 metadata.xml 538
+SHA256 0e2b83bd660e0709ada2f3e9b5d9db161e505ad9baf7c56dd6ee3299f5ce1963 metadata.xml 538
 MD5 7eac0e53c5d86f1bcdc17450a9f5b042 simgear-0.3.6.ebuild 706
+RMD160 6ad38d09685bd4984f120ae3f7655f4dd6fffa49 simgear-0.3.6.ebuild 706
+SHA256 1fb28ec45f53de8e48ecf47e6b8126579f77f44703c643bd6549c05844a92cae simgear-0.3.6.ebuild 706
 MD5 d9d34a68d4f2f9eb313f956d669015d2 simgear-0.3.8.ebuild 708
-MD5 314154eac974f01e1a0bf0a242d56cbf simgear-0.3.9.ebuild 709
+RMD160 800a436d0988d17a2030034241a0cc29b545e76a simgear-0.3.8.ebuild 708
+SHA256 a0880108a73a15cfd7e359848f2a8a01987ca2f68a28580515b370f19b3fd456 simgear-0.3.8.ebuild 708
+MD5 2d6a21efe9064b7fae33d1fde9e7a1fc simgear-0.3.9.ebuild 806
+RMD160 bf0b89d6f3052c9e7689a58564fd469c433c9c1d simgear-0.3.9.ebuild 806
+SHA256 48ae780ff048ab8eb97eca71bd9efa6179c778e2e5ead6546963c278cfd0c803 simgear-0.3.9.ebuild 806
diff --git a/dev-games/simgear/files/digest-simgear-0.3.9 b/dev-games/simgear/files/digest-simgear-0.3.9
index 97dd85aeb070..1d0dd97df760 100644
--- a/dev-games/simgear/files/digest-simgear-0.3.9
+++ b/dev-games/simgear/files/digest-simgear-0.3.9
@@ -1 +1,3 @@
 MD5 c9586d2ddc6a8200ccaae437eaa2be14 SimGear-0.3.9.tar.gz 907159
+RMD160 a1e37f53171600f402dbc5679fc3385a85c6e351 SimGear-0.3.9.tar.gz 907159
+SHA256 f29b2b418f81994c9aae9c6e71c49116e906e9b9a86ba820f44bf103c1a0d3a6 SimGear-0.3.9.tar.gz 907159
diff --git a/dev-games/simgear/files/simgear-0.3.9-gcc41.patch b/dev-games/simgear/files/simgear-0.3.9-gcc41.patch
new file mode 100644
index 000000000000..ae6145eae675
--- /dev/null
+++ b/dev-games/simgear/files/simgear-0.3.9-gcc41.patch
@@ -0,0 +1,13 @@
+diff -ur SimGear-0.3.9-orig/simgear/scene/model/placement.hxx SimGear-0.3.9/simgear/scene/model/placement.hxx
+--- SimGear-0.3.9-orig/simgear/scene/model/placement.hxx	2006-03-31 20:29:37.000000000 -0500
++++ SimGear-0.3.9/simgear/scene/model/placement.hxx	2006-03-31 20:30:03.000000000 -0500
+@@ -46,7 +46,7 @@
+   SGModelPlacement ();
+   virtual ~SGModelPlacement ();
+ 
+-  virtual void SGModelPlacement::init( ssgBranch * model );
++  virtual void init( ssgBranch * model );
+ 
+   virtual void update();
+ 
+
diff --git a/dev-games/simgear/simgear-0.3.9.ebuild b/dev-games/simgear/simgear-0.3.9.ebuild
index ac7bcbfa6019..4f313453cb86 100644
--- a/dev-games/simgear/simgear-0.3.9.ebuild
+++ b/dev-games/simgear/simgear-0.3.9.ebuild
@@ -1,6 +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/dev-games/simgear/simgear-0.3.9.ebuild,v 1.1 2005/12/07 16:28:28 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/simgear/simgear-0.3.9.ebuild,v 1.2 2006/04/04 18:46:46 tupone Exp $
+
+inherit eutils
 
 MY_P="SimGear-${PV/_/-}"
 DESCRIPTION="Development library for simulation games"
@@ -17,6 +19,12 @@ DEPEND=">=media-libs/plib-1.8.4
 
 S=${WORKDIR}/${MY_P}
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}"-gcc41.patch
+}
+
 src_compile() {
 	econf || die
 	emake -j1 || die "emake failed"