From 15b5a9f58e574be58ab894b942520383d8d6c5af Mon Sep 17 00:00:00 2001
From: Pekka Ristola <pekkarr@protonmail.com>
Date: Sun, 25 Jun 2023 23:10:00 +0300
Subject: [PATCH] r-ggfun: use metadata checks

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

diff --git a/BioArchLinux/r-ggfun/PKGBUILD b/BioArchLinux/r-ggfun/PKGBUILD
index e774c24d62..2bdd2dd5a3 100644
--- a/BioArchLinux/r-ggfun/PKGBUILD
+++ b/BioArchLinux/r-ggfun/PKGBUILD
@@ -1,16 +1,16 @@
-# Maintainer: Guoyi Zhang <guoyizhang at malacology dot net>
+# Maintainer: Pekka Ristola <pekkarr [at] protonmail [dot] com>
+# Contributor: Guoyi Zhang <guoyizhang at malacology dot net>
 
 _pkgname=ggfun
-_pkgver=0.1.0
+_pkgver=0.1.1
 pkgname=r-${_pkgname,,}
-pkgver=0.1.0
-pkgrel=1
+pkgver=${_pkgver//-/.}
+pkgrel=0
 pkgdesc="Miscellaneous Functions for 'ggplot2'"
-arch=('any')
+arch=(any)
 url="https://cran.r-project.org/package=${_pkgname}"
-license=('Artistic2.0')
+license=(Artistic2.0)
 depends=(
-  r
   r-ggplot2
   r-rlang
 )
@@ -23,14 +23,15 @@ optdepends=(
   r-tidyr
 )
 source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
-sha256sums=('59e5ca8936c4394732b352dabee6a85cb08b952d3f272e243db0171b44593e63')
+md5sums=('d8345e6cce668ebe3afe2ef3fe9686c0')
+sha256sums=('9845ed6069cd877da59055207b39ea2e30e895b3e9e29f384a985b3d819fd7bf')
 
 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-ggfun/lilac.py b/BioArchLinux/r-ggfun/lilac.py
index bd219c037c..b5cdb057c5 100644
--- a/BioArchLinux/r-ggfun/lilac.py
+++ b/BioArchLinux/r-ggfun/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-ggfun/lilac.yaml b/BioArchLinux/r-ggfun/lilac.yaml
index 18eb94d150..a59b8c4ae0 100644
--- a/BioArchLinux/r-ggfun/lilac.yaml
+++ b/BioArchLinux/r-ggfun/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-ggplot2
 - r-rlang
 update_on:
-- regex: ggfun_([\d._-]+).tar.gz
-  source: regex
-  url: https://cran.r-project.org/package=ggfun
+- source: rpkgs
+  pkgname: ggfun
+  repo: cran
+  md5: true
 - alias: r
diff --git a/lilac-extensions/lilac_r_utils.py b/lilac-extensions/lilac_r_utils.py
index 644c00e97c..626ca15176 100644
--- a/lilac-extensions/lilac_r_utils.py
+++ b/lilac-extensions/lilac_r_utils.py
@@ -185,6 +185,7 @@ class Pkgbuild:
 license_map = {
     "Apache License (== 2.0)": "Apache",
     "Apache License 2.0": "Apache",
+    "Artistic-2.0": "Artistic2.0",
     "BSD_2_clause + file LICENSE": "BSD",
     "BSD_3_clause + file LICENSE": "BSD",
     "BSL-1.0": "Boost",