sys-process/psmisc: resync ebuild with ebuild from tree

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>

6 files changed, 52 insertions, 143 deletions

diff --git a/sys-process/psmisc/Manifest b/sys-process/psmisc/Manifest
index e25cc4f1..c193226f 100644
--- a/sys-process/psmisc/Manifest
+++ b/sys-process/psmisc/Manifest
@@ -1 +1 @@
-DIST psmisc-22.21.tar.gz 457702 SHA256 97323cad619210845b696d7d722c383852b2acb5c49b5b0852c4f29c77a8145a SHA512 766aeb45687090b88b17176c5117a603e83fe92a13c013aea72c8ee80048adf02e18c7daa52ddfb8b2135f7c9a1bcae38896cdfb8d0158728d85a446c5e0d5ae WHIRLPOOL cbd4af3e54ce01f43558184b57a24e44dfb6e05d8438bd11e2308ee62535bb93dc417b08e66603966cc5912d7fa88c29df1529995a42e2a8b7c3da663b01681f
+DIST psmisc-23.1.tar.xz 296136 BLAKE2B e53f7b80f1106622d652dad772d4236a62a1eb58e277f078cf0392d5a0bd7963c66805e28f6d1300999f2e2e5dcb692b1ecb3f6d39cefa77ebbc87302cd730be SHA512 f678869ea555986a2538ada9630b74ce79304f3ee85cc9d69a3912d8d30ad491829eac0dcb69aae7003ee9b5de9645d2135b80a9e0b77824e60c417dc0be5f95
diff --git a/sys-process/psmisc/files/psmisc-22.21-add-limits_h.patch b/sys-process/psmisc/files/psmisc-22.21-add-limits_h.patch
deleted file mode 100644
index 6ebb34a6..00000000
--- a/sys-process/psmisc/files/psmisc-22.21-add-limits_h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur psmisc-22.21.orig/src/pstree.c psmisc-22.21/src/pstree.c
---- psmisc-22.21.orig/src/pstree.c	2013-09-29 05:11:56.000000000 +0000
-+++ psmisc-22.21/src/pstree.c	2014-03-26 13:30:36.000000000 +0000
-@@ -41,6 +41,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/ioctl.h>
-+#include <limits.h>
- 
- #include "i18n.h"
- #include "comm.h"
diff --git a/sys-process/psmisc/files/psmisc-22.21-fuser_typo_fix.patch b/sys-process/psmisc/files/psmisc-22.21-fuser_typo_fix.patch
deleted file mode 100644
index 5c5fd990..00000000
--- a/sys-process/psmisc/files/psmisc-22.21-fuser_typo_fix.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 3638cc55b4d08851faba46635d737b24d016665b Mon Sep 17 00:00:00 2001
-From: Brad Jorsch <anomie@users.sourceforge.net>
-Date: Fri, 28 Feb 2014 21:55:02 +1100
-Subject: [PATCH] Typo in fuser makes -M on all the time
-
-Brad found that fuser had the -M option on all the time.
-A simple but significant typo caused this, thanks the the patch.
-
-Bug-Debian: http://bugs.debian.org/740275
-
-Signed-off-by: Craig Small <csmall@enc.com.au>
----
- ChangeLog   | 4 ++++
- src/fuser.c | 2 +-
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/ChangeLog b/ChangeLog
-index fd1cccf..e5f784c 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,7 @@
-+Changes in 22.22
-+================
-+	* Fixed typo in fuser which has -M on Debian #740275
-+
- Changes in 22.21
- ================
- 	* Missing comma in fuser(1) added Debian #702391
-diff --git a/src/fuser.c b/src/fuser.c
-index b485f65..389b302 100644
---- a/src/fuser.c
-+++ b/src/fuser.c
-@@ -1174,7 +1174,7 @@ int main(int argc, char *argv[])
- 		usage(_("No process specification given"));
- 
- 	/* Check if -M flag was used and if so check mounts */
--	if (opts * OPT_ISMOUNTPOINT) {
-+	if (opts & OPT_ISMOUNTPOINT) {
- 	    check_mountpoints(&mounts, &names_head, &names_tail);
- 	}
- 
--- 
-2.2.2
-
diff --git a/sys-process/psmisc/files/psmisc-22.21-sysmacros.patch b/sys-process/psmisc/files/psmisc-22.21-sysmacros.patch
deleted file mode 100644
index 440c5e62..00000000
--- a/sys-process/psmisc/files/psmisc-22.21-sysmacros.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 367886e1c49238d1a02721f849564d77a163465b Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 7 Mar 2016 14:52:22 -0500
-Subject: [PATCH] fuser: include sysmacros.h for makedev
-
-BSD/Linux define makedev in the sysmacros.h header.  Include it directly
-instead of relying on types.h pulling it in for us.
----
- src/fuser.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/fuser.c b/src/fuser.c
-index da94d22..380046f 100644
---- a/src/fuser.c
-+++ b/src/fuser.c
-@@ -36,6 +36,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/socket.h>
-+#include <sys/sysmacros.h>
- #include <sys/wait.h>
- #include <arpa/inet.h>
- #include <netinet/in.h>
--- 
-2.6.2
-
diff --git a/sys-process/psmisc/psmisc-22.21-r3.ebuild b/sys-process/psmisc/psmisc-22.21-r3.ebuild
deleted file mode 100644
index b1eae765..00000000
--- a/sys-process/psmisc/psmisc-22.21-r3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="A set of tools that use the proc filesystem"
-HOMEPAGE="http://psmisc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ia64 ~mips ppc sh sparc x86"
-IUSE="ipv6 nls selinux X"
-
-RDEPEND=">=sys-libs/ncurses-5.7-r7:0=
-	nls? ( virtual/libintl )
-	selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-2.2.6b
-	nls? ( sys-devel/gettext )"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fuser_typo_fix.patch"
-	"${FILESDIR}/${P}-sysmacros.patch"
-	"${FILESDIR}/${P}-add-limits_h.patch"
-)
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-}
-
-src_configure() {
-	econf \
-		$(use_enable selinux) \
-		--disable-harden-flags \
-		$(use_enable ipv6) \
-		$(use_enable nls)
-}
-
-src_compile() {
-	# peekfd is a fragile crap hack #330631
-	nonfatal emake -C src peekfd || touch src/peekfd{.o,}
-	emake
-}
-
-src_install() {
-	default
-
-	use X || rm -f "${ED}"/usr/bin/pstree.x11
-
-	[[ -s ${ED}/usr/bin/peekfd ]] || rm -f "${ED}"/usr/bin/peekfd
-	[[ -e ${ED}/usr/bin/peekfd ]] || rm -f "${ED}"/usr/share/man/man1/peekfd.1
-
-	# fuser is needed by init.d scripts; use * wildcard for #458250
-	dodir /bin
-	mv "${ED}"/usr/bin/*fuser "${ED}"/bin || die
-}
diff --git a/sys-process/psmisc/psmisc-23.1-r1.ebuild b/sys-process/psmisc/psmisc-23.1-r1.ebuild
new file mode 100644
index 00000000..bad46991
--- /dev/null
+++ b/sys-process/psmisc/psmisc-23.1-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A set of tools that use the proc filesystem"
+HOMEPAGE="http://psmisc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+IUSE="ipv6 nls selinux X"
+
+RDEPEND=">=sys-libs/ncurses-5.7-r7:0=
+	nls? ( virtual/libintl )
+	selinux? ( sys-libs/libselinux )"
+DEPEND="${RDEPEND}
+	>=sys-devel/libtool-2.2.6b
+	nls? ( sys-devel/gettext )"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable selinux)
+		--disable-harden-flags
+		$(use_enable ipv6)
+		$(use_enable nls)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# peekfd is a fragile crap hack #330631
+	nonfatal emake -C src peekfd || touch src/peekfd{.o,}
+	emake
+}
+
+src_install() {
+	default
+
+	use X || rm -f "${ED%/}"/usr/bin/pstree.x11
+
+	[[ -s ${ED%/}/usr/bin/peekfd ]] || rm -f "${ED%/}"/usr/bin/peekfd
+	[[ -e ${ED%/}/usr/bin/peekfd ]] || rm -f "${ED%/}"/usr/share/man/man1/peekfd.1
+
+	# fuser is needed by init.d scripts; use * wildcard for #458250
+	dodir /bin
+	mv "${ED%/}"/usr/bin/*fuser "${ED%/}"/bin || die
+}