[lilac] updated to 1.38-2

2 files changed, 23 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8df285ebf6fd..fd84d211b621 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,17 @@
 pkgbase = r-desolve
 	pkgdesc = Solvers for Initial Value Problems of Differential Equations ('ODE', 'DAE', 'DDE')
-	pkgver = 1.37
-	pkgrel = 1
+	pkgver = 1.38
+	pkgrel = 2
 	url = https://cran.r-project.org/package=deSolve
 	arch = x86_64
 	license = GPL
 	makedepends = gcc-fortran
+	depends = blas
 	depends = r
 	optdepends = r-fme
 	optdepends = r-scatterplot3d
-	source = https://cran.r-project.org/src/contrib/deSolve_1.37.tar.gz
-	sha256sums = c1fa61c2c61d327733ac62a23b2c605a8ff28602540c510c2e8fa49e01a39fb3
+	source = https://cran.r-project.org/src/contrib/deSolve_1.38.tar.gz
+	md5sums = 408826378a07259725f6ad13b71be4c5
+	sha256sums = a0b4fe5c46ae560a3f36eb31e474b08ed85a928e86ae52dd59457409de188969
 
 pkgname = r-desolve
diff --git a/PKGBUILD b/PKGBUILD
index 23fe1ee7fa88..0a4ee90fbf11 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,39 @@
-# Maintainer: Guoyi Zhang <guoyizhang at malacology dot net>
+# Maintainer: Pekka Ristola <pekkarr [at] protonmail [dot] com>
+# Contributor: Guoyi Zhang <guoyizhang at malacology dot net>
 # Contributor: Robert Greener <me@r0bert.dev>
 # Contributor: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
 # Contributor: Grey Christoforo <first name at last name dot net>
 
 _pkgname=deSolve
-_pkgver=1.37
+_pkgver=1.38
 pkgname=r-${_pkgname,,}
-pkgver=1.37
-pkgrel=1
+pkgver=${_pkgver//-/.}
+pkgrel=2
 pkgdesc="Solvers for Initial Value Problems of Differential Equations ('ODE', 'DAE', 'DDE')"
-arch=('x86_64')
+arch=(x86_64)
 url="https://cran.r-project.org/package=${_pkgname}"
-license=('GPL')
+license=(GPL)
 depends=(
+  blas
   r
 )
+makedepends=(
+  gcc-fortran
+)
 optdepends=(
   r-fme
   r-scatterplot3d
 )
-makedepends=(
-  gcc-fortran
-)
 source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
-sha256sums=('c1fa61c2c61d327733ac62a23b2c605a8ff28602540c510c2e8fa49e01a39fb3')
+md5sums=('408826378a07259725f6ad13b71be4c5')
+sha256sums=('a0b4fe5c46ae560a3f36eb31e474b08ed85a928e86ae52dd59457409de188969')
 
 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: