[lilac] updated to 1.5.2-7

3 files changed, 54 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a37a76520845..e567ed2c00d0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,23 @@
 pkgbase = r-foreach
 	pkgdesc = Provides Foreach Looping Construct
 	pkgver = 1.5.2
-	pkgrel = 1
+	pkgrel = 7
 	url = https://cran.r-project.org/package=foreach
 	arch = any
 	license = Apache
-	checkdepends = r-doparallel
 	checkdepends = r-testthat
 	depends = r-iterators
-	optdepends = r-randomforest
 	optdepends = r-domc
 	optdepends = r-doparallel
-	optdepends = r-testthat
 	optdepends = r-knitr
+	optdepends = r-randomforest
 	optdepends = r-rmarkdown
+	optdepends = r-testthat
 	source = https://cran.r-project.org/src/contrib/foreach_1.5.2.tar.gz
+	source = skip-parallel-tests.patch
+	md5sums = 726beb5a50a3cec75261b4405158386c
+	md5sums = 16b5d1acf5f3a8bdb699110a292278c3
 	sha256sums = 56338d8753f9f68f262cf532fd8a6d0fe25a71a2ff0107f3ce378feb926bafe4
+	sha256sums = e6a6de407c2fb1f926514b421cbea747d5e2b910bcb02664ed445dfb2779bc9c
 
 pkgname = r-foreach
diff --git a/PKGBUILD b/PKGBUILD
index 552e08101580..d8528edda5f8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,41 +1,55 @@
 # 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: Alex Branham <branham@utexas.edu>
 
-_cranname=foreach
-_cranver=1.5.2
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=1
+_pkgname=foreach
+_pkgver=1.5.2
+pkgname=r-${_pkgname,,}
+pkgver=${_pkgver//[:-]/.}
+pkgrel=7
 pkgdesc="Provides Foreach Looping Construct"
 arch=(any)
-url="https://cran.r-project.org/package=${_cranname}"
+url="https://cran.r-project.org/package=${_pkgname}"
 license=(Apache)
-depends=(r-iterators)
-checkdepends=(r-doparallel r-testthat)
+depends=(
+  r-iterators
+)
+checkdepends=(
+  r-testthat
+)
 optdepends=(
-    r-randomforest
-    r-domc
-    r-doparallel
-    r-testthat
-    r-knitr
-    r-rmarkdown
+  r-domc
+  r-doparallel
+  r-knitr
+  r-randomforest
+  r-rmarkdown
+  r-testthat
 )
-source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
-sha256sums=('56338d8753f9f68f262cf532fd8a6d0fe25a71a2ff0107f3ce378feb926bafe4')
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz"
+        "skip-parallel-tests.patch")
+md5sums=('726beb5a50a3cec75261b4405158386c'
+         '16b5d1acf5f3a8bdb699110a292278c3')
+sha256sums=('56338d8753f9f68f262cf532fd8a6d0fe25a71a2ff0107f3ce378feb926bafe4'
+            'e6a6de407c2fb1f926514b421cbea747d5e2b910bcb02664ed445dfb2779bc9c')
+
+prepare() {
+  # skip parallel tests in order to avoid a checkdependency on r-doparallel
+  # which would cause a dependency cycle
+  patch -Np1 -i skip-parallel-tests.patch
+}
 
 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"
 }
diff --git a/skip-parallel-tests.patch b/skip-parallel-tests.patch
new file mode 100644
index 000000000000..cca7c209967a
--- /dev/null
+++ b/skip-parallel-tests.patch
@@ -0,0 +1,11 @@
+diff --git a/foreach/tests/testthat.R b/foreach/tests/testthat.R
+index 37f6250..7b32078 100644
+--- a/foreach/tests/testthat.R
++++ b/foreach/tests/testthat.R
+@@ -4,6 +4,3 @@ library(foreach)
+ 

+ Sys.setenv(FOREACH_BACKEND="SEQ")

+ test_check("foreach")

+-

+-Sys.setenv(FOREACH_BACKEND="PAR")

+-test_check("foreach")