From b9662ede5632c80fce33f2c57d5bec63b1200e7a Mon Sep 17 00:00:00 2001
From: Pekka Ristola <pekkarr@protonmail.com>
Date: Sun, 1 Oct 2023 08:19:50 +0300
Subject: [PATCH] r-waffle: fix depends, use metadata checks

---
 BioArchLinux/r-waffle/PKGBUILD   | 38 ++++++++++++++++++++------------
 BioArchLinux/r-waffle/lilac.py   | 11 ++++-----
 BioArchLinux/r-waffle/lilac.yaml | 17 +++++++++-----
 3 files changed, 42 insertions(+), 24 deletions(-)

diff --git a/BioArchLinux/r-waffle/PKGBUILD b/BioArchLinux/r-waffle/PKGBUILD
index 1470ba7fc6..076b77f1e1 100644
--- a/BioArchLinux/r-waffle/PKGBUILD
+++ b/BioArchLinux/r-waffle/PKGBUILD
@@ -1,34 +1,44 @@
-# 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=waffle
-_pkgver=0.7.0
+_pkgver=1.0.2
 pkgname=r-${_pkgname,,}
-pkgver=0.7.0
-pkgrel=6
-pkgdesc='Create Waffle Chart Visualizations in R'
-arch=('any')
+pkgver=${_pkgver//-/.}
+pkgrel=0
+pkgdesc="Create Waffle Chart Visualizations"
+arch=(any)
 url="https://cran.r-project.org/package=${_pkgname}"
-license=('GPL')
+license=(GPL)
 depends=(
-  r
+  r-curl
+  r-dt
   r-extrafont
   r-ggplot2
   r-gridextra
   r-gtable
+  r-htmlwidgets
+  r-plyr
   r-rcolorbrewer
+  r-rlang
+  r-stringr
 )
 optdepends=(
-  r-testthat
+  r-dplyr
+  r-ggthemes
+  r-knitr
+  r-rmarkdown
 )
 source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
-sha256sums=('ae05c344ea7c1227d34ea6645d563bd21908c634f1d114b7f2cca43b465455e2')
+md5sums=('5d8baee6c96eb2a1e7b8001ef159f45e')
+sha256sums=('e650803b4ec3c6a0aca02b1d9430d23d603d86f9782d90b96f698a6b692de09f')
 
 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-waffle/lilac.py b/BioArchLinux/r-waffle/lilac.py
index bd219c037c..b5cdb057c5 100644
--- a/BioArchLinux/r-waffle/lilac.py
+++ b/BioArchLinux/r-waffle/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-waffle/lilac.yaml b/BioArchLinux/r-waffle/lilac.yaml
index 2262af3fe5..d3a98e7548 100644
--- a/BioArchLinux/r-waffle/lilac.yaml
+++ b/BioArchLinux/r-waffle/lilac.yaml
@@ -1,15 +1,22 @@
 build_prefix: extra-x86_64
 maintainers:
-- github: starsareintherose
-  email: kuoi@bioarchlinux.org
+- github: pekkarr
+  email: pekkarr@protonmail.com
 repo_depends:
+- r-curl
+- r-dt
 - r-extrafont
 - r-ggplot2
 - r-gridextra
 - r-gtable
+- r-htmlwidgets
+- r-plyr
 - r-rcolorbrewer
+- r-rlang
+- r-stringr
 update_on:
-- regex: waffle_([\d._-]+).tar.gz
-  source: regex
-  url: https://cran.r-project.org/package=waffle
+- source: rpkgs
+  pkgname: waffle
+  repo: cran
+  md5: true
 - alias: r