gentoo resync : 24.12.2018

30 files changed, 564 insertions, 257 deletions

diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 9dffdb54d1e9..70b32e70b94f 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest
index 37136e25be6d..194c3debcbd1 100644
--- a/sys-process/audit/Manifest
+++ b/sys-process/audit/Manifest
@@ -1,5 +1,6 @@
 AUX audit-2.1.3-ia64-compile-fix.patch 7173 BLAKE2B 0bd30fd04a6c65792d068d96134ba5ccb7f2af85ab060924a9443a9a74df8407cf87012353d8005cf767f24a76993aa9f89b416dd6a616caa300b091b0c88004 SHA512 be1f0fd8933e962b11818bace04a14f89afd40c20d9e3ecc839c210fc946e851bb8ba0ce0eae9267023397f77c5a1a3c8b574b9285c0351f534a24f5c9a2a512
 AUX audit-2.4.3-python.patch 2768 BLAKE2B 374fb16cf85d4ee8bb108f6af1b045e140855fbb35527531adbf51dd8392069c3a3c3393e0b9bde892a8f8492b2e1845b89d7d9f801e26934150d7c05973ea2a SHA512 97c1f2eda07f3d986bab161d299f2cf110c1fdc76b889013748812ee7e33ece0fd6d3f34296d5d875db8c966d7fe77c57e2214c0cf6592beb48e462a504c1d70
+AUX audit-2.8.4-ia64-compile-fix.patch 4000 BLAKE2B df10ca3a5da69b70617c5914b336a83f04de74051109f31836b955ab6756dc9ee7122677efcad1fe88df08a7c009ec012a4d1f9100f96677df69ddf8d53d770e SHA512 6ccff74fbc1591bd3630140e06be66ec78dd3db129d50b65b4fa5e3ea9dc3adf3c4ac51f49fbc72ff1c3181702912b25528cf0c56e797ded9da349de0cc8d338
 AUX audit.rules 886 BLAKE2B ebb2fab57467eee38040d4dde68b9ab0cbbf08af9c3115d7cba74019035cf0fbffd9e21a77064206d13f737eadc58e8ba1da2bcb3605b5efec183e262b0e37eb SHA512 070e51d8182f84385bacb0801b8d0f390f560a650b9b94b74fd5f30fdf9fb2d2ae38bd29e70e2d38a26a6188a5bc3a74d732a84d0a46de926ada692ddd19cbe0
 AUX audit.rules-2.1.3 1009 BLAKE2B df40176208bd68cb9021d15ea5803bb0d1c768c9d6400036a69409e1aae3ad55b89983ed94f22a6399a9cec8fc3dc7b20a7b27e75cdea24edda92b95ee19af87 SHA512 bce3ee9aaa0ab48395e6e10ee9b3627d6b7a8083abefdc4009de26649c65a39e000078f799e8c3c9e3341dfa030c6dfbbcad2fb7756fbb3d01b27be078adecec
 AUX audit.rules.stop.post 452 BLAKE2B b10d6d6c0fa475998856e674bd5c8dc0d7ca8f1d676a684223f48d1b22ce90441b2970c02b0eab882b3d3059f2b350d8a34109b03f5457f709624dccb3722e82 SHA512 a7bc52cbbea278a38e2837149524bb21b2c5367c96ed07fe576e08322595c5bee57ff07f8ebecd17391d9c3abe1ba187ac6e39400a153bf0ace4257303d036d3
@@ -10,8 +11,10 @@ DIST audit-2.6.4.tar.gz 1078677 BLAKE2B 056d9f269926d9b0d74f7187f833f1e94d4e03a5
 DIST audit-2.7.1.tar.gz 1099083 BLAKE2B 10f72ac3273ce9e23e1fb8ad8d57dcae772ba1f861f519867399d95e14f4809897637969de45566d62a73a35e5674260155773daf8de00481fcbd1b9c3138f96 SHA512 37964d81deee8608fde5f90d5d096727d3eb009e084be34749adcb0662e607e35c49c80bd83ce38b17161f11363b691721c8a8aa5dea832d320c53ab0ebb7483
 DIST audit-2.8.2.tar.gz 1121970 BLAKE2B bbec694ed1177a8590d035c2d6d197e49343fc370b101589e58736042c3b12cabb68fe796422f3133feb79068ab7d5931efa5414d22edead10c8871fefcd2549 SHA512 888ebf5e8e9d285b82d87377fc8836886d7a8b089c1be4091420a77a0250c9baf09aebb7a6330ff5043fb35f51eb6baf8d4491e26da7ad0811f0087e395b5012
 DIST audit-2.8.3.tar.gz 1107583 BLAKE2B 21c2b8543a31c0ca4319af40b844f4400615108a59195a95ea79499ff2923d7dbbc840716d60dfba311bfc451983cd4cd0f7cb27c2444825df2c0dfb50f9614f SHA512 aa939b81a66111f4e466208d7a38414bd186d00ccd374b420439764905b4707bbfcdc2331a6179a080fca981d19171696ecabd26674205b2f9339c44954db933
+DIST audit-2.8.4.tar.gz 1123889 BLAKE2B b80272b1984942d3c38bde30d22c736a8cc8896a2e42a9bf286446129313ce57a2a117ce26a0a5f1a4a06b4a48ddde463b8837b8c98273051be0c90e5bbebd42 SHA512 5795c565effab995cee447a2dc457ef6a6f15201fb185d7104992ac373a3cb5cfc865dd661c0896a895c96f452eff392d455064d0eead55cd7364d96e0d15c4a
 EBUILD audit-2.6.4.ebuild 6205 BLAKE2B 486150d4806a8d6839e1a660fccd9556b95db3bcd1715ee797aabc059500cb63a2f38ba6cb9be28229a813403126e4f22e22e011033974663259bab693450216 SHA512 be5b2dc7eb3ffe5d68c1478635fc423337f2047018c4e528d0ee4cd4dfa4e2ecaae8754f7df408adb698b871c7de6e84dab58ed2c36f2d13c455105203ad5b18
 EBUILD audit-2.7.1.ebuild 6202 BLAKE2B bc171497850fa83d1c8e96d3c30913bc4b28078501aa1557577f9c8b3468ffe57d38360611acc0bc6857aa6cab5de07019d58e4edbaac345f75dbab8f39e3d8c SHA512 5058294f8da151fcf2ab11cde998161331b81c117a6ab540168634d6e15ecb88ec8fe639113b183790b430f239034d28f58d542935a5d235e2f7b4097e450d19
 EBUILD audit-2.8.2.ebuild 6216 BLAKE2B ad2391a4eb0802a63b1831646a1da196820605c9a6cf16c595bf1daabcd8b10161c09e23097f48b37378cfd3b18973fa264da92fdfb3df9942e99b736202156a SHA512 17f9261ca660386c6a24cf978dba360b3e911d5515c7ccb6174ad736b67ae33583185f1a758e57c692820d81886b7871a8283b809a959ff231e2700757f0de95
 EBUILD audit-2.8.3.ebuild 6203 BLAKE2B 428c823da15178e0d3569495d392da41dd93dfcf1c9fa65cc8fcc7f1704894d13d6718cdf8548c855444d439a4f7934cf01ffd6deb2d9eab5b23aef11675d74d SHA512 51665b60a864d92bdf0239cc54099db0c5a8248a5ef6c85ff62a97eef738caf9ff85f35e8cdbf07b6a562a3e6ad31b5834994f13c599b04dcfe5619261c07454
+EBUILD audit-2.8.4.ebuild 6208 BLAKE2B 1b36a68888dd7700e2b2bc9c9e5d8a1662ddca442bff6bd12bb044c9064fecce9a965a6e0f22fb22a02be33c7e7b0e78a3d137d737b296bd64c2145fcbfa64ff SHA512 ee11719eaca74708188a569348d6c671057bf464089ffc03ed38d46f3caab3827e3ee32103588c9d91965880e31799cdd3ba2c5dd77dfc837538702370163e97
 MISC metadata.xml 364 BLAKE2B d056ff5b5d3a6fd968f926ceaa85eaaf9b6c54f069dfe3e3d6eb8f784dd1eb4353b3c1236a4eb7691cd48893b7b10a10647a86bd2355b33f2b682c435510422c SHA512 3e5dcff1ff9cfa5c209ab052de5f2ac44ef2bef1d991e8daab6603b72cef81cae6106a34f5181196e083596183a454cb47436d7560084cd51779ae8eb9901202
diff --git a/sys-process/audit/audit-2.8.4.ebuild b/sys-process/audit/audit-2.8.4.ebuild
new file mode 100644
index 000000000000..b15890c509b5
--- /dev/null
+++ b/sys-process/audit/audit-2.8.4.ebuild
@@ -0,0 +1,230 @@
+# 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,3_5,3_6} )
+
+inherit autotools multilib multilib-minimal toolchain-funcs preserve-libs python-r1 linux-info systemd
+
+DESCRIPTION="Userspace utilities for storing and processing auditing records"
+HOMEPAGE="https://people.redhat.com/sgrubb/audit/"
+SRC_URI="https://people.redhat.com/sgrubb/audit/${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="gssapi ldap python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+# Testcases are pretty useless as they are built for RedHat users/groups and kernels.
+RESTRICT="test"
+
+RDEPEND="gssapi? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	sys-libs/libcap-ng
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-2.6.34
+	python? ( dev-lang/swig:0 )"
+# Do not use os-headers as this is linux specific
+
+CONFIG_CHECK="~AUDIT"
+
+pkg_setup() {
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	# Do not build GUI tools
+	sed -i \
+		-e '/AC_CONFIG_SUBDIRS.*system-config-audit/d' \
+		"${S}"/configure.ac || die
+	sed -i \
+		-e 's,system-config-audit,,g' \
+		"${S}"/Makefile.am || die
+	rm -rf "${S}"/system-config-audit
+
+	if ! use ldap; then
+		sed -i \
+			-e '/^AC_OUTPUT/s,audisp/plugins/zos-remote/Makefile,,g' \
+			"${S}"/configure.ac || die
+		sed -i \
+			-e '/^SUBDIRS/s,zos-remote,,g' \
+			"${S}"/audisp/plugins/Makefile.am || die
+	fi
+
+	# Don't build static version of Python module.
+	eapply "${FILESDIR}"/${PN}-2.4.3-python.patch
+
+	# glibc/kernel upstreams suck with both defining ia64_fpreg
+	# This patch is a horribly workaround that is only valid as long as you
+	# don't need the OTHER definitions in fpu.h.
+	eapply "${FILESDIR}"/${PN}-2.8.4-ia64-compile-fix.patch
+
+	# there is no --without-golang conf option
+	sed -e "/^SUBDIRS =/s/ @gobind_dir@//" -i bindings/Makefile.am || die
+
+	eapply_user
+
+	# Regenerate autotooling
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local ECONF_SOURCE=${S}
+	econf \
+		--sbindir="${EPREFIX}/sbin" \
+		$(use_enable gssapi gssapi-krb5) \
+		$(use_enable static-libs static) \
+		--enable-systemd \
+		--without-python \
+		--without-python3
+
+	if multilib_is_native_abi; then
+		python_configure() {
+			mkdir -p "${BUILD_DIR}" || die
+			cd "${BUILD_DIR}" || die
+
+			if python_is_python3; then
+				econf --without-python --with-python3
+			else
+				econf --with-python --without-python3
+			fi
+		}
+
+		use python && python_foreach_impl python_configure
+	fi
+}
+
+src_configure() {
+	tc-export_build_env BUILD_{CC,CPP}
+	export CC_FOR_BUILD="${BUILD_CC}"
+	export CPP_FOR_BUILD="${BUILD_CPP}"
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+
+		python_compile() {
+			local pysuffix pydef
+			if python_is_python3; then
+				pysuffix=3
+				pydef='USE_PYTHON3=true'
+			else
+				pysuffix=2
+				pydef='HAVE_PYTHON=true'
+			fi
+
+			emake -C "${BUILD_DIR}"/bindings/swig \
+				VPATH="${native_build}/lib" \
+				LIBS="${native_build}/lib/libaudit.la" \
+				_audit_la_LIBADD="${native_build}/lib/libaudit.la" \
+				_audit_la_DEPENDENCIES="${S}/lib/libaudit.h ${native_build}/lib/libaudit.la" \
+				${pydef}
+			emake -C "${BUILD_DIR}"/bindings/python/python${pysuffix} \
+				VPATH="${S}/bindings/python/python${pysuffix}:${native_build}/bindings/python/python${pysuffix}" \
+				auparse_la_LIBADD="${native_build}/auparse/libauparse.la ${native_build}/lib/libaudit.la" \
+				${pydef}
+		}
+
+		local native_build="${BUILD_DIR}"
+		use python && python_foreach_impl python_compile
+	else
+		emake -C lib
+		emake -C auparse
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" initdir="$(systemd_get_systemunitdir)" install
+
+		python_install() {
+			local pysuffix pydef
+			if python_is_python3; then
+				pysuffix=3
+				pydef='USE_PYTHON3=true'
+			else
+				pysuffix=2
+				pydef='HAVE_PYTHON=true'
+			fi
+
+			emake -C "${BUILD_DIR}"/bindings/swig \
+				VPATH="${native_build}/lib" \
+				LIBS="${native_build}/lib/libaudit.la" \
+				_audit_la_LIBADD="${native_build}/lib/libaudit.la" \
+				_audit_la_DEPENDENCIES="${S}/lib/libaudit.h ${native_build}/lib/libaudit.la" \
+				${pydef} \
+				DESTDIR="${D}" install
+			emake -C "${BUILD_DIR}"/bindings/python/python${pysuffix} \
+				VPATH="${S}/bindings/python/python${pysuffix}:${native_build}/bindings/python/python${pysuffix}" \
+				auparse_la_LIBADD="${native_build}/auparse/libauparse.la ${native_build}/lib/libaudit.la" \
+				${pydef} \
+				DESTDIR="${D}" install
+		}
+
+		local native_build=${BUILD_DIR}
+		use python && python_foreach_impl python_install
+
+		# things like shadow use this so we need to be in /
+		gen_usr_ldscript -a audit auparse
+	else
+		emake -C lib DESTDIR="${D}" install
+		emake -C auparse DESTDIR="${D}" install
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc AUTHORS ChangeLog README* THANKS
+	docinto contrib
+	dodoc contrib/{avc_snap,skeleton.c}
+	docinto contrib/plugin
+	dodoc contrib/plugin/*
+	docinto rules
+	dodoc rules/*
+
+	newinitd "${FILESDIR}"/auditd-init.d-2.4.3 auditd
+	newconfd "${FILESDIR}"/auditd-conf.d-2.1.3 auditd
+
+	fperms 644 "$(systemd_get_systemunitdir)"/auditd.service # 556436
+
+	[ -f "${ED}"/sbin/audisp-remote ] && \
+	dodir /usr/sbin && \
+	mv "${ED}"/{sbin,usr/sbin}/audisp-remote || die
+
+	# Gentoo rules
+	insinto /etc/audit/
+	newins "${FILESDIR}"/audit.rules-2.1.3 audit.rules
+	doins "${FILESDIR}"/audit.rules.stop*
+
+	# audit logs go here
+	keepdir /var/log/audit/
+
+	find "${D}" -name '*.la' -delete || die
+
+	# Security
+	lockdown_perms "${ED}"
+}
+
+pkg_preinst() {
+	# Preserve from the audit-1 series
+	preserve_old_lib /$(get_libdir)/libaudit.so.0
+}
+
+pkg_postinst() {
+	lockdown_perms "${EROOT}"
+	# Preserve from the audit-1 series
+	preserve_old_lib_notify /$(get_libdir)/libaudit.so.0
+}
+
+lockdown_perms() {
+	# Upstream wants these to have restrictive perms.
+	# Should not || die as not all paths may exist.
+	local basedir="$1"
+	chmod 0750 "${basedir}"/sbin/au{ditctl,report,dispd,ditd,search,trace} 2>/dev/null
+	chmod 0750 "${basedir}"/var/log/audit/ 2>/dev/null
+	chmod 0640 "${basedir}"/etc/{audit/,}{auditd.conf,audit.rules*} 2>/dev/null
+}
diff --git a/sys-process/audit/files/audit-2.8.4-ia64-compile-fix.patch b/sys-process/audit/files/audit-2.8.4-ia64-compile-fix.patch
new file mode 100644
index 000000000000..ef04f7204958
--- /dev/null
+++ b/sys-process/audit/files/audit-2.8.4-ia64-compile-fix.patch
@@ -0,0 +1,195 @@
+--- a/audisp/audispd.c
++++ b/audisp/audispd.c
+@@ -21,6 +21,7 @@
+  */
+ 
+ #include "config.h"
++#include "fixup.h"
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+--- a/audisp/plugins/prelude/audisp-prelude.c
++++ b/audisp/plugins/prelude/audisp-prelude.c
+@@ -21,6 +21,8 @@
+  *
+  */
+ 
++#include "config.h"
++#include "fixup.h"
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <signal.h>
+--- a/audisp/plugins/remote/audisp-remote.c
++++ b/audisp/plugins/remote/audisp-remote.c
+@@ -22,6 +22,7 @@
+  */
+ 
+ #include "config.h"
++#include "fixup.h"
+ #include <stdio.h>
+ #include <signal.h>
+ #include <syslog.h>
+--- a/configure.ac
++++ b/configure.ac
+@@ -216,6 +216,9 @@ AC_ARG_ENABLE(zos-remote,
+ AM_CONDITIONAL(ENABLE_ZOS_REMOTE, test "x$enable_zos_remote" != "xno")
+ AC_MSG_RESULT($enable_zos_remote)
+ 
++AC_CHECK_HEADER([asm/ptrace.h], [AC_DEFINE([HAVE_ASM_PTRACE_H],[],[Define to 1 if you have asm/ptrace.h])], [])
++AC_CHECK_HEADER([linux/ptrace.h], [AC_DEFINE([HAVE_LINUX_PTRACE_H],[],[Define to 1 if you have linux/ptrace.h])], [])
++
+ #gssapi
+ AC_ARG_ENABLE(gssapi_krb5,
+ 	[AS_HELP_STRING([--enable-gssapi-krb5],[Enable GSSAPI Kerberos 5 support @<:@default=no@:>@])],
+--- a/contrib/plugin/audisp-example.c
++++ b/contrib/plugin/audisp-example.c
+@@ -37,6 +37,8 @@
+  */
+ 
+ #define _GNU_SOURCE
++#include "config.h"
++#include "fixup.h"
+ #include <stdio.h>
+ #include <signal.h>
+ #include <string.h>
+--- a/contrib/skeleton.c
++++ b/contrib/skeleton.c
+@@ -13,6 +13,8 @@
+  * gcc skeleton.c -o skeleton -laudit
+  */
+ 
++#include "config.h"
++#include "fixup.h"
+ #include <stdio.h>
+ #include <sys/types.h>
+ #include <sys/uio.h>
+--- /dev/null
++++ b/lib/fixup.h
+@@ -0,0 +1,17 @@
++#ifndef _AUDIT_IA64_FIXUP_H_
++#define _AUDIT_IA64_FIXUP_H_
++
++#ifdef __ia64__ /* what a pos */
++# include <linux/types.h>
++# define _ASM_IA64_FPU_H
++#endif
++#include <signal.h>
++/*
++#ifdef HAVE_ASM_PTRACE_H
++# include <asm/ptrace.h>
++#endif
++#ifdef HAVE_LINUX_PTRACE_H
++# include <linux/ptrace.h>
++#endif
++*/
++#endif
+--- a/src/auditctl.c
++++ b/src/auditctl.c
+@@ -23,6 +23,7 @@
+  */
+ 
+ #include "config.h"
++#include "fixup.h"
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <stdbool.h>
+--- a/src/auditd-config.c
++++ b/src/auditd-config.c
+@@ -22,6 +22,7 @@
+  */
+ 
+ #include "config.h"
++#include "fixup.h"
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <sys/stat.h>
+--- a/src/auditd-dispatch.c
++++ b/src/auditd-dispatch.c
+@@ -22,6 +22,7 @@
+  */
+ 
+ #include "config.h"
++#include "fixup.h"
+ #include <unistd.h>
+ #include <sys/uio.h>
+ #include <fcntl.h>
+--- a/src/auditd-event.c
++++ b/src/auditd-event.c
+@@ -22,6 +22,7 @@
+  */
+ 
+ #include "config.h"
++#include "fixup.h"
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <pthread.h>
+--- a/src/auditd-listen.c
++++ b/src/auditd-listen.c
+@@ -23,6 +23,7 @@
+  */
+ 
+ #include "config.h"
++#include "fixup.h"
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <sys/stat.h>
+--- a/src/auditd-reconfig.c
++++ b/src/auditd-reconfig.c
+@@ -22,6 +22,7 @@
+  */
+ 
+ #include "config.h"
++#include "fixup.h"
+ #include <pthread.h>
+ #include <signal.h>
+ #include <stdlib.h>
+--- a/src/auditd-sendmail.c
++++ b/src/auditd-sendmail.c
+@@ -22,6 +22,7 @@
+  */
+ 
+ #include "config.h"
++#include "fixup.h"
+ #include <stdio.h>
+ #include <unistd.h>		// for access()
+ #include <string.h>
+--- a/src/auditd.c
++++ b/src/auditd.c
+@@ -22,6 +22,7 @@
+  */
+ 
+ #include "config.h"
++#include "fixup.h"
+ #include <stdio.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+--- a/src/ausearch.c
++++ b/src/ausearch.c
+@@ -22,6 +22,7 @@
+  */
+ 
+ #include "config.h"
++#include "fixup.h"
+ #include <stdio.h>
+ #include <stdio_ext.h>
+ #include <string.h>
+--- a/src/autrace.c
++++ b/src/autrace.c
+@@ -21,6 +21,7 @@
+  */
+ 
+ #include "config.h"
++#include "fixup.h"
+ #include <stdio.h>
+ #include <string.h>
+ #include <sys/wait.h>
+--- a/src/delete_all.c
++++ b/src/delete_all.c
+@@ -20,6 +20,7 @@
+  *      Steve Grubb <sgrubb@redhat.com>
+  */
+ #include "config.h"
++#include "fixup.h"
+ #include <stdio.h>
+ #include <string.h>
+ #include <errno.h>
diff --git a/sys-process/cronie/Manifest b/sys-process/cronie/Manifest
index 663b4abb9902..eebbd00fd93d 100644
--- a/sys-process/cronie/Manifest
+++ b/sys-process/cronie/Manifest
@@ -7,5 +7,5 @@ AUX cronie-systemd.patch 865 BLAKE2B 3418425036ce7558f516a70203dac43126299d815bd
 DIST cronie-1.5.1.tar.gz 114848 BLAKE2B 9b2a045c2c3c18a931588c620e455c4f2efbf17a5f5826bc1b276bd2c4537fe91d7f81cdb7434dc7d8357414c14d9dc89c90bb7a5dc22956d90b6a84c731f498 SHA512 7e5b2e5cc782d04b84ffced21b4601ed5a041c125ec9daa3ae3c704c04b376b07f8f6e6e1351659690ce695ca4c9373456420099eefde985e15fbe5d3ebdcf5a
 DIST cronie-1.5.2.tar.gz 121604 BLAKE2B 4225439fd13a32bba3bd24f25d7dd405cdb123e666ebbf14574143af9d161867f82ea3fc479d81a884590faaa9c42e19c971285e01a19d6ac793b7deb7fc4775 SHA512 6455e234becc44e6568fa25fd72abfaa293cb0bc2d2f1d124e551c068ba01083192b21e82e941158c8c1f41cb6dad3851d665b9f3baa82fd49080f3f8619740b
 EBUILD cronie-1.5.1-r1.ebuild 2265 BLAKE2B 25c8da9344fb0f174dbfc46b9e43211e5fa90250507e3adc727944ea9da6af0544b57fe0c8dc7110ad4c0840a2883a71b2a25c39a6688eb331459a3dc2439c25 SHA512 9111a8dda379ac26fa09e823b451b016f9c1ae76872723ee9bcc76655b0d14d6407f258f7ef3c6f1565f4f30777ed825e7b871ac38019897145670bddb55324e
-EBUILD cronie-1.5.2.ebuild 2437 BLAKE2B 3a93b479f40b4a82d5dbad0f9faefa85985155282b4afa9c62688410bd04dea038585300e0ccf70844770c46be2d939824eab71f24ddd5fc0c85d8e482492219 SHA512 38943e05b4936b57aaa52fb06fd79a2aabff21dd28b8533601b8e0a4eabd4e2a772a08479756799be31181e311402ece4f3bfee88acac8f238bc00a51e86679d
+EBUILD cronie-1.5.2.ebuild 2426 BLAKE2B f959f0aa8a2dcafde8f59b4baa83d1398adac906139930c4b224eb4674c0ec5bf4455e27af93fa04066ac712b1c502ed1d66f707c849da519e08b237849d236b SHA512 711b1307c037410826c3a9bff1cd040c7e71e992aa991169937e7eec5e2759c9613d85606c3f84112c8dbd27bd668d9bb709118e50fe701c71b085dc7b45dac5
 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 04f7c7876b18..b6dffbd59768 100644
--- a/sys-process/cronie/cronie-1.5.2.ebuild
+++ b/sys-process/cronie/cronie-1.5.2.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
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="+anacron +inotify pam selinux"
 
 DEPEND="pam? ( virtual/pam )
diff --git a/sys-process/evisum/Manifest b/sys-process/evisum/Manifest
index 9c426f6a7d2d..9b9f4840b25b 100644
--- a/sys-process/evisum/Manifest
+++ b/sys-process/evisum/Manifest
@@ -1,3 +1,3 @@
-DIST evisum-0.1.2.tar.xz 77796 BLAKE2B 79baf9acd755af381e8a2f377727fb7e9d452a7ef57e9e5b4cee0013236e96ec8c8170072790a9a09f22a7d166ba86be4d0580767714a26cbfabc63d2a47aee9 SHA512 30e03c4468079f2932f5b1c3a6c3b2ddcf263c7bcd1a767bc45ac7c6e97a33bc2cd9d5cf1201907d0c76b149fa9798c28b25a81f451074af1c53016bb25fd53b
-EBUILD evisum-0.1.2.ebuild 453 BLAKE2B 0153fb80698947ecc36017fdd5cef8110dfdc602d4c2dde188f0c735044a2622401f0a3f2caa6f683af88171dbdc40c28d30c13accf6c7141cf89f665ac746cf SHA512 24fba1d9c02f41f07d946aaec236c6c124f0a7536abf908205e738dc09596c7fbabe5dca93400d2255070f7ca1bf75c4075497ca042ff7a5d1f21167cf08ca32
+DIST evisum-0.2.0.tar.xz 84340 BLAKE2B ef950f9cab3e8b6e911a62e4a2338f4ce3b80b92c00a9d7a26c3e1929ad140d04dd46ecc96487205b07027a959f772ec2eb437509efdadffce7a496a2784391a SHA512 d0d071b652477f8e25a913d8424245e019f2b418de8886641b6a550845e59a5b55f4e5319530519834d8c699a8a4cdd1a6512271e321a53b1e6d64dc9700a40d
+EBUILD evisum-0.2.0.ebuild 476 BLAKE2B 4e234c077f11a2a61dce235c092277913c8f14d084a926fa4d6ed7111c7882a11f7bf83de4afcceb5909005c28ea44d4fe5ee98bdb144511ada0e8fa16e48aae SHA512 bbda26880c2381a3f05f35cdf02a487f1d810b5cba4a2d15a2b75a4c401f64a821283d5dc8346030eec9b9f76501b60a0da99ad671d9da8480f5416b7d02fa44
 MISC metadata.xml 905 BLAKE2B c288b46a8df2a24a0e509001487c8d987443c139407cb9ec2b964c2cabd02d39566fd2cbda5e77356df2648db9cde543a881350522382734795f3dbc82d460c5 SHA512 75dd35bac971d67c6fd9a78b2cfb599f50d1f8d6107a83729efc9df0cea4fd414ddc50719bfbeddb48edfee82a4a1888a66a2932e35d6b61df8299f87331e381
diff --git a/sys-process/evisum/evisum-0.1.2.ebuild b/sys-process/evisum/evisum-0.2.0.ebuild
index c8a0cadb3539..59ffd0827f48 100644
--- a/sys-process/evisum/evisum-0.1.2.ebuild
+++ b/sys-process/evisum/evisum-0.2.0.ebuild
@@ -11,8 +11,8 @@ LICENSE="ISC"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND=">=dev-libs/efl-1.20.0[X]"
-RDEPEND="${DEPEND}"
+DEPEND="dev-libs/efl"
+RDEPEND="|| ( dev-libs/efl[X] dev-libs/efl[wayland] )"
 
 src_install() {
 	emake PREFIX="${D}"/usr install
diff --git a/sys-process/glances/Manifest b/sys-process/glances/Manifest
index b3df4c881294..d824bf2d8c47 100644
--- a/sys-process/glances/Manifest
+++ b/sys-process/glances/Manifest
@@ -1,7 +1,5 @@
 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 2427 BLAKE2B 3d7379de31a5ea9937f62dcd5e6ad032470f14fe418be4b9a802b4f0a0f6c4f29098c24e6ee8bc63f1107c265897bc1f81c69a1c6d3a3143fc7abc030ffcc175 SHA512 5afcbe5d815a5d833907675afda4d3856b9cd0d982ff60ca7467f3a3937926a879bdda6ebd5229d983a70903e25646f07496bc50499d55a202259ac0904f8795
-EBUILD glances-3.0.2.ebuild 2427 BLAKE2B 3d7379de31a5ea9937f62dcd5e6ad032470f14fe418be4b9a802b4f0a0f6c4f29098c24e6ee8bc63f1107c265897bc1f81c69a1c6d3a3143fc7abc030ffcc175 SHA512 5afcbe5d815a5d833907675afda4d3856b9cd0d982ff60ca7467f3a3937926a879bdda6ebd5229d983a70903e25646f07496bc50499d55a202259ac0904f8795
+EBUILD glances-3.0.2.ebuild 2426 BLAKE2B 0ec19460fa44bbad0ee133320cabfb15f8b0599dbb9eab99dc8034a59083a2eedbd879aa7a6f96080cf148f75f206be212834910a59c21633d8c9a902a128478 SHA512 67378348f4936cf9391afc89d126ae1e94c0758cb919d7e69660954abbf2f6aadfdf7f0960975cfcf339e305338031370a223bf57bba063d21a4d380b1b8ea42
 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
deleted file mode 100644
index 8d9c095beb96..000000000000
--- a/sys-process/glances/glances-3.0.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# 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/glances/glances-3.0.2.ebuild b/sys-process/glances/glances-3.0.2.ebuild
index 8d9c095beb96..1a06e3ac70cc 100644
--- a/sys-process/glances/glances-3.0.2.ebuild
+++ b/sys-process/glances/glances-3.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/G/${PN^}/${P^}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 DEPEND="
diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest
index 389d44291b2b..1ac953710ef6 100644
--- a/sys-process/htop/Manifest
+++ b/sys-process/htop/Manifest
@@ -1,9 +1,6 @@
-AUX htop-2.0.2-tinfo.patch 3655 BLAKE2B 505aacb774b54e4c7d9238942ff74cc96d0f5c93c7b74e9531e41e2ffa994b4d475b16620b65b824c28da2856294ef7fcd3562d9c318d4adbcc30bb512431b0f SHA512 33273ddcb89e955ef499854fb9361b65bafa83cce8e91f4ef62dd70fc29e58e169148c957d9cd0c5a123b9e5fe66f838212c8066bff12ada38c430087d02b210
 AUX htop-2.1.0-header_updates.patch 1213 BLAKE2B 4bf06329ee553b29c40c46b8dd0a267d19d17c0b19e8f7938b9276cfced5ba734924c2228408e7e2bee8088250c85d9cfa1cee508c1f3b4f8554d4be8e47cd2b SHA512 63644982da6a92a5477286df4c2cc16097aee8b6f8fcee6c37448d36074770b2f5f8f5a1dbac32728db79dbfb4a094fdd31128cec1ba322ada0b6a0968e53f98
-DIST htop-2.0.2.tar.gz 476364 BLAKE2B f5519977b4bd6d189cb7f379a9f9b535a4b67a575b30056a43e259ab39a69f84083d310bbefefe8408c7ca99918f1ea9ae775808b9afe9d0f78097ac6bb88dc7 SHA512 1c9bf71a36c56b301667aa6d03756fc757fbcb63e848d9581d10db3df6193cdeb00e55ceb6e2392794ac03ea034b04459a8fe550b3ac2318cd86263a74c78cda
 DIST htop-2.2.0.tar.gz 308109 BLAKE2B 323a3bfe5032b6d59a3f751831a2af6aa7ae7e9ecceb35828812cb375d919de51f401ffe59fffdfc83a72c8dace879c5d5a0e857511c20e2126d11cdc4101b0b SHA512 ec1335bf0e3e0387e5e50acbc508d0effad19c4bc1ac312419dc97b82901f4819600d6f87a91668f39d429536d17304d4b14634426a06bec2ecd09df24adc62e
 DIST htop-3.0.0_beta5.tar.gz 175780 BLAKE2B f7d03485e74387c656e5a576f0a53c832bac668cee79750402335b2051a17d405392b99316f1546cc76fa83dc3bc85055ca58b928225df0e162ffdb9c1889a5f SHA512 eaa04a278257a1447cd60825083c864d3c23a4a5607447ce05356d550f42ff68a810f14bf91314b7266f9741aab8141d67d98316a31fa7806fb6b858cc804344
-EBUILD htop-2.0.2.ebuild 1392 BLAKE2B 951213ba4c64dd0aafed491cfc608075015b22c8bfc5cb7af0436b46bb5a624d5584fe07a6e10b68d336a9a9c1aebf6a361feb0eaa18818082d404b4c14e455d SHA512 034da8860aae7b9f4587acb420cd51367eec49a062488f4ac97d0caa4093209448efc7357dbd8ff1376673259211f31a09f82172442d09578bcf40c1e8e4caf0
-EBUILD htop-2.2.0.ebuild 1496 BLAKE2B 6b43d2f0d200480be4214631e3afd49e1d73ad802eeacbedadd9fe019cbf54cba2fb7300aac7285ecd936d7b19d41d45c744551e2788f2156b251a28d6f69bc3 SHA512 86cc7d5d2b766acbad6ec771b8646dd8f050eb25a86ad6a8cfbd8f2791777619a3e3eeee8646cdfae860b0d97c76384234bad29f3c93657c395ccec09437ee71
+EBUILD htop-2.2.0.ebuild 1495 BLAKE2B 6ef4c04a69250653f26c4d3e514ea88aadaeee7347f5dc879852b13f1dbdb6f8f10d724603b57ee04ca3649ffb1a179de624a59c536a7ea05787443ca9310005 SHA512 cb91e5503e2fdb41e18feefc8cd5ab5377488a8b7c143bb406ef4f24697885797edad05fc18ffda63b20fc5afbebe6f60f289539a443c708ea50ea8c54a6a6e7
 EBUILD htop-3.0.0_beta5.ebuild 1817 BLAKE2B db602dec500e6d0643d60b8c727b33e8696b12217019c6e5963df78abd98cae22e772ae09b59109fb6b593ebda918e96937493753afcedd3756cae30506710f7 SHA512 ac9885ac84d472d4a7d7173fa27c897bf657fffb29457bb4d10a579afe61846a2c5e5d7780ca6fef9a7760e5c755cad1180b44977f5932d88d93f2c118b67fe9
 MISC metadata.xml 750 BLAKE2B 57d419667fbc0053cb2f24908a4e43fefecca832bd86e8d562a4a43090b82f049c62457388ffe8bc4c1f3d49e1119da50f8221686b69956f4ea9426259fb6f3a SHA512 e35d8a5177f9e5bb3136759a7c4c0de5dee4366e3380952c8d72dbdfab46be5f880b77450046f02846c7baa1892e88835c8480808333934ec1bec04c34cd9072
diff --git a/sys-process/htop/files/htop-2.0.2-tinfo.patch b/sys-process/htop/files/htop-2.0.2-tinfo.patch
deleted file mode 100644
index 4a536c0251a1..000000000000
--- a/sys-process/htop/files/htop-2.0.2-tinfo.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- htop-2.0.2/configure.ac
-+++ htop-2.0.2/configure.ac
-@@ -185,32 +185,36 @@
- 
- AC_ARG_ENABLE(unicode, [AS_HELP_STRING([--enable-unicode], [enable Unicode support])], ,enable_unicode="yes")
- if test "x$enable_unicode" = xyes; then
--   HTOP_CHECK_SCRIPT([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw6-config",
--    HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw5-config",
--     HTOP_CHECK_SCRIPT([ncurses], [addnwstr], [HAVE_LIBNCURSESW], "ncurses5-config",
--      HTOP_CHECK_LIB([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW],
--       HTOP_CHECK_LIB([ncursesw], [addnwstr], [HAVE_LIBNCURSESW],
--        HTOP_CHECK_LIB([ncurses], [addnwstr], [HAVE_LIBNCURSESW],
--      missing_libraries="$missing_libraries libncursesw"
--      AC_MSG_ERROR([You may want to use --disable-unicode or install libncursesw.])
--   ))))))
-+   PKG_CHECK_MODULES([NCURSES], [ncursesw],[
-+    HTOP_CHECK_SCRIPT([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw6-config",
-+     HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw5-config",
-+      HTOP_CHECK_SCRIPT([ncurses], [addnwstr], [HAVE_LIBNCURSESW], "ncurses5-config",
-+       HTOP_CHECK_LIB([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW],
-+        HTOP_CHECK_LIB([ncursesw], [addnwstr], [HAVE_LIBNCURSESW],
-+         HTOP_CHECK_LIB([ncurses], [addnwstr], [HAVE_LIBNCURSESW],
-+       missing_libraries="$missing_libraries libncursesw"
-+       AC_MSG_ERROR([You may want to use --disable-unicode or install libncursesw.])
-+    ))))))
- 
--   AC_CHECK_HEADERS([ncursesw/curses.h],[:],
--      [AC_CHECK_HEADERS([ncurses/ncurses.h],[:],
--         [AC_CHECK_HEADERS([ncurses/curses.h],[:],
--            [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])])
-+    AC_CHECK_HEADERS([ncursesw/curses.h],[:],
-+       [AC_CHECK_HEADERS([ncurses/ncurses.h],[:],
-+          [AC_CHECK_HEADERS([ncurses/curses.h],[:],
-+             [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])])
-+   ])
- else
--   HTOP_CHECK_SCRIPT([ncurses6], [refresh], [HAVE_LIBNCURSES], "ncurses6-config",
--    HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "ncurses5-config",
--     HTOP_CHECK_LIB([ncurses6],  [refresh], [HAVE_LIBNCURSES],
--      HTOP_CHECK_LIB([ncurses],  [refresh], [HAVE_LIBNCURSES],
--      missing_libraries="$missing_libraries libncurses"
--   ))))
-+   PKG_CHECK_MODULES([NCURSES], [ncurses],[
-+    HTOP_CHECK_SCRIPT([ncurses6], [refresh], [HAVE_LIBNCURSES], "ncurses6-config",
-+     HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "ncurses5-config",
-+      HTOP_CHECK_LIB([ncurses6],  [refresh], [HAVE_LIBNCURSES],
-+       HTOP_CHECK_LIB([ncurses],  [refresh], [HAVE_LIBNCURSES],
-+       missing_libraries="$missing_libraries libncurses"
-+    ))))
-    
--   AC_CHECK_HEADERS([curses.h],[:],
--      [AC_CHECK_HEADERS([ncurses/curses.h],[:],
--         [AC_CHECK_HEADERS([ncurses/ncurses.h],[:],
--            [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])])
-+    AC_CHECK_HEADERS([curses.h],[:],
-+       [AC_CHECK_HEADERS([ncurses/curses.h],[:],
-+          [AC_CHECK_HEADERS([ncurses/ncurses.h],[:],
-+             [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])])
-+   ])
- fi
- 
- if test "$my_htop_platform" = "freebsd"; then
---- htop-2.0.2/Makefile.am
-+++ htop-2.0.2/Makefile.am
-@@ -85,6 +85,8 @@
- BUILT_SOURCES = $(myhtopheaders) $(myhtopplatheaders)
- htop_SOURCES  = $(myhtopheaders) $(myhtopplatheaders) $(myhtopsources) $(myhtopplatsources) config.h
- 
-+htop_LDADD = $(NCURSES_LIBS)
-+
- target:
- 	echo $(htop_SOURCES)
- 
diff --git a/sys-process/htop/htop-2.0.2.ebuild b/sys-process/htop/htop-2.0.2.ebuild
deleted file mode 100644
index 68515359d77f..000000000000
--- a/sys-process/htop/htop-2.0.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools linux-info
-
-DESCRIPTION="interactive process viewer"
-HOMEPAGE="https://hisham.hm/htop/"
-SRC_URI="https://hisham.hm/htop/releases/${PV}/${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~amd64-fbsd"
-IUSE="kernel_FreeBSD kernel_linux openvz unicode vserver"
-
-RDEPEND="sys-libs/ncurses:0=[unicode?]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( ChangeLog README )
-
-CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.2-tinfo.patch"
-)
-
-pkg_setup() {
-	if ! has_version sys-process/lsof; then
-		ewarn "To use lsof features in htop(what processes are accessing"
-		ewarn "what files), you must have sys-process/lsof installed."
-	fi
-
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	rm missing || die
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	[[ $CBUILD != $CHOST ]] && export ac_cv_file__proc_{meminfo,stat}=yes #328971
-
-	local myeconfargs=()
-
-	myeconfargs+=(
-		# fails to build against recent hwloc versions
-		--disable-hwloc
-		--enable-taskstats
-		$(use_enable kernel_linux cgroup)
-		$(use_enable kernel_linux linux-affinity)
-		$(use_enable openvz)
-		$(use_enable unicode)
-		$(use_enable vserver)
-	)
-	econf ${myeconfargs[@]}
-}
diff --git a/sys-process/htop/htop-2.2.0.ebuild b/sys-process/htop/htop-2.2.0.ebuild
index b2c5951cf851..01dd35aa1f5b 100644
--- a/sys-process/htop/htop-2.2.0.ebuild
+++ b/sys-process/htop/htop-2.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://hisham.hm/htop/releases/${PV}/${P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="kernel_FreeBSD kernel_linux openvz unicode vserver"
 
 RDEPEND="sys-libs/ncurses:0=[unicode?]"
diff --git a/sys-process/lsof/Manifest b/sys-process/lsof/Manifest
index c2f0888abffd..2d29f95ddfba 100644
--- a/sys-process/lsof/Manifest
+++ b/sys-process/lsof/Manifest
@@ -5,5 +5,5 @@ DIST lsof_4.90.tar.bz2 791758 BLAKE2B 250025eb553ee4574cadadcc57fa52bd97d8ce4432
 DIST lsof_4.91.tar.bz2 791734 BLAKE2B cd6211caedea34fdbb89266fd78a70902117eda6d4d7fa69115426f4a6f5cb5296fa09bbd946648d8d93483881e4ea4e2190f090be155c1081850e8366cfd05a SHA512 49f811941dd6303f7cb0655fddb8b1177af5d1b18f2bd1edfab09d2c128aea73daecf09c7a5375979c66ba764c88a6e70c9086b55c3634e3be01ab1aa12e9f92
 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 3606 BLAKE2B 6290ee2f3d0eb94186aa1afd619068945f559e13955ba8208a75139922ca305c1fc9d32207a91c8d559f9fa2d3ace16937739e6d7d81b194bbc529efd69c8557 SHA512 3aae867df16902edf59d2a56e5d7553034e4eef38848c906b24fbcf2ade666c3f975656ad37abfd72223cd90476fb7cd473a8129ab6a90ee515cbefc084a67b2
+EBUILD lsof-4.91.ebuild 3603 BLAKE2B 2e6e36eabd3dc6aa592dc3bee6560bd0c616a08016142491d5a91cd60b538ff51b2481aa2c244cd43dc83128c8010877b8e0ce0b16098446ca49110025682523 SHA512 e33d67630f3786d8de94fc39a0452f8eaf06b294c6169c1f6eeda63ec975ba7156cddc7b54d55a1a84e8dd8a9be18d6ad0801821d08ac0167782d70f3012e7a1
 MISC metadata.xml 327 BLAKE2B 4dec6763546c6f65ccd6a2483e6cc99203313a267ee5f18ca0e646f9af8774c8760e4f56711735f2c64880af8bc78e26b22e47774b36fb48ccd2d841647d274e SHA512 c8c0efc3b339063936d805d533cf3528e1a4e1a84829c0e0f993fd3268751f4d7d4713f45cc6fec2956101b611e6e344e0c0336eb8d1b769a47481d72088fb98
diff --git a/sys-process/lsof/lsof-4.91.ebuild b/sys-process/lsof/lsof-4.91.ebuild
index 16e140f8771a..affb5250fcf1 100644
--- a/sys-process/lsof/lsof-4.91.ebuild
+++ b/sys-process/lsof/lsof-4.91.ebuild
@@ -14,7 +14,7 @@ SRC_URI="ftp://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 ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+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 ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples ipv6 rpc selinux"
 
 RDEPEND="rpc? ( net-libs/libtirpc )
diff --git a/sys-process/numad/Manifest b/sys-process/numad/Manifest
index b6ff19b5c5f9..98181ef4e59d 100644
--- a/sys-process/numad/Manifest
+++ b/sys-process/numad/Manifest
@@ -1,8 +1,12 @@
 AUX 0001-Fix-man-page-directory-creation.patch 722 BLAKE2B c98194d7b9a3679d800dcbd5346bc8b8c141b9021d75f574c876b1f9a8972dfe5a6247cc891c0795a2bd1687db70377e96b3e8bef663e20fedbfc1e324102bfb SHA512 e43609c3e6af1f01c886e707cd126126b9bbc8da98b8313e67d98909889f2c81d640db9bc999ca056611dc7792c8a0d3e9ecf9949b4c0a58d33e9bbe74b127ae
 AUX numad-0.5-ldlibs.patch 912 BLAKE2B 0e086913e819d91469bfae5a6d9e5553c91fcd2971e33e3a1066c277319671fb3157393f5ef8f6771c8d8df719d1b728c310f6de51f41112b7a954e4d149f9d9 SHA512 7bd6e90617382080aaa217fa82c1b792d4b33b2dfc51ec43f3539e2b98eec1aa7fa8312e11fef97974d3ecd3f888a997a3c2b21ee980fc8ec4e74dd4bcdb6cbc
+AUX numad.confd 157 BLAKE2B c2b2c983c2192f63a8212bfbf05f51bebe5854e7bcee6df15ccb8943b08996276d840555bd658782c0baad1dd6cce458a5f7fba785d866224008c49bffd8b074 SHA512 59cb56e31e9581c4b8cdc52f2547269987afb513a9e21ac7c218733d8b7643da6587b38d491b9c739a9cf57fd8713fbfbf849112ed0b49a0b7166f0c6697ae00
+AUX numad.initd 315 BLAKE2B 6cc341364e6766a2376773f453973bb72353eda8fa95c1a768f119b3202c347e9807afb51659a323dc66fdd547b964595975c61b69222efc38909bdefd36ca2f SHA512 80b7f006f2f8a934413ec435ee1a48019e2dfeac16585f794102c47cc9011c3db0b290a9ce0b6df01b1ba8dda85e56932ae1f52eac7023e5658edf7d828d14de
+AUX numad.logrotated 60 BLAKE2B 384bada94db096e9c02555d5342fc998482012bfedb3a6c71af95ff41655a5ce17cddef19e589cfa0d4162f38228a7602ba24ba0ff5d791201593f7096776784 SHA512 6ffdc65b85fd44866b18318b3259e72188547b600e53ef2407ce8f7f1db41582ff9250bdfe4fd360e81816d533f93170cf46e3e8d89cfe57640a07a6bb101d81
 DIST numad-0.5-334278f.tar.bz2 21007 BLAKE2B f226e90e0ad664b0cccd82c060b21cc8b7c4b086220f6eee1cd6e421b32f0efe2be11e66ce749142315f8207e19e635a718a41e5a8dd3ecfda02a96dfbd62798 SHA512 1b4a577f0713bae1386f2064fcb2dcbfb9453e23e7617f40cfff4e56d02a8c26a48c8d03f1ac7aa36e4ba168824572377f84bc669d1dabdc1820c2cdc4c57911
 EBUILD numad-0.5-r1.ebuild 843 BLAKE2B 6dce6a048c9619527d288f52073779f3927b1bc4b7b4cd42fedbc9b46055658769487dc1960f5a2a3576c5c48b7a4898ec4498b122874defe76e6b339d42bf81 SHA512 db4c6ba74bb8a3bd3eb47ebf28b2689a87807b20f5ae4587c9961830a9c2c9ff970586456a1676387b22b71d16ade907132e61c336d186f739385733c908e63b
 EBUILD numad-0.5-r2.ebuild 890 BLAKE2B 0db9cb7690a9ba505ed8f17cf34fe0ee660e13566cd93db32abccd46029a207ebf04d6921d09816ad3987ab497b69a9536387464806e47f34fde3fa69424c031 SHA512 b58afb0a54d604095aaddc7c52d7a894fd5ee7ae31628da47ec1160440ffe6acab9379069dbcf2e0be4af219ff73f21549222c81a538d15af2e322c8e26bb7fa
+EBUILD numad-0.5-r3.ebuild 1129 BLAKE2B 81fe8d3c8fb9f48d6b65bb65ef0254b186d90defa89fc94741ff7636a0d5689eb7f722184c0670ebb9b83f9c5fea4ca5205ce74b91248fad193fdb36d9243ec8 SHA512 a14d1f268bbbfa9edde4f3bd4e5ec355303b565cf9ba2f5a1b7246d158b95da9245a2229b2c0ecaaaeb8d9ac280e741ca0ce29634c3394bfc5997d7a903dde79
 EBUILD numad-0.5.ebuild 749 BLAKE2B 6809148d97102d48ba30aa3d56eeae53b7c1bfe5b3c7db445496cab3b160d53e2fb57f6cf5dd7fc53a057114405dd7b625e26608a8412e256ddcea69bd6af8cd SHA512 a0e13444332366c33ab78354a0c7d04943322d11299f5c69898c45e61a2debfb4de9f04a95e81f2efeb906eec65a41bdf2b1772a53f9bdce54c524775826a12e
-EBUILD numad-9999.ebuild 639 BLAKE2B 3df49bd72069a3e8f13bf9f53a459d6f8da0e6bfe97313b80ac4a9d6b4b7d7d8f757bf0929e1186406842d17598a443055b2b74a9862d3f06ff5000c636689a9 SHA512 8099f02f19e0aae26767488ebe4cfe85d13872ae3b7780c7aed95eaf0c009aba9e283cc70bc7ff769323cb0f7acc5aac4df8425886178c088eeb946de7bdc6ae
+EBUILD numad-9999.ebuild 980 BLAKE2B 467dffd645719dfbf60d4040628f7fa32701a1b70e251e2be9108392f9386b7373bb573bb85663c5dab6ff40362826d1567fd4c216d6f9256c668473976cd5ec SHA512 c460b61e43aaf24ae57fd147aa96c7539c319511cd48d29d5293947560341be8f2c15a5c9d00d25a24fada95152080606536d5ebf18f67568122546586a4d18e
 MISC metadata.xml 328 BLAKE2B 822cf0f0fc28b6d632cfb157d4f75e9e1e9744a142b2e22de3f80fd0c385e47ae9978a547c8287c4eea709e92101e52ecfc2d53a63bd0db8541f310d6aab1112 SHA512 1512c4008e723063cd4fbf1b82319fa2d55aad398017c17f6908bf9c6079087487490b68c5f5f63908dac835be5ef1ae299eb46168151a105ee1e093352bdb36
diff --git a/sys-process/numad/files/numad.confd b/sys-process/numad/files/numad.confd
new file mode 100644
index 000000000000..8767c1102c5a
--- /dev/null
+++ b/sys-process/numad/files/numad.confd
@@ -0,0 +1,6 @@
+# /etc/conf.d/numad: config file for /etc/init.d/numad
+#
+# Options to pass to the numad daemon.
+# See the numad(8) man page for more info.
+
+#NUMAD_OPTS="-v"
diff --git a/sys-process/numad/files/numad.initd b/sys-process/numad/files/numad.initd
new file mode 100755
index 000000000000..afeee8921249
--- /dev/null
+++ b/sys-process/numad/files/numad.initd
@@ -0,0 +1,14 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="NUMA daemon that manages application locality"
+
+depend() {
+	need localmount
+	use logger
+}
+
+command="/usr/bin/numad"
+command_args="${NUMAD_OPTS}"
+pidfile="/run/${RC_SVCNAME}.pid"
diff --git a/sys-process/numad/files/numad.logrotated b/sys-process/numad/files/numad.logrotated
new file mode 100644
index 000000000000..bf17dc3335c7
--- /dev/null
+++ b/sys-process/numad/files/numad.logrotated
@@ -0,0 +1,5 @@
+/var/log/numad.log {
+	copytruncate
+	missingok
+	notifempty
+}
diff --git a/sys-process/numad/numad-0.5-r3.ebuild b/sys-process/numad/numad-0.5-r3.ebuild
new file mode 100644
index 000000000000..9c3e8ee12be6
--- /dev/null
+++ b/sys-process/numad/numad-0.5-r3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info systemd toolchain-funcs
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://pagure.io/numad.git"
+	inherit git-r3
+else
+	EGIT_COMMIT="334278ff3d774d105939743436d7378a189e8693"
+	SRC_URI="mirror://gentoo/numad-0.5-${EGIT_COMMIT:0:7}.tar.bz2"
+	KEYWORDS="~amd64 -arm ~arm64 -s390 ~x86"
+	S="${WORKDIR}/${PN}-${EGIT_COMMIT:0:7}"
+fi
+
+DESCRIPTION="The NUMA daemon that manages application locality"
+HOMEPAGE="http://fedoraproject.org/wiki/Features/numad"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE=""
+
+CONFIG_CHECK="~NUMA ~CPUSETS"
+
+PATCHES=(
+	"${FILESDIR}/0001-Fix-man-page-directory-creation.patch"
+	"${FILESDIR}/${PN}-0.5-ldlibs.patch"
+)
+
+src_prepare() {
+	default
+	tc-export CC
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS} -std=gnu99"
+}
+
+src_install() {
+	emake prefix="${ED}/usr" install
+
+	newinitd "${FILESDIR}/numad.initd" numad
+	newconfd "${FILESDIR}/numad.confd" numad
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/numad.logrotated" numad
+
+	insinto /etc
+	doins numad.conf
+	systemd_dounit numad.service
+}
diff --git a/sys-process/numad/numad-9999.ebuild b/sys-process/numad/numad-9999.ebuild
index d292669c500f..9b2cc2d66a7b 100644
--- a/sys-process/numad/numad-9999.ebuild
+++ b/sys-process/numad/numad-9999.ebuild
@@ -1,16 +1,18 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit linux-info toolchain-funcs
+inherit linux-info systemd toolchain-funcs
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://pagure.io/numad.git"
 	inherit git-r3
 else
-	SRC_URI=""
-	KEYWORDS="~amd64 ~x86 -arm -s390"
+	EGIT_COMMIT=""
+	SRC_URI="mirror://gentoo/numad-0.5-${EGIT_COMMIT:0:7}.tar.bz2"
+	KEYWORDS="~amd64 -arm ~arm64 -s390 ~x86"
+	S="${WORKDIR}/${PN}-${EGIT_COMMIT:0:7}"
 fi
 
 DESCRIPTION="The NUMA daemon that manages application locality"
@@ -33,4 +35,14 @@ src_compile() {
 
 src_install() {
 	emake prefix="${ED}/usr" install
+
+	newinitd "${FILESDIR}/numad.initd" numad
+	newconfd "${FILESDIR}/numad.confd" numad
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/numad.logrotated" numad
+
+	insinto /etc
+	doins numad.conf
+	systemd_dounit numad.service
 }
diff --git a/sys-process/parallel/Manifest b/sys-process/parallel/Manifest
index 6fe7b765bdc7..1ea10ee61419 100644
--- a/sys-process/parallel/Manifest
+++ b/sys-process/parallel/Manifest
@@ -1,5 +1,5 @@
-DIST parallel-20180322.tar.bz2 1735453 BLAKE2B 3dd93dc829850051b9701a673e1da167d7013e693935da2d9df3830ec61ffe871727971512fa631e7ef9e563b08a2100ddfdd6d82c717626f4d3a2528d66e934 SHA512 62299fc3aca77c3d7b844b928d266209735b9f8012dd299ab5c142e4588bc0bf4e039e48200c0602b36719b3f70dc2442c89469939be71f3bcff887b2885f5dd
-DIST parallel-20180622.tar.bz2 1758233 BLAKE2B 4796d35d8e34baacb50ac8669c53f6a3018d02b21d0ccedf3cda1ee955964a3ffed21a5e30a5071212b75d80ad8a71a0a5e348afeebc46b2cdea746de7313202 SHA512 c8ad8e747464ddfb59e1dcdb626c8a25b2da75f41e7a93e6a18a59b7370baf9f00810827868180034ca94f3eb2028452baf8cab41c5b76f91ed4d4a45c06cd24
-EBUILD parallel-20180322.ebuild 870 BLAKE2B 8c59bf00bce95835f194564e853f2730ab87539f14b077a463cc9d84d83c77d0be0bbeeeb997827cb3ddaf7482cee9508e3c1df295bff39b6417e4a831470654 SHA512 3eaf6a0d19f2dc305976cc468631cd79b790aef1e41a803b25eee6908c528b51e3abc4f71b36392b76fdf148bc12e40502040543d34bce691fa83ab2fdc0c68a
-EBUILD parallel-20180622.ebuild 872 BLAKE2B ca91a138a59b01cfe03759ac09535604ff0f5bb9c4c69216145441a75e7d03771975f967971b4b5cbe0f4c6a79fd3dc68511fe1e43bb6def590345cde597c94f SHA512 8b7a52a0e152253144731dee8397d6b07e9ca1559febbc6a2d1cc1ee910673d80b3763ea5aa564c267da2e1e2c14dda010f438066a91da6f780eae99200056f6
+DIST parallel-20181122.tar.bz2 1797525 BLAKE2B 59fa14fffd205ec9846c6054e2b6832f4480ed9ba78466a0d3a3004e0aa4bb3d21f533d49d705d091bd8d55406f74404555453892036a21b8b4b69c8ca83458b SHA512 f832f4d5ca1b7f6149e73074b03fa7ce34e66b0e7d579651a1b52959dde658448da0ec3c9b066275c146a1a39715881237cc42f58a0c413d04240f0c15a98ed7
+DIST parallel-20181222.tar.bz2 1799554 BLAKE2B f74fb22f7212b7bb7a521f3ec0cadc6b1906442a1b0b4070c6411c0cafc7f566014f2daad6b4aa8808a1f72ad964cfcaa01968f0a06760c631d5020ab0a219b5 SHA512 07f85f22fc55d5e873a110901c65e61b330d6e6c92c4c3123efa0af43c2d1e714fdd44b02fced3742333cace33cd381554135b126f4b797d38f8fc12bf4cda59
+EBUILD parallel-20181122.ebuild 867 BLAKE2B b6e9d52e314464be4ea916e4b7f8cb2af81df1f9b14dcaa29875fb5d41001329c6ae827db97c7e1fe00d48de41ba73b333e62069a2d95bfc22cce5e4e64930f2 SHA512 4e435ac48973f7ab9aa8a3dcba3d44aa2fc1c022c30618db91161e112426cf4e4dedd05394984d89ab3583b1fe17c6c6a5524ec11a2c647e18a33ccf0a84a5ef
+EBUILD parallel-20181222.ebuild 869 BLAKE2B ee3f50dbf18cae9f8edf05e38102701105858a8e12dd158566872356f380ed1e0e20eb22ecd9166e721d80e59884dedef15d57b5e0b68c1dc5fc5a1cb0808736 SHA512 19fa0efbdac2aba1987d54afd8a5d88e76b65d1b5452ca1a474dd51e3b973fae1727422e33c499e857d3948e56c013f525c26a6091697b2e2e7d7d2032231469
 MISC metadata.xml 1003 BLAKE2B a5a05ad6fb91321ade93dc8534764af73614a4495ae0ae023825b155be4a2d8f095df51971bb174c3e5fa335d7753121b09b22d8fef5ec4ffce3460b95fa2ed1 SHA512 a9da23fd3dc9476e2934a06ed8c0638fb3ee2530ea0ed9305a88ef0fa517a2996494d4e97492a709a601937d794748b0cba794d0b919667decdace77123c700f
diff --git a/sys-process/parallel/parallel-20180322.ebuild b/sys-process/parallel/parallel-20181122.ebuild
index 778fdc10b82a..75661f1aa74d 100644
--- a/sys-process/parallel/parallel-20180322.ebuild
+++ b/sys-process/parallel/parallel-20181122.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
diff --git a/sys-process/parallel/parallel-20180622.ebuild b/sys-process/parallel/parallel-20181222.ebuild
index a195928e2b8b..5cce3235d389 100644
--- a/sys-process/parallel/parallel-20180622.ebuild
+++ b/sys-process/parallel/parallel-20181222.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="A shell tool for executing jobs in parallel locally or on remote machines"
 HOMEPAGE="https://www.gnu.org/software/parallel/"
diff --git a/sys-process/schedtool/Manifest b/sys-process/schedtool/Manifest
index 64ce2897cb08..2262963da763 100644
--- a/sys-process/schedtool/Manifest
+++ b/sys-process/schedtool/Manifest
@@ -1,3 +1,3 @@
-DIST schedtool-1.3.0.tar.bz2 26531 BLAKE2B 8b702e3e191054935037318490b883e6c78d7ca9643954b635d140c909fe545e14c86d48cfcf126ad7a21541461d0aa9141d6482335a6fb8f9a516b61a86cb94 SHA512 1ae39a7b9481cf4062740343cd31289117610041546a7969fde7ae3bed3c1a06cd258dffaeafc4326c9115e37878b943d5abec222e25e45e2a5f76c65adf3b6a
-EBUILD schedtool-1.3.0-r1.ebuild 650 BLAKE2B 0a2ef972a497a19bdec20cfdbea414df7643c7093e2668a92b6e84ac78fc24677ab570de96e6ea863fe34efee80b6c536a3c97590c2bca4c7a1ac0fd005ecaf0 SHA512 275dbb0a8f0e965530c5698268447cae004c535141d32eeb3d4b3dcfec991064c19a43f16bb53ebfeb02ae9c38eae118cebce23c318b3a90241a694d98950593
+DIST schedtool-1.3.0.tar.gz 29040 BLAKE2B 45e9f0c84b99be83be4e250c71a3ef43e323efff565a89a8e69960b8cb703faa7df94fbfbd3a11863e4ecb54cc07acca8cd7803e21aaafe59cc0e923d1117025 SHA512 71b7bbc91ee86a83639b179c8cce70e0fd3acca3af3cbc51880cf1f177fdd901e1fb6d0ecea2aa40761608589e7b903431ac97d5046f9ec50535bad691af2964
+EBUILD schedtool-1.3.0-r1.ebuild 764 BLAKE2B 4c4a56c1a57dbb95ffb69f5e983587d5937479567466c7e6102af1de38b0abce9ef0e723590845682b03d616b3dfd3e0674c678a6dbe9cdb9b5af8943cf6a2be SHA512 17594b146f4c2cdae708bde8f8064335994fa68a9941116894241731daee753a7ffb96cfb85565002b0306522fd69d65d26fe17a79bd0c41a7f3140e5d3f948e
 MISC metadata.xml 373 BLAKE2B b4b201c13e4753fe148cf2a06606a316d6ec18e17c9be87c0eb662d5923a3bfaf6a54d9f2bddf0f0eb22a1243de69f0802fef994f8008b9ab7591a9fc50caf5b SHA512 0727e19fe620bd5d64fb937d6305f029f9c90acaabc6ee6fb0473c56172a386739dddc67539fa89e3ffd0da13b00ed1d8752c2b1442f2435463fd81779b36f86
diff --git a/sys-process/schedtool/schedtool-1.3.0-r1.ebuild b/sys-process/schedtool/schedtool-1.3.0-r1.ebuild
index 3b2244b04308..017d037f387b 100644
--- a/sys-process/schedtool/schedtool-1.3.0-r1.ebuild
+++ b/sys-process/schedtool/schedtool-1.3.0-r1.ebuild
@@ -1,21 +1,27 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit toolchain-funcs
 
 DESCRIPTION="A tool to query or alter a process' scheduling policy"
-HOMEPAGE="http://freequaos.host.sk/schedtool"
-SRC_URI="http://freequaos.host.sk/${PN}/${P}.tar.bz2"
+HOMEPAGE="https://github.com/freequaos/schedtool"
+SRC_URI="https://github.com/freequaos/schedtool/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT=0
 KEYWORDS="amd64 ~arm ~mips ppc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
+S="${WORKDIR}/${PN}-${P}"
+
 src_prepare() {
-	sed -i '/^CFLAGS=/d;/^install:/s/install-doc//' Makefile || die
+	default
+	sed \
+		-e '/^CFLAGS=/d;/^install:/s@ install-doc zipman@@' \
+		-e '/install/s@\(schedtool.8\).gz@\1@' \
+		-i Makefile || die
 }
 
 src_compile() {
diff --git a/sys-process/tini/Manifest b/sys-process/tini/Manifest
index 9b6b410c78c5..01c3b5e34ac4 100644
--- a/sys-process/tini/Manifest
+++ b/sys-process/tini/Manifest
@@ -1,5 +1,5 @@
 DIST tini-0.16.1.tar.gz 29641 BLAKE2B 637ee17bbf8553b7803dc78cc40ec55ea919ec003005c7f2524322df6cc93a2e4c6fc017fa25c581f50eb17482956ebf37bf49c7796c33d227c7327ca467a906 SHA512 aa0a802c403a07771a2b28a07b97fa2c93d40b5d5be2cba6556c8e7a92e608453010625d0236d26c27bdd2820aed3ad9ca676b70f7fcd5986d7f91eb928d053c
 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.18.0.ebuild 1429 BLAKE2B 2799a4a06d4edbbced8eafc5a2ca2c8f8aadfc3da16b128933787e4f2e2adcbe9d074600d0b48d0a6ddda713b406aba776ce62fa1006176b1a4340223fea644e SHA512 2ebd3c06e3d81c7072269c12c779cd62e1341f4460fa9b46d9d571ec9858128c998860d09184c65bad0abaa93e4d17542159bef48ad43a38f21ebf831d86650c
+EBUILD tini-0.18.0.ebuild 1425 BLAKE2B fade95be72f03fc4518f5586b8998fa0857eb449be9df12243f9cdf6cbf02e4320b0b6792dec6e0ad12ee277ba18bf178cf2c480f42a63c706947beddc5d31eb SHA512 fa274410e2184b59064689f05ae4f994b75929b9f0fcb01f555cc1e88233991ea415e0ae6fa917706bc2b13036020f657c5da1e46b76079db059084afb9d53f1
 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
index 9650f2b376b0..6e77035221d1 100644
--- a/sys-process/tini/tini-0.18.0.ebuild
+++ b/sys-process/tini/tini-0.18.0.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
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/krallin/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="+args +static"
 
 src_prepare() {