Add Madgraph 2.8.1 (#19400)

* Add recipe for qgraf

* Revert "Add recipe for qgraf"

This reverts commit 76783f73867a32b4a96e980e31a433ed3c0037fd.

* Update madgraph to 2.8.1

* Changes from MR

* Changes from MR

Co-authored-by: Ivan Razumov <ivan.razumov@cern.ch>

4 files changed, 5 insertions, 47 deletions

diff --git a/var/spack/repos/builtin/packages/madgraph5amc/madgraph5amc-2.7.3.atlas.patch b/var/spack/repos/builtin/packages/madgraph5amc/madgraph5amc-2.7.3.atlas.patch
index c2b62eaa46..6ad5bf8d94 100644
--- a/var/spack/repos/builtin/packages/madgraph5amc/madgraph5amc-2.7.3.atlas.patch
+++ b/var/spack/repos/builtin/packages/madgraph5amc/madgraph5amc-2.7.3.atlas.patch
@@ -960,28 +960,7 @@
          to_install = self.ask('install', '0',  ask_class=AskLoopInstaller, timeout=300, 
                                path_msg=' ')
 
---- vendor/CutTools/makefile.orig	2018-06-18 13:24:17.164637074 +0200
-+++ vendor/CutTools/makefile	2018-06-18 13:24:27.756740547 +0200
-@@ -9,7 +9,7 @@
- ifeq ($(wildcard ../make_opts), ../make_opts)
-   include ../make_opts
- else
--  FFLAGS = 
-+  FFLAGS = -std=legacy
-   FC=gfortran
- endif
- 
---- vendor/IREGI/src/makefile_ML5_lib.orig	2018-07-09 13:33:48.546490615 +0200
-+++ vendor/IREGI/src/makefile_ML5_lib	2018-07-09 13:33:57.238573607 +0200
-@@ -5,7 +5,7 @@
- FFDIR=$(qcdlooppath)/ff
- onelooppath=$(PWD)/oneloop
- #FFLAGS=-O -g -ggdb -fno-automatic -fbounds-check -I$(onelooppath) # -fbounds-check is very useful in checking mermory error,-g is for debuging,-ggdb is for debuging special in gdb
--FFLAGS=-O -g -fPIC -I$(onelooppath)
-+FFLAGS=-O -g -fPIC -I$(onelooppath) -std=legacy
- obj= global.o funlib.o linear_algebra.o kinematics.o matrices.o matrix_base.o cmatrix_base.o mis_warp.o special_fun.o pave_reduce.o cpave_reduce.o si_reduce.o csi_reduce.o ti_reduce.o cti_reduce.o gti_reduce.o binary_tree.o IREGI4ML5_interface.o avh_olo_foriregi.o
- olomod= avh_olo_foriregi.mod avh_olo_foriregi_dp_box.mod    avh_olo_foriregi_dp_olog.mod   avh_olo_foriregi_units.mod \
-         avh_olo_foriregi_dp.mod        avh_olo_foriregi_dp_boxc.mod   avh_olo_foriregi_dp_prec.mod   avh_olo_foriregi_version.mod \
+
 --- madgraph/various/misc.py.orig      2018-04-29 15:59:44.000000000 +0200
 +++ madgraph/various/misc.py   2018-07-18 10:11:06.000000000 +0200
 @@ -469,6 +469,8 @@
diff --git a/var/spack/repos/builtin/packages/madgraph5amc/madgraph5amc-2.8.0.atlas.patch b/var/spack/repos/builtin/packages/madgraph5amc/madgraph5amc-2.8.0.atlas.patch
index 3004da4dc3..706ace3462 100644
--- a/var/spack/repos/builtin/packages/madgraph5amc/madgraph5amc-2.8.0.atlas.patch
+++ b/var/spack/repos/builtin/packages/madgraph5amc/madgraph5amc-2.8.0.atlas.patch
@@ -960,28 +960,6 @@
          to_install = self.ask('install', '0',  ask_class=AskLoopInstaller, timeout=300, 
                                path_msg=' ')
 
---- vendor/CutTools/makefile.orig	2018-06-18 13:24:17.164637074 +0200
-+++ vendor/CutTools/makefile	2018-06-18 13:24:27.756740547 +0200
-@@ -9,7 +9,7 @@
- ifeq ($(wildcard ../make_opts), ../make_opts)
-   include ../make_opts
- else
--  FFLAGS = 
-+  FFLAGS = -std=legacy
-   FC=gfortran
- endif
- 
---- vendor/IREGI/src/makefile_ML5_lib.orig	2018-07-09 13:33:48.546490615 +0200
-+++ vendor/IREGI/src/makefile_ML5_lib	2018-07-09 13:33:57.238573607 +0200
-@@ -5,7 +5,7 @@
- FFDIR=$(qcdlooppath)/ff
- onelooppath=$(PWD)/oneloop
- #FFLAGS=-O -g -ggdb -fno-automatic -fbounds-check -I$(onelooppath) # -fbounds-check is very useful in checking mermory error,-g is for debuging,-ggdb is for debuging special in gdb
--FFLAGS=-O -g -fPIC -I$(onelooppath)
-+FFLAGS=-O -g -fPIC -I$(onelooppath) -std=legacy
- obj= global.o funlib.o linear_algebra.o kinematics.o matrices.o matrix_base.o cmatrix_base.o mis_warp.o special_fun.o pave_reduce.o cpave_reduce.o si_reduce.o csi_reduce.o ti_reduce.o cti_reduce.o gti_reduce.o binary_tree.o IREGI4ML5_interface.o avh_olo_foriregi.o
- olomod= avh_olo_foriregi.mod avh_olo_foriregi_dp_box.mod    avh_olo_foriregi_dp_olog.mod   avh_olo_foriregi_units.mod \
-         avh_olo_foriregi_dp.mod        avh_olo_foriregi_dp_boxc.mod   avh_olo_foriregi_dp_prec.mod   avh_olo_foriregi_version.mod \
 --- madgraph/various/misc.py.orig      2018-04-29 15:59:44.000000000 +0200
 +++ madgraph/various/misc.py   2018-07-18 10:11:06.000000000 +0200
 @@ -469,6 +469,8 @@
diff --git a/var/spack/repos/builtin/packages/madgraph5amc/madgraph5amc-2.7.3.patch b/var/spack/repos/builtin/packages/madgraph5amc/madgraph5amc.patch
index 38b872352f..38b872352f 100644
--- a/var/spack/repos/builtin/packages/madgraph5amc/madgraph5amc-2.7.3.patch
+++ b/var/spack/repos/builtin/packages/madgraph5amc/madgraph5amc.patch
diff --git a/var/spack/repos/builtin/packages/madgraph5amc/package.py b/var/spack/repos/builtin/packages/madgraph5amc/package.py
index d50afa3308..d0f29eb6c0 100644
--- a/var/spack/repos/builtin/packages/madgraph5amc/package.py
+++ b/var/spack/repos/builtin/packages/madgraph5amc/package.py
@@ -18,6 +18,8 @@ class Madgraph5amc(Package):
     homepage = "https://launchpad.net/mg5amcnlo"
     url      = "https://launchpad.net/mg5amcnlo/2.0/2.7.x/+download/MG5_aMC_v2.7.3.tar.gz"
 
+    version('2.8.1', sha256='acda34414beba201e529b8c03f87f4893fb3f99ed2956a131d60a387e76c5b8c',
+            url="https://launchpad.net/mg5amcnlo/2.0/2.8.x/+download/MG5_aMC_v2.8.1.tar.gz")
     version('2.8.0', sha256='e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855',
             url="https://launchpad.net/mg5amcnlo/2.0/2.8.x/+download/MG5_aMC_v2.8.0.tar.gz")
     version('2.7.3.py3', sha256='400c26f9b15b07baaad9bd62091ceea785c2d3a59618fdc27cad213816bc7225')
@@ -44,12 +46,11 @@ class Madgraph5amc(Package):
     depends_on('python@3.7:', when='@2.7.3.py3', type=('build', 'run'))
     depends_on('python@2.7.0:2.8.0,3.7:', when='@2.8.0:', type=('build', 'run'))
 
-    patch('madgraph5amc-2.7.3.patch', level=0, when='@2.7.3.py2~atlas')
+    patch('madgraph5amc.patch', level=0)
     patch('madgraph5amc-2.7.3.atlas.patch', level=0, when='@2.7.3.py2+atlas')
-    patch('madgraph5amc-2.7.3.patch', level=0, when='@2.7.3.py3~atlas')
     patch('madgraph5amc-2.7.3.atlas.patch', level=0, when='@2.7.3.py3+atlas')
-    patch('madgraph5amc-2.7.3.patch', level=0, when='@2.8.0~atlas')
     patch('madgraph5amc-2.8.0.atlas.patch', level=0, when='@2.8.0+atlas')
+    patch('madgraph5amc-2.8.0.atlas.patch', level=0, when='@2.8.1+atlas')
 
     phases = ['edit', 'build', 'install']