6 files changed, 2 insertions, 110 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index c3d1899ea7ba..0de5e13ae9b0 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/elfix/Manifest b/sys-apps/elfix/Manifest
index 45f527b20e55..3152f539ebb7 100644
--- a/sys-apps/elfix/Manifest
+++ b/sys-apps/elfix/Manifest
@@ -1,5 +1,4 @@
 DIST elfix-0.9.5.tar.gz 401722 BLAKE2B 184f8944c62412675819ca86f13bcf23039ebcf069df528267f3e4272859e6cc442a1e05a7a121d88987c282d7e2f513d02f28ce41a8e3c0c226b456fa256aa6 SHA512 e15ab664357796f3a63ac54912eb43ae659947088a10ef16aafcbdd713cc3670fb0319cb2b95a2d29092866d322ef69df1d63847dfc0c4ab2cdd49e6eaa4635e
-EBUILD elfix-0.9.5-r1.ebuild 1134 BLAKE2B f381fe3629582265fb6a3d2cf0a82c9a9d97d9f8d4bd6310f26a143ebd4fa0ae19e79973865ca05307e86c8c65c97ef0b12923dcf48274b287ade0156a163375 SHA512 9324deb26bd058a7cfe7b66d4fd05bfb22a4f4274a2507f6e3aca795cc53bfd34c74384ddc90c4061f997bc394362b6365abed132e804959ae349cf6495a5d3e
-EBUILD elfix-0.9.5.ebuild 1176 BLAKE2B 608346b90278839d1681a6e50c4d3cc211c18514f04b276ebfd97ba8f8ca4200565780aeeb2ab1c9e0ef6c30a4219482bd8c9846dd789fa1620c0ad998f96ca7 SHA512 34fd8da00406541e94c0de2fcad346fdc0977c849dcb42cfb7533b8d9c920a600885469660b1dd5bd59514011e9ee9589226aad9774fe964f19b94619b21a03b
+EBUILD elfix-0.9.5-r1.ebuild 1127 BLAKE2B 46c1f7dc5f461e75ef7342f0723c62e8ceb8f965754012c63d7dccface385bcdf2083d1cf674aa48d0ba72ca7d278ebee1a3b546fc7de7333aa5595e1dc9c161 SHA512 1d3b092ec41af7bd5cb1c2c8b215935fd349f6e1aecf399d673082eb09caf30aaffd807b31caea68769344a22b56d5972b6d2d5a4fd9ed3e6c53526e9cb9917c
 EBUILD elfix-9999.ebuild 1134 BLAKE2B f381fe3629582265fb6a3d2cf0a82c9a9d97d9f8d4bd6310f26a143ebd4fa0ae19e79973865ca05307e86c8c65c97ef0b12923dcf48274b287ade0156a163375 SHA512 9324deb26bd058a7cfe7b66d4fd05bfb22a4f4274a2507f6e3aca795cc53bfd34c74384ddc90c4061f997bc394362b6365abed132e804959ae349cf6495a5d3e
 MISC metadata.xml 624 BLAKE2B 67192c9d6f15c3e4f4c2c38cee73f5f7e191c42fc56dfb17713e47f2bd91dc50e50e2fafb0a70bdd71da35d60a614a9ac4101aaecf1f1f0d22671a8d7fd03727 SHA512 238813f6095de8b7ab64b764773fe05a0d5d4e6a972fbef1c0dc49ad0653375c168eef3d17cb2fba0864a4f7ce7a1c89441632b0f193da9a51a140427429c121
diff --git a/sys-apps/elfix/elfix-0.9.5-r1.ebuild b/sys-apps/elfix/elfix-0.9.5-r1.ebuild
index b852f0585a0b..5207863a8331 100644
--- a/sys-apps/elfix/elfix-0.9.5-r1.ebuild
+++ b/sys-apps/elfix/elfix-0.9.5-r1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999* ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/elfix/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
 fi
 
 DESCRIPTION="Suite of tools to work with ELF objects on Hardened Gentoo"
diff --git a/sys-apps/elfix/elfix-0.9.5.ebuild b/sys-apps/elfix/elfix-0.9.5.ebuild
deleted file mode 100644
index 0f1ed96f6f05..000000000000
--- a/sys-apps/elfix/elfix-0.9.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/elfix.git"
-	inherit autotools git-r3
-else
-	SRC_URI="https://dev.gentoo.org/~blueness/elfix/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
-fi
-
-DESCRIPTION="A suite of tools to work with ELF objects on Hardened Gentoo"
-HOMEPAGE="https://www.gentoo.org/proj/en/hardened/pax-quickstart.xml
-	https://dev.gentoo.org/~blueness/elfix/"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="+ptpax test +xtpax"
-REQUIRED_USE="|| ( ptpax xtpax )"
-# These only work with a properly configured PaX kernel
-RESTRICT="!test? ( test ) test"
-
-DOCS=( AUTHORS ChangeLog INSTALL README THANKS TODO )
-
-DEPEND="~dev-python/pypax-${PV}[ptpax=,xtpax=]
-	ptpax? ( dev-libs/elfutils )
-	xtpax? ( sys-apps/attr )"
-
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	if [[ ${PV} == *9999* ]]; then
-		eautoreconf
-		cd doc && ./make.sh || die
-	fi
-}
-
-src_configure() {
-	rm -f "${S}/scripts/setup.py"
-	econf \
-		$(use_enable test tests) \
-		$(use_enable ptpax) \
-		$(use_enable xtpax)
-}
diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index f824d28a5f18..1f3faba11390 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -1,5 +1,3 @@
-DIST s6-2.12.0.3.tar.gz 255368 BLAKE2B 2d30b327d45f0cd803cfff1b649b8393d54ff32eb545b536f17d74abca9f5a5638fdea26a5c015756d45ad48201b4adc7479b6cfd7c3f8957693fc3018127c00 SHA512 ecc57b5a06fb413d74337324f8942c905075cf14d87c1471568a836c747271cf95d0edecac69dea54cee55f7a3dbd102493876356c2d36065ab35962b87b559a
 DIST s6-2.12.0.4.tar.gz 255314 BLAKE2B 4a7da37affdc2d0651da905fdfbffe897709cc6f2a4a36453f0a87c88da66adb307805b9f8c850813186ce51c18ed07b8a95aa34a8a266a5a24b3b8646b19485 SHA512 dfdb9c0189177762a89d1f47e1d6b0a82bba5554baef4fa899b1c0a85c192d5e1dac2b929173d750df3707f0d699b28591f1eab3e63b8791e4a51af1c65e3e56
-EBUILD s6-2.12.0.3.ebuild 1273 BLAKE2B 7df072514f91748694d241d121da6b93814087d94625c0226bc39bddd2d988458c8357cfd26903150cfc6654c2735e958635bbac45862ab79b2d06e9acf52bca SHA512 1d726fb3e3754ade32fba153405a157c6f92bb683d481172ca227071bcb209fc622bc3949b327b738fb990635fdf38ba6cc658fb0b0041c4fc0fea1347a9bc25
 EBUILD s6-2.12.0.4.ebuild 1273 BLAKE2B 7df072514f91748694d241d121da6b93814087d94625c0226bc39bddd2d988458c8357cfd26903150cfc6654c2735e958635bbac45862ab79b2d06e9acf52bca SHA512 1d726fb3e3754ade32fba153405a157c6f92bb683d481172ca227071bcb209fc622bc3949b327b738fb990635fdf38ba6cc658fb0b0041c4fc0fea1347a9bc25
 MISC metadata.xml 871 BLAKE2B 2e6ef16a61c8b9d55bb520adc30479837aae5b85fb2e4ab8e18e0d162ae1e7370dc5823c9a711e92c73620fcc20e4e4a159bd6270f29fe99382163a96dac8c75 SHA512 e1e741d4b13338fb41e1b9fda15e308d84bdd7490a7f98063de4052307703303ac4d313e6ea0673d4095f27041bb62539f986e4ce3ff0ee7133ff319f37d63d9
diff --git a/sys-apps/s6/s6-2.12.0.3.ebuild b/sys-apps/s6/s6-2.12.0.3.ebuild
deleted file mode 100644
index 47b107317105..000000000000
--- a/sys-apps/s6/s6-2.12.0.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit optfeature toolchain-funcs
-
-DESCRIPTION="skarnet.org's small and secure supervision software suite"
-HOMEPAGE="https://www.skarnet.org/software/s6/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm ~mips ~riscv x86"
-IUSE="+execline"
-
-RDEPEND="
-	>=dev-libs/skalibs-2.14.1.0:=
-	execline? ( dev-lang/execline:= )
-"
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
-	default
-
-	# Avoid QA warning for LDFLAGS addition
-	sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
-
-	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
-	tc-export AR CC RANLIB
-
-	local myconf=(
-		--bindir=/bin
-		--dynlibdir="/$(get_libdir)"
-		--libdir="/usr/$(get_libdir)/${PN}"
-		--libexecdir=/lib/s6
-		--with-dynlib="/$(get_libdir)"
-		--with-lib="/usr/$(get_libdir)/execline"
-		--with-lib="/usr/$(get_libdir)/skalibs"
-		--with-sysdeps="/usr/$(get_libdir)/skalibs"
-		--enable-shared
-		--disable-allstatic
-		--disable-static
-		--disable-static-libc
-		$(use_enable execline)
-	)
-
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	optfeature "man pages" app-doc/s6-man-pages
-}