Update scorep and friends to newest versions (#8171)

4 files changed, 20 insertions, 7 deletions

diff --git a/var/spack/repos/builtin/packages/cube/package.py b/var/spack/repos/builtin/packages/cube/package.py
index ac1236d5cd..89bdcd873b 100644
--- a/var/spack/repos/builtin/packages/cube/package.py
+++ b/var/spack/repos/builtin/packages/cube/package.py
@@ -34,8 +34,9 @@ class Cube(AutotoolsPackage):
     """
 
     homepage = "http://www.scalasca.org/software/cube-4.x/download.html"
-    url = "http://apps.fz-juelich.de/scalasca/releases/cube/4.2/dist/cube-4.2.3.tar.gz"
+    url = "http://apps.fz-juelich.de/scalasca/releases/cube/4.4/dist/CubeBundle-4.4.tar.gz"
 
+    version('4.4',   'f4f0544883bdd5bad9e11a4a692858bf')
     version('4.3.5', 'e5dce986e3c6381ea3a5fcb66c553adc')
     version('4.3.4', '50f73060f55311cb12c5b3cb354d59fa')
     version('4.3.3', '07e109248ed8ffc7bdcce614264a2909')
@@ -48,11 +49,16 @@ class Cube(AutotoolsPackage):
 
     depends_on('zlib')
 
-    depends_on('qt@5:', when='@4.3.0:4.3.999 +gui')
+    depends_on('qt@5:', when='@4.3.0: +gui')
     depends_on('qt@4.8:', when='@4.2.0:4.2.999 +gui')
 
     def url_for_version(self, version):
-        return 'http://apps.fz-juelich.de/scalasca/releases/cube/{0}/dist/cube-{1}.tar.gz'.format(version.up_to(2), version)
+        if version >= Version('4.4'):
+            filename = 'CubeBundle-{0}.tar.gz'.format(version)
+        else:
+            filename = 'cube-{0}.tar.gz'.format(version)
+
+        return 'http://apps.fz-juelich.de/scalasca/releases/cube/{0}/dist/{1}'.format(version.up_to(2), filename)
 
     def configure_args(self):
         spec = self.spec
diff --git a/var/spack/repos/builtin/packages/opari2/package.py b/var/spack/repos/builtin/packages/opari2/package.py
index 695b6fe6eb..2f1b89bd98 100644
--- a/var/spack/repos/builtin/packages/opari2/package.py
+++ b/var/spack/repos/builtin/packages/opari2/package.py
@@ -39,6 +39,7 @@ class Opari2(AutotoolsPackage):
     homepage = "http://www.vi-hps.org/projects/score-p"
     url      = "http://www.vi-hps.org/upload/packages/opari2/opari2-1.1.2.tar.gz"
 
+    version('2.0.3', 'f34674718ffdb098a48732a1eb9c1aa2')
     version('2.0.1', '74af78f1f27b8caaa4271e0b97fb0fba')
     version('2.0',   '72350dbdb6139f2e68a5055a4f0ba16c')
     version('1.1.4', '245d3d11147a06de77909b0805f530c0')
diff --git a/var/spack/repos/builtin/packages/otf2/package.py b/var/spack/repos/builtin/packages/otf2/package.py
index ce9776ad36..5868214afe 100644
--- a/var/spack/repos/builtin/packages/otf2/package.py
+++ b/var/spack/repos/builtin/packages/otf2/package.py
@@ -34,6 +34,7 @@ class Otf2(AutotoolsPackage):
     homepage = "http://www.vi-hps.org/projects/score-p"
     url      = "http://www.vi-hps.org/upload/packages/otf2/otf2-1.4.tar.gz"
 
+    version('2.1.1', 'e51ad0d8ca374d25f47426746ca629e7')
     version('2.1',   'e2994e53d9b7c2cbd0c4f564d638751e')
     version('2.0',   '5b546188b25bc1c4e285e06dddf75dfc')
     version('1.5.1', '16a9df46e0da78e374f5d12c8cdc1109')
diff --git a/var/spack/repos/builtin/packages/scorep/package.py b/var/spack/repos/builtin/packages/scorep/package.py
index 16769c66e3..246ff59192 100644
--- a/var/spack/repos/builtin/packages/scorep/package.py
+++ b/var/spack/repos/builtin/packages/scorep/package.py
@@ -34,21 +34,26 @@ class Scorep(AutotoolsPackage):
     homepage = "http://www.vi-hps.org/projects/score-p"
     url      = "http://www.vi-hps.org/upload/packages/scorep/scorep-2.0.2.tar.gz"
 
+    version('4.0',   'f04478e0407d67eeb8c49c3c51d91e12')
     version('3.1',   '065bf8eb08398e8146c895718ddb9145')
     version('3.0',   '44da8beaa3f71436a5f6fe51938aab2f')
     version('2.0.2', '8f00e79e1b5b96e511c5ebecd10b2888')
     version('1.4.2', '3b9a042b13bdd5836452354e6567f71e')
     version('1.3',   '9db6f957b7f51fa01377a9537867a55c')
 
-    patch('gcc7.patch')
+    patch('gcc7.patch', when='@:3')
 
     ##########
     # Dependencies for SCORE-P are quite tight. See the homepage for more
     # information.
+    # SCOREP 4
+    depends_on('otf2@2.1:', when='@4:')
+    depends_on('opari2@2.0:', when='@4:')
+    depends_on('cube@4.4:', when='@4:')
     # SCOREP 3
-    depends_on('otf2@2:', when='@3:')
-    depends_on('opari2@2:', when='@3:')
-    depends_on('cube@4.3:', when='@3:')
+    depends_on('otf2@2:', when='@3:3.99')
+    depends_on('opari2@2:', when='@3:3.99')
+    depends_on('cube@4.3:', when='@3:3.99')
     # SCOREP 2.0.2
     depends_on('otf2@2.0', when='@2.0.2')
     depends_on('opari2@2.0', when='@2.0.2')