Updated with additional C++ include for bug #270916.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 26 insertions, 4 deletions

diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog
index 6214f991f6b2..59ee79781be4 100644
--- a/sci-geosciences/grass/ChangeLog
+++ b/sci-geosciences/grass/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-geosciences/grass
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.67 2009/03/23 03:51:42 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.68 2009/06/08 04:51:04 nerdboy Exp $
+
+  08 Jun 2009; Steve Arnold <nerdboy@gentoo.org>
+  +files/grass-6.3.0-gcc44.patch, grass-6.3.0.ebuild:
+  Updated with additional C++ include for bug #270916 (thanks to   	 
+  Jiří Moravec <qjim@volny.cz> for the patch).  I still don't have
+  gcc 4.4 yet, but the benign nature of the patch and building with
+  gcc 4.3.3 should suffice.
 
   23 Mar 2009; Steve Arnold <nerdboy@gentoo.org>
   +files/grass-6.3.0-o_creat.patch, grass-6.3.0.ebuild:
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 24df1624a93b..5ea41aeaa770 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -5,6 +5,7 @@ AUX grass-6.2.1-ffmpeg-fix.patch 816 RMD160 eaefa978b965e1b66d0efec6d3ba8a07d451
 AUX grass-6.2.1-gcc43.patch 488 RMD160 23dfe1e408063330281258ae04dee5b07427b5f9 SHA1 c09e881eb3dde567ed1414075f1cbb33426928b4 SHA256 59346dd5aa8d4411622843db8256f20f7cddd1cc506757dd0b7820fa8f7349a4
 AUX grass-6.2.1-html-nonviz.patch 1742 RMD160 39103490f48abcc53f1fb8f3d9df48910866fab6 SHA1 a98486fb4b21f5ef42084d37ec0e6addc655fdc2 SHA256 73b7661832230f5ea1dadf983d6ce723b2f87bd3bafc4e939f36f7620d764270
 AUX grass-6.2.1-html-nviz-fix.patch 592 RMD160 7935449babc7dd6a07cffad66513c404a266848f SHA1 653a049d80fba93968620f7dc4e0ec2bbfb8edba SHA256 df2bfefc4aa6ddb030eb4a809a3cc885ade69e526a0ec99cd31fe1b751e05c41
+AUX grass-6.3.0-gcc44.patch 387 RMD160 d104b2cbea3ee14d8f266da122d9e4aef63dc6b0 SHA1 1ce70dbb99f64419361816a75e6948d8960d4f4f SHA256 210e7f7f34ec04caf41bd312f5c90c7be206656766e98725f27185e0c8759f80
 AUX grass-6.3.0-html-nonviz.patch 763 RMD160 054b336fcc47d64e56a40d2dda955732047ceb08 SHA1 e8f10078f8cccc5a47d2f2c8bed1d9ace7ed2598 SHA256 e870d724170a9d629a5d0bb8897a2e2f5d1b25eed204a7450061f26d48192981
 AUX grass-6.3.0-o_creat.patch 1469 RMD160 dd2cec8103c07eabd906f3792544bf2225cb1287 SHA1 3bb27a3069abb47b3ac6a9480c508a036d1f3aba SHA256 b9bb9ea09414fbcb00b52520cd4e98147d3de199401efe9996eb6f911fd7ef05
 AUX grass_icon.png 4470 RMD160 b4a6deeb6ce859a57c6aba3c4095e2dd718f36e9 SHA1 6839c28ec1d01c486d45a245a159fced3c0d0810 SHA256 c6c873f24bb59b8ff98000b500ca3a047ca86af216b4b7b1593baef5f2fbe6a9
@@ -15,6 +16,6 @@ DIST grass-6.3.0.tar.gz 17688547 RMD160 66db4223fc0d5172371903f71d68f1dd024ad2d2
 EBUILD grass-5.4.0.ebuild 3097 RMD160 885b7eabdad5fa912b7120b8a571d5b59c9f3971 SHA1 72b35ffc88f218afb14055e94eb8573713d67bb9 SHA256 d93cbad8dea7f99c74979abfc5a86292dffa76e8e3477c5cbc8a7cdf7cf33d21
 EBUILD grass-6.0.1.ebuild 3185 RMD160 9861427db9a4a846941eacd6d8f35cb057460d1b SHA1 79ef31f94dcb9bf8d7a3a89563867b291509173b SHA256 8ce6c6abd8359c2d736d491998d2d93720c89834a7e5f935c954b26af31781be
 EBUILD grass-6.2.1.ebuild 5898 RMD160 55aa97b65c844a9e436f403ea2f8e49aa16620c7 SHA1 57a97027573fb96ebafca2d820b8693b56aedc62 SHA256 fb54121425315410f9cc174b67819ba3d7eb84cc3e9d68ee1d52a2b703879ca1
-EBUILD grass-6.3.0.ebuild 8431 RMD160 b7b72d0ecc16060e416466e872762a008c2d9933 SHA1 2915e665808fedc13951fdcf72250e1703018be4 SHA256 4c6c086e98f3d0ad12699c1d210f977b0eb0ce2dd2ba47e19a457a5e4bd01ac4
-MISC ChangeLog 14092 RMD160 0da19e4c75556f16e1c304fc9c125cc719746f3a SHA1 db9205d0c362738188f73824eddf115cfb0b1ba4 SHA256 bacd9cb636b45fcf056019b97424ab721b01dccb270d687101edd8943c7ec608
+EBUILD grass-6.3.0.ebuild 8527 RMD160 9e3a5e24eae48b4ac2fcbe5a5614a776f5464446 SHA1 4c6eb1af0554669fe487f83ccd650bdc6fd34aa1 SHA256 6633370479d5317dbae455a7b21bf296ea7d14735e36c848671762fd97b0fbce
+MISC ChangeLog 14431 RMD160 3ea300cdf79addacfbef9e33d7fad2dc5f50e128 SHA1 faef6a3ef47facc03905e7fbb5b3412987dfa506 SHA256 837d3d1df4a63af89e6b21518d2c8bb2e710a14c2a2e11ac23c1afce698d54d1
 MISC metadata.xml 783 RMD160 1b1fa970a119a29ee5502815e2dd8103be600526 SHA1 75c6aef32f661f74e29c550e84af8b637d70e98d SHA256 2cb454a8c266d344c7830cee33fffde971164a0d3456b6ff0c1f28a76f0034cd
diff --git a/sci-geosciences/grass/files/grass-6.3.0-gcc44.patch b/sci-geosciences/grass/files/grass-6.3.0-gcc44.patch
new file mode 100644
index 000000000000..d90f074283cd
--- /dev/null
+++ b/sci-geosciences/grass/files/grass-6.3.0-gcc44.patch
@@ -0,0 +1,11 @@
+diff -Nupr grass-6.3.0/imagery/i.atcorr/Output.h~ grass-6.3.0/imagery/i.atcorr/Output.h
+--- grass-6.3.0/imagery/i.atcorr/Output.h~  2009-04-29 20:49:42.000000000 +0000
++++ grass-6.3.0/imagery/i.atcorr/Output.h   2009-04-29 20:49:50.000000000 +0000
+@@ -1,6 +1,7 @@
+ #ifndef MY_OUTPUT_H
+ #define MY_OUTPUT_H
+ 
++#include <cstdio>
+ #include <iostream>
+ #include <sstream>
+ #include <string>
diff --git a/sci-geosciences/grass/grass-6.3.0.ebuild b/sci-geosciences/grass/grass-6.3.0.ebuild
index ce7a140538da..21d3f6e3ad7b 100644
--- a/sci-geosciences/grass/grass-6.3.0.ebuild
+++ b/sci-geosciences/grass/grass-6.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.3.0.ebuild,v 1.6 2009/03/23 03:51:42 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.3.0.ebuild,v 1.7 2009/06/08 04:51:04 nerdboy Exp $
 
 inherit eutils distutils fdo-mime versionator wxwidgets
 
@@ -110,6 +110,9 @@ src_unpack() {
 	epatch rpm/fedora/grass-readline.patch
 	# fix the fortify_source and buffer issues (see bug #261283)
 	epatch "${FILESDIR}"/${P}-o_creat.patch
+	# and update for gcc 4.4 C++ changes (see bug #270916)
+	epatch "${FILESDIR}"/${P}-gcc44.patch
+
 	sed -i -e "s:buff\[12:buff\[16:g" general/g.parser/main.c \
 	    || die "sed failed"