[lilac] updated to 1.2.0-2

2 files changed, 32 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3e198932ff07..3fbf7c901483 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,22 @@
-# Generated by mksrcinfo v8
-# Thu Mar  9 08:25:06 UTC 2017
 pkgbase = revbayes-mpi
-	pkgdesc = bayesian phylogenetic inference using probabilistic graphical models and an interpreted language
-	pkgver = 1.0.4
-	pkgrel = 1
+	pkgdesc = Bayesian Phylogenetic Inference Using Graphical Models and an Interactive Model-Specification Language https://doi.org/10.1093/sysbio/syw021
+	pkgver = 1.2.0
+	pkgrel = 2
 	url = https://github.com/revbayes/revbayes
-	arch = i686
 	arch = x86_64
 	license = GPL3
 	makedepends = boost
+	makedepends = meson
+	makedepends = ninja
 	makedepends = cmake
+	makedepends = git
+	depends = gcc-libs
+	depends = boost-libs
+	depends = openlibm
 	depends = openmpi
-	conflicts = revbayes-mpi-git
-	source = revbayes-1.0.4.tar.gz::https://github.com/revbayes/revbayes/archive/v1.0.4-release.tar.gz
-	md5sums = 5d6de96bcb3b2686b270856de3555a58
+	conflicts = lrzsz
+	conflicts = revbayes-mpi
+	source = git+https://github.com/revbayes/revbayes.git#tag=v1.2.0
+	md5sums = SKIP
 
 pkgname = revbayes-mpi
-
diff --git a/PKGBUILD b/PKGBUILD
index f64dc2b741ae..5f86a125145f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,44 +1,32 @@
-# Maintainer: Christian Krause ("wookietreiber") <christian.krause@mailbox.org>
-
 pkgname=revbayes-mpi
-
-pkgver=1.0.4
-pkgrel=1
-pkgdesc="bayesian phylogenetic inference using probabilistic graphical models and an interpreted language"
-arch=(i686 x86_64)
+_pkgname=revbayes
+pkgver=1.2.0
+pkgrel=2
+pkgdesc="Bayesian Phylogenetic Inference Using Graphical Models and an Interactive Model-Specification Language https://doi.org/10.1093/sysbio/syw021"
+arch=(x86_64)
 url="https://github.com/revbayes/revbayes"
 license=(GPL3)
-depends=(openmpi)
-makedepends=(boost cmake)
-conflicts=('revbayes-mpi-git')
-source=("revbayes-$pkgver.tar.gz::https://github.com/revbayes/revbayes/archive/v$pkgver-release.tar.gz")
+depends=('gcc-libs' 'boost-libs' 'openlibm' 'openmpi')
+makedepends=('boost' 'meson' 'ninja' 'cmake' 'git')
+conflicts=('lrzsz' 'revbayes-mpi')
+source=("git+$url.git#tag=v$pkgver")
+md5sums=('SKIP')
 
 prepare() {
-  cd $srcdir/revbayes-$pkgver-release
-
-  rm -rf boost_*
-
-  cd projects/cmake
-
-  mkdir -p build
-
-  ./regenerate.sh -boost false -mpi true
+  cd $srcdir/$_pkgname
+  git submodule update --init --recursive
+  ./projects/meson/generate.sh
 }
 
 build() {
-  cd $srcdir/revbayes-$pkgver-release/projects/cmake/build
-
-  cmake \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release \
-
-  make
+  cd $srcdir/$_pkgname
+  arch-meson build -Dmpi=true
+  ninja -C build
 }
 
 package() {
-  cd $srcdir/revbayes-$pkgver-release/projects/cmake
-
-  install -Dm755 rb-mpi $pkgdir/usr/bin/rb-mpi
+  cd $srcdir/$_pkgname
+  DESTDIR="${pkgdir}" ninja -C build install
 }
 
-md5sums=('5d6de96bcb3b2686b270856de3555a58')
+