upgpkg: r-biocmanager 1.30.20-2

2 files changed, 25 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 63d0f4d8ba38..a8568973df04 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,26 @@
 pkgbase = r-biocmanager
 	pkgdesc = A convenient tool to install and update Bioconductor packages.
 	pkgver = 1.30.20
-	pkgrel = 1
+	pkgrel = 2
 	url = https://CRAN.R-project.org/package=BiocManager
 	arch = i686
 	arch = x86_64
 	license = Artistic2.0
+	checkdepends = r-biocversion
+	checkdepends = r-curl
+	checkdepends = r-knitr
+	checkdepends = r-remotes
+	checkdepends = r-rmarkdown
+	checkdepends = r-withr
+	checkdepends = r-testthat>=3.0.0
 	depends = r
 	optdepends = r-biocversion
 	optdepends = r-curl
 	optdepends = r-knitr
 	optdepends = r-remotes
 	optdepends = r-rmarkdown
-	optdepends = r-testthat
 	optdepends = r-withr
-	noextract = r-biocmanager-1.30.20.tar.gz
-	source = r-biocmanager-1.30.20.tar.gz::https://cran.r-project.org/src/contrib/BiocManager_1.30.20.tar.gz
+	source = https://cran.r-project.org/src/contrib/BiocManager_1.30.20.tar.gz
 	b2sums = f70c66f07d361d80f2679af273b9b948cf492ab5ef138dc552b264c462e30c602a3324bda346b181663e2e9f492e432ea48d7e995e311e51dfd98e3519e4a03c
 
 pkgname = r-biocmanager
diff --git a/PKGBUILD b/PKGBUILD
index 733dd47e297d..9a85f92eb756 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ _cranname=BiocManager
 _cranver=1.30.20
 pkgname=r-${_cranname,,}
 pkgver=${_cranver//[:-]/.}
-pkgrel=1
+pkgrel=2
 pkgdesc="A convenient tool to install and update Bioconductor packages."
 arch=("i686" "x86_64")
 url="https://CRAN.R-project.org/package=${_cranname}"
@@ -19,20 +19,29 @@ optdepends=(
     r-knitr
     r-remotes
     r-rmarkdown
-    r-testthat
     r-withr
 )
-source=("${pkgname}-${pkgver}.tar.gz::https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
-b2sums=("f70c66f07d361d80f2679af273b9b948cf492ab5ef138dc552b264c462e30c602a3324bda346b181663e2e9f492e432ea48d7e995e311e51dfd98e3519e4a03c")
-noextract=(${pkgname}-${pkgver}.tar.gz)
+checkdepends=(
+    "${optdepends[@]}"
+    "r-testthat>=3.0.0"
+)
+
+source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
+b2sums=('f70c66f07d361d80f2679af273b9b948cf492ab5ef138dc552b264c462e30c602a3324bda346b181663e2e9f492e432ea48d7e995e311e51dfd98e3519e4a03c')
 
 build() {
-    R CMD INSTALL ${pkgname}-${pkgver}.tar.gz -l "${srcdir}"
+    mkdir -p "${srcdir}/build/"
+    R CMD INSTALL ${_cranname}_${_cranver}.tar.gz -l "${srcdir}/build/"
+}
+
+check() {
+    cd "${srcdir}/${_cranname}/tests"
+    R_LIBS="${srcdir}/build/" Rscript --vanilla testthat.R
 }
 
 package() {
     install -dm0755 "${pkgdir}/usr/lib/R/library"
-    cp -a --no-preserve=ownership "${_cranname}" "${pkgdir}/usr/lib/R/library"
+    cp -a --no-preserve=ownership "${srcdir}/build/${_cranname}" "${pkgdir}/usr/lib/R/library"
 
     if [[ -f "${_cranname}/LICENSE" ]]; then
         install -Dm0644 "${_cranname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"