[lilac] updated to 1.8.8-3

2 files changed, 35 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c4ed11f39bf7..1af436c04b27 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,11 @@
 pkgbase = r-plyr
 	pkgdesc = Tools for Splitting, Applying and Combining Data
 	pkgver = 1.8.8
-	pkgrel = 1
+	pkgrel = 3
 	url = https://cran.r-project.org/package=plyr
-	arch = i686
 	arch = x86_64
 	license = MIT
 	checkdepends = r-abind
-	checkdepends = r-doparallel
 	checkdepends = r-testthat
 	depends = r-rcpp
 	optdepends = r-abind
@@ -18,8 +16,7 @@ pkgbase = r-plyr
 	optdepends = r-itertools
 	optdepends = r-testthat
 	source = https://cran.r-project.org/src/contrib/plyr_1.8.8.tar.gz
-	source = CRAN-MIT-TEMPLATE::https://cran.r-project.org/web/licenses/MIT
+	md5sums = 0a22da16605ee765e7d4f1efc9f7a61f
 	sha256sums = a73211b4bbe13e4e5e764966a8dd90172c1cc311938dd464d142e1c7a701070c
-	sha256sums = e76e4aad5d3d9d606db6f8c460311b6424ebadfce13f5322e9bae9d49cc6090b
 
 pkgname = r-plyr
diff --git a/PKGBUILD b/PKGBUILD
index 75724b42667b..a6627cd6ad40 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,48 +1,52 @@
 # 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: wagnerflo <florian@wagner-flo.net>
 # Contributor: Matt Frichtl <frichtlm@gmail.com>
+# Contributor: wagnerflo <florian@wagner-flo.net>
 
-_cranname=plyr
-_cranver=1.8.8
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=1
+_pkgname=plyr
+_pkgver=1.8.8
+pkgname=r-${_pkgname,,}
+pkgver=${_pkgver//-/.}
+pkgrel=3
 pkgdesc="Tools for Splitting, Applying and Combining Data"
-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-rcpp)
-checkdepends=(r-abind r-doparallel r-testthat)
+depends=(
+  r-rcpp
+)
+checkdepends=(
+  r-abind
+  r-testthat
+)
 optdepends=(
-    r-abind
-    r-covr
-    r-doparallel
-    r-foreach
-    r-iterators
-    r-itertools
-    r-testthat
+  r-abind
+  r-covr
+  r-doparallel
+  r-foreach
+  r-iterators
+  r-itertools
+  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=('a73211b4bbe13e4e5e764966a8dd90172c1cc311938dd464d142e1c7a701070c'
-            'e76e4aad5d3d9d606db6f8c460311b6424ebadfce13f5322e9bae9d49cc6090b')
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
+md5sums=('0a22da16605ee765e7d4f1efc9f7a61f')
+sha256sums=('a73211b4bbe13e4e5e764966a8dd90172c1cc311938dd464d142e1c7a701070c')
 
 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"
 }