[lilac] updated to 0.15.0-2

2 files changed, 107 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7f76e4d5b4c7..796b2a68b793 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,45 +1,55 @@
 pkgbase = r-metr
 	pkgdesc = Tools for Easier Analysis of Meteorological Fields
-	pkgver = 0.14.1
-	pkgrel = 1
+	pkgver = 0.15.0
+	pkgrel = 2
 	url = https://cran.r-project.org/package=metR
 	arch = any
-	license = GPL3
-	depends = r>=2.10
+	license = GPL-3.0-only
+	checkdepends = r-curl
+	checkdepends = r-gsignal
+	checkdepends = r-maps
+	checkdepends = r-ncdf4
+	checkdepends = r-pcict
+	checkdepends = r-reshape2
+	checkdepends = r-terra
+	checkdepends = r-testthat
+	checkdepends = r-vdiffr
 	depends = r-checkmate
 	depends = r-data.table
 	depends = r-digest
 	depends = r-formula
 	depends = r-formula.tools
-	depends = r-ggplot2>=3.0.0
+	depends = r-ggplot2
 	depends = r-gtable
+	depends = r-isoband
+	depends = r-lubridate
 	depends = r-memoise
 	depends = r-plyr
+	depends = r-purrr
 	depends = r-scales
 	depends = r-sf
 	depends = r-stringr
-	depends = r-purrr
-	depends = r-isoband
-	depends = r-lubridate
-	optdepends = r-maps
 	optdepends = r-covr
+	optdepends = r-gridextra
+	optdepends = r-gsignal
+	optdepends = r-here
 	optdepends = r-irlba
 	optdepends = r-knitr
+	optdepends = r-kriging
+	optdepends = r-maps
+	optdepends = r-markdown
 	optdepends = r-ncdf4
-	optdepends = r-pkgdown
-	optdepends = r-reshape2
-	optdepends = r-rmarkdown
-	optdepends = r-testthat>=2.1.0
-	optdepends = r-viridis
 	optdepends = r-pcict
-	optdepends = r-gridextra
-	optdepends = r-vdiffr
+	optdepends = r-pkgdown
 	optdepends = r-proj4
-	optdepends = r-kriging
+	optdepends = r-reshape2
+	optdepends = r-rnaturalearth
 	optdepends = r-terra
-	optdepends = r-here
-	optdepends = r-gsignal
-	source = https://cran.r-project.org/src/contrib/metR_0.14.1.tar.gz
-	sha512sums = 71ea2a337e0093c170e6f3aed2dd329ea783b2013fb350711640f4213371cf0727e809577c2e2238c98385518f29d8546c142ac40e2505e098eb10a6229d5d6f
+	optdepends = r-testthat
+	optdepends = r-vdiffr
+	optdepends = r-viridis
+	source = https://cran.r-project.org/src/contrib/metR_0.15.0.tar.gz
+	md5sums = 290d04139ae420099542606da5aff873
+	b2sums = 60d43e8400d35631bde9f924d7947858f62855d402616fe01a1bf56ef62ee7bfe99196c2fcb1817bbfc230248e1139300ff0843a70415daee2cd7e525f182031
 
 pkgname = r-metr
diff --git a/PKGBUILD b/PKGBUILD
index 158ee5afe6e3..7d0112f90365 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,86 @@
-# Maintainer: Carlos Aznarán <caznaranl@uni.pe>
+# Maintainer: Pekka Ristola <pekkarr [at] protonmail [dot] com>
+# Contributor: Guoyi Zhang <guoyizhang at malacology dot net>
+# Contributor: Carlos Aznarán <caznaranl@uni.pe>
 # Contributor: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
 
-_cranname=metR
-_cranver=0.14.1
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=1
+_pkgname=metR
+_pkgver=0.15.0
+pkgname=r-${_pkgname,,}
+pkgver=${_pkgver//-/.}
+pkgrel=2
 pkgdesc="Tools for Easier Analysis of Meteorological Fields"
 arch=(any)
-url="https://cran.r-project.org/package=${_cranname}"
-license=(GPL3)
-depends=('r>=2.10' r-checkmate r-data.table r-digest r-formula r-formula.tools 'r-ggplot2>=3.0.0' r-gtable r-memoise r-plyr r-scales r-sf r-stringr r-purrr r-isoband r-lubridate)
-optdepends=(r-maps r-covr r-irlba r-knitr r-ncdf4 r-pkgdown r-reshape2 r-rmarkdown 'r-testthat>=2.1.0' r-viridis r-pcict r-gridextra r-vdiffr r-proj4 r-kriging r-terra r-here r-gsignal)
-source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
-sha512sums=('71ea2a337e0093c170e6f3aed2dd329ea783b2013fb350711640f4213371cf0727e809577c2e2238c98385518f29d8546c142ac40e2505e098eb10a6229d5d6f')
+url="https://cran.r-project.org/package=$_pkgname"
+license=('GPL-3.0-only')
+depends=(
+  r-checkmate
+  r-data.table
+  r-digest
+  r-formula
+  r-formula.tools
+  r-ggplot2
+  r-gtable
+  r-isoband
+  r-lubridate
+  r-memoise
+  r-plyr
+  r-purrr
+  r-scales
+  r-sf
+  r-stringr
+)
+checkdepends=(
+  r-curl
+  r-gsignal
+  r-maps
+  r-ncdf4
+  r-pcict
+  r-reshape2
+  r-terra
+  r-testthat
+  r-vdiffr
+)
+optdepends=(
+  r-covr
+  r-gridextra
+  r-gsignal
+  r-here
+  r-irlba
+  r-knitr
+  r-kriging
+  r-maps
+  r-markdown
+  r-ncdf4
+  r-pcict
+  r-pkgdown
+  r-proj4
+  r-reshape2
+  r-rnaturalearth
+  r-terra
+  r-testthat
+  r-vdiffr
+  r-viridis
+)
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
+md5sums=('290d04139ae420099542606da5aff873')
+b2sums=('60d43e8400d35631bde9f924d7947858f62855d402616fe01a1bf56ef62ee7bfe99196c2fcb1817bbfc230248e1139300ff0843a70415daee2cd7e525f182031')
+
+prepare() {
+  # skip failing test
+  sed -i '/"can use differnet engine"/a\ \ \ \ skip("fails")' "$_pkgname/tests/testthat/test-eof.R"
+}
 
 build() {
-  R CMD INSTALL ${_cranname}_${_cranver}.tar.gz -l "${srcdir}"
+  mkdir build
+  R CMD INSTALL -l build "$_pkgname"
 }
 
-package() {
-  install -dm0755 "${pkgdir}/usr/lib/R/library"
+check() {
+  cd "$_pkgname/tests"
+  R_LIBS="$srcdir/build" NOT_CRAN=true Rscript --vanilla testthat.R
+}
 
-  cp -a --no-preserve=ownership "${_cranname}" "${pkgdir}/usr/lib/R/library"
+package() {
+  install -d "$pkgdir/usr/lib/R/library"
+  cp -a --no-preserve=ownership "build/$_pkgname" "$pkgdir/usr/lib/R/library"
 }