upgpkg: r-withr 2.5.0-2

2 files changed, 47 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 182ea9aefe98..9a632079f5b7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,18 @@
 pkgbase = r-withr
-	pkgdesc = Run Code 'With' Temporarily Modified Global State
+	pkgdesc = Lightweight Well-Known Geometry Parsing
 	pkgver = 2.5.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://cran.r-project.org/package=withr
 	arch = any
 	license = MIT
+	checkdepends = r-callr
+	checkdepends = r-covr
+	checkdepends = r-dbi
+	checkdepends = r-knitr
+	checkdepends = r-rmarkdown
+	checkdepends = r-rsqlite
+	checkdepends = r-testthat
+	checkdepends = texlive-core
 	depends = r>=3.2.0
 	optdepends = r-callr
 	optdepends = r-covr
@@ -12,8 +20,7 @@ pkgbase = r-withr
 	optdepends = r-knitr
 	optdepends = r-rmarkdown
 	optdepends = r-rsqlite
-	optdepends = r-testthat
 	source = https://cran.r-project.org/src/contrib/withr_2.5.0.tar.gz
-	sha256sums = 37317b3ed790a08407072993a05ab255f6305f95a12a16e0e28aa6aa80fc8bc0
+	b2sums = b472aef752317feedab16ab01557f28cdd30d8f2c6902b1a496f308165c1e02f7a8859cc791acf714748ad0a1b2d58dc9567cacfa0083a8427eb487820d8ab10
 
 pkgname = r-withr
diff --git a/PKGBUILD b/PKGBUILD
index 9f809689f9b3..4dfb353978de 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,52 @@
-# Maintainer: Grey Christoforo <first name at last name dot net>
 # Maintainer: peippo <christoph+aur@christophfink.com>
+# Maintainer: Grey Christoforo <first name at last name dot net>
 # Contributor: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
 # Contributor: Grey Christoforo <first name at last name dot net>
 
 _cranname=withr
 _cranver=2.5.0
 pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=1
-pkgdesc="Run Code 'With' Temporarily Modified Global State"
-arch=(any)
+pkgdesc="Lightweight Well-Known Geometry Parsing"
 url="https://cran.r-project.org/package=${_cranname}"
-license=(MIT)
-depends=('r>=3.2.0')
-optdepends=(r-callr r-covr r-dbi r-knitr r-rmarkdown r-rsqlite r-testthat)
+license=("MIT")
+pkgver=${_cranver//[:-]/.}
+pkgrel=2
+
+arch=("any")
+depends=(
+    "r>=3.2.0"
+)
+optdepends=(
+    "r-callr"
+    "r-covr"
+    "r-dbi"
+    "r-knitr"
+    "r-rmarkdown"
+    "r-rsqlite"
+)
+checkdepends=(
+    "${optdepends[@]}"
+    "r-testthat"
+    "texlive-core"
+)
+
 source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
-sha256sums=('37317b3ed790a08407072993a05ab255f6305f95a12a16e0e28aa6aa80fc8bc0')
+b2sums=("b472aef752317feedab16ab01557f28cdd30d8f2c6902b1a496f308165c1e02f7a8859cc791acf714748ad0a1b2d58dc9567cacfa0083a8427eb487820d8ab10")
 
 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_BUILD_TAR="tar" R_LIBS="build/" R CMD check "${_cranname}"
 }
 
 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
 }