3 files changed, 23 insertions, 15 deletions
diff --git a/var/spack/repos/builtin/packages/gaudi/package.py b/var/spack/repos/builtin/packages/gaudi/package.py
index 0e1146342c..29b9e1710a 100644
--- a/var/spack/repos/builtin/packages/gaudi/package.py
+++ b/var/spack/repos/builtin/packages/gaudi/package.py
@@ -14,8 +14,7 @@ class Gaudi(CMakePackage):
 
     version('develop', branch='master')
     version('30.5',    commit='2c70e73ee5b543b26197b90dd59ea4e4d359d230')
-
-    patch('use-xenv-master.diff')
+    version('31.0',    commit='aeb156f0c40571b5753a9e1dab31e331491b2f3e')
 
     variant('tests', default=False,
             description='Prepare to run the test suite')
@@ -30,6 +29,7 @@ class Gaudi(CMakePackage):
     depends_on('intel-tbb')
     depends_on('libuuid')
     depends_on('python@:2.99.99')
+    depends_on('py-xenv@develop_2018-12-20:')
     depends_on('range-v3')
     depends_on('root +python +root7 +ssl +tbb +threads')
     depends_on('zlib')
diff --git a/var/spack/repos/builtin/packages/gaudi/use-xenv-master.diff b/var/spack/repos/builtin/packages/gaudi/use-xenv-master.diff
deleted file mode 100644
index fd19561860..0000000000
--- a/var/spack/repos/builtin/packages/gaudi/use-xenv-master.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cmake/GaudiProjectConfig.cmake b/cmake/GaudiProjectConfig.cmake
-index ab1a24e1d..dc938da79 100644
---- a/cmake/GaudiProjectConfig.cmake
-+++ b/cmake/GaudiProjectConfig.cmake
-@@ -410,7 +410,7 @@ macro(gaudi_project project version)
-       # Avoid interference from user environment
-       unset(ENV{GIT_DIR})
-       unset(ENV{GIT_WORK_TREE})
--      execute_process(COMMAND git clone -b 0.0.1 https://gitlab.cern.ch/gaudi/xenv.git ${CMAKE_BINARY_DIR}/contrib/xenv)
-+      execute_process(COMMAND git clone https://gitlab.cern.ch/gaudi/xenv.git ${CMAKE_BINARY_DIR}/contrib/xenv)
-     endif()
-     # I'd like to generate the script with executable permission, but I only
-     # found this workaround: https://stackoverflow.com/a/45515418
diff --git a/var/spack/repos/builtin/packages/py-xenv/package.py b/var/spack/repos/builtin/packages/py-xenv/package.py
new file mode 100644
index 0000000000..cd87ff1e06
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-xenv/package.py
@@ -0,0 +1,21 @@
+# Copyright 2013-2019 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+from spack import *
+
+
+class PyXenv(PythonPackage):
+    """Helpers to work with the environment in a platform independent way."""
+
+    homepage = "https://gitlab.cern.ch/gaudi/xenv"
+    git      = "https://gitlab.cern.ch/gaudi/xenv.git"
+
+    # As of 0.0.4, all released versions of xenv corrupt the system environment
+    # in a manner which breaks Spack's compiler wrappers. Therefore, we must
+    # package an un-released development version of xenv.
+    version('develop',            branch='master')
+    version('develop_2018-12-20', commit='ddc3bf5e65e1689da499f639af7a27c5c4242841')
+
+    depends_on('py-setuptools', type='build')