Fixed PKGBUILD

2 files changed, 31 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b5b10d205098..cebbf98c9bfd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,29 +1,33 @@
 pkgbase = r-covr
 	pkgdesc = Test Coverage for Packages
-	pkgver = 3.2.0
+	pkgver = 3.5.0
 	pkgrel = 1
 	url = https://cran.r-project.org/package=covr
+	arch = i686
 	arch = x86_64
 	license = GPL3
-	depends = r
+	makedepends = gcc
+	depends = r>=3.1.0
 	depends = r-digest
 	depends = r-jsonlite
 	depends = r-rex
 	depends = r-httr
 	depends = r-crayon
 	depends = r-withr>=1.0.2
+	depends = r-yaml
 	optdepends = r-r6
 	optdepends = r-knitr
 	optdepends = r-rmarkdown
 	optdepends = r-htmltools
 	optdepends = r-dt
 	optdepends = r-testthat
+	optdepends = r-rlang
 	optdepends = r-rstudioapi
 	optdepends = r-xml2
 	optdepends = r-memoise
 	optdepends = r-mockery
-	source = https://cran.r-project.org/src/contrib/covr_3.2.0.tar.gz
-	md5sums = b34429ae68b0caee13a562ab47537b43
+	source = https://cran.r-project.org/src/contrib/covr_3.5.0.tar.gz
+	md5sums = 92894c27065d11b3967cbb6f9d54f247
 
 pkgname = r-covr
 
diff --git a/PKGBUILD b/PKGBUILD
index cb2e36154f9e..b801cb5f070f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,31 @@
+# Maintainer: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
 # Contributor: Ward Segers <w@rdsegers.be>
 # Contributor: Alex Branham <alex.branham@gmail.com>
-_cranver=3.2.0
-pkgname=r-covr
+
+_cranname=covr
+_cranver=3.5.0
+pkgname=r-${_cranname,,}
 pkgver=${_cranver//[:-]/.}
 pkgrel=1
-pkgdesc='Test Coverage for Packages'
-arch=('x86_64')
-url='https://cran.r-project.org/package=covr'
-license=('GPL3')
-depends=('r' 'r-digest' 'r-jsonlite' 'r-rex' 'r-httr' 'r-crayon' 'r-withr>=1.0.2')
-optdepends=('r-r6' 'r-knitr' 'r-rmarkdown' 'r-htmltools' 'r-dt' 'r-testthat' 'r-rstudioapi' 'r-xml2' 'r-memoise' 'r-mockery')
-source=("https://cran.r-project.org/src/contrib/covr_"$_cranver".tar.gz")
-md5sums=('b34429ae68b0caee13a562ab47537b43')
+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)
+makedepends=(gcc)
+optdepends=(r-r6 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")
+md5sums=('92894c27065d11b3967cbb6f9d54f247')
+
+build() {
+  cd "${srcdir}"
 
-build(){
-    R CMD INSTALL covr_"$_cranver".tar.gz -l "$srcdir"
+  R CMD INSTALL ${_cranname}_${_cranver}.tar.gz -l ${srcdir}
 }
+
 package() {
-    install -dm0755 "$pkgdir"/usr/lib/R/library
-    cp -a --no-preserve=ownership covr "$pkgdir"/usr/lib/R/library
-}
+  cd "${srcdir}"
 
+  install -dm0755 "${pkgdir}/usr/lib/R/library"
+  cp -a --no-preserve=ownership "${_cranname}" "${pkgdir}/usr/lib/R/library"
+}