takeover package

2 files changed, 64 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c5117d6fd0e5..9b503724ce67 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,34 +1,39 @@
 pkgbase = r-lava
 	pkgdesc = Latent Variable Models
 	pkgver = 1.6.10
-	pkgrel = 1
+	pkgrel = 4
 	url = https://cran.r-project.org/package=lava
 	arch = any
-	license = GPL3
-	depends = r>=3.0
+	license = GPL
+	depends = r
 	depends = r-future.apply
-	depends = r-progressr
 	depends = r-numderiv
+	depends = r-progressr
 	depends = r-squarem
-	optdepends = r-rgraphviz
+	optdepends = r-bookdown
 	optdepends = r-data.table
 	optdepends = r-ellipse
 	optdepends = r-fields
 	optdepends = r-geepack
+	optdepends = r-gof
 	optdepends = r-graph
-	optdepends = r-knitr
-	optdepends = r-bookdown
-	optdepends = r-rmarkdown
 	optdepends = r-igraph
+	optdepends = r-kernsmooth
+	optdepends = r-knitr
+	optdepends = r-lava.tobit
 	optdepends = r-lavasearch2
 	optdepends = r-lme4
 	optdepends = r-magrittr
+	optdepends = r-matrix
 	optdepends = r-mets
+	optdepends = r-nlme
 	optdepends = r-optimx
 	optdepends = r-polycor
 	optdepends = r-quantreg
-	optdepends = r-rgl
 	optdepends = r-r.rsp
+	optdepends = r-rgl
+	optdepends = r-rgraphviz
+	optdepends = r-rmarkdown
 	optdepends = r-testthat
 	optdepends = r-visnetwork
 	optdepends = r-zoo
diff --git a/PKGBUILD b/PKGBUILD
index c410b61f3652..d8f891894abe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,59 @@
-# Maintainer: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
-# Contributor: Alex Branham <branham@utexas.edu>
+# Maintainer: Guoyi Zhang <guoyizhang at malacology dot net>
 
-_cranname=lava
-_cranver=1.6.10
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=1
-pkgdesc="Latent Variable Models"
-arch=(any)
-url="https://cran.r-project.org/package=${_cranname}"
-license=(GPL3)
-depends=('r>=3.0' r-future.apply r-progressr r-numderiv r-squarem)
-optdepends=(r-rgraphviz r-data.table r-ellipse r-fields r-geepack r-graph r-knitr r-bookdown r-rmarkdown r-igraph r-lavasearch2 r-lme4 r-magrittr r-mets r-optimx r-polycor r-quantreg r-rgl r-r.rsp r-testthat r-visnetwork r-zoo)
-source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
+_pkgname=lava
+_pkgver=1.6.10
+pkgname=r-${_pkgname,,}
+pkgver=1.6.10
+pkgrel=4
+pkgdesc='Latent Variable Models'
+arch=('any')
+url="https://cran.r-project.org/package=${_pkgname}"
+license=('GPL')
+depends=(
+  r
+  r-future.apply
+  r-numderiv
+  r-progressr
+  r-squarem
+)
+optdepends=(
+  r-bookdown
+  r-data.table
+  r-ellipse
+  r-fields
+  r-geepack
+  r-gof
+  r-graph
+  r-igraph
+  r-kernsmooth
+  r-knitr
+  r-lava.tobit
+  r-lavasearch2
+  r-lme4
+  r-magrittr
+  r-matrix
+  r-mets
+  r-nlme
+  r-optimx
+  r-polycor
+  r-quantreg
+  r-r.rsp
+  r-rgl
+  r-rgraphviz
+  r-rmarkdown
+  r-testthat
+  r-visnetwork
+  r-zoo
+)
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
 sha256sums=('7a88f8a885872e2abb3011c446e9e1c4884cd4dbe6ab4cfe9207538e5560232e')
 
 build() {
-  R CMD INSTALL ${_cranname}_${_cranver}.tar.gz -l "${srcdir}"
+  R CMD INSTALL ${_pkgname}_${_pkgver}.tar.gz -l "${srcdir}"
 }
 
 package() {
   install -dm0755 "${pkgdir}/usr/lib/R/library"
-
-  cp -a --no-preserve=ownership "${_cranname}" "${pkgdir}/usr/lib/R/library"
+  cp -a --no-preserve=ownership "${_pkgname}" "${pkgdir}/usr/lib/R/library"
 }
+# vim:set ts=2 sw=2 et: