diff --git a/BioArchLinux/r-onewaytests/PKGBUILD b/BioArchLinux/r-onewaytests/PKGBUILD index d0f01ee976..c0f65a94ee 100644 --- a/BioArchLinux/r-onewaytests/PKGBUILD +++ b/BioArchLinux/r-onewaytests/PKGBUILD @@ -1,34 +1,36 @@ -# Maintainer: sukanka +# Maintainer: Pekka Ristola +# Contributor: sukanka _pkgname=onewaytests -_pkgver=2.7 +_pkgver=3.0 pkgname=r-${_pkgname,,} -pkgver=2.7 -pkgrel=2 -pkgdesc='One-Way Tests in Independent Groups Designs' -arch=('any') +pkgver=${_pkgver//-/.} +pkgrel=0 +pkgdesc="One-Way Tests in Independent Groups Designs" +arch=(any) url="https://cran.r-project.org/package=${_pkgname}" -license=('GPL') +license=(GPL) depends=( - r r-car r-ggplot2 r-moments r-nortest + r-wesanderson ) optdepends=( r-aid r-tibble ) source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz") -sha256sums=('cd0e043cfbe6a630bcbb419b6e57c17b1e0fe75fecb482118f72d66c86ca6490') +md5sums=('3adc7b0e56ef5dc3599c373eb165d9f4') +sha256sums=('67836ba322b457c45dd637d0ee08b0a95f61be00cd7e149d1eb2dd64d07bbf62') 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-onewaytests/lilac.py b/BioArchLinux/r-onewaytests/lilac.py index bd219c037c..b5cdb057c5 100644 --- a/BioArchLinux/r-onewaytests/lilac.py +++ b/BioArchLinux/r-onewaytests/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-onewaytests/lilac.yaml b/BioArchLinux/r-onewaytests/lilac.yaml index 1daeedae4d..77df2dc555 100644 --- a/BioArchLinux/r-onewaytests/lilac.yaml +++ b/BioArchLinux/r-onewaytests/lilac.yaml @@ -1,13 +1,16 @@ build_prefix: extra-x86_64 maintainers: - - github: sukanka +- github: pekkarr + email: pekkarr@protonmail.com repo_depends: - - r-car - - r-ggplot2 - - r-moments - - r-nortest +- r-car +- r-ggplot2 +- r-moments +- r-nortest +- r-wesanderson update_on: - - regex: onewaytests_([\d._-]+).tar.gz - source: regex - url: https://cran.r-project.org/package=onewaytests - - alias: r +- source: rpkgs + pkgname: onewaytests + repo: cran + md5: true +- alias: r