From c0e59e5ce4ef5f68c20bda22a60258b7655bec47 Mon Sep 17 00:00:00 2001
From: Pekka Ristola <pekkarr@protonmail.com>
Date: Wed, 4 Oct 2023 15:50:11 +0300
Subject: [PATCH] r-restriktor: fix depends, use metadata checks

---
 BioArchLinux/r-restriktor/PKGBUILD   | 34 ++++++++++++++++------------
 BioArchLinux/r-restriktor/lilac.py   | 11 +++++----
 BioArchLinux/r-restriktor/lilac.yaml | 24 +++++++++++---------
 3 files changed, 39 insertions(+), 30 deletions(-)

diff --git a/BioArchLinux/r-restriktor/PKGBUILD b/BioArchLinux/r-restriktor/PKGBUILD
index b56e94643d..222687dc5d 100644
--- a/BioArchLinux/r-restriktor/PKGBUILD
+++ b/BioArchLinux/r-restriktor/PKGBUILD
@@ -1,32 +1,38 @@
-# Maintainer: sukanka <su975853527@gmail.com>
+# Maintainer: Pekka Ristola <pekkarr [at] protonmail [dot] com>
+# Contributor: sukanka <su975853527@gmail.com>
 
 _pkgname=restriktor
-_pkgver=0.5-20
+_pkgver=0.5-30
 pkgname=r-${_pkgname,,}
-pkgver=0.5.20
-pkgrel=1
-pkgdesc='Restricted Statistical Estimation and Inference for Linear Models'
-arch=('any')
+pkgver=${_pkgver//-/.}
+pkgrel=0
+pkgdesc="Restricted Statistical Estimation and Inference for Linear Models"
+arch=(any)
 url="https://cran.r-project.org/package=${_pkgname}"
-license=('GPL')
+license=(GPL)
 depends=(
-  r
   r-ggplot2
   r-ic.infer
   r-lavaan
   r-mvtnorm
-  r-norm2
+  r-norm
   r-quadprog
 )
+optdepends=(
+  r-bain
+  r-knitr
+  r-rmarkdown
+)
 source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
-sha256sums=('b43386d44da5938cfbc8b9c94256dcaa504bc1442b85bd32cdf7027e623c1091')
+md5sums=('ec3023fa71654bd421e7c1f82c1be9fc')
+sha256sums=('2f91995e1248280a4068017fa418431211a480a8add0166915248a9e45428be2')
 
 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-restriktor/lilac.py b/BioArchLinux/r-restriktor/lilac.py
index bd219c037c..b5cdb057c5 100644
--- a/BioArchLinux/r-restriktor/lilac.py
+++ b/BioArchLinux/r-restriktor/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-restriktor/lilac.yaml b/BioArchLinux/r-restriktor/lilac.yaml
index eaaff4eca5..54af26dc96 100644
--- a/BioArchLinux/r-restriktor/lilac.yaml
+++ b/BioArchLinux/r-restriktor/lilac.yaml
@@ -1,15 +1,17 @@
 build_prefix: extra-x86_64
 maintainers:
-  - github: sukanka
+- github: pekkarr
+  email: pekkarr@protonmail.com
 repo_depends:
-  - r-ggplot2
-  - r-ic.infer
-  - r-lavaan
-  - r-mvtnorm
-  - r-norm2
-  - r-quadprog
+- r-ggplot2
+- r-ic.infer
+- r-lavaan
+- r-mvtnorm
+- r-norm
+- r-quadprog
 update_on:
-  - regex: restriktor_([\d._-]+).tar.gz
-    source: regex
-    url: https://cran.r-project.org/package=restriktor
-  - alias: r
+- source: rpkgs
+  pkgname: restriktor
+  repo: cran
+  md5: true
+- alias: r