Restricting test because it requires pre-installation of gerris. Added more mpi flag requirements, and a patch to compile with hypre when mpi is not set

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

4 files changed, 45 insertions, 10 deletions

diff --git a/sci-libs/gerris/ChangeLog b/sci-libs/gerris/ChangeLog
index f309725de1de..5ba4ef95b6e1 100644
--- a/sci-libs/gerris/ChangeLog
+++ b/sci-libs/gerris/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/gerris
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gerris/ChangeLog,v 1.16 2012/08/02 21:30:17 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gerris/ChangeLog,v 1.17 2012/08/08 17:11:25 bicatali Exp $
+
+  08 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/gerris-hypre-no-mpi.patch, gerris-20120731.ebuild:
+  Restricting test because it requires pre-installation of gerris. Added more
+  mpi flag requirements, and a patch to compile with hypre when mpi is not set
 
 *gerris-20120731 (02 Aug 2012)
 
diff --git a/sci-libs/gerris/Manifest b/sci-libs/gerris/Manifest
index de0cda624f01..b7e42f98cc16 100644
--- a/sci-libs/gerris/Manifest
+++ b/sci-libs/gerris/Manifest
@@ -3,18 +3,19 @@ Hash: SHA256
 
 AUX gerris-20100519-autotools.patch 1414 SHA256 bd758909b58ca74def5f9f962afddf4db0edb4ed68c16abdf2e12dfa9a3ee4dd SHA512 1dc7148a3f2d2bd19ba62a6760a0d331ac6dd2e5327bae76fb6032159743edbb4ddbe65ca7be0878930261bc224b3a47a375cf7d9db13682634c173a6c287323 WHIRLPOOL 99ff8c798d1894336370c653fb1d816205ecdcac474ffe21bcd56b43e9dec243b84e1e28d04e84d809d1da9e4e90f087c5b27b0c624a1fc6090bc3b80dc0969a
 AUX gerris-20111123-autotools.patch 3249 SHA256 8c485a120ed850406158e850ebe8e3e51a91085f938bbf1cd7d6d711ba51895e SHA512 5594a5ecd79504dc94ebd7f8a4d3efa6474a00e3b92d8938011f74afb32af7863bd031fc6b9324f78aa00bfdb1d546276bf88951897313316a8c819a3c1c1d54 WHIRLPOOL ac9f9b63b1c9a026c837091041657c64ef759acea52c37d62821734b9b29d4b3e1bfce346f2b3cc523f3bb965f255972456a0e8e31df6e6ede433e9a99cd9b59
+AUX gerris-hypre-no-mpi.patch 730 SHA256 a0d1df524a28c2ac9762475c448e5d317d6cbb2ade4a215f69ec939a936849dc SHA512 f2c58747496b5d5e94da30f53fb5598aba5a868399e14e9c009fba935a6697eca8efe352877ca0502b29459d39de4fdf483a0319e0f8c1dfdf5b8984ecc4f846 WHIRLPOOL 347877817f73d31cdd79497d6b3b323c0f7ca74c9f0704c126af85103e21311073f825a7a63c1d11626f226294120ff75f229904ab54ff58d65b96978de70325
 DIST gerris-20100519.tar.gz 1285580 SHA256 110f3cbc27d5f599467a1795dcb98a41814a3598402a0aebe8f0836b1aaa39c1
 DIST gerris-20111123.tar.gz 2562693 SHA256 f9c5aab9149fd156d9347ace48c257e0a8956e5ced83e747ab3aab3601bb2863 SHA512 f9869fb0b3115709d9bfb69fe0ae0cf135c8dae8cd5582b2d0f8e19ea186cfb6d9f58f1bfbdebcf697894ba58e6d8dc1e4d5d0b96b2849e64bc7a6f6233c2587 WHIRLPOOL 8179c9b218b9fd512e0851daa268e4c7e8c01f786dff690f48cf276cfb3cb5f0576d5d6bdc7660fc4a8f22611e0dfb5134e8a727008fc9368c79ed733cd56a28
 DIST gerris-snapshot-120731.tar.gz 2640044 SHA256 2a032e3418672057d1d83a5280380241d8865d4cc1a53f7bc21e95acd3a5f8fb SHA512 7ec58b715c4e52462c8e0507d34ccf554c71b3bf3575eafd8fb59002c60dcd91a749cfc53b7a4eda1822571777736dab15b0e75594b1d97b4627f72a97defb46 WHIRLPOOL abce090c4f79ee9bf4982ca9bc673ca43c6e40488e308f37a549348eb900ca1d74a8d95b59898bd173167cb849bd5afeca1e38be300d66d711f2a9225108e410
 EBUILD gerris-20100519.ebuild 1096 SHA256 7fa430803ccde59ba2b3fe863dd40c0e5c04e43d031cf97a505ace4c9b713478 SHA512 6724a80254b9d2f036be826b27aec06a5fc094652361eb6f2add412c75b0339d7572048defbf6cc277d41cf8d239d8fcfe58c3655bb175da644c587360275b9a WHIRLPOOL b9d1af543b4edc1d68090f53afbd10e4e72e6cf201b9b7d87e6ccf95aa706e07f80a2a2a5106bb34cdf34f53b9660c0de4be15eea6b41430ed974e322d38e72d
 EBUILD gerris-20111123.ebuild 1356 SHA256 5a6fae8c8bcbfc420f39830660120aca26e7ed1fbb1e15e7052b195d5518274d SHA512 102cce1a5a3196ea25e83e81f4a7df356e19bacb67bdac7f4146caf77844e34195791479a39e6a5db07d50410532e4030d341fb60c4ffd2f71ea6c7becc7cfd5 WHIRLPOOL 659d4da4bea3a1e099c4e929c5c571b1800b2306774cac679653cddf7ee3787951e1928ed0e295c72b102e2204781e2042dff8882f315ab026bc0c3fe799cc25
-EBUILD gerris-20120731.ebuild 1279 SHA256 04b69010ebc845daf11cc258bde9d8f6bf18c7cf089a4149028291d1781f3eac SHA512 6c7b20b2ba98702f24ee57ecdca99b4b5bd193eaa11247509bf6cc6ef549b3d3934eaa4f94d0edf782ab86d7aa6b03a4034544d528afddd2da137892dc4a6791 WHIRLPOOL 7861b9edc86d2578b2479a4e2462ad5998a487e9adeb1a6e596860491aceab5a706fc6f7a6f4236854387ff452be9e458d9020dc1a44326431e7fad866119ecc
-MISC ChangeLog 3270 SHA256 78d762634ec6064468550fb97aadc4e3d25f2f6ee47b843ddc37cc8029b0c9d7 SHA512 acce7375dd027a745e10f6584abcb483ccb22a7e8873652ebf1e6faca14981c95765010a2752449a72c4e27c21975ac6683db7fbf4bee0fadb278a171f5a355e WHIRLPOOL 04ad025e7a40852a8d9f246501b635961a1709f587f686da837d42af12af1f1c7314afc8b663e9f6eaafe664be0d07d4f08747194c410dafd9f8247c168ffdb5
+EBUILD gerris-20120731.ebuild 1455 SHA256 8ec7e050508c868c49c0053068cdacc0aba3518346db241acb4e50bf433170e7 SHA512 2c58ea7023a012bbb4d6433045ab73e8842a1fe12786ccc1813fbe7721c5bd566f9684accb838d9c0dbeb48895d02300c3f9f0f54b452ef90afe6730e321a3c5 WHIRLPOOL d27b953e5e9a6e652c753c0ade8892d4660dfef60089176190d593cf5884939754fede91cc9d80c1f17138b42f076bb71917c99dab7a3fbf1a1962a3ad9b900f
+MISC ChangeLog 3543 SHA256 02d7745ce9f941687d99e90f6482fa2abb6981823d05a2375b18bcad25dbc87b SHA512 229ae65b27d4b1458057180a8f99a8c6b62ee48db68bde91450ab5e788800a859efa4020efd81d01b10d18fd1e979d525b538f3a423c7f7c8a40b05aa7af9e82 WHIRLPOOL 12ae0d1802b61686b29302ae1f64d5bd097156e213745261638002ec1e47eed62acdb8b0ce81d49e94f07258fbbd6a3f7dcecd7219417d4b77492709d315f361
 MISC metadata.xml 326 SHA256 b703973b39f55b88505f9efde23f9317c80505c82564a1c7dd9233bcb14f4d8e SHA512 b71ddea8a349b11dfc831ebf0453ff97ca247ed0b896ce0081c88f28ecbdfa2a913082c92858a0c204745fa0f41705fb67ad1f1cc47b161fd349fcba8a25c7f3 WHIRLPOOL 4f91ae67ed32b11f56bca932652ba09eb53c951c89bfa1c4ebeabd120b94e08891b58a07cc34d39d810a322f7b0a83af415aea866f56e469fe4163dc88f98a41
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAa8W4ACgkQ1ycZbhPLE2DRcwCbBQ5AXCS1o9TO/HhxvxmDUt2U
-hmsAn0Q0aA5FAgv/41ZPdY6df3FLq8V1
-=HOr5
+iEYEAREIAAYFAlAincYACgkQ1ycZbhPLE2CWMgCglhTFmDzllvj+zxkLiego4cYq
+SxwAoIiidjq+DyDwlTm0xlU3CXOKN1qe
+=EQLl
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/gerris/files/gerris-hypre-no-mpi.patch b/sci-libs/gerris/files/gerris-hypre-no-mpi.patch
new file mode 100644
index 000000000000..2e3aede8b7d6
--- /dev/null
+++ b/sci-libs/gerris/files/gerris-hypre-no-mpi.patch
@@ -0,0 +1,21 @@
+--- configure.in.orig	2012-08-08 17:19:49.374366942 +0100
++++ configure.in	2012-08-08 17:20:40.585155226 +0100
+@@ -334,7 +334,8 @@
+ 
+ # Build hypre module if HYPRE is installed
+ hypre=no
+-if test "x$use_mpicc" = "xyes" ; then # HYPRE needs MPI
++# hypre does not need mpi
++#if test "x$use_mpicc" = "xyes" ; then # HYPRE needs MPI
+    AC_CHECK_LIB(HYPRE, HYPRE_IJMatrixCreate, hypre="yes", hypre="no", [-lm])
+    if test x$hypre = xyes; then
+       AC_CHECK_HEADERS(HYPRE.h, hypre="yes", hypre="no")
+@@ -342,7 +343,7 @@
+    if test x$hypre = xno; then
+       AC_MSG_WARN([HYPRE not found. hypre Module won't be available.])
+    fi
+-fi
++#fi
+ AM_CONDITIONAL(BUILD_HYPRE, test x$hypre = xyes)
+ 
+ # Build lis module if lis is installed
diff --git a/sci-libs/gerris/gerris-20120731.ebuild b/sci-libs/gerris/gerris-20120731.ebuild
index 7732277a4ccc..82b465505371 100644
--- a/sci-libs/gerris/gerris-20120731.ebuild
+++ b/sci-libs/gerris/gerris-20120731.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gerris/gerris-20120731.ebuild,v 1.1 2012/08/02 21:30:17 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gerris/gerris-20120731.ebuild,v 1.2 2012/08/08 17:11:25 bicatali Exp $
 
 EAPI=4
 
-inherit autotools eutils flag-o-matic
+inherit eutils flag-o-matic autotools
 
 MYP=${P/-20/-snapshot-}
 
@@ -26,8 +26,8 @@ RDEPEND="dev-libs/glib:2
 	sci-libs/netcdf
 	sci-libs/gsl
 	sci-libs/gts
-	sci-libs/hypre
-	sci-libs/lis
+	sci-libs/hypre[mpi?]
+	sci-libs/lis[mpi?]
 	sci-libs/proj
 	>=sci-libs/fftw-3
 	virtual/lapack
@@ -37,6 +37,14 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MYP}"
 
+# buggy tests, need extra packages and require gerris to be installed
+RESTRICT=test
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-hypre-no-mpi.patch
+	eautoreconf
+}
+
 src_configure() {
 	append-cppflags "-I${EPREFIX}/usr/include/hypre"
 	econf \