From 742c160210c1dcaddd88c127400b1d83b396860b Mon Sep 17 00:00:00 2001
From: Pekka Ristola <pekkarr@protonmail.com>
Date: Sun, 3 Mar 2024 19:01:24 +0200
Subject: [PATCH] r-softimpute: use metadata checks

---
 BioArchLinux/r-softimpute/PKGBUILD   | 27 ++++++++++++++-------------
 BioArchLinux/r-softimpute/lilac.py   | 11 ++++++-----
 BioArchLinux/r-softimpute/lilac.yaml |  7 ++++---
 3 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/BioArchLinux/r-softimpute/PKGBUILD b/BioArchLinux/r-softimpute/PKGBUILD
index 05a20e71bd..e3528e0a24 100644
--- a/BioArchLinux/r-softimpute/PKGBUILD
+++ b/BioArchLinux/r-softimpute/PKGBUILD
@@ -3,31 +3,32 @@
 _pkgname=softImpute
 _pkgver=1.4-1
 pkgname=r-${_pkgname,,}
-pkgver=1.4.1
+pkgver=${_pkgver//-/.}
 pkgrel=8
-pkgdesc='Matrix Completion via Iterative Soft-Thresholded SVD'
-arch=('x86_64')
-url="https://cran.r-project.org/package=${_pkgname}"
-license=('GPL')
+pkgdesc="Matrix Completion via Iterative Soft-Thresholded SVD"
+arch=(x86_64)
+url="https://cran.r-project.org/package=$_pkgname"
+license=('GPL-2.0-only')
 depends=(
   r
 )
+makedepends=(
+  gcc-fortran
+)
 optdepends=(
   r-knitr
   r-rmarkdown
 )
-makedepends=(
-  gcc-fortran
-)
 source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
-sha256sums=('ea4c39831dee834204f6d6594aad6b937540ba4f2adf3f37fb4546844c234aec')
+md5sums=('a17b4aafe9961e6af8f7808829459e90')
+b2sums=('7284a66db4c96348a18b23603a56619fb5d8ad0bbf647446763b2d1910f22e1cd90d2b9f963472189c7d78fa0518b65ab58409359d68fe169b1b820099e5122b')
 
 build() {
-  R CMD INSTALL ${_pkgname}_${_pkgver}.tar.gz -l "${srcdir}"
+  mkdir build
+  R CMD INSTALL -l build "$_pkgname"
 }
 
 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-softimpute/lilac.py b/BioArchLinux/r-softimpute/lilac.py
index bd219c037c..b5cdb057c5 100644
--- a/BioArchLinux/r-softimpute/lilac.py
+++ b/BioArchLinux/r-softimpute/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-softimpute/lilac.yaml b/BioArchLinux/r-softimpute/lilac.yaml
index 5390c24fcc..e04cb16fd7 100644
--- a/BioArchLinux/r-softimpute/lilac.yaml
+++ b/BioArchLinux/r-softimpute/lilac.yaml
@@ -3,7 +3,8 @@ maintainers:
 - github: starsareintherose
   email: kuoi@bioarchlinux.org
 update_on:
-- regex: softImpute_([\d._-]+).tar.gz
-  source: regex
-  url: https://cran.r-project.org/package=softImpute
+- source: rpkgs
+  pkgname: softImpute
+  repo: cran
+  md5: true
 - alias: r