From d017c5080a49bc6c2dee231234f8535198350b16 Mon Sep 17 00:00:00 2001
From: Alfredo Gimenez <gimenez1@llnl.gov>
Date: Fri, 7 Aug 2015 00:03:14 -0700
Subject: Fixed py-pandas package

---
 var/spack/packages/libpciaccess/package.py  | 21 +++++++++++++++++++++
 var/spack/packages/libxml2/package.py       |  5 +++--
 var/spack/packages/mesa/package.py          |  5 +++--
 var/spack/packages/py-mock/package.py       | 17 +++++++++++++++++
 var/spack/packages/py-pandas/package.py     |  4 ++++
 var/spack/packages/py-setuptools/package.py |  1 +
 6 files changed, 49 insertions(+), 4 deletions(-)
 create mode 100644 var/spack/packages/libpciaccess/package.py
 create mode 100644 var/spack/packages/py-mock/package.py

(limited to 'var')

diff --git a/var/spack/packages/libpciaccess/package.py b/var/spack/packages/libpciaccess/package.py
new file mode 100644
index 0000000000..6022fc34a3
--- /dev/null
+++ b/var/spack/packages/libpciaccess/package.py
@@ -0,0 +1,21 @@
+from spack import *
+
+class Libpciaccess(Package):
+    """Generic PCI access library."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/lib/libpciaccess/"
+    url      = "http://cgit.freedesktop.org/xorg/lib/libpciaccess/"
+
+    version('0.13.4', git='http://anongit.freedesktop.org/git/xorg/lib/libpciaccess.git',
+            tag='libpciaccess-0.13.4')
+
+    depends_on('autoconf')
+    depends_on('libtool')
+
+    def install(self, spec, prefix):
+        from subprocess import call
+        call(["./autogen.sh"])
+        configure("--prefix=%s" % prefix)
+
+        make()
+        make("install")
diff --git a/var/spack/packages/libxml2/package.py b/var/spack/packages/libxml2/package.py
index 72199d8def..3a0af6b368 100644
--- a/var/spack/packages/libxml2/package.py
+++ b/var/spack/packages/libxml2/package.py
@@ -9,11 +9,12 @@ class Libxml2(Package):
 
     version('2.9.2', '9e6a9aca9d155737868b3dc5fd82f788')
 
+    extends('python')
     depends_on('zlib')
     depends_on('xz')
 
     def install(self, spec, prefix):
-        configure("--prefix=%s" % prefix,
-                  "--without-python")
+        configure("--prefix=%s" % prefix)
+
         make()
         make("install")
diff --git a/var/spack/packages/mesa/package.py b/var/spack/packages/mesa/package.py
index 2dba878a77..2a04a8fd51 100644
--- a/var/spack/packages/mesa/package.py
+++ b/var/spack/packages/mesa/package.py
@@ -1,7 +1,7 @@
 from spack import *
 
 class Mesa(Package):
-    """Mesa is an open-source implementation of the OpenGL 
+    """Mesa is an open-source implementation of the OpenGL
     specification - a system for rendering interactive 3D graphics."""
 
     homepage = "http://www.mesa3d.org"
@@ -11,9 +11,10 @@ class Mesa(Package):
     # version('10.4.4', '8d863a3c209bf5116b2babfccccc68ce')
     version('8.0.5', 'cda5d101f43b8784fa60bdeaca4056f2')
 
-    # mesa 7.x, 8.x, 9.x 
+    # mesa 7.x, 8.x, 9.x
     depends_on("libdrm@2.4.33")
     depends_on("llvm@3.0")
+    depends_on("libxml2")
 
     # patch("llvm-fixes.patch") # using newer llvm
 
diff --git a/var/spack/packages/py-mock/package.py b/var/spack/packages/py-mock/package.py
new file mode 100644
index 0000000000..3b08428ba0
--- /dev/null
+++ b/var/spack/packages/py-mock/package.py
@@ -0,0 +1,17 @@
+from spack import *
+
+class PyMock(Package):
+    """mock is a library for testing in Python. It allows you to replace parts
+    of your system under test with mock objects and make assertions about how
+    they have been used."""
+
+    homepage = "https://github.com/testing-cabal/mock"
+    url      = "https://pypi.python.org/packages/source/m/mock/mock-1.3.0.tar.gz"
+
+    version('1.3.0', '73ee8a4afb3ff4da1b4afa287f39fdeb')
+
+    extends('python')
+    depends_on('py-setuptools@17.1:')
+
+    def install(self, spec, prefix):
+        python('setup.py', 'install', '--prefix=%s' % prefix)
diff --git a/var/spack/packages/py-pandas/package.py b/var/spack/packages/py-pandas/package.py
index acbb5114a3..5b9997faa9 100644
--- a/var/spack/packages/py-pandas/package.py
+++ b/var/spack/packages/py-pandas/package.py
@@ -16,6 +16,10 @@ class PyPandas(Package):
     depends_on('py-scipy')
     depends_on('py-setuptools')
     depends_on('py-pytz')
+    depends_on('libdrm')
+    depends_on('libpciaccess')
+    depends_on('llvm')
+    depends_on('mesa')
 
     def install(self, spec, prefix):
         python('setup.py', 'install', '--prefix=%s' % prefix)
diff --git a/var/spack/packages/py-setuptools/package.py b/var/spack/packages/py-setuptools/package.py
index d3f11ed469..760ad4d6db 100644
--- a/var/spack/packages/py-setuptools/package.py
+++ b/var/spack/packages/py-setuptools/package.py
@@ -7,6 +7,7 @@ class PySetuptools(Package):
 
     version('11.3.1', '01f69212e019a2420c1693fb43593930')
     version('16.0', '0ace0b96233516fc5f7c857d086aa3ad')
+    version('18.1', 'f72e87f34fbf07f299f6cb46256a0b06')
 
     extends('python')
 
-- 
cgit v1.2.3-60-g2f50