Version bump and gcc-4.3 fix by Joel on bug #250423.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

5 files changed, 157 insertions, 3 deletions

diff --git a/sci-chemistry/mead/ChangeLog b/sci-chemistry/mead/ChangeLog
index 8a577d02676b..1ce6d8627466 100644
--- a/sci-chemistry/mead/ChangeLog
+++ b/sci-chemistry/mead/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-chemistry/mead
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mead/ChangeLog,v 1.5 2007/02/22 14:44:24 peper Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mead/ChangeLog,v 1.6 2009/02/15 22:57:07 dirtyepic Exp $
+
+*mead-2.2.7 (15 Feb 2009)
+
+  15 Feb 2009; Ryan Hill <dirtyepic@gentoo.org>
+  +files/mead-2.2.7-gcc43.patch, +files/mead-2.2.7-respect-cflags.patch,
+  +mead-2.2.7.ebuild:
+  Version bump and gcc-4.3 fix by Joel on bug #250423.
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org>
   files/digest-mead-2.2.5, Manifest:
diff --git a/sci-chemistry/mead/Manifest b/sci-chemistry/mead/Manifest
index 37d00865f7e0..9e5cc8123734 100644
--- a/sci-chemistry/mead/Manifest
+++ b/sci-chemistry/mead/Manifest
@@ -1,5 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX mead-2.2.7-gcc43.patch 469 RMD160 26b213e10918cd5cca859d231220a36d6d5d00d6 SHA1 37f2b71fe72a81a429b9ea9dff22edecd88c6c1b SHA256 00761d07cbe4445ba3fbccfaff23b43d2de133857181b242f60a9608841c91da
+AUX mead-2.2.7-respect-cflags.patch 2229 RMD160 da621223ba4ae992046f2ecf7877547c6c6d9285 SHA1 54b0d3cf3b460aaefbd47c4e1a92fc3cf75754df SHA256 a336e59311c312c15f636b9242fc1602b8d8b4662aeae869fdef8ed120170ba2
 AUX respect-cflags.patch 2202 RMD160 46983e0a9a550a1674f4f17125f1ba558c2d7ad3 SHA1 94e3f8b732def4ec3bd08e0f7270c91cdd3ee7dd SHA256 78cbb06d6857db50cb7680eb0e84e68a8042085067d6f70d0afc8ffa95b62e03
 DIST mead-2.2.5.tar.gz 769751 RMD160 32dbaec5fd85cc1227b31738a2609a538e314027 SHA1 e276b07422f54606adb130e262bc5a85c75c1a02 SHA256 58588ee9dc15088390afb5111a19030224e85cc2e0594f958e4beee86c511ee7
+DIST mead-2.2.7.tar.gz 806319 RMD160 9adf9743e44061779f9ac3b9064abb9164ad3e58 SHA1 6d3bbda29a5f8fdf26600e036ca8debacc37b90e SHA256 fd2a4b357bbd847ac9b255563034d7e71bf16cf59efa371d966b6fbbe9b4cd7c
 EBUILD mead-2.2.5.ebuild 1085 RMD160 2be28dacc57068f752587109a72f335eb88f395b SHA1 4772b574d29e342a9f4413d5c052c550048abf9f SHA256 2b9ac47b87910601b95e48996f282a129caae622aba41013dc7802b780290358
-MISC ChangeLog 933 RMD160 b9102f2b1abc8444e51bf544f6f96796b3c3c8c3 SHA1 80efcaa3dece9f8bd58028a69fdca26098c2a57f SHA256 8f312a639ecba461358d793d821ef470604c0c62c2e4871551f0f5dae2b7c2bd
+EBUILD mead-2.2.7.ebuild 1239 RMD160 98ef06407f2e41e6fb1eda62fd7301a36043ea68 SHA1 67a201727ee30cbaabb1f6e2b5e9fa82e6fa4d16 SHA256 a7b1af90abcac215dd992941b6e7e5efce4b7fe65170f4cc77c3e0aebda4ea34
+MISC ChangeLog 1163 RMD160 c06eb84f8584f511063e85ca03e8ece6bf727b00 SHA1 44169c54ff698ed8da2791c5fbb4b07675537e3c SHA256 bb60c4d91740461d760f72817236e8c07893dc1a8a39f4b8cc41e4e520683b68
 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.10 (GNU/Linux)
+
+iEYEARECAAYFAkmYnhoACgkQiqiDRvmkBmKRiACfWA31ESvdmxZcZ5dDauLP8AGi
+8K8AoOP3IZO002lOHXCq8YbqNb+CkPuj
+=GDIi
+-----END PGP SIGNATURE-----
diff --git a/sci-chemistry/mead/files/mead-2.2.7-gcc43.patch b/sci-chemistry/mead/files/mead-2.2.7-gcc43.patch
new file mode 100644
index 000000000000..673f25890e74
--- /dev/null
+++ b/sci-chemistry/mead/files/mead-2.2.7-gcc43.patch
@@ -0,0 +1,22 @@
+--- mead-2.2.7.orig/libmead/AtomSet.h
++++ mead-2.2.7/libmead/AtomSet.h
+@@ -31,8 +31,7 @@
+ 
+ #include <map>
+ #include <list>
+-#include <string>
+-using std::string;
++#include <string.h>
+ #include "MEAD/Atom.h"
+ #include "MEAD/Coord.h"
+ #include "MEAD/AtomID.h"
+--- mead-2.2.7.orig/libmead/DielCubeRep.h
++++ mead-2.2.7/libmead/DielCubeRep.h
+@@ -31,6 +31,7 @@
+ 
+ #include "MEAD/CubeLatSpec.h"
+ #include "MEAD/globals.h"
++#include <string.h>
+ 
+ class DielCubeRep {
+ public:
diff --git a/sci-chemistry/mead/files/mead-2.2.7-respect-cflags.patch b/sci-chemistry/mead/files/mead-2.2.7-respect-cflags.patch
new file mode 100644
index 000000000000..61c54737778e
--- /dev/null
+++ b/sci-chemistry/mead/files/mead-2.2.7-respect-cflags.patch
@@ -0,0 +1,57 @@
+diff -Naur mead-2.2.7-orig/apps/libmso/Makefile.in mead-2.2.7/apps/libmso/Makefile.in
+--- mead-2.2.7-orig/apps/libmso/Makefile.in	2004-12-10 14:33:49.000000000 -0600
++++ mead-2.2.7/apps/libmso/Makefile.in	2009-02-15 16:32:40.000000000 -0600
+@@ -35,8 +35,8 @@
+ INSTALL_PROGRAM	= @INSTALL_PROGRAM@
+ 
+ ALL_CPPFLAGS	= -I. $(LOCALINCS) $(CPPFLAGS) $(REGEX_CPP) $(CXX_DEFS)
+-ALL_CXXFLAGS	= $(CXX_OPTFLAGS) $(CXX_DEBUGFLAGS)
+-ALL_CFLAGS	= $(CC_DEBUGFLAGS) $(CC_OPTFLAGS)
++ALL_CXXFLAGS	= @CXXFLAGS@
++ALL_CFLAGS	= @CFLAGS@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cc .o
+diff -Naur mead-2.2.7-orig/apps/Makefile.common.in mead-2.2.7/apps/Makefile.common.in
+--- mead-2.2.7-orig/apps/Makefile.common.in	2004-11-19 16:49:56.000000000 -0600
++++ mead-2.2.7/apps/Makefile.common.in	2009-02-15 16:32:22.000000000 -0600
+@@ -36,10 +36,10 @@
+ LIBS		= @LIBS@ -lm
+ 
+ ALL_CPPFLAGS	= -I. $(LOCALINCS) $(CPPFLAGS) $(REGEX_CPP) $(CXX_DEFS)
+-ALL_CXXFLAGS	= $(CXX_OPTFLAGS) $(CXX_DEBUGFLAGS)
+-ALL_CFLAGS	= $(CC_DEBUGFLAGS) $(CC_OPTFLAGS)
++ALL_CXXFLAGS	= @CXXFLAGS@
++ALL_CFLAGS	= @CFLAGS@
+ 
+-CXXLINK = $(CXX) $(ALL_CPPFLAGS) $(CXX_DEBUGFLAGS) $(CXX_OPTFLAGS) \
++CXXLINK = $(CXX) $(ALL_CPPFLAGS) @CXXFLAGS@ \
+            $(LDFLAGS)
+ 
+ .SUFFIXES: .cc .o
+diff -Naur mead-2.2.7-orig/libmead/Makefile.in mead-2.2.7/libmead/Makefile.in
+--- mead-2.2.7-orig/libmead/Makefile.in	2008-03-04 14:18:22.000000000 -0600
++++ mead-2.2.7/libmead/Makefile.in	2009-02-15 16:31:56.000000000 -0600
+@@ -99,8 +99,8 @@
+ INCLUDES	= -I$(top_srcdir)
+ 
+ ALL_CPPFLAGS	= $(INCLUDES) $(CPPFLAGS) $(REGEX_CPP) $(CXX_DEFS)
+-ALL_CXXFLAGS	= $(CXX_OPTFLAGS) $(CXX_DEBUGFLAGS) $(CXX_SHAREDFLAGS)
+-ALL_CFLAGS	= $(CC_DEBUGFLAGS) $(CC_OPTFLAGS)
++ALL_CXXFLAGS	= @CXXFLAGS@
++ALL_CFLAGS	= @CFLAGS@
+ 
+ 
+ 
+diff -Naur mead-2.2.7-orig/swig/Makefile.in mead-2.2.7/swig/Makefile.in
+--- mead-2.2.7-orig/swig/Makefile.in	2007-11-27 15:57:17.000000000 -0600
++++ mead-2.2.7/swig/Makefile.in	2009-02-15 16:34:35.000000000 -0600
+@@ -58,7 +58,7 @@
+ CXX_FLAGS	= @CXX_NOOPTFLAGS@ @CXX_DEBUGFLAGS@ @CXX_SHAREDFLAGS@
+ CXX_DYNLIB_FLAGS = @CXX_DYNLIB_FLAGS@
+ 
+-ALL_CXXFLAGS	= $(CPP_FLAGS) $(CXX_FLAGS)
++ALL_CXXFLAGS	= $(CPP_FLAGS) @CXXFLAGS@ @CXX_SHAREDFLAGS@
+ 
+ MEADINC		= -I$(top_srcdir) -I$(srcdir)
+ MEADLIBS	= -L../libmead -lmead
diff --git a/sci-chemistry/mead/mead-2.2.7.ebuild b/sci-chemistry/mead/mead-2.2.7.ebuild
new file mode 100644
index 000000000000..265c0e911604
--- /dev/null
+++ b/sci-chemistry/mead/mead-2.2.7.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mead/mead-2.2.7.ebuild,v 1.1 2009/02/15 22:57:07 dirtyepic Exp $
+
+inherit eutils python
+
+DESCRIPTION="Macroscopic Electrostatics with Atomic Detail"
+HOMEPAGE="http://www.scripps.edu/mb/bashford/"
+SRC_URI="ftp://ftp.scripps.edu/pub/bashford/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+
+IUSE="python"
+
+RESTRICT="fetch"
+
+RDEPEND="python? ( dev-python/numeric )"
+DEPEND="${RDEPEND}
+	python? ( dev-lang/swig )"
+
+pkg_nofetch() {
+	elog "Download ${SRC_URI}"
+	elog "and place it in ${DISTDIR}."
+	elog
+	elog "Use \"anonymous\" as a login, and an email address as a password."
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-respect-cflags.patch
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+}
+
+src_compile() {
+	if use python; then
+		python_version
+		conf_opts="${conf_opts} --with-py-site-packages-dir=${D}/usr/$(get_libdir)/python${PYVER}/site-packages"
+	fi
+
+	econf \
+		$(use_with python) \
+		${conf_opts} \
+		|| die "configure failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	# package hates emake DESTDIR="${D}" install
+	einstall || die "install failed"
+}