upgpkg: r-pillar 1.8.0-1

upstream release

upstream release

2 files changed, 48 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4f38439f86c0..21ea1b54d71e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,16 @@
 pkgbase = r-pillar
 	pkgdesc = Coloured Formatting for Columns
-	pkgver = 1.7.0
+	pkgver = 1.8.0
 	pkgrel = 1
 	url = https://cran.r-project.org/package=pillar
 	arch = any
 	license = MIT
 	depends = r
-	depends = r-cli
-	depends = r-crayon>=1.3.4
-	depends = r-ellipsis>=0.3.2
+	depends = r-cli>=2.3.0
 	depends = r-fansi
 	depends = r-glue
 	depends = r-lifecycle
-	depends = r-rlang>=0.3.0
+	depends = r-rlang>=1.0.2
 	depends = r-utf8>=1.1.0
 	depends = r-vctrs>=0.3.8
 	optdepends = r-bit64
@@ -23,18 +21,19 @@ pkgbase = r-pillar
 	optdepends = r-ggplot2
 	optdepends = r-knitr
 	optdepends = r-lubridate
+	optdepends = r-nanotime
 	optdepends = r-nycflights13
 	optdepends = r-palmerpenguins
 	optdepends = r-rmarkdown
 	optdepends = r-scales
 	optdepends = r-stringi
 	optdepends = r-survival
-	optdepends = r-testthat
+	optdepends = r-testthat>=3.1.1
 	optdepends = r-tibble
-	optdepends = r-units
+	optdepends = r-units>=0.7.2
 	optdepends = r-vdiffr
 	optdepends = r-withr
-	source = https://cran.r-project.org/src/contrib/pillar_1.7.0.tar.gz
-	sha256sums = 7841f89658cc8935568c0ff24dc480b4481bac896de2f6447050abc4360a13bb
+	source = https://cran.r-project.org/src/contrib/pillar_1.8.0.tar.gz
+	sha256sums = 52c6433692edede2731a95f58ae2bb4017fa50b62d3554c19b7c161d0a79b36f
 
 pkgname = r-pillar
diff --git a/PKGBUILD b/PKGBUILD
index 64fddd7b3fd3..d7f78f73fbd7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Grey Christoforo <first name at last name dot net>
 
 _cranname=pillar
-_cranver=1.7.0
+_cranver=1.8.0
 pkgname=r-${_cranname,,}
 pkgver=${_cranver//[:-]/.}
 pkgrel=1
@@ -11,17 +11,50 @@ pkgdesc="Coloured Formatting for Columns"
 arch=(any)
 url="https://cran.r-project.org/package=${_cranname}"
 license=(MIT)
-depends=(r r-cli 'r-crayon>=1.3.4' 'r-ellipsis>=0.3.2' r-fansi r-glue r-lifecycle 'r-rlang>=0.3.0' 'r-utf8>=1.1.0' 'r-vctrs>=0.3.8')
-optdepends=(r-bit64 r-debugme r-diagrammer r-dplyr r-formattable r-ggplot2 r-knitr r-lubridate r-nycflights13 r-palmerpenguins r-rmarkdown r-scales r-stringi r-survival r-testthat r-tibble r-units r-vdiffr r-withr)
+depends=(
+    r
+    "r-cli>=2.3.0"
+    r-fansi
+    r-glue
+    r-lifecycle
+    "r-rlang>=1.0.2"
+    "r-utf8>=1.1.0"
+    "r-vctrs>=0.3.8"
+)
+optdepends=(
+    r-bit64
+    r-debugme
+    r-diagrammer
+    r-dplyr
+    r-formattable
+    r-ggplot2
+    r-knitr
+    r-lubridate
+    r-nanotime
+    r-nycflights13
+    r-palmerpenguins
+    r-rmarkdown
+    r-scales
+    r-stringi
+    r-survival
+    "r-testthat>=3.1.1"
+    r-tibble
+    "r-units>=0.7.2"
+    r-vdiffr
+    r-withr
+)
 source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
-sha256sums=('7841f89658cc8935568c0ff24dc480b4481bac896de2f6447050abc4360a13bb')
+sha256sums=("52c6433692edede2731a95f58ae2bb4017fa50b62d3554c19b7c161d0a79b36f")
 
 build() {
-  R CMD INSTALL ${_cranname}_${_cranver}.tar.gz -l "${srcdir}"
+    R CMD INSTALL ${_cranname}_${_cranver}.tar.gz -l "${srcdir}"
 }
 
 package() {
-  install -dm0755 "${pkgdir}/usr/lib/R/library"
+    install -dm0755 "${pkgdir}/usr/lib/R/library"
+    cp -a --no-preserve=ownership "${_cranname}" "${pkgdir}/usr/lib/R/library"
 
-  cp -a --no-preserve=ownership "${_cranname}" "${pkgdir}/usr/lib/R/library"
+    if [[ -f "${_cranname}/LICENSE" ]]; then
+        install -Dm0644 "${_cranname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    fi
 }