takeover package

2 files changed, 33 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 45008cb9bc00..9916744c640e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,11 @@
 pkgbase = r-forcats
 	pkgdesc = Tools for Working with Categorical Variables (Factors)
 	pkgver = 0.5.1
-	pkgrel = 1
+	pkgrel = 4
 	url = https://cran.r-project.org/package=forcats
 	arch = any
 	license = MIT
-	depends = r>=3.2
+	depends = r
 	depends = r-ellipsis
 	depends = r-magrittr
 	depends = r-rlang
diff --git a/PKGBUILD b/PKGBUILD
index 0fb4e7d312aa..1fcdfd7cffa1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,40 @@
-# Maintainer: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
-# Contributor: frichtlm <frichtlm@gmail.com>
+# Maintainer: Guoyi Zhang <guoyizhang at malacology dot net>
 
-_cranname=forcats
-_cranver=0.5.1
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=1
-pkgdesc="Tools for Working with Categorical Variables (Factors)"
-arch=(any)
-url="https://cran.r-project.org/package=${_cranname}"
-license=(MIT)
-depends=('r>=3.2' r-ellipsis r-magrittr r-rlang r-tibble)
-optdepends=(r-covr r-dplyr r-ggplot2 r-knitr r-readr r-rmarkdown r-testthat)
-source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
+_pkgname=forcats
+_pkgver=0.5.1
+pkgname=r-${_pkgname,,}
+pkgver=0.5.1
+pkgrel=4
+pkgdesc='Tools for Working with Categorical Variables (Factors)'
+arch=('any')
+url="https://cran.r-project.org/package=${_pkgname}"
+license=('MIT')
+depends=(
+  r
+  r-ellipsis
+  r-magrittr
+  r-rlang
+  r-tibble
+)
+optdepends=(
+  r-covr
+  r-dplyr
+  r-ggplot2
+  r-knitr
+  r-readr
+  r-rmarkdown
+  r-testthat
+)
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
 sha256sums=('c4fb96e874e2bedaa8a1aa32ea22abdee7906d93b5c5c7b42c0894c0c5b6a289')
 
 build() {
-  R CMD INSTALL ${_cranname}_${_cranver}.tar.gz -l "${srcdir}"
+  R CMD INSTALL ${_pkgname}_${_pkgver}.tar.gz -l "${srcdir}"
 }
 
 package() {
   install -dm0755 "${pkgdir}/usr/lib/R/library"
-
-  cp -a --no-preserve=ownership "${_cranname}" "${pkgdir}/usr/lib/R/library"
+  cp -a --no-preserve=ownership "${_pkgname}" "${pkgdir}/usr/lib/R/library"
+  install -Dm644 "${_pkgname}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
+# vim:set ts=2 sw=2 et: