[lilac] updated to 4.2.4-7

2 files changed, 62 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6d482aca7011..9f5ab68e22b7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,26 @@
 pkgbase = r-ggthemes
 	pkgdesc = Extra Themes, Scales and Geoms for 'ggplot2'
 	pkgver = 4.2.4
-	pkgrel = 1
-	url = https://cran.r-project.org/web/packages/ggthemes/
+	pkgrel = 7
+	url = https://cran.r-project.org/package=ggthemes
 	arch = any
-	license = GPL
-	depends = r
+	license = GPL2
+	checkdepends = r-dplyr
+	checkdepends = r-testthat
+	checkdepends = r-vdiffr
 	depends = r-ggplot2
 	depends = r-purrr
 	depends = r-scales
 	depends = r-stringr
 	depends = r-tibble
-	optdepends = r-dplyr
 	optdepends = r-covr
+	optdepends = r-dplyr
 	optdepends = r-extrafont
 	optdepends = r-glue
 	optdepends = r-knitr
-	optdepends = r-lattice
 	optdepends = r-lintr
-	optdepends = r-maps
 	optdepends = r-mapproj
+	optdepends = r-maps
 	optdepends = r-pander
 	optdepends = r-rlang
 	optdepends = r-rmarkdown
@@ -29,7 +30,7 @@ pkgbase = r-ggthemes
 	optdepends = r-vdiffr
 	optdepends = r-withr
 	source = https://cran.r-project.org/src/contrib/ggthemes_4.2.4.tar.gz
-	sha512sums = 70aca67975581dc451c03f204637feff5527c7cc170c67b678b0fca8f947f27dedcf541dc56ee6cf6622a05ec10188509a60ec887cb1ef2b7001f221a4706471
+	md5sums = fbf75caa92427f03c3911afeca5eb514
+	sha256sums = 7b35168cf5b68f6f52dd533a1b345ec87e09d1a85ca68e8dc5377cdf95718567
 
 pkgname = r-ggthemes
-
diff --git a/PKGBUILD b/PKGBUILD
index 0a968ae064da..02a6d0da640c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,24 +1,61 @@
 # Maintainer: dhn <neilson+aur@sent.com>
+# Maintainer: Pekka Ristola <pekkarr [at] protonmail [dot] com>
+# Contributor: Guoyi Zhang <guoyizhang at malacology dot net>
 
 _pkgname=ggthemes
-pkgname=r-$_pkgname
-pkgver=4.2.4
-pkgrel=1
+_pkgver=4.2.4
+pkgname=r-${_pkgname,,}
+pkgver=${_pkgver//-/.}
+pkgrel=7
 pkgdesc="Extra Themes, Scales and Geoms for 'ggplot2'"
-arch=('any')
-url="https://cran.r-project.org/web/packages/$_pkgname/"
-license=('GPL')
-depends=('r' 'r-ggplot2' 'r-purrr' 'r-scales' 'r-stringr' 'r-tibble')
-makedepends=()
-optdepends=('r-dplyr' 'r-covr' 'r-extrafont' 'r-glue' 'r-knitr' 'r-lattice' 'r-lintr' 'r-maps' 'r-mapproj' 'r-pander' 'r-rlang' 'r-rmarkdown' 'r-spelling' 'r-testthat' 'r-tidyr' 'r-vdiffr' 'r-withr')
-source=("https://cran.r-project.org/src/contrib/${_pkgname}_$pkgver.tar.gz")
-sha512sums=('70aca67975581dc451c03f204637feff5527c7cc170c67b678b0fca8f947f27dedcf541dc56ee6cf6622a05ec10188509a60ec887cb1ef2b7001f221a4706471')
+arch=(any)
+url="https://cran.r-project.org/package=${_pkgname}"
+license=(GPL2)
+depends=(
+  r-ggplot2
+  r-purrr
+  r-scales
+  r-stringr
+  r-tibble
+)
+checkdepends=(
+  r-dplyr
+  r-testthat
+  r-vdiffr
+)
+optdepends=(
+  r-covr
+  r-dplyr
+  r-extrafont
+  r-glue
+  r-knitr
+  r-lintr
+  r-mapproj
+  r-maps
+  r-pander
+  r-rlang
+  r-rmarkdown
+  r-spelling
+  r-testthat
+  r-tidyr
+  r-vdiffr
+  r-withr
+)
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
+md5sums=('fbf75caa92427f03c3911afeca5eb514')
+sha256sums=('7b35168cf5b68f6f52dd533a1b345ec87e09d1a85ca68e8dc5377cdf95718567')
 
-build(){
-    R CMD INSTALL ${_pkgname}_$pkgver.tar.gz -l "$srcdir"
+build() {
+  mkdir -p build
+  R CMD INSTALL "$_pkgname" -l build
+}
+
+check() {
+  cd "$_pkgname/tests"
+  R_LIBS="$srcdir/build" NOT_CRAN=true Rscript --vanilla testthat.R
 }
 
 package() {
-    install -dm 755 "$pkgdir"/usr/lib/R/library
-    cp -a --no-preserve=ownership "${_pkgname}" "${pkgdir}/usr/lib/R/library"
+  install -d "$pkgdir/usr/lib/R/library"
+  cp -a --no-preserve=ownership "build/$_pkgname" "$pkgdir/usr/lib/R/library"
 }