gentoo resync : 30.09.2018

9 files changed, 90 insertions, 196 deletions

diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index dfeb91c269ab..3717cfb77ba0 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/glances/Manifest b/sys-process/glances/Manifest
index 21d9874d5b28..b3df4c881294 100644
--- a/sys-process/glances/Manifest
+++ b/sys-process/glances/Manifest
@@ -1,5 +1,7 @@
 DIST Glances-2.11.1.tar.gz 5665685 BLAKE2B 5de75e7770cc01a0ddd6fcb0583e5d23c02e5188c7d6cbd55d2999be9321a1affda351094b8614d206e640e5a1338266b5c77629ec53bb280b9166f7b6a996e2 SHA512 99adccff7d1531760834b76f9a9525df0bf9a8f6f57dbd1f7c3c0515ba3b5c94f26172e19bbc7c93cecbe4bdebcca87ab3a11dd592259509eff85346780ef43a
 DIST Glances-3.0.1.tar.gz 6247919 BLAKE2B 15c59c76037d0e268687762b7539deab0a40748c27837177aa59d97c551471694e5bef6caebc818b4d17e1e5aef5c7cfccbd671e4821446b3bc9175a7ad240ea SHA512 e035de66572facffb2f4ffd85cbb23bf035128ccfb3b31b22deee779b8d7c4606e390fa7c7eeb6421375fbfbdfc451f8d9f112cbf94f36092f2e6997f8cbe9d3
+DIST Glances-3.0.2.tar.gz 6248035 BLAKE2B 1f26788d1b1b66899bcbff8478cea75c8cc376a946b20299243f6f48aee59529560863eed329f10b58650b467a2c3032a1df613d5a8b5ea1e71085b3c0222a62 SHA512 db0ec256e2ae371db8840e7e51f0395a581efa89ab233bbaa219d5c138e751373aa79afd4de6120dd0085cd3305397c84435f22068b186e4a1d5fe83fae9d914
 EBUILD glances-2.11.1.ebuild 2427 BLAKE2B 65fb327b29fdb66c8c6a39abc446cfc972008b4b7b166408b1bda1f84701eefe058d6e6786fd742bcc90df3f8fb7a7970e1b01adc9ab81ac20720a64f77069cc SHA512 e0dde60b0554d30a79e3b14391b131ccb9510d1cdd2feb21b84009dc4f457d1f372c32db633f97f0cbe500d8e270dab801d3fb535757a97ecf7034abf39de7fa
-EBUILD glances-3.0.1.ebuild 2430 BLAKE2B 33a404ac95fe20fc36003ad7779bf01e10b73e93ba8389413e92891767f6cfcedc129115c023e35790b932c4f625067bb73e4fafa96d24cbad7f536ed3be6e26 SHA512 e4659c1fe97f4d19b4670fd99ae5ded672ed21fb5276597939252cf57aaee0aa3fab089e4a6f045ab43b6b5e4d37444797e81f86ef3adee53d6f4981a4563aab
+EBUILD glances-3.0.1.ebuild 2427 BLAKE2B 3d7379de31a5ea9937f62dcd5e6ad032470f14fe418be4b9a802b4f0a0f6c4f29098c24e6ee8bc63f1107c265897bc1f81c69a1c6d3a3143fc7abc030ffcc175 SHA512 5afcbe5d815a5d833907675afda4d3856b9cd0d982ff60ca7467f3a3937926a879bdda6ebd5229d983a70903e25646f07496bc50499d55a202259ac0904f8795
+EBUILD glances-3.0.2.ebuild 2427 BLAKE2B 3d7379de31a5ea9937f62dcd5e6ad032470f14fe418be4b9a802b4f0a0f6c4f29098c24e6ee8bc63f1107c265897bc1f81c69a1c6d3a3143fc7abc030ffcc175 SHA512 5afcbe5d815a5d833907675afda4d3856b9cd0d982ff60ca7467f3a3937926a879bdda6ebd5229d983a70903e25646f07496bc50499d55a202259ac0904f8795
 MISC metadata.xml 493 BLAKE2B 97c23025c2d239873dbdea975ab7d559895eb7373fab2bf0f47020890f5127f12bc3a5b5adc98f0538e4854886fb9ad1a4b20e2781abfb1832de9a6a436a4fe5 SHA512 10c02f8acca9afc8d09ac4ad42e8ae3f30d956fcc6ffb065feb3d43a5de8f5039d5da1115db3ada249b59993c3e4b18ea47f3178013710507b29b9cc0ccb6bec
diff --git a/sys-process/glances/glances-3.0.1.ebuild b/sys-process/glances/glances-3.0.1.ebuild
index 8f7a7c3865df..8d9c095beb96 100644
--- a/sys-process/glances/glances-3.0.1.ebuild
+++ b/sys-process/glances/glances-3.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,7 +25,7 @@ DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 
 RDEPEND="${DEPEND}
-	>=dev-python/psutil-2.0.0[${PYTHON_USEDEP}]"
+	>=dev-python/psutil-5.4.3[${PYTHON_USEDEP}]"
 
 CONFIG_CHECK="~TASK_IO_ACCOUNTING ~TASK_DELAY_ACCT ~TASKSTATS"
 
diff --git a/sys-process/glances/glances-3.0.2.ebuild b/sys-process/glances/glances-3.0.2.ebuild
new file mode 100644
index 000000000000..8d9c095beb96
--- /dev/null
+++ b/sys-process/glances/glances-3.0.2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_REQ_USE="ncurses"
+
+inherit distutils-r1 eutils linux-info
+
+DESCRIPTION="CLI curses based monitoring tool"
+HOMEPAGE="https://github.com/nicolargo/glances"
+SRC_URI="mirror://pypi/G/${PN^}/${P^}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+DEPEND="
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+RDEPEND="${DEPEND}
+	>=dev-python/psutil-5.4.3[${PYTHON_USEDEP}]"
+
+CONFIG_CHECK="~TASK_IO_ACCOUNTING ~TASK_DELAY_ACCT ~TASKSTATS"
+
+S="${WORKDIR}/${P^}"
+
+pkg_setup() {
+	linux-info_pkg_setup
+}
+
+python_prepare_all() {
+	# Remove duplicate entries of a prebuilt doc build and
+	# ensure install of the file glances.conf in /etc/${PN}
+	sed \
+		-e '/share\/doc\/glances/d' \
+		-e "s/'CONTRIBUTING.md',//" \
+		-e "s:'conf/glances.conf':('${EPREFIX}/etc/glances', ['conf/glances.conf':g" \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	# add an intended file from original data set from setup.py to DOCS
+	local DOCS=( README.rst CONTRIBUTING.md conf/glances.conf )
+	# build docs
+	if use doc; then
+		pushd docs
+		make html
+		popd
+		local HTML_DOCS=( docs/_build/html/. )
+	fi
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Action script feature" dev-python/pystache
+	optfeature "Autodiscover mode" dev-python/zeroconf
+	optfeature "Battery monitoring support" dev-python/batinfo
+	optfeature "Docker monitoring support" dev-python/docker-py
+	optfeature "Graphical/chart support" dev-python/matplotlib
+	# https://bitbucket.org/gleb_zhulik/py3sensors
+	# optfeature "Hardware monitoring support" dev-python/py3sensors
+	optfeature "IP plugin" dev-python/netifaces
+	optfeature "InfluxDB export module" dev-python/influxdb
+	optfeature "Hard drive temperature monitoring" app-admin/hddtemp
+	optfeature "Quicklook CPU info" dev-python/py-cpuinfo
+	optfeature "RAID support" dev-python/pymdstat
+	optfeature "RabbitMQ/ActiveMQ export module" dev-python/pika
+	# https://github.com/banjiewen/bernhard
+	# optfeature "Riemann export" dev-python/bernhard
+	optfeature "SNMP support" dev-python/pysnmp
+	optfeature "StatsD export module" dev-python/statsd
+	optfeature "Web server mode" dev-python/bottle
+}
diff --git a/sys-process/lsof/Manifest b/sys-process/lsof/Manifest
index 11fbd88c602c..f6c418aa6ff4 100644
--- a/sys-process/lsof/Manifest
+++ b/sys-process/lsof/Manifest
@@ -3,7 +3,6 @@ AUX lsof-4.90-darwin-cppfix.patch 408 BLAKE2B 761ad2ee39ff4c7080466b20322b58624f
 DIST lsof_4.89.tar.bz2 784560 BLAKE2B 375ad53fd5c26a79559295fc8bcb6c495c00bf546019001b498f064dbd111f3581d60a577c199ce2cbd49dac0c061cdaea99de56d6bf069dceb0dd8b2f836942 SHA512 cafb0209143c7863e5cebe7efc33a2520d36f9e26222350e4edfa18debbcfb5c81f42f71469e5913fb21f49a7562bbe761b72dfc8f297dadf75ac619cdcb318c
 DIST lsof_4.90.tar.bz2 791758 BLAKE2B 250025eb553ee4574cadadcc57fa52bd97d8ce4432e25e9e028d3eec4033be54d5cbab5f02e0a04365033b5d179ca50efa591efe4ac28077f63513edee131084 SHA512 8c1481ab72867488d800ad68c9de5c936f034f044c90eeed220fb5683f68ba8efa3dd0efe1e23b4d4968750255b475150ad08ae8627dd9aa0a5025498418351a
 DIST lsof_4.91.tar.bz2 791734 BLAKE2B cd6211caedea34fdbb89266fd78a70902117eda6d4d7fa69115426f4a6f5cb5296fa09bbd946648d8d93483881e4ea4e2190f090be155c1081850e8366cfd05a SHA512 49f811941dd6303f7cb0655fddb8b1177af5d1b18f2bd1edfab09d2c128aea73daecf09c7a5375979c66ba764c88a6e70c9086b55c3634e3be01ab1aa12e9f92
-EBUILD lsof-4.89-r1.ebuild 3252 BLAKE2B c06ea5f26ef03bc3ddd1712afb89a9bf5c7b37ee9fb553b6db65a50bc3cbf448c2f4be18a9c8453b09ff0e5d5b317e08506d7799b21000bb37d5df942efbb795 SHA512 f44b786019ecf0cf041f51725a8a5ee742b01723638ed215b60988b48a98c164aaee7beb4dcd906f836d383630edc6fe805910082f9782adf6734b2ee16e58e5
 EBUILD lsof-4.89.ebuild 2980 BLAKE2B 2d2229df4d2d952bffff94f3fe0066107e3a1ed93d410a043c6ac57221f3a4a65a5f1e63cc7614c8b34cb93a3bea6668938663d30c3ca8f10fee3a59e2af370c SHA512 3b3d5ce06f3123aca989c683d8c3ef165eafc488258e87e429c96159f5c402326cbfee8426594b89b3106c36d7c2c80e3a501c4d2f4dddd6c8fb2687017772b1
 EBUILD lsof-4.90.ebuild 3665 BLAKE2B f5450b27154595a2d30e07ed804c18f281d2f7a563a550fdb5437099cce5e1f45406da063c97fceca04e38f0f73eb99afbd01228aeaceec8631bc8b093363e74 SHA512 f652c0eaffc1dc51b298f68e1935621d9063d1709ec6154b63e560f3f39c16407efb3dac647c216b9552a02de3559ba115222252e01da4c4ee0cde02912c0dda
 EBUILD lsof-4.91.ebuild 3665 BLAKE2B f5450b27154595a2d30e07ed804c18f281d2f7a563a550fdb5437099cce5e1f45406da063c97fceca04e38f0f73eb99afbd01228aeaceec8631bc8b093363e74 SHA512 f652c0eaffc1dc51b298f68e1935621d9063d1709ec6154b63e560f3f39c16407efb3dac647c216b9552a02de3559ba115222252e01da4c4ee0cde02912c0dda
diff --git a/sys-process/lsof/lsof-4.89-r1.ebuild b/sys-process/lsof/lsof-4.89-r1.ebuild
deleted file mode 100644
index 0fc565391989..000000000000
--- a/sys-process/lsof/lsof-4.89-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-MY_P=${P/-/_}
-DESCRIPTION="Lists open files for running Unix processes"
-HOMEPAGE="ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/"
-SRC_URI="ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/${MY_P}.tar.bz2
-	ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/OLD/${MY_P}.tar.bz2
-	http://www.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/${MY_P}.tar.bz2"
-
-LICENSE="lsof"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples ipv6 rpc selinux static"
-
-RDEPEND="rpc? ( net-libs/libtirpc )
-	selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
-	rpc? ( virtual/pkgconfig )"
-
-S=${WORKDIR}/${MY_P}/${MY_P}_src
-
-src_unpack() {
-	unpack ${A}
-	cd ${MY_P} || die
-	unpack ./${MY_P}_src.tar
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.85-cross.patch #432120
-	# fix POSIX compliance with `echo`
-	sed -i \
-		-e 's:echo -n:printf:' \
-		AFSConfig Configure Customize Inventory tests/CkTestDB || die
-	# Convert `test -r header.h` into a compile test.
-	# Make sure we convert `test ... -a ...` into two `test` commands
-	# so we can then convert both over into a compile test. #601432
-	sed -i -E \
-		-e '/if test .* -a /s: -a : \&\& test :g' \
-		-e '/test -r/s:test -r \$\{LSOF_INCLUDE\}/([[:alnum:]/._]*):echo "#include <\1>" | ${LSOF_CC} ${LSOF_CFGF} -E - >/dev/null 2>\&1:g' \
-		-e 's:grep (.*) \$\{LSOF_INCLUDE\}/([[:alnum:]/._]*):echo "#include <\2>" | ${LSOF_CC} ${LSOF_CFGF} -E -P -dD - 2>/dev/null | grep \1:' \
-		Configure || die
-}
-
-target() {
-	case ${CHOST} in
-	*-darwin*)  echo darwin  ;;
-	*-freebsd*) echo freebsd ;;
-	*-solaris*) echo solaris ;;
-	*-aix*)     echo aixgcc  ;;
-	*)          echo linux   ;;
-	esac
-}
-
-src_configure() {
-	use static && append-ldflags -static
-
-	append-cppflags $(use rpc && $(tc-getPKG_CONFIG) libtirpc --cflags || echo "-DHASNOTRPC -DHASNORPC_H")
-	append-cppflags $(usex ipv6 -{D,U}HASIPv6)
-	[[ ${CHOST} == *-solaris2.11 ]] && append-cppflags -DHAS_PAD_MUTEX
-
-	export LSOF_CFGL="${CFLAGS} ${LDFLAGS} \
-		$(use rpc && $(tc-getPKG_CONFIG) libtirpc --libs)"
-
-	# Set LSOF_INCLUDE to a dummy location so the script doesn't poke
-	# around in it and mix /usr/include paths with cross-compile/etc.
-	touch .neverInv
-	LINUX_HASSELINUX=$(usex selinux y n) \
-	LSOF_INCLUDE=${T} \
-	LSOF_CC=$(tc-getCC) \
-	LSOF_AR="$(tc-getAR) rc" \
-	LSOF_RANLIB=$(tc-getRANLIB) \
-	LSOF_CFGF="${CFLAGS} ${CPPFLAGS}" \
-	./Configure -n $(target) || die
-}
-
-src_compile() {
-	emake DEBUG="" all
-}
-
-src_install() {
-	dobin lsof
-
-	if use examples ; then
-		insinto /usr/share/lsof/scripts
-		doins scripts/*
-	fi
-
-	doman lsof.8
-	dodoc 00*
-}
-
-pkg_postinst() {
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		einfo "Note: to use lsof on Solaris you need read permissions on"
-		einfo "/dev/kmem, i.e. you need to be root, or to be in the group sys"
-	elif [[ ${CHOST} == *-aix* ]] ; then
-		einfo "Note: to use lsof on AIX you need read permissions on /dev/mem and"
-		einfo "/dev/kmem, i.e. you need to be root, or to be in the group system"
-	fi
-}
diff --git a/sys-process/psmisc/Manifest b/sys-process/psmisc/Manifest
index 75465ea904a0..5240c6407df3 100644
--- a/sys-process/psmisc/Manifest
+++ b/sys-process/psmisc/Manifest
@@ -1,6 +1,5 @@
-AUX psmisc-23.2-killall_options_parsing.patch 2959 BLAKE2B bfd718d0e938b48411e38094d8e140b524414c936e62d32cd62a65e634f3db9f8b239fa0e12b3c834d04aed9aec552f5d388887d174062333f191e5431a710e7 SHA512 30c7bede4241f830e1c9e276d6969244eb80853f67b5db0c9a692ab2186f4acc09a4ae27924136e61f0602b228585b20af62cbb4099b5a1fc2eadc8d07bac2aa
 DIST psmisc-23.1.tar.xz 296136 BLAKE2B e53f7b80f1106622d652dad772d4236a62a1eb58e277f078cf0392d5a0bd7963c66805e28f6d1300999f2e2e5dcb692b1ecb3f6d39cefa77ebbc87302cd730be SHA512 f678869ea555986a2538ada9630b74ce79304f3ee85cc9d69a3912d8d30ad491829eac0dcb69aae7003ee9b5de9645d2135b80a9e0b77824e60c417dc0be5f95
-DIST psmisc-23.2.tar.xz 298784 BLAKE2B 61d1ad385f176cbe3ca0edcdd41ed026ab52aca4190c31551392cf83d0bf293de22899b13238d7ebeb1627013a2dc734ca91ad7a0a313c9d92b7af662728bf21 SHA512 114dc4d9a4d66374ee75cd6c845230c24540aa1d7562253c6fd5695552698afcf3e2ad2d7e9675addc63201f7e6d9e697287c72a638705194155bec508211dc3
+DIST psmisc-23.2.tar.xz 303820 BLAKE2B 6c63a54b91e1e31f812bc47c10937e8767fa2990bef66ee779bf44887625719e7342da05137222a6636df7a0e520c39318faba3e7a1022c54fd9f3f172ecc851 SHA512 a8d4e91443b66de1c4418fd74b5eb6dd42caddc937e75dfb35a4e49b9b35236db779e2a480c1693bcc7feaf0957b1028850134040685e88e6ff7ffcb572e20e8
 EBUILD psmisc-23.1-r1.ebuild 1273 BLAKE2B 9c98494ae95fa7e7f9ba859b07905f82f7a24757e8b60b1555f0dd6a74514550550bdb8a6aef826f4be48d0e8390d6f536dd13f9fb82fe055efc262d99838863 SHA512 23ea8e69530e30ea5d9fc92060ee0d0f0aa9e52501ec169cb1033e7887aebad73b52a06c996f064c988d11d21574de1279ebd7ee29552991e09c419edbb7d9b1
-EBUILD psmisc-23.2.ebuild 1349 BLAKE2B b7f25106c62178076d8df6aad89c8e30b0431f45e18fd2117691eb834454e61a8546726961cb0f9b92af47783794bd0901062532e6574f016e828505ccf88f40 SHA512 e100f01ad837ec36ab81a6f0d0ab6be88baaf7504116e5108003f9c86dbd50432911fa83d2682c8ae5264a45fd9b012ac1bd19a42d2722f8a5c520f5fdb3a6bc
+EBUILD psmisc-23.2-r1.ebuild 1283 BLAKE2B 33c7b2e180fd3e5a28cbdf69f0428d3197b2fb23aa01225649fc2799f43ad47f18e8be62d2d974e7d4a53e1c97177e49b6702ac2a48c4ce45ec248de03182c24 SHA512 21641e7161b35ddc7a8b3510928cc5b5800a6f660552520171918ee2d889962c759b0421d6001e458ee7451ea30d24f2642cc2a119ef7dfb89044aae55754252
 MISC metadata.xml 326 BLAKE2B 899a2f3fa295d2e0e8d6114542a149db37c730b845d7ba720127ca2b9b85044c53ff7aa107f866a6e2ece895a8159e25350b17d9665fc9ff915aed3640ac22cf SHA512 580a0e66078b7304d0bf76e3c990e61ee4c073b49381b60c5f3f01e2b64d5f0c318eb5596f7da09a70fa52dc93769b25f37f531038e5d7ce6278dda10e18117c
diff --git a/sys-process/psmisc/files/psmisc-23.2-killall_options_parsing.patch b/sys-process/psmisc/files/psmisc-23.2-killall_options_parsing.patch
deleted file mode 100644
index 48aecb24e5c4..000000000000
--- a/sys-process/psmisc/files/psmisc-23.2-killall_options_parsing.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 258ee9166e585f87005d3a9686938a4fa26669f9 Mon Sep 17 00:00:00 2001
-From: Craig Small <csmall@enc.com.au>
-Date: Tue, 18 Sep 2018 21:17:00 +1000
-Subject: [PATCH] killall: Another go at option parsing
-
-This now seems to be working. There are some evil hacks, especially for
-the -ve option combination but it seems that we have a winner.
-
-Added a bunch more option parsing tests which picked up -ILL passed but
--VTALRM did not. Not sure why, but length seems my guess
-
-References:
- psmisc/psmisc#13
- psmisc/psmisc#12
----
-
-diff --git a/src/killall.c b/src/killall.c
-index 64c406a..2715515 100644
---- a/src/killall.c
-+++ b/src/killall.c
-@@ -857,7 +857,7 @@ main (int argc, char **argv)
- 
-     opterr = 0;
- #ifdef WITH_SELINUX
--    while ( (optc = getopt_long(argc,argv,"egy:o:ilqrs:u:vwZ:VIn:",options,NULL)) != -1) {
-+    while ( (optc = getopt_long_only(argc,argv,"egy:o:ilqrs:u:vwZ:VIn:",options,NULL)) != -1) {
- #else
-         while ( (optc = getopt_long_only(argc,argv,"egy:o:ilqrs:u:vwVIn:",options,NULL)) != -1) {
- #endif
-@@ -914,7 +914,7 @@ main (int argc, char **argv)
-                     ignore_case = 1;
-                 } else {
-                     sig_num = get_signal (argv[optind]+1, "killall");
--                    skip_error=1;
-+                    skip_error=optind;
-                 }
-                 break;
-             case 'V':
-@@ -922,8 +922,10 @@ main (int argc, char **argv)
-                 if (strcmp(argv[optind-1],"-V") == 0 || strncmp(argv[optind-1],"--",2) == 0) {
-                     print_version();
-                     return 0;
-+                } else {
-+                    sig_num = get_signal (argv[optind]+1, "killall");
-+                    skip_error=optind;
-                 }
--                sig_num = get_signal (argv[optind]+1, "killall");
-                 break;
-             case 'n': {
-                 long num;
-@@ -948,6 +950,15 @@ main (int argc, char **argv)
-                 break;
- #endif /*WITH_SELINUX*/
-             case '?':
-+                if (skip_error == optind)
-+                    break;
-+                /* Sigh, this is a hack because -ve could be -version or
-+                 * -verbose */
-+                if (strncmp(argv[optind-1], "-ve", 3) == 0) {
-+                    verbose=1;
-+                    exact=1;
-+                    break;
-+                }
-                 /* Signal names are in uppercase, so check to see if the argv
-                  * is upper case */
-                 if (argv[optind-1][1] >= 'A' && argv[optind-1][1] <= 'Z') {
-@@ -957,9 +968,6 @@ main (int argc, char **argv)
-                     if (argv[optind-1][1] >= '0' && argv[optind-1][1] <= '9') {
-                         sig_num = atoi(argv[optind-1]+1);
-                     } else {
--                        if (skip_error)
--                            skip_error=0;
--                        else
-                             usage(NULL);
-                     }
-                 }
--- 
-2.18.0
-
diff --git a/sys-process/psmisc/psmisc-23.2.ebuild b/sys-process/psmisc/psmisc-23.2-r1.ebuild
index dd989ab0b6ba..2157294a11d1 100644
--- a/sys-process/psmisc/psmisc-23.2.ebuild
+++ b/sys-process/psmisc/psmisc-23.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,10 +21,6 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS ChangeLog NEWS README )
 
-PATCHES=(
-	"${FILESDIR}/${P}-killall_options_parsing.patch"
-)
-
 src_configure() {
 	local myeconfargs=(
 		--disable-harden-flags