takeover package

2 files changed, 25 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0594873c4a9b..b576e2e045ab 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,12 @@
 pkgbase = r-prettyunits
 	pkgdesc = Pretty, Human Readable Formatting of Quantities
 	pkgver = 1.1.1
-	pkgrel = 1
+	pkgrel = 5
 	url = https://cran.r-project.org/package=prettyunits
 	arch = any
 	license = MIT
 	depends = r
+	optdepends = r-codetools
 	optdepends = r-covr
 	optdepends = r-testthat
 	source = https://cran.r-project.org/src/contrib/prettyunits_1.1.1.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index b6a3b613c59a..849a651e7dec 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,32 @@
-# Maintainer: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
+# Maintainer: Guoyi Zhang <guoyizhang at malacology dot net>
 
-_cranname=prettyunits
-_cranver=1.1.1
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=1
-pkgdesc="Pretty, Human Readable Formatting of Quantities"
-arch=(any)
-url="https://cran.r-project.org/package=${_cranname}"
-license=(MIT)
-depends=(r)
-optdepends=(r-covr r-testthat)
-source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
+_pkgname=prettyunits
+_pkgver=1.1.1
+pkgname=r-${_pkgname,,}
+pkgver=1.1.1
+pkgrel=5
+pkgdesc='Pretty, Human Readable Formatting of Quantities'
+arch=('any')
+url="https://cran.r-project.org/package=${_pkgname}"
+license=('MIT')
+depends=(
+  r
+)
+optdepends=(
+  r-codetools
+  r-covr
+  r-testthat
+)
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
 sha256sums=('9a199aa80c6d5e50fa977bc724d6e39dae1fc597a96413053609156ee7fb75c5')
 
 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: