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/qhull/package.py

@@ -0,0 +1,30 @@
+from spack import *
+
+class Qhull(Package):
+    """Qhull computes the convex hull, Delaunay triangulation, Voronoi
+       diagram, halfspace intersection about a point, furt hest-site
+       Delaunay triangulation, and furthest-site Voronoi diagram. The
+       source code runs in 2-d, 3-d, 4-d, and higher dimensions. Qhull
+       implements the Quickhull algorithm for computing the convex
+       hull. It handles roundoff errors from floating point
+       arithmetic. It computes volumes, surface areas, and
+       approximations to the convex hull.
+
+       Qhull does not support triangulation of non-convex surfaces,
+       mesh generation of non-convex objects, medium-sized inputs in
+       9-D and higher, alpha shapes, weighted Voronoi diagrams,
+       Voronoi volumes, or constrained Delaunay triangulations."""
+
+    homepage = "http://www.qhull.org"
+
+    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)
+            make()
+            make("install")

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" {