takeover package

2 files changed, 49 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 27832a091c02..6bfe83c8e358 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -4,28 +4,30 @@ pkgbase = r-car
 	pkgrel = 1
 	url = https://cran.r-project.org/package=car
 	arch = any
-	license = GPL2
-	license = GPL3
-	depends = r>=3.5.0
-	depends = r-cardata>=3.0.0
+	license = GPL
+	depends = r
 	depends = r-abind
-	depends = r-pbkrtest>=0.4.4
-	depends = r-quantreg
+	depends = r-cardata
+	depends = r-lme4
 	depends = r-maptools
-	depends = r-lme4>=1.1.27.1
+	depends = r-pbkrtest
+	depends = r-quantreg
 	optdepends = r-alr4
+	optdepends = r-boot
 	optdepends = r-coxme
 	optdepends = r-effects
 	optdepends = r-knitr
 	optdepends = r-leaps
 	optdepends = r-lmtest
+	optdepends = r-matrix
 	optdepends = r-matrixmodels
 	optdepends = r-rgl
 	optdepends = r-rio
 	optdepends = r-sandwich
 	optdepends = r-sparsem
 	optdepends = r-survey
-	source = https://cran.microsoft.com/snapshot/2022-06-25/src/contrib/car_3.1-0.tar.gz
+	optdepends = r-survival
+	source = https://cran.r-project.org/src/contrib/car_3.1-0.tar.gz
 	sha256sums = bd52b4eaea46ce828fccd93445301d06ebd265e2ffff796064875a8c0f0aea21
 
 pkgname = r-car
diff --git a/PKGBUILD b/PKGBUILD
index 4f80edbac502..d23283a812ac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,49 @@
-# Maintainer: Robert Greener <me@r0bert.dev>
-# Contributor: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
+# Maintainer: Guoyi Zhang <guoyizhang at malacology dot net>
 
-_cranname=car
-_cranver=3.1-0
-_updatedate=2022-06-25
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
+_pkgname=car
+_pkgver=3.1-0
+pkgname=r-${_pkgname,,}
+pkgver=3.1.0
 pkgrel=1
-pkgdesc="Companion to Applied Regression"
-arch=(any)
-url="https://cran.r-project.org/package=${_cranname}"
-license=(GPL2 GPL3)
-depends=('r>=3.5.0' 'r-cardata>=3.0.0' r-abind 'r-pbkrtest>=0.4.4' r-quantreg r-maptools 'r-lme4>=1.1.27.1')
-optdepends=(r-alr4 r-coxme r-effects r-knitr r-leaps r-lmtest r-matrixmodels r-rgl r-rio r-sandwich r-sparsem r-survey)
-source=("https://cran.microsoft.com/snapshot/${_updatedate}/src/contrib/${_cranname}_${_cranver}.tar.gz")
+pkgdesc='Companion to Applied Regression'
+arch=('any')
+url="https://cran.r-project.org/package=${_pkgname}"
+license=('GPL')
+depends=(
+  r
+  r-abind
+  r-cardata
+  r-lme4
+  r-maptools
+  r-pbkrtest
+  r-quantreg
+)
+optdepends=(
+  r-alr4
+  r-boot
+  r-coxme
+  r-effects
+  r-knitr
+  r-leaps
+  r-lmtest
+  r-matrix
+  r-matrixmodels
+  r-rgl
+  r-rio
+  r-sandwich
+  r-sparsem
+  r-survey
+  r-survival
+)
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
 sha256sums=('bd52b4eaea46ce828fccd93445301d06ebd265e2ffff796064875a8c0f0aea21')
 
 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: