fix package format and bump version

2 files changed, 37 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 734a0e27a48f..70f54ff05b2e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,21 @@
 pkgbase = r-biocmanager
-	pkgdesc = BiocManager: Access the Bioconductor Project Package Repository
-	pkgver = 1.30.10
+	pkgdesc = A convenient tool to install and update Bioconductor packages.
+	pkgver = 1.30.12
 	pkgrel = 1
-	url = https://bioconductor.org/packages/release/bioc/html/BiocManager.html
+	url = https://CRAN.R-project.org/package=BiocManager=BiocManager
 	arch = x86_64
-	license = Artistic-2.0
+	license = Artistic2.0
 	depends = r
-	depends = r-knitr
-	depends = r-curl
-	depends = r-withr
-	depends = r-testthat
 	depends = r-remotes
-	optdepends = r-biocstyle
+	depends = r-testthat
+	depends = r-withr
+	depends = r-curl
 	optdepends = r-biocversion
-	source = https://cran.r-project.org/src/contrib/BiocManager_1.30.10.tar.gz
-	sha256sums = f3b7a412b42be0ab8df5fcd9bf981876ba9e5c55bc5faaca7af7ede3b6d0c90e
+	optdepends = r-rmarkdown
+	optdepends = r-knitr
+	noextract = r-biocmanager-1.30.12.tar.gz
+	source = r-biocmanager-1.30.12.tar.gz::https://cran.r-project.org/src/contrib/BiocManager_1.30.12.tar.gz
+	sha256sums = c36108c1d1f3bee1c7ac513714f0c5a75c8417f39b0d69553583dd00d4b74a30
 
 pkgname = r-biocmanager
 
diff --git a/PKGBUILD b/PKGBUILD
index 29aa850746f3..c513067a71f7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,35 @@
 # Maintainer: Grey Christoforo <first name at last name dot net>
 
-_bcname=BiocManager
-_bcver=1.30.10
-pkgname=r-${_bcname,,}
-pkgver=${_bcver//[:-]/.}
+_cranname=BiocManager
+_cranver=1.30.12
+pkgname=r-${_cranname,,}
+pkgver=${_cranver//[:-]/.}
 pkgrel=1
-pkgdesc="BiocManager: Access the Bioconductor Project Package Repository"
+pkgdesc="A convenient tool to install and update Bioconductor packages."
 arch=(x86_64)
-url="https://bioconductor.org/packages/release/bioc/html/${_bcname}.html"
-license=(Artistic-2.0)
-depends=(r r-knitr r-curl r-withr r-testthat r-remotes)
-optdepends=(r-biocstyle r-biocversion)
-source=("https://cran.r-project.org/src/contrib/${_bcname}_${_bcver}.tar.gz")
-sha256sums=('f3b7a412b42be0ab8df5fcd9bf981876ba9e5c55bc5faaca7af7ede3b6d0c90e')
+url="https://CRAN.R-project.org/package=BiocManager=${_cranname}"
+license=('Artistic2.0')
+depends=(
+r
+r-remotes
+r-testthat
+r-withr
+r-curl
+)
+optdepends=(
+r-biocversion
+r-rmarkdown
+r-knitr
+)
+source=("${pkgname}-${pkgver}.tar.gz::https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
+sha256sums=('c36108c1d1f3bee1c7ac513714f0c5a75c8417f39b0d69553583dd00d4b74a30')
+noextract=(${pkgname}-${pkgver}.tar.gz)
 
-build(){
-  cd "${srcdir}"
-
-  R CMD INSTALL ${_bcname}_${_bcver}.tar.gz -l ${srcdir}
+build() {
+  R CMD INSTALL ${pkgname}-${pkgver}.tar.gz -l "${srcdir}"
 }
 
 package() {
-  cd "${srcdir}"
-
   install -dm0755 "${pkgdir}/usr/lib/R/library"
-  cp -a --no-preserve=ownership "${_bcname}" "${pkgdir}/usr/lib/R/library"
+  cp -a --no-preserve=ownership "${_cranname}" "${pkgdir}/usr/lib/R/library"
 }
-