[lilac] updated to 1.0.1-7

2 files changed, 46 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5cc1debed802..98c3f2971d78 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,11 @@
 pkgbase = r-ids
-	pkgdesc = Generate random or human readable and pronounceable identifiers.
+	pkgdesc = Generate Random Identifiers
 	pkgver = 1.0.1
-	pkgrel = 1
+	pkgrel = 7
 	url = https://cran.r-project.org/package=ids
 	arch = any
-	license = GPL3
-	depends = r>=3.2
+	license = MIT
+	checkdepends = r-testthat
 	depends = r-openssl
 	depends = r-uuid
 	optdepends = r-knitr
@@ -13,7 +13,7 @@ pkgbase = r-ids
 	optdepends = r-rmarkdown
 	optdepends = r-testthat
 	source = https://cran.r-project.org/src/contrib/ids_1.0.1.tar.gz
+	md5sums = da97e1c97b795a9c0e4f51dcb1d928bb
 	sha256sums = b6212a186063c23116c5cbd3cca65dbb8977dd737261e4526ebee8f64852cfe8
 
 pkgname = r-ids
-
diff --git a/PKGBUILD b/PKGBUILD
index cb1ef7d51cfc..493624e98ace 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,47 @@
-# Maintainer: Pranav K Anupam <pranavanupam@yahoo.com>
-_cranname=ids
-_cranver=1.0.1
-_pkgtar=${_cranname}_${_cranver}.tar.gz
-pkgname=r-ids
-pkgver=${_cranver//[:-]/.}
-pkgrel=1
-pkgdesc="Generate random or human readable and pronounceable identifiers."
-arch=('any')
-url="https://cran.r-project.org/package=${_cranname}"
-license=('GPL3')
-depends=('r>=3.2' 'r-openssl' 'r-uuid')
-optdepends=('r-knitr' 'r-rcorpora' 'r-rmarkdown' 'r-testthat')
-
+# Maintainer: Pekka Ristola <pekkarr [at] protonmail [dot] com>
+# Contributor: Guoyi Zhang <guoyizhang at malacology dot net>
+# Contributor: Pranav K Anupam <pranavanupam@yahoo.com>
 
+_pkgname=ids
+_pkgver=1.0.1
+pkgname=r-${_pkgname,,}
+pkgver=${_pkgver//-/.}
+pkgrel=7
+pkgdesc="Generate Random Identifiers"
+arch=(any)
+url="https://cran.r-project.org/package=${_pkgname}"
+license=(MIT)
+depends=(
+  r-openssl
+  r-uuid
+)
+checkdepends=(
+  r-testthat
+)
+optdepends=(
+  r-knitr
+  r-rcorpora
+  r-rmarkdown
+  r-testthat
+)
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
+md5sums=('da97e1c97b795a9c0e4f51dcb1d928bb')
 sha256sums=('b6212a186063c23116c5cbd3cca65dbb8977dd737261e4526ebee8f64852cfe8')
-source=("https://cran.r-project.org/src/contrib/${_pkgtar}")
 
-build(){
-cd "${srcdir}"
-R CMD INSTALL ${_pkgtar} -l ${srcdir}
+build() {
+  mkdir -p build
+  R CMD INSTALL "$_pkgname" -l build
+}
+
+check() {
+  cd "$_pkgname/tests"
+  R_LIBS="$srcdir/build" NOT_CRAN=true Rscript --vanilla testthat.R
 }
+
 package() {
-cd "${scrdir}"
-install -dm0755 "$pkgdir/usr/lib/R/library"
-cp -a --no-preserve=ownership "${_cranname}" "${pkgdir}/usr/lib/R/library"
+  install -d "$pkgdir/usr/lib/R/library"
+  cp -a --no-preserve=ownership "build/$_pkgname" "$pkgdir/usr/lib/R/library"
+
+  install -d "$pkgdir/usr/share/licenses/$pkgname"
+  ln -s "/usr/lib/R/library/$_pkgname/LICENSE" "$pkgdir/usr/share/licenses/$pkgname"
 }