[lilac] updated to 1.0.17-7

2 files changed, 30 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a22ee9ff563f..6b735f171a17 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = r-doparallel
 	pkgdesc = Foreach Parallel Adaptor for the 'parallel' Package
 	pkgver = 1.0.17
-	pkgrel = 2
+	pkgrel = 7
 	url = https://cran.r-project.org/package=doParallel
 	arch = any
 	license = GPL2
@@ -14,6 +14,7 @@ pkgbase = r-doparallel
 	optdepends = r-mlbench
 	optdepends = r-runit
 	source = https://cran.r-project.org/src/contrib/doParallel_1.0.17.tar.gz
+	md5sums = df72884b8d87b06c6bdd4f8caf7e5bf7
 	sha256sums = b96a25ad105a654d70c7b4ca27290dc9967bc47f4668b2763927a886b178abd7
 
 pkgname = r-doparallel
diff --git a/PKGBUILD b/PKGBUILD
index b366c67fff68..b90aac24523a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,44 @@
 # Maintainer: Pekka Ristola <pekkarr [at] protonmail [dot] com>
+# Contributor: Guoyi Zhang <guoyizhang at malacology dot net>
 
-_cranname=doParallel
-_cranver=1.0.17
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=2
+_pkgname=doParallel
+_pkgver=1.0.17
+pkgname=r-${_pkgname,,}
+pkgver=${_pkgver//-/.}
+pkgrel=7
 pkgdesc="Foreach Parallel Adaptor for the 'parallel' Package"
 arch=(any)
-url="https://cran.r-project.org/package=${_cranname}"
+url="https://cran.r-project.org/package=${_pkgname}"
 license=(GPL2)
-depends=(r-foreach r-iterators)
-checkdepends=(r-caret r-mlbench r-runit)
-optdepends=(r-caret r-mlbench r-runit)
-source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
+depends=(
+  r-foreach
+  r-iterators
+)
+checkdepends=(
+  r-caret
+  r-mlbench
+  r-runit
+)
+optdepends=(
+  r-caret
+  r-mlbench
+  r-runit
+)
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
+md5sums=('df72884b8d87b06c6bdd4f8caf7e5bf7')
 sha256sums=('b96a25ad105a654d70c7b4ca27290dc9967bc47f4668b2763927a886b178abd7')
 
 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" Rscript --vanilla doRUnit.R
+  cd "$_pkgname/tests"
+  R_LIBS="$srcdir/build" Rscript --vanilla doRUnit.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"
 }