Update to 0.29 and add check() function

3 files changed, 52 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5a823cb0c4b1..5b617a635c17 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,16 @@
 pkgbase = r-xfun
-	pkgdesc = Supporting Functions for Packages Maintained by "Yihui Xie"
-	pkgver = 0.28
+	pkgdesc = Supporting Functions for Packages Maintained by 'Yihui Xie'
+	pkgver = 0.29
 	pkgrel = 1
 	url = https://cran.r-project.org/package=xfun
 	arch = i686
 	arch = x86_64
 	license = MIT
+	checkdepends = r-mime
+	checkdepends = r-testit
 	depends = r
 	optdepends = r-testit
+	optdepends = r-codetools
 	optdepends = r-rstudioapi
 	optdepends = r-tinytex
 	optdepends = r-mime
@@ -21,7 +24,9 @@ pkgbase = r-xfun
 	optdepends = r-curl
 	optdepends = r-jsonlite
 	optdepends = r-rmarkdown
-	source = https://cran.r-project.org/src/contrib/xfun_0.28.tar.gz
-	sha256sums = 0b5be439de8bceb166d98de956eacc7c723378f8af8feef8169ca40c0a683b32
+	source = https://cran.r-project.org/src/contrib/xfun_0.29.tar.gz
+	source = R-MIT-TEMPLATE::https://cran.r-project.org/web/licenses/MIT
+	sha256sums = bf85bb7b4653d03e0730682ffe1d6d3544ac0b36989f9196b2054d356c224ef4
+	sha256sums = e76e4aad5d3d9d606db6f8c460311b6424ebadfce13f5322e9bae9d49cc6090b
 
 pkgname = r-xfun
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 015f10911770..a37ae9df226c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,54 @@
-# 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=xfun
-_cranver=0.28
+_cranver=0.29
 pkgname=r-${_cranname,,}
 pkgver=${_cranver//[:-]/.}
 pkgrel=1
-pkgdesc='Supporting Functions for Packages Maintained by "Yihui Xie"'
+pkgdesc="Supporting Functions for Packages Maintained by 'Yihui Xie'"
 arch=(i686 x86_64)
-url='https://cran.r-project.org/package=xfun'
+url="https://cran.r-project.org/package=${_cranname}"
 license=(MIT)
 depends=(r)
-optdepends=(r-testit r-rstudioapi r-tinytex r-mime r-markdown r-knitr r-htmltools r-remotes r-pak r-rhub r-renv r-curl r-jsonlite r-rmarkdown)
-source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
-sha256sums=('0b5be439de8bceb166d98de956eacc7c723378f8af8feef8169ca40c0a683b32')
+checkdepends=(r-mime r-testit)
+optdepends=(
+    r-testit
+    r-codetools
+    r-rstudioapi
+    r-tinytex
+    r-mime
+    r-markdown
+    r-knitr
+    r-htmltools
+    r-remotes
+    r-pak
+    r-rhub
+    r-renv
+    r-curl
+    r-jsonlite
+    r-rmarkdown
+)
+source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz"
+        "R-MIT-TEMPLATE::https://cran.r-project.org/web/licenses/MIT")
+sha256sums=('bf85bb7b4653d03e0730682ffe1d6d3544ac0b36989f9196b2054d356c224ef4'
+            'e76e4aad5d3d9d606db6f8c460311b6424ebadfce13f5322e9bae9d49cc6090b')
 
-build(){
-  R CMD INSTALL ${_cranname}_${_cranver}.tar.gz -l "${srcdir}"
+build() {
+  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 test-cran.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"
+
+  install -Dm644 R-MIT-TEMPLATE "${pkgdir}/usr/share/licenses/${pkgname}/MIT"
+  install -Dm644 "${_cranname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }