From c9a7ef823ce84c66c40de5fbeb383d11635be4fb Mon Sep 17 00:00:00 2001 From: Pekka Ristola Date: Mon, 11 Mar 2024 15:56:42 +0200 Subject: [PATCH] r-nmi: use metadata checks --- BioArchLinux/r-hdci/lilac.py | 5 +---- BioArchLinux/r-nmi/PKGBUILD | 21 +++++++++++---------- BioArchLinux/r-nmi/lilac.py | 11 ++++++----- BioArchLinux/r-nmi/lilac.yaml | 7 ++++--- lilac-extensions/lilac_r_utils.py | 1 + 5 files changed, 23 insertions(+), 22 deletions(-) diff --git a/BioArchLinux/r-hdci/lilac.py b/BioArchLinux/r-hdci/lilac.py index 28898ccd1b..b5cdb057c5 100644 --- a/BioArchLinux/r-hdci/lilac.py +++ b/BioArchLinux/r-hdci/lilac.py @@ -7,10 +7,7 @@ sys.path.append(os.path.normpath(f'{__file__}/../../../lilac-extensions')) from lilac_r_utils import r_pre_build def pre_build(): - r_pre_build( - _G, - expect_license = "GNU General Public License version 2", - ) + r_pre_build(_G) def post_build(): git_pkgbuild_commit() diff --git a/BioArchLinux/r-nmi/PKGBUILD b/BioArchLinux/r-nmi/PKGBUILD index 6e4bee2623..0c81946c8f 100644 --- a/BioArchLinux/r-nmi/PKGBUILD +++ b/BioArchLinux/r-nmi/PKGBUILD @@ -3,24 +3,25 @@ _pkgname=NMI _pkgver=2.0 pkgname=r-${_pkgname,,} -pkgver=2.0 +pkgver=${_pkgver//-/.} pkgrel=6 -pkgdesc='Normalized Mutual Information of Community Structure in Network' -arch=('any') -url="https://cran.r-project.org/package=${_pkgname}" -license=('GPL') +pkgdesc="Normalized Mutual Information of Community Structure in Network" +arch=(any) +url="https://cran.r-project.org/package=$_pkgname" +license=('GPL-2.0-only') depends=( r ) source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz") -sha256sums=('c39fd733944601dd314dc37a4b0332d374236aa2bb21f263833f79989387b7e7') +md5sums=('4c7ff8b6dc4834b2cfbe0b8cc9b5d88a') +b2sums=('828166b2e3d94f5238e9c20bef3cada33d7b48ac2c23e39ead02066c48d6cc1e8d119f39c311162a02c39257ecd47a15a28af65a6e46e61c3220250d7745cd99') build() { - R CMD INSTALL ${_pkgname}_${_pkgver}.tar.gz -l "${srcdir}" + mkdir build + R CMD INSTALL -l build "$_pkgname" } 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-nmi/lilac.py b/BioArchLinux/r-nmi/lilac.py index bd219c037c..b5cdb057c5 100644 --- a/BioArchLinux/r-nmi/lilac.py +++ b/BioArchLinux/r-nmi/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-nmi/lilac.yaml b/BioArchLinux/r-nmi/lilac.yaml index 72a0ad5a84..b762b8bd5d 100644 --- a/BioArchLinux/r-nmi/lilac.yaml +++ b/BioArchLinux/r-nmi/lilac.yaml @@ -3,7 +3,8 @@ maintainers: - github: starsareintherose email: kuoi@bioarchlinux.org update_on: -- regex: NMI_([\d._-]+).tar.gz - source: regex - url: https://cran.r-project.org/package=NMI +- source: rpkgs + pkgname: NMI + repo: cran + md5: true - alias: r diff --git a/lilac-extensions/lilac_r_utils.py b/lilac-extensions/lilac_r_utils.py index 91e4b672ee..97eee2a8ed 100644 --- a/lilac-extensions/lilac_r_utils.py +++ b/lilac-extensions/lilac_r_utils.py @@ -201,6 +201,7 @@ license_map = { "CC0": "CC0-1.0", "CeCILL": "CECILL-2.0", "EPL": "EPL", + "GNU General Public License version 2": "GPL-2.0-only", "GPL": "GPL-2.0-or-later", "GPL (>= 2)": "GPL-2.0-or-later", "GPL (>= 2.0)": "GPL-2.0-or-later",