diff --git a/BioArchLinux/r-vctrs/PKGBUILD b/BioArchLinux/r-vctrs/PKGBUILD index fbfd4280cd..1f86375352 100644 --- a/BioArchLinux/r-vctrs/PKGBUILD +++ b/BioArchLinux/r-vctrs/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: Grey Christoforo _pkgname=vctrs _pkgver=0.6.4 pkgname=r-${_pkgname,,} -pkgver=0.6.4 +pkgver=${_pkgver//-/.} pkgrel=1 -pkgdesc='Vector Helpers' -arch=('x86_64') +pkgdesc="Vector Helpers" +arch=(x86_64) url="https://cran.r-project.org/package=${_pkgname}" -license=('MIT') +license=(MIT) depends=( - r r-cli r-glue r-lifecycle @@ -34,15 +37,18 @@ optdepends=( r-zeallot ) source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz") +md5sums=('077d53759fa739d3ac5a909239e8fddf') sha256sums=('8a80192356e724d21bd89a0ce3e5835856fd5bb1651e7fc205c6fee58fd001c8') 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 -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-vctrs/lilac.py b/BioArchLinux/r-vctrs/lilac.py index 620556bc87..9244fd6914 100644 --- a/BioArchLinux/r-vctrs/lilac.py +++ b/BioArchLinux/r-vctrs/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-vctrs/lilac.yaml b/BioArchLinux/r-vctrs/lilac.yaml index 4701e884fc..08bcbd8786 100644 --- a/BioArchLinux/r-vctrs/lilac.yaml +++ b/BioArchLinux/r-vctrs/lilac.yaml @@ -1,14 +1,15 @@ build_prefix: extra-x86_64 maintainers: -- github: starsareintherose - email: kuoi@bioarchlinux.org +- github: pekkarr + email: pekkarr@protonmail.com repo_depends: - r-cli - r-glue - r-lifecycle - r-rlang update_on: -- regex: vctrs_([\d._-]+).tar.gz - source: regex - url: https://cran.r-project.org/package=vctrs +- source: rpkgs + pkgname: vctrs + repo: cran + md5: true - alias: r