Merge branch 'mplegendre-multi_pkgsrc_roots' into develop

- This moves var/spack/packages to var/spack/repos/builtin/packages.

- Packages that did not exist in the source branch, or were changed in
  develop, were moved into var/spack/repos/builtin/packages as part of
  the integration.

Conflicts:
	lib/spack/spack/test/unit_install.py
	var/spack/repos/builtin/packages/clang/package.py

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

@@ -0,0 +1,40 @@
+from spack import *
+
+class Openssl(Package):
+    """The OpenSSL Project is a collaborative effort to develop a
+       robust, commercial-grade, full-featured, and Open Source
+       toolkit implementing the Secure Sockets Layer (SSL v2/v3) and
+       Transport Layer Security (TLS v1) protocols as well as a
+       full-strength general purpose cryptography library."""
+    homepage = "http://www.openssl.org"
+    url      = "http://www.openssl.org/source/openssl-1.0.1h.tar.gz"
+
+    version('1.0.1h', '8d6d684a9430d5cc98a62a5d8fbda8cf')
+    version('1.0.2d', '38dd619b2e77cbac69b99f52a053d25a')
+    version('1.0.2e', '5262bfa25b60ed9de9f28d5d52d77fc5')
+
+    depends_on("zlib")
+    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" % 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")