[lilac] updated to 3.8.1-5

2 files changed, 29 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e18d20a18d4f..cabea2dfe80e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = r-processx
 	pkgdesc = Execute and Control System Processes
 	pkgver = 3.8.1
-	pkgrel = 1
+	pkgrel = 5
 	url = https://cran.r-project.org/package=processx
-	arch = i686
 	arch = x86_64
 	license = MIT
 	depends = r-ps
@@ -18,8 +17,6 @@ pkgbase = r-processx
 	optdepends = r-webfakes
 	optdepends = r-withr
 	source = https://cran.r-project.org/src/contrib/processx_3.8.1.tar.gz
-	source = CRAN-MIT-TEMPLATE::https://cran.r-project.org/web/licenses/MIT
 	sha256sums = e008472b81d4ca1a37a4ba7dd58e5e944f96ab2e44c8ccc8840d43e9fe99e93c
-	sha256sums = e76e4aad5d3d9d606db6f8c460311b6424ebadfce13f5322e9bae9d49cc6090b
 
 pkgname = r-processx
diff --git a/PKGBUILD b/PKGBUILD
index 0a7e40e331b2..9c8732d0cd36 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,43 +1,44 @@
 # Maintainer: Pekka Ristola <pekkarr [at] protonmail [dot] com>
+# Contributor: Guoyi Zhang <guoyizhang at malacology dot net>
 # Contributor: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
 # Contributor: Alex Branham <branham@utexas.edu>
 
-_cranname=processx
-_cranver=3.8.1
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=1
+_pkgname=processx
+_pkgver=3.8.1
+pkgname=r-${_pkgname,,}
+pkgver=${_pkgver//[:-]/.}
+pkgrel=5
 pkgdesc="Execute and Control System Processes"
-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-ps r-r6)
+depends=(
+  r-ps
+  r-r6
+)
 optdepends=(
-    r-callr
-    r-cli
-    r-covr
-    r-curl
-    r-debugme
-    r-rlang
-    r-testthat
-    r-webfakes
-    r-withr
+  r-callr
+  r-cli
+  r-covr
+  r-curl
+  r-debugme
+  r-rlang
+  r-testthat
+  r-webfakes
+  r-withr
 )
-source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz"
-        "CRAN-MIT-TEMPLATE::https://cran.r-project.org/web/licenses/MIT")
-sha256sums=('e008472b81d4ca1a37a4ba7dd58e5e944f96ab2e44c8ccc8840d43e9fe99e93c'
-            'e76e4aad5d3d9d606db6f8c460311b6424ebadfce13f5322e9bae9d49cc6090b')
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
+sha256sums=('e008472b81d4ca1a37a4ba7dd58e5e944f96ab2e44c8ccc8840d43e9fe99e93c')
 
 build() {
   mkdir -p build
-  R CMD INSTALL "${_cranname}" -l "${srcdir}/build"
+  R CMD INSTALL "$_pkgname" -l build
 }
 
 package() {
-  install -dm0755 "${pkgdir}/usr/lib/R/library"
-
-  cp -a --no-preserve=ownership "build/${_cranname}" "${pkgdir}/usr/lib/R/library"
+  install -d "$pkgdir/usr/lib/R/library"
+  cp -a --no-preserve=ownership "build/$_pkgname" "$pkgdir/usr/lib/R/library"
 
-  install -Dm644 CRAN-MIT-TEMPLATE "${pkgdir}/usr/share/licenses/${pkgname}/MIT"
-  install -Dm644 "${_cranname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -d "$pkgdir/usr/share/licenses/$pkgname"
+  ln -s "/usr/lib/R/library/$_pkgname/LICENSE" "$pkgdir/usr/share/licenses/$pkgname"
 }