takeover package

2 files changed, 53 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f007728ccdf9..25db1b4193fa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,31 +1,31 @@
 pkgbase = r-covr
 	pkgdesc = Test Coverage for Packages
 	pkgver = 3.5.1
-	pkgrel = 1
+	pkgrel = 4
 	url = https://cran.r-project.org/package=covr
-	arch = i686
 	arch = x86_64
-	license = GPL3
-	depends = r>=3.1.0
+	license = GPL
+	depends = r
+	depends = r-crayon
 	depends = r-digest
+	depends = r-httr
 	depends = r-jsonlite
 	depends = r-rex
-	depends = r-httr
-	depends = r-crayon
-	depends = r-withr>=1.0.2
+	depends = r-withr
 	depends = r-yaml
-	optdepends = r-r6
 	optdepends = r-curl
-	optdepends = r-knitr
-	optdepends = r-rmarkdown
-	optdepends = r-htmltools
 	optdepends = r-dt
-	optdepends = r-testthat
+	optdepends = r-htmltools
+	optdepends = r-knitr
+	optdepends = r-memoise
+	optdepends = r-mockery
+	optdepends = r-parallel
+	optdepends = r-r6
 	optdepends = r-rlang
+	optdepends = r-rmarkdown
 	optdepends = r-rstudioapi
+	optdepends = r-testthat
 	optdepends = r-xml2
-	optdepends = r-memoise
-	optdepends = r-mockery
 	source = https://cran.r-project.org/src/contrib/covr_3.5.1.tar.gz
 	sha256sums = a54cfc3623ea56084158ac5d7fe33f216f45191f6dcddab9c9ed4ec1d9d8ac6c
 
diff --git a/PKGBUILD b/PKGBUILD
index fe2becb496ab..b1e7eaa9c294 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,48 @@
-# Contributor: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
-# Contributor: Ward Segers <w@rdsegers.be>
-# Contributor: Alex Branham <alex.branham@gmail.com>
+# Maintainer: Guoyi Zhang <guoyizhang at malacology dot net>
 
-_cranname=covr
-_cranver=3.5.1
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=1
-pkgdesc="Test Coverage for Packages"
-arch=(i686 x86_64)
-url="https://cran.r-project.org/package=${_cranname}"
-license=(GPL3)
-depends=('r>=3.1.0' r-digest r-jsonlite r-rex r-httr r-crayon 'r-withr>=1.0.2' r-yaml)
-optdepends=(r-r6 r-curl r-knitr r-rmarkdown r-htmltools r-dt r-testthat r-rlang r-rstudioapi r-xml2 r-memoise r-mockery)
-source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
+_pkgname=covr
+_pkgver=3.5.1
+pkgname=r-${_pkgname,,}
+pkgver=3.5.1
+pkgrel=4
+pkgdesc='Test Coverage for Packages'
+arch=('x86_64')
+url="https://cran.r-project.org/package=${_pkgname}"
+license=('GPL')
+depends=(
+  r
+  r-crayon
+  r-digest
+  r-httr
+  r-jsonlite
+  r-rex
+  r-withr
+  r-yaml
+)
+optdepends=(
+  r-curl
+  r-dt
+  r-htmltools
+  r-knitr
+  r-memoise
+  r-mockery
+  r-parallel
+  r-r6
+  r-rlang
+  r-rmarkdown
+  r-rstudioapi
+  r-testthat
+  r-xml2
+)
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
 sha256sums=('a54cfc3623ea56084158ac5d7fe33f216f45191f6dcddab9c9ed4ec1d9d8ac6c')
 
 build() {
-  R CMD INSTALL ${_cranname}_${_cranver}.tar.gz -l "${srcdir}"
+  R CMD INSTALL ${_pkgname}_${_pkgver}.tar.gz -l "${srcdir}"
 }
 
 package() {
   install -dm0755 "${pkgdir}/usr/lib/R/library"
-
-  cp -a --no-preserve=ownership "${_cranname}" "${pkgdir}/usr/lib/R/library"
+  cp -a --no-preserve=ownership "${_pkgname}" "${pkgdir}/usr/lib/R/library"
 }
+# vim:set ts=2 sw=2 et: