[gentoo-commits] proj/sci:master commit in: sci-chemistry/gromacs/

[Christoph Junghans]

commit:     f29955289db5fa42abcec73547a096293eb882a3
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  1 21:38:06 2013 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Sun Jun  2 17:40:26 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f2995528

sync with gx86

Package-Manager: portage-2.2.0_alpha177

---
 sci-chemistry/gromacs/ChangeLog               | 3 +++
 sci-chemistry/gromacs/gromacs-4.6.9999.ebuild | 7 +++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/sci-chemistry/gromacs/ChangeLog b/sci-chemistry/gromacs/ChangeLog
index e91c85a..9a16c48 100644
--- a/sci-chemistry/gromacs/ChangeLog
+++ b/sci-chemistry/gromacs/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  01 Jun 2013; Christoph Junghans <ottxor@g.o> gromacs-4.6.9999.ebuild:
+  sync with gx86
+
   05 May 2013; Christoph Junghans <ottxor@g.o> gromacs-4.5.9999.ebuild:
   sync with gx86
 

diff --git a/sci-chemistry/gromacs/gromacs-4.6.9999.ebuild b/sci-chemistry/gromacs/gromacs-4.6.9999.ebuild
index 7babac6..2382893 100644
--- a/sci-chemistry/gromacs/gromacs-4.6.9999.ebuild
+++ b/sci-chemistry/gromacs/gromacs-4.6.9999.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=5
 
-TEST_PV="4.6.1"
-MANUAL_PV="4.6.1"
+TEST_PV="4.6.2"
+MANUAL_PV="4.6.2"
 
 CMAKE_MAKEFILE_GENERATOR="ninja"
 
@@ -70,8 +70,7 @@ REQUIRED_USE="
 	|| ( single-precision double-precision )
 	cuda? ( single-precision )
 	openmm? ( single-precision )
-	mkl? ( !blas !fftw !lapack )
-	!openmm" #broken, but https://gerrit.gromacs.org/#/c/2087/
+	mkl? ( !blas !fftw !lapack )"
 
 DOCS=( AUTHORS README )
 HTML_DOCS=( "${ED}"/usr/share/gromacs/html/ )