From 6f3d26fe85d92a0241a2ef49410f0db1b73657a5 Mon Sep 17 00:00:00 2001
From: Pekka Ristola <pekkarr@protonmail.com>
Date: Mon, 14 Aug 2023 20:56:23 +0300
Subject: [PATCH] r-confintr: use metadata checks

---
 BioArchLinux/r-confintr/PKGBUILD   | 28 +++++++++++++++++++---------
 BioArchLinux/r-confintr/lilac.py   | 12 +++++++-----
 BioArchLinux/r-confintr/lilac.yaml | 13 ++++++++-----
 3 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/BioArchLinux/r-confintr/PKGBUILD b/BioArchLinux/r-confintr/PKGBUILD
index 898d4f8912..7f6284f074 100644
--- a/BioArchLinux/r-confintr/PKGBUILD
+++ b/BioArchLinux/r-confintr/PKGBUILD
@@ -1,31 +1,41 @@
-# 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=confintr
 _pkgver=1.0.2
 pkgname=r-${_pkgname,,}
-pkgver=1.0.2
+pkgver=${_pkgver//-/.}
 pkgrel=1
-pkgdesc='Confidence Intervals'
-arch=('any')
+pkgdesc="Confidence Intervals"
+arch=(any)
 url="https://cran.r-project.org/package=${_pkgname}"
-license=('GPL')
+license=(GPL)
 depends=(
   r
 )
+checkdepends=(
+  r-testthat
+)
 optdepends=(
   r-knitr
   r-rmarkdown
   r-testthat
 )
 source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
+md5sums=('628fd405c1c04154e90bfd7eca2bfb44')
 sha256sums=('7a104a2e7ef43405e70013bc99529a28bfe4cc4b61cdcc7dddc73426a665293e')
 
 build() {
-  R CMD INSTALL ${_pkgname}_${_pkgver}.tar.gz -l "${srcdir}"
+  mkdir -p build
+  R CMD INSTALL "$_pkgname" -l build
+}
+
+check() {
+  cd "$_pkgname/tests"
+  R_LIBS="$srcdir/build" NOT_CRAN=true Rscript --vanilla testthat.R
 }
 
 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-confintr/lilac.py b/BioArchLinux/r-confintr/lilac.py
index 620556bc87..b5cdb057c5 100644
--- a/BioArchLinux/r-confintr/lilac.py
+++ b/BioArchLinux/r-confintr/lilac.py
@@ -1,12 +1,14 @@
 #!/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()
+    update_aur_repo()
diff --git a/BioArchLinux/r-confintr/lilac.yaml b/BioArchLinux/r-confintr/lilac.yaml
index 4302c1b35c..aaa78590d1 100644
--- a/BioArchLinux/r-confintr/lilac.yaml
+++ b/BioArchLinux/r-confintr/lilac.yaml
@@ -1,9 +1,12 @@
 build_prefix: extra-x86_64
 maintainers:
-- github: starsareintherose
-  email: kuoi@bioarchlinux.org
+- github: pekkarr
+  email: pekkarr@protonmail.com
+repo_makedepends:
+- r-testthat
 update_on:
-- regex: confintr_([\d._-]+).tar.gz
-  source: regex
-  url: https://cran.r-project.org/package=confintr
+- source: rpkgs
+  pkgname: confintr
+  repo: cran
+  md5: true
 - alias: r