From 33f471d0e7e8ce82c6e8b7ad721399de5a1ca8bb Mon Sep 17 00:00:00 2001 From: Pekka Ristola Date: Tue, 26 Sep 2023 14:33:29 +0300 Subject: [PATCH] r-openssl: use metadata checks --- BioArchLinux/r-openssl/PKGBUILD | 43 +++++++++++++++++++++---------- BioArchLinux/r-openssl/lilac.py | 14 ++++++---- BioArchLinux/r-openssl/lilac.yaml | 26 ++++++++++++++----- 3 files changed, 59 insertions(+), 24 deletions(-) diff --git a/BioArchLinux/r-openssl/PKGBUILD b/BioArchLinux/r-openssl/PKGBUILD index d51c1930f0..20f5669304 100644 --- a/BioArchLinux/r-openssl/PKGBUILD +++ b/BioArchLinux/r-openssl/PKGBUILD @@ -1,19 +1,28 @@ -# system requirements: OpenSSL >= 1.0.1 -# Maintainer: Guoyi Zhang +# Maintainer: Pekka Ristola +# Contributor: Guoyi Zhang +# Contributor: peippo +# Contributor: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com +# Contributor: Grey Christoforo +# Contributor: Kibouo +# Contributor: Alex Branham _pkgname=openssl _pkgver=2.1.1 pkgname=r-${_pkgname,,} -pkgver=2.1.1 +pkgver=${_pkgver//-/.} pkgrel=1 -pkgdesc='Toolkit for Encryption, Signatures and Certificates Based on OpenSSL' -arch=('x86_64') +pkgdesc="Toolkit for Encryption, Signatures and Certificates Based on OpenSSL" +arch=(x86_64) url="https://cran.r-project.org/package=${_pkgname}" -license=('MIT') +license=(MIT) depends=( - r - r-askpass openssl + r-askpass +) +checkdepends=( + r-curl + r-sodium + r-testthat ) optdepends=( r-curl @@ -26,15 +35,23 @@ optdepends=( r-testthat ) source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz") +md5sums=('638ba0b9ff6d9376e21a9063ce4dd20a') sha256sums=('faa726f9af2a97d5fa1e1044f4a38ee2edd4c81f0beb5830f6a36ff249b64bdc') 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 -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-openssl/lilac.py b/BioArchLinux/r-openssl/lilac.py index 620556bc87..73343e06c0 100644 --- a/BioArchLinux/r-openssl/lilac.py +++ b/BioArchLinux/r-openssl/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 = "OpenSSL >= 1.0.2", + ) def post_build(): git_pkgbuild_commit() diff --git a/BioArchLinux/r-openssl/lilac.yaml b/BioArchLinux/r-openssl/lilac.yaml index 08c55cf1ea..51dc249fdf 100644 --- a/BioArchLinux/r-openssl/lilac.yaml +++ b/BioArchLinux/r-openssl/lilac.yaml @@ -1,12 +1,26 @@ build_prefix: extra-x86_64 maintainers: -- github: starsareintherose - email: kuoi@bioarchlinux.org +- github: pekkarr + email: pekkarr@protonmail.com repo_depends: - r-askpass +repo_makedepends: +- r-curl +- r-sodium +- r-testthat update_on: -- regex: openssl_([\d._-]+).tar.gz - source: regex - url: https://cran.r-project.org/package=openssl +- source: rpkgs + pkgname: openssl + repo: cran + md5: true - alias: r -- alias: libssl +- source: alpm + alpm: openssl + repo: core + provided: libcrypto.so + strip_release: true +- source: alpm + alpm: openssl + repo: core + provided: libssl.so + strip_release: true