[lilac] updated to 3.6.3-2

2 files changed, 39 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8f8c17401492..328a0280bfe0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,17 @@
 pkgbase = r-covr
 	pkgdesc = Test Coverage for Packages
 	pkgver = 3.6.3
-	pkgrel = 1
+	pkgrel = 2
 	url = https://cran.r-project.org/package=covr
 	arch = x86_64
-	license = GPL
-	depends = r
+	license = MIT
+	checkdepends = r-dt
+	checkdepends = r-htmltools
+	checkdepends = r-memoise
+	checkdepends = r-mockery
+	checkdepends = r-rstudioapi
+	checkdepends = r-testthat
+	checkdepends = r-xml2
 	depends = r-crayon
 	depends = r-digest
 	depends = r-httr
@@ -20,7 +26,6 @@ pkgbase = r-covr
 	optdepends = r-knitr
 	optdepends = r-memoise
 	optdepends = r-mockery
-	optdepends = r-parallel
 	optdepends = r-r6
 	optdepends = r-rlang
 	optdepends = r-rmarkdown
@@ -28,6 +33,7 @@ pkgbase = r-covr
 	optdepends = r-testthat
 	optdepends = r-xml2
 	source = https://cran.r-project.org/src/contrib/covr_3.6.3.tar.gz
+	md5sums = 37f5087c63b1f25b4c6f8df36fcdecbe
 	sha256sums = c0ce1846a4d12cd7d365ed1844c221cd8a40f50ea2c6d7d87f27c3e7deffa29e
 
 pkgname = r-covr
diff --git a/PKGBUILD b/PKGBUILD
index e235a047c9fd..004be6c2b68e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
-# 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: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
 # Contributor: Ward Segers <w@rdsegers.be>
 # Contributor: Alex Branham <alex.branham@gmail.com>
@@ -6,14 +7,13 @@
 _pkgname=covr
 _pkgver=3.6.3
 pkgname=r-${_pkgname,,}
-pkgver=3.6.3
-pkgrel=1
-pkgdesc='Test Coverage for Packages'
-arch=('x86_64')
+pkgver=${_pkgver//-/.}
+pkgrel=2
+pkgdesc="Test Coverage for Packages"
+arch=(x86_64)
 url="https://cran.r-project.org/package=${_pkgname}"
-license=('GPL')
+license=(MIT)
 depends=(
-  r
   r-crayon
   r-digest
   r-httr
@@ -22,6 +22,15 @@ depends=(
   r-withr
   r-yaml
 )
+checkdepends=(
+  r-dt
+  r-htmltools
+  r-memoise
+  r-mockery
+  r-rstudioapi
+  r-testthat
+  r-xml2
+)
 optdepends=(
   r-covr
   r-curl
@@ -30,7 +39,6 @@ optdepends=(
   r-knitr
   r-memoise
   r-mockery
-  r-parallel
   r-r6
   r-rlang
   r-rmarkdown
@@ -39,14 +47,23 @@ optdepends=(
   r-xml2
 )
 source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
+md5sums=('37f5087c63b1f25b4c6f8df36fcdecbe')
 sha256sums=('c0ce1846a4d12cd7d365ed1844c221cd8a40f50ea2c6d7d87f27c3e7deffa29e')
 
 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"
+
+  install -d "$pkgdir/usr/share/licenses/$pkgname"
+  ln -s "/usr/lib/R/library/$_pkgname/LICENSE" "$pkgdir/usr/share/licenses/$pkgname"
 }
-# vim:set ts=2 sw=2 et: