upgpkg: r-colorspace 2.1.0-1

upstream release

2 files changed, 57 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index aa5757ec70c6..d131b96977a7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,30 +1,32 @@
 pkgbase = r-colorspace
 	pkgdesc = A Toolbox for Manipulating and Assessing Colors and Palettes
-	pkgver = 2.0.3
+	pkgver = 2.1.0
 	pkgrel = 1
 	url = https://cran.r-project.org/package=colorspace
 	arch = i686
 	arch = x86_64
-	license = BSD3
+	license = BSD
 	depends = r>=3.0.0
-	optdepends = r-kernlab
-	optdepends = r-mvtnorm
-	optdepends = r-vcd
-	optdepends = r-shiny
-	optdepends = r-shinyjs
-	optdepends = r-ggplot2
+	optdepends = r-cartocolor
+	optdepends = r-colorbrewer
 	optdepends = r-dplyr
-	optdepends = r-scales
-	optdepends = r-png
+	optdepends = r-ggplot2
 	optdepends = r-jpeg
+	optdepends = r-kernlab
+	optdepends = r-kernsmooth
 	optdepends = r-knitr
-	optdepends = r-rmarkdown
-	optdepends = r-rcolorbrewer
-	optdepends = r-rcartocolor
+	optdepends = r-markdown
+	optdepends = r-mass
+	optdepends = r-mvtnorm
+	optdepends = r-png
+	optdepends = r-scales
 	optdepends = r-scico
+	optdepends = r-shiny
+	optdepends = r-shinyjs
+	optdepends = r-vcd
 	optdepends = r-viridis
 	optdepends = r-wesanderson
-	source = https://cran.r-project.org/src/contrib/colorspace_2.0-3.tar.gz
-	sha256sums = e75681cc4dd6e4b70303fd96a6d4597065dc6bffcaa4ae4244b73ff19016857f
+	source = https://cran.r-project.org/src/contrib/colorspace_2.1-0.tar.gz
+	b2sums = 942cadbdf54545aa596a6aeedc520bb7c1738bd663c1e172f4e1336bb778f6a167f01d74950ece04823490437f9bdae930e92946c9c0ec5dbc04ab8e35c981b3
 
 pkgname = r-colorspace
diff --git a/PKGBUILD b/PKGBUILD
index 2e6920014404..6b4b0fff4463 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,53 @@
-# Contributor: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
-# Contributor: Grey Christoforo <first name at last name dot net>
+# Maintainer: peippo <christoph+aur@christophfink.com>
 
 _cranname=colorspace
-_cranver=2.0-3
+_cranver=2.1-0
 pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=1
 pkgdesc="A Toolbox for Manipulating and Assessing Colors and Palettes"
-arch=(i686 x86_64)
 url="https://cran.r-project.org/package=${_cranname}"
-license=(BSD3)
-depends=('r>=3.0.0')
-optdepends=(r-kernlab r-mvtnorm r-vcd r-shiny r-shinyjs r-ggplot2 r-dplyr r-scales r-png r-jpeg r-knitr r-rmarkdown r-rcolorbrewer r-rcartocolor r-scico r-viridis r-wesanderson)
+license=("BSD")
+pkgver=${_cranver//[:-]/.}
+pkgrel=1
+
+arch=("i686" "x86_64")
+depends=(
+    "r>=3.0.0"
+)
+optdepends=(
+    "r-cartocolor"
+    "r-colorbrewer"
+    "r-dplyr"
+    "r-ggplot2"
+    "r-jpeg"
+    "r-kernlab"
+    "r-kernsmooth"
+    "r-knitr"
+    "r-markdown"
+    "r-mass"
+    "r-mvtnorm"
+    "r-png"
+    "r-scales"
+    "r-scico"
+    "r-shiny"
+    "r-shinyjs"
+    "r-vcd"
+    "r-viridis"
+    "r-wesanderson"
+)
+makedepends=()
+
 source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
-sha256sums=('e75681cc4dd6e4b70303fd96a6d4597065dc6bffcaa4ae4244b73ff19016857f')
+b2sums=("942cadbdf54545aa596a6aeedc520bb7c1738bd663c1e172f4e1336bb778f6a167f01d74950ece04823490437f9bdae930e92946c9c0ec5dbc04ab8e35c981b3")
 
 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
 }