[lilac] updated to 1.5.6-1

2 files changed, 39 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0df9dd1fc551..03725ccdd3c7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,16 @@
 pkgbase = r-unix
 	pkgdesc = POSIX System Utilities
-	pkgver = 1.5.4
+	pkgver = 1.5.6
 	pkgrel = 1
 	url = https://cran.r-project.org/package=unix
-	arch = i686
 	arch = x86_64
 	license = MIT
+	checkdepends = r-testthat
+	depends = apparmor
 	depends = r
 	optdepends = r-testthat
-	source = https://cran.r-project.org/src/contrib/unix_1.5.4.tar.gz
-	sha256sums = 149283653a9194008e4bfc53e41c9e6a9bf60af0e9f84c2426fc4b4a0b2c4872
+	source = https://cran.r-project.org/src/contrib/unix_1.5.6.tar.gz
+	md5sums = ea966ea9fb4f59ef99cb6cfa09432fa7
+	sha256sums = 576172d667598245413374121bdcefe6445773aedbb6ce3baf0be2ad5a9a19b9
 
 pkgname = r-unix
diff --git a/PKGBUILD b/PKGBUILD
index c2cbd017400c..1369ee5d9f8f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,45 @@
-# Maintainer: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
+# Maintainer: Pekka Ristola <pekkarr [at] protonmail [dot] com>
+# Contributor: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
 # Contributor: Kibouo <csonka.mihaly@hotmail.com>
 
-_cranname=unix
-_cranver=1.5.4
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
+_pkgname=unix
+_pkgver=1.5.6
+pkgname=r-${_pkgname,,}
+pkgver=${_pkgver//-/.}
 pkgrel=1
 pkgdesc="POSIX System Utilities"
-arch=(i686 x86_64)
-url="https://cran.r-project.org/package=${_cranname}"
+arch=(x86_64)
+url="https://cran.r-project.org/package=${_pkgname}"
 license=(MIT)
-depends=(r)
-optdepends=(r-testthat)
-source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
-sha256sums=('149283653a9194008e4bfc53e41c9e6a9bf60af0e9f84c2426fc4b4a0b2c4872')
+depends=(
+  apparmor
+  r
+)
+checkdepends=(
+  r-testthat
+)
+optdepends=(
+  r-testthat
+)
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
+md5sums=('ea966ea9fb4f59ef99cb6cfa09432fa7')
+sha256sums=('576172d667598245413374121bdcefe6445773aedbb6ce3baf0be2ad5a9a19b9')
 
 build() {
-  R CMD INSTALL ${_cranname}_${_cranver}.tar.gz -l "${srcdir}"
+  mkdir -p build
+  R CMD INSTALL "$_pkgname" -l build \
+      --configure-vars=FORCE_APPARMOR=1
+}
+
+check() {
+  cd "$_pkgname/tests"
+  R_LIBS="$srcdir/build" NOT_CRAN=true Rscript --vanilla testthat.R
 }
 
 package() {
-  install -dm0755 "${pkgdir}/usr/lib/R/library"
+  install -d "$pkgdir/usr/lib/R/library"
+  cp -a --no-preserve=ownership "build/$_pkgname" "$pkgdir/usr/lib/R/library"
 
-  cp -a --no-preserve=ownership "${_cranname}" "${pkgdir}/usr/lib/R/library"
+  install -d "$pkgdir/usr/share/licenses/$pkgname"
+  ln -s "/usr/lib/R/library/$_pkgname/LICENSE" "$pkgdir/usr/share/licenses/$pkgname"
 }