[lilac] updated to 0.4.5-1

2 files changed, 26 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 951a4b43a58d..85d320a7df11 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,11 @@
 pkgbase = r-tidytree
 	pkgdesc = A Tidy Tool for Phylogenetic Tree Data Manipulation
-	pkgver = 0.4.4
+	pkgver = 0.4.5
 	pkgrel = 1
 	url = https://cran.r-project.org/package=tidytree
 	arch = any
 	license = Artistic2.0
-	depends = r
+	checkdepends = r-testthat
 	depends = r-ape
 	depends = r-cli
 	depends = r-dplyr
@@ -21,8 +21,8 @@ pkgbase = r-tidytree
 	optdepends = r-prettydoc
 	optdepends = r-rmarkdown
 	optdepends = r-testthat
-	optdepends = r-utils
-	source = https://cran.r-project.org/src/contrib/tidytree_0.4.4.tar.gz
-	sha256sums = 21560aa418af1f2db25e2b4f591ceb44508e0ef81a36892482fcaa77873ccca4
+	source = https://cran.r-project.org/src/contrib/tidytree_0.4.5.tar.gz
+	md5sums = 640ea7d55246de3bfcc2019183093118
+	sha256sums = d2708e5ff068102262eb3bc0577e34522263d70ed1e291ef196c931b51c89472
 
 pkgname = r-tidytree
diff --git a/PKGBUILD b/PKGBUILD
index ac33c7f541fe..d15099456d3b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,16 +1,16 @@
-# Maintainer: Guoyi Zhang <guoyizhang at malacology dot net>
+# Maintainer: Pekka Ristola <pekkarr [at] protonmail [dot] com>
+# Contributor: Guoyi Zhang <guoyizhang at malacology dot net>
 
 _pkgname=tidytree
-_pkgver=0.4.4
+_pkgver=0.4.5
 pkgname=r-${_pkgname,,}
-pkgver=0.4.4
+pkgver=${_pkgver//-/.}
 pkgrel=1
-pkgdesc='A Tidy Tool for Phylogenetic Tree Data Manipulation'
-arch=('any')
+pkgdesc="A Tidy Tool for Phylogenetic Tree Data Manipulation"
+arch=(any)
 url="https://cran.r-project.org/package=${_pkgname}"
-license=('Artistic2.0')
+license=(Artistic2.0)
 depends=(
-  r
   r-ape
   r-cli
   r-dplyr
@@ -23,22 +23,30 @@ depends=(
   r-tidyselect
   r-yulab.utils
 )
+checkdepends=(
+  r-testthat
+)
 optdepends=(
   r-knitr
   r-prettydoc
   r-rmarkdown
   r-testthat
-  r-utils
 )
 source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
-sha256sums=('21560aa418af1f2db25e2b4f591ceb44508e0ef81a36892482fcaa77873ccca4')
+md5sums=('640ea7d55246de3bfcc2019183093118')
+sha256sums=('d2708e5ff068102262eb3bc0577e34522263d70ed1e291ef196c931b51c89472')
 
 build() {
-  R CMD INSTALL ${_pkgname}_${_pkgver}.tar.gz -l "${srcdir}"
+  mkdir -p build
+  R CMD INSTALL "$_pkgname" -l build
+}
+
+check() {
+  cd "$_pkgname/tests"
+  R_LIBS="$srcdir/build" NOT_CRAN=true Rscript --vanilla testthat.R
 }
 
 package() {
-  install -dm0755 "${pkgdir}/usr/lib/R/library"
-  cp -a --no-preserve=ownership "${_pkgname}" "${pkgdir}/usr/lib/R/library"
+  install -d "$pkgdir/usr/lib/R/library"
+  cp -a --no-preserve=ownership "build/$_pkgname" "$pkgdir/usr/lib/R/library"
 }
-# vim:set ts=2 sw=2 et: