Add check() function and devendor hopscotch-map

3 files changed, 34 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c9e6f57819af..39d4e7f9bf01 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,18 @@
 pkgbase = r-fastmap
 	pkgdesc = Fast Data Structures
 	pkgver = 1.1.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://cran.r-project.org/package=fastmap
 	arch = i686
 	arch = x86_64
 	license = MIT
+	checkdepends = r-testthat
+	makedepends = hopscotch-map
 	depends = r
 	optdepends = r-testthat
 	source = https://cran.r-project.org/src/contrib/fastmap_1.1.0.tar.gz
+	source = R-MIT-TEMPLATE::https://cran.r-project.org/web/licenses/MIT
 	sha256sums = 9113e526b4c096302cfeae660a06de2c4c82ae4e2d3d6ef53af6de812d4c822b
+	sha256sums = e76e4aad5d3d9d606db6f8c460311b6424ebadfce13f5322e9bae9d49cc6090b
 
 pkgname = r-fastmap
-
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..018a3de08144
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*
+!PKGBUILD
+!.SRCINFO
+!.gitignore
diff --git a/PKGBUILD b/PKGBUILD
index c9155aa6590f..d4264386bb56 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,44 @@
-# Maintainer: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
+# Maintainer: Pekka Ristola <pekkarr [at] protonmail [dot] com>
+# Contributor: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
 
 _cranname=fastmap
 _cranver=1.1.0
 pkgname=r-${_cranname,,}
 pkgver=${_cranver//[:-]/.}
-pkgrel=1
+pkgrel=2
 pkgdesc="Fast Data Structures"
 arch=(i686 x86_64)
 url="https://cran.r-project.org/package=${_cranname}"
 license=(MIT)
 depends=(r)
+makedepends=(hopscotch-map)
+checkdepends=(r-testthat)
 optdepends=(r-testthat)
-source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
-sha256sums=('9113e526b4c096302cfeae660a06de2c4c82ae4e2d3d6ef53af6de812d4c822b')
+source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz"
+        "R-MIT-TEMPLATE::https://cran.r-project.org/web/licenses/MIT")
+sha256sums=('9113e526b4c096302cfeae660a06de2c4c82ae4e2d3d6ef53af6de812d4c822b'
+            'e76e4aad5d3d9d606db6f8c460311b6424ebadfce13f5322e9bae9d49cc6090b')
+
+prepare() {
+  # Use system hopscotch_map
+  sed -i '/PKG_CPPFLAGS=-Ilib/d' "${_cranname}/src/Makevars"
+}
 
 build() {
-  R CMD INSTALL ${_cranname}_${_cranver}.tar.gz -l "${srcdir}"
+  mkdir -p build
+  R CMD INSTALL "${_cranname}" -l "${srcdir}/build"
+}
+
+check() {
+  cd "${_cranname}/tests"
+  R_LIBS="${srcdir}/build" NOT_CRAN=true Rscript --vanilla testthat.R
 }
 
 package() {
   install -dm0755 "${pkgdir}/usr/lib/R/library"
 
-  cp -a --no-preserve=ownership "${_cranname}" "${pkgdir}/usr/lib/R/library"
+  cp -a --no-preserve=ownership "build/${_cranname}" "${pkgdir}/usr/lib/R/library"
+
+  install -Dm644 R-MIT-TEMPLATE "${pkgdir}/usr/share/licenses/${pkgname}/MIT"
+  install -Dm644 "${_cranname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }