upgpkg: r-rprojroot 2.0.3-2

2 files changed, 44 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5a6ba63f1e38..b334d4379d2f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,25 @@
 pkgbase = r-rprojroot
-	pkgdesc = Finding Files in Project Subdirectories
+	pkgdesc = Find Files in Project Subdirectories
 	pkgver = 2.0.3
-	pkgrel = 1
+	pkgrel = 2
 	url = https://cran.r-project.org/package=rprojroot
 	arch = any
 	license = MIT
+	checkdepends = r-covr
+	checkdepends = r-knitr
+	checkdepends = r-lifecycle
+	checkdepends = r-mockr
+	checkdepends = r-rmarkdown
+	checkdepends = r-withr
+	checkdepends = r-testthat
 	depends = r>=3.0.0
 	optdepends = r-covr
 	optdepends = r-knitr
 	optdepends = r-lifecycle
 	optdepends = r-mockr
 	optdepends = r-rmarkdown
-	optdepends = r-testthat>=3.0.0
 	optdepends = r-withr
 	source = https://cran.r-project.org/src/contrib/rprojroot_2.0.3.tar.gz
-	sha256sums = 50604247470e910cecfe9b76df754bf96a0d701f81b732f7aa9c90a20d30f897
+	b2sums = ccb1d8f06ada72aa666e7f81cfdf5ce77596fce543c525c80f6eb91a5239c78d42aa16f192d900f9a90fc98d8c283af1ec2eada755a2dff9147bcd03002ceca3
 
 pkgname = r-rprojroot
diff --git a/PKGBUILD b/PKGBUILD
index b1cd4b9c1b28..451d659b1429 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,27 +4,46 @@
 _cranname=rprojroot
 _cranver=2.0.3
 pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=1
-pkgdesc="Finding Files in Project Subdirectories"
-arch=(any)
+pkgdesc="Find Files in Project Subdirectories"
 url="https://cran.r-project.org/package=${_cranname}"
-license=(MIT)
-depends=('r>=3.0.0')
-optdepends=(r-covr r-knitr r-lifecycle r-mockr r-rmarkdown "r-testthat>=3.0.0" r-withr)
+license=("MIT")
+pkgver=${_cranver//[:-]/.}
+pkgrel=2
+
+arch=("any")
+depends=(
+    "r>=3.0.0"
+)
+optdepends=(
+    "r-covr"
+    "r-knitr"
+    "r-lifecycle"
+    "r-mockr"
+    "r-rmarkdown"
+    "r-withr"
+)
+checkdepends=(
+    "${optdepends[@]}"
+    "r-testthat"
+)
+
 source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
-sha256sums=("50604247470e910cecfe9b76df754bf96a0d701f81b732f7aa9c90a20d30f897")
+b2sums=("ccb1d8f06ada72aa666e7f81cfdf5ce77596fce543c525c80f6eb91a5239c78d42aa16f192d900f9a90fc98d8c283af1ec2eada755a2dff9147bcd03002ceca3")
 
 build() {
-  R CMD INSTALL ${_cranname}_${_cranver}.tar.gz -l "${srcdir}"
+    mkdir -p "${srcdir}/build/"
+    R CMD INSTALL ${_cranname}_${_cranver}.tar.gz -l "${srcdir}/build/"
 }
 
-package() {
-  install -dm0755 "${pkgdir}/usr/lib/R/library"
-  cp -a --no-preserve=ownership "${_cranname}" "${pkgdir}/usr/lib/R/library"
+check() {
+    R_LIBS="build/" R CMD check --no-manual --as-cran "${_cranname}"
+}
 
-  if [[ -f "${_cranname}/LICENSE" ]]; then
-    install -Dm0644 "${_cranname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  fi
+package() {
+    install -dm0755 "${pkgdir}/usr/lib/R/library"
+    cp -a --no-preserve=ownership "${srcdir}/build/${_cranname}" "${pkgdir}/usr/lib/R/library"
 
+    if [[ -f "${_cranname}/LICENSE" ]]; then
+        install -Dm0644 "${_cranname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    fi
 }