Add patch to fix building with gcc-4.3. Thanks to Marek Cruz <programatorfreez AT gmail DOT com>; bug #248922

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.26-rc5 i686

4 files changed, 51 insertions, 13 deletions

diff --git a/dev-cpp/gccxml/ChangeLog b/dev-cpp/gccxml/ChangeLog
index 03cfb13eefc0..02d3dbf62ba8 100644
--- a/dev-cpp/gccxml/ChangeLog
+++ b/dev-cpp/gccxml/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-cpp/gccxml
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gccxml/ChangeLog,v 1.22 2008/06/07 16:57:59 dev-zero Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gccxml/ChangeLog,v 1.23 2009/01/02 01:37:51 halcy0n Exp $
+
+  02 Jan 2009; Mark Loeser <halcy0n@gentoo.org>
+  +files/gccxml-0.6.0-gcc43.patch, gccxml-0.6.0-r1.ebuild:
+  Add patch to fix building with gcc-4.3. Thanks to Marek Cruz
+  <programatorfreez AT gmail DOT com>; bug #248922
 
 *gccxml-0.9.0_pre20080607 (07 Jun 2008)
 
diff --git a/dev-cpp/gccxml/Manifest b/dev-cpp/gccxml/Manifest
index 3b507b17890f..3025225ab07e 100644
--- a/dev-cpp/gccxml/Manifest
+++ b/dev-cpp/gccxml/Manifest
@@ -1,7 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX gccxml-0.6.0-gcc43.patch 750 RMD160 fdea223e25bef284efbc19e6ffb2fef21a180cd4 SHA1 720221cbb54f25ba8d6b7f36e1b86e7d66ca0908 SHA256 214c738249f06e2a7e498377a83dbec25160cc8a326cdc7b3be9cf67383a9d96
 AUX obstack.h.diff 3852 RMD160 95acc6e2df168028e3e516f304ffc0f0ad5e22d8 SHA1 05078ccd22329a5f23d025b1fa6b2476e827a9fe SHA256 3e9b6f504f57e790bd6d641920477a43ff2fcd06080ee9894bd4a6b28583cff7
 DIST gccxml-0.6.0.tar.gz 9740448 RMD160 8bcf54541282160c2fe09ea40e9d5fdfdd06b1ba SHA1 efd9ef010e5b802e828e0d3c807d827e1ad82830 SHA256 5efcad16ffa33eea6aea4c918f45838e3c826ad0e3d32d85f96f2b49bd66ba94
 DIST gccxml-0.9.0_pre20080607.tar.bz2 12680073 RMD160 4ed87d708a9586788d51ef679315f702c8947b2d SHA1 32db73ec2c86363cc06acaa53b844be8e010433b SHA256 bb08201225c9ecd3914a465def6a0cb826bd3b1b08bdc4058f02eb5daa6b3f7c
-EBUILD gccxml-0.6.0-r1.ebuild 874 RMD160 bf83d9171d644252694eb74a748896b0499d77d8 SHA1 a9d709f34ae6043ebe0a3341017fb0ec92a2be1f SHA256 de0dc3d91ba3cdea656bd78f37ea1e01173ba1c6cc2aecd72b3ef5de70091b4d
+EBUILD gccxml-0.6.0-r1.ebuild 928 RMD160 38b2a1ab917664602332a6d6eb2df0b16e582f0e SHA1 f7e71685bbea6e70c11bcd95906fee30ba6e2bc8 SHA256 8118994cbb43d28839e52a4e153a0e3ca1c416546ba907efdc026f4bca5370a5
 EBUILD gccxml-0.9.0_pre20080607.ebuild 1162 RMD160 b138d3d0bd98bf492e04949b50b167279aa1579b SHA1 56bc40dece09c7c59ff479cb0cb91273770e3510 SHA256 70c0ee7bf6fe6b90e9b8c749ae36c3b5af56b14308dd517c4695c82c3ef1e551
-MISC ChangeLog 3068 RMD160 5b6be3482f4777d7900c594cc2e7676add2d7275 SHA1 a5f52fa16220c5b14e4d681b3c724cb7fff3a68e SHA256 6e9986653011d0ea90aa28a9039a657e10678f8da59463bc219f89c564e00fcc
+MISC ChangeLog 3289 RMD160 deb80a13a4717ab5ddb6003f33c422867f1a6b68 SHA1 753c00a1638b379b701f48983b6068deac9d74c5 SHA256 c6bf92ebca3b58b2d265885e5f9462327355abd5bf5f401dee4ed3bf5bf3bf2b
 MISC metadata.xml 162 RMD160 a0cebea19e0b8fd83f1a4b52b18abbc1d279af4e SHA1 01ac8441582a31c0291855174b1760bb8d127cd5 SHA256 f0e3b8e87a26756fd1e576f63ed9221cad04e69e4ed6588fd11954250991a0d1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkldb90ACgkQCRZPokWLroT7CwCgig41o1MNF8sLRLlA3XbSClpI
+B7gAoOFjlMA+z3RCC13e5W3bAhrg+pCj
+=2QY6
+-----END PGP SIGNATURE-----
diff --git a/dev-cpp/gccxml/files/gccxml-0.6.0-gcc43.patch b/dev-cpp/gccxml/files/gccxml-0.6.0-gcc43.patch
new file mode 100644
index 000000000000..ed65ca2758a9
--- /dev/null
+++ b/dev-cpp/gccxml/files/gccxml-0.6.0-gcc43.patch
@@ -0,0 +1,21 @@
+--- GCC_XML/GXFront/gxConfiguration.cxx       2004-01-22 22:51:36.000000000 +0100
++++ GCC_XML/GXFront/gxConfiguration.cxx       2008-11-26 18:17:34.000000000 +0100
+@@ -15,6 +15,7 @@
+
+ =========================================================================*/
+ #include "gxConfiguration.h"
++#include <cstring>
+
+ //----------------------------------------------------------------------------
+ const char* gxConfigurationVc6Registry =
+--- GCC_XML/KWSys/SystemTools.cxx       2004-01-22 16:30:01.000000000 +0100
++++ GCC_XML/KWSys/SystemTools.cxx       2008-11-26 18:16:53.000000000 +0100
+@@ -17,6 +17,7 @@
+
+ #include KWSYS_HEADER(ios/iostream)
+ #include KWSYS_HEADER(ios/fstream)
++#include <cstring>
+
+ #ifdef _MSC_VER
+ # pragma warning (disable: 4786)
+
diff --git a/dev-cpp/gccxml/gccxml-0.6.0-r1.ebuild b/dev-cpp/gccxml/gccxml-0.6.0-r1.ebuild
index 152dadd91594..c18642f32c2a 100644
--- a/dev-cpp/gccxml/gccxml-0.6.0-r1.ebuild
+++ b/dev-cpp/gccxml/gccxml-0.6.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gccxml/gccxml-0.6.0-r1.ebuild,v 1.6 2007/02/11 11:20:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gccxml/gccxml-0.6.0-r1.ebuild,v 1.7 2009/01/02 01:37:51 halcy0n Exp $
 
 inherit versionator eutils
 PVM="$(get_version_component_range 1-2)"
@@ -16,20 +16,21 @@ IUSE=""
 DEPEND="dev-util/cmake"
 RDEPEND=""
 
-MYBUILDDIR=${WORKDIR}/build
+MYBUILDDIR="${WORKDIR}"/build
 src_unpack() {
-	mkdir ${MYBUILDDIR}
+	mkdir "${MYBUILDDIR}"
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/obstack.h.diff
+	cd "${S}"
+	epatch "${FILESDIR}"/obstack.h.diff
+	epatch "${FILESDIR}"/${P}-gcc43.patch
 }
 src_compile() {
-	cd ${MYBUILDDIR}
+	cd "${MYBUILDDIR}"
 	cmake ../${P} -DCMAKE_INSTALL_PREFIX:PATH=/usr || die "cmake failed"
 	emake || die "emake failed"
 }
 
 src_install() {
-	cd ${MYBUILDDIR}
-	make DESTDIR=${D} install || die
+	cd "${MYBUILDDIR}"
+	make DESTDIR="${D}" install || die
 }