From 9f5dfc40ef3f8f2931798cf2d8bf37e0c620462e Mon Sep 17 00:00:00 2001 From: Pekka Ristola Date: Tue, 12 Sep 2023 14:45:37 +0300 Subject: [PATCH] r-lwgeom: use metadata checks --- BioArchLinux/r-lwgeom/PKGBUILD | 29 ++++++++++++++++++----------- BioArchLinux/r-lwgeom/lilac.py | 14 +++++++++----- BioArchLinux/r-lwgeom/lilac.yaml | 27 ++++++++++++++++++++------- 3 files changed, 47 insertions(+), 23 deletions(-) diff --git a/BioArchLinux/r-lwgeom/PKGBUILD b/BioArchLinux/r-lwgeom/PKGBUILD index b00fe558fe..6670f4c240 100644 --- a/BioArchLinux/r-lwgeom/PKGBUILD +++ b/BioArchLinux/r-lwgeom/PKGBUILD @@ -1,23 +1,24 @@ -# system requirements: GEOS (>= 3.5.0), PROJ (>= 4.8.0), sqlite3 -# Maintainer: sukanka +# Maintainer: Pekka Ristola +# Contributor: sukanka _pkgname=lwgeom _pkgver=0.2-13 pkgname=r-${_pkgname,,} -pkgver=0.2.13 +pkgver=${_pkgver//-/.} pkgrel=1 pkgdesc="Bindings to Selected 'liblwgeom' Functions for Simple Features" -arch=('x86_64') +arch=(x86_64) url="https://cran.r-project.org/package=${_pkgname}" -license=('GPL') +license=(GPL2) depends=( geos proj - r r-rcpp r-sf r-units - sqlite +) +checkdepends=( + r-testthat ) optdepends=( r-covr @@ -26,14 +27,20 @@ optdepends=( r-testthat ) source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz") +md5sums=('9bf0d8b96f4e19f2a042d50cb66d7989') sha256sums=('f0822888c029af48bf0238e3d20d82d3c75018e7e63728765a6220a6a0151c67') build() { - R CMD INSTALL ${_pkgname}_${_pkgver}.tar.gz -l "${srcdir}" + mkdir -p build + R CMD INSTALL "$_pkgname" -l build +} + +check() { + cd "$_pkgname/tests" + R_LIBS="$srcdir/build" NOT_CRAN=true Rscript --vanilla testthat.R } 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-lwgeom/lilac.py b/BioArchLinux/r-lwgeom/lilac.py index bd219c037c..efcc38dafa 100644 --- a/BioArchLinux/r-lwgeom/lilac.py +++ b/BioArchLinux/r-lwgeom/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 = "GEOS (>= 3.5.0), PROJ (>= 4.8.0), sqlite3", + ) def post_build(): git_pkgbuild_commit() diff --git a/BioArchLinux/r-lwgeom/lilac.yaml b/BioArchLinux/r-lwgeom/lilac.yaml index b380d3c158..e26dea5e65 100644 --- a/BioArchLinux/r-lwgeom/lilac.yaml +++ b/BioArchLinux/r-lwgeom/lilac.yaml @@ -1,11 +1,24 @@ build_prefix: extra-x86_64 maintainers: - - github: sukanka +- github: pekkarr + email: pekkarr@protonmail.com repo_depends: - - r-rcpp - - r-sf - - r-units +- r-rcpp +- r-sf +- r-units +repo_makedepends: +- r-testthat update_on: - - regex: lwgeom_([\d._-]+).tar.gz - source: regex - url: https://cran.r-project.org/package=lwgeom +- source: rpkgs + pkgname: lwgeom + repo: cran + md5: true +- alias: r +- source: alpmfiles + pkgname: geos + filename: usr/lib/libgeos_c\.so\.([^.]+) + repo: extra +- source: alpmfiles + pkgname: proj + filename: usr/lib/libproj\.so\.([^.]+) + repo: extra