From 157ec210a74c2897abc093c14824975c49944f16 Mon Sep 17 00:00:00 2001
From: alalazo <massimiliano.culpo@googlemail.com>
Date: Thu, 11 Feb 2016 13:05:31 +0100
Subject: espresso : synchronized with current develop

---
 var/spack/packages/espresso/package.py             | 61 ----------------------
 .../repos/builtin/packages/espresso/package.py     | 61 ++++++++++++++++++++++
 2 files changed, 61 insertions(+), 61 deletions(-)
 delete mode 100644 var/spack/packages/espresso/package.py
 create mode 100644 var/spack/repos/builtin/packages/espresso/package.py

(limited to 'var')

diff --git a/var/spack/packages/espresso/package.py b/var/spack/packages/espresso/package.py
deleted file mode 100644
index ce5dcc2acc..0000000000
--- a/var/spack/packages/espresso/package.py
+++ /dev/null
@@ -1,61 +0,0 @@
-# FIXME:
-# This is a template package file for Spack.  We've conveniently
-# put "FIXME" labels next to all the things you'll want to change.
-#
-# Once you've edited all the FIXME's, delete this whole message,
-# save this file, and test out your package like this:
-#
-#     spack install espresso
-#
-# You can always get back here to change things with:
-#
-#     spack edit espresso
-#
-# See the spack documentation for more information on building
-# packages.
-#
-from spack import *
-
-class Espresso(Package):
-    """FIXME: put a proper description of your package here."""
-    # FIXME: add a proper url for your package's homepage here.
-    homepage = "http://quantum-espresso.org"
-    url      = "http://www.qe-forge.org/gf/download/frsrelease/204/912/espresso-5.3.0.tar.gz"
-
-    version('5.3.0', '6848fcfaeb118587d6be36bd10b7f2c3')
-    variant('mpi', default=True, description='Build Quantum-ESPRESSO with mpi support')
-    variant('openmp', default=False, description='Build Quantum-ESPRESSO with mpi openmp')
-    variant('scalapack', default=False, description='Build Quantum-ESPRESSO with mpi openmp')
-
-
-    # FIXME: Add dependencies if this package requires them.
-    # depends_on("foo")
-    depends_on('mpi', when='+mpi')
-
-
-#    def install(self, spec, prefix):
-        # FIXME: Modify the configure line to suit your build system here.
-#        configure('--prefix=%s' % prefix)
-
-        # FIXME: Add logic to build and install here
-#        make()
-#        make("install")
-
-    def install(self, spec, prefix):
-        # TAU isn't happy with directories that have '@' in the path.  Sigh.
-
-        # TAU configure, despite the name , seems to be a manually written script (nothing related to autotools).
-        # As such it has a few #peculiarities# that make this build quite hackish.
-        options = ["-prefix=%s" % prefix,
-                   "--enable-parallel"]
-
-        if '+openmp' in spec:
-            options.append('--enable-openmp')
-
-        if '+scalapack' in spec:
-            options.append('--with-scalapack=yes')
-
-        configure(*options)
-        make("all")
-        make("install")
-
diff --git a/var/spack/repos/builtin/packages/espresso/package.py b/var/spack/repos/builtin/packages/espresso/package.py
new file mode 100644
index 0000000000..ce5dcc2acc
--- /dev/null
+++ b/var/spack/repos/builtin/packages/espresso/package.py
@@ -0,0 +1,61 @@
+# FIXME:
+# This is a template package file for Spack.  We've conveniently
+# put "FIXME" labels next to all the things you'll want to change.
+#
+# Once you've edited all the FIXME's, delete this whole message,
+# save this file, and test out your package like this:
+#
+#     spack install espresso
+#
+# You can always get back here to change things with:
+#
+#     spack edit espresso
+#
+# See the spack documentation for more information on building
+# packages.
+#
+from spack import *
+
+class Espresso(Package):
+    """FIXME: put a proper description of your package here."""
+    # FIXME: add a proper url for your package's homepage here.
+    homepage = "http://quantum-espresso.org"
+    url      = "http://www.qe-forge.org/gf/download/frsrelease/204/912/espresso-5.3.0.tar.gz"
+
+    version('5.3.0', '6848fcfaeb118587d6be36bd10b7f2c3')
+    variant('mpi', default=True, description='Build Quantum-ESPRESSO with mpi support')
+    variant('openmp', default=False, description='Build Quantum-ESPRESSO with mpi openmp')
+    variant('scalapack', default=False, description='Build Quantum-ESPRESSO with mpi openmp')
+
+
+    # FIXME: Add dependencies if this package requires them.
+    # depends_on("foo")
+    depends_on('mpi', when='+mpi')
+
+
+#    def install(self, spec, prefix):
+        # FIXME: Modify the configure line to suit your build system here.
+#        configure('--prefix=%s' % prefix)
+
+        # FIXME: Add logic to build and install here
+#        make()
+#        make("install")
+
+    def install(self, spec, prefix):
+        # TAU isn't happy with directories that have '@' in the path.  Sigh.
+
+        # TAU configure, despite the name , seems to be a manually written script (nothing related to autotools).
+        # As such it has a few #peculiarities# that make this build quite hackish.
+        options = ["-prefix=%s" % prefix,
+                   "--enable-parallel"]
+
+        if '+openmp' in spec:
+            options.append('--enable-openmp')
+
+        if '+scalapack' in spec:
+            options.append('--with-scalapack=yes')
+
+        configure(*options)
+        make("all")
+        make("install")
+
-- 
cgit v1.2.3-70-g09d2