Add urls into cbtf* and openspeedshop* package files and update the release versions for the Krell products (#8188)

8 files changed, 121 insertions, 112 deletions

diff --git a/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py b/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py
index 8ba4e23267..4f2d7645e8 100644
--- a/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py
+++ b/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py
@@ -48,18 +48,16 @@ class CbtfArgonavisGui(QMakePackage):
        performance information by loading in the Sqlite database files.
     """
     homepage = "http://sourceforge.net/p/cbtf/wiki/Home/"
+    url = "https://github.com/OpenSpeedShop/cbtf-argonavis-gui.git"
 
     version('1.3.0.0', branch='1.3.0.0',
             git='https://github.com/OpenSpeedShop/cbtf-argonavis-gui.git')
 
-    version('1.3.0', branch='master',
-            git='https://github.com/OpenSpeedShop/cbtf-argonavis-gui.git')
-
     version('develop', branch='master',
             git='https://github.com/OpenSpeedShop/cbtf-argonavis-gui.git')
 
     depends_on("cmake@3.0.2:", when='@develop', type='build')
-    depends_on("cmake@3.11.1", when='@1.3.0.0', type='build')
+    depends_on("cmake@3.11.1", when='@1.3.0.0:', type='build')
 
     # To specify ^elfutils@0.170 on the command line spack
     # apparently needs/wants this dependency explicity here
@@ -67,36 +65,36 @@ class CbtfArgonavisGui(QMakePackage):
     depends_on("elf", type="link")
 
     depends_on('qt@4.8.6:', when='@develop')
-    depends_on('qt@5.10.0', when='@1.3.0.0')
+    depends_on('qt@5.10.0', when='@1.3.0.0:')
 
     depends_on("boost@1.50.0:", when='@develop')
-    depends_on("boost@1.66.0", when='@1.3.0.0')
+    depends_on("boost@1.66.0", when='@1.3.0.0:')
 
     # For MRNet
     depends_on("mrnet@5.0.1-3:+lwthreads", when='@develop')
-    depends_on("mrnet@5.0.1-3+lwthreads", when='@1.3.0.0')
+    depends_on("mrnet@5.0.1-3+lwthreads", when='@1.3.0.0:')
 
     # Dependencies for the openspeedshop cbtf packages.
     depends_on("cbtf@develop", when='@develop')
-    depends_on("cbtf@1.9.1.0", when='@1.3.0.0')
+    depends_on("cbtf@1.9.1.0:", when='@1.3.0.0:')
 
     depends_on("cbtf-krell@develop", when='@develop')
-    depends_on("cbtf-krell@1.9.1.0", when='@1.3.0.0')
+    depends_on("cbtf-krell@1.9.1.0:", when='@1.3.0.0:')
 
     depends_on("cbtf-argonavis@develop", when='@develop')
-    depends_on("cbtf-argonavis@1.9.1.0", when='@1.3.0.0')
+    depends_on("cbtf-argonavis@1.9.1.0:", when='@1.3.0.0:')
 
     depends_on("cuda")
 
     depends_on("openspeedshop-utils+cuda@develop", when='@develop')
-    depends_on("openspeedshop-utils@2.3.1.3+cuda", when='@1.3.0.0')
+    depends_on("openspeedshop-utils@2.3.1.3:+cuda", when='@1.3.0.0:')
 
     # For Xerces-C
     depends_on("xerces-c@3.1.1:", when='@develop')
-    depends_on("xerces-c@3.1.4", when='@1.3.0.0')
+    depends_on("xerces-c@3.1.4", when='@1.3.0.0:')
 
     depends_on("graphviz@2.40.1:", when='@develop')
-    depends_on("graphviz@2.40.1", when='@1.3.0.0')
+    depends_on("graphviz@2.40.1", when='@1.3.0.0:')
 
     depends_on("qtgraph")
 
diff --git a/var/spack/repos/builtin/packages/cbtf-argonavis/package.py b/var/spack/repos/builtin/packages/cbtf-argonavis/package.py
index 0bffad266c..62b42dc6da 100644
--- a/var/spack/repos/builtin/packages/cbtf-argonavis/package.py
+++ b/var/spack/repos/builtin/packages/cbtf-argonavis/package.py
@@ -49,11 +49,12 @@ class CbtfArgonavis(CMakePackage):
 
     """
     homepage = "http://sourceforge.net/p/cbtf/wiki/Home/"
+    url = "https://github.com/OpenSpeedShop/cbtf-argonavis.git"
 
-    version('1.9.1.0', branch='1.9.1.0',
+    version('1.9.1.1', branch='1.9.1.1',
             git='https://github.com/OpenSpeedShop/cbtf-argonavis.git')
 
-    version('1.9.1', branch='master',
+    version('1.9.1.0', branch='1.9.1.0',
             git='https://github.com/OpenSpeedShop/cbtf-argonavis.git')
 
     version('develop', branch='master',
@@ -69,7 +70,8 @@ class CbtfArgonavis(CMakePackage):
     variant('build_type', default='None', values=('None'),
             description='CMake build type')
 
-    depends_on("cmake@3.0.2:", type='build')
+    depends_on("cmake@3.11.1", when='@1.9.1.0:', type='build')
+    depends_on("cmake@3.0.2:", when='@develop', type='build')
 
     # To specify ^elfutils@0.170 on the command line spack
     # apparently needs/wants this dependency explicity here
@@ -78,42 +80,42 @@ class CbtfArgonavis(CMakePackage):
 
     # For boost
     depends_on("boost@1.50.0:", when='@develop')
-    depends_on("boost@1.66.0", when='@1.9.1.0')
+    depends_on("boost@1.66.0", when='@1.9.1.0:')
 
     # For MRNet
     depends_on("mrnet@5.0.1-3:+cti", when='@develop+cti')
     depends_on("mrnet@5.0.1-3:+lwthreads", when='@develop~cti')
-    depends_on("mrnet@5.0.1-3+cti", when='@1.9.1.0+cti')
-    depends_on("mrnet@5.0.1-3+lwthreads", when='@1.9.1.0~cti')
+    depends_on("mrnet@5.0.1-3+cti", when='@1.9.1.0:+cti')
+    depends_on("mrnet@5.0.1-3+lwthreads", when='@1.9.1.0:~cti')
 
     # For CBTF
     depends_on("cbtf@develop", when='@develop')
-    depends_on("cbtf@1.9.1.0", when='@1.9.1.0')
+    depends_on("cbtf@1.9.1.0:", when='@1.9.1.0:')
 
     # For CBTF with cti
     depends_on("cbtf@develop+cti", when='@develop+cti')
-    depends_on("cbtf@1.9.1.0+cti", when='@1.9.1.0+cti')
+    depends_on("cbtf@1.9.1.0:+cti", when='@1.9.1.0:+cti')
 
     # For CBTF with runtime
     depends_on("cbtf@develop+runtime", when='@develop+runtime')
-    depends_on("cbtf@1.9.1.0+runtime", when='@1.9.1.0+runtime')
+    depends_on("cbtf@1.9.1.0:+runtime", when='@1.9.1.0:+runtime')
 
     # For libmonitor
     depends_on("libmonitor+krellpatch")
 
     # For PAPI
     depends_on("papi", when='@develop')
-    depends_on("papi@5.5.1", when='@1.9.1.0')
+    depends_on("papi@5.5.1", when='@1.9.1.0:')
 
     # For CBTF-KRELL
     depends_on("cbtf-krell@develop", when='@develop')
-    depends_on("cbtf-krell@1.9.1.0", when='@1.9.1.0')
+    depends_on("cbtf-krell@1.9.1.0:", when='@1.9.1.0:')
 
     depends_on('cbtf-krell@develop+cti', when='@develop+cti')
-    depends_on('cbtf-krell@1.9.1.0+cti', when='@1.9.1.0+cti')
+    depends_on('cbtf-krell@1.9.1.0:+cti', when='@1.9.1.0:+cti')
 
     depends_on('cbtf-krell@develop+runtime', when='@develop+runtime')
-    depends_on('cbtf-krell@1.9.1.0+runtime', when='@1.9.1.0+runtime')
+    depends_on('cbtf-krell@1.9.1.0:+runtime', when='@1.9.1.0:+runtime')
 
     # For CUDA
     depends_on("cuda")
diff --git a/var/spack/repos/builtin/packages/cbtf-krell/package.py b/var/spack/repos/builtin/packages/cbtf-krell/package.py
index 5baaa2ba98..e7da53d7ba 100644
--- a/var/spack/repos/builtin/packages/cbtf-krell/package.py
+++ b/var/spack/repos/builtin/packages/cbtf-krell/package.py
@@ -41,6 +41,7 @@
 ##########################################################################
 
 from spack import *
+import spack
 import spack.store
 
 
@@ -52,11 +53,12 @@ class CbtfKrell(CMakePackage):
 
     """
     homepage = "http://sourceforge.net/p/cbtf/wiki/Home/"
+    url = "https://github.com/OpenSpeedShop/cbtf-krell.git"
 
-    version('1.9.1.0', branch='1.9.1.0',
+    version('1.9.1.1', branch='1.9.1.1',
             git='https://github.com/OpenSpeedShop/cbtf-krell.git')
 
-    version('1.9.1', branch='master',
+    version('1.9.1.0', branch='1.9.1.0',
             git='https://github.com/OpenSpeedShop/cbtf-krell.git')
 
     version('develop', branch='master',
@@ -86,51 +88,52 @@ class CbtfKrell(CMakePackage):
                          to point to target build.")
 
     # Dependencies for cbtf-krell
-    depends_on("cmake@3.0.2:", type='build')
+    depends_on("cmake@3.11.1", when='@1.9.1.0:', type='build')
+    depends_on("cmake@3.0.2:", when='@develop', type='build')
 
     # For binutils
     depends_on("binutils", when='@develop')
-    depends_on("binutils@2.29.1", when='@1.9.1.0')
+    depends_on("binutils@2.29.1", when='@1.9.1.0:')
 
     # For boost
     depends_on("boost@1.50.0:", when='@develop')
-    depends_on("boost@1.66.0", when='@1.9.1.0')
+    depends_on("boost@1.66.0", when='@1.9.1.0:')
 
     # For Dyninst
     depends_on("dyninst@9.3.2:", when='@develop')
-    depends_on("dyninst@9.3.2", when='@1.9.1.0')
+    depends_on("dyninst@9.3.2", when='@1.9.1.0:')
 
     # For MRNet
     depends_on("mrnet@5.0.1-3:+cti", when='@develop+cti')
     depends_on("mrnet@5.0.1-3:+lwthreads", when='@develop')
 
-    depends_on("mrnet@5.0.1-3+cti", when='@1.9.1.0+cti')
-    depends_on("mrnet@5.0.1-3+lwthreads", when='@1.9.1.0')
+    depends_on("mrnet@5.0.1-3+cti", when='@1.9.1.0:+cti')
+    depends_on("mrnet@5.0.1-3+lwthreads", when='@1.9.1.0:')
 
     # For Xerces-C
     depends_on("xerces-c@3.1.1:", when='@develop')
-    depends_on("xerces-c@3.1.4", when='@1.9.1.0')
+    depends_on("xerces-c@3.1.4", when='@1.9.1.0:')
 
     # For CBTF
     depends_on("cbtf@develop", when='@develop')
-    depends_on("cbtf@1.9.1.0", when='@1.9.1.0')
+    depends_on("cbtf@1.9.1.0:", when='@1.9.1.0:')
 
     # For CBTF with cti
     depends_on("cbtf@develop+cti", when='@develop+cti')
-    depends_on("cbtf@1.9.1.0+cti", when='@1.9.1.0+cti')
+    depends_on("cbtf@1.9.1.0:+cti", when='@1.9.1.0:+cti')
 
     # For CBTF with runtime
     depends_on("cbtf@develop+runtime", when='@develop+runtime')
-    depends_on("cbtf@1.9.1.0+runtime", when='@1.9.1.0+runtime')
+    depends_on("cbtf@1.9.1.0:+runtime", when='@1.9.1.0:+runtime')
 
     # for services and collectors
     depends_on("libmonitor+krellpatch")
 
     depends_on("libunwind", when='@develop')
-    depends_on("libunwind@1.1", when='@1.9.1.0')
+    depends_on("libunwind@1.1", when='@1.9.1.0:')
 
     depends_on("papi", when='@develop')
-    depends_on("papi@5.5.1", when='@1.9.1.0')
+    depends_on("papi@5.5.1", when='@1.9.1.0:')
 
     depends_on("llvm-openmp-ompt@tr6_forwards+standalone")
 
@@ -193,16 +196,15 @@ class CbtfKrell(CMakePackage):
         # the login node components with this spack invocation. We
         # need these paths to be the ones created in the CNL
         # spack invocation.
-        store = spack.store
-        be_cbtf = store.db.query_one('cbtf arch=cray-CNL-haswell')
-        be_cbtfk = store.db.query_one('cbtf-krell arch=cray-CNL-haswell')
-        be_papi = store.db.query_one('papi arch=cray-CNL-haswell')
-        be_boost = store.db.query_one('boost arch=cray-CNL-haswell')
-        be_mont = store.db.query_one('libmonitor arch=cray-CNL-haswell')
-        be_unw = store.db.query_one('libunwind arch=cray-CNL-haswell')
-        be_xer = store.db.query_one('xerces-c arch=cray-CNL-haswell')
-        be_dyn = store.db.query_one('dyninst arch=cray-CNL-haswell')
-        be_mrnet = store.db.query_one('mrnet arch=cray-CNL-haswell')
+        be_cbtf = spack.store.db.query_one('cbtf arch=cray-CNL-haswell')
+        be_cbtfk = spack.store.db.query_one('cbtf-krell arch=cray-CNL-haswell')
+        be_papi = spack.store.db.query_one('papi arch=cray-CNL-haswell')
+        be_boost = spack.store.db.query_one('boost arch=cray-CNL-haswell')
+        be_mont = spack.store.db.query_one('libmonitor arch=cray-CNL-haswell')
+        be_unw = spack.store.db.query_one('libunwind arch=cray-CNL-haswell')
+        be_xer = spack.store.db.query_one('xerces-c arch=cray-CNL-haswell')
+        be_dyn = spack.store.db.query_one('dyninst arch=cray-CNL-haswell')
+        be_mrnet = spack.store.db.query_one('mrnet arch=cray-CNL-haswell')
 
         CrayLoginNodeOptions.append('-DCN_RUNTIME_PLATFORM=%s'
                                     % rt_platform)
diff --git a/var/spack/repos/builtin/packages/cbtf-lanl/package.py b/var/spack/repos/builtin/packages/cbtf-lanl/package.py
index d327537cc3..e39a7cec5a 100644
--- a/var/spack/repos/builtin/packages/cbtf-lanl/package.py
+++ b/var/spack/repos/builtin/packages/cbtf-lanl/package.py
@@ -47,11 +47,12 @@ class CbtfLanl(CMakePackage):
     """CBTF LANL project contains a memory tool and data center type system
        command monitoring tool."""
     homepage = "http://sourceforge.net/p/cbtf/wiki/Home/"
+    url = "https://github.com/OpenSpeedShop/cbtf-lanl.git"
 
-    version('1.9.1.0', branch='1.9.1.0',
+    version('1.9.1.1', branch='1.9.1.1',
             git='https://github.com/OpenSpeedShop/cbtf-lanl.git')
 
-    version('1.9.1', branch='master',
+    version('1.9.1.0', branch='1.9.1.0',
             git='https://github.com/OpenSpeedShop/cbtf-lanl.git')
 
     version('develop', branch='master',
@@ -66,39 +67,40 @@ class CbtfLanl(CMakePackage):
     variant('cti', default=False,
             description="Build MRNet with the CTI startup option")
 
-    depends_on("cmake@3.0.2:", type='build')
+    depends_on("cmake@3.0.2:", when='@develop', type='build')
+    depends_on("cmake@3.11.1", when='@1.9.1.0:', type='build')
 
     # For MRNet
     depends_on("mrnet@5.0.1-3:+cti", when='@develop+cti')
     depends_on("mrnet@5.0.1-3:+lwthreads", when='@develop')
-    depends_on("mrnet@5.0.1-3+cti", when='@1.9.1.0+cti')
-    depends_on("mrnet@5.0.1-3+lwthreads", when='@1.9.1.0')
+    depends_on("mrnet@5.0.1-3+cti", when='@1.9.1.0:+cti')
+    depends_on("mrnet@5.0.1-3+lwthreads", when='@1.9.1.0:')
 
     # For Xerces-C
     depends_on("xerces-c@3.1.1:", when='@develop')
-    depends_on("xerces-c@3.1.4", when='@1.9.1.0')
+    depends_on("xerces-c@3.1.4", when='@1.9.1.0:')
 
     # For CBTF
     depends_on("cbtf@develop", when='@develop')
-    depends_on("cbtf@1.9.1.0", when='@1.9.1.0')
+    depends_on("cbtf@1.9.1.0:", when='@1.9.1.0:')
 
     # For CBTF with cti
     depends_on("cbtf@develop+cti", when='@develop+cti')
-    depends_on("cbtf@1.9.1.0+cti", when='@1.9.1.0+cti')
+    depends_on("cbtf@1.9.1.0:+cti", when='@1.9.1.0:+cti')
 
     # For CBTF with runtime
     depends_on("cbtf@develop+runtime", when='@develop+runtime')
-    depends_on("cbtf@1.9.1.0+runtime", when='@1.9.1.0+runtime')
+    depends_on("cbtf@1.9.1.0:+runtime", when='@1.9.1.0:+runtime')
 
     # For CBTF-KRELL
     depends_on("cbtf-krell@develop", when='@develop')
-    depends_on("cbtf-krell@1.9.1.0", when='@1.9.1.0')
+    depends_on("cbtf-krell@1.9.1.0:", when='@1.9.1.0:')
 
     depends_on('cbtf-krell@develop+cti', when='@develop+cti')
-    depends_on('cbtf-krell@1.9.1.0+cti', when='@1.9.1.0+cti')
+    depends_on('cbtf-krell@1.9.1.0:+cti', when='@1.9.1.0:+cti')
 
     depends_on('cbtf-krell@develop+runtime', when='@develop+runtime')
-    depends_on('cbtf-krell@1.9.1.0+runtime', when='@1.9.1.0+runtime')
+    depends_on('cbtf-krell@1.9.1.0:+runtime', when='@1.9.1.0:+runtime')
 
     parallel = False
 
diff --git a/var/spack/repos/builtin/packages/cbtf/package.py b/var/spack/repos/builtin/packages/cbtf/package.py
index 73e7227aba..2845efd446 100644
--- a/var/spack/repos/builtin/packages/cbtf/package.py
+++ b/var/spack/repos/builtin/packages/cbtf/package.py
@@ -51,13 +51,13 @@ class Cbtf(CMakePackage):
 
     """
     homepage = "http://sourceforge.net/p/cbtf/wiki/Home"
+    url = "https://github.com/OpenSpeedShop/cbtf.git"
 
     # Use when the git repository is available
-
-    version('1.9.1.0', branch='1.9.1.0',
+    version('1.9.1.1', branch='1.9.1.1',
             git='https://github.com/OpenSpeedShop/cbtf.git')
 
-    version('1.9.1', branch='master',
+    version('1.9.1.0', branch='1.9.1.0',
             git='https://github.com/OpenSpeedShop/cbtf.git')
 
     version('develop', branch='master',
diff --git a/var/spack/repos/builtin/packages/openspeedshop-utils/package.py b/var/spack/repos/builtin/packages/openspeedshop-utils/package.py
index 12eee7c8b1..ab5bf2a791 100644
--- a/var/spack/repos/builtin/packages/openspeedshop-utils/package.py
+++ b/var/spack/repos/builtin/packages/openspeedshop-utils/package.py
@@ -72,7 +72,11 @@ class OpenspeedshopUtils(CMakePackage):
     url = "https://github.com/OpenSpeedShop/openspeedshop.git"
 
     # Use when the git repository is available
-    version('2.3.1.3', git='https://github.com/OpenSpeedShop/openspeedshop.git', tag='2.3.1.3')
+    version('2.3.1.4', branch='2.3.1.4',
+            git='https://github.com/OpenSpeedShop/openspeedshop.git')
+
+    version('2.3.1.3', branch='2.3.1.3',
+            git='https://github.com/OpenSpeedShop/openspeedshop.git')
 
     version('develop', branch='master',
             git='https://github.com/OpenSpeedShop/openspeedshop.git')
@@ -110,7 +114,8 @@ class OpenspeedshopUtils(CMakePackage):
             description="Build mpi collector for mpich\
                          MPI when variant is enabled.")
 
-    depends_on("cmake@3.0.2:", type='build')
+    depends_on("cmake@3.11.1", when='@2.3.1.3:', type='build')
+    depends_on("cmake@3.0.2:", when='@develop', type='build')
 
     # Dependencies for openspeedshop that are common to all
     # the variants of the OpenSpeedShop build
@@ -120,7 +125,7 @@ class OpenspeedshopUtils(CMakePackage):
 
     # For binutils
     depends_on("binutils", when='@develop', type='build')
-    depends_on("binutils@2.29.1", when='@2.3.1.3', type='build')
+    depends_on("binutils@2.29.1", when='@2.3.1.3:', type='build')
 
     depends_on("elf", type="link")
     depends_on("libdwarf")
@@ -129,57 +134,57 @@ class OpenspeedshopUtils(CMakePackage):
 
     # For boost
     depends_on("boost@1.50.0:", when='@develop')
-    depends_on("boost@1.66.0", when='@2.3.1.3')
+    depends_on("boost@1.66.0", when='@2.3.1.3:')
 
     depends_on("dyninst@9.3.2:", when='@develop')
-    depends_on("dyninst@9.3.2", when='@2.3.1.3')
+    depends_on("dyninst@9.3.2", when='@2.3.1.3:')
 
     depends_on("python", when='@develop')
-    depends_on("python@2.7.14", when='@2.3.1.3')
+    depends_on("python@2.7.14", when='@2.3.1.3:')
 
     depends_on("libxml2", when='@develop')
-    depends_on("libxml2@2.9.4", when='@2.3.1.3')
+    depends_on("libxml2@2.9.4", when='@2.3.1.3:')
 
     # Dependencies for the openspeedshop cbtf packages.
     depends_on("cbtf@develop", when='@develop')
-    depends_on("cbtf@1.9.1.0", when='@2.3.1.3')
+    depends_on("cbtf@1.9.1.0:", when='@2.3.1.3:')
 
     depends_on("cbtf-krell@develop", when='@develop')
-    depends_on("cbtf-krell@1.9.1.0", when='@2.3.1.3')
+    depends_on("cbtf-krell@1.9.1.0:", when='@2.3.1.3:')
 
     depends_on('cbtf-krell@develop+crayfe', when='@develop+crayfe')
-    depends_on('cbtf-krell@1.9.1.0+crayfe', when='@2.3.1.3+crayfe')
+    depends_on('cbtf-krell@1.9.1.0:+crayfe', when='@2.3.1.3:+crayfe')
 
     depends_on('cbtf-krell@develop+cti', when='@develop+cti')
-    depends_on('cbtf-krell@1.9.1.0+cti', when='@2.3.1.3+cti')
+    depends_on('cbtf-krell@1.9.1.0:+cti', when='@2.3.1.3:+cti')
 
     depends_on('cbtf-krell@develop+mpich', when='@develop+mpich')
-    depends_on('cbtf-krell@1.9.1.0+mpich', when='@2.3.1.3+mpich')
+    depends_on('cbtf-krell@1.9.1.0:+mpich', when='@2.3.1.3:+mpich')
 
     depends_on('cbtf-krell@develop+mpich2', when='@develop+mpich2')
-    depends_on('cbtf-krell@1.9.1.0+mpich2', when='@2.3.1.3+mpich2')
+    depends_on('cbtf-krell@1.9.1.0:+mpich2', when='@2.3.1.3:+mpich2')
 
     depends_on('cbtf-krell@develop+mpt', when='@develop+mpt')
-    depends_on('cbtf-krell@1.9.1.0+mpt', when='@2.3.1.3+mpt')
+    depends_on('cbtf-krell@1.9.1.0:+mpt', when='@2.3.1.3:+mpt')
 
     depends_on('cbtf-krell@develop+mvapich', when='@develop+mvapich')
-    depends_on('cbtf-krell@1.9.1.0+mvapich', when='@2.3.1.3+mvapich')
+    depends_on('cbtf-krell@1.9.1.0:+mvapich', when='@2.3.1.3:+mvapich')
 
     depends_on('cbtf-krell@develop+mvapich2', when='@develop+mvapich2')
-    depends_on('cbtf-krell@1.9.1.0+mvapich2', when='@2.3.1.3+mvapich2')
+    depends_on('cbtf-krell@1.9.1.0:+mvapich2', when='@2.3.1.3:+mvapich2')
 
     depends_on('cbtf-krell@develop+openmpi', when='@develop+openmpi')
-    depends_on('cbtf-krell@1.9.1.0+openmpi', when='@2.3.1.3+openmpi')
+    depends_on('cbtf-krell@1.9.1.0:+openmpi', when='@2.3.1.3:+openmpi')
 
     depends_on("cbtf-argonavis@develop", when='@develop+cuda')
-    depends_on("cbtf-argonavis@1.9.1.0", when='@2.3.1.3+cuda')
+    depends_on("cbtf-argonavis@1.9.1.0:", when='@2.3.1.3:+cuda')
 
     # For MRNet
     depends_on("mrnet@5.0.1-3:+cti", when='@develop+cti')
     depends_on("mrnet@5.0.1-3:+lwthreads", when='@develop')
 
-    depends_on("mrnet@5.0.1-3:+cti", when='@2.3.1.3+cti')
-    depends_on("mrnet@5.0.1-3:+lwthreads", when='@2.3.1.3')
+    depends_on("mrnet@5.0.1-3:+cti", when='@2.3.1.3:+cti')
+    depends_on("mrnet@5.0.1-3:+lwthreads", when='@2.3.1.3:')
 
     parallel = False
 
diff --git a/var/spack/repos/builtin/packages/openspeedshop/package.py b/var/spack/repos/builtin/packages/openspeedshop/package.py
index dd9e8e8503..28938399a4 100644
--- a/var/spack/repos/builtin/packages/openspeedshop/package.py
+++ b/var/spack/repos/builtin/packages/openspeedshop/package.py
@@ -66,7 +66,11 @@ class Openspeedshop(CMakePackage):
     url = "https://github.com/OpenSpeedShop/openspeedshop.git"
 
     # Use when the git repository is available
-    version('2.3.1.3', git='https://github.com/OpenSpeedShop/openspeedshop.git', tag='2.3.1.3')
+    version('2.3.1.4', branch='2.3.1.4',
+            git='https://github.com/OpenSpeedShop/openspeedshop.git')
+
+    version('2.3.1.3', branch='2.3.1.3',
+            git='https://github.com/OpenSpeedShop/openspeedshop.git')
 
     version('develop', branch='master',
             git='https://github.com/OpenSpeedShop/openspeedshop.git')
@@ -108,7 +112,8 @@ class Openspeedshop(CMakePackage):
             description="Build mpi collector for mpich\
                          MPI when variant is enabled.")
 
-    depends_on("cmake@3.0.2:", type='build')
+    depends_on("cmake@3.11.1", when='@2.3.1.3:', type='build')
+    depends_on("cmake@3.0.2:", when='@develop', type='build')
 
     # Dependencies for openspeedshop that are common to all
     # the variants of the OpenSpeedShop build
@@ -118,7 +123,7 @@ class Openspeedshop(CMakePackage):
 
     # For binutils
     depends_on("binutils", when='@develop', type='build')
-    depends_on("binutils@2.29.1", when='@2.3.1.3', type='build')
+    depends_on("binutils@2.29.1", when='@2.3.1.3:', type='build')
 
     depends_on("elf", type="link")
     depends_on("libdwarf")
@@ -127,59 +132,59 @@ class Openspeedshop(CMakePackage):
 
     # For boost
     depends_on("boost@1.50.0:", when='@develop')
-    depends_on("boost@1.66.0", when='@2.3.1.3')
+    depends_on("boost@1.66.0", when='@2.3.1.3:')
 
     depends_on("dyninst@9.3.2:", when='@develop')
-    depends_on("dyninst@9.3.2", when='@2.3.1.3')
+    depends_on("dyninst@9.3.2", when='@2.3.1.3:')
 
     depends_on("python", when='@develop')
-    depends_on("python@2.7.14", when='@2.3.1.3')
+    depends_on("python@2.7.14", when='@2.3.1.3:')
 
     depends_on("libxml2", when='@develop')
-    depends_on("libxml2@2.9.4", when='@2.3.1.3')
+    depends_on("libxml2@2.9.4", when='@2.3.1.3:')
 
     depends_on("qt@3.3.8b+krellpatch", when='gui=qt3')
 
     # Dependencies for the openspeedshop cbtf packages.
     depends_on("cbtf@develop", when='@develop')
-    depends_on("cbtf@1.9.1.0", when='@2.3.1.3')
+    depends_on("cbtf@1.9.1.0:", when='@2.3.1.3:')
 
     depends_on("cbtf-krell@develop", when='@develop')
-    depends_on("cbtf-krell@1.9.1.0", when='@2.3.1.3')
+    depends_on("cbtf-krell@1.9.1.0:", when='@2.3.1.3:')
 
     depends_on('cbtf-krell@develop+crayfe', when='@develop+crayfe')
-    depends_on('cbtf-krell@1.9.1.0+crayfe', when='@2.3.1.3+crayfe')
+    depends_on('cbtf-krell@1.9.1.0:+crayfe', when='@2.3.1.3:+crayfe')
 
     depends_on('cbtf-krell@develop+cti', when='@develop+cti')
-    depends_on('cbtf-krell@1.9.1.0+cti', when='@2.3.1.3+cti')
+    depends_on('cbtf-krell@1.9.1.0:+cti', when='@2.3.1.3:+cti')
 
     depends_on('cbtf-krell@develop+mpich', when='@develop+mpich')
-    depends_on('cbtf-krell@1.9.1.0+mpich', when='@2.3.1.3+mpich')
+    depends_on('cbtf-krell@1.9.1.0:+mpich', when='@2.3.1.3:+mpich')
 
     depends_on('cbtf-krell@develop+mpich2', when='@develop+mpich2')
-    depends_on('cbtf-krell@1.9.1.0+mpich2', when='@2.3.1.3+mpich2')
+    depends_on('cbtf-krell@1.9.1.0:+mpich2', when='@2.3.1.3:+mpich2')
 
     depends_on('cbtf-krell@develop+mpt', when='@develop+mpt')
-    depends_on('cbtf-krell@1.9.1.0+mpt', when='@2.3.1.3+mpt')
+    depends_on('cbtf-krell@1.9.1.0:+mpt', when='@2.3.1.3:+mpt')
 
     depends_on('cbtf-krell@develop+mvapich', when='@develop+mvapich')
-    depends_on('cbtf-krell@1.9.1.0+mvapich', when='@2.3.1.3+mvapich')
+    depends_on('cbtf-krell@1.9.1.0:+mvapich', when='@2.3.1.3:+mvapich')
 
     depends_on('cbtf-krell@develop+mvapich2', when='@develop+mvapich2')
-    depends_on('cbtf-krell@1.9.1.0+mvapich2', when='@2.3.1.3+mvapich2')
+    depends_on('cbtf-krell@1.9.1.0:+mvapich2', when='@2.3.1.3:+mvapich2')
 
     depends_on('cbtf-krell@develop+openmpi', when='@develop+openmpi')
-    depends_on('cbtf-krell@1.9.1.0+openmpi', when='@2.3.1.3+openmpi')
+    depends_on('cbtf-krell@1.9.1.0:+openmpi', when='@2.3.1.3:+openmpi')
 
     depends_on("cbtf-argonavis@develop", when='@develop+cuda')
-    depends_on("cbtf-argonavis@1.9.1.0", when='@2.3.1.3+cuda')
+    depends_on("cbtf-argonavis@1.9.1.0:", when='@2.3.1.3:+cuda')
 
     # For MRNet
     depends_on("mrnet@5.0.1-3:+cti", when='@develop+cti')
     depends_on("mrnet@5.0.1-3:+lwthreads", when='@develop')
 
-    depends_on("mrnet@5.0.1-3:+cti", when='@2.3.1.3+cti')
-    depends_on("mrnet@5.0.1-3:+lwthreads", when='@2.3.1.3')
+    depends_on("mrnet@5.0.1-3:+cti", when='@2.3.1.3:+cti')
+    depends_on("mrnet@5.0.1-3:+lwthreads", when='@2.3.1.3:')
 
     parallel = False
 
@@ -345,7 +350,6 @@ class Openspeedshop(CMakePackage):
                              os.path.dirname(oss_libdir.joined()))
 
         run_env.set('OPENSS_RAWDATA_DIR', '.')
-
         cbtf_mc = '/sbin/cbtf_mrnet_commnode'
         cbtf_lmb = '/sbin/cbtf_libcbtf_mrnet_backend'
         run_env.set('XPLAT_RSH', 'ssh')
diff --git a/var/spack/repos/builtin/packages/qtgraph/package.py b/var/spack/repos/builtin/packages/qtgraph/package.py
index f4ffbaefcf..d151c98076 100644
--- a/var/spack/repos/builtin/packages/qtgraph/package.py
+++ b/var/spack/repos/builtin/packages/qtgraph/package.py
@@ -49,24 +49,20 @@ class Qtgraph(QMakePackage):
        libgvc within the Qt Graphics View Framework."""
 
     homepage = "https://github.com/OpenSpeedShop/QtGraph"
-
     url      = "https://github.com/OpenSpeedShop/QtGraph.git"
 
     version('1.0.0.0', branch='1.0.0.0',
             git='https://github.com/OpenSpeedShop/QtGraph.git')
 
-    version('1.0.0', branch='master',
-            git='https://github.com/OpenSpeedShop/QtGraph.git')
-
     version('develop', branch='master',
             git='https://github.com/OpenSpeedShop/QtGraph.git')
 
     # qtgraph depends on these packages
     depends_on('qt@4.8.6:', when='@develop')
-    depends_on('qt@5.10.0', when='@1.0.0.0')
+    depends_on('qt@5.10.0', when='@1.0.0.0:')
 
     depends_on("graphviz@2.40.1:", when='@develop')
-    depends_on("graphviz@2.40.1", when='@1.0.0.0')
+    depends_on("graphviz@2.40.1", when='@1.0.0.0:')
 
     def setup_environment(self, spack_env, run_env):
         """Set up the compile and runtime environments for a package."""