gentoo resync : 25.08.2020

4 files changed, 239 insertions, 64 deletions

diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest
index e68fe76fb79b..44029ec8a5a3 100644
--- a/sys-process/audit/Manifest
+++ b/sys-process/audit/Manifest
@@ -7,16 +7,19 @@ AUX audit.rules.stop.post 452 BLAKE2B b10d6d6c0fa475998856e674bd5c8dc0d7ca8f1d67
 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.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
 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.6.4.ebuild 6209 BLAKE2B da9974d8cfa7dd21da6cff1e2275b0f70f756c5dd5fba309cdb4806f79349b040ef29181ab00129c97564302139d24696c4ba5c6018f1543a951cbee49a4657e SHA512 84a693604384d5bcdfedaad966d9ebb78441262e877741ebf699eba408f8b6d2e3497f4eca40c45ec50e3d0517cbd24f8e3a5a1d2c50d346fc80d4c56d2e4cb4
 EBUILD audit-2.7.1.ebuild 6206 BLAKE2B b9b6109a7e75546eb3c6cad3d8f1d720572ccf95dbbbd47709006394b7ae900feba2fd6fdf65a15d2d07e872ba59d04e00ca13d2709a9cafaaf918a1516a3ee8 SHA512 f44ecf8c79611d803429ec798a63ec2f34ca862cdac039adf90a28bfc8fa0bec4991188da430dbc426171ff3fd4d20e13e4dbaed3198a636f302d254bb5c541e
 EBUILD audit-2.8.2.ebuild 6140 BLAKE2B 751cce3ad1146270470bfc8df41bb117c427edcd1ca21fb032a929ecd54f0e43a0bd72244d3e60eda8ccba960963c6906e0302dada72b4b1d9bcab5697eb3888 SHA512 3be981935f47ff0db641a57612a3d156297429805acda9d0cf2a1974a7fd660c464a2afcd1e6395f7e1745a0a37157ac98e88337890371ce2a1cd7609e65637e
 EBUILD audit-2.8.3.ebuild 6132 BLAKE2B 16fa21d0b4937b162fefaa41fe6ede13fad9eb755b3e8f2d15ba54a69f4bd45b229fa70dc2ddbf5ce649c8152fe72c0ef134a8369dfbe76221c3d97008baa945 SHA512 f571a1adf2963bbd7c653077a41ff95d31896790a05ffdb9fd85b5e60af485f49299e04270eeed7ae72668af2985b2b9a79f24cae4db7d73b27edeadb6af28b3
-EBUILD audit-2.8.4.ebuild 6140 BLAKE2B f1afbe67fc1eadc75a3c715460d8eb35d41d375ca0e5ae231dd8a4ee406bf152c82ac7222f642924ca641eb2c6be2a6b3d87df87fd80b172679f95587804c6a1 SHA512 db791492f537f21ede9b5afe90bbdb51488c9d6aebdcca9158fc5855d81d9a7efdf7caae67e8a6a1f74962bb664f1f236bd5e4a27bf1e5d5e0d22a68034142cb
-EBUILD audit-2.8.5.ebuild 6193 BLAKE2B 4e4a073ec8ac7b81360275c045c177aac396936b14f64f7fbfcef02c22e04181d4f654f8626da1abc6c13f40ea386bfed65be77fc06788093ed2c2fe1d9b0a6b SHA512 9cf62b6878edf261ebdab265b3f8b485e4cb501df01fc9f3cecc92ab06b4f1700a3c3f6249c16feac59a1e9c67dc999bfa173258bd3111905ff1054819fae4f9
+EBUILD audit-2.8.4.ebuild 5711 BLAKE2B e6956eff8afffcae7e22919680cb7db63af7c1dfdfd9e35e14af73ae378031a821beee4fc782741393421e6a3873a401f3f8e86e5567595d4d5e93f26ecea2a7 SHA512 d659215b7caf54d1c68aa3f7d18fa1951c938eff67c3b8c2ca666c368e90bfbe8112133e45d85905b909a55026bb1e53ed635dedacc7d9ac34934ceb414300a3
+EBUILD audit-2.8.5-r1.ebuild 6383 BLAKE2B 70b429c3b28758094fadbdcb9ac392bc0cbaf88d872a374dfe96d8a90a0f8d2226bf7a14225aa541e6cd10cbe6cb6f62f7e5415b008794c42f0eae3b7ad0e18e SHA512 6f4347ca67a31739228d20718129614ed7f05b1815d69ce48bd0cb9e0cab22156d870c240dcf40495179f066e8a4b7212c565b0583771a9c6c3559a27611b097
+EBUILD audit-2.8.5.ebuild 5753 BLAKE2B 13495f6f69ca6cb3d85b091805ddcf8f78beb24414d8c797220a0ba21526a5301e014617e20aaa21bee43dbdb80e3ac4aad54692e669a2ffaba3b60bc9e6c9d0 SHA512 001dae4db073cb1d3b4de94da68cd46d27ea5eeb18a1d9c50c04d01f6f831c9e95e4d49b3362c716b874c3ed54e2d30666f717accb84bef11f34ee2b525bec5f
 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
index 9e94441dc51a..fb5ec3ac098c 100644
--- a/sys-process/audit/audit-2.8.4.ebuild
+++ b/sys-process/audit/audit-2.8.4.ebuild
@@ -85,11 +85,7 @@ multilib_src_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
+			econf --without-python --with-python3
 		}
 
 		use python && python_foreach_impl python_configure
@@ -109,25 +105,16 @@ multilib_src_compile() {
 		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}" \
+				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" \
-				${pydef}
+				USE_PYTHON3=true
 		}
 
 		local native_build="${BUILD_DIR}"
@@ -143,26 +130,17 @@ multilib_src_install() {
 		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} \
+				USE_PYTHON3=true \
 				DESTDIR="${D}" install
-			emake -C "${BUILD_DIR}"/bindings/python/python${pysuffix} \
-				VPATH="${S}/bindings/python/python${pysuffix}:${native_build}/bindings/python/python${pysuffix}" \
+			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" \
-				${pydef} \
+				USE_PYTHON3=true \
 				DESTDIR="${D}" install
 		}
 
diff --git a/sys-process/audit/audit-2.8.5-r1.ebuild b/sys-process/audit/audit-2.8.5-r1.ebuild
new file mode 100644
index 000000000000..dba672537b50
--- /dev/null
+++ b/sys-process/audit/audit-2.8.5-r1.ebuild
@@ -0,0 +1,216 @@
+# 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/"
+# https://github.com/linux-audit/audit-userspace/tree/2.8_maintenance
+COMMIT='80866dc78b5db17010516e24344eaed8dcc6fb99' # contains many fixes not yet released
+if [[ -n $COMMIT ]]; then
+	SRC_URI="https://github.com/linux-audit/audit-userspace/archive/${COMMIT}.tar.gz -> ${P}_p${COMMIT:0:12}.tar.gz"
+	S="${WORKDIR}/audit-userspace-${COMMIT}"
+else
+	SRC_URI="https://people.redhat.com/sgrubb/audit/${P}.tar.gz"
+fi
+# -fno-common patch:
+SRC_URI+=" https://github.com/linux-audit/audit-userspace/commit/017e6c6ab95df55f34e339d2139def83e5dada1f.patch -> ${PN}-017e6c6ab95df55f34e339d2139def83e5dada1f.patch"
+
+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
+
+	# -fno-common
+	eapply "${DISTDIR}/${PN}-017e6c6ab95df55f34e339d2139def83e5dada1f.patch"
+
+	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-2.8.5.ebuild b/sys-process/audit/audit-2.8.5.ebuild
index aebeceb470c4..d743db4f3f59 100644
--- a/sys-process/audit/audit-2.8.5.ebuild
+++ b/sys-process/audit/audit-2.8.5.ebuild
@@ -83,11 +83,7 @@ multilib_src_configure() {
 			mkdir -p "${BUILD_DIR}" || die
 			cd "${BUILD_DIR}" || die
 
-			if python_is_python3; then
-				econf ${my_conf} --without-python --with-python3
-			else
-				econf ${my_conf} --with-python --without-python3
-			fi
+			econf ${my_conf} --without-python --with-python3
 		}
 
 		use python && python_foreach_impl python_configure
@@ -107,25 +103,16 @@ multilib_src_compile() {
 		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}" \
+				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" \
-				${pydef}
+				USE_PYTHON3=true
 		}
 
 		local native_build="${BUILD_DIR}"
@@ -141,26 +128,17 @@ multilib_src_install() {
 		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} \
+				USE_PYTHON3=true \
 				DESTDIR="${D}" install
-			emake -C "${BUILD_DIR}"/bindings/python/python${pysuffix} \
-				VPATH="${S}/bindings/python/python${pysuffix}:${native_build}/bindings/python/python${pysuffix}" \
+			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" \
-				${pydef} \
+				USE_PYTHON3=true \
 				DESTDIR="${D}" install
 		}