[lilac] updated to 0.3.1-6

2 files changed, 45 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eff01a4e92d2..ff90eb131db1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = r-furrr
 	pkgdesc = Apply Mapping Functions in Parallel using Futures
 	pkgver = 0.3.1
-	pkgrel = 1
+	pkgrel = 6
 	url = https://cran.r-project.org/package=furrr
 	arch = any
 	license = MIT
@@ -21,11 +21,10 @@ pkgbase = r-furrr
 	optdepends = r-magrittr
 	optdepends = r-rmarkdown
 	optdepends = r-testthat
-	optdepends = r-withr
 	optdepends = r-tidyselect
+	optdepends = r-withr
 	source = https://cran.r-project.org/src/contrib/furrr_0.3.1.tar.gz
-	source = CRAN-MIT-TEMPLATE::https://cran.r-project.org/web/licenses/MIT
+	md5sums = 813dfb60e455c5667be5117b3df2943b
 	sha256sums = 0d91735e2e9be759b1ab148d115c2c7429b79740514778828e5dab631dc0e48b
-	sha256sums = e76e4aad5d3d9d606db6f8c460311b6424ebadfce13f5322e9bae9d49cc6090b
 
 pkgname = r-furrr
diff --git a/PKGBUILD b/PKGBUILD
index cdecf7d1053e..3e89dd24fd81 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,55 +1,62 @@
 # Maintainer: Pekka Ristola <pekkarr [at] protonmail [dot] com>
+# Contributor: Guoyi Zhang <guoyizhang at malacology dot net>
 
-_cranname=furrr
-_cranver=0.3.1
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=1
+_pkgname=furrr
+_pkgver=0.3.1
+pkgname=r-${_pkgname,,}
+pkgver=${_pkgver//-/.}
+pkgrel=6
 pkgdesc="Apply Mapping Functions in Parallel using Futures"
 arch=(any)
-url="https://cran.r-project.org/package=${_cranname}"
+url="https://cran.r-project.org/package=${_pkgname}"
 license=(MIT)
 depends=(
-    r-future
-    r-globals
-    r-lifecycle
-    r-purrr
-    r-rlang
-    r-vctrs
+  r-future
+  r-globals
+  r-lifecycle
+  r-purrr
+  r-rlang
+  r-vctrs
+)
+checkdepends=(
+  r-dplyr
+  r-testthat
 )
-checkdepends=(r-dplyr r-testthat)
 optdepends=(
-    r-carrier
-    r-covr
-    r-dplyr
-    r-knitr
-    r-listenv
-    r-magrittr
-    r-rmarkdown
-    r-testthat
-    r-withr
-    r-tidyselect
+  r-carrier
+  r-covr
+  r-dplyr
+  r-knitr
+  r-listenv
+  r-magrittr
+  r-rmarkdown
+  r-testthat
+  r-tidyselect
+  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=('0d91735e2e9be759b1ab148d115c2c7429b79740514778828e5dab631dc0e48b'
-            'e76e4aad5d3d9d606db6f8c460311b6424ebadfce13f5322e9bae9d49cc6090b')
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
+md5sums=('813dfb60e455c5667be5117b3df2943b')
+sha256sums=('0d91735e2e9be759b1ab148d115c2c7429b79740514778828e5dab631dc0e48b')
+
+prepare() {
+  # fix snapshot test
+  sed -i 's/Please use/i Please use/' "$_pkgname/tests/testthat/_snaps/deprecation.md"
+}
 
 build() {
   mkdir -p build
-  R CMD INSTALL "${_cranname}" -l "${srcdir}/build"
+  R CMD INSTALL "$_pkgname" -l build
 }
 
 check() {
-  cd "${_cranname}/tests"
-  R_LIBS="${srcdir}/build" NOT_CRAN=true Rscript --vanilla testthat.R
+  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 "build/${_cranname}" "${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 -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"
 }