[lilac] updated to 0.99.49-2

2 files changed, 24 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c0b1497247f5..d76a0591e764 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,12 @@
 pkgbase = r-desctools
 	pkgdesc = Tools for Descriptive Statistics
 	pkgver = 0.99.49
-	pkgrel = 1
+	pkgrel = 2
 	url = https://cran.r-project.org/package=DescTools
 	arch = x86_64
 	license = GPL
 	makedepends = gcc-fortran
-	depends = r
-	depends = r-bh
+	makedepends = r-bh
 	depends = r-data.table
 	depends = r-exact
 	depends = r-expm
@@ -20,10 +19,10 @@ pkgbase = r-desctools
 	depends = r-withr
 	optdepends = r-r.rsp
 	optdepends = r-rdcomclient
-	optdepends = r-tcltk
 	optdepends = r-testthat
 	optdepends = r-vgam
 	source = https://cran.r-project.org/src/contrib/DescTools_0.99.49.tar.gz
+	md5sums = b398e94abb66cfeace9fb2c74249f935
 	sha256sums = 4522cd2b308bafd0d26220496daa35c62fa891d2ef7ac6572e8419f03b825f68
 
 pkgname = r-desctools
diff --git a/PKGBUILD b/PKGBUILD
index 5a82ee544c19..bda8f2a68c9f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,18 @@
-# system requirements: C++11
-# Maintainer: Guoyi Zhang <guoyizhang at malacology dot net>
+# Maintainer: Pekka Ristola <pekkarr [at] protonmail [dot] com>
+# Contributor: Guoyi Zhang <guoyizhang at malacology dot net>
 # Contributor: Robert Greener <me@r0bert.dev>
 # Contributor: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
 
 _pkgname=DescTools
 _pkgver=0.99.49
 pkgname=r-${_pkgname,,}
-pkgver=0.99.49
-pkgrel=1
-pkgdesc='Tools for Descriptive Statistics'
-arch=('x86_64')
+pkgver=${_pkgver//-/.}
+pkgrel=2
+pkgdesc="Tools for Descriptive Statistics"
+arch=(x86_64)
 url="https://cran.r-project.org/package=${_pkgname}"
-license=('GPL')
+license=(GPL)
 depends=(
-  r
-  r-bh
   r-data.table
   r-exact
   r-expm
@@ -26,25 +24,31 @@ depends=(
   r-rstudioapi
   r-withr
 )
+makedepends=(
+  gcc-fortran
+  r-bh
+)
 optdepends=(
   r-r.rsp
   r-rdcomclient
-  r-tcltk
   r-testthat
   r-vgam
 )
-makedepends=(
-  gcc-fortran
-)
 source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
+md5sums=('b398e94abb66cfeace9fb2c74249f935')
 sha256sums=('4522cd2b308bafd0d26220496daa35c62fa891d2ef7ac6572e8419f03b825f68')
 
 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" Rscript --vanilla misc.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: