From c6b01113b0776057be44aff914a8ee31e1b4e8db Mon Sep 17 00:00:00 2001
From: Pekka Ristola <pekkarr@protonmail.com>
Date: Sat, 17 Jun 2023 15:45:59 +0300
Subject: [PATCH] r-rcppziggurat: use metadata checks

---
 BioArchLinux/r-rcppziggurat/PKGBUILD   | 25 ++++++++++++++-----------
 BioArchLinux/r-rcppziggurat/lilac.py   | 11 ++++++-----
 BioArchLinux/r-rcppziggurat/lilac.yaml | 12 +++++++-----
 lilac-extensions/lilac_r_utils.py      |  2 +-
 4 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/BioArchLinux/r-rcppziggurat/PKGBUILD b/BioArchLinux/r-rcppziggurat/PKGBUILD
index 3b7f99e171..d6b2d1f878 100644
--- a/BioArchLinux/r-rcppziggurat/PKGBUILD
+++ b/BioArchLinux/r-rcppziggurat/PKGBUILD
@@ -1,36 +1,39 @@
-# 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=RcppZiggurat
 _pkgver=0.1.6
 pkgname=r-${_pkgname,,}
-pkgver=0.1.6
+pkgver=${_pkgver//[:-]/.}
 pkgrel=5
-pkgdesc="'Rcpp' Integration of Different "Ziggurat" Normal RNG Implementations"
-arch=('x86_64')
+pkgdesc="'Rcpp' Integration of Different \"Ziggurat\" Normal RNG Implementations"
+arch=(x86_64)
 url="https://cran.r-project.org/package=${_pkgname}"
-license=('GPL')
+license=(GPL)
 depends=(
-  r
+  gsl
   r-rcpp
+)
+makedepends=(
   r-rcppgsl
 )
 optdepends=(
   r-knitr
-  r-lattice
   r-microbenchmark
   r-pinp
   r-rbenchmark
   r-rmarkdown
 )
 source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
+md5sums=('53115de66376aafe087e90ff166d6de1')
 sha256sums=('9c78255ca476c945c05a564d1e4da363de714d890e0e27f3b252fd73c50eed71')
 
 build() {
-  R CMD INSTALL ${_pkgname}_${_pkgver}.tar.gz -l "${srcdir}"
+  mkdir -p build
+  R CMD INSTALL "$_pkgname" -l build
 }
 
 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-rcppziggurat/lilac.py b/BioArchLinux/r-rcppziggurat/lilac.py
index bd219c037c..b5cdb057c5 100644
--- a/BioArchLinux/r-rcppziggurat/lilac.py
+++ b/BioArchLinux/r-rcppziggurat/lilac.py
@@ -1,12 +1,13 @@
 #!/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()
diff --git a/BioArchLinux/r-rcppziggurat/lilac.yaml b/BioArchLinux/r-rcppziggurat/lilac.yaml
index 5c3ac247d7..d7171d491a 100644
--- a/BioArchLinux/r-rcppziggurat/lilac.yaml
+++ b/BioArchLinux/r-rcppziggurat/lilac.yaml
@@ -1,12 +1,14 @@
 build_prefix: extra-x86_64
 maintainers:
-- github: starsareintherose
-  email: kuoi@bioarchlinux.org
+- github: pekkarr
+  email: pekkarr@protonmail.com
 repo_depends:
 - r-rcpp
+repo_makedepends:
 - r-rcppgsl
 update_on:
-- regex: RcppZiggurat_([\d._-]+).tar.gz
-  source: regex
-  url: https://cran.r-project.org/package=RcppZiggurat
+- source: rpkgs
+  pkgname: RcppZiggurat
+  repo: cran
+  md5: true
 - alias: r
diff --git a/lilac-extensions/lilac_r_utils.py b/lilac-extensions/lilac_r_utils.py
index 93c8dc714e..d6d6026a4c 100644
--- a/lilac-extensions/lilac_r_utils.py
+++ b/lilac-extensions/lilac_r_utils.py
@@ -295,7 +295,7 @@ def check_fortran(pkg: Pkgbuild, desc: Description, cfg: CheckConfig):
     elif not fortran_files and fortran_dep:
         raise CheckFailed("Unnecessary make dependency: gcc-fortran")
     elif cfg.ignore_fortran_files and not fortran_files:
-        raise CheckFailed("Unnecessary config 'ignore_fortran_files'");
+        raise CheckFailed("Unnecessary config 'ignore_fortran_files'")
 
 def check_systemrequirements(pkg: Pkgbuild, desc: Description, cfg: CheckConfig):
     if cfg.expect_systemrequirements != desc.systemrequirements: