[lilac] updated to 1.0.10-4

2 files changed, 30 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 97fcf8dbfd74..316803aec825 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,18 @@
 pkgbase = r-rcpp
 	pkgdesc = Seamless R and C++ Integration
 	pkgver = 1.0.10
-	pkgrel = 2
+	pkgrel = 4
 	url = https://cran.r-project.org/package=Rcpp
-	arch = i686
 	arch = x86_64
 	license = GPL
 	checkdepends = r-tinytest
 	depends = r
-	optdepends = r-tinytest
 	optdepends = r-inline
-	optdepends = r-rbenchmark
 	optdepends = r-pkgkitten
+	optdepends = r-rbenchmark
+	optdepends = r-tinytest
 	source = https://cran.r-project.org/src/contrib/Rcpp_1.0.10.tar.gz
+	md5sums = 32f9331801336420cae8a04d8c3c9e17
 	sha256sums = 1e65e24a9981251ab5fc4f9fd65fe4eab4ba0255be3400a8c5abe20b62b5d546
 
 pkgname = r-rcpp
diff --git a/PKGBUILD b/PKGBUILD
index b49d38679eae..f6c0b5a55207 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,44 +1,49 @@
 # 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: Matt Frichtl <frichtlm@gmail.com>
 
-_cranname=Rcpp
-_cranver=1.0.10
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=2
+_pkgname=Rcpp
+_pkgver=1.0.10
+pkgname=r-${_pkgname,,}
+pkgver=${_pkgver//[:-]/.}
+pkgrel=4
 pkgdesc="Seamless R and C++ Integration"
-arch=(i686 x86_64)
-url="https://cran.r-project.org/package=${_cranname}"
+arch=(x86_64)
+url="https://cran.r-project.org/package=${_pkgname}"
 license=(GPL)
-depends=(r)
-checkdepends=(r-tinytest)
+depends=(
+  r
+)
+checkdepends=(
+  r-tinytest
+)
 optdepends=(
-    r-tinytest
-    r-inline
-    r-rbenchmark
-    r-pkgkitten
+  r-inline
+  r-pkgkitten
+  r-rbenchmark
+  r-tinytest
 )
-source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
+md5sums=('32f9331801336420cae8a04d8c3c9e17')
 sha256sums=('1e65e24a9981251ab5fc4f9fd65fe4eab4ba0255be3400a8c5abe20b62b5d546')
 
 prepare() {
   # upstream issue https://github.com/RcppCore/Rcpp/issues/1251
-  sed -i 's/-447.1974945/-447.197893678525/' "$_cranname/inst/tinytest/test_stats.R"
+  sed -i 's/-447.1974945/-447.197893678525/' "$_pkgname/inst/tinytest/test_stats.R"
 }
 
 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" LC_ALL=C.UTF-8 RunAllRcppTests=yes Rscript --vanilla tinytest.R
+  cd "$_pkgname/tests"
+  R_LIBS="$srcdir/build" LC_ALL=C.UTF-8 RunAllRcppTests=yes Rscript --vanilla tinytest.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"
 }