upgpkg: r-farver 2.1.1-2

2 files changed, 18 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 09b4a39dca8e..53ca4c005396 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,16 @@
 pkgbase = r-farver
 	pkgdesc = High Performance Colour Space Manipulation
 	pkgver = 2.1.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://cran.r-project.org/package=farver
 	arch = i686
 	arch = x86_64
 	license = MIT
+	checkdepends = r-covr
+	checkdepends = r-testthat>=3.0.0
 	depends = r
 	optdepends = r-covr
-	optdepends = r-testthat>=3.0.0
 	source = https://cran.r-project.org/src/contrib/farver_2.1.1.tar.gz
-	sha256sums = 0dcfda6ca743f465372790bcff1bcbc6a7145fdac1c682b021f654e8c6c996ce
+	b2sums = 8aae9b293163faaefa87227286e8c49fc7432689338120a07ec00f6337828eaf5bcee2ef1ab2ceadfe1846546fe1397647d324c69a43735f3e595d3361bcc3b5
 
 pkgname = r-farver
diff --git a/PKGBUILD b/PKGBUILD
index 6aee07e30d16..dc1db2de8fd0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ _cranname=farver
 _cranver=2.1.1
 pkgname=r-${_cranname,,}
 pkgver=${_cranver//[:-]/.}
-pkgrel=1
+pkgrel=2
 pkgdesc="High Performance Colour Space Manipulation"
 arch=(i686 x86_64)
 url="https://cran.r-project.org/package=${_cranname}"
@@ -16,18 +16,28 @@ depends=(
 )
 optdepends=(
     r-covr
+)
+checkdepends=(
+    "${optdepends[@]}"
     "r-testthat>=3.0.0"
 )
+
 source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
-sha256sums=("0dcfda6ca743f465372790bcff1bcbc6a7145fdac1c682b021f654e8c6c996ce")
+b2sums=("8aae9b293163faaefa87227286e8c49fc7432689338120a07ec00f6337828eaf5bcee2ef1ab2ceadfe1846546fe1397647d324c69a43735f3e595d3361bcc3b5")
 
 build() {
-    R CMD INSTALL ${_cranname}_${_cranver}.tar.gz -l "${srcdir}"
+    mkdir -p "${srcdir}/build/"
+    R CMD INSTALL ${_cranname}_${_cranver}.tar.gz -l "${srcdir}/build/"
+}
+
+check() {
+    cd "${srcdir}/${_cranname}/tests"
+    R_LIBS="${srcdir}/build/" Rscript --vanilla testthat.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 "${srcdir}/build/${_cranname}" "${pkgdir}/usr/lib/R/library"
 
     if [[ -f "${_cranname}/LICENSE" ]]; then
         install -Dm0644 "${_cranname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"