Initialize and update to 2.1

2 files changed, 32 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 923315b8f16b..8cf23c9bf043 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,30 +1,33 @@
 pkgbase = r-rmarkdown
 	pkgdesc = Dynamic Documents for R
-	pkgver = 1.10
+	pkgver = 2.1
 	pkgrel = 1
 	url = https://cran.r-project.org/package=rmarkdown
 	arch = any
 	license = GPL3
 	depends = r
-	depends = r-knitr>=1.18
-	depends = r-yaml>=2.1.5
+	depends = pandoc>=1.12.3
+	depends = r-knitr>=1.22
+	depends = r-yaml>=2.1.19
 	depends = r-htmltools>=0.3.5
-	depends = r-evaluate>=0.8
+	depends = r-evaluate>=0.13
 	depends = r-base64enc
 	depends = r-jsonlite
-	depends = r-rprojroot
 	depends = r-mime
-	depends = r-tinytex>=0.3
+	depends = r-tinytex>=0.11
+	depends = r-xfun
 	depends = r-stringr>=1.2.0
-	optdepends = pandoc
-	optdepends = r-shiny
+	optdepends = r-shiny>=0.11
 	optdepends = r-tufte
 	optdepends = r-testthat
 	optdepends = r-digest
 	optdepends = r-dygraphs
 	optdepends = r-tibble
-	source = https://cran.r-project.org/src/contrib/Archive/rmarkdown/rmarkdown_1.10.tar.gz
-	md5sums = 1c923705dc968e04455b72723bd9fdb1
+	optdepends = r-fs
+	optdepends = r-pkgdown
+	optdepends = r-callr>=2.0.0
+	source = https://cran.r-project.org/src/contrib/rmarkdown_2.1.tar.gz
+	sha256sums = ef450e21206c454aa78eeca9023bbc78d1b2939e0b4bed9fdec9f2bf81ee455d
 
 pkgname = r-rmarkdown
 
diff --git a/PKGBUILD b/PKGBUILD
index 9b3fa1967b26..825618bb2f1a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,32 @@
+# Maintainer: haha662 <haha662 at outlook dot com>
 # Contributor: Kibouo <csonka.mihaly@hotmail.com>
 # Contributor: Ward Segers <w@rdsegers.be>
 # Contributor: Alex Branham <branham@utexas.edu>
+
 _cranname=rmarkdown
-_cranver=1.10
-_pkgtar=${_cranname}_${_cranver}.tar.gz
-pkgname=r-rmarkdown
+_cranver=2.1
+pkgname=r-${_cranname,,}
 pkgver=${_cranver//[:-]/.}
 pkgrel=1
 pkgdesc="Dynamic Documents for R"
-arch=('any')
+arch=("any")
 url="https://cran.r-project.org/package=${_cranname}"
-license=('GPL3')
-depends=('r' 'r-knitr>=1.18' 'r-yaml>=2.1.5' 'r-htmltools>=0.3.5' 'r-evaluate>=0.8' 'r-base64enc' 'r-jsonlite' 'r-rprojroot' 'r-mime' 'r-tinytex>=0.3' 'r-stringr>=1.2.0')
-
-optdepends=('pandoc' 'r-shiny' 'r-tufte' 'r-testthat' 'r-digest' 'r-dygraphs' 'r-tibble')
+license=("GPL3")
+depends=("r" "pandoc>=1.12.3" "r-knitr>=1.22" "r-yaml>=2.1.19" "r-htmltools>=0.3.5" "r-evaluate>=0.13" "r-base64enc" "r-jsonlite" "r-mime" "r-tinytex>=0.11" "r-xfun" "r-stringr>=1.2.0")
+# makedepends=()
+optdepends=("r-shiny>=0.11" "r-tufte" "r-testthat" "r-digest" "r-dygraphs" "r-tibble" "r-fs" "r-pkgdown" "r-callr>=2.0.0")
+source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
+sha256sums=("ef450e21206c454aa78eeca9023bbc78d1b2939e0b4bed9fdec9f2bf81ee455d")
 
-source=("https://cran.r-project.org/src/contrib/Archive/${_cranname}/${_pkgtar}")
-md5sums=('1c923705dc968e04455b72723bd9fdb1')
+build() {
+  cd "${srcdir}"
 
-build(){
-    R CMD INSTALL ${_pkgtar} -l $srcdir
+  R CMD INSTALL ${_cranname}_${_cranver}.tar.gz -l ${srcdir}
 }
+
 package() {
-    install -d "$pkgdir/usr/lib/R/library"
-    cp -r "$srcdir/$_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"
+}