diff --git a/BioArchLinux/r-fmsb/PKGBUILD b/BioArchLinux/r-fmsb/PKGBUILD index 9b3f0e88f2..fac0de264e 100644 --- a/BioArchLinux/r-fmsb/PKGBUILD +++ b/BioArchLinux/r-fmsb/PKGBUILD @@ -3,12 +3,12 @@ _pkgname=fmsb _pkgver=0.7.6 pkgname=r-${_pkgname,,} -pkgver=0.7.6 +pkgver=${_pkgver//-/.} pkgrel=1 -pkgdesc='Functions for Medical Statistics Book with some Demographic Data' -arch=('any') -url="https://cran.r-project.org/package=${_pkgname}" -license=('GPL') +pkgdesc="Functions for Medical Statistics Book with some Demographic Data" +arch=(any) +url="https://cran.r-project.org/package=$_pkgname" +license=('GPL-2.0-or-later') depends=( r ) @@ -17,14 +17,15 @@ optdepends=( r-vcd ) source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz") -sha256sums=('e57df29d44d988ec977b3d7a6250e5d647ae8572bc41240bb86290252d79d3b2') +md5sums=('281b8f4834c1583168cb0bfd32b58ee2') +b2sums=('c26909c62c231ae997e7b27ee382918ccc5ae83536f10a31d00cd3b96f582eed4a997a1327ff25814dd1221d00b1ce4eb4c26758e1a9116819298f8ee05540ab') 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-fmsb/lilac.py b/BioArchLinux/r-fmsb/lilac.py index bd219c037c..b5cdb057c5 100644 --- a/BioArchLinux/r-fmsb/lilac.py +++ b/BioArchLinux/r-fmsb/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-fmsb/lilac.yaml b/BioArchLinux/r-fmsb/lilac.yaml index 394edba3b8..b5809a36d4 100644 --- a/BioArchLinux/r-fmsb/lilac.yaml +++ b/BioArchLinux/r-fmsb/lilac.yaml @@ -3,7 +3,8 @@ maintainers: - github: starsareintherose email: kuoi@bioarchlinux.org update_on: -- regex: fmsb_([\d._-]+).tar.gz - source: regex - url: https://cran.r-project.org/package=fmsb +- source: rpkgs + pkgname: fmsb + repo: cran + md5: true - alias: r diff --git a/BioArchLinux/r-fmstable/PKGBUILD b/BioArchLinux/r-fmstable/PKGBUILD index 0145b061de..093b9a3b0c 100644 --- a/BioArchLinux/r-fmstable/PKGBUILD +++ b/BioArchLinux/r-fmstable/PKGBUILD @@ -3,24 +3,25 @@ _pkgname=FMStable _pkgver=0.1-4 pkgname=r-${_pkgname,,} -pkgver=0.1.4 +pkgver=${_pkgver//-/.} pkgrel=3 -pkgdesc='Finite Moment Stable Distributions' -arch=('any') -url="https://cran.r-project.org/package=${_pkgname}" -license=('GPL') +pkgdesc="Finite Moment Stable Distributions" +arch=(x86_64) +url="https://cran.r-project.org/package=$_pkgname" +license=('GPL-3.0-only') depends=( r ) source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz") -sha256sums=('2a391061dc2d2e89f6639aada07e839fdf950c0b20e27566219bb89befb4e93a') +md5sums=('3697fa5f8c5cc6acfcf0285ca7819f56') +b2sums=('f28d9b17352e3d6c0ad287512e9b08af46aafff97b5ca5287ad32f472a3a07a6586982a1ec3d93bd9bba030943880c105d9eb18df33904b4a65db97bf37844a0') 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-fmstable/lilac.py b/BioArchLinux/r-fmstable/lilac.py index bd219c037c..b5cdb057c5 100644 --- a/BioArchLinux/r-fmstable/lilac.py +++ b/BioArchLinux/r-fmstable/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-fmstable/lilac.yaml b/BioArchLinux/r-fmstable/lilac.yaml index 8df9445a30..bc1455a4ac 100644 --- a/BioArchLinux/r-fmstable/lilac.yaml +++ b/BioArchLinux/r-fmstable/lilac.yaml @@ -3,7 +3,8 @@ maintainers: - github: starsareintherose email: kuoi@bioarchlinux.org update_on: -- regex: FMStable_([\d._-]+).tar.gz - source: regex - url: https://cran.r-project.org/package=FMStable +- source: rpkgs + pkgname: FMStable + repo: cran + md5: true - alias: r diff --git a/BioArchLinux/r-gwasexacthw/PKGBUILD b/BioArchLinux/r-gwasexacthw/PKGBUILD index d7f5a67f6d..b5f7cddc04 100644 --- a/BioArchLinux/r-gwasexacthw/PKGBUILD +++ b/BioArchLinux/r-gwasexacthw/PKGBUILD @@ -3,24 +3,25 @@ _pkgname=GWASExactHW _pkgver=1.01 pkgname=r-${_pkgname,,} -pkgver=1.01 +pkgver=${_pkgver//-/.} pkgrel=8 -pkgdesc='Exact Hardy-Weinburg testing for Genome Wide Association Studies' -arch=('any') -url="https://cran.r-project.org/package=${_pkgname}" -license=('GPL') +pkgdesc="Exact Hardy-Weinburg testing for Genome Wide Association Studies" +arch=(x86_64) +url="https://cran.r-project.org/package=$_pkgname" +license=('GPL-3.0-only') depends=( r ) source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz") -sha256sums=('e850ed40fbf14b02eb3798603cfb111fe3718bb69d74c0ff4cb6f679209a15a7') +md5sums=('041fc38bed5b43e6f81962b872cbfbe4') +b2sums=('585c3a70ca8a1ceb352e50ca3f8d6e2bd541dd1489b6da5eb90afad276897ed137f2dbb74d6dd735d695c565daefcf9276a9b56acaf96e767477fa3c812fcae6') 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-gwasexacthw/lilac.py b/BioArchLinux/r-gwasexacthw/lilac.py index bd219c037c..dc94522131 100644 --- a/BioArchLinux/r-gwasexacthw/lilac.py +++ b/BioArchLinux/r-gwasexacthw/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_needscompilation = "", + ) def post_build(): git_pkgbuild_commit() diff --git a/BioArchLinux/r-gwasexacthw/lilac.yaml b/BioArchLinux/r-gwasexacthw/lilac.yaml index 5f018bfc93..bb1543240d 100644 --- a/BioArchLinux/r-gwasexacthw/lilac.yaml +++ b/BioArchLinux/r-gwasexacthw/lilac.yaml @@ -3,7 +3,8 @@ maintainers: - github: starsareintherose email: kuoi@bioarchlinux.org update_on: -- regex: GWASExactHW_([\d._-]+).tar.gz - source: regex - url: https://cran.r-project.org/package=GWASExactHW +- source: rpkgs + pkgname: GWASExactHW + repo: cran + md5: true - alias: r diff --git a/BioArchLinux/r-h5vcdata/PKGBUILD b/BioArchLinux/r-h5vcdata/PKGBUILD index 2627322836..649bead7e6 100644 --- a/BioArchLinux/r-h5vcdata/PKGBUILD +++ b/BioArchLinux/r-h5vcdata/PKGBUILD @@ -3,12 +3,12 @@ _pkgname=h5vcData _pkgver=2.22.0 pkgname=r-${_pkgname,,} -pkgver=2.22.0 +pkgver=${_pkgver//-/.} pkgrel=1 -pkgdesc='Example data for the h5vc package' -arch=('any') -url="https://bioconductor.org/packages/${_pkgname}" -license=('GPL') +pkgdesc="Example data for the h5vc package" +arch=(any) +url="https://bioconductor.org/packages/$_pkgname" +license=('GPL-3.0-or-later') depends=( r ) @@ -16,14 +16,15 @@ optdepends=( r-h5vc ) source=("https://bioconductor.org/packages/release/data/experiment/src/contrib/${_pkgname}_${_pkgver}.tar.gz") -sha256sums=('ff015754b692f4057063e947d01e76a1bfa6c9715f71b4123f3c2a6f1eced45d') +md5sums=('c251316e2d6dc6cb90e8faad0015103b') +b2sums=('4c71488a293cc88ad70e67b166b687b8e156edad74343d5f3d1354ce310d428615591706193bb1faaba58e3e5b4d8b105d328ca77c2529a5ac2c11c908bcd211') 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-h5vcdata/lilac.py b/BioArchLinux/r-h5vcdata/lilac.py index bd219c037c..b5cdb057c5 100644 --- a/BioArchLinux/r-h5vcdata/lilac.py +++ b/BioArchLinux/r-h5vcdata/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-h5vcdata/lilac.yaml b/BioArchLinux/r-h5vcdata/lilac.yaml index b9291b30c1..3e571ff71d 100644 --- a/BioArchLinux/r-h5vcdata/lilac.yaml +++ b/BioArchLinux/r-h5vcdata/lilac.yaml @@ -3,7 +3,8 @@ maintainers: - github: starsareintherose email: kuoi@bioarchlinux.org update_on: -- regex: h5vcData_([\d._-]+).tar.gz - source: regex - url: https://bioconductor.org/packages/h5vcData +- source: rpkgs + pkgname: h5vcData + repo: bioc-data-experiment + md5: true - alias: r diff --git a/BioArchLinux/r-mapplots/PKGBUILD b/BioArchLinux/r-mapplots/PKGBUILD index 439257a0bc..8ab95b520c 100644 --- a/BioArchLinux/r-mapplots/PKGBUILD +++ b/BioArchLinux/r-mapplots/PKGBUILD @@ -3,12 +3,12 @@ _pkgname=mapplots _pkgver=1.5.2 pkgname=r-${_pkgname,,} -pkgver=1.5.2 +pkgver=${_pkgver//-/.} pkgrel=1 -pkgdesc='Data Visualisation on Maps' -arch=('any') -url="https://cran.r-project.org/package=${_pkgname}" -license=('GPL') +pkgdesc="Data Visualisation on Maps" +arch=(any) +url="https://cran.r-project.org/package=$_pkgname" +license=('GPL-2.0-or-later') depends=( r ) @@ -16,14 +16,15 @@ optdepends=( r-shapefiles ) source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz") -sha256sums=('ed0e151d6865549d1a10882984a7fb29bc89a7b94ad69e512f90937b981c8a18') +md5sums=('d376f1fa68dd004de1fa49bf1146e465') +b2sums=('bd796d85ec69f5569fc2a4515b00c596738e988fb70eef5d93ae9aa1aaf30a6881232f58e6df30a1b40f06af1c350db8416578d97ce54f67f25d22973d30774c') 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-mapplots/lilac.py b/BioArchLinux/r-mapplots/lilac.py index bd219c037c..b5cdb057c5 100644 --- a/BioArchLinux/r-mapplots/lilac.py +++ b/BioArchLinux/r-mapplots/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-mapplots/lilac.yaml b/BioArchLinux/r-mapplots/lilac.yaml index d41c4da5d9..52686c9315 100644 --- a/BioArchLinux/r-mapplots/lilac.yaml +++ b/BioArchLinux/r-mapplots/lilac.yaml @@ -3,7 +3,8 @@ maintainers: - github: starsareintherose email: kuoi@bioarchlinux.org update_on: -- regex: mapplots_([\d._-]+).tar.gz - source: regex - url: https://cran.r-project.org/package=mapplots +- source: rpkgs + pkgname: mapplots + repo: cran + md5: true - alias: r diff --git a/BioArchLinux/r-proto/PKGBUILD b/BioArchLinux/r-proto/PKGBUILD index e686e7cffd..76b82fea99 100644 --- a/BioArchLinux/r-proto/PKGBUILD +++ b/BioArchLinux/r-proto/PKGBUILD @@ -3,12 +3,12 @@ _pkgname=proto _pkgver=1.0.0 pkgname=r-${_pkgname,,} -pkgver=1.0.0 +pkgver=${_pkgver//-/.} pkgrel=8 -pkgdesc='Prototype Object-Based Programming' -arch=('any') -url="https://cran.r-project.org/package=${_pkgname}" -license=('GPL') +pkgdesc="Prototype Object-Based Programming" +arch=(any) +url="https://cran.r-project.org/package=$_pkgname" +license=('GPL-2.0-only') depends=( r ) @@ -17,14 +17,15 @@ optdepends=( r-testthat ) source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz") -sha256sums=('9294d9a3b2b680bb6fac17000bfc97453d77c87ef68cfd609b4c4eb6d11d04d1') +md5sums=('ba74c21febd5282d73e97ccaf5ebbb84') +b2sums=('9a6b7830558dc3d5b64b686b0f110bf784c02d4f82144936abc931572f0fd5dc60cbf48d1f60361dcc2522945c9f8c49c8c45799046002813efc64214b4c0b71') 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-proto/lilac.py b/BioArchLinux/r-proto/lilac.py index bd219c037c..b5cdb057c5 100644 --- a/BioArchLinux/r-proto/lilac.py +++ b/BioArchLinux/r-proto/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-proto/lilac.yaml b/BioArchLinux/r-proto/lilac.yaml index 990efec6b1..cb4cf7d2a6 100644 --- a/BioArchLinux/r-proto/lilac.yaml +++ b/BioArchLinux/r-proto/lilac.yaml @@ -3,7 +3,8 @@ maintainers: - github: starsareintherose email: kuoi@bioarchlinux.org update_on: -- regex: proto_([\d._-]+).tar.gz - source: regex - url: https://cran.r-project.org/package=proto +- source: rpkgs + pkgname: proto + repo: cran + md5: true - alias: r diff --git a/BioArchLinux/r-qvcalc/PKGBUILD b/BioArchLinux/r-qvcalc/PKGBUILD index ed27b80d87..b6f4f80d55 100644 --- a/BioArchLinux/r-qvcalc/PKGBUILD +++ b/BioArchLinux/r-qvcalc/PKGBUILD @@ -3,30 +3,28 @@ _pkgname=qvcalc _pkgver=1.0.3 pkgname=r-${_pkgname,,} -pkgver=1.0.3 +pkgver=${_pkgver//-/.} pkgrel=1 -pkgdesc='Quasi Variances for Factor Effects in Statistical Models' -arch=('any') -url="https://cran.r-project.org/package=${_pkgname}" -license=('GPL') +pkgdesc="Quasi Variances for Factor Effects in Statistical Models" +arch=(any) +url="https://cran.r-project.org/package=$_pkgname" +license=('GPL-2.0-only OR GPL-3.0-only') depends=( r ) optdepends=( - r-mass - r-psychotools r-relimp - r-survival ) source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz") -sha256sums=('8a9e0fa0719dc40c0857de97f6bd322754e2bac4bb6bb4c095c547064020599f') +md5sums=('2494a818e5a13b2d8b4b7f6c7e3fe8bb') +b2sums=('9f24b01e36aa0c4cbdcc6847a17082aba6ed84e52ce6b8f0290ce2bd5c28ffe4b613f99e3e15c1bf83eb698362d089586d1dc06921f51e5a3fd7c226c9c526be') 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-qvcalc/lilac.py b/BioArchLinux/r-qvcalc/lilac.py index bd219c037c..b5cdb057c5 100644 --- a/BioArchLinux/r-qvcalc/lilac.py +++ b/BioArchLinux/r-qvcalc/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-qvcalc/lilac.yaml b/BioArchLinux/r-qvcalc/lilac.yaml index 336cf187a7..4113136321 100644 --- a/BioArchLinux/r-qvcalc/lilac.yaml +++ b/BioArchLinux/r-qvcalc/lilac.yaml @@ -3,7 +3,8 @@ maintainers: - github: starsareintherose email: kuoi@bioarchlinux.org update_on: -- regex: qvcalc_([\d._-]+).tar.gz - source: regex - url: https://cran.r-project.org/package=qvcalc +- source: rpkgs + pkgname: qvcalc + repo: cran + md5: true - alias: r diff --git a/BioArchLinux/r-relimp/PKGBUILD b/BioArchLinux/r-relimp/PKGBUILD index 868cca90d1..7dde3c56ab 100644 --- a/BioArchLinux/r-relimp/PKGBUILD +++ b/BioArchLinux/r-relimp/PKGBUILD @@ -3,30 +3,28 @@ _pkgname=relimp _pkgver=1.0-5 pkgname=r-${_pkgname,,} -pkgver=1.0.5 +pkgver=${_pkgver//-/.} pkgrel=8 -pkgdesc='Relative Contribution of Effects in a Regression Model' -arch=('any') -url="https://cran.r-project.org/package=${_pkgname}" -license=('GPL') +pkgdesc="Relative Contribution of Effects in a Regression Model" +arch=(any) +url="https://cran.r-project.org/package=$_pkgname" +license=('GPL-2.0-or-later') depends=( r ) optdepends=( - r-mass - r-nnet r-rcmdr - r-tcltk ) source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz") -sha256sums=('acac7cf72ea39916761b51c825db0ffcb2bb1640e0a04086831fb78e9e40b679') +md5sums=('0ce1f03f9ec99b940941d708e505afd0') +b2sums=('5bedb34d02d224934adb2cf2b43a1a0ff9d21f867f6632ae050061799abf2269a9cbf49de8558496f16e841c258fe03d0693d35363321eaf7e06073d9dedcbd5') 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-relimp/lilac.py b/BioArchLinux/r-relimp/lilac.py index bd219c037c..b5cdb057c5 100644 --- a/BioArchLinux/r-relimp/lilac.py +++ b/BioArchLinux/r-relimp/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-relimp/lilac.yaml b/BioArchLinux/r-relimp/lilac.yaml index ac9758dd94..7307780a31 100644 --- a/BioArchLinux/r-relimp/lilac.yaml +++ b/BioArchLinux/r-relimp/lilac.yaml @@ -3,7 +3,8 @@ maintainers: - github: starsareintherose email: kuoi@bioarchlinux.org update_on: -- regex: relimp_([\d._-]+).tar.gz - source: regex - url: https://cran.r-project.org/package=relimp +- source: rpkgs + pkgname: relimp + repo: cran + md5: true - alias: r diff --git a/BioArchLinux/r-rmutil/PKGBUILD b/BioArchLinux/r-rmutil/PKGBUILD index cc3df1bae0..3bb92f0c21 100644 --- a/BioArchLinux/r-rmutil/PKGBUILD +++ b/BioArchLinux/r-rmutil/PKGBUILD @@ -3,12 +3,12 @@ _pkgname=rmutil _pkgver=1.1.10 pkgname=r-${_pkgname,,} -pkgver=1.1.10 +pkgver=${_pkgver//-/.} pkgrel=2 -pkgdesc='Utilities for Nonlinear Regression and Repeated Measurements Models' -arch=('x86_64') -url="https://cran.r-project.org/package=${_pkgname}" -license=('GPL') +pkgdesc="Utilities for Nonlinear Regression and Repeated Measurements Models" +arch=(x86_64) +url="https://cran.r-project.org/package=$_pkgname" +license=('GPL-2.0-or-later') depends=( r ) @@ -16,14 +16,15 @@ makedepends=( gcc-fortran ) source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz") -sha256sums=('819fd7ce695cc742b4594705986eb06764460fc88521ea32de793c49de7ca5f9') +md5sums=('b7b0dfa56534cab7cc4a8b57bac51317') +b2sums=('04f850b4698cd3cbb14254b2ae4f376088fe6b7e423320c30a9f8d346c04cdaae9735f0439c3f3344c1d3ab833835a5112668fc7d979484e200e6aea130fecc5') 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-rmutil/lilac.py b/BioArchLinux/r-rmutil/lilac.py index bd219c037c..b5cdb057c5 100644 --- a/BioArchLinux/r-rmutil/lilac.py +++ b/BioArchLinux/r-rmutil/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-rmutil/lilac.yaml b/BioArchLinux/r-rmutil/lilac.yaml index a77f5bc814..37572b7ad0 100644 --- a/BioArchLinux/r-rmutil/lilac.yaml +++ b/BioArchLinux/r-rmutil/lilac.yaml @@ -3,7 +3,8 @@ maintainers: - github: starsareintherose email: kuoi@bioarchlinux.org update_on: -- regex: rmutil_([\d._-]+).tar.gz - source: regex - url: https://cran.r-project.org/package=rmutil +- source: rpkgs + pkgname: rmutil + repo: cran + md5: true - alias: r diff --git a/BioArchLinux/r-soniclength/PKGBUILD b/BioArchLinux/r-soniclength/PKGBUILD index bdabba57e6..ad5d969ac9 100644 --- a/BioArchLinux/r-soniclength/PKGBUILD +++ b/BioArchLinux/r-soniclength/PKGBUILD @@ -3,24 +3,25 @@ _pkgname=sonicLength _pkgver=1.4.7 pkgname=r-${_pkgname,,} -pkgver=1.4.7 +pkgver=${_pkgver//-/.} pkgrel=8 -pkgdesc='Estimating Abundance of Clones from DNA Fragmentation Data' -arch=('any') -url="https://cran.r-project.org/package=${_pkgname}" -license=('GPL') +pkgdesc="Estimating Abundance of Clones from DNA Fragmentation Data" +arch=(any) +url="https://cran.r-project.org/package=$_pkgname" +license=('GPL-2.0-or-later') depends=( r ) source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz") -sha256sums=('af097ff97eff9a0ae58afc5523d6c30ba750325eb102d5a8ab6c0662a6646df3') +md5sums=('f2ba331f3e7c0368220ec0c463d6838f') +b2sums=('52b663daec95952304878535cf4b4e3c9ed3162b12ef051e9df85749bbd834acaaaee29a0b7ec89c49612328802516bea71126a511252973b1edb8b906f2f934') 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-soniclength/lilac.py b/BioArchLinux/r-soniclength/lilac.py index bd219c037c..b5cdb057c5 100644 --- a/BioArchLinux/r-soniclength/lilac.py +++ b/BioArchLinux/r-soniclength/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-soniclength/lilac.yaml b/BioArchLinux/r-soniclength/lilac.yaml index 6a5b9f1dbf..d8f1b235fa 100644 --- a/BioArchLinux/r-soniclength/lilac.yaml +++ b/BioArchLinux/r-soniclength/lilac.yaml @@ -3,7 +3,8 @@ maintainers: - github: starsareintherose email: kuoi@bioarchlinux.org update_on: -- regex: sonicLength_([\d._-]+).tar.gz - source: regex - url: https://cran.r-project.org/package=sonicLength +- source: rpkgs + pkgname: sonicLength + repo: cran + md5: true - alias: r