From 316755a4c268ef6f229652c0b683adec9928949d Mon Sep 17 00:00:00 2001
From: Pekka Ristola <pekkarr@protonmail.com>
Date: Thu, 13 Jul 2023 20:18:17 +0300
Subject: [PATCH] r-doparallel: use metadata checks

---
 BioArchLinux/r-doparallel/PKGBUILD   | 31 ++++++++++++++++++----------
 BioArchLinux/r-doparallel/lilac.py   | 12 ++++++-----
 BioArchLinux/r-doparallel/lilac.yaml | 15 +++++++++-----
 3 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/BioArchLinux/r-doparallel/PKGBUILD b/BioArchLinux/r-doparallel/PKGBUILD
index be1ed1055c..748ff8dc01 100644
--- a/BioArchLinux/r-doparallel/PKGBUILD
+++ b/BioArchLinux/r-doparallel/PKGBUILD
@@ -1,35 +1,44 @@
-# Maintainer: Guoyi Zhang <guoyizhang at malacology dot net>
+# Maintainer: Pekka Ristola <pekkarr [at] protonmail [dot] com>
+# Contributor: Guoyi Zhang <guoyizhang at malacology dot net>
 
 _pkgname=doParallel
 _pkgver=1.0.17
 pkgname=r-${_pkgname,,}
-pkgver=1.0.17
+pkgver=${_pkgver//-/.}
 pkgrel=6
 pkgdesc="Foreach Parallel Adaptor for the 'parallel' Package"
-arch=('any')
+arch=(any)
 url="https://cran.r-project.org/package=${_pkgname}"
-license=('GPL')
+license=(GPL2)
 depends=(
-  r
   r-foreach
   r-iterators
 )
+checkdepends=(
+  r-caret
+  r-mlbench
+  r-runit
+)
 optdepends=(
   r-caret
-  r-compiler
   r-mlbench
-  r-rpart
   r-runit
 )
 source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
+md5sums=('df72884b8d87b06c6bdd4f8caf7e5bf7')
 sha256sums=('b96a25ad105a654d70c7b4ca27290dc9967bc47f4668b2763927a886b178abd7')
 
 build() {
-  R CMD INSTALL ${_pkgname}_${_pkgver}.tar.gz -l "${srcdir}"
+  mkdir -p build
+  R CMD INSTALL "$_pkgname" -l build
+}
+
+check() {
+  cd "$_pkgname/tests"
+  R_LIBS="$srcdir/build" Rscript --vanilla doRUnit.R
 }
 
 package() {
-  install -dm0755 "${pkgdir}/usr/lib/R/library"
-  cp -a --no-preserve=ownership "${_pkgname}" "${pkgdir}/usr/lib/R/library"
+  install -d "$pkgdir/usr/lib/R/library"
+  cp -a --no-preserve=ownership "build/$_pkgname" "$pkgdir/usr/lib/R/library"
 }
-# vim:set ts=2 sw=2 et:
diff --git a/BioArchLinux/r-doparallel/lilac.py b/BioArchLinux/r-doparallel/lilac.py
index 620556bc87..b5cdb057c5 100644
--- a/BioArchLinux/r-doparallel/lilac.py
+++ b/BioArchLinux/r-doparallel/lilac.py
@@ -1,12 +1,14 @@
 #!/usr/bin/env python3
 from lilaclib import *
 
+import os
+import sys
+sys.path.append(os.path.normpath(f'{__file__}/../../../lilac-extensions'))
+from lilac_r_utils import r_pre_build
+
 def pre_build():
-    for line in edit_file('PKGBUILD'):
-        if line.startswith('_pkgver='):
-            line = f'_pkgver={_G.newver}'
-        print(line)
-    update_pkgver_and_pkgrel(_G.newver.replace(':', '.').replace('-', '.'))
+    r_pre_build(_G)
 
 def post_build():
     git_pkgbuild_commit()
+    update_aur_repo()
diff --git a/BioArchLinux/r-doparallel/lilac.yaml b/BioArchLinux/r-doparallel/lilac.yaml
index 4ec65c1e0e..1d37b96c31 100644
--- a/BioArchLinux/r-doparallel/lilac.yaml
+++ b/BioArchLinux/r-doparallel/lilac.yaml
@@ -1,12 +1,17 @@
 build_prefix: extra-x86_64
 maintainers:
-- github: starsareintherose
-  email: kuoi@bioarchlinux.org
+- github: pekkarr
+  email: pekkarr@protonmail.com
 repo_depends:
 - r-foreach
 - r-iterators
+repo_makedepends:
+- r-caret
+- r-mlbench
+- r-runit
 update_on:
-- regex: doParallel_([\d._-]+).tar.gz
-  source: regex
-  url: https://cran.r-project.org/package=doParallel
+- source: rpkgs
+  pkgname: doParallel
+  repo: cran
+  md5: true
 - alias: r