sys-process/psmisc: Sync with upstream

Drop r99 postfix.

4 files changed, 83 insertions, 5 deletions

diff --git a/sys-process/psmisc/Manifest b/sys-process/psmisc/Manifest
index d8fc7abe..d5336827 100644
--- a/sys-process/psmisc/Manifest
+++ b/sys-process/psmisc/Manifest
@@ -1,4 +1,6 @@
 AUX psmisc-22.21-add-limits_h.patch 355 SHA256 363ba4dcc2627d7db260f29a97888fe8b58315fa5317bf3506e685c9fc30e46e SHA512 a26cd96decdbcb7ed8822a5cee74254b428a0ff8b76c972b08be80a345f29bfb915ccd7b3816d1ca0c559ddc7b1a945f49091142abef74e508d57ba487b39c49 WHIRLPOOL 3fc7e0172f709158a19e7f6679d1918f8abd4a085be99537634beff5075eb7527cf9dbf20ed960047b7506ce7800808560245cb76ae87cda27b01d70d0aa14bd
+AUX psmisc-22.21-fuser_typo_fix.patch 1226 SHA256 51c251f07ad0a898a5654fe18d8955e08943025c5df2f73d0f65d00c4b6c3c92 SHA512 c2e46a19959f368935462bc93bde8bf5ee4a3b5530a66255cd9a83be04acbc6246e0a3900efeb1cb9f1bbaf5a1435c0c65d677f643664be25f87662e6048c930 WHIRLPOOL 48c6bc0bd4c4b521be621406d5b52d4df47687307ec681e5c20dfce77db22c7f1db322d40614a9eb59cfa3aebd287af8e23b6ce9cba21dd986f78718669c34e5
+AUX psmisc-22.21-sysmacros.patch 693 SHA256 c3e071e67c808c68acc49edc3b8d7ad665780403ca697e6e74b290816ec91633 SHA512 febac721daad0046eb8367015657904eafaa934dc4b314f19ec487c1953ea2f4ff70e79e7c94473a20e5a69e7ed1eb17a4cfbbac6b102622b12322bb9cc76a09 WHIRLPOOL 394bfdfc37f8ed754092b5868a5bafd1858fdc8ee00b060f0455bd0736ed84288b7bd1aed0d9e17c108fcc166b056dd10547f067be3ee0e25e4b0db9bfd6a509
 DIST psmisc-22.21.tar.gz 457702 SHA256 97323cad619210845b696d7d722c383852b2acb5c49b5b0852c4f29c77a8145a SHA512 766aeb45687090b88b17176c5117a603e83fe92a13c013aea72c8ee80048adf02e18c7daa52ddfb8b2135f7c9a1bcae38896cdfb8d0158728d85a446c5e0d5ae WHIRLPOOL cbd4af3e54ce01f43558184b57a24e44dfb6e05d8438bd11e2308ee62535bb93dc417b08e66603966cc5912d7fa88c29df1529995a42e2a8b7c3da663b01681f
-EBUILD psmisc-22.21-r99.ebuild 1237 SHA256 81cdbeabdc803e1b8c802b62fa7655787958e2f9c53469fa81f97c2686d7f1b1 SHA512 c1b0bcfe3f27e6b3e49ca17d4b07130b3236184b3fc66dae49e35151407083176998d9b87a6fccfb324b5743e9027b516541a067c67f0e1730fe02c4b2f6447d WHIRLPOOL 29cff0f558de06982f499b14a76943dab1e5583a7e65ac265df90679108e5c28336f9a449eb12bf019e4ae619f87e02e823f99c8bacdb64bb259b4b2d1f42f82
+EBUILD psmisc-22.21-r3.ebuild 1439 SHA256 00354a92c6189309051fe34a0a904c4669d7aff9f92600f3153e97e656e8e8b6 SHA512 626ac29a208d3caf05999da9db23eb8a7454984c68513ed83a29d4d1895a20d4859574d6593de65d2946ad1031d0a6d1854013e0151e6dfe5ed8e9e0e5836b87 WHIRLPOOL 22a4a0218cc31a388c52ef1d0e411c336c13cc79b399dffdf29fcb6e598e0e1e0397a7a50f8a822530cc0eccc23f7cf73a8c71b29450c0220f9b2a63945dd930
 MISC metadata.xml 326 SHA256 f9e015cc6214350091a0d68a07299ed5e6ad518b10eb91902da25726658623f3 SHA512 580a0e66078b7304d0bf76e3c990e61ee4c073b49381b60c5f3f01e2b64d5f0c318eb5596f7da09a70fa52dc93769b25f37f531038e5d7ce6278dda10e18117c WHIRLPOOL c0a2727f3ee0a38abe0ad2ceb0adf0b476a1fe9ba8435168c457aa0326aa8fb54f25d7828ac11a1f98b9e1066e69112ecb77b02111449680b64073163130bfa5
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
new file mode 100644
index 00000000..5c5fd990
--- /dev/null
+++ b/sys-process/psmisc/files/psmisc-22.21-fuser_typo_fix.patch
@@ -0,0 +1,44 @@
+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
new file mode 100644
index 00000000..440c5e62
--- /dev/null
+++ b/sys-process/psmisc/files/psmisc-22.21-sysmacros.patch
@@ -0,0 +1,26 @@
+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-r99.ebuild b/sys-process/psmisc/psmisc-22.21-r3.ebuild
index cc44e773..800f3597 100644
--- a/sys-process/psmisc/psmisc-22.21-r99.ebuild
+++ b/sys-process/psmisc/psmisc-22.21-r3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=5
 
 inherit eutils
 
@@ -12,10 +12,10 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux"
 IUSE="ipv6 nls selinux X"
 
-RDEPEND=">=sys-libs/ncurses-5.7-r7
+RDEPEND=">=sys-libs/ncurses-5.7-r7:0=
 	nls? ( virtual/libintl )
 	selinux? ( sys-libs/libselinux )"
 DEPEND="${RDEPEND}
@@ -24,8 +24,14 @@ DEPEND="${RDEPEND}
 
 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 "${FILESDIR}"/${P}-add-limits_h.patch
+	epatch "${PATCHES[@]}"
 }
 
 src_configure() {