diff --git a/BioArchLinux/r-rcppprogress/PKGBUILD b/BioArchLinux/r-rcppprogress/PKGBUILD index 35498c4205..6c55bd4c88 100644 --- a/BioArchLinux/r-rcppprogress/PKGBUILD +++ b/BioArchLinux/r-rcppprogress/PKGBUILD @@ -1,17 +1,23 @@ -# Maintainer: Guoyi Zhang +# Maintainer: Pekka Ristola +# Contributor: Guoyi Zhang _pkgname=RcppProgress _pkgver=0.4.2 pkgname=r-${_pkgname,,} -pkgver=0.4.2 +pkgver=${_pkgver//-/.} pkgrel=9 -pkgdesc='An Interruptible Progress Bar with OpenMP Support for C++ in R Packages' -arch=('any') +pkgdesc="An Interruptible Progress Bar with OpenMP Support for C++ in R Packages" +arch=(any) url="https://cran.r-project.org/package=${_pkgname}" -license=('GPL') +license=(GPL3) depends=( r ) +checkdepends=( + r-devtools + r-rcpparmadillo + r-testthat +) optdepends=( r-devtools r-rcpparmadillo @@ -19,14 +25,20 @@ optdepends=( r-testthat ) source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz") +md5sums=('29ecb32d5c739805ced912e4bedf26f2') sha256sums=('b1624b21b7aeb1dafb30f092b2a4bef4c3504efd2d6b00b2cdf55dc9df194b48') 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-rcppprogress/lilac.py b/BioArchLinux/r-rcppprogress/lilac.py index 620556bc87..b5cdb057c5 100644 --- a/BioArchLinux/r-rcppprogress/lilac.py +++ b/BioArchLinux/r-rcppprogress/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-rcppprogress/lilac.yaml b/BioArchLinux/r-rcppprogress/lilac.yaml index 136be22fa1..1be6786d18 100644 --- a/BioArchLinux/r-rcppprogress/lilac.yaml +++ b/BioArchLinux/r-rcppprogress/lilac.yaml @@ -1,9 +1,14 @@ build_prefix: extra-x86_64 maintainers: -- github: starsareintherose - email: kuoi@bioarchlinux.org +- github: pekkarr + email: pekkarr@protonmail.com +repo_makedepends: +- r-devtools +- r-rcpparmadillo +- r-testthat update_on: -- regex: RcppProgress_([\d._-]+).tar.gz - source: regex - url: https://cran.r-project.org/package=RcppProgress +- source: rpkgs + pkgname: RcppProgress + repo: cran + md5: true - alias: r