Update 1.37

3 files changed, 67 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 41297d1788c4..62ac4fa9bee6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,18 @@
 pkgbase = r-knitr
 	pkgdesc = A General-Purpose Package for Dynamic Report Generation in R
-	pkgver = 1.36
+	pkgver = 1.37
 	pkgrel = 1
 	url = https://cran.r-project.org/package=knitr
 	arch = any
-	license = GPL2
-	license = GPL3
-	depends = r>=3.2.3
-	depends = r-evaluate>=0.10
+	license = GPL
+	checkdepends = r-rmarkdown
+	checkdepends = r-testit
+	checkdepends = r-tibble
+	depends = r-evaluate
 	depends = r-highr
-	depends = r-stringr>=0.6
-	depends = r-yaml>=2.1.19
-	depends = r-xfun>=0.21
+	depends = r-stringr
+	depends = r-yaml
+	depends = r-xfun
 	optdepends = r-markdown
 	optdepends = r-formatr
 	optdepends = r-testit
@@ -41,7 +42,7 @@ pkgbase = r-knitr
 	optdepends = r-targets
 	optdepends = pandoc: R Markdown v2 and reStructuredText support
 	optdepends = rst2pdf: rst2pdf() support
-	source = https://cran.r-project.org/src/contrib/knitr_1.36.tar.gz
-	sha256sums = 6ecef5b428d135e95a05f24f9f194d0d828b1180c61be44ad89b6210e32b8e41
+	source = https://cran.r-project.org/src/contrib/knitr_1.37.tar.gz
+	sha256sums = 39cd2a4848baebbe7fa0c0ab8200179690fb5b9190f0c1688d987c38363ad763
 
 pkgname = r-knitr
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..018a3de08144
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*
+!PKGBUILD
+!.SRCINFO
+!.gitignore
diff --git a/PKGBUILD b/PKGBUILD
index 1938c862be45..4740872bb3ba 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,69 @@
-# Maintainer: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
+# Maintainer: Pekka Ristola <pekkarr [at] protonmail [dot] com>
+# Contributor: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
 
 _cranname=knitr
-_cranver=1.36
+_cranver=1.37
 pkgname=r-${_cranname,,}
 pkgver=${_cranver//[:-]/.}
 pkgrel=1
 pkgdesc="A General-Purpose Package for Dynamic Report Generation in R"
 arch=(any)
 url="https://cran.r-project.org/package=${_cranname}"
-license=(GPL2 GPL3)
-depends=('r>=3.2.3' 'r-evaluate>=0.10' r-highr 'r-stringr>=0.6' 'r-yaml>=2.1.19' 'r-xfun>=0.21')
-optdepends=(r-markdown r-formatr r-testit r-digest r-rgl r-codetools r-rmarkdown r-htmlwidgets r-webshot r-tikzdevice r-tinytex r-reticulate r-juliacall r-magick r-png r-jpeg r-gifski r-xml2 r-httr r-dbi r-showtext r-tibble r-sass r-bslib r-ragg r-styler r-targets 'pandoc: R Markdown v2 and reStructuredText support' 'rst2pdf: rst2pdf() support')
+license=(GPL)
+depends=(
+    r-evaluate
+    r-highr
+    r-stringr
+    r-yaml
+    r-xfun
+)
+checkdepends=(r-rmarkdown r-testit r-tibble)
+optdepends=(
+    r-markdown
+    r-formatr
+    r-testit
+    r-digest
+    r-rgl
+    r-codetools
+    r-rmarkdown
+    r-htmlwidgets
+    r-webshot
+    r-tikzdevice
+    r-tinytex
+    r-reticulate
+    r-juliacall
+    r-magick
+    r-png
+    r-jpeg
+    r-gifski
+    r-xml2
+    r-httr
+    r-dbi
+    r-showtext
+    r-tibble
+    r-sass
+    r-bslib
+    r-ragg
+    r-styler
+    r-targets
+    'pandoc: R Markdown v2 and reStructuredText support'
+    'rst2pdf: rst2pdf() support'
+)
 source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
-sha256sums=('6ecef5b428d135e95a05f24f9f194d0d828b1180c61be44ad89b6210e32b8e41')
+sha256sums=('39cd2a4848baebbe7fa0c0ab8200179690fb5b9190f0c1688d987c38363ad763')
 
 build() {
-  R CMD INSTALL ${_cranname}_${_cranver}.tar.gz -l "${srcdir}"
+  mkdir -p build
+  R CMD INSTALL "${_cranname}" -l "${srcdir}/build"
+}
+
+check() {
+  cd "${_cranname}/tests"
+  R_LIBS="${srcdir}/build" _R_CHECK_PACKAGE_NAME_=false Rscript --vanilla run-all.R
 }
 
 package() {
   install -dm0755 "${pkgdir}/usr/lib/R/library"
 
-  cp -a --no-preserve=ownership "${_cranname}" "${pkgdir}/usr/lib/R/library"
+  cp -a --no-preserve=ownership "build/${_cranname}" "${pkgdir}/usr/lib/R/library"
 }