[sci-chemistry/gromacs]: fortran fix

(Portage version: 2.1.8.3/git/Linux i686)
 (Signed Manifest commit)

6 files changed, 31 insertions, 53 deletions

diff --git a/sci-chemistry/gromacs/ChangeLog b/sci-chemistry/gromacs/ChangeLog
index e7edbc8a7..df2837949 100644
--- a/sci-chemistry/gromacs/ChangeLog
+++ b/sci-chemistry/gromacs/ChangeLog
@@ -3,6 +3,11 @@
 # $Header: $
 
   04 Jul 2010; Christoph Junghans <kleiner_otti@gmx.de>
+  gromacs-4.0.9999.ebuild, -files/gromacs-4.0.9999-ccache.patch,
+  -files/gromacs-4.0.9999-configure-gfortran.patch, gromacs-9999.ebuild:
+  make it compile without fortran again
+
+  04 Jul 2010; Christoph Junghans <kleiner_otti@gmx.de>
   gromacs-4.0.9999.ebuild, gromacs-9999.ebuild:
   Fixes for Bug #326331
 
diff --git a/sci-chemistry/gromacs/Manifest b/sci-chemistry/gromacs/Manifest
index 1daa3d7d0..9cfb151c5 100644
--- a/sci-chemistry/gromacs/Manifest
+++ b/sci-chemistry/gromacs/Manifest
@@ -1,20 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX gromacs-4.0.9999-ccache.patch 678 RMD160 043d0e207e04a275fe00a3bd2b28f8dc0dfd4b7f SHA1 08bc5ac8bc0b28f68e1ede994d49616dd920af5d SHA256 ca477d54351c418f1d39dda29373a1426c9403ec0d2f21c28fc7568227d47632
-AUX gromacs-4.0.9999-configure-gfortran.patch 760 RMD160 1700579b0c2dfb8cbb743d795aa9f0f9f467c06b SHA1 e6924d3598b20195fcb6809e64f333def5b0f919 SHA256 1a59dfde8a3db8db729bd19691a5945e02be2725fa66ec0b125ab3b931518761
 AUX gromacs-4.0.9999-docdir.patch 1352 RMD160 336ab23b4b65430caf3205650a8787e8e33d2137 SHA1 77e0cc966c4d755f603b2d0ab9a075c0ee6b7361 SHA256 8ead457b06f7f943455a95494be4648e539934699d29e955d2e05ac02f1ca4ef
 DIST ffamber_v4.0-doc.tar.gz 7915520 RMD160 aeadb18bd88bcd9e6fc45af22af15c51e32c66a3 SHA1 8d4969fa7eec660b41f769874be9698980b49ed0 SHA256 0b3395570dfe9bf808a297fcb120e1f525f38a91791fbafe6e444d542d7754aa
 DIST gmxtest-4.0.4.tgz 14845017 RMD160 c7c583415438bdef4c9996da9064254e9460cf16 SHA1 998179aa2bfbc4f80514f10ed774762f85c854c3 SHA256 6a7f787f4bb7cbecb688115ff0854a5ffd2ef33487d7bce4b031e63848b6f361
 DIST manual-4.0.pdf 2135100 RMD160 b963642f8e1433f11328c3d0c4b1645c9de506da SHA1 8ae951ee15b2a7dc626331fce36511bc8766144c SHA256 646f810477eee2d710de6019c52056550413d0ba77baf9680195c835ddafe80a
-EBUILD gromacs-4.0.9999.ebuild 9730 RMD160 925b82d95735c33dd5da45a4e56a13eebbfe4e89 SHA1 ddf83193ed3c8ef962fef4fea7a373c04c8e31c2 SHA256 0f196b40be65aefbb29f2797c000b9df9f7186c31460f7a70fd253a9b837dff9
-EBUILD gromacs-9999.ebuild 9146 RMD160 46f86959c7245fa3ae9ca52856216540f334f055 SHA1 6fa06cf36c85ef8391dde145fe0ca4514cd66662 SHA256 a8fd388f84b546c02848dd6cb3eb699d8763f3871f943af494bf0bead24c33f8
-MISC ChangeLog 4346 RMD160 398fc7ccc1ed9e330298ffe44232a1b8c11d123b SHA1 ea62ab1f5b986bc91804b24ef0bde311ac6dc452 SHA256 a193699f1d4b2e753fdee1ffff0c81669598c9a035adad2d73b1842d4cccf7cb
+EBUILD gromacs-4.0.9999.ebuild 9775 RMD160 187846ca6f4229464c3a645565ee0da713989c43 SHA1 431d4530eeb40c8ffeaed877fc1e280ed5e5a1bd SHA256 eb18957efa06404dcb0cfea0b9ee53ba1b9d18094caf39a6e76600849e0ca5d0
+EBUILD gromacs-9999.ebuild 9191 RMD160 8e0614ff83d7f13d056b3b5f19c86bc19535e26f SHA1 f4928b01cc7a71a5b230b8076f2314a001da66bb SHA256 0d0dc2ed6996ec94353b2ce8b170621206e46888f9b9c925f1978c7ceb1bc69b
+MISC ChangeLog 4581 RMD160 5de19b5b4aeeeac7f0b844b504a5bc62e6352e89 SHA1 6557568b661bd93f1b02cb0a3e7692d6d5ea5bac SHA256 b1cfbc47856ab3b028e043432da246ecab13529495ed5aa831619683f20bc38a
 MISC metadata.xml 643 RMD160 e9ffc42d792f15f3d4438a0de225277ec4814041 SHA1 c83fd4a32d896b7a2586667bc684d46f9daf8693 SHA256 177885ec674e8630a9c9451a0e0a35fc83615b39b387a67002e27f1b0d6b19b2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwwt9QACgkQy0OE/ans1/nWKQCcCqtbwZtTjeGg09D0nJWeDmDC
-vsAAnRN1QEnrQ9C6ANR9L0zG492ezQ3E
-=tA5i
+iEYEARECAAYFAkww8GcACgkQy0OE/ans1/m6JwCfcItAhw0uqiD98Aq2YYHBR6dS
+Rt4An2Gm/oWmeGMBkZRujWQ/jlsk4ezE
+=dK5g
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/gromacs/files/gromacs-4.0.9999-ccache.patch b/sci-chemistry/gromacs/files/gromacs-4.0.9999-ccache.patch
deleted file mode 100644
index 68b6a1e66..000000000
--- a/sci-chemistry/gromacs/files/gromacs-4.0.9999-ccache.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-cc is not cache by ccache (bug #302048), work around that
-
-diff --git a/configure.ac b/configure.ac
-index 3100101..db9d0b6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -288,11 +288,11 @@ AC_DEFINE_UNQUOTED([BUILD_MACHINE],["`uname -srm`"],[Hardware and OS version for
- # normally we use the default compiler, but on alpha/linux we try the compaq ones first
- case "${host_cpu}-${host_os}" in
-   alpha*-linux*)
--    cc_names="ccc cc gcc"
-+    cc_names="ccc gcc"
-     f77_names="fort f77 g77"
-     ;;
-   *) 
--    cc_names="cc icc xlc gcc"
-+    cc_names="icc xlc gcc"
-     f77_names="f77 ifort xlf xlf77 cf77 fl32 g77 fort77 f90 xlf90 pgf77 cf77 fort fort77 pgf90"
-     ;;
- esac
diff --git a/sci-chemistry/gromacs/files/gromacs-4.0.9999-configure-gfortran.patch b/sci-chemistry/gromacs/files/gromacs-4.0.9999-configure-gfortran.patch
deleted file mode 100644
index 1bf19ddf5..000000000
--- a/sci-chemistry/gromacs/files/gromacs-4.0.9999-configure-gfortran.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-enable gfortan as fortan compiler
-
-diff -Naur gromacs-4.0.4-orig/configure.ac gromacs-4.0.4/configure.ac
---- gromacs-4.0.4-orig/configure.ac	2009-04-09 21:12:31.000000000 +0200
-+++ gromacs-4.0.4/configure.ac	2009-04-09 21:13:38.000000000 +0200
-@@ -320,11 +320,11 @@
- case "${host_cpu}-${host_os}" in
-   alpha*-linux*)
-     cc_names="ccc gcc"
--    f77_names="fort f77 g77"
-+    f77_names="fort f77 g77 gfortran"
-     ;;
-   *) 
-     cc_names="icc xlc gcc"
--    f77_names="f77 ifort xlf xlf77 cf77 fl32 g77 fort77 f90 xlf90 pgf77 cf77 fort fort77 pgf90"
-+    f77_names="f77 ifort xlf xlf77 cf77 fl32 g77 fort77 f90 xlf90 pgf77 cf77 fort fort77 pgf90 gfortran"
-     ;;
- esac
- # the (non-mpi) c compiler, which is also used for programs executed during build stage
diff --git a/sci-chemistry/gromacs/gromacs-4.0.9999.ebuild b/sci-chemistry/gromacs/gromacs-4.0.9999.ebuild
index 70cad5a5f..f61c8eedf 100644
--- a/sci-chemistry/gromacs/gromacs-4.0.9999.ebuild
+++ b/sci-chemistry/gromacs/gromacs-4.0.9999.ebuild
@@ -45,6 +45,15 @@ QA_EXECSTACK="usr/lib/libgmx.so.*
 
 use static && QA_EXECSTACK="$QA_EXECSTACK usr/bin/*"
 
+pkg_setup() {
+	if use fkernels; then
+		FORTRAN="g77 gfortran ifc"
+		fortran_pkg_setup
+	else
+		FORTRANC=""
+	fi
+}
+
 src_prepare() {
 
 	( use single-precision || use double-precision ) || \
@@ -120,11 +129,9 @@ src_configure() {
 	if use fkernels; then
 		ewarn "Fortran kernels are usually not faster than C kernels and assembly"
 		ewarn "I hope, you know what are you doing..."
-		FORTRAN="g77 gfortran ifc"
-		myconf="${myconf} --enable-fortran" && fortran_pkg_setup
+		myconf="${myconf} --enable-fortran"
 	else
 		myconf="${myconf} --disable-fortran"
-		FORTRANC="true"
 	fi
 
 	# if we need external blas
diff --git a/sci-chemistry/gromacs/gromacs-9999.ebuild b/sci-chemistry/gromacs/gromacs-9999.ebuild
index c6b9acac1..b54f1998b 100644
--- a/sci-chemistry/gromacs/gromacs-9999.ebuild
+++ b/sci-chemistry/gromacs/gromacs-9999.ebuild
@@ -45,6 +45,15 @@ QA_EXECSTACK="usr/lib/libgmx.so.*
 
 use static && QA_EXECSTACK="$QA_EXECSTACK usr/bin/*"
 
+pkg_setup() {
+	if use fkernels; then
+		FORTRAN="g77 gfortran ifc"
+		fortran_pkg_setup
+	else
+		FORTRANC=""
+	fi
+}
+
 src_prepare() {
 
 	( use single-precision || use double-precision ) || \
@@ -98,11 +107,9 @@ src_configure() {
 	if use fkernels; then
 		ewarn "Fortran kernels are usually not faster than C kernels and assembly"
 		ewarn "I hope, you know what are you doing..."
-		FORTRAN="g77 gfortran ifc"
-		myconf="${myconf} --enable-fortran" && fortran_pkg_setup
+		myconf="${myconf} --enable-fortran"
 	else
 		myconf="${myconf} --disable-fortran"
-		FORTRANC="true"
 	fi
 
 	# if we need external blas