Making emacs dependent on internal packages

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

@@ -23,6 +23,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ##############################################################################
 from spack import *
+import llnl.util.tty as tty
 
 
 class Emacs(Package):
@@ -33,28 +34,33 @@ class Emacs(Package):
 
     version('24.5', 'd74b597503a68105e61b5b9f6d065b44')
 
-    variant('use-system-deps', default=True, description='Uses the library on the system to compile')
+    variant('X', default=True, description="Enable a X toolkit (GTK+)")
+    variant('gtkplus', default=False, description="Enable a GTK+ as X toolkit (this variant is ignored if ~X)")
 
     depends_on('ncurses')
-    # Emacs also depends on:
+    depends_on('libtiff', when='+X')
-    #     GTK or other widget library
+    depends_on('libpng', when='+X')
-    #     libtiff, png, etc.
+    depends_on('libxpm', when='+X')
-    # For now, we assume the system provides all that stuff.
+    depends_on('giflib', when='+X')
-    # For Ubuntu 14.04 LTS:
+    depends_on('gtkplus', when='+X+gtkplus')
-    #     sudo apt-get install libgtk-3-dev libxpm-dev
-    #     libtiff5-dev libjpeg8-dev libgif-dev libpng12-dev
-    depends_on('libtiff', when='~use-system-deps')
-    depends_on('libpng', when='~use-system-deps')
 
     def install(self, spec, prefix):
-        if '~use-system-deps' in self.spec:
+        args = []
+        if '+X' in spec:
+            if '+gtkplus' in spec:
+                toolkit = 'gtk{0}'.format(spec['gtkplus'].version.up_to(1))
+            else:
+                toolkit = 'no'
             args = [
-                '--with-xpm=no',
+                '--with-x',
-                '--with-gif=no',
+                '--with-x-toolkit={0}'.format(toolkit)
             ]
         else:
-            args = []
+            args = ['--without-x']
+            if '+gtkplus' in spec:
+                tty.warn('The variant +gtkplus is ignored if ~X is selected.')
+
+        configure('--prefix={0}'.format(prefix), *args)
 
-        configure('--prefix=%s' % prefix, *args)
         make()
         make("install")

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

@@ -0,0 +1,41 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created 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 Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, 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 Lesser 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 Giflib(Package):
+    """The GIFLIB project maintains the giflib service library, which has
+    been pulling images out of GIFs since 1989."""
+
+    homepage = "http://giflib.sourceforge.net/"
+    url      = "https://downloads.sourceforge.net/project/giflib/giflib-5.1.4.tar.bz2"
+
+    version('5.1.4', '2c171ced93c0e83bb09e6ccad8e3ba2b')
+
+    def install(self, spec, prefix):
+        configure('--prefix=%s' % prefix)
+
+        make()
+        make("install")

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

@@ -0,0 +1,44 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created 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 Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, 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 Lesser 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 Libxpm(Package):
+    """Xpm file format library"""
+
+    homepage = "https://www.x.org/"
+    url      = "https://www.x.org/archive//individual/lib/libXpm-3.5.11.tar.gz"
+
+    version('3.5.11', '7c67c878ee048206b070bc0b24154f04')
+    version('3.5.10', 'a70507638d74541bf30a771f1e5938bb')
+    version('3.5.9', 'd6d4b0f76248a6b346eb42dfcdaa72a6')
+    version('3.5.8', '2d81d6633e67ac5562e2fbee126b2897')
+    version('3.5.7', '7bbc8f112f7143ed6961a58ce4e14558')
+
+    def install(self, spec, prefix):
+        configure('--prefix=%s' % prefix)
+
+        make()
+        make("install")