[lilac] updated to 0.39-3

2 files changed, 54 insertions, 53 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 104c09034ec0..22b9682c3b78 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,32 +1,30 @@
 pkgbase = r-xfun
 	pkgdesc = Supporting Functions for Packages Maintained by 'Yihui Xie'
 	pkgver = 0.39
-	pkgrel = 1
+	pkgrel = 3
 	url = https://cran.r-project.org/package=xfun
-	arch = i686
 	arch = x86_64
 	license = MIT
 	checkdepends = r-testit
 	depends = r
-	optdepends = r-testit
-	optdepends = r-rstudioapi
-	optdepends = r-tinytex
-	optdepends = r-mime
-	optdepends = r-markdown
-	optdepends = r-knitr
-	optdepends = r-htmltools
-	optdepends = r-remotes
-	optdepends = r-pak
-	optdepends = r-rhub
-	optdepends = r-renv
 	optdepends = r-curl
+	optdepends = r-htmltools
 	optdepends = r-jsonlite
+	optdepends = r-knitr
 	optdepends = r-magick
-	optdepends = r-yaml
+	optdepends = r-markdown
+	optdepends = r-mime
+	optdepends = r-pak
+	optdepends = r-remotes
+	optdepends = r-renv
+	optdepends = r-rhub
 	optdepends = r-rmarkdown
+	optdepends = r-rstudioapi
+	optdepends = r-testit
+	optdepends = r-tinytex
+	optdepends = r-yaml
 	source = https://cran.r-project.org/src/contrib/xfun_0.39.tar.gz
-	source = CRAN-MIT-TEMPLATE::https://cran.r-project.org/web/licenses/MIT
+	md5sums = 97d013cfb2a4503ef16936a950ce04a2
 	sha256sums = d0ecaabb243dd3496da6029932fcdd4772914843de7ffd0b78a172efde1356c9
-	sha256sums = e76e4aad5d3d9d606db6f8c460311b6424ebadfce13f5322e9bae9d49cc6090b
 
 pkgname = r-xfun
diff --git a/PKGBUILD b/PKGBUILD
index 565f0acf31f8..950f1041dcd3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,57 +1,60 @@
 # 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: Kibouo <csonka.mihaly@hotmail.com>
 # Contributor: Alex Branham <branham@utexas.edu>
 
-_cranname=xfun
-_cranver=0.39
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=1
+_pkgname=xfun
+_pkgver=0.39
+pkgname=r-${_pkgname,,}
+pkgver=${_pkgver//[:-]/.}
+pkgrel=3
 pkgdesc="Supporting Functions for Packages Maintained by 'Yihui Xie'"
-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)
-checkdepends=(r-testit)
+depends=(
+  r
+)
+checkdepends=(
+  r-testit
+)
 optdepends=(
-    r-testit
-    r-rstudioapi
-    r-tinytex
-    r-mime
-    r-markdown
-    r-knitr
-    r-htmltools
-    r-remotes
-    r-pak
-    r-rhub
-    r-renv
-    r-curl
-    r-jsonlite
-    r-magick
-    r-yaml
-    r-rmarkdown
+  r-curl
+  r-htmltools
+  r-jsonlite
+  r-knitr
+  r-magick
+  r-markdown
+  r-mime
+  r-pak
+  r-remotes
+  r-renv
+  r-rhub
+  r-rmarkdown
+  r-rstudioapi
+  r-testit
+  r-tinytex
+  r-yaml
 )
-source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz"
-        "CRAN-MIT-TEMPLATE::https://cran.r-project.org/web/licenses/MIT")
-sha256sums=('d0ecaabb243dd3496da6029932fcdd4772914843de7ffd0b78a172efde1356c9'
-            'e76e4aad5d3d9d606db6f8c460311b6424ebadfce13f5322e9bae9d49cc6090b')
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
+md5sums=('97d013cfb2a4503ef16936a950ce04a2')
+sha256sums=('d0ecaabb243dd3496da6029932fcdd4772914843de7ffd0b78a172efde1356c9')
 
 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" _R_CHECK_PACKAGE_NAME_=false Rscript --vanilla test-cran.R
+  cd "$_pkgname/tests"
+  R_LIBS="$srcdir/build" _R_CHECK_PACKAGE_NAME_=false Rscript --vanilla test-cran.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"
 }