takeover package

2 files changed, 31 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 065da15c8e67..af6d4dc39bf5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,17 @@
 pkgbase = r-corrplot
 	pkgdesc = Visualization of a Correlation Matrix
 	pkgver = 0.92
-	pkgrel = 1
+	pkgrel = 4
 	url = https://cran.r-project.org/package=corrplot
 	arch = any
 	license = MIT
 	depends = r
-	optdepends = r-seriation
 	optdepends = r-knitr
-	optdepends = r-rcolorbrewer
-	optdepends = r-rmarkdown
 	optdepends = r-magrittr
 	optdepends = r-prettydoc
+	optdepends = r-rcolorbrewer
+	optdepends = r-rmarkdown
+	optdepends = r-seriation
 	optdepends = r-testthat
 	source = https://cran.r-project.org/src/contrib/corrplot_0.92.tar.gz
 	sha256sums = e8c09f963f9c4837036c439ebfe00fa3a6e462ccbb786d2cf90850ddcd9428bd
diff --git a/PKGBUILD b/PKGBUILD
index 92ff4b3b017a..583ce532b2cb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,36 @@
-# Maintainer: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
+# Maintainer: Guoyi Zhang <guoyizhang at malacology dot net>
 
-_cranname=corrplot
-_cranver=0.92
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=1
-pkgdesc="Visualization of a Correlation Matrix"
-arch=(any)
-url="https://cran.r-project.org/package=${_cranname}"
-license=(MIT)
-depends=(r)
-optdepends=(r-seriation r-knitr r-rcolorbrewer r-rmarkdown r-magrittr r-prettydoc r-testthat)
-source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
+_pkgname=corrplot
+_pkgver=0.92
+pkgname=r-${_pkgname,,}
+pkgver=0.92
+pkgrel=4
+pkgdesc='Visualization of a Correlation Matrix'
+arch=('any')
+url="https://cran.r-project.org/package=${_pkgname}"
+license=('MIT')
+depends=(
+  r
+)
+optdepends=(
+  r-knitr
+  r-magrittr
+  r-prettydoc
+  r-rcolorbrewer
+  r-rmarkdown
+  r-seriation
+  r-testthat
+)
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
 sha256sums=('e8c09f963f9c4837036c439ebfe00fa3a6e462ccbb786d2cf90850ddcd9428bd')
 
 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: