upgpkg: r-scales 1.2.1-2

2 files changed, 34 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6fccb0edf6a9..9fc1e354cadb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,18 @@
 pkgbase = r-scales
 	pkgdesc = Scale Functions for Visualization
 	pkgver = 1.2.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://cran.r-project.org/package=scales
 	arch = any
 	license = MIT
+	checkdepends = r-bit64
+	checkdepends = r-covr
+	checkdepends = r-dichromat
+	checkdepends = r-ggplot2
+	checkdepends = r-hms>=0.5.0
+	checkdepends = r-stringi
+	checkdepends = r-waldo>=0.4.0
+	checkdepends = r-testthat>=3.0.0
 	depends = r>=3.2
 	depends = r-farver>=2.0.3
 	depends = r-labeling
@@ -20,9 +28,8 @@ pkgbase = r-scales
 	optdepends = r-ggplot2
 	optdepends = r-hms>=0.5.0
 	optdepends = r-stringi
-	optdepends = r-testthat>=3.0.0
 	optdepends = r-waldo>=0.4.0
 	source = https://cran.r-project.org/src/contrib/scales_1.2.1.tar.gz
-	sha256sums = 59453e6dbdafee93dfb101e4d86048a62a12898134259d3ef02d65aeec57ed08
+	b2sums = db15b378fafb37a4adb5bb426582d2ab4ef53ba76ac88fabfe2c87f813e0863f8d89dd2a24cae9e9657c4f0bf889dba1b5d75cc1345496dc163d61b45b1ace33
 
 pkgname = r-scales
diff --git a/PKGBUILD b/PKGBUILD
index 3ca95338c7e4..06866b667b61 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,48 +6,54 @@ _cranver=1.2.1
 pkgname="r-${_cranname,,}"
 pkgdesc="Scale Functions for Visualization"
 pkgver="${_cranver//[:-]/.}"
-pkgrel=1
+pkgrel=2
 
 arch=("any")
 license=("MIT")
 
 url="https://cran.r-project.org/package=${_cranname}"
 source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
-sha256sums=("59453e6dbdafee93dfb101e4d86048a62a12898134259d3ef02d65aeec57ed08")
+b2sums=("db15b378fafb37a4adb5bb426582d2ab4ef53ba76ac88fabfe2c87f813e0863f8d89dd2a24cae9e9657c4f0bf889dba1b5d75cc1345496dc163d61b45b1ace33")
 
 depends=(
     "r>=3.2"
     "r-farver>=2.0.3"
-    r-labeling
-    r-lifecycle
+    "r-labeling"
+    "r-lifecycle"
     "r-munsell>=0.5"
-    r-r6
-    r-rcolorbrewer
+    "r-r6"
+    "r-rcolorbrewer"
     "r-rlang>=1.0.0"
-    r-viridislite
+    "r-viridislite"
 )
 optdepends=(
-    r-bit64
-    r-covr
-    r-dichromat
-    r-ggplot2
+    "r-bit64"
+    "r-covr"
+    "r-dichromat"
+    "r-ggplot2"
     "r-hms>=0.5.0"
-    r-stringi
-    "r-testthat>=3.0.0"
+    "r-stringi"
     "r-waldo>=0.4.0"
 )
+checkdepends=(
+    "${optdepends[@]}"
+    "r-testthat>=3.0.0"
+)
 
 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() {
+    R_LIBS="build/" R CMD check --no-manual --as-cran "${_cranname}"
 }
 
 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"
+        install -Dm0644 "${_cranname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
     fi
 }