Updated to version 2.2.0

2 files changed, 21 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a01fe501b6bc..0f96465cccbf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = r-haven
-	pkgdesc = Import and Export SPSS, Stata and SAS Files
-	pkgver = 2.1.1
+	pkgdesc = Import and Export 'SPSS', 'Stata' and 'SAS' Files
+	pkgver = 2.2.0
 	pkgrel = 1
 	url = https://cran.r-project.org/package=haven
 	arch = x86_64
@@ -12,7 +12,9 @@ pkgbase = r-haven
 	depends = r-hms
 	depends = r-rcpp>=0.11.4
 	depends = r-readr>=0.1.0
+	depends = r-rlang>=0.4.0
 	depends = r-tibble
+	depends = r-tidyselect
 	optdepends = r-covr
 	optdepends = r-fs
 	optdepends = r-knitr
@@ -21,8 +23,8 @@ pkgbase = r-haven
 	optdepends = r-pillar>=1.1.1
 	optdepends = r-cli
 	optdepends = r-crayon
-	source = https://cran.r-project.org/src/contrib/haven_2.1.1.tar.gz
-	md5sums = f1883920a72fb564853f8dd7e1a5bf7c
+	source = https://cran.r-project.org/src/contrib/haven_2.2.0.tar.gz
+	md5sums = 822ff6e567fe0cdeda88a5cb2a6e75c5
 
 pkgname = r-haven
 
diff --git a/PKGBUILD b/PKGBUILD
index 9853da8ad305..7cb3bb831e1e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,30 @@
-# Maintainer: Taekyung Kim <Taekyung.Kim.Maths@gmail.com>
+# Maintainer: Matt Frichtl <frichtlm@gmail.com>
+# Contributor: Taekyung Kim <Taekyung.Kim.Maths@gmail.com>
 # Contributor: Alex Branham <branham@utexas.edu>
 
 _cranname=haven
-_cranver=2.1.1
-_pkgtar=${_cranname}_${_cranver}.tar.gz
+_cranver=2.2.0
 pkgname=r-haven
-pkgver=${_cranver//[:-]/.}
+pkgver=${_cranver}
 pkgrel=1
-pkgdesc="Import and Export SPSS, Stata and SAS Files"
+pkgdesc="Import and Export 'SPSS', 'Stata' and 'SAS' Files"
 arch=('x86_64')
 url="https://cran.r-project.org/package=${_cranname}"
 license=('MIT' 'custom')
-depends=('r>=3.2' 'r-forcats>=0.2.0' 'r-hms' 'r-rcpp>=0.11.4' 'r-readr>=0.1.0' 'r-tibble')
+depends=('r>=3.2' 'r-forcats>=0.2.0' 'r-hms' 'r-rcpp>=0.11.4' 'r-readr>=0.1.0' 'r-rlang>=0.4.0' 'r-tibble' 'r-tidyselect')
 makedepends=('make')
 optdepends=('r-covr' 'r-fs' 'r-knitr' 'r-rmarkdown' 'r-testthat' 'r-pillar>=1.1.1' 'r-cli' 'r-crayon')
-
-source=("https://cran.r-project.org/src/contrib/${_pkgtar}")
-md5sums=('f1883920a72fb564853f8dd7e1a5bf7c')
+source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
+#source=("https://cran.r-project.org/src/contrib/Archive/${_cranname}/${_cranname}_${_cranver}.tar.gz") # uncomment if 404
+md5sums=('822ff6e567fe0cdeda88a5cb2a6e75c5')
 
 build(){
-    R CMD INSTALL "${_pkgtar}" -l "$srcdir"
+    cd "$srcdir"
+    R CMD INSTALL ${_cranname}_${_cranver}.tar.gz -l $srcdir
 }
+
 package() {
-    install -dm0755 "$pkgdir"/usr/lib/R/library
-    cp -a --no-preserve=ownership "$_cranname" "$pkgdir"/usr/lib/R/library
+    cd "$srcdir"
+    install -dm0755 "$pkgdir/usr/lib/R/library"
+    cp -a --no-preserve=ownership "$_cranname" "$pkgdir/usr/lib/R/library"
 }