takeover package

2 files changed, 23 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index af1a40b02123..e321a07f34ba 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -4,10 +4,10 @@ pkgbase = r-r.methodss3
 	pkgrel = 1
 	url = https://cran.r-project.org/package=R.methodsS3
 	arch = any
-	license = LGPL2.1
-	license = LGPL3
-	depends = r>=2.13.0
-	source = https://cran.microsoft.com/snapshot/2022-06-25/src/contrib/R.methodsS3_1.8.2.tar.gz
+	license = LGPL
+	depends = r
+	optdepends = r-codetools
+	source = https://cran.r-project.org/src/contrib/R.methodsS3_1.8.2.tar.gz
 	sha256sums = 822d5e61dad4c91e8883be2b38d7b89f87492046d0fe345704eb5d2658927c2e
 
 pkgname = r-r.methodss3
diff --git a/PKGBUILD b/PKGBUILD
index 6fc119b0e08e..58a5a68cb95d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,29 @@
-# Maintainer: Robert Greener <me@r0bert.dev>
-# Contributor: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
+# Maintainer: Guoyi Zhang <guoyizhang at malacology dot net>
 
-_cranname=R.methodsS3
-_cranver=1.8.2
-_updatedate=2022-06-25
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
+_pkgname=R.methodsS3
+_pkgver=1.8.2
+pkgname=r-${_pkgname,,}
+pkgver=1.8.2
 pkgrel=1
-pkgdesc="S3 Methods Simplified"
-arch=(any)
-url="https://cran.r-project.org/package=${_cranname}"
-license=(LGPL2.1 LGPL3)
-depends=('r>=2.13.0')
-source=("https://cran.microsoft.com/snapshot/${_updatedate}/src/contrib/${_cranname}_${_cranver}.tar.gz")
+pkgdesc='S3 Methods Simplified'
+arch=('any')
+url="https://cran.r-project.org/package=${_pkgname}"
+license=('LGPL')
+depends=(
+  r
+)
+optdepends=(
+  r-codetools
+)
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
 sha256sums=('822d5e61dad4c91e8883be2b38d7b89f87492046d0fe345704eb5d2658927c2e')
 
 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: