takeover package

2 files changed, 24 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3db971154515..a3688d4abebc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,12 @@
 pkgbase = r-askpass
 	pkgdesc = Safe Password Entry for R, Git, and SSH
 	pkgver = 1.1
-	pkgrel = 1
+	pkgrel = 5
 	url = https://cran.r-project.org/package=askpass
-	arch = i686
 	arch = x86_64
 	license = MIT
 	depends = r
-	depends = r-sys>=2.1
+	depends = r-sys
 	optdepends = r-testthat
 	source = https://cran.r-project.org/src/contrib/askpass_1.1.tar.gz
 	sha256sums = db40827d1bdbb90c0aa2846a2961d3bf9d76ad1b392302f9dd84cc2fd18c001f
diff --git a/PKGBUILD b/PKGBUILD
index 180fdab2da0f..9bf075904eba 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,31 @@
-# Maintainer: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
-# Contributor: Kibouo <csonka.mihaly@hotmail.com>
+# Maintainer: Guoyi Zhang <guoyizhang at malacology dot net>
 
-_cranname=askpass
-_cranver=1.1
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=1
-pkgdesc="Safe Password Entry for R, Git, and SSH"
-arch=(i686 x86_64)
-url="https://cran.r-project.org/package=${_cranname}"
-license=(MIT)
-depends=(r 'r-sys>=2.1')
-optdepends=(r-testthat)
-source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
+_pkgname=askpass
+_pkgver=1.1
+pkgname=r-${_pkgname,,}
+pkgver=1.1
+pkgrel=5
+pkgdesc='Safe Password Entry for R, Git, and SSH'
+arch=('x86_64')
+url="https://cran.r-project.org/package=${_pkgname}"
+license=('MIT')
+depends=(
+  r
+  r-sys
+)
+optdepends=(
+  r-testthat
+)
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
 sha256sums=('db40827d1bdbb90c0aa2846a2961d3bf9d76ad1b392302f9dd84cc2fd18c001f')
 
 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: