gentoo resync : 19.03.2019

13 files changed, 364 insertions, 33 deletions

diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index e7c89adcf87e..b758f56c59ef 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/cronie/Manifest b/sys-process/cronie/Manifest
index b095a7c412cf..a8b29d305708 100644
--- a/sys-process/cronie/Manifest
+++ b/sys-process/cronie/Manifest
@@ -1,8 +1,11 @@
 AUX cronie-1.2-cron.deny 148 BLAKE2B 3da92c65667ccacd74e32443e1cd5623d8040a75d783bac5055ed2c6773b1967c516cba82fcfe8ab6a25b65af6d009ae7c4178b332681970c9b2d339bc6473bd SHA512 e2e3a72a527d7d905b8e36f3a988eb71baebab5eb83d4a744d7c4ff4e9d6030d17bd9d8dbea30397027f4f0bbcd8df82ca0c2dd89777aade530af832fa26b5c6
 AUX cronie-1.3-initd 274 BLAKE2B 11ea62f09ca1263b9daecfcccc422d4ce28c200e03a1edbae91db9cae770910490a5c34f0f3e8a6a7ccc677aca6c555450fd9b2e7ec7aade163552f5613cbbd8 SHA512 f80a745dd00c62518dff3faff45bc79df97254e275bd5d26a1edc7452c23cebffa1d3eb3cb1767b23f40eae462f9432cca87b5b075a143169e056b38f21e85ae
 AUX cronie-1.4.3-pamd 231 BLAKE2B d993c025529e817435264c798bec757ead59d77540e1ff08a0f43d2d686d5c82eb9101455bc3191417323286a483e68795ec3a376c73b216ac4ea6d77fbaf2bf SHA512 32268d8b097e60eb039c023647ecd651b6940a8fe1587111ce0d49314bbb2de451214f98b7b703fd284e231c10bc4e616d4d0c63c107d9cdbc2bb470a17f2c3a
+AUX cronie-1.5.2-systemd.patch 861 BLAKE2B 17bd191d6f33f179d71e1e891b1091ef29092f271ecbaff308658ab3288bb02df101053f1f98f70cd8060c5e538265d8edf3bab39a7dc0d9c8d5a0ebeb0327fc SHA512 99694f838f5fb1fc70f7edd16780fd1822edece7895cee38a71585c2054fbf62b12225e63616935c631996a70b803c2e36b3f6043ccadafa73ebbc1b24edcbcb
+AUX cronie-1.5.3-systemd.patch 980 BLAKE2B dc11e7e1f072270f24e4ae420c2bde63412ec8d322d65972eb574cab2594388157c1ea4fb9297500de5ba4c32639792e810590e44dbc2650ae5bb5eab11c160b SHA512 a1e9fef4cff7503357785645ee91cccf54dcfd8433ed9d1fd22813849bcb47f0bb6f96b404a66450d865d586041415b480e53ef1599318df32331a657456b92f
 AUX cronie-crontab 477 BLAKE2B 3ae5d23fbd5439a314d087f95f7cd469d7c7c617c2d7f2c4b8671b550228906e8e68d539085b260ee52c4b27384d000ba34878f648310b50ba7bf1d6b6ef41e3 SHA512 ee626c83612bc143c5a1ba816c8147751ce519d0bd0de6adc2132b930872259ae4ecdcd465563ebce43d5fa913ab5e52a36392ae7933a71b3ebcdab840742ebb
-AUX cronie-systemd.patch 865 BLAKE2B 3418425036ce7558f516a70203dac43126299d815bd473940c296015cbd4a1fb2fb7032ca2b7d81edc8bb946f72e83a3282c071ef14a1f0dc28505e03cdaba43 SHA512 dcbeb3fba468f3b63965714075bb6619c768e0d14caddf8c4b62a5d6bee6a2f55be2f1d589b9ef5adefe57d9a20eb2c17216550519fd83bcea2151ccf151d4e0
 DIST cronie-1.5.2.tar.gz 121604 BLAKE2B 4225439fd13a32bba3bd24f25d7dd405cdb123e666ebbf14574143af9d161867f82ea3fc479d81a884590faaa9c42e19c971285e01a19d6ac793b7deb7fc4775 SHA512 6455e234becc44e6568fa25fd72abfaa293cb0bc2d2f1d124e551c068ba01083192b21e82e941158c8c1f41cb6dad3851d665b9f3baa82fd49080f3f8619740b
-EBUILD cronie-1.5.2.ebuild 2425 BLAKE2B 74fb6bb92af87b12a03e6041192e22c8c3795c0d6e6851b4cb05398fea9609f2c0f7089f417103381cb0508ee2215f9b5235623b5daa3d812eda52131c0f4244 SHA512 b0a17e79b031687597e3b2c184341b5741ebcbf62afe2e2deb4ce46c05631deffa3f46fc8ff5a0e013e18f9bfa50930cba2e1df86d1313fca80983817461119a
+DIST cronie-1.5.3.tar.gz 122363 BLAKE2B 68bfc5e83a1d006534291ab054dd8aaa4b351ba1abda8feed0a04885b74cfefa39cc3bd5d2caa5394b1167353da9f2c98a30e6343956cee1014d53370743acbd SHA512 18c5b51d27258f7d37286d6d1684142a74ec49994ba8332ae3afeb77320d242ada5fe5923baf043b460c2769658d74ec60ac73f37836947620660a6c2119086d
+EBUILD cronie-1.5.2.ebuild 2430 BLAKE2B 5d32b1ecee5a5ae64d6f62e83450c2c63dda18bce059e9c9bd335cbdacd10714db8f9b71ec28c236b0895dfd12ab2c7cbc7390c38a01f66f35d2b4a1b3ae2bc1 SHA512 da19bbf48fc70609b0b253a4f7b9c074b560edefaf6cae699a2c9db561e7cddaae958be00fc263528dff93222a2238282e95879c001efa39e3a54f3417cc10c2
+EBUILD cronie-1.5.3-r1.ebuild 2433 BLAKE2B e343c543f2c81c84ca1c9826c40fa4e886a1131dc219750974186cd58e981afae08c449a51d3ac460799121ee0bb51c6b60a1d03273982d7b465fe31cafe5795 SHA512 42c899e2e5974500f896c2d188a9da46ea2fbb0b2cbef5b853c54f9a57b3dac141518b266206f4b366952b3458a01b406669345b83cec2381a0d6f5defec91d5
 MISC metadata.xml 1014 BLAKE2B be8a19ba115ac54d9cc8c667072264f4eb134ba5133e404f74436ab5b0fd88b42a21d6a6f0441ebe3158ce475ea29f5eebc5d135e6b2317ef4b35ee1365bce52 SHA512 7f8295708e5049940e4e2147494e8ee2649635b492fe9096f1d61785f6fd8126d380be1517b253e668d6355d0d2d03e97af4fcca47ed42a6b70a5d669e7ab2c5
diff --git a/sys-process/cronie/cronie-1.5.2.ebuild b/sys-process/cronie/cronie-1.5.2.ebuild
index 34872882b77f..9daf0a21a947 100644
--- a/sys-process/cronie/cronie-1.5.2.ebuild
+++ b/sys-process/cronie/cronie-1.5.2.ebuild
@@ -26,7 +26,7 @@ CRON_SYSTEM_CRONTAB="yes"
 S="${WORKDIR}/${PN}-${P}"
 
 PATCHES=(
-	"${FILESDIR}/cronie-systemd.patch"
+	"${FILESDIR}/${PN}-1.5.2-systemd.patch"
 )
 
 pkg_setup() {
diff --git a/sys-process/cronie/cronie-1.5.3-r1.ebuild b/sys-process/cronie/cronie-1.5.3-r1.ebuild
new file mode 100644
index 000000000000..a9589e5fbea2
--- /dev/null
+++ b/sys-process/cronie/cronie-1.5.3-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools cron flag-o-matic pam systemd user
+
+DESCRIPTION="Cronie is a standard UNIX daemon cron based on the original vixie-cron"
+HOMEPAGE="https://github.com/cronie-crond/cronie"
+SRC_URI="https://github.com/cronie-crond/cronie/archive/${P}.tar.gz"
+
+LICENSE="ISC BSD BSD-2 GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="+anacron +inotify pam selinux"
+
+DEPEND="
+	pam? ( virtual/pam )
+	anacron? ( !sys-process/anacron
+		elibc_musl? ( sys-libs/obstack-standalone )
+	)
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	sys-apps/debianutils
+"
+
+#cronie supports /etc/crontab
+CRON_SYSTEM_CRONTAB="yes"
+
+S="${WORKDIR}/${PN}-${P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.5.3-systemd.patch"
+)
+
+pkg_setup() {
+	enewgroup crontab
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with inotify)
+		$(use_with pam)
+		$(use_with selinux)
+		$(use_enable anacron)
+		--enable-syscrontab
+		--with-daemon_username=cron
+		--with-daemon_groupname=cron
+	)
+
+	if use anacron; then
+		use elibc_musl && append-cflags "-lobstack"
+	fi
+	SPOOL_DIR="/var/spool/cron/crontabs" \
+	ANACRON_SPOOL_DIR="/var/spool/anacron" \
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	docrondir -m 1730 -o root -g crontab
+	fowners root:crontab /usr/bin/crontab
+	fperms 2751 /usr/bin/crontab
+
+	newconfd "${S}"/crond.sysconfig ${PN}
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}-crontab" crontab
+	newins "${FILESDIR}/${PN}-1.2-cron.deny" cron.deny
+
+	insinto /etc/cron.d
+	doins contrib/0hourly
+
+	newinitd "${FILESDIR}/${PN}-1.3-initd" ${PN}
+	newpamd "${FILESDIR}/${PN}-1.4.3-pamd" crond
+
+	systemd_newunit contrib/cronie.systemd cronie.service
+
+	if use anacron ; then
+		local anacrondir="/var/spool/anacron"
+		keepdir ${anacrondir}
+		fowners root:cron ${anacrondir}
+		fperms 0750 ${anacrondir}
+
+		insinto /etc
+		doins contrib/anacrontab
+
+		insinto /etc/cron.hourly
+		doins contrib/0anacron
+		fperms 0750 /etc/cron.hourly/0anacron
+	else
+		insinto /etc/cron.d
+		doins contrib/dailyjobs
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	cron_pkg_postinst
+
+	if [[ -n "${REPLACING_VERSIONS}" ]] ; then
+		ewarn "You should restart ${PN} daemon or else you might experience segfaults"
+		ewarn "or ${PN} not working reliably anymore."
+		einfo "(see https://bugs.gentoo.org/557406 for details.)"
+	fi
+}
diff --git a/sys-process/cronie/files/cronie-systemd.patch b/sys-process/cronie/files/cronie-1.5.2-systemd.patch
index 81c191737842..884e6655fa87 100644
--- a/sys-process/cronie/files/cronie-systemd.patch
+++ b/sys-process/cronie/files/cronie-1.5.2-systemd.patch
@@ -21,7 +21,7 @@ index ad46899..7a6c1a9 100644
  ExecReload=/bin/kill -HUP $MAINPID
  KillMode=process
 +Type=forking
-+PIDFile=/var/run/crond.pid
++PIDFile=/run/crond.pid
  
  [Install]
  WantedBy=multi-user.target
diff --git a/sys-process/cronie/files/cronie-1.5.3-systemd.patch b/sys-process/cronie/files/cronie-1.5.3-systemd.patch
new file mode 100644
index 000000000000..0aed5404d39a
--- /dev/null
+++ b/sys-process/cronie/files/cronie-1.5.3-systemd.patch
@@ -0,0 +1,33 @@
+From d022f457d838251963b23697d7ec907d43b637ac Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Sat, 16 Mar 2019 20:57:37 +0100
+Subject: [PATCH] Adjust systemd service unit for Gentoo
+
+forward-ported to v1.5.3 by Lars Wendler <polynomial-c@gentoo.org>
+---
+ contrib/cronie.systemd | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/contrib/cronie.systemd b/contrib/cronie.systemd
+index 19f2a98..6f4c608 100644
+--- a/contrib/cronie.systemd
++++ b/contrib/cronie.systemd
+@@ -3,12 +3,13 @@ Description=Command Scheduler
+ After=auditd.service nss-user-lookup.target systemd-user-sessions.service time-sync.target ypbind.service autofs.service
+ 
+ [Service]
+-EnvironmentFile=/etc/sysconfig/crond
+-ExecStart=/usr/sbin/crond -n $CRONDARGS
++ExecStart=/usr/sbin/crond
+ ExecReload=/bin/kill -HUP $MAINPID
+ KillMode=process
+ Restart=on-failure
+ RestartSec=30s
++Type=forking
++PIDFile=/run/crond.pid
+ 
+ [Install]
+ WantedBy=multi-user.target
+-- 
+2.21.0
+
diff --git a/sys-process/psmisc/Manifest b/sys-process/psmisc/Manifest
index 5240c6407df3..3e92cd970d67 100644
--- a/sys-process/psmisc/Manifest
+++ b/sys-process/psmisc/Manifest
@@ -1,5 +1,8 @@
+AUX psmisc-23.2-killall_check_truncated_16_char.patch 4440 BLAKE2B d04ab70003cb9de27c918ff72a283fbbfc087760a11ff4fad9cf587ff2aa4e3e22bafe94d615d192f33c0d7e0868efd03949e6f1b60acbeaba475600d2e546ee SHA512 ec9247957426865f009b5bd22bb518c229a52e5f26908e304fd6b3a891204bc53cf6cb2974d9b38741a5afb9b6f9ebfd622a7911412a53b90ec20366f3b3f4ca
+AUX psmisc-23.2-old_comm_len.patch 602 BLAKE2B ebcf12e6debdef6a708594f2193103f41c36babd2b5b6ae2027c17364102fc906bf88cd275e2a9183bde62d94da6106fa2eb36cdc62af4a77ca0623be2cc8d01 SHA512 fea4df7b9cabfc5e02628a7876a032027c738f1515b049caf5ccdc376cc6a64eacd1c232d006ab102c5c5aed9e0b40c3cbd23c9e698312dc853b06abd2809c8a
 DIST psmisc-23.1.tar.xz 296136 BLAKE2B e53f7b80f1106622d652dad772d4236a62a1eb58e277f078cf0392d5a0bd7963c66805e28f6d1300999f2e2e5dcb692b1ecb3f6d39cefa77ebbc87302cd730be SHA512 f678869ea555986a2538ada9630b74ce79304f3ee85cc9d69a3912d8d30ad491829eac0dcb69aae7003ee9b5de9645d2135b80a9e0b77824e60c417dc0be5f95
 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-r1.ebuild 1283 BLAKE2B 33c7b2e180fd3e5a28cbdf69f0428d3197b2fb23aa01225649fc2799f43ad47f18e8be62d2d974e7d4a53e1c97177e49b6702ac2a48c4ce45ec248de03182c24 SHA512 21641e7161b35ddc7a8b3510928cc5b5800a6f660552520171918ee2d889962c759b0421d6001e458ee7451ea30d24f2642cc2a119ef7dfb89044aae55754252
+EBUILD psmisc-23.2-r2.ebuild 1393 BLAKE2B 81dc63e68930f360225079d5bb2f7bf1cea2cc0c3db480b4318102fdff3ab9364caf521ffaeae36166a2a188008d1687ed9bbd3f50816369b8c2b10d864aef89 SHA512 bd9cd294c1100b3643db7f02f1e24b335de795e503b45aa3d145511ab3c4a1ef404275bfeab89ee35cf0688a28b46de60a19e79a82ce23aae8713aa612b64e15
 MISC metadata.xml 326 BLAKE2B 899a2f3fa295d2e0e8d6114542a149db37c730b845d7ba720127ca2b9b85044c53ff7aa107f866a6e2ece895a8159e25350b17d9665fc9ff915aed3640ac22cf SHA512 580a0e66078b7304d0bf76e3c990e61ee4c073b49381b60c5f3f01e2b64d5f0c318eb5596f7da09a70fa52dc93769b25f37f531038e5d7ce6278dda10e18117c
diff --git a/sys-process/psmisc/files/psmisc-23.2-killall_check_truncated_16_char.patch b/sys-process/psmisc/files/psmisc-23.2-killall_check_truncated_16_char.patch
new file mode 100644
index 000000000000..bfc2a24d5de9
--- /dev/null
+++ b/sys-process/psmisc/files/psmisc-23.2-killall_check_truncated_16_char.patch
@@ -0,0 +1,122 @@
+From 1188315cd037d73bf946a0003b70c6423cc330d2 Mon Sep 17 00:00:00 2001
+From: Craig Small <csmall@enc.com.au>
+Date: Wed, 7 Nov 2018 20:13:09 +1100
+Subject: [PATCH] killall: match on 16 character commlen too
+
+The comm length increase meant killall could accomodate the
+larger comm name given out by newer kernels but it meant that
+if a user relied on the previous 16 character truncation then
+processes that used to match would fail.
+
+killall now checks to see if the the comm is the old COMM_LEN
+length and the given name is longer than old COMM_LEN and does
+a truncated match as well.
+
+References:
+ https://bugs.debian.org/912748
+---
+ ChangeLog     |  3 +++
+ src/killall.c | 69 +++++++++++++++++++++++++++++++++++----------------
+ 2 files changed, 50 insertions(+), 22 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 7fd2abd..37962cb 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,6 @@
++Changes in 23.4
++===============
++	* killall: check also truncated 16 char comm names Debian #912748
+ Changes in 23.2
+ ===============
+ 	* misc: Command names increased from 16 to 64 characters
+diff --git a/src/killall.c b/src/killall.c
+index 2715515..09212a4 100644
+--- a/src/killall.c
++++ b/src/killall.c
+@@ -492,6 +492,49 @@ create_pid_table(int *max_pids, int *pids)
+     return pid_table;
+ }
+ 
++#define strcmp2(A,B,I) (I? strcasecmp((A),(B)):strcmp((A),(B)))
++#define strncmp2(A,B,L,I) (I? strncasecmp((A),(B),(L)):strncmp((A),(B),(L)))
++static int match_process_name(
++    const char *proc_comm,
++    const int comm_len,
++    const char *proc_cmdline,
++    const char *match_name,
++    const int match_len,
++    const int got_long
++                         )
++{
++    /* process is old length but matching longer */
++    if (comm_len == OLD_COMM_LEN - 1 && match_len >= OLD_COMM_LEN - 1)
++    {
++        if (got_long)
++        {
++            return (0 == strncmp2 (match_name, proc_cmdline, OLD_COMM_LEN - 1,
++                                   ignore_case));
++        } else {
++            return (0 == strncmp2 (match_name, proc_comm, OLD_COMM_LEN - 1,
++                                   ignore_case));
++        }
++    }
++
++    if (comm_len == COMM_LEN - 1 && match_len >= COMM_LEN - 1)
++    {
++        if (got_long)
++        {
++            return (0 == strncmp2 (match_name, proc_cmdline, COMM_LEN - 1,
++                                   ignore_case));
++        } else {
++            return (0 == strncmp2 (match_name, proc_comm, COMM_LEN - 1,
++                                   ignore_case));
++        }
++    }
++    /* Not old new COMM_LEN so we match all of it */
++    if (got_long)
++    {
++        return (0 == strcmp2 (match_name, proc_cmdline, ignore_case));
++    }
++    return (0 == strcmp2 (match_name, proc_comm, ignore_case));
++}
++
+ #ifdef WITH_SELINUX
+ static int
+ kill_all(int signal, int name_count, char **namelist, struct passwd *pwent, 
+@@ -599,28 +642,10 @@ kill_all (int signal, int name_count, char **namelist, struct passwd *pwent)
+             {
+                 if (!name_info[j].st.st_dev)
+                 {
+-                    if (length != COMM_LEN - 1 || name_info[j].name_length < COMM_LEN - 1)
+-                    {
+-                        if (ignore_case == 1)
+-                        {
+-                            if (strcasecmp (namelist[j], comm))
+-                                continue;
+-                        } else {
+-                            if (strcmp(namelist[j], comm))
+-                                continue;
+-                        }
+-                    } else {
+-                        if (ignore_case == 1)
+-                        {
+-                            if (got_long ? strcasecmp (namelist[j], command) :
+-                                strncasecmp (namelist[j], comm, COMM_LEN - 1))
+-                                continue;
+-                        } else {
+-                            if (got_long ? strcmp (namelist[j], command) :
+-                                strncmp (namelist[j], comm, COMM_LEN - 1))
+-                                continue;
+-                        }
+-                    }
++                    if (!match_process_name(comm, length, command, namelist[j],
++                                            name_info[j].name_length, got_long))
++                        continue;
++
+                 } else {
+                     int ok = 1; 
+                     if (asprintf (&path, PROC_BASE "/%d/exe", pid_table[i]) < 0)
+-- 
+2.18.1
+
diff --git a/sys-process/psmisc/files/psmisc-23.2-old_comm_len.patch b/sys-process/psmisc/files/psmisc-23.2-old_comm_len.patch
new file mode 100644
index 000000000000..ae237e691099
--- /dev/null
+++ b/sys-process/psmisc/files/psmisc-23.2-old_comm_len.patch
@@ -0,0 +1,28 @@
+From e2cf9f3e83e0fc0278ff39a4dfc8e3f2730eebca Mon Sep 17 00:00:00 2001
+From: Craig Small <csmall@enc.com.au>
+Date: Wed, 7 Nov 2018 20:19:38 +1100
+Subject: [PATCH] misc: Remember to add comm.h too
+
+The previous commit should have included comm.h too
+---
+ src/comm.h | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/comm.h b/src/comm.h
+index b54b998..b10eb36 100644
+--- a/src/comm.h
++++ b/src/comm.h
+@@ -33,4 +33,10 @@
+  */
+ #define COMM_LEN 64
+ 
++/*
++ * Older kernels had only 16 characters, which means we may have to check this
++ * too
++ */
++#define OLD_COMM_LEN 16
++
+ #endif
+-- 
+2.18.1
+
diff --git a/sys-process/psmisc/psmisc-23.2-r2.ebuild b/sys-process/psmisc/psmisc-23.2-r2.ebuild
new file mode 100644
index 000000000000..f06137e3682d
--- /dev/null
+++ b/sys-process/psmisc/psmisc-23.2-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 )
+
+PATCHES=(
+	"${FILESDIR}/${P}-old_comm_len.patch"
+	"${FILESDIR}/${P}-killall_check_truncated_16_char.patch"
+)
+
+src_configure() {
+	local myeconfargs=(
+		--disable-harden-flags
+		$(use_enable ipv6)
+		$(use_enable nls)
+		$(use_enable selinux)
+	)
+	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
+}
diff --git a/sys-process/supervise-scripts/Manifest b/sys-process/supervise-scripts/Manifest
index 1db43b397da5..3d39219db6af 100644
--- a/sys-process/supervise-scripts/Manifest
+++ b/sys-process/supervise-scripts/Manifest
@@ -1,4 +1,3 @@
 DIST supervise-scripts-4.0.tar.gz 23504 BLAKE2B a0167f0e75542e702940cece251bc7291fd4d6146e04e6b048ff1f5aa749a86a689ca98a1b66f1ca4ef4d0e954a0fb4542223a1bb9aa19796473ac6168e85d98 SHA512 7543759b4078dacea7678e55498d470d8ed6edf56394f913f97721ec60330a8a0f538560ca48dc0269c2f98ff2dbaef0cf39d22f3db12eda778126a466e317cc
-EBUILD supervise-scripts-4.0-r1.ebuild 593 BLAKE2B c4b3cdc248530adcb5862876f4a1699584f5cc07062473583f2837b316a497b0441112a435e004c6028a1061e3d3aaa18da17161e76c37472277845297da1b0f SHA512 8a98dc69169c7434849c4ff7bb1d239e6a9dbcc6b2ff7e2db281976f3a7697c91c4951cf068ea2bedc07cb08ae8fd9b1f0d3bd8d61e0c158a4057b8ad5456547
-EBUILD supervise-scripts-4.0.ebuild 609 BLAKE2B 86df7e181494f93fe642f8e1678e8de0bcd39b7ddf0b220f4e0308afe44195cf239a636595dff9916c68f939c00ef811dfe660a30169311c13768cbc9c44e167 SHA512 16cec031b705e2911ad3f1f4bc4112fa1e1919e1ca403bedbb04861694e17d294d954fee2dcc03595800256f3d2bba51e4ca491bc262c35bd5188c3bacc2e59b
+EBUILD supervise-scripts-4.0-r1.ebuild 588 BLAKE2B ed944fab1d515960a4eec068ef2790ef195bf8599656c43946e3c554b02524e8292f177f8507457b909a2de287fcc43e04eddd0a2d10642590c2489c57c132f5 SHA512 6cee09c9560bd8f97cb47d29ab110b5cea782cf270334b9fcd8f0f1b402e9212923db036f25b16c4a682aa8568effeb430f2de3cb6c316cceb9dacd3e46e1d4c
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-process/supervise-scripts/supervise-scripts-4.0-r1.ebuild b/sys-process/supervise-scripts/supervise-scripts-4.0-r1.ebuild
index 0d19d3c970c5..8ee51eed091d 100644
--- a/sys-process/supervise-scripts/supervise-scripts-4.0-r1.ebuild
+++ b/sys-process/supervise-scripts/supervise-scripts-4.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://untroubled.org/supervise-scripts/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="alpha amd64 ppc sparc x86"
 IUSE="doc"
 
 RDEPEND="virtual/daemontools"
diff --git a/sys-process/supervise-scripts/supervise-scripts-4.0.ebuild b/sys-process/supervise-scripts/supervise-scripts-4.0.ebuild
deleted file mode 100644
index c63c589d8040..000000000000
--- a/sys-process/supervise-scripts/supervise-scripts-4.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-DESCRIPTION="Starting and stopping daemontools managed services"
-HOMEPAGE="http://untroubled.org/supervise-scripts/"
-SRC_URI="http://untroubled.org/supervise-scripts/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc sparc x86"
-IUSE="doc"
-
-RDEPEND="virtual/daemontools"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	echo "/usr/bin" > conf-bin
-	echo "/usr/share/man" > conf-man
-}
-
-src_install() {
-	emake PREFIX="${D}" install || die "Install failed"
-	use doc && dohtml *.html
-}