gentoo auto-resync : 15:06:2024 - 00:09:17

14 files changed, 147 insertions, 118 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 191c1e26e0fe..0ab8ea7b9a2a 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/edid-decode/Manifest b/sys-apps/edid-decode/Manifest
index 9ffa5003e5f5..b0788bab59bd 100644
--- a/sys-apps/edid-decode/Manifest
+++ b/sys-apps/edid-decode/Manifest
@@ -1,6 +1,6 @@
 DIST edid-decode-0_pre20220319.tar.gz 135715 BLAKE2B 3ca70f7147463ec586d9b28e4e68327c5b2e8075dcf6f57f0be40288f87a4b498998654333321b3d3ca7e7d38926befc53094250b2953cd2b33b686f5cd878cc SHA512 5f3f285b898ae1a47abf06e787e097c8aebb558e3efbc6e80bdd4ed5505ea4f59f723d5a0a820bbc0c575d25f686f03aa33fe424e1b3a1b2c1be1ef13b6508c2
 DIST edid-decode-0_pre20230131.tar.gz 147392 BLAKE2B 8a08ca44bbdb61b0264a24b911b082d264eb1ef281d98a93dc12d62f5d233cc898cf1ad06647e680f8ab49b047721f31c80572582a2dd5dc8fec93ff70227b03 SHA512 53619eb79e456d4bf3566506019ad77a8f8dacb4211106cdf21164c26d0d026383bedd8a8ba2a7050d4d0657e1bbca51fb89978cfd066f1130f888a4537dd19b
 EBUILD edid-decode-0_pre20220319.ebuild 676 BLAKE2B 24b12550cea4f8bdc2d24aeca29eea88fc6311c833f23d8bf2d484e1338f9534dc2fde388deb4343f52c74d69e137681accef07981bdb54d81e6d222cd4b5cb3 SHA512 b8e6fc02163f9f1e6b921051211e299d18c8ad1f9046a726856d263b2fb8073ee8bffbe6357106b21a60130ee30454b6d0d7f4d2f7221219fc5e2149a56ce745
-EBUILD edid-decode-0_pre20230131.ebuild 699 BLAKE2B ae87b55ea2f4520bfccc34d64ab174071f27df519db87063cf9f2269c2d48ffd07d6e034c6c27178c0689886ded72c670a3179577e81d1b1edafc48bd73ae983 SHA512 86c8e3d44774c013358f70064a24399af10656f591c249d3cfe1c3fd72ca76bb37e72541392a6fed0c11d852c5f322b20f04eccad098a37cd66d16cec3f906d2
+EBUILD edid-decode-0_pre20230131.ebuild 704 BLAKE2B 84ac233c7b5242fcbeb3ede2834bfdec862a185c23e6816bb079dc708f571c50a3490b89a68a9d8bf9e23ffeea78214a8355a20b0e49377b6b1015372f7232d8 SHA512 cbc3cab73be482a3acc6fdc15b5405352fccf5fac1f0470845f18a2d08401480e638e44324ccd532d352c75033c76e1156378b6e0214e92b46f3e22ac8def150
 EBUILD edid-decode-9999.ebuild 550 BLAKE2B 775a90997efcdbe276451be45fb7533e5132864ec6bebf44172d708c328e0acb9ecb58c66e6402642c0b3dc7a8da71715b8592f4e86975f8c538946cdf53cd21 SHA512 0fcd19bdb9b1bfb54db0140b96efdbd6058648c2dc663f617a9823e453255844a377dbff3ddbe98557ca514ed0ee4d54cbb68f5859d1a060d5f5202a86c25c5f
 MISC metadata.xml 647 BLAKE2B 42d8d41db31a4748f5ffad976c0ad35ff483073c286236d77f3c6fc91e854844e519bc8d4761a02880e116faca88c43c16bea37c008719c8adb8f55f4226ac83 SHA512 c7c46f576fd17b42a06a6b241d3a5b6f5dfb9597e824f00ff311feba48a587ecd821285ecc3fb46d3533b6bdd352b34a69ec8886e0e7e8da38dbd29055effbad
diff --git a/sys-apps/edid-decode/edid-decode-0_pre20230131.ebuild b/sys-apps/edid-decode/edid-decode-0_pre20230131.ebuild
index ab504c4b4a5a..e775c7987721 100644
--- a/sys-apps/edid-decode/edid-decode-0_pre20230131.ebuild
+++ b/sys-apps/edid-decode/edid-decode-0_pre20230131.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://git.linuxtv.org/edid-decode.git/"
 SRC_URI="https://dev.gentoo.org/~conikost/distfiles/${P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
-KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
 LICENSE="MIT"
 SLOT="0"
 IUSE="examples"
diff --git a/sys-apps/polychromatic/Manifest b/sys-apps/polychromatic/Manifest
index d2b5e24b96b5..0eaf5295ecf6 100644
--- a/sys-apps/polychromatic/Manifest
+++ b/sys-apps/polychromatic/Manifest
@@ -3,6 +3,6 @@ DIST polychromatic-0.9.0.tar.gz 1776527 BLAKE2B 20129aad108f362d6efff4ad8e4e3b6e
 DIST polychromatic-0.9.1.tar.gz 1786276 BLAKE2B 46865d85aefa99ebc06ea145fe3afd3e4388d94529b8835ff4c4990d241031ee069801c7183ef89c811bde170a2211583dae7bb5bde8b3d65ebdf04421cef349 SHA512 def2d488fb52091ecddea5f11bf066efec5caf43b2c53f3b1a63d6de59c4ca9b62eb5da84faa08581050dbcc8ebcb98681b6d5c4376d04699a736d7122b79cb3
 EBUILD polychromatic-0.8.3-r1.ebuild 1905 BLAKE2B 149506c4c5bcb6df832d39c2dc482328fe1ecadcd38b52119b19ba25149653449beac38e5acee7afab8f9e0f49137184c461d3891e8cd85b6360525b5830985b SHA512 196b59767cae6c8fb8068422eb4929af1f8b2114c04b72b5788494224d3436b48c180f32f964e81a0975e52f18f6a09b0e15540d80bd89097749927afdcf9665
 EBUILD polychromatic-0.9.0.ebuild 1912 BLAKE2B f4f767a988f30d9e192b4660913434e1ba1c4e6021af2605f128c931df14512575dba9e7ab1d42f4485fa4f8418932d23a1143558b37c5ca719fda54b2ff2b00 SHA512 4f4001098bff43f5cc9c63672c51c339272ef4e524099f227f8b7438a50cb7c1166b580c1bb96664910406ceb593b3b7c80894fe418624cd76cae41c3f8f4a4a
-EBUILD polychromatic-0.9.1.ebuild 1912 BLAKE2B f4f767a988f30d9e192b4660913434e1ba1c4e6021af2605f128c931df14512575dba9e7ab1d42f4485fa4f8418932d23a1143558b37c5ca719fda54b2ff2b00 SHA512 4f4001098bff43f5cc9c63672c51c339272ef4e524099f227f8b7438a50cb7c1166b580c1bb96664910406ceb593b3b7c80894fe418624cd76cae41c3f8f4a4a
-EBUILD polychromatic-9999.ebuild 1912 BLAKE2B f4f767a988f30d9e192b4660913434e1ba1c4e6021af2605f128c931df14512575dba9e7ab1d42f4485fa4f8418932d23a1143558b37c5ca719fda54b2ff2b00 SHA512 4f4001098bff43f5cc9c63672c51c339272ef4e524099f227f8b7438a50cb7c1166b580c1bb96664910406ceb593b3b7c80894fe418624cd76cae41c3f8f4a4a
+EBUILD polychromatic-0.9.1.ebuild 2071 BLAKE2B 47b2a3c11b2a524e23fe7afd494d1708c15679997197960011617ddbd94adc3dc58140561a6de759d0d333430a83046d1db0d9cf6e3366632fd407fe0ec8b2b3 SHA512 e8dff2dec0a6f4ddb5b70a0717cbf30ecf0c9da428ef28396713770b2ae0895c3483b733cc6b1d033d184959a9e8194c76ea127227edcf9eeeb85737ceeb6bc4
+EBUILD polychromatic-9999.ebuild 2071 BLAKE2B 47b2a3c11b2a524e23fe7afd494d1708c15679997197960011617ddbd94adc3dc58140561a6de759d0d333430a83046d1db0d9cf6e3366632fd407fe0ec8b2b3 SHA512 e8dff2dec0a6f4ddb5b70a0717cbf30ecf0c9da428ef28396713770b2ae0895c3483b733cc6b1d033d184959a9e8194c76ea127227edcf9eeeb85737ceeb6bc4
 MISC metadata.xml 993 BLAKE2B 193ed9d7f922efa078e7856084b828ff4f97d8606a1979206b3ff4a36ddcc6ff88a1adc3d0d899261fef5ae5751a1204fb27a03b0a8ff7510578f431a89a0cd2 SHA512 245f395c90cfbe36dae2bc1da5f1c6d2513ebde78a44e7a785a4bb9c01cf24ea0be81405c82eb8f4fbc34d34a4990a36359e98658d1340e47172257a867aa8db
diff --git a/sys-apps/polychromatic/polychromatic-0.9.1.ebuild b/sys-apps/polychromatic/polychromatic-0.9.1.ebuild
index 19e9c50db521..17566f06c680 100644
--- a/sys-apps/polychromatic/polychromatic-0.9.1.ebuild
+++ b/sys-apps/polychromatic/polychromatic-0.9.1.ebuild
@@ -51,6 +51,12 @@ DOC_CONTENTS="To automatically start up Polychromatic on session login copy
 /usr/share/polychromatic/polychromatic-autostart.desktop file into Your user's
 ~/.config/autostart/ directory."
 
+src_test() {
+	rm -rf "locale" || die
+	ln -svf "${BUILD_DIR}/locale" "locale" || die
+	PYTHONPATH="tests:${PYTHONPATH}" "${EPYTHON}" "tests/runner.py" || die
+}
+
 src_install() {
 	meson_src_install
 	python_optimize
diff --git a/sys-apps/polychromatic/polychromatic-9999.ebuild b/sys-apps/polychromatic/polychromatic-9999.ebuild
index 19e9c50db521..17566f06c680 100644
--- a/sys-apps/polychromatic/polychromatic-9999.ebuild
+++ b/sys-apps/polychromatic/polychromatic-9999.ebuild
@@ -51,6 +51,12 @@ DOC_CONTENTS="To automatically start up Polychromatic on session login copy
 /usr/share/polychromatic/polychromatic-autostart.desktop file into Your user's
 ~/.config/autostart/ directory."
 
+src_test() {
+	rm -rf "locale" || die
+	ln -svf "${BUILD_DIR}/locale" "locale" || die
+	PYTHONPATH="tests:${PYTHONPATH}" "${EPYTHON}" "tests/runner.py" || die
+}
+
 src_install() {
 	meson_src_install
 	python_optimize
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index db473a0ccee2..ba40464d9a3c 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -11,5 +11,5 @@ EBUILD portage-3.0.61-r1.ebuild 6919 BLAKE2B 42d9b40cd255004ae6e3e59894071729616
 EBUILD portage-3.0.63-r1.ebuild 7011 BLAKE2B c4699c5b413f5071199b9a5a8a12e2ea4be8a72cac9ef08bc9a79254584175f98730080ad15d7ce42228f54a5172a1ef97440aa179f440f0b53142367baea905 SHA512 1fa6ca885f591aa34faa2fa39bc4502cd3793cfc4ed6f95eec40a56f056bbd91813d7182893c07a0b5a6e34ceb2283faa3b94ad13b2cc05477c5ab8d78e4ffe9
 EBUILD portage-3.0.64-r3.ebuild 6925 BLAKE2B c891b87805d71055af7b8356ba291256266bc7182e95986e08a770f9449a1a33497e57d53f35ab6e7103b4bd41ebbad4bb86500308a4fb9e16a0265f65f2b909 SHA512 c9bcddeb6d28610fbac860bb76ecf7c71a2189c567c2be785fdd87db25c9ebc432c594f0bb21c2b8d1c2ad1f8dbdbc17128b30f8d5056923ee4bc0cfbae9edcc
 EBUILD portage-3.0.65.ebuild 6790 BLAKE2B c0c4b0323ecf461cdd38831f8644944803b3c3cc653e11b7ed88ac4495f99ccf6fffc170d1bf41daffa60e5d8d262766a3e9641eac3f106f2dd866b6354722fd SHA512 73def9620f9e55157d298d89064cf7c7011ed0320fe1a2fb597b5ad74cf2ff2696a60ef1a89780883aecd98964bc559ed4d91d2d73f37082795885dc8181f169
-EBUILD portage-9999.ebuild 6790 BLAKE2B c18b8ceeb336a4c684403b02c3d7d8b3e9dc4847e900b8c9d41f10049d9b062a4f259e1cc1c11133569c56a1e9d858686ccbe5139ad9b47d3203baeb33fdd78b SHA512 fc18f3bc8c8751e4698a6cb9481cb93c5d0f9121e1fd0d51c7d6507e17ce1ad03edc2d92ad30d796db4b6ac3045105ac52f8680904e854a758c980ae185919d2
+EBUILD portage-9999.ebuild 6367 BLAKE2B 8bea0739e270057fe4f570683b837acd84ddc802a90d185656c12ddac6c21908d38417a2f801f763f539800df48fd89d66609d4f8e9019e2bc22420ce641f3df SHA512 9450eefc94bdc4ed06ca5ef3efc21fc04ef854d28aa271e3158855baedd1cb2aa66421ce9059429b10cb9cfe730d5ddaab9d202ffee30afb5d3079b59fbb9676
 MISC metadata.xml 1539 BLAKE2B 0efa1ae365449d6593909046c32158a9f6755aa9252c34ae00eb866dd29a0b6a5c2e7a4af9293d0f87c4dd9231132fc5361acb0818fb6beff6dd6fbbdc6f409b SHA512 675f5baa1b3079592e3930b11ca18f324e27c42b5515f9ae815a26e53a465640fa6e9c4069df0e2121932b9f1cc73f2c9469c1529728f3c5ed5c3e687743ac0d
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 56a051fcc8d0..3995572457bc 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -29,21 +29,10 @@ IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
 
-# setuptools is still needed as a workaround for Python 3.12+ for now.
-# https://github.com/mesonbuild/meson/issues/7702
-#
-# >=meson-1.2.1-r1 for bug #912051
 BDEPEND="
 	${PYTHON_DEPS}
 	>=app-arch/tar-1.27
-	>=dev-build/meson-1.2.1-r1
-	|| (
-		>=dev-build/meson-1.3.0-r1
-		<dev-build/meson-1.3.0
-	)
-	$(python_gen_cond_dep '
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	' python3_12)
+	>=dev-build/meson-1.3.0-r1
 	>=sys-apps/sed-4.0.5
 	sys-devel/patch
 	!build? ( $(python_gen_impl_dep 'ssl(+)') )
@@ -89,10 +78,6 @@ RDEPEND="
 	xattr? ( kernel_linux? (
 		>=sys-apps/install-xattr-0.3
 	) )
-	!<app-admin/logrotate-3.8.0
-	!<app-portage/gentoolkit-0.4.6
-	!<app-portage/repoman-2.3.10
-	!~app-portage/repoman-3.0.0
 "
 # coreutils-6.4 rdep is for date format in emerge-webrsync #164532
 # NOTE: FEATURES=installsources requires debugedit and rsync
diff --git a/sys-apps/razercfg/Manifest b/sys-apps/razercfg/Manifest
index d0d0fa913931..a7779d85b2ec 100644
--- a/sys-apps/razercfg/Manifest
+++ b/sys-apps/razercfg/Manifest
@@ -2,5 +2,4 @@ AUX razercfg-0.39-unit-variables.patch 712 BLAKE2B 2aeea04ea744bb6ed708d6d112802
 AUX razerd.init.d-r2 447 BLAKE2B ea72b6e9fa2f32ecede29e910f76f75a0de538c84271245eb8cf4f0715aa36c954e05cedb31c8af8a39b222c001bcdbd738ec5163c18eb58730b8868ae8da592 SHA512 8c9e307bd2a76086f9fa462f04019c9c840681232f1833292d4f64ed030ce83392cf039919f9f830abb4b61e0be65e2637c6bfdb7551291f68626c876ec92af1
 DIST razercfg-0.42.tar.xz 103300 BLAKE2B 83f9432edf4deda78514dd1e2a65e04981d3646c543ebf3b74060f5d6ee5f9c3ddec5b0c544c11c9968c790172ae2bd4d4503adaf1428ca31337fdcd33d8545c SHA512 3856f4133b620fb639a46a5bb02fe8e6c47ae3928a04fe9d1bbef2792a44fdd4f5dff2efa43a1e43d75312025d3c65c626e331e723092e4e0b8d6622657fb197
 EBUILD razercfg-0.42-r1.ebuild 2215 BLAKE2B 99c91338ccb23db55cead186ce65bf457d4c08e76d5b3eaf3301364b7788bcf0aa55b8c865c7f1ff5466fc8275827b1cf4d6fd9daf25ac99a623a45ab9f592e8 SHA512 5780af33b5af5212aba1d9cd6b9241824cc6bcb6dd02be091a07b30c63b8cd63071eddfbe4b65e6470e9a2a7c017b67c34fd06725ee2b929e2c227f2623dd474
-EBUILD razercfg-0.42.ebuild 2114 BLAKE2B 0a4f134474559139d9d79f4fb396e6c6cf53f86fcc9d55d65ab1515161e15fa52a216aa0958122f0412dd436f03a1b7e5ae7d9e9997154ebee637a6faacbf60a SHA512 79135054b84c439d2b28c3ea650bbf4fe5fa9f52a1e6296e2a797e16264843d4cf5b076bb8c1c566577131f51eebaf85ea645c7cf27eddb931e480c279b8572f
 MISC metadata.xml 809 BLAKE2B 5b46066b524415984e133f732d0802d7c32f90ce6e856e555bd0bd7cf1a02907e2777a9a1aba74829ec55917b342d01cae78e9f784e4f66ea28cbc2522d9639f SHA512 5f9a513fbe36af7f824fa5f99c8f5fb637cfd4cd3ea6e8cd28f18698986efa0fb8cf40fea7b89ec7c838c0173320d305caca2ebc02c2f285da858836a1503bf7
diff --git a/sys-apps/razercfg/razercfg-0.42.ebuild b/sys-apps/razercfg/razercfg-0.42.ebuild
deleted file mode 100644
index a7e7db3cb1d6..000000000000
--- a/sys-apps/razercfg/razercfg-0.42.ebuild
+++ /dev/null
@@ -1,96 +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 cmake python-single-r1 systemd tmpfiles udev xdg-utils
-
-DESCRIPTION="Utility for advanced configuration of Razer mice"
-HOMEPAGE="https://bues.ch/cms/hacking/razercfg.html https://github.com/mbuesch/razer"
-SRC_URI="https://bues.ch/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gui +udev"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	virtual/libusb:1
-"
-BDEPEND="virtual/pkgconfig"
-RDEPEND="${DEPEND}
-	gui? (
-		$(python_gen_cond_dep '
-			dev-python/PyQt5[${PYTHON_USEDEP}]
-		')
-	)
-	udev? ( virtual/udev )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-0.39-unit-variables.patch" )
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -i librazer/CMakeLists.txt \
-		-e '/ldconfig/{N;d}' \
-		-e "s:DESTINATION lib:DESTINATION $(get_libdir):" \
-		|| die
-
-	sed -i ui/razercfg.desktop.template \
-		-e '/^Categories=/s/=.*$/=Qt;Settings/' \
-		|| die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPYTHON="${PYTHON}"
-		-DSYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)"
-		-DUDEV_DIR="$(get_udevdir)"
-	)
-	RAZERCFG_PKG_BUILD=1 cmake_src_configure
-}
-
-src_install() {
-	RAZERCFG_PKG_BUILD=1 cmake_src_install
-
-	python_optimize
-
-	newinitd "${FILESDIR}"/razerd.init.d-r2 razerd
-	dodoc README.* HACKING.* razer.conf
-
-	if ! use gui; then
-		rm "${D}"/usr/bin/qrazercfg{,-applet} || die
-		rm -r "${D}"/usr/share/icons || die
-		rm -r "${D}"/usr/share/applications || die
-	fi
-
-	# sys-power/pm-utils is deprecated, so we delete related files
-	# (they contain a hook for resume from suspend)
-	# TODO: test resume from suspend
-	rm -r "${D}/etc/pm" || die
-}
-
-pkg_postinst() {
-	if use udev ; then
-		udevadm control --reload-rules
-		udevadm trigger --subsystem-match=usb
-	fi
-
-	xdg_icon_cache_update
-
-	tmpfiles_process razerd.conf
-
-	if [[ -e "${ROOT}/usr/bin/pyrazer.pyc" ]]; then
-		eerror "A stale ${ROOT}/usr/bin/pyrazer.pyc exists and will prevent"
-		eerror "the Python frontends from working until removed manually."
-	fi
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index 0c8e66d81b0b..b7aa4ddfa132 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -1,3 +1,5 @@
 DIST s6-rc-0.5.4.2.tar.gz 100896 BLAKE2B d9e6f580a32d27950c7c525a5b657b429616d1c937c71cee302939b847a58bae1d5e209f53113dc82b953b5aa14c6078b206566e4809902a8f06b17c5621205f SHA512 f04e94db957e6d0033e328cc63530f64c9db101815bcafdb00a23205f4e75039dd3e593f93d48e4d9877b0696ea734ca62f672d92ff31e4e07aa19d26d809443
+DIST s6-rc-0.5.4.3.tar.gz 101738 BLAKE2B fbf69bff42c999af063810fd92467de5357d9405dbb3767064ab1aa12bda1262f5622884a1d547ca4d2c03cb9714f0f53acc4389949c65f606780837dcd0ccf7 SHA512 7a54a32ea1261de79b9494adde74b50dbefce831f5a00f9d3772c9b64fd71918ce54a16dff828de0fb762633255226ca935357f9f31c4264716b7041a5f5f8bb
 EBUILD s6-rc-0.5.4.2.ebuild 1627 BLAKE2B 9b7f35d16fa9e955d310d9fe0ad39a1da58365709a624b325cfc94a391b5e6e3313aa8012d1a9a937f227c5e130751235c6ce3dab5252abf97623233f8b79c82 SHA512 86a5f5b1ef6aba4a10a7d6d01593eeb2e509568ef7e445cc445dccc534faeddd75c1ade25d15a9afa231223b1bdfe80f4c04930a15299579d2c7dcbb71797588
+EBUILD s6-rc-0.5.4.3.ebuild 1630 BLAKE2B 8201e6c4347b112520ea63c4f0896e6827fe3eac65f2f4de606511d313dfcde4afb52b0601d75c18f0f1aa22704e948d930dbcc77362904d4e8a385e035326ea SHA512 d1b07a88300e79e44e818f3316186009eac0328e63dc3172036d870b22158c233c560d6f4dc17167b91247a24b174960ddf56eef9bbaa8232e8a6974055fcade
 MISC metadata.xml 612 BLAKE2B 5512fe794ae7362a22aab418fd82bcc6f0fc4713dee0657166f045f9c6d0a06e15a1d97ddae56556d996c887a93c401e0874c999b8b5e6bc7a6bb5815ab3921f SHA512 787bcdaaf32e0bda6270e0d21eb0a98e8105055bfe7f681b1bde6ec286df6036a4f4c40641c94341a95d74ff289b7d922774e88605907d64a8f2b1ef5963c689
diff --git a/sys-apps/s6-rc/s6-rc-0.5.4.3.ebuild b/sys-apps/s6-rc/s6-rc-0.5.4.3.ebuild
new file mode 100644
index 000000000000..0a8af8cd7296
--- /dev/null
+++ b/sys-apps/s6-rc/s6-rc-0.5.4.3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit optfeature toolchain-funcs
+
+DESCRIPTION="Service manager for the s6 supervision suite"
+HOMEPAGE="https://www.skarnet.org/software/s6-rc/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="
+	dev-lang/execline:=
+	>=dev-libs/skalibs-2.14.0.0:=
+	>=sys-apps/s6-2.11.3.0:=[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)/s6"
+		--with-lib="/usr/$(get_libdir)/skalibs"
+		--with-sysdeps="/usr/$(get_libdir)/skalibs"
+		--enable-shared
+		--disable-allstatic
+		--disable-static
+		--disable-static-libc
+	)
+
+	econf "${myconf[@]}"
+}
+
+pkg_postinst() {
+	for ver in ${REPLACING_VERSIONS}; do
+		if ver_test "${ver}" -lt "0.5.4.0"; then
+			elog "Location of helper utilities was changed from /usr/libexec to /lib/s6 in"
+			elog "version 0.5.4.0. It is necessary to recompile and update s6-rc database and"
+			elog "restart s6rc-oneshot-runner service because you are upgrading from older"
+			elog "version."
+		fi
+	done
+
+	optfeature "man pages" app-doc/s6-rc-man-pages
+}
diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index dfa0d3f47f58..21df32adcf83 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -1,3 +1,5 @@
 DIST s6-2.12.0.4.tar.gz 255314 BLAKE2B 4a7da37affdc2d0651da905fdfbffe897709cc6f2a4a36453f0a87c88da66adb307805b9f8c850813186ce51c18ed07b8a95aa34a8a266a5a24b3b8646b19485 SHA512 dfdb9c0189177762a89d1f47e1d6b0a82bba5554baef4fa899b1c0a85c192d5e1dac2b929173d750df3707f0d699b28591f1eab3e63b8791e4a51af1c65e3e56
+DIST s6-2.13.0.0.tar.gz 256126 BLAKE2B 08c20a6e2268bcecea39f7066f8fcbb61723c4c0ae3772af5362b68f53ed65494b824827779d44d64d204688f03634bdd079f08def5b41a5170d88888e2fbc8a SHA512 b54d334496d79d1b845552f5e7763c536d6f253c9bb2d61802695ea1a596af918562daa230f09f4cbfc06614eff70930d0963439d7d84ec8ae0388291912ca9d
 EBUILD s6-2.12.0.4.ebuild 1285 BLAKE2B 3a1b992126a9d614fda5730ff12cf5d6dd5d7738cbd67e0b4c9aa9a5b4ee4c29d4183025b52b6a5c2eea44c4b2c6f7fc548c3c09345cbcc15bbd7b0c8d2b5580 SHA512 9d5c4fc95e0a642caa4a65c93fc250c317575be0721fb83ad1b3443347acd1cba16406ec4cf6d4c55eab480e90515f2dd328d00b85a16b1774107add856d07d4
+EBUILD s6-2.13.0.0.ebuild 1288 BLAKE2B bd08900350c5621081c25654c729aca3d2d2e0c6e2e3ba38d77c869ac8432619d10b47ef8de4a8c18831a8d7681d976480f4d0f5f3174eda459d0d5a68db5516 SHA512 4d0a97a33dcb795f018ae471c4b7dc392e8f5087c8327b281f82b39d591e711bcdc0946e87055787b2e75aa6d0fb31d951f30030dc8add9090e57227a959aab0
 MISC metadata.xml 871 BLAKE2B 2e6ef16a61c8b9d55bb520adc30479837aae5b85fb2e4ab8e18e0d162ae1e7370dc5823c9a711e92c73620fcc20e4e4a159bd6270f29fe99382163a96dac8c75 SHA512 e1e741d4b13338fb41e1b9fda15e308d84bdd7490a7f98063de4052307703303ac4d313e6ea0673d4095f27041bb62539f986e4ce3ff0ee7133ff319f37d63d9
diff --git a/sys-apps/s6/s6-2.13.0.0.ebuild b/sys-apps/s6/s6-2.13.0.0.ebuild
new file mode 100644
index 000000000000..75a6f7ec08d5
--- /dev/null
+++ b/sys-apps/s6/s6-2.13.0.0.ebuild
@@ -0,0 +1,58 @@
+# 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 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+execline"
+
+RDEPEND="
+	>=dev-libs/skalibs-2.14.2.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
+}