update r-desolve

2 files changed, 30 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0f6c8040e7c0..42cca4cdf6c6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,15 @@
 pkgbase = r-desolve
 	pkgdesc = Solvers for Initial Value Problems of Differential Equations ('ODE', 'DAE', 'DDE')
-	pkgver = 1.32
+	pkgver = 1.33
 	pkgrel = 1
 	url = https://cran.r-project.org/package=deSolve
-	arch = i686
 	arch = x86_64
-	license = GPL2
-	license = GPL3
+	license = GPL
 	makedepends = gcc-fortran
-	depends = r>=4.0.0
-	optdepends = r-scatterplot3d
+	depends = r
 	optdepends = r-fme
-	source = https://cran.r-project.org/src/contrib/deSolve_1.32.tar.gz
-	sha512sums = 9d1f1f73dc25670b21bfb789dacab2d95470a317aaa2ab0ecbc85bdd302aab4d07c504b140e2de4e6b8fa4a6fe368f33716a7c66eb0c01415b95e919f93fa22d
+	optdepends = r-scatterplot3d
+	source = https://cran.r-project.org/src/contrib/deSolve_1.33.tar.gz
+	sha256sums = 71de979e05ce7e472308ac5218e97efe976051364ba579b10940dc1fe4c8b684
 
 pkgname = r-desolve
diff --git a/PKGBUILD b/PKGBUILD
index f061d8842b94..fffd45fb7e4c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,35 @@
-# Maintainer: Robert Greener <me@r0bert.dev>
+# Maintainer: 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>
-
-_cranname=deSolve
-_cranver=1.32
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
+_pkgname=deSolve
+_pkgver=1.33
+pkgname=r-${_pkgname,,}
+pkgver=1.33
 pkgrel=1
 pkgdesc="Solvers for Initial Value Problems of Differential Equations ('ODE', 'DAE', 'DDE')"
-arch=(i686 x86_64)
-url="https://cran.r-project.org/package=${_cranname}"
-license=(GPL2 GPL3)
-depends=('r>=4.0.0')
-makedepends=(gcc-fortran)
-optdepends=(r-scatterplot3d r-fme)
-source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
-sha512sums=("9d1f1f73dc25670b21bfb789dacab2d95470a317aaa2ab0ecbc85bdd302aab4d07c504b140e2de4e6b8fa4a6fe368f33716a7c66eb0c01415b95e919f93fa22d")
+arch=('x86_64')
+url="https://cran.r-project.org/package=${_pkgname}"
+license=('GPL')
+depends=(
+  r
+)
+optdepends=(
+  r-fme
+  r-scatterplot3d
+)
+makedepends=(
+  gcc-fortran
+)
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
+sha256sums=('71de979e05ce7e472308ac5218e97efe976051364ba579b10940dc1fe4c8b684')
 
 build() {
-  R CMD INSTALL ${_cranname}_${_cranver}.tar.gz -l "${srcdir}"
+  R CMD INSTALL ${_pkgname}_${_pkgver}.tar.gz -l "${srcdir}"
 }
 
 package() {
   install -dm0755 "${pkgdir}/usr/lib/R/library"
-
-  cp -a --no-preserve=ownership "${_cranname}" "${pkgdir}/usr/lib/R/library"
+  cp -a --no-preserve=ownership "${_pkgname}" "${pkgdir}/usr/lib/R/library"
 }
+# vim:set ts=2 sw=2 et: