diff --git a/BioArchLinux/r-utf8/PKGBUILD b/BioArchLinux/r-utf8/PKGBUILD index e5d1ecd739..f10d857409 100644 --- a/BioArchLinux/r-utf8/PKGBUILD +++ b/BioArchLinux/r-utf8/PKGBUILD @@ -1,14 +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 +# Contributor: Clint Valentine _pkgname=utf8 _pkgver=1.2.4 pkgname=r-${_pkgname,,} -pkgver=1.2.4 +pkgver=${_pkgver//-/.} pkgrel=1 -pkgdesc='Unicode Text Processing' -arch=('x86_64') +pkgdesc="Unicode Text Processing" +arch=(x86_64) url="https://cran.r-project.org/package=${_pkgname}" -license=('Apache') +license=(Apache) depends=( r ) @@ -22,14 +27,15 @@ optdepends=( r-withr ) source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz") +md5sums=('b12b4a8b7c9fc8429a0c0633c59c7c18') sha256sums=('418f824bbd9cd868d2d8a0d4345545c62151d321224cdffca8b1ffd98a167b7d') 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-utf8/lilac.py b/BioArchLinux/r-utf8/lilac.py index 620556bc87..6e016c36fd 100644 --- a/BioArchLinux/r-utf8/lilac.py +++ b/BioArchLinux/r-utf8/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_license = "Apache License (== 2.0) | file LICENSE", + ) def post_build(): git_pkgbuild_commit() diff --git a/BioArchLinux/r-utf8/lilac.yaml b/BioArchLinux/r-utf8/lilac.yaml index 8415188725..18d9128574 100644 --- a/BioArchLinux/r-utf8/lilac.yaml +++ b/BioArchLinux/r-utf8/lilac.yaml @@ -1,9 +1,10 @@ build_prefix: extra-x86_64 maintainers: -- github: starsareintherose - email: kuoi@bioarchlinux.org +- github: pekkarr + email: pekkarr@protonmail.com update_on: -- regex: utf8_([\d._-]+).tar.gz - source: regex - url: https://cran.r-project.org/package=utf8 +- source: rpkgs + pkgname: utf8 + repo: cran + md5: true - alias: r