Fixed PKGBUILD

2 files changed, 28 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e7b302a315cd..7e071ce02db0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,12 @@
 pkgbase = r-dplyr
-	pkgdesc = A grammar of data manipulation.
-	pkgver = 0.8.4
+	pkgdesc = A Grammar of Data Manipulation
+	pkgver = 0.8.5
 	pkgrel = 1
 	url = https://cran.r-project.org/package=dplyr
-	arch = any
+	arch = i686
+	arch = x86_64
 	license = MIT
+	makedepends = gcc
 	depends = r>=3.2.0
 	depends = r-ellipsis
 	depends = r-assertthat>=0.2.0
@@ -18,7 +20,6 @@ pkgbase = r-dplyr
 	depends = r-tidyselect>=0.2.5
 	depends = r-bh
 	depends = r-plogr>=0.2.0
-	depends = r-rcpp>=1.0.1
 	optdepends = r-bit64
 	optdepends = r-callr
 	optdepends = r-covr
@@ -43,8 +44,8 @@ pkgbase = r-dplyr
 	optdepends = r-broom
 	optdepends = r-purrr
 	optdepends = r-readr
-	source = http://cran.r-project.org/src/contrib/dplyr_0.8.4.tar.gz
-	md5sums = 9d5eee2ae011523b7546dda000d55528
+	source = https://cran.r-project.org/src/contrib/dplyr_0.8.5.tar.gz
+	md5sums = 86faa442ad8027b27b3ece36a09e7a8b
 
 pkgname = r-dplyr
 
diff --git a/PKGBUILD b/PKGBUILD
index ef33b78bc4a8..b0e576304ede 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,30 @@
-# Maintainer: frichtlm <frichtlm@gmail.com>
+# Maintainer: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
+# Contributor: frichtlm <frichtlm@gmail.com>
+
 _cranname=dplyr
-_cranver=0.8.4
-pkgname=r-${_cranname}
-pkgver=${_cranver}
+_cranver=0.8.5
+pkgname=r-${_cranname,,}
+pkgver=${_cranver//[:-]/.}
 pkgrel=1
-pkgdesc="A grammar of data manipulation."
+pkgdesc="A Grammar of Data Manipulation"
+arch=(i686 x86_64)
 url="https://cran.r-project.org/package=${_cranname}"
-arch=('any')
-license=('MIT')
-depends=('r>=3.2.0' 'r-ellipsis' 'r-assertthat>=0.2.0' 'r-glue>=1.3.0' 'r-magrittr>=1.5' 'r-pkgconfig' 'r-r6' 'r-rcpp>=1.0.1' 'r-rlang>=0.4.0' 'r-tibble>=2.0.0' 'r-tidyselect>=0.2.5' 'r-bh' 'r-plogr>=0.2.0' 'r-rcpp>=1.0.1')
-optdepends=('r-bit64' 'r-callr' 'r-covr' 'r-crayon' 'r-dbi' 'r-dbplyr' 'r-dtplyr' 'r-ggplot2' 'r-hms' 'r-knitr' 'r-lahman' 'r-lubridate' 'r-mgcv' 'r-microbenchmark' 'r-nycflights13' 'r-rmarkdown' 'r-rmysql' 'r-rpostgresql' 'r-rsqlite' 'r-testthat' 'r-withr' 'r-broom' 'r-purrr' 'r-readr')
-source=("http://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
-#source=("http://cran.r-project.org/src/contrib/Archive/${_cranname}/${_cranname}_${_cranver}.tar.gz") # replace with this if 404 error
-md5sums=('9d5eee2ae011523b7546dda000d55528') 
+license=(MIT)
+depends=('r>=3.2.0' r-ellipsis 'r-assertthat>=0.2.0' 'r-glue>=1.3.0' 'r-magrittr>=1.5' r-pkgconfig r-r6 'r-rcpp>=1.0.1' 'r-rlang>=0.4.0' 'r-tibble>=2.0.0' 'r-tidyselect>=0.2.5' r-bh 'r-plogr>=0.2.0')
+makedepends=(gcc)
+optdepends=(r-bit64 r-callr r-covr r-crayon r-dbi r-dbplyr r-dtplyr r-ggplot2 r-hms r-knitr r-lahman r-lubridate r-mgcv r-microbenchmark r-nycflights13 r-rmarkdown r-rmysql r-rpostgresql r-rsqlite r-testthat r-withr r-broom r-purrr r-readr)
+source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
+md5sums=('86faa442ad8027b27b3ece36a09e7a8b')
 
 build() {
-    cd "${srcdir}"
-    R CMD INSTALL ${_cranname}_${_cranver}.tar.gz -l $srcdir
+  cd "${srcdir}"
+
+  R CMD INSTALL ${_cranname}_${_cranver}.tar.gz -l ${srcdir}
 }
 
 package() {
-    cd "${srcdir}"
-    install -dm0755 "$pkgdir/usr/lib/R/library"
-    cp -a --no-preserve=ownership "$_cranname" "$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"
 }