Update to use Python3.

2 files changed, 29 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b196078f0c24..2a7f8e89728e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,23 @@
+# Generated by mksrcinfo v8
+# Thu Aug 16 12:58:54 UTC 2018
 pkgbase = rivet-hg
 	pkgdesc = A particle physics package for data analysis and validation of Monte Carlo event generators -- latest build from hg-repo
-	pkgver = r4803.18d522e5cb21
+	pkgver = r6396.6af72c1a196d
 	pkgrel = 1
 	url = http://rivet.hepforge.org
 	arch = x86_64
 	arch = i686
-	license = GPL2
-	makedepends = cython2
-	makedepends = boost
-	makedepends = mercurial
-	makedepends = autoconf
-	makedepends = libtool
-	makedepends = automake
-	depends = python2
-	depends = yoda-hg
+	license = GPL3
+	makedepends = cython
+	depends = python
+	depends = yoda>=1.7.1
 	depends = fastjet
 	depends = gsl
 	depends = hepmc
+	optdepends = texlive-core: Plotting functionality
+	optdepends = ghostscript: PDF plot output
+	optdepends = imagemagick: PNG plot output
+	optdepends = python2: For Python2 module in addition to Python3
 	provides = rivet
 	conflicts = rivet
 	source = hg+https://rivet.hepforge.org/hg/rivet
diff --git a/PKGBUILD b/PKGBUILD
index 6ff3c3d8b567..adbeef253808 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,28 @@
 # Maintainer: Frank Siegert <frank.siegert@googlemail.com>
 pkgname=rivet-hg
-pkgver=r4803.18d522e5cb21
+pkgver=r6396.6af72c1a196d
 pkgrel=1
 pkgdesc="A particle physics package for data analysis and validation of Monte Carlo event generators -- latest build from hg-repo"
 arch=('x86_64' 'i686')
 url="http://rivet.hepforge.org"
-license=('GPL2')
+license=('GPL3')
 conflicts=('rivet')
 provides=('rivet')
-depends=('python2' 'yoda-hg' 'fastjet' 'gsl' 'hepmc')
-makedepends=('cython2' 'boost' 'mercurial' 'autoconf' 'libtool' 'automake')
+depends=('python' 'yoda>=1.7.1' 'fastjet' 'gsl' 'hepmc')
+optdepends=('texlive-core: Plotting functionality'
+            'ghostscript: PDF plot output'
+            'imagemagick: PNG plot output'
+            'python2: For Python2 module in addition to Python3')
+makedepends=('cython')
 source=('hg+https://rivet.hepforge.org/hg/rivet')
 md5sums=('SKIP')
 
-prepare() {
-	cd "$srcdir/rivet"
-        sed -e 's/\/usr\/bin\/env python$/\/usr\/bin\/env python2/g' -i bin/* doc/* pyext/setup.py.in pyext/rivet/spiresbib.py
-        sed -e 's/cython /cython2 /g' -i pyext/rivet/Makefile.am
-}
-
 build() {
 	cd "$srcdir/rivet"
-        export PYTHON=/usr/bin/python2
         autoreconf -i
+        ## need to rebuild Python extension code with up-to-date Cython for Python 3.7
+        ## will eventually be fixed upstream
+        touch pyext/rivet/*.pyx
 	./configure --prefix=/usr
 	make
 }
@@ -30,6 +30,13 @@ build() {
 package() {
 	cd "$srcdir/rivet"
 	make DESTDIR="$pkgdir/" install
+
+        # If python2 is present, also build a library for it
+        if [ -x /usr/bin/python2 ]; then
+          PYTHON=/usr/bin/python2 ./configure --prefix=/usr
+          make DESTDIR="$pkgdir/" install
+        fi
+        
         mkdir -p $pkgdir/etc/bash_completion.d
         mv $pkgdir/usr/share/Rivet/rivet-completion $pkgdir/etc/bash_completion.d
 }