takeover package

2 files changed, 66 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9b16702665d6..99c7afcb2e52 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,25 @@
 pkgbase = r-vroom
 	pkgdesc = Read and Write Rectangular Text Data Quickly
 	pkgver = 1.5.7
-	pkgrel = 1
+	pkgrel = 4
 	url = https://cran.r-project.org/package=vroom
-	arch = i686
 	arch = x86_64
 	license = MIT
-	depends = r>=3.1
+	depends = r
 	depends = r-bit64
-	depends = r-crayon
 	depends = r-cli
+	depends = r-cpp11
+	depends = r-crayon
 	depends = r-glue
 	depends = r-hms
 	depends = r-lifecycle
-	depends = r-rlang>=0.4.2
-	depends = r-tibble>=2.0.0
-	depends = r-tzdb>=0.1.1
-	depends = r-vctrs>=0.2.0
+	depends = r-progress
+	depends = r-rlang
+	depends = r-tibble
 	depends = r-tidyselect
+	depends = r-tzdb
+	depends = r-vctrs
 	depends = r-withr
-	depends = r-progress>=1.2.1
-	depends = r-cpp11>=0.2.0
 	optdepends = r-archive
 	optdepends = r-bench
 	optdepends = r-covr
@@ -39,6 +38,7 @@ pkgbase = r-vroom
 	optdepends = r-spelling
 	optdepends = r-testthat
 	optdepends = r-tidyr
+	optdepends = r-utils
 	optdepends = r-waldo
 	optdepends = r-xml2
 	source = https://cran.r-project.org/src/contrib/vroom_1.5.7.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index f2fa3e9c6611..08b0f2db7e0f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,65 @@
-# Maintainer: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
+# system requirements: C++11
+# Maintainer: Guoyi Zhang <guoyizhang at malacology dot net>
 
-_cranname=vroom
-_cranver=1.5.7
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=1
-pkgdesc="Read and Write Rectangular Text Data Quickly"
-arch=(i686 x86_64)
-url="https://cran.r-project.org/package=${_cranname}"
-license=(MIT)
-depends=('r>=3.1' r-bit64 r-crayon r-cli r-glue r-hms r-lifecycle 'r-rlang>=0.4.2' 'r-tibble>=2.0.0' 'r-tzdb>=0.1.1' 'r-vctrs>=0.2.0' r-tidyselect r-withr 'r-progress>=1.2.1' 'r-cpp11>=0.2.0')
-optdepends=(r-archive r-bench r-covr r-curl r-dplyr r-forcats r-fs r-ggplot2 r-knitr r-patchwork r-prettyunits r-purrr r-rmarkdown r-rstudioapi r-scales r-spelling r-testthat r-tidyr r-waldo r-xml2)
-source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
+_pkgname=vroom
+_pkgver=1.5.7
+pkgname=r-${_pkgname,,}
+pkgver=1.5.7
+pkgrel=4
+pkgdesc='Read and Write Rectangular Text Data Quickly'
+arch=('x86_64')
+url="https://cran.r-project.org/package=${_pkgname}"
+license=('MIT')
+depends=(
+  r
+  r-bit64
+  r-cli
+  r-cpp11
+  r-crayon
+  r-glue
+  r-hms
+  r-lifecycle
+  r-progress
+  r-rlang
+  r-tibble
+  r-tidyselect
+  r-tzdb
+  r-vctrs
+  r-withr
+)
+optdepends=(
+  r-archive
+  r-bench
+  r-covr
+  r-curl
+  r-dplyr
+  r-forcats
+  r-fs
+  r-ggplot2
+  r-knitr
+  r-patchwork
+  r-prettyunits
+  r-purrr
+  r-rmarkdown
+  r-rstudioapi
+  r-scales
+  r-spelling
+  r-testthat
+  r-tidyr
+  r-utils
+  r-waldo
+  r-xml2
+)
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
 sha256sums=('d087cb148f71c222fc89199d03df2502689149873414a6d89c2f006d3a109fde')
 
 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"
+  install -Dm644 "${_pkgname}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
+# vim:set ts=2 sw=2 et: