diff --git a/BioArchLinux/r-rfast/PKGBUILD b/BioArchLinux/r-rfast/PKGBUILD index 5fde98ddc7..d7ce424121 100644 --- a/BioArchLinux/r-rfast/PKGBUILD +++ b/BioArchLinux/r-rfast/PKGBUILD @@ -1,30 +1,34 @@ -# system requirements: C++17 -# Maintainer: Guoyi Zhang +# Maintainer: Pekka Ristola +# Contributor: Guoyi Zhang _pkgname=Rfast -_pkgver=2.0.7 +_pkgver=2.0.8 pkgname=r-${_pkgname,,} -pkgver=2.0.7 -pkgrel=2 -pkgdesc='A Collection of Efficient and Extremely Fast R Functions' -arch=('x86_64') +pkgver=${_pkgver//-/.} +pkgrel=0 +pkgdesc="A Collection of Efficient and Extremely Fast R Functions" +arch=(x86_64) url="https://cran.r-project.org/package=${_pkgname}" -license=('GPL') +license=(GPL) depends=( - r + blas + lapack r-rcpp - r-rcpparmadillo r-rcppziggurat ) +makedepends=( + r-rcpparmadillo +) source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz") -sha256sums=('8f86159a4760a7124e1c91ae0b022c7e496f81590ea4e4af702bea44e8dedf8f') +md5sums=('c566094df35be55dd733727cf69121b0') +sha256sums=('1bb2c8f0580d0fe27e2b06d1dd069d09588f410e4a895147cca445f32092c4b0') 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-rfast/lilac.py b/BioArchLinux/r-rfast/lilac.py index bd219c037c..1c788feeff 100644 --- a/BioArchLinux/r-rfast/lilac.py +++ b/BioArchLinux/r-rfast/lilac.py @@ -1,12 +1,16 @@ #!/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, + expect_systemrequirements = "C++17", + ) def post_build(): git_pkgbuild_commit() diff --git a/BioArchLinux/r-rfast/lilac.yaml b/BioArchLinux/r-rfast/lilac.yaml index df36ae1f10..d1550d54d7 100644 --- a/BioArchLinux/r-rfast/lilac.yaml +++ b/BioArchLinux/r-rfast/lilac.yaml @@ -1,13 +1,23 @@ build_prefix: extra-x86_64 maintainers: -- github: starsareintherose - email: kuoi@bioarchlinux.org +- github: pekkarr + email: pekkarr@protonmail.com repo_depends: - r-rcpp -- r-rcpparmadillo - r-rcppziggurat +repo_makedepends: +- r-rcpparmadillo update_on: -- regex: Rfast_([\d._-]+).tar.gz - source: regex - url: https://cran.r-project.org/package=Rfast +- source: rpkgs + pkgname: Rfast + repo: cran + md5: true - alias: r +- source: alpmfiles + pkgname: blas + filename: usr/lib/libblas\.so\.([^.]+) + repo: extra +- source: alpmfiles + pkgname: lapack + filename: usr/lib/liblapack\.so\.([^.]+) + repo: extra diff --git a/lilac-extensions/lilac_r_utils.py b/lilac-extensions/lilac_r_utils.py index be705345e4..ec8a1f6ddd 100644 --- a/lilac-extensions/lilac_r_utils.py +++ b/lilac-extensions/lilac_r_utils.py @@ -193,6 +193,7 @@ license_map = { "EPL": "EPL", "GPL": "GPL", "GPL (>= 2)": "GPL", + "GPL (>= 2.0)": "GPL", "GPL (>= 3)": "GPL3", "GPL-2": "GPL2", "GPL-2 | GPL-3": "GPL",