[lilac] updated to 1.8-1

2 files changed, 22 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d4e713c6bfd2..b009c09c916d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,16 @@
 pkgbase = r-gunifrac
 	pkgdesc = Generalized UniFrac Distances, Distance-Based Multivariate Methods and Feature-Based Univariate Methods for Microbiome Data Analysis
-	pkgver = 1.7
-	pkgrel = 3
+	pkgver = 1.8
+	pkgrel = 1
 	url = https://cran.r-project.org/package=GUniFrac
 	arch = x86_64
-	license = GPL
-	depends = r
+	license = GPL3
 	depends = r-ape
 	depends = r-dirmult
 	depends = r-foreach
 	depends = r-ggplot2
 	depends = r-ggrepel
+	depends = r-inline
 	depends = r-matrixstats
 	depends = r-modeest
 	depends = r-rcpp
@@ -21,7 +21,8 @@ pkgbase = r-gunifrac
 	optdepends = r-ggpubr
 	optdepends = r-knitr
 	optdepends = r-markdown
-	source = https://cran.r-project.org/src/contrib/GUniFrac_1.7.tar.gz
-	sha256sums = 770b34dda757d7412592d78eb385e36320b870a4a3a748512fd7d499b82b0b8f
+	source = https://cran.r-project.org/src/contrib/GUniFrac_1.8.tar.gz
+	md5sums = 5117c6e23fa9da45978808b23144bba3
+	sha256sums = aea41a3f94fe1fff4f4284f786a43f90bfd4f7f3c9db067c17c6e8b3206a80fb
 
 pkgname = r-gunifrac
diff --git a/PKGBUILD b/PKGBUILD
index 59e1a3b0e4b7..d89df64539c4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,22 @@
-# 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=GUniFrac
-_pkgver=1.7
+_pkgver=1.8
 pkgname=r-${_pkgname,,}
-pkgver=1.7
-pkgrel=3
-pkgdesc='Generalized UniFrac Distances, Distance-Based Multivariate Methods and Feature-Based Univariate Methods for Microbiome Data Analysis'
-arch=('x86_64')
+pkgver=${_pkgver//-/.}
+pkgrel=1
+pkgdesc="Generalized UniFrac Distances, Distance-Based Multivariate Methods and Feature-Based Univariate Methods for Microbiome Data Analysis"
+arch=(x86_64)
 url="https://cran.r-project.org/package=${_pkgname}"
-license=('GPL')
+license=(GPL3)
 depends=(
-  r
   r-ape
   r-dirmult
   r-foreach
   r-ggplot2
   r-ggrepel
+  r-inline
   r-matrixstats
   r-modeest
   r-rcpp
@@ -30,14 +31,15 @@ optdepends=(
   r-markdown
 )
 source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
-sha256sums=('770b34dda757d7412592d78eb385e36320b870a4a3a748512fd7d499b82b0b8f')
+md5sums=('5117c6e23fa9da45978808b23144bba3')
+sha256sums=('aea41a3f94fe1fff4f4284f786a43f90bfd4f7f3c9db067c17c6e8b3206a80fb')
 
 build() {
-  R CMD INSTALL ${_pkgname}_${_pkgver}.tar.gz -l "${srcdir}"
+  mkdir -p build
+  R CMD INSTALL "$_pkgname" -l build
 }
 
 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: