Add gl2ps and qrupdate packages

3 files changed, 48 insertions, 12 deletions

diff --git a/var/spack/repos/builtin/packages/gl2ps/package.py b/var/spack/repos/builtin/packages/gl2ps/package.py
new file mode 100644
index 0000000000..cb376b3f03
--- /dev/null
+++ b/var/spack/repos/builtin/packages/gl2ps/package.py
@@ -0,0 +1,18 @@
+from spack import *
+
+class Gl2ps(Package):
+    """GL2PS is a C library providing high quality vector output for any
+    OpenGL application."""
+
+    homepage = "http://www.geuz.org/gl2ps/"
+    url      = "http://geuz.org/gl2ps/src/gl2ps-1.3.9.tgz"
+
+    version('1.3.9', '377b2bcad62d528e7096e76358f41140')
+
+    depends_on("libpng")
+
+    def install(self, spec, prefix):
+        cmake('.', *std_cmake_args)
+
+        make()
+        make("install")
diff --git a/var/spack/repos/builtin/packages/octave/package.py b/var/spack/repos/builtin/packages/octave/package.py
index 6810da6d98..99847e1dbe 100644
--- a/var/spack/repos/builtin/packages/octave/package.py
+++ b/var/spack/repos/builtin/packages/octave/package.py
@@ -50,7 +50,7 @@ class Octave(Package):
     depends_on('fontconfig',  when='+fontconfig')
     depends_on('freetype',    when='+freetype')
     depends_on('glpk',        when='+glpk')
-    #depends_on('gl2ps',       when='+gl2ps')
+    depends_on('gl2ps',       when='+gl2ps')
     depends_on('gnuplot',     when='+gnuplot')
     depends_on('ImageMagick', when='+magick')
     depends_on('hdf5',        when='+hdf5')
@@ -58,10 +58,10 @@ class Octave(Package):
     depends_on('llvm',        when='+llvm')
     #depends_on('opengl',      when='+opengl')
     depends_on('qhull',       when='+qhull')
-    #depends_on('qrupdate',    when='+qrupdate')
+    depends_on('qrupdate',    when='+qrupdate')
     #depends_on('qscintilla',  when='+qscintilla)
     depends_on('qt',          when='+qt')
-    depends_on('SuiteSparse', when='suitesparse')
+    depends_on('SuiteSparse', when='+suitesparse')
     depends_on('zlib',        when='+zlib')
 
 
@@ -72,7 +72,7 @@ class Octave(Package):
 
         # Required dependencies
         config_args.extend([
-            "--with-blas=%s" % spec['blas'].prefix.lib,
+            "--with-blas=%s"   % spec['blas'].prefix.lib,
             "--with-lapack=%s" % spec['lapack'].prefix.lib
         ])
 
@@ -122,7 +122,7 @@ class Octave(Package):
 
         if '+glpk' in spec:
             config_args.extend([
-                "--with-glpk-includedir=%s" % spec['glpk'].prefix.include
+                "--with-glpk-includedir=%s" % spec['glpk'].prefix.include,
                 "--with-glpk-libdir=%s"     % spec['glpk'].prefix.lib
             ])
         else:
@@ -160,13 +160,13 @@ class Octave(Package):
         else:
             config_args.append("--without-qhull")
 
-        #if '+qrupdate' in spec:
-        #    config_args.extend([
-        #        "--with-qrupdate-includedir=%s" % spec['qrupdate'].prefix.include,
-        #        "--with-qrupdate-libdir=%s"     % spec['qrupdate'].prefix.lib
-        #    ])
-        #else:
-        #    config_args.append("--without-qrupdate")
+        if '+qrupdate' in spec:
+            config_args.extend([
+                "--with-qrupdate-includedir=%s" % spec['qrupdate'].prefix.include,
+                "--with-qrupdate-libdir=%s"     % spec['qrupdate'].prefix.lib
+            ])
+        else:
+            config_args.append("--without-qrupdate")
 
         if '+zlib' in spec:
             config_args.extend([
diff --git a/var/spack/repos/builtin/packages/qrupdate/package.py b/var/spack/repos/builtin/packages/qrupdate/package.py
new file mode 100644
index 0000000000..aff44bb2d8
--- /dev/null
+++ b/var/spack/repos/builtin/packages/qrupdate/package.py
@@ -0,0 +1,18 @@
+from spack import *
+
+class Qrupdate(Package):
+    """qrupdate is a Fortran library for fast updates of QR and
+    Cholesky decompositions."""
+
+    homepage = "http://sourceforge.net/projects/qrupdate/"
+    url      = "https://downloads.sourceforge.net/qrupdate/qrupdate-1.1.2.tar.gz"
+
+    version('1.1.2', '6d073887c6e858c24aeda5b54c57a8c4')
+
+    depends_on("openblas")
+
+    def install(self, spec, prefix):
+        configure('--prefix=%s' % prefix)
+
+        make()
+        make("install")