New upstream release

2 files changed, 45 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 07f2b7b9c6d5..15f838c591f5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,23 @@
 pkgbase = r-webshot
 	pkgdesc = Take Screenshots of Web Pages
-	pkgver = 0.5.2
+	pkgver = 0.5.3
 	pkgrel = 1
 	url = https://cran.r-project.org/package=webshot
 	arch = any
 	license = GPL2
-	depends = r>=3.0
-	depends = r-magrittr
-	depends = r-jsonlite
-	depends = r-callr
-	depends = phantomjs
-	depends = imagemagick
 	depends = graphicsmagick
+	depends = imagemagick
 	depends = optipng
+	depends = phantomjs
+	depends = r
+	depends = r-callr
+	depends = r-jsonlite
+	depends = r-magrittr
 	optdepends = r-httpuv
 	optdepends = r-knitr
 	optdepends = r-rmarkdown
 	optdepends = r-shiny
-	source = https://cran.r-project.org/src/contrib/webshot_0.5.2.tar.gz
-	sha256sums = f183dc970157075b51ac543550a7a48fa3428b9c6838abb72fe987c21982043f
+	source = https://cran.r-project.org/src/contrib/webshot_0.5.3.tar.gz
+	sha256sums = b7c4f2be61c8c4730202a9c3604072478e30cb85b423b7497cd703cc3f49dbc0
 
 pkgname = r-webshot
diff --git a/PKGBUILD b/PKGBUILD
index 77b86a24be46..3ac46c5dfc64 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,6 @@
-# Contributor: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
-
+# Maintainer: Robert Greener <me@r0bert.dev>
 _cranname=webshot
-_cranver=0.5.2
+_cranver=0.5.3
 pkgname=r-${_cranname,,}
 pkgver=${_cranver//[:-]/.}
 pkgrel=1
@@ -9,17 +8,45 @@ pkgdesc="Take Screenshots of Web Pages"
 arch=(any)
 url="https://cran.r-project.org/package=${_cranname}"
 license=(GPL2)
-depends=('r>=3.0' r-magrittr r-jsonlite r-callr phantomjs imagemagick graphicsmagick optipng)
-optdepends=(r-httpuv r-knitr r-rmarkdown r-shiny)
+depends=(
+	graphicsmagick
+	imagemagick
+	optipng
+	phantomjs
+	r
+	r-callr
+	r-jsonlite
+	r-magrittr
+)
+checkdepends=(
+)
+optdepends=(
+	r-httpuv
+	r-knitr
+	r-rmarkdown
+	r-shiny
+)
 source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
-sha256sums=('f183dc970157075b51ac543550a7a48fa3428b9c6838abb72fe987c21982043f')
 
 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=('b7c4f2be61c8c4730202a9c3604072478e30cb85b423b7497cd703cc3f49dbc0')