rivet: remove deprecated versions and clean up recipe (#39861)

Co-authored-by: jmcarcell <jmcarcell@users.noreply.github.com>
Co-authored-by: Wouter Deconinck <wdconinc@gmail.com>

16 files changed, 7 insertions, 892 deletions

diff --git a/var/spack/repos/builtin/packages/rivet/package.py b/var/spack/repos/builtin/packages/rivet/package.py
index fe23f40cac..dd20cd7273 100644
--- a/var/spack/repos/builtin/packages/rivet/package.py
+++ b/var/spack/repos/builtin/packages/rivet/package.py
@@ -6,7 +6,6 @@
 import os
 
 from spack.package import *
-from spack.pkg.builtin.boost import Boost
 
 
 class Rivet(AutotoolsPackage):
@@ -18,6 +17,7 @@ class Rivet(AutotoolsPackage):
 
     tags = ["hep"]
 
+    version("3.1.8", sha256="75b3f3d419ca6388d1fd2ec0eda7e1f90f324b996ccf0591f48a5d2e28dccc13")
     version("3.1.7", sha256="27c7dbbcb5fd7ee81caf136daf4e960bca0ec255d9fa1abe602f4d430861b27a")
     version("3.1.6", sha256="1cf6ebb6a79d181c441d1d0c7c6d623c423817c61093f36f21adaae23e679090")
     version("3.1.4", sha256="37edc80a2968ce1031589e43ba6b492877ca7901bea38f8bb7536a5c8cf8100d")
@@ -28,206 +28,9 @@ class Rivet(AutotoolsPackage):
     version("3.0.2", sha256="9624d6cdcad77eafde40312cf6a1c97f4263f22faf9244b198c140b2c256d2f3")
     version("3.0.1", sha256="e7551168b86a05c9c029c319c313a0aa142a476195e7ff986c896c1b868f89dd")
     version("3.0.0", sha256="3944434d3791dccb54f7b2257589df6252cc7c065ce9deb57fbef466ff9e62b1")
-    version(
-        "2.7.2b",
-        sha256="e9f0a709f8226cde54f9406d36efab1e1b8ed0c6574fbcb1d72a186b09188106",
-        deprecated=True,
-    )
-    version(
-        "2.7.2",
-        sha256="a6634537c005660e56514b70ab9efb9d466c50685d6fb45ed03e9e1988479f02",
-        deprecated=True,
-    )
-    version(
-        "2.7.1",
-        sha256="b4145d8369b8a9fa0ada7ba2e5a2e9992d8e4a12ca4874d835246d2e708cbdef",
-        deprecated=True,
-    )
-    version(
-        "2.7.0",
-        sha256="34ad6a0b47dc4736feac8580a275e8b3a46df8fbeefd91e813add0a1525aacaf",
-        deprecated=True,
-    )
-    version(
-        "2.6.2",
-        sha256="9dde49d5c02038a295f03d2972f85be8746205bdb5ca1eab868b2c9129ade37a",
-        deprecated=True,
-    )
-    version(
-        "2.6.1",
-        sha256="e490d1f35aafa3e175690ae92f862c07a5fe2c51f693c88c87789f0441c89022",
-        deprecated=True,
-    )
-    version(
-        "2.6.0",
-        sha256="fb3229dccd31ea40b0af09974253073f6ad0a3a97e9a0cf44b53748ea8e2f900",
-        deprecated=True,
-    )
-    version(
-        "2.5.4",
-        sha256="772252193698d994fd111f790e72a4024df7572d492e3d5a9e840a074c5527e2",
-        deprecated=True,
-    )
-    version(
-        "2.5.3",
-        sha256="99e10330564ac479c6637d317c08882889a272db8ee204ad45a6ee1dcb291de4",
-        deprecated=True,
-    )
-    version(
-        "2.5.2",
-        sha256="70aa27764a14159c94c0b753a0c3d3600ac669def398cb2d8a6c63ae17704f05",
-        deprecated=True,
-    )
-    version(
-        "2.5.1",
-        sha256="14ee5828de217e96a30e666192515a2083afee030d81d36fc6bea948e9f7810a",
-        deprecated=True,
-    )
-    version(
-        "2.5.0",
-        sha256="c59ff35715be0caf65d6ba808b3badad0f6f7e7758f2049fb6ba43ed579bd4af",
-        deprecated=True,
-    )
-    version(
-        "2.4.3",
-        sha256="18aafecab6c3baeac871a9743946433c2dc01825d8fe291b157719a15c342682",
-        deprecated=True,
-    )
-    version(
-        "2.4.2",
-        sha256="accb146f3082719781a51eec879427c31401577c44f60b27ec8450102fe68aff",
-        deprecated=True,
-    )
-    version(
-        "2.4.1",
-        sha256="c14f0f58d1792d84d62c62b44ebb94db004776feba83fd8186bba898d55123cf",
-        deprecated=True,
-    )
-    version(
-        "2.4.0",
-        sha256="5ee2f34a277ed058b8aef750d946b40d4cf781023b9adab03ca95e803a39fb06",
-        deprecated=True,
-    )
-    version(
-        "2.3.0",
-        sha256="dd07702981d586e4b97b0fa56ae08cd08a631a952322a9b52e7622a46a7741ab",
-        deprecated=True,
-    )
-    version(
-        "2.2.1",
-        sha256="9e64ba19d567bdf4d0cc42b435491c4363b5fec90170d034445a99a1e752b691",
-        deprecated=True,
-    )
-    version(
-        "2.2.0",
-        sha256="3bdafe2007ff54c4734e0c8bc6ba9dc97028d4c41d538201b9582a869af8ae1a",
-        deprecated=True,
-    )
-    version(
-        "2.1.2",
-        sha256="40a20c1ee186326e5bfd906e0bc88f16dc740551be9cc274e9a826873d9c1eed",
-        deprecated=True,
-    )
-    version(
-        "2.1.1",
-        sha256="eefa936de6f6c34a6bab39899841f3189d7621c8ba227032f0f32e6e20dfcf85",
-        deprecated=True,
-    )
-    version(
-        "2.1.0",
-        sha256="58a1ca7b5a47719933782c050e67d0eb3823a7384cfc3c434fece41724c307e6",
-        deprecated=True,
-    )
-    version(
-        "2.0.0",
-        sha256="038f81f92fbba001ed23b56c1229a4f3b41e0c32e00bc92ea58d042909e3855a",
-        deprecated=True,
-    )
-    version(
-        "1.9.0",
-        sha256="55ef552b351328c287194aa99fa2b797e6632dc3fa88dfccd58264602012e044",
-        deprecated=True,
-    )
-    version(
-        "1.8.3",
-        sha256="aa82742fd4d7c68bfbef1367c4c605e06f9fed479a753db96aa6659407fcc4fd",
-        deprecated=True,
-    )
-    version(
-        "1.8.2",
-        sha256="56be98d31693253543f3e657c8f8edc7979c89fdb0ede1bdddfb3a9f5d4cfc3a",
-        deprecated=True,
-    )
-    version(
-        "1.8.1",
-        sha256="7e06d22350bec30220186e796caa93e9bfebd8d771a7efd35673897248437c61",
-        deprecated=True,
-    )
-    version(
-        "1.8.0",
-        sha256="7b28f9163f74583b1542b87c48f28a3ad1338da6136d8e3ca0aeba21095f5fe0",
-        deprecated=True,
-    )
-    version(
-        "1.7.0",
-        sha256="180741f590f210474b686d60241ad59e008221751ead21f0950c59aff93e54fd",
-        deprecated=True,
-    )
-    version(
-        "1.6.0",
-        sha256="1affd9e779f48477402e4150f315b3179204cbbc920db2d0129cd9c38bd18b26",
-        deprecated=True,
-    )
-    version(
-        "1.5.1",
-        sha256="9f24e9824286d5b0302c7e440f4803a8e3b8da50e1260e78c3b3c2eb587b317a",
-        deprecated=True,
-    )
-    version(
-        "1.5.0",
-        sha256="b7fe63e8caacc5c038ab567fe505d275288eedaa1aed6c379057629eef126006",
-        deprecated=True,
-    )
-    version(
-        "1.4.0",
-        sha256="067c94659bb7859904e20e72a676f94f103e6e012b7dba8071f51e8a6e624dbb",
-        deprecated=True,
-    )
-    version(
-        "1.3.0",
-        sha256="5ce41c8492c2fcf809a7135bf8335a01a98ea85fb556b3d00bd4260151efd12f",
-        deprecated=True,
-    )
-    version(
-        "1.2.1",
-        sha256="2d0380b819f778d8d9c2a462af90bd6a6188121e4edcc6202d936130b59bab17",
-        deprecated=True,
-    )
-    version(
-        "1.2.0",
-        sha256="ff5869f6dc9465f429e54686e12c39becac57a83273542179a59bac7561b6404",
-        deprecated=True,
-    )
-    version(
-        "1.1.3",
-        sha256="4be3cd9e6f808cdc5511991be2756f5fa838b6ecd01806fdbe7aec0aa382f946",
-        deprecated=True,
-    )
-    version(
-        "1.1.2",
-        sha256="a15b5d3339481446dec1b719d7d531a87a2e9d11c9fe8044e270ea69611b07c8",
-        deprecated=True,
-    )
-    version(
-        "1.1.1",
-        sha256="bd87fefee6bb8368216755342dc80ab3f8f3c813732dd03c6f94135d45f7036b",
-        deprecated=True,
-    )
 
     variant("hepmc", default="2", values=("2", "3"), description="HepMC version to link against")
 
-    conflicts("hepmc=3", when="@:2", msg="HepMC support was added in 3.0")
-
     # According to A. Buckley (main Rivet developer):
     # "typically a given Rivet version will work with
     # all YODA releases of that middle-digit version,
@@ -235,25 +38,6 @@ class Rivet(AutotoolsPackage):
     # to be using the latest versions of both.". The versions below
     # are taken from LCG stack which, in most cases, is the definition
     # of "latest" at the moment of release.
-    depends_on("yoda@1.0.4", when="@2.0.0")
-    depends_on("yoda@1.0.5", when="@2.1.0")
-    depends_on("yoda@1.0.6", when="@2.1.1")
-    depends_on("yoda@1.1.0", when="@2.1.2")
-    depends_on("yoda@1.3.0", when="@2.2.0")
-    depends_on("yoda@1.3.1", when="@2.2.1")
-    depends_on("yoda@1.4.0", when="@2.3.0")
-    depends_on("yoda@1.5.5", when="@2.4.0")
-    depends_on("yoda@1.5.9", when="@2.4.2")
-    depends_on("yoda@1.6.1", when="@2.4.3")
-    depends_on("yoda@1.6.2", when="@2.5.0")
-    depends_on("yoda@1.6.3", when="@2.5.1")
-    depends_on("yoda@1.6.5", when="@2.5.2")
-    depends_on("yoda@1.6.6", when="@2.5.3")
-    depends_on("yoda@1.6.7", when="@2.5.4")
-    depends_on("yoda@1.7.1", when="@2.6.1")
-    depends_on("yoda@1.7.4", when="@2.6.2")
-    depends_on("yoda@1.7.5", when="@2.7.2")
-    depends_on("yoda@1.7.5", when="@2.7.2b")
     depends_on("yoda@1.7.7", when="@3.0.1")
     depends_on("yoda@1.8.0", when="@3.1.0")
     depends_on("yoda@1.8.2", when="@3.1.1")
@@ -264,24 +48,16 @@ class Rivet(AutotoolsPackage):
 
     # The following versions were not a part of LCG stack
     # and thus the exact version of YODA is unknown
-    depends_on("yoda@1.7.0:1.7", when="@2.6.0,2.7.0,2.7.1,3.0.0,3.0.2")
-    depends_on("yoda@1.5.0:1.5", when="@2.4.1")
+    depends_on("yoda@1.7.0:1.7", when="@3.0.0,3.0.2")
 
     depends_on("hepmc", when="hepmc=2")
     depends_on("hepmc3", when="hepmc=3")
-    depends_on("boost", when="@:2.5.0")
-    # TODO: replace this with an explicit list of components of Boost,
-    # for instance depends_on('boost +filesystem')
-    # See https://github.com/spack/spack/pull/22303 for reference
-    depends_on(Boost.with_default_variants, when="@:2.5.0")
     depends_on("fastjet")
     depends_on("fastjet@3.4.0:", when="@3.1.7:")
-    depends_on("fjcontrib", when="@3.0.0:")
-    depends_on("gsl", when="@:2.6.0,2.6.2:2")
+    depends_on("fjcontrib")
     depends_on("python", type=("build", "run"))
     depends_on("py-cython@0.24.0:", type="build")
     depends_on("swig", type="build")
-    depends_on("yaml-cpp", when="@2.0.0:2.1.2")
 
     depends_on("autoconf", type="build")
     depends_on("autoconf@2.71:", when="@3.1.7", type="build")
@@ -294,21 +70,6 @@ class Rivet(AutotoolsPackage):
 
     filter_compiler_wrappers("rivet-build", relative_root="bin")
 
-    patch("rivet-1.8.2.patch", when="@1.8.2", level=0)
-    patch("rivet-1.9.0.patch", when="@1.9.0", level=0)
-    patch("rivet-2.2.0.patch", when="@2.2.0", level=0)
-    patch("rivet-2.2.1.patch", when="@2.2.1", level=0)
-    patch("rivet-2.4.0.patch", when="@2.4.0", level=0)
-    patch("rivet-2.4.2.patch", when="@2.4.2", level=0)
-    patch("rivet-2.4.3.patch", when="@2.4.3", level=0)
-    patch("rivet-2.5.1.patch", when="@2.5.1", level=0)
-    patch("rivet-2.5.2.patch", when="@2.5.2", level=0)
-    patch("rivet-2.5.3.patch", when="@2.5.3", level=0)
-    patch("rivet-2.5.4.patch", when="@2.5.4", level=0)
-    patch("rivet-2.6.0.patch", when="@2.6.0", level=0)
-    patch("rivet-2.6.1.patch", when="@2.6.1", level=0)
-    patch("rivet-2.6.2.patch", when="@2.6.2", level=0)
-    patch("rivet-2.7.0.patch", when="@2.7.0", level=0)
     patch("rivet-3.0.0.patch", when="@3.0.0", level=0)
     patch("rivet-3.0.1.patch", when="@3.0.1", level=0)
     patch("rivet-3.1.0.patch", when="@3.1.0", level=0)
@@ -316,12 +77,11 @@ class Rivet(AutotoolsPackage):
 
     @run_before("configure")
     def copy_gsl_m4(self):
-        if self.spec.satisfies("@2.6.2:"):
-            copy(join_path(os.path.dirname(__file__), "gsl.m4"), "m4/gsl.m4")
+        copy(join_path(os.path.dirname(__file__), "gsl.m4"), "m4/gsl.m4")
 
     @property
     def force_autoreconf(self):
-        return self.version >= Version("2.6.2")
+        return True
 
     def setup_build_environment(self, env):
         # this avoids an "import site" error in the build
@@ -340,27 +100,10 @@ class Rivet(AutotoolsPackage):
         else:
             args += ["--with-hepmc3=" + self.spec["hepmc3"].prefix]
 
-        if self.spec.satisfies("@:1"):
-            args += ["--with-boost-incpath=" + self.spec["boost"].includes]
-        else:
-            if self.spec.satisfies("@:2.5.0"):
-                args += ["--with-boost=" + self.spec["boost"].prefix]
-
         args += ["--with-fastjet=" + self.spec["fastjet"].prefix]
-        if self.spec.satisfies("@2:"):
-            args += ["--with-yoda=" + self.spec["yoda"].prefix]
-
-        if self.spec.satisfies("@:2.6.0,2.6.2:2"):
-            args += ["--with-gsl=" + self.spec["gsl"].prefix]
-
-        if self.spec.satisfies("@3.0.0:"):
-            args += ["--with-fjcontrib=" + self.spec["fjcontrib"].prefix]
-
-        if self.spec.satisfies("@:2.5.1"):
-            args += ["--enable-unvalidated"]
+        args += ["--with-yoda=" + self.spec["yoda"].prefix]
 
-        if self.spec.satisfies("@2:2.4"):
-            args += ["--enable-stdcxx11"]
+        args += ["--with-fjcontrib=" + self.spec["fjcontrib"].prefix]
 
         args += ["--disable-pdfmanual"]
 
diff --git a/var/spack/repos/builtin/packages/rivet/rivet-1.8.2.patch b/var/spack/repos/builtin/packages/rivet/rivet-1.8.2.patch
deleted file mode 100644
index 95cbe774a0..0000000000
--- a/var/spack/repos/builtin/packages/rivet/rivet-1.8.2.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- src/Tools/Makefile.in.orig	2013-05-15 14:02:25.000000000 +0200
-+++ src/Tools/Makefile.in	2013-05-15 14:03:14.000000000 +0200
-@@ -79,7 +79,7 @@
- 	libRivetTools_la-ParticleIdUtils.lo \
- 	libRivetTools_la-tinyxml.lo libRivetTools_la-tinyxmlerror.lo \
- 	libRivetTools_la-tinyxmlparser.lo \
--	libRivetTools_la-BinnedHistogram.lo \
-+#	libRivetTools_la-BinnedHistogram.lo \
- 	libRivetTools_la-mt2_bisect.lo libRivetTools_la-RivetMT2.lo \
- 	libRivetTools_la-BinnedHistogram.lo
- libRivetTools_la_OBJECTS = $(am_libRivetTools_la_OBJECTS)
-@@ -371,7 +371,7 @@
-   TinyXML/tinyxml.cpp \
-   TinyXML/tinyxmlerror.cpp \
-   TinyXML/tinyxmlparser.cpp \
--  BinnedHistogram.cc \
-+#  BinnedHistogram.cc \
-   mt2_bisect.cc \
-   RivetMT2.cc \
-   BinnedHistogram.cc
---- include/LWH/Axis.h.orig	2013-05-14 18:30:02.000000000 +0200
-+++ include/LWH/Axis.h	2013-05-14 18:31:35.000000000 +0200
-
-@@ -115,7 +115,7 @@
-    *
-    */
-   int coordToIndex(double coord) const {
--    assert( ! isnan(coord) );
-+    assert( ! std::isnan(coord) );
-     if ( coord >= upper ) return OVERFLOW_BIN;
-     else if ( coord < lower ) return UNDERFLOW_BIN;
-     else return int((coord - lower)/binWidth(0));
-
---- src/Tools/Makefile.am.orig  2013-05-15 13:14:11.000000000 +0200
-+++ src/Tools/Makefile.am       2013-05-15 13:16:53.000000000 +0200
-@@ -14,7 +14,7 @@
-   TinyXML/tinyxml.cpp \
-   TinyXML/tinyxmlerror.cpp \
-   TinyXML/tinyxmlparser.cpp \
--  BinnedHistogram.cc \
-+#  BinnedHistogram.cc \
-   mt2_bisect.cc \
-   RivetMT2.cc \
-   BinnedHistogram.cc
diff --git a/var/spack/repos/builtin/packages/rivet/rivet-1.9.0.patch b/var/spack/repos/builtin/packages/rivet/rivet-1.9.0.patch
deleted file mode 100644
index 9d274550b7..0000000000
--- a/var/spack/repos/builtin/packages/rivet/rivet-1.9.0.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- bin/rivet-buildplugin.in.orig	2014-09-02 11:22:32.000000000 +0200
-+++ bin/rivet-buildplugin.in	2014-09-02 11:26:31.000000000 +0200
-@@ -62,6 +62,7 @@
- mycppflags=""
- prefix="@prefix@"
- irivet="@includedir@"
-+exec_prefix=@exec_prefix@
- test -n "$irivet" && mycppflags="$mycppflags -I${irivet}"
- ihepmc="@HEPMCINCPATH@"
- test -n "$ihepmc" && mycppflags="$mycppflags -I${ihepmc}"
-@@ -74,7 +75,7 @@
- 
- ## Get Rivet system linker flags (duplicating that in rivet-config.in)
- myldflags=""
--lrivet="@libdir@"
-+lrivet="${exec_prefix}/lib"
- test -n "$lrivet" && myldflags="$myldflags -L${lrivet}"
- lhepmc="@HEPMCLIBPATH@"
- test -n "$lhepmc" && myldflags="$myldflags -L${lhepmc}"
---- bin/rivet-findid	2015-06-23 09:15:28.000000001 +0200
-+++ bin/rivet-findid	2015-06-23 09:15:38.000000001 +0200
-@@ -170,7 +170,7 @@
-                     if k=='code':
-                         entries[v] = c.text
-             if entries.get('9') == 'SPIRESTeX':
--                result['bibtex'] = entries['z']
-+                result['bibtex'] = entries['a']
- 
-         if i.get('tag') == '037':
-             entries = {}
diff --git a/var/spack/repos/builtin/packages/rivet/rivet-2.2.0.patch b/var/spack/repos/builtin/packages/rivet/rivet-2.2.0.patch
deleted file mode 100644
index ac9268a252..0000000000
--- a/var/spack/repos/builtin/packages/rivet/rivet-2.2.0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- bin/rivet-findid	2015-06-23 09:39:49.000000001 +0200
-+++ bin/rivet-findid	2015-06-23 09:40:09.000000001 +0200
-@@ -160,7 +160,7 @@
-                     if k=='code':
-                         entries[v] = c.text
-             if entries.get('9') == 'SPIRESTeX':
--                result['bibtex'] = entries['z']
-+                result['bibtex'] = entries['a']
- 
-         if i.get('tag') == '037':
-             entries = {}
diff --git a/var/spack/repos/builtin/packages/rivet/rivet-2.2.1.patch b/var/spack/repos/builtin/packages/rivet/rivet-2.2.1.patch
deleted file mode 100644
index a9fceb92c0..0000000000
--- a/var/spack/repos/builtin/packages/rivet/rivet-2.2.1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- bin/rivet-findid	2015-06-23 09:40:38.000000001 +0200
-+++ bin/rivet-findid	2015-06-23 09:40:45.000000001 +0200
-@@ -160,7 +160,7 @@
-                     if k=='code':
-                         entries[v] = c.text
-             if entries.get('9') == 'SPIRESTeX':
--                result['bibtex'] = entries['z']
-+                result['bibtex'] = entries['a']
- 
-         if i.get('tag') == '037':
-             entries = {}
diff --git a/var/spack/repos/builtin/packages/rivet/rivet-2.4.0.patch b/var/spack/repos/builtin/packages/rivet/rivet-2.4.0.patch
deleted file mode 100644
index 7ce4f1dd55..0000000000
--- a/var/spack/repos/builtin/packages/rivet/rivet-2.4.0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- configure	2015-10-07 12:35:57.000000000 +0300
-+++ configure	2015-10-09 16:18:02.432562522 +0300
-@@ -18728,7 +18728,7 @@
- ## Boost utility library
- echo "$as_me: this is boost.m4 serial 24" >&5
- boost_save_IFS=$IFS
--boost_version_req=1.55.0
-+boost_version_req=1.53.0
- IFS=.
- set x $boost_version_req 0 0 0
- IFS=$boost_save_IFS
-
diff --git a/var/spack/repos/builtin/packages/rivet/rivet-2.4.2.patch b/var/spack/repos/builtin/packages/rivet/rivet-2.4.2.patch
deleted file mode 100644
index 98436c5acf..0000000000
--- a/var/spack/repos/builtin/packages/rivet/rivet-2.4.2.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- configure.orig      2016-09-30 14:12:42.317369715 +0200
-+++ configure   2016-09-30 14:17:21.690229397 +0200
-@@ -19644,11 +19644,15 @@
-         cat >conftest.py <<_ACEOF
-
- import sys, string
-+# Python 2 and 3 compatible
-+from future.builtins import map
-+# Python 2 and 3: forward-compatible
-+from future.builtins import range
- # split strings by '.' and convert to numeric.  Append some zeros
- # because we need at least 4 digits for the hex conversion.
--minver = map(int, string.split('2.5', '.')) + [0, 0, 0]
-+minver = list(map(int, '2.5'.split('.'))) + [0, 0, 0]
- minverhex = 0
--for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[i]
-+for i in range(0, 4): minverhex = (minverhex << 8) + minver[i]
- if sys.hexversion >= minverhex:
-     sys.exit( 0 )
- else:
-@@ -19676,15 +19680,15 @@
-     fi
-
-
--  PYTHON_VERSION=`$PYTHON -c "import sys; print '.'.join(map(str, sys.version_info[:2]));"`
-+  PYTHON_VERSION=`$PYTHON -c "from __future__ import print_function; import sys; print('.'.join(map(str, sys.version_info[:2])));"`
-
--  RIVET_PYTHONPATH=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(prefix='$prefix', plat_specific=True);"`
-+  RIVET_PYTHONPATH=`$PYTHON -c "from __future__ import print_function; import distutils.sysconfig; print(distutils.sysconfig.get_python_lib(prefix='$prefix', plat_specific=True));"`
-
-   ## Test for Python header
-   if test -x "$PYTHON"; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python include path" >&5
- $as_echo_n "checking for Python include path... " >&6; }
--    python_incpath=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_python_inc();"`
-+    python_incpath=`$PYTHON -c "from __future__ import print_function; import distutils.sysconfig; print(distutils.sysconfig.get_python_inc());"`
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $python_incpath" >&5
- $as_echo "$python_incpath" >&6; }
-     python_header="$python_incpath/Python.h"
diff --git a/var/spack/repos/builtin/packages/rivet/rivet-2.4.3.patch b/var/spack/repos/builtin/packages/rivet/rivet-2.4.3.patch
deleted file mode 100644
index 9d006df8c0..0000000000
--- a/var/spack/repos/builtin/packages/rivet/rivet-2.4.3.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- configure.orig	2016-06-28 23:57:35.000000000 +0200
-+++ configure	2016-09-19 12:44:23.411192406 +0200
-@@ -19643,11 +19643,15 @@
-         cat >conftest.py <<_ACEOF
-
- import sys, string
-+# Python 2 and 3 compatible
-+from future.builtins import map
-+# Python 2 and 3: forward-compatible
-+from future.builtins import range
- # split strings by '.' and convert to numeric.  Append some zeros
- # because we need at least 4 digits for the hex conversion.
--minver = map(int, string.split('2.5', '.')) + [0, 0, 0]
-+minver = list(map(int, '2.5'.split('.'))) + [0, 0, 0]
- minverhex = 0
--for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[i]
-+for i in range(0, 4): minverhex = (minverhex << 8) + minver[i]
- if sys.hexversion >= minverhex:
-     sys.exit( 0 )
- else:
-@@ -19675,15 +19679,15 @@
-     fi
-
-
--  PYTHON_VERSION=`$PYTHON -c "import sys; print '.'.join(map(str, sys.version_info[:2]));"`
-+    PYTHON_VERSION=`$PYTHON -c "from __future__ import print_function; import sys; print('.'.join(map(str, sys.version_info[:2])));"`
-
--  RIVET_PYTHONPATH=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(prefix='$prefix', plat_specific=True);"`
-+    RIVET_PYTHONPATH=`$PYTHON -c "from __future__ import print_function; import distutils.sysconfig; print(distutils.sysconfig.get_python_lib(prefix='$prefix', plat_specific=True));"`
-
-   ## Test for Python header
-   if test -x "$PYTHON"; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python include path" >&5
- $as_echo_n "checking for Python include path... " >&6; }
--    python_incpath=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_python_inc();"`
-+python_incpath=`$PYTHON -c "from __future__ import print_function; import distutils.sysconfig; print(distutils.sysconfig.get_python_inc());"`
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $python_incpath" >&5
- $as_echo "$python_incpath" >&6; }
-     python_header="$python_incpath/Python.h"
diff --git a/var/spack/repos/builtin/packages/rivet/rivet-2.5.1.patch b/var/spack/repos/builtin/packages/rivet/rivet-2.5.1.patch
deleted file mode 100644
index dc5f484203..0000000000
--- a/var/spack/repos/builtin/packages/rivet/rivet-2.5.1.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- configure.orig      2016-09-30 09:25:10.000000000 +0200
-+++ configure   2016-09-30 09:27:01.000000000 +0200
-@@ -19681,11 +19681,15 @@
-         cat >conftest.py <<_ACEOF
-
- import sys, string
-+# Python 2 and 3 compatible
-+from future.builtins import map
-+# Python 2 and 3: forward-compatible
-+from future.builtins import range
- # split strings by '.' and convert to numeric.  Append some zeros
- # because we need at least 4 digits for the hex conversion.
--minver = map(int, string.split('2.5', '.')) + [0, 0, 0]
-+minver = list(map(int, '2.5'.split('.'))) + [0, 0, 0]
- minverhex = 0
--for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[i]
-+for i in range(0, 4): minverhex = (minverhex << 8) + minver[i]
- if sys.hexversion >= minverhex:
-     sys.exit( 0 )
- else:
-@@ -19713,15 +19717,15 @@
-     fi
-
-
--  PYTHON_VERSION=`$PYTHON -c "import sys; print '.'.join(map(str, sys.version_info[:2]));"`
-+    PYTHON_VERSION=`$PYTHON -c "from __future__ import print_function; import sys; print('.'.join(map(str, sys.version_info[:2])));"`
-
--  RIVET_PYTHONPATH=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(prefix='$prefix', plat_specific=True);"`
-+    RIVET_PYTHONPATH=`$PYTHON -c "from __future__ import print_function; import distutils.sysconfig; print(distutils.sysconfig.get_python_lib(prefix='$prefix', plat_specific=True));"`
-
-   ## Test for Python header
-   if test -x "$PYTHON"; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python include path" >&5
- $as_echo_n "checking for Python include path... " >&6; }
--    python_incpath=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_python_inc();"`
-+python_incpath=`$PYTHON -c "from __future__ import print_function; import distutils.sysconfig; print(distutils.sysconfig.get_python_inc());"`
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $python_incpath" >&5
- $as_echo "$python_incpath" >&6; }
-     python_header="$python_incpath/Python.h"
diff --git a/var/spack/repos/builtin/packages/rivet/rivet-2.5.2.patch b/var/spack/repos/builtin/packages/rivet/rivet-2.5.2.patch
deleted file mode 100644
index 9f536d3751..0000000000
--- a/var/spack/repos/builtin/packages/rivet/rivet-2.5.2.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./include/Rivet/Tools/RivetSTL.hh.orig	2017-08-03 11:49:33.005431033 +0200
-+++ ./include/Rivet/Tools/RivetSTL.hh	2017-08-03 11:50:13.817841608 +0200
-@@ -19,6 +19,7 @@
- #include <iomanip>
- #include <cmath>
- #include <limits>
-+#include <functional>
- 
- 
- #ifndef foreach
diff --git a/var/spack/repos/builtin/packages/rivet/rivet-2.5.3.patch b/var/spack/repos/builtin/packages/rivet/rivet-2.5.3.patch
deleted file mode 100644
index bebf5c73ab..0000000000
--- a/var/spack/repos/builtin/packages/rivet/rivet-2.5.3.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- include/Rivet/Config/RivetCommon.hh.orig	2017-05-31 12:32:04.547062840 +0200
-+++ include/Rivet/Config/RivetCommon.hh	2017-05-31 12:32:12.379054886 +0200
-@@ -2,6 +2,7 @@
- #define RIVET_RivetCommon_HH
- 
- // Convenience build-setup header for Rivet internal use
-+#include <functional>
- 
- // Automatic build info from autoconf
- #include "Rivet/Config/RivetConfig.hh"
---- include/Rivet/Run.hh.orig	2017-05-31 12:36:00.225823486 +0200
-+++ include/Rivet/Run.hh	2017-05-31 12:36:18.653804770 +0200
-@@ -4,6 +4,7 @@
- 
- #include "Rivet/Tools/RivetSTL.hh"
- #include "Rivet/Tools/RivetHepMC.hh"
-+#include <functional>
- 
- namespace Rivet {
- 
---- include/Rivet/Particle.hh.orig	2017-05-31 12:39:14.273626411 +0200
-+++ include/Rivet/Particle.hh	2017-05-31 14:00:02.387272379 +0200
-@@ -11,6 +11,8 @@
- // NOTE: Rivet/Tools/ParticleUtils.hh included at the end
- #include "fastjet/PseudoJet.hh"
- 
-+#include <functional>
-+
- namespace Rivet {
- 
- 
---- include/Rivet/Tools/RivetSTL.hh.orig	2017-05-31 14:05:28.368975178 +0200
-+++ include/Rivet/Tools/RivetSTL.hh	2017-05-31 14:05:44.432960512 +0200
-@@ -1,6 +1,8 @@
- #ifndef RIVET_RivetSTL_HH
- #define RIVET_RivetSTL_HH
- 
-+#include <functional>
-+
- #include <string>
- #include <vector>
- #include <set>
-
diff --git a/var/spack/repos/builtin/packages/rivet/rivet-2.5.4.patch b/var/spack/repos/builtin/packages/rivet/rivet-2.5.4.patch
deleted file mode 100644
index af338da6d5..0000000000
--- a/var/spack/repos/builtin/packages/rivet/rivet-2.5.4.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-patch written by GENSER to avoid system libraries of GLS coming from fastjet-config
---- include/Rivet/Tools/JetUtils.hh
-+++ include/Rivet/Tools/JetUtils.hh
-@@ -47,4 +47,5 @@
-   struct BoolJetFunctor {
-     virtual bool operator()(const Jet& p) const = 0;
-+    virtual ~BoolJetFunctor() {}
-   };
-
---- include/Rivet/Tools/ParticleBaseUtils.hh
-+++ include/Rivet/Tools/ParticleBaseUtils.hh
-@@ -23,4 +23,5 @@
-   struct BoolParticleBaseFunctor {
-     virtual bool operator()(const ParticleBase& p) const = 0;
-+    virtual ~BoolParticleBaseFunctor() {}
-   };
- 
-@@ -397,4 +398,5 @@
-   struct DoubleParticleBaseFunctor {
-     virtual double operator()(const ParticleBase& p) const = 0;
-+    virtual ~DoubleParticleBaseFunctor() {}
-   };
-
---- include/Rivet/Tools/ParticleUtils.hh
-+++ include/Rivet/Tools/ParticleUtils.hh
-@@ -486,4 +486,5 @@
-   struct BoolParticleFunctor {
-     virtual bool operator()(const Particle& p) const = 0;
-+    virtual ~BoolParticleFunctor() {}
-   };
-
---- src/Makefile.in.orig	2018-01-30 13:52:58.641670247 +0100
-+++ src/Makefile.in	2018-01-30 13:53:19.377586118 +0100
-@@ -449,7 +449,7 @@
- libRivet_la_SOURCES = 
- libRivet_la_LDFLAGS = -export-dynamic -avoid-version -L$(YODALIBPATH) -L$(HEPMCLIBPATH)
- libRivet_la_LIBADD = Core/libRivetCore.la Projections/libRivetProjections.la Tools/libRivetTools.la $(ANA_LIBADD) \
--  -lYODA -lHepMC -ldl -lm  $(FASTJETCONFIGLIBADD) $(GSL_LDFLAGS)
-+  -lYODA -lHepMC -ldl -lm  $(GSL_LDFLAGS) $(FASTJETCONFIGLIBADD)
- 
- all: all-recursive
- 
diff --git a/var/spack/repos/builtin/packages/rivet/rivet-2.6.0.patch b/var/spack/repos/builtin/packages/rivet/rivet-2.6.0.patch
deleted file mode 100644
index 2cb7cab14b..0000000000
--- a/var/spack/repos/builtin/packages/rivet/rivet-2.6.0.patch
+++ /dev/null
@@ -1,90 +0,0 @@
---- include/Rivet/Tools/JetUtils.hh
-+++ include/Rivet/Tools/JetUtils.hh
-@@ -47,4 +47,5 @@
-   struct BoolJetFunctor {
-     virtual bool operator()(const Jet& p) const = 0;
-+    virtual ~BoolJetFunctor() {}
-   };
-
---- include/Rivet/Tools/ParticleBaseUtils.hh
-+++ include/Rivet/Tools/ParticleBaseUtils.hh
-@@ -23,4 +23,5 @@
-   struct BoolParticleBaseFunctor {
-     virtual bool operator()(const ParticleBase& p) const = 0;
-+    virtual ~BoolParticleBaseFunctor() {}
-   };
- 
-@@ -397,4 +398,5 @@
-   struct DoubleParticleBaseFunctor {
-     virtual double operator()(const ParticleBase& p) const = 0;
-+    virtual ~DoubleParticleBaseFunctor() {}
-   };
-
---- include/Rivet/Tools/ParticleUtils.hh
-+++ include/Rivet/Tools/ParticleUtils.hh
-@@ -486,4 +486,5 @@
-   struct BoolParticleFunctor {
-     virtual bool operator()(const Particle& p) const = 0;
-+    virtual ~BoolParticleFunctor() {}
-   };
-
---- analyses/Makefile.in.orig	2018-06-28 09:22:46.722022129 +0200
-+++ analyses/Makefile.in	2018-06-28 10:11:59.772373529 +0200
-@@ -523,21 +523,21 @@
- @ENABLE_ANALYSES_TRUE@%.so:
- @ENABLE_ANALYSES_TRUE@	@+echo && RIVET_BUILDPLUGIN_BEFORE_INSTALL=1 bash $(top_builddir)/bin/rivet-buildplugin -j2 $@ $^ -I$(top_builddir)/include
- 
--@ENABLE_ANALYSES_TRUE@RivetALICEAnalyses.so: $(shell ls $(srcdir)/pluginALICE/*.cc)
--@ENABLE_ANALYSES_TRUE@RivetATLASAnalyses.so: $(shell ls $(srcdir)/pluginATLAS/*.cc)
--@ENABLE_ANALYSES_TRUE@RivetCDFAnalyses.so  : $(shell ls $(srcdir)/pluginCDF/*.cc)
--@ENABLE_ANALYSES_TRUE@RivetCMSAnalyses.so  : $(shell ls $(srcdir)/pluginCMS/*.cc)
--@ENABLE_ANALYSES_TRUE@RivetD0Analyses.so   : $(shell ls $(srcdir)/pluginD0/*.cc)
--@ENABLE_ANALYSES_TRUE@RivetHERAAnalyses.so : $(shell ls $(srcdir)/pluginHERA/*.cc)
--@ENABLE_ANALYSES_TRUE@RivetLEPAnalyses.so  : $(shell ls $(srcdir)/pluginLEP/*.cc)
--@ENABLE_ANALYSES_TRUE@RivetLHCbAnalyses.so : $(shell ls $(srcdir)/pluginLHCb/*.cc)
--@ENABLE_ANALYSES_TRUE@RivetLHCfAnalyses.so : $(shell ls $(srcdir)/pluginLHCf/*.cc)
--@ENABLE_ANALYSES_TRUE@RivetMCAnalyses.so   : $(shell ls $(srcdir)/pluginMC/*.cc)
--@ENABLE_ANALYSES_TRUE@RivetMiscAnalyses.so : $(shell ls $(srcdir)/pluginMisc/*.cc)
--@ENABLE_ANALYSES_TRUE@RivetPetraAnalyses.so: $(shell ls $(srcdir)/pluginPetra/*.cc)
--@ENABLE_ANALYSES_TRUE@RivetRHICAnalyses.so : $(shell ls $(srcdir)/pluginRHIC/*.cc)
--@ENABLE_ANALYSES_TRUE@RivetSPSAnalyses.so  : $(shell ls $(srcdir)/pluginSPS/*.cc)
--@ENABLE_ANALYSES_TRUE@RivetTOTEMAnalyses.so: $(shell ls $(srcdir)/pluginTOTEM/*.cc)
-+@ENABLE_ANALYSES_TRUE@RivetALICEAnalyses.so: $(shell find $(srcdir)/pluginALICE/ -name '*.cc' -not -name 'tmp*')
-+@ENABLE_ANALYSES_TRUE@RivetATLASAnalyses.so: $(shell find $(srcdir)/pluginATLAS/ -name '*.cc' -not -name 'tmp*')
-+@ENABLE_ANALYSES_TRUE@RivetCDFAnalyses.so  : $(shell find $(srcdir)/pluginCDF/ -name '*.cc' -not -name 'tmp*')
-+@ENABLE_ANALYSES_TRUE@RivetCMSAnalyses.so  : $(shell find $(srcdir)/pluginCMS/ -name '*.cc' -not -name 'tmp*')
-+@ENABLE_ANALYSES_TRUE@RivetD0Analyses.so   : $(shell find $(srcdir)/pluginD0/ -name '*.cc' -not -name 'tmp*')
-+@ENABLE_ANALYSES_TRUE@RivetHERAAnalyses.so : $(shell find $(srcdir)/pluginHERA/ -name '*.cc' -not -name 'tmp*')
-+@ENABLE_ANALYSES_TRUE@RivetLEPAnalyses.so  : $(shell find $(srcdir)/pluginLEP/ -name '*.cc' -not -name 'tmp*')
-+@ENABLE_ANALYSES_TRUE@RivetLHCbAnalyses.so : $(shell find $(srcdir)/pluginLHCb/ -name '*.cc' -not -name 'tmp*')
-+@ENABLE_ANALYSES_TRUE@RivetLHCfAnalyses.so : $(shell find $(srcdir)/pluginLHCf/ -name '*.cc' -not -name 'tmp*')
-+@ENABLE_ANALYSES_TRUE@RivetMCAnalyses.so   : $(shell find $(srcdir)/pluginMC/ -name '*.cc' -not -name 'tmp*')
-+@ENABLE_ANALYSES_TRUE@RivetMiscAnalyses.so : $(shell find $(srcdir)/pluginMisc/ -name '*.cc' -not -name 'tmp*')
-+@ENABLE_ANALYSES_TRUE@RivetPetraAnalyses.so: $(shell find $(srcdir)/pluginPetra/ -name '*.cc' -not -name 'tmp*')
-+@ENABLE_ANALYSES_TRUE@RivetRHICAnalyses.so : $(shell find $(srcdir)/pluginRHIC/ -name '*.cc' -not -name 'tmp*')
-+@ENABLE_ANALYSES_TRUE@RivetSPSAnalyses.so  : $(shell find $(srcdir)/pluginSPS/ -name '*.cc' -not -name 'tmp*')
-+@ENABLE_ANALYSES_TRUE@RivetTOTEMAnalyses.so: $(shell find $(srcdir)/pluginTOTEM/ -name '*.cc' -not -name 'tmp*')
- 
- @ENABLE_ANALYSES_TRUE@all-local: $(PLUGIN_LIBS) $(PLUGIN_DATAFILES)
- @ENABLE_ANALYSES_TRUE@	mkdir -p $(builddir)/data
---- analyses/pluginATLAS/ATLAS_2016_CONF_2016_037.cc.orig	2018-07-02 10:43:08.656094368 +0200
-+++ analyses/pluginATLAS/ATLAS_2016_CONF_2016_037.cc	2018-07-02 10:44:04.920361160 +0200
-@@ -2,6 +2,7 @@
- #include "Rivet/Analysis.hh"
- #include "Rivet/Projections/FinalState.hh"
- #include "Rivet/Projections/PromptFinalState.hh"
-+#include "Rivet/Projections/ChargedFinalState.hh"
- #include "Rivet/Projections/FastJets.hh"
- #include "Rivet/Projections/Sphericity.hh"
- #include "Rivet/Projections/SmearedParticles.hh"
---- include/Rivet/AnalysisHandler.hh.orig	2018-07-10 10:39:21.719532209 +0200
-+++ include/Rivet/AnalysisHandler.hh	2018-07-10 10:39:29.225608530 +0200
-@@ -17,7 +17,7 @@
- 
-   // Needed to make smart pointers compare equivalent in the STL set
-   struct CmpAnaHandle {
--    bool operator() (const AnaHandle& a, const AnaHandle& b) {
-+    bool operator() (const AnaHandle& a, const AnaHandle& b) const {
-       return a.get() < b.get();
-     }
-   };
diff --git a/var/spack/repos/builtin/packages/rivet/rivet-2.6.1.patch b/var/spack/repos/builtin/packages/rivet/rivet-2.6.1.patch
deleted file mode 100644
index 878e72d739..0000000000
--- a/var/spack/repos/builtin/packages/rivet/rivet-2.6.1.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- doc/Makefile.in.orig	2018-10-17 18:29:15.568630034 +0200
-+++ doc/Makefile.in	2018-10-17 18:31:45.829375147 +0200
-@@ -594,15 +594,15 @@
- .PRECIOUS: Makefile
- 
- @ENABLE_PYEXT_TRUE@analyses.html: $(top_srcdir)/analyses $(srcdir)/mk-analysis-html
--@ENABLE_PYEXT_TRUE@	LD_LIBRARY_PATH=$(top_builddir)/src/.libs:$(LD_LIBRARY_PATH) \
--@ENABLE_PYEXT_TRUE@    DYLD_LIBRARY_PATH=$(top_builddir)/src/.libs:$(DYLD_LIBRARY_PATH) \
-+@ENABLE_PYEXT_TRUE@	LD_LIBRARY_PATH=$(top_builddir)/src/.libs:$(HEPMCLIBPATH):$(FASTJETLIBPATH):$(YODALIBPATH):$(RIVETLIBPATH):$(LD_LIBRARY_PATH) \
-+@ENABLE_PYEXT_TRUE@    DYLD_LIBRARY_PATH=$(top_builddir)/src/.libs:$(HEPMCLIBPATH):$(FASTJETLIBPATH):$(YODALIBPATH):$(RIVETLIBPATH):$(DYLD_LIBRARY_PATH) \
- @ENABLE_PYEXT_TRUE@    PYTHONPATH=$(YODA_PYTHONPATH):$(RIVET_PYTHONPATH):$(PYTHONPATH) \
--@ENABLE_PYEXT_TRUE@    $(srcdir)/mk-analysis-html
-+@ENABLE_PYEXT_TRUE@    $(PYTHON) $(srcdir)/mk-analysis-html
- @ENABLE_PYEXT_TRUE@analyses.json: $(top_srcdir)/analyses $(srcdir)/mk-analysis-json
--@ENABLE_PYEXT_TRUE@	LD_LIBRARY_PATH=$(top_builddir)/src/.libs:$(LD_LIBRARY_PATH) \
--@ENABLE_PYEXT_TRUE@    DYLD_LIBRARY_PATH=$(top_builddir)/src/.libs:$(DYLD_LIBRARY_PATH) \
-+@ENABLE_PYEXT_TRUE@	LD_LIBRARY_PATH=$(top_builddir)/src/.libs:$(HEPMCLIBPATH):$(FASTJETLIBPATH):$(YODALIBPATH):$(RIVETLIBPATH):$(LD_LIBRARY_PATH) \
-+@ENABLE_PYEXT_TRUE@    DYLD_LIBRARY_PATH=$(top_builddir)/src/.libs:$(HEPMCLIBPATH):$(FASTJETLIBPATH):$(YODALIBPATH):$(RIVETLIBPATH):$(DYLD_LIBRARY_PATH) \
- @ENABLE_PYEXT_TRUE@    PYTHONPATH=$(YODA_PYTHONPATH):$(RIVET_PYTHONPATH):$(PYTHONPATH) \
--@ENABLE_PYEXT_TRUE@    $(srcdir)/mk-analysis-json
-+@ENABLE_PYEXT_TRUE@    $(PYTHON) $(srcdir)/mk-analysis-json
- 
- @WITH_ASCIIDOC_TRUE@compare-histos.html: compare-histos.txt
- @WITH_ASCIIDOC_TRUE@	asciidoc -a toc compare-histos.txt
diff --git a/var/spack/repos/builtin/packages/rivet/rivet-2.6.2.patch b/var/spack/repos/builtin/packages/rivet/rivet-2.6.2.patch
deleted file mode 100644
index a327f481d4..0000000000
--- a/var/spack/repos/builtin/packages/rivet/rivet-2.6.2.patch
+++ /dev/null
@@ -1,97 +0,0 @@
---- configure.ac.orig	2019-01-23 11:02:06.206570992 +0100
-+++ configure.ac	2019-01-23 11:02:26.704761899 +0100
-@@ -151,12 +151,12 @@
- 
- 
- # ## GNU Scientific Library
--# AC_SEARCH_GSL
--# AC_CEDAR_HEADERS([gsl], , , [AC_MSG_ERROR([GSL (GNU Scientific Library) is required])])
--# oldCPPFLAGS=$CPPFLAGS
--# CPPFLAGS="$CPPFLAGS -I$GSLINCPATH"
--# AC_CHECK_HEADER([gsl/gsl_vector.h], [], [AC_MSG_ERROR([GSL vectors not found.])])
--# CPPFLAGS=$oldCPPFLAGS
-+AC_SEARCH_GSL
-+AC_CEDAR_HEADERS([gsl], , , [AC_MSG_ERROR([GSL (GNU Scientific Library) is required])])
-+oldCPPFLAGS=$CPPFLAGS
-+CPPFLAGS="$CPPFLAGS -I$GSLINCPATH"
-+AC_CHECK_HEADER([gsl/gsl_vector.h], [], [AC_MSG_ERROR([GSL vectors not found.])])
-+CPPFLAGS=$oldCPPFLAGS
- 
- 
- ## Disable build/install of standard analyses
-@@ -256,7 +256,7 @@
- ## Set default build flags
- AM_CPPFLAGS="-I\$(top_srcdir)/include -I\$(top_builddir)/include"
- #AM_CPPFLAGS="$AM_CPPFLAGS -I\$(top_srcdir)/include/eigen3"
--#AM_CPPFLAGS="$AM_CPPFLAGS \$(GSL_CPPFLAGS)"
-+AM_CPPFLAGS="$AM_CPPFLAGS \$(GSL_CPPFLAGS)"
- dnl AM_CPPFLAGS="$AM_CPPFLAGS \$(BOOST_CPPFLAGS)"
- AM_CPPFLAGS="$AM_CPPFLAGS -I\$(YODAINCPATH)"
- AM_CPPFLAGS="$AM_CPPFLAGS -I\$(HEPMCINCPATH)"
---- bin/rivet-config.in.orig	2019-01-23 11:08:04.608907832 +0100
-+++ bin/rivet-config.in	2019-01-23 11:08:25.058098155 +0100
-@@ -82,8 +82,8 @@
-     test -n "$iyoda" && OUT="$OUT -I${iyoda}"
-     ifastjet="@FASTJETINCPATH@"
-     test -n "$ifastjet" && OUT="$OUT -I${ifastjet}"
--    # igsl="@GSLINCPATH@"
--    # test -n "$igsl" && OUT="$OUT -I${igsl}"
-+    igsl="@GSLINCPATH@"
-+    test -n "$igsl" && OUT="$OUT -I${igsl}"
-     # iboost="@BOOST_CPPFLAGS@"
-     # test -n "$iboost" && OUT="$OUT ${iboost}"
- fi
-@@ -98,8 +98,8 @@
-     test -n "$lyoda" && OUT="$OUT -L${lyoda} -lYODA"
-     lfastjet="@FASTJETCONFIGLIBADD@"
-     test -n "$lfastjet" && OUT="$OUT ${lfastjet}"
--    # lgsl="@GSLLIBPATH@"
--    # test -n "$lgsl" && OUT="$OUT -L${lgsl}"
-+    lgsl="@GSLLIBPATH@"
-+    test -n "$lgsl" && OUT="$OUT -L${lgsl}"
- fi
- 
- tmp=$( echo "$*" | egrep -- '--\<libs\>|--\<ldadd\>')
---- bin/rivet-buildplugin.in.orig	2019-01-23 11:10:07.804054317 +0100
-+++ bin/rivet-buildplugin.in	2019-01-23 11:10:34.370301517 +0100
-@@ -169,8 +169,8 @@
- test -n "$iyoda" && mycppflags="$mycppflags -I${iyoda}"
- ifastjet="@FASTJETINCPATH@"
- test -n "$ifastjet" && mycppflags="$mycppflags -I${ifastjet}"
--# igsl="@GSLINCPATH@"
--# test -n "$igsl" && mycppflags="$mycppflags -I${igsl}"
-+igsl="@GSLINCPATH@"
-+test -n "$igsl" && mycppflags="$mycppflags -I${igsl}"
- # iboost="@BOOST_CPPFLAGS@"
- # test -n "$iboost" && mycppflags="$mycppflags ${iboost}"
- 
---- pyext/setup.py.in.orig	2019-01-23 11:12:04.694141901 +0100
-+++ pyext/setup.py.in	2019-01-23 11:12:44.531512512 +0100
-@@ -29,11 +29,11 @@
- 
- 
- ## Be careful with extracting the GSL path from the flags string
--# import re
--# re_libdirflag = re.compile(r".*-L\s*(\S+).*")
--# re_match = re_libdirflag.search("@GSL_LDFLAGS@")
--# if re_match:
--    # lookupdirs.append( re_match.group(1) )
-+import re
-+re_libdirflag = re.compile(r".*-L\s*(\S+).*")
-+re_match = re_libdirflag.search("@GSL_LDFLAGS@")
-+if re_match:
-+    lookupdirs.append( re_match.group(1) )
- 
- ## A helper function
- def ext(name, depends=[], statics=[]):
-@@ -47,8 +47,8 @@
-         language="c++",
- #        depends=depends,
-         include_dirs=[incdir1, incdir2, incdir3, incdir4],
--        # extra_compile_args="-I@prefix@/include @PYEXT_CXXFLAGS@ @HEPMCCPPFLAGS@ @FASTJETCPPFLAGS@ @YODACPPFLAGS@ @GSLCPPFLAGS@".split(),
--        extra_compile_args="-I@prefix@/include @PYEXT_CXXFLAGS@ @HEPMCCPPFLAGS@ @FASTJETCPPFLAGS@ @YODACPPFLAGS@".split(),
-+        extra_compile_args="-I@prefix@/include @PYEXT_CXXFLAGS@ @HEPMCCPPFLAGS@ @FASTJETCPPFLAGS@ @YODACPPFLAGS@ @GSLCPPFLAGS@".split(),
-+        # extra_compile_args="-I@prefix@/include @PYEXT_CXXFLAGS@ @HEPMCCPPFLAGS@ @FASTJETCPPFLAGS@ @YODACPPFLAGS@".split(),
-         extra_link_args=BASE_LINK_ARGS,
-         library_dirs=lookupdirs,
-         runtime_library_dirs=lookupdirs[1:],
diff --git a/var/spack/repos/builtin/packages/rivet/rivet-2.7.0.patch b/var/spack/repos/builtin/packages/rivet/rivet-2.7.0.patch
deleted file mode 100644
index a327f481d4..0000000000
--- a/var/spack/repos/builtin/packages/rivet/rivet-2.7.0.patch
+++ /dev/null
@@ -1,97 +0,0 @@
---- configure.ac.orig	2019-01-23 11:02:06.206570992 +0100
-+++ configure.ac	2019-01-23 11:02:26.704761899 +0100
-@@ -151,12 +151,12 @@
- 
- 
- # ## GNU Scientific Library
--# AC_SEARCH_GSL
--# AC_CEDAR_HEADERS([gsl], , , [AC_MSG_ERROR([GSL (GNU Scientific Library) is required])])
--# oldCPPFLAGS=$CPPFLAGS
--# CPPFLAGS="$CPPFLAGS -I$GSLINCPATH"
--# AC_CHECK_HEADER([gsl/gsl_vector.h], [], [AC_MSG_ERROR([GSL vectors not found.])])
--# CPPFLAGS=$oldCPPFLAGS
-+AC_SEARCH_GSL
-+AC_CEDAR_HEADERS([gsl], , , [AC_MSG_ERROR([GSL (GNU Scientific Library) is required])])
-+oldCPPFLAGS=$CPPFLAGS
-+CPPFLAGS="$CPPFLAGS -I$GSLINCPATH"
-+AC_CHECK_HEADER([gsl/gsl_vector.h], [], [AC_MSG_ERROR([GSL vectors not found.])])
-+CPPFLAGS=$oldCPPFLAGS
- 
- 
- ## Disable build/install of standard analyses
-@@ -256,7 +256,7 @@
- ## Set default build flags
- AM_CPPFLAGS="-I\$(top_srcdir)/include -I\$(top_builddir)/include"
- #AM_CPPFLAGS="$AM_CPPFLAGS -I\$(top_srcdir)/include/eigen3"
--#AM_CPPFLAGS="$AM_CPPFLAGS \$(GSL_CPPFLAGS)"
-+AM_CPPFLAGS="$AM_CPPFLAGS \$(GSL_CPPFLAGS)"
- dnl AM_CPPFLAGS="$AM_CPPFLAGS \$(BOOST_CPPFLAGS)"
- AM_CPPFLAGS="$AM_CPPFLAGS -I\$(YODAINCPATH)"
- AM_CPPFLAGS="$AM_CPPFLAGS -I\$(HEPMCINCPATH)"
---- bin/rivet-config.in.orig	2019-01-23 11:08:04.608907832 +0100
-+++ bin/rivet-config.in	2019-01-23 11:08:25.058098155 +0100
-@@ -82,8 +82,8 @@
-     test -n "$iyoda" && OUT="$OUT -I${iyoda}"
-     ifastjet="@FASTJETINCPATH@"
-     test -n "$ifastjet" && OUT="$OUT -I${ifastjet}"
--    # igsl="@GSLINCPATH@"
--    # test -n "$igsl" && OUT="$OUT -I${igsl}"
-+    igsl="@GSLINCPATH@"
-+    test -n "$igsl" && OUT="$OUT -I${igsl}"
-     # iboost="@BOOST_CPPFLAGS@"
-     # test -n "$iboost" && OUT="$OUT ${iboost}"
- fi
-@@ -98,8 +98,8 @@
-     test -n "$lyoda" && OUT="$OUT -L${lyoda} -lYODA"
-     lfastjet="@FASTJETCONFIGLIBADD@"
-     test -n "$lfastjet" && OUT="$OUT ${lfastjet}"
--    # lgsl="@GSLLIBPATH@"
--    # test -n "$lgsl" && OUT="$OUT -L${lgsl}"
-+    lgsl="@GSLLIBPATH@"
-+    test -n "$lgsl" && OUT="$OUT -L${lgsl}"
- fi
- 
- tmp=$( echo "$*" | egrep -- '--\<libs\>|--\<ldadd\>')
---- bin/rivet-buildplugin.in.orig	2019-01-23 11:10:07.804054317 +0100
-+++ bin/rivet-buildplugin.in	2019-01-23 11:10:34.370301517 +0100
-@@ -169,8 +169,8 @@
- test -n "$iyoda" && mycppflags="$mycppflags -I${iyoda}"
- ifastjet="@FASTJETINCPATH@"
- test -n "$ifastjet" && mycppflags="$mycppflags -I${ifastjet}"
--# igsl="@GSLINCPATH@"
--# test -n "$igsl" && mycppflags="$mycppflags -I${igsl}"
-+igsl="@GSLINCPATH@"
-+test -n "$igsl" && mycppflags="$mycppflags -I${igsl}"
- # iboost="@BOOST_CPPFLAGS@"
- # test -n "$iboost" && mycppflags="$mycppflags ${iboost}"
- 
---- pyext/setup.py.in.orig	2019-01-23 11:12:04.694141901 +0100
-+++ pyext/setup.py.in	2019-01-23 11:12:44.531512512 +0100
-@@ -29,11 +29,11 @@
- 
- 
- ## Be careful with extracting the GSL path from the flags string
--# import re
--# re_libdirflag = re.compile(r".*-L\s*(\S+).*")
--# re_match = re_libdirflag.search("@GSL_LDFLAGS@")
--# if re_match:
--    # lookupdirs.append( re_match.group(1) )
-+import re
-+re_libdirflag = re.compile(r".*-L\s*(\S+).*")
-+re_match = re_libdirflag.search("@GSL_LDFLAGS@")
-+if re_match:
-+    lookupdirs.append( re_match.group(1) )
- 
- ## A helper function
- def ext(name, depends=[], statics=[]):
-@@ -47,8 +47,8 @@
-         language="c++",
- #        depends=depends,
-         include_dirs=[incdir1, incdir2, incdir3, incdir4],
--        # extra_compile_args="-I@prefix@/include @PYEXT_CXXFLAGS@ @HEPMCCPPFLAGS@ @FASTJETCPPFLAGS@ @YODACPPFLAGS@ @GSLCPPFLAGS@".split(),
--        extra_compile_args="-I@prefix@/include @PYEXT_CXXFLAGS@ @HEPMCCPPFLAGS@ @FASTJETCPPFLAGS@ @YODACPPFLAGS@".split(),
-+        extra_compile_args="-I@prefix@/include @PYEXT_CXXFLAGS@ @HEPMCCPPFLAGS@ @FASTJETCPPFLAGS@ @YODACPPFLAGS@ @GSLCPPFLAGS@".split(),
-+        # extra_compile_args="-I@prefix@/include @PYEXT_CXXFLAGS@ @HEPMCCPPFLAGS@ @FASTJETCPPFLAGS@ @YODACPPFLAGS@".split(),
-         extra_link_args=BASE_LINK_ARGS,
-         library_dirs=lookupdirs,
-         runtime_library_dirs=lookupdirs[1:],