Gtkorvo updates (#8663)

* gtkorvo-atl: Updated to version 2.2

* gtkorvo-dill: Updated to version 2.4

* gtkorvo-enet: Updated to version 1.3.14

* libevpath: Updated to version 4.4.0

* libffs: Updated to version 1.5

* gtkorvo-atl: Bugfix: Fixed cmake args

* gtkorvo-enet: Switched order of versions to have the latest version on the top

* gtkorvo-atl: Cleaned up cmake_args. Added conditional self.run_tests

* gtkorvo-dill: Cleaned up cmake_args. Added conditional self.run_tests

* libffs: Correction in dependency versions. Cleaned up cmake_args. Added conditional self.run_tests

* libevpath: Correction in dependency versions. Cleaned up cmake_args. Added conditional self.run_tests

* gtkorvo-atl: Removed unused option from cmake args

var/spack/repos/builtin/packages/gtkorvo-atl/package.py

@@ -35,10 +35,21 @@ class GtkorvoAtl(CMakePackage):
 
     version('develop', git='https://github.com/GTkorvo/atl.git',
             branch='master')
+    version('2.2', 'f0e3581e4b4c6943bf4b203685630564')
     version('2.1', 'b2324ff041bccba127330a0e1b241978')
 
     depends_on('gtkorvo-cercs-env')
 
     def cmake_args(self):
-        args = ["-DENABLE_TESTING=0", "-DENABLE_BUILD_STATIC=STATIC"]
+        args = []
+        if self.spec.satisfies('@2.2:'):
+            args.append("-DBUILD_SHARED_LIBS=OFF")
+        else:
+            args.append("-DENABLE_BUILD_STATIC=STATIC")
+
+        if self.run_tests:
+            args.append('-DENABLE_TESTING=1')
+        else:
+            args.append('-DENABLE_TESTING=0')
+
         return args

var/spack/repos/builtin/packages/gtkorvo-dill/package.py

@@ -36,8 +36,19 @@ class GtkorvoDill(CMakePackage):
 
     version('develop', git='https://github.com/GTkorvo/dill.git',
             branch='master')
+    version('2.4', '6836673b24f395eaae044b8bb976511d')
     version('2.1', '14c835e79b66c9acd2beee01d56e6200')
 
     def cmake_args(self):
-        args = ["-DENABLE_TESTING=0", "-DBUILD_SHARED_STATIC=STATIC"]
+        args = []
+        if self.spec.satisfies('@2.4:'):
+            args.append("-DBUILD_SHARED_LIBS=OFF")
+        else:
+            args.append("-DENABLE_BUILD_STATIC=STATIC")
+
+        if self.run_tests:
+            args.append('-DENABLE_TESTING=1')
+        else:
+            args.append('-DENABLE_TESTING=0')
+
         return args

var/spack/repos/builtin/packages/gtkorvo-enet/package.py

@@ -35,4 +35,5 @@ class GtkorvoEnet(AutotoolsPackage):
     homepage = "http://www.github.com/GTkorvo/enet"
     url = "https://github.com/GTkorvo/enet/archive/v1.3.13.tar.gz"
 
+    version('1.3.14', '05272cac1a8cb0500995eeca310e7fac')
     version('1.3.13', '3490f924a4d421e4832e45850e6ec142')

var/spack/repos/builtin/packages/libevpath/package.py

@@ -37,13 +37,28 @@ class Libevpath(CMakePackage):
 
     version('develop', git='https://github.com/GTkorvo/evpath.git',
             branch='master')
+    version('4.4.0', 'd8630eb358ec90ae2d188e0e6c74022a')
+    version('4.2.4', '757ce010a6b7564dc62d3c79edd861d5')
     version('4.2.1', 'f928dc0dee41668afc91634c7051ce1a')
     version('4.1.2', '1a187f55431c991ae7040e3ff041d75c')
     version('4.1.1', '65a8db820f396ff2926e3d31908d123d')
 
+    variant('enet_transport', default=False, description='Build an ENET transport for EVpath')
+
+    depends_on('gtkorvo-enet', when='@4.4.0: +enet_transport')
+    depends_on('gtkorvo-enet@1.3.13', when='@:4.2.4 +enet_transport')
     depends_on('libffs')
 
     def cmake_args(self):
-        args = ["-DENABLE_TESTING=0", "-DTARGET_CNL=1",
-                "-DBUILD_SHARED_STATIC=STATIC"]
+        args = ["-DTARGET_CNL=1"]
+        if self.spec.satisfies('@4.4.0:'):
+            args.append("-DBUILD_SHARED_LIBS=OFF")
+        else:
+            args.append("-DENABLE_BUILD_STATIC=STATIC")
+
+        if self.run_tests:
+            args.append('-DENABLE_TESTING=1')
+        else:
+            args.append('-DENABLE_TESTING=0')
+
         return args

var/spack/repos/builtin/packages/libffs/package.py

@@ -38,16 +38,26 @@ class Libffs(CMakePackage):
 
     version('develop', git='https://github.com/GTkorvo/ffs.git',
             branch='master')
+    version('1.5', 'c41c5f5f448b627740deecd695b7bbf8')
     version('1.1.1', 'aa1c8ad5cf35e8cf76735e3a60891509')
     version('1.1', '561c6b3abc53e12b3c01192e8ef2ffbc')
 
-    depends_on('flex')
-    depends_on('bison')
+    depends_on('flex', type='build', when='@:1.4')
+    depends_on('bison', type='build', when='@:1.4')
+    depends_on('gtkorvo-cercs-env', type='build', when='@:1.4')
     depends_on('gtkorvo-atl')
     depends_on('gtkorvo-dill')
-    depends_on('gtkorvo-cercs-env')
 
     def cmake_args(self):
-        args = ["-DENABLE_TESTING=0", "-DTARGET_CNL=1",
-                "-DBUILD_SHARED_STATIC=STATIC"]
+        args = ["-DTARGET_CNL=1"]
+        if self.spec.satisfies('@1.5:'):
+            args.append("-DBUILD_SHARED_LIBS=OFF")
+        else:
+            args.append("-DENABLE_BUILD_STATIC=STATIC")
+
+        if self.run_tests:
+            args.append('-DENABLE_TESTING=0')
+        else:
+            args.append('-DENABLE_TESTING=0')
+
         return args