Add madgraph 2.8.0; fix recipe (#18510)

2 files changed, 1119 insertions, 6 deletions

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
new file mode 100644
index 0000000000..3004da4dc3
--- /dev/null
+++ b/var/spack/repos/builtin/packages/madgraph5amc/madgraph5amc-2.8.0.atlas.patch
@@ -0,0 +1,1108 @@
+--- models/sm/restrict_ckm.dat	2015-10-26 02:18:52.000000001 +0100
++++ models/sm/restrict_ckm.dat	2016-05-03 22:54:19.000000001 +0200
+@@ -6,9 +6,9 @@
+ ## INFORMATION FOR SMINPUTS
+ ###################################
+ Block SMINPUTS 
+-    1 1.325070e+02 # aEWM1 
+-    2 1.166390e-05 # Gf 
+-    3 1.180000e-01 # aS 
++    1 1.32348905e+02 # aEWM1 
++    2 1.16637000e-05 # Gf 
++    3 1.18400000e-01 # aS 
+ 
+ ###################################
+ ## INFORMATION FOR MASS
+@@ -16,30 +16,30 @@
+ Block MASS 
+     4 0.000000e+00 # MC 
+     5 4.700000e+00 # MB 
+-    6 1.730000e+02 # MT 
++    6 1.725000e+02 # MT 
+    11 0.000000e+00 # Me 
+    13 0.000000e+00 # MM 
+-   15 1.777000e+00 # MTA 
+-   23 9.118800e+01 # MZ 
++   15 1.776820e+00 # MTA 
++   23 9.118760e+01 # MZ 
+    25 1.250000e+02 # MH 
+ 
+ ###################################
+ ## INFORMATION FOR DECAY
+ ###################################
+-DECAY   6 1.491500E+00
++DECAY   6 1.32000000E+00
+ DECAY  15 0.000000e+00
+-DECAY  23 2.441404e+00 
+-DECAY  24 2.047600e+00 
++DECAY  23 2.49520000e+00  
++DECAY  24 2.085000e+00 
+ DECAY  25 6.38233934e-03 
+ 
+ ###################################
+ ## INFORMATION FOR WOLFENSTEIN
+ ###################################
+ Block Wolfenstein 
+-    1 2.253000e-01 # lamWS 
+-    2 8.080000e-01 # AWS 
+-    3 1.320000e-01 # rhoWS 
+-    4 3.410000e-01 # etaWS 
++    1 2.257000e-01 # lamWS 
++    2 8.140000e-01 # AWS 
++    3 1.350000e-01 # rhoWS 
++    4 3.490000e-01 # etaWS 
+ 
+ ###################################
+ ## INFORMATION FOR YUKAWA
+@@ -47,7 +47,7 @@
+ Block YUKAWA 
+     4 0.000000e+00 # ymc 
+     5 4.700000e+00 # ymb
+-    6 1.730000e+02 # ymt
++    6 1.725000e+02 # ymt
+    11 0.000000e+00 # yme 
+    13 0.000000e+00 # ymm 
+    15 1.777000e+00 # ymtau 
+--- models/sm/restrict_c_mass.dat	2015-10-26 02:18:52.000000001 +0100
++++ models/sm/restrict_c_mass.dat	2016-05-03 22:54:19.000000001 +0200
+@@ -6,9 +6,9 @@
+ ## INFORMATION FOR SMINPUTS
+ ###################################
+ Block SMINPUTS 
+-    1 1.325070e+02 # aEWM1 
+-    2 1.166390e-05 # Gf 
+-    3 1.180000e-01 # aS 
++    1 1.32348905e+02 # aEWM1 
++    2 1.16637000e-05 # Gf 
++    3 1.18400000e-01 # aS 
+ 
+ ###################################
+ ## INFORMATION FOR MASS
+@@ -16,20 +16,20 @@
+ Block MASS 
+     4 1.550000e+00 # MC 
+     5 4.700000e+00 # MB 
+-    6 1.730000e+02 # MT 
++    6 1.725000e+02 # MT 
+    11 0.000000e+00 # Me 
+    13 0.000000e+00 # MM 
+-   15 1.777000e+00 # MTA 
+-   23 9.118800e+01 # MZ 
++   15 1.776820e+00 # MTA 
++   23 9.118760e+01 # MZ 
+    25 1.250000e+02 # MH 
+ 
+ ###################################
+ ## INFORMATION FOR DECAY
+ ###################################
+-DECAY   6 1.491500E+00
++DECAY   6 1.32000000E+00
+ DECAY  15 0.000000e+00
+-DECAY  23 2.441404e+00 
+-DECAY  24 2.047600e+00 
++DECAY  23 2.49520000e+00  
++DECAY  24 2.085000e+00 
+ DECAY  25 6.38233934e-03
+ 
+ ###################################
+@@ -47,7 +47,7 @@
+ Block YUKAWA 
+     4 1.550000e+00 # ymc 
+     5 4.700000e+00 # ymb
+-    6 1.730000e+02 # ymt
++    6 1.725000e+02 # ymt
+    11 0.000000e+00 # yme 
+    13 0.000000e+00 # ymm 
+    15 1.777000e+00 # ymtau 
+--- models/sm/restrict_default.dat	2015-10-26 02:18:52.000000001 +0100
++++ models/sm/restrict_default.dat	2016-05-03 22:54:19.000000001 +0200
+@@ -6,9 +6,9 @@
+ ## INFORMATION FOR SMINPUTS
+ ###################################
+ Block SMINPUTS 
+-    1 1.325070e+02 # aEWM1 
+-    2 1.166390e-05 # Gf 
+-    3 1.180000e-01 # aS 
++    1 1.32348905e+02 # aEWM1 
++    2 1.16637000e-05 # Gf 
++    3 1.18400000e-01 # aS 
+ 
+ ###################################
+ ## INFORMATION FOR MASS
+@@ -16,20 +16,20 @@
+ Block MASS 
+     4 0.000000e+00 # MC 
+     5 4.700000e+00 # MB 
+-    6 1.730000e+02 # MT 
++    6 1.725000e+02 # MT 
+    11 0.000000e+00 # Me 
+    13 0.000000e+00 # MM 
+-   15 1.777000e+00 # MTA 
+-   23 9.118800e+01 # MZ 
++   15 1.776820e+00 # MTA 
++   23 9.118760e+01 # MZ 
+    25 1.250000e+02 # MH 
+ 
+ ###################################
+ ## INFORMATION FOR DECAY
+ ###################################
+-DECAY   6 1.491500E+00
++DECAY   6 1.32000000E+00
+ DECAY  15 0.000000e+00
+-DECAY  23 2.441404e+00 
+-DECAY  24 2.047600e+00 
++DECAY  23 2.49520000e+00  
++DECAY  24 2.085000e+00 
+ DECAY  25 6.38233934e-03
+ 
+ ###################################
+@@ -47,7 +47,7 @@
+ Block YUKAWA 
+     4 0.000000e+00 # ymc 
+     5 4.700000e+00 # ymb
+-    6 1.730000e+02 # ymt
++    6 1.725000e+02 # ymt
+    11 0.000000e+00 # yme 
+    13 0.000000e+00 # ymm 
+    15 1.777000e+00 # ymtau 
+--- models/sm/restrict_lepton_masses.dat	2015-10-26 02:18:52.000000001 +0100
++++ models/sm/restrict_lepton_masses.dat	2016-05-03 22:54:19.000000001 +0200
+@@ -6,9 +6,9 @@
+ ## INFORMATION FOR SMINPUTS
+ ###################################
+ Block SMINPUTS 
+-    1 1.325070e+02 # aEWM1 
+-    2 1.166390e-05 # Gf 
+-    3 1.180000e-01 # aS 
++    1 1.32348905e+02 # aEWM1 
++    2 1.16637000e-05 # Gf 
++    3 1.18400000e-01 # aS 
+ 
+ ###################################
+ ## INFORMATION FOR MASS
+@@ -16,20 +16,20 @@
+ Block MASS 
+     4 0.000000e+00 # MC 
+     5 4.700000e+00 # MB 
+-    6 1.730000e+02 # MT 
++    6 1.725000e+02 # MT 
+    11 5.110000e-04 # Me 
+    13 1.056600e-01 # MM 
+-   15 1.777000e+00 # MTA 
+-   23 9.118800e+01 # MZ 
++   15 1.776820e+00 # MTA 
++   23 9.118760e+01 # MZ 
+    25 1.250000e+02 # MH 
+ 
+ ###################################
+ ## INFORMATION FOR DECAY
+ ###################################
+-DECAY   6 1.491500E+00
++DECAY   6 1.32000000E+00
+ DECAY  15 2.270000e-12
+-DECAY  23 2.441404e+00 
+-DECAY  24 2.047600e+00 
++DECAY  23 2.49520000e+00  
++DECAY  24 2.085000e+00 
+ DECAY  25 6.38233934e-03 
+ 
+ ###################################
+@@ -47,7 +47,7 @@
+ Block YUKAWA 
+     4 0.000000e+00 # ymc 
+     5 4.700000e+00 # ymb
+-    6 1.730000e+02 # ymt
++    6 1.725000e+02 # ymt
+    11 5.110000e-04 # yme
+    13 1.056600e-01 # ymm
+    15 1.777000e+00 # ymtau 
+--- models/sm/restrict_no_b_mass.dat	2015-10-26 02:18:52.000000001 +0100
++++ models/sm/restrict_no_b_mass.dat	2016-05-03 22:54:19.000000001 +0200
+@@ -6,9 +6,9 @@
+ ## INFORMATION FOR SMINPUTS
+ ###################################
+ Block SMINPUTS 
+-    1 1.325070e+02 # aEWM1 
+-    2 1.166390e-05 # Gf 
+-    3 1.180000e-01 # aS 
++    1 1.32348905e+02 # aEWM1 
++    2 1.16637000e-05 # Gf 
++    3 1.18400000e-01 # aS 
+ 
+ ###################################
+ ## INFORMATION FOR MASS
+@@ -16,20 +16,20 @@
+ Block MASS 
+     4 0.000000e+00 # MC 
+     5 0.000000e+00 # MB 
+-    6 1.730000e+02 # MT 
++    6 1.725000e+02 # MT 
+    11 0.000000e+00 # Me 
+    13 0.000000e+00 # MM 
+-   15 1.777000e+00 # MTA 
+-   23 9.118800e+01 # MZ 
++   15 1.776820e+00 # MTA 
++   23 9.118760e+01 # MZ 
+    25 1.250000e+02 # MH 
+ 
+ ###################################
+ ## INFORMATION FOR DECAY
+ ###################################
+-DECAY   6 1.491500E+00
++DECAY   6 1.32000000E+00
+ DECAY  15 0.000000e+00
+-DECAY  23 2.441404e+00 
+-DECAY  24 2.047600e+00 
++DECAY  23 2.49520000e+00  
++DECAY  24 2.085000e+00 
+ DECAY  25 6.38233934e-03
+ 
+ ###################################
+@@ -47,7 +47,7 @@
+ Block YUKAWA 
+     4 0.000000e+00 # ymc 
+     5 0.000000e+00 # ymb 
+-    6 1.730000e+02 # ymt
++    6 1.725000e+02 # ymt
+    11 0.000000e+00 # yme 
+    13 0.000000e+00 # ymm 
+    15 1.777000e+00 # ymtau 
+--- models/sm/restrict_no_masses.dat	2015-10-26 02:18:52.000000001 +0100
++++ models/sm/restrict_no_masses.dat	2016-05-03 22:54:19.000000001 +0200
+@@ -6,9 +6,9 @@
+ ## INFORMATION FOR SMINPUTS
+ ###################################
+ Block SMINPUTS 
+-    1 1.325070e+02 # aEWM1 
+-    2 1.166390e-05 # Gf 
+-    3 1.180000e-01 # aS 
++    1 1.32348905e+02 # aEWM1 
++    2 1.16637000e-05 # Gf 
++    3 1.18400000e-01 # aS 
+ 
+ ###################################
+ ## INFORMATION FOR MASS
+@@ -16,20 +16,20 @@
+ Block MASS 
+     4 0.000000e+00 # MC 
+     5 0.000000e+00 # MB 
+-    6 1.730000e+02 # MT 
++    6 1.725000e+02 # MT 
+    11 0.000000e+00 # Me 
+    13 0.000000e+00 # MM 
+    15 0.000000e+00 # MTA 
+-   23 9.118800e+01 # MZ 
++   23 9.118760e+01 # MZ 
+    25 1.250000e+02 # MH 
+ 
+ ###################################
+ ## INFORMATION FOR DECAY
+ ###################################
+-DECAY   6 1.491500E+00
++DECAY   6 1.320000E+00
+ DECAY  15 0.000000e+00
+-DECAY  23 2.441404e+00 
+-DECAY  24 2.047600e+00 
++DECAY  23 2.49520000e+00  
++DECAY  24 2.085000e+00 
+ DECAY  25 6.38233934e-03
+ 
+ ###################################
+@@ -47,7 +47,7 @@
+ Block YUKAWA 
+     4 0.000000e+00 # ymc 
+     5 0.000000e+00 # ymb 
+-    6 1.730000e+02 # ymt
++    6 1.725000e+02 # ymt
+    11 0.000000e+00 # yme 
+    13 0.000000e+00 # ymm 
+    15 0.000000e+00 # ymtau 
+--- models/sm/restrict_no_tau_mass.dat	2015-10-26 02:18:52.000000001 +0100
++++ models/sm/restrict_no_tau_mass.dat	2016-05-03 22:54:19.000000001 +0200
+@@ -6,9 +6,9 @@
+ ## INFORMATION FOR SMINPUTS
+ ###################################
+ Block SMINPUTS 
+-    1 1.325070e+02 # aEWM1 
+-    2 1.166390e-05 # Gf 
+-    3 1.180000e-01 # aS 
++    1 1.32348905e+02 # aEWM1 
++    2 1.16637000e-05 # Gf 
++    3 1.18400000e-01 # aS 
+ 
+ ###################################
+ ## INFORMATION FOR MASS
+@@ -16,20 +16,20 @@
+ Block MASS 
+     4 0.000000e+00 # MC 
+     5 4.700000e+00 # MB 
+-    6 1.730000e+02 # MT 
++    6 1.725000e+02 # MT 
+    11 0.000000e+00 # Me 
+    13 0.000000e+00 # MM 
+    15 0.000000e+00 # MTA 
+-   23 9.118800e+01 # MZ 
++   23 9.118760e+01 # MZ 
+    25 1.250000e+02 # MH 
+ 
+ ###################################
+ ## INFORMATION FOR DECAY
+ ###################################
+-DECAY   6 1.491500E+00
++DECAY   6 1.32000000E+00
+ DECAY  15 0.000000e+00
+-DECAY  23 2.441404e+00 
+-DECAY  24 2.047600e+00 
++DECAY  23 2.49520000e+00  
++DECAY  24 2.085000e+00 
+ DECAY  25 6.38233934e-03
+ 
+ ###################################
+@@ -47,7 +47,7 @@
+ Block YUKAWA 
+     4 0.000000e+00 # ymc 
+     5 4.700000e+00 # ymb
+-    6 1.730000e+02 # ymt
++    6 1.725000e+02 # ymt
+    11 0.000000e+00 # yme 
+    13 0.000000e+00 # ymm 
+    15 0.000000e+00 # ymtau 
+--- models/sm/restrict_no_widths.dat	2015-10-26 02:18:52.000000001 +0100
++++ models/sm/restrict_no_widths.dat	2016-05-03 22:54:19.000000001 +0200
+@@ -16,7 +16,7 @@
+ Block MASS 
+     4 0.000000e+00 # MC 
+     5 4.700000e+00 # MB 
+-    6 1.730000e+02 # MT 
++    6 1.725000e+02 # MT 
+    11 0.000000e+00 # Me 
+    13 0.000000e+00 # MM 
+    15 1.777000e+00 # MTA 
+--- models/sm/restrict_zeromass_ckm.dat	2015-10-26 02:18:52.000000001 +0100
++++ models/sm/restrict_zeromass_ckm.dat	2016-05-03 22:54:20.000000001 +0200
+@@ -6,9 +6,9 @@
+ ## INFORMATION FOR SMINPUTS
+ ###################################
+ Block SMINPUTS 
+-    1 1.325070e+02 # aEWM1 
+-    2 1.166390e-05 # Gf 
+-    3 1.180000e-01 # aS 
++    1 1.32348905e+02 # aEWM1 
++    2 1.16637000e-05 # Gf 
++    3 1.18400000e-01 # aS 
+ 
+ ###################################
+ ## INFORMATION FOR MASS
+@@ -16,30 +16,30 @@
+ Block MASS 
+     4 0.000000e+00 # MC 
+     5 0.000000e+00 # MB 
+-    6 1.730000e+02 # MT 
++    6 1.725000e+02 # MT 
+    11 0.000000e+00 # Me 
+    13 0.000000e+00 # MM 
+    15 0.000000e+00 # MTA 
+-   23 9.118800e+01 # MZ 
++   23 9.118760e+01 # MZ 
+    25 1.250000e+02 # MH 
+ 
+ ###################################
+ ## INFORMATION FOR DECAY
+ ###################################
+-DECAY   6 1.491500E+00
++DECAY   6 1.32000000E+00
+ DECAY  15 0.000000e+00
+-DECAY  23 2.441404e+00 
+-DECAY  24 2.047600e+00 
++DECAY  23 2.49520000e+00  
++DECAY  24 2.085000e+00 
+ DECAY  25 6.38233934e-03
+ 
+ ###################################
+ ## INFORMATION FOR WOLFENSTEIN
+ ###################################
+ Block Wolfenstein 
+-    1 2.253000e-01 # lamWS 
+-    2 8.080000e-01 # AWS 
+-    3 1.320000e-01 # rhoWS 
+-    4 3.410000e-01 # etaWS 
++    1 2.257000e-01 # lamWS 
++    2 8.140000e-01 # AWS 
++    3 1.350000e-01 # rhoWS 
++    4 3.490000e-01 # etaWS 
+ 
+ ###################################
+ ## INFORMATION FOR YUKAWA
+@@ -47,7 +47,7 @@
+ Block YUKAWA 
+     4 0.000000e+00 # ymc 
+     5 0.000000e+00 # ymb 
+-    6 1.730000e+02 # ymt
++    6 1.725000e+02 # ymt
+    11 0.000000e+00 # yme 
+    13 0.000000e+00 # ymm 
+    15 0.000000e+00 # ymtau 
+--- models/loop_sm/restrict_ckm.dat	2015-10-26 02:18:52.000000001 +0100
++++ models/loop_sm/restrict_ckm.dat	2016-05-03 22:54:29.000000001 +0200
+@@ -12,9 +12,9 @@
+ ## INFORMATION FOR SMINPUTS
+ ###################################
+ Block SMINPUTS 
+-    1 1.325070e+02 # aEWM1 
+-    2 1.166390e-05 # Gf 
+-    3 1.180000e-01 # aS 
++    1 1.32348905e+02 # aEWM1 
++    2 1.16637000e-05 # Gf 
++    3 1.18400000e-01 # aS 
+ 
+ ###################################
+ ## INFORMATION FOR MASS
+@@ -22,30 +22,30 @@
+ Block MASS 
+     4 0.000000e+00 # MC 
+     5 4.700000e+00 # MB 
+-    6 1.730000e+02 # MT 
++    6 1.725000e+02 # MT 
+    11 0.000000e+00 # Me 
+    13 0.000000e+00 # MM 
+-   15 1.777000e+00 # MTA 
+-   23 9.118800e+01 # MZ 
++   15 1.776820e+00 # MTA 
++   23 9.118760e+01 # MZ 
+    25 1.250000e+02 # MH 
+ 
+ ###################################
+ ## INFORMATION FOR DECAY
+ ###################################
+-DECAY   6 1.491500E+00
++DECAY   6 1.32000000E+00
+ DECAY  15 0.000000e+00
+-DECAY  23 2.441404e+00 
+-DECAY  24 2.047600e+00 
++DECAY  23 2.49520000e+00  
++DECAY  24 2.085000e+00 
+ DECAY  25 6.38233934e-03 
+ 
+ ###################################
+ ## INFORMATION FOR WOLFENSTEIN
+ ###################################
+ Block Wolfenstein 
+-    1 2.253000e-01 # lamWS 
+-    2 8.080000e-01 # AWS 
+-    3 1.320000e-01 # rhoWS 
+-    4 3.410000e-01 # etaWS 
++    1 2.257000e-01 # lamWS 
++    2 8.140000e-01 # AWS 
++    3 1.350000e-01 # rhoWS 
++    4 3.490000e-01 # etaWS 
+ 
+ ###################################
+ ## INFORMATION FOR YUKAWA
+@@ -53,7 +53,7 @@
+ Block YUKAWA 
+     4 0.000000e+00 # ymc 
+     5 4.700000e+00 # ymb 
+-    6 1.730000e+02 # ymt 
++    6 1.725000e+02 # ymt 
+    11 0.000000e+00 # yme 
+    13 0.000000e+00 # ymm 
+    15 1.777000e+00 # ymtau 
+--- models/loop_sm/restrict_c_mass.dat	2015-10-26 02:18:52.000000001 +0100
++++ models/loop_sm/restrict_c_mass.dat	2016-05-03 22:54:29.000000001 +0200
+@@ -12,9 +12,9 @@
+ ## INFORMATION FOR SMINPUTS
+ ###################################
+ Block SMINPUTS 
+-    1 1.325070e+02 # aEWM1 
+-    2 1.166390e-05 # Gf 
+-    3 1.180000e-01 # aS 
++    1 1.32348905e+02 # aEWM1 
++    2 1.16637000e-05 # Gf 
++    3 1.18400000e-01 # aS 
+ 
+ ###################################
+ ## INFORMATION FOR MASS
+@@ -22,20 +22,20 @@
+ Block MASS 
+     4 1.550000e+00 # MC 
+     5 4.700000e+00 # MB 
+-    6 1.730000e+02 # MT 
++    6 1.725000e+02 # MT 
+    11 0.000000e+00 # Me 
+    13 0.000000e+00 # MM 
+-   15 1.777000e+00 # MTA 
+-   23 9.118800e+01 # MZ 
++   15 1.776820e+00 # MTA 
++   23 9.118760e+01 # MZ 
+    25 1.250000e+02 # MH 
+ 
+ ###################################
+ ## INFORMATION FOR DECAY
+ ###################################
+-DECAY   6 1.491500E+00
++DECAY   6 1.32000000E+00
+ DECAY  15 0.000000e+00
+-DECAY  23 2.441404e+00 
+-DECAY  24 2.047600e+00 
++DECAY  23 2.49520000e+00 
++DECAY  24 2.085000e+00 
+ DECAY  25 6.38233934e-03 
+ 
+ ###################################
+@@ -53,7 +53,7 @@
+ Block YUKAWA 
+     4 1.550000e+00 # ymc 
+     5 4.700000e+00 # ymb 
+-    6 1.730000e+02 # ymt 
++    6 1.725000e+02 # ymt 
+    11 0.000000e+00 # yme 
+    13 0.000000e+00 # ymm 
+    15 1.777000e+00 # ymtau 
+--- models/loop_sm/restrict_default.dat	2015-10-26 02:18:52.000000001 +0100
++++ models/loop_sm/restrict_default.dat	2016-05-03 22:54:29.000000001 +0200
+@@ -12,9 +12,9 @@
+ ## INFORMATION FOR SMINPUTS
+ ###################################
+ Block SMINPUTS 
+-    1 1.325070e+02 # aEWM1 
+-    2 1.166390e-05 # Gf 
+-    3 1.180000e-01 # aS 
++    1 1.32348905e+02 # aEWM1 
++    2 1.16637000e-05 # Gf 
++    3 1.18400000e-01 # aS 
+ 
+ ###################################
+ ## INFORMATION FOR MASS
+@@ -22,20 +22,20 @@
+ Block MASS 
+     4 0.000000e+00 # MC 
+     5 4.700000e+00 # MB 
+-    6 1.730000e+02 # MT 
++    6 1.725000e+02 # MT 
+    11 0.000000e+00 # Me 
+    13 0.000000e+00 # MM 
+-   15 1.777000e+00 # MTA 
+-   23 9.118800e+01 # MZ 
++   15 1.776820e+00 # MTA 
++   23 9.118760e+01 # MZ 
+    25 1.250000e+02 # MH 
+ 
+ ###################################
+ ## INFORMATION FOR DECAY
+ ###################################
+-DECAY   6 1.491500E+00
++DECAY   6 1.32000000E+00
+ DECAY  15 0.000000e+00
+-DECAY  23 2.441404e+00 
+-DECAY  24 2.047600e+00 
++DECAY  23 2.49520000e+00  
++DECAY  24 2.085000e+00 
+ DECAY  25 6.38233934e-03
+ 
+ ###################################
+@@ -53,7 +53,7 @@
+ Block YUKAWA 
+     4 0.000000e+00 # ymc 
+     5 4.700000e+00 # ymb 
+-    6 1.730000e+02 # ymt 
++    6 1.725000e+02 # ymt 
+    11 0.000000e+00 # yme 
+    13 0.000000e+00 # ymm 
+    15 1.777000e+00 # ymtau 
+--- models/loop_sm/restrict_lepton_masses.dat	2015-10-26 02:18:52.000000001 +0100
++++ models/loop_sm/restrict_lepton_masses.dat	2016-05-03 22:54:29.000000001 +0200
+@@ -12,9 +12,9 @@
+ ## INFORMATION FOR SMINPUTS
+ ###################################
+ Block SMINPUTS 
+-    1 1.325070e+02 # aEWM1 
+-    2 1.166390e-05 # Gf 
+-    3 1.180000e-01 # aS 
++    1 1.32348905e+02 # aEWM1 
++    2 1.16637000e-05 # Gf 
++    3 1.18400000e-01 # aS 
+ 
+ ###################################
+ ## INFORMATION FOR MASS
+@@ -22,20 +22,20 @@
+ Block MASS 
+     4 0.000000e+00 # MC 
+     5 4.700000e+00 # MB 
+-    6 1.730000e+02 # MT 
++    6 1.725000e+02 # MT 
+    11 5.110000e-04 # Me 
+    13 1.056600e-01 # MM 
+-   15 1.777000e+00 # MTA 
+-   23 9.118800e+01 # MZ 
++   15 1.776820e+00 # MTA 
++   23 9.118760e+01 # MZ 
+    25 1.250000e+02 # MH 
+ 
+ ###################################
+ ## INFORMATION FOR DECAY
+ ###################################
+-DECAY   6 1.491500E+00
++DECAY   6 1.32000000E+00
+ DECAY  15 2.270000e-12
+-DECAY  23 2.441404e+00 
+-DECAY  24 2.047600e+00 
++DECAY  23 2.49520000e+00  
++DECAY  24 2.085000e+00 
+ DECAY  25 6.38233934e-03 
+ 
+ ###################################
+@@ -53,7 +53,7 @@
+ Block YUKAWA 
+     4 0.000000e+00 # ymc 
+     5 4.700000e+00 # ymb
+-    6 1.730000e+02 # ymt
++    6 1.725000e+02 # ymt
+    11 5.110000e-04 # yme
+    13 1.056600e-01 # ymm
+    15 1.777000e+00 # ymtau 
+--- models/loop_sm/restrict_no_b_mass.dat	2015-10-26 02:18:52.000000001 +0100
++++ models/loop_sm/restrict_no_b_mass.dat	2016-05-03 22:54:29.000000001 +0200
+@@ -12,9 +12,9 @@
+ ## INFORMATION FOR SMINPUTS
+ ###################################
+ Block SMINPUTS 
+-    1 1.325070e+02 # aEWM1 
+-    2 1.166390e-05 # Gf 
+-    3 1.180000e-01 # aS 
++    1 1.32348905e+02 # aEWM1 
++    2 1.16637000e-05 # Gf 
++    3 1.18400000e-01 # aS 
+ 
+ ###################################
+ ## INFORMATION FOR MASS
+@@ -22,20 +22,20 @@
+ Block MASS 
+     4 0.000000e+00 # MC 
+     5 0.000000e+00 # MB 
+-    6 1.730000e+02 # MT 
++    6 1.725000e+02 # MT 
+    11 0.000000e+00 # Me 
+    13 0.000000e+00 # MM 
+-   15 1.777000e+00 # MTA 
+-   23 9.118800e+01 # MZ 
++   15 1.776820e+00 # MTA 
++   23 9.118760e+01 # MZ 
+    25 1.250000e+02 # MH 
+ 
+ ###################################
+ ## INFORMATION FOR DECAY
+ ###################################
+-DECAY   6 1.491500E+00
++DECAY   6 1.32000000E+00
+ DECAY  15 0.000000e+00
+-DECAY  23 2.441404e+00 
+-DECAY  24 2.047600e+00 
++DECAY  23 2.49520000e+00  
++DECAY  24 2.085000e+00 
+ DECAY  25 6.38233934e-03 
+ 
+ ###################################
+@@ -53,7 +53,7 @@
+ Block YUKAWA 
+     4 0.000000e+00 # ymc 
+     5 0.000000e+00 # ymb 
+-    6 1.730000e+02 # ymt 
++    6 1.725000e+02 # ymt 
+    11 0.000000e+00 # yme 
+    13 0.000000e+00 # ymm 
+    15 1.777000e+00 # ymtau 
+--- models/loop_sm/restrict_no_masses.dat	2015-10-26 02:18:52.000000001 +0100
++++ models/loop_sm/restrict_no_masses.dat	2016-05-03 22:54:29.000000001 +0200
+@@ -12,9 +12,9 @@
+ ## INFORMATION FOR SMINPUTS
+ ###################################
+ Block SMINPUTS 
+-    1 1.325070e+02 # aEWM1 
+-    2 1.166390e-05 # Gf 
+-    3 1.180000e-01 # aS 
++    1 1.32348905e+02 # aEWM1 
++    2 1.16637000e-05 # Gf 
++    3 1.18400000e-01 # aS 
+ 
+ ###################################
+ ## INFORMATION FOR MASS
+@@ -22,20 +22,20 @@
+ Block MASS 
+     4 0.000000e+00 # MC 
+     5 0.000000e+00 # MB 
+-    6 1.730000e+02 # MT 
++    6 1.725000e+02 # MT 
+    11 0.000000e+00 # Me 
+    13 0.000000e+00 # MM 
+    15 0.000000e+00 # MTA 
+-   23 9.118800e+01 # MZ 
++   23 9.118760e+01 # MZ 
+    25 1.250000e+02 # MH 
+ 
+ ###################################
+ ## INFORMATION FOR DECAY
+ ###################################
+-DECAY   6 1.491500E+00
++DECAY   6 1.32000000E+00
+ DECAY  15 0.000000e+00
+-DECAY  23 2.441404e+00 
+-DECAY  24 2.047600e+00 
++DECAY  23 2.49520000e+00  
++DECAY  24 2.085000e+00 
+ DECAY  25 6.38233934e-03 
+ 
+ ###################################
+@@ -53,7 +53,7 @@
+ Block YUKAWA 
+     4 0.000000e+00 # ymc 
+     5 0.000000e+00 # ymb 
+-    6 1.730000e+02 # ymt 
++    6 1.725000e+02 # ymt 
+    11 0.000000e+00 # yme 
+    13 0.000000e+00 # ymm 
+    15 0.000000e+00 # ymtau 
+--- models/loop_sm/restrict_no_tau_mass.dat	2015-10-26 02:18:52.000000001 +0100
++++ models/loop_sm/restrict_no_tau_mass.dat	2016-05-03 22:54:29.000000001 +0200
+@@ -12,9 +12,9 @@
+ ## INFORMATION FOR SMINPUTS
+ ###################################
+ Block SMINPUTS 
+-    1 1.325070e+02 # aEWM1 
+-    2 1.166390e-05 # Gf 
+-    3 1.180000e-01 # aS 
++    1 1.32348905e+02 # aEWM1 
++    2 1.16637000e-05 # Gf 
++    3 1.18400000e-01 # aS 
+ 
+ ###################################
+ ## INFORMATION FOR MASS
+@@ -22,20 +22,20 @@
+ Block MASS 
+     4 0.000000e+00 # MC 
+     5 4.700000e+00 # MB 
+-    6 1.730000e+02 # MT 
++    6 1.725000e+02 # MT 
+    11 0.000000e+00 # Me 
+    13 0.000000e+00 # MM 
+    15 0.000000e+00 # MTA 
+-   23 9.118800e+01 # MZ 
++   23 9.118760e+01 # MZ 
+    25 1.250000e+02 # MH 
+ 
+ ###################################
+ ## INFORMATION FOR DECAY
+ ###################################
+-DECAY   6 1.491500E+00
++DECAY   6 1.32000000E+00
+ DECAY  15 0.000000e+00
+-DECAY  23 2.441404e+00 
+-DECAY  24 2.047600e+00 
++DECAY  23 2.49520000e+00  
++DECAY  24 2.085000e+00 
+ DECAY  25 6.38233934e-03 
+ 
+ ###################################
+@@ -53,7 +53,7 @@
+ Block YUKAWA 
+     4 0.000000e+00 # ymc 
+     5 4.700000e+00 # ymb 
+-    6 1.730000e+02 # ymt 
++    6 1.725000e+02 # ymt 
+    11 0.000000e+00 # yme 
+    13 0.000000e+00 # ymm 
+    15 0.000000e+00 # ymtau 
+--- models/loop_sm/restrict_no_widths.dat	2015-10-26 02:18:52.000000001 +0100
++++ models/loop_sm/restrict_no_widths.dat	2016-05-03 22:54:29.000000001 +0200
+@@ -22,7 +22,7 @@
+ Block MASS 
+     4 0.000000e+00 # MC 
+     5 4.700000e+00 # MB 
+-    6 1.730000e+02 # MT 
++    6 1.725000e+02 # MT 
+    11 0.000000e+00 # Me 
+    13 0.000000e+00 # MM 
+    15 1.777000e+00 # MTA 
+@@ -53,7 +53,7 @@
+ Block YUKAWA 
+     4 0.000000e+00 # ymc 
+     5 4.700000e+00 # ymb 
+-    6 1.730000e+02 # ymt 
++    6 1.725000e+02 # ymt 
+    11 0.000000e+00 # yme 
+    13 0.000000e+00 # ymm 
+    15 1.777000e+00 # ymtau 
+--- models/loop_sm/restrict_parallel_test.dat	2015-10-26 02:18:52.000000001 +0100
++++ models/loop_sm/restrict_parallel_test.dat	2016-05-03 22:54:29.000000001 +0200
+@@ -22,7 +22,7 @@
+ Block MASS 
+     4 0.000000e+00 # MC 
+     5 4.620000e+00 # MB 
+-    6 1.743000e+02 # MT 
++    6 1.725000e+02 # MT 
+    11 0.000000e+00 # Me 
+    13 0.000000e+00 # MM 
+    15 1.777000e+00 # MTA 
+@@ -53,7 +53,7 @@
+ Block YUKAWA 
+     4 0.000000e+00 # ymc 
+     5 4.6200000e+00 # ymb 
+-    6 1.743000e+02 # ymt 
++    6 1.725000e+02 # ymt 
+    11 0.000000e+00 # yme 
+    13 0.000000e+00 # ymm 
+    15 1.777000e+00 # ymtau 
+--- models/loop_sm/restrict_test.dat	2015-10-26 02:18:52.000000001 +0100
++++ models/loop_sm/restrict_test.dat	2016-05-03 22:54:29.000000001 +0200
+@@ -22,7 +22,7 @@
+ Block MASS 
+     4 0.000000e+00 # MC 
+     5 4.700000e+00 # MB 
+-    6 1.730000e+02 # MT 
++    6 1.725000e+02 # MT 
+    11 0.000000e+00 # Me 
+    13 0.000000e+00 # MM 
+    15 1.777000e+00 # MTA 
+--- models/loop_sm/restrict_zeromass_ckm.dat	2015-10-26 02:18:52.000000001 +0100
++++ models/loop_sm/restrict_zeromass_ckm.dat	2016-05-03 22:54:29.000000001 +0200
+@@ -12,9 +12,9 @@
+ ## INFORMATION FOR SMINPUTS
+ ###################################
+ Block SMINPUTS 
+-    1 1.325070e+02 # aEWM1 
+-    2 1.166390e-05 # Gf 
+-    3 1.180000e-01 # aS 
++    1 1.32348905e+02 # aEWM1 
++    2 1.16637000e-05 # Gf 
++    3 1.18400000e-01 # aS 
+ 
+ ###################################
+ ## INFORMATION FOR MASS
+@@ -22,30 +22,30 @@
+ Block MASS 
+     4 0.000000e+00 # MC 
+     5 0.000000e+00 # MB 
+-    6 1.730000e+02 # MT 
++    6 1.725000e+02 # MT 
+    11 0.000000e+00 # Me 
+    13 0.000000e+00 # MM 
+    15 0.000000e+00 # MTA 
+-   23 9.118800e+01 # MZ 
++   23 9.118760e+01 # MZ 
+    25 1.250000e+02 # MH 
+ 
+ ###################################
+ ## INFORMATION FOR DECAY
+ ###################################
+-DECAY   6 1.491500E+00
++DECAY   6 1.32000000E+00
+ DECAY  15 0.000000e+00
+-DECAY  23 2.441404e+00 
+-DECAY  24 2.047600e+00 
++DECAY  23 2.49520000e+00  
++DECAY  24 2.085000e+00 
+ DECAY  25 6.38233934e-03 
+ 
+ ###################################
+ ## INFORMATION FOR WOLFENSTEIN
+ ###################################
+ Block Wolfenstein 
+-    1 2.253000e-01 # lamWS 
+-    2 8.080000e-01 # AWS 
+-    3 1.320000e-01 # rhoWS 
+-    4 3.410000e-01 # etaWS 
++    1 2.257000e-01 # lamWS 
++    2 8.140000e-01 # AWS 
++    3 1.350000e-01 # rhoWS 
++    4 3.490000e-01 # etaWS 
+ 
+ ###################################
+ ## INFORMATION FOR YUKAWA
+@@ -53,7 +53,7 @@
+ Block YUKAWA 
+     4 0.000000e+00 # ymc 
+     5 0.000000e+00 # ymb 
+-    6 1.730000e+02 # ymt 
++    6 1.725000e+02 # ymt 
+    11 0.000000e+00 # yme 
+    13 0.000000e+00 # ymm 
+    15 0.000000e+00 # ymtau 
+--- bin/.compile.py.orig	2017-02-23 09:30:11.498513439 +0100
++++ bin/.compile.py	2017-02-23 09:30:45.660867637 +0100
+@@ -59,7 +59,8 @@
+             self.make_stdHep()
+             self.make_CutTools()
+             self.make_IREGI()
+-            self.install_package(ext_programs)
++            if ext_programs:
++                self.install_package(ext_programs)
+             self.test_output_LO()
+             self.test_output_NLO()
+             self.precompilation(debug=True)
+--- madgraph/interface/loop_interface.py.orig	2018-05-01 10:19:36.391921213 +0300
++++ madgraph/interface/loop_interface.py	2018-05-01 10:20:08.019974345 +0300
+@@ -23,7 +23,7 @@
+ import re
+ 
+ import madgraph
+-from madgraph import MG4DIR, MG5DIR, MadGraph5Error
++from madgraph import MG4DIR, MG5DIR, MadGraph5Error, ReadWrite
+ import madgraph.interface.madgraph_interface as mg_interface
+ import madgraph.interface.extended_cmd as cmd
+ import madgraph.interface.launch_ext_program as launch_ext
+@@ -503,6 +503,9 @@
+         if (opt['ninja'] is None) or (os.path.isfile(pjoin(MG5DIR, opt['ninja'],'libninja.a'))): 
+             return
+         
++        if not ReadWrite:
++            return
++
+         logger.info("First output using loop matrix-elements has been detected. Now asking for loop reduction:", '$MG:BOLD')
+         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 @@
+     try:
+         if nb_core > 1:
+             cmd.append('-j%s' % nb_core)
++        if nb_core < 0:
++            cmd.append('-j1')
+         cmd += arg
+         p = subprocess.Popen(cmd, stdout=subprocess.PIPE, 
+                              stderr=subprocess.STDOUT, cwd=cwd, **opt)
+
+--- bin/.compile.py.orig	2018-07-18 10:56:33.000000000 +0200
++++ bin/.compile.py	2018-07-18 10:42:56.000000000 +0200
+@@ -168,7 +168,7 @@
+             text = text.replace(base,compiler)
+         open(path, 'w').writelines(text)
+ 
+-        misc.compile(cwd = os.path.join(MG5DIR, 'vendor', 'StdHEP'))
++        misc.compile(cwd = os.path.join(MG5DIR, 'vendor', 'StdHEP'), nb_core=-1)
+ 
+     @staticmethod
+     def make_CutTools():
+@@ -190,7 +190,7 @@
+             text = text.replace(base,compiler)
+         open(path, 'w').writelines(text)
+ 
+-        misc.compile(cwd = os.path.join(MG5DIR, 'vendor', 'CutTools'))
++        misc.compile(cwd = os.path.join(MG5DIR, 'vendor', 'CutTools'), nb_core=-1)
+ 
+     @staticmethod
+     def make_IREGI():
+@@ -274,7 +274,7 @@
+                     open(name,'w').write('\n'.join(lines))
+                     mod = False
+ 
+-        misc.compile(cwd = os.path.join(iregi_path,'src'))        
++        misc.compile(cwd = os.path.join(iregi_path,'src'), nb_core=-1)        
+ 
+     def install_package(self, programs=[]):
+         print "installing external package"
+--- madgraph/various/cluster.py.orig	2020-02-03 16:49:15.391981789 +0100
++++ madgraph/various/cluster.py	2020-02-03 16:50:03.040159965 +0100
+@@ -875,7 +875,7 @@
+                """
+         
+         if self.cluster_queue not in ['None', None]:
+-            requirement = 'Requirements = %s=?=True' % self.cluster_queue
++            requirement = '+JobFlavour = "%s"' % self.cluster_queue
+         else:
+             requirement = ''
+ 
+@@ -951,7 +951,7 @@
+                """
+         
+         if self.cluster_queue not in ['None', None]:
+-            requirement = 'Requirements = %s=?=True' % self.cluster_queue
++            requirement = '+JobFlavour = "%s"' % self.cluster_queue
+         else:
+             requirement = ''
+ 
+--- /dev/null	2020-09-02 07:36:17.604620197 +0200
++++ models/loop_sm/restrict_ckm_c_mass.dat	2020-09-02 13:18:03.083179993 +0200
+@@ -0,0 +1,59 @@
++######################################################################
++## PARAM_CARD AUTOMATICALY GENERATED BY THE UFO  #####################
++######################################################################
++
++###################################
++### INFORMATION FOR LOOP
++####################################
++Block loop
++  1 9.118800e+01 # MU_R
++
++###################################
++## INFORMATION FOR SMINPUTS
++###################################
++Block SMINPUTS 
++    1 1.32348905e+02 # aEWM1 
++    2 1.16637000e-05 # Gf 
++    3 1.18400000e-01 # aS 
++
++###################################
++## INFORMATION FOR MASS
++###################################
++Block MASS 
++    4 1.550000e+00 # MC 
++    5 4.700000e+00 # MB 
++    6 1.725000e+02 # MT 
++   11 0.000000e+00 # Me 
++   13 0.000000e+00 # MM 
++   15 1.776820e+00 # MTA 
++   23 9.118760e+01 # MZ 
++   25 1.250000e+02 # MH 
++
++###################################
++## INFORMATION FOR DECAY
++###################################
++DECAY   6 1.32000000E+00
++DECAY  15 0.000000e+00
++DECAY  23 2.49520000e+00 
++DECAY  24 2.085000e+00 
++DECAY  25 6.38233934e-03 
++
++###################################
++## INFORMATION FOR WOLFENSTEIN
++###################################
++Block Wolfenstein 
++    1 2.257000e-01 # lamWS 
++    2 8.140000e-01 # AWS 
++    3 1.350000e-01 # rhoWS 
++    4 3.490000e-01 # etaWS 
++
++###################################
++## INFORMATION FOR YUKAWA
++###################################
++Block YUKAWA 
++    4 1.550000e+00 # ymc 
++    5 4.700000e+00 # ymb 
++    6 1.725000e+02 # ymt 
++   11 0.000000e+00 # yme 
++   13 0.000000e+00 # ymm 
++   15 1.777000e+00 # ymtau 
+
diff --git a/var/spack/repos/builtin/packages/madgraph5amc/package.py b/var/spack/repos/builtin/packages/madgraph5amc/package.py
index 3abe3dce1f..d50afa3308 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.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')
     version('2.7.3.py2', sha256='0b665356f4d9359e6e382e0f408dc11db594734567c6b2f0ec0e0697f2dbe099',
             url="https://launchpad.net/mg5amcnlo/2.0/2.7.x/+download/MG5_aMC_v2.7.3.tar.gz")
@@ -29,22 +31,25 @@ class Madgraph5amc(Package):
     variant('collier', default=False, description='Use external installation' +
             ' of Collier')
 
+    conflicts('%gcc@10:', when='@2.7.3')
+
     depends_on('syscalc')
     depends_on('gosam-contrib', when='+ninja')
     depends_on('collier', when='+collier')
     depends_on('lhapdf')
     depends_on('fastjet')
-    depends_on('py-six', when='@2.7.3.py3', type=('build', 'run'))
-
-    depends_on('python@:2.7.999', when='@2.7.3.py2', type=('build', 'run'))
-    conflicts('%gcc@10:', when='@2.7.3')
+    depends_on('py-six', when='@2.7.3.py3,2.8.0:', type=('build', 'run'))
 
-    depends_on('python@3:', when='@2.7.3.py3', type=('build', 'run'))
+    depends_on('python@2.7.0:2.8.0', when='@2.7.3.py2', type=('build', 'run'))
+    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-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')
 
     phases = ['edit', 'build', 'install']
 
@@ -64,7 +69,7 @@ class Madgraph5amc(Package):
             set_parameter('ninja', spec['gosam-contrib'].prefix)
 
         if '+collier' in spec:
-            set_parameter('collier', spec['collier'].prefix)
+            set_parameter('collier', spec['collier'].prefix.lib)
 
         set_parameter('output_dependencies', 'internal')
         set_parameter('lhapdf', join_path(spec['lhapdf'].prefix.bin,