takeover package

2 files changed, 28 insertions, 48 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 15f838c591f5..c67adf07e84b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,10 @@
 pkgbase = r-webshot
 	pkgdesc = Take Screenshots of Web Pages
 	pkgver = 0.5.3
-	pkgrel = 1
+	pkgrel = 3
 	url = https://cran.r-project.org/package=webshot
 	arch = any
-	license = GPL2
-	depends = graphicsmagick
-	depends = imagemagick
-	depends = optipng
-	depends = phantomjs
+	license = GPL
 	depends = r
 	depends = r-callr
 	depends = r-jsonlite
diff --git a/PKGBUILD b/PKGBUILD
index 3ac46c5dfc64..05c8fc22aafe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,52 +1,36 @@
-# Maintainer: Robert Greener <me@r0bert.dev>
-_cranname=webshot
-_cranver=0.5.3
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=1
-pkgdesc="Take Screenshots of Web Pages"
-arch=(any)
-url="https://cran.r-project.org/package=${_cranname}"
-license=(GPL2)
+# system requirements: PhantomJS (http://phantomjs.org) for takingscreenshots, ImageMagick (http://www.imagemagick.org) orGraphicsMagick (http://www.graphicsmagick.org) and OptiPNG(http://optipng.sourceforge.net) for manipulating images.
+# Maintainer: Guoyi Zhang <guoyizhang at malacology dot net>
+
+_pkgname=webshot
+_pkgver=0.5.3
+pkgname=r-${_pkgname,,}
+pkgver=0.5.3
+pkgrel=3
+pkgdesc='Take Screenshots of Web Pages'
+arch=('any')
+url="https://cran.r-project.org/package=${_pkgname}"
+license=('GPL')
 depends=(
-	graphicsmagick
-	imagemagick
-	optipng
-	phantomjs
-	r
-	r-callr
-	r-jsonlite
-	r-magrittr
-)
-checkdepends=(
+  r
+  r-callr
+  r-jsonlite
+  r-magrittr
 )
 optdepends=(
-	r-httpuv
-	r-knitr
-	r-rmarkdown
-	r-shiny
+  r-httpuv
+  r-knitr
+  r-rmarkdown
+  r-shiny
 )
-source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
+sha256sums=('b7c4f2be61c8c4730202a9c3604072478e30cb85b423b7497cd703cc3f49dbc0')
 
 build() {
-	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
+  R CMD INSTALL ${_pkgname}_${_pkgver}.tar.gz -l "${srcdir}"
 }
 
 package() {
-	install -dm0755 "${pkgdir}/usr/lib/R/library"
-
-	cp -a --no-preserve=ownership "build/${_cranname}" "${pkgdir}/usr/lib/R/library"
+  install -dm0755 "${pkgdir}/usr/lib/R/library"
+  cp -a --no-preserve=ownership "${_pkgname}" "${pkgdir}/usr/lib/R/library"
 }
-
-sha256sums=('b7c4f2be61c8c4730202a9c3604072478e30cb85b423b7497cd703cc3f49dbc0')
+# vim:set ts=2 sw=2 et: