Update

2 files changed, 33 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e1374a1af587..4d0e0f37f241 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,17 @@
 pkgbase = r-zoo
-	pkgdesc = S3 Infrastructure for Regular and Irregular Time Series (Zs Ordered Observations)
-	pkgver = 1.8.4
+	pkgdesc = S3 Infrastructure for Regular and Irregular Time Series (Z's Ordered Observations)
+	pkgver = 1.8.7
 	pkgrel = 1
 	url = https://cran.r-project.org/package=zoo
+	arch = i686
 	arch = x86_64
-	license = GPL
-	depends = r
+	license = GPL2
+	license = GPL3
+	makedepends = gcc
+	depends = r>=3.1.0
+	optdepends = r-aer
 	optdepends = r-coda
 	optdepends = r-chron
-	optdepends = r-daag
 	optdepends = r-fts
 	optdepends = r-ggplot2
 	optdepends = r-mondate
@@ -19,8 +22,8 @@ pkgbase = r-zoo
 	optdepends = r-tis
 	optdepends = r-tseries
 	optdepends = r-xts
-	source = https://cran.r-project.org/src/contrib/zoo_1.8-4.tar.gz
-	md5sums = fdd2bbb9c1a737e38c7062ff84506509
+	source = https://cran.r-project.org/src/contrib/zoo_1.8-7.tar.gz
+	md5sums = 0c605833a519755832800137383d8ca3
 
 pkgname = r-zoo
 
diff --git a/PKGBUILD b/PKGBUILD
index 689b777a0b59..4d5df88160a4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,29 @@
-# Contributor: Ward Segers <w@rdsegers.be>
-# Contributor: Alex Branham <alex.branham@gmail.com>
-_cranver=1.8-4
-pkgname=r-zoo
+# Maintainer: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
+
+_cranname=zoo
+_cranver=1.8-7
+pkgname=r-${_cranname,,}
 pkgver=${_cranver//[:-]/.}
 pkgrel=1
-pkgdesc='S3 Infrastructure for Regular and Irregular Time Series (Zs Ordered Observations)'
-arch=('x86_64')
-url='https://cran.r-project.org/package=zoo'
-license=('GPL')
-depends=('r' )
-optdepends=('r-coda' 'r-chron' 'r-daag' 'r-fts' 'r-ggplot2' 'r-mondate' 'r-scales' 'r-strucchange' 'r-timedate' 'r-timeseries' 'r-tis' 'r-tseries' 'r-xts')
-source=("https://cran.r-project.org/src/contrib/zoo_"$_cranver".tar.gz")
-md5sums=('fdd2bbb9c1a737e38c7062ff84506509')
+pkgdesc="S3 Infrastructure for Regular and Irregular Time Series (Z's Ordered Observations)"
+arch=(i686 x86_64)
+url="https://cran.r-project.org/package=${_cranname}"
+license=(GPL2 GPL3)
+depends=('r>=3.1.0')
+makedepends=(gcc)
+optdepends=(r-aer r-coda r-chron r-fts r-ggplot2 r-mondate r-scales r-strucchange r-timedate r-timeseries r-tis r-tseries r-xts)
+source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
+md5sums=('0c605833a519755832800137383d8ca3')
+
+build() {
+  cd "${srcdir}"
 
-build(){
-    R CMD INSTALL zoo_"$_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 zoo "$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"
+}