[lilac] updated to 1.1.2-3

2 files changed, 68 insertions, 54 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 28cc9d2559a2..b957a039d5cf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,26 @@
 pkgbase = r-dplyr
 	pkgdesc = A Grammar of Data Manipulation
 	pkgver = 1.1.2
-	pkgrel = 1
+	pkgrel = 3
 	url = https://cran.r-project.org/package=dplyr
-	arch = i686
 	arch = x86_64
 	license = MIT
+	checkdepends = r-lobstr
+	checkdepends = r-purrr
+	checkdepends = r-rsqlite
+	checkdepends = r-stringi
+	checkdepends = r-testthat
 	depends = r-cli
 	depends = r-generics
 	depends = r-glue
 	depends = r-lifecycle
 	depends = r-magrittr
+	depends = r-pillar
 	depends = r-r6
 	depends = r-rlang
 	depends = r-tibble
 	depends = r-tidyselect
 	depends = r-vctrs
-	depends = r-pillar
 	optdepends = r-bench
 	optdepends = r-broom
 	optdepends = r-callr
@@ -39,8 +43,7 @@ pkgbase = r-dplyr
 	optdepends = r-tidyr
 	optdepends = r-withr
 	source = https://cran.r-project.org/src/contrib/dplyr_1.1.2.tar.gz
-	source = CRAN-MIT-TEMPLATE::https://cran.r-project.org/web/licenses/MIT
+	md5sums = f139a07119594ad50882f14fc8bd90e1
 	sha256sums = c220c38a3a44977c43eeae3d9aef90e8bb297150cad0993ea8d3cc13150096e3
-	sha256sums = e76e4aad5d3d9d606db6f8c460311b6424ebadfce13f5322e9bae9d49cc6090b
 
 pkgname = r-dplyr
diff --git a/PKGBUILD b/PKGBUILD
index 101e73ddb9f6..da7f1287759f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,67 +1,78 @@
 # 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: frichtlm <frichtlm@gmail.com>
 
-_cranname=dplyr
-_cranver=1.1.2
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=1
+_pkgname=dplyr
+_pkgver=1.1.2
+pkgname=r-${_pkgname,,}
+pkgver=${_pkgver//-/.}
+pkgrel=3
 pkgdesc="A Grammar of Data Manipulation"
-arch=(i686 x86_64)
-url="https://cran.r-project.org/package=${_cranname}"
+arch=(x86_64)
+url="https://cran.r-project.org/package=${_pkgname}"
 license=(MIT)
 depends=(
-    r-cli
-    r-generics
-    r-glue
-    r-lifecycle
-    r-magrittr
-    r-r6
-    r-rlang
-    r-tibble
-    r-tidyselect
-    r-vctrs
-    r-pillar
+  r-cli
+  r-generics
+  r-glue
+  r-lifecycle
+  r-magrittr
+  r-pillar
+  r-r6
+  r-rlang
+  r-tibble
+  r-tidyselect
+  r-vctrs
+)
+checkdepends=(
+  r-lobstr
+  r-purrr
+  r-rsqlite
+  r-stringi
+  r-testthat
 )
 optdepends=(
-    r-bench
-    r-broom
-    r-callr
-    r-covr
-    r-dbi
-    r-dbplyr
-    r-ggplot2
-    r-knitr
-    r-lahman
-    r-lobstr
-    r-microbenchmark
-    r-nycflights13
-    r-purrr
-    r-rmarkdown
-    r-rmysql
-    r-rpostgresql
-    r-rsqlite
-    r-stringi
-    r-testthat
-    r-tidyr
-    r-withr
+  r-bench
+  r-broom
+  r-callr
+  r-covr
+  r-dbi
+  r-dbplyr
+  r-ggplot2
+  r-knitr
+  r-lahman
+  r-lobstr
+  r-microbenchmark
+  r-nycflights13
+  r-purrr
+  r-rmarkdown
+  r-rmysql
+  r-rpostgresql
+  r-rsqlite
+  r-stringi
+  r-testthat
+  r-tidyr
+  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=('c220c38a3a44977c43eeae3d9aef90e8bb297150cad0993ea8d3cc13150096e3'
-            'e76e4aad5d3d9d606db6f8c460311b6424ebadfce13f5322e9bae9d49cc6090b')
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
+md5sums=('f139a07119594ad50882f14fc8bd90e1')
+sha256sums=('c220c38a3a44977c43eeae3d9aef90e8bb297150cad0993ea8d3cc13150096e3')
 
 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"
 }