[lilac] updated to 1.84.0-2

2 files changed, 32 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2a3ef954f9d5..311e4e4540c1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,27 @@
 pkgbase = r-genefilter
-	pkgdesc = genefilter: methods for filtering genes from high-throughput experiments
+	pkgdesc = methods for filtering genes from high-throughput experiments
 	pkgver = 1.84.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://bioconductor.org/packages/genefilter
 	arch = x86_64
-	license = Artistic2.0
+	license = Artistic-2.0
 	makedepends = gcc-fortran
-	depends = r
 	depends = r-annotate
 	depends = r-annotationdbi
 	depends = r-biobase
 	depends = r-matrixgenerics
 	optdepends = r-all
 	optdepends = r-biocstyle
-	optdepends = r-class
 	optdepends = r-hgu95av2.db
 	optdepends = r-knitr
 	optdepends = r-rcolorbrewer
 	optdepends = r-roc
 	optdepends = r-tkwidgets
 	source = https://bioconductor.org/packages/release/bioc/src/contrib/genefilter_1.84.0.tar.gz
-	sha256sums = 5c629c6477b77177e423b76a8d49ffc5415df7ef7894958c97e18f260efa0061
+	source = genefilter-fix-format.patch::https://github.com/Bioconductor/genefilter/pull/13.patch
+	md5sums = 15011d1662a58967aeb3e89f1f660e40
+	md5sums = f192fbd037f307740c07f4131aecfcfb
+	b2sums = fb1c5d61c75424a5feba2edfcd8fee6b4f224097d9353425f9d533bd323a9e8c6a6f48b67252b6570e308966ca0fa55eeef9a992d181adefa6703eeca9983404
+	b2sums = 0b0bf3818c026825f3cf007d566a32404553b4363e2671f14c3465ee3168ef71d8939811d93cd4c0d0c3158decaf5e47f63593f36afb793de183ef7713d8c230
 
 pkgname = r-genefilter
diff --git a/PKGBUILD b/PKGBUILD
index a6f2681c427b..4f2fe731f289 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,41 +3,48 @@
 _pkgname=genefilter
 _pkgver=1.84.0
 pkgname=r-${_pkgname,,}
-pkgver=1.84.0
-pkgrel=1
-pkgdesc='genefilter: methods for filtering genes from high-throughput experiments'
-arch=('x86_64')
-url="https://bioconductor.org/packages/${_pkgname}"
-license=('Artistic2.0')
+pkgver=${_pkgver//-/.}
+pkgrel=2
+pkgdesc="methods for filtering genes from high-throughput experiments"
+arch=(x86_64)
+url="https://bioconductor.org/packages/$_pkgname"
+license=('Artistic-2.0')
 depends=(
-  r
   r-annotate
   r-annotationdbi
   r-biobase
   r-matrixgenerics
 )
+makedepends=(
+  gcc-fortran
+)
 optdepends=(
   r-all
   r-biocstyle
-  r-class
   r-hgu95av2.db
   r-knitr
   r-rcolorbrewer
   r-roc
   r-tkwidgets
 )
-makedepends=(
-  gcc-fortran
-)
-source=("https://bioconductor.org/packages/release/bioc/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
-sha256sums=('5c629c6477b77177e423b76a8d49ffc5415df7ef7894958c97e18f260efa0061')
+source=("https://bioconductor.org/packages/release/bioc/src/contrib/${_pkgname}_${_pkgver}.tar.gz"
+        "$_pkgname-fix-format.patch::https://github.com/Bioconductor/genefilter/pull/13.patch")
+md5sums=('15011d1662a58967aeb3e89f1f660e40'
+         'f192fbd037f307740c07f4131aecfcfb')
+b2sums=('fb1c5d61c75424a5feba2edfcd8fee6b4f224097d9353425f9d533bd323a9e8c6a6f48b67252b6570e308966ca0fa55eeef9a992d181adefa6703eeca9983404'
+        '0b0bf3818c026825f3cf007d566a32404553b4363e2671f14c3465ee3168ef71d8939811d93cd4c0d0c3158decaf5e47f63593f36afb793de183ef7713d8c230')
+
+prepare() {
+  # fix format string errors
+  patch -Np1 -d "$_pkgname" < "$_pkgname-fix-format.patch"
+}
 
 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: