Add patch/hack to build with GCC 4.4 and a patch to fix tests under Gentoo/FreeBSD.

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

5 files changed, 72 insertions, 7 deletions

diff --git a/dev-util/ragel/ChangeLog b/dev-util/ragel/ChangeLog
index 820dc5a1f0c3..a5bb2cb7c9e3 100644
--- a/dev-util/ragel/ChangeLog
+++ b/dev-util/ragel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/ragel
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ragel/ChangeLog,v 1.26 2009/05/19 18:33:18 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ragel/ChangeLog,v 1.27 2009/05/19 19:07:29 flameeyes Exp $
+
+  19 May 2009; Diego E. Pettenò <flameeyes@gentoo.org> ragel-6.5.ebuild,
+  +files/ragel-6.5+gcc-4.4.patch, +files/ragel-6.5-freebsd.patch:
+  Add patch/hack to build with GCC 4.4 and a patch to fix tests under
+  Gentoo/FreeBSD.
 
   19 May 2009; Diego E. Pettenò <flameeyes@gentoo.org> ragel-6.5.ebuild:
   Fix ebuild since upstream changed the tarball; now vim-syntax is back, as
diff --git a/dev-util/ragel/Manifest b/dev-util/ragel/Manifest
index 7659e090ba54..ba8bdb5ac0a6 100644
--- a/dev-util/ragel/Manifest
+++ b/dev-util/ragel/Manifest
@@ -2,19 +2,21 @@
 Hash: SHA1
 
 AUX ragel-6.4-solaris.patch 2142 RMD160 919186d187399a55c5f0dae723e01f5308d750e0 SHA1 e5d6f97c3ca99c6b6db838a326017968252cb807 SHA256 8ec8536ec924d8810397bf54866dec83f1076bb90952b10b4fb5f78026d98804
+AUX ragel-6.5+gcc-4.4.patch 743 RMD160 3c5b5e298a1c19ad979d49ec56d5d6855efd848f SHA1 50578786b767f99985a2451bffc921c69c90a497 SHA256 6628abbfd4a89c65df23738a6d43f32b3c2c153722efb96e0829e55090adb9b4
+AUX ragel-6.5-freebsd.patch 727 RMD160 a3a673796e81df6ec62871a1346cf58b6d831c09 SHA1 d68cc2c8a89c6ad1d2d88cd75637823acc539d81 SHA256 b7370fe0365f1db1d419294e9f8fdf3ed109e5c4c01eabd24f568a60fd22c94d
 DIST ragel-6.3.tar.gz 597390 RMD160 2bb2ebf7399eacc3c02eceb1b9305f17346b0fae SHA1 0c5f21d6f02ef68ecd0adc85659a7abc7d48f56d SHA256 018cedc8a68be85cda330fc53d0bb8a1ca6ad39b1cf790eed0311e7baa5a2520
 DIST ragel-6.4.tar.gz 571767 RMD160 a432fc93f8b107b43d323f389137cc609e061d01 SHA1 480807c488a82d168f6a2527fa85035c37a68ba5 SHA256 dab2360332abf07aff903e834c18f687322a682f55cb0b44aafe383a7ab88cb7
 DIST ragel-6.5.tar.gz 973457 RMD160 162af80f2fdaeb43dc2ce98b1834b17156f27e9f SHA1 7bc2cd5fb40d00e71e1d37a6d4d69c83c67f983f SHA256 5234efbb4ff9d8206ba5d304fca93ce1ce3df0ad75ffb374347bf03cb1527787
 DIST ragel-guide-6.4.pdf 576521 RMD160 4f659476d941054d4f15a36b019b54e8669f06ba SHA1 dd3305629ec4d9d8dda3472ced9f644ec42c112c SHA256 6268f2b1cfc98fdd9d856742cf27361fb1921aa5f1c434bdf7d26043692c8527
 EBUILD ragel-6.3.ebuild 1330 RMD160 27709b12a32446252e98faeacf81231a0bc819df SHA1 9fd0ede8370444b1ecbe464e48d574c524aec085 SHA256 8b3f9ca540ff41216d4709c0f4f736a0aaf9b2e76ac4f2ea60e7a6a82b0dde07
 EBUILD ragel-6.4.ebuild 1248 RMD160 4671e1f75fa7766f9d5160e58959f96475c03600 SHA1 21ac8055c15001c7be0450843a98f1ef1ffaa1e1 SHA256 91c7a8c21d40fa10ec231e17bc8404f770b4ef241bb7df27df6c2b5dcb747299
-EBUILD ragel-6.5.ebuild 900 RMD160 3ef832e1b1afde705b1eba499ced4255e264163d SHA1 e4c8cf319af85421dd44b90e0ddae0a50eebebfe SHA256 ea7df2e66a33abfcfbe8ed4ddf1944a7977c4c429d2a97e868e522715fdfadc3
-MISC ChangeLog 3743 RMD160 b1594af5f5a4ae054c555fcabc8416323a6c6ea6 SHA1 d88e3a2efef7053914cc45eef2c81e47ed7770a5 SHA256 12aaeb512636382f16f6ec8144433c0fd01ad56fe6092592443c9f80977106ca
+EBUILD ragel-6.5.ebuild 1025 RMD160 95ae56dc7bb82ee36aa20f5995d5689123bd3ff1 SHA1 85031b8092331800f17f44a3e1d717f1f6b36436 SHA256 2d03ddc2aee03f3ffc69d97e536d3344e20f57831abbf6fdab6e8ee51ddb243d
+MISC ChangeLog 3972 RMD160 10e3823edda9645c5a6adc16c9c63e170a7bc663 SHA1 0a52751575849086ecc69457a617894a48b64f46 SHA256 81f092771f3509a178ca6d9d53611cda1abb238069c7e38ec5096d7e8822105c
 MISC metadata.xml 302 RMD160 9205fdcfd20baf4dd662ab6ebc1f99703a8ff3bd SHA1 e3da4820729ccfd84d5705065c7f3b70983b5a29 SHA256 2f71f52c17df00296cea96267c2fe72b083db772d619e8616029254e81484abb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkoS+3QACgkQAiZjviIA2XiLgQCgpzu8oxsQ9OX9i9oiO2UTKW0Z
-GM0AoI3zndPjjiwDArJbfNkBRzeqqqG4
-=VgAX
+iEYEARECAAYFAkoTA3kACgkQAiZjviIA2XjPtgCguaNMSnZOkpZRhupb+ncnvUvG
+eqoAoNW7MXreigW21Jny9RuJ7bYnUjvO
+=aO81
 -----END PGP SIGNATURE-----
diff --git a/dev-util/ragel/files/ragel-6.5+gcc-4.4.patch b/dev-util/ragel/files/ragel-6.5+gcc-4.4.patch
new file mode 100644
index 000000000000..131b05d04f01
--- /dev/null
+++ b/dev-util/ragel/files/ragel-6.5+gcc-4.4.patch
@@ -0,0 +1,22 @@
+diff --git a/ragel/main.cpp b/ragel/main.cpp
+index a16a50a..13d0152 100644
+--- a/ragel/main.cpp
++++ b/ragel/main.cpp
+@@ -336,7 +336,7 @@ void processArgs( int argc, const char **argv, InputData &id )
+ 				printStatistics = true;
+ 				break;
+ 			case '-': {
+-				char *eq = strchr( pc.paramArg, '=' );
++				char *eq = const_cast<char *>(strchr( pc.paramArg, '=' ));
+ 
+ 				if ( eq != 0 )
+ 					*eq++ = 0;
+@@ -507,7 +507,7 @@ char *makeIntermedTemplate( const char *baseFileName )
+ {
+ 	char *result = 0;
+ 	const char *templ = "ragel-XXXXXX.xml";
+-	char *lastSlash = strrchr( baseFileName, '/' );
++	const char *lastSlash = strrchr( baseFileName, '/' );
+ 	if ( lastSlash == 0 ) {
+ 		result = new char[strlen(templ)+1];
+ 		strcpy( result, templ );
diff --git a/dev-util/ragel/files/ragel-6.5-freebsd.patch b/dev-util/ragel/files/ragel-6.5-freebsd.patch
new file mode 100644
index 000000000000..f4de33ba4745
--- /dev/null
+++ b/dev-util/ragel/files/ragel-6.5-freebsd.patch
@@ -0,0 +1,28 @@
+From 8da80e890a57c76671d61acf2ee58d9686b7b271 Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Diego=20Elio=20'Flameeyes'=20Petten=C3=B2?= <flameeyes@gmail.com>
+Date: Tue, 19 May 2009 20:46:39 +0200
+Subject: [PATCH 2/2] Fix tests on FreeBSD: malloc.h should not be used, stdlib.h should.
+
+Also use the C++ proper includes instead of the C includes.
+---
+ test/cppscan1.h |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test/cppscan1.h b/test/cppscan1.h
+index 3fa0229..346dd9b 100644
+--- a/test/cppscan1.h
++++ b/test/cppscan1.h
+@@ -2,8 +2,8 @@
+ #define _CPPSCAN1_H
+ 
+ #include <iostream>
+-#include <malloc.h>
+-#include <string.h>
++#include <cstdlib>
++#include <cstring>
+ 
+ using namespace std;
+ 
+-- 
+1.6.3.1
+
diff --git a/dev-util/ragel/ragel-6.5.ebuild b/dev-util/ragel/ragel-6.5.ebuild
index fa6024ae1ada..9dbc7c351592 100644
--- a/dev-util/ragel/ragel-6.5.ebuild
+++ b/dev-util/ragel/ragel-6.5.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/dev-util/ragel/ragel-6.5.ebuild,v 1.2 2009/05/19 18:33:18 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ragel/ragel-6.5.ebuild,v 1.3 2009/05/19 19:07:29 flameeyes Exp $
 
 inherit eutils
 
@@ -16,6 +16,14 @@ IUSE="vim-syntax"
 DEPEND=""
 RDEPEND=""
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}+gcc-4.4.patch
+	epatch "${FILESDIR}"/${P}-freebsd.patch
+}
+
 src_compile() {
 	econf --docdir=/usr/share/doc/${PF} || die "econf failed"
 	emake || die "emake failed"