[lilac] updated to 1.1.2-9

2 files changed, 36 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 10d5e6a745bb..002cf6e5d741 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = r-lobstr
 	pkgdesc = Visualize R Data Structures with Trees
 	pkgver = 1.1.2
-	pkgrel = 1
+	pkgrel = 9
 	url = https://cran.r-project.org/package=lobstr
-	arch = i686
 	arch = x86_64
 	license = MIT
 	checkdepends = r-testthat
@@ -16,8 +15,7 @@ pkgbase = r-lobstr
 	optdepends = r-pkgdown
 	optdepends = r-testthat
 	source = https://cran.r-project.org/src/contrib/lobstr_1.1.2.tar.gz
-	source = CRAN-MIT-TEMPLATE::https://cran.r-project.org/web/licenses/MIT
+	md5sums = 742ca7fe19f22d6d8246e6d5696b70f5
 	sha256sums = 9bc533ed7e8f816097a03acfbca33308c9940ba26d02674f4ba06311cf3a1718
-	sha256sums = e76e4aad5d3d9d606db6f8c460311b6424ebadfce13f5322e9bae9d49cc6090b
 
 pkgname = r-lobstr
diff --git a/PKGBUILD b/PKGBUILD
index 4d2b5fa4a384..c7efaccfab41 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,49 +1,56 @@
 # Maintainer: Pekka Ristola <pekkarr [at] protonmail [dot] com>
+# Contributor: Guoyi Zhang <guoyizhang at malacology dot net>
 
-_cranname=lobstr
-_cranver=1.1.2
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=1
+_pkgname=lobstr
+_pkgver=1.1.2
+pkgname=r-${_pkgname,,}
+pkgver=${_pkgver//-/.}
+pkgrel=9
 pkgdesc="Visualize R Data Structures with Trees"
-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-crayon r-prettyunits r-rlang)
-makedepends=(r-cpp11)
-checkdepends=(r-testthat)
+depends=(
+  r-crayon
+  r-prettyunits
+  r-rlang
+)
+makedepends=(
+  r-cpp11
+)
+checkdepends=(
+  r-testthat
+)
 optdepends=(
-    r-covr
-    r-pillar
-    r-pkgdown
-    r-testthat
+  r-covr
+  r-pillar
+  r-pkgdown
+  r-testthat
 )
-source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz"
-        "CRAN-MIT-TEMPLATE::https://cran.r-project.org/web/licenses/MIT")
-sha256sums=('9bc533ed7e8f816097a03acfbca33308c9940ba26d02674f4ba06311cf3a1718'
-            'e76e4aad5d3d9d606db6f8c460311b6424ebadfce13f5322e9bae9d49cc6090b')
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
+md5sums=('742ca7fe19f22d6d8246e6d5696b70f5')
+sha256sums=('9bc533ed7e8f816097a03acfbca33308c9940ba26d02674f4ba06311cf3a1718')
 
 prepare() {
   # Fix test
   sed -i '209 s/\[4]>1, 1, 1, 9000/[3]>1, 1, 2/' \
-      "${_cranname}/tests/testthat/_snaps/tree.md"
+      "$_pkgname/tests/testthat/_snaps/tree.md"
 }
 
 build() {
   mkdir -p build
-  R CMD INSTALL "${_cranname}" -l "${srcdir}/build"
+  R CMD INSTALL "$_pkgname" -l build
 }
 
 check() {
-  cd "${_cranname}/tests"
-  R_LIBS="${srcdir}/build" NOT_CRAN=true Rscript --vanilla testthat.R
+  cd "$_pkgname/tests"
+  R_LIBS="$srcdir/build" NOT_CRAN=true Rscript --vanilla testthat.R
 }
 
 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"
 }