[lilac] updated to 1.5.18-1

2 files changed, 26 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3d53c5635ada..ab3aa7bbe3e2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
 pkgbase = r-geosphere
 	pkgdesc = Spherical Trigonometry
-	pkgver = 1.5.14
+	pkgver = 1.5.18
 	pkgrel = 1
 	url = https://cran.r-project.org/package=geosphere
-	arch = i686
 	arch = x86_64
 	license = GPL3
-	depends = r>=3.0.0
+	depends = r-rcpp
 	depends = r-sp
 	optdepends = r-raster
-	source = https://cran.r-project.org/src/contrib/geosphere_1.5-14.tar.gz
-	sha256sums = f2c3a4ae1c87c86c123d48f134721c809fb33675cb5cd0959080049eabdbe42d
+	source = https://cran.r-project.org/src/contrib/geosphere_1.5-18.tar.gz
+	md5sums = 46dd202b43575a2e12a2bf93723dbddf
+	sha256sums = 99ff6ff050cc8c2d565b6bb1488607fc7950a6d448930f8d9642eccefbc6dac0
 
 pkgname = r-geosphere
diff --git a/PKGBUILD b/PKGBUILD
index 16eec4a3e998..a3edc57d2f4c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,33 @@
+# Maintainer: Pekka Ristola <pekkarr [at] protonmail [dot] com>
 # Contributor: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
 # Contributor: Jooa <aur at (name) dot xyz>
 
-_cranname=geosphere
-_cranver=1.5-14
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
+_pkgname=geosphere
+_pkgver=1.5-18
+pkgname=r-${_pkgname,,}
+pkgver=${_pkgver//-/.}
 pkgrel=1
 pkgdesc="Spherical Trigonometry"
-arch=(i686 x86_64)
-url="https://cran.r-project.org/package=${_cranname}"
+arch=(x86_64)
+url="https://cran.r-project.org/package=${_pkgname}"
 license=(GPL3)
-depends=('r>=3.0.0' r-sp)
-optdepends=(r-raster)
-source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
-sha256sums=('f2c3a4ae1c87c86c123d48f134721c809fb33675cb5cd0959080049eabdbe42d')
+depends=(
+  r-rcpp
+  r-sp
+)
+optdepends=(
+  r-raster
+)
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
+md5sums=('46dd202b43575a2e12a2bf93723dbddf')
+sha256sums=('99ff6ff050cc8c2d565b6bb1488607fc7950a6d448930f8d9642eccefbc6dac0')
 
 build() {
-  R CMD INSTALL ${_cranname}_${_cranver}.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 "${_cranname}" "${pkgdir}/usr/lib/R/library"
+  install -d "$pkgdir/usr/lib/R/library"
+  cp -a --no-preserve=ownership "build/$_pkgname" "$pkgdir/usr/lib/R/library"
 }