Fixed PKGBUILD

3 files changed, 34 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5bf189c2eebd..5e5705acd86d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,18 @@
 pkgbase = r-r6
-	pkgdesc = Create Compact Hash Digests of R Objects
+	pkgdesc = Encapsulated Classes with Reference Semantics
 	pkgver = 2.4.1
 	pkgrel = 1
-	url = https://CRAN.R-project.org/package=R6
-	arch = x86_64
-	license = GPL3
-	depends = r
-	source = http://cran.r-project.org/src/contrib/R6_2.4.1.tar.gz
+	url = https://cran.r-project.org/package=R6
+	arch = any
+	license = MIT
+	depends = r>=3.0
+	optdepends = r-knitr
+	optdepends = r-microbenchmark
+	optdepends = r-pryr
+	optdepends = r-testthat
+	optdepends = r-ggplot2
+	optdepends = r-scales
+	source = https://cran.r-project.org/src/contrib/R6_2.4.1.tar.gz
 	md5sums = 78cabfb5a4e18fab29659752271ab4af
 
 pkgname = r-r6
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 461bd5a934fc..eec7e10db5bb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,29 @@
+# Contributor: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
 # Contributor: Grey Christoforo <first name at last name dot net>
-pkgname=r-r6
-_cran_name=R6
-pkgver=2.4.1
+
+_cranname=R6
+_cranver=2.4.1
+pkgname=r-${_cranname,,}
+pkgver=${_cranver//[:-]/.}
 pkgrel=1
-pkgdesc="Create Compact Hash Digests of R Objects"
-arch=('x86_64')
-url="https://CRAN.R-project.org/package=${_cran_name}"
-license=('GPL3')
-depends=('r')
-source=("http://cran.r-project.org/src/contrib/${_cran_name}_${pkgver}.tar.gz")
+pkgdesc="Encapsulated Classes with Reference Semantics"
+arch=(any)
+url="https://cran.r-project.org/package=${_cranname}"
+license=(MIT)
+depends=('r>=3.0')
+optdepends=(r-knitr r-microbenchmark r-pryr r-testthat r-ggplot2 r-scales)
+source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
 md5sums=('78cabfb5a4e18fab29659752271ab4af')
 
+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"
 }