[lilac] updated to 1.0.8-5

2 files changed, 59 insertions, 53 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 978a13b9ac2a..0e83fab9a9d7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,35 +1,36 @@
 pkgbase = r-gganimate
 	pkgdesc = A Grammar of Animated Graphics
 	pkgver = 1.0.8
-	pkgrel = 1
+	pkgrel = 5
 	url = https://cran.r-project.org/package=gganimate
 	arch = any
 	license = MIT
+	checkdepends = r-gifski
 	checkdepends = r-magick
 	checkdepends = r-testthat
 	checkdepends = r-transformr
+	checkdepends = ttf-font
 	depends = r-ggplot2
-	depends = r-stringi
-	depends = r-tweenr
-	depends = r-rlang
 	depends = r-glue
 	depends = r-progress
+	depends = r-rlang
 	depends = r-scales
-	optdepends = r-magick
-	optdepends = r-svglite
-	optdepends = r-knitr
-	optdepends = r-rmarkdown
-	optdepends = r-testthat
+	depends = r-stringi
+	depends = r-tweenr
+	optdepends = r-av
 	optdepends = r-base64enc
-	optdepends = r-htmltools
 	optdepends = r-covr
-	optdepends = r-transformr
-	optdepends = r-av
 	optdepends = r-gifski
+	optdepends = r-htmltools
+	optdepends = r-knitr
+	optdepends = r-magick
 	optdepends = r-ragg
+	optdepends = r-rmarkdown
+	optdepends = r-svglite
+	optdepends = r-testthat
+	optdepends = r-transformr
 	source = https://cran.r-project.org/src/contrib/gganimate_1.0.8.tar.gz
-	source = CRAN-MIT-TEMPLATE::https://cran.r-project.org/web/licenses/MIT
+	md5sums = 2ec08a5316dfd4d845238dfb296e2b91
 	sha256sums = a12d865ddecea761e8f12bdc3bfdb78642f7ab2d53b78940e1290c9071d24bc9
-	sha256sums = e76e4aad5d3d9d606db6f8c460311b6424ebadfce13f5322e9bae9d49cc6090b
 
 pkgname = r-gganimate
diff --git a/PKGBUILD b/PKGBUILD
index c15f479b9a9c..12ec4b0f821a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,48 @@
 # Maintainer: Pekka Ristola <pekkarr [at] protonmail [dot] com>
+# Contributor: Guoyi Zhang <guoyizhang at malacology dot net>
 
-_cranname=gganimate
-_cranver=1.0.8
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=1
+_pkgname=gganimate
+_pkgver=1.0.8
+pkgname=r-${_pkgname,,}
+pkgver=${_pkgver//-/.}
+pkgrel=5
 pkgdesc="A Grammar of Animated Graphics"
 arch=(any)
-url="https://cran.r-project.org/package=${_cranname}"
+url="https://cran.r-project.org/package=${_pkgname}"
 license=(MIT)
 depends=(
-    r-ggplot2
-    r-stringi
-    r-tweenr
-    r-rlang
-    r-glue
-    r-progress
-    r-scales
+  r-ggplot2
+  r-glue
+  r-progress
+  r-rlang
+  r-scales
+  r-stringi
+  r-tweenr
+)
+checkdepends=(
+  r-gifski
+  r-magick
+  r-testthat
+  r-transformr
+  ttf-font
 )
-checkdepends=(r-magick r-testthat r-transformr)
 optdepends=(
-    r-magick
-    r-svglite
-    r-knitr
-    r-rmarkdown
-    r-testthat
-    r-base64enc
-    r-htmltools
-    r-covr
-    r-transformr
-    r-av
-    r-gifski
-    r-ragg
+  r-av
+  r-base64enc
+  r-covr
+  r-gifski
+  r-htmltools
+  r-knitr
+  r-magick
+  r-ragg
+  r-rmarkdown
+  r-svglite
+  r-testthat
+  r-transformr
 )
-source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz"
-        "CRAN-MIT-TEMPLATE::https://cran.r-project.org/web/licenses/MIT")
-sha256sums=('a12d865ddecea761e8f12bdc3bfdb78642f7ab2d53b78940e1290c9071d24bc9'
-            'e76e4aad5d3d9d606db6f8c460311b6424ebadfce13f5322e9bae9d49cc6090b')
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
+md5sums=('2ec08a5316dfd4d845238dfb296e2b91')
+sha256sums=('a12d865ddecea761e8f12bdc3bfdb78642f7ab2d53b78940e1290c9071d24bc9')
 
 prepare() {
   # Skip test until upstream fixes the bug
@@ -44,24 +50,23 @@ prepare() {
   # https://github.com/thomasp85/gganimate/issues/287
   # https://github.com/thomasp85/gganimate/issues/447
   sed -i '/contour works/a\ \ skip("Upstream bug #287")' \
-      "${_cranname}/tests/testthat/test-transition-states.R"
+      "$_pkgname/tests/testthat/test-transition-states.R"
 }
 
 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"
-
-  cp -a --no-preserve=ownership "build/${_cranname}" "${pkgdir}/usr/lib/R/library"
+  install -d "$pkgdir/usr/lib/R/library"
+  cp -a --no-preserve=ownership "build/$_pkgname" "$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"
 }