13 files changed, 140 insertions, 139 deletions
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index af58367603c0..c1b7938882e2 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/iotop/Manifest b/sys-process/iotop/Manifest
index 33e1e291c544..8ce499eea408 100644
--- a/sys-process/iotop/Manifest
+++ b/sys-process/iotop/Manifest
@@ -1,4 +1,4 @@
 AUX iotop-0.6-setup.py3.patch 1151 BLAKE2B da00d36a1778173e2d77041fec584aa1ff42062932915ff2a6beb9aaeda0699fdb6a6c9903eee56e10efb9ed9d6def08a8d7fbbe714def4e8bff4504500aa55e SHA512 6b97da5ef9e78c268193ce0270328f4c4d99d30f532fe68dac9bd033bb0a5e6cdb3145b53a7670c7babdae7f170473d1f9eb23137b5950fdaceadde266b4bb73
 DIST iotop-0.6.tar.bz2 29779 BLAKE2B 6c979f7beef4e9ec6536eb5ec113ab7089ccb0b8b00dfca6181408390584dac0eae18b110c3f4837a25defd7ab2c2e9d79f1f5cad762f97519e94847951f0037 SHA512 b1047da3bc46604447cc8ab22442a3a5381e1a79a6b176fe9ee8402ee5cebb959205407a6aeaffccccde9d2f67624ff8ee6717b051838f13ab88bf3a16db3ab9
-EBUILD iotop-0.6.ebuild 724 BLAKE2B 5149971ef2244a3ac5d15b2526281f3fcadab6842b34fec546694cf6099ea4f3973bb986f00ae099df266fc1547d0ccd743f579a1e2ad901b1865ff6eba64263 SHA512 cae68ec22904f2e4d89d0e09a4de9d7171badb48a891d8bfb4a8eb151f8affdf43bd1cecc0d0c75bfebd4b3951e4b424070fcdf9bb5f51a698f5eba0871c1d9a
+EBUILD iotop-0.6.ebuild 723 BLAKE2B 1a0cf691eece2d5a345aa295f0458fcb368b97be399f3e204a02aff288c0147adec7ce1b9c5ce0ad01dc68a722d77fb8fa05cb337f54e65d7219d6031dcea950 SHA512 e95470cf93d36ed84240a77e813b8c4148d3c687f362d37a6c1891ee9a524b7f1e05231e83c3d9f15e8ce5cf35da58d61a5caa395b1ae86f495d11b36e52a295
 MISC metadata.xml 359 BLAKE2B d2fa2d7b93eeb82a5494f0c92270a512083e71b60699ebdd9b860560796b21e94e77be8c5af0dcd4533bc3b6a4bc173d72cef1d5da736f7b948c83982ef91489 SHA512 12f1f2e8971ea7d83248c637e6128be106087f733af8625fea8dd7ad9c891ef38ea0eda8ed7f6cfe96a4c0b795a799c1b51301e0ae424898c413a354305c7852
diff --git a/sys-process/iotop/iotop-0.6.ebuild b/sys-process/iotop/iotop-0.6.ebuild
index 33d342c58296..3faec2aa4511 100644
--- a/sys-process/iotop/iotop-0.6.ebuild
+++ b/sys-process/iotop/iotop-0.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://guichaz.free.fr/iotop/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ~ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 CONFIG_CHECK="~TASK_IO_ACCOUNTING ~TASK_DELAY_ACCT ~TASKSTATS ~VM_EVENT_COUNTERS"
diff --git a/sys-process/tini/Manifest b/sys-process/tini/Manifest
index e0eabb080ca4..5e4d5a1a1ae9 100644
--- a/sys-process/tini/Manifest
+++ b/sys-process/tini/Manifest
@@ -1,5 +1,7 @@
 DIST tini-0.16.1.tar.gz 29641 BLAKE2B 637ee17bbf8553b7803dc78cc40ec55ea919ec003005c7f2524322df6cc93a2e4c6fc017fa25c581f50eb17482956ebf37bf49c7796c33d227c7327ca467a906 SHA512 aa0a802c403a07771a2b28a07b97fa2c93d40b5d5be2cba6556c8e7a92e608453010625d0236d26c27bdd2820aed3ad9ca676b70f7fcd5986d7f91eb928d053c
 DIST tini-0.17.0.tar.gz 30881 BLAKE2B 8212bfa56b6ade3b79e1d4d3144b10b98e4daf19e9a9c93f6db44dfea22f80b4c6810619832b339984681d1933d00964f7cfbf516286354141f795d3cb5e745f SHA512 4e59241bd621cd89f9c07dcd7a21754a947c87d3571b06bc5f034c0059a20cbc02d4d22fd08a79633b84fd47980dbf5240e2d2fa382aaf5c32e6003710b7691a
+DIST tini-0.18.0.tar.gz 32152 BLAKE2B d676f0f1b4d9f6dca98cdb626aa7c525ec55e090cfeb1cf0e9ab167f1ef4285123223873e92e81d5d62ceb631e26e9012f16b28b1d35813ac801f8e4594be70b SHA512 83279180b6a875aaff9b6b7446ee7e71fd05357279744afcb4db67c76572dc871acfba86c035857009b5dd88ca75d9f2e815d6a925563cdb3e6e771eb83be9b1
 EBUILD tini-0.16.1.ebuild 910 BLAKE2B 44bd74197ebd18fddb00f4f9b285da19dcdbcdce97548317ca4e786e7e3ce5724e3a2c85c5741b6ceff57e46c87c632cd27e2c629a7b18ecb7d98eb91b0f4e63 SHA512 a7f116a229f64b1b90f7117ad3788e514138f30a10779ce13c06672f796fda300e69301426c0c912ee777894e7e156b1dc4421cc3b9d2a994e86a28f25ea2334
 EBUILD tini-0.17.0.ebuild 911 BLAKE2B db44d845dd47b42e0a707d5bb342cfdcc7f6d79ba2f5e114fc03788be003854e7f7b2b53f86b80a1bae961b85d0ae98a8dce34187027aa2e088cd7b33feb4e46 SHA512 1b3d1aa8f75d7ac3fbbae3dbdee31e370e1c2c44c1763ade560e5940153fa0f45c63e7e3ffba97b18fa5c0f41b50efec3bd519964893af77467c2e2c8126709d
+EBUILD tini-0.18.0.ebuild 1098 BLAKE2B 0f3a4cc57085e6e88bc70afca7a02aa5febc6f8b97223bd10587f82b232f824e0126baf98befd0a076c8b51113feb4c627309077f0a921e43c01988fd7b4216e SHA512 0235d848202700878ea820f76a4a17d1d05f2346fb609db66d8a62298f365c26bf718fa2a82569a52a0e82c8a825e04d6a0271fdeea12ea0a28548f0981c6a8f
 MISC metadata.xml 603 BLAKE2B 5e702a958ad14189e4be030441833428283784695d116c8404be905b6aece027ec8acbe05394c6108d13ad04eae0284dc88cbab77364aeb73dfc21001457f7f7 SHA512 9e6651c7f9ae7a2b3d856af9e74e8656f89de4496fcacf5d97bcbe4d2b20be01c306cb3e116a0ad7eabe213e2476245894ffa53e5c63ef9b4e73ca989584af9c
diff --git a/sys-process/tini/tini-0.18.0.ebuild b/sys-process/tini/tini-0.18.0.ebuild
new file mode 100644
index 000000000000..e10889c529fb
--- /dev/null
+++ b/sys-process/tini/tini-0.18.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils flag-o-matic
+
+GIT_COMMIT=fec3683b971d9c3ef73f284f176672c44b448662
+DESCRIPTION="A tiny but valid init for containers"
+HOMEPAGE="https://github.com/krallin/tini"
+SRC_URI="https://github.com/krallin/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+args +static"
+
+src_prepare() {
+	cmake-utils_src_prepare
+	# Do not strip binary
+	sed -i -e 's/-Wl,-s")$/")/' \
+		-e "s/git.*status --porcelain.*/true/" \
+		-e "s/git.*log -n 1.*/true/" \
+		-e "s/git.\${tini_VERSION_GIT}/git.${GIT_COMMIT}/" \
+		CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=()
+	use args || mycmakeargs+=(-DMINIMAL=ON)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	append-cflags -DPR_SET_CHILD_SUBREAPER=36 -DPR_GET_CHILD_SUBREAPER=37
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+	if use static; then
+		mv "${ED%/}"/usr/bin/{${PN}-static,${PN}} || die
+	else
+		rm "${ED%/}"/usr/bin/${PN}-static || die
+	fi
+}
diff --git a/sys-process/unixtop/Manifest b/sys-process/unixtop/Manifest
index 6064774558c7..34e447df1306 100644
--- a/sys-process/unixtop/Manifest
+++ b/sys-process/unixtop/Manifest
@@ -1,9 +1,9 @@
-AUX unixtop-3.8_beta1-high-threadid-crash.patch 2261 BLAKE2B 46398841ae8a36885e72f104a4b0d0a6501d8bd5251a043e886d25b508281c27783360d98fc3127484b0703eeaa6a10ce3413cc56cfc1d5d4dd8ea6cc9c8c5fc SHA512 d25ce022391db06eeef794062bd49cb4c20f4a544bbd389fed566e172c58025cfc79ba6128ebdac2c9c97c21782842922834138d8a754e20c88d64ee65ccf2c7
-AUX unixtop-3.8_beta1-memleak-fix-v2.patch 1060 BLAKE2B fa60f1e4563ac7f5c5f02625af76c4f1b5fad788bfc2c91eee67acc7a193b469d2a430f53f23b9d9256cd89defc8d62b6365ff93b305b2482a487951a74668b9 SHA512 83ac5d5c61adeb839d45af91c5a52dce38a66abea5f14407dcb988e29c297f7fd36a6c6d845cd90110a003471aba9ed0f715b68beaf6cbb15f433597a6273c8c
-AUX unixtop-3.8_beta1-ncurses.patch 436 BLAKE2B 73e4cfe1b4152d95cff5a876fc5af9c9eed50bda19f16c279048c41da1aa1768303d9901fc6fc0576b3cf829e18197f749242c1bba780e74c09a57c442ab183d SHA512 1d5e63cadcc3c69ed4e92973cd0e8bd2de69d19a4dc7cf92ba30e669ece9e9c70b7ec8f0cfb621e101abd850470b75e388f70ceb46dfc9746ab04442ec98f68a
-AUX unixtop-3.8_beta1-no-AX-macros.patch 609 BLAKE2B 0e5cb54a109ca1a9353c13c5d58176dac85997899edfbedc25a79a8c20e775b65b90c43201438f125d32fab42dc77ddb77f34047fe2ee91bb84170beb286b02d SHA512 a55e9c5b4f337365b24b99f2412ad69edc51a610a4cf831592183d284c83202149342c52e1f09fbdb78dc468484510d3d67902386358aa85eb45c5e8a092ff8e
+AUX unixtop-3.8_beta1-high-threadid-crash.patch 1649 BLAKE2B 1a4a01b99ab4c404406451017ab88d74081617edb4400368ce2ab638bd54e0bc70b298c43e641f827c63150b73547c25eb5e513816237721a8afb0b5734ec124 SHA512 44d02d0f7843379674cf55b0c8250833b53741bbe39ab33eb72ca24745b1b71363402641a6f365862f8b671e8e34e36e17a0cab9889892d30ba23ca08685de32
+AUX unixtop-3.8_beta1-memleak-fix-v2.patch 730 BLAKE2B 483f161fb64ec1c9bd2e3e86c604026e7b7e84540bf3ef02393e8f58569231e7ba0613d227ef7930d8c748e5e4cc24c9c1ffa26ce067096f975e36f4bd2b355c SHA512 e4c83d939fcd29726f63c34483fc60dd09cc6c777f8cff0469a5c386acfdf85a49dacfa5e2e0ea44c78b7abb139a0933c72db87a3100524011d09d69838d767e
+AUX unixtop-3.8_beta1-ncurses.patch 440 BLAKE2B 9036fe2ff33e610cf210e9819c4d67b4463b0cb919042d58d73a23e10dfd6229c143e634978f9823e71009a182756c64e54966f4e5096f315fc2cbbceed4213c SHA512 b3d1f5e30a38fc2a7516258f264c18a2aafae4ee38bd65efdba9bb1617399aa31a9b6582388de38551437a84fefdd73226989d80e4381adfb172b08062034ba8
+AUX unixtop-3.8_beta1-no-AX-macros.patch 613 BLAKE2B 1e33613a9956527ecd3248c56d98a31b9191945f4eef4758cc31f32d9350b6db12a8750520ad1ac0cd0fbb1c309f1d7838a86f78de49022d04dc1d0162e78a13 SHA512 49af9bac713bd64af5cd0162090e1aab9c9af3d331574f0786f565715841b8c9fe0ae0fa29d1309d2b9ffe442a522bd1eecb295fc1e026e5fd4a70d804579255
 AUX unixtop-3.8_beta1-percent-cpu.patch 903 BLAKE2B 57873c687e6a3ddf62c79524738bbb30984ebc85db5c8dd36aeb3d33284da1c621a7bbb8e1d178ee4e00f377cee9684e47f31150d16e72b89fa691d80c71ea7d SHA512 6867b2c9951e801aeefc464e7903b719c6acfee7db33e65c7c51da2055daef5990d5a8d1131dc069334bca54f866b25db2891fdb7c15a9d8c468047f090e327c
 AUX unixtop-3.8_beta1-renice-segfault.patch 518 BLAKE2B fb81d2053fd5de006b9a229f0cc6bb6be6107fa26d22488e20ba76ca021a98298f035af3daee5d5cecb1d68100d5dd3062399578c60e83fe2b4f90052f0c838f SHA512 2d74ee0e67136a59d6745522ea7671404a9d0a026311f6dfa47dc78d12ecb12da63aab915b969cdecbdf9f3ba9dd86babeebc5c1b61713adbb7c98f70adf56f6
 DIST top-3.8beta1.tar.bz2 233880 BLAKE2B 126ed2ef1e89bcd00e989350d0bdd2b78308400eadf0208d7c1bb1abac6b46cecfb0db514576cf6a272038329b1bc0fce4ada37bed42a2e2a662778bcdaf465b SHA512 c66d786e34070afd00dc2225ce4cddcf0fdaee0e2a6c6e2dfadadcd97bbe84c6668041ff5b075137630b99240c711fbfda8b85fb09c6a39e3067798cbe612671
-EBUILD unixtop-3.8_beta1-r3.ebuild 1092 BLAKE2B c3dc431216208c0d72ebe6ee2198f351f54137071b21df10bae291b0cab5c26bf035fb0d3ec0044c9604ed15f4bbfb8bacf96e39002e7d7204377e5e7449f6bd SHA512 25c86d0658a57534c6c90b976761205dcd5c2385a0ba5c1571b292da2d63546e505ff9df2e60688151a9d2ac396941be7c900e7f81b017fb957bbb3c964680d1
+EBUILD unixtop-3.8_beta1-r3.ebuild 1118 BLAKE2B 5d0a0e094b63a144e0fc40ad0bfd66b88bff75225f0c702fdb4466c425016ca3e1c011f3edea03f4dea6b359d1a77d74b80efa77d3dc20cbf4ce3581c26c4263 SHA512 c5c35c6f707f6a1ba15d7429e675822f8478927ad13ba7a3c5815aa3e6ae0139d8782670fc2dbcb1009823b0d54af1dcebf988b90123b22dd4646607efee8661
 MISC metadata.xml 324 BLAKE2B 3fc9d4e7659f62ded757066d234e3ae7182283c646807988045ade34f146fb490ae01748196ef0a9535daa01ab578d6e5ccdc1cc03fc5a1b952092ac99b1f11c SHA512 9d0285bab5e9e40597de61a2dd87370aa693ea943f63a6163d5fc3100e9ca8dd7198a309e0d4735a9cb6bbfdb850a06f1e082758d71df21ab1eb0af34361968d
diff --git a/sys-process/unixtop/files/unixtop-3.8_beta1-high-threadid-crash.patch b/sys-process/unixtop/files/unixtop-3.8_beta1-high-threadid-crash.patch
index 734826a647dd..00f19536e388 100644
--- a/sys-process/unixtop/files/unixtop-3.8_beta1-high-threadid-crash.patch
+++ b/sys-process/unixtop/files/unixtop-3.8_beta1-high-threadid-crash.patch
@@ -1,75 +1,40 @@
-https://sourceforge.net/tracker/index.php?func=detail&aid=2815842&group_id=72892&atid=536042
-
-*** hash.c-old  Thu Jul  2 15:30:55 2009
---- hash.c      Thu Jul  2 15:48:39 2009
-***************
-*** 1354,1360 ****
-      hi->value = value;
-
-      /* hash to the bucket */
-!     bucket = &(ht->buckets[((key.k_thr * 10000 + key.k_pid) % ht->num_buckets)]);
-
-      /* walk the list to make sure we do not have a duplicate */
-      ll = &(bucket->list);
---- 1354,1360 ----
-      hi->value = value;
-
-      /* hash to the bucket */
-!     bucket = &(ht->buckets[(((unsigned long)(key.k_thr) * 10000U + (unsigned long)(key.k_pid)) % ht->num_buckets)]);
-
-      /* walk the list to make sure we do not have a duplicate */
-      ll = &(bucket->list);
-***************
-*** 1408,1414 ****
-      pidthr_t k1;
-
-      /* find the bucket */
-!     bucket = &(ht->buckets[((key.k_thr * 10000 + key.k_pid) % ht->num_buckets)]);
-
-      /* walk the list until we find the existing item */
-      ll = &(bucket->list);
---- 1408,1414 ----
-      pidthr_t k1;
-
-      /* find the bucket */
-!     bucket = &(ht->buckets[(((unsigned long)(key.k_thr) * 10000U + (unsigned long)(key.k_pid)) % ht->num_buckets)]);
-
-      /* walk the list until we find the existing item */
-      ll = &(bucket->list);
-***************
-*** 1460,1466 ****
-      pidthr_t k1;
-
-      result = NULL;
-!     if ((bucket = &(ht->buckets[((key.k_thr * 10000 + key.k_pid) % ht->num_buckets)])) != NULL)
-      {
-        ll = &(bucket->list);
-        li = LL_FIRST(ll);
---- 1460,1466 ----
-      pidthr_t k1;
-
-      result = NULL;
-!     if ((bucket = &(ht->buckets[(((unsigned long)(key.k_thr) * 10000U + (unsigned long)(key.k_pid)) % ht->num_buckets)])) != NULL)
-      {
-        ll = &(bucket->list);
-        li = LL_FIRST(ll);
-***************
-*** 1499,1505 ****
-      pidthr_t k1;
-
-      result = NULL;
-!     if ((bucket = &(ht->buckets[((key.k_thr * 10000 + key.k_pid) % ht->num_buckets)])) != NULL)
-      {
-        ll = &(bucket->list);
-        li = LL_FIRST(ll);
---- 1499,1505 ----
-      pidthr_t k1;
-
-      result = NULL;
-!     if ((bucket = &(ht->buckets[(((unsigned long)(key.k_thr) * 10000U + (unsigned long)(key.k_pid)) % ht->num_buckets)])) != NULL)
-      {
-        ll = &(bucket->list);
-        li = LL_FIRST(ll);
-
-
-
+https://sourceforge.net/p/unixtop/bugs/43/
+
+--- a/hash.c
++++ b/hash.c
+@@ -1354,7 +1354,7 @@ hash_add_pidthr(hash_table *ht, pidthr_t
+     hi->value = value;
+ 
+     /* hash to the bucket */
+-    bucket = &(ht->buckets[((key.k_thr * 10000 + key.k_pid) % ht->num_buckets)]);
++    bucket = &(ht->buckets[(((unsigned long)(key.k_thr) * 10000U + (unsigned long)(key.k_pid)) % ht->num_buckets)]);
+ 
+     /* walk the list to make sure we do not have a duplicate */
+     ll = &(bucket->list);
+@@ -1408,7 +1408,7 @@ hash_replace_pidthr(hash_table *ht, pidt
+     pidthr_t k1;
+ 
+     /* find the bucket */
+-    bucket = &(ht->buckets[((key.k_thr * 10000 + key.k_pid) % ht->num_buckets)]);
++    bucket = &(ht->buckets[(((unsigned long)(key.k_thr) * 10000U + (unsigned long)(key.k_pid)) % ht->num_buckets)]);
+ 
+     /* walk the list until we find the existing item */
+     ll = &(bucket->list);
+@@ -1460,7 +1460,7 @@ hash_lookup_pidthr(hash_table *ht, pidth
+     pidthr_t k1;
+ 
+     result = NULL;
+-    if ((bucket = &(ht->buckets[((key.k_thr * 10000 + key.k_pid) % ht->num_buckets)])) != NULL)
++    if ((bucket = &(ht->buckets[(((unsigned long)(key.k_thr) * 10000U + (unsigned long)(key.k_pid)) % ht->num_buckets)])) != NULL)
+     {
+ 	ll = &(bucket->list);
+ 	li = LL_FIRST(ll);
+@@ -1499,7 +1499,7 @@ hash_remove_pidthr(hash_table *ht, pidth
+     pidthr_t k1;
+ 
+     result = NULL;
+-    if ((bucket = &(ht->buckets[((key.k_thr * 10000 + key.k_pid) % ht->num_buckets)])) != NULL)
++    if ((bucket = &(ht->buckets[(((unsigned long)(key.k_thr) * 10000U + (unsigned long)(key.k_pid)) % ht->num_buckets)])) != NULL)
+     {
+ 	ll = &(bucket->list);
+ 	li = LL_FIRST(ll);
diff --git a/sys-process/unixtop/files/unixtop-3.8_beta1-memleak-fix-v2.patch b/sys-process/unixtop/files/unixtop-3.8_beta1-memleak-fix-v2.patch
index 76042bb4c1a6..2d79c7293f9d 100644
--- a/sys-process/unixtop/files/unixtop-3.8_beta1-memleak-fix-v2.patch
+++ b/sys-process/unixtop/files/unixtop-3.8_beta1-memleak-fix-v2.patch
@@ -1,44 +1,28 @@
 https://hg.openindiana.org/upstream/oracle/userland-gate/raw-file/23c55a2f8a8e/components/top/patches/03.sunos5.patch
 
-*** top-3.8beta1/machine/m_sunos5.c.orig	Wed Aug 31 05:23:52 2011
---- top-3.8beta1/machine/m_sunos5.c	Wed Aug 31 05:25:25 2011
-***************
-*** 2064,2070 ****
-  
-  	    /* read the whole file */
-  	    p = malloc(st.st_size);
-! 	    (void)pread(fd, p, st.st_size, 0);
-  
-  	    /* cache the file descriptor if we can */
-  	    if (fd < maxfiles)
---- 2064,2076 ----
-  
-  	    /* read the whole file */
-  	    p = malloc(st.st_size);
-! 	    if (pread(fd, p, st.st_size, 0) != st.st_size)
-! 	    {
-! 		(void) close(fd);
-! 		op->fd_lpsinfo = -1;
-! 		free(p);
-! 		continue;
-! 	    }
-  
-  	    /* cache the file descriptor if we can */
-  	    if (fd < maxfiles)
-***************
-*** 2148,2154 ****
-  		op->oldtime = TIMESPEC_TO_DOUBLE(lwpp->pr_time);
-  		op->seen = 1;
-  	    }
-! 	    free(p);
-  	}
-  #endif
-  
---- 2154,2160 ----
-  		op->oldtime = TIMESPEC_TO_DOUBLE(lwpp->pr_time);
-  		op->seen = 1;
-  	    }
-! 	    free(prp);
-  	}
-  #endif
-  
+--- a/machine/m_sunos5.c
++++ b/machine/m_sunos5.c
+@@ -2064,7 +2064,13 @@ getptable (struct prpsinfo *baseptr)
+ 
+ 	    /* read the whole file */
+ 	    p = malloc(st.st_size);
+-	    (void)pread(fd, p, st.st_size, 0);
++	    if (pread(fd, p, st.st_size, 0) != st.st_size)
++	    {
++		(void) close(fd);
++		op->fd_lpsinfo = -1;
++		free(p);
++		continue;
++	    }
+ 
+ 	    /* cache the file descriptor if we can */
+ 	    if (fd < maxfiles)
+@@ -2148,7 +2154,7 @@ getptable (struct prpsinfo *baseptr)
+ 		op->oldtime = TIMESPEC_TO_DOUBLE(lwpp->pr_time);
+ 		op->seen = 1;
+ 	    }
+-	    free(p);
++	    free(prp);
+ 	}
+ #endif
+ 
diff --git a/sys-process/unixtop/files/unixtop-3.8_beta1-ncurses.patch b/sys-process/unixtop/files/unixtop-3.8_beta1-ncurses.patch
index 73cd88b72826..a2da4b47da6a 100644
--- a/sys-process/unixtop/files/unixtop-3.8_beta1-ncurses.patch
+++ b/sys-process/unixtop/files/unixtop-3.8_beta1-ncurses.patch
@@ -1,8 +1,8 @@
 * check ncurses first, such that we only link agains (system) termcap if
   necessary (never the case in prefix) -- grobian@gentoo.org
 
---- configure.ac
-+++ configure.ac
+--- a/configure.ac
++++ b/configure.ac
 @@ -174,7 +174,7 @@
  AC_CHECK_LIB(kvm, kvm_open)
  # -lmld -lmach
diff --git a/sys-process/unixtop/files/unixtop-3.8_beta1-no-AX-macros.patch b/sys-process/unixtop/files/unixtop-3.8_beta1-no-AX-macros.patch
index f5d34a4a9ae9..88fd475fe61d 100644
--- a/sys-process/unixtop/files/unixtop-3.8_beta1-no-AX-macros.patch
+++ b/sys-process/unixtop/files/unixtop-3.8_beta1-no-AX-macros.patch
@@ -1,8 +1,8 @@
 * no idea where these macros are, but we can surely do without this, for
   now -- grobian@gentoo.org
 
---- configure.ac
-+++ configure.ac
+--- a/configure.ac
++++ b/configure.ac
 @@ -504,16 +504,6 @@
  
  AC_MSG_RESULT($result)
diff --git a/sys-process/unixtop/unixtop-3.8_beta1-r3.ebuild b/sys-process/unixtop/unixtop-3.8_beta1-r3.ebuild
index d32e3863a6f7..c4f9598cf00b 100644
--- a/sys-process/unixtop/unixtop-3.8_beta1-r3.ebuild
+++ b/sys-process/unixtop/unixtop-3.8_beta1-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils autotools
+inherit autotools
 
 DESCRIPTION="top for UNIX systems"
 HOMEPAGE="http://unixtop.sourceforge.net/"
@@ -19,14 +19,17 @@ DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/top-${PV/_/}
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.8_beta1-ncurses.patch
+	"${FILESDIR}"/${PN}-3.8_beta1-no-AX-macros.patch
+	"${FILESDIR}"/${PN}-3.8_beta1-renice-segfault.patch
+	"${FILESDIR}"/${PN}-3.8_beta1-memleak-fix-v2.patch
+	"${FILESDIR}"/${PN}-3.8_beta1-high-threadid-crash.patch
+	"${FILESDIR}"/${PN}-3.8_beta1-percent-cpu.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-ncurses.patch
-	epatch "${FILESDIR}"/${P}-no-AX-macros.patch
-	epatch "${FILESDIR}"/${P}-renice-segfault.patch
-	epatch "${FILESDIR}"/${P}-memleak-fix-v2.patch
-	epatch "${FILESDIR}"/${P}-high-threadid-crash.patch
-	epatch "${FILESDIR}"/${P}-percent-cpu.patch
-	eapply_user
+	default
 	eautoreconf
 }
 
diff --git a/sys-process/vixie-cron/Manifest b/sys-process/vixie-cron/Manifest
index 740eadb73b77..422c3e1888c1 100644
--- a/sys-process/vixie-cron/Manifest
+++ b/sys-process/vixie-cron/Manifest
@@ -16,5 +16,5 @@ AUX vixie-cron.service 178 BLAKE2B 2ef614075505ef9a48b89ae46d21c5c3544db711b430e
 DIST vixie-cron-4.1-gentoo-r4.patch.bz2 4204 BLAKE2B 1e276ade20e61ae17e45c10145532e3f32dfa74e32b6cbecde22863de82afb280e97d3b380626451524cfc7fc0663934657509b228a51b3b5ad42e26e5cceb3d SHA512 eec8f89a97927a3557bd1350ed7e9baa0ec133e2c49f8f0fbf51adf62c377451dc48867ca6affcc7576833a5b6b749613c9b99641b1b658853f91d8071c3411b
 DIST vixie-cron-4.1.tar.bz2 54246 BLAKE2B 920bf5d95b24cd41677f4a748da02231ed75713ff280acafdf476ad0a71e73068bbad9070fc57d3b0cb39a9539da24182aa2dbc9eb9dfe241adaf9a46f9c5db2 SHA512 1db9a246243dbd4934438ce70bf022215ccffed4b899a77b076d5a7679a7b98a23ef67344e329fc7a836df90685581e10b1c95709db40601c33d2052ce561e04
 EBUILD vixie-cron-4.1-r14.ebuild 3481 BLAKE2B c26a872b822d134a7bffe26460f308bd1f8f3fc214745fb4d23a40a1cb291d2823450831238949b933ea8e90a19aabcb90cf2c632bc4b2d090ecb97fd72b8916 SHA512 82ce946e83acc561b99ad435290be9afcd2d1eac85e438e5b152483522148c8f0b77436df8383f2d4c152aa657bce6884f95e5131b16d7ea269616a8e6d7e804
-EBUILD vixie-cron-4.1-r15.ebuild 3483 BLAKE2B bcc95e7d8489128961d3ae08c3c73bc1256105ee4216efcbbd27167bb971fa4020e5c1293e81904eb6746dd1a7d9a05297a523996b34e2df7038d7853e1b295f SHA512 11a7727e99ece218d841f37e21e21c9cb192d6500bd7d68b9b00a90747f2b38c56215bb47d826d5fd3409392fdc849c653c3ed0f97153e7e8d05f22544bea89f
+EBUILD vixie-cron-4.1-r15.ebuild 3482 BLAKE2B d19da439c85deff92d1d51eb8de28ffeb9bb3eec5ccf86bf7b4faa5e5799b680c5007431579c05202b631672ffccb9a8a9cb89c3c1d38706e32db63995b459af SHA512 f00a7d7c1f61d3efa46ad6548ff3372ac86029adff76a15feb6a9557e7cc2c6ac38cb5bb58b6ccd6a2dc0f7e7d10d2a6c1a1f1a74a419072cbf96bf033617df9
 MISC metadata.xml 256 BLAKE2B 7f6bf423ff7b1888b8b0c774896aff78d7e367bae5dcedebd27a9f0f844102d6904223a0fd8dbfa5cd568d9447be548580aa0f83de5373ac26eee266052e58b5 SHA512 155f3cbb14ae54e9dfb98e954f6bdf7f23bf5654ae2d00549f7722085a7243d934dfd99d6f1325b00dcaeb50c5344e818e602dc4e2fe47dc7aeb1fdb77668521
diff --git a/sys-process/vixie-cron/vixie-cron-4.1-r15.ebuild b/sys-process/vixie-cron/vixie-cron-4.1-r15.ebuild
index 5976e4ceafcd..66f310fd824e 100644
--- a/sys-process/vixie-cron/vixie-cron-4.1-r15.ebuild
+++ b/sys-process/vixie-cron/vixie-cron-4.1-r15.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
 	mirror://gentoo/${P}-gentoo-${GENTOO_PATCH_REV}.patch.bz2"
 
 LICENSE="ISC BSD-2 BSD"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="selinux pam debug"
 
 DEPEND="selinux? ( sys-libs/libselinux )