takeover package

2 files changed, 19 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c5cacad2deb3..87707bc1c93d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,10 @@
 pkgbase = r-modeltools
 	pkgdesc = Tools and Classes for Statistical Models
 	pkgver = 0.2.23
-	pkgrel = 1
+	pkgrel = 4
 	url = https://cran.r-project.org/package=modeltools
 	arch = any
-	license = GPL2
+	license = GPL
 	depends = r
 	source = https://cran.r-project.org/src/contrib/modeltools_0.2-23.tar.gz
 	sha256sums = 6b3e8d5af1a039db5c178498dbf354ed1c5627a8cea9229726644053443210ef
diff --git a/PKGBUILD b/PKGBUILD
index 009f6447a905..a3dfbb788bde 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,24 +1,26 @@
-# Contributorr: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
+# Maintainer: Guoyi Zhang <guoyizhang at malacology dot net>
 
-_cranname=modeltools
-_cranver=0.2-23
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=1
-pkgdesc="Tools and Classes for Statistical Models"
-arch=(any)
-url="https://cran.r-project.org/package=${_cranname}"
-license=(GPL2)
-depends=(r)
-source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
+_pkgname=modeltools
+_pkgver=0.2-23
+pkgname=r-${_pkgname,,}
+pkgver=0.2.23
+pkgrel=4
+pkgdesc='Tools and Classes for Statistical Models'
+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=('6b3e8d5af1a039db5c178498dbf354ed1c5627a8cea9229726644053443210ef')
 
 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: