From 5598c75011b811d56e838180f3d835567af793fd Mon Sep 17 00:00:00 2001
From: Pekka Ristola <pekkarr@protonmail.com>
Date: Wed, 20 Sep 2023 14:37:07 +0300
Subject: [PATCH] r-dapardata: fix depends, use metadata checks

---
 BioArchLinux/r-dapardata/PKGBUILD   | 29 ++++++++++++++++-------------
 BioArchLinux/r-dapardata/lilac.py   | 11 ++++++-----
 BioArchLinux/r-dapardata/lilac.yaml | 13 ++++++++-----
 3 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/BioArchLinux/r-dapardata/PKGBUILD b/BioArchLinux/r-dapardata/PKGBUILD
index d3df9f4843..ac88e4a080 100644
--- a/BioArchLinux/r-dapardata/PKGBUILD
+++ b/BioArchLinux/r-dapardata/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>
 
 _pkgname=DAPARdata
-_pkgver=1.30.0
+_pkgver=1.30.1
 pkgname=r-${_pkgname,,}
-pkgver=1.30.0
-pkgrel=1
-pkgdesc='Data accompanying the DAPAR and Prostar packages'
-arch=('any')
+pkgver=${_pkgver//-/.}
+pkgrel=0
+pkgdesc="Data accompanying the DAPAR and Prostar packages"
+arch=(any)
 url="https://bioconductor.org/packages/${_pkgname}"
-license=('GPL')
+license=(GPL2)
 depends=(
-  r
+  r-biocstyle
+  r-graph
   r-msnbase
 )
 optdepends=(
@@ -18,14 +20,15 @@ optdepends=(
   r-knitr
 )
 source=("https://bioconductor.org/packages/release/data/experiment/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
-sha256sums=('8e0efdfa97128410865b6d189e5d7381d0526945b207163220a96cbb3c51e513')
+md5sums=('2c5359b007b456c901c1bb947ba4c81a')
+sha256sums=('041fcdccae7ac679e84fcc969031dc97fa830b431d9e3f3e2fed752d81357d24')
 
 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-dapardata/lilac.py b/BioArchLinux/r-dapardata/lilac.py
index bd219c037c..b5cdb057c5 100644
--- a/BioArchLinux/r-dapardata/lilac.py
+++ b/BioArchLinux/r-dapardata/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-dapardata/lilac.yaml b/BioArchLinux/r-dapardata/lilac.yaml
index 9aa225a3a3..1490448d0f 100644
--- a/BioArchLinux/r-dapardata/lilac.yaml
+++ b/BioArchLinux/r-dapardata/lilac.yaml
@@ -1,11 +1,14 @@
 build_prefix: extra-x86_64
 maintainers:
-- github: starsareintherose
-  email: kuoi@bioarchlinux.org
+- github: pekkarr
+  email: pekkarr@protonmail.com
 repo_depends:
+- r-biocstyle
+- r-graph
 - r-msnbase
 update_on:
-- regex: DAPARdata_([\d._-]+).tar.gz
-  source: regex
-  url: https://bioconductor.org/packages/DAPARdata
+- source: rpkgs
+  pkgname: DAPARdata
+  repo: bioc-data-experiment
+  md5: true
 - alias: r