fix build with gcc 4.3, bug #227863 and fix tests build

(Portage version: 2.1.5.5)

4 files changed, 43 insertions, 13 deletions

diff --git a/dev-tex/cpp2latex/ChangeLog b/dev-tex/cpp2latex/ChangeLog
index 620aa278e103..886e7e182b8a 100644
--- a/dev-tex/cpp2latex/ChangeLog
+++ b/dev-tex/cpp2latex/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-tex/cpp2latex
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/cpp2latex/ChangeLog,v 1.10 2007/03/13 00:12:21 nattfodd Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/cpp2latex/ChangeLog,v 1.11 2008/06/17 17:06:12 aballier Exp $
+
+  17 Jun 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/cpp2latex-2.3-gcc43.patch, +files/cpp2latex-2.3-tests.patch,
+  cpp2latex-2.3-r1.ebuild:
+  fix build with gcc 4.3, bug #227863 and fix tests build
 
   12 Mar 2007; Alexandre Buisse <nattfodd@gentoo.org> metadata.xml:
   Replaced text-markup by tex as maintaining herd (text-markup split).
diff --git a/dev-tex/cpp2latex/cpp2latex-2.3-r1.ebuild b/dev-tex/cpp2latex/cpp2latex-2.3-r1.ebuild
index 8fccb81fd3c3..eabc8c75d955 100644
--- a/dev-tex/cpp2latex/cpp2latex-2.3-r1.ebuild
+++ b/dev-tex/cpp2latex/cpp2latex-2.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/cpp2latex/cpp2latex-2.3-r1.ebuild,v 1.2 2007/02/06 16:45:54 nattfodd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/cpp2latex/cpp2latex-2.3-r1.ebuild,v 1.3 2008/06/17 17:06:12 aballier Exp $
 
 inherit eutils
 
@@ -17,17 +17,15 @@ KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
 # neither a compile or runtime dependency
 
 src_unpack() {
-	unpack ${A} || die
-	cd ${S}/cpp2latex
+	unpack ${A}
+	cd "${S}/cpp2latex"
 	# bug 44585
-	epatch ${FILESDIR}/cpp2latex-2.3.patch || die
-}
-
-src_compile() {
-	econf || die
-	emake || die
+	epatch "${FILESDIR}/cpp2latex-2.3.patch"
+	# bug #227863
+	epatch "${FILESDIR}/${P}-gcc43.patch"
+	epatch "${FILESDIR}/${P}-tests.patch"
 }
 
 src_install() {
-	make install DESTDIR=${D} || die
+	emake install DESTDIR="${D}" || die "make install failed"
 }
diff --git a/dev-tex/cpp2latex/files/cpp2latex-2.3-gcc43.patch b/dev-tex/cpp2latex/files/cpp2latex-2.3-gcc43.patch
new file mode 100644
index 000000000000..006560506676
--- /dev/null
+++ b/dev-tex/cpp2latex/files/cpp2latex-2.3-gcc43.patch
@@ -0,0 +1,12 @@
+Index: cpp2latex-2.3/cpp2latex/main.cpp
+===================================================================
+--- cpp2latex-2.3.orig/cpp2latex/main.cpp
++++ cpp2latex-2.3/cpp2latex/main.cpp
+@@ -22,6 +22,7 @@
+ #include <iostream>
+ #include <stdlib.h>
+ #include <string>
++#include <cstring>
+ #include <fstream>
+ #include <vector>
+ #include <stdio.h>
diff --git a/dev-tex/cpp2latex/files/cpp2latex-2.3-tests.patch b/dev-tex/cpp2latex/files/cpp2latex-2.3-tests.patch
new file mode 100644
index 000000000000..621c43d28156
--- /dev/null
+++ b/dev-tex/cpp2latex/files/cpp2latex-2.3-tests.patch
@@ -0,0 +1,15 @@
+Index: cpp2latex-2.3/cpp2latex/getopttest.cpp
+===================================================================
+--- cpp2latex-2.3.orig/cpp2latex/getopttest.cpp
++++ cpp2latex-2.3/cpp2latex/getopttest.cpp
+@@ -2,7 +2,9 @@
+ #include <iostream>
+ #include <getopt.h>
+ 
+-void main( int argc, char* argv[] )
++using namespace std;
++
++int main( int argc, char* argv[] )
+ {
+ int optch=0, optc=1;
+ 	while( ( optch = getopt( argc,argv, "h:a:k" ) ) > 0 )