Update to 2.0.11.

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

6 files changed, 48 insertions, 66 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f6006688b8b4..c01d2441d6cf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sun Feb 26 10:07:59 UTC 2017
+# Mon Apr  3 09:48:54 UTC 2017
 pkgbase = checkmate
 	pkgdesc = A program to compare theoretical models against many recent experimental analyses
-	pkgver = 2.0.3
-	pkgrel = 4
+	pkgver = 2.0.11
+	pkgrel = 1
 	url = http://checkmate.hepforge.org/
 	arch = i686
 	arch = x86_64
@@ -15,16 +15,16 @@ pkgbase = checkmate
 	depends = pythia
 	depends = python2-scipy
 	depends = root
-	source = http://www.hepforge.org/archive/checkmate/CheckMATE-2.0.3.tar.gz
+	source = http://www.hepforge.org/archive/checkmate/CheckMATE-2.0.11.tar.gz
 	source = ExRootAnalysis.patch
 	source = fastjet.patch
 	source = path.patch
 	source = PythiaHandler.patch
-	sha256sums = 420fa42e4555e7f9f86605f7a17878fc9ff62cd852cbdd45f86361b3a27656a8
-	sha256sums = 9420c9b166261a67e2febe983c37638dcff85b3660b5fd4acf1733a52b0d9402
-	sha256sums = 55874c4a88f10b0307a1495028acfd7ad28f1fac6b170fcafbe3c01a5a0b0edb
-	sha256sums = 1092f5bf843ec51f8cf1510673218dadd220bca26209bbd03787fb4257e6a804
-	sha256sums = 89cff18a1bf2bea50238d455010157bbafaf2b6671fd2db97443bb6d283c6a94
+	sha256sums = 05eda2ddb4775408d4c6a193b529c8e43cdfb025b161c4b98fa69922e54c8927
+	sha256sums = 0318bd33ae752a914e1af6102f5c648a4bcb72d87922f30561f7f9e44c80e169
+	sha256sums = c5be604f8cc3edcfd69c58b3c56c431ff2d8329e8a3ef1afea39ffd1d4f194f5
+	sha256sums = 7069aaf2bfa0ad620e268f106c85f3b32688f78f5f122824ea9b4c665603c7cf
+	sha256sums = c073ee1e04a415dc3be3aa81de38feb031acec770b98b7b3429707e8cd7f81f1
 
 pkgname = checkmate
 
diff --git a/ExRootAnalysis.patch b/ExRootAnalysis.patch
index 66247e3cb6af..7d8e19a70947 100644
--- a/ExRootAnalysis.patch
+++ b/ExRootAnalysis.patch
@@ -1,5 +1,5 @@
---- a/CheckMATE-2.0.3/tools/analysis/include/base/AnalysisBase.h
-+++ b/CheckMATE-2.0.3/tools/analysis/include/base/AnalysisBase.h
+--- a/CheckMATE-2.0.11/tools/analysis/include/base/AnalysisBase.h
++++ b/CheckMATE-2.0.11/tools/analysis/include/base/AnalysisBase.h
 @@ -21,8 +21,8 @@
  #include <TMatrixDEigen.h>
  
@@ -11,8 +11,8 @@
  
  #include "external/fastjet/JetDefinition.hh"
  #include "external/fastjet/ClusterSequence.hh"
---- a/CheckMATE-2.0.3/tools/fritz/include/delpheshandler/DelphesHandler.h
-+++ b/CheckMATE-2.0.3/tools/fritz/include/delpheshandler/DelphesHandler.h
+--- a/CheckMATE-2.0.11/tools/fritz/include/delpheshandler/DelphesHandler.h
++++ b/CheckMATE-2.0.11/tools/fritz/include/delpheshandler/DelphesHandler.h
 @@ -28,9 +28,9 @@
  
  #include "CMExRootTreeBranch.h"
diff --git a/PKGBUILD b/PKGBUILD
index a7ab7402b368..c70d960cbfd4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: JP-Ellis <josh@jpellis.me>
 
 pkgname=checkmate
-pkgver=2.0.3
-pkgrel=4
+pkgver=2.0.11
+pkgrel=1
 pkgdesc="A program to compare theoretical models against many recent experimental analyses"
 url="http://checkmate.hepforge.org/"
 arch=('i686' 'x86_64')
@@ -19,11 +19,11 @@ source=("http://www.hepforge.org/archive/checkmate/CheckMATE-${pkgver}.tar.gz"
         "fastjet.patch"
         "path.patch"
         "PythiaHandler.patch")
-sha256sums=('420fa42e4555e7f9f86605f7a17878fc9ff62cd852cbdd45f86361b3a27656a8'
-            '9420c9b166261a67e2febe983c37638dcff85b3660b5fd4acf1733a52b0d9402'
-            '55874c4a88f10b0307a1495028acfd7ad28f1fac6b170fcafbe3c01a5a0b0edb'
-            '1092f5bf843ec51f8cf1510673218dadd220bca26209bbd03787fb4257e6a804'
-            '89cff18a1bf2bea50238d455010157bbafaf2b6671fd2db97443bb6d283c6a94')
+sha256sums=('05eda2ddb4775408d4c6a193b529c8e43cdfb025b161c4b98fa69922e54c8927'
+            '0318bd33ae752a914e1af6102f5c648a4bcb72d87922f30561f7f9e44c80e169'
+            'c5be604f8cc3edcfd69c58b3c56c431ff2d8329e8a3ef1afea39ffd1d4f194f5'
+            '7069aaf2bfa0ad620e268f106c85f3b32688f78f5f122824ea9b4c665603c7cf'
+            'c073ee1e04a415dc3be3aa81de38feb031acec770b98b7b3429707e8cd7f81f1')
 
 prepare() {
     msg2 "Patching files"
@@ -53,6 +53,7 @@ build() {
 
     msg2 "Cleaning temporary build files"
     find . -type f -name "*.o" -o -name "*.lo" -print0 | xargs -0 rm -f
+    find . -type d -name ".libs" -empty -delete
 
     msg2 "Compiling Python files"
     python2 -O -m compileall -qf . || true
@@ -60,19 +61,14 @@ build() {
 }
 
 package() {
-    # CheckMATE does not provide `make install`; so we manually install files
-    #
-    # If any file is missing, I welcome a patch
-    install -Dm755 "${srcdir}/CheckMATE-${pkgver}/bin/CheckMATE" "${pkgdir}/usr/bin/CheckMATE"
-    install -Dm755 "${srcdir}/CheckMATE-${pkgver}/bin/AnalysisManager" "${pkgdir}/usr/bin/AnalysisManager"
+    msg2 "Copying files"
+    mkdir -p "${pkgdir}/opt/checkmate"
+    cp -r "${srcdir}/CheckMATE-${pkgver}/." "${pkgdir}/opt/checkmate/"
 
-    install -d "${pkgdir}/usr/share/CheckMATE"
-    cp -r "${srcdir}/CheckMATE-${pkgver}/tools" "${pkgdir}/usr/share/CheckMATE"
-    cp -r "${srcdir}/CheckMATE-${pkgver}/data" "${pkgdir}/usr/share/CheckMATE/"
-
-    find "${pkgdir}" -type f -name "*.o" -delete
-
-    find "${pkgdir}" -type d -name ".libs" -empty -delete
+    msg2 "Linking binaries"
+    mkdir -p "${pkgdir}/usr/bin"
+    ln -s "/opt/checkmate/bin/CheckMATE" "${pkgdir}/usr/bin"
+    ln -s "/opt/checkmate/bin/AnalysisManager" "${pkgdir}/usr/bin"
 }
 
 # Local Variables:
diff --git a/PythiaHandler.patch b/PythiaHandler.patch
index 6ee42d200375..f6c2fe6420c7 100644
--- a/PythiaHandler.patch
+++ b/PythiaHandler.patch
@@ -1,5 +1,5 @@
---- a/CheckMATE-2.0.3/tools/fritz/include/pythiahandler/PythiaHandler.h
-+++ b/CheckMATE-2.0.3/tools/fritz/include/pythiahandler/PythiaHandler.h
+--- a/CheckMATE-2.0.11/tools/fritz/include/pythiahandler/PythiaHandler.h
++++ b/CheckMATE-2.0.11/tools/fritz/include/pythiahandler/PythiaHandler.h
 @@ -1,6 +1,7 @@
  #ifndef _PYTHIAHANDLER
  #define _PYTHIAHANDLER
diff --git a/fastjet.patch b/fastjet.patch
index 482d86586041..ef79abffa267 100644
--- a/fastjet.patch
+++ b/fastjet.patch
@@ -1,5 +1,5 @@
---- a/CheckMATE-2.0.3/tools/analysis/include/base/AnalysisBase.h
-+++ b/CheckMATE-2.0.3/tools/analysis/include/base/AnalysisBase.h
+--- a/CheckMATE-2.0.11/tools/analysis/include/base/AnalysisBase.h
++++ b/CheckMATE-2.0.11/tools/analysis/include/base/AnalysisBase.h
 @@ -24,8 +24,8 @@
  #include "ExRootAnalysis/ExRootTreeReader.h"
  #include "ExRootAnalysis/ExRootResult.h"
diff --git a/path.patch b/path.patch
index 2b64354b2008..d1a47fec07cb 100644
--- a/path.patch
+++ b/path.patch
@@ -1,35 +1,21 @@
---- a/CheckMATE-2.0.3/tools/python/info.py
-+++ b/CheckMATE-2.0.3/tools/python/info.py
-@@ -678,9 +678,9 @@ class Info(dict):
-         if config_paths != dict() and config_paths['pythia8_lib_path']:
-             cls.paths['pythia8_lib_path'] = config_paths['pythia8_lib_path']
+diff --git a/CheckMATE-2.0.11.orig/tools/python/info.py b/CheckMATE-2.0.11/tools/python/info.py
+index 4bd10ca..91b58f9 100644
+--- a/CheckMATE-2.0.11.orig/tools/python/info.py
++++ b/CheckMATE-2.0.11/tools/python/info.py
+@@ -2,6 +2,7 @@ import os, shutil,  sys
+ import json, pickle
+ import argparse
+ import ConfigParser
++import tempfile
+ from advprint import AdvPrint
+ 
+ class Info(dict):
+@@ -671,7 +672,7 @@ class Info(dict):
  
--        cls.paths['checkmate'] = os.path.split(os.path.split(os.path.split(os.path.realpath(__file__))[0])[0])[0]
--        
+         cls.paths['checkmate'] = os.path.split(os.path.split(os.path.split(os.path.realpath(__file__))[0])[0])[0]
+         
 -        cls.paths['results'] = os.path.join(cls.paths['checkmate'], 'results')
-+        cls.paths['checkmate'] = '/usr/share/CheckMATE'
-+        
-+        cls.paths['results'] = os.path.join('/tmp/CheckMATE/', 'results')
++        cls.paths['results'] = os.path.join(tempfile.gettempdir(), 'checkmate')
          cls.paths['tools'] = os.path.join(cls.paths['checkmate'], 'tools')
          cls.paths['data'] = os.path.join(cls.paths['checkmate'], 'data')
          
---- a/CheckMATE-2.0.3/tools/python/CheckMATE.raw
-+++ b/CheckMATE-2.0.3/tools/python/CheckMATE.raw
-@@ -1,6 +1,6 @@
- #!/usr/bin/python
- import sys,os
--sys.path.append(os.path.join(os.path.split(os.path.split(os.path.realpath(__file__))[0])[0], "tools", "python"))
-+sys.path.append("/usr/share/CheckMATE/tools/python")
- sys.path.append('ROOT_LIB_DIR')
- from checkmate_core import CheckMATE2
- from advprint import AdvPrint
---- a/CheckMATE-2.0.3/tools/python/AnalysisManager.raw
-+++ b/CheckMATE-2.0.3/tools/python/AnalysisManager.raw
-@@ -3,7 +3,7 @@
- import os
- import sys
-
--sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "tools", "python"))
-+sys.path.append("/usr/share/CheckMATE/tools/python")
-
- reload(sys)