[lilac] updated to 0.4.3-3

2 files changed, 58 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 452432cce46d..0a49d36e4134 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,15 @@
 pkgbase = r-cpp11
 	pkgdesc = A C++11 Interface for R's C Interface
 	pkgver = 0.4.3
-	pkgrel = 1
+	pkgrel = 3
 	url = https://cran.r-project.org/package=cpp11
 	arch = any
 	license = MIT
+	checkdepends = r-decor
+	checkdepends = r-knitr
+	checkdepends = r-mockery
+	checkdepends = r-progress
+	checkdepends = r-testthat
 	depends = r
 	optdepends = r-bench
 	optdepends = r-brio
@@ -19,16 +24,15 @@ pkgbase = r-cpp11
 	optdepends = r-lobstr
 	optdepends = r-mockery
 	optdepends = r-progress
+	optdepends = r-rcpp
 	optdepends = r-rmarkdown
 	optdepends = r-scales
-	optdepends = r-rcpp
 	optdepends = r-testthat
 	optdepends = r-tibble
 	optdepends = r-vctrs
 	optdepends = r-withr
 	source = https://cran.r-project.org/src/contrib/cpp11_0.4.3.tar.gz
-	source = CRAN-MIT-TEMPLATE::https://cran.r-project.org/web/licenses/MIT
+	md5sums = af41a95ad71f4179f680c8e3138d5ba5
 	sha256sums = f1a60e4971a86dbbcf6a16bbd739b59bb66d9c45d93cfd8dedc2a87e302598f1
-	sha256sums = e76e4aad5d3d9d606db6f8c460311b6424ebadfce13f5322e9bae9d49cc6090b
 
 pkgname = r-cpp11
diff --git a/PKGBUILD b/PKGBUILD
index 1a717afb2f56..f01fe05ae0c7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,53 +1,66 @@
 # 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
 
-_cranname=cpp11
-_cranver=0.4.3
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=1
+_pkgname=cpp11
+_pkgver=0.4.3
+pkgname=r-${_pkgname,,}
+pkgver=${_pkgver//-/.}
+pkgrel=3
 pkgdesc="A C++11 Interface for R's C Interface"
 arch=(any)
-url="https://cran.r-project.org/package=${_cranname}"
+url="https://cran.r-project.org/package=${_pkgname}"
 license=(MIT)
-depends=(r)
+depends=(
+  r
+)
+checkdepends=(
+  r-decor
+  r-knitr
+  r-mockery
+  r-progress
+  r-testthat
+)
 optdepends=(
-    r-bench
-    r-brio
-    r-callr
-    r-cli
-    r-covr
-    r-decor
-    r-desc
-    r-ggplot2
-    r-glue
-    r-knitr
-    r-lobstr
-    r-mockery
-    r-progress
-    r-rmarkdown
-    r-scales
-    r-rcpp
-    r-testthat
-    r-tibble
-    r-vctrs
-    r-withr
+  r-bench
+  r-brio
+  r-callr
+  r-cli
+  r-covr
+  r-decor
+  r-desc
+  r-ggplot2
+  r-glue
+  r-knitr
+  r-lobstr
+  r-mockery
+  r-progress
+  r-rcpp
+  r-rmarkdown
+  r-scales
+  r-testthat
+  r-tibble
+  r-vctrs
+  r-withr
 )
-source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz"
-        "CRAN-MIT-TEMPLATE::https://cran.r-project.org/web/licenses/MIT")
-sha256sums=('f1a60e4971a86dbbcf6a16bbd739b59bb66d9c45d93cfd8dedc2a87e302598f1'
-            'e76e4aad5d3d9d606db6f8c460311b6424ebadfce13f5322e9bae9d49cc6090b')
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
+md5sums=('af41a95ad71f4179f680c8e3138d5ba5')
+sha256sums=('f1a60e4971a86dbbcf6a16bbd739b59bb66d9c45d93cfd8dedc2a87e302598f1')
 
 build() {
   mkdir -p build
-  R CMD INSTALL "${_cranname}" -l "${srcdir}/build"
+  R CMD INSTALL "$_pkgname" -l build
 }
 
-package() {
-  install -dm0755 "${pkgdir}/usr/lib/R/library"
+check() {
+  cd "$_pkgname/tests"
+  R_LIBS="$srcdir/build" NOT_CRAN=true Rscript --vanilla testthat.R
+}
 
-  cp -a --no-preserve=ownership "build/${_cranname}" "${pkgdir}/usr/lib/R/library"
+package() {
+  install -d "$pkgdir/usr/lib/R/library"
+  cp -a --no-preserve=ownership "build/$_pkgname" "$pkgdir/usr/lib/R/library"
 
-  install -Dm644 CRAN-MIT-TEMPLATE "${pkgdir}/usr/share/licenses/${pkgname}/MIT"
-  install -Dm644 "${_cranname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -d "$pkgdir/usr/share/licenses/$pkgname"
+  ln -s "/usr/lib/R/library/$_pkgname/LICENSE" "$pkgdir/usr/share/licenses/$pkgname"
 }