Add patch for gcc-4.3. Fixes bug #207631. Thanks to impulze@impulze.org for the patch.

Package-Manager: portage-2.1.4.4

4 files changed, 27 insertions, 8 deletions

diff --git a/dev-java/antlr/ChangeLog b/dev-java/antlr/ChangeLog
index c28885fb38f5..78c6fbd38631 100644
--- a/dev-java/antlr/ChangeLog
+++ b/dev-java/antlr/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/antlr
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/ChangeLog,v 1.62 2008/03/08 13:31:43 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/ChangeLog,v 1.63 2008/04/04 12:56:22 betelgeuse Exp $
+
+  04 Apr 2008; Petteri Räty <betelgeuse@gentoo.org>
+  +files/2.7.7-gcc-4.3.patch, antlr-2.7.7.ebuild:
+  Add patch for gcc-4.3. Fixes bug #207631. Thanks to impulze@impulze.org for
+  the patch.
 
   08 Mar 2008; Petteri Räty <betelgeuse@gentoo.org> antlr-2.7.7.ebuild:
   Rename nocxx and nojava to cxx and java and turn them on by default using
diff --git a/dev-java/antlr/Manifest b/dev-java/antlr/Manifest
index 7b17b415a7ee..ff9660d3af22 100644
--- a/dev-java/antlr/Manifest
+++ b/dev-java/antlr/Manifest
@@ -1,15 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 2.7.7-gcc-4.3.patch 383 RMD160 b07b999bd1fe9ed4e90c2c4240c6b8dcececa460 SHA1 9561c692ccfad5f320739897da0ce985d8c804d7 SHA256 de68d3a12a03d7bcdbd3e1cf5ab7d773123a55b4d9e8bb9f3a873fa2c2be84e2
 AUX antlr.pc.in 155 RMD160 9e65e2d813b035fceba2893da2b14e21b579ff22 SHA1 008e6316a5f75884749bd88925a888fa0f7de78e SHA256 31bf717831c33e3088958712f2c6629427a505ee0a48030e65b4f733e0bf277f
 DIST antlr-2.7.7.tar.gz 1816180 RMD160 0b7951a28b748e912721fe0f6de4095d9f8da57d SHA1 802655c343cc7806aaf1ec2177a0e663ff209de1 SHA256 853aeb021aef7586bda29e74a6b03006bcb565a755c86b66032d8ec31b67dbb9
-EBUILD antlr-2.7.7.ebuild 2562 RMD160 743dc8c4d237e37b76fd14b861e215cff3bf58ee SHA1 30b6c4bcecabf0d0b232b55df44e4381785192fe SHA256 9f7deaf2f118734106b1dd670d739e4295d41a83f45f2d82c46822edadac6dba
-MISC ChangeLog 8604 RMD160 b9c74fd24577fa7ced68738f1e0a0a37a59d7016 SHA1 0b3a64e673664f064541cede775f3d05241f0f39 SHA256 a7c56810a255ab854dece148dcb55a35ccfbf168021d631791dfec0637d289c5
+EBUILD antlr-2.7.7.ebuild 2614 RMD160 4e783852e81512a6ca8a44e4251deb08bfe7a6cf SHA1 7d076ed634ce14b5b719b276cf33fd2636893727 SHA256 206eb4ff7095278d18999e1538b7f3f41fd32de153f45d1e612f0cf716b68b64
+MISC ChangeLog 8799 RMD160 ee56eaf2fa7638a45ae624687cf2f49c7243eef0 SHA1 d64cc4aaf522782509c1e30acb5f7fa302e80c5f SHA256 3765862f448a8ca884a1a407bd0662105238fd9d940d6422b5a3e1d81ed68c68
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFH0pU+cxLzpIGCsLQRAvgpAJ9pIioduV3yOdHy/Bsrq4Unnng6BgCfbXx1
-ZeFuZyFZEBNmqzWh/I/zQxA=
-=NaZ9
+iD8DBQFH9iV9cxLzpIGCsLQRAuYeAJ4o8m09UT5hXf6/hQX3tI9cosUWsACfV/iw
+OeYM4l6xkBdOLf/XkdwqaSQ=
+=cjBt
 -----END PGP SIGNATURE-----
diff --git a/dev-java/antlr/antlr-2.7.7.ebuild b/dev-java/antlr/antlr-2.7.7.ebuild
index 873e3b67991e..e690e77e8fb9 100644
--- a/dev-java/antlr/antlr-2.7.7.ebuild
+++ b/dev-java/antlr/antlr-2.7.7.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7.ebuild,v 1.10 2008/03/08 13:31:43 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7.ebuild,v 1.11 2008/04/04 12:56:22 betelgeuse Exp $
 
 EAPI=1
 
-inherit java-pkg-2 mono distutils multilib
+inherit base java-pkg-2 mono distutils multilib
 
 DESCRIPTION="A parser generator for C++, C#, Java, and Python"
 HOMEPAGE="http://www.antlr.org/"
@@ -23,6 +23,8 @@ DEPEND="${RDEPEND}
 	script? ( !dev-util/pccts )
 	source? ( app-arch/zip )"
 
+PATCHES=( "${FILESDIR}/2.7.7-gcc-4.3.patch" )
+
 src_compile() {
 	# don't ask why, but this is needed for stuff to get built properly
 	# across the various JDKs
diff --git a/dev-java/antlr/files/2.7.7-gcc-4.3.patch b/dev-java/antlr/files/2.7.7-gcc-4.3.patch
new file mode 100644
index 000000000000..628f8dd2645a
--- /dev/null
+++ b/dev-java/antlr/files/2.7.7-gcc-4.3.patch
@@ -0,0 +1,11 @@
+diff -Naur antlr-2.7.7.orig/lib/cpp/antlr/CharScanner.hpp antlr-2.7.7/lib/cpp/antlr/CharScanner.hpp
+--- antlr-2.7.7.orig/lib/cpp/antlr/CharScanner.hpp	2006-11-01 22:37:17.000000000 +0100
++++ antlr-2.7.7/lib/cpp/antlr/CharScanner.hpp	2008-03-19 20:09:21.000000000 +0100
+@@ -10,6 +10,7 @@
+ 
+ #include <antlr/config.hpp>
+ 
++#include <cstring>
+ #include <map>
+ 
+ #ifdef HAS_NOT_CCTYPE_H