diff --git a/BioArchLinux/r-gunifrac/PKGBUILD b/BioArchLinux/r-gunifrac/PKGBUILD index 9f3fd73e23..8c5ad92ab6 100644 --- a/BioArchLinux/r-gunifrac/PKGBUILD +++ b/BioArchLinux/r-gunifrac/PKGBUILD @@ -1,21 +1,22 @@ -# Maintainer: Guoyi Zhang +# Maintainer: Pekka Ristola +# Contributor: Guoyi Zhang _pkgname=GUniFrac -_pkgver=1.7 +_pkgver=1.8 pkgname=r-${_pkgname,,} -pkgver=1.7 -pkgrel=4 -pkgdesc='Generalized UniFrac Distances, Distance-Based Multivariate Methods and Feature-Based Univariate Methods for Microbiome Data Analysis' -arch=('x86_64') +pkgver=${_pkgver//-/.} +pkgrel=0 +pkgdesc="Generalized UniFrac Distances, Distance-Based Multivariate Methods and Feature-Based Univariate Methods for Microbiome Data Analysis" +arch=(x86_64) url="https://cran.r-project.org/package=${_pkgname}" -license=('GPL') +license=(GPL3) depends=( - r r-ape r-dirmult r-foreach r-ggplot2 r-ggrepel + r-inline r-matrixstats r-modeest r-rcpp @@ -30,14 +31,15 @@ optdepends=( r-markdown ) source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz") -sha256sums=('770b34dda757d7412592d78eb385e36320b870a4a3a748512fd7d499b82b0b8f') +md5sums=('5117c6e23fa9da45978808b23144bba3') +sha256sums=('aea41a3f94fe1fff4f4284f786a43f90bfd4f7f3c9db067c17c6e8b3206a80fb') 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-gunifrac/lilac.py b/BioArchLinux/r-gunifrac/lilac.py index bd219c037c..b5cdb057c5 100644 --- a/BioArchLinux/r-gunifrac/lilac.py +++ b/BioArchLinux/r-gunifrac/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-gunifrac/lilac.yaml b/BioArchLinux/r-gunifrac/lilac.yaml index 039991da9f..6d320b3ce5 100644 --- a/BioArchLinux/r-gunifrac/lilac.yaml +++ b/BioArchLinux/r-gunifrac/lilac.yaml @@ -1,13 +1,14 @@ build_prefix: extra-x86_64 maintainers: -- github: starsareintherose - email: kuoi@bioarchlinux.org +- github: pekkarr + email: pekkarr@protonmail.com repo_depends: - r-ape - r-dirmult - r-foreach - r-ggplot2 - r-ggrepel +- r-inline - r-matrixstats - r-modeest - r-rcpp @@ -15,7 +16,8 @@ repo_depends: - r-statmod - r-vegan update_on: -- regex: GUniFrac_([\d._-]+).tar.gz - source: regex - url: https://cran.r-project.org/package=GUniFrac +- source: rpkgs + pkgname: GUniFrac + repo: cran + md5: true - alias: r