upgpkg: r-r6 2.5.1-2

2 files changed, 37 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9bf969daffbb..323de08154e6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,17 @@
 pkgbase = r-r6
 	pkgdesc = Encapsulated Classes with Reference Semantics
 	pkgver = 2.5.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://cran.r-project.org/package=R6
 	arch = any
 	license = MIT
+	checkdepends = r-pryr
+	checkdepends = r-testthat
+	checkdepends = r-testthat
 	depends = r>=3.0
-	optdepends = r-testthat
 	optdepends = r-pryr
+	optdepends = r-testthat
 	source = https://cran.r-project.org/src/contrib/R6_2.5.1.tar.gz
-	sha256sums = 8d92bd29c2ed7bf15f2778618ffe4a95556193d21d8431a7f75e7e5fc102bf48
+	b2sums = 0045d7c37dfb7a773cd24e85e695575eaf6aa5c9392fb6888c10aa9fb3e35b13a230ed0aabcf84d52e656ef506ab58371044c4179b3380f5324b217fae6daeb4
 
 pkgname = r-r6
diff --git a/PKGBUILD b/PKGBUILD
index 7e5c2de77a29..bb11d8b61fa0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,47 @@
+# 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=R6
 _cranver=2.5.1
 pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=1
 pkgdesc="Encapsulated Classes with Reference Semantics"
-arch=(any)
 url="https://cran.r-project.org/package=${_cranname}"
-license=(MIT)
-depends=('r>=3.0')
-optdepends=(r-testthat r-pryr)
+license=("MIT")
+pkgver=${_cranver//[:-]/.}
+pkgrel=2
+
+arch=("any")
+depends=(
+    "r>=3.0"
+)
+optdepends=(
+    "r-pryr"
+    "r-testthat"
+)
+checkdepends=(
+    "${optdepends[@]}"
+    "r-testthat"
+)
+
 source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
-sha256sums=('8d92bd29c2ed7bf15f2778618ffe4a95556193d21d8431a7f75e7e5fc102bf48')
+b2sums=("0045d7c37dfb7a773cd24e85e695575eaf6aa5c9392fb6888c10aa9fb3e35b13a230ed0aabcf84d52e656ef506ab58371044c4179b3380f5324b217fae6daeb4")
 
 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
 }