Add madanalysis5 as an optional dependency

Additional minor changes:
- remove ExRootAnalysis (might add a specific `madgraph-exrootanalysis` if
  requested);
- Fix the mg5 configuration to work with madanalysis5
- Fix the mg5 configuration to work with madgraph-madanalysis (i.e. madanalysis4)

Signed-off-by: JP-Ellis <josh@jpellis.me>

3 files changed, 9 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 74223e2e1474..e74737b97232 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue Feb 14 03:30:10 UTC 2017
+# Mon Feb 27 12:46:44 UTC 2017
 pkgbase = madgraph
 	pkgdesc = MadGraph5_aMC@NLO is a framework that aims at providing all the elements necessary for SM and BSM phenomenology
 	pkgver = 2.5.2
-	pkgrel = 2
+	pkgrel = 3
 	url = http://madgraph.hep.uiuc.edu/
 	arch = i686
 	arch = x86_64
@@ -14,10 +14,10 @@ pkgbase = madgraph
 	depends = python2
 	depends = tcsh
 	optdepends = delphes
-	optdepends = exrootanalysis
 	optdepends = fastjet
 	optdepends = hepmc
 	optdepends = lhapdf
+	optdepends = madanalysis5
 	optdepends = madgraph-pythia-pgs
 	optdepends = pythia8
 	options = !strip
@@ -26,7 +26,7 @@ pkgbase = madgraph
 	source = mg5_configuration.patch
 	sha256sums = 7968f6d0543b3af2649ba497d17c3a23b089cc6f5ba352e0fd7fa106aa07a512
 	sha256sums = b16bcfebae4d50eb145436c97a06daf706691bbef4e7f45cde1c6116d2869720
-	sha256sums = 3a7065d9b8273f0c0e5530d85510a13c9b8241f9961a0d3a836786c8e3e151b4
+	sha256sums = 253c66568c16bf4f118c200a76a91f0cca2bf441d880719c8bf583db770cbc28
 
 pkgname = madgraph
 
diff --git a/PKGBUILD b/PKGBUILD
index c79bc3a80ac9..5652faa3b1fb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=madgraph
 pkgver=2.5.2
 _dirname="MG5_aMC_v${pkgver//./_}"
-pkgrel=2
+pkgrel=3
 pkgdesc="MadGraph5_aMC@NLO is a framework that aims at providing all the elements necessary for SM and BSM phenomenology"
 url="http://madgraph.hep.uiuc.edu/"
 arch=('i686' 'x86_64')
@@ -17,10 +17,10 @@ depends=(
 )
 optdepends=(
     'delphes'
-    'exrootanalysis'
     'fastjet'
     'hepmc'
     'lhapdf'
+    'madanalysis5'
     'madgraph-pythia-pgs'
     'pythia8'
 )
@@ -29,7 +29,7 @@ source=("https://launchpad.net/mg5amcnlo/${pkgver%%.*}.0/${pkgver%.*}.x/+downloa
         "mg5_configuration.patch")
 sha256sums=('7968f6d0543b3af2649ba497d17c3a23b089cc6f5ba352e0fd7fa106aa07a512'
             'b16bcfebae4d50eb145436c97a06daf706691bbef4e7f45cde1c6116d2869720'
-            '3a7065d9b8273f0c0e5530d85510a13c9b8241f9961a0d3a836786c8e3e151b4')
+            '253c66568c16bf4f118c200a76a91f0cca2bf441d880719c8bf583db770cbc28')
 options=("!strip")
 
 prepare() {
diff --git a/mg5_configuration.patch b/mg5_configuration.patch
index 7457ba8b99dc..1579da3ccef3 100644
--- a/mg5_configuration.patch
+++ b/mg5_configuration.patch
@@ -52,12 +52,12 @@
  #! MadAnalysis4 fortran-based package [for basic analysis]
  #!  relative path start from main directory
 -# madanalysis_path = ./MadAnalysis
-+madanalysis_path = /usr
++madanalysis_path = ./MadAnalysis
  
  #! MadAnalysis5 python-based Package [For advanced analysis]
  #!  relative path start from main directory
 -# madanalysis5_path = ./HEPTools/madanalysis5/madanalysis5
-+madanalysis5_path = /usr
++madanalysis5_path = /opt/madanalysis5
  
  #! ExRootAnalysis Package
  #!  relative path start from main directory