gentoo auto-resync : 02:11:2024 - 03:04:23

16 files changed, 2 insertions, 1394 deletions

diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 9a72ab9982cc..cefa763fb95c 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/atop/Manifest b/sys-process/atop/Manifest
index c6fec03de8ad..181b5b2daf17 100644
--- a/sys-process/atop/Manifest
+++ b/sys-process/atop/Manifest
@@ -1,17 +1,7 @@
-AUX atop-2.10.0-ldflags.patch 897 BLAKE2B 23e574eccaa4112067f820742f8e110240b6afeaccbec142a7136eabbe72312f78d5216524e1b2608301c3834c4005ca6f77740ff1ae03141863804b5dfed9a3 SHA512 67aa591f824dfe736f0f1bee8c842f2e84a7389ec4589a798b6279bd8563b9bb93e7c6c3fd03d3711a920c97d9312b86988766eb3a2a4f01044b5e52786f1729
-AUX atop-2.10.0-respect-PKG_CONFIG.patch 812 BLAKE2B eb47efa3889f60e384af33b5665d99400bfcc3310b1038879837f45215e0e28eb03fea8ec93ba37dda51fbe4710bfd4bd5c0d6dff7fe695ea95ab5a4dbbbf9b6 SHA512 42cddd3d94fec2908e8dd13280ccbefd055e0456bd87e4f47e1460c44ee3908949c593b92b61922069a86d1b35d2279963739a294534800e84329e8862f7ef7f
-AUX atop-2.10.0-respect-opt.patch 664 BLAKE2B 2b8c691ac67f370d827047bff1220139fd443a65b78d38c2a502ddca28783a43abe4df14943443d94d9b83b08e3ebd128c9edc8583a5c5ef6e24bea6c77d2123 SHA512 9dd5d0425b5220a1838785b93b65f6dab5b9db5b4457de649f39db9320661005f02428f470a9b5328fe513a9ceae08a0aca45fd115daf818611bda628419dd3d
 AUX atop-2.11.0-build.patch 1149 BLAKE2B 68512cc240987461e0cafcb4b96626e975a2d29d75f52fc3362400601d487cd8613c19db949757e03905b030eb5dfba7447aa6db5132407d04493c6a812c2ee9 SHA512 15da444495ba18308af1c875475e584e3c68900eb4a137504b44f95b8ca854e87e6b9f0f88d39a60ddec8c9ce6832dace251df55751d510705249848f1aec327
 AUX atop-2.11.0-respect-opt.patch 647 BLAKE2B 9a5fe18e18c7813ff7e0c5a703f8968466c8a8ec1c9ac8386bc6de03447790f8491c6074856c59e97f6bcde65b3ac5cb2c58563e07588403f0636da9361640cc SHA512 b54a018263b00d68f2ccc26d3d8c3b36940de0b7f94146a21f67f6660890e5279e90c4773c6a926ba124b1342a0083e9d111251609aa36c8b06403d182306142
-AUX atop-2.6.0-build.patch 911 BLAKE2B d67b53d297d2e05ce098eca6e2f99ee2314652755d01671a72bc2501913419461bbafd7f054a58ff62dc90434960cdcbb335e397e6c7316670aca902fcd504d7 SHA512 9798131103ed5d34210a00d0e7fc82f4a50bd5a2c6bc12dc67d6a34192a0bb8bcc38777311d5a6562af9434766b26ad9fc2c4452a8da1b28316a816c3316761d
-AUX atop-2.9.0-netatop-makefile.patch 897 BLAKE2B f1f05008e329ea4b96a6b43336fa5df5356c011f6b5eaf3080766e4314040f0629f58f86e9957f095897079f7490fc954ea1ae2556cf8dd7e948497ccdb4d0b4 SHA512 2bd5988ed31af5a528e351ea58a072a06d7d297c7f89591a8b530e507fc342e2aa762c6344cdd8380affeda1e29bb071aee54e4b20379d5a11e21c797ab8fa80
 AUX netatop.rc 330 BLAKE2B 8da0bdd3ea55cdc0ff9b54d7fd499f6582eb6571a859da8e2e0eefd7b5c47b9c6aac9be5565bd61e8fb03168482cab65e5ecbaf702d56c8e940bfb4c4e38f12f SHA512 e61c8133041da7961088faa90b244ab44cebc07583b3feffa5854b2751fc6bdd1cd8964c30ab9acde653d70f4280738fe9f77f7eaf29d939757dc0b51151f289
-DIST atop-2.10.0.tar.gz 296569 BLAKE2B 8c6e56978cb32e4e80c7344f631d6fd3dd034ff785e6b2db1b80556aaea30a0feeb413704128150ba0d7b1b4eaeb6cb5699a1b2661060ac53c10f7025997418e SHA512 22e39799aa7c090c68d8ac2f02646fb9586122bdb83de9d90bc3119bd290c557faa0489cdc8640fc4fd1f1155c231b1d70dae1b22dc6102ba0327fdd4b5f7029
 DIST atop-2.11.0.tar.gz 322301 BLAKE2B 0084f1c02e835abd69c4810c0ef020d40bd8738064f8b9ae3cb1f24c460507571b87ddf47f12a0b2eefa86f9d0dcce02be8829e157dcc289deaac6d9cd3c7cda SHA512 5cf176e83232a54b69628b165172ed43f7bdfb62c7744ee781da8a262f3e4d70a829dc175320b5042a794a8d31318672477ba870feaaf3e9aa85fd4d6f485356
-DIST atop-2.9.0.tar.gz 282412 BLAKE2B 8531eee3bffabfb3cacdb6bea4c4a1b7ea56da878154a86edd80fb20ddffc5f56248d06c679bd8933c203a0174e97515cfce633a2387bf465399d4203ca857c2 SHA512 f055466c076491a54fc45a482209fd3de60013e7b76af46b65dffe82d220fbd96eb11d5f199aa27e2f7a8754fe3c6509c44bf0dbd6e3099d8f5710944e01cb38
-DIST netatop-3.1.tar.gz 22812 BLAKE2B 1b1faebf1392a57db6b4662192f90821289c8fc40c2c1ee0ad61feeeee6477c4d091744a1e82cdd987baf59f8dd71fc6d242d6dd294b8fb29b9447a9d5055996 SHA512 b12fd2287d89d3a8277f8fb540a19e6d26aa26c3f88e7ae2e6601b63f78d642e73b8d16cf351f6979ce7bbf53251b9c1faa76798a87f70cf3dcf51279eb0db68
 DIST netatop-3.2.2.tar.gz 23977 BLAKE2B cf360071e56593251df4249d2c7ec8a1c823c71a4d96e5b7f5d02ab0dc8388eb22d34c4120924c5a5ecc9b4d610a14785e5002bc3b888aa4c66d8c73454a0900 SHA512 59ff6daf56f73578cfc7b48085747d3f2917589203196396dde6036c33da0dbce4b67b58c141545a785beb31ebeb35936d96bb6ff3b6071e95315a32e20d6093
-EBUILD atop-2.10.0-r1.ebuild 2756 BLAKE2B b89a5829f563ab2ad0017e0c027d178fdb2d61328f76ac5e10091d5fa30e605429409dca89c497f76fb08df1021303df6d6da6af5fd56a238e67500ba5958639 SHA512 3fe3655e53bac30a449b595fe3e2516c364724d0906f403352270b8134d42c62c2a3ab5a79ca3576cef00e87268d8e6aef8f9b4004080a525bc241e81c1d9c60
 EBUILD atop-2.11.0.ebuild 2467 BLAKE2B d20e370f75461d6dcdb70bf1c2001b2ef077089baf3de62006ce95f6b3970de5cf53270e433251eadc52cf47ae08be9f5e98d7f7729743538aeaee201e3ab03b SHA512 37e4b45bcab1cc821ba7c25a146111087c1793d3e692d6ba1598a60dae186ae09c458a371e166605846b4d1e214ca53d51e361f6ebfb50b2e096973ff2d0ea28
-EBUILD atop-2.9.0-r1.ebuild 2600 BLAKE2B 3c2a0392684b65059c5183b3a842a072d27a50912bde7fd018a1c4408d0287a7c5ec0512345ecf8904b18c0f040421b2da56e45b962332d3e21c5a7c8b1bdd45 SHA512 9c0ef8fe59ec29977e69199e7ea8fafec8376f737c18c507a6f381485971577f39897385f06eb05339d1c682e462586cf0ebb218ac53716ad216b9d6ae8b08ab
 MISC metadata.xml 438 BLAKE2B 39c4d236c004f4b9856dd64ee810c64f41ec5097c259d2ee51d2e3c01b75d04aeb49d19f25bbb6aba131d4fc31fae9b2f4d3706cb1358ccdc95a4caca9967ca8 SHA512 7dfb13251330c915a8e8373f4f4a58113a5dac2a036e79d9ec9bc72c76ed7756f6706cb01c65b0f77458818485383199747fde1cd935b855e1c08c6f02e3c274
diff --git a/sys-process/atop/atop-2.10.0-r1.ebuild b/sys-process/atop/atop-2.10.0-r1.ebuild
deleted file mode 100644
index 5d3ecf36942a..000000000000
--- a/sys-process/atop/atop-2.10.0-r1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Check on bumps of atop
-# https://www.atoptool.nl/downloadnetatop.php
-NETATOP_VER=3.1
-
-# Controls 'netatop' kernel module
-MODULES_OPTIONAL_IUSE="modules"
-NETATOP_P=netatop-${NETATOP_VER}
-NETATOP_S="${WORKDIR}"/${NETATOP_P}
-
-inherit linux-mod-r1 systemd toolchain-funcs
-
-DESCRIPTION="Resource-specific view of processes"
-HOMEPAGE="https://www.atoptool.nl/ https://github.com/Atoptool/atop"
-SRC_URI="https://github.com/Atoptool/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" modules? ( https://www.atoptool.nl/download/${NETATOP_P}.tar.gz )"
-
-# Module is GPL-2 as well
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-libs/glib
-	sys-libs/ncurses:=
-	sys-libs/zlib
-	>=sys-process/acct-6.6.4-r1
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.6.0-build.patch
-	"${FILESDIR}"/${PN}-2.10.0-ldflags.patch
-	"${FILESDIR}"/${PN}-2.10.0-respect-PKG_CONFIG.patch
-	"${FILESDIR}"/${PN}-2.10.0-respect-opt.patch
-)
-
-pkg_pretend() {
-	if use kernel_linux ; then
-		CONFIG_CHECK="~BSD_PROCESS_ACCT"
-		check_extra_config
-	fi
-}
-
-src_prepare() {
-	default
-
-	if use modules ; then
-		cd "${WORKDIR}"/${NETATOP_P} || die
-		eapply "${FILESDIR}"/${PN}-2.9.0-netatop-makefile.patch
-
-		sed \
-			-e "s#\`uname -r\`#${KV_FULL}#g" \
-			-e "s#\$(shell uname -r)#${KV_FULL}#g" \
-			-i {.,daemon,module}/Makefile || die
-
-		grep -rq "uname -r" && die "found uname calls"
-
-		cd "${S}" || die
-	fi
-
-	tc-export CC PKG_CONFIG
-
-	# bug #191926
-	sed -i 's: root : :' atop.cronsysv || die
-
-	# Prefixify
-	sed -i "s:/\(usr\|etc\|var\):${EPREFIX}/\1:g" Makefile || die
-}
-
-src_compile() {
-	default
-
-	local modlist=( "netatop=:../${NETATOP_P}/module::netatop.ko" )
-	linux-mod-r1_src_compile
-
-	if use modules ; then
-		# netatop's Makefile tries to build the kernel module for us
-		# so let's just replicate parts of it here.
-		emake -C "${NETATOP_S}"/daemon all
-	fi
-}
-
-src_install() {
-	linux-mod-r1_src_install
-
-	if use modules ; then
-		dosbin "${NETATOP_S}"/daemon/netatopd
-		doman "${NETATOP_S}"/man/*
-
-		systemd_dounit "${NETATOP_S}"/netatop.service
-
-		# TODO: Release after 2.8.0 may contain this, check!
-		newinitd "${FILESDIR}"/netatop.rc netatop
-	fi
-
-	emake DESTDIR="${D}" genericinstall
-
-	# useless -${PV} copies ?
-	rm "${ED}"/usr/bin/atop*-${PV} || die
-
-	newinitd atop.rc.openrc ${PN}
-	newinitd atopacct.rc.openrc atopacct
-
-	systemd_dounit "${S}"/${PN}.service
-	systemd_dounit "${S}"/atopacct.service
-
-	dodoc atop.cronsysv AUTHORS README
-
-	exeinto /usr/share/${PN}
-	doexe ${PN}.daily
-
-	insinto /etc/default
-	newins ${PN}{.default,}
-
-	keepdir /var/log/${PN}
-}
diff --git a/sys-process/atop/atop-2.9.0-r1.ebuild b/sys-process/atop/atop-2.9.0-r1.ebuild
deleted file mode 100644
index 6b72dd2f4521..000000000000
--- a/sys-process/atop/atop-2.9.0-r1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Check on bumps of atop
-# https://www.atoptool.nl/downloadnetatop.php
-NETATOP_VER=3.1
-
-# Controls 'netatop' kernel module
-MODULES_OPTIONAL_IUSE="modules"
-NETATOP_P=netatop-${NETATOP_VER}
-NETATOP_S="${WORKDIR}"/${NETATOP_P}
-
-inherit linux-mod-r1 systemd toolchain-funcs
-
-DESCRIPTION="Resource-specific view of processes"
-HOMEPAGE="https://www.atoptool.nl/ https://github.com/Atoptool/atop"
-SRC_URI="https://github.com/Atoptool/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" modules? ( https://www.atoptool.nl/download/${NETATOP_P}.tar.gz )"
-
-# Module is GPL-2 as well
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	sys-libs/ncurses:=
-	sys-libs/zlib
-	>=sys-process/acct-6.6.4-r1
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.6.0-build.patch
-)
-
-pkg_pretend() {
-	if use kernel_linux ; then
-		CONFIG_CHECK="~BSD_PROCESS_ACCT"
-		check_extra_config
-	fi
-}
-
-src_prepare() {
-	default
-
-	if use modules ; then
-		cd "${WORKDIR}"/${NETATOP_P} || die
-		eapply "${FILESDIR}"/${PN}-2.9.0-netatop-makefile.patch
-
-		sed \
-			-e "s#\`uname -r\`#${KV_FULL}#g" \
-			-e "s#\$(shell uname -r)#${KV_FULL}#g" \
-			-i {.,daemon,module}/Makefile || die
-
-		grep -rq "uname -r" && die "found uname calls"
-
-		cd "${S}" || die
-	fi
-
-	tc-export CC PKG_CONFIG
-
-	# bug #191926
-	sed -i 's: root : :' atop.cronsysv || die
-
-	# Prefixify
-	sed -i "s:/\(usr\|etc\|var\):${EPREFIX}/\1:g" Makefile || die
-}
-
-src_compile() {
-	default
-
-	local modlist=( "netatop=:../${NETATOP_P}/module::netatop.ko" )
-	linux-mod-r1_src_compile
-
-	if use modules ; then
-		# netatop's Makefile tries to build the kernel module for us
-		# so let's just replicate parts of it here.
-		emake -C "${NETATOP_S}"/daemon all
-	fi
-}
-
-src_install() {
-	linux-mod-r1_src_install
-
-	if use modules ; then
-		dosbin "${NETATOP_S}"/daemon/netatopd
-		doman "${NETATOP_S}"/man/*
-
-		systemd_dounit "${NETATOP_S}"/netatop.service
-
-		# TODO: Release after 2.8.0 may contain this, check!
-		newinitd "${FILESDIR}"/netatop.rc netatop
-	fi
-
-	emake DESTDIR="${D}" genericinstall
-
-	# useless -${PV} copies ?
-	rm "${ED}"/usr/bin/atop*-${PV} || die
-
-	newinitd atop.rc.openrc ${PN}
-	newinitd atopacct.rc.openrc atopacct
-
-	systemd_dounit "${S}"/${PN}.service
-	systemd_dounit "${S}"/atopacct.service
-
-	dodoc atop.cronsysv AUTHORS README
-
-	exeinto /usr/share/${PN}
-	doexe ${PN}.daily
-
-	insinto /etc/default
-	newins ${PN}{.default,}
-
-	keepdir /var/log/${PN}
-}
diff --git a/sys-process/atop/files/atop-2.10.0-ldflags.patch b/sys-process/atop/files/atop-2.10.0-ldflags.patch
deleted file mode 100644
index 5b2924ef3864..000000000000
--- a/sys-process/atop/files/atop-2.10.0-ldflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://github.com/Atoptool/atop/pull/289
-
-From 8411f81a202c9c39aebcc637ef94cc3d454cbaaf Mon Sep 17 00:00:00 2001
-From: Marc 'Zugschlus' Haber <mh+github@zugschlus.de>
-Date: Sat, 6 Jan 2024 07:03:53 +0100
-Subject: [PATCH] set LDFLAGS with +=, not overwriting existing variable
-
-this allows the Debian build process to set hardening flags
---- a/Makefile
-+++ b/Makefile
-@@ -21,7 +21,7 @@ PMPATH2  = /usr/lib64/pm-utils/sleep.d
- PMPATHD  = /usr/lib/systemd/system-sleep
- 
- CFLAGS  += -O2 -I. -Wall $(shell pkg-config --cflags glib-2.0)  -Wno-stringop-truncation -Wmissing-prototypes -Wmissing-declarations -Wformat-security # -DNOPERFEVENT   # -DHTTPSTATS
--LDFLAGS  = $(shell pkg-config --libs glib-2.0)
-+LDFLAGS += $(shell pkg-config --libs glib-2.0)
- OBJMOD0  = version.o
- OBJMOD1  = various.o  deviate.o   procdbase.o
- OBJMOD2  = acctproc.o photoproc.o photosyst.o  rawlog.o ifprop.o parseable.o
-
diff --git a/sys-process/atop/files/atop-2.10.0-respect-PKG_CONFIG.patch b/sys-process/atop/files/atop-2.10.0-respect-PKG_CONFIG.patch
deleted file mode 100644
index 483506043490..000000000000
--- a/sys-process/atop/files/atop-2.10.0-respect-PKG_CONFIG.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -20,8 +20,9 @@ PMPATH1  = /usr/lib/pm-utils/sleep.d
- PMPATH2  = /usr/lib64/pm-utils/sleep.d
- PMPATHD  = /usr/lib/systemd/system-sleep
- 
--CFLAGS  += -O2 -I. -Wall $(shell pkg-config --cflags glib-2.0)  -Wno-stringop-truncation -Wmissing-prototypes -Wmissing-declarations -Wformat-security # -DNOPERFEVENT   # -DHTTPSTATS
--LDFLAGS += $(shell pkg-config --libs glib-2.0)
-+PKG_CONFIG ?= pkg-config
-+CFLAGS  += -O2 -I. -Wall $(shell ${PKG_CONFIG} --cflags glib-2.0)  -Wno-stringop-truncation -Wmissing-prototypes -Wmissing-declarations -Wformat-security # -DNOPERFEVENT   # -DHTTPSTATS
-+LDFLAGS += $(shell ${PKG_CONFIG} --libs glib-2.0)
- OBJMOD0  = version.o
- OBJMOD1  = various.o  deviate.o   procdbase.o
- OBJMOD2  = acctproc.o photoproc.o photosyst.o  rawlog.o ifprop.o parseable.o
diff --git a/sys-process/atop/files/atop-2.10.0-respect-opt.patch b/sys-process/atop/files/atop-2.10.0-respect-opt.patch
deleted file mode 100644
index 5a55e6f2f835..000000000000
--- a/sys-process/atop/files/atop-2.10.0-respect-opt.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Don't force -O2.
---- a/Makefile
-+++ b/Makefile
-@@ -21,7 +21,7 @@ PMPATH2  = /usr/lib64/pm-utils/sleep.d
- PMPATHD  = /usr/lib/systemd/system-sleep
- 
- PKG_CONFIG ?= pkg-config
--CFLAGS  += -O2 -I. -Wall $(shell ${PKG_CONFIG} --cflags glib-2.0)  -Wno-stringop-truncation -Wmissing-prototypes -Wmissing-declarations -Wformat-security # -DNOPERFEVENT   # -DHTTPSTATS
-+CFLAGS  += -I. -Wall $(shell ${PKG_CONFIG} --cflags glib-2.0)  -Wno-stringop-truncation -Wmissing-prototypes -Wmissing-declarations -Wformat-security # -DNOPERFEVENT   # -DHTTPSTATS
- LDFLAGS += $(shell ${PKG_CONFIG} --libs glib-2.0)
- OBJMOD0  = version.o
- OBJMOD1  = various.o  deviate.o   procdbase.o
diff --git a/sys-process/atop/files/atop-2.6.0-build.patch b/sys-process/atop/files/atop-2.6.0-build.patch
deleted file mode 100644
index b675a16ee360..000000000000
--- a/sys-process/atop/files/atop-2.6.0-build.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -33,19 +33,19 @@ VERS     = $(shell ./atop -V 2>/dev/null| sed -e 's/^[^ ]* //' -e 's/ .*//')
- all: 		atop atopsar atopacctd atopconvert atopcat
- 
- atop:		atop.o    $(ALLMODS) Makefile
--		$(CC) atop.o $(ALLMODS) -o atop -lncursesw -lz -lm -lrt $(LDFLAGS)
-+		$(CC) $(CFLAGS) atop.o $(ALLMODS) -o atop $(shell ${PKG_CONFIG} --libs ncurses) -lz -lm -lrt $(LDFLAGS)
- 
- atopsar:	atop
- 		ln -sf atop atopsar
- 
- atopacctd:	atopacctd.o netlink.o
--		$(CC) atopacctd.o netlink.o -o atopacctd $(LDFLAGS)
-+		$(CC) $(CFLAGS) atopacctd.o netlink.o -o atopacctd $(LDFLAGS)
- 
- atopconvert:	atopconvert.o
--		$(CC) atopconvert.o -o atopconvert -lz $(LDFLAGS)
-+		$(CC) $(CFLAGS) atopconvert.o -o atopconvert -lz $(LDFLAGS)
- 
- atopcat:	atopcat.o
--		$(CC) atopcat.o -o atopcat $(LDFLAGS)
-+		$(CC) $(CFLAGS) atopcat.o -o atopcat $(LDFLAGS)
- 
- clean:
- 		rm -f *.o atop atopacctd atopconvert atopcat
- 
diff --git a/sys-process/atop/files/atop-2.9.0-netatop-makefile.patch b/sys-process/atop/files/atop-2.9.0-netatop-makefile.patch
deleted file mode 100644
index 30710369fd46..000000000000
--- a/sys-process/atop/files/atop-2.9.0-netatop-makefile.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/daemon/Makefile
-+++ b/daemon/Makefile
-@@ -6,7 +6,7 @@
- all:		netatopd
- 
- netatopd:	netatopd.o Makefile
--		$(CC) netatopd.o -o netatopd -lz
-+		$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) netatopd.o -o netatopd -lz
- 
- clean:
- 		rm -f *.o netatopd
---- a/Makefile
-+++ b/Makefile
-@@ -1,7 +1,7 @@
- all:
- 		./mkversion
--		cd module; make
--		cd daemon; make
-+		$(MAKE) -C module
-+		$(MAKE) -C daemon
- 
- install:	module/netatop.ko daemon/netatopd
- 		install -d /lib/modules/`uname -r`/extra
-@@ -14,5 +14,5 @@
- 		install man/netatopd.8 -t /usr/share/man/man8
- 
- clean:
--		cd module; make clean
--		cd daemon; make clean
-+		$(MAKE) -C module clean
-+		$(MAKE) -C daemon clean
---- a/module/Makefile
-+++ b/module/Makefile
-@@ -7,7 +7,7 @@
- 
- $(MYMODULE).ko: $(MYMODULE).c 
- 		echo start the make
--		make -C $(KERNDIR) M=$(THISDIR) modules
-+		$(MAKE) -C $(KERNDIR) M=$(THISDIR) modules
- 
- clean:
- 	rm -f *.o *.ko
diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest
index 5d27ec0c4477..46eba3ebda40 100644
--- a/sys-process/audit/Manifest
+++ b/sys-process/audit/Manifest
@@ -1,5 +1,3 @@
-AUX audit-3.0.8-musl-malloc.patch 1415 BLAKE2B 0b3a9ec80ed8b445e4d5eea0b9f49f4e5a165ac538b7769305b9107be0874ee9b50f30ea13f77d1b9d54a35ada15a0dfd07e5b905f03b4df3834a4904dec4b94 SHA512 152674f0000a14d7e13b31c1b6cfc0bf48f94f56eb2a1d52e5aa2e306264c507dd1410b7a1457195578bce734ae9ac7f9ad3e10006a8451450b6d8bf6592a8d6
-AUX audit-3.1.4-c99.patch 17997 BLAKE2B 3e44a2f948dfed2f46c453c2e56a9440c56c58326f9e35a466119c3aa67ba56ca0a28e708a1a356400c411068fe09030c337a851ce8690a3645c58a5b406b7ae SHA512 cbf20ba9ffba31af0fa015a211fcb66d1420eff3547e3b7ff1e52e092fdb2a4d1bb790910d65774139b64c9dadcf68f75c56787fb7861a008cfd881bef3f7834
 AUX audit-4.0.1-implicit-builtin-functions.patch 18210 BLAKE2B ea15d2d81ab9eb580e1586c276f0846fa7473176b7eead9e6d47788ec847665f3e670dcc84e78158a040fd5eaba3f946aa786b66b15f34fb216d73e34c90ec99 SHA512 579eca565c0e7f8fe3451ba806298c67a127009e029a91e8d5a33e76a6831c2867bc27c1d63c83334dadd318edc01f7af04c0a2b3cd6072a17a7f406ff06c5a3
 AUX audit-4.0.1-null-deref.patch 1148 BLAKE2B a148aa4d68c04adeed6c02fcd72dc196739bc139ecb3af32bff8c78ddbb6f5206faac560205ebef04703d2750bb0163426d84e8277d38bfe78e42698bede5d98 SHA512 89ba281d94039091f86e42db67c83d4758a89b5cf42b9ef697a87712be011bcea4c52126a3b707cc7a1890d2602515b1b8bb6bbccc333a56abb8f1c23873ac26
 AUX audit.rules-2.1.3 1009 BLAKE2B df40176208bd68cb9021d15ea5803bb0d1c768c9d6400036a69409e1aae3ad55b89983ed94f22a6399a9cec8fc3dc7b20a7b27e75cdea24edda92b95ee19af87 SHA512 bce3ee9aaa0ab48395e6e10ee9b3627d6b7a8083abefdc4009de26649c65a39e000078f799e8c3c9e3341dfa030c6dfbbcad2fb7756fbb3d01b27be078adecec
@@ -7,10 +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.1.2.tar.gz 1219860 BLAKE2B dfdec470bf12cce6c570b3d260e65e2b49e8ac0761e6a6fbf7b4f4a57f92e88367cd74bfcb88e6d718619b88fea27ce963a977c9f4346c95d18a5310e217accb SHA512 a97003a294ed3671df01e2952688e7d5eef59a35f6891feb53e67c4c7eab9ae8c2d18de41a5b5b20e0ad7156fac93aec05f32f6bc5eea706b42b6f27f676446a
-DIST audit-3.1.4.tar.gz 1225648 BLAKE2B c6875f7d031e810469511ac8f86f05b2de7f19c044dbf67bc9d66430167fcf0f031e0279ce170a496b672a6fc99ee18b8cc39943e6faf3c19a24a381d2701439 SHA512 d26c498c91e838d97d3f199630650f509bb1e82b44d364306b20db32d4116fa73d775ef56c0fed2ec8d548b19215052691cbc80c74699bc87f2a0ea08cf664f5
 DIST audit-4.0.1.tar.gz 1194961 BLAKE2B 590abf58e672921a432348f48936cfbff0b6ddfa47e77b3b20eaa00e5d1c4ce2fc8d10c1fc1cbc19d44c09a9f7dfbca76778c94d8d340485c2bb1bb3b5a3c95a SHA512 7fbc426d0ddea340a36ceab52ac090e8e3dfb3450ebf50b478324a097f19ab4bb2cf78a2532644acb17e6114b59b8fda718affda9da62fb84181e3abf76039df
-EBUILD audit-3.1.2.ebuild 4961 BLAKE2B 78cf140b4d36cc6d2e4067bd4ccce551f8af3c9603b0d6989fb0c3255db61fb4b79d58853e88cf6c6aebb959d48f12b94209a609a1ff7dc38ffbb19b323bceb6 SHA512 839383b568effd054968935954a49002e85356322b738100610cc14e3d13aab43f30831bc9b9f7e825d945b7e367b599987f3ac00123d555c37f96473d6cdc97
-EBUILD audit-3.1.4-r1.ebuild 4949 BLAKE2B a4db098166a5aa44784891a784eef46883d1640344a3a9cc9eae0c000251b554e7b21cb4b5ec5c2c97cdfddf20609e8d930db746eb02357d71eb9e333260f7b0 SHA512 84124e3e2c7d8cbefaf55b453552ab4f04dfafcb7979004fe731d0da78f035be122f25220b02eebea6a79063c1554eaa9bc166002527073de22fda88d8aaba81
 EBUILD audit-4.0.1-r1.ebuild 5033 BLAKE2B 4f750017e326fea193d9e592d8899d0a22bab89456777868d69487109e9047ca3ba3fba10d4ded56e8b02b14864d78f84a21514f69939ed7304e44ead36a4e2c SHA512 0814bd6e729ec278d541e4f634ffd0f6f90c3fde100872b02b73ff9a37e70709637b31c12ef12752f81df2ddca7293e70137d3591483fbe6841f731e178b538a
 MISC metadata.xml 628 BLAKE2B 1e927808210f4acff077f0c9e1a2d358c823fd5ce405b2ef5f0ed760cfa2ac059665f5a11cf1d87314012025844f21b3b9cb25f38a892f715ab2e7de47bbb86a SHA512 2bcb29cb5748ac22d0902dc616cf236eca7f5440c48a6f4bd2b7f2c65ec35cf63bda79252ea21d3553749146b9c84a6db7af256e01a84d347bfd4d8d60a204f6
diff --git a/sys-process/audit/audit-3.1.2.ebuild b/sys-process/audit/audit-3.1.2.ebuild
deleted file mode 100644
index 62947e3e3553..000000000000
--- a/sys-process/audit/audit-3.1.2.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# 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_{10..12} )
-
-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="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="gssapi io-uring ldap python static-libs test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sys-libs/libcap-ng
-	gssapi? ( virtual/krb5 )
-	ldap? ( net-nds/openldap:= )
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="
-	${RDEPEND}
-	>=sys-kernel/linux-headers-2.6.34
-	test? ( dev-libs/check )
-"
-BDEPEND="python? (
-			dev-lang/swig
-			$(python_gen_cond_dep '
-				dev-python/setuptools[${PYTHON_USEDEP}]
-			' python3_12)
-		)
-"
-
-CONFIG_CHECK="~AUDIT"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.8-musl-malloc.patch
-)
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	# missing on musl. Uses handrolled AC_LINK_IFELSE but fails at link time
-	# for older compilers regardless. bug #898828
-	strndupa
-)
-
-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 myeconfargs=(
-		--sbindir="${EPREFIX}"/sbin
-		$(use_enable gssapi gssapi-krb5)
-		$(use_enable ldap zos-remote)
-		$(use_enable static-libs static)
-		$(use_with io-uring io_uring)
-		$(use_with arm)
-		$(use_with arm64 aarch64)
-		--enable-systemd
-		--without-golang
-		--without-libwrap
-		--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
-			find . -type f -name 'Makefile' -exec sed -i "s;-I/usr/include/python;-I${SYSROOT}/usr/include/python;g" {} +
-
-			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
-
-	if [[ -f "${ED}"/sbin/audisp-remote ]] ; then
-		dodir /usr/sbin
-		mv "${ED}"/{sbin,usr/sbin}/audisp-remote || die
-	fi
-
-	# 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.1.4-r1.ebuild b/sys-process/audit/audit-3.1.4-r1.ebuild
deleted file mode 100644
index 11755f4501cd..000000000000
--- a/sys-process/audit/audit-3.1.4-r1.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# 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_{10..13} )
-
-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="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="gssapi io-uring ldap python static-libs test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sys-libs/libcap-ng
-	gssapi? ( virtual/krb5 )
-	ldap? ( net-nds/openldap:= )
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="
-	${RDEPEND}
-	>=sys-kernel/linux-headers-2.6.34
-	test? ( dev-libs/check )
-"
-BDEPEND="
-	python? (
-		dev-lang/swig
-		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_USEDEP}]
-		' python3_12)
-	)
-"
-
-CONFIG_CHECK="~AUDIT"
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	# missing on musl. Uses handrolled AC_LINK_IFELSE but fails at link time
-	# for older compilers regardless. bug #898828
-	strndupa
-)
-
-PATCHES=(
-	"${FILESDIR}"/${P}-c99.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 myeconfargs=(
-		--sbindir="${EPREFIX}"/sbin
-		$(use_enable gssapi gssapi-krb5)
-		$(use_enable ldap zos-remote)
-		$(use_enable static-libs static)
-		$(use_with arm)
-		$(use_with arm64 aarch64)
-		$(use_with io-uring io_uring)
-		--enable-systemd
-		--without-golang
-		--without-libwrap
-		--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
-			find . -type f -name 'Makefile' -exec sed -i "s;-I/usr/include/python;-I${SYSROOT}/usr/include/python;g" {} +
-
-			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
-
-	if [[ -f "${ED}"/sbin/audisp-remote ]] ; then
-		dodir /usr/sbin
-		mv "${ED}"/{sbin,usr/sbin}/audisp-remote || die
-	fi
-
-	# 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/files/audit-3.0.8-musl-malloc.patch b/sys-process/audit/files/audit-3.0.8-musl-malloc.patch
deleted file mode 100644
index 7233aabe03c6..000000000000
--- a/sys-process/audit/files/audit-3.0.8-musl-malloc.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://cgit.openembedded.org/meta-openembedded/tree/meta-oe/recipes-security/audit/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch?id=ad978133a1a10d609bb2545882a2f720a2572f3d
-https://github.com/linux-audit/audit-userspace/pull/311
-https://bugs.gentoo.org/837275
-
-From 79c8d6a2755c9dfa00a5e86378e89a94eef0504d Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 9 Aug 2022 23:57:03 -0700
-Subject: [PATCH] Replace __attribute_malloc__ with 
- __attribute__((__malloc__))
-
-__attribute_malloc__ is not available on musl
-
-Fixes
-| ../../git/auparse/auparse.h:54:2: error: expected function body after function declarator
-|         __attribute_malloc__ __attr_dealloc (auparse_destroy, 1);
-|         ^
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---- a/auparse/auparse.h
-+++ b/auparse/auparse.h
-@@ -51,7 +51,7 @@ typedef void (*auparse_callback_ptr)(auparse_state_t *au,
- void auparse_destroy(auparse_state_t *au);
- void auparse_destroy_ext(auparse_state_t *au, auparse_destroy_what_t what);
- auparse_state_t *auparse_init(ausource_t source, const void *b)
--	__attribute_malloc__ __attr_dealloc (auparse_destroy, 1);
-+	__attribute__((__malloc__)) __attr_dealloc (auparse_destroy, 1);
- int auparse_new_buffer(auparse_state_t *au, const char *data, size_t data_len)
- 	__attr_access ((__read_only__, 2, 3));
- int auparse_feed(auparse_state_t *au, const char *data, size_t data_len)
diff --git a/sys-process/audit/files/audit-3.1.4-c99.patch b/sys-process/audit/files/audit-3.1.4-c99.patch
deleted file mode 100644
index e78d26038645..000000000000
--- a/sys-process/audit/files/audit-3.1.4-c99.patch
+++ /dev/null
@@ -1,599 +0,0 @@
-https://bugs.gentoo.org/936080
-https://github.com/linux-audit/audit-userspace/commit/ec6763ed29a034b452a6fb568b226c57c7be30e7
-
-From ec6763ed29a034b452a6fb568b226c57c7be30e7 Mon Sep 17 00:00:00 2001
-From: Yanase Yuki <41878038+zpc0@users.noreply.github.com>
-Date: Tue, 14 May 2024 04:51:35 +0900
-Subject: [PATCH] Implicit builtin functions (#372)
-
-Correct a number of places where printf is being used without a prototype.
-All cases are in libraries which should not be using printf. Change them
-to return an error rather than communicate the problem.
-
-This is a backport of 8c7eaa7
-
-Co-authored-by: Steve Grubb <ausearch.1@gmail.com>
---- a/audisp/audispd-llist.c
-+++ b/audisp/audispd-llist.c
-@@ -69,15 +69,13 @@ unsigned int plist_count_active(const conf_llist *l)
- 	return cnt;
- }
- 
--void plist_append(conf_llist *l, plugin_conf_t *p)
-+int plist_append(conf_llist *l, plugin_conf_t *p)
- {
- 	lnode* newnode;
- 
- 	newnode = malloc(sizeof(lnode));
--	if (newnode == NULL) {
--		printf("Out of memory. Check %s file, %d line", __FILE__, __LINE__);
--		return;
--	}
-+	if (newnode == NULL)
-+		return 1;
- 
- 	if (p) {
- 		void *pp = malloc(sizeof(struct plugin_conf));
-@@ -98,6 +96,8 @@ void plist_append(conf_llist *l, plugin_conf_t *p)
- 	// make newnode current
- 	l->cur = newnode;
- 	l->cnt++;
-+
-+	return 0;
- }
- 
- void plist_clear(conf_llist* l)
---- a/audisp/audispd-llist.h
-+++ b/audisp/audispd-llist.h
-@@ -1,6 +1,6 @@
- /*
- * audispd-llist.h - Header file for ausearch-conf_llist.c
--* Copyright (c) 2007,2013 Red Hat Inc., Durham, North Carolina.
-+* Copyright (c) 2007,2013 Red Hat Inc.
- * All Rights Reserved.
- *
- * This software may be freely redistributed and/or modified under the
-@@ -51,7 +51,7 @@ unsigned int plist_count_active(const conf_llist *l);
- void plist_last(conf_llist *l);
- lnode *plist_next(conf_llist *l);
- static inline lnode *plist_get_cur(conf_llist *l) { return l->cur; }
--void plist_append(conf_llist *l, plugin_conf_t *p);
-+int plist_append(conf_llist *l, plugin_conf_t *p);
- void plist_clear(conf_llist* l);
- void plist_mark_all_unchecked(conf_llist* l);
- lnode *plist_find_unchecked(conf_llist* l);
---- a/auparse/normalize-llist.c
-+++ b/auparse/normalize-llist.c
-@@ -1,6 +1,6 @@
- /*
-  * normalize-llist.c - Minimal linked list library
-- * Copyright (c) 2016-17 Red Hat Inc., Durham, North Carolina.
-+ * Copyright (c) 2016-17 Red Hat Inc.
-  * All Rights Reserved. 
-  *
-  * This library is free software; you can redistribute it and/or
-@@ -61,15 +61,14 @@ data_node *cllist_next(cllist *l)
- 	return l->cur;
- }
- 
--void cllist_append(cllist *l, uint32_t num, void *data)
-+// Returns 0 on success and 1 on error
-+int cllist_append(cllist *l, uint32_t num, void *data)
- {
- 	data_node *newnode;
- 
- 	newnode = malloc(sizeof(data_node));
--	if (newnode == NULL) {
--		printf("Out of memory. Check %s file, %d line", __FILE__, __LINE__);
--		return;
--	}
-+	if (newnode == NULL)
-+		return 1;
- 
- 	newnode->num = num;
- 	newnode->data = data;
-@@ -84,5 +83,6 @@ void cllist_append(cllist *l, uint32_t num, void *data)
- 	// make newnode current
- 	l->cur = newnode;
- 	l->cnt++;
-+	return 0;
- }
- 
---- a/auparse/normalize-llist.h
-+++ b/auparse/normalize-llist.h
-@@ -1,6 +1,6 @@
- /*
-  * normalize-llist.h - Header file for normalize-llist.c
-- * Copyright (c) 2016-17 Red Hat Inc., Durham, North Carolina.
-+ * Copyright (c) 2016-17 Red Hat Inc.
-  * All Rights Reserved.
-  *
-  * This library is free software; you can redistribute it and/or
-@@ -53,7 +53,7 @@ AUDIT_HIDDEN_START
- void cllist_create(cllist *l, void (*cleanup)(void *));
- void cllist_clear(cllist* l);
- data_node *cllist_next(cllist *l);
--void cllist_append(cllist *l, uint32_t num, void *data);
-+int cllist_append(cllist *l, uint32_t num, void *data);
- 
- AUDIT_HIDDEN_END
- 
---- a/auparse/normalize.c
-+++ b/auparse/normalize.c
-@@ -179,7 +179,8 @@ static unsigned int add_subj_attr(auparse_state_t *au, const char *str,
- 	if ((auparse_find_field(au, str))) {
- 		attr = set_record(0, rnum);
- 		attr = set_field(attr, auparse_get_field_num(au));
--		cllist_append(&D.actor.attr, attr, NULL);
-+		if (cllist_append(&D.actor.attr, attr, NULL))
-+			return 1;
- 		return 0;
- 	} else
- 		auparse_goto_record_num(au, rnum);
-@@ -224,7 +225,8 @@ static unsigned int add_obj_attr(auparse_state_t *au, const char *str,
- 	if ((auparse_find_field(au, str))) {
- 		attr = set_record(0, rnum);
- 		attr = set_field(attr, auparse_get_field_num(au));
--		cllist_append(&D.thing.attr, attr, NULL);
-+		if (cllist_append(&D.thing.attr, attr, NULL))
-+			return 1;
- 		return 0;
- 	} else
- 		auparse_goto_record_num(au, rnum);
-@@ -360,21 +362,23 @@ static void collect_id_obj2(auparse_state_t *au, const char *syscall)
- 	}
- }
- 
--static void collect_path_attrs(auparse_state_t *au)
-+static int collect_path_attrs(auparse_state_t *au)
- {
- 	value_t attr;
- 	unsigned int rnum = auparse_get_record_num(au);
- 
- 	auparse_first_field(au);
- 	if (add_obj_attr(au, "mode", rnum))
--		return;	// Failed opens don't have anything else
-+		return 1;	// Failed opens don't have anything else
- 
- 	// All the rest of the fields matter
- 	while ((auparse_next_field(au))) {
- 		attr = set_record(0, rnum);
- 		attr = set_field(attr, auparse_get_field_num(au));
--		cllist_append(&D.thing.attr, attr, NULL);
-+		if (cllist_append(&D.thing.attr, attr, NULL))
-+			return 1;
- 	}
-+	return 0;
- }
- 
- static void collect_cwd_attrs(auparse_state_t *au)
---- a/src/auditctl-llist.c
-+++ b/src/auditctl-llist.c
-@@ -1,7 +1,7 @@
- /*
- * ausearch-llist.c - Minimal linked list library
--* Copyright (c) 2005 Red Hat Inc., Durham, North Carolina.
--* All Rights Reserved. 
-+* Copyright (c) 2005 Red Hat Inc.
-+* All Rights Reserved.
- *
- * This software may be freely redistributed and/or modified under the
- * terms of the GNU General Public License as published by the Free
-@@ -15,7 +15,7 @@
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING. If not, write to the
--* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor 
-+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1335, USA.
- *
- * Authors:
-@@ -59,19 +59,17 @@ lnode *list_next(llist *l)
- 	return l->cur;
- }
- 
--void list_append(llist *l, struct audit_rule_data *r, size_t sz)
-+int list_append(llist *l, struct audit_rule_data *r, size_t sz)
- {
- 	lnode* newnode;
- 
- 	newnode = malloc(sizeof(lnode));
--	if (newnode == NULL) {
--		printf("Out of memory. Check %s file, %d line", __FILE__, __LINE__);
--		return;
--	}
-+	if (newnode == NULL)
-+		return 1;
- 
- 	if (r) {
- 		void *rr = malloc(sz);
--		if (rr) 
-+		if (rr)
- 			memcpy(rr, r, sz);
- 		newnode->r = rr;
- 	} else
-@@ -89,6 +87,8 @@ void list_append(llist *l, struct audit_rule_data *r, size_t sz)
- 	// make newnode current
- 	l->cur = newnode;
- 	l->cnt++;
-+
-+	return 0;
- }
- 
- void list_clear(llist* l)
---- a/src/auditctl-llist.h
-+++ b/src/auditctl-llist.h
-@@ -1,6 +1,6 @@
- /*
- * auditctl-llist.h - Header file for ausearch-llist.c
--* Copyright (c) 2005 Red Hat Inc., Durham, North Carolina.
-+* Copyright (c) 2005 Red Hat Inc.
- * All Rights Reserved.
- *
- * This software may be freely redistributed and/or modified under the
-@@ -50,7 +50,7 @@ void list_first(llist *l);
- void list_last(llist *l);
- lnode *list_next(llist *l);
- static inline lnode *list_get_cur(llist *l) { return l->cur; }
--void list_append(llist *l, struct audit_rule_data *r, size_t sz);
-+int list_append(llist *l, struct audit_rule_data *r, size_t sz);
- void list_clear(llist* l);
- 
- #endif
---- a/src/ausearch-avc.c
-+++ b/src/ausearch-avc.c
-@@ -1,7 +1,7 @@
- /*
- * ausearch-avc.c - Minimal linked list library for avcs
--* Copyright (c) 2006,2008,2014 Red Hat Inc., Durham, North Carolina.
--* All Rights Reserved. 
-+* Copyright (c) 2006,2008,2014 Red Hat Inc.
-+* All Rights Reserved.
- *
- * This software may be freely redistributed and/or modified under the
- * terms of the GNU General Public License as published by the Free
-@@ -15,7 +15,7 @@
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING. If not, write to the
--* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor 
-+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1335, USA.
- *
- * Authors:
-@@ -62,15 +62,13 @@ static void alist_last(alist *l)
- 	l->cur = cur;
- }
- 
--void alist_append(alist *l, anode *node)
-+int alist_append(alist *l, anode *node)
- {
- 	anode* newnode;
- 
- 	newnode = malloc(sizeof(anode));
--	if (newnode == NULL) {
--		printf("Out of memory. Check %s file, %d line", __FILE__, __LINE__);
--		return;
--	}
-+	if (newnode == NULL)
-+		return 1;
- 
- 	if (node->scontext)
- 		newnode->scontext = node->scontext;
-@@ -108,6 +106,8 @@ void alist_append(alist *l, anode *node)
- 	// make newnode current
- 	l->cur = newnode;
- 	l->cnt++;
-+
-+	return 0;
- }
- 
- int alist_find_subj(alist *l)
---- a/src/ausearch-avc.h
-+++ b/src/ausearch-avc.h
-@@ -1,6 +1,6 @@
- /*
- * ausearch-avc.h - Header file for ausearch-string.c
--* Copyright (c) 2006,2008 Red Hat Inc., Durham, North Carolina.
-+* Copyright (c) 2006,2008 Red Hat Inc.
- * All Rights Reserved.
- *
- * This software may be freely redistributed and/or modified under the
-@@ -54,7 +54,7 @@ void alist_create(alist *l);
- static inline void alist_first(alist *l) { l->cur = l->head; }
- anode *alist_next(alist *l);
- static inline anode *alist_get_cur(alist *l) { return l->cur; }
--void alist_append(alist *l, anode *node);
-+int alist_append(alist *l, anode *node);
- void anode_init(anode *an);
- void anode_clear(anode *an);
- void alist_clear(alist* l);
---- a/src/ausearch-int.c
-+++ b/src/ausearch-int.c
-@@ -1,6 +1,6 @@
- /*
- * ausearch-int.c - Minimal linked list library for integers
--* Copyright (c) 2005,2008 Red Hat Inc., Durham, North Carolina.
-+* Copyright (c) 2005,2008 Red Hat Inc.
- * All Rights Reserved. 
- *
- * This software may be freely redistributed and/or modified under the
-@@ -41,15 +41,13 @@ int_node *ilist_next(ilist *l)
- 	return l->cur;
- }
- 
--void ilist_append(ilist *l, int num, unsigned int hits, int aux)
-+int ilist_append(ilist *l, int num, unsigned int hits, int aux)
- {
- 	int_node* newnode;
- 
- 	newnode = malloc(sizeof(int_node));
--	if (newnode == NULL) {
--		printf("Out of memory. Check %s file, %d line", __FILE__, __LINE__);
--		return;
--	}
-+	if (newnode == NULL)
-+		return 1;
- 
- 	newnode->num = num;
- 	newnode->hits = hits;
-@@ -65,6 +63,8 @@ void ilist_append(ilist *l, int num, unsigned int hits, int aux)
- 	// make newnode current
- 	l->cur = newnode;
- 	l->cnt++;
-+
-+	return 0;
- }
- 
- void ilist_clear(ilist* l)
---- a/src/ausearch-int.h
-+++ b/src/ausearch-int.h
-@@ -1,6 +1,6 @@
- /*
- * ausearch-int.h - Header file for ausearch-int.c
--* Copyright (c) 2005,2008 Red Hat Inc., Durham, North Carolina.
-+* Copyright (c) 2005,2008 Red Hat Inc.
- * All Rights Reserved.
- *
- * This software may be freely redistributed and/or modified under the
-@@ -48,7 +48,7 @@ void ilist_create(ilist *l);
- static inline void ilist_first(ilist *l) { l->cur = l->head; }
- int_node *ilist_next(ilist *l);
- static inline int_node *ilist_get_cur(ilist *l) { return l->cur; }
--void ilist_append(ilist *l, int num, unsigned int hits, int aux);
-+int ilist_append(ilist *l, int num, unsigned int hits, int aux);
- void ilist_clear(ilist* l);
- 
- /* append a number if its not already on the list */
---- a/src/ausearch-llist.c
-+++ b/src/ausearch-llist.c
-@@ -1,6 +1,6 @@
- /*
- * ausearch-llist.c - Minimal linked list library
--* Copyright (c) 2005-2008,2011,2016 Red Hat Inc., Durham, North Carolina.
-+* Copyright (c) 2005-2008,2011,2016 Red Hat Inc.
- * Copyright (c) 2011 IBM Corp.
- * All Rights Reserved. 
- *
-@@ -102,15 +102,13 @@ lnode *list_prev(llist *l)
- 	return l->cur;
- }
- 
--void list_append(llist *l, lnode *node)
-+int list_append(llist *l, lnode *node)
- {
- 	lnode* newnode;
- 
- 	newnode = malloc(sizeof(lnode));
--	if (newnode == NULL) {
--		printf("Out of memory. Check %s file, %d line", __FILE__, __LINE__);
--		return;
--	}
-+	if (newnode == NULL)
-+		return 1;
- 
- 	if (node->message)
- 		newnode->message = node->message;
-@@ -123,7 +121,7 @@ void list_append(llist *l, lnode *node)
- 	newnode->type = node->type;
- 	newnode->a0 = node->a0;
- 	newnode->a1 = node->a1;
--	newnode->item = l->cnt; 
-+	newnode->item = l->cnt;
- 	newnode->next = NULL;
- 
- 	// if we are at top, fix this up
-@@ -135,6 +133,8 @@ void list_append(llist *l, lnode *node)
- 	// make newnode current
- 	l->cur = newnode;
- 	l->cnt++;
-+
-+	return 0;
- }
- 
- int list_find_item(llist *l, unsigned int i)
---- a/src/ausearch-llist.h
-+++ b/src/ausearch-llist.h
-@@ -107,7 +107,7 @@ void list_last(llist *l);
- lnode *list_next(llist *l);
- lnode *list_prev(llist *l);
- static inline lnode *list_get_cur(llist *l) { return l->cur; }
--void list_append(llist *l, lnode *node);
-+int list_append(llist *l, lnode *node);
- void list_clear(llist* l);
- int list_get_event(llist* l, event *e);
- 
---- a/src/ausearch-nvpair.c
-+++ b/src/ausearch-nvpair.c
-@@ -1,6 +1,6 @@
- /*
- * ausearch-nvpair.c - Minimal linked list library for name-value pairs
--* Copyright (c) 2006-08 Red Hat Inc., Durham, North Carolina.
-+* Copyright (c) 2006-08 Red Hat Inc.
- * All Rights Reserved. 
- *
- * This software may be freely redistributed and/or modified under the
-@@ -42,13 +42,11 @@ nvnode *search_list_next(nvlist *l)
- 	return l->cur;
- }
- 
--void search_list_append(nvlist *l, nvnode *node)
-+int search_list_append(nvlist *l, nvnode *node)
- {
- 	nvnode* newnode = malloc(sizeof(nvnode));
--	if (newnode == NULL) {
--		printf("Out of memory. Check %s file, %d line", __FILE__, __LINE__);
--		return;
--	}
-+	if (newnode == NULL)
-+		return 1;
- 
- 	newnode->name = node->name;
- 	newnode->val = node->val;
-@@ -66,6 +64,8 @@ void search_list_append(nvlist *l, nvnode *node)
- 	// make newnode current
- 	l->cur = newnode;
- 	l->cnt++;
-+
-+	return 0;
- }
- 
- int search_list_find_val(nvlist *l, long val)
---- a/src/ausearch-nvpair.h
-+++ b/src/ausearch-nvpair.h
-@@ -1,6 +1,6 @@
- /*
- * ausearch-nvpair.h - Header file for ausearch-nvpair.c
--* Copyright (c) 2006-08 Red Hat Inc., Durham, North Carolina.
-+* Copyright (c) 2006-08 Red Hat Inc.
- * All Rights Reserved.
- *
- * This software may be freely redistributed and/or modified under the
-@@ -48,7 +48,7 @@ void search_list_create(nvlist *l);
- static inline void search_list_first(nvlist *l) { l->cur = l->head; }
- nvnode *search_list_next(nvlist *l);
- static inline nvnode *search_list_get_cur(nvlist *l) { return l->cur; }
--void search_list_append(nvlist *l, nvnode *node);
-+int search_list_append(nvlist *l, nvnode *node);
- void search_list_clear(nvlist* l);
- 
- /* Given a numeric index, find that record. */
---- a/src/ausearch-string.c
-+++ b/src/ausearch-string.c
-@@ -44,15 +44,13 @@ snode *slist_next(slist *l)
- 	return l->cur;
- }
- 
--void slist_append(slist *l, snode *node)
-+int slist_append(slist *l, snode *node)
- {
- 	snode* newnode;
- 
- 	newnode = malloc(sizeof(snode));
--	if (newnode == NULL) {
--		printf("Out of memory. Check %s file, %d line", __FILE__, __LINE__);
--		return;
--	}
-+	if (newnode == NULL)
-+		return 1;
- 
- 	if (node->str)
- 		newnode->str = node->str;
-@@ -79,6 +77,8 @@ void slist_append(slist *l, snode *node)
- 	// make newnode current
- 	l->cur = newnode;
- 	l->cnt++;
-+
-+	return 0;
- }
- 
- void slist_clear(slist* l)
---- a/src/ausearch-string.h
-+++ b/src/ausearch-string.h
-@@ -49,7 +49,7 @@ void slist_create(slist *l);
- static inline void slist_first(slist *l) { l->cur = l->head; }
- snode *slist_next(slist *l);
- static inline snode *slist_get_cur(slist *l) { return l->cur; }
--void slist_append(slist *l, snode *node);
-+int slist_append(slist *l, snode *node);
- void slist_clear(slist* l);
- 
- /* append a string if its not already on the list */
---- a/tools/aulastlog/aulastlog-llist.c
-+++ b/tools/aulastlog/aulastlog-llist.c
-@@ -1,7 +1,7 @@
- /*
- * aulastlog-llist.c - Minimal linked list library
--* Copyright (c) 2008 Red Hat Inc., Durham, North Carolina.
--* All Rights Reserved. 
-+* Copyright (c) 2008 Red Hat Inc..
-+* All Rights Reserved.
- *
- * This software may be freely redistributed and/or modified under the
- * terms of the GNU General Public License as published by the Free
-@@ -15,7 +15,7 @@
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING. If not, write to the
--* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor 
-+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1335, USA.
- *
- * Authors:
-@@ -41,15 +41,13 @@ lnode *list_next(llist *l)
- 	return l->cur;
- }
- 
--void list_append(llist *l, lnode *node)
-+int list_append(llist *l, lnode *node)
- {
- 	lnode* newnode;
- 
- 	newnode = malloc(sizeof(lnode));
--	if (newnode == NULL) {
--		printf("Out of memory. Check %s file, %d line", __FILE__, __LINE__);
--		return;
--	}
-+	if (newnode == NULL)
-+		return 1;
- 
- 	newnode->sec = node->sec;
- 	newnode->uid = node->uid;
-@@ -62,7 +60,7 @@ void list_append(llist *l, lnode *node)
- 		newnode->term = strdup(node->term);
- 	else
- 		newnode->term = NULL;
--	newnode->item = l->cnt; 
-+	newnode->item = l->cnt;
- 	newnode->next = NULL;
- 
- 	// if we are at top, fix this up
-@@ -74,6 +72,8 @@ void list_append(llist *l, lnode *node)
- 	// make newnode current
- 	l->cur = newnode;
- 	l->cnt++;
-+
-+	return 0;
- }
- 
- void list_clear(llist* l)
---- a/tools/aulastlog/aulastlog-llist.h
-+++ b/tools/aulastlog/aulastlog-llist.h
-@@ -1,6 +1,6 @@
- /*
- * aulastlog-llist.h - Header file for aulastlog-llist.c
--* Copyright (c) 2008 Red Hat Inc., Durham, North Carolina.
-+* Copyright (c) 2008 Red Hat Inc.
- * All Rights Reserved.
- *
- * This software may be freely redistributed and/or modified under the
-@@ -53,7 +53,7 @@ static inline void list_first(llist *l) { l->cur = l->head; }
- lnode *list_next(llist *l);
- static inline lnode *list_get_cur(llist *l) { return l->cur; }
- static inline unsigned int list_get_cnt(llist *l) { return l->cnt; }
--void list_append(llist *l, lnode *node);
-+int list_append(llist *l, lnode *node);
- void list_clear(llist* l);
- int list_update_login(llist* l, time_t t);
- int list_update_host(llist* l, const char *h);
-
diff --git a/sys-process/daemontools/Manifest b/sys-process/daemontools/Manifest
index 73c890c21d8f..949f81b88bf5 100644
--- a/sys-process/daemontools/Manifest
+++ b/sys-process/daemontools/Manifest
@@ -8,5 +8,5 @@ DIST daemontools-0.76-man-20020131.tar.gz 8005 BLAKE2B 0c8f0ae71754516fda772b377
 DIST daemontools-0.76.tar.gz 36975 BLAKE2B cb45c92fc06169b617befe9f9193377a07d31e9e6ae05526c299ce2a63c8009b599384a87f768fbe9283b229083ef74007b85662976cf7add5c855f5018fafa8 SHA512 e4a7938352b745a03ccc41acdddba1e6782f0ca245e5cae060de62ab6c5a23c841a994c30140298d274405a7f26d53ba7e84e5810a3d185b2c01e4c0feffe6c7
 EBUILD daemontools-0.76-r10.ebuild 1337 BLAKE2B dcf058cdff239e3ec759427383c1e7edf458d7194cb9061090d9162976b24e6036d9962691d182d1f390297543496f333d65365ac4bd250aac7fe625fde7eada SHA512 3be0cf82ac32ddfbb143faa6b595a97d2ae380d00a092b6a0f8901fbc64cb36861a0fccad6baee38fab87d0a63d9e7dfa0652076102bc86abb0bd82a309079ab
 EBUILD daemontools-0.76-r11.ebuild 1391 BLAKE2B fa0b9f635696f4a8dea370eececa327420267c55490df5560305b593f7023b79df3a1f97daef4449d9de6b6010c779ca9355435392e5cf1d979cef6000607323 SHA512 449b97ffb24c13d9bfa3df392450f7ad995c74f4d0c7cff20cb60973d6c90c0da9a099ed0b4d4d124cc86c3fa8ea1cb288dbc626b9f521fd645a322aea089e34
-EBUILD daemontools-0.76-r12.ebuild 1444 BLAKE2B 36f6cb1f6c600a4efa9fec6652f75501d286c865bb57cf3e489d663e5e8b4f3a23b0d94d8b391ec30692dfb23daaf01ae48094d9ddcd3d8d44fadf282d310187 SHA512 7c1ad1ed0968112ee8c805ac24aba6ddeda499dc951ac0db1093d183fddaa776dbc13eb3b29bd66511209e11cdeda927e98eed7b7c2ea9bdfebd0f8114b3853a
+EBUILD daemontools-0.76-r12.ebuild 1439 BLAKE2B 12ae8ea946ec6a64d40f774089e49921cd8760e5e3a7d5edfe488ed4b99890536ba037f8939871c3083f77423591ad182991fa16aec739cc2f701ebaeb7dbe26 SHA512 cf4fae43d42e5a58e498db939cdf9c95a90c91583871b81b3715f3794b3c2a328880b14de42b52c30c8fa9aafb76425aa5a9059773364876a6312cabca94613c
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/sys-process/daemontools/daemontools-0.76-r12.ebuild b/sys-process/daemontools/daemontools-0.76-r12.ebuild
index eabe98c08521..46b17ab30d77 100644
--- a/sys-process/daemontools/daemontools-0.76-r12.ebuild
+++ b/sys-process/daemontools/daemontools-0.76-r12.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/admin/${P}/src"
 
 LICENSE="public-domain GPL-2"	# GPL-2 for init script
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="selinux static"
 
 RDEPEND="selinux? ( sec-policy/selinux-daemontools )"