Fixed PKGBUILD

2 files changed, 27 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 11e4ccdc0580..f834d9cd5bcf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,14 @@
 pkgbase = r-lava
 	pkgdesc = Latent Variable Models
-	pkgver = 1.6.3
+	pkgver = 1.6.7
 	pkgrel = 1
 	url = https://cran.r-project.org/package=lava
 	arch = any
 	license = GPL3
-	depends = r
+	depends = r>=3.0
 	depends = r-numderiv
 	depends = r-squarem
 	optdepends = r-rgraphviz
-	optdepends = r-ascii
 	optdepends = r-data.table
 	optdepends = r-ellipse
 	optdepends = r-fields
@@ -28,8 +27,8 @@ pkgbase = r-lava
 	optdepends = r-testthat
 	optdepends = r-visnetwork
 	optdepends = r-zoo
-	source = https://cran.r-project.org/src/contrib/lava_1.6.3.tar.gz
-	md5sums = 4bc25864b5ed98880376786b4f76594d
+	source = https://cran.r-project.org/src/contrib/lava_1.6.7.tar.gz
+	md5sums = 3b1b88d532e7b80db5ab326d6785a269
 
 pkgname = r-lava
 
diff --git a/PKGBUILD b/PKGBUILD
index afe54d2dabe9..f3197c5aaa6d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,29 @@
-# Maintainer: Alex Branham <branham@utexas.edu>
-_cranver=1.6.3
-pkgname=r-lava
+# Maintainer: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
+# Contributor: Alex Branham <branham@utexas.edu>
+
+_cranname=lava
+_cranver=1.6.7
+pkgname=r-${_cranname,,}
 pkgver=${_cranver//[:-]/.}
 pkgrel=1
-pkgdesc='Latent Variable Models'
-arch=('any')
-url='https://cran.r-project.org/package=lava'
-license=('GPL3')
-depends=('r' 'r-numderiv' 'r-squarem')
-optdepends=('r-rgraphviz' 'r-ascii' 'r-data.table' 'r-ellipse' 'r-fields' 'r-foreach' 'r-geepack' 'r-gof' 'r-graph' 'r-igraph' 'r-lava.tobit' 'r-lme4' 'r-mets' 'r-optimx' 'r-polycor' 'r-quantreg' 'r-rgl' 'r-testthat' 'r-visnetwork' 'r-zoo')
-source=("https://cran.r-project.org/src/contrib/lava_"$_cranver".tar.gz")
-md5sums=('4bc25864b5ed98880376786b4f76594d')
+pkgdesc="Latent Variable Models"
+arch=(any)
+url="https://cran.r-project.org/package=${_cranname}"
+license=(GPL3)
+depends=('r>=3.0' r-numderiv r-squarem)
+optdepends=(r-rgraphviz r-data.table r-ellipse r-fields r-foreach r-geepack r-gof r-graph r-igraph r-lava.tobit r-lme4 r-mets r-optimx r-polycor r-quantreg r-rgl r-testthat r-visnetwork r-zoo)
+source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
+md5sums=('3b1b88d532e7b80db5ab326d6785a269')
+
+build() {
+  cd "${srcdir}"
 
-build(){
-    R CMD INSTALL lava_"$_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 lava "$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"
+}