From 00fd1f84d44a5f8e9dc085b1bc90a75a2ed62c51 Mon Sep 17 00:00:00 2001
From: Pekka Ristola <pekkarr@protonmail.com>
Date: Sun, 24 Dec 2023 16:53:59 +0200
Subject: [PATCH] r-*: use metadata checks for several packages

---
 BioArchLinux/r-additivitytests/PKGBUILD   | 21 ++++++++-------
 BioArchLinux/r-additivitytests/lilac.py   | 11 ++++----
 BioArchLinux/r-additivitytests/lilac.yaml |  7 ++---
 BioArchLinux/r-bdsmatrix/PKGBUILD         | 21 ++++++++-------
 BioArchLinux/r-bdsmatrix/lilac.py         | 11 ++++----
 BioArchLinux/r-bdsmatrix/lilac.yaml       |  7 ++---
 BioArchLinux/r-beaddatapackr/PKGBUILD     | 21 ++++++++-------
 BioArchLinux/r-beaddatapackr/lilac.py     | 11 ++++----
 BioArchLinux/r-beaddatapackr/lilac.yaml   |  7 ++---
 BioArchLinux/r-brew/PKGBUILD              | 21 ++++++++-------
 BioArchLinux/r-brew/lilac.py              | 11 ++++----
 BioArchLinux/r-brew/lilac.yaml            |  7 ++---
 BioArchLinux/r-dixontest/PKGBUILD         | 19 ++++++-------
 BioArchLinux/r-dixontest/lilac.py         | 11 ++++----
 BioArchLinux/r-dixontest/lilac.yaml       |  7 ++---
 BioArchLinux/r-fitdistrplus/PKGBUILD      | 21 ++++++++-------
 BioArchLinux/r-fitdistrplus/lilac.py      | 11 ++++----
 BioArchLinux/r-fitdistrplus/lilac.yaml    |  7 ++---
 BioArchLinux/r-infotheo/PKGBUILD          | 21 ++++++++-------
 BioArchLinux/r-infotheo/lilac.py          | 11 ++++----
 BioArchLinux/r-infotheo/lilac.yaml        |  7 ++---
 BioArchLinux/r-insight/PKGBUILD           | 33 +++++++++--------------
 BioArchLinux/r-insight/lilac.py           | 11 ++++----
 BioArchLinux/r-insight/lilac.yaml         |  7 ++---
 BioArchLinux/r-investr/PKGBUILD           | 24 ++++++++---------
 BioArchLinux/r-investr/lilac.py           | 11 ++++----
 BioArchLinux/r-investr/lilac.yaml         |  7 ++---
 BioArchLinux/r-laplacesdemon/PKGBUILD     | 28 +++++++++----------
 BioArchLinux/r-laplacesdemon/lilac.py     | 11 ++++----
 BioArchLinux/r-laplacesdemon/lilac.yaml   |  7 ++---
 BioArchLinux/r-mglm/PKGBUILD              | 21 ++++++++-------
 BioArchLinux/r-mglm/lilac.py              | 11 ++++----
 BioArchLinux/r-mglm/lilac.yaml            |  7 ++---
 BioArchLinux/r-modeltools/PKGBUILD        | 21 ++++++++-------
 BioArchLinux/r-modeltools/lilac.py        | 11 ++++----
 BioArchLinux/r-modeltools/lilac.yaml      |  7 ++---
 BioArchLinux/r-moments/PKGBUILD           | 21 ++++++++-------
 BioArchLinux/r-moments/lilac.py           | 14 ++++++----
 BioArchLinux/r-moments/lilac.yaml         |  7 ++---
 BioArchLinux/r-nortest/PKGBUILD           | 21 ++++++++-------
 BioArchLinux/r-nortest/lilac.py           | 11 ++++----
 BioArchLinux/r-nortest/lilac.yaml         |  7 ++---
 BioArchLinux/r-poibin/PKGBUILD            | 21 ++++++++-------
 BioArchLinux/r-poibin/lilac.py            | 11 ++++----
 BioArchLinux/r-poibin/lilac.yaml          |  7 ++---
 BioArchLinux/r-profmem/PKGBUILD           | 21 ++++++++-------
 BioArchLinux/r-profmem/lilac.py           | 11 ++++----
 BioArchLinux/r-profmem/lilac.yaml         |  7 ++---
 BioArchLinux/r-rcircos/PKGBUILD           | 21 ++++++++-------
 BioArchLinux/r-rcircos/lilac.py           | 11 ++++----
 BioArchLinux/r-rcircos/lilac.yaml         |  7 ++---
 BioArchLinux/r-rjsonio/PKGBUILD           | 25 +++++++++--------
 BioArchLinux/r-rjsonio/lilac.py           | 11 ++++----
 BioArchLinux/r-rjsonio/lilac.yaml         |  7 ++---
 54 files changed, 388 insertions(+), 341 deletions(-)

diff --git a/BioArchLinux/r-additivitytests/PKGBUILD b/BioArchLinux/r-additivitytests/PKGBUILD
index 41d7a07b1a..181ec4c9bd 100644
--- a/BioArchLinux/r-additivitytests/PKGBUILD
+++ b/BioArchLinux/r-additivitytests/PKGBUILD
@@ -3,12 +3,12 @@
 _pkgname=additivityTests
 _pkgver=1.1-4.1
 pkgname=r-${_pkgname,,}
-pkgver=1.1.4.1
+pkgver=${_pkgver//-/.}
 pkgrel=5
-pkgdesc='Additivity Tests in the Two Way Anova with Single Sub-class Numbers'
-arch=('any')
-url="https://cran.r-project.org/package=${_pkgname}"
-license=('GPL')
+pkgdesc="Additivity Tests in the Two Way Anova with Single Sub-Class Numbers"
+arch=(any)
+url="https://cran.r-project.org/package=$_pkgname"
+license=(GPL3)
 depends=(
   r
 )
@@ -16,14 +16,15 @@ optdepends=(
   r-knitr
 )
 source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
-sha256sums=('0421d0aa00edb67c42a61a66722c43cb95d8cd1dafa6bff603739a6fd0767f02')
+md5sums=('0aa55442e90e17042e1fdb78b29c525c')
+b2sums=('fdddc851dc30942495272e759e06965a6cda841de4c7b7edb113beb74f2d96b5116f8d30f9c7a5f001377350e7d8d26d1c503957827d5cbb7ebf953f3f1488c7')
 
 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-additivitytests/lilac.py b/BioArchLinux/r-additivitytests/lilac.py
index bd219c037c..b5cdb057c5 100644
--- a/BioArchLinux/r-additivitytests/lilac.py
+++ b/BioArchLinux/r-additivitytests/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-additivitytests/lilac.yaml b/BioArchLinux/r-additivitytests/lilac.yaml
index cd7cdd1a2a..db02e82969 100644
--- a/BioArchLinux/r-additivitytests/lilac.yaml
+++ b/BioArchLinux/r-additivitytests/lilac.yaml
@@ -3,7 +3,8 @@ maintainers:
 - github: starsareintherose
   email: kuoi@bioarchlinux.org
 update_on:
-- regex: additivityTests_([\d._-]+).tar.gz
-  source: regex
-  url: https://cran.r-project.org/package=additivityTests
+- source: rpkgs
+  pkgname: additivityTests
+  repo: cran
+  md5: true
 - alias: r
diff --git a/BioArchLinux/r-bdsmatrix/PKGBUILD b/BioArchLinux/r-bdsmatrix/PKGBUILD
index f68369b6ae..1f1907a3a9 100644
--- a/BioArchLinux/r-bdsmatrix/PKGBUILD
+++ b/BioArchLinux/r-bdsmatrix/PKGBUILD
@@ -3,24 +3,25 @@
 _pkgname=bdsmatrix
 _pkgver=1.3-6
 pkgname=r-${_pkgname,,}
-pkgver=1.3.6
+pkgver=${_pkgver//-/.}
 pkgrel=6
-pkgdesc='Routines for Block Diagonal Symmetric Matrices'
-arch=('x86_64')
-url="https://cran.r-project.org/package=${_pkgname}"
-license=('LGPL')
+pkgdesc="Routines for Block Diagonal Symmetric Matrices"
+arch=(x86_64)
+url="https://cran.r-project.org/package=$_pkgname"
+license=(LGPL2.1)
 depends=(
   r
 )
 source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
-sha256sums=('f9c871d54378408902931792b3dbf8bda863d6aa67af6a0472a6ec1c420760bc')
+md5sums=('4f8ccf979ab7f88fa71b7e45323b219a')
+b2sums=('1bceed25e2ab1e3de9d6eb401797d87d4bd7e69bc90c436b41381649b9a1d11e8179fbf6d4ec3d03516c9587cbe7dacb2ecf673e1f10a7afb61bbb46874dd690')
 
 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-bdsmatrix/lilac.py b/BioArchLinux/r-bdsmatrix/lilac.py
index bd219c037c..b5cdb057c5 100644
--- a/BioArchLinux/r-bdsmatrix/lilac.py
+++ b/BioArchLinux/r-bdsmatrix/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-bdsmatrix/lilac.yaml b/BioArchLinux/r-bdsmatrix/lilac.yaml
index 2471766d9c..9daa43cd19 100644
--- a/BioArchLinux/r-bdsmatrix/lilac.yaml
+++ b/BioArchLinux/r-bdsmatrix/lilac.yaml
@@ -3,7 +3,8 @@ maintainers:
 - github: starsareintherose
   email: kuoi@bioarchlinux.org
 update_on:
-- regex: bdsmatrix_([\d._-]+).tar.gz
-  source: regex
-  url: https://cran.r-project.org/package=bdsmatrix
+- source: rpkgs
+  pkgname: bdsmatrix
+  repo: cran
+  md5: true
 - alias: r
diff --git a/BioArchLinux/r-beaddatapackr/PKGBUILD b/BioArchLinux/r-beaddatapackr/PKGBUILD
index 3025b95ee8..97eacd7ff0 100644
--- a/BioArchLinux/r-beaddatapackr/PKGBUILD
+++ b/BioArchLinux/r-beaddatapackr/PKGBUILD
@@ -3,12 +3,12 @@
 _pkgname=BeadDataPackR
 _pkgver=1.54.0
 pkgname=r-${_pkgname,,}
-pkgver=1.54.0
+pkgver=${_pkgver//-/.}
 pkgrel=1
-pkgdesc='Compression of Illumina BeadArray data'
-arch=('x86_64')
-url="https://bioconductor.org/packages/${_pkgname}"
-license=('GPL')
+pkgdesc="Compression of Illumina BeadArray data"
+arch=(x86_64)
+url="https://bioconductor.org/packages/$_pkgname"
+license=(GPL2)
 depends=(
   r
 )
@@ -17,14 +17,15 @@ optdepends=(
   r-knitr
 )
 source=("https://bioconductor.org/packages/release/bioc/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
-sha256sums=('bf8334ad6e6b7a7df914ceb0e4331fac47f65ee0a9ffa9d3face616cf86dd769')
+md5sums=('b1e73395e4f18af4b799a1f447487a87')
+b2sums=('52af55ac7067abbf25debad01d9dfd1dde91fe34d38dc227639cfed7296e2817e456bf2e72a8341c1f69308dae200feb8815c06f1a4e1a6ac930c43fed8b39f7')
 
 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-beaddatapackr/lilac.py b/BioArchLinux/r-beaddatapackr/lilac.py
index bd219c037c..b5cdb057c5 100644
--- a/BioArchLinux/r-beaddatapackr/lilac.py
+++ b/BioArchLinux/r-beaddatapackr/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-beaddatapackr/lilac.yaml b/BioArchLinux/r-beaddatapackr/lilac.yaml
index e5d6c4d89d..031ed410e6 100644
--- a/BioArchLinux/r-beaddatapackr/lilac.yaml
+++ b/BioArchLinux/r-beaddatapackr/lilac.yaml
@@ -3,7 +3,8 @@ maintainers:
 - github: starsareintherose
   email: kuoi@bioarchlinux.org
 update_on:
-- regex: BeadDataPackR_([\d._-]+).tar.gz
-  source: regex
-  url: https://bioconductor.org/packages/BeadDataPackR
+- source: rpkgs
+  pkgname: BeadDataPackR
+  repo: bioc
+  md5: true
 - alias: r
diff --git a/BioArchLinux/r-brew/PKGBUILD b/BioArchLinux/r-brew/PKGBUILD
index 3da934234e..172be3b622 100644
--- a/BioArchLinux/r-brew/PKGBUILD
+++ b/BioArchLinux/r-brew/PKGBUILD
@@ -6,12 +6,12 @@
 _pkgname=brew
 _pkgver=1.0-10
 pkgname=r-${_pkgname,,}
-pkgver=1.0.10
+pkgver=${_pkgver//-/.}
 pkgrel=1
-pkgdesc='Templating Framework for Report Generation'
-arch=('any')
-url="https://cran.r-project.org/package=${_pkgname}"
-license=('GPL')
+pkgdesc="Templating Framework for Report Generation"
+arch=(any)
+url="https://cran.r-project.org/package=$_pkgname"
+license=(GPL)
 depends=(
   r
 )
@@ -19,14 +19,15 @@ optdepends=(
   r-testthat
 )
 source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
-sha256sums=('4181f7334e032ae0775c5dec49d6137eb25d5430ca3792d321793307b3dda38f')
+md5sums=('c1ebbea7284161a8884ffe9ae5ca451f')
+b2sums=('de4ef8171ae15ecea559a4a0a6e1414bef9eec0bd457aa00601a34738277bddad72eff90f41fd6c3dc3579bd849297922f2eb8e411238b736f9d8808b526ac54')
 
 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-brew/lilac.py b/BioArchLinux/r-brew/lilac.py
index bd219c037c..b5cdb057c5 100644
--- a/BioArchLinux/r-brew/lilac.py
+++ b/BioArchLinux/r-brew/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-brew/lilac.yaml b/BioArchLinux/r-brew/lilac.yaml
index 6c44dbb33b..36cbe6fa90 100644
--- a/BioArchLinux/r-brew/lilac.yaml
+++ b/BioArchLinux/r-brew/lilac.yaml
@@ -3,7 +3,8 @@ maintainers:
 - github: starsareintherose
   email: kuoi@bioarchlinux.org
 update_on:
-- regex: brew_([\d._-]+).tar.gz
-  source: regex
-  url: https://cran.r-project.org/package=brew
+- source: rpkgs
+  pkgname: brew
+  repo: cran
+  md5: true
 - alias: r
diff --git a/BioArchLinux/r-dixontest/PKGBUILD b/BioArchLinux/r-dixontest/PKGBUILD
index 65ca9491c1..43946fff59 100644
--- a/BioArchLinux/r-dixontest/PKGBUILD
+++ b/BioArchLinux/r-dixontest/PKGBUILD
@@ -3,12 +3,12 @@
 _pkgname=dixonTest
 _pkgver=1.0.4
 pkgname=r-${_pkgname,,}
-pkgver=1.0.4
+pkgver=${_pkgver//-/.}
 pkgrel=2
 pkgdesc="Dixon's Ratio Test for Outlier Detection"
-arch=('x86_64')
-url="https://cran.r-project.org/package=${_pkgname}"
-license=('GPL')
+arch=(x86_64)
+url="https://cran.r-project.org/package=$_pkgname"
+license=(GPL3)
 depends=(
   r
 )
@@ -16,14 +16,15 @@ makedepends=(
   gcc-fortran
 )
 source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
-sha256sums=('b8694e4c4123827f954dffd0a30fb8c7f9cf49d0ec66be4d79eba0f4834ee33f')
+md5sums=('3f0dfa902dc3f22986b729f500f9ac63')
+b2sums=('126309cab66862de09a4032d61d161dfe08eccafe0799a065046e96270a19890054c2708335d1dc182429a86b2fa912b99bdcdfad30c20d5123cd824ba4e0883')
 
 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-dixontest/lilac.py b/BioArchLinux/r-dixontest/lilac.py
index bd219c037c..b5cdb057c5 100644
--- a/BioArchLinux/r-dixontest/lilac.py
+++ b/BioArchLinux/r-dixontest/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-dixontest/lilac.yaml b/BioArchLinux/r-dixontest/lilac.yaml
index d24f2cc82e..dabd2f33c5 100644
--- a/BioArchLinux/r-dixontest/lilac.yaml
+++ b/BioArchLinux/r-dixontest/lilac.yaml
@@ -3,7 +3,8 @@ maintainers:
 - github: starsareintherose
   email: kuoi@bioarchlinux.org
 update_on:
-- regex: dixonTest_([\d._-]+).tar.gz
-  source: regex
-  url: https://cran.r-project.org/package=dixonTest
+- source: rpkgs
+  pkgname: dixonTest
+  repo: cran
+  md5: true
 - alias: r
diff --git a/BioArchLinux/r-fitdistrplus/PKGBUILD b/BioArchLinux/r-fitdistrplus/PKGBUILD
index 7d4d3d8e0a..de8040d7bb 100644
--- a/BioArchLinux/r-fitdistrplus/PKGBUILD
+++ b/BioArchLinux/r-fitdistrplus/PKGBUILD
@@ -3,12 +3,12 @@
 _pkgname=fitdistrplus
 _pkgver=1.1-11
 pkgname=r-${_pkgname,,}
-pkgver=1.1.11
+pkgver=${_pkgver//-/.}
 pkgrel=3
-pkgdesc='Help to Fit of a Parametric Distribution to Non-Censored or Censored Data'
-arch=('any')
-url="https://cran.r-project.org/package=${_pkgname}"
-license=('GPL')
+pkgdesc="Help to Fit of a Parametric Distribution to Non-Censored or Censored Data"
+arch=(any)
+url="https://cran.r-project.org/package=$_pkgname"
+license=(GPL)
 depends=(
   r
 )
@@ -25,14 +25,15 @@ optdepends=(
   r-rmarkdown
 )
 source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
-sha256sums=('26274f2b710b2417a8bca314d400abf320d4ccf0387ad082743056699501b53d')
+md5sums=('512df42bc5b35be4690c17882315f33b')
+b2sums=('a4fd884dcf7813d0fdd1c2c96dd4de6ca747b1e775553cdcc797006c45b6521395780193a8ff9c9258cad6d1eac00418dcdbcd557a6594407fbc734e97c45043')
 
 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-fitdistrplus/lilac.py b/BioArchLinux/r-fitdistrplus/lilac.py
index bd219c037c..b5cdb057c5 100644
--- a/BioArchLinux/r-fitdistrplus/lilac.py
+++ b/BioArchLinux/r-fitdistrplus/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-fitdistrplus/lilac.yaml b/BioArchLinux/r-fitdistrplus/lilac.yaml
index 9a2c2efe30..cb6b6c480a 100644
--- a/BioArchLinux/r-fitdistrplus/lilac.yaml
+++ b/BioArchLinux/r-fitdistrplus/lilac.yaml
@@ -3,7 +3,8 @@ maintainers:
 - github: starsareintherose
   email: kuoi@bioarchlinux.org
 update_on:
-- regex: fitdistrplus_([\d._-]+).tar.gz
-  source: regex
-  url: https://cran.r-project.org/package=fitdistrplus
+- source: rpkgs
+  pkgname: fitdistrplus
+  repo: cran
+  md5: true
 - alias: r
diff --git a/BioArchLinux/r-infotheo/PKGBUILD b/BioArchLinux/r-infotheo/PKGBUILD
index dc52c2a670..ea51ee705d 100644
--- a/BioArchLinux/r-infotheo/PKGBUILD
+++ b/BioArchLinux/r-infotheo/PKGBUILD
@@ -3,24 +3,25 @@
 _pkgname=infotheo
 _pkgver=1.2.0.1
 pkgname=r-${_pkgname,,}
-pkgver=1.2.0.1
+pkgver=${_pkgver//-/.}
 pkgrel=7
-pkgdesc='Information-Theoretic Measures'
-arch=('x86_64')
-url="https://cran.r-project.org/package=${_pkgname}"
-license=('GPL')
+pkgdesc="Information-Theoretic Measures"
+arch=(x86_64)
+url="https://cran.r-project.org/package=$_pkgname"
+license=(GPL3)
 depends=(
   r
 )
 source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
-sha256sums=('c0fb8ec97ad3a49f231c4c993b5eee70c6a61c8c30dc4a46197867e4763a29d4')
+md5sums=('980ad0bc179733e870c25276cc95680e')
+b2sums=('29605dd98d54deccf85ca2c2edd181042f4c83253973925a80b620742a96ed7b4b092f0aa56cb65eb8d38d10674d9f0a3891b2b925f7fe0f99ff1e3aa7649708')
 
 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-infotheo/lilac.py b/BioArchLinux/r-infotheo/lilac.py
index bd219c037c..b5cdb057c5 100644
--- a/BioArchLinux/r-infotheo/lilac.py
+++ b/BioArchLinux/r-infotheo/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-infotheo/lilac.yaml b/BioArchLinux/r-infotheo/lilac.yaml
index f48abc099c..e2fe4b7d3e 100644
--- a/BioArchLinux/r-infotheo/lilac.yaml
+++ b/BioArchLinux/r-infotheo/lilac.yaml
@@ -3,7 +3,8 @@ maintainers:
 - github: starsareintherose
   email: kuoi@bioarchlinux.org
 update_on:
-- regex: infotheo_([\d._-]+).tar.gz
-  source: regex
-  url: https://cran.r-project.org/package=infotheo
+- source: rpkgs
+  pkgname: infotheo
+  repo: cran
+  md5: true
 - alias: r
diff --git a/BioArchLinux/r-insight/PKGBUILD b/BioArchLinux/r-insight/PKGBUILD
index 96755da9ff..2bc525703d 100644
--- a/BioArchLinux/r-insight/PKGBUILD
+++ b/BioArchLinux/r-insight/PKGBUILD
@@ -3,12 +3,12 @@
 _pkgname=insight
 _pkgver=0.19.7
 pkgname=r-${_pkgname,,}
-pkgver=0.19.7
+pkgver=${_pkgver//-/.}
 pkgrel=1
-pkgdesc='Easy Access to Model Information for Various Model Objects'
-arch=('any')
-url="https://cran.r-project.org/package=${_pkgname}"
-license=('GPL')
+pkgdesc="Easy Access to Model Information for Various Model Objects"
+arch=(any)
+url="https://cran.r-project.org/package=$_pkgname"
+license=(GPL3)
 depends=(
   r
 )
@@ -25,7 +25,6 @@ optdepends=(
   r-biglm
   r-blavaan
   r-blme
-  r-boot
   r-brms
   r-broom
   r-car
@@ -53,10 +52,10 @@ optdepends=(
   r-gee
   r-geepack
   r-geor
+  r-ggeffects
   r-glmmadaptive
   r-glmmtmb
   r-gmnl
-  r-grdevices
   r-gt
   r-httr
   r-interp
@@ -72,8 +71,6 @@ optdepends=(
   r-logistf
   r-logitr
   r-marginaleffects
-  r-mass
-  r-matrix
   r-mclogit
   r-mclust
   r-mcmcglmm
@@ -82,7 +79,6 @@ optdepends=(
   r-metadat
   r-metafor
   r-metaplus
-  r-mgcv
   r-mhurdle
   r-mice
   r-mlogit
@@ -90,8 +86,6 @@ optdepends=(
   r-modelbased
   r-multgee
   r-nestedlogit
-  r-nlme
-  r-nnet
   r-nonnest2
   r-ordinal
   r-panelr
@@ -109,31 +103,30 @@ optdepends=(
   r-rms
   r-robustbase
   r-robustlmm
-  r-rpart
   r-rstanarm
   r-rstantools
   r-rstudioapi
   r-sandwich
   r-speedglm
-  r-splines
   r-statmod
   r-survey
-  r-survival
   r-testthat
   r-tmb
   r-truncreg
   r-tweedie
   r-vgam
+  r-withr
 )
 source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
-sha256sums=('41a54c13a3f04108c79469cf35c41161f37e2d89e6d70791eb13fd5fc0e71f06')
+md5sums=('e13822ab6a330715c876b28a7a4805f4')
+b2sums=('149cbe5108b8fe8c37f64ccec4cddc3b60f21904098f67a1073a86758e5cccb4ee3ae0975c6231792aad286c333884f90d3fb61791e32ca386bea0cbaea2fb8f')
 
 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-insight/lilac.py b/BioArchLinux/r-insight/lilac.py
index bd219c037c..b5cdb057c5 100644
--- a/BioArchLinux/r-insight/lilac.py
+++ b/BioArchLinux/r-insight/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-insight/lilac.yaml b/BioArchLinux/r-insight/lilac.yaml
index dd3ef03396..f105655731 100644
--- a/BioArchLinux/r-insight/lilac.yaml
+++ b/BioArchLinux/r-insight/lilac.yaml
@@ -3,7 +3,8 @@ maintainers:
 - github: starsareintherose
   email: kuoi@bioarchlinux.org
 update_on:
-- regex: insight_([\d._-]+).tar.gz
-  source: regex
-  url: https://cran.r-project.org/package=insight
+- source: rpkgs
+  pkgname: insight
+  repo: cran
+  md5: true
 - alias: r
diff --git a/BioArchLinux/r-investr/PKGBUILD b/BioArchLinux/r-investr/PKGBUILD
index 61e818fc0b..71306a53e4 100644
--- a/BioArchLinux/r-investr/PKGBUILD
+++ b/BioArchLinux/r-investr/PKGBUILD
@@ -3,31 +3,29 @@
 _pkgname=investr
 _pkgver=1.4.2
 pkgname=r-${_pkgname,,}
-pkgver=1.4.2
+pkgver=${_pkgver//-/.}
 pkgrel=7
-pkgdesc='Inverse Estimation/Calibration Functions'
-arch=('any')
-url="https://cran.r-project.org/package=${_pkgname}"
-license=('GPL')
+pkgdesc="Inverse Estimation/Calibration Functions"
+arch=(any)
+url="https://cran.r-project.org/package=$_pkgname"
+license=(GPL)
 depends=(
   r
 )
 optdepends=(
-  r-boot
-  r-datasets
   r-knitr
-  r-mass
   r-testthat
 )
 source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
-sha256sums=('2a07537777b95370f574b597e1d97279cd700ec9d17d2bad8a1c8ef846dc198a')
+md5sums=('35f482b245f8033f4168e87d4a02e898')
+b2sums=('1ab183d2d42da6ddf801cfabadafce5c16d5ff16ceddb78542c31a71ce864fe27508514fc8a7e636cc218f8029cc14a86cf3924075e44d58ba8c1a87a84dcc97')
 
 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-investr/lilac.py b/BioArchLinux/r-investr/lilac.py
index bd219c037c..b5cdb057c5 100644
--- a/BioArchLinux/r-investr/lilac.py
+++ b/BioArchLinux/r-investr/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-investr/lilac.yaml b/BioArchLinux/r-investr/lilac.yaml
index 6522ed3c7c..992e7517f7 100644
--- a/BioArchLinux/r-investr/lilac.yaml
+++ b/BioArchLinux/r-investr/lilac.yaml
@@ -3,7 +3,8 @@ maintainers:
 - github: starsareintherose
   email: kuoi@bioarchlinux.org
 update_on:
-- regex: investr_([\d._-]+).tar.gz
-  source: regex
-  url: https://cran.r-project.org/package=investr
+- source: rpkgs
+  pkgname: investr
+  repo: cran
+  md5: true
 - alias: r
diff --git a/BioArchLinux/r-laplacesdemon/PKGBUILD b/BioArchLinux/r-laplacesdemon/PKGBUILD
index 6f1a8a3c6a..de028071d9 100644
--- a/BioArchLinux/r-laplacesdemon/PKGBUILD
+++ b/BioArchLinux/r-laplacesdemon/PKGBUILD
@@ -3,28 +3,28 @@
 _pkgname=LaplacesDemon
 _pkgver=16.1.6
 pkgname=r-${_pkgname,,}
-pkgver=16.1.6
+pkgver=${_pkgver//-/.}
 pkgrel=6
-pkgdesc='Complete Environment for Bayesian Inference'
-arch=('any')
-url="https://cran.r-project.org/package=${_pkgname}"
-license=('MIT')
+pkgdesc="Complete Environment for Bayesian Inference"
+arch=(any)
+url="https://cran.r-project.org/package=$_pkgname"
+license=(MIT)
 depends=(
   r
 )
-optdepends=(
-  r-kernsmooth
-)
 source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
-sha256sums=('57b53882fd7a195b38bbdbbf0b17745405eb3159b1b42f7f11ce80c78ab94eb7')
+md5sums=('7b23b0c00987f6974aad4795ad7b6614')
+b2sums=('8140b1bc034bf8d8f1ea8544200abdd715396bd9d92e5a6b73228d9c94859c82b4ef0eb54cb87fef26993116973827ee3a81d94b58c242e2d249a3983917b179')
 
 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 -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-laplacesdemon/lilac.py b/BioArchLinux/r-laplacesdemon/lilac.py
index bd219c037c..b5cdb057c5 100644
--- a/BioArchLinux/r-laplacesdemon/lilac.py
+++ b/BioArchLinux/r-laplacesdemon/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-laplacesdemon/lilac.yaml b/BioArchLinux/r-laplacesdemon/lilac.yaml
index ed59df7c4e..e5cd5c79a0 100644
--- a/BioArchLinux/r-laplacesdemon/lilac.yaml
+++ b/BioArchLinux/r-laplacesdemon/lilac.yaml
@@ -3,7 +3,8 @@ maintainers:
 - github: starsareintherose
   email: kuoi@bioarchlinux.org
 update_on:
-- regex: LaplacesDemon_([\d._-]+).tar.gz
-  source: regex
-  url: https://cran.r-project.org/package=LaplacesDemon
+- source: rpkgs
+  pkgname: LaplacesDemon
+  repo: cran
+  md5: true
 - alias: r
diff --git a/BioArchLinux/r-mglm/PKGBUILD b/BioArchLinux/r-mglm/PKGBUILD
index 24a1269f9e..4919dc535a 100644
--- a/BioArchLinux/r-mglm/PKGBUILD
+++ b/BioArchLinux/r-mglm/PKGBUILD
@@ -3,12 +3,12 @@
 _pkgname=MGLM
 _pkgver=0.2.1
 pkgname=r-${_pkgname,,}
-pkgver=0.2.1
+pkgver=${_pkgver//-/.}
 pkgrel=9
-pkgdesc='Multivariate Response Generalized Linear Models'
-arch=('any')
-url="https://cran.r-project.org/package=${_pkgname}"
-license=('GPL')
+pkgdesc="Multivariate Response Generalized Linear Models"
+arch=(any)
+url="https://cran.r-project.org/package=$_pkgname"
+license=(GPL)
 depends=(
   r
 )
@@ -20,14 +20,15 @@ optdepends=(
   r-testthat
 )
 source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
-sha256sums=('aed900e67f6aa30f1f5da2220a7621fdaad2428697bf4be4a68f9192b29d6d3a')
+md5sums=('d4c964eaa6fd83920fd9948ade55a0f4')
+b2sums=('4900e0585fdc4da3f96839d9f3f9efa9eb101069d5d56531bded5b9636ebb59b9e3dd4c0e1652d56af2ae7950a09c5cbfa7c024dc2261c07c315ebf57383e6ea')
 
 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-mglm/lilac.py b/BioArchLinux/r-mglm/lilac.py
index bd219c037c..b5cdb057c5 100644
--- a/BioArchLinux/r-mglm/lilac.py
+++ b/BioArchLinux/r-mglm/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-mglm/lilac.yaml b/BioArchLinux/r-mglm/lilac.yaml
index b22341f17f..02db8f66f9 100644
--- a/BioArchLinux/r-mglm/lilac.yaml
+++ b/BioArchLinux/r-mglm/lilac.yaml
@@ -3,7 +3,8 @@ maintainers:
 - github: starsareintherose
   email: kuoi@bioarchlinux.org
 update_on:
-- regex: MGLM_([\d._-]+).tar.gz
-  source: regex
-  url: https://cran.r-project.org/package=MGLM
+- source: rpkgs
+  pkgname: MGLM
+  repo: cran
+  md5: true
 - alias: r
diff --git a/BioArchLinux/r-modeltools/PKGBUILD b/BioArchLinux/r-modeltools/PKGBUILD
index c6429ce4a2..2b52b8f4fc 100644
--- a/BioArchLinux/r-modeltools/PKGBUILD
+++ b/BioArchLinux/r-modeltools/PKGBUILD
@@ -4,24 +4,25 @@
 _pkgname=modeltools
 _pkgver=0.2-23
 pkgname=r-${_pkgname,,}
-pkgver=0.2.23
+pkgver=${_pkgver//-/.}
 pkgrel=11
-pkgdesc='Tools and Classes for Statistical Models'
-arch=('any')
-url="https://cran.r-project.org/package=${_pkgname}"
-license=('GPL')
+pkgdesc="Tools and Classes for Statistical Models"
+arch=(any)
+url="https://cran.r-project.org/package=$_pkgname"
+license=(GPL2)
 depends=(
   r
 )
 source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
-sha256sums=('6b3e8d5af1a039db5c178498dbf354ed1c5627a8cea9229726644053443210ef')
+md5sums=('954e3f72a5fd9086f070f7fcc41a08f1')
+b2sums=('af734abbab0177159bcb62babe233d777c697d510d0d152b3b1303c02e174a2ee6bc1a3767725ba89b20a83222a1e848d62ac31cf625d0ccc0aa3db150204c33')
 
 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-modeltools/lilac.py b/BioArchLinux/r-modeltools/lilac.py
index bd219c037c..b5cdb057c5 100644
--- a/BioArchLinux/r-modeltools/lilac.py
+++ b/BioArchLinux/r-modeltools/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-modeltools/lilac.yaml b/BioArchLinux/r-modeltools/lilac.yaml
index 8c6130483b..d1bc97d143 100644
--- a/BioArchLinux/r-modeltools/lilac.yaml
+++ b/BioArchLinux/r-modeltools/lilac.yaml
@@ -3,7 +3,8 @@ maintainers:
 - github: starsareintherose
   email: kuoi@bioarchlinux.org
 update_on:
-- regex: modeltools_([\d._-]+).tar.gz
-  source: regex
-  url: https://cran.r-project.org/package=modeltools
+- source: rpkgs
+  pkgname: modeltools
+  repo: cran
+  md5: true
 - alias: r
diff --git a/BioArchLinux/r-moments/PKGBUILD b/BioArchLinux/r-moments/PKGBUILD
index b8943693f6..17e2979865 100644
--- a/BioArchLinux/r-moments/PKGBUILD
+++ b/BioArchLinux/r-moments/PKGBUILD
@@ -3,24 +3,25 @@
 _pkgname=moments
 _pkgver=0.14.1
 pkgname=r-${_pkgname,,}
-pkgver=0.14.1
+pkgver=${_pkgver//-/.}
 pkgrel=6
-pkgdesc='Moments, cumulants, skewness, kurtosis and related tests'
-arch=('any')
-url="https://cran.r-project.org/package=${_pkgname}"
-license=('GPL')
+pkgdesc="Moments, Cumulants, Skewness, Kurtosis and Related Tests"
+arch=(any)
+url="https://cran.r-project.org/package=$_pkgname"
+license=(GPL)
 depends=(
   r
 )
 source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
-sha256sums=('2ed2b84802da132ae0cf826a65de5bfa85042b82e086be844002fe1ce270d864')
+md5sums=('622afd35702c45ad010c106af2457458')
+b2sums=('60e12f8a33c051cb91282438d8afb1459882b332ccdde217cdd10cafab32d97084b49a0e670b1716035188d37be7199740ac5baf06ab803309e9586bc7c683b0')
 
 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-moments/lilac.py b/BioArchLinux/r-moments/lilac.py
index bd219c037c..e87b418a04 100644
--- a/BioArchLinux/r-moments/lilac.py
+++ b/BioArchLinux/r-moments/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_title = "Moments, Cumulants, Skewness, Kurtosis and Related Tests",
+    )
 
 def post_build():
     git_pkgbuild_commit()
diff --git a/BioArchLinux/r-moments/lilac.yaml b/BioArchLinux/r-moments/lilac.yaml
index d688966b14..44d20fbbc4 100644
--- a/BioArchLinux/r-moments/lilac.yaml
+++ b/BioArchLinux/r-moments/lilac.yaml
@@ -3,7 +3,8 @@ maintainers:
 - github: starsareintherose
   email: kuoi@bioarchlinux.org
 update_on:
-- regex: moments_([\d._-]+).tar.gz
-  source: regex
-  url: https://cran.r-project.org/package=moments
+- source: rpkgs
+  pkgname: moments
+  repo: cran
+  md5: true
 - alias: r
diff --git a/BioArchLinux/r-nortest/PKGBUILD b/BioArchLinux/r-nortest/PKGBUILD
index 1afd471569..b879c853c4 100644
--- a/BioArchLinux/r-nortest/PKGBUILD
+++ b/BioArchLinux/r-nortest/PKGBUILD
@@ -4,24 +4,25 @@
 _pkgname=nortest
 _pkgver=1.0-4
 pkgname=r-${_pkgname,,}
-pkgver=1.0.4
+pkgver=${_pkgver//-/.}
 pkgrel=10
-pkgdesc='Tests for Normality'
-arch=('any')
-url="https://cran.r-project.org/package=${_pkgname}"
-license=('GPL')
+pkgdesc="Tests for Normality"
+arch=(any)
+url="https://cran.r-project.org/package=$_pkgname"
+license=(GPL)
 depends=(
   r
 )
 source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
-sha256sums=('a3850a048181d5d059c1e74903437569873b430c915b709808237d71fee5209f')
+md5sums=('de58446c1da50602a9c85dba5fe409ca')
+b2sums=('3d6e81de1296529c28641feaba04ed907c662755787b076b4b87d1a6b33362a710bc354a5388065c05877967aa805ed4148f8deff1192842585ea1a772651d53')
 
 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-nortest/lilac.py b/BioArchLinux/r-nortest/lilac.py
index bd219c037c..b5cdb057c5 100644
--- a/BioArchLinux/r-nortest/lilac.py
+++ b/BioArchLinux/r-nortest/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-nortest/lilac.yaml b/BioArchLinux/r-nortest/lilac.yaml
index 171565921f..0b9c2997cb 100644
--- a/BioArchLinux/r-nortest/lilac.yaml
+++ b/BioArchLinux/r-nortest/lilac.yaml
@@ -3,7 +3,8 @@ maintainers:
 - github: starsareintherose
   email: kuoi@bioarchlinux.org
 update_on:
-- regex: nortest_([\d._-]+).tar.gz
-  source: regex
-  url: https://cran.r-project.org/package=nortest
+- source: rpkgs
+  pkgname: nortest
+  repo: cran
+  md5: true
 - alias: r
diff --git a/BioArchLinux/r-poibin/PKGBUILD b/BioArchLinux/r-poibin/PKGBUILD
index 690a77d39d..6eef8bc76a 100644
--- a/BioArchLinux/r-poibin/PKGBUILD
+++ b/BioArchLinux/r-poibin/PKGBUILD
@@ -3,24 +3,25 @@
 _pkgname=poibin
 _pkgver=1.5
 pkgname=r-${_pkgname,,}
-pkgver=1.5
+pkgver=${_pkgver//-/.}
 pkgrel=6
-pkgdesc='The Poisson Binomial Distribution'
-arch=('x86_64')
-url="https://cran.r-project.org/package=${_pkgname}"
-license=('GPL')
+pkgdesc="The Poisson Binomial Distribution"
+arch=(x86_64)
+url="https://cran.r-project.org/package=$_pkgname"
+license=(GPL2)
 depends=(
   r
 )
 source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
-sha256sums=('3b395e001db8f4b0a56f3645c5eef645978418baa6f8f6a7d58d9acff9f6b9eb')
+md5sums=('ccb27983b15b6670ae4b454bea9bd0a1')
+b2sums=('818f937ae9c1b013dff2b623185b7337a7a0d411c53098a178f6e65b19a1c396b2235a056d9e3510436d9ea1787b4b11189653f2a0719a1d448ed63e17d6256a')
 
 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-poibin/lilac.py b/BioArchLinux/r-poibin/lilac.py
index bd219c037c..b5cdb057c5 100644
--- a/BioArchLinux/r-poibin/lilac.py
+++ b/BioArchLinux/r-poibin/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-poibin/lilac.yaml b/BioArchLinux/r-poibin/lilac.yaml
index c5bdf2fda3..2ce4d54ea7 100644
--- a/BioArchLinux/r-poibin/lilac.yaml
+++ b/BioArchLinux/r-poibin/lilac.yaml
@@ -3,7 +3,8 @@ maintainers:
 - github: starsareintherose
   email: kuoi@bioarchlinux.org
 update_on:
-- regex: poibin_([\d._-]+).tar.gz
-  source: regex
-  url: https://cran.r-project.org/package=poibin
+- source: rpkgs
+  pkgname: poibin
+  repo: cran
+  md5: true
 - alias: r
diff --git a/BioArchLinux/r-profmem/PKGBUILD b/BioArchLinux/r-profmem/PKGBUILD
index 5bde0415e6..640405140b 100644
--- a/BioArchLinux/r-profmem/PKGBUILD
+++ b/BioArchLinux/r-profmem/PKGBUILD
@@ -3,12 +3,12 @@
 _pkgname=profmem
 _pkgver=0.6.0
 pkgname=r-${_pkgname,,}
-pkgver=0.6.0
+pkgver=${_pkgver//-/.}
 pkgrel=5
-pkgdesc='Simple Memory Profiling for R'
-arch=('any')
-url="https://cran.r-project.org/package=${_pkgname}"
-license=('LGPL')
+pkgdesc="Simple Memory Profiling for R"
+arch=(any)
+url="https://cran.r-project.org/package=$_pkgname"
+license=(LGPL)
 depends=(
   r
 )
@@ -18,14 +18,15 @@ optdepends=(
   r-r.rsp
 )
 source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
-sha256sums=('745ca9b22a8de3cda4374be6e2454e549742a3b72ff02c8894c972178192e63d')
+md5sums=('f67828b0287e8ca8d244982cc6c171e4')
+b2sums=('ecb07fca472cdc482f238792a3e8c0f48fcfda36534f3f2f5720d911474e7ac9bbd6ebc7ad32b2a8280534e4cf26deeeae3532e2af67a91f8cdaa0a918cdb7ce')
 
 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-profmem/lilac.py b/BioArchLinux/r-profmem/lilac.py
index bd219c037c..b5cdb057c5 100644
--- a/BioArchLinux/r-profmem/lilac.py
+++ b/BioArchLinux/r-profmem/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-profmem/lilac.yaml b/BioArchLinux/r-profmem/lilac.yaml
index 3bbd9e83ec..a6cd8024b9 100644
--- a/BioArchLinux/r-profmem/lilac.yaml
+++ b/BioArchLinux/r-profmem/lilac.yaml
@@ -3,7 +3,8 @@ maintainers:
 - github: starsareintherose
   email: kuoi@bioarchlinux.org
 update_on:
-- regex: profmem_([\d._-]+).tar.gz
-  source: regex
-  url: https://cran.r-project.org/package=profmem
+- source: rpkgs
+  pkgname: profmem
+  repo: cran
+  md5: true
 - alias: r
diff --git a/BioArchLinux/r-rcircos/PKGBUILD b/BioArchLinux/r-rcircos/PKGBUILD
index 2de7b1f778..5420c28ae8 100644
--- a/BioArchLinux/r-rcircos/PKGBUILD
+++ b/BioArchLinux/r-rcircos/PKGBUILD
@@ -3,24 +3,25 @@
 _pkgname=RCircos
 _pkgver=1.2.2
 pkgname=r-${_pkgname,,}
-pkgver=1.2.2
+pkgver=${_pkgver//-/.}
 pkgrel=6
-pkgdesc='Circos 2D Track Plot'
-arch=('any')
-url="https://cran.r-project.org/package=${_pkgname}"
-license=('GPL')
+pkgdesc="Circos 2D Track Plot"
+arch=(any)
+url="https://cran.r-project.org/package=$_pkgname"
+license=(GPL)
 depends=(
   r
 )
 source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
-sha256sums=('5bbdc3baff2d22a8922685af02b2af07541a1bcf1914abd9c166850b4c550afc')
+md5sums=('a1bf14fdaa2933f090ceab87803f9988')
+b2sums=('bd734acd48114628f942dc6534df1ce24d940a2e68eaffd747f6701bc3bbb7b18b59890db14e18dae432240f353e9e12b6d093d738eb99320c74aff567667e27')
 
 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-rcircos/lilac.py b/BioArchLinux/r-rcircos/lilac.py
index bd219c037c..b5cdb057c5 100644
--- a/BioArchLinux/r-rcircos/lilac.py
+++ b/BioArchLinux/r-rcircos/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-rcircos/lilac.yaml b/BioArchLinux/r-rcircos/lilac.yaml
index 8eb13b4c74..d48f6196ec 100644
--- a/BioArchLinux/r-rcircos/lilac.yaml
+++ b/BioArchLinux/r-rcircos/lilac.yaml
@@ -3,7 +3,8 @@ maintainers:
 - github: starsareintherose
   email: kuoi@bioarchlinux.org
 update_on:
-- regex: RCircos_([\d._-]+).tar.gz
-  source: regex
-  url: https://cran.r-project.org/package=RCircos
+- source: rpkgs
+  pkgname: RCircos
+  repo: cran
+  md5: true
 - alias: r
diff --git a/BioArchLinux/r-rjsonio/PKGBUILD b/BioArchLinux/r-rjsonio/PKGBUILD
index 7e2a368a2a..1e4867739d 100644
--- a/BioArchLinux/r-rjsonio/PKGBUILD
+++ b/BioArchLinux/r-rjsonio/PKGBUILD
@@ -3,25 +3,28 @@
 _pkgname=RJSONIO
 _pkgver=1.3-1.9
 pkgname=r-${_pkgname,,}
-pkgver=1.3.1.9
+pkgver=${_pkgver//-/.}
 pkgrel=1
-pkgdesc='Serialize R Objects to JSON, JavaScript Object Notation'
-arch=('x86_64')
-url="https://cran.r-project.org/package=${_pkgname}"
-license=('BSD')
+pkgdesc="Serialize R Objects to JSON, JavaScript Object Notation"
+arch=(x86_64)
+url="https://cran.r-project.org/package=$_pkgname"
+license=(BSD)
 depends=(
   r
 )
 source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
-sha256sums=('f173034b0c28873f417ee804b9e278aedd92e76eb56c7c6d71b1c02fa1193ece')
+md5sums=('d42747c9c3be446a3aefa2b9fa28023c')
+b2sums=('24741269513cc5259c03420879c1b926ebd6927c9a361db154853b583ac116519df4c68a9860cb165c0c58021777074b5778097bfc2b4342474a6387fe57af94')
 
 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 -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-rjsonio/lilac.py b/BioArchLinux/r-rjsonio/lilac.py
index bd219c037c..b5cdb057c5 100644
--- a/BioArchLinux/r-rjsonio/lilac.py
+++ b/BioArchLinux/r-rjsonio/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-rjsonio/lilac.yaml b/BioArchLinux/r-rjsonio/lilac.yaml
index 6a7ff7cd96..06bcbb7aec 100644
--- a/BioArchLinux/r-rjsonio/lilac.yaml
+++ b/BioArchLinux/r-rjsonio/lilac.yaml
@@ -3,7 +3,8 @@ maintainers:
 - github: starsareintherose
   email: kuoi@bioarchlinux.org
 update_on:
-- regex: RJSONIO_([\d._-]+).tar.gz
-  source: regex
-  url: https://cran.r-project.org/package=RJSONIO
+- source: rpkgs
+  pkgname: RJSONIO
+  repo: cran
+  md5: true
 - alias: r