gentoo auto-resync : 15:07:2023 - 10:39:50

16 files changed, 63 insertions, 238 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 32df310e7ea9..3e9ae204b90c 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index d6249407d288..1c0d0fdfbff8 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,4 +1,5 @@
 AUX README.RESCUE 134 BLAKE2B 2cd153e0077388f29e11779670086c50fb1a470b9bb76969a747313021bb85c37b20327ab2feb9b2cc715849245875e7d8a5ae6ceee84b4a33d532996cb793bd SHA512 0df49e479e551648519ea4db0986584463eed498f77b133bd0e517389e71f4ff4069f1a5017c39f349bae62baa2ac32d968048c396261a9045ff00a0e5aa8bf4
+AUX depgraph.py-fix-no-ebuilds-binpkgs-message.patch 1690 BLAKE2B 225d42fd148c50d244503ba2039daa02a2fd05aa9bb339d21d4b204786d10379e44d491aa8016eacc079103943ee32c0cef74a7f72de7a84520347f80ca03a4b SHA512 0587687db2be3fa70fcf05ec3171d979492c3c986b0e1050ff3dd4dca6e92ef372c70cfe2d088e854e85cddc285129e38e082c92daac358f94971b8d61ec0d26
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
 AUX portage-tmpdir.conf 76 BLAKE2B 79f35df57dbdcd461d94d558212261df7df54253d5205b40a0a0640ce2a7ae553a84d7aa8d8c11a776cac44b7573b842951ec11f8ab393145edb1786d6837e79 SHA512 4810d8ae1f8291d34b756897972841d30d5f50b48597a430cb8ddb102dab07a7f0d78c3901b6fdd6763180e92b5ae90a3cb88ae5a5c1cae845b23b49d03a87fd
 DIST portage-3.0.44.tar.bz2 1140911 BLAKE2B 06f584e6e37bbb309b9bb0e29ba4381eadd4ae6246aeb1045e3a5c5dcb33d74f74e74aa3f2325acbf37e16a535095c433f2796ed042f73cea5e208150e210cb0 SHA512 d40c95f3a31c5e2ae35374243c40c8d1f6b47b7c89f6a711a12d8744cb6848a85443298c0f947475b32acf52332e7f09b1e85915149ab8363930c0404f08410e
@@ -11,7 +12,7 @@ EBUILD portage-3.0.44-r1.ebuild 9185 BLAKE2B d1477b9433d5d369f10b4332293c0686be6
 EBUILD portage-3.0.45.3-r2.ebuild 9026 BLAKE2B aaba365eaafaffb9dd2d8a66c41fa51c9f5cd7c462fb52f6c77ebc5401361e0875e5696ccea13a647189c53765842f019e255ce14bbb8290f4f8e2ca45a2b051 SHA512 07c1d7ebe215da5031e1f7d6a926e31387d31d3e8ee59fb0a4e86bde8c06b0f6b698ac885c7acc18db1461859c84055b2e8b9a21af36ddbe4692db920e62b377
 EBUILD portage-3.0.46.ebuild 9028 BLAKE2B 45cc1c243acdcd59535c2b0ae9f0ab94719f5892d9d15574b1f19cd849b26b01c8ade885a219d270aec61c9973bb39c05c82f61988bf414c972e2a696c9ec6a5 SHA512 daa29ed42c599011e6b93e765a97bc55262acffd01dccc3c681a4e2fcd5eefd1aa173024221e71e6d8cb463f024b71c7bb276632cd5a7a58a3a2d470124899d3
 EBUILD portage-3.0.47-r1.ebuild 9272 BLAKE2B 5cfd00aa50d078fe299c5cf244064ddf63e9b31a713d96a515c6dac9efd4b2e9964630de983a1707831ef06df49286ea123b9c4dd6503162bb107202f60e71c4 SHA512 3914720ad172677040d9016783145c325ae2504df00180811bcb0418ca983f3c843e57d08ef76d749cddaea4a491e4b95148a62ac85de625a33e083b5289f4c1
-EBUILD portage-3.0.48.1-r1.ebuild 9269 BLAKE2B d4dd70f72286c3ca9ed910daa052c7eaaa7e391aa7a19b7b92535fff570c0e973e4d46c363d076569aa4617019fc942844ab008368c21cf624df0b5ffa30d1f9 SHA512 2767d6091fe1aa7f8c9df1c724193ed66897310c06e9e836d2ef8dd6be54344022b3ebba60235885d9be534e0998e01a24a395a7604abed0273876b372c4ae3b
-EBUILD portage-3.0.49.ebuild 9267 BLAKE2B 4da728bc5e89ed5dbfc4dd034ed0c2da34eefe85f7beac1ac8d8f55c041b6cc4c2bf3839127072db1d79f003ed67fe5fa5bcf7a7da03a05cdb59fab40d1db072 SHA512 51324b1b8e98a50495b37b2da7809fe08448bf29ed8a2dcc77ba820eb970fe85211596ac9fa4aa78108166cb398545c24cd0711a800cfd1622dffe7b8e9adfa5
+EBUILD portage-3.0.48.1-r2.ebuild 9403 BLAKE2B a4df81d1c9e37bab4233bc81950311e2a6a63d128c01b7bf31ad67e26540e5511cd24ecd10694abd7f66a3f5d25a55f14f831237aee8d3386645af36ced1cf5f SHA512 7585547ae3b2c15b65e9a728305775fd5f1dd5109c1a4cd906128c4c74c863aae57e6fefe6363374778c68d380dbae7cb67ac843bf21083fb0c11ade0f78a878
+EBUILD portage-3.0.49-r1.ebuild 9400 BLAKE2B 8a29b5903d236f0954f21427c72d044c6a7ad4abccfc6acaf99b00ec90f50ab77460d0a4b8b672d85a924112fd1eb4abb764dcb88ee6db2727069b0bd22da890 SHA512 7aad4ec72e5d4b48e11c677e9d00225d4c0b8e7e2d08d77d818e3312e04cf126ca64a4f731163ff53e4aae64af8b026c3effc203e0dec9225fffc99726ed2f45
 EBUILD portage-9999.ebuild 9206 BLAKE2B dbd2078ae019d8047d4246dff0c5f74ed9efbd5409a48bccb34c2e3b8198c53b29237ab1978f2b2b4a65cd51e1b70f6b6c65cdb86c754d578409d52d300b63d1 SHA512 718d004ad310227b92c7cb3956e2c9359ba6974cf99b33a0d9266c3647aed3314e92a3731108bc3ed22299163b9b4c0561401ae124e4c562da066368c69ff2c0
 MISC metadata.xml 1539 BLAKE2B 0efa1ae365449d6593909046c32158a9f6755aa9252c34ae00eb866dd29a0b6a5c2e7a4af9293d0f87c4dd9231132fc5361acb0818fb6beff6dd6fbbdc6f409b SHA512 675f5baa1b3079592e3930b11ca18f324e27c42b5515f9ae815a26e53a465640fa6e9c4069df0e2121932b9f1cc73f2c9469c1529728f3c5ed5c3e687743ac0d
diff --git a/sys-apps/portage/files/depgraph.py-fix-no-ebuilds-binpkgs-message.patch b/sys-apps/portage/files/depgraph.py-fix-no-ebuilds-binpkgs-message.patch
new file mode 100644
index 000000000000..97cff72cd85c
--- /dev/null
+++ b/sys-apps/portage/files/depgraph.py-fix-no-ebuilds-binpkgs-message.patch
@@ -0,0 +1,43 @@
+From b199d0307b47f9fb06dbe533d7e24926a561c238 Mon Sep 17 00:00:00 2001
+From: Oskari Pirhonen <xxc3ncoredxx@gmail.com>
+Date: Sun, 9 Jul 2023 00:08:27 -0500
+Subject: [PATCH] depgraph.py: fix "no ebuilds/binpkgs" message
+
+The "there are no binary packages to satisfy" was being unconditionally
+output for packages that could not be found. Fix the logic for choosing
+between the "binary packages" and "ebuilds" form of the message.
+
+This is a temporary stopgap as alluded to by me in the bug, but the
+tl;dr is that some entries in the `myopts` dict have "y"/"n" values
+whereas some are True/unset, and this discrepancy should be sorted out.
+
+[sam: Add NEWS and Fixes, although the change in that commit _shouldn't_
+have been wrong, it is because of a quirk for now...]
+
+[oskari: remove NEWS for backport]
+
+Bug: https://bugs.gentoo.org/909853
+Signed-off-by: Oskari Pirhonen <xxc3ncoredxx@gmail.com>
+Closes: https://github.com/gentoo/portage/pull/1065
+Fixes: 0b21a5a392bd84c07b94373991f59108fbe98516
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ lib/_emerge/depgraph.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/_emerge/depgraph.py b/lib/_emerge/depgraph.py
+index a36ab6351..1aeae6257 100644
+--- a/lib/_emerge/depgraph.py
++++ b/lib/_emerge/depgraph.py
+@@ -6456,7 +6456,7 @@ class depgraph:
+                     cp_exists = True
+                     break
+ 
+-            if self._frozen_config.myopts.get("--usepkgonly", "y"):
++            if self._frozen_config.myopts.get("--usepkgonly", False):
+                 writemsg(
+                     f"\nemerge: there are no binary packages to satisfy {green(xinfo)}.\n",
+                     noiselevel=-1,
+-- 
+2.41.0
+
diff --git a/sys-apps/portage/portage-3.0.48.1-r1.ebuild b/sys-apps/portage/portage-3.0.48.1-r2.ebuild
index 9e5f7353bb48..d86dba628ab6 100644
--- a/sys-apps/portage/portage-3.0.48.1-r1.ebuild
+++ b/sys-apps/portage/portage-3.0.48.1-r2.ebuild
@@ -93,6 +93,11 @@ PDEPEND="
 	)
 "
 
+# message patch used in 3.0.48.1 and 3.0.49 (bug 909853)
+PATCHES=(
+	"${FILESDIR}/depgraph.py-fix-no-ebuilds-binpkgs-message.patch"
+)
+
 distutils_enable_tests pytest
 
 pkg_pretend() {
diff --git a/sys-apps/portage/portage-3.0.49.ebuild b/sys-apps/portage/portage-3.0.49-r1.ebuild
index f4767cd601e3..0108022357f3 100644
--- a/sys-apps/portage/portage-3.0.49.ebuild
+++ b/sys-apps/portage/portage-3.0.49-r1.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="GPL-2"
@@ -93,6 +93,11 @@ PDEPEND="
 	)
 "
 
+# message patch used in 3.0.48.1 and 3.0.49 (bug 909853)
+PATCHES=(
+	"${FILESDIR}/depgraph.py-fix-no-ebuilds-binpkgs-message.patch"
+)
+
 distutils_enable_tests pytest
 
 pkg_pretend() {
diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index 2665828dfa8b..97309dbdd3d6 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -1,7 +1,5 @@
 DIST s6-linux-init-1.1.0.0.tar.gz 58588 BLAKE2B c2560a8decdf0ce1570391f1c6915d2368cf2457f30c8432501121f6bd78752f51bfa00d799d5ec0dbfe09addc6bc3822e723261f5db67558f7f111bd0f3df16 SHA512 4d96a7e9786c085445970290bdb77d763b912f8405fa2ca5ccd01c31e18bee67ca4b420f222a7ea599376a9ab4a89269cb7756ef15138b191168bfd01366c3a6
-DIST s6-linux-init-1.1.1.0.tar.gz 59928 BLAKE2B b5498aafa44cc10a66a1ab591d0db8b0321f0371b51fb199224aa26257b3809ea693c18d6fd945a283f545af72b3910073560f6356a8d9b0c30a691c0cbeea28 SHA512 7c403bbf06658a754d255cb4ab24aaae408bad0bc2d022881e98fafe7f78689216a634c6689b6d2a84d43c73bc9f45ad19ad01dad03cc780ecddfa950aa6a8eb
 DIST s6-linux-init-1.1.1.1.tar.gz 59951 BLAKE2B a906f58f9bef56d6bf0299d23e0fcf6c9a9e2b9c87d8ca5a7b5e3880445983589ab5ded18486e71dbea6778a94c39ae33378639c17f5988d1cb39121c80b0566 SHA512 7f8b81d7fd975c948676c7dad9c1824d304fde58ae660e0bc3256904d8cc53a3fa507428bfbafffcbdb5108b526cfd8d4ba1f2349b3dcf52acd31773ecc770ca
 EBUILD s6-linux-init-1.1.0.0.ebuild 1637 BLAKE2B 4d35a2508f4e5aab6e40e2e2d2426f49d927afb5c8b1cac782585559b4e960a8b9cc3028d54c678c6583295e515c741a7d90e27a472d01570cb9a80b9d8c881e SHA512 ac7d33bd71887fc8402234fbf96fd2fd7811ce9bccf8221dd1b8f30f4bcaa8ed9cd581f354dc85db3b1a5e013aa113863c8ef7195b637f28819951fb1edd6f05
-EBUILD s6-linux-init-1.1.1.0.ebuild 1638 BLAKE2B ff3a7269815cb3aa9978942ea18d609bebd002b5cbff1e5abbad229bbc9f191fe2a07dcea612259bc78284365c4ee8f7df36159b1ed4e59a871c48e61e4e8df9 SHA512 b0bbabe29f5f3cfeabdc3f6450c5590072efb60c35c20803cc8f365213de602685e758065048d37fbba17c063b4f02bb30b846b687076911909c3d5cc3346498
 EBUILD s6-linux-init-1.1.1.1.ebuild 1638 BLAKE2B ff3a7269815cb3aa9978942ea18d609bebd002b5cbff1e5abbad229bbc9f191fe2a07dcea612259bc78284365c4ee8f7df36159b1ed4e59a871c48e61e4e8df9 SHA512 b0bbabe29f5f3cfeabdc3f6450c5590072efb60c35c20803cc8f365213de602685e758065048d37fbba17c063b4f02bb30b846b687076911909c3d5cc3346498
 MISC metadata.xml 762 BLAKE2B 57da7dfce946e1566ada1e25b90a5746cf60e5bfc1fb1aa1e3d0f24b5afb8475a1261dba37dbe5e256215c5e2477c1dc415872f9af1e66b08712be59f69e2b3f SHA512 6d1b096d6996c091bbadbea038fdcde9c8c20f7fa44df5355ab46e3d7b80ef0c3e8609dbf326400a0969e42f03300742887c15c6cc2edc5e6a27d35e5ab79a90
diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.1.1.0.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.1.1.0.ebuild
deleted file mode 100644
index 73485c0fdbd4..000000000000
--- a/sys-apps/s6-linux-init/s6-linux-init-1.1.1.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Generates an init binary for s6-based init systems"
-HOMEPAGE="https://www.skarnet.org/software/s6-linux-init/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm x86"
-IUSE="+sysv-utils"
-
-RDEPEND="
-	dev-lang/execline:=
-	>=dev-libs/skalibs-2.13.0.0:=
-	sys-apps/s6:=[execline]
-	sysv-utils? (
-		!sys-apps/openrc[sysv-utils(-)]
-		!sys-apps/systemd[sysv-utils]
-		!sys-apps/sysvinit
-	)
-"
-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)"
-		--skeldir=/etc/s6-linux-init/skel
-		--libdir="/usr/$(get_libdir)/${PN}"
-		--libexecdir=/lib/s6
-		--with-dynlib="/$(get_libdir)"
-		--with-lib="/usr/$(get_libdir)/s6"
-		--with-lib="/usr/$(get_libdir)/skalibs"
-		--with-sysdeps="/usr/$(get_libdir)/skalibs"
-		--enable-shared
-		--disable-allstatic
-		--disable-static
-		--disable-static-libc
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	if use sysv-utils ; then
-		"${D}/bin/s6-linux-init-maker" -f "${D}/etc/s6-linux-init/skel" "${T}/dir" || die
-		into /
-		dosbin "${T}/dir/bin"/{halt,poweroff,reboot,shutdown,telinit}
-	fi
-}
-
-pkg_postinst() {
-	einfo "Read ${EROOT}/usr/share/doc/${PF}/html/quickstart.html"
-	einfo "for usage instructions."
-}
diff --git a/sys-apps/s6-linux-utils/Manifest b/sys-apps/s6-linux-utils/Manifest
index 5fd25334f0f9..64dae88b8bb5 100644
--- a/sys-apps/s6-linux-utils/Manifest
+++ b/sys-apps/s6-linux-utils/Manifest
@@ -1,5 +1,3 @@
-DIST s6-linux-utils-2.6.1.1.tar.gz 42836 BLAKE2B 7651427c7ac452db66f20a7c01eaa1f559a9fa6c2478c758bcd47d0d398b6747756d7584c890c810c69719223cd3d76b9d441ae8c4980008c83f893687e32955 SHA512 da392c6ce698d0a59a6191c71e5c4ad80e9b15056aaf4791ce47601027bed58d5371be5bc31798fd29b42fbad4113ffa5faac0ff99dc0e3c160397aabc903a59
 DIST s6-linux-utils-2.6.1.2.tar.gz 42886 BLAKE2B 8c25472c0c1d9c47fef2d210fa1d4ab17bba7e8da10a2b8374572dcc4a258f72c87212c70bd6c8151d7612d3fdb7233fc033f382cdb93b6dc4b5c74870ff5159 SHA512 7afb268719410e93c711d20532118d6dcc338ebdf9a12c18ba794e1a23acb9ed264133838e89cc0e26fbed1bfacb0d2eb20efc9dc9bddffa0a74f9bc2c17cdb7
-EBUILD s6-linux-utils-2.6.1.1.ebuild 987 BLAKE2B 81eada21d56c4ec744f4fa5516b27b7563d04652739642d68e4388ece92d53a5ecfa4146f8f1f8de0772cfb6b32f841266cdba5fb2f58d098e79c07586fce7bd SHA512 3c99192ff3748caa924e3f3cc44be9d268919d644cbb96f89ca556c521ded1afbe0acc2b23aef60f31a875ed6612d4c3595526ea1a69dc8cedfd97e4893d2e7d
-EBUILD s6-linux-utils-2.6.1.2.ebuild 988 BLAKE2B 43b549b21652a885e3750caf964fbd7b7d93ad2fc8f9b83986899b79b6c9d5911f8beb4d26277f514794dfbd826aa39729ed177e41d1af5ddafbfe8d133fc993 SHA512 d96576b722aa134e100b59d0470d7522cf4532a990275e6f386740792d658b28acbd5e7fba9624cb8ef3db330ba477e797b6a2d69f235d9bcc6356b0606f1eb6
+EBUILD s6-linux-utils-2.6.1.2.ebuild 987 BLAKE2B 81eada21d56c4ec744f4fa5516b27b7563d04652739642d68e4388ece92d53a5ecfa4146f8f1f8de0772cfb6b32f841266cdba5fb2f58d098e79c07586fce7bd SHA512 3c99192ff3748caa924e3f3cc44be9d268919d644cbb96f89ca556c521ded1afbe0acc2b23aef60f31a875ed6612d4c3595526ea1a69dc8cedfd97e4893d2e7d
 MISC metadata.xml 624 BLAKE2B 6bb21b1df5c53a8811ff8a98d86fc5c12343ea057c772ec1f287d38b9ae50a0e758179f7f17ba6f3b243853e0ede843b424803d46a47c4cf359f2026c8305e05 SHA512 6848575ab57d2e24f8efcd0d30e8226574098c4c01d751ed7a9a307a029fb5c6812ddece36c7f8c296c933f0e2fab4ded376bb1d9f6132803ceba0fb3ce70f07
diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.1.ebuild b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.1.ebuild
deleted file mode 100644
index 9fd0c86a78b0..000000000000
--- a/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Set of tiny linux utilities"
-HOMEPAGE="https://www.skarnet.org/software/s6-linux-utils/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86"
-
-RDEPEND=">=dev-libs/skalibs-2.13.0.0:="
-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}"
-		--with-dynlib="/$(get_libdir)"
-		--with-lib="/usr/$(get_libdir)/skalibs"
-		--with-sysdeps="/usr/$(get_libdir)/skalibs"
-		--disable-allstatic
-		--disable-static
-		--disable-static-libc
-	)
-
-	econf "${myconf[@]}"
-}
diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.2.ebuild b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.2.ebuild
index ba5d70f74e27..9fd0c86a78b0 100644
--- a/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.2.ebuild
+++ b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 arm ~arm64 x86"
 
 RDEPEND=">=dev-libs/skalibs-2.13.0.0:="
 DEPEND="${RDEPEND}"
diff --git a/sys-apps/s6-portable-utils/Manifest b/sys-apps/s6-portable-utils/Manifest
index 5bc24a67c564..1b49070dfd37 100644
--- a/sys-apps/s6-portable-utils/Manifest
+++ b/sys-apps/s6-portable-utils/Manifest
@@ -1,5 +1,3 @@
-DIST s6-portable-utils-2.3.0.1.tar.gz 51746 BLAKE2B 50190c7c55a4e5d79a55a7a9edfa948931ecce3f6e33d2f95113a8e8ea3a5587dfcf7a98b54236eb66488976044d0b319ce0a45c0eb3a1b7399be299bab711fc SHA512 46f4a09d124e44b9b2ac3b8fa8f7b4492207f0a03a052e7b15309aeea175682f7366ff74fbd8a2732952c8f3bbb2fcc69b4bca89609b690e91d167bd25c16b90
 DIST s6-portable-utils-2.3.0.2.tar.gz 51106 BLAKE2B a7c55fb99f8d2e46343c14169cd63c5054b5869e1cd2b5cc4b158e1f47035d956aba8faa0cceed3c39dba43945bdac44d9fe3b7ef5edae184c85d9e9e33f7215 SHA512 f918244e8ed5957817d28fc43ae2cdcbbdce600dc208bc0422e262ce42f36d8e8b77002c2143e7741390eea52e9c4bae7a1358c23ebbba3c689c64c7115d4b72
-EBUILD s6-portable-utils-2.3.0.1.ebuild 991 BLAKE2B 1c1a54d8c39cedb3fec4f5efa2f6c4678b60cc35a28711af211e35dedb9705b5d01a6b2b332766c09e4af62906e66382789cb44f3c5cf7142794d0b4bfaf943b SHA512 fcbaabaa168f0d8097f194fb434ce3f993b761c3d66af73caa6eb6c625e23e503f50ae10c807153b274fa5ad8a3823fd5b2bedbfab3108d3701ea2e05c8babab
-EBUILD s6-portable-utils-2.3.0.2.ebuild 992 BLAKE2B 9eb7471f6393864358cc0a880b23b77f943a5f303465495295f01a6756bca24dcf3c0f07e43292fa4e11a19786c3265fdb8d7fd76ad2696d2ed0261bc78b14aa SHA512 110fd161d8efe8184c37f371b8a9e689e399b2415fbaac0649a0e6bc3597f3245e6095d02abe4a62b71a5ed573bed197c4d4c6578c56f06dd0b73b09c85d8f1b
+EBUILD s6-portable-utils-2.3.0.2.ebuild 991 BLAKE2B 1c1a54d8c39cedb3fec4f5efa2f6c4678b60cc35a28711af211e35dedb9705b5d01a6b2b332766c09e4af62906e66382789cb44f3c5cf7142794d0b4bfaf943b SHA512 fcbaabaa168f0d8097f194fb434ce3f993b761c3d66af73caa6eb6c625e23e503f50ae10c807153b274fa5ad8a3823fd5b2bedbfab3108d3701ea2e05c8babab
 MISC metadata.xml 624 BLAKE2B 6bb21b1df5c53a8811ff8a98d86fc5c12343ea057c772ec1f287d38b9ae50a0e758179f7f17ba6f3b243853e0ede843b424803d46a47c4cf359f2026c8305e05 SHA512 6848575ab57d2e24f8efcd0d30e8226574098c4c01d751ed7a9a307a029fb5c6812ddece36c7f8c296c933f0e2fab4ded376bb1d9f6132803ceba0fb3ce70f07
diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.1.ebuild b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.1.ebuild
deleted file mode 100644
index 820e3f643603..000000000000
--- a/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Set of tiny portable unix utilities"
-HOMEPAGE="https://www.skarnet.org/software/s6-portable-utils/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-
-RDEPEND=">=dev-libs/skalibs-2.13.0.0:="
-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}"
-		--with-dynlib="/$(get_libdir)"
-		--with-lib="/usr/$(get_libdir)/skalibs"
-		--with-sysdeps="/usr/$(get_libdir)/skalibs"
-		--disable-allstatic
-		--disable-static
-		--disable-static-libc
-	)
-
-	econf "${myconf[@]}"
-}
diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.2.ebuild b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.2.ebuild
index 36d808ebf75e..820e3f643603 100644
--- a/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.2.ebuild
+++ b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 arm x86"
 
 RDEPEND=">=dev-libs/skalibs-2.13.0.0:="
 DEPEND="${RDEPEND}"
diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index 193e65a57507..6c8ff58c97cf 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -1,5 +1,3 @@
-DIST s6-2.11.3.0.tar.gz 247736 BLAKE2B a409e2f759e7096fa95c4cc60294b89b7625a712b95901fc3336d6c14af007a0a603db1f43db9a5e379657af3f2b0f4a995897a519346ee8a61e63ad5519fd19 SHA512 764981bb54c6add6bff7c77b41c6c61055fd8b9ba284c7b41e13e4103c8d5a3dddd442145d8eb572e5be6883ab6a9e3025c064d946e8e273e956d404528c5479
 DIST s6-2.11.3.2.tar.gz 247882 BLAKE2B 67de13e967502f159b6ebc1a4727f16a123ae9a88e1441d30100a952da7b9c2acd53b417d1b4760be9e4082856c30447b9a2f7b60e46e92531ebe0cd20fb7c22 SHA512 fe87c7984905b3eb35d7c91a3f0b6ece5cb0eb2c6d16ea7725655f118c464cf017e10b6ed82b3b12b6deb331538fc5d20afea7f34ff98b85d4c437b09e07371a
-EBUILD s6-2.11.3.0.ebuild 1184 BLAKE2B 3a7f6160c952ec46c2645fcdd3357ede7700cc04d45b004785874b3e0f75486c77fe43bbc2e86005f167a1180c5b8b28cdbc8ed3aded60b3c2abad17d7a47244 SHA512 7b6e50b8d659363e2bf44e56ffce6c2db3d23f12ad2ad96ae299f0b0f52bac261fddb685d272853bf94efecc407874c1d84d780c9ee3dd522f367f0cc6d756bb
-EBUILD s6-2.11.3.2.ebuild 1185 BLAKE2B fcbc621a63147bfcfac3ecf4d5ef2c26d56ae4ac4633919d30da94cb2ba9292707507a9931168a95ddcce93eb8cb2e84b018915bd9c9398ea208ee96525ab279 SHA512 828a26049002e24cf1521acaa20753e377ae427da7917c3353fd1f8f20761425d4dae59de309ad71ba179a736bb62343c1c30b82a64e3d5e44e75ab9c05f5ad0
+EBUILD s6-2.11.3.2.ebuild 1184 BLAKE2B 3a7f6160c952ec46c2645fcdd3357ede7700cc04d45b004785874b3e0f75486c77fe43bbc2e86005f167a1180c5b8b28cdbc8ed3aded60b3c2abad17d7a47244 SHA512 7b6e50b8d659363e2bf44e56ffce6c2db3d23f12ad2ad96ae299f0b0f52bac261fddb685d272853bf94efecc407874c1d84d780c9ee3dd522f367f0cc6d756bb
 MISC metadata.xml 883 BLAKE2B 9a3dfebf852c277dade51f8f3caa46863c8d0466c7371f70ebe4530818d33c9c3656011c1f45c68c26badd9ab396baa3336b017c6937763fd5de64fcf8da554d SHA512 09e18443d718af2ef9515efb8df03af309ba46c72022322a44c14f99152e0c5d7463c9c23a1ad3756fa40bc6345626999e388201259e943484f26303767b901f
diff --git a/sys-apps/s6/s6-2.11.3.0.ebuild b/sys-apps/s6/s6-2.11.3.0.ebuild
deleted file mode 100644
index d38aa94a0fd2..000000000000
--- a/sys-apps/s6/s6-2.11.3.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit 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="amd64 arm ~riscv x86"
-IUSE="+execline"
-
-RDEPEND="
-	>=dev-libs/skalibs-2.13.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[@]}"
-}
diff --git a/sys-apps/s6/s6-2.11.3.2.ebuild b/sys-apps/s6/s6-2.11.3.2.ebuild
index 7edd95a7f70b..d38aa94a0fd2 100644
--- a/sys-apps/s6/s6-2.11.3.2.ebuild
+++ b/sys-apps/s6/s6-2.11.3.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~riscv x86"
+KEYWORDS="amd64 arm ~riscv x86"
 IUSE="+execline"
 
 RDEPEND="