diff --git a/BioArchLinux/r-assertive.reflection/PKGBUILD b/BioArchLinux/r-assertive.reflection/PKGBUILD index 3e672499a2..0926972158 100644 --- a/BioArchLinux/r-assertive.reflection/PKGBUILD +++ b/BioArchLinux/r-assertive.reflection/PKGBUILD @@ -3,28 +3,28 @@ _pkgname=assertive.reflection _pkgver=0.0-5 pkgname=r-${_pkgname,,} -pkgver=0.0.5 +pkgver=${_pkgver//-/.} pkgrel=6 -pkgdesc='Assertions for Checking the State of R' -arch=('any') -url="https://cran.r-project.org/package=${_pkgname}" -license=('GPL') +pkgdesc="Assertions for Checking the State of R" +arch=(any) +url="https://cran.r-project.org/package=$_pkgname" +license=('GPL-3.0-or-later') depends=( - r r-assertive.base ) optdepends=( r-testthat ) -source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz") -sha256sums=('c2ca9b27cdddb9b9876351afd2ebfaf0fbe72c636cd12aa2af5d64e33fbf34bd') +source=("https://cran.r-project.org/src/contrib/Archive/$_pkgname/${_pkgname}_${_pkgver}.tar.gz") +md5sums=('e5b52b04481fe2b713a668262fb1c642') +b2sums=('3091e695854ccd6ac3d0febb22e8a45249f21a176b212e37b9f208bafc6aa526a60b2bfca648338b222cd6c7b6a2bb00a70349d3beda891f915e2703cccfaa10') 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-assertive.reflection/lilac.py b/BioArchLinux/r-assertive.reflection/lilac.py index bd219c037c..b5cdb057c5 100644 --- a/BioArchLinux/r-assertive.reflection/lilac.py +++ b/BioArchLinux/r-assertive.reflection/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-assertive.reflection/lilac.yaml b/BioArchLinux/r-assertive.reflection/lilac.yaml index dffb7f0c40..edb99e2339 100644 --- a/BioArchLinux/r-assertive.reflection/lilac.yaml +++ b/BioArchLinux/r-assertive.reflection/lilac.yaml @@ -5,7 +5,6 @@ maintainers: repo_depends: - r-assertive.base update_on: -- regex: assertive.reflection_([\d._-]+).tar.gz - source: regex - url: https://cran.r-project.org/package=assertive.reflection +- source: manual + manual: 0.0-5#e5b52b04481fe2b713a668262fb1c642 - alias: r