upgpkg: r-viridislite 0.4.1-2

2 files changed, 16 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9a69fb7a6ec3..e090f8009824 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,18 @@
 pkgbase = r-viridislite
 	pkgdesc = Colorblind-Friendly Color Maps (Lite Version)
 	pkgver = 0.4.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://cran.r-project.org/package=viridisLite
 	arch = any
 	license = MIT
+	checkdepends = r-covr
+	checkdepends = r-hexbin>=1.27.0
+	checkdepends = r-ggplot2>=1.0.1
+	checkdepends = r-testthat
 	depends = r>=2.10
 	optdepends = r-covr
 	optdepends = r-hexbin>=1.27.0
 	optdepends = r-ggplot2>=1.0.1
-	optdepends = r-testthat
 	source = https://cran.r-project.org/src/contrib/viridisLite_0.4.1.tar.gz
 	b2sums = 024b7470a96a8f487ddf58b02f3efd96ccd7d54ee2de6a1ff88b070570543d8f08e6a95dc5530d197d45014b6f5403c8375a572f96f84693bb010725a04893cd
 
diff --git a/PKGBUILD b/PKGBUILD
index a34f17065f23..cdea26d80df8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@ pkgdesc="Colorblind-Friendly Color Maps (Lite Version)"
 url="https://cran.r-project.org/package=${_cranname}"
 license=("MIT")
 pkgver=${_cranver//[:-]/.}
-pkgrel=1
+pkgrel=2
 
 arch=("any")
 depends=(
@@ -19,20 +19,27 @@ optdepends=(
     "r-covr"
     "r-hexbin>=1.27.0"
     "r-ggplot2>=1.0.1"
+)
+checkdepends=(
+    "${optdepends[@]}"
     "r-testthat"
 )
-makedepends=()
 
 source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
 b2sums=("024b7470a96a8f487ddf58b02f3efd96ccd7d54ee2de6a1ff88b070570543d8f08e6a95dc5530d197d45014b6f5403c8375a572f96f84693bb010725a04893cd")
 
 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"