From d1135bd75c391a29e1ad58f942e31a59a6a843a2 Mon Sep 17 00:00:00 2001 From: Pekka Ristola Date: Wed, 11 Oct 2023 14:54:07 +0300 Subject: [PATCH] r-pkgbuild: use metadata checks --- BioArchLinux/r-pkgbuild/PKGBUILD | 35 ++++++++++++++++++++---------- BioArchLinux/r-pkgbuild/lilac.py | 11 +++++----- BioArchLinux/r-pkgbuild/lilac.yaml | 12 +++++----- 3 files changed, 35 insertions(+), 23 deletions(-) diff --git a/BioArchLinux/r-pkgbuild/PKGBUILD b/BioArchLinux/r-pkgbuild/PKGBUILD index 7e8af32b85..d5d3fc9a91 100644 --- a/BioArchLinux/r-pkgbuild/PKGBUILD +++ b/BioArchLinux/r-pkgbuild/PKGBUILD @@ -1,16 +1,19 @@ -# Maintainer: Guoyi Zhang +# Maintainer: Pekka Ristola +# Contributor: Guoyi Zhang +# Contributor: peippo +# Contributor: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com +# Contributor: Alex Branham _pkgname=pkgbuild _pkgver=1.4.2 pkgname=r-${_pkgname,,} -pkgver=1.4.2 +pkgver=${_pkgver//-/.} pkgrel=1 -pkgdesc='Find Tools Needed to Build R Packages' -arch=('any') +pkgdesc="Find Tools Needed to Build R Packages" +arch=(any) url="https://cran.r-project.org/package=${_pkgname}" -license=('MIT') +license=(MIT) depends=( - r r-callr r-cli r-crayon @@ -19,7 +22,6 @@ depends=( r-processx r-r6 r-rprojroot - r-withr ) optdepends=( r-covr @@ -29,17 +31,26 @@ optdepends=( r-rcpp r-rmarkdown r-testthat + r-withr ) source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz") +md5sums=('b4a62e531fc8970dc28721d6d87cb036') sha256sums=('2334a245d75420b2adf9f217a6bc4a5f7faaa4244a6aac2b774b26f199fc82c5') 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" Rscript --vanilla build-tools.R } package() { - install -dm0755 "${pkgdir}/usr/lib/R/library" - cp -a --no-preserve=ownership "${_pkgname}" "${pkgdir}/usr/lib/R/library" - install -Dm644 "${_pkgname}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}" + install -d "$pkgdir/usr/lib/R/library" + cp -a --no-preserve=ownership "build/$_pkgname" "$pkgdir/usr/lib/R/library" + + install -d "$pkgdir/usr/share/licenses/$pkgname" + ln -s "/usr/lib/R/library/$_pkgname/LICENSE" "$pkgdir/usr/share/licenses/$pkgname" } -# vim:set ts=2 sw=2 et: diff --git a/BioArchLinux/r-pkgbuild/lilac.py b/BioArchLinux/r-pkgbuild/lilac.py index 620556bc87..9244fd6914 100644 --- a/BioArchLinux/r-pkgbuild/lilac.py +++ b/BioArchLinux/r-pkgbuild/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-pkgbuild/lilac.yaml b/BioArchLinux/r-pkgbuild/lilac.yaml index 4964333b49..ae7b952896 100644 --- a/BioArchLinux/r-pkgbuild/lilac.yaml +++ b/BioArchLinux/r-pkgbuild/lilac.yaml @@ -1,7 +1,7 @@ build_prefix: extra-x86_64 maintainers: -- github: starsareintherose - email: kuoi@bioarchlinux.org +- github: pekkarr + email: pekkarr@protonmail.com repo_depends: - r-callr - r-cli @@ -11,9 +11,9 @@ repo_depends: - r-processx - r-r6 - r-rprojroot -- r-withr update_on: -- regex: pkgbuild_([\d._-]+).tar.gz - source: regex - url: https://cran.r-project.org/package=pkgbuild +- source: rpkgs + pkgname: pkgbuild + repo: cran + md5: true - alias: r