takeover package

2 files changed, 42 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 672a031a1bde..f5b5fec77017 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -4,21 +4,25 @@ pkgbase = r-sandwich
 	pkgrel = 1
 	url = https://cran.r-project.org/package=sandwich
 	arch = any
-	license = GPL2
-	license = GPL3
-	depends = r>=3.0.0
+	license = GPL
+	depends = r
 	depends = r-zoo
 	optdepends = r-aer
 	optdepends = r-car
 	optdepends = r-geepack
+	optdepends = r-lattice
 	optdepends = r-lmtest
+	optdepends = r-mass
 	optdepends = r-multiwayvcov
+	optdepends = r-parallel
 	optdepends = r-pcse
 	optdepends = r-plm
 	optdepends = r-pscl
 	optdepends = r-scatterplot3d
+	optdepends = r-stats4
 	optdepends = r-strucchange
-	source = https://cran.microsoft.com/snapshot/2022-06-25/src/contrib/sandwich_3.0-2.tar.gz
+	optdepends = r-survival
+	source = https://cran.r-project.org/src/contrib/sandwich_3.0-2.tar.gz
 	sha256sums = 6e30b6b554eb19430a60c45a8132fb7918ddb0013577bf6a62caeb163bdfe2b4
 
 pkgname = r-sandwich
diff --git a/PKGBUILD b/PKGBUILD
index 2b5b70d33c68..d402590ccb75 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,44 @@
-# 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=sandwich
-_cranver=3.0-2
-_updatedate=2022-06-25
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
+_pkgname=sandwich
+_pkgver=3.0-2
+pkgname=r-${_pkgname,,}
+pkgver=3.0.2
 pkgrel=1
-pkgdesc="Robust Covariance Matrix Estimators"
-arch=(any)
-url="https://cran.r-project.org/package=${_cranname}"
-license=(GPL2 GPL3)
-depends=('r>=3.0.0' r-zoo)
-optdepends=(r-aer r-car r-geepack r-lmtest r-multiwayvcov r-pcse r-plm r-pscl r-scatterplot3d r-strucchange)
-source=("https://cran.microsoft.com/snapshot/${_updatedate}/src/contrib/${_cranname}_${_cranver}.tar.gz")
+pkgdesc='Robust Covariance Matrix Estimators'
+arch=('any')
+url="https://cran.r-project.org/package=${_pkgname}"
+license=('GPL')
+depends=(
+  r
+  r-zoo
+)
+optdepends=(
+  r-aer
+  r-car
+  r-geepack
+  r-lattice
+  r-lmtest
+  r-mass
+  r-multiwayvcov
+  r-parallel
+  r-pcse
+  r-plm
+  r-pscl
+  r-scatterplot3d
+  r-stats4
+  r-strucchange
+  r-survival
+)
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
 sha256sums=('6e30b6b554eb19430a60c45a8132fb7918ddb0013577bf6a62caeb163bdfe2b4')
 
 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: