[lilac] updated to 2.22-2

2 files changed, 50 insertions, 52 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 60844eee112e..ceec4f9254f1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = r-rmarkdown
 	pkgdesc = Dynamic Documents for R
-	pkgver = 2.21
-	pkgrel = 1
+	pkgver = 2.22
+	pkgrel = 2
 	url = https://cran.r-project.org/package=rmarkdown
 	arch = any
 	license = GPL3
@@ -10,7 +10,6 @@ pkgbase = r-rmarkdown
 	checkdepends = r-testthat
 	checkdepends = texlive-core
 	checkdepends = texlive-latexextra
-	checkdepends = ttf-font
 	depends = pandoc
 	depends = r-bslib
 	depends = r-evaluate
@@ -24,18 +23,18 @@ pkgbase = r-rmarkdown
 	depends = r-xfun
 	depends = r-yaml
 	optdepends = r-digest
+	optdepends = r-downlit
 	optdepends = r-dygraphs
 	optdepends = r-fs
-	optdepends = r-rsconnect
-	optdepends = r-downlit
 	optdepends = r-katex
+	optdepends = r-rsconnect
 	optdepends = r-sass
 	optdepends = r-shiny
 	optdepends = r-testthat
 	optdepends = r-tibble
 	optdepends = r-vctrs
 	optdepends = r-withr
-	source = https://cran.r-project.org/src/contrib/rmarkdown_2.21.tar.gz
-	sha256sums = c25b20a422d11a115c93460f41c488874002154abb349b14e0d6518682fdac28
+	source = https://cran.r-project.org/src/contrib/rmarkdown_2.22.tar.gz
+	sha256sums = c6635519503e0fcdd518696d3ac96d8d28d9d4ecd9db0532c53426002f6387b8
 
 pkgname = r-rmarkdown
diff --git a/PKGBUILD b/PKGBUILD
index 67a3aa91bc3a..093ecccc27fb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,76 +1,75 @@
 # Maintainer: Pekka Ristola <pekkarr [at] protonmail [dot] com>
+# Contributor: Guoyi Zhang <guoyizhang at malacology dot net>
 # Contributor: anzi2001 <anzi2001 at gmail dot com>
 # Contributor: haha662 <haha662 at outlook dot com>
 # Contributor: Kibouo <csonka.mihaly@hotmail.com>
 # Contributor: Ward Segers <w@rdsegers.be>
 # Contributor: Alex Branham <branham@utexas.edu>
 
-_cranname=rmarkdown
-_cranver=2.21
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=1
+_pkgname=rmarkdown
+_pkgver=2.22
+pkgname=r-${_pkgname,,}
+pkgver=${_pkgver//[:-]/.}
+pkgrel=2
 pkgdesc="Dynamic Documents for R"
 arch=(any)
-url="https://cran.r-project.org/package=${_cranname}"
+url="https://cran.r-project.org/package=${_pkgname}"
 license=(GPL3)
 depends=(
-    pandoc
-    r-bslib
-    r-evaluate
-    r-fontawesome
-    r-htmltools
-    r-jquerylib
-    r-jsonlite
-    r-knitr
-    r-stringr
-    r-tinytex
-    r-xfun
-    r-yaml
+  pandoc
+  r-bslib
+  r-evaluate
+  r-fontawesome
+  r-htmltools
+  r-jquerylib
+  r-jsonlite
+  r-knitr
+  r-stringr
+  r-tinytex
+  r-xfun
+  r-yaml
 )
 checkdepends=(
-    r-curl
-    r-shiny
-    r-testthat
-    texlive-core
-    texlive-latexextra
-    ttf-font
+  r-curl
+  r-shiny
+  r-testthat
+  texlive-core
+  texlive-latexextra
 )
 optdepends=(
-    r-digest
-    r-dygraphs
-    r-fs
-    r-rsconnect
-    r-downlit
-    r-katex
-    r-sass
-    r-shiny
-    r-testthat
-    r-tibble
-    r-vctrs
-    r-withr
+  r-digest
+  r-downlit
+  r-dygraphs
+  r-fs
+  r-katex
+  r-rsconnect
+  r-sass
+  r-shiny
+  r-testthat
+  r-tibble
+  r-vctrs
+  r-withr
 )
-source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
-sha256sums=('c25b20a422d11a115c93460f41c488874002154abb349b14e0d6518682fdac28')
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
+sha256sums=('c6635519503e0fcdd518696d3ac96d8d28d9d4ecd9db0532c53426002f6387b8')
 
 prepare() {
   # Skip a test that might fail depending on environment
   sed -i '/"Converting bib file is working"/a\ \ skip("Inconsistent test")' \
-      "${_cranname}/tests/testthat/test-pandoc.R"
+      "$_pkgname/tests/testthat/test-pandoc.R"
 }
 
 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"
 }