[lilac] updated to 2.1.2-2

2 files changed, 41 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c1d4994cc0f2..993ea34b8eac 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,21 @@
 pkgbase = r-sp
 	pkgdesc = Classes and Methods for Spatial Data
 	pkgver = 2.1.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://cran.r-project.org/package=sp
-	arch = i686
 	arch = x86_64
-	license = GPL2
-	license = GPL3
-	depends = r>=3.2.0
-	optdepends = r-rcolorbrewer
-	optdepends = r-rgdal
-	optdepends = r-rgeos
-	optdepends = r-gstat
-	optdepends = r-maptools
+	license = GPL
+	depends = r
 	optdepends = r-deldir
+	optdepends = r-gstat
 	optdepends = r-knitr
+	optdepends = r-raster
+	optdepends = r-rcolorbrewer
 	optdepends = r-rmarkdown
+	optdepends = r-sf
+	optdepends = r-terra
 	source = https://cran.r-project.org/src/contrib/sp_2.1-2.tar.gz
+	md5sums = b06218c0fc28bc70fafcd40fd60cfd08
 	sha256sums = bfdbb4a62f9fe0c554f88c75af6f214dc9a550da09bd3aefe1115ac6963e0dc5
 
 pkgname = r-sp
diff --git a/PKGBUILD b/PKGBUILD
index f061fc6c9a77..951f9a833af8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,40 @@
-_cranname=sp
-_cranver=2.1-2
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=1
+# Maintainer: Pekka Ristola <pekkarr [at] protonmail [dot] com>
+# Contributor: Guoyi Zhang <guoyizhang at malacology dot net>
+# Contributor: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
+# Contributor: Jooa <aur at (name) dot xyz>
+
+_pkgname=sp
+_pkgver=2.1-2
+pkgname=r-${_pkgname,,}
+pkgver=${_pkgver//-/.}
+pkgrel=2
 pkgdesc="Classes and Methods for Spatial Data"
-arch=(i686 x86_64)
-url="https://cran.r-project.org/package=${_cranname}"
-license=(GPL2 GPL3)
-depends=('r>=3.2.0')
-optdepends=(r-rcolorbrewer r-rgdal r-rgeos r-gstat r-maptools r-deldir r-knitr r-rmarkdown)
-source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
+arch=(x86_64)
+url="https://cran.r-project.org/package=${_pkgname}"
+license=(GPL)
+depends=(
+  r
+)
+optdepends=(
+  r-deldir
+  r-gstat
+  r-knitr
+  r-raster
+  r-rcolorbrewer
+  r-rmarkdown
+  r-sf
+  r-terra
+)
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
+md5sums=('b06218c0fc28bc70fafcd40fd60cfd08')
 sha256sums=('bfdbb4a62f9fe0c554f88c75af6f214dc9a550da09bd3aefe1115ac6963e0dc5')
 
 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"
 }