[lilac] updated to 1.16.0-2

2 files changed, 30 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 347c65778277..8a6a59d6e686 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,12 @@
 pkgbase = r-chetah
 	pkgdesc = Fast and accurate scRNA-seq cell type identification
 	pkgver = 1.16.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://bioconductor.org/packages/CHETAH
 	arch = any
-	license = custom
-	makedepends = git
-	depends = r
+	license = AGPL3
+	checkdepends = r-testthat
+	checkdepends = r-vdiffr
 	depends = r-biodist
 	depends = r-corrplot
 	depends = r-cowplot
@@ -20,11 +20,11 @@ pkgbase = r-chetah
 	depends = r-singlecellexperiment
 	depends = r-summarizedexperiment
 	optdepends = r-knitr
-	optdepends = r-matrix
 	optdepends = r-rmarkdown
 	optdepends = r-testthat
 	optdepends = r-vdiffr
-	source = git+https://git.bioconductor.org/packages/CHETAH
-	sha256sums = SKIP
+	source = https://bioconductor.org/packages/release/bioc/src/contrib/CHETAH_1.16.0.tar.gz
+	md5sums = 0312f98ec3d18db1839da7f6980cf4d6
+	sha256sums = f5e07c35a8f28513578d56bb2b1145933a47d56d8cd6c8c9135e1e143f530aa7
 
 pkgname = r-chetah
diff --git a/PKGBUILD b/PKGBUILD
index 8491eb7fd336..23e392ae0c88 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,16 +1,16 @@
-# Maintainer: Guoyi Zhang <guoyizhang at malacology dot net>
+# Maintainer: Pekka Ristola <pekkarr [at] protonmail [dot] com>
+# Contributor: Guoyi Zhang <guoyizhang at malacology dot net>
 
 _pkgname=CHETAH
 _pkgver=1.16.0
 pkgname=r-${_pkgname,,}
-pkgver=1.16.0
-pkgrel=1
-pkgdesc='Fast and accurate scRNA-seq cell type identification'
-arch=('any')
+pkgver=${_pkgver//-/.}
+pkgrel=2
+pkgdesc="Fast and accurate scRNA-seq cell type identification"
+arch=(any)
 url="https://bioconductor.org/packages/${_pkgname}"
-license=('custom')
+license=(AGPL3)
 depends=(
-  r
   r-biodist
   r-corrplot
   r-cowplot
@@ -24,27 +24,31 @@ depends=(
   r-singlecellexperiment
   r-summarizedexperiment
 )
+checkdepends=(
+  r-testthat
+  r-vdiffr
+)
 optdepends=(
   r-knitr
-  r-matrix
   r-rmarkdown
   r-testthat
   r-vdiffr
 )
-makedepends=(
-  git
-)
-source=("git+https://git.bioconductor.org/packages/${_pkgname}")
-sha256sums=('SKIP')
+source=("https://bioconductor.org/packages/release/bioc/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
+md5sums=('0312f98ec3d18db1839da7f6980cf4d6')
+sha256sums=('f5e07c35a8f28513578d56bb2b1145933a47d56d8cd6c8c9135e1e143f530aa7')
 
 build() {
-  tar -zcvf ${_pkgname}_${_pkgver}.tar.gz  ${_pkgname}
-  R CMD INSTALL ${_pkgname}_${_pkgver}.tar.gz -l "${srcdir}"
+  mkdir -p build
+  R CMD INSTALL "$_pkgname" -l build
+}
+
+check() {
+  cd "$_pkgname/tests"
+  R_LIBS="$srcdir/build" NOT_CRAN=true Rscript --vanilla testthat.R
 }
 
 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"
 }
-# vim:set ts=2 sw=2 et: