upgpkg: r-r5r 1.0.1-1

upstream release

2 files changed, 65 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 59f1fcd496af..f5c1e6600c4e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,31 +1,39 @@
 pkgbase = r-r5r
 	pkgdesc = Rapid Realistic Routing with ‘R5’
-	pkgver = 0.7.0
+	pkgver = 1.0.1
 	pkgrel = 1
 	url = https://cran.r-project.org/package=r5r
 	arch = any
 	license = MIT
-	depends = java-r5
-	depends = java-r5rcore
-	depends = r
+	checkdepends = r-covr
+	checkdepends = r-dplyr
+	checkdepends = r-ggplot2>=3.3.1
+	checkdepends = r-interp
+	checkdepends = r-knitr
+	checkdepends = r-patchwork
+	checkdepends = r-rmarkdown
+	checkdepends = r-testthat
 	depends = r-checkmate
 	depends = r-curl
 	depends = r-data.table
 	depends = r-httr
+	depends = r-jsonlite
 	depends = r-raster
-	depends = r-rjava
-	depends = r-sf
+	depends = r-rjava>=0.9.10
+	depends = r-sf>=1.0.6
 	depends = r-sfheaders
-	optdepends = r-akima
+	depends = r-zip
+	depends = r>=3.6
 	optdepends = r-covr
 	optdepends = r-dplyr
-	optdepends = r-ggplot2
+	optdepends = r-ggplot2>=3.3.1
+	optdepends = r-gtfstools
+	optdepends = r-h3jsr>=1.3.0
+	optdepends = r-interp
 	optdepends = r-knitr
-	optdepends = r-mapview
+	optdepends = r-patchwork
 	optdepends = r-rmarkdown
-	optdepends = r-rgdal
-	optdepends = r-testthat
-	source = https://cran.r-project.org/src/contrib/r5r_0.7.0.tar.gz
-	sha512sums = 506bdff1403dec41843fd8a2a53b78328898c42d3f048213e1f9009a93ef6b9df90dbf5d78a365cb8514df6825b86acf5d2aa65887603a769c73d5b5dff18679
+	source = https://cran.r-project.org/src/contrib/r5r_1.0.1.tar.gz
+	b2sums = 052f76d4ef0c0ef4a6e3aeeca361715e53dfea0b86394562e9acd7fdc066e442d2b12163d894293e96d1726dec2501259003b6f0be5a9f11690f26db05884460
 
 pkgname = r-r5r
diff --git a/PKGBUILD b/PKGBUILD
index 5f13dc790c68..e9e666f6ab80 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: peippo <christoph+aur@christophfink.com>
 
 _cranname=r5r
-_cranver=0.7.0
+_cranver=1.0.1
 pkgname=r-${_cranname,,}
 pkgdesc="Rapid Realistic Routing with ‘R5’"
 url="https://cran.r-project.org/package=r5r"
@@ -10,35 +10,57 @@ pkgver=${_cranver//[:-]/.}
 pkgrel=1
 
 arch=("any")
-depends=("java-r5" "java-r5rcore" "r" "r-checkmate" "r-curl" "r-data.table" "r-httr" "r-raster" "r-rjava" "r-sf" "r-sfheaders")
-optdepends=("r-akima" "r-covr" "r-dplyr" "r-ggplot2" "r-knitr" "r-mapview" "r-rmarkdown" "r-rgdal" "r-testthat")
-makedepends=()
+depends=(
+    "r-checkmate"
+    "r-curl"
+    "r-data.table"
+    "r-httr"
+    "r-jsonlite"
+    "r-raster"
+    "r-rjava>=0.9.10"
+    "r-sf>=1.0.6"
+    "r-sfheaders"
+    "r-zip"
+    "r>=3.6"
+)
+optdepends=(
+    "r-covr"
+    "r-dplyr"
+    "r-ggplot2>=3.3.1"
+    "r-gtfstools"
+    "r-h3jsr>=1.3.0"
+    "r-interp"
+    "r-knitr"
+    "r-patchwork"
+    "r-rmarkdown"
+)
+checkdepends=(
+    "r-covr"
+    "r-dplyr"
+    "r-ggplot2>=3.3.1"
+    "r-interp"
+    "r-knitr"
+    "r-patchwork"
+    "r-rmarkdown"
+    "r-testthat"
+)
 
 source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
-sha512sums=("506bdff1403dec41843fd8a2a53b78328898c42d3f048213e1f9009a93ef6b9df90dbf5d78a365cb8514df6825b86acf5d2aa65887603a769c73d5b5dff18679")
+b2sums=('052f76d4ef0c0ef4a6e3aeeca361715e53dfea0b86394562e9acd7fdc066e442d2b12163d894293e96d1726dec2501259003b6f0be5a9f11690f26db05884460')
 
 build() {
-    R CMD INSTALL ${_cranname}_${_cranver}.tar.gz -l "${srcdir}"
+    mkdir -p "${srcdir}/build/"
+    R CMD INSTALL ${_cranname}_${_cranver}.tar.gz -l "${srcdir}/build/"
+}
+
+check() {
+    cd "${srcdir}/${_cranname}/tests"
+    R_LIBS="${srcdir}/build/" Rscript --vanilla testthat.R
 }
 
 package() {
     install -dm0755 "${pkgdir}/usr/lib/R/library"
-    cp -a --no-preserve=ownership "${_cranname}" "${pkgdir}/usr/lib/R/library"
-
-    ln -sf \
-        /usr/share/java/java-r5rcore/java-r5rcore.jar \
-        "${pkgdir}/usr/lib/R/library/${_cranname}/jar/${_cranname}_${pkgver//./_}.jar"
-
-    ln -sf \
-        /usr/share/java/r5/r5-all.jar \
-        "${pkgdir}/usr/lib/R/library/${_cranname}/jar/r5-v6.4-all.jar"
-
-        # TODO: don’t hardcode these paths!
-
-        # ( this is going to be a bit of a pita:
-        #       1. check in ${srcdir}/.../download_r5.R what the default argument for `version` is
-        #       2. find the basename of the according url from the csv in ${srcdir}/.../int/extdata/metadata.csv
-        # tl;dr: not pretty in a PKGBUILD)
+    cp -a --no-preserve=ownership "${srcdir}/build/${_cranname}" "${pkgdir}/usr/lib/R/library"
 
     if [[ -f "${_cranname}/LICENSE" ]]; then
         install -Dm0644 "${_cranname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"