takeover package

2 files changed, 50 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c7ee7f92dbe5..f6e614a7a943 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -3,21 +3,25 @@ pkgbase = r-desctools
 	pkgver = 0.99.45
 	pkgrel = 1
 	url = https://cran.r-project.org/package=DescTools
-	arch = i686
 	arch = x86_64
 	license = GPL
-	depends = r>=3.6.0
-	depends = r-mvtnorm
-	depends = r-expm
-	depends = r-rcpp>=0.12.10
-	depends = r-rstudioapi
+	makedepends = gcc-fortran
+	depends = r
+	depends = r-bh
+	depends = r-data.table
 	depends = r-exact
+	depends = r-expm
 	depends = r-gld
-	depends = r-data.table
-	depends = r-bh
-	optdepends = r-vgam
+	depends = r-mvtnorm
+	depends = r-rcpp
+	depends = r-rstudioapi
+	depends = r-readxl
+	depends = r-httr
 	optdepends = r-r.rsp
-	source = https://cran.microsoft.com/snapshot/2022-06-08/src/contrib/DescTools_0.99.45.tar.gz
+	optdepends = r-rdcomclient
+	optdepends = r-tcltk
+	optdepends = r-vgam
+	source = https://cran.r-project.org/src/contrib/DescTools_0.99.45.tar.gz
 	sha256sums = 8dfe7057fdcec475bc444761b00db59f6fb7313fd39c7bd6aebeca7f67aceb05
 
 pkgname = r-desctools
diff --git a/PKGBUILD b/PKGBUILD
index 21b580538bec..edcae460cdc0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,46 @@
-# Maintainer: Robert Greener <me@r0bert.dev>
-# Contributor: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
+# system requirements: C++11
+# Maintainer: Guoyi Zhang <guoyizhang at malacology dot net>
 
-_cranname=DescTools
-_cranver=0.99.45
-_updatedate=2022-06-08
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
+_pkgname=DescTools
+_pkgver=0.99.45
+pkgname=r-${_pkgname,,}
+pkgver=0.99.45
 pkgrel=1
-pkgdesc="Tools for Descriptive Statistics"
-arch=(i686 x86_64)
-url="https://cran.r-project.org/package=${_cranname}"
-license=(GPL)
-depends=('r>=3.6.0' r-mvtnorm r-expm 'r-rcpp>=0.12.10' r-rstudioapi r-exact r-gld r-data.table r-bh)
-optdepends=(r-vgam r-r.rsp)
-source=("https://cran.microsoft.com/snapshot/${_updatedate}/src/contrib/${_cranname}_${_cranver}.tar.gz")
+pkgdesc='Tools for Descriptive Statistics'
+arch=('x86_64')
+url="https://cran.r-project.org/package=${_pkgname}"
+license=('GPL')
+depends=(
+  r
+  r-bh
+  r-data.table
+  r-exact
+  r-expm
+  r-gld
+  r-mvtnorm
+  r-rcpp
+  r-rstudioapi
+  r-readxl
+  r-httr
+)
+optdepends=(
+  r-r.rsp
+  r-rdcomclient
+  r-tcltk
+  r-vgam
+)
+makedepends=(
+  gcc-fortran
+)
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
 sha256sums=('8dfe7057fdcec475bc444761b00db59f6fb7313fd39c7bd6aebeca7f67aceb05')
 
 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: