slepc: refine version constraints for petsc 3.8 (#5752)

1 files changed, 8 insertions, 4 deletions

diff --git a/var/spack/repos/builtin/packages/slepc/package.py b/var/spack/repos/builtin/packages/slepc/package.py
index d0ea038c2e..0d2aa9018d 100644
--- a/var/spack/repos/builtin/packages/slepc/package.py
+++ b/var/spack/repos/builtin/packages/slepc/package.py
@@ -39,22 +39,26 @@ class Slepc(Package):
     version('3.7.1', '670216f263e3074b21e0623c01bc0f562fdc0bffcd7bd42dd5d8edbe73a532c2')
     version('3.6.3', '384939d009546db37bc05ed81260c8b5ba451093bf891391d32eb7109ccff876')
     version('3.6.2', '2ab4311bed26ccf7771818665991b2ea3a9b15f97e29fd13911ab1293e8e65df')
+    version('develop', git='https://bitbucket.org/slepc/slepc.git')
 
     variant('arpack', default=True, description='Enables Arpack wrappers')
 
     # NOTE: make sure PETSc and SLEPc use the same python.
     depends_on('python@2.6:2.8', type='build')
-    depends_on('petsc@3.7:', when='@3.7.1:')
+    # Cannot mix release and development versions of SLEPc and PETSc:
+    depends_on('petsc@develop', when='@develop')
+    depends_on('petsc@3.8:3.8.99', when='@3.8:3.8.99')
+    depends_on('petsc@3.7:3.7.7', when='@3.7.1:3.7.4')
     depends_on('petsc@3.6.3:3.6.4', when='@3.6.2:3.6.3')
     depends_on('arpack-ng~mpi', when='+arpack^petsc~mpi~int64')
     depends_on('arpack-ng+mpi', when='+arpack^petsc+mpi~int64')
 
     patch('install_name_371.patch', when='@3.7.1')
 
-    def install(self, spec, prefix):
-        if spec.satisfies('+arpack^petsc+int64'):
-            raise RuntimeError('Arpack can not be used with 64bit integers.')
+    # Arpack can not be used with 64bit integers.
+    conflicts('+arpack', when='^petsc+int64')
 
+    def install(self, spec, prefix):
         # set SLEPC_DIR for installation
         # Note that one should set the current (temporary) directory instead
         # its symlink in spack/stage/ !