From e8c1ebe35722a79cca3f0cfa40eba01d0aaf09d4 Mon Sep 17 00:00:00 2001
From: Pekka Ristola <pekkarr@protonmail.com>
Date: Sun, 17 Dec 2023 18:41:00 +0200
Subject: [PATCH] r-r6: use metadata checks

---
 BioArchLinux/r-r6/PKGBUILD   | 25 ++++++++++++++-----------
 BioArchLinux/r-r6/lilac.py   | 11 ++++++-----
 BioArchLinux/r-r6/lilac.yaml |  7 ++++---
 3 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/BioArchLinux/r-r6/PKGBUILD b/BioArchLinux/r-r6/PKGBUILD
index d03de12a4a..b878d8a15a 100644
--- a/BioArchLinux/r-r6/PKGBUILD
+++ b/BioArchLinux/r-r6/PKGBUILD
@@ -3,12 +3,12 @@
 _pkgname=R6
 _pkgver=2.5.1
 pkgname=r-${_pkgname,,}
-pkgver=2.5.1
+pkgver=${_pkgver//-/.}
 pkgrel=10
-pkgdesc='Encapsulated Classes with Reference Semantics'
-arch=('any')
-url="https://cran.r-project.org/package=${_pkgname}"
-license=('MIT')
+pkgdesc="Encapsulated Classes with Reference Semantics"
+arch=(any)
+url="https://cran.r-project.org/package=$_pkgname"
+license=(MIT)
 depends=(
   r
 )
@@ -17,15 +17,18 @@ optdepends=(
   r-testthat
 )
 source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
-sha256sums=('8d92bd29c2ed7bf15f2778618ffe4a95556193d21d8431a7f75e7e5fc102bf48')
+md5sums=('e84fd376e246738402e5529b6d52e101')
+b2sums=('0045d7c37dfb7a773cd24e85e695575eaf6aa5c9392fb6888c10aa9fb3e35b13a230ed0aabcf84d52e656ef506ab58371044c4179b3380f5324b217fae6daeb4')
 
 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 -Dm644 "${_pkgname}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -d "$pkgdir/usr/lib/R/library"
+  cp -a --no-preserve=ownership "build/$_pkgname" "$pkgdir/usr/lib/R/library"
+
+  install -d "$pkgdir/usr/share/licenses/$pkgname"
+  ln -s "/usr/lib/R/library/$_pkgname/LICENSE" "$pkgdir/usr/share/licenses/$pkgname"
 }
-# vim:set ts=2 sw=2 et:
diff --git a/BioArchLinux/r-r6/lilac.py b/BioArchLinux/r-r6/lilac.py
index 620556bc87..9244fd6914 100644
--- a/BioArchLinux/r-r6/lilac.py
+++ b/BioArchLinux/r-r6/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-r6/lilac.yaml b/BioArchLinux/r-r6/lilac.yaml
index b5debabfdd..1070c0885c 100644
--- a/BioArchLinux/r-r6/lilac.yaml
+++ b/BioArchLinux/r-r6/lilac.yaml
@@ -3,7 +3,8 @@ maintainers:
 - github: starsareintherose
   email: kuoi@bioarchlinux.org
 update_on:
-- regex: R6_([\d._-]+).tar.gz
-  source: regex
-  url: https://cran.r-project.org/package=R6
+- source: rpkgs
+  pkgname: R6
+  repo: cran
+  md5: true
 - alias: r