Merge branch 'develop' into mplegendre-multi_pkgsrc_roots

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

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

@@ -0,0 +1,53 @@
+##############################################################################
+# 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 Libgd(Package):
+    """
+    GD is an open source code library for the dynamic creation of images by programmers. GD is written in C, and
+    "wrappers" are available for Perl, PHP and other languages. GD creates PNG, JPEG, GIF, WebP, XPM, BMP images,
+    among other formats. GD is commonly used to generate charts, graphics, thumbnails, and most anything else, on the
+    fly. While not restricted to use on the web, the most common applications of GD involve website development.
+    """
+
+    homepage = "https://github.com/libgd/libgd"
+    url      = "https://github.com/libgd/libgd/archive/gd-2.1.1.tar.gz"
+
+    version('2.1.1', 'e91a1a99903e460e7ba00a794e72cc1e')
+
+    depends_on('libpng')
+
+    def install(self, spec, prefix):
+
+        with working_dir('spack-build', create=True):
+            cmake('..',
+                  '-DENABLE_JPEG:BOOL=ON',
+                  '-DENABLE_PNG:BOOL=ON',
+                  '-DENABLE_TIFF:BOOL=ON',
+                  *std_cmake_args)
+            make()
+            make("install")