From 4a5d3f3fe6702a5468bdb562706852dd7753bf80 Mon Sep 17 00:00:00 2001
From: Alessandro Barbieri <lssndrbarbieri@gmail.com>
Date: Sun, 24 Apr 2022 02:04:25 +0200
Subject: [PATCH] dev-R/ps: new version

Signed-off-by: Alessandro Barbieri <lssndrbarbieri@gmail.com>
---
 dev-R/ps/Manifest                             |  2 +-
 ...pect-LDFLAGS.patch => ps-1.7.0-fPIE.patch} |  4 +--
 dev-R/ps/ps-1.6.0.ebuild                      | 15 ---------
 dev-R/ps/ps-1.7.0.ebuild                      | 31 +++++++++++++++++++
 4 files changed, 34 insertions(+), 18 deletions(-)
 rename dev-R/ps/files/{ps-respect-LDFLAGS.patch => ps-1.7.0-fPIE.patch} (75%)
 delete mode 100644 dev-R/ps/ps-1.6.0.ebuild
 create mode 100644 dev-R/ps/ps-1.7.0.ebuild

diff --git a/dev-R/ps/Manifest b/dev-R/ps/Manifest
index 4b2d537e8b..ec0d7d2e2e 100644
--- a/dev-R/ps/Manifest
+++ b/dev-R/ps/Manifest
@@ -1 +1 @@
-DIST ps_1.6.0.tar.gz 119670 BLAKE2B bf838fe601c4a3fedc7b17b7222c888ee44e52ec571cb4557665fa8dd8f577da6f4616fa351cb3e13da92898a9bebe2581b4e6918f01862296dbeb99af55db5f SHA512 c5110e86ea72a3c1aff4d93fbcb630b00d9b59e49271530327dfa8f1f7f88b9caab909b76d1638f77518292bec438412961375035e156b3ceebe6fed381bae45
+DIST ps_1.7.0.tar.gz 125455 BLAKE2B e10b3c93c586d4e2d7e054a74b64d45506409ed79cd6c5b0eebacafa0f319d70ed7a0ab39a0df42420cf23c6e27790ed52706952d9d5c823ce91945a00975179 SHA512 69b53c22f39e5feab6834f81c48b0fe2e4772f6b400ead7a46a4bd07adb8fe2de8a9bafa8001ef7c6038f2fb1f9c0037905bbf8fe12a19b7b5b2c9627acbb910
diff --git a/dev-R/ps/files/ps-respect-LDFLAGS.patch b/dev-R/ps/files/ps-1.7.0-fPIE.patch
similarity index 75%
rename from dev-R/ps/files/ps-respect-LDFLAGS.patch
rename to dev-R/ps/files/ps-1.7.0-fPIE.patch
index a1ab2933e4..eeb966bfdc 100644
--- a/dev-R/ps/files/ps-respect-LDFLAGS.patch
+++ b/dev-R/ps/files/ps-1.7.0-fPIE.patch
@@ -4,11 +4,11 @@
  all: px @TARGETS@ $(SHLIB)
  
  px: px.c
--	$(CC) $(CFLAGS) -Wall px.c -o px
+-	$(CC) $(CFLAGS) $(LDFLAGS) -Wall px.c -o px
 +	$(CC) $(CFLAGS) $(LDFLAGS) -fPIE -Wall px.c -o px
  
  interrupt: interrupt.c
--	$(CC) $(CFLAGS) -Wall interrupt.c -o interrupt
+-	$(CC) $(CFLAGS) $(LDFLAGS) -Wall interrupt.c -o interrupt
 +	$(CC) $(CFLAGS) $(LDFLAGS) -fPIE -Wall interrupt.c -o interrupt
  
  clean:
diff --git a/dev-R/ps/ps-1.6.0.ebuild b/dev-R/ps/ps-1.6.0.ebuild
deleted file mode 100644
index 45ed001ab7..0000000000
--- a/dev-R/ps/ps-1.6.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit R-packages
-
-DESCRIPTION='List, Query, Manipulate System Processes'
-KEYWORDS="~amd64"
-LICENSE='MIT'
-
-DEPEND=">=dev-lang/R-3.1"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-respect-LDFLAGS.patch" )
diff --git a/dev-R/ps/ps-1.7.0.ebuild b/dev-R/ps/ps-1.7.0.ebuild
new file mode 100644
index 0000000000..f992740400
--- /dev/null
+++ b/dev-R/ps/ps-1.7.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit R-packages
+
+DESCRIPTION='List, Query, Manipulate System Processes'
+HOMEPAGE="
+	https://cran.r-project.org/package=ps
+	https://github.com/r-lib/ps
+	https://ps.r-lib.org/
+"
+KEYWORDS="~amd64"
+LICENSE='MIT'
+
+DEPEND=">=dev-lang/R-3.1"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-fPIE.patch" )
+
+SUGGESTED_PACKAGES="
+	dev-R/callr
+	dev-R/covr
+	dev-R/pingr
+	>=dev-R/processx-3.1.0
+	dev-R/R6
+	dev-R/rlang
+	>=dev-R/testthat-3.0.0
+	dev-R/tibble
+"