upgpkg: r-scales 1.2.0-1

upstream release

upstream release

2 files changed, 50 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 724d3f8f63e7..57e7747ba81e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = r-scales
 	pkgdesc = Scale Functions for Visualization
-	pkgver = 1.1.1
+	pkgver = 1.2.0
 	pkgrel = 1
 	url = https://cran.r-project.org/package=scales
 	arch = any
@@ -12,14 +12,17 @@ pkgbase = r-scales
 	depends = r-munsell>=0.5
 	depends = r-r6
 	depends = r-rcolorbrewer
+	depends = r-rlang>=1.0.0
 	depends = r-viridislite
 	optdepends = r-bit64
 	optdepends = r-covr
 	optdepends = r-dichromat
 	optdepends = r-ggplot2
-	optdepends = r-hms
-	optdepends = r-testthat
-	source = https://cran.r-project.org/src/contrib/scales_1.1.1.tar.gz
-	sha256sums = 40b2b66522f1f314a20fd09426011b0cdc9d16b23ee2e765fe1930292dd03705
+	optdepends = r-hms>=0.5.0
+	optdepends = r-stringi
+	optdepends = r-testthat>=3.0.0
+	optdepends = r-waldo>=0.4.0
+	source = https://cran.r-project.org/src/contrib/scales_1.2.0.tar.gz
+	sha256sums = 185d50240e6b3e84d36ec7fbca6aef7a85db7c8c1b0dde51d4af28d363ce02df
 
 pkgname = r-scales
diff --git a/PKGBUILD b/PKGBUILD
index 1c94a7f862e9..8c236fd45477 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,53 @@
-# Maintainer: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
+# Maintainer: peippo <christoph+aur@christophfink.com>
+# Contributor: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
 
-_cranname=scales
-_cranver=1.1.1
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=1
+_cranname="scales"
+_cranver=1.2.0
+pkgname="r-${_cranname,,}"
 pkgdesc="Scale Functions for Visualization"
-arch=(any)
+pkgver="${_cranver//[:-]/.}"
+pkgrel=1
+
+arch=("any")
+license=("MIT")
+
 url="https://cran.r-project.org/package=${_cranname}"
-license=(MIT)
-depends=('r>=3.2' 'r-farver>=2.0.3' r-labeling r-lifecycle 'r-munsell>=0.5' r-r6 r-rcolorbrewer r-viridislite)
-optdepends=(r-bit64 r-covr r-dichromat r-ggplot2 r-hms r-testthat)
 source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
-sha256sums=('40b2b66522f1f314a20fd09426011b0cdc9d16b23ee2e765fe1930292dd03705')
+sha256sums=("185d50240e6b3e84d36ec7fbca6aef7a85db7c8c1b0dde51d4af28d363ce02df")
+
+depends=(
+    "r>=3.2"
+    "r-farver>=2.0.3"
+    r-labeling
+    r-lifecycle
+    "r-munsell>=0.5"
+    r-r6
+    r-rcolorbrewer
+    "r-rlang>=1.0.0"
+    r-viridislite
+)
+optdepends=(
+    r-bit64
+    r-covr
+    r-dichromat
+    r-ggplot2
+    "r-hms>=0.5.0"
+    r-stringi
+    "r-testthat>=3.0.0"
+    "r-waldo>=0.4.0"
+)
 
 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
 }