Fixing bug #74976

diff --git a/sci-chemistry/ghemical/ChangeLog b/sci-chemistry/ghemical/ChangeLog
index daaaf817535a339af4fad54fb5b31d106713f07f..cf550530934ad479eb86890482b2e74a7b0d81ea 100644 (file)
--- a/sci-chemistry/ghemical/ChangeLog
+++ b/sci-chemistry/ghemical/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/ghemical
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ghemical/ChangeLog,v 1.2 2004/12/24 20:13:11 swegener Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ghemical/ChangeLog,v 1.3 2005/01/04 16:02:11 phosphan Exp $
+
+  04 Jan 2005; Patrick Kursawe <phosphan@gentoo.org> +files/gcc3.4.patch,
+  ghemical-1.00.ebuild:
+  Gets through gcc 3.4.3 now - solving bug #74976.
 
 *ghemical-1.00 (24 Dec 2004)
 

diff --git a/sci-chemistry/ghemical/Manifest b/sci-chemistry/ghemical/Manifest
index ac4385854fdbaab45653a3363b42a4fb9393711b..f3c819445262f41c4308cfc7faa4e5133a72da0f 100644 (file)
--- a/sci-chemistry/ghemical/Manifest
+++ b/sci-chemistry/ghemical/Manifest
@@ -1,14 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 980dd49ebb7d231910cc4e43e0cbd6f3 ghemical-1.00.ebuild 1080
-MD5 1f7c4b3f17e8fe12b3ca6543d47c520c ChangeLog 1392
+MD5 7eee9f49213553ee1ee395ec0d8c2384 ghemical-1.00.ebuild 1169
+MD5 605bf18d27a39277565f181822f195bf ChangeLog 1542
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 MD5 fefd85f432335b478759ce408d355480 files/digest-ghemical-1.00 63
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBzHhdI1lqEGTUzyQRAg88AKCClJ1jsEEdnorAOFAcc4mOCHtEQQCfTtio
-u17MX9OMevwzZFWjs2vWSaQ=
-=EsJ3
------END PGP SIGNATURE-----
+MD5 bdb8f7d12899a6cae19b4d7ff183c752 files/gcc3.4.patch 1112

diff --git a/sci-chemistry/ghemical/files/gcc3.4.patch b/sci-chemistry/ghemical/files/gcc3.4.patch
new file mode 100644 (file)
index 0000000..f147e44
--- /dev/null
+++ b/sci-chemistry/ghemical/files/gcc3.4.patch
@@ -0,0 +1,34 @@
+diff -ru src-old/graphics/objects.h src/graphics/objects.h
+--- src-old/graphics/objects.h 2005-01-04 16:21:49.000000000 +0100
++++ src/graphics/objects.h     2005-01-04 12:26:57.000000000 +0100
+@@ -177,7 +177,7 @@
+ {
+       protected:
+       
+-      friend obj_loc_data * dummy_object::GetLocDataRW(void) const;
++      friend class dummy_object;
+       
+       obj_loc_data * data;
+       
+diff -ru src-old/target3/t3views.cpp src/target3/t3views.cpp
+--- src-old/target3/t3views.cpp        2002-10-23 11:01:09.000000000 +0200
++++ src/target3/t3views.cpp    2005-01-04 16:22:26.000000000 +0100
+@@ -7,6 +7,7 @@
+ 
+ /*################################################################################################*/
+ 
++#include <libintl.h>
+ #include "t3views.h"
+ 
+ #include "t3main.h"
+diff -ru src-old/target3/t3main.cpp src/target3/t3main.cpp
+--- src-old/target3/t3main.cpp 2002-11-20 16:49:39.000000000 +0100
++++ src/target3/t3main.cpp     2005-01-04 16:46:44.762693881 +0100
+@@ -7,6 +7,7 @@
+ 
+ /*################################################################################################*/
+ 
++#include <libintl.h>
+ #include "t3main.h"
+ 
+ #include "t3errutil.h"

diff --git a/sci-chemistry/ghemical/ghemical-1.00.ebuild b/sci-chemistry/ghemical/ghemical-1.00.ebuild
index b3fc2360bd067b801bdc78bf3af335396810118b..8f6c3b92535de972f5ac34cb7086381bbc457057 100644 (file)
--- a/sci-chemistry/ghemical/ghemical-1.00.ebuild
+++ b/sci-chemistry/ghemical/ghemical-1.00.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ghemical/ghemical-1.00.ebuild,v 1.2 2004/12/24 16:50:58 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ghemical/ghemical-1.00.ebuild,v 1.3 2005/01/04 16:02:11 phosphan Exp $
+
+inherit eutils
 
 DESCRIPTION="Ghemical supports both quantum-mechanics (semi-empirical and ab initio) models and molecular mechanics models (there is an experimental Tripos 5.2-like force field for organic molecules). Also a tool for reduced protein models is included. Geometry optimization, molecular dynamics and a large set of visualization tools are currently available."
 HOMEPAGE="http://www.uku.fi/~thassine/ghemical/"
@@ -19,6 +21,12 @@ DEPEND="gnome-base/gnome-libs
        dev-libs/libxml
        =gnome-base/libglade-0*"
 
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+       epatch ${FILESDIR}/gcc3.4.patch
+}
+
 src_compile() {
        ./configure --prefix=/usr --enable-mpqc ||die
        emake ||die