Fixed PKGBUILD

3 files changed, 41 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2585daa446ac..2ff12db2e71a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -2,17 +2,29 @@ pkgbase = r-vctrs
 	pkgdesc = Vector Helpers
 	pkgver = 0.2.2
 	pkgrel = 1
-	url = http://cran.r-project.org/web/packages/vctrs/index.html
+	url = https://cran.r-project.org/package=vctrs
+	arch = i686
 	arch = x86_64
 	license = GPL3
-	depends = r
-	depends = r-backports
+	makedepends = gcc
+	depends = r>=3.2
+	depends = r-ellipsis>=0.2.0
 	depends = r-digest
 	depends = r-glue
-	depends = r-rlang
-	depends = r-zeallot
-	depends = r-ellipsis
-	source = http://cran.r-project.org/src/contrib/vctrs_0.2.2.tar.gz
+	depends = r-rlang>=0.4.2
+	optdepends = r-bit64
+	optdepends = r-covr
+	optdepends = r-crayon
+	optdepends = r-generics
+	optdepends = r-knitr
+	optdepends = r-pillar
+	optdepends = r-pkgdown
+	optdepends = r-rmarkdown
+	optdepends = r-testthat
+	optdepends = r-tibble
+	optdepends = r-xml2
+	optdepends = r-zeallot
+	source = https://cran.r-project.org/src/contrib/vctrs_0.2.2.tar.gz
 	md5sums = cc0e82d6af5756f7d22f5421420f5472
 
 pkgname = r-vctrs
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 6ae0b18a1f6c..000000000000
--- a/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/pkg
-/src
-*.tar.gz
-*.tar.xz
diff --git a/PKGBUILD b/PKGBUILD
index f269384f4c7e..bcdc19a62cdf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,30 @@
+# Contributor: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
 # Contributor: Grey Christoforo <first name at last name dot net>
-pkgname=r-vctrs
-_cran_name=vctrs
-pkgver=0.2.2
+
+_cranname=vctrs
+_cranver=0.2.2
+pkgname=r-${_cranname,,}
+pkgver=${_cranver//[:-]/.}
 pkgrel=1
 pkgdesc="Vector Helpers"
-arch=('x86_64')
-url="http://cran.r-project.org/web/packages/${_cran_name}/index.html"
-license=('GPL3')
-depends=('r' 'r-backports' 'r-digest' 'r-glue' 'r-rlang' 'r-zeallot' 'r-ellipsis')
-source=("http://cran.r-project.org/src/contrib/${_cran_name}_${pkgver}.tar.gz")
+arch=(i686 x86_64)
+url="https://cran.r-project.org/package=${_cranname}"
+license=(GPL3)
+depends=('r>=3.2' 'r-ellipsis>=0.2.0' r-digest r-glue 'r-rlang>=0.4.2')
+makedepends=(gcc)
+optdepends=(r-bit64 r-covr r-crayon r-generics r-knitr r-pillar r-pkgdown r-rmarkdown r-testthat r-tibble r-xml2 r-zeallot)
+source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
 md5sums=('cc0e82d6af5756f7d22f5421420f5472')
 
+build() {
+  cd "${srcdir}"
+
+  R CMD INSTALL ${_cranname}_${_cranver}.tar.gz -l ${srcdir}
+}
+
 package() {
- mkdir -p $pkgdir/usr/lib/R/library
- cd $srcdir
+  cd "${srcdir}"
 
- R CMD INSTALL -l $pkgdir/usr/lib/R/library ./${_cran_name}
+  install -dm0755 "${pkgdir}/usr/lib/R/library"
+  cp -a --no-preserve=ownership "${_cranname}" "${pkgdir}/usr/lib/R/library"
 }