takeover package

2 files changed, 20 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7252c287cd7d..400fe9d39da0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,12 @@
 pkgbase = r-formula
 	pkgdesc = Extended Model Formulas
 	pkgver = 1.2.4
-	pkgrel = 1
+	pkgrel = 4
 	url = https://cran.r-project.org/package=Formula
 	arch = any
-	license = GPL2
-	license = GPL3
-	depends = r>=2.0.0
+	license = GPL
+	depends = r
 	source = https://cran.r-project.org/src/contrib/Formula_1.2-4.tar.gz
 	sha256sums = cb70e373b5ed2fc8450937fb3321d37dfd22dcc6f07cb872a419d51205125caf
 
 pkgname = r-formula
-
diff --git a/PKGBUILD b/PKGBUILD
index dc01d7f6c755..a3a5a675f128 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,24 +1,26 @@
-# Maintainer: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
+# Maintainer: Guoyi Zhang <guoyizhang at malacology dot net>
 
-_cranname=Formula
-_cranver=1.2-4
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=1
-pkgdesc="Extended Model Formulas"
-arch=(any)
-url="https://cran.r-project.org/package=${_cranname}"
-license=(GPL2 GPL3)
-depends=('r>=2.0.0')
-source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
+_pkgname=Formula
+_pkgver=1.2-4
+pkgname=r-${_pkgname,,}
+pkgver=1.2.4
+pkgrel=4
+pkgdesc='Extended Model Formulas'
+arch=('any')
+url="https://cran.r-project.org/package=${_pkgname}"
+license=('GPL')
+depends=(
+  r
+)
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
 sha256sums=('cb70e373b5ed2fc8450937fb3321d37dfd22dcc6f07cb872a419d51205125caf')
 
 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: