upgpkg: r-lazyeval 0.2.2-2

2 files changed, 48 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 107ceb491b7f..a82b1d1fe14a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,23 @@
 pkgbase = r-lazyeval
-	pkgdesc = Lazy (Non-Standard) Evaluation
+	pkgdesc = Lightweight Well-Known Geometry Parsing
 	pkgver = 0.2.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://cran.r-project.org/package=lazyeval
 	arch = i686
 	arch = x86_64
 	license = GPL3
+	checkdepends = r-covr
+	checkdepends = r-knitr
+	checkdepends = r-rmarkdown>=0.2.65
+	checkdepends = r-testthat
+	checkdepends = r-testthat
 	depends = r>=3.1.0
+	depends = r-cpp11
+	optdepends = r-covr
 	optdepends = r-knitr
-	optdepends = r-rmarkdown
+	optdepends = r-rmarkdown>=0.2.65
 	optdepends = r-testthat
-	optdepends = r-covr
 	source = https://cran.r-project.org/src/contrib/lazyeval_0.2.2.tar.gz
-	sha256sums = d6904112a21056222cfcd5eb8175a78aa063afe648a562d9c42c6b960a8820d4
+	b2sums = 94f69fe95a8ef8bf98421ae8570c6d381183f242e6f74334ed1886033b0ec3228e25b5412b89fe97fd4268f77b6be1c3fbe0113035b1afdee398898c732d67ff
 
 pkgname = r-lazyeval
diff --git a/PKGBUILD b/PKGBUILD
index fb3156e0a9c8..f48c53b5c918 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,52 @@
-# Maintainer: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
+# Maintainer: peippo <christoph+aur@christophfink.com>
+# Contributor: Grey Christoforo <first name at last name dot net>
+# Contributor: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
 # Contributor: Matt Frichtl <frichtlm@gmail.com>
 # Contributor: wagnerflo <florian@wagner-flo.net>
 
 _cranname=lazyeval
 _cranver=0.2.2
 pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=1
-pkgdesc="Lazy (Non-Standard) Evaluation"
-arch=(i686 x86_64)
+pkgdesc="Lightweight Well-Known Geometry Parsing"
 url="https://cran.r-project.org/package=${_cranname}"
-license=(GPL3)
-depends=('r>=3.1.0')
-optdepends=(r-knitr r-rmarkdown r-testthat r-covr)
+license=("GPL3")
+pkgver=${_cranver//[:-]/.}
+pkgrel=2
+
+arch=("i686" "x86_64")
+depends=(
+    "r>=3.1.0"
+    "r-cpp11"
+)
+optdepends=(
+    "r-covr"
+    "r-knitr"
+    "r-rmarkdown>=0.2.65"
+    "r-testthat"
+)
+checkdepends=(
+    "${optdepends[@]}"
+    "r-testthat"
+)
+
 source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
-sha256sums=('d6904112a21056222cfcd5eb8175a78aa063afe648a562d9c42c6b960a8820d4')
+b2sums=("94f69fe95a8ef8bf98421ae8570c6d381183f242e6f74334ed1886033b0ec3228e25b5412b89fe97fd4268f77b6be1c3fbe0113035b1afdee398898c732d67ff")
 
 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
 }