takeover package

2 files changed, 35 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8d1106562359..c84f3bc91ef1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,19 @@
 pkgbase = r-credentials
 	pkgdesc = Tools for Managing SSH and Git Credentials
 	pkgver = 1.3.2
-	pkgrel = 1
+	pkgrel = 4
 	url = https://cran.r-project.org/package=credentials
 	arch = any
 	license = MIT
 	depends = r
-	depends = r-openssl>=1.3
-	depends = r-sys>=2.1
+	depends = r-askpass
 	depends = r-curl
 	depends = r-jsonlite
-	depends = r-askpass
-	optdepends = r-testthat
+	depends = r-openssl
+	depends = r-sys
 	optdepends = r-knitr
 	optdepends = r-rmarkdown
+	optdepends = r-testthat
 	optdepends = git
 	source = https://cran.r-project.org/src/contrib/credentials_1.3.2.tar.gz
 	sha256sums = 2ffa7c11bedbfa034adf553d0a2f2e4f6a496b858af753a09a89219cff9028b8
diff --git a/PKGBUILD b/PKGBUILD
index 2d3be85b9322..8b207c0b2685 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,39 @@
-# Maintainer: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
+# system requirements: git (optional)
+# Maintainer: Guoyi Zhang <guoyizhang at malacology dot net>
 
-_cranname=credentials
-_cranver=1.3.2
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=1
-pkgdesc="Tools for Managing SSH and Git Credentials"
-arch=(any)
-url="https://cran.r-project.org/package=${_cranname}"
-license=(MIT)
-depends=(r 'r-openssl>=1.3' 'r-sys>=2.1' r-curl r-jsonlite r-askpass)
-optdepends=(r-testthat r-knitr r-rmarkdown git)
-source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
+_pkgname=credentials
+_pkgver=1.3.2
+pkgname=r-${_pkgname,,}
+pkgver=1.3.2
+pkgrel=4
+pkgdesc='Tools for Managing SSH and Git Credentials'
+arch=('any')
+url="https://cran.r-project.org/package=${_pkgname}"
+license=('MIT')
+depends=(
+  r
+  r-askpass
+  r-curl
+  r-jsonlite
+  r-openssl
+  r-sys
+)
+optdepends=(
+  r-knitr
+  r-rmarkdown
+  r-testthat
+  git
+)
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
 sha256sums=('2ffa7c11bedbfa034adf553d0a2f2e4f6a496b858af753a09a89219cff9028b8')
 
 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: