From c3b3a1c40e835deb4bbfe52ba0703c6c860c2e5a Mon Sep 17 00:00:00 2001
From: Pekka Ristola <pekkarr@protonmail.com>
Date: Sat, 15 Jul 2023 20:38:47 +0300
Subject: [PATCH] r-distr: use metadata checks

---
 BioArchLinux/r-distr/PKGBUILD     | 24 +++++++++++++-----------
 BioArchLinux/r-distr/lilac.py     | 11 ++++++-----
 BioArchLinux/r-distr/lilac.yaml   | 11 ++++++-----
 lilac-extensions/lilac_r_utils.py |  1 +
 4 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/BioArchLinux/r-distr/PKGBUILD b/BioArchLinux/r-distr/PKGBUILD
index e56d351149..e025e875af 100644
--- a/BioArchLinux/r-distr/PKGBUILD
+++ b/BioArchLinux/r-distr/PKGBUILD
@@ -1,16 +1,18 @@
-# Maintainer: Guoyi Zhang <guoyizhang at malacology dot net>
+# Maintainer: Pekka Ristola <pekkarr [at] protonmail [dot] com>
+# Contributor: Guoyi Zhang <guoyizhang at malacology dot net>
+# Contributor: Alex Branham <branham@utexas.edu>
+# Contributor: fordprefect <fordprefect@dukun.de>
 
 _pkgname=distr
 _pkgver=2.9.2
 pkgname=r-${_pkgname,,}
-pkgver=2.9.2
+pkgver=${_pkgver//-/.}
 pkgrel=1
-pkgdesc='Object Oriented Implementation of Distributions'
-arch=('x86_64')
+pkgdesc="Object Oriented Implementation of Distributions"
+arch=(x86_64)
 url="https://cran.r-project.org/package=${_pkgname}"
-license=('LGPL')
+license=(LGPL3)
 depends=(
-  r
   r-sfsmisc
   r-startupmsg
 )
@@ -18,19 +20,19 @@ optdepends=(
   r-distrex
   r-distrmod
   r-knitr
-  r-robastbase
   r-roptest
   r-svunit
 )
 source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
+md5sums=('434704907b6994db505b19a50564b007')
 sha256sums=('b52a817ed66b75defb009e2f946472ab87f693f63c43638e86b5482cd39a2e30')
 
 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-distr/lilac.py b/BioArchLinux/r-distr/lilac.py
index bd219c037c..b5cdb057c5 100644
--- a/BioArchLinux/r-distr/lilac.py
+++ b/BioArchLinux/r-distr/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-distr/lilac.yaml b/BioArchLinux/r-distr/lilac.yaml
index e1b29b4344..f687191911 100644
--- a/BioArchLinux/r-distr/lilac.yaml
+++ b/BioArchLinux/r-distr/lilac.yaml
@@ -1,12 +1,13 @@
 build_prefix: extra-x86_64
 maintainers:
-- github: starsareintherose
-  email: kuoi@bioarchlinux.org
+- github: pekkarr
+  email: pekkarr@protonmail.com
 repo_depends:
 - r-sfsmisc
 - r-startupmsg
 update_on:
-- regex: distr_([\d._-]+).tar.gz
-  source: regex
-  url: https://cran.r-project.org/package=distr
+- source: rpkgs
+  pkgname: distr
+  repo: cran
+  md5: true
 - alias: r
diff --git a/lilac-extensions/lilac_r_utils.py b/lilac-extensions/lilac_r_utils.py
index 8251542cd1..c5e9979013 100644
--- a/lilac-extensions/lilac_r_utils.py
+++ b/lilac-extensions/lilac_r_utils.py
@@ -203,6 +203,7 @@ license_map = {
     "LGPL (>= 2)": "LGPL",
     "LGPL (>= 2.1)": "LGPL",
     "LGPL-2": "LGPL2.1",
+    "LGPL-3": "LGPL3",
     "Lucent Public License": "custom:LPL",
     "MIT + file LICENSE": "MIT",
 }