[lilac] updated to 1.60.0-2

2 files changed, 28 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6a54b21a0092..813452e02715 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,20 @@
 pkgbase = r-hilbertvisgui
 	pkgdesc = HilbertVisGUI
 	pkgver = 1.60.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://bioconductor.org/packages/HilbertVisGUI
 	arch = x86_64
-	license = GPL
-	depends = r
-	depends = r-hilbertvis
+	license = GPL-3.0-or-later
+	depends = atkmm
+	depends = glibmm
+	depends = gtk2
 	depends = gtkmm
+	depends = libsigc++
+	depends = pangomm
+	depends = r-hilbertvis
 	optdepends = r-iranges
-	optdepends = r-lattice
 	source = https://bioconductor.org/packages/release/bioc/src/contrib/HilbertVisGUI_1.60.0.tar.gz
-	sha256sums = 8295dfdff3c658b56c39cbd732255e0770016457aec83acce13df51e37f13224
+	md5sums = e9e6a2cce82ff0dfcf0828ae7d123537
+	b2sums = cafe62163b23afa93b138788e4a0b91c0af1fb338822beb27e64176944fb2efd3c1882a15ff97a36290a54c1cf3884dda399196bf11018923eb1d56f89b90854
 
 pkgname = r-hilbertvisgui
diff --git a/PKGBUILD b/PKGBUILD
index e175a5b38bba..b87c6b4e8624 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,36 @@
-# system requirements: gtkmm-2.4, GNU make
 # Maintainer: Guoyi Zhang <guoyizhang at malacology dot net>
 
 _pkgname=HilbertVisGUI
 _pkgver=1.60.0
 pkgname=r-${_pkgname,,}
-pkgver=1.60.0
-pkgrel=1
-pkgdesc='HilbertVisGUI'
-arch=('x86_64')
-url="https://bioconductor.org/packages/${_pkgname}"
-license=('GPL')
+pkgver=${_pkgver//-/.}
+pkgrel=2
+pkgdesc="HilbertVisGUI"
+arch=(x86_64)
+url="https://bioconductor.org/packages/$_pkgname"
+license=('GPL-3.0-or-later')
 depends=(
-  r
-  r-hilbertvis
+  atkmm
+  glibmm
+  gtk2
   gtkmm
+  libsigc++
+  pangomm
+  r-hilbertvis
 )
 optdepends=(
   r-iranges
-  r-lattice
 )
 source=("https://bioconductor.org/packages/release/bioc/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
-sha256sums=('8295dfdff3c658b56c39cbd732255e0770016457aec83acce13df51e37f13224')
+md5sums=('e9e6a2cce82ff0dfcf0828ae7d123537')
+b2sums=('cafe62163b23afa93b138788e4a0b91c0af1fb338822beb27e64176944fb2efd3c1882a15ff97a36290a54c1cf3884dda399196bf11018923eb1d56f89b90854')
 
 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: