366 files changed, 2225 insertions, 661 deletions

diff --git a/var/spack/mock_configs/site_spackconfig/compilers.yaml b/var/spack/mock_configs/site_spackconfig/compilers.yaml
deleted file mode 100644
index 0a2dc893e2..0000000000
--- a/var/spack/mock_configs/site_spackconfig/compilers.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-compilers:
-  all:
-    clang@3.3:
-      cc: /path/to/clang
-      cxx: /path/to/clang++
-      f77: None
-      fc: None
-    gcc@4.5.0:
-      cc: /path/to/gcc
-      cxx: /path/to/g++
-      f77: /path/to/gfortran
-      fc: /path/to/gfortran
diff --git a/var/spack/packages/R/package.py b/var/spack/packages/R/package.py
deleted file mode 100644
index 2e6f65a742..0000000000
--- a/var/spack/packages/R/package.py
+++ /dev/null
@@ -1,33 +0,0 @@
-from spack import *
-
-class R(Package):
-    """R is 'GNU S', a freely available language and environment for
-       statistical computing and graphics which provides a wide va
-       riety of statistical and graphical techniques: linear and
-       nonlinear modelling, statistical tests, time series analysis,
-       classification, clustering, etc. Please consult the R project
-       homepage for further information."""
-    homepage = "http://www.example.com"
-    url      = "http://cran.cnr.berkeley.edu/src/base/R-3/R-3.1.2.tar.gz"
-
-    version('3.1.2', '3af29ec06704cbd08d4ba8d69250ae74')
-
-    depends_on("readline")
-    depends_on("ncurses")
-    depends_on("icu")
-    depends_on("glib")
-    depends_on("zlib")
-    depends_on("libtiff")
-    depends_on("jpeg")
-    depends_on("cairo")
-    depends_on("pango")
-    depends_on("freetype")
-    depends_on("tcl")
-    depends_on("tk")
-
-    def install(self, spec, prefix):
-        configure("--prefix=%s" % prefix,
-                  "--enable-R-shlib",
-                  "--enable-BLAS-shlib")
-        make()
-        make("install")
diff --git a/var/spack/packages/boost/package.py b/var/spack/packages/boost/package.py
deleted file mode 100644
index 81dadbbf61..0000000000
--- a/var/spack/packages/boost/package.py
+++ /dev/null
@@ -1,138 +0,0 @@
-from spack import *
-
-class Boost(Package):
-    """Boost provides free peer-reviewed portable C++ source
-       libraries, emphasizing libraries that work well with the C++
-       Standard Library.
-
-       Boost libraries are intended to be widely useful, and usable
-       across a broad spectrum of applications. The Boost license
-       encourages both commercial and non-commercial use.
-    """
-    homepage = "http://www.boost.org"
-    url      = "http://downloads.sourceforge.net/project/boost/boost/1.55.0/boost_1_55_0.tar.bz2"
-    list_url = "http://sourceforge.net/projects/boost/files/boost/"
-    list_depth = 2
-
-    version('1.59.0', '6aa9a5c6a4ca1016edd0ed1178e3cb87')
-    version('1.58.0', 'b8839650e61e9c1c0a89f371dd475546')
-    version('1.57.0', '1be49befbdd9a5ce9def2983ba3e7b76')
-    version('1.56.0', 'a744cf167b05d72335f27c88115f211d')
-    version('1.55.0', 'd6eef4b4cacb2183f2bf265a5a03a354')
-    version('1.54.0', '15cb8c0803064faef0c4ddf5bc5ca279')
-    version('1.53.0', 'a00d22605d5dbcfb4c9936a9b35bc4c2')
-    version('1.52.0', '3a855e0f919107e0ca4de4d84ad3f750')
-    version('1.51.0', '4b6bd483b692fd138aef84ed2c8eb679')
-    version('1.50.0', '52dd00be775e689f55a987baebccc462')
-    version('1.49.0', '0d202cb811f934282dea64856a175698')
-    version('1.48.0', 'd1e9a7a7f532bb031a3c175d86688d95')
-    version('1.47.0', 'a2dc343f7bc7f83f8941e47ed4a18200')
-    version('1.46.1', '7375679575f4c8db605d426fc721d506')
-    version('1.46.0', '37b12f1702319b73876b0097982087e0')
-    version('1.45.0', 'd405c606354789d0426bc07bea617e58')
-    version('1.44.0', 'f02578f5218f217a9f20e9c30e119c6a')
-    version('1.43.0', 'dd49767bfb726b0c774f7db0cef91ed1')
-    version('1.42.0', '7bf3b4eb841b62ffb0ade2b82218ebe6')
-    version('1.41.0', '8bb65e133907db727a2a825c5400d0a6')
-    version('1.40.0', 'ec3875caeac8c52c7c129802a8483bd7')
-    version('1.39.0', 'a17281fd88c48e0d866e1a12deecbcc0')
-    version('1.38.0', '5eca2116d39d61382b8f8235915cb267')
-    version('1.37.0', '8d9f990bfb7e83769fa5f1d6f065bc92')
-    version('1.36.0', '328bfec66c312150e4c2a78dcecb504b')
-    version('1.35.0', 'dce952a7214e72d6597516bcac84048b')
-    version('1.34.1', '2d938467e8a448a2c9763e0a9f8ca7e5')
-    version('1.34.0', 'ed5b9291ffad776f8757a916e1726ad0')
-
-    variant('debug', default=False, description='Switch to the debug version of Boost')
-    variant('python', default=False, description='Activate the component Boost.Python')
-    variant('mpi', default=False, description='Activate the component Boost.MPI')
-    variant('compression', default=True, description='Activate the compression Boost.iostreams')
-
-    depends_on('mpi', when='+mpi')
-    depends_on('python', when='+python')
-    depends_on('zlib', when='+compression')
-    depends_on('bzip2', when='+compression')
-    
-    def url_for_version(self, version):
-        """Handle Boost's weird URLs, which write the version two different ways."""
-        parts = [str(p) for p in Version(version)]
-        dots = ".".join(parts)
-        underscores = "_".join(parts)
-        return "http://downloads.sourceforge.net/project/boost/boost/%s/boost_%s.tar.bz2" % (
-            dots, underscores)
-
-    def determine_toolset(self):
-        toolsets = {'gcc': 'gcc',
-                    'icpc': 'intel',
-                    'clang++': 'clang'}
-
-        for cc, toolset in toolsets.iteritems():
-            if(cc in self.compiler.cxx_names):
-                return toolset
-
-        # fallback to gcc if no toolset found
-        return 'gcc'
-
-    def determine_bootstrap_options(self, spec, options):
-        options.append('--with-toolset=%s' % self.determine_toolset())
-
-        without_libs = []
-        if '~mpi' in spec:
-            without_libs.append('mpi')
-        if '~python' in spec:
-            without_libs.append('python')
-        else:
-            options.append('--with-python=%s' % (spec['python'].prefix.bin + '/python'))
-
-        if without_libs:
-            options.append('--without-libraries=%s' % ','.join(without_libs))
-
-        with open('user-config.jam', 'w') as f:
-            if '+mpi' in spec:
-                f.write('using mpi : %s ;\n' % (spec['mpi'].prefix.bin + '/mpicxx'))
-            if '+python' in spec:
-                f.write('using python : %s : %s ;\n' % (spec['python'].version,
-                                                      (spec['python'].prefix.bin + '/python')))
-
-    def determine_b2_options(self, spec, options):
-        if '+debug' in spec:
-            options.append('variant=debug')
-        else:
-            options.append('variant=release')
-
-        if '~compression' in spec:
-            options.extend(['-s NO_BZIP2=1',
-                            '-s NO_ZLIB=1',
-            ])
-
-        if '+compression' in spec:
-            options.extend(['-s BZIP2_INCLUDE=%s' % spec['bzip2'].prefix.include,
-                            '-s BZIP2_LIBPATH=%s' % spec['bzip2'].prefix.lib,
-                            '-s ZLIB_INCLUDE=%s' % spec['zlib'].prefix.include,
-                            '-s ZLIB_LIBPATH=%s' % spec['zlib'].prefix.lib])
-
-        options.extend(['toolset=%s' % self.determine_toolset(),
-                       'link=static,shared',
-                       '--layout=tagged'])
-
-    def install(self, spec, prefix):
-        # to make him find the user-config.jam
-        env['BOOST_BUILD_PATH'] = './'
-
-        bootstrap = Executable('./bootstrap.sh')
-
-        bootstrap_options = ['--prefix=%s' % prefix]
-        self.determine_bootstrap_options(spec, bootstrap_options)
-
-        bootstrap(*bootstrap_options)
-
-        # b2 used to be called bjam, before 1.47 (sigh)
-        b2name = './b2' if spec.satisfies('@1.47:') else './bjam'
-
-        b2 = Executable(b2name)
-        b2_options = ['-j %s' % make_jobs]
-
-        self.determine_b2_options(spec, b2_options)
-
-        b2('install', 'threading=single', *b2_options)
-        b2('install', 'threading=multi', *b2_options)
diff --git a/var/spack/packages/clang/package.py b/var/spack/packages/clang/package.py
deleted file mode 100644
index e46e08d5f1..0000000000
--- a/var/spack/packages/clang/package.py
+++ /dev/null
@@ -1,95 +0,0 @@
-##############################################################################
-# Copyright (c) 2013, Lawrence Livermore National Security, LLC.
-# Produced at the Lawrence Livermore National Laboratory.
-#
-# This file is part of Spack.
-# Written by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
-# LLNL-CODE-647188
-#
-# For details, see https://github.com/llnl/spack
-# Please also see the LICENSE file for our notice and the LGPL.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License (as published by
-# the Free Software Foundation) version 2.1 dated February 1999.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
-# conditions of the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-##############################################################################
-
-
-from spack import *
-
-import os
-import os.path
-
-class Clang(Package):
-    """The goal of the Clang project is to create a new C, C++,
-       Objective C and Objective C++ front-end for the LLVM compiler.
-    """
-    homepage = 'http://clang.llvm.org'
-    url = 'http://llvm.org/releases/3.7.0/cfe-3.7.0.src.tar.xz'
-
-    depends_on('llvm@3.7.0', when='@3.7.0')
-    depends_on('llvm@3.6.2', when='@3.6.2')
-    depends_on('llvm@3.5.1', when='@3.5.1')
-
-    version('3.7.0', '8f9d27335e7331cf0a4711e952f21f01', url='http://llvm.org/releases/3.7.0/cfe-3.7.0.src.tar.xz')
-    version('3.6.2', 'ff862793682f714bb7862325b9c06e20', url='http://llvm.org/releases/3.6.2/cfe-3.6.2.src.tar.xz')
-    version('3.5.1', '93f9532f8f7e6f1d8e5c1116907051cb', url='http://llvm.org/releases/3.5.1/cfe-3.5.1.src.tar.xz')
-
-    ##########
-    # @3.7.0
-    resource(name='clang-tools-extra',
-             url='http://llvm.org/releases/3.7.0/clang-tools-extra-3.7.0.src.tar.xz',
-             md5='d5a87dacb65d981a427a536f6964642e', destination='tools', when='@3.7.0')
-    ##########
-
-    def install(self, spec, prefix):
-        env['CXXFLAGS'] = self.compiler.cxx11_flag
-
-        with working_dir('spack-build', create=True):
-
-            options = []
-            if '@3.7.0:' in spec:
-                options.append('-DCLANG_DEFAULT_OPENMP_RUNTIME:STRING=libomp')
-            options.extend(std_cmake_args)
-
-            cmake('..',
-                  '-DCLANG_PATH_TO_LLVM_BUILD:PATH=%s' % spec['llvm'].prefix,
-                  '-DLLVM_MAIN_SRC_DIR:PATH=%s' % spec['llvm'].prefix,
-                  *options)
-            make()
-            make("install")
-            # CLang doesn't look in llvm folders for system headers...
-            self.link_llvm_directories(spec)
-
-    def link_llvm_directories(self, spec):
-
-        def clang_include_dir_at(root):
-            return join_path(root, 'include')
-
-        def clang_lib_dir_at(root):
-            return join_path(root, 'lib/clang/', str(self.version), 'include')
-
-        def do_link(source_dir, destination_dir):
-            if os.path.exists(source_dir):
-                for name in os.listdir(source_dir):
-                    source = join_path(source_dir, name)
-                    link = join_path(destination_dir, name)
-                    os.symlink(source, link)
-
-        # Link folder and files in include
-        llvm_dir = clang_include_dir_at(spec['llvm'].prefix)
-        clang_dir = clang_include_dir_at(self.prefix)
-        do_link(llvm_dir, clang_dir)
-        # Link folder and files in lib
-        llvm_dir = clang_lib_dir_at(spec['llvm'].prefix)
-        clang_dir = clang_lib_dir_at(self.prefix)
-        do_link(llvm_dir, clang_dir)
\ No newline at end of file
diff --git a/var/spack/packages/hdf5/package.py b/var/spack/packages/hdf5/package.py
deleted file mode 100644
index adac79d9bb..0000000000
--- a/var/spack/packages/hdf5/package.py
+++ /dev/null
@@ -1,50 +0,0 @@
-from spack import *
-
-class Hdf5(Package):
-    """HDF5 is a data model, library, and file format for storing and managing
-       data. It supports an unlimited variety of datatypes, and is designed for
-       flexible and efficient I/O and for high volume and complex data.
-    """
-
-    homepage = "http://www.hdfgroup.org/HDF5/"
-    url      = "http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8.13/src/hdf5-1.8.13.tar.gz"
-    list_url = "http://www.hdfgroup.org/ftp/HDF5/releases"
-    list_depth = 3
-    
-    version('1.8.16', 'b8ed9a36ae142317f88b0c7ef4b9c618')
-    version('1.8.15', '03cccb5b33dbe975fdcd8ae9dc021f24')
-    version('1.8.13', 'c03426e9e77d7766944654280b467289')
-
-    variant('mpi', default=False, description='Enable MPI support')
-
-    depends_on("mpi", when='+mpi')
-    depends_on("zlib")
-
-    # TODO: currently hard-coded to use OpenMPI
-    def install(self, spec, prefix):
-        extra_args = []
-        if '+mpi' in spec:
-            extra_args.extend([
-                "--enable-parallel",
-                "CC=%s" % spec['mpi'].prefix.bin + "/mpicc",
-                "CXX=%s" % spec['mpi'].prefix.bin + "/mpic++",
-            ])
-
-        configure(
-            "--prefix=%s" % prefix,
-            "--with-zlib=%s" % spec['zlib'].prefix,
-            "--enable-shared",
-            *extra_args)
-
-        make()
-        make("install")
-
-    def url_for_version(self, version):
-        v = str(version)
-
-        if version == Version("1.2.2"):
-            return "http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-" + v + ".tar.gz"
-        elif version < Version("1.7"):
-            return "http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-" + version.up_to(2) + "/hdf5-" + v + ".tar.gz"
-        else:
-            return "http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-" + v + "/src/hdf5-" + v + ".tar.gz"
diff --git a/var/spack/packages/llvm/package.py b/var/spack/packages/llvm/package.py
deleted file mode 100644
index a3307584e0..0000000000
--- a/var/spack/packages/llvm/package.py
+++ /dev/null
@@ -1,72 +0,0 @@
-##############################################################################
-# Copyright (c) 2013, Lawrence Livermore National Security, LLC.
-# Produced at the Lawrence Livermore National Laboratory.
-#
-# This file is part of Spack.
-# Written by David Beckingsale, david@llnl.gov, All rights reserved.
-# LLNL-CODE-647188
-#
-# For details, see https://github.com/llnl/spack
-# Please also see the LICENSE file for our notice and the LGPL.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License (as published by
-# the Free Software Foundation) version 2.1 dated February 1999.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
-# conditions of the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-##############################################################################
-from spack import *
-
-
-class Llvm(Package):
-    """The LLVM Project is a collection of modular and reusable compiler and
-       toolchain technologies. Despite its name, LLVM has little to do with
-       traditional virtual machines, though it does provide helpful libraries
-       that can be used to build them. The name "LLVM" itself is not an acronym;
-       it is the full name of the project.
-    """
-    homepage = 'http://llvm.org/'
-    url = 'http://llvm.org/releases/3.7.0/llvm-3.7.0.src.tar.xz'
-
-    version('3.7.0', 'b98b9495e5655a672d6cb83e1a180f8e', url='http://llvm.org/releases/3.7.0/llvm-3.7.0.src.tar.xz')
-    version('3.6.2', '0c1ee3597d75280dee603bae9cbf5cc2', url='http://llvm.org/releases/3.6.2/llvm-3.6.2.src.tar.xz')
-    version('3.5.1', '2d3d8004f38852aa679e5945b8ce0b14', url='http://llvm.org/releases/3.5.1/llvm-3.5.1.src.tar.xz')
-    version('3.0', 'a8e5f5f1c1adebae7b4a654c376a6005', url='http://llvm.org/releases/3.0/llvm-3.0.tar.gz') # currently required by mesa package
-
-    depends_on('python@2.7:')
-
-    variant('libcxx', default=False, description="Builds the LLVM Standard C++ library targeting C++11")
-
-    ##########
-    # @3.7.0
-    resource(name='compiler-rt',
-             url='http://llvm.org/releases/3.7.0/compiler-rt-3.7.0.src.tar.xz', md5='383c10affd513026f08936b5525523f5',
-             destination='projects', when='@3.7.0')
-    resource(name='openmp',
-             url='http://llvm.org/releases/3.7.0/openmp-3.7.0.src.tar.xz', md5='f482c86fdead50ba246a1a2b0bbf206f',
-             destination='projects', when='@3.7.0')
-    resource(name='libcxx',
-             url='http://llvm.org/releases/3.7.0/libcxx-3.7.0.src.tar.xz', md5='46aa5175cbe1ad42d6e9c995968e56dd',
-             destination='projects', placement='libcxx', when='+libcxx@3.7.0')
-    resource(name='libcxxabi',
-             url='http://llvm.org/releases/3.7.0/libcxxabi-3.7.0.src.tar.xz', md5='5aa769e2fca79fa5335cfae8f6258772',
-             destination='projects', placement='libcxxabi', when='+libcxx@3.7.0')
-    ##########
-
-    def install(self, spec, prefix):
-        env['CXXFLAGS'] = self.compiler.cxx11_flag
-
-        with working_dir('spack-build', create=True):
-            cmake('..',
-                  '-DLLVM_REQUIRES_RTTI:BOOL=ON',
-                  '-DPYTHON_EXECUTABLE:PATH=%s/bin/python' % spec['python'].prefix,
-                  *std_cmake_args)
-            make()
-            make("install")
diff --git a/var/spack/packages/metis/package.py b/var/spack/packages/metis/package.py
deleted file mode 100644
index 7ce5ae1925..0000000000
--- a/var/spack/packages/metis/package.py
+++ /dev/null
@@ -1,27 +0,0 @@
-from spack import *
-
-class Metis(Package):
-    """METIS is a set of serial programs for partitioning graphs,
-       partitioning finite element meshes, and producing fill reducing
-       orderings for sparse matrices. The algorithms implemented in
-       METIS are based on the multilevel recursive-bisection,
-       multilevel k-way, and multi-constraint partitioning schemes."""
-
-    homepage = "http://glaros.dtc.umn.edu/gkhome/metis/metis/overview"
-    url      = "http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-5.1.0.tar.gz"
-
-    version('5.1.0', '5465e67079419a69e0116de24fce58fe')
-
-    depends_on('mpi')
-
-    def install(self, spec, prefix):
-        cmake(".",
-              '-DGKLIB_PATH=%s/GKlib' % pwd(),
-              '-DSHARED=1',
-              '-DCMAKE_C_COMPILER=mpicc',
-              '-DCMAKE_CXX_COMPILER=mpicxx',
-              '-DSHARED=1',
-              *std_cmake_args)
-
-        make()
-        make("install")
diff --git a/var/spack/packages/netcdf/netcdf-4.3.3-mpi.patch b/var/spack/packages/netcdf/netcdf-4.3.3-mpi.patch
deleted file mode 100644
index 46dda5fc9d..0000000000
--- a/var/spack/packages/netcdf/netcdf-4.3.3-mpi.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Nur netcdf-4.3.3/CMakeLists.txt netcdf-4.3.3.mpi/CMakeLists.txt
---- netcdf-4.3.3/CMakeLists.txt	2015-02-12 16:44:35.000000000 -0500
-+++ netcdf-4.3.3.mpi/CMakeLists.txt	2015-10-14 16:44:41.176300658 -0400
-@@ -753,6 +753,7 @@
-     SET(USE_PARALLEL OFF CACHE BOOL "")
-     MESSAGE(STATUS "Cannot find HDF5 library built with parallel support. Disabling parallel build.")
-   ELSE()
-+    FIND_PACKAGE(MPI REQUIRED)
-     SET(USE_PARALLEL ON CACHE BOOL "")
-     SET(STATUS_PARALLEL "ON")
-   ENDIF()
-diff -Nur netcdf-4.3.3/liblib/CMakeLists.txt netcdf-4.3.3.mpi/liblib/CMakeLists.txt
---- netcdf-4.3.3/liblib/CMakeLists.txt	2015-02-12 16:44:35.000000000 -0500
-+++ netcdf-4.3.3.mpi/liblib/CMakeLists.txt	2015-10-14 16:44:57.757793634 -0400
-@@ -71,6 +71,10 @@
-   SET(TLL_LIBS ${TLL_LIBS} ${CURL_LIBRARY})
- ENDIF()
- 
-+IF(USE_PARALLEL)
-+  SET(TLL_LIBS ${TLL_LIBS} ${MPI_C_LIBRARIES})
-+ENDIF()
-+
- IF(USE_HDF4)
-   SET(TLL_LIBS ${TLL_LIBS} ${HDF4_LIBRARIES})
- ENDIF()
diff --git a/var/spack/packages/netcdf/package.py b/var/spack/packages/netcdf/package.py
deleted file mode 100644
index e1e0d836c6..0000000000
--- a/var/spack/packages/netcdf/package.py
+++ /dev/null
@@ -1,27 +0,0 @@
-from spack import *
-
-class Netcdf(Package):
-    """NetCDF is a set of software libraries and self-describing, machine-independent
-        data formats that support the creation, access, and sharing of array-oriented
-        scientific data."""
-
-    homepage = "http://www.unidata.ucar.edu/software/netcdf/"
-    url      = "ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-4.3.3.tar.gz"
-
-    version('4.3.3', '5fbd0e108a54bd82cb5702a73f56d2ae')
-
-    patch('netcdf-4.3.3-mpi.patch')
-
-    # Dependencies:
-        # >HDF5
-    depends_on("hdf5")
-
-    def install(self, spec, prefix):
-        with working_dir('spack-build', create=True):
-            cmake('..',
-                "-DCMAKE_INSTALL_PREFIX:PATH=%s" % prefix,
-                "-DENABLE_DAP:BOOL=OFF", # Disable DAP.
-                "-DBUILD_SHARED_LIBS:BOOL=OFF") # Don't build shared libraries (use static libs).
-
-            make()
-            make("install")
diff --git a/var/spack/packages/parmetis/package.py b/var/spack/packages/parmetis/package.py
deleted file mode 100644
index d8cd337304..0000000000
--- a/var/spack/packages/parmetis/package.py
+++ /dev/null
@@ -1,26 +0,0 @@
-from spack import *
-
-class Parmetis(Package):
-    """ParMETIS is an MPI-based parallel library that implements a
-       variety of algorithms for partitioning unstructured graphs,
-       meshes, and for computing fill-reducing orderings of sparse
-       matrices."""
-    homepage = "http://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview"
-    url      = "http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/parmetis-4.0.3.tar.gz"
-
-    version('4.0.3', 'f69c479586bf6bb7aff6a9bc0c739628')
-
-    depends_on('mpi')
-
-    def install(self, spec, prefix):
-        cmake(".",
-              '-DGKLIB_PATH=%s/metis/GKlib' % pwd(),
-              '-DMETIS_PATH=%s/metis' % pwd(),
-              '-DSHARED=1',
-              '-DCMAKE_C_COMPILER=mpicc',
-              '-DCMAKE_CXX_COMPILER=mpicxx',
-              '-DSHARED=1',
-              *std_cmake_args)
-
-        make()
-        make("install")
diff --git a/var/spack/mock_packages/a/package.py b/var/spack/repos/builtin.mock/packages/a/package.py
index fa63c08df0..fa63c08df0 100644
--- a/var/spack/mock_packages/a/package.py
+++ b/var/spack/repos/builtin.mock/packages/a/package.py
diff --git a/var/spack/mock_packages/b/package.py b/var/spack/repos/builtin.mock/packages/b/package.py
index cb88aa2157..cb88aa2157 100644
--- a/var/spack/mock_packages/b/package.py
+++ b/var/spack/repos/builtin.mock/packages/b/package.py
diff --git a/var/spack/mock_packages/c/package.py b/var/spack/repos/builtin.mock/packages/c/package.py
index f51b913fa9..f51b913fa9 100644
--- a/var/spack/mock_packages/c/package.py
+++ b/var/spack/repos/builtin.mock/packages/c/package.py
diff --git a/var/spack/mock_packages/callpath/package.py b/var/spack/repos/builtin.mock/packages/callpath/package.py
index abc576f78f..abc576f78f 100644
--- a/var/spack/mock_packages/callpath/package.py
+++ b/var/spack/repos/builtin.mock/packages/callpath/package.py
diff --git a/var/spack/mock_packages/direct_mpich/package.py b/var/spack/repos/builtin.mock/packages/direct_mpich/package.py
index efe7fc2afc..efe7fc2afc 100644
--- a/var/spack/mock_packages/direct_mpich/package.py
+++ b/var/spack/repos/builtin.mock/packages/direct_mpich/package.py
diff --git a/var/spack/mock_packages/dyninst/package.py b/var/spack/repos/builtin.mock/packages/dyninst/package.py
index ea57950865..ea57950865 100644
--- a/var/spack/mock_packages/dyninst/package.py
+++ b/var/spack/repos/builtin.mock/packages/dyninst/package.py
diff --git a/var/spack/mock_packages/e/package.py b/var/spack/repos/builtin.mock/packages/e/package.py
index 76c6b64c7f..76c6b64c7f 100644
--- a/var/spack/mock_packages/e/package.py
+++ b/var/spack/repos/builtin.mock/packages/e/package.py
diff --git a/var/spack/mock_packages/fake/package.py b/var/spack/repos/builtin.mock/packages/fake/package.py
index 5f81ef20fc..5f81ef20fc 100644
--- a/var/spack/mock_packages/fake/package.py
+++ b/var/spack/repos/builtin.mock/packages/fake/package.py
diff --git a/var/spack/mock_packages/git-test/package.py b/var/spack/repos/builtin.mock/packages/git-test/package.py
index 689185463c..689185463c 100644
--- a/var/spack/mock_packages/git-test/package.py
+++ b/var/spack/repos/builtin.mock/packages/git-test/package.py
diff --git a/var/spack/mock_packages/hg-test/package.py b/var/spack/repos/builtin.mock/packages/hg-test/package.py
index 462f1e4c3a..462f1e4c3a 100644
--- a/var/spack/mock_packages/hg-test/package.py
+++ b/var/spack/repos/builtin.mock/packages/hg-test/package.py
diff --git a/var/spack/mock_packages/indirect_mpich/package.py b/var/spack/repos/builtin.mock/packages/indirect_mpich/package.py
index 0b1773a27b..0b1773a27b 100644
--- a/var/spack/mock_packages/indirect_mpich/package.py
+++ b/var/spack/repos/builtin.mock/packages/indirect_mpich/package.py
diff --git a/var/spack/mock_packages/libdwarf/package.py b/var/spack/repos/builtin.mock/packages/libdwarf/package.py
index e486a5de03..e486a5de03 100644
--- a/var/spack/mock_packages/libdwarf/package.py
+++ b/var/spack/repos/builtin.mock/packages/libdwarf/package.py
diff --git a/var/spack/mock_packages/libelf/package.py b/var/spack/repos/builtin.mock/packages/libelf/package.py
index 5e5b0b7143..5e5b0b7143 100644
--- a/var/spack/mock_packages/libelf/package.py
+++ b/var/spack/repos/builtin.mock/packages/libelf/package.py
diff --git a/var/spack/mock_packages/mpich/package.py b/var/spack/repos/builtin.mock/packages/mpich/package.py
index 55bf97f2cf..55bf97f2cf 100644
--- a/var/spack/mock_packages/mpich/package.py
+++ b/var/spack/repos/builtin.mock/packages/mpich/package.py
diff --git a/var/spack/mock_packages/mpich2/package.py b/var/spack/repos/builtin.mock/packages/mpich2/package.py
index 90f969b898..90f969b898 100644
--- a/var/spack/mock_packages/mpich2/package.py
+++ b/var/spack/repos/builtin.mock/packages/mpich2/package.py
diff --git a/var/spack/mock_packages/mpileaks/package.py b/var/spack/repos/builtin.mock/packages/mpileaks/package.py
index 9a18c5e1f2..9a18c5e1f2 100644
--- a/var/spack/mock_packages/mpileaks/package.py
+++ b/var/spack/repos/builtin.mock/packages/mpileaks/package.py
diff --git a/var/spack/mock_packages/multimethod/package.py b/var/spack/repos/builtin.mock/packages/multimethod/package.py
index ea103fe175..ea103fe175 100644
--- a/var/spack/mock_packages/multimethod/package.py
+++ b/var/spack/repos/builtin.mock/packages/multimethod/package.py
diff --git a/var/spack/mock_packages/netlib-blas/package.py b/var/spack/repos/builtin.mock/packages/netlib-blas/package.py
index 39f2c92ae5..39f2c92ae5 100644
--- a/var/spack/mock_packages/netlib-blas/package.py
+++ b/var/spack/repos/builtin.mock/packages/netlib-blas/package.py
diff --git a/var/spack/mock_packages/netlib-lapack/package.py b/var/spack/repos/builtin.mock/packages/netlib-lapack/package.py
index 331844e544..331844e544 100644
--- a/var/spack/mock_packages/netlib-lapack/package.py
+++ b/var/spack/repos/builtin.mock/packages/netlib-lapack/package.py
diff --git a/var/spack/mock_packages/openblas/package.py b/var/spack/repos/builtin.mock/packages/openblas/package.py
index c7771b92a3..c7771b92a3 100644
--- a/var/spack/mock_packages/openblas/package.py
+++ b/var/spack/repos/builtin.mock/packages/openblas/package.py
diff --git a/var/spack/mock_packages/optional-dep-test-2/package.py b/var/spack/repos/builtin.mock/packages/optional-dep-test-2/package.py
index ef0587588e..ef0587588e 100644
--- a/var/spack/mock_packages/optional-dep-test-2/package.py
+++ b/var/spack/repos/builtin.mock/packages/optional-dep-test-2/package.py
diff --git a/var/spack/mock_packages/optional-dep-test-3/package.py b/var/spack/repos/builtin.mock/packages/optional-dep-test-3/package.py
index e6cb3bd6e7..e6cb3bd6e7 100644
--- a/var/spack/mock_packages/optional-dep-test-3/package.py
+++ b/var/spack/repos/builtin.mock/packages/optional-dep-test-3/package.py
diff --git a/var/spack/mock_packages/optional-dep-test/package.py b/var/spack/repos/builtin.mock/packages/optional-dep-test/package.py
index bb57576ca9..bb57576ca9 100644
--- a/var/spack/mock_packages/optional-dep-test/package.py
+++ b/var/spack/repos/builtin.mock/packages/optional-dep-test/package.py
diff --git a/var/spack/mock_packages/svn-test/package.py b/var/spack/repos/builtin.mock/packages/svn-test/package.py
index ba4d5522b4..ba4d5522b4 100644
--- a/var/spack/mock_packages/svn-test/package.py
+++ b/var/spack/repos/builtin.mock/packages/svn-test/package.py
diff --git a/var/spack/mock_packages/trivial_install_test_package/package.py b/var/spack/repos/builtin.mock/packages/trivial_install_test_package/package.py
index fec5849e67..fec5849e67 100644
--- a/var/spack/mock_packages/trivial_install_test_package/package.py
+++ b/var/spack/repos/builtin.mock/packages/trivial_install_test_package/package.py
diff --git a/var/spack/mock_packages/zmpi/package.py b/var/spack/repos/builtin.mock/packages/zmpi/package.py
index 201fac2fbf..201fac2fbf 100644
--- a/var/spack/mock_packages/zmpi/package.py
+++ b/var/spack/repos/builtin.mock/packages/zmpi/package.py
diff --git a/var/spack/repos/builtin.mock/repo.yaml b/var/spack/repos/builtin.mock/repo.yaml
new file mode 100644
index 0000000000..30b068da13
--- /dev/null
+++ b/var/spack/repos/builtin.mock/repo.yaml
@@ -0,0 +1,2 @@
+repo:
+  namespace: builtin.mock
diff --git a/var/spack/packages/ImageMagick/package.py b/var/spack/repos/builtin/packages/ImageMagick/package.py
index 753ea80ca6..753ea80ca6 100644
--- a/var/spack/packages/ImageMagick/package.py
+++ b/var/spack/repos/builtin/packages/ImageMagick/package.py
diff --git a/var/spack/packages/Mitos/package.py b/var/spack/repos/builtin/packages/Mitos/package.py
index ea131872dd..ea131872dd 100644
--- a/var/spack/packages/Mitos/package.py
+++ b/var/spack/repos/builtin/packages/Mitos/package.py
diff --git a/var/spack/repos/builtin/packages/R/package.py b/var/spack/repos/builtin/packages/R/package.py
new file mode 100644
index 0000000000..2471dff09b
--- /dev/null
+++ b/var/spack/repos/builtin/packages/R/package.py
@@ -0,0 +1,49 @@
+from spack import *
+
+
+class R(Package):
+    """
+    R is 'GNU S', a freely available language and environment for statistical computing and graphics which provides a
+    wide variety of statistical and graphical techniques: linear and nonlinear modelling, statistical tests, time series
+    analysis, classification, clustering, etc. Please consult the R project homepage for further information.
+    """
+    homepage = "https://www.r-project.org"
+    url = "http://cran.cnr.berkeley.edu/src/base/R-3/R-3.1.2.tar.gz"
+
+    version('3.2.3', '1ba3dac113efab69e706902810cc2970')
+    version('3.2.2', '57cef5c2e210a5454da1979562a10e5b')
+    version('3.2.1', 'c2aac8b40f84e08e7f8c9068de9239a3')
+    version('3.2.0', '66fa17ad457d7e618191aa0f52fc402e')
+    version('3.1.3', '53a85b884925aa6b5811dfc361d73fc4')
+    version('3.1.2', '3af29ec06704cbd08d4ba8d69250ae74')
+
+    variant('external-lapack', default=False, description='Links to externally installed BLAS/LAPACK')
+
+    # Virtual dependencies
+    depends_on('blas', when='+external-lapack')
+    depends_on('lapack', when='+external-lapack')
+
+    # Concrete dependencies
+    depends_on('readline')
+    depends_on('ncurses')
+    depends_on('icu')
+    depends_on('glib')
+    depends_on('zlib')
+    depends_on('libtiff')
+    depends_on('jpeg')
+    depends_on('cairo')
+    depends_on('pango')
+    depends_on('freetype')
+    depends_on('tcl')
+    depends_on('tk')
+
+    def install(self, spec, prefix):
+        options = ['--prefix=%s' % prefix,
+                   '--enable-R-shlib',
+                   '--enable-BLAS-shlib']
+        if '+external-lapack' in spec:
+            options.extend(['--with-blas', '--with-lapack'])
+
+        configure(*options)
+        make()
+        make('install')
diff --git a/var/spack/packages/SAMRAI/no-tool-build.patch b/var/spack/repos/builtin/packages/SAMRAI/no-tool-build.patch
index 1adf0cf721..1adf0cf721 100644
--- a/var/spack/packages/SAMRAI/no-tool-build.patch
+++ b/var/spack/repos/builtin/packages/SAMRAI/no-tool-build.patch
diff --git a/var/spack/packages/SAMRAI/package.py b/var/spack/repos/builtin/packages/SAMRAI/package.py
index 2c3b9180af..2c3b9180af 100644
--- a/var/spack/packages/SAMRAI/package.py
+++ b/var/spack/repos/builtin/packages/SAMRAI/package.py
diff --git a/var/spack/packages/activeharmony/package.py b/var/spack/repos/builtin/packages/activeharmony/package.py
index 45dcc7c0e8..45dcc7c0e8 100644
--- a/var/spack/packages/activeharmony/package.py
+++ b/var/spack/repos/builtin/packages/activeharmony/package.py
diff --git a/var/spack/packages/adept-utils/package.py b/var/spack/repos/builtin/packages/adept-utils/package.py
index fb59576c21..fb59576c21 100644
--- a/var/spack/packages/adept-utils/package.py
+++ b/var/spack/repos/builtin/packages/adept-utils/package.py
diff --git a/var/spack/packages/apex/package.py b/var/spack/repos/builtin/packages/apex/package.py
index 8769d97056..8769d97056 100644
--- a/var/spack/packages/apex/package.py
+++ b/var/spack/repos/builtin/packages/apex/package.py
diff --git a/var/spack/packages/arpack/package.py b/var/spack/repos/builtin/packages/arpack/package.py
index 8c67c536f3..8c67c536f3 100644
--- a/var/spack/packages/arpack/package.py
+++ b/var/spack/repos/builtin/packages/arpack/package.py
diff --git a/var/spack/packages/asciidoc/package.py b/var/spack/repos/builtin/packages/asciidoc/package.py
index 828f3b3f4f..828f3b3f4f 100644
--- a/var/spack/packages/asciidoc/package.py
+++ b/var/spack/repos/builtin/packages/asciidoc/package.py
diff --git a/var/spack/packages/atk/package.py b/var/spack/repos/builtin/packages/atk/package.py
index 769805b227..769805b227 100644
--- a/var/spack/packages/atk/package.py
+++ b/var/spack/repos/builtin/packages/atk/package.py
diff --git a/var/spack/packages/atlas/package.py b/var/spack/repos/builtin/packages/atlas/package.py
index fc683363a7..fc683363a7 100644
--- a/var/spack/packages/atlas/package.py
+++ b/var/spack/repos/builtin/packages/atlas/package.py
diff --git a/var/spack/repos/builtin/packages/atop/package.py b/var/spack/repos/builtin/packages/atop/package.py
new file mode 100644
index 0000000000..346ab0763c
--- /dev/null
+++ b/var/spack/repos/builtin/packages/atop/package.py
@@ -0,0 +1,16 @@
+from spack import *
+
+class Atop(Package):
+    """Atop is an ASCII full-screen performance monitor for Linux"""
+    homepage = "http://www.atoptool.nl/index.php"
+    url      = "http://www.atoptool.nl/download/atop-2.2-3.tar.gz"
+
+    version('2.2-3', '034dc1544f2ec4e4d2c739d320dc326d')
+
+    def install(self, spec, prefix):
+        make()
+        mkdirp(prefix.bin)
+        install("atop", join_path(prefix.bin, "atop"))
+        mkdirp(join_path(prefix.man, "man1"))
+        install(join_path("man", "atop.1"),
+        join_path(prefix.man, "man1", "atop.1"))
diff --git a/var/spack/packages/autoconf/package.py b/var/spack/repos/builtin/packages/autoconf/package.py
index 5189faf054..5189faf054 100644
--- a/var/spack/packages/autoconf/package.py
+++ b/var/spack/repos/builtin/packages/autoconf/package.py
diff --git a/var/spack/packages/automaded/package.py b/var/spack/repos/builtin/packages/automaded/package.py
index e0bc7efb8b..e0bc7efb8b 100644
--- a/var/spack/packages/automaded/package.py
+++ b/var/spack/repos/builtin/packages/automaded/package.py
diff --git a/var/spack/packages/automake/package.py b/var/spack/repos/builtin/packages/automake/package.py
index 9115822730..9115822730 100644
--- a/var/spack/packages/automake/package.py
+++ b/var/spack/repos/builtin/packages/automake/package.py
diff --git a/var/spack/packages/bear/package.py b/var/spack/repos/builtin/packages/bear/package.py
index 0d4436fccc..0d4436fccc 100644
--- a/var/spack/packages/bear/package.py
+++ b/var/spack/repos/builtin/packages/bear/package.py
diff --git a/var/spack/packages/bib2xhtml/package.py b/var/spack/repos/builtin/packages/bib2xhtml/package.py
index 7f8e0cfe5a..7f8e0cfe5a 100644
--- a/var/spack/packages/bib2xhtml/package.py
+++ b/var/spack/repos/builtin/packages/bib2xhtml/package.py
diff --git a/var/spack/packages/binutils/binutilskrell-2.24.patch b/var/spack/repos/builtin/packages/binutils/binutilskrell-2.24.patch
index f48291a6c9..f48291a6c9 100644
--- a/var/spack/packages/binutils/binutilskrell-2.24.patch
+++ b/var/spack/repos/builtin/packages/binutils/binutilskrell-2.24.patch
diff --git a/var/spack/repos/builtin/packages/binutils/cr16.patch b/var/spack/repos/builtin/packages/binutils/cr16.patch
new file mode 100644
index 0000000000..2727c70b23
--- /dev/null
+++ b/var/spack/repos/builtin/packages/binutils/cr16.patch
@@ -0,0 +1,26 @@
+--- old/opcodes/cr16-dis.c	2014-10-14 03:32:04.000000000 -0400
++++ new/opcodes/cr16-dis.c	2016-01-14 21:54:26.000000000 -0500
+@@ -78,7 +78,7 @@
+ REG_ARG_TYPE;
+ 
+ /* Current opcode table entry we're disassembling.  */
+-const inst *instruction;
++extern const inst *instruction;
+ /* Current instruction we're disassembling.  */
+ ins cr16_currInsn;
+ /* The current instruction is read into 3 consecutive words.  */
+@@ -86,12 +86,12 @@
+ /* Contains all words in appropriate order.  */
+ ULONGLONG cr16_allWords;
+ /* Holds the current processed argument number.  */
+-int processing_argument_number;
++extern int processing_argument_number;
+ /* Nonzero means a IMM4 instruction.  */
+ int imm4flag;
+ /* Nonzero means the instruction's original size is
+    incremented (escape sequence is used).  */
+-int size_changed;
++extern int size_changed;
+ 
+ 
+ /* Print the constant expression length.  */
diff --git a/var/spack/packages/binutils/package.py b/var/spack/repos/builtin/packages/binutils/package.py
index 123f4598f6..de04221e33 100644
--- a/var/spack/packages/binutils/package.py
+++ b/var/spack/repos/builtin/packages/binutils/package.py
@@ -11,8 +11,11 @@ class Binutils(Package):
 
     # Add a patch that creates binutils libiberty_pic.a which is preferred by OpenSpeedShop and cbtf-krell
     variant('krellpatch', default=False, description="build with openspeedshop based patch.")
+    variant('gold', default=True, description="build the gold linker")
     patch('binutilskrell-2.24.patch', when='@2.24+krellpatch')
 
+    patch('cr16.patch')
+
     variant('libiberty', default=False, description='Also install libiberty.')
 
     def install(self, spec, prefix):
@@ -26,6 +29,9 @@ class Binutils(Package):
             '--enable-targets=all',
             '--with-sysroot=/']
 
+        if '+gold' in spec:
+            configure_args.append('--enable-gold')
+
         if '+libiberty' in spec:
             configure_args.append('--enable-install-libiberty')
 
diff --git a/var/spack/packages/bison/package.py b/var/spack/repos/builtin/packages/bison/package.py
index 7c526fb958..7c526fb958 100644
--- a/var/spack/packages/bison/package.py
+++ b/var/spack/repos/builtin/packages/bison/package.py
diff --git a/var/spack/repos/builtin/packages/boost/boost_11856.patch b/var/spack/repos/builtin/packages/boost/boost_11856.patch
new file mode 100644
index 0000000000..3b4052ca18
--- /dev/null
+++ b/var/spack/repos/builtin/packages/boost/boost_11856.patch
@@ -0,0 +1,34 @@
+--- a/libs/container/src/pool_resource.cpp	2015-11-06 12:49:55.000000000 -0800
++++ b/libs/container/src/pool_resource.cpp	2015-12-22 07:54:36.202131121 -0800
+@@ -32,11 +32,11 @@
+ class pool_data_t
+    : public block_slist_base<>
+ {
+-   typedef block_slist_base<> block_slist_base;
++   typedef block_slist_base<> block_slist_base_t;
+ 
+    public:
+    explicit pool_data_t(std::size_t initial_blocks_per_chunk)
+-      : block_slist_base(), next_blocks_per_chunk(initial_blocks_per_chunk)
++      : block_slist_base_t(), next_blocks_per_chunk(initial_blocks_per_chunk)
+    {  slist_algo::init_header(&free_slist);  }
+ 
+    void *allocate_block() BOOST_NOEXCEPT
+@@ -59,7 +59,7 @@
+    void release(memory_resource &upstream)
+    {
+       slist_algo::init_header(&free_slist);
+-      this->block_slist_base::release(upstream);
++      this->block_slist_base_t::release(upstream);
+       next_blocks_per_chunk = pool_options_minimum_max_blocks_per_chunk;
+    }
+ 
+@@ -72,7 +72,7 @@
+       
+       //Minimum block size is at least max_align, so all pools allocate sizes that are multiple of max_align,
+       //meaning that all blocks are max_align-aligned.
+-      char *p = static_cast<char *>(block_slist_base::allocate(blocks_per_chunk*pool_block, mr));
++      char *p = static_cast<char *>(block_slist_base_t::allocate(blocks_per_chunk*pool_block, mr));
+ 
+       //Create header types. This is no-throw
+       for(std::size_t i = 0, max = blocks_per_chunk; i != max; ++i){
diff --git a/var/spack/repos/builtin/packages/boost/package.py b/var/spack/repos/builtin/packages/boost/package.py
new file mode 100644
index 0000000000..fb1f5daee7
--- /dev/null
+++ b/var/spack/repos/builtin/packages/boost/package.py
@@ -0,0 +1,210 @@
+from spack import *
+import spack
+
+class Boost(Package):
+    """Boost provides free peer-reviewed portable C++ source
+       libraries, emphasizing libraries that work well with the C++
+       Standard Library.
+
+       Boost libraries are intended to be widely useful, and usable
+       across a broad spectrum of applications. The Boost license
+       encourages both commercial and non-commercial use.
+    """
+    homepage = "http://www.boost.org"
+    url      = "http://downloads.sourceforge.net/project/boost/boost/1.55.0/boost_1_55_0.tar.bz2"
+    list_url = "http://sourceforge.net/projects/boost/files/boost/"
+    list_depth = 2
+
+    version('1.60.0', '65a840e1a0b13a558ff19eeb2c4f0cbe')
+    version('1.59.0', '6aa9a5c6a4ca1016edd0ed1178e3cb87')
+    version('1.58.0', 'b8839650e61e9c1c0a89f371dd475546')
+    version('1.57.0', '1be49befbdd9a5ce9def2983ba3e7b76')
+    version('1.56.0', 'a744cf167b05d72335f27c88115f211d')
+    version('1.55.0', 'd6eef4b4cacb2183f2bf265a5a03a354')
+    version('1.54.0', '15cb8c0803064faef0c4ddf5bc5ca279')
+    version('1.53.0', 'a00d22605d5dbcfb4c9936a9b35bc4c2')
+    version('1.52.0', '3a855e0f919107e0ca4de4d84ad3f750')
+    version('1.51.0', '4b6bd483b692fd138aef84ed2c8eb679')
+    version('1.50.0', '52dd00be775e689f55a987baebccc462')
+    version('1.49.0', '0d202cb811f934282dea64856a175698')
+    version('1.48.0', 'd1e9a7a7f532bb031a3c175d86688d95')
+    version('1.47.0', 'a2dc343f7bc7f83f8941e47ed4a18200')
+    version('1.46.1', '7375679575f4c8db605d426fc721d506')
+    version('1.46.0', '37b12f1702319b73876b0097982087e0')
+    version('1.45.0', 'd405c606354789d0426bc07bea617e58')
+    version('1.44.0', 'f02578f5218f217a9f20e9c30e119c6a')
+    version('1.43.0', 'dd49767bfb726b0c774f7db0cef91ed1')
+    version('1.42.0', '7bf3b4eb841b62ffb0ade2b82218ebe6')
+    version('1.41.0', '8bb65e133907db727a2a825c5400d0a6')
+    version('1.40.0', 'ec3875caeac8c52c7c129802a8483bd7')
+    version('1.39.0', 'a17281fd88c48e0d866e1a12deecbcc0')
+    version('1.38.0', '5eca2116d39d61382b8f8235915cb267')
+    version('1.37.0', '8d9f990bfb7e83769fa5f1d6f065bc92')
+    version('1.36.0', '328bfec66c312150e4c2a78dcecb504b')
+    version('1.35.0', 'dce952a7214e72d6597516bcac84048b')
+    version('1.34.1', '2d938467e8a448a2c9763e0a9f8ca7e5')
+    version('1.34.0', 'ed5b9291ffad776f8757a916e1726ad0')
+
+    default_install_libs = set(['atomic', 
+        'chrono', 
+        'date_time', 
+        'filesystem', 
+        'graph',
+        'iostreams',
+        'locale',
+        'log',
+        'math', 
+        'program_options',
+        'random', 
+        'regex', 
+        'serialization', 
+        'signals', 
+        'system', 
+        'test', 
+        'thread', 
+        'wave'])
+
+    # mpi/python are not installed by default because they pull in many 
+    # dependencies and/or because there is a great deal of customization 
+    # possible (and it would be difficult to choose sensible defaults)
+    default_noinstall_libs = set(['mpi', 'python'])
+
+    all_libs = default_install_libs | default_noinstall_libs
+
+    for lib in all_libs:
+        variant(lib, default=(lib not in default_noinstall_libs), 
+            description="Compile with {0} library".format(lib))
+
+    variant('debug', default=False, description='Switch to the debug version of Boost')
+    variant('shared', default=True, description="Additionally build shared libraries")
+    variant('multithreaded', default=True, description="Build multi-threaded versions of libraries")
+    variant('singlethreaded', default=True, description="Build single-threaded versions of libraries")
+    variant('icu_support', default=False, description="Include ICU support (for regex/locale libraries)")
+
+    depends_on('icu', when='+icu_support')
+    depends_on('python', when='+python')
+    depends_on('mpi', when='+mpi')
+    depends_on('bzip2', when='+iostreams')
+    depends_on('zlib', when='+iostreams')
+
+    # Patch fix from https://svn.boost.org/trac/boost/ticket/11856
+    patch('boost_11856.patch', when='@1.60.0%gcc@4.4.7')
+
+    def url_for_version(self, version):
+        """Handle Boost's weird URLs, which write the version two different ways."""
+        parts = [str(p) for p in Version(version)]
+        dots = ".".join(parts)
+        underscores = "_".join(parts)
+        return "http://downloads.sourceforge.net/project/boost/boost/%s/boost_%s.tar.bz2" % (
+            dots, underscores)
+
+    def determine_toolset(self, spec):
+        if spec.satisfies("=darwin-x86_64"):
+            return 'darwin'
+
+        toolsets = {'g++': 'gcc',
+                    'icpc': 'intel',
+                    'clang++': 'clang'}
+
+        for cc, toolset in toolsets.iteritems():
+            if cc in self.compiler.cxx_names:
+                return toolset
+
+        # fallback to gcc if no toolset found
+        return 'gcc'
+
+    def determine_bootstrap_options(self, spec, withLibs, options):
+        boostToolsetId = self.determine_toolset(spec)
+        options.append('--with-toolset=%s' % boostToolsetId)
+        options.append("--with-libraries=%s" % ','.join(withLibs))
+
+        if '+python' in spec:
+            options.append('--with-python=%s' %
+                join_path(spec['python'].prefix.bin, 'python'))
+
+        with open('user-config.jam', 'w') as f:
+            compiler_wrapper = join_path(spack.build_env_path, 'c++')
+            f.write("using {0} : : {1} ;\n".format(boostToolsetId, 
+                compiler_wrapper))
+            
+            if '+mpi' in spec:
+                f.write('using mpi : %s ;\n' %
+                    join_path(spec['mpi'].prefix.bin, 'mpicxx'))
+            if '+python' in spec:
+                f.write('using python : %s : %s ;\n' %
+                    (spec['python'].version,
+                    join_path(spec['python'].prefix.bin, 'python')))
+
+    def determine_b2_options(self, spec, options):
+        if '+debug' in spec:
+            options.append('variant=debug')
+        else:
+            options.append('variant=release')
+
+        if '+icu_support' in spec:
+            options.extend(['-s', 'ICU_PATH=%s' % spec['icu'].prefix])
+
+        if '+iostreams' in spec:
+            options.extend([
+                '-s', 'BZIP2_INCLUDE=%s' % spec['bzip2'].prefix.include,
+                '-s', 'BZIP2_LIBPATH=%s' % spec['bzip2'].prefix.lib,
+                '-s', 'ZLIB_INCLUDE=%s' % spec['zlib'].prefix.include,
+                '-s', 'ZLIB_LIBPATH=%s' % spec['zlib'].prefix.lib,
+                ])
+
+        linkTypes = ['static']
+        if '+shared' in spec:
+            linkTypes.append('shared')
+        
+        threadingOpts = []
+        if '+multithreaded' in spec:
+            threadingOpts.append('multi')
+        if '+singlethreaded' in spec:
+            threadingOpts.append('single')
+        if not threadingOpts:
+            raise RuntimeError("At least one of {singlethreaded, multithreaded} must be enabled")
+        
+        options.extend([
+            'toolset=%s' % self.determine_toolset(spec),
+            'link=%s' % ','.join(linkTypes),
+            '--layout=tagged'])
+        
+        return threadingOpts
+
+    def install(self, spec, prefix):
+        withLibs = list()
+        for lib in Boost.all_libs:
+            if "+{0}".format(lib) in spec:
+                withLibs.append(lib)
+        if not withLibs:
+            # if no libraries are specified for compilation, then you dont have 
+            # to configure/build anything, just copy over to the prefix directory.
+            src = join_path(self.stage.source_path, 'boost')
+            mkdirp(join_path(prefix, 'include'))
+            dst = join_path(prefix, 'include', 'boost')
+            install_tree(src, dst)
+            return
+    
+        # to make Boost find the user-config.jam
+        env['BOOST_BUILD_PATH'] = './'
+
+        bootstrap = Executable('./bootstrap.sh')
+
+        bootstrap_options = ['--prefix=%s' % prefix]
+        self.determine_bootstrap_options(spec, withLibs, bootstrap_options)
+
+        bootstrap(*bootstrap_options)
+
+        # b2 used to be called bjam, before 1.47 (sigh)
+        b2name = './b2' if spec.satisfies('@1.47:') else './bjam'
+
+        b2 = Executable(b2name)
+        b2_options = ['-j', '%s' % make_jobs]
+
+        threadingOpts = self.determine_b2_options(spec, b2_options)
+
+        # In theory it could be done on one call but it fails on
+        # Boost.MPI if the threading options are not separated.
+        for threadingOpt in threadingOpts:
+            b2('install', 'threading=%s' % threadingOpt, *b2_options)
+        
diff --git a/var/spack/packages/bowtie2/bowtie2-2.5.patch b/var/spack/repos/builtin/packages/bowtie2/bowtie2-2.5.patch
index 290be39c73..290be39c73 100644
--- a/var/spack/packages/bowtie2/bowtie2-2.5.patch
+++ b/var/spack/repos/builtin/packages/bowtie2/bowtie2-2.5.patch
diff --git a/var/spack/packages/bowtie2/package.py b/var/spack/repos/builtin/packages/bowtie2/package.py
index 339aab6598..339aab6598 100644
--- a/var/spack/packages/bowtie2/package.py
+++ b/var/spack/repos/builtin/packages/bowtie2/package.py
diff --git a/var/spack/packages/boxlib/package.py b/var/spack/repos/builtin/packages/boxlib/package.py
index 4f1b71132f..4f1b71132f 100644
--- a/var/spack/packages/boxlib/package.py
+++ b/var/spack/repos/builtin/packages/boxlib/package.py
diff --git a/var/spack/packages/bzip2/package.py b/var/spack/repos/builtin/packages/bzip2/package.py
index 638ba1fa4d..638ba1fa4d 100644
--- a/var/spack/packages/bzip2/package.py
+++ b/var/spack/repos/builtin/packages/bzip2/package.py
diff --git a/var/spack/packages/cairo/package.py b/var/spack/repos/builtin/packages/cairo/package.py
index e1ac8aaa7d..8255e869be 100644
--- a/var/spack/packages/cairo/package.py
+++ b/var/spack/repos/builtin/packages/cairo/package.py
@@ -14,6 +14,7 @@ class Cairo(Package):
 
     def install(self, spec, prefix):
         configure("--prefix=%s" % prefix,
+                  "--disable-trace", # can cause problems with libiberty
                   "--enable-tee")
         make()
         make("install")
diff --git a/var/spack/packages/callpath/package.py b/var/spack/repos/builtin/packages/callpath/package.py
index 3d2d96249e..3d2d96249e 100644
--- a/var/spack/packages/callpath/package.py
+++ b/var/spack/repos/builtin/packages/callpath/package.py
diff --git a/var/spack/packages/cblas/package.py b/var/spack/repos/builtin/packages/cblas/package.py
index 3cfe5ee588..3cfe5ee588 100644
--- a/var/spack/packages/cblas/package.py
+++ b/var/spack/repos/builtin/packages/cblas/package.py
diff --git a/var/spack/packages/cbtf-argonavis/package.py b/var/spack/repos/builtin/packages/cbtf-argonavis/package.py
index 7b07933911..7b07933911 100644
--- a/var/spack/packages/cbtf-argonavis/package.py
+++ b/var/spack/repos/builtin/packages/cbtf-argonavis/package.py
diff --git a/var/spack/packages/cbtf-krell/package.py b/var/spack/repos/builtin/packages/cbtf-krell/package.py
index 9458ac113c..9458ac113c 100644
--- a/var/spack/packages/cbtf-krell/package.py
+++ b/var/spack/repos/builtin/packages/cbtf-krell/package.py
diff --git a/var/spack/packages/cbtf-lanl/package.py b/var/spack/repos/builtin/packages/cbtf-lanl/package.py
index 2da9e8a1f7..2da9e8a1f7 100644
--- a/var/spack/packages/cbtf-lanl/package.py
+++ b/var/spack/repos/builtin/packages/cbtf-lanl/package.py
diff --git a/var/spack/packages/cbtf/package.py b/var/spack/repos/builtin/packages/cbtf/package.py
index 52e6a07020..52e6a07020 100644
--- a/var/spack/packages/cbtf/package.py
+++ b/var/spack/repos/builtin/packages/cbtf/package.py
diff --git a/var/spack/repos/builtin/packages/cereal/Werror.patch b/var/spack/repos/builtin/packages/cereal/Werror.patch
new file mode 100644
index 0000000000..d39eaaffdb
--- /dev/null
+++ b/var/spack/repos/builtin/packages/cereal/Werror.patch
@@ -0,0 +1,33 @@
+--- old/sandbox/CMakeLists.txt
++++ new/sandbox/CMakeLists.txt
+@@ -4,9 +4,11 @@
+ add_executable(sandbox_json sandbox_json.cpp)
+ add_executable(sandbox_rtti sandbox_rtti.cpp)
+
++if(Boost_FOUND)
+ add_executable(sandbox_vs sandbox_vs.cpp)
+ target_link_libraries(sandbox_vs sandbox_vs_dll)
+ include_directories(sandbox_shared_lib)
++endif(Boost_FOUND)
+
+ if(Boost_FOUND)
+   add_executable(performance performance.cpp)
+--- old/include/cereal/types/common.hpp
++++ new/include/cereal/types/common.hpp
+@@ -106,14 +106,16 @@
+     t = reinterpret_cast<typename common_detail::is_enum<T>::type const &>( value );
+   }
+
++#ifndef CEREAL_ENABLE_RAW_POINTER_SERIALIZATION
+   //! Serialization for raw pointers
+   /*! This exists only to throw a static_assert to let users know we don't support raw pointers. */
+   template <class Archive, class T> inline
+   void CEREAL_SERIALIZE_FUNCTION_NAME( Archive &, T * & )
+   {
+     static_assert(cereal::traits::detail::delay_static_assert<T>::value,
+       "Cereal does not support serializing raw pointers - please use a smart pointer");
+   }
++#endif
+
+   //! Serialization for C style arrays
+   template <class Archive, class T> inline
diff --git a/var/spack/repos/builtin/packages/cereal/package.py b/var/spack/repos/builtin/packages/cereal/package.py
new file mode 100644
index 0000000000..a83927456f
--- /dev/null
+++ b/var/spack/repos/builtin/packages/cereal/package.py
@@ -0,0 +1,34 @@
+from spack import *
+import shutil
+
+class Cereal(Package):
+    """cereal is a header-only C++11 serialization library. cereal takes arbitrary data types and reversibly turns them into different representations, such as compact binary encodings, XML, or JSON. cereal was designed to be fast, light-weight, and easy to extend - it has no external dependencies and can be easily bundled with other code or used standalone."""
+    homepage = "http://uscilab.github.io/cereal/"
+    url      = "https://github.com/USCiLab/cereal/archive/v1.1.2.tar.gz"
+
+    version('1.1.2', '34d4ad174acbff005c36d4d10e48cbb9')
+    version('1.1.1', '0ceff308c38f37d5b5f6df3927451c27')
+    version('1.1.0', '9f2d5f72e935c54f4c6d23e954ce699f')
+    version('1.0.0', 'd1bacca70a95cec0ddbff68b0871296b')
+    version('0.9.1', '8872d4444ff274ce6cd1ed364d0fc0ad')
+
+    patch("Werror.patch")
+
+    depends_on("cmake @2.6.2:")
+
+    def install(self, spec, prefix):
+        # Don't use -Werror
+        filter_file(r'-Werror', '', 'CMakeLists.txt')
+
+        # configure
+        # Boost is only used for self-tests, which we are not running (yet?)
+        cmake('.', '-DCMAKE_DISABLE_FIND_PACKAGE_Boost=TRUE', *std_cmake_args)
+
+        # Build
+        make()
+
+        # Install
+        shutil.rmtree(join_path(prefix, 'doc'), ignore_errors=True)
+        shutil.rmtree(join_path(prefix, 'include'), ignore_errors=True)
+        shutil.copytree('doc', join_path(prefix, 'doc'), symlinks=True)
+        shutil.copytree('include', join_path(prefix, 'include'), symlinks=True)
diff --git a/var/spack/packages/cfitsio/package.py b/var/spack/repos/builtin/packages/cfitsio/package.py
index ff450cb5f3..ff450cb5f3 100644
--- a/var/spack/packages/cfitsio/package.py
+++ b/var/spack/repos/builtin/packages/cfitsio/package.py
diff --git a/var/spack/repos/builtin/packages/cgal/package.py b/var/spack/repos/builtin/packages/cgal/package.py
new file mode 100644
index 0000000000..97356433be
--- /dev/null
+++ b/var/spack/repos/builtin/packages/cgal/package.py
@@ -0,0 +1,73 @@
+##############################################################################
+# Copyright (c) 2013, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Written by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License (as published by
+# the Free Software Foundation) version 2.1 dated February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+
+from spack import *
+
+
+class Cgal(Package):
+    """
+    CGAL is a software project that provides easy access to efficient and reliable geometric algorithms in the form of
+    a C++ library. CGAL is used in various areas needing geometric computation, such as geographic information systems,
+    computer aided design, molecular biology, medical imaging, computer graphics, and robotics.
+    """
+    homepage = 'http://www.cgal.org/'
+    url = 'https://github.com/CGAL/cgal/archive/releases/CGAL-4.7.tar.gz'
+
+    version('4.7', '4826714810f3b4c65cac96b90fb03b67')
+    version('4.6.3', 'e8ee2ecc8d2b09b94a121c09257b576d')
+
+    # Installation instructions : http://doc.cgal.org/latest/Manual/installation.html
+    variant('shared', default=True, description='Enables the build of shared libraries')
+    variant('debug', default=False, description='Builds a debug version of the libraries')
+
+    depends_on('boost')
+    depends_on('mpfr')
+    depends_on('gmp')
+    depends_on('zlib')
+
+    # FIXME : Qt5 dependency missing (needs Qt5 and OpenGL)
+    # FIXME : Optional third party libraries missing
+
+    def install(self, spec, prefix):
+
+        options = []
+        options.extend(std_cmake_args)
+        # CGAL supports only Release and Debug build type. Any other build type will raise an error at configure time
+        if '+debug' in spec:
+            options.append('-DCMAKE_BUILD_TYPE:STRING=Debug')
+        else:
+            options.append('-DCMAKE_BUILD_TYPE:STRING=Release')
+
+        if '+shared' in spec:
+            options.append('-DBUILD_SHARED_LIBS:BOOL=ON')
+        else:
+            options.append('-DBUILD_SHARED_LIBS:BOOL=OFF')
+
+        build_directory = join_path(self.stage.path, 'spack-build')
+        source_directory = self.stage.source_path
+        with working_dir(build_directory, create=True):
+            cmake(source_directory, *options)
+            make()
+            make("install")
diff --git a/var/spack/packages/cgm/package.py b/var/spack/repos/builtin/packages/cgm/package.py
index 05d6395c5a..05d6395c5a 100644
--- a/var/spack/packages/cgm/package.py
+++ b/var/spack/repos/builtin/packages/cgm/package.py
diff --git a/var/spack/packages/cityhash/package.py b/var/spack/repos/builtin/packages/cityhash/package.py
index 1643cc3b42..1643cc3b42 100644
--- a/var/spack/packages/cityhash/package.py
+++ b/var/spack/repos/builtin/packages/cityhash/package.py
diff --git a/var/spack/packages/cleverleaf/package.py b/var/spack/repos/builtin/packages/cleverleaf/package.py
index fb400b25c3..fb400b25c3 100644
--- a/var/spack/packages/cleverleaf/package.py
+++ b/var/spack/repos/builtin/packages/cleverleaf/package.py
diff --git a/var/spack/packages/cloog/package.py b/var/spack/repos/builtin/packages/cloog/package.py
index 814a33c76c..814a33c76c 100644
--- a/var/spack/packages/cloog/package.py
+++ b/var/spack/repos/builtin/packages/cloog/package.py
diff --git a/var/spack/packages/cmake/package.py b/var/spack/repos/builtin/packages/cmake/package.py
index cb54c92d69..f67ae21ebd 100644
--- a/var/spack/packages/cmake/package.py
+++ b/var/spack/repos/builtin/packages/cmake/package.py
@@ -31,15 +31,16 @@ class Cmake(Package):
 
     version('2.8.10.2', '097278785da7182ec0aea8769d06860c',
             url = 'http://www.cmake.org/files/v2.8/cmake-2.8.10.2.tar.gz')
- 
+
     version('3.0.2', 'db4c687a31444a929d2fdc36c4dfb95f',
             url = 'http://www.cmake.org/files/v3.0/cmake-3.0.2.tar.gz')
- 
+
     version('3.4.0', 'cd3034e0a44256a0917e254167217fc8',
-            url = 'https://cmake.org/files/v3.4/cmake-3.4.0.tar.gz')
+            url = 'http://cmake.org/files/v3.4/cmake-3.4.0.tar.gz')
+
+    variant('ncurses', default=True, description='Enables the build of the ncurses gui')
 
-#    version('3.0.1', 'e2e05d84cb44a42f1371d9995631dcf5')
-#    version('3.0.0', '21a1c85e1a3b803c4b48e7ff915a863e')
+    depends_on('ncurses', when='+ncurses')
 
     def install(self, spec, prefix):
         configure('--prefix='   + prefix,
diff --git a/var/spack/repos/builtin/packages/cmocka/package.py b/var/spack/repos/builtin/packages/cmocka/package.py
new file mode 100644
index 0000000000..7377016a6b
--- /dev/null
+++ b/var/spack/repos/builtin/packages/cmocka/package.py
@@ -0,0 +1,16 @@
+from spack import *
+
+class Cmocka(Package):
+    """Unit-testing framework in pure C"""
+    homepage = "https://cmocka.org/"
+    url      = "https://cmocka.org/files/1.0/cmocka-1.0.1.tar.xz"
+
+    version('1.0.1', 'ed861e501a21a92b2af63e466df2015e')
+    parallel = False
+
+    def install(self, spec, prefix):
+        with working_dir('spack-build', create=True):
+	    cmake('..', *std_cmake_args)
+
+	    make()
+	    make("install")
diff --git a/var/spack/packages/coreutils/package.py b/var/spack/repos/builtin/packages/coreutils/package.py
index 78c608d8eb..78c608d8eb 100644
--- a/var/spack/packages/coreutils/package.py
+++ b/var/spack/repos/builtin/packages/coreutils/package.py
diff --git a/var/spack/packages/cppcheck/package.py b/var/spack/repos/builtin/packages/cppcheck/package.py
index 8e98f457ee..8e98f457ee 100644
--- a/var/spack/packages/cppcheck/package.py
+++ b/var/spack/repos/builtin/packages/cppcheck/package.py
diff --git a/var/spack/packages/cram/package.py b/var/spack/repos/builtin/packages/cram/package.py
index b19422b8a8..b19422b8a8 100644
--- a/var/spack/packages/cram/package.py
+++ b/var/spack/repos/builtin/packages/cram/package.py
diff --git a/var/spack/packages/cscope/package.py b/var/spack/repos/builtin/packages/cscope/package.py
index 9aac0f7304..9aac0f7304 100644
--- a/var/spack/packages/cscope/package.py
+++ b/var/spack/repos/builtin/packages/cscope/package.py
diff --git a/var/spack/packages/cube/package.py b/var/spack/repos/builtin/packages/cube/package.py
index 17d388c33d..17d388c33d 100644
--- a/var/spack/packages/cube/package.py
+++ b/var/spack/repos/builtin/packages/cube/package.py
diff --git a/var/spack/packages/curl/package.py b/var/spack/repos/builtin/packages/curl/package.py
index 9e684445c7..9e684445c7 100644
--- a/var/spack/packages/curl/package.py
+++ b/var/spack/repos/builtin/packages/curl/package.py
diff --git a/var/spack/packages/czmq/package.py b/var/spack/repos/builtin/packages/czmq/package.py
index 0665332179..0665332179 100644
--- a/var/spack/packages/czmq/package.py
+++ b/var/spack/repos/builtin/packages/czmq/package.py
diff --git a/var/spack/packages/damselfly/package.py b/var/spack/repos/builtin/packages/damselfly/package.py
index 96666d1abe..96666d1abe 100644
--- a/var/spack/packages/damselfly/package.py
+++ b/var/spack/repos/builtin/packages/damselfly/package.py
diff --git a/var/spack/packages/dbus/package.py b/var/spack/repos/builtin/packages/dbus/package.py
index 294b0de54e..294b0de54e 100644
--- a/var/spack/packages/dbus/package.py
+++ b/var/spack/repos/builtin/packages/dbus/package.py
diff --git a/var/spack/packages/docbook-xml/package.py b/var/spack/repos/builtin/packages/docbook-xml/package.py
index fce1de7deb..fce1de7deb 100644
--- a/var/spack/packages/docbook-xml/package.py
+++ b/var/spack/repos/builtin/packages/docbook-xml/package.py
diff --git a/var/spack/packages/doxygen/package.py b/var/spack/repos/builtin/packages/doxygen/package.py
index 3d4a4e47a7..3d4a4e47a7 100644
--- a/var/spack/packages/doxygen/package.py
+++ b/var/spack/repos/builtin/packages/doxygen/package.py
diff --git a/var/spack/packages/dri2proto/package.py b/var/spack/repos/builtin/packages/dri2proto/package.py
index 11dfa568e2..11dfa568e2 100644
--- a/var/spack/packages/dri2proto/package.py
+++ b/var/spack/repos/builtin/packages/dri2proto/package.py
diff --git a/var/spack/packages/dtcmp/package.py b/var/spack/repos/builtin/packages/dtcmp/package.py
index 9d940583c1..9d940583c1 100644
--- a/var/spack/packages/dtcmp/package.py
+++ b/var/spack/repos/builtin/packages/dtcmp/package.py
diff --git a/var/spack/packages/dyninst/package.py b/var/spack/repos/builtin/packages/dyninst/package.py
index 0111dcbe08..0111dcbe08 100644
--- a/var/spack/packages/dyninst/package.py
+++ b/var/spack/repos/builtin/packages/dyninst/package.py
diff --git a/var/spack/repos/builtin/packages/eigen/package.py b/var/spack/repos/builtin/packages/eigen/package.py
new file mode 100644
index 0000000000..44ee6819f5
--- /dev/null
+++ b/var/spack/repos/builtin/packages/eigen/package.py
@@ -0,0 +1,68 @@
+##############################################################################
+# Copyright (c) 2013, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Written by David Beckingsale, david@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License (as published by
+# the Free Software Foundation) version 2.1 dated February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+
+from spack import *
+
+
+class Eigen(Package):
+    """
+    Eigen is a C++ template library for linear algebra: matrices, vectors, numerical solvers, and related algorithms
+    """
+
+    homepage = 'http://eigen.tuxfamily.org/'
+    url = 'http://bitbucket.org/eigen/eigen/get/3.2.7.tar.bz2'
+
+    version('3.2.7', 'cc1bacbad97558b97da6b77c9644f184', url='http://bitbucket.org/eigen/eigen/get/3.2.7.tar.bz2')
+
+    variant('debug', default=False, description='Builds the library in debug mode')
+
+    variant('metis', default=True, description='Enables metis backend')
+    variant('scotch', default=True, description='Enables scotch backend')
+    variant('fftw', default=True, description='Enables FFTW backend')
+
+    # TODO : dependency on SuiteSparse, googlehash, superlu, adolc missing
+
+    depends_on('metis', when='+metis')
+    depends_on('scotch', when='+scotch')
+    depends_on('fftw', when='+fftw')
+
+    depends_on('mpfr@2.3.0:')  # Eigen 3.2.7 requires at least 2.3.0
+    depends_on('gmp')
+
+    def install(self, spec, prefix):
+
+        options = []
+        options.extend(std_cmake_args)
+
+        build_directory = join_path(self.stage.path, 'spack-build')
+        source_directory = self.stage.source_path
+
+        if '+debug' in spec:
+            options.append('-DCMAKE_BUILD_TYPE:STRING=Debug')
+
+        with working_dir(build_directory, create=True):
+            cmake(source_directory, *options)
+            make()
+            make("install")
diff --git a/var/spack/packages/elfutils/package.py b/var/spack/repos/builtin/packages/elfutils/package.py
index 926d234584..926d234584 100644
--- a/var/spack/packages/elfutils/package.py
+++ b/var/spack/repos/builtin/packages/elfutils/package.py
diff --git a/var/spack/repos/builtin/packages/elpa/package.py b/var/spack/repos/builtin/packages/elpa/package.py
new file mode 100644
index 0000000000..2ade5b0b37
--- /dev/null
+++ b/var/spack/repos/builtin/packages/elpa/package.py
@@ -0,0 +1,55 @@
+##############################################################################
+# Copyright (c) 2013, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Written by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License (as published by
+# the Free Software Foundation) version 2.1 dated February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+
+from spack import *
+
+
+class Elpa(Package):
+    """
+    Eigenvalue solvers for Petaflop-Applications (ELPA)
+    """
+
+    homepage = 'http://elpa.mpcdf.mpg.de/'
+    url = 'http://elpa.mpcdf.mpg.de/elpa-2015.11.001.tar.gz'
+
+    version('2015.11.001', 'de0f35b7ee7c971fd0dca35c900b87e6', url='http://elpa.mpcdf.mpg.de/elpa-2015.11.001.tar.gz')
+
+    variant('openmp', default=False, description='Activates OpenMP support')
+
+    depends_on('mpi')
+    depends_on('blas')
+    depends_on('lapack')
+    depends_on('scalapack')
+
+    def install(self, spec, prefix):
+
+        options = ["--prefix=%s" % prefix]
+
+        if '+openmp' in spec:
+            options.append("--enable-openmp")
+
+        configure(*options)
+        make()
+        make("install")
diff --git a/var/spack/packages/expat/package.py b/var/spack/repos/builtin/packages/expat/package.py
index 082da5bf0b..082da5bf0b 100644
--- a/var/spack/packages/expat/package.py
+++ b/var/spack/repos/builtin/packages/expat/package.py
diff --git a/var/spack/packages/extrae/package.py b/var/spack/repos/builtin/packages/extrae/package.py
index 3ad4cbaf86..3ad4cbaf86 100644
--- a/var/spack/packages/extrae/package.py
+++ b/var/spack/repos/builtin/packages/extrae/package.py
diff --git a/var/spack/packages/exuberant-ctags/package.py b/var/spack/repos/builtin/packages/exuberant-ctags/package.py
index efd2b541b2..efd2b541b2 100644
--- a/var/spack/packages/exuberant-ctags/package.py
+++ b/var/spack/repos/builtin/packages/exuberant-ctags/package.py
diff --git a/var/spack/packages/fftw/package.py b/var/spack/repos/builtin/packages/fftw/package.py
index 5f71762c4f..4d2b964242 100644
--- a/var/spack/packages/fftw/package.py
+++ b/var/spack/repos/builtin/packages/fftw/package.py
@@ -39,54 +39,21 @@ class Fftw(Package):
 
     version('3.3.4', '2edab8c06b24feeb3b82bbb3ebf3e7b3')
 
-    ##########
-    # Floating point precision
-    FLOAT = 'float'
-    LONG_DOUBLE = 'long_double'
-    QUAD_PRECISION = 'quad'
-    PRECISION_OPTIONS = {
-        FLOAT: '--enable-float',
-        LONG_DOUBLE: '--enable--long-double',
-        QUAD_PRECISION: '--enable-quad-precision'
-    }
-    variant(FLOAT, default=False, description='Produces a single precision version of the library')
-    variant(LONG_DOUBLE, default=False, description='Produces a long double precision version of the library')
-    variant(QUAD_PRECISION, default=False, description='Produces a quad precision version of the library (works only with GCC and libquadmath)')
-    ##########
+    variant('float', default=True, description='Produces a single precision version of the library')
+    variant('long_double', default=True, description='Produces a long double precision version of the library')
+    variant('quad', default=False, description='Produces a quad precision version of the library (works only with GCC and libquadmath)')
 
     variant('mpi', default=False, description='Activate MPI support')
 
     depends_on('mpi', when='+mpi')
 
-    @staticmethod
-    def enabled(x):
-        """
-        Given a variant name returns the string that means the variant is enabled
-
-        :param x: variant name
-        """
-        # FIXME : duplicated from MVAPICH2
-        return '+' + x
-
-    def check_fortran_availability(self, options):
-        if not self.compiler.f77 or not self.compiler.fc:
-            options.append("--disable-fortran")
-
-    def set_floating_point_precision(self, spec, options):
-        l = [option for variant, option in Fftw.PRECISION_OPTIONS.iteritems() if self.enabled(variant) in spec]
-        if len(l) > 1:
-            raise RuntimeError('At most one floating point precision variant may activated per build.')
-        options.extend(l)
-
     def install(self, spec, prefix):
-
         options = ['--prefix=%s' % prefix,
                    '--enable-shared',
                    '--enable-threads',
                    '--enable-openmp']
-        self.check_fortran_availability(options)
-        self.set_floating_point_precision(spec, options)
-
+        if not self.compiler.f77 or not self.compiler.fc:
+            options.append("--disable-fortran")
         if '+mpi' in spec:
             options.append('--enable-mpi')
 
@@ -94,3 +61,15 @@ class Fftw(Package):
         make()
         make("install")
 
+        if '+float' in spec:
+            configure('--enable-float', *options)
+            make()
+            make("install")
+        if '+long_double' in spec:
+            configure('--enable-long-double', *options)
+            make()
+            make("install")
+        if '+quad' in spec:
+            configure('--enable-quad-precision', *options)
+            make()
+            make("install")
diff --git a/var/spack/packages/fish/package.py b/var/spack/repos/builtin/packages/fish/package.py
index 1225558705..1225558705 100644
--- a/var/spack/packages/fish/package.py
+++ b/var/spack/repos/builtin/packages/fish/package.py
diff --git a/var/spack/packages/flex/package.py b/var/spack/repos/builtin/packages/flex/package.py
index b065904912..b065904912 100644
--- a/var/spack/packages/flex/package.py
+++ b/var/spack/repos/builtin/packages/flex/package.py
diff --git a/var/spack/repos/builtin/packages/fltk/font.patch b/var/spack/repos/builtin/packages/fltk/font.patch
new file mode 100644
index 0000000000..7706a1b4ee
--- /dev/null
+++ b/var/spack/repos/builtin/packages/fltk/font.patch
@@ -0,0 +1,44 @@
+Index: FL/x.H
+===================================================================
+--- a/FL/x.H	(revision 10476)
++++ b/FL/x.H	(working copy)
+@@ -132,6 +132,7 @@
+   XFontStruct *ptr;
+ };
+ extern FL_EXPORT Fl_XFont_On_Demand fl_xfont;
++extern FL_EXPORT XFontStruct* fl_core_font();
+
+ // this object contains all X-specific stuff about a window:
+ // Warning: this object is highly subject to change!
+Index: src/fl_font.cxx
+===================================================================
+--- a/src/fl_font.cxx	(revision 10476)
++++ b/src/fl_font.cxx	(working copy)
+@@ -55,6 +55,14 @@
+ #  include "fl_font_x.cxx"
+ #endif // WIN32
+
++#ifdef WIN32
++#elif defined(__APPLE__)
++#else
++XFontStruct *fl_core_font()
++{
++  return fl_xfont.value();
++}
++#endif
+
+ double fl_width(const char* c) {
+   if (c) return fl_width(c, (int) strlen(c));
+Index: src/gl_draw.cxx
+===================================================================
+--- a/src/gl_draw.cxx	(revision 10476)
++++ b/src/gl_draw.cxx	(working copy)
+@@ -84,7 +84,7 @@
+  * then sorting through them at draw time (for normal X rendering) to find which one can
+  * render the current glyph... But for now, just use the first font in the list for GL...
+  */
+-    XFontStruct *font = fl_xfont;
++    XFontStruct *font = fl_core_font();
+     int base = font->min_char_or_byte2;
+     int count = font->max_char_or_byte2-base+1;
+     fl_fontsize->listbase = glGenLists(256);
diff --git a/var/spack/repos/builtin/packages/fltk/package.py b/var/spack/repos/builtin/packages/fltk/package.py
new file mode 100644
index 0000000000..0b462f83f8
--- /dev/null
+++ b/var/spack/repos/builtin/packages/fltk/package.py
@@ -0,0 +1,58 @@
+##############################################################################
+# Copyright (c) 2013-2015, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Written by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License (as published by
+# the Free Software Foundation) version 2.1 dated February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Fltk(Package):
+    """
+    FLTK (pronounced "fulltick") is a cross-platform C++ GUI toolkit for UNIX/Linux (X11), Microsoft Windows, and
+    MacOS X. FLTK provides modern GUI functionality without the bloat and supports 3D graphics via OpenGL and its
+    built-in GLUT emulation.
+
+    FLTK is designed to be small and modular enough to be statically linked, but works fine as a shared library. FLTK
+    also includes an excellent UI builder called FLUID that can be used to create applications in minutes.
+    """
+    homepage = 'http://www.fltk.org/'
+    url = 'http://fltk.org/pub/fltk/1.3.3/fltk-1.3.3-source.tar.gz'
+
+    version('1.3.3', '9ccdb0d19dc104b87179bd9fd10822e3')
+
+    patch('font.patch', when='@1.3.3')
+
+    variant('shared', default=True, description='Enables the build of shared libraries')
+
+    def install(self, spec, prefix):
+        options = ['--prefix=%s' % prefix,
+                   '--enable-localjpeg',
+                   '--enable-localpng',
+                   '--enable-localzlib']
+
+        if '+shared' in spec:
+            options.append('--enable-shared')
+
+        # FLTK needs to be built in-source
+        configure(*options)
+        make()
+        make('install')
diff --git a/var/spack/packages/flux/package.py b/var/spack/repos/builtin/packages/flux/package.py
index dc4e0594c5..dc4e0594c5 100644
--- a/var/spack/packages/flux/package.py
+++ b/var/spack/repos/builtin/packages/flux/package.py
diff --git a/var/spack/packages/fontconfig/package.py b/var/spack/repos/builtin/packages/fontconfig/package.py
index 517c9d1813..517c9d1813 100644
--- a/var/spack/packages/fontconfig/package.py
+++ b/var/spack/repos/builtin/packages/fontconfig/package.py
diff --git a/var/spack/packages/freetype/package.py b/var/spack/repos/builtin/packages/freetype/package.py
index 0309b858a1..0309b858a1 100644
--- a/var/spack/packages/freetype/package.py
+++ b/var/spack/repos/builtin/packages/freetype/package.py
diff --git a/var/spack/packages/gasnet/package.py b/var/spack/repos/builtin/packages/gasnet/package.py
index 705961d1de..705961d1de 100644
--- a/var/spack/packages/gasnet/package.py
+++ b/var/spack/repos/builtin/packages/gasnet/package.py
diff --git a/var/spack/packages/gcc/package.py b/var/spack/repos/builtin/packages/gcc/package.py
index 7ec160d595..3e5895cfb8 100644
--- a/var/spack/packages/gcc/package.py
+++ b/var/spack/repos/builtin/packages/gcc/package.py
@@ -48,11 +48,14 @@ class Gcc(Package):
     version('4.7.4', '4c696da46297de6ae77a82797d2abe28')
     version('4.6.4', 'b407a3d1480c11667f293bfb1f17d1a4')
     version('4.5.4', '27e459c2566b8209ab064570e1b378f7')
-    
+
+    variant('gold', default=True, description="Build the gold linker plugin for ld-based LTO")
+
     depends_on("mpfr")
     depends_on("gmp")
     depends_on("mpc")     # when @4.5:
-    depends_on("binutils~libiberty")
+    depends_on("binutils~libiberty", when='~gold')
+    depends_on("binutils~libiberty+gold", when='+gold')
 
     # Save these until we can do optional deps.
     depends_on("isl", when=DEPENDS_ON_ISL_PREDICATE)
@@ -99,7 +102,7 @@ class Gcc(Package):
             configure(*options)
             make()
             make("install")
-            
+
         self.write_rpath_specs()
 
 
@@ -118,7 +121,7 @@ class Gcc(Package):
             return
 
         gcc = Executable(join_path(self.prefix.bin, 'gcc'))
-        lines = gcc('-dumpspecs', return_output=True).strip().split("\n")
+        lines = gcc('-dumpspecs', output=str).strip().split("\n")
         specs_file = join_path(self.spec_dir, 'specs')
         with closing(open(specs_file, 'w')) as out:
             for line in lines:
diff --git a/var/spack/packages/gdb/package.py b/var/spack/repos/builtin/packages/gdb/package.py
index fd567f346b..dd02b426b9 100644
--- a/var/spack/packages/gdb/package.py
+++ b/var/spack/repos/builtin/packages/gdb/package.py
@@ -6,7 +6,7 @@
 # Written by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
 # LLNL-CODE-647188
 #
-# For details, see https://scalability-llnl.github.io/spack
+# For details, see https://llnl.github.io/spack
 # Please also see the LICENSE file for our notice and the LGPL.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -32,13 +32,13 @@ class Gdb(Package):
     -- or what another program was doing at the moment it crashed.
     """
     homepage = "https://www.gnu.org/software/gdb"
-    url = "http://ftp.gnu.org/gnu/gdb/gdb-7.10.tar.xz"
+    url = "http://ftp.gnu.org/gnu/gdb/gdb-7.10.tar.gz"
 
-    version('7.10.1', '39e654460c9cdd80200a29ac020cfe11')
-    version('7.10', '2a35bac41fa8e10bf04f3a0dd7f7f363')
-    version('7.9.1', '35374c77a70884eb430c97061053a36e')
-    version('7.9', 'e6279f26559d839f0b4218a482bcb43e')
-    version('7.8.2', 'a80cf252ed2e775d4e4533341bbf2459')
+    version('7.10.1', 'b93a2721393e5fa226375b42d567d90b')
+    version('7.10', 'fa6827ad0fd2be1daa418abb11a54d86')
+    version('7.9.1', 'f3b97de919a9dba84490b2e076ec4cb0')
+    version('7.9', '8f8ced422fe462a00e0135a643544f17')
+    version('7.8.2', '8b0ea8b3559d3d90b3ff4952f0aeafbc')
 
     depends_on('texinfo')
 
diff --git a/var/spack/packages/gdk-pixbuf/package.py b/var/spack/repos/builtin/packages/gdk-pixbuf/package.py
index 14a5569984..14a5569984 100644
--- a/var/spack/packages/gdk-pixbuf/package.py
+++ b/var/spack/repos/builtin/packages/gdk-pixbuf/package.py
diff --git a/var/spack/packages/geos/package.py b/var/spack/repos/builtin/packages/geos/package.py
index 4a2657e32f..4a2657e32f 100644
--- a/var/spack/packages/geos/package.py
+++ b/var/spack/repos/builtin/packages/geos/package.py
diff --git a/var/spack/packages/gflags/package.py b/var/spack/repos/builtin/packages/gflags/package.py
index 62dd80a094..62dd80a094 100644
--- a/var/spack/packages/gflags/package.py
+++ b/var/spack/repos/builtin/packages/gflags/package.py
diff --git a/var/spack/packages/ghostscript/package.py b/var/spack/repos/builtin/packages/ghostscript/package.py
index 0ab49d425f..0ab49d425f 100644
--- a/var/spack/packages/ghostscript/package.py
+++ b/var/spack/repos/builtin/packages/ghostscript/package.py
diff --git a/var/spack/packages/git/package.py b/var/spack/repos/builtin/packages/git/package.py
index 28c7aa8161..ddc5078c4d 100644
--- a/var/spack/packages/git/package.py
+++ b/var/spack/repos/builtin/packages/git/package.py
@@ -5,14 +5,14 @@ class Git(Package):
        system designed to handle everything from small to very large
        projects with speed and efficiency."""
     homepage = "http://git-scm.com"
-    url      = "https://www.kernel.org/pub/software/scm/git/git-2.2.1.tar.xz"
-
-    version('2.6.3', '5a6375349c3f13c8dbbabfc327bae429')
-    version('2.6.2', '32ae5ad29763fc927bfcaeab55385fd9')
-    version('2.6.1', 'dd4a3a7fe96598c553edd39d40c9c290')
-    version('2.6.0', '6b7d43d615fb3f0dfecf4d131e23f438')
-    version('2.5.4', 'ec118fcd1cf984edc17eb6588b78e81b')
-    version('2.2.1', '43e01f9d96ba8c11611e0eef0d9f9f28')
+    url      = "https://www.kernel.org/pub/software/scm/git/git-2.2.1.tar.gz"
+
+    version('2.6.3', 'b711be7628a4a2c25f38d859ee81b423')
+    version('2.6.2', 'da293290da69f45a86a311ad3cd43dc8')
+    version('2.6.1', '4c62ee9c5991fe93d99cf2a6b68397fd')
+    version('2.6.0', 'eb76a07148d94802a1745d759716a57e')
+    version('2.5.4', '3eca2390cf1fa698b48e2a233563a76b')
+    version('2.2.1', 'ff41fdb094eed1ec430aed8ee9b9849c')
 
 
     # Git compiles with curl support by default on but if your system
diff --git a/var/spack/packages/glib/package.py b/var/spack/repos/builtin/packages/glib/package.py
index baca1a5a45..67ead5f941 100644
--- a/var/spack/packages/glib/package.py
+++ b/var/spack/repos/builtin/packages/glib/package.py
@@ -16,4 +16,4 @@ class Glib(Package):
     def install(self, spec, prefix):
         configure("--prefix=%s" % prefix)
         make()
-        make("install")
+        make("install", parallel=False)
diff --git a/var/spack/packages/glm/package.py b/var/spack/repos/builtin/packages/glm/package.py
index d00c301b4c..d00c301b4c 100644
--- a/var/spack/packages/glm/package.py
+++ b/var/spack/repos/builtin/packages/glm/package.py
diff --git a/var/spack/packages/global/package.py b/var/spack/repos/builtin/packages/global/package.py
index e8f06516d9..e8f06516d9 100644
--- a/var/spack/packages/global/package.py
+++ b/var/spack/repos/builtin/packages/global/package.py
diff --git a/var/spack/packages/glog/package.py b/var/spack/repos/builtin/packages/glog/package.py
index d73386b394..d73386b394 100644
--- a/var/spack/packages/glog/package.py
+++ b/var/spack/repos/builtin/packages/glog/package.py
diff --git a/var/spack/repos/builtin/packages/glpk/package.py b/var/spack/repos/builtin/packages/glpk/package.py
new file mode 100644
index 0000000000..855f459fb3
--- /dev/null
+++ b/var/spack/repos/builtin/packages/glpk/package.py
@@ -0,0 +1,53 @@
+##############################################################################
+# Copyright (c) 2013-2015, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Written by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License (as published by
+# the Free Software Foundation) version 2.1 dated February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+
+from spack import *
+
+
+class Glpk(Package):
+    """
+    The GLPK (GNU Linear Programming Kit) package is intended for solving large-scale linear programming (LP), mixed
+    integer programming (MIP), and other related problems. It is a set of routines written in ANSI C and organized in
+    the form of a callable library
+    """
+    homepage = "https://www.gnu.org/software/glpk"
+    url = "http://ftp.gnu.org/gnu/glpk/glpk-4.57.tar.gz"
+
+    version('4.57', '237531a54f73155842f8defe51aedb0f')
+
+    variant('gmp', default=False, description='Activates support for GMP library')
+
+    depends_on('gmp', when='+gmp')
+
+    def install(self, spec, prefix):
+
+        options = ['--prefix=%s' % prefix]
+
+        if '+gmp' in spec:
+            options.append('--with-gmp')
+
+        configure(*options)
+        make()
+        make("install")
diff --git a/var/spack/packages/gmp/package.py b/var/spack/repos/builtin/packages/gmp/package.py
index fe13de3b95..fe13de3b95 100644
--- a/var/spack/packages/gmp/package.py
+++ b/var/spack/repos/builtin/packages/gmp/package.py
diff --git a/var/spack/repos/builtin/packages/gmsh/package.py b/var/spack/repos/builtin/packages/gmsh/package.py
new file mode 100644
index 0000000000..9d759303cb
--- /dev/null
+++ b/var/spack/repos/builtin/packages/gmsh/package.py
@@ -0,0 +1,84 @@
+##############################################################################
+# Copyright (c) 2013, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Written by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License (as published by
+# the Free Software Foundation) version 2.1 dated February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Gmsh(Package):
+    """
+    Gmsh is a free 3D finite element grid generator with a built-in CAD engine and post-processor. Its design goal is
+    to provide a fast, light and user-friendly meshing tool with parametric input and advanced visualization
+    capabilities. Gmsh is built around four modules: geometry, mesh, solver and post-processing. The specification of
+    any input to these modules is done either interactively using the graphical user interface or in ASCII text files
+    using Gmsh's own scripting language.
+    """
+    homepage = 'http://gmsh.info'
+    url = 'http://gmsh.info/src/gmsh-2.11.0-source.tgz'
+
+    version('2.11.0', 'f15b6e7ac9ca649c9a74440e1259d0db')
+
+    # FIXME : Misses dependencies on gmm, PetsC, TetGen
+
+    variant('shared', default=True, description='Enables the build of shared libraries')
+    variant('debug', default=False, description='Builds the library in debug mode')
+    variant('mpi', default=False, description='Builds MPI support for parser and solver')
+    variant('fltk', default=False, description='Enables the build of the FLTK GUI')
+    variant('hdf5', default=False, description='Enables HDF5 support')
+    variant('compression', default=True, description='Enables IO compression through zlib')
+
+    depends_on('blas')
+    depends_on('lapack')
+    depends_on('gmp')
+    depends_on('mpi', when='+mpi')
+    depends_on('fltk', when='+fltk')  # Assumes OpenGL with GLU is already provided by the system
+    depends_on('hdf5', when='+hdf5')
+    depends_on('zlib', when='+compression')
+
+    def install(self, spec, prefix):
+
+        options = []
+        options.extend(std_cmake_args)
+
+        build_directory = join_path(self.stage.path, 'spack-build')
+        source_directory = self.stage.source_path
+
+        if '+shared' in spec:
+            options.extend(['-DENABLE_BUILD_SHARED:BOOL=ON',
+                            '-DENABLE_BUILD_DYNAMIC:BOOL=ON'])  # Builds dynamic executable and installs shared library
+        else:
+            options.append('-DENABLE_BUILD_LIB:BOOL=ON')  # Builds and installs static library
+
+        if '+debug' in spec:
+            options.append('-DCMAKE_BUILD_TYPE:STRING=Debug')
+
+        if '+mpi' in spec:
+            options.append('-DENABLE_MPI:BOOL=ON')
+
+        if '+compression' in spec:
+            options.append('-DENABLE_COMPRESSED_IO:BOOL=ON')
+
+        with working_dir(build_directory, create=True):
+            cmake(source_directory, *options)
+            make()
+            make('install')
diff --git a/var/spack/packages/gnuplot/package.py b/var/spack/repos/builtin/packages/gnuplot/package.py
index 71c09bd43d..71c09bd43d 100644
--- a/var/spack/packages/gnuplot/package.py
+++ b/var/spack/repos/builtin/packages/gnuplot/package.py
diff --git a/var/spack/packages/gnutls/package.py b/var/spack/repos/builtin/packages/gnutls/package.py
index cf57a24a6d..cf57a24a6d 100644
--- a/var/spack/packages/gnutls/package.py
+++ b/var/spack/repos/builtin/packages/gnutls/package.py
diff --git a/var/spack/packages/gperf/package.py b/var/spack/repos/builtin/packages/gperf/package.py
index 32551b67b4..32551b67b4 100644
--- a/var/spack/packages/gperf/package.py
+++ b/var/spack/repos/builtin/packages/gperf/package.py
diff --git a/var/spack/packages/gperftools/package.py b/var/spack/repos/builtin/packages/gperftools/package.py
index 0ba44c9329..22b2e6c424 100644
--- a/var/spack/packages/gperftools/package.py
+++ b/var/spack/repos/builtin/packages/gperftools/package.py
@@ -30,8 +30,11 @@ class Gperftools(Package):
     homepage = "https://code.google.com/p/gperftools"
     url      = "https://googledrive.com/host/0B6NtGsLhIcf7MWxMMF9JdTN3UVk/gperftools-2.3.tar.gz"
 
+    version('2.4', '2171cea3bbe053036fb5d5d25176a160', url="https://github.com/gperftools/gperftools/releases/download/gperftools-2.4/gperftools-2.4.tar.gz")
     version('2.3', 'f54dd119f0e46ac1f13264f8d97adf90', url="https://googledrive.com/host/0B6NtGsLhIcf7MWxMMF9JdTN3UVk/gperftools-2.3.tar.gz")
 
+    depends_on("libunwind")
+
     def install(self, spec, prefix):
         configure("--prefix=" + prefix)
         make()
diff --git a/var/spack/packages/graphlib/package.py b/var/spack/repos/builtin/packages/graphlib/package.py
index ddac0b2b66..ddac0b2b66 100644
--- a/var/spack/packages/graphlib/package.py
+++ b/var/spack/repos/builtin/packages/graphlib/package.py
diff --git a/var/spack/packages/graphviz/package.py b/var/spack/repos/builtin/packages/graphviz/package.py
index 7af7da1881..7af7da1881 100644
--- a/var/spack/packages/graphviz/package.py
+++ b/var/spack/repos/builtin/packages/graphviz/package.py
diff --git a/var/spack/packages/gsl/package.py b/var/spack/repos/builtin/packages/gsl/package.py
index 789eb49d85..789eb49d85 100644
--- a/var/spack/packages/gsl/package.py
+++ b/var/spack/repos/builtin/packages/gsl/package.py
diff --git a/var/spack/packages/gtkplus/package.py b/var/spack/repos/builtin/packages/gtkplus/package.py
index 0ebc7100de..0ebc7100de 100644
--- a/var/spack/packages/gtkplus/package.py
+++ b/var/spack/repos/builtin/packages/gtkplus/package.py
diff --git a/var/spack/packages/harfbuzz/package.py b/var/spack/repos/builtin/packages/harfbuzz/package.py
index ed7c42a909..ed7c42a909 100644
--- a/var/spack/packages/harfbuzz/package.py
+++ b/var/spack/repos/builtin/packages/harfbuzz/package.py
diff --git a/var/spack/repos/builtin/packages/hdf/package.py b/var/spack/repos/builtin/packages/hdf/package.py
new file mode 100644
index 0000000000..ac6435f2a2
--- /dev/null
+++ b/var/spack/repos/builtin/packages/hdf/package.py
@@ -0,0 +1,45 @@
+from spack import *
+
+class Hdf(Package):
+    """HDF4 (also known as HDF) is a library and multi-object
+    file format for storing and managing data between machines."""
+
+    homepage = "https://www.hdfgroup.org/products/hdf4/"
+    url      = "https://www.hdfgroup.org/ftp/HDF/releases/HDF4.2.11/src/hdf-4.2.11.tar.gz"
+    list_url = "https://www.hdfgroup.org/ftp/HDF/releases/"
+    list_depth = 3
+
+    version('4.2.11', '063f9928f3a19cc21367b71c3b8bbf19')
+
+    variant('szip', default=False, description="Enable szip support")
+
+    depends_on("jpeg")
+    depends_on("szip", when='+szip')
+    depends_on("zlib")
+
+
+    def url_for_version(self, version):
+       return "https://www.hdfgroup.org/ftp/HDF/releases/HDF" + str(version) + "/src/hdf-" + str(version) + ".tar.gz"
+
+
+    def install(self, spec, prefix):
+        config_args = [
+            'CFLAGS=-fPIC',
+            '--prefix=%s' % prefix,
+            '--with-jpeg=%s' % spec['jpeg'].prefix,
+            '--with-zlib=%s' % spec['zlib'].prefix,
+            '--disable-netcdf',  # must be disabled to build NetCDF with HDF4 support
+            '--enable-fortran',
+            '--disable-shared',  # fortran and shared libraries are not compatible
+            '--enable-static',
+            '--enable-production'
+        ]
+
+        # SZip support
+        if '+szip' in spec:
+            config_args.append('--with-szlib=%s' % spec['szip'].prefix)
+
+        configure(*config_args)
+
+        make()
+        make("install")
diff --git a/var/spack/repos/builtin/packages/hdf5/package.py b/var/spack/repos/builtin/packages/hdf5/package.py
new file mode 100644
index 0000000000..5321a191f0
--- /dev/null
+++ b/var/spack/repos/builtin/packages/hdf5/package.py
@@ -0,0 +1,135 @@
+##############################################################################
+# Copyright (c) 2013, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Written by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License (as published by
+# the Free Software Foundation) version 2.1 dated February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+
+from spack import *
+
+
+class Hdf5(Package):
+    """HDF5 is a data model, library, and file format for storing and managing
+       data. It supports an unlimited variety of datatypes, and is designed for
+       flexible and efficient I/O and for high volume and complex data.
+    """
+
+    homepage = "http://www.hdfgroup.org/HDF5/"
+    url = "http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8.13/src/hdf5-1.8.13.tar.gz"
+    list_url = "http://www.hdfgroup.org/ftp/HDF5/releases"
+    list_depth = 3
+
+    version('1.8.16', 'b8ed9a36ae142317f88b0c7ef4b9c618')
+    version('1.8.15', '03cccb5b33dbe975fdcd8ae9dc021f24')
+    version('1.8.13', 'c03426e9e77d7766944654280b467289')
+
+    variant('debug', default=False, description='Builds a debug version of the library')
+
+    variant('cxx', default=True, description='Enable C++ support')
+    variant('fortran', default=True, description='Enable Fortran support')
+    variant('unsupported', default=False, description='Enables unsupported configuration options')
+
+    variant('mpi', default=False, description='Enable MPI support')
+    variant('szip', default=False, description='Enable szip support')
+    variant('threadsafe', default=False, description='Enable thread-safe capabilities')
+
+    depends_on("mpi", when='+mpi')
+    depends_on("szip", when='+szip')
+    depends_on("zlib")
+
+    def validate(self, spec):
+        """
+        Checks if incompatible variants have been activated at the same time
+
+        :param spec: spec of the package
+        :raises RuntimeError: in case of inconsistencies
+        """
+        if '+fortran' in spec and not self.compiler.fc:
+            msg = 'cannot build a fortran variant without a fortran compiler'
+            raise RuntimeError(msg)
+
+        if '+threadsafe' in spec and ('+cxx' in spec or '+fortran' in spec):
+                raise RuntimeError("cannot use variant +threadsafe with either +cxx or +fortran")
+
+    def install(self, spec, prefix):
+        self.validate(spec)
+        # Handle compilation after spec validation
+        extra_args = []
+        if '+debug' in spec:
+            extra_args.append('--enable-debug=all')
+        else:
+            extra_args.append('--enable-production')
+
+        if '+unsupported' in spec:
+            extra_args.append("--enable-unsupported")
+
+        if '+cxx' in spec:
+            extra_args.append('--enable-cxx')
+
+        if '+fortran' in spec:
+            extra_args.extend([
+                '--enable-fortran',
+                '--enable-fortran2003'
+            ])
+
+        if '+mpi' in spec:
+            # The HDF5 configure script warns if cxx and mpi are enabled
+            # together. There doesn't seem to be a real reason for this, except
+            # that parts of the MPI interface are not accessible via the C++
+            # interface. Since they are still accessible via the C interface,
+            # this is not actually a problem.
+            extra_args.extend([
+                "--enable-parallel",
+                "CC=%s" % spec['mpi'].prefix.bin + "/mpicc",
+            ])
+
+            if '+cxx' in spec:
+                extra_args.append("CXX=%s" % spec['mpi'].prefix.bin + "/mpic++")
+
+            if '+fortran' in spec:
+                extra_args.append("FC=%s" % spec['mpi'].prefix.bin + "/mpifort")
+
+        if '+szip' in spec:
+            extra_args.append("--with-szlib=%s" % spec['szip'].prefix)
+
+        if '+threadsafe' in spec:
+            extra_args.extend([
+                '--enable-threadsafe',
+                '--disable-hl',
+            ])
+
+        configure(
+            "--prefix=%s" % prefix,
+            "--with-zlib=%s" % spec['zlib'].prefix,
+            "--enable-shared",  # TODO : this should be enabled by default, remove it?
+            *extra_args)
+        make()
+        make("install")
+
+    def url_for_version(self, version):
+        v = str(version)
+
+        if version == Version("1.2.2"):
+            return "http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-" + v + ".tar.gz"
+        elif version < Version("1.7"):
+            return "http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-" + version.up_to(2) + "/hdf5-" + v + ".tar.gz"
+        else:
+            return "http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-" + v + "/src/hdf5-" + v + ".tar.gz"
diff --git a/var/spack/packages/hwloc/package.py b/var/spack/repos/builtin/packages/hwloc/package.py
index 7ebede76a3..60b315119b 100644
--- a/var/spack/packages/hwloc/package.py
+++ b/var/spack/repos/builtin/packages/hwloc/package.py
@@ -14,15 +14,18 @@ class Hwloc(Package):
        efficiently."""
     homepage = "http://www.open-mpi.org/projects/hwloc/"
     url      = "http://www.open-mpi.org/software/hwloc/v1.9/downloads/hwloc-1.9.tar.gz"
+    list_url = "http://www.open-mpi.org/software/hwloc/"
+    list_depth = 3
 
-    version('1.11.2', '486169cbe111cdea57be12638828ebbf',
-            url='http://www.open-mpi.org/software/hwloc/v1.11/downloads/hwloc-1.11.2.tar.bz2')
-    version('1.11.1', '002742efd3a8431f98d6315365a2b543',
-            url='http://www.open-mpi.org/software/hwloc/v1.11/downloads/hwloc-1.11.1.tar.bz2')
-    version('1.9', '1f9f9155682fe8946a97c08896109508')
+    version('1.11.2', '486169cbe111cdea57be12638828ebbf')
+    version('1.11.1', '002742efd3a8431f98d6315365a2b543')
+    version('1.9',    '1f9f9155682fe8946a97c08896109508')
 
     depends_on('libpciaccess')
 
+    def url_for_version(self, version):
+        return "http://www.open-mpi.org/software/hwloc/v%s/downloads/hwloc-%s.tar.gz" % (version.up_to(2), version)
+
     def install(self, spec, prefix):
         configure("--prefix=%s" % prefix)
 
diff --git a/var/spack/packages/hypre/package.py b/var/spack/repos/builtin/packages/hypre/package.py
index 0f7f14dd89..0f7f14dd89 100644
--- a/var/spack/packages/hypre/package.py
+++ b/var/spack/repos/builtin/packages/hypre/package.py
diff --git a/var/spack/packages/icu/package.py b/var/spack/repos/builtin/packages/icu/package.py
index f256ec5712..f256ec5712 100644
--- a/var/spack/packages/icu/package.py
+++ b/var/spack/repos/builtin/packages/icu/package.py
diff --git a/var/spack/packages/icu4c/package.py b/var/spack/repos/builtin/packages/icu4c/package.py
index 55b44463b2..55b44463b2 100644
--- a/var/spack/packages/icu4c/package.py
+++ b/var/spack/repos/builtin/packages/icu4c/package.py
diff --git a/var/spack/packages/isl/package.py b/var/spack/repos/builtin/packages/isl/package.py
index 836ef3ea40..836ef3ea40 100644
--- a/var/spack/packages/isl/package.py
+++ b/var/spack/repos/builtin/packages/isl/package.py
diff --git a/var/spack/packages/jdk/package.py b/var/spack/repos/builtin/packages/jdk/package.py
index f8f5fc21bd..f8f5fc21bd 100644
--- a/var/spack/packages/jdk/package.py
+++ b/var/spack/repos/builtin/packages/jdk/package.py
diff --git a/var/spack/packages/jemalloc/package.py b/var/spack/repos/builtin/packages/jemalloc/package.py
index 8cec9ea75b..8cec9ea75b 100644
--- a/var/spack/packages/jemalloc/package.py
+++ b/var/spack/repos/builtin/packages/jemalloc/package.py
diff --git a/var/spack/packages/jpeg/package.py b/var/spack/repos/builtin/packages/jpeg/package.py
index 87820467db..87820467db 100644
--- a/var/spack/packages/jpeg/package.py
+++ b/var/spack/repos/builtin/packages/jpeg/package.py
diff --git a/var/spack/packages/judy/package.py b/var/spack/repos/builtin/packages/judy/package.py
index b8d8701383..b8d8701383 100644
--- a/var/spack/packages/judy/package.py
+++ b/var/spack/repos/builtin/packages/judy/package.py
diff --git a/var/spack/repos/builtin/packages/julia/gc.patch b/var/spack/repos/builtin/packages/julia/gc.patch
new file mode 100644
index 0000000000..6db69c6c1b
--- /dev/null
+++ b/var/spack/repos/builtin/packages/julia/gc.patch
@@ -0,0 +1,11 @@
+--- julia/src/gc.c
++++ julia/src/gc.c
+@@ -162,7 +162,7 @@
+ // A region is contiguous storage for up to REGION_PG_COUNT naturally aligned GC_PAGE_SZ pages
+ // It uses a very naive allocator (see malloc_page & free_page)
+ #if defined(_P64) && !defined(_COMPILER_MICROSOFT_)
+-#define REGION_PG_COUNT 16*8*4096 // 8G because virtual memory is cheap
++#define REGION_PG_COUNT 8*4096 // 512M
+ #else
+ #define REGION_PG_COUNT 8*4096 // 512M
+ #endif
diff --git a/var/spack/packages/julia/package.py b/var/spack/repos/builtin/packages/julia/package.py
index 9fd946c905..6900af38e4 100644
--- a/var/spack/packages/julia/package.py
+++ b/var/spack/repos/builtin/packages/julia/package.py
@@ -6,13 +6,17 @@ class Julia(Package):
     homepage = "http://julialang.org"
     url      = "http://github.com/JuliaLang/julia/releases/download/v0.4.2/julia-0.4.2.tar.gz"
 
+    version('0.4.3', '7b9f096798fca4bef262a64674bc2b52')
     version('0.4.2', 'ccfeb4f4090c8b31083f5e1ccb03eb06')
 
+    patch('gc.patch')
+
     # Build-time dependencies
-    # depends_on("cmake")
+    depends_on("cmake @2.8:")
     # depends_on("awk")
     # depends_on("m4")
     # depends_on("pkg-config")
+    depends_on("python @2.6:2.9")
 
     # I think that Julia requires the dependencies above, but it builds find (on
     # my system) without these. We should enable them as necessary.
diff --git a/var/spack/packages/launchmon/package.py b/var/spack/repos/builtin/packages/launchmon/package.py
index f97384a249..aec2fd6fa7 100644
--- a/var/spack/packages/launchmon/package.py
+++ b/var/spack/repos/builtin/packages/launchmon/package.py
@@ -37,6 +37,16 @@ class Launchmon(Package):
     depends_on('automake')
     depends_on('libtool')
 
+
+    def patch(self):
+        # This patch makes libgcrypt compile correctly with newer gcc versions.
+        mf = FileFilter('tools/libgcrypt/tests/Makefile.in')
+        mf.filter(r'(basic_LDADD\s*=\s*.*)',     r'\1 -lgpg-error')
+        mf.filter(r'(tsexp_LDADD\s*=\s*.*)',     r'\1 -lgpg-error')
+        mf.filter(r'(keygen_LDADD\s*=\s*.*)',    r'\1 -lgpg-error')
+        mf.filter(r'(benchmark_LDADD\s*=\s*.*)', r'\1 -lgpg-error')
+
+
     def install(self, spec, prefix):
         configure(
             "--prefix=" + prefix,
diff --git a/var/spack/packages/launchmon/patch.lmon_install_dir b/var/spack/repos/builtin/packages/launchmon/patch.lmon_install_dir
index 8a1d93fdc9..8a1d93fdc9 100644
--- a/var/spack/packages/launchmon/patch.lmon_install_dir
+++ b/var/spack/repos/builtin/packages/launchmon/patch.lmon_install_dir
diff --git a/var/spack/packages/lcms/package.py b/var/spack/repos/builtin/packages/lcms/package.py
index a53c2f997a..a53c2f997a 100644
--- a/var/spack/packages/lcms/package.py
+++ b/var/spack/repos/builtin/packages/lcms/package.py
diff --git a/var/spack/packages/leveldb/package.py b/var/spack/repos/builtin/packages/leveldb/package.py
index da68a9cbcb..da68a9cbcb 100644
--- a/var/spack/packages/leveldb/package.py
+++ b/var/spack/repos/builtin/packages/leveldb/package.py
diff --git a/var/spack/packages/libNBC/package.py b/var/spack/repos/builtin/packages/libNBC/package.py
index 550568e97d..550568e97d 100644
--- a/var/spack/packages/libNBC/package.py
+++ b/var/spack/repos/builtin/packages/libNBC/package.py
diff --git a/var/spack/packages/libarchive/package.py b/var/spack/repos/builtin/packages/libarchive/package.py
index cbd4b89cd0..cbd4b89cd0 100644
--- a/var/spack/packages/libarchive/package.py
+++ b/var/spack/repos/builtin/packages/libarchive/package.py
diff --git a/var/spack/packages/libcerf/package.py b/var/spack/repos/builtin/packages/libcerf/package.py
index 15e87ce4fe..15e87ce4fe 100644
--- a/var/spack/packages/libcerf/package.py
+++ b/var/spack/repos/builtin/packages/libcerf/package.py
diff --git a/var/spack/packages/libcircle/package.py b/var/spack/repos/builtin/packages/libcircle/package.py
index 3f7c996fb0..3f7c996fb0 100644
--- a/var/spack/packages/libcircle/package.py
+++ b/var/spack/repos/builtin/packages/libcircle/package.py
diff --git a/var/spack/packages/libdrm/package.py b/var/spack/repos/builtin/packages/libdrm/package.py
index 00736b7811..00736b7811 100644
--- a/var/spack/packages/libdrm/package.py
+++ b/var/spack/repos/builtin/packages/libdrm/package.py
diff --git a/var/spack/packages/libdwarf/package.py b/var/spack/repos/builtin/packages/libdwarf/package.py
index addb557519..addb557519 100644
--- a/var/spack/packages/libdwarf/package.py
+++ b/var/spack/repos/builtin/packages/libdwarf/package.py
diff --git a/var/spack/packages/libedit/package.py b/var/spack/repos/builtin/packages/libedit/package.py
index bcd5212b9e..bcd5212b9e 100644
--- a/var/spack/packages/libedit/package.py
+++ b/var/spack/repos/builtin/packages/libedit/package.py
diff --git a/var/spack/packages/libelf/package.py b/var/spack/repos/builtin/packages/libelf/package.py
index 29bc21b65c..29bc21b65c 100644
--- a/var/spack/packages/libelf/package.py
+++ b/var/spack/repos/builtin/packages/libelf/package.py
diff --git a/var/spack/packages/libevent/package.py b/var/spack/repos/builtin/packages/libevent/package.py
index 11b1083d67..11b1083d67 100644
--- a/var/spack/packages/libevent/package.py
+++ b/var/spack/repos/builtin/packages/libevent/package.py
diff --git a/var/spack/packages/libffi/package.py b/var/spack/repos/builtin/packages/libffi/package.py
index acec031717..acec031717 100644
--- a/var/spack/packages/libffi/package.py
+++ b/var/spack/repos/builtin/packages/libffi/package.py
diff --git a/var/spack/packages/libgcrypt/package.py b/var/spack/repos/builtin/packages/libgcrypt/package.py
index 1d0a57f317..1d0a57f317 100644
--- a/var/spack/packages/libgcrypt/package.py
+++ b/var/spack/repos/builtin/packages/libgcrypt/package.py
diff --git a/var/spack/packages/libgd/package.py b/var/spack/repos/builtin/packages/libgd/package.py
index d920957ef1..d920957ef1 100644
--- a/var/spack/packages/libgd/package.py
+++ b/var/spack/repos/builtin/packages/libgd/package.py
diff --git a/var/spack/packages/libgpg-error/package.py b/var/spack/repos/builtin/packages/libgpg-error/package.py
index 6c1d1a10a7..6c1d1a10a7 100644
--- a/var/spack/packages/libgpg-error/package.py
+++ b/var/spack/repos/builtin/packages/libgpg-error/package.py
diff --git a/var/spack/packages/libjpeg-turbo/package.py b/var/spack/repos/builtin/packages/libjpeg-turbo/package.py
index 07ee183947..07ee183947 100644
--- a/var/spack/packages/libjpeg-turbo/package.py
+++ b/var/spack/repos/builtin/packages/libjpeg-turbo/package.py
diff --git a/var/spack/packages/libjson-c/package.py b/var/spack/repos/builtin/packages/libjson-c/package.py
index c0801cce9c..c0801cce9c 100644
--- a/var/spack/packages/libjson-c/package.py
+++ b/var/spack/repos/builtin/packages/libjson-c/package.py
diff --git a/var/spack/packages/libmng/package.py b/var/spack/repos/builtin/packages/libmng/package.py
index e5336ea2c2..e5336ea2c2 100644
--- a/var/spack/packages/libmng/package.py
+++ b/var/spack/repos/builtin/packages/libmng/package.py
diff --git a/var/spack/packages/libmonitor/libmonitorkrell-0000.patch b/var/spack/repos/builtin/packages/libmonitor/libmonitorkrell-0000.patch
index 3a90106850..3a90106850 100644
--- a/var/spack/packages/libmonitor/libmonitorkrell-0000.patch
+++ b/var/spack/repos/builtin/packages/libmonitor/libmonitorkrell-0000.patch
diff --git a/var/spack/packages/libmonitor/libmonitorkrell-0001.patch b/var/spack/repos/builtin/packages/libmonitor/libmonitorkrell-0001.patch
index 85d69595c0..85d69595c0 100644
--- a/var/spack/packages/libmonitor/libmonitorkrell-0001.patch
+++ b/var/spack/repos/builtin/packages/libmonitor/libmonitorkrell-0001.patch
diff --git a/var/spack/packages/libmonitor/libmonitorkrell-0002.patch b/var/spack/repos/builtin/packages/libmonitor/libmonitorkrell-0002.patch
index 514dfdf13e..514dfdf13e 100644
--- a/var/spack/packages/libmonitor/libmonitorkrell-0002.patch
+++ b/var/spack/repos/builtin/packages/libmonitor/libmonitorkrell-0002.patch
diff --git a/var/spack/packages/libmonitor/package.py b/var/spack/repos/builtin/packages/libmonitor/package.py
index eecf1963e3..eecf1963e3 100644
--- a/var/spack/packages/libmonitor/package.py
+++ b/var/spack/repos/builtin/packages/libmonitor/package.py
diff --git a/var/spack/packages/libpciaccess/package.py b/var/spack/repos/builtin/packages/libpciaccess/package.py
index 403bafbbd2..0c0847d323 100644
--- a/var/spack/packages/libpciaccess/package.py
+++ b/var/spack/repos/builtin/packages/libpciaccess/package.py
@@ -5,12 +5,10 @@ class Libpciaccess(Package):
     """Generic PCI access library."""
 
     homepage = "http://cgit.freedesktop.org/xorg/lib/libpciaccess/"
-    url      = "http://cgit.freedesktop.org/xorg/lib/libpciaccess/"
+    url      = "http://xorg.freedesktop.org/archive/individual/lib/libpciaccess-0.13.4.tar.bz2"
 
-    version('0.13.4', git='http://anongit.freedesktop.org/git/xorg/lib/libpciaccess.git',
-            tag='libpciaccess-0.13.4')
+    version('0.13.4', 'ace78aec799b1cf6dfaea55d3879ed9f')
 
-    depends_on('autoconf')
     depends_on('libtool')
 
     def install(self, spec, prefix):
@@ -20,9 +18,6 @@ class Libpciaccess(Package):
             mkdir(prefix.lib)
             return
 
-        from subprocess import call
-        call(["./autogen.sh"])
         configure("--prefix=%s" % prefix)
-
         make()
         make("install")
diff --git a/var/spack/packages/libpng/package.py b/var/spack/repos/builtin/packages/libpng/package.py
index e02b08663e..e02b08663e 100644
--- a/var/spack/packages/libpng/package.py
+++ b/var/spack/repos/builtin/packages/libpng/package.py
diff --git a/var/spack/packages/libsodium/package.py b/var/spack/repos/builtin/packages/libsodium/package.py
index 1c8a16d998..1c8a16d998 100644
--- a/var/spack/packages/libsodium/package.py
+++ b/var/spack/repos/builtin/packages/libsodium/package.py
diff --git a/var/spack/packages/libtiff/package.py b/var/spack/repos/builtin/packages/libtiff/package.py
index 63c6704cb8..63c6704cb8 100644
--- a/var/spack/packages/libtiff/package.py
+++ b/var/spack/repos/builtin/packages/libtiff/package.py
diff --git a/var/spack/packages/libtool/package.py b/var/spack/repos/builtin/packages/libtool/package.py
index a07daf9781..82a54953b2 100644
--- a/var/spack/packages/libtool/package.py
+++ b/var/spack/repos/builtin/packages/libtool/package.py
@@ -5,6 +5,7 @@ class Libtool(Package):
     homepage = "https://www.gnu.org/software/libtool/"
     url      = "http://ftpmirror.gnu.org/libtool/libtool-2.4.2.tar.gz"
 
+    version('2.4.6' , 'addf44b646ddb4e3919805aa88fa7c5e')
     version('2.4.2' , 'd2f3b7d4627e69e13514a40e72a24d50')
 
     def install(self, spec, prefix):
diff --git a/var/spack/packages/libunwind/package.py b/var/spack/repos/builtin/packages/libunwind/package.py
index 6f162f7b08..6f162f7b08 100644
--- a/var/spack/packages/libunwind/package.py
+++ b/var/spack/repos/builtin/packages/libunwind/package.py
diff --git a/var/spack/packages/libuuid/package.py b/var/spack/repos/builtin/packages/libuuid/package.py
index 373c5bfcac..373c5bfcac 100644
--- a/var/spack/packages/libuuid/package.py
+++ b/var/spack/repos/builtin/packages/libuuid/package.py
diff --git a/var/spack/packages/libxcb/package.py b/var/spack/repos/builtin/packages/libxcb/package.py
index 16a5525c0d..1dd5954c99 100644
--- a/var/spack/packages/libxcb/package.py
+++ b/var/spack/repos/builtin/packages/libxcb/package.py
@@ -1,9 +1,9 @@
 from spack import *
 
 class Libxcb(Package):
-    """The X protocol C-language Binding (XCB) is a replacement 
-    for Xlib featuring a small footprint, latency hiding, direct 
-    access to the protocol, improved threading support, and 
+    """The X protocol C-language Binding (XCB) is a replacement
+    for Xlib featuring a small footprint, latency hiding, direct
+    access to the protocol, improved threading support, and
     extensibility."""
 
     homepage = "http://xcb.freedesktop.org/"
@@ -14,6 +14,10 @@ class Libxcb(Package):
     depends_on("python")
     depends_on("xcb-proto")
 
+    def patch(self):
+        filter_file('typedef struct xcb_auth_info_t {', 'typedef struct {', 'src/xcb.h')
+
+
     def install(self, spec, prefix):
         configure("--prefix=%s" % prefix)
 
diff --git a/var/spack/packages/libxml2/package.py b/var/spack/repos/builtin/packages/libxml2/package.py
index 134e596963..134e596963 100644
--- a/var/spack/packages/libxml2/package.py
+++ b/var/spack/repos/builtin/packages/libxml2/package.py
diff --git a/var/spack/packages/libxshmfence/package.py b/var/spack/repos/builtin/packages/libxshmfence/package.py
index 3aa2448b46..3aa2448b46 100644
--- a/var/spack/packages/libxshmfence/package.py
+++ b/var/spack/repos/builtin/packages/libxshmfence/package.py
diff --git a/var/spack/packages/libxslt/package.py b/var/spack/repos/builtin/packages/libxslt/package.py
index f97332d020..f97332d020 100644
--- a/var/spack/packages/libxslt/package.py
+++ b/var/spack/repos/builtin/packages/libxslt/package.py
diff --git a/var/spack/packages/llvm-lld/package.py b/var/spack/repos/builtin/packages/llvm-lld/package.py
index cb91aa22a5..cb91aa22a5 100644
--- a/var/spack/packages/llvm-lld/package.py
+++ b/var/spack/repos/builtin/packages/llvm-lld/package.py
diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py
new file mode 100644
index 0000000000..a2b2c6eccc
--- /dev/null
+++ b/var/spack/repos/builtin/packages/llvm/package.py
@@ -0,0 +1,218 @@
+##############################################################################
+# Copyright (c) 2013, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Written by David Beckingsale, david@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License (as published by
+# the Free Software Foundation) version 2.1 dated February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+import os, shutil
+
+
+class Llvm(Package):
+    """The LLVM Project is a collection of modular and reusable compiler and
+       toolchain technologies. Despite its name, LLVM has little to do with
+       traditional virtual machines, though it does provide helpful libraries
+       that can be used to build them. The name "LLVM" itself is not an acronym;
+       it is the full name of the project.
+    """
+    homepage = 'http://llvm.org/'
+    url = 'http://llvm.org/releases/3.7.0/llvm-3.7.0.src.tar.xz'
+
+    version('3.0', 'a8e5f5f1c1adebae7b4a654c376a6005', url='http://llvm.org/releases/3.0/llvm-3.0.tar.gz') # currently required by mesa package
+
+    variant('debug', default=False, description="Build a debug version of LLVM, this increases binary size by an order of magnitude, make sure you have 20-30gb of space available to build this")
+    variant('clang', default=True, description="Build the LLVM C/C++/Objective-C compiler frontend")
+    variant('lldb', default=True, description="Build the LLVM debugger")
+    variant('internal_unwind', default=True, description="Build the libcxxabi libunwind")
+    variant('polly', default=True, description="Build the LLVM polyhedral optimization plugin, only builds for 3.7.0+")
+    variant('libcxx', default=True, description="Build the LLVM C++ standard library")
+    variant('compiler-rt', default=True, description="Build the LLVM compiler runtime, including sanitizers")
+    variant('gold', default=True, description="Add support for LTO with the gold linker plugin")
+
+
+    # Build dependency
+    depends_on('cmake @2.8.12.2:')
+
+    # Universal dependency
+    depends_on('python@2.7:')
+
+    # lldb dependencies
+    depends_on('ncurses', when='+lldb')
+    depends_on('swig', when='+lldb')
+    depends_on('libedit', when='+lldb')
+
+    # gold support
+    depends_on('binutils+gold', when='+gold')
+
+    # polly plugin
+    depends_on('gmp', when='@:3.6.999 +polly')
+    depends_on('isl', when='@:3.6.999 +polly')
+
+    base_url =  'http://llvm.org/releases/%%(version)s/%(pkg)s-%%(version)s.src.tar.xz'
+    llvm_url = base_url % { 'pkg' : 'llvm'}
+
+    resources = {
+                    'compiler-rt' : {
+                        'url' : base_url % { 'pkg' : 'compiler-rt'},
+                        'destination' : 'projects',
+                        'placement' : 'compiler-rt',
+                    },
+                    'openmp' : {
+                        'url' : base_url % { 'pkg' : 'openmp'},
+                        'destination' : 'projects',
+                        'placement' : 'openmp',
+                    },
+                    'libcxx' : {
+                        'url' : base_url % { 'pkg' : 'libcxx'},
+                        'destination' : 'projects',
+                        'placement' : 'libcxx',
+                    },
+                    'libcxxabi' : {
+                        'url' :  base_url % { 'pkg' : 'libcxxabi'},
+                        'destination' : 'projects',
+                        'placement' : 'libcxxabi',
+                    },
+                    'clang' : {
+                        'url' :  base_url % { 'pkg' : 'cfe'},
+                        'destination' : 'tools',
+                        'placement' : 'clang',
+                    },
+                    'clang-tools-extra' : {
+                        'url' :  base_url % { 'pkg' : 'clang-tools-extra'},
+                        'destination' : 'tools/clang/tools',
+                        'placement' : 'extra',
+                    },
+                    'lldb' : {
+                        'url' :  base_url % { 'pkg' : 'lldb'},
+                        'destination' : 'tools',
+                        'placement' : 'lldb',
+                    },
+                    'polly' : {
+                        'url' :  base_url % { 'pkg' : 'polly'},
+                        'destination' : 'tools',
+                        'placement' : 'polly',
+                    },
+                    'llvm-libunwind' : {
+                        'url' :  base_url % { 'pkg' : 'libunwind'},
+                        'destination' : 'projects',
+                        'placement' : 'libunwind',
+                    },
+                }
+    releases = [
+                  {
+                    'version' : '3.7.0',
+                    'md5':'b98b9495e5655a672d6cb83e1a180f8e',
+                    'resources' : {
+                        'compiler-rt' : '383c10affd513026f08936b5525523f5',
+                        'openmp' : 'f482c86fdead50ba246a1a2b0bbf206f',
+                        'polly' : '32f93ffc9cc7e042df22089761558f8b',
+                        'libcxx' : '46aa5175cbe1ad42d6e9c995968e56dd',
+                        'libcxxabi' : '5aa769e2fca79fa5335cfae8f6258772',
+                        'clang' : '8f9d27335e7331cf0a4711e952f21f01',
+                        'clang-tools-extra' : 'd5a87dacb65d981a427a536f6964642e',
+                        'lldb' : 'e5931740400d1dc3e7db4c7ba2ceff68',
+                        'llvm-libunwind' : '9a75392eb7eb8ed5c0840007e212baf5',
+                        }
+                  },
+                  {
+                    'version' : '3.6.2',
+                    'md5':'0c1ee3597d75280dee603bae9cbf5cc2',
+                    'resources' : {
+                        'compiler-rt' : 'e3bc4eb7ba8c39a6fe90d6c988927f3c',
+                        'openmp' : '65dd5863b9b270960a96817e9152b123',
+                        'libcxx' : '22214c90697636ef960a49aef7c1823a',
+                        'libcxxabi' : '17518e361e4e228f193dd91e8ef54ba2',
+                        'clang' : 'ff862793682f714bb7862325b9c06e20',
+                        'clang-tools-extra' : '3ebc1dc41659fcec3db1b47d81575e06',
+                        'lldb' : '51e5eb552f777b950bb0ff326e60d5f0',
+                        }
+                  },
+                  {
+                    'version' : '3.5.1',
+                    'md5':'2d3d8004f38852aa679e5945b8ce0b14',
+                    'resources' : {
+                        'compiler-rt' : 'd626cfb8a9712cb92b820798ab5bc1f8',
+                        'openmp' : '121ddb10167d7fc38b1f7e4b029cf059',
+                        'libcxx' : '406f09b1dab529f3f7879f4d548329d2',
+                        'libcxxabi' : 'b22c707e8d474a99865ad3c521c3d464',
+                        'clang' : '93f9532f8f7e6f1d8e5c1116907051cb',
+                        'clang-tools-extra' : 'f13f31ed3038acadc6fa63fef812a246',
+                        'lldb' : 'cc5ea8a414c62c33e760517f8929a204',
+                        }
+                  },
+               ]
+
+    for release in releases:
+        version(release['version'], release['md5'], url=llvm_url % release)
+
+        for name, md5 in release['resources'].items():
+            resource(name=name,
+                     url=resources[name]['url'] % release,
+                     md5=md5,
+                     destination=resources[name]['destination'],
+                     when='@%(version)s' % release,
+                     placement=resources[name].get('placement', None))
+
+    def install(self, spec, prefix):
+        env['CXXFLAGS'] = self.compiler.cxx11_flag
+        cmake_args = [ arg for arg in std_cmake_args if 'BUILD_TYPE' not in arg ]
+
+        build_type = 'RelWithDebInfo' if '+debug' in spec else 'Release'
+        cmake_args.extend([
+                '..',
+                '-DCMAKE_BUILD_TYPE=' + build_type,
+                '-DLLVM_REQUIRES_RTTI:BOOL=ON',
+                '-DCLANG_DEFAULT_OPENMP_RUNTIME:STRING=libomp',
+                '-DPYTHON_EXECUTABLE:PATH=%s/bin/python' % spec['python'].prefix ])
+
+        if '+gold' in spec:
+            cmake_args.append('-DLLVM_BINUTILS_INCDIR=' + os.path.join( spec['binutils'].prefix, 'include'))
+        if '+polly' in spec:
+            cmake_args.append('-DLINK_POLLY_INTO_TOOLS:Bool=ON')
+        else:
+            cmake_args.append('-DLLVM_EXTERNAL_POLLY_BUILD:Bool=OFF')
+
+        if '+clang' not in spec:
+            cmake_args.append('-DLLVM_EXTERNAL_CLANG_BUILD:Bool=OFF')
+        if '+lldb' not in spec:
+            cmake_args.append('-DLLVM_EXTERNAL_LLDB_BUILD:Bool=OFF')
+        if '+internal_unwind' not in spec:
+            cmake_args.append('-DLLVM_EXTERNAL_LIBUNWIND_BUILD:Bool=OFF')
+        if '+libcxx' not in spec:
+            cmake_args.append('-DLLVM_EXTERNAL_LIBCXX_BUILD:Bool=OFF')
+            cmake_args.append('-DLLVM_EXTERNAL_LIBCXXABI_BUILD:Bool=OFF')
+        if '+compiler-rt' not in spec:
+            cmake_args.append('-DLLVM_EXTERNAL_COMPILER_RT_BUILD:Bool=OFF')
+
+        if  '+clang' not in spec:
+            if '+clang_extra' in spec:
+                raise SpackException('The clang_extra variant requires the clang variant to be selected')
+            if '+lldb' in spec:
+                raise SpackException('The lldb variant requires the clang variant to be selected')
+
+        with working_dir('spack-build', create=True):
+            cmake(*cmake_args)
+            make()
+            make("install")
+            query_path = os.path.join('bin', 'clang-query')
+            # Manually install clang-query, because llvm doesn't...
+            if os.path.exists(query_path):
+                shutil.copy(query_path, os.path.join(prefix, 'bin'))
diff --git a/var/spack/packages/lmdb/package.py b/var/spack/repos/builtin/packages/lmdb/package.py
index 875b8100c5..875b8100c5 100644
--- a/var/spack/packages/lmdb/package.py
+++ b/var/spack/repos/builtin/packages/lmdb/package.py
diff --git a/var/spack/packages/lmod/package.py b/var/spack/repos/builtin/packages/lmod/package.py
index d642594f92..d642594f92 100644
--- a/var/spack/packages/lmod/package.py
+++ b/var/spack/repos/builtin/packages/lmod/package.py
diff --git a/var/spack/packages/lua/package.py b/var/spack/repos/builtin/packages/lua/package.py
index 6d8f7806d9..ca8cfc5365 100644
--- a/var/spack/packages/lua/package.py
+++ b/var/spack/repos/builtin/packages/lua/package.py
@@ -6,6 +6,7 @@ class Lua(Package):
     homepage = "http://www.lua.org"
     url      = "http://www.lua.org/ftp/lua-5.1.5.tar.gz"
 
+    version('5.3.2', '33278c2ab5ee3c1a875be8d55c1ca2a1')
     version('5.3.1', '797adacada8d85761c079390ff1d9961')
     version('5.3.0', 'a1b0a7e92d0c85bbff7a8d27bf29f8af')
     version('5.2.4', '913fdb32207046b273fdb17aad70be13')
@@ -18,11 +19,16 @@ class Lua(Package):
     version('5.1.3', 'a70a8dfaa150e047866dc01a46272599')
 
     depends_on('ncurses')
+    depends_on('readline')
 
     def install(self, spec, prefix):
+        if spec.satisfies("=darwin-i686") or spec.satisfies("=darwin-x86_64"):
+            target = 'macosx'
+        else:
+            target = 'linux'
         make('INSTALL_TOP=%s' % prefix,
-             'MYLDFLAGS="-L%s/lib -Wl,-rpath,%s"' % (spec['ncurses'].prefix,spec['ncurses'].prefix),
-             'linux')
+             'MYLDFLAGS=-L%s -lncurses' % spec['ncurses'].prefix.lib,
+             target)
         make('INSTALL_TOP=%s' % prefix,
-             'MYLDFLAGS="-L%s/lib -Wl,-rpath,%s"' % (spec['ncurses'].prefix,spec['ncurses'].prefix),
+             'MYLDFLAGS=-L%s -lncurses' % spec['ncurses'].prefix.lib,
              'install')
diff --git a/var/spack/packages/lwgrp/package.py b/var/spack/repos/builtin/packages/lwgrp/package.py
index 5963382b92..5963382b92 100644
--- a/var/spack/packages/lwgrp/package.py
+++ b/var/spack/repos/builtin/packages/lwgrp/package.py
diff --git a/var/spack/packages/lwm2/package.py b/var/spack/repos/builtin/packages/lwm2/package.py
index 31afff8816..31afff8816 100644
--- a/var/spack/packages/lwm2/package.py
+++ b/var/spack/repos/builtin/packages/lwm2/package.py
diff --git a/var/spack/packages/matio/package.py b/var/spack/repos/builtin/packages/matio/package.py
index 12cfb80926..12cfb80926 100644
--- a/var/spack/packages/matio/package.py
+++ b/var/spack/repos/builtin/packages/matio/package.py
diff --git a/var/spack/repos/builtin/packages/mbedtls/package.py b/var/spack/repos/builtin/packages/mbedtls/package.py
new file mode 100644
index 0000000000..3da00cf417
--- /dev/null
+++ b/var/spack/repos/builtin/packages/mbedtls/package.py
@@ -0,0 +1,22 @@
+from spack import *
+
+class Mbedtls(Package):
+    """
+    mbed TLS (formerly known as PolarSSL) makes it trivially easy for developers to include cryptographic and SSL/TLS capabilities in their (embedded) products, facilitating this functionality with a minimal coding footprint.
+    """
+    homepage = "https://tls.mbed.org"
+    url      = "https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.2.1.tar.gz"
+
+    version('2.2.1' , '73a38f96898d6d03e32f55dd9f9a67be')
+    version('2.2.0' , 'eaf4586c1ef93ae872e606b6c1203942')
+    version('2.1.4' , '40cdf67b6c6d92c9cbcfd552d39ea3ae')
+    version('2.1.3' , '7eb4cf1dfa68578a2c8dbd0b6fa752dd')
+    version('1.3.16', '4144d7320c691f721aeb9e67a1bc38e0')
+
+    depends_on('cmake')
+
+    def install(self, spec, prefix):
+        cmake('.', *std_cmake_args)
+
+        make()
+        make("install")
diff --git a/var/spack/packages/memaxes/package.py b/var/spack/repos/builtin/packages/memaxes/package.py
index 4b1da558a2..4b1da558a2 100644
--- a/var/spack/packages/memaxes/package.py
+++ b/var/spack/repos/builtin/packages/memaxes/package.py
diff --git a/var/spack/packages/mesa/package.py b/var/spack/repos/builtin/packages/mesa/package.py
index 62da8c993b..62da8c993b 100644
--- a/var/spack/packages/mesa/package.py
+++ b/var/spack/repos/builtin/packages/mesa/package.py
diff --git a/var/spack/repos/builtin/packages/metis/package.py b/var/spack/repos/builtin/packages/metis/package.py
new file mode 100644
index 0000000000..bbfc4de7d1
--- /dev/null
+++ b/var/spack/repos/builtin/packages/metis/package.py
@@ -0,0 +1,83 @@
+##############################################################################
+# Copyright (c) 2013-2015, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Written by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License (as published by
+# the Free Software Foundation) version 2.1 dated February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+
+from spack import *
+
+
+class Metis(Package):
+    """
+    METIS is a set of serial programs for partitioning graphs, partitioning finite element meshes, and producing fill
+    reducing orderings for sparse matrices. The algorithms implemented in METIS are based on the multilevel
+    recursive-bisection, multilevel k-way, and multi-constraint partitioning schemes.
+    """
+
+    homepage = 'http://glaros.dtc.umn.edu/gkhome/metis/metis/overview'
+    url = "http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-5.1.0.tar.gz"
+
+    version('5.1.0', '5465e67079419a69e0116de24fce58fe')
+
+    variant('shared', default=True, description='Enables the build of shared libraries')
+    variant('debug', default=False, description='Builds the library in debug mode')
+    variant('gdb', default=False, description='Enables gdb support')
+
+    variant('idx64', default=False, description='Use int64_t as default index type')
+    variant('double', default=False, description='Use double precision floating point types')
+
+    depends_on('cmake @2.8:')  # build-time dependency
+
+    depends_on('gdb', when='+gdb')
+
+    def install(self, spec, prefix):
+
+        options = []
+        options.extend(std_cmake_args)
+
+        build_directory = join_path(self.stage.path, 'spack-build')
+        source_directory = self.stage.source_path
+
+        options.append('-DGKLIB_PATH:PATH={metis_source}/GKlib'.format(metis_source=source_directory))
+
+        if '+shared' in spec:
+            options.append('-DSHARED:BOOL=ON')
+
+        if '+debug' in spec:
+            options.extend(['-DDEBUG:BOOL=ON',
+                            '-DCMAKE_BUILD_TYPE:STRING=Debug'])
+
+        if '+gdb' in spec:
+            options.append('-DGDB:BOOL=ON')
+
+        metis_header = join_path(source_directory, 'include', 'metis.h')
+
+        if '+idx64' in spec:
+            filter_file('IDXTYPEWIDTH 32', 'IDXTYPEWIDTH 64', metis_header)
+
+        if '+double' in spec:
+            filter_file('REALTYPEWIDTH 32', 'REALTYPEWIDTH 64', metis_header)
+
+        with working_dir(build_directory, create=True):
+            cmake(source_directory, *options)
+            make()
+            make("install")
\ No newline at end of file
diff --git a/var/spack/packages/mpc/package.py b/var/spack/repos/builtin/packages/mpc/package.py
index 50477a0ccb..50477a0ccb 100644
--- a/var/spack/packages/mpc/package.py
+++ b/var/spack/repos/builtin/packages/mpc/package.py
diff --git a/var/spack/packages/mpe2/mpe2.patch b/var/spack/repos/builtin/packages/mpe2/mpe2.patch
index 3ade1f04f4..3ade1f04f4 100644
--- a/var/spack/packages/mpe2/mpe2.patch
+++ b/var/spack/repos/builtin/packages/mpe2/mpe2.patch
diff --git a/var/spack/packages/mpe2/package.py b/var/spack/repos/builtin/packages/mpe2/package.py
index 27295172cc..27295172cc 100644
--- a/var/spack/packages/mpe2/package.py
+++ b/var/spack/repos/builtin/packages/mpe2/package.py
diff --git a/var/spack/packages/mpfr/package.py b/var/spack/repos/builtin/packages/mpfr/package.py
index 0f2baac004..a1bd7529cf 100644
--- a/var/spack/packages/mpfr/package.py
+++ b/var/spack/repos/builtin/packages/mpfr/package.py
@@ -31,7 +31,7 @@ class Mpfr(Package):
     url      = "http://www.mpfr.org/mpfr-current/mpfr-3.1.3.tar.bz2"
 
     version('3.1.3', '5fdfa3cfa5c86514ee4a241a1affa138')
-    # version('3.1.2', 'ee2c3ac63bf0c2359bf08fc3ee094c19')
+    version('3.1.2', 'ee2c3ac63bf0c2359bf08fc3ee094c19')
 
     depends_on('gmp')
 
diff --git a/var/spack/packages/mpibash/mpibash-4.3.patch b/var/spack/repos/builtin/packages/mpibash/mpibash-4.3.patch
index 17e285b0bf..17e285b0bf 100644
--- a/var/spack/packages/mpibash/mpibash-4.3.patch
+++ b/var/spack/repos/builtin/packages/mpibash/mpibash-4.3.patch
diff --git a/var/spack/packages/mpibash/package.py b/var/spack/repos/builtin/packages/mpibash/package.py
index d0f6dafed6..d0f6dafed6 100644
--- a/var/spack/packages/mpibash/package.py
+++ b/var/spack/repos/builtin/packages/mpibash/package.py
diff --git a/var/spack/packages/mpich/package.py b/var/spack/repos/builtin/packages/mpich/package.py
index 7cfa0a3b61..c856cfe277 100644
--- a/var/spack/packages/mpich/package.py
+++ b/var/spack/repos/builtin/packages/mpich/package.py
@@ -33,13 +33,16 @@ class Mpich(Package):
     list_url   = "http://www.mpich.org/static/downloads/"
     list_depth = 2
 
+    version('3.2',   'f414cfa77099cd1fa1a5ae4e22db508a')
     version('3.1.4', '2ab544607986486562e076b83937bba2')
     version('3.1.3', '93cb17f91ac758cbf9174ecb03563778')
     version('3.1.2', '7fbf4b81dcb74b07ae85939d1ceee7f1')
     version('3.1.1', '40dc408b1e03cc36d80209baaa2d32b7')
-    version('3.1', '5643dd176499bfb7d25079aaff25f2ec')
+    version('3.1',   '5643dd176499bfb7d25079aaff25f2ec')
     version('3.0.4', '9c5d5d4fe1e17dd12153f40bc5b6dbc0')
 
+    variant('verbs', default=False, description='Build support for OpenFabrics verbs.')
+
     provides('mpi@:3.0', when='@3:')
     provides('mpi@:1.3', when='@1:')
 
@@ -55,6 +58,12 @@ class Mpich(Package):
         config_args = ["--prefix=" + prefix,
                        "--enable-shared"]
 
+        # Variants
+        if '+verbs' in spec:
+            config_args.append("--with-ibverbs")
+        else:
+            config_args.append("--without-ibverbs")
+
         # TODO: Spack should make it so that you can't actually find
         # these compilers if they're "disabled" for the current
         # compiler configuration.
diff --git a/var/spack/packages/mpileaks/package.py b/var/spack/repos/builtin/packages/mpileaks/package.py
index 661d9d66bf..661d9d66bf 100644
--- a/var/spack/packages/mpileaks/package.py
+++ b/var/spack/repos/builtin/packages/mpileaks/package.py
diff --git a/var/spack/packages/mrnet/package.py b/var/spack/repos/builtin/packages/mrnet/package.py
index fed944e45f..fed944e45f 100644
--- a/var/spack/packages/mrnet/package.py
+++ b/var/spack/repos/builtin/packages/mrnet/package.py
diff --git a/var/spack/repos/builtin/packages/mumps/Makefile.inc b/var/spack/repos/builtin/packages/mumps/Makefile.inc
new file mode 100644
index 0000000000..2e6a041878
--- /dev/null
+++ b/var/spack/repos/builtin/packages/mumps/Makefile.inc
@@ -0,0 +1,38 @@
+LPORDDIR = $(topdir)/PORD/lib/
+IPORD = -I$(topdir)/PORD/include/
+LPORD = -L$(LPORDDIR) -lpord
+
+ORDERINGSC = $(ORDERINGSF)
+LORDERINGS = $(LMETIS) $(LPORD) $(LSCOTCH)
+IORDERINGSF = $(ISCOTCH)
+IORDERINGSC = $(IMETIS) $(IPORD) $(ISCOTCH)
+
+PLAT    =
+LIBEXT  = .a
+OUTC    = -o 
+OUTF    = -o
+RM = /bin/rm -f
+AR = ar vr 
+RANLIB = ranlib
+
+INCSEQ  = -I$(topdir)/libseq
+LIBSEQ  = -L$(topdir)/libseq -lmpiseq
+
+INCPAR  =
+LIBPAR  = $(SCALAP)
+
+LIBOTHERS = -lpthread
+
+#Sequential:
+ifeq ($(MUMPS_TYPE),seq)
+INCS = $(INCSEQ)
+LIBS = $(LIBSEQ)
+LIBSEQNEEDED = libseqneeded
+endif
+
+#Parallel:
+ifeq ($(MUMPS_TYPE),par)
+INCS = $(INCPAR)
+LIBS = $(LIBPAR)
+LIBSEQNEEDED =
+endif
diff --git a/var/spack/repos/builtin/packages/mumps/package.py b/var/spack/repos/builtin/packages/mumps/package.py
new file mode 100644
index 0000000000..44a37903cc
--- /dev/null
+++ b/var/spack/repos/builtin/packages/mumps/package.py
@@ -0,0 +1,139 @@
+from spack import *
+import os
+
+
+class Mumps(Package):
+    """MUMPS: a MUltifrontal Massively Parallel sparse direct Solver"""
+
+    homepage = "http://mumps.enseeiht.fr"
+    url      = "http://mumps.enseeiht.fr/MUMPS_5.0.1.tar.gz"
+
+    version('5.0.1', 'b477573fdcc87babe861f62316833db0')
+
+    variant('mpi', default=True, description='Activate the compilation of MUMPS with the MPI support')
+    variant('scotch', default=False, description='Activate Scotch as a possible ordering library')
+    variant('ptscotch', default=False, description='Activate PT-Scotch as a possible ordering library')
+    variant('metis', default=False, description='Activate Metis as a possible ordering library')
+    variant('parmetis', default=False, description='Activate Parmetis as a possible ordering library')
+    variant('double', default=True, description='Activate the compilation of dmumps')
+    variant('float', default=True, description='Activate the compilation of smumps')
+    variant('complex', default=True, description='Activate the compilation of cmumps and/or zmumps')
+    variant('idx64', default=False, description='Use int64_t/integer*8 as default index type')
+
+    
+    depends_on('scotch + esmumps', when='~ptscotch+scotch')
+    depends_on('scotch + esmumps + mpi', when='+ptscotch')
+    depends_on('metis', when='~parmetis+metis')
+    depends_on('parmetis', when="+parmetis")
+    depends_on('blas')
+    depends_on('lapack')
+    depends_on('scalapack', when='+mpi')
+    depends_on('mpi', when='+mpi')
+
+    # this function is not a patch function because in case scalapack
+    # is needed it uses self.spec['scalapack'].fc_link set by the
+    # setup_dependent_environment in scalapck. This happen after patch
+    # end before install
+    # def patch(self):
+    def write_makefile_inc(self):
+        if ('+parmetis' in self.spec or '+ptscotch' in self.spec) and '+mpi' not in self.spec:
+            raise RuntimeError('You cannot use the variants parmetis or ptscotch without mpi')
+        
+        makefile_conf = ["LIBBLAS = -L%s -lblas" % self.spec['blas'].prefix.lib]
+
+        orderings = ['-Dpord']
+        
+        if '+ptscotch' in self.spec or '+scotch' in self.spec:
+            join_lib = ' -l%s' % ('pt' if '+ptscotch' in self.spec else '')
+            makefile_conf.extend(
+                ["ISCOTCH = -I%s" % self.spec['scotch'].prefix.include,
+                 "LSCOTCH = -L%s %s%s" % (self.spec['scotch'].prefix.lib,
+                                          join_lib,
+                                          join_lib.join(['esmumps', 'scotch', 'scotcherr']))])
+            orderings.append('-Dscotch')
+            if '+ptscotch' in self.spec:
+                orderings.append('-Dptscotch')
+
+        if '+parmetis' in self.spec or '+metis' in self.spec:
+            libname = 'parmetis' if '+parmetis' in self.spec else 'metis'
+            makefile_conf.extend(
+                ["IMETIS = -I%s" % self.spec[libname].prefix.include,
+                 "LMETIS = -L%s -l%s" % (self.spec[libname].prefix.lib, libname)])
+
+            orderings.append('-Dmetis')
+            if '+parmetis' in self.spec:
+                orderings.append('-Dparmetis')
+
+        makefile_conf.append("ORDERINGSF = %s" % (' '.join(orderings)))
+
+        # TODO: test this part, it needs a full blas, scalapack and
+        # partitionning environment with 64bit integers
+        if '+idx64' in self.spec:
+            makefile_conf.extend(
+                # the fortran compilation flags most probably are
+                # working only for intel and gnu compilers this is
+                # perhaps something the compiler should provide
+                ['OPTF    = -O  -DALLOW_NON_INIT %s' % '-fdefault-integer-8' if self.compiler.name == "gcc" else '-i8',
+                 'OPTL    = -O ',
+                 'OPTC    = -O -DINTSIZE64'])
+        else:
+            makefile_conf.extend(
+                ['OPTF    = -O  -DALLOW_NON_INIT',
+                 'OPTL    = -O ',
+                 'OPTC    = -O '])
+
+
+        if '+mpi' in self.spec:
+            makefile_conf.extend(
+                ["CC = %s" % join_path(self.spec['mpi'].prefix.bin, 'mpicc'),
+                 "FC = %s" % join_path(self.spec['mpi'].prefix.bin, 'mpif90'),
+                 "FL = %s" % join_path(self.spec['mpi'].prefix.bin, 'mpif90'),
+                 "SCALAP = %s" % self.spec['scalapack'].fc_link,
+                 "MUMPS_TYPE = par"])
+        else:
+            makefile_conf.extend(
+                ["CC = cc",
+                 "FC = fc",
+                 "FL = fc",
+                 "MUMPS_TYPE = seq"])
+
+        # TODO: change the value to the correct one according to the
+        # compiler possible values are -DAdd_, -DAdd__ and/or -DUPPER
+        makefile_conf.append("CDEFS   = -DAdd_")
+
+        
+        makefile_inc_template = join_path(os.path.dirname(self.module.__file__),
+                                          'Makefile.inc')
+        with open(makefile_inc_template, "r") as fh:
+            makefile_conf.extend(fh.read().split('\n'))
+        
+        with working_dir('.'):
+            with open("Makefile.inc", "w") as fh:
+                makefile_inc = '\n'.join(makefile_conf)
+                fh.write(makefile_inc)
+
+
+
+    def install(self, spec, prefix):
+        make_libs = []
+
+        # the coice to compile ?examples is to have kind of a sanity
+        # check on the libraries generated.
+        if '+float' in spec:
+            make_libs.append('sexamples')
+            if '+complex' in spec:
+                make_libs.append('cexamples')
+
+        if '+double' in spec:
+            make_libs.append('dexamples')
+            if '+complex' in spec:
+                make_libs.append('zexamples')
+
+        self.write_makefile_inc()
+                
+        make(*make_libs)
+
+        install_tree('lib', prefix.lib)
+        install_tree('include', prefix.include)
+        if '~mpi' in spec:
+            install('libseq/libmpiseq.a', prefix.lib)
diff --git a/var/spack/packages/munge/package.py b/var/spack/repos/builtin/packages/munge/package.py
index c737ca0354..c737ca0354 100644
--- a/var/spack/packages/munge/package.py
+++ b/var/spack/repos/builtin/packages/munge/package.py
diff --git a/var/spack/packages/muster/package.py b/var/spack/repos/builtin/packages/muster/package.py
index 0dc2e5e086..0dc2e5e086 100644
--- a/var/spack/packages/muster/package.py
+++ b/var/spack/repos/builtin/packages/muster/package.py
diff --git a/var/spack/packages/mvapich2/ad_lustre_rwcontig_open_source.patch b/var/spack/repos/builtin/packages/mvapich2/ad_lustre_rwcontig_open_source.patch
index ff85845cf8..ff85845cf8 100644
--- a/var/spack/packages/mvapich2/ad_lustre_rwcontig_open_source.patch
+++ b/var/spack/repos/builtin/packages/mvapich2/ad_lustre_rwcontig_open_source.patch
diff --git a/var/spack/packages/mvapich2/package.py b/var/spack/repos/builtin/packages/mvapich2/package.py
index 23a11b3171..af5ed1b088 100644
--- a/var/spack/packages/mvapich2/package.py
+++ b/var/spack/repos/builtin/packages/mvapich2/package.py
@@ -4,15 +4,13 @@ import os
 class Mvapich2(Package):
     """MVAPICH2 is an MPI implementation for Infiniband networks."""
     homepage = "http://mvapich.cse.ohio-state.edu/"
+    url = "http://mvapich.cse.ohio-state.edu/download/mvapich/mv2/mvapich2-2.2b.tar.gz"
 
-    version('2.2a', 'b8ceb4fc5f5a97add9b3ff1b9cbe39d2',
-            url='http://mvapich.cse.ohio-state.edu/download/mvapich/mv2/mvapich2-2.2a.tar.gz')
+    version('2.2b', '5651e8b7a72d7c77ca68da48f3a5d108')
+    version('2.2a', 'b8ceb4fc5f5a97add9b3ff1b9cbe39d2')
+    version('2.0',  '9fbb68a4111a8b6338e476dc657388b4')
+    version('1.9',  '5dc58ed08fd3142c260b70fe297e127c')
 
-    version('2.0', '9fbb68a4111a8b6338e476dc657388b4',
-            url='http://mvapich.cse.ohio-state.edu/download/mvapich/mv2/mvapich2-2.0.tar.gz')
-
-    version('1.9', '5dc58ed08fd3142c260b70fe297e127c',
-            url="http://mvapich.cse.ohio-state.edu/download/mvapich2/mv2/mvapich2-1.9.tgz")
     patch('ad_lustre_rwcontig_open_source.patch', when='@1.9')
 
     provides('mpi@:2.2', when='@1.9')  # MVAPICH2-1.9 supports MPI 2.2
@@ -41,16 +39,25 @@ class Mvapich2(Package):
     NEMESISIBTCP = 'nemesisibtcp'
     NEMESISIB = 'nemesisib'
     NEMESIS = 'nemesis'
+    MRAIL = 'mrail'
     SUPPORTED_NETWORKS = (PSM, SOCK, NEMESIS, NEMESISIB, NEMESISIBTCP)
     variant(PSM, default=False, description='Configures a build for QLogic PSM-CH3')
     variant(SOCK, default=False, description='Configures a build for TCP/IP-CH3')
     variant(NEMESISIBTCP, default=False, description='Configures a build for both OFA-IB-Nemesis and TCP/IP-Nemesis')
     variant(NEMESISIB, default=False, description='Configures a build for OFA-IB-Nemesis')
     variant(NEMESIS, default=False, description='Configures a build for TCP/IP-Nemesis')
+    variant(MRAIL, default=False, description='Configures a build for OFA-IB-CH3')
     ##########
 
     # FIXME : CUDA support is missing
 
+    def url_for_version(self, version):
+        base_url = "http://mvapich.cse.ohio-state.edu/download"
+        if version < Version('2.0'):
+            return "%s/mvapich2/mv2/mvapich2-%s.tar.gz" % (base_url, version)
+        else:
+            return "%s/mvapich/mv2/mvapich2-%s.tar.gz"  % (base_url, version)
+
     @staticmethod
     def enabled(x):
         """
@@ -117,7 +124,7 @@ class Mvapich2(Package):
         if count > 1:
             raise RuntimeError('network variants are mutually exclusive (only one can be selected at a time)')
 
-        # From here on I can suppose that ony one variant has been selected
+        # From here on I can suppose that only one variant has been selected
         if self.enabled(Mvapich2.PSM) in spec:
             network_options = ["--with-device=ch3:psm"]
         elif self.enabled(Mvapich2.SOCK) in spec:
@@ -128,7 +135,7 @@ class Mvapich2(Package):
             network_options = ["--with-device=ch3:nemesis:ib"]
         elif self.enabled(Mvapich2.NEMESIS) in spec:
             network_options = ["--with-device=ch3:nemesis"]
-        else:
+        elif self.enabled(Mvapich2.MRAIL) in spec:
             network_options = ["--with-device=ch3:mrail", "--with-rdma=gen2"]
 
         configure_args.extend(network_options)
@@ -141,7 +148,14 @@ class Mvapich2(Package):
             "--enable-romio",
             "--disable-silent-rules",
         ]
-        if not self.compiler.f77 and not self.compiler.fc:
+
+        if self.compiler.f77 and self.compiler.fc:
+            configure_args.append("--enable-fortran=all")
+        elif self.compiler.f77:
+            configure_args.append("--enable-fortran=f77")
+        elif self.compiler.fc:
+            configure_args.append("--enable-fortran=fc")
+        else:
             configure_args.append("--enable-fortran=none")
 
         # Set the type of the build (debug, release)
diff --git a/var/spack/packages/nasm/package.py b/var/spack/repos/builtin/packages/nasm/package.py
index 933b6a62c5..933b6a62c5 100644
--- a/var/spack/packages/nasm/package.py
+++ b/var/spack/repos/builtin/packages/nasm/package.py
diff --git a/var/spack/packages/ncdu/package.py b/var/spack/repos/builtin/packages/ncdu/package.py
index 234f9730d6..234f9730d6 100644
--- a/var/spack/packages/ncdu/package.py
+++ b/var/spack/repos/builtin/packages/ncdu/package.py
diff --git a/var/spack/packages/ncurses/package.py b/var/spack/repos/builtin/packages/ncurses/package.py
index 31f53b6c43..8dc808caac 100644
--- a/var/spack/packages/ncurses/package.py
+++ b/var/spack/repos/builtin/packages/ncurses/package.py
@@ -17,19 +17,14 @@ class Ncurses(Package):
     patch('patch_gcc_5.txt', when='%gcc@5.0:')
 
     def install(self, spec, prefix):
-        configure("--prefix=%s" % prefix,
-                  "--with-shared",
-                  "--enable-widec",
-                  "--disable-pc-files",
-                  "--without-ada")
+        opts = [
+            "--prefix=%s" % prefix,
+            "--with-shared",
+            "--with-cxx-shared",
+            "--enable-widec",
+            "--enable-overwrite",
+            "--disable-lib-suffixes",
+            "--without-ada"]
+        configure(*opts)
         make()
         make("install")
-
-        configure("--prefix=%s" % prefix,
-                  "--with-shared",
-                  "--disable-widec",
-                  "--disable-pc-files",
-                  "--without-ada")
-        make()
-        make("install")
-
diff --git a/var/spack/packages/ncurses/patch_gcc_5.txt b/var/spack/repos/builtin/packages/ncurses/patch_gcc_5.txt
index f85e07cb8d..f85e07cb8d 100644
--- a/var/spack/packages/ncurses/patch_gcc_5.txt
+++ b/var/spack/repos/builtin/packages/ncurses/patch_gcc_5.txt
diff --git a/var/spack/repos/builtin/packages/netcdf/package.py b/var/spack/repos/builtin/packages/netcdf/package.py
new file mode 100644
index 0000000000..3cd0b2ee7a
--- /dev/null
+++ b/var/spack/repos/builtin/packages/netcdf/package.py
@@ -0,0 +1,80 @@
+from spack import *
+
+class Netcdf(Package):
+    """NetCDF is a set of software libraries and self-describing, machine-independent
+    data formats that support the creation, access, and sharing of array-oriented
+    scientific data."""
+
+    homepage = "http://www.unidata.ucar.edu/software/netcdf/"
+    url      = "ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-4.3.3.tar.gz"
+
+    version('4.4.0', 'f01cb26a0126dd9a6224e76472d25f6c')
+    version('4.3.3', '5fbd0e108a54bd82cb5702a73f56d2ae')
+
+    variant('fortran', default=False, description="Download and install NetCDF-Fortran")
+    variant('hdf4',    default=False, description="Enable HDF4 support")
+
+    # Dependencies:
+    depends_on("curl")  # required for DAP support
+    depends_on("hdf", when='+hdf4')
+    depends_on("hdf5")  # required for NetCDF-4 support
+    depends_on("zlib")  # required for NetCDF-4 support
+
+    def install(self, spec, prefix):
+        # Environment variables
+        CPPFLAGS = []
+        LDFLAGS  = []
+        LIBS     = []
+
+        config_args = [
+            "--prefix=%s" % prefix,
+            "--enable-fsync",
+            "--enable-v2",
+            "--enable-utilities",
+            "--enable-shared",
+            "--enable-static",
+            "--enable-largefile",
+            # necessary for HDF5 support
+            "--enable-netcdf-4",
+            "--enable-dynamic-loading",
+            # necessary for DAP support
+            "--enable-dap"
+        ]
+
+        CPPFLAGS.append("-I%s/include" % spec['hdf5'].prefix)
+        LDFLAGS.append( "-L%s/lib"     % spec['hdf5'].prefix)
+
+        # HDF4 support
+        # As of NetCDF 4.1.3, "--with-hdf4=..." is no longer a valid option
+        # You must use the environment variables CPPFLAGS and LDFLAGS
+        if '+hdf4' in spec:
+            config_args.append("--enable-hdf4")
+            CPPFLAGS.append("-I%s/include" % spec['hdf'].prefix)
+            LDFLAGS.append( "-L%s/lib"     % spec['hdf'].prefix)
+            LIBS.append(    "-l%s"         % "jpeg")
+
+        if 'szip' in spec:
+            CPPFLAGS.append("-I%s/include" % spec['szip'].prefix)
+            LDFLAGS.append( "-L%s/lib"     % spec['szip'].prefix)
+            LIBS.append(    "-l%s"         % "sz")
+
+        # Fortran support
+        # In version 4.2+, NetCDF-C and NetCDF-Fortran have split.
+        # They can be installed separately, but this bootstrap procedure
+        # should be able to install both at the same time.
+        # Note: this is a new experimental feature.
+        if '+fortran' in spec:
+            config_args.append("--enable-remote-fortran-bootstrap")
+
+        config_args.append('CPPFLAGS=%s' % ' '.join(CPPFLAGS))
+        config_args.append('LDFLAGS=%s'  % ' '.join(LDFLAGS))
+        config_args.append('LIBS=%s'     % ' '.join(LIBS))
+
+        configure(*config_args)
+        make()
+        make("install")
+
+        # After installing NetCDF-C, install NetCDF-Fortran
+        if '+fortran' in spec:
+            make("build-netcdf-fortran")
+            make("install-netcdf-fortran")
diff --git a/var/spack/packages/netgauge/package.py b/var/spack/repos/builtin/packages/netgauge/package.py
index 0ea42175c6..0ea42175c6 100644
--- a/var/spack/packages/netgauge/package.py
+++ b/var/spack/repos/builtin/packages/netgauge/package.py
diff --git a/var/spack/packages/netlib-blas/package.py b/var/spack/repos/builtin/packages/netlib-blas/package.py
index 85e97323d3..85e97323d3 100644
--- a/var/spack/packages/netlib-blas/package.py
+++ b/var/spack/repos/builtin/packages/netlib-blas/package.py
diff --git a/var/spack/packages/netlib-lapack/package.py b/var/spack/repos/builtin/packages/netlib-lapack/package.py
index fb6b99e27c..fb6b99e27c 100644
--- a/var/spack/packages/netlib-lapack/package.py
+++ b/var/spack/repos/builtin/packages/netlib-lapack/package.py
diff --git a/var/spack/repos/builtin/packages/netlib-scalapack/package.py b/var/spack/repos/builtin/packages/netlib-scalapack/package.py
new file mode 100644
index 0000000000..5be91c4a40
--- /dev/null
+++ b/var/spack/repos/builtin/packages/netlib-scalapack/package.py
@@ -0,0 +1,50 @@
+from spack import *
+
+class NetlibScalapack(Package):
+    """ScaLAPACK is a library of high-performance linear algebra routines for parallel distributed memory machines"""
+    
+    homepage = "http://www.netlib.org/scalapack/"
+    url      = "http://www.netlib.org/scalapack/scalapack-2.0.2.tgz"
+
+    version('2.0.2', '2f75e600a2ba155ed9ce974a1c4b536f')
+    version('2.0.1', '17b8cde589ea0423afe1ec43e7499161')
+    version('2.0.0', '9e76ae7b291be27faaad47cfc256cbfe')
+    # versions before 2.0.0 are not using cmake and requires blacs as
+    # a separated package
+    
+    variant('shared', default=True, description='Build the shared library version')
+    variant('fpic', default=False, description="Build with -fpic compiler option")
+    
+    provides('scalapack')
+    
+    depends_on('mpi')
+    depends_on('lapack')
+    
+    def install(self, spec, prefix):       
+        options = [
+            "-DBUILD_SHARED_LIBS:BOOL=%s" % 'ON' if '+shared' in spec else 'OFF',
+            "-DBUILD_STATIC_LIBS:BOOL=%s" % 'OFF' if '+shared' in spec else 'ON',
+            "-DUSE_OPTIMIZED_LAPACK_BLAS:BOOL=ON", # forces scalapack to use find_package(LAPACK)
+            ]
+
+        if '+fpic' in spec:
+            options.extend([
+                "-DCMAKE_C_FLAGS=-fPIC",
+                "-DCMAKE_Fortran_FLAGS=-fPIC"
+            ])
+           
+        options.extend(std_cmake_args)
+        
+        with working_dir('spack-build', create=True):
+            cmake('..', *options)
+            make()
+            make("install")
+
+    def setup_dependent_environment(self, module, spec, dependent_spec):
+        # TODO treat OS that are not Linux...
+        lib_suffix = '.so' if '+shared' in spec['scalapack'] else '.a'
+
+        spec['scalapack'].fc_link = '-L%s -lscalapack' % spec['scalapack'].prefix.lib
+        spec['scalapack'].cc_link = spec['scalapack'].fc_link
+        spec['scalapack'].libraries = [join_path(spec['scalapack'].prefix.lib,
+                                                 'libscalapack%s' % lib_suffix)]
diff --git a/var/spack/packages/nettle/package.py b/var/spack/repos/builtin/packages/nettle/package.py
index cd600b0b87..cd600b0b87 100644
--- a/var/spack/packages/nettle/package.py
+++ b/var/spack/repos/builtin/packages/nettle/package.py
diff --git a/var/spack/packages/ninja/package.py b/var/spack/repos/builtin/packages/ninja/package.py
index 9e6bf4e358..9e6bf4e358 100644
--- a/var/spack/packages/ninja/package.py
+++ b/var/spack/repos/builtin/packages/ninja/package.py
diff --git a/var/spack/packages/ompss/package.py b/var/spack/repos/builtin/packages/ompss/package.py
index e09e0a624f..e09e0a624f 100644
--- a/var/spack/packages/ompss/package.py
+++ b/var/spack/repos/builtin/packages/ompss/package.py
diff --git a/var/spack/packages/ompt-openmp/package.py b/var/spack/repos/builtin/packages/ompt-openmp/package.py
index e5bcfb51f0..e5bcfb51f0 100644
--- a/var/spack/packages/ompt-openmp/package.py
+++ b/var/spack/repos/builtin/packages/ompt-openmp/package.py
diff --git a/var/spack/packages/opari2/package.py b/var/spack/repos/builtin/packages/opari2/package.py
index c68978f5c0..c68978f5c0 100644
--- a/var/spack/packages/opari2/package.py
+++ b/var/spack/repos/builtin/packages/opari2/package.py
diff --git a/var/spack/packages/openblas/package.py b/var/spack/repos/builtin/packages/openblas/package.py
index e01467c05a..9c8fa1c694 100644
--- a/var/spack/packages/openblas/package.py
+++ b/var/spack/repos/builtin/packages/openblas/package.py
@@ -19,3 +19,7 @@ class Openblas(Package):
         with working_dir(prefix.lib):
             symlink('libopenblas.a', 'blas.a')
             symlink('libopenblas.a', 'libblas.a')
+
+        # Lapack virtual package should provide liblapack.a
+        with working_dir(prefix.lib):
+            symlink('libopenblas.a', 'liblapack.a')
diff --git a/var/spack/packages/openmpi/ad_lustre_rwcontig_open_source.patch b/var/spack/repos/builtin/packages/openmpi/ad_lustre_rwcontig_open_source.patch
index daa825ccbe..daa825ccbe 100644
--- a/var/spack/packages/openmpi/ad_lustre_rwcontig_open_source.patch
+++ b/var/spack/repos/builtin/packages/openmpi/ad_lustre_rwcontig_open_source.patch
diff --git a/var/spack/packages/openmpi/configure.patch b/var/spack/repos/builtin/packages/openmpi/configure.patch
index 18fb42c1d1..18fb42c1d1 100644
--- a/var/spack/packages/openmpi/configure.patch
+++ b/var/spack/repos/builtin/packages/openmpi/configure.patch
diff --git a/var/spack/packages/openmpi/llnl-platforms.patch b/var/spack/repos/builtin/packages/openmpi/llnl-platforms.patch
index f515743c4d..f515743c4d 100644
--- a/var/spack/packages/openmpi/llnl-platforms.patch
+++ b/var/spack/repos/builtin/packages/openmpi/llnl-platforms.patch
diff --git a/var/spack/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py
index be2202fbbd..e4484af8c5 100644
--- a/var/spack/packages/openmpi/package.py
+++ b/var/spack/repos/builtin/packages/openmpi/package.py
@@ -13,41 +13,61 @@ class Openmpi(Package):
     """
 
     homepage = "http://www.open-mpi.org"
+    url = "http://www.open-mpi.org/software/ompi/v1.10/downloads/openmpi-1.10.1.tar.bz2"
+    list_url = "http://www.open-mpi.org/software/ompi/"
+    list_depth = 3
 
-    version('1.10.1', 'f0fcd77ed345b7eafb431968124ba16e',
-            url = "http://www.open-mpi.org/software/ompi/v1.10/downloads/openmpi-1.10.1.tar.bz2")
-    version('1.10.0', '280cf952de68369cebaca886c5ce0304',
-            url = "http://www.open-mpi.org/software/ompi/v1.10/downloads/openmpi-1.10.0.tar.bz2")
-    version('1.8.8', '0dab8e602372da1425e9242ae37faf8c',
-            url = 'http://www.open-mpi.org/software/ompi/v1.8/downloads/openmpi-1.8.8.tar.bz2')
-    version('1.6.5', '03aed2a4aa4d0b27196962a2a65fc475',
-            url = "http://www.open-mpi.org/software/ompi/v1.6/downloads/openmpi-1.6.5.tar.bz2")
+    version('1.10.2', 'b2f43d9635d2d52826e5ef9feb97fd4c')
+    version('1.10.1', 'f0fcd77ed345b7eafb431968124ba16e')
+    version('1.10.0', '280cf952de68369cebaca886c5ce0304')
+    version('1.8.8', '0dab8e602372da1425e9242ae37faf8c')
+    version('1.6.5', '03aed2a4aa4d0b27196962a2a65fc475')
 
     patch('ad_lustre_rwcontig_open_source.patch', when="@1.6.5")
     patch('llnl-platforms.patch', when="@1.6.5")
-    patch('configure.patch', when="@1.10.0:")
+    patch('configure.patch', when="@1.10.0:1.10.1")
 
-    provides('mpi@:2.2', when='@1.6.5')    # Open MPI 1.6.5 supports MPI-2.2
-    provides('mpi@:3.0', when='@1.8.8')    # Open MPI 1.8.8 supports MPI-3.0
-    provides('mpi@:3.0', when='@1.10.0')   # Open MPI 1.10.0 supports MPI-3.0
-    provides('mpi@:3.0', when='@1.10.1')   # Open MPI 1.10.1 supports MPI-3.0
+    variant('psm', default=False, description='Build support for the PSM library.')
+    variant('verbs', default=False, description='Build support for OpenFabrics verbs.')
 
+    # TODO : variant support for other schedulers is missing
+    variant('tm', default=False, description='Build TM (Torque, PBSPro, and compatible) support')
+
+    provides('mpi@:2.2', when='@1.6.5')
+    provides('mpi@:3.0', when='@1.7.5:')
 
     depends_on('hwloc')
 
+    def url_for_version(self, version):
+        return "http://www.open-mpi.org/software/ompi/v%s/downloads/openmpi-%s.tar.bz2" % (version.up_to(2), version)
 
     def setup_dependent_environment(self, module, spec, dep_spec):
         """For dependencies, make mpicc's use spack wrapper."""
-        os.environ['OMPI_CC']  = 'cc'
+        os.environ['OMPI_CC'] = 'cc'
         os.environ['OMPI_CXX'] = 'c++'
         os.environ['OMPI_FC'] = 'f90'
         os.environ['OMPI_F77'] = 'f77'
 
-
     def install(self, spec, prefix):
-        config_args = ["--prefix=%s" % prefix]
-
-        config_args.append("--with-hwloc=%s" % spec['hwloc'].prefix)
+        config_args = ["--prefix=%s" % prefix,
+                       "--with-hwloc=%s" % spec['hwloc'].prefix,
+                       "--enable-shared",
+                       "--enable-static"]
+
+        # Variants
+        if '+tm' in spec:
+            config_args.append("--with-tm")  # necessary for Torque support
+
+        if '+psm' in spec:
+            config_args.append("--with-psm")
+
+        if '+verbs' in spec:
+            # Up through version 1.6, this option was previously named --with-openib
+            if spec.satisfies('@:1.6'):
+                config_args.append("--with-openib")
+            # In version 1.7, it was renamed to be --with-verbs
+            elif spec.satisfies('@1.7:'):
+                config_args.append("--with-verbs")
 
         # TODO: use variants for this, e.g. +lanl, +llnl, etc.
         # use this for LANL builds, but for LLNL builds, we need:
@@ -67,7 +87,6 @@ class Openmpi(Package):
 
         self.filter_compilers()
 
-
     def filter_compilers(self):
         """Run after install to make the MPI compilers use the
            compilers that Spack built the package with.
@@ -76,7 +95,7 @@ class Openmpi(Package):
            to Spack's generic cc, c++ and f90.  We want them to
            be bound to whatever compiler they were built with.
         """
-        kwargs = { 'ignore_absent' : True, 'backup' : False, 'string' : False }
+        kwargs = {'ignore_absent': True, 'backup': False, 'string': False}
         dir = os.path.join(self.prefix, 'share/openmpi/')
 
         cc_wrappers = ['mpicc-vt-wrapper-data.txt', 'mpicc-wrapper-data.txt',
@@ -114,5 +133,3 @@ class Openmpi(Package):
             if not os.path.islink(path):
                 filter_file('compiler=.*', 'compiler=%s' % self.compiler.fc,
                             path, **kwargs)
-
-
diff --git a/var/spack/packages/openspeedshop/package.py b/var/spack/repos/builtin/packages/openspeedshop/package.py
index 8c71bcb7c3..8c71bcb7c3 100644
--- a/var/spack/packages/openspeedshop/package.py
+++ b/var/spack/repos/builtin/packages/openspeedshop/package.py
diff --git a/var/spack/packages/openssl/package.py b/var/spack/repos/builtin/packages/openssl/package.py
index 1fa288a36d..8f0427796b 100644
--- a/var/spack/packages/openssl/package.py
+++ b/var/spack/repos/builtin/packages/openssl/package.py
@@ -19,12 +19,24 @@ class Openssl(Package):
     parallel = False
 
     def install(self, spec, prefix):
+        # OpenSSL uses a variable APPS in its Makefile. If it happens to be set
+        # in the environment, then this will override what is set in the
+        # Makefile, leading to build errors.
+        env.pop('APPS', None)
+        if spec.satisfies("=darwin-x86_64") or spec.satisfies("=ppc64"):
+            # This needs to be done for all 64-bit architectures (except Linux,
+            # where it happens automatically?)
+            env['KERNEL_BITS'] = '64'
         config = Executable("./config")
         config("--prefix=%s" % prefix,
-               "--openssldir=%s/etc/openssl" % prefix,
+               "--openssldir=%s" % join_path(prefix, 'etc', 'openssl'),
                "zlib",
                "no-krb5",
                "shared")
+        # Remove non-standard compiler options if present. These options are
+        # present e.g. on Darwin. They are non-standard, i.e. most compilers
+        # (e.g. gcc) will not accept them.
+        filter_file(r'-arch x86_64', '', 'Makefile')
 
         make()
         make("install")
diff --git a/var/spack/packages/otf/package.py b/var/spack/repos/builtin/packages/otf/package.py
index 52893dd265..52893dd265 100644
--- a/var/spack/packages/otf/package.py
+++ b/var/spack/repos/builtin/packages/otf/package.py
diff --git a/var/spack/packages/otf2/package.py b/var/spack/repos/builtin/packages/otf2/package.py
index c3d61bc228..c3d61bc228 100644
--- a/var/spack/packages/otf2/package.py
+++ b/var/spack/repos/builtin/packages/otf2/package.py
diff --git a/var/spack/packages/pango/package.py b/var/spack/repos/builtin/packages/pango/package.py
index df43625bf5..df43625bf5 100644
--- a/var/spack/packages/pango/package.py
+++ b/var/spack/repos/builtin/packages/pango/package.py
diff --git a/var/spack/packages/papi/package.py b/var/spack/repos/builtin/packages/papi/package.py
index 910e0aa9f9..910e0aa9f9 100644
--- a/var/spack/packages/papi/package.py
+++ b/var/spack/repos/builtin/packages/papi/package.py
diff --git a/var/spack/packages/paraver/package.py b/var/spack/repos/builtin/packages/paraver/package.py
index 5f8a153d4c..5f8a153d4c 100644
--- a/var/spack/packages/paraver/package.py
+++ b/var/spack/repos/builtin/packages/paraver/package.py
diff --git a/var/spack/packages/paraview/package.py b/var/spack/repos/builtin/packages/paraview/package.py
index 1d99b34899..aaab352e66 100644
--- a/var/spack/packages/paraview/package.py
+++ b/var/spack/repos/builtin/packages/paraview/package.py
@@ -60,6 +60,10 @@ class Paraview(Package):
 
             feature_args.extend(std_cmake_args)
 
+            if 'darwin' in self.spec.architecture:
+                feature_args.append('-DVTK_USE_X:BOOL=OFF')
+                feature_args.append('-DPARAVIEW_DO_UNIX_STYLE_INSTALLS:BOOL=ON')
+
             cmake('..',
                 '-DCMAKE_INSTALL_PREFIX:PATH=%s' % prefix,
                 '-DBUILD_TESTING:BOOL=OFF',
diff --git a/var/spack/repos/builtin/packages/parmetis/package.py b/var/spack/repos/builtin/packages/parmetis/package.py
new file mode 100644
index 0000000000..c897dec7e4
--- /dev/null
+++ b/var/spack/repos/builtin/packages/parmetis/package.py
@@ -0,0 +1,95 @@
+##############################################################################
+# Copyright (c) 2013-2015, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Written by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License (as published by
+# the Free Software Foundation) version 2.1 dated February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+
+from spack import *
+
+# FIXME : lot of code is duplicated from packages/metis/package.py . Inheriting from there may reduce
+# FIXME : the installation rules to just a few lines
+
+
+class Parmetis(Package):
+    """
+    ParMETIS is an MPI-based parallel library that implements a variety of algorithms for partitioning unstructured
+    graphs, meshes, and for computing fill-reducing orderings of sparse matrices.
+    """
+    homepage = 'http://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview'
+    url = 'http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/parmetis-4.0.3.tar.gz'
+
+    version('4.0.3', 'f69c479586bf6bb7aff6a9bc0c739628')
+
+    variant('shared', default=True, description='Enables the build of shared libraries')
+    variant('debug', default=False, description='Builds the library in debug mode')
+    variant('gdb', default=False, description='Enables gdb support')
+
+    variant('idx64', default=False, description='Use int64_t as default index type')
+    variant('double', default=False, description='Use double precision floating point types')
+
+    depends_on('cmake @2.8:')  # build dependency
+    depends_on('mpi')
+
+    # FIXME : this should conflict with metis as it builds its own version internally
+
+    depends_on('gdb', when='+gdb')
+
+    def install(self, spec, prefix):
+        options = []
+        options.extend(std_cmake_args)
+
+        build_directory = join_path(self.stage.path, 'spack-build')
+        source_directory = self.stage.source_path
+        metis_source = join_path(source_directory, 'metis')
+
+        # FIXME : Once a contract is defined, MPI compilers should be retrieved indirectly via spec['mpi'] in case
+        # FIXME : they use a non-standard name
+        options.extend(['-DGKLIB_PATH:PATH={metis_source}/GKlib'.format(metis_source=metis_source),
+                        '-DMETIS_PATH:PATH={metis_source}'.format(metis_source=metis_source),
+                        '-DCMAKE_C_COMPILER:STRING=mpicc',
+                        '-DCMAKE_CXX_COMPILER:STRING=mpicxx'])
+
+        if '+shared' in spec:
+            options.append('-DSHARED:BOOL=ON')
+
+        if '+debug' in spec:
+            options.extend(['-DDEBUG:BOOL=ON',
+                            '-DCMAKE_BUILD_TYPE:STRING=Debug'])
+
+        if '+gdb' in spec:
+            options.append('-DGDB:BOOL=ON')
+
+        metis_header = join_path(metis_source, 'include', 'metis.h')
+
+        if '+idx64' in spec:
+            filter_file('IDXTYPEWIDTH 32', 'IDXTYPEWIDTH 64', metis_header)
+
+        if '+double' in spec:
+            filter_file('REALTYPEWIDTH 32', 'REALTYPEWIDTH 64', metis_header)
+
+        with working_dir(build_directory, create=True):
+            cmake(source_directory, *options)
+            make()
+            make("install")
+            # Parmetis build system doesn't allow for an external metis to be used, but doesn't copy the required
+            # metis header either
+            install(metis_header, self.prefix.include)
diff --git a/var/spack/packages/parpack/package.py b/var/spack/repos/builtin/packages/parpack/package.py
index 622aceca04..622aceca04 100644
--- a/var/spack/packages/parpack/package.py
+++ b/var/spack/repos/builtin/packages/parpack/package.py
diff --git a/var/spack/repos/builtin/packages/patchelf/package.py b/var/spack/repos/builtin/packages/patchelf/package.py
new file mode 100644
index 0000000000..036dc6bd17
--- /dev/null
+++ b/var/spack/repos/builtin/packages/patchelf/package.py
@@ -0,0 +1,16 @@
+from spack import *
+
+class Patchelf(Package):
+    """PatchELF is a small utility to modify the dynamic linker and RPATH of ELF executables."""
+
+    homepage = "https://nixos.org/patchelf.html"
+    url      = "http://nixos.org/releases/patchelf/patchelf-0.8/patchelf-0.8.tar.gz"
+    list_url = "http://nixos.org/releases/patchelf/"
+    list_depth = 2
+
+    version('0.8', '407b229e6a681ffb0e2cdd5915cb2d01')
+
+    def install(self, spec, prefix):
+        configure('--prefix=%s' % prefix)
+        make()
+        make("install")
diff --git a/var/spack/packages/pcre/package.py b/var/spack/repos/builtin/packages/pcre/package.py
index e38d337e3d..e38d337e3d 100644
--- a/var/spack/packages/pcre/package.py
+++ b/var/spack/repos/builtin/packages/pcre/package.py
diff --git a/var/spack/packages/pcre2/package.py b/var/spack/repos/builtin/packages/pcre2/package.py
index 6a0244a15e..6a0244a15e 100644
--- a/var/spack/packages/pcre2/package.py
+++ b/var/spack/repos/builtin/packages/pcre2/package.py
diff --git a/var/spack/packages/pdt/package.py b/var/spack/repos/builtin/packages/pdt/package.py
index ce3b793e30..ce3b793e30 100644
--- a/var/spack/packages/pdt/package.py
+++ b/var/spack/repos/builtin/packages/pdt/package.py
diff --git a/var/spack/packages/petsc/package.py b/var/spack/repos/builtin/packages/petsc/package.py
index f3ed3d72ec..87f700629d 100644
--- a/var/spack/packages/petsc/package.py
+++ b/var/spack/repos/builtin/packages/petsc/package.py
@@ -12,6 +12,8 @@ class Petsc(Package):
     version('3.5.2', 'ad170802b3b058b5deb9cd1f968e7e13')
     version('3.5.1', 'a557e029711ebf425544e117ffa44d8f')
 
+    depends_on("python @2.6:2.9")   # requires Python for building
+
     depends_on("boost")
     depends_on("blas")
     depends_on("lapack")
@@ -23,9 +25,6 @@ class Petsc(Package):
 
     def install(self, spec, prefix):
         configure("--prefix=%s" % prefix,
-                  "CC=cc",
-                  "CXX=c++",
-                  "FC=f90",
                   "--with-blas-lib=%s/libblas.a"     % spec['blas'].prefix.lib,
                   "--with-lapack-lib=%s/liblapack.a" % spec['lapack'].prefix.lib,
                   "--with-boost-dir=%s"              % spec['boost'].prefix,
@@ -33,6 +32,7 @@ class Petsc(Package):
                   "--with-parmetis-dir=%s"           % spec['parmetis'].prefix,
                   "--with-metis-dir=%s"              % spec['metis'].prefix,
                   "--with-hdf5-dir=%s"               % spec['hdf5'].prefix,
+                  "--with-mpi-dir=%s"                % spec['mpi'].prefix,
                   "--with-shared-libraries=0")
 
         # PETSc has its own way of doing parallel make.
diff --git a/var/spack/packages/pidx/package.py b/var/spack/repos/builtin/packages/pidx/package.py
index 81aed62fb1..81aed62fb1 100644
--- a/var/spack/packages/pidx/package.py
+++ b/var/spack/repos/builtin/packages/pidx/package.py
diff --git a/var/spack/packages/pixman/package.py b/var/spack/repos/builtin/packages/pixman/package.py
index 895cbdbca5..895cbdbca5 100644
--- a/var/spack/packages/pixman/package.py
+++ b/var/spack/repos/builtin/packages/pixman/package.py
diff --git a/var/spack/packages/pkg-config/package.py b/var/spack/repos/builtin/packages/pkg-config/package.py
index 9964c6ce34..9964c6ce34 100644
--- a/var/spack/packages/pkg-config/package.py
+++ b/var/spack/repos/builtin/packages/pkg-config/package.py
diff --git a/var/spack/packages/pmgr_collective/package.py b/var/spack/repos/builtin/packages/pmgr_collective/package.py
index 1fc47c658f..1fc47c658f 100644
--- a/var/spack/packages/pmgr_collective/package.py
+++ b/var/spack/repos/builtin/packages/pmgr_collective/package.py
diff --git a/var/spack/packages/postgresql/package.py b/var/spack/repos/builtin/packages/postgresql/package.py
index 46922b7b71..46922b7b71 100644
--- a/var/spack/packages/postgresql/package.py
+++ b/var/spack/repos/builtin/packages/postgresql/package.py
diff --git a/var/spack/packages/ppl/package.py b/var/spack/repos/builtin/packages/ppl/package.py
index 018d5c523d..018d5c523d 100644
--- a/var/spack/packages/ppl/package.py
+++ b/var/spack/repos/builtin/packages/ppl/package.py
diff --git a/var/spack/packages/protobuf/package.py b/var/spack/repos/builtin/packages/protobuf/package.py
index 34085c7ce9..34085c7ce9 100644
--- a/var/spack/packages/protobuf/package.py
+++ b/var/spack/repos/builtin/packages/protobuf/package.py
diff --git a/var/spack/repos/builtin/packages/py-astropy/package.py b/var/spack/repos/builtin/packages/py-astropy/package.py
new file mode 100644
index 0000000000..d138a514f6
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-astropy/package.py
@@ -0,0 +1,28 @@
+from spack import *
+
+class PyAstropy(Package):
+    """
+    The Astropy Project is a community effort to develop a single core
+    package for Astronomy in Python and foster interoperability between
+    Python astronomy packages.
+    """
+    homepage = 'http://www.astropy.org/'
+
+    version('1.1.post1', 'b52919f657a37d45cc45f5cb0f58c44d')
+
+    def url_for_version(self, version):
+        return 'https://pypi.python.org/packages/source/a/astropy/astropy-{0}.tar.gz'.format(version)
+
+    extends('python')
+
+    depends_on('cfitsio')
+    depends_on('expat')
+    depends_on('py-h5py')
+    depends_on('py-numpy')
+    depends_on('py-scipy')
+
+    def install(self, spec, prefix):
+        python('setup.py', 'build', '--use-system-cfitsio',
+                                    '--use-system-expat')
+        python('setup.py', 'install', '--prefix=' + prefix)
+
diff --git a/var/spack/packages/py-basemap/package.py b/var/spack/repos/builtin/packages/py-basemap/package.py
index 8dfc99b28d..8dfc99b28d 100644
--- a/var/spack/packages/py-basemap/package.py
+++ b/var/spack/repos/builtin/packages/py-basemap/package.py
diff --git a/var/spack/packages/py-biopython/package.py b/var/spack/repos/builtin/packages/py-biopython/package.py
index 8ecaf48626..8ecaf48626 100644
--- a/var/spack/packages/py-biopython/package.py
+++ b/var/spack/repos/builtin/packages/py-biopython/package.py
diff --git a/var/spack/packages/py-blessings/package.py b/var/spack/repos/builtin/packages/py-blessings/package.py
index f2475a0efd..f2475a0efd 100644
--- a/var/spack/packages/py-blessings/package.py
+++ b/var/spack/repos/builtin/packages/py-blessings/package.py
diff --git a/var/spack/packages/py-cffi/package.py b/var/spack/repos/builtin/packages/py-cffi/package.py
index 909049a67c..909049a67c 100644
--- a/var/spack/packages/py-cffi/package.py
+++ b/var/spack/repos/builtin/packages/py-cffi/package.py
diff --git a/var/spack/packages/py-coverage/package.py b/var/spack/repos/builtin/packages/py-coverage/package.py
index 39b2ac3b01..39b2ac3b01 100644
--- a/var/spack/packages/py-coverage/package.py
+++ b/var/spack/repos/builtin/packages/py-coverage/package.py
diff --git a/var/spack/packages/py-cython/package.py b/var/spack/repos/builtin/packages/py-cython/package.py
index 68eb735ad9..68eb735ad9 100644
--- a/var/spack/packages/py-cython/package.py
+++ b/var/spack/repos/builtin/packages/py-cython/package.py
diff --git a/var/spack/packages/py-dateutil/package.py b/var/spack/repos/builtin/packages/py-dateutil/package.py
index 0a17f2f2d2..0a17f2f2d2 100644
--- a/var/spack/packages/py-dateutil/package.py
+++ b/var/spack/repos/builtin/packages/py-dateutil/package.py
diff --git a/var/spack/packages/py-epydoc/package.py b/var/spack/repos/builtin/packages/py-epydoc/package.py
index af05510504..af05510504 100644
--- a/var/spack/packages/py-epydoc/package.py
+++ b/var/spack/repos/builtin/packages/py-epydoc/package.py
diff --git a/var/spack/repos/builtin/packages/py-funcsigs/package.py b/var/spack/repos/builtin/packages/py-funcsigs/package.py
new file mode 100644
index 0000000000..a428890288
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-funcsigs/package.py
@@ -0,0 +1,19 @@
+from spack import *
+import os
+
+class PyFuncsigs(Package):
+    """Python function signatures from PEP362 for Python 2.6, 2.7 and 3.2."""
+    homepage = "https://pypi.python.org/pypi/funcsigs"
+    url      = "https://pypi.python.org/packages/source/f/funcsigs/funcsigs-0.4.tar.gz"
+
+    version('0.4', 'fb1d031f284233e09701f6db1281c2a5')
+
+    extends('python')
+
+    depends_on('py-setuptools')
+
+    def install(self, spec, prefix):
+        python('setup.py', 'install', '--prefix=%s' % prefix)
+
+
+
diff --git a/var/spack/packages/py-genders/package.py b/var/spack/repos/builtin/packages/py-genders/package.py
index c49c8fd5b2..c49c8fd5b2 100644
--- a/var/spack/packages/py-genders/package.py
+++ b/var/spack/repos/builtin/packages/py-genders/package.py
diff --git a/var/spack/packages/py-gnuplot/package.py b/var/spack/repos/builtin/packages/py-gnuplot/package.py
index ede4472c03..ede4472c03 100644
--- a/var/spack/packages/py-gnuplot/package.py
+++ b/var/spack/repos/builtin/packages/py-gnuplot/package.py
diff --git a/var/spack/packages/py-h5py/package.py b/var/spack/repos/builtin/packages/py-h5py/package.py
index 6293da5407..6293da5407 100644
--- a/var/spack/packages/py-h5py/package.py
+++ b/var/spack/repos/builtin/packages/py-h5py/package.py
diff --git a/var/spack/packages/py-ipython/package.py b/var/spack/repos/builtin/packages/py-ipython/package.py
index 8d0e64a07f..8d0e64a07f 100644
--- a/var/spack/packages/py-ipython/package.py
+++ b/var/spack/repos/builtin/packages/py-ipython/package.py
diff --git a/var/spack/packages/py-libxml2/package.py b/var/spack/repos/builtin/packages/py-libxml2/package.py
index 59005428e4..59005428e4 100644
--- a/var/spack/packages/py-libxml2/package.py
+++ b/var/spack/repos/builtin/packages/py-libxml2/package.py
diff --git a/var/spack/packages/py-lockfile/package.py b/var/spack/repos/builtin/packages/py-lockfile/package.py
index 8722914d94..8722914d94 100644
--- a/var/spack/packages/py-lockfile/package.py
+++ b/var/spack/repos/builtin/packages/py-lockfile/package.py
diff --git a/var/spack/packages/py-mako/package.py b/var/spack/repos/builtin/packages/py-mako/package.py
index 3e91ffd8e5..3e91ffd8e5 100644
--- a/var/spack/packages/py-mako/package.py
+++ b/var/spack/repos/builtin/packages/py-mako/package.py
diff --git a/var/spack/packages/py-matplotlib/package.py b/var/spack/repos/builtin/packages/py-matplotlib/package.py
index a5fee39d42..2167735fb8 100644
--- a/var/spack/packages/py-matplotlib/package.py
+++ b/var/spack/repos/builtin/packages/py-matplotlib/package.py
@@ -12,7 +12,7 @@ class PyMatplotlib(Package):
     variant('gui', default=False, description='Enable GUI')
     variant('ipython', default=False, description='Enable ipython support')
 
-    extends('python', ignore=r'bin/nosetests.*$')
+    extends('python', ignore=r'bin/nosetests.*$|bin/pbr$')
 
     depends_on('py-pyside', when='+gui')
     depends_on('py-ipython', when='+ipython')
@@ -22,7 +22,11 @@ class PyMatplotlib(Package):
     depends_on('py-pytz')
     depends_on('py-nose')
     depends_on('py-numpy')
+    depends_on('py-mock')
+    depends_on('py-pbr')
+    depends_on('py-funcsigs')
 
+    depends_on('freetype')
     depends_on('qt', when='+gui')
     depends_on('bzip2')
     depends_on('tcl', when='+gui')
diff --git a/var/spack/packages/py-mock/package.py b/var/spack/repos/builtin/packages/py-mock/package.py
index 3b08428ba0..e89af8802a 100644
--- a/var/spack/packages/py-mock/package.py
+++ b/var/spack/repos/builtin/packages/py-mock/package.py
@@ -11,6 +11,7 @@ class PyMock(Package):
     version('1.3.0', '73ee8a4afb3ff4da1b4afa287f39fdeb')
 
     extends('python')
+    depends_on('py-pbr')
     depends_on('py-setuptools@17.1:')
 
     def install(self, spec, prefix):
diff --git a/var/spack/packages/py-mpi4py/package.py b/var/spack/repos/builtin/packages/py-mpi4py/package.py
index 8001689a18..8001689a18 100644
--- a/var/spack/packages/py-mpi4py/package.py
+++ b/var/spack/repos/builtin/packages/py-mpi4py/package.py
diff --git a/var/spack/packages/py-mx/package.py b/var/spack/repos/builtin/packages/py-mx/package.py
index 717ee0562b..717ee0562b 100644
--- a/var/spack/packages/py-mx/package.py
+++ b/var/spack/repos/builtin/packages/py-mx/package.py
diff --git a/var/spack/packages/py-mysqldb1/package.py b/var/spack/repos/builtin/packages/py-mysqldb1/package.py
index fda02b4982..fda02b4982 100644
--- a/var/spack/packages/py-mysqldb1/package.py
+++ b/var/spack/repos/builtin/packages/py-mysqldb1/package.py
diff --git a/var/spack/packages/py-nose/package.py b/var/spack/repos/builtin/packages/py-nose/package.py
index e7c6cf0264..e7c6cf0264 100644
--- a/var/spack/packages/py-nose/package.py
+++ b/var/spack/repos/builtin/packages/py-nose/package.py
diff --git a/var/spack/repos/builtin/packages/py-numexpr/package.py b/var/spack/repos/builtin/packages/py-numexpr/package.py
new file mode 100644
index 0000000000..89f8a525b1
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-numexpr/package.py
@@ -0,0 +1,15 @@
+from spack import *
+import re
+
+class PyNumexpr(Package):
+    """Fast numerical expression evaluator for NumPy"""
+    homepage = "https://pypi.python.org/pypi/numexpr"
+    url      = "https://pypi.python.org/packages/source/n/numexpr/numexpr-2.4.6.tar.gz"
+
+    version('2.4.6', '17ac6fafc9ea1ce3eb970b9abccb4fbd')
+
+    extends('python')
+    depends_on('py-numpy')
+
+    def install(self, spec, prefix):
+        python('setup.py', 'install', '--prefix=%s' % prefix)
diff --git a/var/spack/packages/py-numpy/package.py b/var/spack/repos/builtin/packages/py-numpy/package.py
index 4c085fba6e..0354811186 100644
--- a/var/spack/packages/py-numpy/package.py
+++ b/var/spack/repos/builtin/packages/py-numpy/package.py
@@ -7,15 +7,18 @@ class PyNumpy(Package):
 
     version('1.9.1', '78842b73560ec378142665e712ae4ad9')
     version('1.9.2', 'a1ed53432dbcd256398898d35bc8e645')
-    
+
+    variant('blas', default=True)
+
     extends('python')
     depends_on('py-nose')
-    depends_on('netlib-blas+fpic')
-    depends_on('netlib-lapack+shared')
+    depends_on('netlib-blas+fpic', when='+blas')
+    depends_on('netlib-lapack+shared', when='+blas')
 
     def install(self, spec, prefix):
-        with open('site.cfg', 'w') as f:
-            f.write('[DEFAULT]\n')
-            f.write('libraries=lapack,blas\n')
-            f.write('library_dirs=%s/lib:%s/lib\n' % (spec['blas'].prefix, spec['lapack'].prefix))
+        if '+blas' in spec:
+            with open('site.cfg', 'w') as f:
+                f.write('[DEFAULT]\n')
+                f.write('libraries=lapack,blas\n')
+                f.write('library_dirs=%s/lib:%s/lib\n' % (spec['blas'].prefix, spec['lapack'].prefix))
         python('setup.py', 'install', '--prefix=%s' % prefix)
diff --git a/var/spack/packages/py-pandas/package.py b/var/spack/repos/builtin/packages/py-pandas/package.py
index 5b9997faa9..5b9997faa9 100644
--- a/var/spack/packages/py-pandas/package.py
+++ b/var/spack/repos/builtin/packages/py-pandas/package.py
diff --git a/var/spack/repos/builtin/packages/py-pbr/package.py b/var/spack/repos/builtin/packages/py-pbr/package.py
new file mode 100644
index 0000000000..02957483d4
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-pbr/package.py
@@ -0,0 +1,18 @@
+from spack import *
+import os
+
+class PyPbr(Package):
+    """PBR is a library that injects some useful and sensible default behaviors into your setuptools run."""
+    homepage = "https://pypi.python.org/pypi/pbr"
+    url      = "https://pypi.python.org/packages/source/p/pbr/pbr-1.8.1.tar.gz"
+
+    version('1.8.1', 'c8f9285e1a4ca6f9654c529b158baa3a')
+
+    extends('python')
+
+    depends_on('py-setuptools')
+
+    def install(self, spec, prefix):
+        python('setup.py', 'install', '--prefix=%s' % prefix)
+
+
diff --git a/var/spack/repos/builtin/packages/py-periodictable/package.py b/var/spack/repos/builtin/packages/py-periodictable/package.py
new file mode 100644
index 0000000000..6a495a1cc8
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-periodictable/package.py
@@ -0,0 +1,17 @@
+from spack import *
+
+class PyPeriodictable(Package):
+    """nose extends the test loading and running features of unittest,
+    making it easier to write, find and run tests."""
+
+    homepage = "https://pypi.python.org/pypi/periodictable"
+    url      = "https://pypi.python.org/packages/source/p/periodictable/periodictable-1.4.1.tar.gz"
+
+    version('1.4.1', '7246b63cc0b6b1be6e86b6616f9e866e')
+
+    depends_on('py-numpy')
+    depends_on('py-pyparsing')
+    extends('python')
+
+    def install(self, spec, prefix):
+        python('setup.py', 'install', '--prefix=%s' % prefix)
diff --git a/var/spack/packages/py-pexpect/package.py b/var/spack/repos/builtin/packages/py-pexpect/package.py
index ff5fac84e0..ff5fac84e0 100644
--- a/var/spack/packages/py-pexpect/package.py
+++ b/var/spack/repos/builtin/packages/py-pexpect/package.py
diff --git a/var/spack/packages/py-pil/package.py b/var/spack/repos/builtin/packages/py-pil/package.py
index 743b761981..743b761981 100644
--- a/var/spack/packages/py-pil/package.py
+++ b/var/spack/repos/builtin/packages/py-pil/package.py
diff --git a/var/spack/packages/py-pillow/package.py b/var/spack/repos/builtin/packages/py-pillow/package.py
index adc8507bd5..adc8507bd5 100644
--- a/var/spack/packages/py-pillow/package.py
+++ b/var/spack/repos/builtin/packages/py-pillow/package.py
diff --git a/var/spack/packages/py-pmw/package.py b/var/spack/repos/builtin/packages/py-pmw/package.py
index 56131811e9..56131811e9 100644
--- a/var/spack/packages/py-pmw/package.py
+++ b/var/spack/repos/builtin/packages/py-pmw/package.py
diff --git a/var/spack/packages/py-pychecker/package.py b/var/spack/repos/builtin/packages/py-pychecker/package.py
index bda5a746aa..bda5a746aa 100644
--- a/var/spack/packages/py-pychecker/package.py
+++ b/var/spack/repos/builtin/packages/py-pychecker/package.py
diff --git a/var/spack/packages/py-pycparser/package.py b/var/spack/repos/builtin/packages/py-pycparser/package.py
index f2bb679d25..f2bb679d25 100644
--- a/var/spack/packages/py-pycparser/package.py
+++ b/var/spack/repos/builtin/packages/py-pycparser/package.py
diff --git a/var/spack/packages/py-pyelftools/package.py b/var/spack/repos/builtin/packages/py-pyelftools/package.py
index d5ad32e624..d5ad32e624 100644
--- a/var/spack/packages/py-pyelftools/package.py
+++ b/var/spack/repos/builtin/packages/py-pyelftools/package.py
diff --git a/var/spack/packages/py-pygments/package.py b/var/spack/repos/builtin/packages/py-pygments/package.py
index 7e07bf6869..7e07bf6869 100644
--- a/var/spack/packages/py-pygments/package.py
+++ b/var/spack/repos/builtin/packages/py-pygments/package.py
diff --git a/var/spack/packages/py-pylint/package.py b/var/spack/repos/builtin/packages/py-pylint/package.py
index 9579708c29..9579708c29 100644
--- a/var/spack/packages/py-pylint/package.py
+++ b/var/spack/repos/builtin/packages/py-pylint/package.py
diff --git a/var/spack/packages/py-pypar/package.py b/var/spack/repos/builtin/packages/py-pypar/package.py
index af9c76ccd8..af9c76ccd8 100644
--- a/var/spack/packages/py-pypar/package.py
+++ b/var/spack/repos/builtin/packages/py-pypar/package.py
diff --git a/var/spack/packages/py-pyparsing/package.py b/var/spack/repos/builtin/packages/py-pyparsing/package.py
index a6e50ad139..a6e50ad139 100644
--- a/var/spack/packages/py-pyparsing/package.py
+++ b/var/spack/repos/builtin/packages/py-pyparsing/package.py
diff --git a/var/spack/packages/py-pyqt/package.py b/var/spack/repos/builtin/packages/py-pyqt/package.py
index 8edca105bb..8edca105bb 100644
--- a/var/spack/packages/py-pyqt/package.py
+++ b/var/spack/repos/builtin/packages/py-pyqt/package.py
diff --git a/var/spack/packages/py-pyside/package.py b/var/spack/repos/builtin/packages/py-pyside/package.py
index ffa433e18e..ffa433e18e 100644
--- a/var/spack/packages/py-pyside/package.py
+++ b/var/spack/repos/builtin/packages/py-pyside/package.py
diff --git a/var/spack/repos/builtin/packages/py-pytables/package.py b/var/spack/repos/builtin/packages/py-pytables/package.py
new file mode 100644
index 0000000000..a5b1e78ab3
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-pytables/package.py
@@ -0,0 +1,19 @@
+from spack import *
+import re
+
+class PyPytables(Package):
+    """PyTables is a package for managing hierarchical datasets and designed to efficiently and easily cope with extremely large amounts of data."""
+    homepage = "http://www.pytables.org/"
+    url      = "https://github.com/PyTables/PyTables/archive/v.3.2.2.tar.gz"
+
+    version('3.2.2', '7cbb0972e4d6580f629996a5bed92441')
+
+    extends('python')
+    depends_on('hdf5')
+    depends_on('py-numpy')
+    depends_on('py-numexpr')
+    depends_on('py-cython')
+
+    def install(self, spec, prefix):
+        env["HDF5_DIR"] = spec['hdf5'].prefix
+        python('setup.py', 'install', '--prefix=%s' % prefix)
diff --git a/var/spack/packages/py-python-daemon/package.py b/var/spack/repos/builtin/packages/py-python-daemon/package.py
index 12cbe9101c..12cbe9101c 100644
--- a/var/spack/packages/py-python-daemon/package.py
+++ b/var/spack/repos/builtin/packages/py-python-daemon/package.py
diff --git a/var/spack/packages/py-pytz/package.py b/var/spack/repos/builtin/packages/py-pytz/package.py
index da6311a784..da6311a784 100644
--- a/var/spack/packages/py-pytz/package.py
+++ b/var/spack/repos/builtin/packages/py-pytz/package.py
diff --git a/var/spack/packages/py-rpy2/package.py b/var/spack/repos/builtin/packages/py-rpy2/package.py
index a0b03d03e3..a0b03d03e3 100644
--- a/var/spack/packages/py-rpy2/package.py
+++ b/var/spack/repos/builtin/packages/py-rpy2/package.py
diff --git a/var/spack/packages/py-scientificpython/package.py b/var/spack/repos/builtin/packages/py-scientificpython/package.py
index df2c86caac..df2c86caac 100644
--- a/var/spack/packages/py-scientificpython/package.py
+++ b/var/spack/repos/builtin/packages/py-scientificpython/package.py
diff --git a/var/spack/packages/py-scikit-learn/package.py b/var/spack/repos/builtin/packages/py-scikit-learn/package.py
index 5b078ce901..5b078ce901 100644
--- a/var/spack/packages/py-scikit-learn/package.py
+++ b/var/spack/repos/builtin/packages/py-scikit-learn/package.py
diff --git a/var/spack/packages/py-scipy/package.py b/var/spack/repos/builtin/packages/py-scipy/package.py
index 3a1124cc15..3a1124cc15 100644
--- a/var/spack/packages/py-scipy/package.py
+++ b/var/spack/repos/builtin/packages/py-scipy/package.py
diff --git a/var/spack/packages/py-setuptools/package.py b/var/spack/repos/builtin/packages/py-setuptools/package.py
index 760ad4d6db..26c048bfd4 100644
--- a/var/spack/packages/py-setuptools/package.py
+++ b/var/spack/repos/builtin/packages/py-setuptools/package.py
@@ -8,6 +8,7 @@ class PySetuptools(Package):
     version('11.3.1', '01f69212e019a2420c1693fb43593930')
     version('16.0', '0ace0b96233516fc5f7c857d086aa3ad')
     version('18.1', 'f72e87f34fbf07f299f6cb46256a0b06')
+    version('19.2', '78353b1f80375ca5e088f4b4627ffe03')
 
     extends('python')
 
diff --git a/var/spack/packages/py-shiboken/package.py b/var/spack/repos/builtin/packages/py-shiboken/package.py
index e4bf4ce07e..e4bf4ce07e 100644
--- a/var/spack/packages/py-shiboken/package.py
+++ b/var/spack/repos/builtin/packages/py-shiboken/package.py
diff --git a/var/spack/packages/py-sip/package.py b/var/spack/repos/builtin/packages/py-sip/package.py
index e4a6fb6961..e4a6fb6961 100644
--- a/var/spack/packages/py-sip/package.py
+++ b/var/spack/repos/builtin/packages/py-sip/package.py
diff --git a/var/spack/packages/py-six/package.py b/var/spack/repos/builtin/packages/py-six/package.py
index 05c5bd00a9..05c5bd00a9 100644
--- a/var/spack/packages/py-six/package.py
+++ b/var/spack/repos/builtin/packages/py-six/package.py
diff --git a/var/spack/packages/py-sphinx/package.py b/var/spack/repos/builtin/packages/py-sphinx/package.py
index ec2e89a098..ec2e89a098 100644
--- a/var/spack/packages/py-sphinx/package.py
+++ b/var/spack/repos/builtin/packages/py-sphinx/package.py
diff --git a/var/spack/packages/py-sympy/package.py b/var/spack/repos/builtin/packages/py-sympy/package.py
index c17e35b95f..c17e35b95f 100644
--- a/var/spack/packages/py-sympy/package.py
+++ b/var/spack/repos/builtin/packages/py-sympy/package.py
diff --git a/var/spack/packages/py-tappy/package.py b/var/spack/repos/builtin/packages/py-tappy/package.py
index df61a909da..df61a909da 100644
--- a/var/spack/packages/py-tappy/package.py
+++ b/var/spack/repos/builtin/packages/py-tappy/package.py
diff --git a/var/spack/packages/py-twisted/package.py b/var/spack/repos/builtin/packages/py-twisted/package.py
index 2fdebb6cb9..2fdebb6cb9 100644
--- a/var/spack/packages/py-twisted/package.py
+++ b/var/spack/repos/builtin/packages/py-twisted/package.py
diff --git a/var/spack/packages/py-urwid/package.py b/var/spack/repos/builtin/packages/py-urwid/package.py
index aaa11c681d..aaa11c681d 100644
--- a/var/spack/packages/py-urwid/package.py
+++ b/var/spack/repos/builtin/packages/py-urwid/package.py
diff --git a/var/spack/packages/py-virtualenv/package.py b/var/spack/repos/builtin/packages/py-virtualenv/package.py
index 037a6fc59f..037a6fc59f 100644
--- a/var/spack/packages/py-virtualenv/package.py
+++ b/var/spack/repos/builtin/packages/py-virtualenv/package.py
diff --git a/var/spack/packages/py-yapf/package.py b/var/spack/repos/builtin/packages/py-yapf/package.py
index 12ef191515..12ef191515 100644
--- a/var/spack/packages/py-yapf/package.py
+++ b/var/spack/repos/builtin/packages/py-yapf/package.py
diff --git a/var/spack/packages/python/package.py b/var/spack/repos/builtin/packages/python/package.py
index eae2566b57..a1ce06feb0 100644
--- a/var/spack/packages/python/package.py
+++ b/var/spack/repos/builtin/packages/python/package.py
@@ -11,15 +11,16 @@ import spack
 class Python(Package):
     """The Python programming language."""
     homepage = "http://www.python.org"
-    url      = "http://www.python.org/ftp/python/2.7.8/Python-2.7.8.tar.xz"
+    url      = "http://www.python.org/ftp/python/2.7.8/Python-2.7.8.tgz"
 
     extendable = True
 
-    version('2.7.8', 'd235bdfa75b8396942e360a70487ee00')
-    version('2.7.10', 'c685ef0b8e9f27b5e3db5db12b268ac6')
-    version('2.7.11', '1dbcc848b4cd8399a8199d000f9f823c', preferred=True)
-    version('3.5.0', 'd149d2812f10cbe04c042232e7964171')
-    version('3.5.1', 'e9ea6f2623fffcdd871b7b19113fde80')
+    version('3.5.1', 'be78e48cdfc1a7ad90efff146dce6cfe')
+    version('3.5.0', 'a56c0c0b45d75a0ec9c6dee933c41c36')
+    version('2.7.11', '6b6076ec9e93f05dd63e47eb9c15728b', preferred=True)
+    version('2.7.10', 'd7547558fd673bd9d38e2108c6b42521')
+    version('2.7.9', '5eebcaa0030dc4061156d3429657fb83')
+    version('2.7.8', 'd4bca0159acb0b44a781292b5231936f')
 
     depends_on("openssl")
     depends_on("bzip2")
diff --git a/var/spack/packages/qhull/package.py b/var/spack/repos/builtin/packages/qhull/package.py
index 9da4078a70..f6712ced38 100644
--- a/var/spack/packages/qhull/package.py
+++ b/var/spack/repos/builtin/packages/qhull/package.py
@@ -20,6 +20,9 @@ class Qhull(Package):
     version('1.0', 'd0f978c0d8dfb2e919caefa56ea2953c',
             url="http://www.qhull.org/download/qhull-2012.1-src.tgz")
 
+    # https://github.com/qhull/qhull/pull/5
+    patch('qhull-iterator.patch')
+
     def install(self, spec, prefix):
         with working_dir('spack-build', create=True):
             cmake('..', *std_cmake_args)
diff --git a/var/spack/repos/builtin/packages/qhull/qhull-iterator.patch b/var/spack/repos/builtin/packages/qhull/qhull-iterator.patch
new file mode 100644
index 0000000000..88e931d84f
--- /dev/null
+++ b/var/spack/repos/builtin/packages/qhull/qhull-iterator.patch
@@ -0,0 +1,45 @@
+From 93f4b306c54bb5be7724dcc19c6e747b62ac76dd Mon Sep 17 00:00:00 2001
+From: Ben Boeckel <mathstuf@gmail.com>
+Date: Thu, 28 May 2015 11:12:25 -0400
+Subject: [PATCH] iterator: use the header
+
+Standard libraries are doing funky things with inline namespaces which
+make these declarations impossible to get right. Just include the
+header.
+---
+ src/libqhullcpp/QhullIterator.h   | 3 +--
+ src/libqhullcpp/QhullLinkedList.h | 5 +----
+ 2 files changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/src/libqhullcpp/QhullIterator.h b/src/libqhullcpp/QhullIterator.h
+index 9dde894..49f3a3b 100644
+--- a/src/libqhullcpp/QhullIterator.h
++++ b/src/libqhullcpp/QhullIterator.h
+@@ -14,10 +14,9 @@ extern "C" {
+ }
+ 
+ #include <assert.h>
++#include <iterator>
+ #include <string>
+ #include <vector>
+-//! Avoid dependence on <iterator>
+-namespace std { struct bidirectional_iterator_tag; struct random_access_iterator_tag; }
+ 
+ namespace orgQhull {
+ 
+diff --git a/src/libqhullcpp/QhullLinkedList.h b/src/libqhullcpp/QhullLinkedList.h
+index d828ac6..00b9008 100644
+--- a/src/libqhullcpp/QhullLinkedList.h
++++ b/src/libqhullcpp/QhullLinkedList.h
+@@ -9,10 +9,7 @@
+ #ifndef QHULLLINKEDLIST_H
+ #define QHULLLINKEDLIST_H
+ 
+-namespace std {
+-    struct bidirectional_iterator_tag;
+-    struct random_access_iterator_tag;
+-}//std
++#include <iterator>
+ 
+ #include "QhullError.h"
+ extern "C" {
diff --git a/var/spack/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py
index e8d843519d..e8d843519d 100644
--- a/var/spack/packages/qt/package.py
+++ b/var/spack/repos/builtin/packages/qt/package.py
diff --git a/var/spack/packages/qt/qt3krell.patch b/var/spack/repos/builtin/packages/qt/qt3krell.patch
index 3333eeacd4..3333eeacd4 100644
--- a/var/spack/packages/qt/qt3krell.patch
+++ b/var/spack/repos/builtin/packages/qt/qt3krell.patch
diff --git a/var/spack/packages/qthreads/package.py b/var/spack/repos/builtin/packages/qthreads/package.py
index dacdb71524..dacdb71524 100644
--- a/var/spack/packages/qthreads/package.py
+++ b/var/spack/repos/builtin/packages/qthreads/package.py
diff --git a/var/spack/packages/ravel/package.py b/var/spack/repos/builtin/packages/ravel/package.py
index d774a0ab86..d774a0ab86 100644
--- a/var/spack/packages/ravel/package.py
+++ b/var/spack/repos/builtin/packages/ravel/package.py
diff --git a/var/spack/packages/readline/package.py b/var/spack/repos/builtin/packages/readline/package.py
index 1b870e0e7f..1b870e0e7f 100644
--- a/var/spack/packages/readline/package.py
+++ b/var/spack/repos/builtin/packages/readline/package.py
diff --git a/var/spack/packages/rose/add_spack_compiler_recognition.patch b/var/spack/repos/builtin/packages/rose/add_spack_compiler_recognition.patch
index ce61ae4e4c..ce61ae4e4c 100644
--- a/var/spack/packages/rose/add_spack_compiler_recognition.patch
+++ b/var/spack/repos/builtin/packages/rose/add_spack_compiler_recognition.patch
diff --git a/var/spack/packages/rose/package.py b/var/spack/repos/builtin/packages/rose/package.py
index 1d7294acab..1d7294acab 100644
--- a/var/spack/packages/rose/package.py
+++ b/var/spack/repos/builtin/packages/rose/package.py
diff --git a/var/spack/packages/rsync/package.py b/var/spack/repos/builtin/packages/rsync/package.py
index 76aec3096d..76aec3096d 100644
--- a/var/spack/packages/rsync/package.py
+++ b/var/spack/repos/builtin/packages/rsync/package.py
diff --git a/var/spack/packages/ruby/package.py b/var/spack/repos/builtin/packages/ruby/package.py
index 6b6242362c..6b6242362c 100644
--- a/var/spack/packages/ruby/package.py
+++ b/var/spack/repos/builtin/packages/ruby/package.py
diff --git a/var/spack/packages/samtools/package.py b/var/spack/repos/builtin/packages/samtools/package.py
index 72900398d8..72900398d8 100644
--- a/var/spack/packages/samtools/package.py
+++ b/var/spack/repos/builtin/packages/samtools/package.py
diff --git a/var/spack/packages/samtools/samtools1.2.patch b/var/spack/repos/builtin/packages/samtools/samtools1.2.patch
index ead3ab4e2c..ead3ab4e2c 100644
--- a/var/spack/packages/samtools/samtools1.2.patch
+++ b/var/spack/repos/builtin/packages/samtools/samtools1.2.patch
diff --git a/var/spack/packages/scalasca/package.py b/var/spack/repos/builtin/packages/scalasca/package.py
index 6de14564b2..6de14564b2 100644
--- a/var/spack/packages/scalasca/package.py
+++ b/var/spack/repos/builtin/packages/scalasca/package.py
diff --git a/var/spack/packages/scorep/package.py b/var/spack/repos/builtin/packages/scorep/package.py
index 5127e814b6..5127e814b6 100644
--- a/var/spack/packages/scorep/package.py
+++ b/var/spack/repos/builtin/packages/scorep/package.py
diff --git a/var/spack/packages/scotch/package.py b/var/spack/repos/builtin/packages/scotch/package.py
index 8229ed8686..8229ed8686 100644
--- a/var/spack/packages/scotch/package.py
+++ b/var/spack/repos/builtin/packages/scotch/package.py
diff --git a/var/spack/packages/scr/package.py b/var/spack/repos/builtin/packages/scr/package.py
index 1408dce678..1408dce678 100644
--- a/var/spack/packages/scr/package.py
+++ b/var/spack/repos/builtin/packages/scr/package.py
diff --git a/var/spack/packages/silo/package.py b/var/spack/repos/builtin/packages/silo/package.py
index 9eda11df15..9eda11df15 100644
--- a/var/spack/packages/silo/package.py
+++ b/var/spack/repos/builtin/packages/silo/package.py
diff --git a/var/spack/packages/snappy/package.py b/var/spack/repos/builtin/packages/snappy/package.py
index c8f9ceef7d..c8f9ceef7d 100644
--- a/var/spack/packages/snappy/package.py
+++ b/var/spack/repos/builtin/packages/snappy/package.py
diff --git a/var/spack/packages/sparsehash/package.py b/var/spack/repos/builtin/packages/sparsehash/package.py
index 7decaeb89b..7decaeb89b 100644
--- a/var/spack/packages/sparsehash/package.py
+++ b/var/spack/repos/builtin/packages/sparsehash/package.py
diff --git a/var/spack/packages/spindle/package.py b/var/spack/repos/builtin/packages/spindle/package.py
index a20753458a..a20753458a 100644
--- a/var/spack/packages/spindle/package.py
+++ b/var/spack/repos/builtin/packages/spindle/package.py
diff --git a/var/spack/packages/spot/package.py b/var/spack/repos/builtin/packages/spot/package.py
index 9e539277ae..9e539277ae 100644
--- a/var/spack/packages/spot/package.py
+++ b/var/spack/repos/builtin/packages/spot/package.py
diff --git a/var/spack/packages/sqlite/package.py b/var/spack/repos/builtin/packages/sqlite/package.py
index 1cf2d30239..1cf2d30239 100644
--- a/var/spack/packages/sqlite/package.py
+++ b/var/spack/repos/builtin/packages/sqlite/package.py
diff --git a/var/spack/packages/stat/configure_mpicxx.patch b/var/spack/repos/builtin/packages/stat/configure_mpicxx.patch
index e09056d95c..e09056d95c 100644
--- a/var/spack/packages/stat/configure_mpicxx.patch
+++ b/var/spack/repos/builtin/packages/stat/configure_mpicxx.patch
diff --git a/var/spack/packages/stat/package.py b/var/spack/repos/builtin/packages/stat/package.py
index 5d81e62731..5d81e62731 100644
--- a/var/spack/packages/stat/package.py
+++ b/var/spack/repos/builtin/packages/stat/package.py
diff --git a/var/spack/packages/sundials/package.py b/var/spack/repos/builtin/packages/sundials/package.py
index 7e025a8244..7e025a8244 100644
--- a/var/spack/packages/sundials/package.py
+++ b/var/spack/repos/builtin/packages/sundials/package.py
diff --git a/var/spack/packages/swig/package.py b/var/spack/repos/builtin/packages/swig/package.py
index 8d46c4fe46..8d46c4fe46 100644
--- a/var/spack/packages/swig/package.py
+++ b/var/spack/repos/builtin/packages/swig/package.py
diff --git a/var/spack/repos/builtin/packages/szip/package.py b/var/spack/repos/builtin/packages/szip/package.py
new file mode 100644
index 0000000000..c48c5b431e
--- /dev/null
+++ b/var/spack/repos/builtin/packages/szip/package.py
@@ -0,0 +1,21 @@
+from spack import *
+
+class Szip(Package):
+    """Szip is an implementation of the extended-Rice lossless compression algorithm.
+    It provides lossless compression of scientific data, and is provided with HDF
+    software products."""
+
+    homepage = "https://www.hdfgroup.org/doc_resource/SZIP/"
+    url      = "http://www.hdfgroup.org/ftp/lib-external/szip/2.1/src/szip-2.1.tar.gz"
+
+    version('2.1', '902f831bcefb69c6b635374424acbead')
+
+    def install(self, spec, prefix):
+        configure('--prefix=%s' % prefix,
+                  '--enable-production',
+                  '--enable-shared',
+                  '--enable-static',
+                  '--enable-encoding')
+
+        make()
+        make("install")
diff --git a/var/spack/repos/builtin/packages/tar/package.py b/var/spack/repos/builtin/packages/tar/package.py
new file mode 100644
index 0000000000..539174017c
--- /dev/null
+++ b/var/spack/repos/builtin/packages/tar/package.py
@@ -0,0 +1,13 @@
+from spack import *
+
+class Tar(Package):
+    """GNU Tar provides the ability to create tar archives, as well as various other kinds of manipulation."""
+    homepage = "https://www.gnu.org/software/tar/"
+    url      = "http://ftp.gnu.org/gnu/tar/tar-1.28.tar.gz"
+
+    version('1.28', '6ea3dbea1f2b0409b234048e021a9fd7')
+
+    def install(self, spec, prefix):
+        configure("--prefix=%s" % prefix)
+        make()
+        make('install')
diff --git a/var/spack/packages/task/package.py b/var/spack/repos/builtin/packages/task/package.py
index 07f44cc45b..07f44cc45b 100644
--- a/var/spack/packages/task/package.py
+++ b/var/spack/repos/builtin/packages/task/package.py
diff --git a/var/spack/packages/taskd/package.py b/var/spack/repos/builtin/packages/taskd/package.py
index 66bc0cb484..66bc0cb484 100644
--- a/var/spack/packages/taskd/package.py
+++ b/var/spack/repos/builtin/packages/taskd/package.py
diff --git a/var/spack/packages/tau/package.py b/var/spack/repos/builtin/packages/tau/package.py
index 31492397d8..31492397d8 100644
--- a/var/spack/packages/tau/package.py
+++ b/var/spack/repos/builtin/packages/tau/package.py
diff --git a/var/spack/packages/tcl/package.py b/var/spack/repos/builtin/packages/tcl/package.py
index 529adf7788..529adf7788 100644
--- a/var/spack/packages/tcl/package.py
+++ b/var/spack/repos/builtin/packages/tcl/package.py
diff --git a/var/spack/packages/texinfo/package.py b/var/spack/repos/builtin/packages/texinfo/package.py
index 460db65b3e..a83c10c0c1 100644
--- a/var/spack/packages/texinfo/package.py
+++ b/var/spack/repos/builtin/packages/texinfo/package.py
@@ -6,7 +6,7 @@
 # Written by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
 # LLNL-CODE-647188
 #
-# For details, see https://scalability-llnl.github.io/spack
+# For details, see https://llnl.github.io/spack
 # Please also see the LICENSE file for our notice and the LGPL.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -33,12 +33,12 @@ class Texinfo(Package):
     used by many non-GNU projects as well.FIXME: put a proper description of your package here.
     """
     homepage = "https://www.gnu.org/software/texinfo/"
-    url      = "http://ftp.gnu.org/gnu/texinfo/texinfo-6.0.tar.xz"
+    url      = "http://ftp.gnu.org/gnu/texinfo/texinfo-6.0.tar.gz"
 
-    version('6.0', '02818e62a5b8ae0213a7ff572991bb50')
-    version('5.2', 'cb489df8a7ee9d10a236197aefdb32c5')
-    version('5.1', '52ee905a3b705020d2a1b6ec36d53ca6')
-    version('5.0', 'ef2fad34c71ddc95b20c7d6a08c0d7a6')
+    version('6.0', 'e1a2ef5dce5018b53f0f6eed45b247a7')
+    version('5.2', '1b8f98b80a8e6c50422125e07522e8db')
+    version('5.1', '54e250014fe698fb4832016158747c03')
+    version('5.0', '918432285abe6fe96c98355594c5656a')
 
     def install(self, spec, prefix):
         configure('--prefix=%s' % prefix)
diff --git a/var/spack/packages/the_silver_searcher/package.py b/var/spack/repos/builtin/packages/the_silver_searcher/package.py
index e4020b6766..e4020b6766 100644
--- a/var/spack/packages/the_silver_searcher/package.py
+++ b/var/spack/repos/builtin/packages/the_silver_searcher/package.py
diff --git a/var/spack/packages/thrift/package.py b/var/spack/repos/builtin/packages/thrift/package.py
index 0e15052f64..0e15052f64 100644
--- a/var/spack/packages/thrift/package.py
+++ b/var/spack/repos/builtin/packages/thrift/package.py
diff --git a/var/spack/packages/tk/package.py b/var/spack/repos/builtin/packages/tk/package.py
index 96736f6f95..96736f6f95 100644
--- a/var/spack/packages/tk/package.py
+++ b/var/spack/repos/builtin/packages/tk/package.py
diff --git a/var/spack/packages/tmux/package.py b/var/spack/repos/builtin/packages/tmux/package.py
index 23d36db427..23d36db427 100644
--- a/var/spack/packages/tmux/package.py
+++ b/var/spack/repos/builtin/packages/tmux/package.py
diff --git a/var/spack/packages/tmuxinator/package.py b/var/spack/repos/builtin/packages/tmuxinator/package.py
index 77ae063e5d..77ae063e5d 100644
--- a/var/spack/packages/tmuxinator/package.py
+++ b/var/spack/repos/builtin/packages/tmuxinator/package.py
diff --git a/var/spack/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py
index 7c43f796a4..7c43f796a4 100644
--- a/var/spack/packages/trilinos/package.py
+++ b/var/spack/repos/builtin/packages/trilinos/package.py
diff --git a/var/spack/packages/uncrustify/package.py b/var/spack/repos/builtin/packages/uncrustify/package.py
index d3f2d1b473..d3f2d1b473 100644
--- a/var/spack/packages/uncrustify/package.py
+++ b/var/spack/repos/builtin/packages/uncrustify/package.py
diff --git a/var/spack/packages/util-linux/package.py b/var/spack/repos/builtin/packages/util-linux/package.py
index cb7ceabf57..cb7ceabf57 100644
--- a/var/spack/packages/util-linux/package.py
+++ b/var/spack/repos/builtin/packages/util-linux/package.py
diff --git a/var/spack/packages/valgrind/package.py b/var/spack/repos/builtin/packages/valgrind/package.py
index 0b030d73e9..0b030d73e9 100644
--- a/var/spack/packages/valgrind/package.py
+++ b/var/spack/repos/builtin/packages/valgrind/package.py
diff --git a/var/spack/packages/vim/package.py b/var/spack/repos/builtin/packages/vim/package.py
index 4099b3257f..4099b3257f 100644
--- a/var/spack/packages/vim/package.py
+++ b/var/spack/repos/builtin/packages/vim/package.py
diff --git a/var/spack/packages/vtk/package.py b/var/spack/repos/builtin/packages/vtk/package.py
index 4a27a8fedb..4a27a8fedb 100644
--- a/var/spack/packages/vtk/package.py
+++ b/var/spack/repos/builtin/packages/vtk/package.py
diff --git a/var/spack/packages/wget/package.py b/var/spack/repos/builtin/packages/wget/package.py
index c8fd025122..55728b0515 100644
--- a/var/spack/packages/wget/package.py
+++ b/var/spack/repos/builtin/packages/wget/package.py
@@ -8,9 +8,10 @@ class Wget(Package):
        etc."""
 
     homepage = "http://www.gnu.org/software/wget/"
-    url      = "http://ftp.gnu.org/gnu/wget/wget-1.16.tar.xz"
+    url      = "http://ftp.gnu.org/gnu/wget/wget-1.16.tar.gz"
 
-    version('1.16', 'fe102975ab3a6c049777883f1bb9ad07')
+    version('1.17', 'c4c4727766f24ac716936275014a0536')
+    version('1.16', '293a37977c41b5522f781d3a3a078426')
 
     depends_on("openssl")
 
diff --git a/var/spack/packages/wx/package.py b/var/spack/repos/builtin/packages/wx/package.py
index 206fde7775..206fde7775 100644
--- a/var/spack/packages/wx/package.py
+++ b/var/spack/repos/builtin/packages/wx/package.py
diff --git a/var/spack/packages/wxpropgrid/package.py b/var/spack/repos/builtin/packages/wxpropgrid/package.py
index 790cead517..790cead517 100644
--- a/var/spack/packages/wxpropgrid/package.py
+++ b/var/spack/repos/builtin/packages/wxpropgrid/package.py
diff --git a/var/spack/packages/xcb-proto/package.py b/var/spack/repos/builtin/packages/xcb-proto/package.py
index 17a94bd892..17a94bd892 100644
--- a/var/spack/packages/xcb-proto/package.py
+++ b/var/spack/repos/builtin/packages/xcb-proto/package.py
diff --git a/var/spack/packages/xerces-c/package.py b/var/spack/repos/builtin/packages/xerces-c/package.py
index b59ab178ae..b59ab178ae 100644
--- a/var/spack/packages/xerces-c/package.py
+++ b/var/spack/repos/builtin/packages/xerces-c/package.py
diff --git a/var/spack/packages/xz/package.py b/var/spack/repos/builtin/packages/xz/package.py
index ba6c9733a7..ba6c9733a7 100644
--- a/var/spack/packages/xz/package.py
+++ b/var/spack/repos/builtin/packages/xz/package.py
diff --git a/var/spack/packages/yasm/package.py b/var/spack/repos/builtin/packages/yasm/package.py
index d3a695b16d..d3a695b16d 100644
--- a/var/spack/packages/yasm/package.py
+++ b/var/spack/repos/builtin/packages/yasm/package.py
diff --git a/var/spack/packages/zeromq/package.py b/var/spack/repos/builtin/packages/zeromq/package.py
index b5a1e3d4cd..b5a1e3d4cd 100644
--- a/var/spack/packages/zeromq/package.py
+++ b/var/spack/repos/builtin/packages/zeromq/package.py
diff --git a/var/spack/packages/zlib/package.py b/var/spack/repos/builtin/packages/zlib/package.py
index 2770f781ac..2770f781ac 100644
--- a/var/spack/packages/zlib/package.py
+++ b/var/spack/repos/builtin/packages/zlib/package.py
diff --git a/var/spack/packages/zsh/package.py b/var/spack/repos/builtin/packages/zsh/package.py
index 06665f0c83..06665f0c83 100644
--- a/var/spack/packages/zsh/package.py
+++ b/var/spack/repos/builtin/packages/zsh/package.py
diff --git a/var/spack/repos/builtin/repo.yaml b/var/spack/repos/builtin/repo.yaml
new file mode 100644
index 0000000000..54b282db6b
--- /dev/null
+++ b/var/spack/repos/builtin/repo.yaml
@@ -0,0 +1,2 @@
+repo:
+  namespace: builtin