From 7f24802979b07836509d3daa8543ce2cff39f66d Mon Sep 17 00:00:00 2001 From: Pekka Ristola Date: Thu, 19 Dec 2024 00:00:22 +0200 Subject: [PATCH] r-future.apply: use metadata checks, push to AUR --- BioArchLinux/r-future.apply/PKGBUILD | 28 +++++++++++++------------- BioArchLinux/r-future.apply/lilac.py | 12 ++++++----- BioArchLinux/r-future.apply/lilac.yaml | 7 ++++--- 3 files changed, 25 insertions(+), 22 deletions(-) diff --git a/BioArchLinux/r-future.apply/PKGBUILD b/BioArchLinux/r-future.apply/PKGBUILD index a5b3093e20..cec300c379 100644 --- a/BioArchLinux/r-future.apply/PKGBUILD +++ b/BioArchLinux/r-future.apply/PKGBUILD @@ -1,36 +1,36 @@ # Maintainer: Guoyi Zhang +# Contributor: peippo +# Contributor: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com +# Contributor: Grey Christoforo _pkgname=future.apply _pkgver=1.11.3 pkgname=r-${_pkgname,,} -pkgver=1.11.3 +pkgver=${_pkgver//-/.} pkgrel=1 -pkgdesc='Apply Function to Elements in Parallel using Futures' -arch=('any') -url="https://cran.r-project.org/package=${_pkgname}" -license=('GPL') +pkgdesc="Apply Function to Elements in Parallel using Futures" +arch=(any) +url="https://cran.r-project.org/package=$_pkgname" +license=('GPL-2.0-or-later') depends=( - r r-future r-globals ) optdepends=( - r-datasets r-listenv r-markdown r-r.rsp - r-stats - r-tools ) source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz") -sha256sums=('e6e8858509e6681d71823a5d6600702ea91ee72ad0da4476c993580706db85d0') +md5sums=('264da036546e5c295724d130c2be3ce9') +b2sums=('da916f440caa59695b9abb348cfc1d0621e2014e1992e3ea13044ce8baa9ddd200a8da489fa6a319916b1e589231a317ba0b71cce317f54fde4473a1f3f78526') build() { - R CMD INSTALL ${_pkgname}_${_pkgver}.tar.gz -l "${srcdir}" + mkdir build + R CMD INSTALL -l build "$_pkgname" } 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-future.apply/lilac.py b/BioArchLinux/r-future.apply/lilac.py index 620556bc87..b5cdb057c5 100644 --- a/BioArchLinux/r-future.apply/lilac.py +++ b/BioArchLinux/r-future.apply/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-future.apply/lilac.yaml b/BioArchLinux/r-future.apply/lilac.yaml index ae75fff66d..8b6a598061 100644 --- a/BioArchLinux/r-future.apply/lilac.yaml +++ b/BioArchLinux/r-future.apply/lilac.yaml @@ -6,7 +6,8 @@ repo_depends: - r-future - r-globals update_on: -- regex: future.apply_([\d._-]+).tar.gz - source: regex - url: https://cran.r-project.org/package=future.apply +- source: rpkgs + pkgname: future.apply + repo: cran + md5: true - alias: r