New upstream release

2 files changed, 51 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a592f57ffbce..42d20a141953 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,25 @@
 pkgbase = r-gdtools
 	pkgdesc = Utilities for Graphical Rendering
-	pkgver = 0.2.3
+	pkgver = 0.2.4
 	pkgrel = 1
 	url = https://cran.r-project.org/package=gdtools
-	arch = i686
-	arch = x86_64
+	arch = any
 	license = GPL3
-	depends = r
-	depends = r-rcpp>=0.12.12
-	depends = r-systemfonts>=0.1.1
+	checkdepends = r-htmltools
+	checkdepends = r-testthat
+	checkdepends = r-fontquiver
+	checkdepends = r-curl
 	depends = cairo
-	depends = freetype2
 	depends = fontconfig
+	depends = freetype2
+	depends = r
+	depends = r-rcpp
+	depends = r-systemfonts
 	optdepends = r-htmltools
 	optdepends = r-testthat
 	optdepends = r-fontquiver
 	optdepends = r-curl
-	source = https://cran.r-project.org/src/contrib/gdtools_0.2.3.tar.gz
-	sha256sums = 972bbbfc45054513ddfc7d77d4626b4050c3d4da6881eee4300ebdcb31b871dc
+	source = https://cran.r-project.org/src/contrib/gdtools_0.2.4.tar.gz
+	sha256sums = 32884ce1aa49be1fd897b4f808cdbc8727cb0d881ff8961e899220b2cac33028
 
 pkgname = r-gdtools
diff --git a/PKGBUILD b/PKGBUILD
index 432cf7368518..18675aa0a22e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,54 @@
-# Contributor: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
-# Contributor: portaloffreedom
-
+# Maintainer: Robert Greener <me@r0bert.dev>
 _cranname=gdtools
-_cranver=0.2.3
+_cranver=0.2.4
 pkgname=r-${_cranname,,}
 pkgver=${_cranver//[:-]/.}
 pkgrel=1
 pkgdesc="Utilities for Graphical Rendering"
-arch=(i686 x86_64)
+arch=(any)
 url="https://cran.r-project.org/package=${_cranname}"
 license=(GPL3)
-depends=(r 'r-rcpp>=0.12.12' 'r-systemfonts>=0.1.1' cairo freetype2 fontconfig)
-optdepends=(r-htmltools r-testthat r-fontquiver r-curl)
+depends=(
+	cairo
+	fontconfig
+	freetype2
+	r
+	r-rcpp
+	r-systemfonts
+)
+checkdepends=(
+	r-htmltools
+	r-testthat
+	r-fontquiver
+	r-curl
+)
+optdepends=(
+	r-htmltools
+	r-testthat
+	r-fontquiver
+	r-curl
+)
 source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
-sha256sums=('972bbbfc45054513ddfc7d77d4626b4050c3d4da6881eee4300ebdcb31b871dc')
 
 build() {
-  R CMD INSTALL ${_cranname}_${_cranver}.tar.gz -l "${srcdir}"
+	mkdir -p build
+	R CMD INSTALL "${_cranname}" -l "${srcdir}/build"
+}
+
+check() {
+	if [ -d "${_cranname}/tests" ]
+	then
+  		cd "${_cranname}/tests"
+		for i in *.R; do
+			R_LIBS="${srcdir}/build" Rscript --vanilla $i
+		done
+	fi
 }
 
 package() {
-  install -dm0755 "${pkgdir}/usr/lib/R/library"
+	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"
 }
+
+sha256sums=('32884ce1aa49be1fd897b4f808cdbc8727cb0d881ff8961e899220b2cac33028')