[sci-chemistry/gromacs] Add missing patch. thanks to rei4dan

(Portage version: 2.2_rc55/cvs/Linux x86_64)

3 files changed, 88 insertions, 5 deletions

diff --git a/sci-chemistry/gromacs/ChangeLog b/sci-chemistry/gromacs/ChangeLog
index 1037295874ef..3ae9ace46de7 100644
--- a/sci-chemistry/gromacs/ChangeLog
+++ b/sci-chemistry/gromacs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/gromacs
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gromacs/ChangeLog,v 1.46 2009/12/07 20:51:47 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gromacs/ChangeLog,v 1.47 2009/12/08 15:08:23 alexxy Exp $
+
+  08 Dec 2009; Alexey Shvetsov <alexxy@gentoo.org>
+  +files/gromacs-4.0.7-docdir.patch:
+  Add missing patch. thanks to rei4dan
 
 *gromacs-4.0.7 (07 Dec 2009)
 
diff --git a/sci-chemistry/gromacs/files/gromacs-4.0.7-docdir.patch b/sci-chemistry/gromacs/files/gromacs-4.0.7-docdir.patch
new file mode 100644
index 000000000000..b556947b9c2c
--- /dev/null
+++ b/sci-chemistry/gromacs/files/gromacs-4.0.7-docdir.patch
@@ -0,0 +1,72 @@
+diff -Naur gromacs-4.0.5.orig/share/html/Makefile.am gromacs-4.0.5/share/html/Makefile.am
+--- gromacs-4.0.5.orig/share/html/Makefile.am	2006-03-06 10:52:20.000000000 +0100
++++ gromacs-4.0.5/share/html/Makefile.am	2009-11-29 22:27:24.000000000 +0100
+@@ -4,7 +4,7 @@
+ #
+ SUBDIRS = .  images  online
+ 
+-htmldir = ${pkgdatadir}/html
++htmldir = @htmldir@/html
+ 
+ html_DATA = online.html gmxfaq.html
+ 
+diff -Naur gromacs-4.0.5.orig/share/html/Makefile.in gromacs-4.0.5/share/html/Makefile.in
+--- gromacs-4.0.5.orig/share/html/Makefile.in	2009-05-09 11:12:24.000000000 +0200
++++ gromacs-4.0.5/share/html/Makefile.in	2009-11-29 22:28:16.000000000 +0100
+@@ -172,7 +172,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+-htmldir = ${pkgdatadir}/html
++htmldir = @htmldir@/html
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+diff -Naur gromacs-4.0.5.orig/share/html/images/Makefile.am gromacs-4.0.5/share/html/images/Makefile.am
+--- gromacs-4.0.5.orig/share/html/images/Makefile.am	2006-03-06 10:52:20.000000000 +0100
++++ gromacs-4.0.5/share/html/images/Makefile.am	2009-11-29 23:00:57.000000000 +0100
+@@ -2,7 +2,7 @@
+ #
+ # Don't edit - this file is generated automatically from Makefile.am
+ #
+-imagedir = ${pkgdatadir}/html/images
++imagedir = @htmldir@/html/images
+ 
+ image_DATA = \
+ 	features.gif					\
+diff -Naur gromacs-4.0.5.orig/share/html/images/Makefile.in gromacs-4.0.5/share/html/images/Makefile.in
+--- gromacs-4.0.5.orig/share/html/images/Makefile.in	2009-05-09 11:12:24.000000000 +0200
++++ gromacs-4.0.5/share/html/images/Makefile.in	2009-11-29 23:01:20.000000000 +0100
+@@ -186,7 +186,7 @@
+ #
+ # Don't edit - this file is generated automatically from Makefile.am
+ #
+-imagedir = ${pkgdatadir}/html/images
++imagedir = @htmldir@/html/images
+ image_DATA = \
+ 	features.gif					\
+ 	flow_leftrightup.gif	flow_vrule.gif 		\
+diff -Naur gromacs-4.0.5.orig/share/html/online/Makefile.am gromacs-4.0.5/share/html/online/Makefile.am
+--- gromacs-4.0.5.orig/share/html/online/Makefile.am	2008-08-11 11:46:17.000000000 +0200
++++ gromacs-4.0.5/share/html/online/Makefile.am	2009-11-29 23:01:47.000000000 +0100
+@@ -2,7 +2,7 @@
+ #
+ # Don't edit - this file is generated automatically from Makefile.am
+ #
+-onlinedir = ${pkgdatadir}/html/online
++onlinedir = @htmldir@/html/online
+ 
+ online_DATA = \
+   cpt.html	\
+diff -Naur gromacs-4.0.5.orig/share/html/online/Makefile.in gromacs-4.0.5/share/html/online/Makefile.in
+--- gromacs-4.0.5.orig/share/html/online/Makefile.in	2009-05-09 11:12:24.000000000 +0200
++++ gromacs-4.0.5/share/html/online/Makefile.in	2009-11-29 23:02:15.000000000 +0100
+@@ -186,7 +186,7 @@
+ #
+ # Don't edit - this file is generated automatically from Makefile.am
+ #
+-onlinedir = ${pkgdatadir}/html/online
++onlinedir = @htmldir@/html/online
+ online_DATA = \
+   cpt.html	\
+   dat.html           g_disre.html      g_sorient.html        ndx.html        \
diff --git a/sci-chemistry/gromacs/gromacs-4.0.7.ebuild b/sci-chemistry/gromacs/gromacs-4.0.7.ebuild
index f1f63cee3a47..5b6f1bd4093d 100644
--- a/sci-chemistry/gromacs/gromacs-4.0.7.ebuild
+++ b/sci-chemistry/gromacs/gromacs-4.0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gromacs/gromacs-4.0.7.ebuild,v 1.1 2009/12/07 20:51:47 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gromacs/gromacs-4.0.7.ebuild,v 1.2 2009/12/08 15:08:23 alexxy Exp $
 
 EAPI="2"
 
@@ -92,8 +92,9 @@ src_configure() {
 	fi
 
 	if [[ $(gcc-version) == "4.1" ]]; then
-		ewarn "gcc 4.1 is not supported by gromacs"
-		ewarn "please run test suite"
+		eerror "gcc 4.1 is not supported by gromacs"
+		eerror "please run test suite"
+		die
 	fi
 
 	#note for gentoo-PREFIX on apple: use --enable-apple-64bit
@@ -121,6 +122,13 @@ src_configure() {
 		myconf="${myconf} $(use_with lapack external-lapack)"
 	fi
 
+	# by default its better to have dynamicaly linked binaries
+	if use static; then
+		myconf="${myconf} $(use_enable static all-static)"
+	else
+		myconf="${myconf} --enable-shared"
+	fi
+
 	myconf="--datadir=/usr/share \
 			--bindir=/usr/bin \
 			--libdir=/usr/$(get_libdir) \
@@ -130,7 +138,6 @@ src_configure() {
 			$(use_with gsl) \
 			$(use_with X x) \
 			$(use_with xml) \
-			$(use_enable static all-static) \
 			${myconf}"
 
 	#if we build single and double - double is suffixed