gentoo resync : 20.03.2022

5 files changed, 20 insertions, 537 deletions

diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest
index f82d06b28539..195814f56c3f 100644
--- a/sys-process/audit/Manifest
+++ b/sys-process/audit/Manifest
@@ -1,17 +1,12 @@
-AUX audit-3.0.1-slibtool.patch 10052 BLAKE2B 5b88a2be001a95a94c717e4c9a5b92a4e83dcac75e4e11ce863b8ac1d43317d2fadef057b865af140e32fffe1254a7862ae84100d30302f07484e2ad2a6509b4 SHA512 8e838610818e033169aedd596ced83bd41852de1491d01d8a4e1500d8e084d681e708822b3971b2fb60dea644a6cef4dedd62e553c5cd13d5df9fd3274b5b43f
 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-3.0.1.tar.gz 1180286 BLAKE2B f29687ebc76f4eb88184cce1a3da0b8ca4464b2f81f56d71048ac4a64a713f33d6964e46e78b73c72b6ac2495f80114866773b3b86753c1d0dead25df73f7c43 SHA512 ad2897c9f539681f0f65b08cd0e650c528957fd4799755c2bcc47f869e04272aad31684c46847124d7b42dde243a16ba2754936890189610814c7007c0381d8c
-DIST audit-3.0.2.tar.gz 1184356 BLAKE2B 13f76e9c40bc8ffc53b5499076b5cb75c2690d95414a0e1942fa9725b9617f10327a2ee676dc10cc46ba76d223f77509d305bcd22344b678443b7707cc6d10cd SHA512 9e831ed6f30ac7d58f028cede97adba431bde18dfd9045c19f5e03eff52cd28db3a6792e5969f555ce51aa562662b59fa5cc5265586c6acf0b3aa1feae4d720f
-DIST audit-3.0.3.tar.gz 1186684 BLAKE2B 53e3fbb2acc574bad86cd41e6ffe396631695321e1c02f2d0f1f1f6fed8c77f61c3513431eafb157ec11e99330b4e277f6c75eaabac6179dac2abc8826e9cc76 SHA512 7132fd5d90c3745cdb2cd664c8d0b74ad9108bc39940e87fd1ae3ee461c484505d5d33fa5c741caa237e79e3bf9c7e1ccb07cac81b5cbfbe59db8fc8db021fd7
 DIST audit-3.0.6.tar.gz 1190011 BLAKE2B 93a7efad1cbea6771a73222b05aacbabc4ac61d1efb9fc2532607a94804bcac6512d0be2f4d89aa62d94fb85ba5818ffae4bf0a72676e8d549ddbec766e83e9c SHA512 74734e1b1fddea086db9c5dc8c4b7817917fdf17bc7ca4e5b440aae975484d020a17c3f485f6a37b6b150a307d809e50d559d31a8cbd6f1e554933719551bcd1
+DIST audit-3.0.7.tar.gz 1180226 BLAKE2B 706db746fb779913619da794bab24a9e890e1655bbd0abb007cbc909b32ab1d643e93953a23ef864d5e189f3447a7ddb4dca1478144cdc226f5a5594545bd28f SHA512 b5662b32082fc2ac54e247aa0db5442d76afa30134ebba1d624a17004e9ccf6856bb75344af4ce9d9a0a66c03e1c6f18b7d45658d7df13ea71af0c8362e08d70
 DIST audit-3.0.tar.gz 1109442 BLAKE2B f9c94f7163522068f5f37163a242cb913acc87b5465f7f8550fad27ac1dc673fd7a98e208bd5e6fb136eac1fdadd659e599e7722426937481bbf8c66d86a1617 SHA512 b82ec73c85a8ebb5108b526673d6fe08cbe0b51376788f3ea6ed5747c4612158462893e719496dffbd723f833f84383a2d1d55fd78a3ed985ecfd19545060c88
-EBUILD audit-3.0.1.ebuild 4262 BLAKE2B 95c293ae585d4c8e5decbf05938012ab0fab3c4dafc6348977107043f6e02252947eec36c7d0fe446c872caf7143b56fa70641e8a399a7e0b4a467d6ccb02571 SHA512 fff5966e9deeaca3387d1de975e8e934c7dcce303fa6a1ea6a2ab60fe92a37e16eaf2af8b3a65ddd12c0ba20267a785cf57f0c00e31a710e86b3949f588586e2
-EBUILD audit-3.0.2.ebuild 4215 BLAKE2B 1c349d818cd2d82a4956f61ff927a1da22cc3cfce0933b5f23a4f406d33ff4cfdb8bc54f779c8c7621f7e8ed53fb7d3447cf13f3584e9b9c6fd3c7c6a00d34e9 SHA512 34d842ff81a353ff5b5dd4ea96d83a935b394de4d10aabbe3b4fc9ab6a5c773166406c456f861acac6fab2b9fda781d94df8d766072ed566e3e6c87fc2fe0795
-EBUILD audit-3.0.3.ebuild 4145 BLAKE2B dc128f4a5f621c8d4106ee3eb86b7abcf01e11690419c76546ca46ce00eeb61a24b658d976357110bb5f13ce5df4a0921ddd745b526361a61eab3a22e6f0fb02 SHA512 19e279719d1f299515dc6b32f5a1048684ed000fc65af9eef7f78ee5faaead61ed8544671beccf9627718fb49e10d83a46cfa6131cc9d2f1e3cbf429e8d150bf
 EBUILD audit-3.0.6.ebuild 4132 BLAKE2B 440f537eafbcbadbf57f15faa3f0a7397dd83e6b07499669580997ba5fa1518ac93fceef5db1c237b00a4bb41e72f58d98034a9cfd48b8ceaf1463d9e89f4fe2 SHA512 0a235acfd15ca9d63fd340b8904f493354676a8e335f9e7836cd7ef0bdda874d84ca6a431ef617ee0edd42c8071fe67a432e0a7e1d2bc48c32d78ab7ddebe10d
+EBUILD audit-3.0.7.ebuild 4160 BLAKE2B 454b5ec931d2a3805e3354ebed518f4fe76b7afdf6b44640218bf041731a130b5b0ef6f41a6f2ec5acc08a74882cf5e3d781383bf890e3dcb3f8657b04c08782 SHA512 3f2ec375b44c2997c5c544b840441c5b42f662c34ec58eacd2e2f3e7f34fbb3f0a46a1bc67a568a35604b55aa3e868f16d91ce7bb51c909e3babd63a8a8f9a3e
 EBUILD audit-3.0.ebuild 4191 BLAKE2B 5ae83eab000925774dad7ea3679f2b40c7dfadc5d9253ffc8d2127d93b33740d5fa6dde11765aca42462e47ca2408b980cc1ac168bb1e36a90fb4461df7988a2 SHA512 aeb650ef13517defd99d1ea211bede149cbeb4868ca9f3ebef7668dcbd1bee6315bcb6bc98b9fde6022553e25c9c45f394d86a757009bf42d9befdb9d6c3a5bd
 MISC metadata.xml 457 BLAKE2B 2d18aba4c1e67e285691ed949808ebe7de2fddecb008eb16c1f8615d16e044fcfe3e81cceb30d325c4338462872fd2c436625a0d4eeefffd51cd074b1b5b4514 SHA512 809ea56f90880760e4b7ed180930af44f68b1ce5457fce2063969feebb22f02c8156bcc248cb885878e4d98848a2a5e91c194ac6f9fd54d8a88501e0c2d25ea9
diff --git a/sys-process/audit/audit-3.0.1.ebuild b/sys-process/audit/audit-3.0.1.ebuild
deleted file mode 100644
index 5c63dae44b9f..000000000000
--- a/sys-process/audit/audit-3.0.1.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit autotools 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"
-
-PATCHES=( "${FILESDIR}"/${P}-slibtool.patch )
-
-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
-	eautoreconf
-}
-
-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/audit-3.0.2.ebuild b/sys-process/audit/audit-3.0.2.ebuild
deleted file mode 100644
index 861a82aa1f1b..000000000000
--- a/sys-process/audit/audit-3.0.2.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit autotools 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
-	eautoreconf
-}
-
-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/audit-3.0.3.ebuild b/sys-process/audit/audit-3.0.7.ebuild
index 7ca9ea03f3db..ed9baad55d32 100644
--- a/sys-process/audit/audit-3.0.3.ebuild
+++ b/sys-process/audit/audit-3.0.7.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
-inherit autotools multilib multilib-minimal toolchain-funcs python-r1 linux-info systemd usr-ldscript
+inherit autotools 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/"
@@ -21,12 +21,12 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="gssapi? ( virtual/krb5 )
 	ldap? ( net-nds/openldap )
-	sys-libs/libcap-ng
-	python? ( ${PYTHON_DEPS} )"
+	python? ( ${PYTHON_DEPS} )
+	sys-libs/libcap-ng"
 DEPEND="${RDEPEND}
 	>=sys-kernel/linux-headers-2.6.34
 	test? ( dev-libs/check )"
-BDEPEND="python? ( dev-lang/swig:0 )"
+BDEPEND="python? ( dev-lang/swig )"
 
 CONFIG_CHECK="~AUDIT"
 
@@ -37,7 +37,7 @@ src_prepare() {
 		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
+	echo -e '%:\n\t:' | tee rules/Makefile.{am,in} >/dev/null || die
 
 	default
 	eautoreconf
@@ -54,23 +54,29 @@ multilib_src_configure() {
 		--without-python
 		--without-python3
 	)
-	ECONF_SOURCE=${S} econf "${myeconfargs[@]}"
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 
 	if multilib_is_native_abi && use python; then
 		python_configure() {
-			mkdir -p "${BUILD_DIR}"
+			mkdir -p "${BUILD_DIR}" || die
 			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
 }
 
@@ -101,9 +107,10 @@ multilib_src_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 /
+		# Things like shadow use this so we need to be in /
 		gen_usr_ldscript -a audit auparse
 	else
 		emake -C lib DESTDIR="${D}" install
@@ -148,7 +155,7 @@ pkg_postinst() {
 lockdown_perms() {
 	# Upstream wants these to have restrictive perms.
 	# Should not || die as not all paths may exist.
-	local basedir="$1"
+	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-3.0.1-slibtool.patch b/sys-process/audit/files/audit-3.0.1-slibtool.patch
deleted file mode 100644
index a1cf75341787..000000000000
--- a/sys-process/audit/files/audit-3.0.1-slibtool.patch
+++ /dev/null
@@ -1,207 +0,0 @@
-From 8d6a7be8e29d00ab08c0cdcaf0dd293ed834205d Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Wed, 31 Mar 2021 05:51:53 -0700
-Subject: [PATCH] build: Link with libtool archives instead.
-
-Signed-off-by: orbea <orbea@riseup.net>
----
- audisp/Makefile.am                    | 10 +++++-----
- audisp/plugins/ids/Makefile.am        |  2 +-
- audisp/plugins/remote/Makefile.am     |  2 +-
- audisp/plugins/statsd/Makefile.am     |  2 +-
- audisp/plugins/syslog/Makefile.am     |  2 +-
- audisp/plugins/zos-remote/Makefile.am |  2 +-
- src/Makefile.am                       | 11 +++++------
- src/libev/Makefile.am                 |  5 +++--
- tools/aulast/Makefile.am              |  2 +-
- tools/aulastlog/Makefile.am           |  2 +-
- tools/ausyscall/Makefile.am           |  2 +-
- tools/auvirt/Makefile.am              |  2 +-
- 12 files changed, 22 insertions(+), 22 deletions(-)
-
-diff --git a/audisp/Makefile.am b/audisp/Makefile.am
-index 852169e0..c477ee19 100644
---- a/audisp/Makefile.am
-+++ b/audisp/Makefile.am
-@@ -23,13 +23,13 @@
- SUBDIRS = plugins 
- CONFIG_CLEAN_FILES = *.rej *.orig
- AM_CPPFLAGS = -D_GNU_SOURCE -fPIC -DPIC -I${top_srcdir} -I${top_srcdir}/lib -I${top_srcdir}/src -I${top_srcdir}/src/libev
--LIBS = -L${top_builddir}/lib -laudit 
-+LIBS = ${top_builddir}/lib/libaudit.la
- LDADD = -lpthread
- 
- noinst_HEADERS = audispd-pconfig.h audispd-llist.h audispd-config.h \
- 	queue.h audispd-builtins.h libdisp.h
--libdisp_a_SOURCES = audispd.c audispd-pconfig.c queue.c \
-+libdisp_la_SOURCES = audispd.c audispd-pconfig.c queue.c \
- 	audispd-llist.c audispd-builtins.c
--libdisp_a_CFLAGS = -fno-strict-aliasing
--noinst_LIBRARIES = libdisp.a
--
-+libdisp_la_CFLAGS = -fno-strict-aliasing
-+libdisp_la_LDFLAGS = -no-undefined -static
-+noinst_LTLIBRARIES = libdisp.la
-diff --git a/audisp/plugins/ids/Makefile.am b/audisp/plugins/ids/Makefile.am
-index 65d83b64..9bb141fa 100644
---- a/audisp/plugins/ids/Makefile.am
-+++ b/audisp/plugins/ids/Makefile.am
-@@ -37,7 +37,7 @@ audisp_ids_SOURCES = account.c avl.c ids.c ids_config.c model_bad_event.c \
- 	model_behavior.c nvpair.c origin.c reactions.c session.c \
- 	timer-services.c
- audisp_ids_CFLAGS = -D_GNU_SOURCE
--audisp_ids_LDADD = -L${top_builddir}/lib -laudit -L${top_builddir}/auparse -lauparse -L${top_builddir}/common -laucommon -lpthread
-+audisp_ids_LDADD = ${top_builddir}/lib/libaudit.la ${top_builddir}/auparse/libauparse.la ${top_builddir}/common/libaucommon.la -lpthread
- 
- install-data-hook:
- 	mkdir -p -m 0750 ${DESTDIR}${plugin_confdir}
-diff --git a/audisp/plugins/remote/Makefile.am b/audisp/plugins/remote/Makefile.am
-index bd3f3016..ae867079 100644
---- a/audisp/plugins/remote/Makefile.am
-+++ b/audisp/plugins/remote/Makefile.am
-@@ -37,7 +37,7 @@ audisp_remote_DEPENDENCIES = ${top_builddir}/common/libaucommon.la
- audisp_remote_SOURCES = audisp-remote.c remote-config.c queue.c
- audisp_remote_CFLAGS = -fPIE -DPIE -g -D_REENTRANT -D_GNU_SOURCE -Wundef
- audisp_remote_LDFLAGS = -pie -Wl,-z,relro -Wl,-z,now
--audisp_remote_LDADD = $(CAPNG_LDADD) $(gss_libs) -L${top_builddir}/common -laucommon
-+audisp_remote_LDADD = $(CAPNG_LDADD) $(gss_libs) ${top_builddir}/common/libaucommon.la
- 
- test_queue_SOURCES = queue.c test-queue.c
- 
-diff --git a/audisp/plugins/statsd/Makefile.am b/audisp/plugins/statsd/Makefile.am
-index 7ba887df..a105e66b 100644
---- a/audisp/plugins/statsd/Makefile.am
-+++ b/audisp/plugins/statsd/Makefile.am
-@@ -30,7 +30,7 @@ sbin_PROGRAMS = audisp-statsd
- man_MANS = audisp-statsd.8
- audisp_statsd_SOURCES = audisp-statsd.c
- audisp_statsd_CFLAGS = -g -D_GNU_SOURCE
--audisp_statsd_LDADD = -L${top_builddir}/auparse -lauparse -L${top_builddir}/lib -laudit
-+audisp_statsd_LDADD = ${top_builddir}/auparse/libauparse.la ${top_builddir}/lib/libaudit.la
- 
- install-data-hook:
- 	mkdir -p -m 0750 ${DESTDIR}${plugin_confdir}
-diff --git a/audisp/plugins/syslog/Makefile.am b/audisp/plugins/syslog/Makefile.am
-index 353229ec..e5451866 100644
---- a/audisp/plugins/syslog/Makefile.am
-+++ b/audisp/plugins/syslog/Makefile.am
-@@ -33,7 +33,7 @@ audisp_syslog_DEPENDENCIES = ${top_builddir}/common/libaucommon.la
- audisp_syslog_SOURCES = audisp-syslog.c
- audisp_syslog_CFLAGS = -fPIE -DPIE -g -D_GNU_SOURCE -Wundef
- audisp_syslog_LDFLAGS = -pie -Wl,-z,relro -Wl,-z,now
--audisp_syslog_LDADD = $(CAPNG_LDADD) -L${top_builddir}/common -laucommon -L${top_builddir}/auparse -lauparse
-+audisp_syslog_LDADD = $(CAPNG_LDADD) ${top_builddir}/common/libaucommon.la ${top_builddir}/auparse/libauparse.la
- 
- install-data-hook:
- 	mkdir -p -m 0750 ${DESTDIR}${plugin_confdir}
-diff --git a/audisp/plugins/zos-remote/Makefile.am b/audisp/plugins/zos-remote/Makefile.am
-index d8d88b3f..d51e83e7 100644
---- a/audisp/plugins/zos-remote/Makefile.am
-+++ b/audisp/plugins/zos-remote/Makefile.am
-@@ -24,7 +24,7 @@
- AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/lib -I${top_srcdir}/auparse
- CONFIG_CLEAN_FILES = *.rej *.orig
- EXTRA_DIST = zos-remote.conf audispd-zos-remote.conf
--LIBS = -L${top_builddir}/auparse -lauparse
-+LIBS = ${top_builddir}/auparse/libauparse.la
- LDADD = -lpthread -lldap -llber $(CAPNG_LDADD) 
- plugin_confdir=$(sysconfdir)/audit
- plugin_conf = zos-remote.conf
-diff --git a/src/Makefile.am b/src/Makefile.am
-index fda612b1..e2e58acb 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -33,22 +33,21 @@ auditd_SOURCES += auditd-listen.c
- endif
- auditd_CFLAGS = -fPIE -DPIE -g -D_REENTRANT -D_GNU_SOURCE -fno-strict-aliasing -pthread -Wno-pointer-sign
- auditd_LDFLAGS = -pie -Wl,-z,relro -Wl,-z,now
--auditd_DEPENDENCIES = libev/libev.a ${top_builddir}/audisp/libdisp.a
--auditd_LDADD = @LIBWRAP_LIBS@ -Llibev -lev -L${top_builddir}/audisp -ldisp -L${top_builddir}/lib -laudit -L${top_builddir}/auparse -lauparse -lpthread -lrt -lm $(gss_libs) -L${top_builddir}/common -laucommon
-+auditd_LDADD = @LIBWRAP_LIBS@ ${top_builddir}/src/libev/libev.la ${top_builddir}/audisp/libdisp.la ${top_builddir}/lib/libaudit.la ${top_builddir}/auparse/libauparse.la -lpthread -lrt -lm $(gss_libs) ${top_builddir}/common/libaucommon.la
- 
- auditctl_SOURCES = auditctl.c auditctl-llist.c delete_all.c auditctl-listing.c
- auditctl_CFLAGS = -fPIE -DPIE -g -D_GNU_SOURCE
- auditctl_LDFLAGS = -pie -Wl,-z,relro -Wl,-z,now
--auditctl_LDADD = -L${top_builddir}/lib -laudit -L${top_builddir}/auparse -lauparse -L${top_builddir}/common -laucommon
-+auditctl_LDADD = ${top_builddir}/lib/libaudit.la ${top_builddir}/auparse/libauparse.la ${top_builddir}/common/libaucommon.la
- 
- aureport_SOURCES = aureport.c auditd-config.c ausearch-llist.c aureport-options.c ausearch-string.c ausearch-parse.c aureport-scan.c aureport-output.c ausearch-lookup.c ausearch-int.c ausearch-time.c ausearch-nvpair.c ausearch-avc.c ausearch-lol.c
--aureport_LDADD = -L${top_builddir}/lib -laudit -L${top_builddir}/auparse -lauparse -L${top_builddir}/common -laucommon
-+aureport_LDADD = ${top_builddir}/lib/libaudit.la ${top_builddir}/auparse/libauparse.la ${top_builddir}/common/libaucommon.la
- 
- ausearch_SOURCES = ausearch.c auditd-config.c ausearch-llist.c ausearch-options.c ausearch-report.c ausearch-match.c ausearch-string.c ausearch-parse.c ausearch-int.c ausearch-time.c ausearch-nvpair.c ausearch-lookup.c ausearch-avc.c ausearch-lol.c ausearch-checkpt.c
--ausearch_LDADD = -L${top_builddir}/lib -laudit -L${top_builddir}/auparse -lauparse -L${top_builddir}/common -laucommon
-+ausearch_LDADD = ${top_builddir}/lib/libaudit.la ${top_builddir}/auparse/libauparse.la ${top_builddir}/common/libaucommon.la
- 
- autrace_SOURCES = autrace.c delete_all.c auditctl-llist.c
--autrace_LDADD = -L${top_builddir}/lib -laudit
-+autrace_LDADD = ${top_builddir}/lib/libaudit.la
- 
- libev/libev.a:
- 	make -C libev
-diff --git a/src/libev/Makefile.am b/src/libev/Makefile.am
-index d6094a76..85f4da52 100644
---- a/src/libev/Makefile.am
-+++ b/src/libev/Makefile.am
-@@ -24,6 +24,7 @@ EXTRA_DIST = README ev_epoll.c ev_poll.c ev_select.c ev_iouring.c ev_linuxaio.c
- AM_CFLAGS = -fPIC -DPIC -g -fno-strict-aliasing ${DEBUG}
- 
- noinst_HEADERS = ev.h ev_vars.h ev_wrap.h event.h
--noinst_LIBRARIES = libev.a
-+noinst_LTLIBRARIES = libev.la
- 
--libev_a_SOURCES = ev.c event.c
-+libev_la_SOURCES = ev.c event.c
-+libev_la_LDFLAGS = -no-undefined -static
-diff --git a/tools/aulast/Makefile.am b/tools/aulast/Makefile.am
-index 2f15525a..1ee0b8c0 100644
---- a/tools/aulast/Makefile.am
-+++ b/tools/aulast/Makefile.am
-@@ -23,7 +23,7 @@
- CONFIG_CLEAN_FILES = *.loT *.rej *.orig
- EXTRA_DIST = $(man_MANS)
- AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/lib -I${top_srcdir}/auparse
--LIBS = -L${top_builddir}/auparse -lauparse
-+LIBS = ${top_builddir}/auparse/libauparse.la
- AM_CFLAGS = -D_GNU_SOURCE
- bin_PROGRAMS = aulast
- noinst_HEADERS = aulast-llist.h
-diff --git a/tools/aulastlog/Makefile.am b/tools/aulastlog/Makefile.am
-index e45076ba..f208b4c3 100644
---- a/tools/aulastlog/Makefile.am
-+++ b/tools/aulastlog/Makefile.am
-@@ -23,7 +23,7 @@
- CONFIG_CLEAN_FILES = *.loT *.rej *.orig
- EXTRA_DIST = $(man_MANS)
- AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/auparse
--LIBS = -L${top_builddir}/auparse -lauparse
-+LIBS = ${top_builddir}/auparse/libauparse.la
- AM_CFLAGS = -D_GNU_SOURCE
- bin_PROGRAMS = aulastlog
- noinst_HEADERS = aulastlog-llist.h
-diff --git a/tools/ausyscall/Makefile.am b/tools/ausyscall/Makefile.am
-index 1dce67c0..daa277d7 100644
---- a/tools/ausyscall/Makefile.am
-+++ b/tools/ausyscall/Makefile.am
-@@ -23,7 +23,7 @@
- CONFIG_CLEAN_FILES = *.loT *.rej *.orig
- EXTRA_DIST = $(man_MANS)
- AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/lib
--LIBS = -L${top_builddir}/lib -laudit
-+LIBS = ${top_builddir}/lib/libaudit.la
- AM_CFLAGS = -D_GNU_SOURCE
- bin_PROGRAMS = ausyscall
- man_MANS = ausyscall.8
-diff --git a/tools/auvirt/Makefile.am b/tools/auvirt/Makefile.am
-index 50b9b323..dafeeccf 100644
---- a/tools/auvirt/Makefile.am
-+++ b/tools/auvirt/Makefile.am
-@@ -29,7 +29,7 @@ AM_CPPFLAGS = -I${top_srcdir} \
- 		   -I${top_srcdir}/lib \
- 		   -I${top_srcdir}/auparse \
- 		   -I${top_srcdir}/src
--LIBS = -L${top_builddir}/auparse -lauparse
-+LIBS = ${top_builddir}/auparse/libauparse.la
- AM_CFLAGS = -D_GNU_SOURCE
- bin_PROGRAMS = auvirt
- noinst_HEADERS = auvirt-list.h