diff --git a/BioArchLinux/r-rastervis/PKGBUILD b/BioArchLinux/r-rastervis/PKGBUILD index 598a713d1b..b387c579b0 100644 --- a/BioArchLinux/r-rastervis/PKGBUILD +++ b/BioArchLinux/r-rastervis/PKGBUILD @@ -1,16 +1,15 @@ # Maintainer: Guoyi Zhang _pkgname=rasterVis -_pkgver=0.51.5 +_pkgver=0.51.6 pkgname=r-${_pkgname,,} -pkgver=0.51.5 -pkgrel=2 -pkgdesc='Visualization Methods for Raster Data' -arch=('any') -url="https://cran.r-project.org/package=${_pkgname}" -license=('GPL') +pkgver=${_pkgver//-/.} +pkgrel=0 +pkgdesc="Visualization Methods for Raster Data" +arch=(any) +url="https://cran.r-project.org/package=$_pkgname" +license=('GPL-3.0-only') depends=( - r r-hexbin r-latticeextra r-raster @@ -28,14 +27,15 @@ optdepends=( r-sf ) source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz") -sha256sums=('3a9ffe38f7835bf9008cb3f2fbe01208f17130f4b1ca9ba19f97dc240ccf7aa1') +md5sums=('9e0a042f2e7058b73b32e8207fdbfd74') +b2sums=('fa3e9629e42727102cbff7b1c76fb3ace380be049a766e534055f63c182dad0726279e3a3f5b6c24a9f171a58e49b0a37bbdf2f166ada1d75a9a342397d168f3') 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-rastervis/lilac.py b/BioArchLinux/r-rastervis/lilac.py index bd219c037c..b5cdb057c5 100644 --- a/BioArchLinux/r-rastervis/lilac.py +++ b/BioArchLinux/r-rastervis/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-rastervis/lilac.yaml b/BioArchLinux/r-rastervis/lilac.yaml index a69249f99d..4b212ebd5b 100644 --- a/BioArchLinux/r-rastervis/lilac.yaml +++ b/BioArchLinux/r-rastervis/lilac.yaml @@ -12,7 +12,8 @@ repo_depends: - r-viridislite - r-zoo update_on: -- regex: rasterVis_([\d._-]+).tar.gz - source: regex - url: https://cran.r-project.org/package=rasterVis +- source: rpkgs + pkgname: rasterVis + repo: cran + md5: true - alias: r