upgpkg: r-munsell 0.5.0-2

2 files changed, 37 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4c81ddf82c99..9c78e8a704f7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,18 @@
 pkgbase = r-munsell
 	pkgdesc = Utilities for Using Munsell Colours
 	pkgver = 0.5.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://cran.r-project.org/package=munsell
 	arch = any
 	license = MIT
+	checkdepends = r-ggplot2
+	checkdepends = r-testthat
+	checkdepends = r-testthat
 	depends = r
 	depends = r-colorspace
 	optdepends = r-ggplot2
 	optdepends = r-testthat
 	source = https://cran.r-project.org/src/contrib/munsell_0.5.0.tar.gz
-	sha256sums = d0f3a9fb30e2b5d411fa61db56d4be5733a2621c0edf017d090bdfa5e377e199
+	b2sums = 534463ce90f276b5fb3c874fadd882b1f824cef7b8ba1a7817994a1949d312fc85acf7893df03ca11403e0d20b2b3223e606ee2a92b8d735904b37f41b2706f3
 
 pkgname = r-munsell
diff --git a/PKGBUILD b/PKGBUILD
index 9f81f6b2f4a8..23a8ed7e5822 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,48 @@
+# Maintainer: peippo <christoph+aur@christophfink.com>
 # Contributor: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
 # Contributor: Grey Christoforo <first name at last name dot net>
 
 _cranname=munsell
 _cranver=0.5.0
 pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=1
 pkgdesc="Utilities for Using Munsell Colours"
-arch=(any)
 url="https://cran.r-project.org/package=${_cranname}"
-license=(MIT)
-depends=(r r-colorspace)
-optdepends=(r-ggplot2 r-testthat)
+license=("MIT")
+pkgver=${_cranver//[:-]/.}
+pkgrel=2
+
+arch=("any")
+depends=(
+    "r"
+    "r-colorspace"
+)
+optdepends=(
+    "r-ggplot2"
+    "r-testthat"
+)
+checkdepends=(
+    "${optdepends[@]}"
+    "r-testthat"
+)
+
 source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
-sha256sums=('d0f3a9fb30e2b5d411fa61db56d4be5733a2621c0edf017d090bdfa5e377e199')
+b2sums=('534463ce90f276b5fb3c874fadd882b1f824cef7b8ba1a7817994a1949d312fc85acf7893df03ca11403e0d20b2b3223e606ee2a92b8d735904b37f41b2706f3')
 
 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"
+    install -dm0755 "${pkgdir}/usr/lib/R/library"
+    cp -a --no-preserve=ownership "${srcdir}/build/${_cranname}" "${pkgdir}/usr/lib/R/library"
 
-  cp -a --no-preserve=ownership "${_cranname}" "${pkgdir}/usr/lib/R/library"
+    if [[ -f "${_cranname}/LICENSE" ]]; then
+        install -Dm0644 "${_cranname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    fi
 }