From 1dbcedaf86b21bb2ec2a573d6a1e7d75953c0db2 Mon Sep 17 00:00:00 2001
From: Pekka Ristola <pekkarr@protonmail.com>
Date: Mon, 18 Mar 2024 19:30:41 +0200
Subject: [PATCH] r-rjava: use metadata checks

---
 BioArchLinux/r-hwriter/lilac.py   |  5 +----
 BioArchLinux/r-imagehts/lilac.py  |  5 +----
 BioArchLinux/r-rjava/PKGBUILD     | 23 ++++++++++++-----------
 BioArchLinux/r-rjava/lilac.py     | 14 +++++++++-----
 BioArchLinux/r-rjava/lilac.yaml   |  7 ++++---
 lilac-extensions/lilac_r_utils.py |  1 +
 6 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/BioArchLinux/r-hwriter/lilac.py b/BioArchLinux/r-hwriter/lilac.py
index a7a64004ec..9244fd6914 100644
--- a/BioArchLinux/r-hwriter/lilac.py
+++ b/BioArchLinux/r-hwriter/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 = "LGPL-2.1",
-    )
+    r_pre_build(_G)
 
 def post_build():
     git_pkgbuild_commit()
diff --git a/BioArchLinux/r-imagehts/lilac.py b/BioArchLinux/r-imagehts/lilac.py
index ffc2c2d82a..b5cdb057c5 100644
--- a/BioArchLinux/r-imagehts/lilac.py
+++ b/BioArchLinux/r-imagehts/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 = "LGPL-2.1",
-    )
+    r_pre_build(_G)
 
 def post_build():
     git_pkgbuild_commit()
diff --git a/BioArchLinux/r-rjava/PKGBUILD b/BioArchLinux/r-rjava/PKGBUILD
index 771376ae7e..3649506632 100644
--- a/BioArchLinux/r-rjava/PKGBUILD
+++ b/BioArchLinux/r-rjava/PKGBUILD
@@ -4,25 +4,25 @@
 _pkgname=rJava
 _pkgver=1.0-11
 pkgname=r-${_pkgname,,}
-pkgver=1.0.11
+pkgver=${_pkgver//-/.}
 pkgrel=1
-pkgdesc='Low-Level R to Java Interface'
+pkgdesc="Low-Level R to Java Interface"
 arch=(x86_64)
-url="https://cran.r-project.org/package=${_pkgname}"
-license=(LGPL)
+url="https://cran.r-project.org/package=$_pkgname"
+license=('LGPL-2.1-only')
 depends=(
-  r
-  openmp
   java-runtime
+  openmp
+  r
 )
 makedepends=(
-  make
   clang
   java-environment
   patchelf
 )
 source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
-sha256sums=('9ea0ccf5553d86f7de8649a8324766c4f0810f35b7be561640dd87fd37986417')
+md5sums=('4d8eff03a23cb797f01e710ea7528dd2')
+b2sums=('13ecb4a3c545505f047474027d586e0bf7ca02676bbe0bcd142bba786b3380714937f71efa2ca324fcf6efa0c20112f9ef8bc01d8093d3eea17e63176048d6b4')
 
 
 package() {
@@ -39,10 +39,11 @@ package() {
   export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$JAVA_HOME/lib/server"
 
   archlinux-java fix
-  R CMD INSTALL ${_pkgname}_${_pkgver}.tar.gz -l "${srcdir}"
-  install -dm0755 "${pkgdir}/usr/lib/R/library"
+  mkdir build
+  R CMD INSTALL -l build "$_pkgname"
 
-  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"
 
   patchelf --set-rpath "${JAVA_LD_LIBRARY_PATH}" ${pkgdir}/usr/lib/R/library/rJava/libs/rJava.so
 }
diff --git a/BioArchLinux/r-rjava/lilac.py b/BioArchLinux/r-rjava/lilac.py
index 620556bc87..559a362456 100644
--- a/BioArchLinux/r-rjava/lilac.py
+++ b/BioArchLinux/r-rjava/lilac.py
@@ -1,12 +1,16 @@
 #!/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,
+        expect_systemrequirements = "Java JDK 1.2 or higher (for JRI/REngine JDK 1.4 or higher), GNU make",
+    )
 
 def post_build():
     git_pkgbuild_commit()
diff --git a/BioArchLinux/r-rjava/lilac.yaml b/BioArchLinux/r-rjava/lilac.yaml
index a38fd12ea8..41610a2535 100644
--- a/BioArchLinux/r-rjava/lilac.yaml
+++ b/BioArchLinux/r-rjava/lilac.yaml
@@ -3,7 +3,8 @@ maintainers:
 - github: starsareintherose
   email: kuoi@bioarchlinux.org
 update_on:
-- regex: rJava_([\d._-]+).tar.gz
-  source: regex
-  url: https://cran.r-project.org/package=rJava
+- source: rpkgs
+  pkgname: rJava
+  repo: cran
+  md5: true
 - alias: r
diff --git a/lilac-extensions/lilac_r_utils.py b/lilac-extensions/lilac_r_utils.py
index 97eee2a8ed..e7ba7ed51f 100644
--- a/lilac-extensions/lilac_r_utils.py
+++ b/lilac-extensions/lilac_r_utils.py
@@ -215,6 +215,7 @@ license_map = {
     "LGPL (>= 2)": "LGPL-2.0-or-later",
     "LGPL (>= 2.1)": "LGPL-2.1-or-later",
     "LGPL-2": "LGPL-2.0-only",
+    "LGPL-2.1": "LGPL-2.1-only",
     "LGPL-3": "LGPL-3.0-only",
     "LGPL-3 | Apache License 2.0": "LGPL-3.0-only OR Apache-2.0",
     "Lucent Public License": "custom:LPL",