Merge branch 'develop' into mplegendre-multi_pkgsrc_roots

Conflicts:
	lib/spack/spack/cmd/create.py
	lib/spack/spack/cmd/extensions.py
	lib/spack/spack/cmd/fetch.py
	lib/spack/spack/cmd/uninstall.py
	lib/spack/spack/config.py
	lib/spack/spack/database.py
	lib/spack/spack/directory_layout.py
	lib/spack/spack/packages.py
	lib/spack/spack/spec.py

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

@@ -0,0 +1,23 @@
+from spack import *
+
+class Cleverleaf(Package):
+    """
+    CleverLeaf is a hydrodynamics mini-app that extends CloverLeaf with Adaptive
+    Mesh Refinement using the SAMRAI toolkit from Lawrence Livermore National
+    Laboratory. The primary goal of CleverLeaf is to evaluate the application of
+    AMR to the Lagrangian-Eulerian hydrodynamics scheme used by CloverLeaf.
+    """
+
+    homepage = "http://uk-mac.github.io/CleverLeaf/"
+    url      = "https://github.com/UK-MAC/CleverLeaf/tarball/master"
+
+    version('develop', git='https://github.com/UK-MAC/CleverLeaf_ref.git', branch='develop')
+
+    depends_on("SAMRAI@3.8.0:")
+    depends_on("hdf5+mpi")
+    depends_on("boost")
+
+    def install(self, spec, prefix):
+        cmake(*std_cmake_args)
+        make()
+        make("install")