gentoo resync : 09.06.2018

20 files changed, 262 insertions, 30 deletions

diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 06cd3ed195cc..e3854a547b53 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/acct/Manifest b/sys-process/acct/Manifest
index 7a4ea212cfc2..898f09f875fe 100644
--- a/sys-process/acct/Manifest
+++ b/sys-process/acct/Manifest
@@ -4,5 +4,5 @@ AUX acct.initd-r2 1080 BLAKE2B c1d2a49530df32adf143b4b3b50059602494df57efe0ef414
 AUX acct.logrotate-r1 304 BLAKE2B 60ddfe6b5a8fdf75c82bdf43308ad6f2e1da0c533e532277eabff670c46bb874b5dee90f1bd0d98cba9218cc47e82fd4a91e66170ffd1d367d2d8a01c1e3e00d SHA512 54fcb419f433df2a64eb51ecfc8122c4945960ca7d745d7a8816fec441586e15321cdfacb2db1feeec23c66b1b02b4191d3fc53355379a75c2956a00bc743332
 AUX acct.service 382 BLAKE2B 7a777c0d9195676d897bf95087a3af2175587e365969956de0d458e842144b6fa97c3e7e1bac402467c8611ef19915c55b562466104b6cbc75279225870c25dc SHA512 8c2523526eb3185765eac62676761af6758d0090d68ba48aeacc59c7a45f0722c867fb97d02ff3ceaa8d77637d2b915938d545f7d782e4f7aa46861f25364bd3
 DIST acct-6.6.4.tar.gz 853273 BLAKE2B 2ee42ae849f8e7c5c6dbe33d45e944f945cef87a5fef0074ac31848547ab9b7068509bce3c4b47b35bfde49b02daf43ae812cc58284c50185e4bdc660dccae52 SHA512 413aa446caece8fd773c92e2995bbaa034f63dd0ced521815a676c49f118e02982862b9c0ab7e60be5212c87d1e82ba6325bda212cf4857392a068d359a1e2c2
-EBUILD acct-6.6.4-r1.ebuild 1065 BLAKE2B f5ffa36955d4ac1c1631183c1622929e799e2364241227906366e233a899f71cc10fbce8aaccb0d9855756a8807887aedd44d5c98423fc1d0d088e0fc8ae2a06 SHA512 33eb3779d43ea49c52f44cebbc3a677bee2318194056fd31269acd23c2876e270f23b03717b279b8d388cfccf46b559f66acbbd855ae468bac0102d29585c13b
+EBUILD acct-6.6.4-r1.ebuild 1072 BLAKE2B 791b3bcab9874f364266effa467052d3952cd985e2410a8b8108db5b8e315182f8be8aecf3d6a21e5157b9b08b899b4c3355b7060e4db64ef8bd904d1f07e4e0 SHA512 bee9dc00fa36bc67c9acee03c0c12232d60b1cc92e00de809a6414911506ded1e0f05a9592c7224a992051b34d10324be299ccbcc9e62bbcc51bbfa45608cee3
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-process/acct/acct-6.6.4-r1.ebuild b/sys-process/acct/acct-6.6.4-r1.ebuild
index b24a5088384d..cedd5614c1f7 100644
--- a/sys-process/acct/acct-6.6.4-r1.ebuild
+++ b/sys-process/acct/acct-6.6.4-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="sys-apps/texinfo"
diff --git a/sys-process/atop/Manifest b/sys-process/atop/Manifest
index ec7949ca8943..eb3226db5b0f 100644
--- a/sys-process/atop/Manifest
+++ b/sys-process/atop/Manifest
@@ -8,5 +8,5 @@ DIST atop-2.3.0-netatop_h.patch 3279 BLAKE2B ac663d50c4474d28bbc1c6b70a2f439ccf7
 DIST atop-2.3.0-version_c.patch 1537 BLAKE2B eda9f0aa427e39ef12aa1584e6277de00577dff81a85085b8b12478a7631cb1739196a91feb684c2b9bdc0bd879493d1bb3a5dca8062da650cda78ae7744e934 SHA512 48589cb29cc969c25d0dbc5c5237200b28af6f1b5daf478abdd52079360938887f9de0fa4a379479c5bf8f3ba31946eba5aae19fe3246f36e82a132708840373
 DIST atop-2.3.0-version_h.patch 748 BLAKE2B 95aa0e819d35498436ddb2554f457e9bf74a70395f077d8f0625b52469d3f4a1f5793afc061aa1f7105fbea6223bb19bbcb999be4231b761523eb28cb5243542 SHA512 79ea49421e9bd82322cae26148d608560910a3d2e089228d2218d93744dcba8398058dd75255b64d15301c8bc4bde1dd6e15b6c6949a01534557b24b3d79089d
 DIST atop-2.3.0.tar.gz 190560 BLAKE2B 4c7a8f33f7e32fb6107275c21db54af91ffdb06cea14039ba85c6e844efc05e5c64708dae48eb3a7b8e075378838937ddd4756a954e6a040d4b3e8c4e7dd9e93 SHA512 8347f480b3e8f957be9aa8982b9c69c5fbc59b8a32044662995495cc2218de48342788aae40538d2ad67d402c8c470d0514261791ead70303f97221ea6983621
-EBUILD atop-2.3.0-r1.ebuild 1828 BLAKE2B f8842470b2eb6ac512ccbb73c376dab6b882d119ee0d010bf09878dfb099cf50b81685771552c0c5c7df93cbd5faf2dfef7e50265c1d8b968d713bd521798900 SHA512 7df239077f9656e145c701082ae82c0cd2664cd5772139704a1fbfe046a5d471af6e00a966c60507ebe33f55dd789ca3223a21a7a95a57835a1e18f00a55ad1f
+EBUILD atop-2.3.0-r1.ebuild 1835 BLAKE2B 8508bba0c31f2fc5f73a708b464d45e0603178a23966cd8e9bd0fc1968f02f036664d5ec2f3f917a51b2ed303bd845bc370258ac9e6fb569e97a57306c78eb7e SHA512 a83ace4dcab3d628151cd5f976f4d10baf4c23ff48b0b814e75f1cab90a9553575bb71b4744d5ed4cecc6fac0a3708d0c316fc66d94bf65cf7818ae0393e8838
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-process/atop/atop-2.3.0-r1.ebuild b/sys-process/atop/atop-2.3.0-r1.ebuild
index 5bf2b3134865..c2b7fbd1fb79 100644
--- a/sys-process/atop/atop-2.3.0-r1.ebuild
+++ b/sys-process/atop/atop-2.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI+=" https://github.com/Atoptool/atop/commit/5f101e656a24271726d1e9cd67263
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest
index 1ff9c3d594d8..6c78683d2597 100644
--- a/sys-process/audit/Manifest
+++ b/sys-process/audit/Manifest
@@ -9,7 +9,9 @@ AUX auditd-init.d-2.4.3 2054 BLAKE2B 20e68ab676c925b8567a7e9a12d2ac055fd90477cbb
 DIST audit-2.6.4.tar.gz 1078677 BLAKE2B 056d9f269926d9b0d74f7187f833f1e94d4e03a5137750fe4ff87b71fa0ce0e0a8569b97ecbd671f951061cfb088dff17b46e37cc14122864c37615356646fc5 SHA512 69b5d3987d2b8b189d1242fde639af3d7d366e901733133e47ee71223caf73aa7da40b7811298f0af861969b0ab482c5ef9830b711bdd15bd5f4d0ebc88a1224
 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
 EBUILD audit-2.6.4.ebuild 6194 BLAKE2B 5e159665e671092224196d91478246d2f9f56092dac4be65d86d6094bc535c276d90f2635be17214bc9fbae94aa9d4e58d1b538766eda940260c00ce9be66591 SHA512 5769b0f13bd033b5b465ca36d707c4324338fb2ce43948a2d656ebdb76d5004030e5a10057aa8d9f532d13484fdc1819f5633ce52a12c20dd301d0b4b7eaffe5
-EBUILD audit-2.7.1.ebuild 6193 BLAKE2B 34dff4853db72278c5b95b9c33a7e0a4e2d2815a89d016dd4d7c72c8f531729fe8808fc2ae74b66239e344d1bedc43fcf6cb7e1bf7d0358887cb8c85a32a4102 SHA512 c671d3381f8b53db2a5b69df4ed8265b88332874251fa3d4971982c821331cfe489eeb5bed44ae681d999f5bad385e93e625d8890d6ef0b68afd40eb9f135b8c
+EBUILD audit-2.7.1.ebuild 6192 BLAKE2B b338e66d4e936218fa802cee329e094514b54585a9c075573fe149ff923747c26397a27d9fd60686d6ae3258843651467fbcf2dc4891a656873de05062dd520e SHA512 623452b62318fe7060c08fac9b9ad1556aa3c85bf46ffb60aa55375c24318ff40391f37754cbd5e62065e376ae05aa8fab99fdb873215c59283a16bd07d24e1e
 EBUILD audit-2.8.2.ebuild 6205 BLAKE2B 82d223206cf3e14c58ce4bbdec2df18e5ad874eb440b4208a7c7463305ec2ec8039783e6436dff0623478db3dcb0d7909b4f077a819bee494d086f162d455e34 SHA512 ee1194da6ee59e8efb3d625853dfd98b0b4e034282aa72cd5f38860be7023c0e8d795c6898313551fca0b8477912a3d7608d821d74f66851136786620abdd630
-MISC metadata.xml 284 BLAKE2B c99c67d5591687a10bb380f1264dd1cde6370ff3a96864093cb41c7c17617bed826652b7651490b6a4634a7429589bbd137402afd7cf8e79cfd5f636c86baa52 SHA512 84f04c94a976c0e2c7db9a7c8c392b6c714e37650efefe2db9807688c28a8cdb64722064be23b89d0263c82c5de7b7dc412ae13f95b42c97ae928c00bb584fac
+EBUILD audit-2.8.3.ebuild 6205 BLAKE2B 82d223206cf3e14c58ce4bbdec2df18e5ad874eb440b4208a7c7463305ec2ec8039783e6436dff0623478db3dcb0d7909b4f077a819bee494d086f162d455e34 SHA512 ee1194da6ee59e8efb3d625853dfd98b0b4e034282aa72cd5f38860be7023c0e8d795c6898313551fca0b8477912a3d7608d821d74f66851136786620abdd630
+MISC metadata.xml 364 BLAKE2B d056ff5b5d3a6fd968f926ceaa85eaaf9b6c54f069dfe3e3d6eb8f784dd1eb4353b3c1236a4eb7691cd48893b7b10a10647a86bd2355b33f2b682c435510422c SHA512 3e5dcff1ff9cfa5c209ab052de5f2ac44ef2bef1d991e8daab6603b72cef81cae6106a34f5181196e083596183a454cb47436d7560084cd51779ae8eb9901202
diff --git a/sys-process/audit/audit-2.7.1.ebuild b/sys-process/audit/audit-2.7.1.ebuild
index 8f1b35143887..471749e78e5f 100644
--- a/sys-process/audit/audit-2.7.1.ebuild
+++ b/sys-process/audit/audit-2.7.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://people.redhat.com/sgrubb/audit/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+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.
diff --git a/sys-process/audit/audit-2.8.3.ebuild b/sys-process/audit/audit-2.8.3.ebuild
new file mode 100644
index 000000000000..c03f103ef2f8
--- /dev/null
+++ b/sys-process/audit/audit-2.8.3.ebuild
@@ -0,0 +1,230 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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"
+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() {
+	eapply_user
+
+	# 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.1.3-ia64-compile-fix.patch
+
+	# there is no --without-golang conf option
+	sed -e "/^SUBDIRS =/s/ @gobind_dir@//" -i bindings/Makefile.am || die
+
+	# 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 TODO
+	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/metadata.xml b/sys-process/audit/metadata.xml
index 4d7881556dac..411e621a64ef 100644
--- a/sys-process/audit/metadata.xml
+++ b/sys-process/audit/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="project">
+		<email>selinux@gentoo.org</email>
+	</maintainer>
 	<maintainer type="person">
 		<email>robbat2@gentoo.org</email>
 	</maintainer>
diff --git a/sys-process/ctop/Manifest b/sys-process/ctop/Manifest
index 4b984ebdaec2..6f0b2cab6bd3 100644
--- a/sys-process/ctop/Manifest
+++ b/sys-process/ctop/Manifest
@@ -13,4 +13,4 @@ DIST github.com-nsf-termbox-go-7994c181db7761ca3c67a217068cf31826113f5f.tar.gz 3
 DIST github.com-nu7hatch-gouuid-179d4d0c4d8d407a32af483c2354df1d2c91e6c3.tar.gz 3735 BLAKE2B 8b9b946faeb43bed2904e9b13f2a21552f13f9460a1e0730812d244314a709a1646b6a4da5bdc2d1b27779a4dbe30755ef2b31770ea09b9efedd4eed47cd1f85 SHA512 418e6d4bf49f715148f584fe936d6f76209cef2cd70696babf3e52778a13ee7524ab43ce071b951d006b7dc77182611282fae9e4e37045b73fc9ffd7f0cfd778
 DIST github.com-op-go-logging-970db520ece77730c7e4724c61121037378659d9.tar.gz 37182 BLAKE2B 80761978e7650222d733694d0abb647710d5102f731fe7b9c86f3d82be71941f77ddeefcce06b62859ba74d6a6ceac923794f2b1a8db0f5cc287b72b078ac8a1 SHA512 2f3ca6a8fcd596db1165453c6f235697504eeb1e6ec75311cb392a040ee394939ab92aa6e6726c47b1c0c07fc98ceef265df6db90c6a536a5d3719aae5bcf590
 EBUILD ctop-0.5.1.ebuild 1904 BLAKE2B 64908fddb7f0604ae9a239d512a4b9b86e0f854d2ca250b2e9f310d1b1a495b5f5410b96584b71af674fd7d56c4fef652a3a39e9683b0f20e0a93cbcfadf4885 SHA512 55b4cadc0e1b9bb70d40ead51fdd318ff13ec1fe3684b805c61223accc2f4a9c6d0acd47e57c9921372cfe57acfabd858992bd2edd9f841448fb2512127f5463
-MISC metadata.xml 331 BLAKE2B ab412f134abf46f57fbff14d5107c73f9b89795d926f9c4dad7a238efc7fd725ebab9d9ffe12b09e91c3270ba3e2268f7279916b8cab4ea5390297f848b9b25b SHA512 c1a175dccb82abd3ceab538883b3ef101ef2fe3b5bb579e68d8e20eec7e783adffba1bca314c0c4170009264ceafc5fb455e17fb14d78dd99f24e41461bb3832
+MISC metadata.xml 248 BLAKE2B b5441b270b247a88ffc1cadfe3d4e19e34f7c3358992ac6fefb9b72e922c4719e31552f176214d28a7d085f103e377223860030b33e640386888299dec175284 SHA512 51dbeeb69e8bc7545264821619fcdcc32e2643e14b43339f33e7b315a6f9c4671b71e01eee0e62d1c96d67763a823b6a46fb4501300c0dfa68bb87de79e3ff7e
diff --git a/sys-process/ctop/metadata.xml b/sys-process/ctop/metadata.xml
index 3f3a995b35ac..6da1f3541b21 100644
--- a/sys-process/ctop/metadata.xml
+++ b/sys-process/ctop/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <name>Manuel Rüger</name>
-    <email>mrueg@gentoo.org</email>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">bcicen/ctop</remote-id>
   </upstream>
diff --git a/sys-process/glances/Manifest b/sys-process/glances/Manifest
index 49d395188aa0..49e889c77964 100644
--- a/sys-process/glances/Manifest
+++ b/sys-process/glances/Manifest
@@ -1,3 +1,3 @@
 DIST Glances-2.11.1.tar.gz 5665685 BLAKE2B 5de75e7770cc01a0ddd6fcb0583e5d23c02e5188c7d6cbd55d2999be9321a1affda351094b8614d206e640e5a1338266b5c77629ec53bb280b9166f7b6a996e2 SHA512 99adccff7d1531760834b76f9a9525df0bf9a8f6f57dbd1f7c3c0515ba3b5c94f26172e19bbc7c93cecbe4bdebcca87ab3a11dd592259509eff85346780ef43a
-EBUILD glances-2.11.1.ebuild 2488 BLAKE2B 590c24ebab7ce2e795c8740cf0a373eae3da1a93422c86aa97c69fafd4722007464df17b4a992e0039d136ba8139abc434a243f39d4ed33075527eff11e9f5bb SHA512 d685b530c311b46d8982dae6245cc417ab71406996ba1ef1d64e582d9dc894a4e7a2a1b7790f3689dcf00f394149b1e6a47ae454dc606d422769754daf66da40
+EBUILD glances-2.11.1.ebuild 2490 BLAKE2B f20d45c62f86148c17298ae669003157993695f4c0cd43ad92693d649417b176849a1280d928a9c0446219db684ceabf24459c3f584bc97279da27b2ca2045b3 SHA512 7ac32b4dbc9f1040e5ebae5f330e0d4a8fe2c90ea7bcd9cf2abeb9b50e650a435219a6358767703f4df0e69f31c878fb3fa093d6498cf08eee539b39c0e8eaf2
 MISC metadata.xml 599 BLAKE2B df65b96c953ac8e717f9c5f4cc5703c36c515fc1cb2e639e11f3f9d3da4a3041ea633d4af86082494a7f54e8208bab634e2c06d435c76cbd878b58b2f7f0d36c SHA512 a847b6f7e3db008c2875f1fcf352058ac41f516c2548ac8a7256833a7b08331da6c7a70cfaf212bc070fdea7978c82359cf13b7f32343dd813f76595238519e8
diff --git a/sys-process/glances/glances-2.11.1.ebuild b/sys-process/glances/glances-2.11.1.ebuild
index 8a69a9264c75..51d1b0476c64 100644
--- a/sys-process/glances/glances-2.11.1.ebuild
+++ b/sys-process/glances/glances-2.11.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
 PYTHON_REQ_USE="ncurses"
 
 inherit distutils-r1 eutils linux-info
diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest
index bf80269f692f..e42fbb1a7184 100644
--- a/sys-process/htop/Manifest
+++ b/sys-process/htop/Manifest
@@ -11,8 +11,8 @@ DIST htop-2.0.2.tar.gz 476364 BLAKE2B f5519977b4bd6d189cb7f379a9f9b535a4b67a575b
 DIST htop-2.1.0.tar.gz 302938 BLAKE2B 3e290a3dbb0bf5424780ba5dcb9de8ea478bf4cabbbde202c19eb3db7e0f8d1e108ec3ea41544ac095097c39100417c72477dab96f104a6317f4edd06d69199f SHA512 203e8f4abd63334330fc673f6c9609adbeab763d80f553d8b48670091d18dd347599a9ce2dbbac374fa4a13fa904948711a441fa676f52ab1612bd2b4ee4c6eb
 DIST htop-2.2.0.tar.gz 308109 BLAKE2B 323a3bfe5032b6d59a3f751831a2af6aa7ae7e9ecceb35828812cb375d919de51f401ffe59fffdfc83a72c8dace879c5d5a0e857511c20e2126d11cdc4101b0b SHA512 ec1335bf0e3e0387e5e50acbc508d0effad19c4bc1ac312419dc97b82901f4819600d6f87a91668f39d429536d17304d4b14634426a06bec2ecd09df24adc62e
 DIST htop-3.0.0_beta4.tar.gz 179849 BLAKE2B 2990090a3b898673fd3bf985077721aed79d00ee07c8a6808b25eb84e320a9c494bd8ad7440ea142ae01bd634ab8863e2cca01c5a52bd19a7e2f4746334acce8 SHA512 4a9c8765ddbd366b06f23e14dc2176cd2da5346e32867c6fa9f11e57018acb6cc37f9ada044febb1b9d414e4dc5958c3c84455649e9c05f64ddf1b37c59fc05e
-EBUILD htop-2.0.2.ebuild 1390 BLAKE2B d38a5264ba9f0f2c8467f3dc2ad61440c50945a2ae2b8782879e93084b405253899a8430aff263181b9b11bc74376d8a9f087bcbf4e29908e3c9bdd607cf8d6d SHA512 82e5bc99fe341b7492f219193fb74c241ba035455e0faae7cea42635a99069c6d195157d8bb6e13277483e47d5df37a579dcf57c0a6e0a33ec31d983b9b9f5c7
-EBUILD htop-2.1.0-r1.ebuild 1990 BLAKE2B 9e2842b82870620628f502cfb81e53436c78eca5ece566cd393751e6da1878a792d56632c294b52ff4c4aee02bfa1ffc81cbd22da8e7f52136bb6073a9de98ae SHA512 34441c4ea5ea25169d6bf84c89008b1b0d1d54eaaf1fbc6e46b5f3afabe561578ec8823bd02d6da2f563ae87213284fba66436657cb74bb1b18a6502ada5cd53
-EBUILD htop-2.2.0.ebuild 1504 BLAKE2B eab36c8ce2218b6aad12a6db3eb13643b0da2f6a5e57153fc0635f95cc693d60d3898b70f8e1fb58deaca1f0b13c0f7a7315135dcd960a9b217733735654b145 SHA512 63313f981af313b63dc06803ebf75fc8fa264eac4e9bed29821b15959e67ff508e8cab97ce93f26aa57a50d7de6dea673453941cf24f885197f1ed26b0252e02
-EBUILD htop-3.0.0_beta4.ebuild 1849 BLAKE2B 219ddc0369c745dfcd08821a05dbb8115dcc3ec89dc3c5b8bdbaed91da1b408f3258dca8676052a5915d78735f881d253eb017e2707bbc83e0ec9183c67b33ba SHA512 4f42160dc348cb5be44b86ab3e82a6f03043631d64f9d0602c729a3cf8774c54daa70a1c1fd96d166c9efab880412003845ccdadbdef37174711e33e89b45c7f
+EBUILD htop-2.0.2.ebuild 1392 BLAKE2B 951213ba4c64dd0aafed491cfc608075015b22c8bfc5cb7af0436b46bb5a624d5584fe07a6e10b68d336a9a9c1aebf6a361feb0eaa18818082d404b4c14e455d SHA512 034da8860aae7b9f4587acb420cd51367eec49a062488f4ac97d0caa4093209448efc7357dbd8ff1376673259211f31a09f82172442d09578bcf40c1e8e4caf0
+EBUILD htop-2.1.0-r1.ebuild 1992 BLAKE2B 1eb22bcc2d7d5a78ab7f5db4aff0c5e2908f58b42dffeaa10ef7730b7a5dd2c5dc403c048c09ca959cea68edd3ddd6c2ad8da5e7860a6ae0e663e5a631e6ca85 SHA512 96f1d32dc7f3f5decf550af430d81e16f0368deb0ab4142e2960d79e753cb486238f746d8eb6e6790fd5f874acde158ddf5e6638aa8bffd80edc89dbea1734e3
+EBUILD htop-2.2.0.ebuild 1506 BLAKE2B 40768733346a26d5f05f0490f4afb751b82bdf0c0cdee7573d90bd5fbe13153a16cb2c19549239c253eb70b308c7f5efabb06602db94303ac95d468b0429a559 SHA512 058725dda9fe0868570a51958f4f15db7be4bfe1c73a1938ef011b2071ed33653a94dc67ff4f65207a68790162852c4ac51060ce07d797a30bbc03eb780dfa65
+EBUILD htop-3.0.0_beta4.ebuild 1851 BLAKE2B 5d2e0e05ba8d2e4367f6be6fe865dfee6478a7111449ae54037b5e01383bc8ff87112fedad96a6c9378d50ab293520fa4ae11dbc40580a560ba2702ccccd336c SHA512 689993ec609120040ec0d9cb1483dd2d3f5b9b6dc5c144e28f1e1d6ddedc4dc2e59f83121203dc95276caba1a064abe6382b6ba40fa1898b06e40b6964207c25
 MISC metadata.xml 750 BLAKE2B 57d419667fbc0053cb2f24908a4e43fefecca832bd86e8d562a4a43090b82f049c62457388ffe8bc4c1f3d49e1119da50f8221686b69956f4ea9426259fb6f3a SHA512 e35d8a5177f9e5bb3136759a7c4c0de5dee4366e3380952c8d72dbdfab46be5f880b77450046f02846c7baa1892e88835c8480808333934ec1bec04c34cd9072
diff --git a/sys-process/htop/htop-2.0.2.ebuild b/sys-process/htop/htop-2.0.2.ebuild
index 864882f610bf..68515359d77f 100644
--- a/sys-process/htop/htop-2.0.2.ebuild
+++ b/sys-process/htop/htop-2.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,8 +6,8 @@ EAPI=6
 inherit autotools linux-info
 
 DESCRIPTION="interactive process viewer"
-HOMEPAGE="http://hisham.hm/htop/"
-SRC_URI="http://hisham.hm/htop/releases/${PV}/${P}.tar.gz"
+HOMEPAGE="https://hisham.hm/htop/"
+SRC_URI="https://hisham.hm/htop/releases/${PV}/${P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
diff --git a/sys-process/htop/htop-2.1.0-r1.ebuild b/sys-process/htop/htop-2.1.0-r1.ebuild
index 8eac59d43915..c0f863a1c769 100644
--- a/sys-process/htop/htop-2.1.0-r1.ebuild
+++ b/sys-process/htop/htop-2.1.0-r1.ebuild
@@ -8,8 +8,8 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit autotools linux-info python-single-r1
 
 DESCRIPTION="interactive process viewer"
-HOMEPAGE="http://hisham.hm/htop/"
-SRC_URI="http://hisham.hm/htop/releases/${PV}/${P}.tar.gz"
+HOMEPAGE="https://hisham.hm/htop/"
+SRC_URI="https://hisham.hm/htop/releases/${PV}/${P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
diff --git a/sys-process/htop/htop-2.2.0.ebuild b/sys-process/htop/htop-2.2.0.ebuild
index 980d490717ab..5647433903d2 100644
--- a/sys-process/htop/htop-2.2.0.ebuild
+++ b/sys-process/htop/htop-2.2.0.ebuild
@@ -8,8 +8,8 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit linux-info python-single-r1
 
 DESCRIPTION="interactive process viewer"
-HOMEPAGE="http://hisham.hm/htop/"
-SRC_URI="http://hisham.hm/htop/releases/${PV}/${P}.tar.gz"
+HOMEPAGE="https://hisham.hm/htop/"
+SRC_URI="https://hisham.hm/htop/releases/${PV}/${P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
diff --git a/sys-process/htop/htop-3.0.0_beta4.ebuild b/sys-process/htop/htop-3.0.0_beta4.ebuild
index d0ff7771a218..26c184d21dd0 100644
--- a/sys-process/htop/htop-3.0.0_beta4.ebuild
+++ b/sys-process/htop/htop-3.0.0_beta4.ebuild
@@ -8,12 +8,12 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit autotools linux-info python-single-r1
 
 DESCRIPTION="interactive process viewer"
-HOMEPAGE="http://hisham.hm/htop/"
+HOMEPAGE="https://hisham.hm/htop/"
 if [[ "${PV}" = *_beta* ]] ; then
 	SRC_URI="https://github.com/hishamhm/${PN}/archive/${PV/_}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${P/_}"
 else
-	SRC_URI="http://hisham.hm/htop/releases/${PV}/${P}.tar.gz"
+	SRC_URI="https://hisham.hm/htop/releases/${PV}/${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 fi
 LICENSE="BSD GPL-2"
diff --git a/sys-process/tini/Manifest b/sys-process/tini/Manifest
index 5e4d5a1a1ae9..149ef74eaa4e 100644
--- a/sys-process/tini/Manifest
+++ b/sys-process/tini/Manifest
@@ -3,5 +3,5 @@ DIST tini-0.17.0.tar.gz 30881 BLAKE2B 8212bfa56b6ade3b79e1d4d3144b10b98e4daf19e9
 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
+EBUILD tini-0.18.0.ebuild 1105 BLAKE2B 356280a58fe5c1f146c83531021e131c9162da1e1075820d1aae4c130b3c71ff214f3270375be83efbbff705a9e5d90a8224ead03c2828e9bc6853789f69a747 SHA512 7cf39465ae7a3a3ea332c9277380d62e813097ef12f5dd50ea1002de87e4925ffddeca550138f7469fdfc19e7701c35ce13fb5f46172df54edb1c698e803d861
 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 e10889c529fb..6055c7e98a14 100644
--- a/sys-process/tini/tini-0.18.0.ebuild
+++ b/sys-process/tini/tini-0.18.0.ebuild
@@ -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 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="+args +static"
 
 src_prepare() {