13 files changed, 4 insertions, 1444 deletions
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 93a165592141..6c533fea9883 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest
index 01e0eb2b05a0..ac91b3b2288a 100644
--- a/sys-process/audit/Manifest
+++ b/sys-process/audit/Manifest
@@ -5,14 +5,6 @@ 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-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.8.tar.gz 1182432 BLAKE2B 38a35a7540e608127cfc54a2de2cb12df8c29e778799ca53318824c84565a67b7ea131f9bba455fa469ce9139a27908738f571a6e383ce9a3274f70c09d27ec7 SHA512 8379bf425d68381d182300e628e42de8460d2f3e15b2395e10880f94b9989656852a50a9bece75b632ec8a04c40c9e666ff4c9d6b25ace3a8f50d2011506afab
 DIST audit-3.0.9.tar.gz 1210655 BLAKE2B a6b17ee61f506878cd70827b6ca2040762c762f10bdab7a253300d926cda59b300571c6df0e852ffb56db94620868de7dd22267ba1e8d1281e4ae1f702914b23 SHA512 5219eb0b41746eca3406008a97731c0083e7be50ec88563a39537de22cb69fe88490f5fe5a11535930f360b11a62538e2ff6cbe39e059cd760038363954ef4d6
-DIST audit-3.0.tar.gz 1109442 BLAKE2B f9c94f7163522068f5f37163a242cb913acc87b5465f7f8550fad27ac1dc673fd7a98e208bd5e6fb136eac1fdadd659e599e7722426937481bbf8c66d86a1617 SHA512 b82ec73c85a8ebb5108b526673d6fe08cbe0b51376788f3ea6ed5747c4612158462893e719496dffbd723f833f84383a2d1d55fd78a3ed985ecfd19545060c88
-EBUILD audit-3.0-r2.ebuild 4216 BLAKE2B c5d479706327d9973ce84566b24cb2ab83ff2f6d334d0a8482026f66213cad69197ea3e09f3c4ecea2c680aaf3383e2244d4fd42670dc685a94beafa9a5f1936 SHA512 f8d4a924c2c38dbe31ce94ff1da4e176d93c6c84c4d6ec778b7c220256a9fa0e154f2adaa06ba76424b1795871004db9fdacc8c231913aceb13c943b783683ab
-EBUILD audit-3.0.6-r2.ebuild 4162 BLAKE2B bb999a1f538127deed7b8e43ca367e86dd8b2d66e6d0dad5ce0c3aabc35ff05cada754941ab55c23c9b9e29fd1022cb9649e289341f91305a8377994c7b23fe0 SHA512 7ae465078a07b5301aacce119b895557b5aa7150f61a6dd625468cefdd14cf7c18a2116238b931bcdfbdf7ec9e1b976fb09fdc3edbd3ffaaf713ede72e540d60
-EBUILD audit-3.0.7-r2.ebuild 4190 BLAKE2B b77068469069c4459779abc1129537ed9e79e38692ae31a5ac6bbc758704e9d0e7791fd8352e237aa38566db1bbfdcb7af1bb2204f2cef1664d90a184554ed02 SHA512 3d43b49916f796f8450ccc20cb63ce02f7100f88146115926ef3290284e6393885d295d87823af9ae4750bf37b3c25c085f1316b36554df989e5e4dddde58063
-EBUILD audit-3.0.8-r1.ebuild 4627 BLAKE2B 61f1914e144aa72c7bc983d00c3c698fceb05fffa39b82649171ec3b1a11d57a61c99ab82ce9e3ebb99ef9641af3e2d493a052b18c1a81b51bc0bdd7b99c85bd SHA512 af1e5bc9fe3ffbaf0851e97d294b1d84b7d52e555a43896fb06dbf13150917eaaf2c3e60ce47a56013e91c52d5b91acdd06ab0cb72e05eb61e335d5892455ac4
 EBUILD audit-3.0.9-r1.ebuild 4638 BLAKE2B 221e9c6f037f8e43e536be2aed7bcf35b0934febc725bbb4d86536dddeb0fe53246bdcf7879af2e99537abf783a2d3be012afd3913da6126d693345aa3877358 SHA512 9d4894e640a2ef92b02d1c117ed14e01c0b31f14622806209a63531cac39786c2e2b131d5cab7f783a34fecd27cac2dbd2be0f9af97ba921dea89e466339a462
 MISC metadata.xml 457 BLAKE2B 2d18aba4c1e67e285691ed949808ebe7de2fddecb008eb16c1f8615d16e044fcfe3e81cceb30d325c4338462872fd2c436625a0d4eeefffd51cd074b1b5b4514 SHA512 809ea56f90880760e4b7ed180930af44f68b1ce5457fce2063969feebb22f02c8156bcc248cb885878e4d98848a2a5e91c194ac6f9fd54d8a88501e0c2d25ea9
diff --git a/sys-process/audit/audit-3.0-r2.ebuild b/sys-process/audit/audit-3.0-r2.ebuild
deleted file mode 100644
index 9fff712f7911..000000000000
--- a/sys-process/audit/audit-3.0-r2.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_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="~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" # 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*
-	keepdir /etc/audit/rules.d
-
-	# 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.6-r2.ebuild b/sys-process/audit/audit-3.0.6-r2.ebuild
deleted file mode 100644
index 10d1ec62119c..000000000000
--- a/sys-process/audit/audit-3.0.6-r2.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-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/"
-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 test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( 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
-	test? ( dev-libs/check )"
-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*
-	keepdir /etc/audit/rules.d
-
-	# 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.7-r2.ebuild b/sys-process/audit/audit-3.0.7-r2.ebuild
deleted file mode 100644
index 0b4fa332e869..000000000000
--- a/sys-process/audit/audit-3.0.7-r2.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-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/"
-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 test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="gssapi? ( virtual/krb5 )
-	ldap? ( net-nds/openldap:= )
-	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 )"
-
-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 || die
-
-	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}" || 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
-}
-
-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*
-	keepdir /etc/audit/rules.d
-
-	# 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.8-r1.ebuild b/sys-process/audit/audit-3.0.8-r1.ebuild
deleted file mode 100644
index f785fbc7c6b1..000000000000
--- a/sys-process/audit/audit-3.0.8-r1.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# As with sys-libs/libcap-ng, same maintainer in Fedora as upstream, so
-# check Fedora's packaging (https://src.fedoraproject.org/rpms/audit/tree/rawhide)
-# on bumps (or if hitting a bug) to see what they've done there.
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-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/"
-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 test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="gssapi? ( virtual/krb5 )
-	ldap? ( net-nds/openldap:= )
-	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 )"
-
-CONFIG_CHECK="~AUDIT"
-
-PATCHES=(
-	# See bug #836702 before removing / verify builds fine w/ USE=python
-	# with latest kernel headers.
-	"${FILESDIR}"/${PN}-3.0.8-linux-headers-5.17.patch
-	"${FILESDIR}"/${PN}-3.0.8-musl-malloc.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 || die
-
-	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}" || 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
-}
-
-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*
-	keepdir /etc/audit/rules.d
-
-	# 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/criu/Manifest b/sys-process/criu/Manifest
index 5d3b9f167bf8..89bb96d4830f 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -1,17 +1,10 @@
 AUX 2.2/criu-2.2-flags.patch 259 BLAKE2B 6e62d8e96ba9b2beaa4a525f14ebca1a198dae73c83d37396d92642dd426a015828daa0f5022471f0822f1660acc373cc5a848d86bcb231d9ed00b6ca5975866 SHA512 d2b122abb9d8878b5d50e11aa6a5323bd16a30f60eb7b746ecb7e4dcaab2a54d7974931778b5d82766d92963dc5075784df87bb736ad5019c66052bd25d9d57d
 AUX 2.3/criu-2.3-no-git.patch 651 BLAKE2B 76d7bd15f67789a72cd0d58c854da5601cfdc42e657cc819acecd52653b2b3699db3f00cb5916148c9a1a8013159716d8607bfd6443d24a2f98bd6e0abe21f90 SHA512 9010b79a01f7bab35ca23749d6e61706404cca89d5cdacd31fc32aba82b088becd9997f9a82db460e16bd84d9f38b1b35e90d3c49ad04b0f141d037e9ebafdd8
 AUX criu-3.12-automagic-libbsd.patch 457 BLAKE2B bd16c9e84ba67d0968371844c7b8121d1defea93371b17124130685c1d55969e3f472349f4e4f5ac211cd659980bfdecaa06b38a2fc6037d486d15dee6850884 SHA512 b535792caf39c9e8c21ed313551b9fc0f8675c494586c66d5caba17c67bb432c27c9ff3cbf5a7d2248c99fc438174c0daea355d89ef9d4ce1a8a26e688fdf7c3
-AUX criu-3.15-pkg-config.patch 5131 BLAKE2B 3b4cc0a2ae3dac24eb5f76a20478844e10b601a9584e8ae7bdd6a0167add2ba715c606fd7ee00aea9893c9e99a9ee42f031b85b37c7f4fc5d4b1fcf9ecff78e7 SHA512 e424d3ee684463dfab504da234c7e178a8060a83efd743d940ad8c8ebc58f5c07de7a48cd3fc333fcc67a0947ad8c9b838e48163045a2093afe5923ca6ff1399
-AUX criu-3.15-protobuf-c-1.4.0.patch 6377 BLAKE2B bbfce0a7feecf2886cb5fbfff3d79ac47e28e1cd6d5d5133323c5d89be005120e38de5378f31faaf83f0698170ca4b8d5d795faaca190802d2102539032b193a SHA512 50f1e6a5cb2b69d0fbbbe1013d4d2b91af6800dfcfc2d73d83cd389118ab85dea1d2b32fb4152b56ef58373da3e8cd6e962f9c111359e6e76e399c3e84f3030e
 AUX criu-3.16.1-buildsystem.patch 2164 BLAKE2B aaa5e47ca5c822407693c795015e25b9db5208bf0c25026030c5b776769d27c4513707865fdd37eb4acd14beca4eecdcb83fe77c6c9479df2519dc0c49e912b5 SHA512 a36932081ed1aa058a60f93ec4a2c434a3ec6cad6ac221f2db22f3d01025e7de074ef3f3feda206ed50b1ed921b87cfa5e3d07e6cfc50ab1c527a2821ad33e1d
 AUX criu-3.17-amdgpu-build-fixes.patch 3069 BLAKE2B 21bf7ce7bfa8a1d07e2160a7dd8b6e4d638499add115d66b40811d095f622cdf93f51aaacf16afb48bcc8cd0084839982ebe3e9c3c149d8303f12468959c0d00 SHA512 9c4d94d937ce4802531456d2a1679dcaa7f726fc96d80b0892b3c17ae6653ae94090f1f23f8c9ae6450782d74f5de05151b277aef826349cfc510c70e459c2ca
 AUX criu-3.17-glibc-2.36-deux.patch 5484 BLAKE2B 63605200e43064e67686ef823032de9c27316800d2097721bd7143e371703e52803c03b6cc695491ca3326f27a44e177a3fe946868577805b3242ba08a00465f SHA512 3dd0d28bd8591d857f927539bb578337e60fcaf7f83890315fd25f4944a72f097374a4423955187673328ca32491d5f585391f21565df53d666f761ccd552a0e
 AUX criu-3.17-glibc-2.36.patch 7344 BLAKE2B 4b42e4b524807fed9277eaafbbe9c77bc4dd6e0993d8f801898e2c2a3d4c0aca58d58e34285f23a7d5f1778f8f952f27c7b6a323313103b6444d07287431d9b8 SHA512 d7e6768c26a0f27e11f639d17ccdb62ba7543cbcfdc7a940e39c0ad4f338dce9996129c41904df667633282fb954ec79ffe88879dc61a39658ed7c821fa8f1ba
-DIST criu-3.15.tar.bz2 913904 BLAKE2B 2a3c7ad7ac32a407493e8908886d2929606e1dd0a1dd499be75cb954c1c4d60d0c59f0524d173dcdd89fa638e1edcc0c31886262069e3478173648ef09b4c159 SHA512 7bfd32053e47b95d10cdd5e99494bff6a21aa3179518179f8c72e870f0aab960dd76c9f6cb6982e5b881472cf6962eefee3cf7d8ae9128b3379bcaecc937ebbc
-DIST criu-3.16.1.tar.gz 1228535 BLAKE2B 45aa87ee00a18b91474e767dc0326cce6c0942af7771a0c5536751361c171c86ba2065c54587e82b51fd6d7ab116e659324369955086c5237cd7fd26b60d6ce6 SHA512 a558af41f1927a1b1d87f8d11163a5f3d2e4f83a74aba00619b45a6d464d5477a6a0aac3c1b9d9a17e3343a4bf21a3fd6b279b51fa0c347c86c307381a4d0739
 DIST criu-3.17.tar.gz 1321713 BLAKE2B 3bc13a7df0da0a17c74e0c12f07b81fe7f294be4d1980647b64c74e35383416ffbc10e7c04398f307bc68ff701f76a9586ea58825057b0df16b40f6aab3cbd0e SHA512 febae66a7820345c0f335f4a49e64c0af5c8ae5d3a394cc0770881b64eab11ca03ad5872f06b0c4ccd1da844c519268dad3b4f8b260267e6d3f582e80d80f804
-EBUILD criu-3.15-r3.ebuild 3301 BLAKE2B 3eeadd32610bb9cfd176d69dfd373c938c7b85840515c9a7deed360c9eec92f8a17e3c5973f1473754c17f940842d3d80ef564220e8efdeea4be3e2e87415c71 SHA512 9d7241b8ce893e8652056581e1e95f9c6e737802d7da2baab2db1ad30bd00170030602c3454f873d9c769cc323323712e5aa015cb1b470049102abd9bb6d6130
-EBUILD criu-3.15.ebuild 3233 BLAKE2B 6ee46101b7e4cb8faa6a89131c6eea8253a64e7811884a464c7ab63476cdcd012a5b9bb9afa64730936d152e53a0c28c9600ecb102ee1f101c5b48bcb322be18 SHA512 9475fa146bfff57cf614692a958b8f5a4a8161eee6c12be5feb8300a48de45017cbf19c41f7ac022a9a68cfb82f4bb395f0743cd741050df3af02db64eeeb124
-EBUILD criu-3.16.1.ebuild 3556 BLAKE2B 48501fcc197de6e873c89b9ad198a3f9714f6c7db6d4e22ee5d58fb494a7db28d2d45a4eef86fc5589d84a829af8ab1c07e4ce5916667717a4fc956854cacb8b SHA512 27120e0882fe79f1158bd85c0782b5d1314268d0a7013ff8e5d2c24225753d3d10ad0bf43691beee0ebc8411253ff036df23571f4b2ddfb15d3534ccc2da88e9
 EBUILD criu-3.17-r1.ebuild 3809 BLAKE2B a65fc63000fa79fc0ddd0c670ad2f812778c0c1ce9ef25f073e412f39e997ae7d92671c729d4840289c4eee9cff2637faa7bed781d6dd511b695e09810802e51 SHA512 140743b4976b2d82b8735b6ca9ae14fe2bb96eaeb3efd1f4a51533fe0386cf0345fc7eb38dc571bea6f17e254c58996084810716029799cbebb8b5a171db875a
-MISC metadata.xml 690 BLAKE2B d39aa87ec4e0470cb5864776d802cc06be21866123a8db69ace61af3f686cf9b034cf6790d2a5fd5777bb02531db78ea72eb03c0f3f18195b56ea4b85205c87e SHA512 385296a53d274252d796563346bd999dbe4afa5c02b5f00ce42459ad995ce004f593a039c54f1e91fb572b849199e2669077ffda3affd031e23f4b4d1db9ff0e
+MISC metadata.xml 778 BLAKE2B dd77f2e054c4a085dfe2ff6addab5ba38892315a02f8330c66348bf8febbff5c5a8ccea44e8d553804693a952ab5cbcfcd5bca64798e7a26784cbfbf37088e98 SHA512 c6b3c87c7daa8317f745556c22482fdf31b1b19209d6e4c8698499823291f9fea63ca9f7c12e7bace1561d4d76b877e9132d582d822ef51f544b69c51564e79c
diff --git a/sys-process/criu/criu-3.15-r3.ebuild b/sys-process/criu/criu-3.15-r3.ebuild
deleted file mode 100644
index f4108c16202b..000000000000
--- a/sys-process/criu/criu-3.15-r3.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_9 )
-
-inherit toolchain-funcs linux-info python-r1
-
-DESCRIPTION="utility to checkpoint/restore a process tree"
-HOMEPAGE="https://criu.org/"
-SRC_URI="https://download.openvz.org/criu/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 -riscv"
-IUSE="doc selinux setproctitle static-libs"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-libs/protobuf-c-1.4.0:=
-	dev-libs/libnl:3
-	net-libs/libnet:1.1
-	sys-libs/libcap
-	selinux? ( sys-libs/libselinux )
-	setproctitle? ( dev-libs/libbsd )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? (
-		app-text/asciidoc
-		app-text/xmlto
-	)"
-RDEPEND="${RDEPEND}
-	dev-python/protobuf-python[${PYTHON_USEDEP}]"
-
-CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL ~INOTIFY_USER
-	~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG ~TUN ~NETFILTER_XT_MARK"
-
-# root access required for tests
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/2.2/${PN}-2.2-flags.patch
-	"${FILESDIR}"/2.3/${PN}-2.3-no-git.patch
-	"${FILESDIR}"/${PN}-3.12-automagic-libbsd.patch
-	"${FILESDIR}"/${PN}-3.15-pkg-config.patch
-	"${FILESDIR}"/${PN}-3.15-protobuf-c-1.4.0.patch
-)
-
-criu_arch() {
-	# criu infers the arch from $(uname -m).  We never want this to happen.
-	case ${ARCH} in
-		amd64) echo "x86";;
-		arm64) echo "aarch64";;
-		ppc64*) echo "ppc64";;
-		*)     echo "${ARCH}";;
-	esac
-}
-
-pkg_setup() {
-	use amd64 && CONFIG_CHECK+=" ~IA32_EMULATION"
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	if ! use selinux; then
-		sed \
-			-e 's:libselinux:no_libselinux:g' \
-			-i Makefile.config || die
-	fi
-
-	use doc || sed -i 's_\(install: \)install-man _\1_g' Makefile.install
-}
-
-src_configure() {
-	# Gold linker generates invalid object file when used with criu's custom
-	# linker script.  Use the bfd linker instead. See https://crbug.com/839665#c3
-	tc-ld-disable-gold
-
-	# Build system uses this variable as a trigger to append coverage flags
-	# we'd like to avoid it. https://bugs.gentoo.org/744244
-	unset GCOV
-
-	python_setup
-}
-
-src_compile() {
-	local target="all $(usex doc 'docs' '')"
-	emake \
-		HOSTCC="$(tc-getBUILD_CC)" \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getLD)" \
-		AR="$(tc-getAR)" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-		PYTHON="${EPYTHON%.?}" \
-		FULL_PYTHON="${PYTHON%.?}" \
-		OBJCOPY="$(tc-getOBJCOPY)" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		ARCH="$(criu_arch)" \
-		V=1 WERROR=0 DEBUG=0 \
-		SETPROCTITLE=$(usex setproctitle) \
-		${target}
-}
-
-src_test() {
-	# root privileges are required to dump all necessary info
-	if [[ ${EUID} -eq 0 ]] ; then
-		emake -j1 CC="$(tc-getCC)" ARCH="$(criu_arch)" V=1 WERROR=0 test
-	fi
-}
-
-install_crit() {
-	"${EPYTHON}" scripts/crit-setup.py install --root="${D}" --prefix="${EPREFIX}/usr/" || die
-	python_optimize
-}
-
-src_install() {
-	emake \
-		ARCH="$(criu_arch)" \
-		PREFIX="${EPREFIX}"/usr \
-		PYTHON="${EPYTHON%.?}" \
-		FULL_PYTHON="${PYTHON%.?}" \
-		LOGROTATEDIR="${EPREFIX}"/etc/logrotate.d \
-		DESTDIR="${D}" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		V=1 WERROR=0 DEBUG=0 \
-		install
-
-	use doc && dodoc CREDITS README.md
-
-	python_foreach_impl install_crit
-
-	if ! use static-libs; then
-		find "${D}" -name "*.a" -delete || die
-	fi
-}
diff --git a/sys-process/criu/criu-3.15.ebuild b/sys-process/criu/criu-3.15.ebuild
deleted file mode 100644
index 283d46ee4859..000000000000
--- a/sys-process/criu/criu-3.15.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_9 )
-
-inherit toolchain-funcs linux-info python-r1
-
-DESCRIPTION="utility to checkpoint/restore a process tree"
-HOMEPAGE="https://criu.org/"
-SRC_URI="https://download.openvz.org/criu/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 -riscv"
-IUSE="doc selinux setproctitle static-libs"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/protobuf-c
-	dev-libs/libnl:3
-	net-libs/libnet:1.1
-	sys-libs/libcap
-	selinux? ( sys-libs/libselinux )
-	setproctitle? ( dev-libs/libbsd )"
-DEPEND="${RDEPEND}
-	doc? (
-		app-text/asciidoc
-		app-text/xmlto
-	)"
-RDEPEND="${RDEPEND}
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-"
-
-CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL ~INOTIFY_USER
-	~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG ~TUN ~NETFILTER_XT_MARK"
-
-# root access required for tests
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/2.2/${PN}-2.2-flags.patch
-	"${FILESDIR}"/2.3/${PN}-2.3-no-git.patch
-	"${FILESDIR}"/${PN}-3.12-automagic-libbsd.patch
-	"${FILESDIR}"/${PN}-3.15-pkg-config.patch
-)
-
-criu_arch() {
-	# criu infers the arch from $(uname -m).  We never want this to happen.
-	case ${ARCH} in
-		amd64) echo "x86";;
-		arm64) echo "aarch64";;
-		ppc64*) echo "ppc64";;
-		*)     echo "${ARCH}";;
-	esac
-}
-
-pkg_setup() {
-	use amd64 && CONFIG_CHECK+=" ~IA32_EMULATION"
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	if ! use selinux; then
-		sed \
-			-e 's:libselinux:no_libselinux:g' \
-			-i Makefile.config || die
-	fi
-
-	use doc || sed -i 's_\(install: \)install-man _\1_g' Makefile.install
-}
-
-src_configure() {
-	# Gold linker generates invalid object file when used with criu's custom
-	# linker script.  Use the bfd linker instead. See https://crbug.com/839665#c3
-	tc-ld-disable-gold
-
-	# Build system uses this variable as a trigger to append coverage flags
-	# we'd like to avoid it. https://bugs.gentoo.org/744244
-	unset GCOV
-
-	python_setup
-}
-
-src_compile() {
-	local target="all $(usex doc 'docs' '')"
-	emake \
-		HOSTCC="$(tc-getBUILD_CC)" \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getLD)" \
-		AR="$(tc-getAR)" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-		PYTHON="${EPYTHON%.?}" \
-		FULL_PYTHON="${PYTHON%.?}" \
-		OBJCOPY="$(tc-getOBJCOPY)" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		ARCH="$(criu_arch)" \
-		V=1 WERROR=0 DEBUG=0 \
-		SETPROCTITLE=$(usex setproctitle) \
-		${target}
-}
-
-src_test() {
-	# root privileges are required to dump all necessary info
-	if [[ ${EUID} -eq 0 ]] ; then
-		emake -j1 CC="$(tc-getCC)" ARCH="$(criu_arch)" V=1 WERROR=0 test
-	fi
-}
-
-install_crit() {
-	"${EPYTHON}" scripts/crit-setup.py install --root="${D}" --prefix="${EPREFIX}/usr/" || die
-	python_optimize
-}
-
-src_install() {
-	emake \
-		ARCH="$(criu_arch)" \
-		PREFIX="${EPREFIX}"/usr \
-		PYTHON="${EPYTHON%.?}" \
-		FULL_PYTHON="${PYTHON%.?}" \
-		LOGROTATEDIR="${EPREFIX}"/etc/logrotate.d \
-		DESTDIR="${D}" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		V=1 WERROR=0 DEBUG=0 \
-		install
-
-	use doc && dodoc CREDITS README.md
-
-	python_foreach_impl install_crit
-
-	if ! use static-libs; then
-		find "${D}" -name "*.a" -delete || die
-	fi
-}
diff --git a/sys-process/criu/criu-3.16.1.ebuild b/sys-process/criu/criu-3.16.1.ebuild
deleted file mode 100644
index 7c36938828cc..000000000000
--- a/sys-process/criu/criu-3.16.1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit toolchain-funcs linux-info python-r1
-
-DESCRIPTION="utility to checkpoint/restore a process tree"
-HOMEPAGE="
-	https://criu.org/
-	https://github.com/checkpoint-restore/
-"
-SRC_URI="https://github.com/checkpoint-restore/${PN}/archive/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 -riscv"
-IUSE="bpf doc gnutls nftables selinux setproctitle static-libs test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	>=dev-libs/protobuf-c-1.4.0:=
-	dev-libs/libnl:3=
-	net-libs/libnet:1.1=
-	sys-libs/libcap:=
-	bpf? ( dev-libs/libbpf:= )
-	gnutls? ( net-libs/gnutls:= )
-	nftables? ( net-libs/gnutls:= )
-	selinux? ( sys-libs/libselinux:= )
-	setproctitle? ( dev-libs/libbsd:= )
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		app-text/asciidoc
-		app-text/xmlto
-	)
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-"
-
-CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL ~INOTIFY_USER
-	~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG ~TUN ~NETFILTER_XT_MARK"
-
-# root access required for tests
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/2.2/criu-2.2-flags.patch"
-	"${FILESDIR}/2.3/criu-2.3-no-git.patch"
-	"${FILESDIR}/criu-3.12-automagic-libbsd.patch"
-	"${FILESDIR}/criu-3.16.1-buildsystem.patch"
-)
-
-criu_arch() {
-	# criu infers the arch from $(uname -m).  We never want this to happen.
-	case ${ARCH} in
-		amd64) echo "x86";;
-		arm64) echo "aarch64";;
-		ppc64*) echo "ppc64";;
-		*)     echo "${ARCH}";;
-	esac
-}
-
-pkg_setup() {
-	use amd64 && CONFIG_CHECK+=" ~IA32_EMULATION"
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	use doc || sed -i 's_\(install: \)install-man _\1_g' Makefile.install
-}
-
-criu_use() {
-	if ! use "${1}"; then
-		sed \
-			-e "s:${2:-${1}}:no_${2:-lib${1}}:g" \
-			-i Makefile.config || die
-	fi
-}
-
-src_configure() {
-	# Gold linker generates invalid object file when used with criu's custom
-	# linker script.  Use the bfd linker instead. See https://crbug.com/839665#c3
-	tc-ld-disable-gold
-
-	# Build system uses this variable as a trigger to append coverage flags
-	# we'd like to avoid it. https://bugs.gentoo.org/744244
-	unset GCOV
-
-	# we have to sed the Makdfile.config to disable automagic deps
-	criu_use selinux
-	criu_use bpf
-	criu_use nftables
-
-	emake_opts=(
-		SETPROCTITLE="$(usex setproctitle)"
-		NO_GNUTLS="$(usex gnutls '' '1')"
-	)
-
-	python_setup
-}
-
-criu_emake() {
-	emake \
-		AR="$(tc-getAR)" \
-		ARCH="$(criu_arch)" \
-		CC="$(tc-getCC)" \
-		FULL_PYTHON="${PYTHON%.*}" \
-		HOSTCC="$(tc-getBUILD_CC)" \
-		LD="$(tc-getLD)" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		LOGROTATEDIR="${EPREFIX}"/etc/logrotate.d \
-		OBJCOPY="$(tc-getOBJCOPY)" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-		PREFIX="${EPREFIX}"/usr \
-		PYTHON="${EPYTHON%.*}" \
-		V=1 WERROR=0 DEBUG=0 \
-		"${emake_opts[@]}" \
-		"${@}"
-}
-
-build_crit() {
-	"${EPYTHON}" scripts/crit-setup.py build || die
-}
-
-src_compile() {
-	local -a targets=(
-		all
-		$(usex doc 'docs' '')
-	)
-	criu_emake ${targets}
-}
-
-src_test() {
-	criu_emake unittest
-}
-
-install_crit() {
-	"${EPYTHON}" scripts/crit-setup.py install --root="${D}" --prefix="${EPREFIX}/usr/" || die
-	python_optimize
-}
-
-src_install() {
-	criu_emake DESTDIR="${D}" install
-	python_foreach_impl install_crit
-
-	dodoc CREDITS README.md
-
-	if ! use static-libs; then
-		find "${D}" -name "*.a" -delete || die
-	fi
-}
diff --git a/sys-process/criu/files/criu-3.15-pkg-config.patch b/sys-process/criu/files/criu-3.15-pkg-config.patch
deleted file mode 100644
index 69d83bfc399a..000000000000
--- a/sys-process/criu/files/criu-3.15-pkg-config.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-https://github.com/checkpoint-restore/criu/pull/1517
-
-From d72536d9a821f9ff64f5dd62c9f8a282e3e5ec85 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@chromium.org>
-Date: Wed, 16 Jun 2021 15:43:04 -0400
-Subject: [PATCH] build: respect $PKG_CONFIG settings
-
-The build needs to respect $PKG_CONFIG env var like other standard
-build systems and the the upstream pkg-config project itself.  This
-allows the package builder to point it to the right tool when doing
-a cross-compile build.  Otherwise the host pkg-config tool is used
-which won't have access to the packages in the cross sysroot.
-
-Signed-off-by: Mike Frysinger <vapier@chromium.org>
----
- Makefile.config              | 2 +-
- criu/Makefile                | 2 +-
- scripts/nmk/scripts/tools.mk | 1 +
- scripts/nmk/scripts/utils.mk | 2 +-
- test/zdtm/Makefile.inc       | 8 +++++---
- test/zdtm/lib/Makefile       | 2 +-
- test/zdtm/static/Makefile    | 2 +-
- 7 files changed, 11 insertions(+), 8 deletions(-)
-
-diff --git a/Makefile.config b/Makefile.config
-index 3d99e680be7f..6e3e1b062256 100644
---- a/Makefile.config
-+++ b/Makefile.config
-@@ -30,7 +30,7 @@ else
- endif
- 
- ifeq ($(call pkg-config-check,libnftables),y)
--        LIB_NFTABLES	:= $(shell pkg-config --libs libnftables)
-+        LIB_NFTABLES	:= $(shell $(PKG_CONFIG) --libs libnftables)
-         ifeq ($(call try-cc,$(FEATURE_TEST_NFTABLES_LIB_API_0),$(LIB_NFTABLES)),true)
-                 LIBS_FEATURES	+= $(LIB_NFTABLES)
-                 FEATURE_DEFINES	+= -DCONFIG_HAS_NFTABLES_LIB_API_0
-diff --git a/criu/Makefile b/criu/Makefile
-index ceb49ce09925..11d454c81026 100644
---- a/criu/Makefile
-+++ b/criu/Makefile
-@@ -27,7 +27,7 @@ CFLAGS			+= -iquote include
- CFLAGS			+= -iquote images
- CFLAGS			+= -iquote $(ARCH_DIR)/include
- CFLAGS			+= -iquote .
--CFLAGS			+= $(shell pkg-config --cflags libnl-3.0)
-+CFLAGS			+= $(shell $(PKG_CONFIG) --cflags libnl-3.0)
- CFLAGS			+= $(CONFIG-DEFINES)
- 
- ifeq ($(GMON),1)
-diff --git a/scripts/nmk/scripts/tools.mk b/scripts/nmk/scripts/tools.mk
-index c5794401c734..1681d4e9092b 100644
---- a/scripts/nmk/scripts/tools.mk
-+++ b/scripts/nmk/scripts/tools.mk
-@@ -17,6 +17,7 @@ AR		:= $(CROSS_COMPILE)ar
- STRIP		:= $(CROSS_COMPILE)strip
- OBJCOPY		:= $(CROSS_COMPILE)objcopy
- OBJDUMP		:= $(CROSS_COMPILE)objdump
-+PKG_CONFIG	?= pkg-config
- NM		:= $(CROSS_COMPILE)nm
- MAKE		:= make
- MKDIR		:= mkdir -p
-diff --git a/scripts/nmk/scripts/utils.mk b/scripts/nmk/scripts/utils.mk
-index b9790615ca7f..f93fdf911cef 100644
---- a/scripts/nmk/scripts/utils.mk
-+++ b/scripts/nmk/scripts/utils.mk
-@@ -16,7 +16,7 @@ try-asm = $(call try-compile,assembler-with-cpp,$(1),$(2),$(3))
- 
- # pkg-config-check
- # Usage: ifeq ($(call pkg-config-check, library),y)
--pkg-config-check = $(shell sh -c 'pkg-config $(1) && echo y')
-+pkg-config-check = $(shell sh -c '$(PKG_CONFIG) $(1) && echo y')
- 
- #
- # Remove duplicates.
-diff --git a/test/zdtm/Makefile.inc b/test/zdtm/Makefile.inc
-index 43763321f956..e4af9c51e9e4 100644
---- a/test/zdtm/Makefile.inc
-+++ b/test/zdtm/Makefile.inc
-@@ -37,6 +37,7 @@ HOSTCC	?= gcc
- ifeq ($(origin CC), default)
-         CC := $(CROSS_COMPILE)$(HOSTCC)
- endif
-+PKG_CONFIG ?= pkg-config
- CFLAGS	+= -g -O2 -Wall -Werror -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
- CFLAGS	+= -Wdeclaration-after-statement -Wstrict-prototypes
- CFLAGS	+= $(USERCFLAGS)
-@@ -54,8 +55,9 @@ endif
- RM := rm -f --one-file-system
- 
- ifeq ($(COMPAT_TEST),y)
-+$(error bad juju)
-         # Firstly look for 32-bit libs and then in standard path.
--        PKG_CONFIG_PATH := $(shell pkg-config --variable pc_path pkg-config)
-+        PKG_CONFIG_PATH := $(shell $(PKG_CONFIG) --variable pc_path pkg-config)
-         PKG_CONFIG_PATH := /usr/lib32/pkgconfig:$(PKG_CONFIG_PATH)
- ifeq ($(ARCH),x86)
-         export CFLAGS += -m32
-@@ -66,11 +68,11 @@ endif
- endif
- 
- define pkg-libs
--        $(shell PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" pkg-config --libs $(1))
-+        $(shell PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" $(PKG_CONFIG) --libs $(1))
- endef
- 
- define pkg-cflags
--        $(shell PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" pkg-config --cflags $(1))
-+        $(shell PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" $(PKG_CONFIG) --cflags $(1))
- endef
- 
- %.d: %.c
-diff --git a/test/zdtm/lib/Makefile b/test/zdtm/lib/Makefile
-index 05fe64e91703..5ecf8bccf27b 100644
---- a/test/zdtm/lib/Makefile
-+++ b/test/zdtm/lib/Makefile
-@@ -6,7 +6,7 @@ LIB	:= libzdtmtst.a
- 
- LIBSRC	:= datagen.c msg.c parseargs.c test.c streamutil.c lock.c ns.c tcp.c unix.c fs.c sysctl.c
- 
--pkg-config-check = $(shell sh -c 'pkg-config $(1) && echo y')
-+pkg-config-check = $(shell sh -c '$(PKG_CONFIG) $(1) && echo y')
- ifeq ($(call pkg-config-check,libbpf),y)
- LIBSRC	+= bpfmap_zdtm.c
- endif
-diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
-index e60fe6dc2d66..c5f3c98be3ed 100644
---- a/test/zdtm/static/Makefile
-+++ b/test/zdtm/static/Makefile
-@@ -241,7 +241,7 @@ TST_NOFILE	:=				\
- 		sigtrap01			\
- #		jobctl00			\
- 
--pkg-config-check = $(shell sh -c 'pkg-config $(1) && echo y')
-+pkg-config-check = $(shell sh -c '$(PKG_CONFIG) $(1) && echo y')
- ifeq ($(call pkg-config-check,libbpf),y)
- TST_NOFILE	+=				\
- 		bpf_hash			\
--- 
-2.31.1
-
diff --git a/sys-process/criu/files/criu-3.15-protobuf-c-1.4.0.patch b/sys-process/criu/files/criu-3.15-protobuf-c-1.4.0.patch
deleted file mode 100644
index 86d9cd31724d..000000000000
--- a/sys-process/criu/files/criu-3.15-protobuf-c-1.4.0.patch
+++ /dev/null
@@ -1,194 +0,0 @@
-https://bugs.gentoo.org/809092
-https://bugs.gentoo.org/814056
-https://github.com/checkpoint-restore/criu/commit/1c25914a5dd1eb385937dffdd85901c3f5e39b8c
-https://github.com/checkpoint-restore/criu/commit/6a15dbdefa5c23a75eb3d1137681404588a16efa
-
-From 1c25914a5dd1eb385937dffdd85901c3f5e39b8c Mon Sep 17 00:00:00 2001
-From: Zeyad Yasser <zeyady98@gmail.com>
-Date: Thu, 22 Jul 2021 11:39:34 +0200
-Subject: [PATCH] protobuf: remove leading underscores from protobuf structs
-
-Fixes: #1560
-
-The latest protobuf-c compiler breaks CRIU because they removed
-leading underscores from structs in 1.4.0.
-
-This replaces those definitions with the standard generated structs.
-
-v2: remove struct _VmaEntry, struct _CredsEntry and struct _CoreEntry
-
-Signed-off-by: Zeyad Yasser <zeyady98@gmail.com>
----
- criu/include/irmap.h            | 8 +++++---
- criu/include/parasite-syscall.h | 8 +++-----
- criu/include/pstree.h           | 2 +-
- criu/include/rst_info.h         | 5 ++---
- criu/include/shmem.h            | 1 -
- criu/mem.c                      | 2 +-
- lib/c/criu.h                    | 3 ++-
- 7 files changed, 14 insertions(+), 15 deletions(-)
-
-diff --git a/criu/include/irmap.h b/criu/include/irmap.h
-index 033f71e372..188d753f4d 100644
---- a/criu/include/irmap.h
-+++ b/criu/include/irmap.h
-@@ -1,13 +1,15 @@
- #ifndef __CR_IRMAP__H__
- #define __CR_IRMAP__H__
-+
-+#include "images/fh.pb-c.h"
-+
- char *irmap_lookup(unsigned int s_dev, unsigned long i_ino);
--struct _FhEntry;
- int irmap_queue_cache(unsigned int dev, unsigned long ino,
--		struct _FhEntry *fh);
-+		FhEntry *fh);
- int irmap_predump_prep(void);
- int irmap_predump_run(void);
- int check_open_handle(unsigned int s_dev, unsigned long i_ino,
--		struct _FhEntry *f_handle);
-+		FhEntry *f_handle);
- int irmap_load_cache(void);
- int irmap_scan_path_add(char *path);
- #endif
-diff --git a/criu/include/parasite-syscall.h b/criu/include/parasite-syscall.h
-index c86a724fd1..afba95a9e7 100644
---- a/criu/include/parasite-syscall.h
-+++ b/criu/include/parasite-syscall.h
-@@ -11,8 +11,6 @@ struct parasite_dump_misc;
- struct parasite_drain_fd;
- struct vm_area_list;
- struct pstree_item;
--struct _CredsEntry;
--struct _CoreEntry;
- struct list_head;
- struct cr_imgset;
- struct fd_opts;
-@@ -31,11 +29,11 @@ extern int parasite_dump_posix_timers_seized(struct proc_posix_timers_stat *proc
- 		struct parasite_ctl *ctl, struct pstree_item *);
- 
- extern int parasite_dump_misc_seized(struct parasite_ctl *ctl, struct parasite_dump_misc *misc);
--extern int parasite_dump_creds(struct parasite_ctl *ctl, struct _CredsEntry *ce);
--extern int parasite_dump_thread_leader_seized(struct parasite_ctl *ctl, int pid, struct _CoreEntry *core);
-+extern int parasite_dump_creds(struct parasite_ctl *ctl, CredsEntry *ce);
-+extern int parasite_dump_thread_leader_seized(struct parasite_ctl *ctl, int pid, CoreEntry *core);
- extern int parasite_dump_thread_seized(struct parasite_thread_ctl *tctl,
- 				       struct parasite_ctl *ctl, int id,
--				       struct pid *tid, struct _CoreEntry *core);
-+				       struct pid *tid, CoreEntry *core);
- extern int dump_thread_core(int pid, CoreEntry *core,
- 					const struct parasite_dump_thread *dt);
- 
-diff --git a/criu/include/pstree.h b/criu/include/pstree.h
-index 61ab0ce0eb..17d22e791e 100644
---- a/criu/include/pstree.h
-+++ b/criu/include/pstree.h
-@@ -113,7 +113,7 @@ extern int prepare_task_entries(void);
- extern int prepare_dummy_task_state(struct pstree_item *pi);
- 
- extern int get_task_ids(struct pstree_item *);
--extern struct _TaskKobjIdsEntry *root_ids;
-+extern TaskKobjIdsEntry *root_ids;
- 
- extern void core_entry_free(CoreEntry *core);
- extern CoreEntry *core_entry_alloc(int alloc_thread_info, int alloc_tc);
-diff --git a/criu/include/rst_info.h b/criu/include/rst_info.h
-index 3283849e44..3dc119a931 100644
---- a/criu/include/rst_info.h
-+++ b/criu/include/rst_info.h
-@@ -5,6 +5,7 @@
- #include "common/list.h"
- #include "vma.h"
- #include "kerndat.h"
-+#include "images/mm.pb-c.h"
- 
- struct task_entries {
- 	int nr_threads, nr_tasks, nr_helpers;
-@@ -25,8 +26,6 @@ struct fdt {
- 	futex_t			fdt_lock;
- };
- 
--struct _MmEntry;
--
- struct rst_info {
- 	struct list_head	fds;
- 
-@@ -40,7 +39,7 @@ struct rst_info {
- 	struct fdt		*fdt;
- 
- 	struct vm_area_list	vmas;
--	struct _MmEntry		*mm;
-+	MmEntry		*mm;
- 	struct list_head	vma_io;
- 	unsigned int		pages_img_id;
- 
-diff --git a/criu/include/shmem.h b/criu/include/shmem.h
-index 9afdb799af..798e28f347 100644
---- a/criu/include/shmem.h
-+++ b/criu/include/shmem.h
-@@ -5,7 +5,6 @@
- #include "common/lock.h"
- #include "images/vma.pb-c.h"
- 
--struct _VmaEntry;
- struct vma_area;
- 
- extern int collect_shmem(int pid, struct vma_area *vma);
-diff --git a/criu/mem.c b/criu/mem.c
-index 9fabe4c470..b0a76e4da9 100644
---- a/criu/mem.c
-+++ b/criu/mem.c
-@@ -1230,7 +1230,7 @@ static int restore_priv_vma_content(struct pstree_item *t, struct page_read *pr)
- 
- static int maybe_disable_thp(struct pstree_item *t, struct page_read *pr)
- {
--	struct _MmEntry *mm = rsti(t)->mm;
-+	MmEntry *mm = rsti(t)->mm;
- 
- 	/*
- 	 * There is no need to disable it if the page read doesn't
-diff --git a/lib/c/criu.h b/lib/c/criu.h
-index 3d64939584..d2bfbf958c 100644
---- a/lib/c/criu.h
-+++ b/lib/c/criu.h
-@@ -22,6 +22,7 @@
- #include <stdbool.h>
- 
- #include "version.h"
-+#include "rpc.pb-c.h"
- 
- #ifdef __GNUG__
- 	extern "C" {
-@@ -112,7 +113,7 @@ void criu_set_pidfd_store_sk(int sk);
-  * some non-existing one is reported.
-  */
- 
--typedef struct _CriuNotify *criu_notify_arg_t;
-+typedef CriuNotify *criu_notify_arg_t;
- void criu_set_notify_cb(int (*cb)(char *action, criu_notify_arg_t na));
- 
- /* Get pid of root task. 0 if not available */
-From: Radostin Stoyanov <radostin@redhat.com>
-Date: Fri, 3 Sep 2021 14:14:41 +0100
-Subject: [PATCH] lib: install images/rpc.pb-c.h
-
-Since commit 1c25914 compiling crun with libcriu also requires
-/usr/include/criu/rpc.pb-c.h
-
-Signed-off-by: Radostin Stoyanov <radostin@redhat.com>
----
- lib/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/Makefile b/lib/Makefile
-index f9b66701e0..575a7bad3f 100644
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -1,6 +1,6 @@
- CRIU_SO			:= libcriu.so
- CRIU_A			:= libcriu.a
--UAPI_HEADERS		:= lib/c/criu.h images/rpc.proto criu/include/version.h
-+UAPI_HEADERS		:= lib/c/criu.h images/rpc.proto images/rpc.pb-c.h criu/include/version.h
- 
- #
- # File to keep track of files installed by setup.py
diff --git a/sys-process/criu/metadata.xml b/sys-process/criu/metadata.xml
index bec8a7d57bfc..5f7652d71661 100644
--- a/sys-process/criu/metadata.xml
+++ b/sys-process/criu/metadata.xml
@@ -14,4 +14,7 @@
 		<flag name="bpf">Add support for BPF programs via <pkg>dev-libs/libbpf</pkg></flag>
 		<flag name="nftables">Add support for <pkg>net-firewall/nftables</pkg></flag>
 	</use>
+	<upstream>
+		<remote-id type="github">checkpoint-restore/criu</remote-id>
+	</upstream>
 </pkgmetadata>