Patch to allow compilation with gcc-4.3. Many thanks to Marek Miller on bug #225401.

Package-Manager: portage-2.1.5.4

5 files changed, 40 insertions, 11 deletions

diff --git a/sci-libs/libghemical/ChangeLog b/sci-libs/libghemical/ChangeLog
index 31e8a9cfc901..6e1a84fd96e5 100644
--- a/sci-libs/libghemical/ChangeLog
+++ b/sci-libs/libghemical/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/libghemical
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libghemical/ChangeLog,v 1.13 2006/12/28 22:30:59 je_fro Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libghemical/ChangeLog,v 1.14 2008/06/09 09:15:45 je_fro Exp $
+
+  09 Jun 2008; Jeff Gardner <je_fro@gentoo.org>
+  +files/libghemical-gcc43.patch, libghemical-2.00.ebuild,
+  libghemical-2.10.ebuild:
+  Patch to allow compilation with gcc-4.3. Many thanks to Marek Miller on
+  bug #225401.
 
 *libghemical-2.10 (28 Dec 2006)
 
diff --git a/sci-libs/libghemical/Manifest b/sci-libs/libghemical/Manifest
index 7436a88a839b..243c3e3c5622 100644
--- a/sci-libs/libghemical/Manifest
+++ b/sci-libs/libghemical/Manifest
@@ -1,7 +1,8 @@
 AUX 2.00-really-find-blas-and-lapack.patch 1317 RMD160 017aaba010e92b83d688caef67ee5413a665b173 SHA1 1e39f1a18bfa691c4429b679f77bcd8bbdd0871e SHA256 4d16fc804523fa24f0eb3fcbe33f3535d0265b6cc858f6291b5304806556d4ff
+AUX libghemical-gcc43.patch 520 RMD160 1fd7d5fb971abef6f2c0c3a6a7312284932d30dd SHA1 c1b2c97f62d59dd235855510665e30b898e059fe SHA256 691641d5b34921d4acff7a746eef84e8eabb7cd6f9ff43df333cbd7cca00383e
 DIST libghemical-2.00.tar.gz 629479 RMD160 8c49ce3f128ef937dfb4443e4ffebff0b9183a1d SHA1 3be7f292752657b3a49b8417e2d43dc262ecd45b SHA256 e873b3042df75fa1c9f37fc99f2ff14227965ed13c7680169f714ab6575d5f21
 DIST libghemical-2.10.tar.gz 690680 RMD160 30cf295ca940a25c9326a75eb10de00b917dc065 SHA1 70e541fdb707f66e1d32d80a0739ee1aeba202a5 SHA256 b0d6639d3b79f865cffb8cf4c2721f6bc7e81c562240a10441766358f4576a7e
-EBUILD libghemical-2.00.ebuild 991 RMD160 d129c3565d2cf1b50364d27f60922043918b3f43 SHA1 6797599476a2f29174b7f7c66b052ac44c2a119e SHA256 026970e0eb152c213a486152fd4e6ad5f16b9c43eedcb86dd52ec7bb1f466bf1
-EBUILD libghemical-2.10.ebuild 913 RMD160 5aaa3dc2ff2f0167cb5161b478c1e4d508afad2a SHA1 ebb26f324b00442e735383c4042c8870c9a5fa09 SHA256 475510fa7eb9a25dc1323c6d1b19835ded239bd84999fa2de1d595fef96cd05c
-MISC ChangeLog 2338 RMD160 2fc30b3d372a82c2bd44e3d9ca78a4ed20cd5e8a SHA1 f4b9fe8815580a8e607541f0cbd3676f5b483e0e SHA256 e8330960bc386d6c786cc3b7c2c43b6c353456b953720b957cf8ae364b979e1a
+EBUILD libghemical-2.00.ebuild 992 RMD160 f90ad27527adfc1820752f25b10215934645f2b3 SHA1 37002ac0bfb7d2719652572fcc6e8a506f8a524e SHA256 35e67f0c204e8c16ec0cbc8c95f21ffc44251b4d74c986d282fb97abeff87ce5
+EBUILD libghemical-2.10.ebuild 967 RMD160 a75b832b82607e9014852c4eeda0cab6e43f8a5f SHA1 54e751bf45ab069d1749d9a4c252876c9da81ff0 SHA256 05e43678b930813284ebfcfe95f9dbcfc6d5939b162d195515467008fb1b5a92
+MISC ChangeLog 2562 RMD160 1523eb75cfb9d5d85c7a88b27194c119b83ddd5c SHA1 2010ec6d009a6bb9500551ce983302ddb3c827b3 SHA256 635d2a48a4a6d612393768b85be8454e63ee12ee4b2db851d22931d0b692526d
 MISC metadata.xml 553 RMD160 f8bf00291af94065bc4b5604d5f695d3814502d1 SHA1 51444cb1c8d735dc66b5c7b433509f470121edfb SHA256 6ab5bdd882bc36abb113b5c22df7c2daf35d1df8fcd9a1555fb9665959cd0aaa
diff --git a/sci-libs/libghemical/files/libghemical-gcc43.patch b/sci-libs/libghemical/files/libghemical-gcc43.patch
new file mode 100644
index 000000000000..53db5fba4d90
--- /dev/null
+++ b/sci-libs/libghemical/files/libghemical-gcc43.patch
@@ -0,0 +1,21 @@
+--- src/atom.h.orig	2008-06-09 03:59:34.262567972 -0500
++++ src/atom.h	2008-06-09 04:00:07.136698792 -0500
+@@ -10,6 +10,8 @@
+ #ifndef ATOM_H
+ #define ATOM_H
+ 
++#include <cstdlib>
++#include <cstring>
+ #include "libghemicaldefine.h"
+ #include "libghemicalconfig2.h"
+ 
+--- src/notice.h.orig	2008-06-09 04:00:24.472509840 -0500
++++ src/notice.h	2008-06-09 04:00:44.608265748 -0500
+@@ -10,6 +10,7 @@
+ #ifndef NOTICE_H
+ #define NOTICE_H
+ 
++#include <cstring>
+ #include "libghemicaldefine.h"
+ #include "libghemicalconfig2.h"
+ 
diff --git a/sci-libs/libghemical/libghemical-2.00.ebuild b/sci-libs/libghemical/libghemical-2.00.ebuild
index cdec23e108ba..3ef8159648c9 100644
--- a/sci-libs/libghemical/libghemical-2.00.ebuild
+++ b/sci-libs/libghemical/libghemical-2.00.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libghemical/libghemical-2.00.ebuild,v 1.4 2006/11/24 21:49:01 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libghemical/libghemical-2.00.ebuild,v 1.5 2008/06/09 09:15:45 je_fro Exp $
 
 inherit autotools eutils
 
@@ -20,7 +20,7 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/${PV}-really-find-blas-and-lapack.patch
+	epatch "${FILESDIR}"/${PV}-really-find-blas-and-lapack.patch
 	cd "${S}"
 	eautoreconf
 }
diff --git a/sci-libs/libghemical/libghemical-2.10.ebuild b/sci-libs/libghemical/libghemical-2.10.ebuild
index 5291c9ce940f..575e8d804d68 100644
--- a/sci-libs/libghemical/libghemical-2.10.ebuild
+++ b/sci-libs/libghemical/libghemical-2.10.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libghemical/libghemical-2.10.ebuild,v 1.2 2007/07/13 06:57:50 mr_bones_ Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libghemical/libghemical-2.10.ebuild,v 1.3 2008/06/09 09:15:45 je_fro Exp $
+inherit autotools
 DESCRIPTION="Chemical quantum mechanics and molecular mechanics"
 HOMEPAGE="http://bioinformatics.org/ghemical/"
 SRC_URI="http://www.bioinformatics.org/ghemical/download/${P}.tar.gz"
@@ -21,6 +21,7 @@ RDEPEND="mopac7? ( sci-chemistry/mopac7 )
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-gcc43.patch
 	eautoreconf
 }