[lilac] updated to 3.4.2-3

2 files changed, 61 insertions, 63 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0e4a485ade54..8b6da8bdb5f2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = r-ggplot2
 	pkgdesc = Create Elegant Data Visualisations Using the Grammar of Graphics
 	pkgver = 3.4.2
-	pkgrel = 1
+	pkgrel = 3
 	url = https://cran.r-project.org/package=ggplot2
 	arch = any
 	license = MIT
@@ -25,7 +25,6 @@ pkgbase = r-ggplot2
 	depends = r-vctrs
 	depends = r-withr
 	optdepends = r-covr
-	optdepends = r-ragg
 	optdepends = r-dplyr
 	optdepends = r-ggplot2movies
 	optdepends = r-hexbin
@@ -38,6 +37,7 @@ pkgbase = r-ggplot2
 	optdepends = r-munsell
 	optdepends = r-profvis
 	optdepends = r-quantreg
+	optdepends = r-ragg
 	optdepends = r-rcolorbrewer
 	optdepends = r-rgeos
 	optdepends = r-rmarkdown
@@ -47,8 +47,7 @@ pkgbase = r-ggplot2
 	optdepends = r-vdiffr
 	optdepends = r-xml2
 	source = https://cran.r-project.org/src/contrib/ggplot2_3.4.2.tar.gz
-	source = CRAN-MIT-TEMPLATE::https://cran.r-project.org/web/licenses/MIT
+	md5sums = ae74c0829b62eb7ff8a425df4645c85f
 	sha256sums = 70230aa70a2c6f844fc41dd93e5f62af6859dfed390026ae58f223637e5283ca
-	sha256sums = e76e4aad5d3d9d606db6f8c460311b6424ebadfce13f5322e9bae9d49cc6090b
 
 pkgname = r-ggplot2
diff --git a/PKGBUILD b/PKGBUILD
index c6477ef10169..5249d5d076b6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,84 +1,83 @@
 # Maintainer: Pekka Ristola <pekkarr [at] protonmail [dot] com>
+# Contributor: Guoyi Zhang <guoyizhang at malacology dot net>
 # Contributor: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
 # Contributor: frichtlm <frichtlm@gmail.com>
 # Contributor: wagnerflo <florian@wagner-flo.net>
 
-_cranname=ggplot2
-_cranver=3.4.2
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=1
+_pkgname=ggplot2
+_pkgver=3.4.2
+pkgname=r-${_pkgname,,}
+pkgver=${_pkgver//-/.}
+pkgrel=3
 pkgdesc="Create Elegant Data Visualisations Using the Grammar of Graphics"
 arch=(any)
-url="https://cran.r-project.org/package=${_cranname}"
+url="https://cran.r-project.org/package=${_pkgname}"
 license=(MIT)
 depends=(
-    r-cli
-    r-glue
-    r-gtable
-    r-isoband
-    r-lifecycle
-    r-rlang
-    r-scales
-    r-tibble
-    r-vctrs
-    r-withr
+  r-cli
+  r-glue
+  r-gtable
+  r-isoband
+  r-lifecycle
+  r-rlang
+  r-scales
+  r-tibble
+  r-vctrs
+  r-withr
 )
 checkdepends=(
-    r-hexbin
-    r-mapproj
-    r-quantreg
-    r-sf
-    r-sp
-    r-svglite
-    r-testthat
-    r-xml2
-    ttf-font
+  r-hexbin
+  r-mapproj
+  r-quantreg
+  r-sf
+  r-sp
+  r-svglite
+  r-testthat
+  r-xml2
+  ttf-font
 )
 optdepends=(
-    r-covr
-    r-ragg
-    r-dplyr
-    r-ggplot2movies
-    r-hexbin
-    r-hmisc
-    r-knitr
-    r-mapproj
-    r-maps
-    r-maptools
-    r-multcomp
-    r-munsell
-    r-profvis
-    r-quantreg
-    r-rcolorbrewer
-    r-rgeos
-    r-rmarkdown
-    r-sf
-    r-svglite
-    r-testthat
-    r-vdiffr
-    r-xml2
+  r-covr
+  r-dplyr
+  r-ggplot2movies
+  r-hexbin
+  r-hmisc
+  r-knitr
+  r-mapproj
+  r-maps
+  r-maptools
+  r-multcomp
+  r-munsell
+  r-profvis
+  r-quantreg
+  r-ragg
+  r-rcolorbrewer
+  r-rgeos
+  r-rmarkdown
+  r-sf
+  r-svglite
+  r-testthat
+  r-vdiffr
+  r-xml2
 )
-source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz"
-        "CRAN-MIT-TEMPLATE::https://cran.r-project.org/web/licenses/MIT")
-sha256sums=('70230aa70a2c6f844fc41dd93e5f62af6859dfed390026ae58f223637e5283ca'
-            'e76e4aad5d3d9d606db6f8c460311b6424ebadfce13f5322e9bae9d49cc6090b')
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
+md5sums=('ae74c0829b62eb7ff8a425df4645c85f')
+sha256sums=('70230aa70a2c6f844fc41dd93e5f62af6859dfed390026ae58f223637e5283ca')
 
 build() {
   mkdir -p build
-  R CMD INSTALL "${_cranname}" -l "${srcdir}/build"
+  R CMD INSTALL "$_pkgname" -l build
 }
 
 check() {
-  cd "${_cranname}/tests"
-  R_LIBS="${srcdir}/build" NOT_CRAN=true Rscript --vanilla testthat.R
+  cd "$_pkgname/tests"
+  R_LIBS="$srcdir/build" NOT_CRAN=true Rscript --vanilla testthat.R
 }
 
 package() {
-  install -dm0755 "${pkgdir}/usr/lib/R/library"
+  install -d "$pkgdir/usr/lib/R/library"
+  cp -a --no-preserve=ownership "build/$_pkgname" "$pkgdir/usr/lib/R/library"
 
-  cp -a --no-preserve=ownership "build/${_cranname}" "${pkgdir}/usr/lib/R/library"
-
-  install -Dm644 CRAN-MIT-TEMPLATE "${pkgdir}/usr/share/licenses/${pkgname}/MIT"
-  install -Dm644 "${_cranname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -d "$pkgdir/usr/share/licenses/$pkgname"
+  ln -s "/usr/lib/R/library/$_pkgname/LICENSE" "$pkgdir/usr/share/licenses/$pkgname"
 }