Fix building with gcc-4.3

Package-Manager: portage-2.1.5_rc6

4 files changed, 64 insertions, 10 deletions

diff --git a/dev-libs/libbulletml/ChangeLog b/dev-libs/libbulletml/ChangeLog
index 90f77c7deead..001353b854bc 100644
--- a/dev-libs/libbulletml/ChangeLog
+++ b/dev-libs/libbulletml/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libbulletml
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libbulletml/ChangeLog,v 1.6 2007/02/09 07:29:49 flameeyes Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libbulletml/ChangeLog,v 1.7 2008/04/30 23:16:43 nyhm Exp $
+
+  30 Apr 2008; Tristan Heaven <nyhm@gentoo.org>
+  +files/libbulletml-0.0.6-gcc43.patch, libbulletml-0.0.6.ebuild:
+  Fix building with gcc-4.3
 
   09 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/dev-libs/libbulletml/Manifest b/dev-libs/libbulletml/Manifest
index 26f5d78483f3..553ca9a6d0da 100644
--- a/dev-libs/libbulletml/Manifest
+++ b/dev-libs/libbulletml/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX libbulletml-0.0.6-gcc43.patch 589 RMD160 2156ca25e5dbde78d62291bc5ae0182cf745f4c2 SHA1 2202e8c4ca0d440c1159c1696d99b2222c3255c3 SHA256 86e34792a212498cd2ffa86abe8ce595479a904f434d60ba4df924c51bc9455b
 DIST libbulletml-0.0.6.tar.bz2 94529 RMD160 acdb028e2fc2a355e2a9bc38677d001bcd20ae5c SHA1 31a1937a772f7cf208064d3fa294c1055a50e8d7 SHA256 c7770f37c5a870ce2f2640c83378c0ee4da9d77bcdd286ce33d0de6c4d5f4524
-EBUILD libbulletml-0.0.6.ebuild 830 RMD160 d23693a9d972e0131430f69606584b74ae401476 SHA1 36934df1b3b15ae01cd92f0cafc5a15ba498db3d SHA256 8da331f457d784714ceca744e7acf1675a8a793c2f07a13fd70c069433f4e24a
-MISC ChangeLog 1024 RMD160 fb151303e388f1536e093b33d0b09c0de1438284 SHA1 9a2375a71e35c31e7d5973e20ce760dcb5fc5461 SHA256 44c2ef819ad5ee113c722f502661bf49380eff4e406f0d29ab86cfe872d75861
+EBUILD libbulletml-0.0.6.ebuild 1035 RMD160 76e6e51ffa9e53a79832b7ad7f19b5a8ed21a727 SHA1 c4c058d50fa9090e979d49a8a0e46baa3870a384 SHA256 17cd62472c1436dddb3f1d3d80b0ee534cc18ea3cb05eca00abe0a24c3b1771c
+MISC ChangeLog 1162 RMD160 8602fe7c8d42d6a7bc85b1a8eaa2de0b478da9c9 SHA1 deaa974948e36c8f9063b989cce33b5e4f63afaf SHA256 be50204d9b84d5509e8adf03c8ea344cbc0e23580397e8a05bdb0c08ed516d37
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgY/eAACgkQdz7hIScOURFSewCgqH9//iDxXeSwi6arN7ucu8Ce
+M6EAoNYS1qeAPD/f96NKYdtElpxE7N5E
+=AI1d
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/libbulletml/files/libbulletml-0.0.6-gcc43.patch b/dev-libs/libbulletml/files/libbulletml-0.0.6-gcc43.patch
new file mode 100644
index 000000000000..f7e9bfbab9b1
--- /dev/null
+++ b/dev-libs/libbulletml/files/libbulletml-0.0.6-gcc43.patch
@@ -0,0 +1,31 @@
+--- src/calc.yy
++++ src/calc.yy
+@@ -8,6 +8,7 @@
+ 
+ #include <cmath>
+ #include <cctype>
++#include <cstring>
+ 
+ #include <vector>
+ #include <sstream>
+--- src/tinyxml/tinyxml.h
++++ src/tinyxml/tinyxml.h
+@@ -28,6 +28,8 @@
+ #include <string>

+ #include <stdio.h>

+ #include <assert.h>

++#include <cstring>

++#include <cstdlib>

+ 

+ class TiXmlDocument;

+ class TiXmlElement;

+--- src/tinyxml/tinyxmlparser.cpp
++++ src/tinyxml/tinyxmlparser.cpp
+@@ -24,6 +24,7 @@
+ 

+ #include "tinyxml.h"

+ #include <ctype.h>

++#include <cstring>

+ 

+ const char* TiXmlBase::SkipWhiteSpace( const char* p )

+ {

diff --git a/dev-libs/libbulletml/libbulletml-0.0.6.ebuild b/dev-libs/libbulletml/libbulletml-0.0.6.ebuild
index 1493acd27704..d6f003cc8d33 100644
--- a/dev-libs/libbulletml/libbulletml-0.0.6.ebuild
+++ b/dev-libs/libbulletml/libbulletml-0.0.6.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libbulletml/libbulletml-0.0.6.ebuild,v 1.5 2005/08/11 12:01:55 r3pek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libbulletml/libbulletml-0.0.6.ebuild,v 1.6 2008/04/30 23:16:43 nyhm Exp $
+
+inherit eutils
 
 DESCRIPTION="A Library of Bullet Markup Language"
 HOMEPAGE="http://user.ecc.u-tokyo.ac.jp/~s31552/wp/libbulletml/index_en.html"
@@ -13,21 +15,27 @@ IUSE=""
 
 S="${WORKDIR}/${PN#lib}/src"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+}
+
 src_compile() {
 	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" || die "emake failed"
 }
 
 src_install() {
-	dolib.a libbulletml.a
+	dolib.a libbulletml.a || die "dolib.a failed"
 
 	insinto /usr/include/bulletml
-	doins *.h
+	doins *.h || die "doins .h failed"
 
 	insinto /usr/include/bulletml/tinyxml
-	doins tinyxml/tinyxml.h
+	doins tinyxml/tinyxml.h || die "doins tinyxml.h failed"
 
 	insinto /usr/include/bulletml/ygg
-	doins ygg/ygg.h
+	doins ygg/ygg.h || die "doins ygg.h failed"
 
 	dodoc ../README*
 }