Update to 1.7.0

Also remove check() to avoid dependency cycle with r-testthat

2 files changed, 10 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 13976344616a..4b3f43a4a988 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,11 @@
 pkgbase = r-ps
 	pkgdesc = List, Query, Manipulate System Processes
-	pkgver = 1.6.0
-	pkgrel = 2
+	pkgver = 1.7.0
+	pkgrel = 1
 	url = https://cran.r-project.org/package=ps
 	arch = i686
 	arch = x86_64
 	license = MIT
-	checkdepends = procps-ng
-	checkdepends = r-curl
-	checkdepends = r-pingr
-	checkdepends = r-testthat
-	checkdepends = socat
 	depends = r
 	optdepends = r-callr
 	optdepends = r-covr
@@ -21,9 +16,9 @@ pkgbase = r-ps
 	optdepends = r-rlang
 	optdepends = r-testthat
 	optdepends = r-tibble
-	source = https://cran.r-project.org/src/contrib/ps_1.6.0.tar.gz
-	source = R-MIT-TEMPLATE::https://cran.r-project.org/web/licenses/MIT
-	sha256sums = 89ad7ddc5e0818bccacfd0673ddf2da0892ac2a3b4d3a821e40884ab1e96bf31
+	source = https://cran.r-project.org/src/contrib/ps_1.7.0.tar.gz
+	source = CRAN-MIT-TEMPLATE::https://cran.r-project.org/web/licenses/MIT
+	sha256sums = 8220cf32c6a12c908b6b7669f96b57445d3147a1aa484b9b5209e0f3fd4b52e1
 	sha256sums = e76e4aad5d3d9d606db6f8c460311b6424ebadfce13f5322e9bae9d49cc6090b
 
 pkgname = r-ps
diff --git a/PKGBUILD b/PKGBUILD
index 71b0e9593159..d62955d3f384 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,22 +2,15 @@
 # Contributor: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
 
 _cranname=ps
-_cranver=1.6.0
+_cranver=1.7.0
 pkgname=r-${_cranname,,}
 pkgver=${_cranver//[:-]/.}
-pkgrel=2
+pkgrel=1
 pkgdesc="List, Query, Manipulate System Processes"
 arch=(i686 x86_64)
 url="https://cran.r-project.org/package=${_cranname}"
 license=(MIT)
 depends=(r)
-checkdepends=(
-    procps-ng
-    r-curl
-    r-pingr
-    r-testthat
-    socat
-)
 optdepends=(
     r-callr
     r-covr
@@ -30,30 +23,20 @@ optdepends=(
     r-tibble
 )
 source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz"
-        "R-MIT-TEMPLATE::https://cran.r-project.org/web/licenses/MIT")
-sha256sums=('89ad7ddc5e0818bccacfd0673ddf2da0892ac2a3b4d3a821e40884ab1e96bf31'
+        "CRAN-MIT-TEMPLATE::https://cran.r-project.org/web/licenses/MIT")
+sha256sums=('8220cf32c6a12c908b6b7669f96b57445d3147a1aa484b9b5209e0f3fd4b52e1'
             'e76e4aad5d3d9d606db6f8c460311b6424ebadfce13f5322e9bae9d49cc6090b')
 
-prepare() {
-  # pass LDFLAGS to linker when linking px binary to enable RELRO
-  sed -i 's/-o px/-o px $(LDFLAGS)/' "${_cranname}/src/Makevars.in"
-}
-
 build() {
   mkdir -p build
   R CMD INSTALL "${_cranname}" -l "${srcdir}/build"
 }
 
-check() {
-  cd "${_cranname}/tests"
-  R_LIBS="${srcdir}/build" NOT_CRAN=true R --vanilla -q -f testthat.R
-}
-
 package() {
   install -dm0755 "${pkgdir}/usr/lib/R/library"
 
   cp -a --no-preserve=ownership "build/${_cranname}" "${pkgdir}/usr/lib/R/library"
 
-  install -Dm644 R-MIT-TEMPLATE "${pkgdir}/usr/share/licenses/${pkgname}/MIT"
+  install -Dm644 CRAN-MIT-TEMPLATE "${pkgdir}/usr/share/licenses/${pkgname}/MIT"
   install -Dm644 "${_cranname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }