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

Package-Manager: portage-2.1.5.5

5 files changed, 57 insertions, 15 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/Manifest b/dev-tex/cpp2latex/Manifest
index 8dcb0b187336..27cb6e71eabe 100644
--- a/dev-tex/cpp2latex/Manifest
+++ b/dev-tex/cpp2latex/Manifest
@@ -1,6 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX cpp2latex-2.3-gcc43.patch 345 RMD160 856fb03577039e9731c4f8bfdc87936c4166105c SHA1 89f5ceb91cb5120e42aebf9c47d2d629d5deb735 SHA256 45bf1cfb72623b1a9996fb304b7cf7ed824f205e63872eb10faa1f9b00a3ab62
+AUX cpp2latex-2.3-tests.patch 443 RMD160 0dd1dfe353fcedfb503f984ed0c83001859684a8 SHA1 d932c199424640379e82cef348b3fbd575f5c8be SHA256 3753ba7caadeff12b4b901627e07b68ffa8535ae72781e787ff818ac4a56745b
 AUX cpp2latex-2.3.patch 1237 RMD160 567f95def5ee2135b9daedf49b3f8af9226f1533 SHA1 48521453005f07e09f2f94ec85389e5aa13baed7 SHA256 91d4c31028ffdca26170983cec8aa941f72ef96c18dc9b227df0c2acbd898dff
 DIST cpp2latex-2.3.tar.gz 483213 RMD160 0b5a191f6aa5c34ad4bee7ead5cae18f47776ba4 SHA1 2b0ce5af779ab17c071bf9731e2cc81cc7ff6dbd SHA256 bd2ede885f34f5412734b2ec28cc454b6ce0ae3cc89b9a0cfe9df4baa075af86
-EBUILD cpp2latex-2.3-r1.ebuild 822 RMD160 f7a5786014f2f50a281fdf9cd30af83f9c8fca65 SHA1 c0df4dee871e5fada80391670d2b326ec44b865e SHA256 0c52af291b6651043625dc691cfc59bcd51a422f4ec95feae587fc7b74f51710
+EBUILD cpp2latex-2.3-r1.ebuild 883 RMD160 d71adf4b075be6ce9cdc70bd1e415599509bce76 SHA1 83ec2cc580decc6f772fb5440adca41d2c43bb4b SHA256 b87d7e073b9fdd8c1e546d742c98f1ded0610011947f21c75610004d768066aa
 EBUILD cpp2latex-2.3.ebuild 741 RMD160 c56dcf496dcd561c4bb00a1a5022b63f0e7a209c SHA1 5c3ca5c10527641fb92c8f1699d1781cafbe4b40 SHA256 88823f6c611cdd7080bd37f914136e7e03f265eab66feaca6bff89acc6738969
-MISC ChangeLog 1502 RMD160 22f8601fbf06edb72f48eb39091bc6113de86827 SHA1 51172456e88692d4990e786c4b03464d0ffe920c SHA256 d8d1be127fbe8c53d6dcdde0628584dcd31d7e41d95fe456f481e110b18f9696
+MISC ChangeLog 1710 RMD160 6eebaf80e0a259e8efe6aa98e6c6fbc31164d184 SHA1 ad67741cc9ec66ef6e4adc68e31ae0c1d1ddd555 SHA256 db1382a285771d28727ca84a627b6a3b53bf96871d5a090e3f38606f1c2f74be
 MISC metadata.xml 156 RMD160 2bf6b2ed9ff0fcef1e902cf093ccf4ae2dcc70a0 SHA1 e9260cd53905d8569cf3327ded4c6d01653fc389 SHA256 b4971b8472ab3fe4fbfe41b331a79193ca19e86c08d055ad1c20eaf9e04b79b6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkhX71IACgkQvFcC4BYPU0odDwCgjafiRsfVk0xx/A/rx2RJwbTU
+q54An3RUXo7GejVKOjJnAEbfAUZODayg
+=aG8k
+-----END PGP SIGNATURE-----
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 )