diff --git a/BioArchLinux/r-rsvg/PKGBUILD b/BioArchLinux/r-rsvg/PKGBUILD index 8edf05292f..b980a7b274 100644 --- a/BioArchLinux/r-rsvg/PKGBUILD +++ b/BioArchLinux/r-rsvg/PKGBUILD @@ -1,18 +1,20 @@ -# system requirements: librsvg2 -# Maintainer: Guoyi Zhang +# Maintainer: Pekka Ristola +# Contributor: Guoyi Zhang _pkgname=rsvg _pkgver=2.5.0 pkgname=r-${_pkgname,,} -pkgver=2.5.0 +pkgver=${_pkgver//-/.} pkgrel=1 -pkgdesc='Render SVG Images into PDF, PNG, PostScript, or Bitmap Arrays' -arch=('x86_64') +pkgdesc="Render SVG Images into PDF, PNG, (Encapsulated) PostScript, or Bitmap Arrays" +arch=(x86_64) url="https://cran.r-project.org/package=${_pkgname}" -license=('MIT') +license=(MIT) depends=( - r + cairo + glib2 librsvg + r ) optdepends=( r-ggplot2 @@ -24,15 +26,18 @@ optdepends=( r-webp ) source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz") +md5sums=('cd4f97f9721a1bab32b1bcfc6d4ca154') sha256sums=('b5ddafaefe0ab8f4cb5305dcbc8a9cbafaa5210c2c51cc28480a21a2210c23be') 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-rsvg/lilac.py b/BioArchLinux/r-rsvg/lilac.py index bd219c037c..66377b7b77 100644 --- a/BioArchLinux/r-rsvg/lilac.py +++ b/BioArchLinux/r-rsvg/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_systemrequirements = "librsvg2", + ) def post_build(): git_pkgbuild_commit() diff --git a/BioArchLinux/r-rsvg/lilac.yaml b/BioArchLinux/r-rsvg/lilac.yaml index c045d484fd..347f2b372f 100644 --- a/BioArchLinux/r-rsvg/lilac.yaml +++ b/BioArchLinux/r-rsvg/lilac.yaml @@ -1,9 +1,25 @@ build_prefix: extra-x86_64 maintainers: -- github: starsareintherose - email: kuoi@bioarchlinux.org +- github: pekkarr + email: pekkarr@protonmail.com update_on: -- regex: rsvg_([\d._-]+).tar.gz - source: regex - url: https://cran.r-project.org/package=rsvg +- source: rpkgs + pkgname: rsvg + repo: cran + md5: true - alias: r +- source: alpm + alpm: cairo + repo: extra + provided: libcairo.so + strip_release: true +- source: alpm + alpm: glib2 + repo: core + provided: libgobject-2.0.so + strip_release: true +- source: alpm + alpm: librsvg + repo: extra + provided: librsvg-2.so + strip_release: true