From a2da2910c9f89bc3f8f31dd3b3fd96e7a48fa250 Mon Sep 17 00:00:00 2001 From: Pekka Ristola Date: Thu, 30 Nov 2023 13:40:49 +0200 Subject: [PATCH] r-ggformula: use metadata checks --- BioArchLinux/r-ggformula/PKGBUILD | 32 +++++++++++++---------------- BioArchLinux/r-ggformula/lilac.py | 11 +++++----- BioArchLinux/r-ggformula/lilac.yaml | 14 ++++++------- 3 files changed, 26 insertions(+), 31 deletions(-) diff --git a/BioArchLinux/r-ggformula/PKGBUILD b/BioArchLinux/r-ggformula/PKGBUILD index 8fe990d5ad..1c2a546566 100644 --- a/BioArchLinux/r-ggformula/PKGBUILD +++ b/BioArchLinux/r-ggformula/PKGBUILD @@ -1,22 +1,19 @@ -# Maintainer: Guoyi Zhang +# Maintainer: Pekka Ristola +# Contributor: Guoyi Zhang _pkgname=ggformula _pkgver=0.12.0 pkgname=r-${_pkgname,,} -pkgver=0.12.0 +pkgver=${_pkgver//-/.} pkgrel=1 -pkgdesc='Formula Interface to the Grammar of Graphics' -arch=('any') +pkgdesc="Formula Interface to the Grammar of Graphics" +arch=(any) url="https://cran.r-project.org/package=${_pkgname}" -license=('MIT') +license=(MIT) depends=( - r - r-ggforce r-ggplot2 r-ggridges - r-ggstance r-labelled - r-magrittr r-mosaiccore r-rlang r-scales @@ -31,33 +28,32 @@ optdepends=( r-ggthemes r-interp r-knitr - r-lattice r-lubridate r-maps - r-maptools r-mosaic r-mosaicdata r-palmerpenguins r-purrr r-quantreg - r-rgeos r-rmarkdown r-sf - r-survival r-testthat r-tidyr r-vdiffr ) source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz") +md5sums=('8eee6fba1dc5081b680ecd4ae73c42b4') sha256sums=('d569f83e059f9e4836bd513f92706fb8a614300f744dcc47bf86e8dafd8e776d') 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-ggformula/lilac.py b/BioArchLinux/r-ggformula/lilac.py index bd219c037c..b5cdb057c5 100644 --- a/BioArchLinux/r-ggformula/lilac.py +++ b/BioArchLinux/r-ggformula/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-ggformula/lilac.yaml b/BioArchLinux/r-ggformula/lilac.yaml index 232db4fa85..6de4f95bb9 100644 --- a/BioArchLinux/r-ggformula/lilac.yaml +++ b/BioArchLinux/r-ggformula/lilac.yaml @@ -1,21 +1,19 @@ build_prefix: extra-x86_64 maintainers: -- github: starsareintherose - email: kuoi@bioarchlinux.org +- github: pekkarr + email: pekkarr@protonmail.com repo_depends: -- r-ggforce - r-ggplot2 - r-ggridges -- r-ggstance - r-labelled -- r-magrittr - r-mosaiccore - r-rlang - r-scales - r-stringr - r-tibble update_on: -- regex: ggformula_([\d._-]+).tar.gz - source: regex - url: https://cran.r-project.org/package=ggformula +- source: rpkgs + pkgname: ggformula + repo: cran + md5: true - alias: r