gentoo resync : 08.01.2021

13 files changed, 252 insertions, 420 deletions

diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 0bc26d1e0003..66cbb66d956c 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest
index 0ce2286fa7da..cff9dd5665b8 100644
--- a/sys-process/audit/Manifest
+++ b/sys-process/audit/Manifest
@@ -1,13 +1,13 @@
 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-2.1.3 1009 BLAKE2B df40176208bd68cb9021d15ea5803bb0d1c768c9d6400036a69409e1aae3ad55b89983ed94f22a6399a9cec8fc3dc7b20a7b27e75cdea24edda92b95ee19af87 SHA512 bce3ee9aaa0ab48395e6e10ee9b3627d6b7a8083abefdc4009de26649c65a39e000078f799e8c3c9e3341dfa030c6dfbbcad2fb7756fbb3d01b27be078adecec
+AUX audit.rules.stop.post 452 BLAKE2B b10d6d6c0fa475998856e674bd5c8dc0d7ca8f1d676a684223f48d1b22ce90441b2970c02b0eab882b3d3059f2b350d8a34109b03f5457f709624dccb3722e82 SHA512 a7bc52cbbea278a38e2837149524bb21b2c5367c96ed07fe576e08322595c5bee57ff07f8ebecd17391d9c3abe1ba187ac6e39400a153bf0ace4257303d036d3
+AUX audit.rules.stop.pre 427 BLAKE2B ddf4ac16c3e1fd401c266287e792865adf8f4dd0b4bbaea6f991bf8dcee69c8ecd69c93d0cbd8352e280c3c61d24de23ca89f700e383c79036526e59c311c004 SHA512 def5ef378ad554f38754839d1c00c598686645a59896e37a3c7ff07b00aaa05a2b92305e49a750358eaba63a7d48fb647472529b155301069771678eed272463
 AUX auditd-conf.d-2.1.3 734 BLAKE2B 018677362bc82c2052885cdd0e2185050cf5e97722ead4acdc51d428b52c265317c7dd03d1459be38b781e78f857cd967e5a60b68360c3381c31c62e1d61d843 SHA512 69d8777772ded7a8c0db2bcf84961b121bb355fa0d4ba0e14e311f8a8bfe665cbd2b7ac632d73477f9dfa9a6eec357a7ed458fe9b3e7b5ede75b166f3f092ab7
 AUX auditd-init.d-2.4.3 2054 BLAKE2B 20e68ab676c925b8567a7e9a12d2ac055fd90477cbbd6444136b7198828798f7b6428948503c344639fab5fea54962682be7c986950c2cbae8b7c9dfeb321a4b SHA512 1b48c248db5d34f148f9c79f8b2a6acbf61c729230341b861f5e331bbfb0c8356305a09eb2cc5c82c14c4fd9a13c7c13957e1ed493834b8b3b9ee38978e4c31f
 DIST audit-017e6c6ab95df55f34e339d2139def83e5dada1f.patch 852 BLAKE2B 60d8b813f57338ce267a09913e68a0726acf5cf878cd2893fe2493f80d2b0ac1e0504dc7a72e85134ae2597b268cb1772b4e7c6c2f19149fc905f6928e2db47f SHA512 78e32c05b6896d37bacf0938954fbce7486a528dabd55421f1715438fe489171f9157059050abdcb3f673258aa28b4a11f643ddb7824f3499a195dbbe634f101
-DIST audit-2.8.4.tar.gz 1123889 BLAKE2B b80272b1984942d3c38bde30d22c736a8cc8896a2e42a9bf286446129313ce57a2a117ce26a0a5f1a4a06b4a48ddde463b8837b8c98273051be0c90e5bbebd42 SHA512 5795c565effab995cee447a2dc457ef6a6f15201fb185d7104992ac373a3cb5cfc865dd661c0896a895c96f452eff392d455064d0eead55cd7364d96e0d15c4a
-DIST audit-2.8.5.tar.gz 1140694 BLAKE2B 64fd0cd93f934e3dd11faf21fcd765894a9c4336d8322179980bb7df1ef5a06d301a665860aeb84fefa0cf278940668023675b99ba7f33cdcfb542d869034358 SHA512 7d416aaa21c1a167f8e911ca82aecbaba804424f3243f505066c43ecc4a62a34feb2c27555e99d3268608404793dccca0f828c63670e3aa816016fb493f8174a
 DIST audit-2.8.5_p80866dc78b5d.tar.gz 552094 BLAKE2B adb936a314ef2f11828ee00f3513631e06e2df09e37e68be27b1b694e278116d2f486dbde7ed57c77d9ff0bcd09309ea841959c7a66caed6770f367d65dd14f4 SHA512 7ec103bf076cfac7906748162e78835f1f65dd9d68e3a7466346e0473075beb47897adf88ab9ba0eb42db1953372aafb16cc040674b9a9c887730c062b82540a
-EBUILD audit-2.8.4.ebuild 5711 BLAKE2B e6956eff8afffcae7e22919680cb7db63af7c1dfdfd9e35e14af73ae378031a821beee4fc782741393421e6a3873a401f3f8e86e5567595d4d5e93f26ecea2a7 SHA512 d659215b7caf54d1c68aa3f7d18fa1951c938eff67c3b8c2ca666c368e90bfbe8112133e45d85905b909a55026bb1e53ed635dedacc7d9ac34934ceb414300a3
+DIST audit-3.0.tar.gz 1109442 BLAKE2B f9c94f7163522068f5f37163a242cb913acc87b5465f7f8550fad27ac1dc673fd7a98e208bd5e6fb136eac1fdadd659e599e7722426937481bbf8c66d86a1617 SHA512 b82ec73c85a8ebb5108b526673d6fe08cbe0b51376788f3ea6ed5747c4612158462893e719496dffbd723f833f84383a2d1d55fd78a3ed985ecfd19545060c88
 EBUILD audit-2.8.5-r2.ebuild 6398 BLAKE2B 5e087a92a21fd4b773e81f6c3e175a4ca189c0718912aaad1d319df023934121bd51452fe69c194a14f620c56d769e9b0d51218e0992e9130b17180ba495a128 SHA512 ed677938d5d405b54652fc59a57c149e8a8dd59aa1497f859c4079ac830807b5fe79ef1bb9635e785870ca177e2e3965ee94de74fd7696c5901a6788dbf5df70
-EBUILD audit-2.8.5.ebuild 5753 BLAKE2B 13495f6f69ca6cb3d85b091805ddcf8f78beb24414d8c797220a0ba21526a5301e014617e20aaa21bee43dbdb80e3ac4aad54692e669a2ffaba3b60bc9e6c9d0 SHA512 001dae4db073cb1d3b4de94da68cd46d27ea5eeb18a1d9c50c04d01f6f831c9e95e4d49b3362c716b874c3ed54e2d30666f717accb84bef11f34ee2b525bec5f
+EBUILD audit-3.0.ebuild 4192 BLAKE2B 4570eac6117e7bc135984059aba672b6b3bfddccd27f86981330f5d3e5ba65eee72ab75b2ae9a44d22a8424000e2c033829cfbe05cbb429f8c9a32b0d4cd3570 SHA512 3eeefce797a9949e634c52368c6810415aa38fa1c700b379cf6545b1c373892e4dc08f348c57326d90188eb7d7656e464ceaae00c60f8429b111ceefae609bd3
 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
deleted file mode 100644
index fb5ec3ac098c..000000000000
--- a/sys-process/audit/audit-2.8.4.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit autotools multilib multilib-minimal toolchain-funcs preserve-libs python-r1 linux-info systemd usr-ldscript
-
-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 ~riscv s390 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
-
-			econf --without-python --with-python3
-		}
-
-		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() {
-			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" \
-				USE_PYTHON3=true
-			emake -C "${BUILD_DIR}"/bindings/python/python3 \
-				VPATH="${S}/bindings/python/python3:${native_build}/bindings/python/python3" \
-				auparse_la_LIBADD="${native_build}/auparse/libauparse.la ${native_build}/lib/libaudit.la" \
-				USE_PYTHON3=true
-		}
-
-		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() {
-			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" \
-				USE_PYTHON3=true \
-				DESTDIR="${D}" install
-			emake -C "${BUILD_DIR}"/bindings/python/python3 \
-				VPATH="${S}/bindings/python/python3:${native_build}/bindings/python/python3" \
-				auparse_la_LIBADD="${native_build}/auparse/libauparse.la ${native_build}/lib/libaudit.la" \
-				USE_PYTHON3=true \
-				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
-
-	[ -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/audit-2.8.5.ebuild b/sys-process/audit/audit-2.8.5.ebuild
deleted file mode 100644
index d743db4f3f59..000000000000
--- a/sys-process/audit/audit-2.8.5.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit autotools multilib multilib-minimal toolchain-funcs preserve-libs python-r1 linux-info systemd usr-ldscript
-
-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 ~riscv ~s390 ~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
-
-	# audisp-remote moved in multilib_src_install_all
-	sed -i \
-		-e "s,/sbin/audisp-remote,${EPREFIX}/usr/sbin/audisp-remote," \
-		"${S}"/audisp/plugins/remote/au-remote.conf || die
-
-	# 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}
-	local my_conf="$(use_enable ldap zos-remote)"
-	econf \
-		${my_conf} \
-		--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
-
-			econf ${my_conf} --without-python --with-python3
-		}
-
-		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() {
-			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" \
-				USE_PYTHON3=true
-			emake -C "${BUILD_DIR}"/bindings/python/python3 \
-				VPATH="${S}/bindings/python/python3:${native_build}/bindings/python/python3" \
-				auparse_la_LIBADD="${native_build}/auparse/libauparse.la ${native_build}/lib/libaudit.la" \
-				USE_PYTHON3=true
-		}
-
-		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() {
-			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" \
-				USE_PYTHON3=true \
-				DESTDIR="${D}" install
-			emake -C "${BUILD_DIR}"/bindings/python/python3 \
-				VPATH="${S}/bindings/python/python3:${native_build}/bindings/python/python3" \
-				auparse_la_LIBADD="${native_build}/auparse/libauparse.la ${native_build}/lib/libaudit.la" \
-				USE_PYTHON3=true \
-				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
-
-	[ -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/audit-3.0.ebuild b/sys-process/audit/audit-3.0.ebuild
new file mode 100644
index 000000000000..1e38bb1fe32a
--- /dev/null
+++ b/sys-process/audit/audit-3.0.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit multilib multilib-minimal toolchain-funcs python-r1 linux-info systemd usr-ldscript
+
+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="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~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" # This is linux specific.
+BDEPEND="python? ( dev-lang/swig:0 )"
+
+CONFIG_CHECK="~AUDIT"
+
+src_prepare() {
+	# audisp-remote moved in multilib_src_install_all
+	sed -i \
+		-e "s,/sbin/audisp-remote,${EPREFIX}/usr/sbin/audisp-remote," \
+		audisp/plugins/remote/au-remote.conf || die
+
+	# Disable installing sample rules so they can be installed as docs.
+	echo -e '%:\n\t:' | tee rules/Makefile.{am,in} >/dev/null
+
+	default
+}
+
+multilib_src_configure() {
+	local -a myeconfargs=(
+		--sbindir="${EPREFIX}/sbin"
+		$(use_enable gssapi gssapi-krb5)
+		$(use_enable ldap zos-remote)
+		$(use_enable static-libs static)
+		--enable-systemd
+		--without-golang
+		--without-python
+		--without-python3
+	)
+	ECONF_SOURCE=${S} econf "${myeconfargs[@]}"
+
+	if multilib_is_native_abi && use python; then
+		python_configure() {
+			mkdir -p "${BUILD_DIR}"
+			pushd "${BUILD_DIR}" &>/dev/null || die
+			ECONF_SOURCE=${S} econf "${myeconfargs[@]}" --with-python3
+			popd &>/dev/null || die
+		}
+		python_foreach_impl python_configure
+	fi
+}
+
+src_configure() {
+	tc-export_build_env BUILD_{CC,CPP}
+	local -x CC_FOR_BUILD="${BUILD_CC}"
+	local -x CPP_FOR_BUILD="${BUILD_CPP}"
+	multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+
+		local native_build="${BUILD_DIR}"
+		python_compile() {
+			emake -C "${BUILD_DIR}"/bindings/swig top_builddir="${native_build}"
+			emake -C "${BUILD_DIR}"/bindings/python/python3 top_builddir="${native_build}"
+		}
+		use python && python_foreach_impl python_compile
+	else
+		emake -C common
+		emake -C lib
+		emake -C auparse
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" initdir="$(systemd_get_systemunitdir)" install
+
+		local native_build="${BUILD_DIR}"
+		python_install() {
+			emake -C "${BUILD_DIR}"/bindings/swig DESTDIR="${D}" top_builddir="${native_build}" install
+			emake -C "${BUILD_DIR}"/bindings/python/python3 DESTDIR="${D}" top_builddir="${native_build}" install
+			python_optimize
+		}
+		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
+	docinto contrib/plugin
+	dodoc contrib/plugin/*
+	docinto rules
+	dodoc rules/*rules
+
+	newinitd "${FILESDIR}"/auditd-init.d-2.4.3 auditd
+	newconfd "${FILESDIR}"/auditd-conf.d-2.1.3 auditd
+
+	[ -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 "${ED}" -type f -name '*.la' -delete || die
+
+	# Security
+	lockdown_perms "${ED}"
+}
+
+pkg_postinst() {
+	lockdown_perms "${EROOT}"
+}
+
+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,ditd,report,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.rules.stop.post b/sys-process/audit/files/audit.rules.stop.post
new file mode 100644
index 000000000000..29ae197f18bd
--- /dev/null
+++ b/sys-process/audit/files/audit.rules.stop.post
@@ -0,0 +1,12 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+#
+# This file contains the auditctl rules that are loaded immediately after the
+# audit deamon is stopped via the initscripts.
+# The rules are simply the parameters that would be passed
+# to auditctl.
+
+# Not used for the default Gentoo configuration as of v1.2.3
+# Paranoid security types might wish to reconfigure kauditd here.
+
+# vim:ft=conf:
diff --git a/sys-process/audit/files/audit.rules.stop.pre b/sys-process/audit/files/audit.rules.stop.pre
new file mode 100644
index 000000000000..1f34173369ec
--- /dev/null
+++ b/sys-process/audit/files/audit.rules.stop.pre
@@ -0,0 +1,15 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+#
+# This file contains the auditctl rules that are loaded immediately before the
+# audit deamon is stopped via the initscripts.
+# The rules are simply the parameters that would be passed
+# to auditctl.
+
+# auditd is stopping, don't capture events anymore
+-D
+
+# Disable kernel generating audit events
+-e 0
+
+# vim:ft=conf:
diff --git a/sys-process/pkill-darwin/Manifest b/sys-process/pkill-darwin/Manifest
index 917cd522726f..4c1101839e29 100644
--- a/sys-process/pkill-darwin/Manifest
+++ b/sys-process/pkill-darwin/Manifest
@@ -1,3 +1,3 @@
 DIST pkill-darwin-1.0.tar.xz 8232 BLAKE2B 283c49e125d55de6994013ca002225ddc728fc837029fafbddf4d9c4e0574761a220cc347f62d95b49d4e430b4d53c20a712e73b497700272c7f022a913e0f16 SHA512 18ced350664b6dcd07acb33e1872726857a6f762311f91ca2d30323153712a436017b232efd34f8cd0055e10f1036d4a84a06f37ef104722701a172a40d3575a
-EBUILD pkill-darwin-1.0.ebuild 1082 BLAKE2B 902a755475848aa0b0e4d1f1802c72ad4e7246ccf51c3db532123c5d82c3165aaf72e26efb9b4c3fa1cc0ce8f74e8fc072b43b5c81b072057f58397d75cfc279 SHA512 b838d5e6227ff2514d6675b14a0b9f84009191386b94e97f5869787f1505f3f913a49ea37059d26f0faa29d8d08d18427eae3dd1ee135a9b246af710ac241ad4
+EBUILD pkill-darwin-1.0.ebuild 1071 BLAKE2B bbaadccb06cfc107e3da8b47ce567fa5227c764337760d35fec0024ace6729a4e3429cc9d739a3d2eb5f28bf486972f52f416c1176933fe6ad8918dd9d455ae8 SHA512 65d1c8d63b1c0462e98c7d846d0eebe9c274cde207cc05b35ac2d339191edcbc85f107f516dd01347bad2ab72b07fa519d4112e6f5322719af4ca38723e7cf25
 MISC metadata.xml 253 BLAKE2B a4b36b4be049f1d21e016d607880182f1cec9bed962515c57a38cf380f146696105267bf25064ed831d889c27030798245d96eaee47d098a017f5052f44bc24f SHA512 b87265dab4980faf3d32b53ab9ce7d4ebbe5cc9d12300903b1365b337bcd72c337fdec2ef1574615d2d02cf0664023c17c0d30b57ac0237412fd2b401cc0e2f8
diff --git a/sys-process/pkill-darwin/pkill-darwin-1.0.ebuild b/sys-process/pkill-darwin/pkill-darwin-1.0.ebuild
index dd80960b677f..c4f2ad05eff2 100644
--- a/sys-process/pkill-darwin/pkill-darwin-1.0.ebuild
+++ b/sys-process/pkill-darwin/pkill-darwin-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://www.gentoo.org/~grobian/distfiles/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~ppc-macos ~x64-macos"
 IUSE=""
 
 src_compile() {
diff --git a/sys-process/tini/Manifest b/sys-process/tini/Manifest
index d18744a0c0af..71bc517f5e0a 100644
--- a/sys-process/tini/Manifest
+++ b/sys-process/tini/Manifest
@@ -1,3 +1,5 @@
 DIST tini-0.18.0.tar.gz 32152 BLAKE2B d676f0f1b4d9f6dca98cdb626aa7c525ec55e090cfeb1cf0e9ab167f1ef4285123223873e92e81d5d62ceb631e26e9012f16b28b1d35813ac801f8e4594be70b SHA512 83279180b6a875aaff9b6b7446ee7e71fd05357279744afcb4db67c76572dc871acfba86c035857009b5dd88ca75d9f2e815d6a925563cdb3e6e771eb83be9b1
+DIST tini-0.19.0.tar.gz 32369 BLAKE2B 5d86f6299b92152063974e6ecd347e1a2ba90f0188f2a702ddb6c814fc1c9723062481fe560caa89e9f74883017ee833566adf1eb1f11fe625671eced47f3296 SHA512 1fa85b56e2c6085ea474f251928e7a40510d92aeef60b3c145b0496969c1b5df86835d143cb91ef5b4bf4da63fa8a56947cc39a4276e4b72faa57276d432b292
 EBUILD tini-0.18.0.ebuild 1426 BLAKE2B 016e2475b6297cf6bf1cc2d6ff24f4a27fe456d41c6bdb8f76eda0e976ecb556e0b598d5c39225aa1f54e6e3533b3ebd182e9914ad9ca0164cbc2debd3e63472 SHA512 2bba6d17d43b7276d2372f20d2a975e6cb8749d572a4dc22f69975bb2930557fac35cf7d218377d638b1a63a3d8b7f89bdbe5123f0a13537b91a52b9a38cefbf
+EBUILD tini-0.19.0.ebuild 1399 BLAKE2B 3d3355ad6a5d6ca456e79415d94cb633d74504fbc60882c81e844ce92ad0d3f7c653cae86f364aaa3c25105ac30856fc4cb751050cf9d2269a1b3473de3816a8 SHA512 9ec866c568e96be698c3f247db0d76007e7476ea611003f9bc7d115e539dedcc89c85486edc3b3d5862fd126b5a6d1738123a723897121dd5acf04c55659cb8e
 MISC metadata.xml 558 BLAKE2B 7fd719d731c968125776805299e964567907ca7cae8a94c717218fdf8caa73d6f333a8bb22c36e0bec273f48504a55f91081e09474abc90440b50bcd760f53aa SHA512 dfbadc5994b3c7b4d8a27fd207c9f1836a21633218dee0252f938448f3c14f3c41d1f35c0604aecbc9f14117b27cd995451800c61dd41875be3becffb53d33f3
diff --git a/sys-process/tini/tini-0.19.0.ebuild b/sys-process/tini/tini-0.19.0.ebuild
new file mode 100644
index 000000000000..4e04e46695c9
--- /dev/null
+++ b/sys-process/tini/tini-0.19.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake 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 ~arm64 ~ppc64 ~x86"
+IUSE="+args +static"
+
+src_prepare() {
+	cmake_src_prepare
+
+	local sed_args=(
+		# Do not strip binary
+		-e 's/-Wl,-s")$/")/'
+
+		# Remove -Werror and -pedantic-errors in order to allow macro
+		# redefinition, so that CFLAGS="-U_FORTIFY_SOURCE" does not
+		# trigger an error due to add_definitions(-D_FORTIFY_SOURCE=2)
+		# in CMakeLists.txt (bug 626438).
+		-e "s/ -Werror / /"
+		-e "s/ -pedantic-errors / /"
+	)
+
+	sed -i "${sed_args[@]}" \
+		-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_src_configure
+}
+
+src_compile() {
+	append-cflags -DPR_SET_CHILD_SUBREAPER=36 -DPR_GET_CHILD_SUBREAPER=37
+	cmake_src_compile
+}
+
+src_install() {
+	cmake_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/top-apple/Manifest b/sys-process/top-apple/Manifest
index 519bf73a6499..5f75a5dd4345 100644
--- a/sys-process/top-apple/Manifest
+++ b/sys-process/top-apple/Manifest
@@ -1,5 +1,5 @@
 AUX top-apple-73-darwin9.patch 1157 BLAKE2B d4dcd4f956def1163a62a037d310763c8ea04d4c0a108f50ba8734f66558b11a6fbf0af51ad0c4846026555a4d226ee28c0c633b7bbfabbac08c67dc6985f0f4 SHA512 946257f7b33684479aab189c43d3e385ed8c70c882f1ae26ab38a0c9aa3318aed57a2e00bfd4f8a0e801b3510067ff5bb7fc1846b256d0787ba7d60ce3a0675e
 DIST libutil-11-top-73.h 5641 BLAKE2B 9c1c08f3e23a96a2b1178a9874a8be5b173b2b891b1b89b4d2480970e538db5ad09ec0956b46c77aea86530525d58e4d18a1c7d30e6b5e93ad087c99e5d17be5 SHA512 1acfefa549dce3f9fbbb30d1684f88538ceee2ec81554b9cb992c655edf2bd10464aa3f5beba4ffd0e7021aa77e1e97dcc18d6ee4801d63ecabb3b43185c1f51
 DIST top-73.tar.gz 69253 BLAKE2B 39b98f9a1b6f3c9663d26c70d55897375dd85d3ebcb54548a53e3c30f37fb7a5ae76a6d835b7ac0ea847d4c1f09f97ad92d863c4adc04c58bb5e11b99c0063eb SHA512 cefffbd59bb4e9021d62c93dfb04866f300e7e53af697c6c084fb66851d5e6df8dfb15ef46994a108febe66f95b9702e7ebb078df1f645a01adc86c2145322c9
-EBUILD top-apple-73.ebuild 1225 BLAKE2B 1f49b45a19850f3baa033aca46cdac16a559505d81696efc712680b9fd7237eb76e69e150c1223be209108a1a6939578c01af5133e8341e2e660b6297e1c01fe SHA512 5b2d561cbae86b0f8edeb146904362e60c1cc254456ab98e1f72ba2363215ff59a614dfcc0e9a23dd52cdb98c8674a81eb74675f4b1e5f164e522c5120d6331b
+EBUILD top-apple-73.ebuild 1211 BLAKE2B 5a1a9fc2df841dcd0c65987a63a0cd70122ee3edb2ba31d4beda4dac9221d8eb80f5660ff2d10bc35ae65d131d27831765860d0da586f124b573a057673ecb2d SHA512 afddcfa6dd39dc205b162451ee538f9b2fd315f76a0fdd8e194b2b71fc199134730c03e847133f062052851b8a8051f5c37a124c1f63aa58d8715fa72c55f1e3
 MISC metadata.xml 253 BLAKE2B a4b36b4be049f1d21e016d607880182f1cec9bed962515c57a38cf380f146696105267bf25064ed831d889c27030798245d96eaee47d098a017f5052f44bc24f SHA512 b87265dab4980faf3d32b53ab9ce7d4ebbe5cc9d12300903b1365b337bcd72c337fdec2ef1574615d2d02cf0664023c17c0d30b57ac0237412fd2b401cc0e2f8
diff --git a/sys-process/top-apple/top-apple-73.ebuild b/sys-process/top-apple/top-apple-73.ebuild
index 489dda9c7a83..c8d33f1440c3 100644
--- a/sys-process/top-apple/top-apple-73.ebuild
+++ b/sys-process/top-apple/top-apple-73.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="APSL-2 BSD"
 SLOT="0"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~ppc-macos ~x64-macos"
 IUSE=""
 
 S=${WORKDIR}/top-${PV}