Fixed PKGBUILD

2 files changed, 31 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 909b53288f54..732d2cf13ccc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,16 @@
 pkgbase = r-catools
-	pkgdesc = Moving (rolling, running) window statistic functions, read/write for GIF and ENVI binary files, fast calculation of AUC, LogitBoost classifier, base64 encoder/decoder, round-off-error-free sum and cumsum, etc.
-	pkgver = 1.17.1
+	pkgdesc = Tools: Moving Window Statistics, GIF, Base64, ROC AUC, etc
+	pkgver = 1.18.0
 	pkgrel = 1
-	url = http://cran.r-project.org/web/packages/caTools/index.html
+	url = https://cran.r-project.org/package=caTools
 	arch = i686
 	arch = x86_64
 	license = GPL3
-	depends = r
-	source = http://cran.r-project.org/src/contrib/caTools_1.17.1.tar.gz
-	md5sums = 5c872bbc78b177b306f36709deb44498
+	makedepends = gcc
+	depends = r>=3.6.0
+	depends = r-bitops
+	source = https://cran.r-project.org/src/contrib/caTools_1.18.0.tar.gz
+	md5sums = 3327465ba016d4f85f69d652021c9355
 
 pkgname = r-catools
 
diff --git a/PKGBUILD b/PKGBUILD
index 9cebc28d5da7..73e44e335e38 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,29 @@
+# Maintainer: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
 # Contributor: Sauliusl <luksaulius at gmail>
-# Based on r-colorspace PKGBUILD
-pkgname=r-catools
-pkgver=1.17.1
+
+_cranname=caTools
+_cranver=1.18.0
+pkgname=r-${_cranname,,}
+pkgver=${_cranver//[:-]/.}
 pkgrel=1
-pkgdesc="Moving (rolling, running) window statistic functions, read/write for GIF and ENVI binary files, fast calculation of AUC, LogitBoost classifier, base64 encoder/decoder, round-off-error-free sum and cumsum, etc."
-arch=('i686' 'x86_64')
-url="http://cran.r-project.org/web/packages/caTools/index.html"
-license=('GPL3')
-depends=('r')
-source=("http://cran.r-project.org/src/contrib/caTools_${pkgver}.tar.gz")
-md5sums=('5c872bbc78b177b306f36709deb44498')
+pkgdesc="Tools: Moving Window Statistics, GIF, Base64, ROC AUC, etc"
+arch=(i686 x86_64)
+url="https://cran.r-project.org/package=${_cranname}"
+license=(GPL3)
+depends=('r>=3.6.0' r-bitops)
+makedepends=(gcc)
+source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
+md5sums=('3327465ba016d4f85f69d652021c9355')
+
+build() {
+  cd "${srcdir}"
+
+  R CMD INSTALL ${_cranname}_${_cranver}.tar.gz -l ${srcdir}
+}
 
 package() {
- mkdir -p $pkgdir/usr/lib/R/library
- cd $srcdir
+  cd "${srcdir}"
 
- R CMD INSTALL -l $pkgdir/usr/lib/R/library ./caTools
+  install -dm0755 "${pkgdir}/usr/lib/R/library"
+  cp -a --no-preserve=ownership "${_cranname}" "${pkgdir}/usr/lib/R/library"
 }