Add a patch to build under Solaris (for Prefix).

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

4 files changed, 91 insertions, 4 deletions

diff --git a/dev-util/ragel/ChangeLog b/dev-util/ragel/ChangeLog
index 49ba9fd7100d..bd3dae567f46 100644
--- a/dev-util/ragel/ChangeLog
+++ b/dev-util/ragel/ChangeLog
@@ -1,6 +1,10 @@
 # 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.21 2009/03/24 09:39:55 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ragel/ChangeLog,v 1.22 2009/03/28 00:06:30 flameeyes Exp $
+
+  28 Mar 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/ragel-6.4-solaris.patch, ragel-6.4.ebuild:
+  Add a patch to build under Solaris (for Prefix).
 
   24 Mar 2009; Luca Barbato <lu_zero@gentoo.org> ragel-6.4.ebuild:
   Call econf, as reported in bug #263498
diff --git a/dev-util/ragel/Manifest b/dev-util/ragel/Manifest
index d5bac0a67df6..75f5a320443f 100644
--- a/dev-util/ragel/Manifest
+++ b/dev-util/ragel/Manifest
@@ -1,7 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX ragel-6.4-solaris.patch 2142 RMD160 919186d187399a55c5f0dae723e01f5308d750e0 SHA1 e5d6f97c3ca99c6b6db838a326017968252cb807 SHA256 8ec8536ec924d8810397bf54866dec83f1076bb90952b10b4fb5f78026d98804
 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-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 1145 RMD160 beb81bb0edde7bd171458050cfbb4372b9e11efc SHA1 b8ac7ce9a0c027048a22dc9f909af7310351cb0e SHA256 950fe8f1109e26368c97a74ae787b25f4f5f5f11973a4c4f5cca3b8fa333f15b
-MISC ChangeLog 2945 RMD160 533d168d5d6e43bda139355a72761d94ded304d1 SHA1 aa6bc16fd9bc4fcf9729fa5cca93d6c203ed98d4 SHA256 f2640d6485b179e2b1d1414a0c26518fd2e520cbc9d28a42a41da478466070e1
+EBUILD ragel-6.4.ebuild 1231 RMD160 3d3fffbedc586b912806909129f1792da0dce712 SHA1 85a869baa416cca843e1964dcd7b396114bae99c SHA256 bbedd175b4ba475e887aa72f9e1c9946552b40734d54b6789f3e096253214cc4
+MISC ChangeLog 3107 RMD160 b9343239ffe00db18ded792dd9fbb8a2b8ecfd44 SHA1 b1caa8d866b671bb787753b552d0232b74bb9de0 SHA256 2c7b4de7b2bbb7609f1ab8be5abf6d5413ba21266c80af96a232da3644200697
 MISC metadata.xml 302 RMD160 9205fdcfd20baf4dd662ab6ebc1f99703a8ff3bd SHA1 e3da4820729ccfd84d5705065c7f3b70983b5a29 SHA256 2f71f52c17df00296cea96267c2fe72b083db772d619e8616029254e81484abb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAknNahwACgkQAiZjviIA2XgJGwCeOjYQKRbemzRQzPCvyyhephEz
+ZZgAn1f/Qi1NYiOuqncakeZ4eG7m9Mw4
+=ZPWS
+-----END PGP SIGNATURE-----
diff --git a/dev-util/ragel/files/ragel-6.4-solaris.patch b/dev-util/ragel/files/ragel-6.4-solaris.patch
new file mode 100644
index 000000000000..c0710f00a997
--- /dev/null
+++ b/dev-util/ragel/files/ragel-6.4-solaris.patch
@@ -0,0 +1,65 @@
+diff -ur ragel-6.4.orig/ragel/cdcodegen.cpp ragel-6.4/ragel/cdcodegen.cpp
+--- ragel-6.4.orig/ragel/cdcodegen.cpp	2009-03-21 21:15:43.000000000 +0100
++++ ragel-6.4/ragel/cdcodegen.cpp	2009-03-27 23:19:39.105379307 +0100
+@@ -21,8 +21,8 @@
+  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
+  */
+ 
+-#include "cdcodegen.h"
+ #include "ragel.h"
++#include "cdcodegen.h"
+ #include "redfsm.h"
+ #include "gendata.h"
+ #include <sstream>
+diff -ur ragel-6.4.orig/ragel/ragel.h ragel-6.4/ragel/ragel.h
+--- ragel-6.4.orig/ragel/ragel.h	2009-03-22 02:26:32.000000000 +0100
++++ ragel-6.4/ragel/ragel.h	2009-03-27 23:18:21.551766402 +0100
+@@ -30,6 +30,11 @@
+ #include "config.h"
+ #include "common.h"
+ 
++#ifdef CS
++#warning "There is a CS macro in the system, we're undefining it"
++# undef CS
++#endif
++
+ #define PROGNAME "ragel"
+ 
+ /* Target output style. */
+diff -ur ragel-6.4.orig/ragel/rbxgoto.cpp ragel-6.4/ragel/rbxgoto.cpp
+--- ragel-6.4.orig/ragel/rbxgoto.cpp	2009-01-04 21:39:52.000000000 +0100
++++ ragel-6.4/ragel/rbxgoto.cpp	2009-03-27 23:25:24.473960528 +0100
+@@ -23,8 +23,8 @@
+ #include <stdio.h>
+ #include <string>
+ 
+-#include "rbxgoto.h"
+ #include "ragel.h"
++#include "rbxgoto.h"
+ #include "redfsm.h"
+ #include "bstmap.h"
+ #include "gendata.h"
+diff -ur ragel-6.4.orig/ragel/rubyfflat.cpp ragel-6.4/ragel/rubyfflat.cpp
+--- ragel-6.4.orig/ragel/rubyfflat.cpp	2009-01-04 21:39:52.000000000 +0100
++++ ragel-6.4/ragel/rubyfflat.cpp	2009-03-27 23:21:50.309156000 +0100
+@@ -20,6 +20,7 @@
+  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
+  */
+ 
++#include "ragel.h"
+ #include "rubyfflat.h"
+ 
+ void RubyFFlatCodeGen::GOTO( ostream &out, int gotoDest, bool inFinish )
+diff -ur ragel-6.4.orig/ragel/rubyflat.cpp ragel-6.4/ragel/rubyflat.cpp
+--- ragel-6.4.orig/ragel/rubyflat.cpp	2009-01-04 21:39:52.000000000 +0100
++++ ragel-6.4/ragel/rubyflat.cpp	2009-03-27 23:21:24.564040150 +0100
+@@ -20,8 +20,8 @@
+  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
+  */
+ 
+-#include "rubyflat.h"
+ #include "ragel.h"
++#include "rubyflat.h"
+ #include "redfsm.h"
+ #include "gendata.h"
+ 
diff --git a/dev-util/ragel/ragel-6.4.ebuild b/dev-util/ragel/ragel-6.4.ebuild
index 433bbb653253..18cccedb27dc 100644
--- a/dev-util/ragel/ragel-6.4.ebuild
+++ b/dev-util/ragel/ragel-6.4.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.4.ebuild,v 1.2 2009/03/24 09:39:55 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ragel/ragel-6.4.ebuild,v 1.3 2009/03/28 00:06:30 flameeyes Exp $
 
 inherit eutils
 
@@ -17,6 +17,13 @@ IUSE="doc vim-syntax"
 DEPEND=""
 RDEPEND=""
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-solaris.patch
+}
+
 src_compile() {
 	econf || die "econf failed"
 	emake || die "emake failed"