From cc7cebf5aabbb927f372721d0058144b1e5af775 Mon Sep 17 00:00:00 2001
From: Pekka Ristola <pekkarr@protonmail.com>
Date: Sat, 9 Mar 2024 16:21:14 +0200
Subject: [PATCH] r-isa2: use metadata checks

---
 BioArchLinux/r-isa2/PKGBUILD      | 21 +++++++++++----------
 BioArchLinux/r-isa2/lilac.py      | 11 ++++++-----
 BioArchLinux/r-isa2/lilac.yaml    |  7 ++++---
 BioArchLinux/r-rtriangle/lilac.py |  5 +----
 lilac-extensions/lilac_r_utils.py |  1 +
 5 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/BioArchLinux/r-isa2/PKGBUILD b/BioArchLinux/r-isa2/PKGBUILD
index ebd000da15..c08c5fbfa5 100644
--- a/BioArchLinux/r-isa2/PKGBUILD
+++ b/BioArchLinux/r-isa2/PKGBUILD
@@ -3,12 +3,12 @@
 _pkgname=isa2
 _pkgver=0.3.6
 pkgname=r-${_pkgname,,}
-pkgver=0.3.6
+pkgver=${_pkgver//-/.}
 pkgrel=2
-pkgdesc='The Iterative Signature Algorithm'
-arch=('x86_64')
-url="https://cran.r-project.org/package=${_pkgname}"
-license=('CCPL:by-nc-sa')
+pkgdesc="The Iterative Signature Algorithm"
+arch=(x86_64)
+url="https://cran.r-project.org/package=$_pkgname"
+license=('CC-BY-NC-SA-4.0')
 depends=(
   r
 )
@@ -17,14 +17,15 @@ optdepends=(
   r-igraph
 )
 source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
-sha256sums=('6256da84dd9a10499f802838c2065ee6e4dcc012b07d21116496ff8aebb65c66')
+md5sums=('01ce8d5c7bd43fa7fe702cbdaf6863d3')
+b2sums=('d0d587629d79353c47bfeded7557d6d673eeee1993b6de2f29f1b7546b7a1b3aab1e251d192e8d7fb7165d70d8cf948a0f8d157810b0fc677eb8669ee5dc4c1d')
 
 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-isa2/lilac.py b/BioArchLinux/r-isa2/lilac.py
index bd219c037c..b5cdb057c5 100644
--- a/BioArchLinux/r-isa2/lilac.py
+++ b/BioArchLinux/r-isa2/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-isa2/lilac.yaml b/BioArchLinux/r-isa2/lilac.yaml
index e10ec74d6a..f55241290d 100644
--- a/BioArchLinux/r-isa2/lilac.yaml
+++ b/BioArchLinux/r-isa2/lilac.yaml
@@ -3,7 +3,8 @@ maintainers:
 - github: starsareintherose
   email: kuoi@bioarchlinux.org
 update_on:
-- regex: isa2_([\d._-]+).tar.gz
-  source: regex
-  url: https://cran.r-project.org/package=isa2
+- source: rpkgs
+  pkgname: isa2
+  repo: cran
+  md5: true
 - alias: r
diff --git a/BioArchLinux/r-rtriangle/lilac.py b/BioArchLinux/r-rtriangle/lilac.py
index b490c80d5e..b5cdb057c5 100644
--- a/BioArchLinux/r-rtriangle/lilac.py
+++ b/BioArchLinux/r-rtriangle/lilac.py
@@ -7,10 +7,7 @@ sys.path.append(os.path.normpath(f'{__file__}/../../../lilac-extensions'))
 from lilac_r_utils import r_pre_build
 
 def pre_build():
-    r_pre_build(
-        _G,
-        expect_license = "CC BY-NC-SA 4.0",
-    )
+    r_pre_build(_G)
 
 def post_build():
     git_pkgbuild_commit()
diff --git a/lilac-extensions/lilac_r_utils.py b/lilac-extensions/lilac_r_utils.py
index ababad97f9..91e4b672ee 100644
--- a/lilac-extensions/lilac_r_utils.py
+++ b/lilac-extensions/lilac_r_utils.py
@@ -197,6 +197,7 @@ license_map = {
     "BSD_2_clause + file LICENSE": "BSD-2-Clause",
     "BSD_3_clause + file LICENSE": "BSD-3-Clause",
     "BSL-1.0": "BSL-1.0",
+    "CC BY-NC-SA 4.0": "CC-BY-NC-SA-4.0",
     "CC0": "CC0-1.0",
     "CeCILL": "CECILL-2.0",
     "EPL": "EPL",