diff --git a/BioArchLinux/r-biganalytics/PKGBUILD b/BioArchLinux/r-biganalytics/PKGBUILD index 10f2691940..f4648bbd40 100644 --- a/BioArchLinux/r-biganalytics/PKGBUILD +++ b/BioArchLinux/r-biganalytics/PKGBUILD @@ -9,7 +9,7 @@ pkgrel=8 pkgdesc="Utilities for 'big.matrix' Objects from Package 'bigmemory'" arch=(x86_64) url="https://cran.r-project.org/package=$_pkgname" -license=(Apache LGPL3) +license=('LGPL-3.0-only OR Apache-2.0') depends=( r-biglm r-bigmemory diff --git a/BioArchLinux/r-biganalytics/lilac.py b/BioArchLinux/r-biganalytics/lilac.py index 7d8bd24c5c..b5cdb057c5 100644 --- a/BioArchLinux/r-biganalytics/lilac.py +++ b/BioArchLinux/r-biganalytics/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 = "LGPL-3 | Apache License 2.0", - ) + r_pre_build(_G) def post_build(): git_pkgbuild_commit() diff --git a/BioArchLinux/r-bigmemory.sri/PKGBUILD b/BioArchLinux/r-bigmemory.sri/PKGBUILD index abbe55539a..db92df2839 100644 --- a/BioArchLinux/r-bigmemory.sri/PKGBUILD +++ b/BioArchLinux/r-bigmemory.sri/PKGBUILD @@ -3,27 +3,25 @@ _pkgname=bigmemory.sri _pkgver=0.1.6 pkgname=r-${_pkgname,,} -pkgver=0.1.6 +pkgver=${_pkgver//-/.} pkgrel=4 -pkgdesc='A shared resource interface for Bigmemory Project packages' -arch=('any') -url="https://cran.r-project.org/package=${_pkgname}" -license=('LGPL') +pkgdesc="A Shared Resource Interface for Bigmemory Project Packages" +arch=(any) +url="https://cran.r-project.org/package=$_pkgname" +license=('LGPL-3.0-only OR Apache-2.0') depends=( r ) -optdepends=( - r-bigmemory -) source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz") -sha256sums=('3bfa6ac966ce0ea93283f5856a853d0ee5ff85aedd7a7d1ca8a93d0aa642860c') +md5sums=('c9e558480d17b5d5abaa3fc8fa02fde6') +b2sums=('50493caa6334f9719f3eb6142394fd43b795119790f221123ef1e26b27d30cf09caa5bada455f3fa927e86ee4a526d8c3c5ca9a31cd310b77581b83d29a411b8') 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-bigmemory.sri/lilac.py b/BioArchLinux/r-bigmemory.sri/lilac.py index bd219c037c..b5cdb057c5 100644 --- a/BioArchLinux/r-bigmemory.sri/lilac.py +++ b/BioArchLinux/r-bigmemory.sri/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-bigmemory.sri/lilac.yaml b/BioArchLinux/r-bigmemory.sri/lilac.yaml index 24e556d303..c25cc500c1 100644 --- a/BioArchLinux/r-bigmemory.sri/lilac.yaml +++ b/BioArchLinux/r-bigmemory.sri/lilac.yaml @@ -3,7 +3,8 @@ maintainers: - github: starsareintherose email: kuoi@bioarchlinux.org update_on: -- regex: bigmemory.sri_([\d._-]+).tar.gz - source: regex - url: https://cran.r-project.org/package=bigmemory.sri +- source: rpkgs + pkgname: bigmemory.sri + repo: cran + md5: true - alias: r diff --git a/BioArchLinux/r-bigmemory/PKGBUILD b/BioArchLinux/r-bigmemory/PKGBUILD index 968675f92a..35f8628ab5 100644 --- a/BioArchLinux/r-bigmemory/PKGBUILD +++ b/BioArchLinux/r-bigmemory/PKGBUILD @@ -9,7 +9,7 @@ pkgrel=7 pkgdesc="Manage Massive Matrices with Shared Memory and Memory-Mapped Files" arch=(x86_64) url="https://cran.r-project.org/package=$_pkgname" -license=(Apache LGPL3) +license=('LGPL-3.0-only OR Apache-2.0') depends=( r-bigmemory.sri r-rcpp diff --git a/BioArchLinux/r-bigmemory/lilac.py b/BioArchLinux/r-bigmemory/lilac.py index 7d8bd24c5c..b5cdb057c5 100644 --- a/BioArchLinux/r-bigmemory/lilac.py +++ b/BioArchLinux/r-bigmemory/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 = "LGPL-3 | Apache License 2.0", - ) + r_pre_build(_G) def post_build(): git_pkgbuild_commit() diff --git a/lilac-extensions/lilac_r_utils.py b/lilac-extensions/lilac_r_utils.py index 3b9be2879e..2371621fad 100644 --- a/lilac-extensions/lilac_r_utils.py +++ b/lilac-extensions/lilac_r_utils.py @@ -211,6 +211,7 @@ license_map = { "LGPL (>= 2.1)": "LGPL", "LGPL-2": "LGPL2.1", "LGPL-3": "LGPL3", + "LGPL-3 | Apache License 2.0": "LGPL-3.0-only OR Apache-2.0", "Lucent Public License": "custom:LPL", "MIT + file LICENSE": "MIT", "Mozilla Public License 2.0": "MPL2",