takeover package

2 files changed, 27 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c2ed44aff79b..8ece2d05e0e4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,14 @@
 pkgbase = r-minqa
 	pkgdesc = Derivative-free optimization algorithms by quadratic approximation
 	pkgver = 1.2.4
-	pkgrel = 1
+	pkgrel = 4
 	url = https://cran.r-project.org/package=minqa
-	arch = i686
 	arch = x86_64
-	license = GPL2
-	makedepends = make
+	license = GPL
 	makedepends = gcc-fortran
 	depends = r
-	depends = r-rcpp>=0.9.10
+	depends = r-rcpp
+	depends = make
 	source = https://cran.r-project.org/src/contrib/minqa_1.2.4.tar.gz
 	sha256sums = cfa193a4a9c55cb08f3faf4ab09c11b70412523767f19894e4eafc6e94cccd0c
 
diff --git a/PKGBUILD b/PKGBUILD
index 63415e96f4a2..e56ccab82bfd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,32 @@
-# Maintainer: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
-# Contributor: Taekyung Kim <Taekyung.Kim.Maths@gmail.com>
+# system requirements: GNU make
+# Maintainer: Guoyi Zhang <guoyizhang at malacology dot net>
 
-_cranname=minqa
-_cranver=1.2.4
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=1
-pkgdesc="Derivative-free optimization algorithms by quadratic approximation"
-arch=(i686 x86_64)
-url="https://cran.r-project.org/package=${_cranname}"
-license=(GPL2)
-depends=(r 'r-rcpp>=0.9.10')
-makedepends=(make gcc-fortran)
-source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
+_pkgname=minqa
+_pkgver=1.2.4
+pkgname=r-${_pkgname,,}
+pkgver=1.2.4
+pkgrel=4
+pkgdesc='Derivative-free optimization algorithms by quadratic approximation'
+arch=('x86_64')
+url="https://cran.r-project.org/package=${_pkgname}"
+license=('GPL')
+depends=(
+  r
+  r-rcpp
+  make
+)
+makedepends=(
+  gcc-fortran
+)
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
 sha256sums=('cfa193a4a9c55cb08f3faf4ab09c11b70412523767f19894e4eafc6e94cccd0c')
 
 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"
 }
+# vim:set ts=2 sw=2 et: