gentoo auto-resync : 07:05:2024 - 00:00:56

17 files changed, 223 insertions, 27 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index a084c077a181..f1b5330499e6 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/biosdevname/Manifest b/sys-apps/biosdevname/Manifest
index 95ba9f21c029..9e30b3b99e19 100644
--- a/sys-apps/biosdevname/Manifest
+++ b/sys-apps/biosdevname/Manifest
@@ -1,3 +1,4 @@
 DIST biosdevname-0.7.3.tar.gz 96231 BLAKE2B d572b15f86ba1ddaba191f859afcfbd39fa0fe397ee6968ab794e217d37b875b9f9d20c219cb44f62fc5d3fede7aa487963f54423ca20086c75c15b17d755c8e SHA512 9cd2b7d115d6ee487f4aafa21b00025a3917d3c89489fe70ab3de8aa979158477a1d0b5287101b7cec7200fef0d2f6894a0e6389a174d6f8670dcd7530dc445d
+EBUILD biosdevname-0.7.3-r1.ebuild 736 BLAKE2B 47295a2b2562cb2f29f135e2f1da68c31375fa5c6c6837cf78c42ea96446c3bb58c699fb5363632ea882af8add07d7e787b8a5a1cdc5dab89d465a61882bfce3 SHA512 aef9cc5cb1b5b9122272f2abf88f797ddcbc2ba16ccf59b40654b592e1267458398a12be95a304e439691a6423c2b59c72a863605c29f636a8d6297ef30a03ca
 EBUILD biosdevname-0.7.3.ebuild 626 BLAKE2B e1b95694af9223e0ed37998155a1ef21dacc216f8192d1fce9a8dd6d57a9c6620cc49027d0ed052cf1288c4b88f7816778abba58a91923812cef620671c09934 SHA512 b9447820c7d320bcdfe1f08a3c5f06755cb2fa29e1894181f4ffefec208f03ec622c82154e35ff3e6c09b4cb95abd35bfaac94893da49c50067e190dca40f0d1
 MISC metadata.xml 603 BLAKE2B fdeffd51ab9a0e2590d6d14b0c4caaa515a4a0e32ae64d2d84b81be0657e676647decc11c2d5e5bdbbf878c6e98cac345263c113b502d50d4ee742b5c93275b1 SHA512 da4bfe4ceb9e097750173c5bdb5d9ff024afb927ddd9e9240824e73a1f27352ff22d5dce52b6b6d1d8cdc711eff13d594db7801b1be4d152477287c8f0c4c339
diff --git a/sys-apps/biosdevname/biosdevname-0.7.3-r1.ebuild b/sys-apps/biosdevname/biosdevname-0.7.3-r1.ebuild
new file mode 100644
index 000000000000..9a09515f1a4f
--- /dev/null
+++ b/sys-apps/biosdevname/biosdevname-0.7.3-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools udev
+
+DESCRIPTION="Sets BIOS-given device names instead of kernel eth* names"
+HOMEPAGE="
+	https://linux.dell.com/biosdevname/
+	https://github.com/dell/biosdevname
+"
+SRC_URI="https://github.com/dell/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	virtual/udev
+	sys-apps/pciutils
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i -e 's|/sbin/biosdevname|/usr\0|g' biosdevname.rules.in || die
+	sed -i -e "/RULEDEST/s:/lib/udev:$(get_udevdir):" configure.ac || die
+
+	eautoreconf
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/sys-apps/dcfldd/Manifest b/sys-apps/dcfldd/Manifest
index aab9499ff6c8..96c8c2700ab9 100644
--- a/sys-apps/dcfldd/Manifest
+++ b/sys-apps/dcfldd/Manifest
@@ -5,6 +5,6 @@ DIST dcfldd-1.9.tar.gz 90477 BLAKE2B a594474fea9414e18ba80c1d385f87a19baac49cd09
 EBUILD dcfldd-1.8.ebuild 538 BLAKE2B 325317833e1b39bda24ce502c3e32825d4e9cef62361ef81cffd1bb26d68fd9c5e36b4451bf7b54aacf7e448f08b101abd0721d4ec11ebbdcbf0c6ce723bd12c SHA512 73ff0ad486df5b448885de912ddb89e7e88eab06897b7abb44abd228fc1998d07a44a81f8c4488577e6fc596aee41b194e04877c5e54a61ff67d55afc6993758
 EBUILD dcfldd-1.9-r1.ebuild 634 BLAKE2B 7a030c0a747ca3d298a92756f2d31ffec97b36f05bae40feb1ea7ce49e914c1df393d7af39d9a1cf338af11dfb12a75dd12262388756bbfc43c3a494ae39990a SHA512 b978291c8de13b570dabdeab0859b6b90833f35e086d5363d49f0eba6d26c411a4edb4f0892d6d6d2e62ac661cc1013ddcc286fda25726f0e89c82d0ccd48ea2
 EBUILD dcfldd-1.9.1-r1.ebuild 663 BLAKE2B 6aacc0dd6e1e6b50a4a3ea6e776159439f8b95113b8af7a47e1a9d08f82dec893ec1af556cea075061dd30c0400f807431a603175e29eda26a3bc6191e440412 SHA512 1c9aa1bc93cebe30385e570b5de0fde29c1c3d4a1c58d18668a272be548322987bd97c8125a137acb2b2e8da6de9a5496844196f75fcd7c72c1688f66ca21f0e
-EBUILD dcfldd-1.9.1-r2.ebuild 713 BLAKE2B d8a89e0cdc59a1da1b7dafa49f50eea9ad24f19d94f5518e2e88b91fa75d0f655d7f7a0796d056dd27294bbd6236b013fd79352fc64b09075b9585bfb9b2f1ca SHA512 feae814bf3dc668649af1be550bfdd3a42fcc83e08b5c1fd59dbc7f500118965dbc85df0adf3ad222db29de2ba0179537f6d88cf7da5a1b1cdcf8fd4ec1ebe0a
+EBUILD dcfldd-1.9.1-r2.ebuild 711 BLAKE2B d3a0aff2efd2918cbddbd1dc593ec2cbc6d6820cdfbdb5fcb1a4f539cc12972afc29f6412a6647618df3e1614d2293aa28032b20b9e909c545488a785a06bd6e SHA512 8d57a404efba0d6363f029c7abe3a6703eef4646ed76b86a56dca60dfbf3667efae9e24bc3becb94b6960f12e97bb454ea045cc695cc9baf4afe88c64f382fe0
 EBUILD dcfldd-1.9.1.ebuild 634 BLAKE2B 7a030c0a747ca3d298a92756f2d31ffec97b36f05bae40feb1ea7ce49e914c1df393d7af39d9a1cf338af11dfb12a75dd12262388756bbfc43c3a494ae39990a SHA512 b978291c8de13b570dabdeab0859b6b90833f35e086d5363d49f0eba6d26c411a4edb4f0892d6d6d2e62ac661cc1013ddcc286fda25726f0e89c82d0ccd48ea2
 MISC metadata.xml 406 BLAKE2B 4b3f919fe88a08eafae29fa536a35c8776adde46ac0243cf1191eef5a2523a96a7f6bedee749b0bc9ba2a32aab79bcaf781497b2f92fe0a7afa6c3b645dca10f SHA512 19bb9687b9bd30914b6f6f1554eaae34dcd48415c022c6b90df7cec8fb85d010dad1edcc4a9299343afe1577ffcb30a23c3cc536eb933ef8066f6b7de112af2f
diff --git a/sys-apps/dcfldd/dcfldd-1.9.1-r2.ebuild b/sys-apps/dcfldd/dcfldd-1.9.1-r2.ebuild
index 4add47a1a11a..105469231d1d 100644
--- a/sys-apps/dcfldd/dcfldd-1.9.1-r2.ebuild
+++ b/sys-apps/dcfldd/dcfldd-1.9.1-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/archive/v${P
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+KEYWORDS="amd64 ~ppc ~riscv x86"
 
 DEPEND="virtual/pkgconfig"
 
diff --git a/sys-apps/elfix/Manifest b/sys-apps/elfix/Manifest
index 9992af50c60c..45f527b20e55 100644
--- a/sys-apps/elfix/Manifest
+++ b/sys-apps/elfix/Manifest
@@ -1,4 +1,5 @@
 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-9999.ebuild 1183 BLAKE2B c6f089178776378a236f3e34c2034d7c9d116e864fe0b46c944163271b3135481b1cb1c68c9783c87decdd053be3d43ccfd871bd2e10e76909ac39ab9b97adcc SHA512 f685ca0da674d30d5055140aecc97c590e1438c3fc51a3efe7c1daf38afa8cb592d3ab731f76fab4f92092532f5df5ebbb5ed1e9572c8aecc02728e49187fb81
+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
new file mode 100644
index 000000000000..b852f0585a0b
--- /dev/null
+++ b/sys-apps/elfix/elfix-0.9.5-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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="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"
+
+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" || die
+	econf \
+		$(use_enable test tests) \
+		$(use_enable ptpax) \
+		$(use_enable xtpax)
+}
diff --git a/sys-apps/elfix/elfix-9999.ebuild b/sys-apps/elfix/elfix-9999.ebuild
index 05b415e1f5d3..b852f0585a0b 100644
--- a/sys-apps/elfix/elfix-9999.ebuild
+++ b/sys-apps/elfix/elfix-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/elfix.git"
@@ -11,19 +11,17 @@ else
 	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"
+DESCRIPTION="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"
+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 )"
@@ -39,7 +37,7 @@ src_prepare() {
 }
 
 src_configure() {
-	rm -f "${S}/scripts/setup.py"
+	rm -f "${S}/scripts/setup.py" || die
 	econf \
 		$(use_enable test tests) \
 		$(use_enable ptpax) \
diff --git a/sys-apps/moar/Manifest b/sys-apps/moar/Manifest
index af243c6d85f2..cdecbfc9844c 100644
--- a/sys-apps/moar/Manifest
+++ b/sys-apps/moar/Manifest
@@ -2,9 +2,12 @@ DIST moar-1.23.10-deps.tar.xz 37188500 BLAKE2B a5c92f8e56d4c7588265132f33089f108
 DIST moar-1.23.10.tar.gz 2804040 BLAKE2B f3e4b53b3457461766c04d81f081c01a7d12a261502b1c59970099b403c562bd3276510ab0b59d1629e9d5e97922cc6a9839ae4525f62cecad752b5d65ce27ac SHA512 835b9910fb6451a58e04008517ede25644b897e94cfd5fc7ed5d7104107e91458b77e2a6230668169c9f213df297335767de6bc467a6f6e928b53d2e1060e4e9
 DIST moar-1.23.11-deps.tar.xz 1228028 BLAKE2B f8895cef15f6ab0eb5dcf826d86deb7dc2c67dd6e692e456d5d98830fba93b3a17e5d3b3026c0f7ea10e3810db1f17ccb27b3cb704cff1c9bcbd267fbf68acbd SHA512 f12f2fa563b5170c8fe092f15476692815c2e0ab341d8becff504e5ded426efae5fc20697ef935ca5d037fa40abbfebbe5d0f59ac4e805e2d7d60e19070df3d4
 DIST moar-1.23.11.tar.gz 2804497 BLAKE2B 5472aa0cbcf3e781e0ef57ebf7d5424e481f96acd04f82e8e816adf4e0182a85fcd16567daa986564f09f0a54416cbf02b90f6a5cd50250d4593392a6bed1b45 SHA512 31d64d97475e2f82af19d770010d0972c469105d1b797cf63521021906a5eef666932b9227ff94d60cca20dfcb956193954687939b92e1042a1473052d4539f4
+DIST moar-1.23.12-deps.tar.xz 1228028 BLAKE2B f8895cef15f6ab0eb5dcf826d86deb7dc2c67dd6e692e456d5d98830fba93b3a17e5d3b3026c0f7ea10e3810db1f17ccb27b3cb704cff1c9bcbd267fbf68acbd SHA512 f12f2fa563b5170c8fe092f15476692815c2e0ab341d8becff504e5ded426efae5fc20697ef935ca5d037fa40abbfebbe5d0f59ac4e805e2d7d60e19070df3d4
+DIST moar-1.23.12.tar.gz 2804471 BLAKE2B b366fa309000622c7eee59613895381bfd736a1ef6291ae7771e04aa93654f538872afa121c6fac360bb5d9436d4533986534bdc129afa49efa6d940df30c91d SHA512 1e096da3549c33722dbeb2ef8c223138b926a6eea8562efd95ef260b2adc2f5bf60d9417540c942b9726619e3bb7255f6d7bb7f2fbefdbcc6784394739573057
 DIST moar-1.23.9-deps.tar.xz 37188500 BLAKE2B a5c92f8e56d4c7588265132f33089f1086fb7a14b1d1023caf7594cbda16772776751a80d44f451a9c5c765bd03d25687a63b5a00c4a50603b4598162920d840 SHA512 44c924339dbde95b647c464a00382786dfd8adfc72f307a9df63ed39f85fefe76260fde082a39738fb97c571217e8d591bdeada054dbe75ed56aa0156e7cf2fa
 DIST moar-1.23.9.tar.gz 2804191 BLAKE2B d5663fedd70fc80d70a206c276ece6ec11da4f4b4dc396a3e11b1fb8edd5bd9f3395e943158c4bb297b5ebfeecd8f61bdbaaff79e78c4a89458f1b1a02db0e71 SHA512 9ab4a3e49b66b39f642b6a1f882c0980a4e755e3e127ca37d1319615ae836fe3250676a8c0e95ccd0f8e714357df5dc00235bf67be6097a7b2811f0e3bf02e9f
 EBUILD moar-1.23.10.ebuild 986 BLAKE2B e9f5c41907da162be3ffaea0fe77bc7aea55176d4c15ad3833fc72806c7bd24fdcb9ccf9b389d20ea037628f6c6858553465dd5f6710971d46ae0489d7acc28a SHA512 a65b9b98e31c52869882d4b0b4ad855383a2ddd444c74883d70a64be377c4d6706eed78d930ebbfc7cc61a83cad793d4f0d9d652ab96ac03d59753456f226b6a
 EBUILD moar-1.23.11.ebuild 1097 BLAKE2B 17e50fb8feed6ce38e7016cc781fa39256b5d8090480386fc7172e49423126dc898b857c154323a2647e47c5ad390a8915b2797428adca544239e42b5456c0c6 SHA512 886afe4a9d3bf1ef75859fd59856b94644f8ddcdc4de3d0d99f9abae96f69781e799cefc5dd064f3618bb08ffc2743025b0b42285b4f1404dbf1fc4c70bc4037
+EBUILD moar-1.23.12.ebuild 1143 BLAKE2B 3b995dadce97cddd595cc95ebcc290651b0c94255eae7d6fd36e9b8029764fb981dab2728a3ed808f9438080f5b3f0727474fe4051bd2f704e21df48a3437b90 SHA512 c29255a40fdec0fd4f37afd2d899e4ff9ed435ec5b5b14656ddbc4039572c56196dd597f61e444963096d1e0051f7e83a0ad2c4e5bc863cb8a141e134b4b1071
 EBUILD moar-1.23.9.ebuild 984 BLAKE2B 59e8ecfe756c1a600b9ca5e39bc43663264434288be4e7a1a7064c8e2b7dbbf47f130ebe847e6385e28d92aba622d5999a1f48777fe2eae62cf0aec56c24d78e SHA512 a4e31acdd2bc81ff9789e9b1c871a3d080dccf2532c4210f7c1b4a02b2a6366a98cf46eb785f9b896523ef401b71c4e3cda313c9162f1d8ea6151a2b54db8fd7
 MISC metadata.xml 316 BLAKE2B 19b5d071afbcad1f05744cca494156dc634f3fc35afaf4828dcf1e691e75a0f47f162b6cf548e5a333441f25327970f6a71d6acb436b60a68deeb7fb44659d45 SHA512 44155ffd972d79d47e41fe2ed38583e41eaaeb9f6b0de7e52b666930906f561e73d1f604acf602750ae1bed50e516dbbe36327b47ba2005813438e0d2db070e1
diff --git a/sys-apps/moar/moar-1.23.12.ebuild b/sys-apps/moar/moar-1.23.12.ebuild
new file mode 100644
index 000000000000..928e03d26244
--- /dev/null
+++ b/sys-apps/moar/moar-1.23.12.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-env go-module
+
+DESCRIPTION="Pager designed to do the right thing without any configuration"
+HOMEPAGE="https://github.com/walles/moar"
+SRC_URI="https://github.com/walles/moar/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
+
+LICENSE="BSD-2 BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# moarvm: https://github.com/walles/moar/issues/143
+RDEPEND="!dev-lang/moarvm"
+BDEPEND="
+	test? (
+		app-arch/bzip2
+		app-arch/xz-utils
+	)
+"
+
+src_unpack() {
+	default
+
+	if [[ -d "${WORKDIR}"/vendor ]] ; then
+		mv "${WORKDIR}"/vendor "${S}"/vendor || die
+	fi
+	go-env_set_compile_environment
+}
+
+src_compile() {
+	# https://github.com/walles/moar/blob/master/build.sh#L28
+	ego build -ldflags="-w -X main.versionString=${PV}" -o moar
+}
+
+src_test() {
+	# From test.sh (we don't run that because it has some linting etc)
+	ego test -timeout 20s ./...
+}
+
+src_install() {
+	dobin moar
+	doman moar.1
+	einstalldocs
+}
diff --git a/sys-apps/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest
index d547c5dd83e3..237d044c6265 100644
--- a/sys-apps/pcsc-lite/Manifest
+++ b/sys-apps/pcsc-lite/Manifest
@@ -7,5 +7,5 @@ AUX pcscd.conf 32 BLAKE2B 2407e00c654d7e259ebf69ab420800f5605cb3ead23eb4aa073179
 DIST pcsc-lite-2.0.0.tar.bz2 799011 BLAKE2B d93fffebbe3daf389fcd8195c9fb3d76db64dbb98ac9c7ecd08338331389298e710ca71187cb73165868b0b5e66cb9735b60e22d508db1c1a81e04555103948a SHA512 4b34628d3269ae1859f19d2ab7eb74a76a55f3d76fbc9e4e420a081a065b1d0d7b98680552c7208f3265c684bed844afc6be1c2e5f103ad916ce7f38b52ee68c
 DIST pcsc-lite-2.0.1.tar.bz2 815103 BLAKE2B a9eea4a4da1a78fc22797b17c128889b2f7caf8c4aa02dd77f4ac79e4ec458fb0162578b5422552545cd39303750d5396f3687f8cfee7603fad8d60cb54ee1e8 SHA512 af007f00f43e8d897710580f6f27814c9e7d3ca489ff01edf2e3b979e46267915aa04d9c15f225a420fa681de936e42a1d4779d962717cf9a9f4a3d1ca31502b
 EBUILD pcsc-lite-2.0.0.ebuild 3348 BLAKE2B e631a5f8290d238b99c12846c824c408f6f03e0326589d9c8485c59829d1aa7512e806b6760db8b23ffe113ba10dceb099f2b5454e536394c960ddc724a723e2 SHA512 a62dd910e493483c30d6b9c65b627aecf3e3ec1979a41e1c2696f28296eef80bdad1b25b6d7473b6bd498c0af442e562d050b476c9c756595de4039389035ed2
-EBUILD pcsc-lite-2.0.1.ebuild 3348 BLAKE2B e631a5f8290d238b99c12846c824c408f6f03e0326589d9c8485c59829d1aa7512e806b6760db8b23ffe113ba10dceb099f2b5454e536394c960ddc724a723e2 SHA512 a62dd910e493483c30d6b9c65b627aecf3e3ec1979a41e1c2696f28296eef80bdad1b25b6d7473b6bd498c0af442e562d050b476c9c756595de4039389035ed2
+EBUILD pcsc-lite-2.0.1.ebuild 3348 BLAKE2B ab4c779003df5c234b83dddf62ec045d032faef917427406064765c46f21a403412c12cc60a827cc67204084e741375f4b66183a2e9bd36f0713726b5149bc74 SHA512 e421f379dfcfc7353d1bcdc9f65d4705d838d73b4291cbafc5a5829b19fc08c32d8b176ea3ac8019e4e62420f4347c096ac78ff112099aa52fa799d4b552f61a
 MISC metadata.xml 1147 BLAKE2B c89b7f5443b81af35a0debe239b95ffa3dea06c4e86c1cb3bfe50dfc81e49d32939ae2eaaabcc5b4c5947c69c8ae90ce278efafc324ff6ab10a9ed514fa0a8b3 SHA512 96aea50c57df7bf05d5e05d7dd19f985193638592526a1357680f3e3489c0680b38f2f732714a0726097e40503bf1573b5458d4917fbcf1cbfeb56953d05293f
diff --git a/sys-apps/pcsc-lite/pcsc-lite-2.0.1.ebuild b/sys-apps/pcsc-lite/pcsc-lite-2.0.1.ebuild
index 661385f197ba..5d5823a7adbb 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-2.0.1.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-2.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit python-single-r1 systemd tmpfiles udev multilib-minimal
 
diff --git a/sys-apps/syd/Manifest b/sys-apps/syd/Manifest
index 8d15f9a8f292..cc0030fc2dba 100644
--- a/sys-apps/syd/Manifest
+++ b/sys-apps/syd/Manifest
@@ -13,7 +13,6 @@ DIST anstyle-query-1.0.3.crate 9742 BLAKE2B cfcba0a2773f07b9292279afd70832c5d4eb
 DIST anstyle-wincon-3.0.3.crate 12179 BLAKE2B 37793975a05ad60bb2b670c208db11c5cda8a2a456242cd118748709d0a220b541b6f088676eccd19870cfb8f910d4aa1e7764393785a6db0531af4a3ffc8047 SHA512 55217c65fc9ec674e5b4dd70716a221bd108b507dce9baaeb542f0e0a47027ec7fe61f9cd3cccfda43e4a4cd785b42f13400daf89884c32d3768e48bdff2d179
 DIST anyhow-1.0.82.crate 45361 BLAKE2B 558bac4de847a432fc80427e7be4e78cae4b01c4da852eae2121416af4d7e6ddeaeffd7de9bb69e55340b9a228436b975fdea88e380391a77c782a3776b835dd SHA512 e0d25a8c0b9c45e1db2072618097aff3908f70bfcbf0963d3c9dd9c97be27a85c4a763c5cb74e1ccd1b0a2059360e0879df4be80e10e58e0a5346b65f4fa1a69
 DIST argv-0.1.11.crate 8683 BLAKE2B 44344e0f3678b159b64d06287d58508479831dc0bd7b044a1ccaebfffdd9023508da5d86f3e6d8af8579cf5351f6c8963581af978ca46bb0b87a37c1802e67d8 SHA512 011e8d5333b305387d7667bbcd4d3e694fb73d16ba4c51a10969d5dae7a7a4286f8583c160949fc2724c56c7d47c618813d0dd55c42665c8c2d1cccfcaf414a3
-DIST autocfg-1.2.0.crate 14808 BLAKE2B 122327d6ffd32e08dc9fbdb4dcf69128b19d56280f9d934311b946741003b40571cdd1f3ef54b2be02c8dc505aea11c962b244d33a92206bf4ee8f6b2b9da432 SHA512 66cbfd13e33b36284cf4c74c8d654f93adcc45893d127d9aaa4c1d183e47336096e72d74e7c17dd481fb7a98931ab6cfec7e4d4165cfb491861d4e3ffe2416fc
 DIST autocfg-1.3.0.crate 16524 BLAKE2B 7d5a03853d6b4f0da08d8e139fb200da21e47fa7e50d1956270d0ff0cc496f660f8f800122c95eee9ba98d9210ab200c3010b782097483d12d6be4ac0df0e7c9 SHA512 a5570b955d57a7183ba148b335837dc5af24b202e80681027536d33fe2822509ba644fc70c29f018c893285ced2bf6774f44ca6c59f7c7e2226d5349cf7c3635
 DIST backtrace-0.3.71.crate 86553 BLAKE2B 15ed93574fb9e8e28d5ad901bb1f94013b5fec7a79aa96d17f13f6f11a02d29a274ec14ce51a9f515574839aa41232e5aaf6e6fa3ad9c0483591055bd0a78c8a SHA512 5d9307757349e860fb4cab7e9ba1c9d0f1faf49ebcd935ba879b85fed2a9812786c7458abb59a742842a0796fc29ce9921cf575792402486ecdbd9a2568cdd89
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
@@ -130,7 +129,6 @@ DIST nix-0.26.4.crate 279099 BLAKE2B 41debf1f21427ad6c25c6cd26b7867feb8ba4636602
 DIST nix-0.27.1.crate 286494 BLAKE2B 63fbe347360ad4b7a86f30bf2f1b27ff1ec581145a90c34160f4d143e9c297a34a2ee72e9de3a48bd3418657fbc9bafd09b704ec15a42b16b3a4187d5304ce77 SHA512 7b35a0f87427eb1b5e1480d7daedafea4609b7f3a4fcf48ca99bdbc2f150865996539f2c51c7ae6a6a13169614681fc838efb306994b020d44b45735a7380010
 DIST nix-0.28.0.crate 311086 BLAKE2B a07023566f04896fdb3ef8b2a1ae8dd64adaa5eb48217c58588e1b41733642e03e0637350c0ee83ac47e663c02b24d5668be751f8d199aa773de6df8b2213894 SHA512 73c0c94b360f4fc81ff07a13692b2a5b5ceda3a7203bdf1e526facabd36cdf160f0ae8fa479e31a4e4237c09bde11e9bf821aa496311cac8614f9c5626f8d69a
 DIST nonempty-0.10.0.crate 12661 BLAKE2B 6d86e3a3b7dd0eda0f9485cedc61f6450d2a6176af5841272b455205f64abcf64d846c457cf233fe4dc0328bd0ab03b713397faf13056e515a5322ff228f03a2 SHA512 ae8c00fd056f8f2a59c7a569c922ae3188c337aeb52531fcbc315ce51787c89ee907eb7039ff96cadada0909610cbdf9a3b6604be6b894878a86352c3d475adf
-DIST num-traits-0.2.18.crate 51930 BLAKE2B 6c40e155d7a52267a7183d8030ef34245492d33f103cc24551b10da3eaa18e3db485062ff87057dc23e6b55e381e5c5d2a2633aaf6f4763c06677a0a0c524f02 SHA512 e395ad9f3b21b0dd1d3a94cefe0d68a42d1b1d429ddb2823696f9cd75042568a635d93d133ddb9497ed357e5b3be5caddb8e4a4af87b65882bbdc60b05c74ebc
 DIST num-traits-0.2.19.crate 51631 BLAKE2B 78637360cbf32d172510a62bd9442708af9730c0296a2bb4ebd200c08facd49bc31bf8ddd58967e0df7273a938832b620265d9f8f4d26ad16049bf6dac1cb4e5 SHA512 180018a5eceb45085e4e8d103ff21bb4d5079cea874c42a0ad4c76c99d275d434bbc1cc289f0cdec172866daa89dbfe0871410b2cc3407233fe1129786905956
 DIST num_cpus-1.16.0.crate 15713 BLAKE2B 11b432fc7c7496d48918f09ed0954e0f1d0845596301266321293b374392898853fb7c313a0b0fd9d22d9dbfe3ccc5cc1e38f38407c89b2e5906eb76caa6ad68 SHA512 a75863afc4a563e63c64d06471c7921615355d98011ea9497b1f1a7dac2bdfc876509136018e8062ac38575ccf476a196d1fd9231e09e90017333bbf2df4615d
 DIST object-0.32.2.crate 286994 BLAKE2B b9085200fe0107ab0f8ddd5c5ac82bc681dc6266c6503e4a803ae4dbdec775ae84ca4a736754b770d858ebb058342af45d485d4c9a41f57966ca1466de40a4c5 SHA512 5d03d998f06dc592c3be141f7163bd72a0e73396f95d22ef1e0ffbfc66489bf727a6f6fb813a32739609b619b8e34a471974b2231dcfa23df8bff52007c25a96
@@ -203,8 +201,8 @@ DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e49
 DIST strsim-0.11.1.crate 14266 BLAKE2B 252a9ede4241b165525486aa8855dece37af77f5b28e0e1858c4a5d2047db9fa958328db10989234aad69463ab51b2303785ec056c63ea8c95bf95e111ddabf2 SHA512 0cebe0155a92640e56db9a599ae62078cbb32e1d2da8bfa67ed0e8f410a7558dfcf7b3c2720ff5913282e291ecf076aed9fe9bf84c8d44e814a642b1bed3335c
 DIST strum-0.26.2.crate 7189 BLAKE2B 7582fe304551e98b121d3a386af22bc022d7d11323b81ed9c2d600c8d2496077c09bdc8dfd78a636c18b9f522808b2ea54cf8b669419b0c89fcb6b232eade617 SHA512 819cfddb3028d5267842cdeaf17d37569eb18c957cb78a055b25d9ee1b8461026dab9bd980da4a89ac7b2858ff22880e40b46a72d7695a5135b84c4b7e5026f3
 DIST strum_macros-0.26.2.crate 27056 BLAKE2B c9df13a91dd08f8bba0dfeec4fc03b59cd74eafaace7d2d228b8636264a9ea11137d0be741a936f7290e09525586818726000f07ed84a5ae711b89d61f52e89e SHA512 519bc654adcf131d85d1ef83f62be2429f7472df25cf962fdc1cf5070d33c39dfe71f08fbf296df9b85fdfcda95cf2fea27e8e52e9ae93de27bb8fc4a5b55dd1
-DIST syd-3.17.4.tar.gz 676758 BLAKE2B 7391f2a4409dbd60c8d883ccf3077641083c83becad0e317e0b06ec75845e00f1478602d216b04ea0333cadda44170033bedeb83a78ec23b3e482240276c135a SHA512 be844554c4d6d04e2b025bcb958ae31d3d04f010076966fc84634977a686d19bd0e27f8b6d5f438b44eb97867d9d444c663a55ae452aa7b63bbcd2bc1077dd9f
 DIST syd-3.18.3.tar.gz 699730 BLAKE2B 12afee9bca004ec21896630fc14380b81cc4980b972e93794ba3344b99623a20d6883b8cc1653e39c74c9ff1ab3c7c634c7f34bb70174fe897d1ed3d79194c75 SHA512 c96fbc0ff27c5c106c115401aef65c901110004bfb2e2747b983f54f932b7120877675e89ca550b9b1868c0864eff95240233ca7b56503dff64fe13550cd5365
+DIST syd-3.18.5.tar.gz 700286 BLAKE2B 3e0b744635661ffa50d9597816f19be39733986d539deed48b31e769e1e73e236681692a04896d955f9ffb7cbc768db5ac97867ea6157714738b404c6fce97fc SHA512 c09274900ee6972ebb3c44750147d24bd7de6b5a3e90671386892f911d2adf7f3ed7d84971725b77781b48ca3f05b81f8103632d52112f7ed27d046c62dff6e8
 DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d
 DIST syn-2.0.60.crate 255808 BLAKE2B d7a8e415dd72267fd92da48ba8b3e6feb728f0639797db1aa74aeaa2a57935b7565eec37cbd32eec826154e2c54075b121737369eb15af36c322c34b3cfd7930 SHA512 20bfa02b03c193672a9922f9a5e196185341e082a262f7c00d7c2d467d9e2d77f4af3994634923cfaeee34aa9eab510415165f052ffd9b1ed0b1b581e272898d
 DIST tabwriter-1.4.0.crate 9951 BLAKE2B 8833c5a7f37749268187e60d95b07262e77c461ab868cd934e58031703dc0c9ea83b8757e681747900dc07eb5c8e41e589d9c37568b66ca25c95f0fbf07c8a8c SHA512 066846124e3beee816f76ed3a59fb224593537ce5807aa472fbcd0cb98f638dba6801d171b6d1026e56b6eaae6f2e873d64c190c97bbd8d6ffeffc82f3b4d52f
@@ -263,10 +261,8 @@ DIST windows_x86_64_gnullvm-0.52.5.crate 433246 BLAKE2B f34328a6d100e092ecb34a63
 DIST windows_x86_64_msvc-0.42.2.crate 666936 BLAKE2B bc3a456e7f8bc272f8978ec69506ec9d89f97b7582ebbe05d8bd57bdf8156ef62d0d2dc6137a97e81d54059d70db97a24af9a038adff357f5dfd28805d6193b5 SHA512 53a35f438903fceb59e36bd2ac331773fb8e6c8c5a6d984e79021761f91b3b4a23efe49d219667a4d0d23dcdbf906da9c24e74fb1cff93395b5c55ff524e3788
 DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0
 DIST windows_x86_64_msvc-0.52.5.crate 827905 BLAKE2B fd5dac198bfbf29878cb461a7338c289c9af16ea80b3e5fa567980d2a6a5ea6a1cd83729ce6fd67e4da171873083dbeb1d6e16a287620f0245201f9cb29c29b4 SHA512 81176090dc725d7fe3867e6322fdc4a4065168580847b35e6f8da345f685c4f66a81e35cd1880dbaabdd4cdc82446dde9d6a0e583cf0b7fe47dda8bc8002f1c6
-DIST zerocopy-0.7.32.crate 151096 BLAKE2B 12c7c329ec0e0865467af08306ff4b55ce1e39fd77b094ee48ed9c6e266dfa807bda9ea72a3f7ea989916327f4d9e803d8868995728bfe2fb1c2dc1e5ecff78e SHA512 6729b05eb88029555b88c75feff4f8bc28ad9675edb02b07486381f775c8650c95e2e59612906bd9c34c5e390fd339857ca91573ee9f9ca7948572cff4171c82
 DIST zerocopy-0.7.33.crate 151013 BLAKE2B d9f811a98d0565421cfffcd2e36ef4370c8d2b0f364f0ccfe44d63d6bfc0cb302a0a04659a33f43e2b1cf7cd296b5800548f74f1b43ac15c7d7b2830a2521726 SHA512 8c21b9d743369ca1ed9b56e7cf87e20041b5436aa4727c72e5a6763dde15ccd277a4117aac3d37005a7f1a063dce7c44625aa2cf7de435204d13c86aa6c70a58
-DIST zerocopy-derive-0.7.32.crate 37623 BLAKE2B 8b583d39d7bf9c3dbbba578120751c664f87363c5ba3fc45f6506a4059b9e599c43d9fc7bd498a257ff7c9d872af77d39bebdb0e65fb8009eaa2ae9903dece46 SHA512 3ce8528871fd18d6abe92b98503927451d25791c9c4af0ba39a3b6ba2006030bdc137084d080e9b1ac8b5ddf5f2121e0a3ef34bb2033a040f2c72c8149a9fc0d
 DIST zerocopy-derive-0.7.33.crate 37907 BLAKE2B 9106804643067ca3d21a409fc4dc8f86792a142cd770679d49d29da0fad148de00c105fd18f0ca7a615b4c99ad86242fff17043e0ad4e5c5375fa088e2fac2b0 SHA512 8cdb8164906029da51f604675a7c03ae0b60e7ba43a7273cd93028f814d4fe15b231b65b47df4cae1898c154e9a06701dea81bc82278e1732eae17a422b28229
-EBUILD syd-3.17.4.ebuild 5397 BLAKE2B 9005b1b1a6eee3407f6e7364f5baf5278d903c38ec7d92717c11f9c9f10b2135ce0fbacc9abe86061294800d398c21c11970d879cf835fab02b2f0cf71e74363 SHA512 f5cf02b806e0fc1113e17fc3933213d0cd8ca0748a90148d644ab00455dabb3782aeb3ea320fe0d25995b04b3c2cbb7bc812573bf086624349f767dc3979e4b4
 EBUILD syd-3.18.3.ebuild 6537 BLAKE2B db697743e3dfcc9f10df70f9ba2b3b9da5d2f6070b617808cf2b0b4a37fbd96d20a52b3347d5d175a82e0296098874cd0ade5a23f50863c4cd0aaef25d4ae891 SHA512 38b5b292ba7f387508a4bdb5ee76873f86678c714373866f33bef540125584f02688d669de138ae85310836c7cc3f3bf0e7d9f5dac870784ab78930f0abfe23c
+EBUILD syd-3.18.5.ebuild 6537 BLAKE2B db697743e3dfcc9f10df70f9ba2b3b9da5d2f6070b617808cf2b0b4a37fbd96d20a52b3347d5d175a82e0296098874cd0ade5a23f50863c4cd0aaef25d4ae891 SHA512 38b5b292ba7f387508a4bdb5ee76873f86678c714373866f33bef540125584f02688d669de138ae85310836c7cc3f3bf0e7d9f5dac870784ab78930f0abfe23c
 MISC metadata.xml 254 BLAKE2B 0e6d918ec0aa523a1d7ff2da1c9081d8257c2a83396bc5c7033412341b400364ee2d9b155d9d1df05da92b11f6a940dcda2adae7c158e479d082ce4a0583971b SHA512 24b045489397ba3bcd9dc48dbbc8a26189c1220053c04f09035dd735d2a3fb2ad6a55791f943f4502fee20c633c4a30983b76093f31ce752994f424fbb3cd21b
diff --git a/sys-apps/syd/syd-3.17.4.ebuild b/sys-apps/syd/syd-3.18.5.ebuild
index 5c4695483f63..80ae803cfc48 100644
--- a/sys-apps/syd/syd-3.17.4.ebuild
+++ b/sys-apps/syd/syd-3.18.5.ebuild
@@ -13,27 +13,41 @@ CRATES="
 	ahash@0.8.11
 	aho-corasick@1.1.3
 	allocator-api2@0.2.18
+	android-tzdata@0.1.1
+	android_system_properties@0.1.5
 	anes@0.1.6
+	anstream@0.6.14
+	anstyle-parse@0.2.4
+	anstyle-query@1.0.3
+	anstyle-wincon@3.0.3
 	anstyle@1.0.7
 	anyhow@1.0.82
 	argv@0.1.11
-	autocfg@1.2.0
+	autocfg@1.3.0
 	backtrace@0.3.71
 	bitflags@1.3.2
 	bitflags@2.5.0
 	bstr@1.9.1
+	bumpalo@3.16.0
 	byteorder@1.5.0
+	caps@0.5.5
 	cast@0.3.0
 	cc@1.0.96
 	cfg-if@1.0.0
+	cfg_aliases@0.1.1
+	chrono@0.4.38
 	ciborium-io@0.2.2
 	ciborium-ll@0.2.2
 	ciborium@0.2.2
 	clap@4.5.4
 	clap_builder@4.5.2
+	clap_derive@4.5.4
 	clap_lex@0.7.0
+	colorchoice@1.0.1
 	const-hex@1.11.3
+	core-foundation-sys@0.8.6
 	cpufeatures@0.2.12
+	crc32fast@1.4.0
 	criterion-plot@0.5.0
 	criterion@0.5.1
 	crossbeam-channel@0.5.12
@@ -59,12 +73,17 @@ CRATES="
 	errno@0.3.8
 	fastrand@2.1.0
 	fixedbitset@0.4.2
+	flate2@1.0.30
 	fnv@1.0.7
 	futures-channel@0.3.30
 	futures-core@0.3.30
 	futures-executor@0.3.30
+	futures-io@0.3.30
+	futures-macro@0.3.30
+	futures-sink@0.3.30
 	futures-task@0.3.30
 	futures-util@0.3.30
+	futures@0.3.30
 	getargs@0.5.0
 	getrandom@0.2.14
 	getset@0.1.2
@@ -73,23 +92,34 @@ CRATES="
 	globset@0.4.14
 	goblin@0.8.2
 	half@2.4.1
+	hashbrown@0.12.3
 	hashbrown@0.14.5
 	heck@0.4.1
+	heck@0.5.0
 	hermit-abi@0.3.9
 	hex@0.4.3
+	home@0.5.9
+	iana-time-zone-haiku@0.1.2
+	iana-time-zone@0.1.60
 	ident_case@1.0.1
+	indexmap@1.9.3
 	indexmap@2.2.6
 	io-lifetimes@1.0.11
 	io-uring@0.6.4
 	ipnetwork@0.20.0
 	is-terminal@0.4.12
+	is_terminal_polyfill@1.70.0
 	itertools@0.10.5
 	itoa@1.0.11
+	js-sys@0.3.69
 	lazy_static@1.4.0
 	lexis@0.2.2
 	libc@0.2.154
+	libcgroups@0.3.2
+	libcontainer@0.3.2
 	libloading@0.8.3
 	libm@0.2.8
+	liboci-cli@0.3.2
 	libredox@0.1.3
 	libseccomp-sys@0.2.1
 	libseccomp@0.3.0
@@ -100,12 +130,16 @@ CRATES="
 	md5@0.7.0
 	memchr@2.7.2
 	memoffset@0.7.1
+	memoffset@0.9.1
 	mimalloc2-rust-sys@2.1.4-source
 	mimalloc2-rust@0.3.1
 	miniz_oxide@0.7.2
+	nc@0.8.20
 	nix@0.26.4
+	nix@0.27.1
+	nix@0.28.0
 	nonempty@0.10.0
-	num-traits@0.2.18
+	num-traits@0.2.19
 	num_cpus@1.16.0
 	object@0.32.2
 	oci-spec@0.6.5
@@ -123,11 +157,18 @@ CRATES="
 	pkg-config@0.3.30
 	plain@0.2.3
 	ppv-lite86@0.2.17
+	prctl@1.0.0
 	proc-macro-error-attr@1.0.4
 	proc-macro-error@1.0.4
 	proc-macro2@1.0.81
+	procfs-core@0.16.0
 	procfs@0.15.1
+	procfs@0.16.0
 	proptest@1.4.0
+	protobuf-codegen@3.2.0
+	protobuf-parse@3.2.0
+	protobuf-support@3.2.0
+	protobuf@3.2.0
 	quote@1.0.36
 	rand@0.8.5
 	rand_chacha@0.3.1
@@ -146,12 +187,14 @@ CRATES="
 	rs_sha3_256@0.1.2
 	rs_sha3_384@0.1.2
 	rs_sha3_512@0.1.2
+	rust-criu@0.4.0
 	rustc-demangle@0.1.23
 	rustix@0.36.17
 	rustix@0.38.34
 	rustversion@1.0.15
 	rusty_pool@0.7.0
 	ryu@1.0.17
+	safe-path@0.1.0
 	same-file@1.0.6
 	scopeguard@1.2.0
 	scroll@0.12.0
@@ -165,25 +208,39 @@ CRATES="
 	slotmap@1.0.7
 	smallvec@1.13.2
 	strsim@0.10.0
+	strsim@0.11.1
 	strum@0.26.2
 	strum_macros@0.26.2
 	syn@1.0.109
 	syn@2.0.60
+	tabwriter@1.4.0
 	tempfile@3.10.1
 	thiserror-impl@1.0.59
 	thiserror@1.0.59
 	thread-id@4.2.1
 	tick_counter@0.4.5
 	tinytemplate@1.2.1
+	tracing-attributes@0.1.27
+	tracing-core@0.1.32
+	tracing@0.1.40
 	unarray@0.1.4
 	unicode-ident@1.0.12
+	unicode-width@0.1.12
+	utf8parse@0.2.1
 	version_check@0.9.4
 	walkdir@2.5.0
 	wasi@0.11.0+wasi-snapshot-preview1
+	wasm-bindgen-backend@0.2.92
+	wasm-bindgen-macro-support@0.2.92
+	wasm-bindgen-macro@0.2.92
+	wasm-bindgen-shared@0.2.92
+	wasm-bindgen@0.2.92
+	which@4.4.2
 	winapi-i686-pc-windows-gnu@0.4.0
 	winapi-util@0.1.8
 	winapi-x86_64-pc-windows-gnu@0.4.0
 	winapi@0.3.9
+	windows-core@0.52.0
 	windows-sys@0.45.0
 	windows-sys@0.48.0
 	windows-sys@0.52.0
@@ -212,8 +269,8 @@ CRATES="
 	windows_x86_64_msvc@0.42.2
 	windows_x86_64_msvc@0.48.5
 	windows_x86_64_msvc@0.52.5
-	zerocopy-derive@0.7.32
-	zerocopy@0.7.32
+	zerocopy-derive@0.7.33
+	zerocopy@0.7.33
 "
 
 inherit cargo
@@ -247,6 +304,7 @@ src_configure() {
 		local myfeatures=( "log,mimalloc,uring,utils" )
 		cargo_src_configure --no-default-features
 	else
+		local myfeatures=( "oci" )
 		cargo_src_configure
 	fi
 }
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 94244c55d97c..94cb1a1904f6 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -13,11 +13,11 @@ DIST util-linux-2.39.3.tar.sign 833 BLAKE2B 433b9ad6e97d9e2ffbd516addf8406587d00
 DIST util-linux-2.39.3.tar.xz 8526168 BLAKE2B cd7b2b3c820e920d4a6ecd46fd807e018fc8e54439292f5e62c5f6863dd0f2505df3ec02c470d9be255a437c6ee8e4077908ac78d19a0d1273854d99eb571df0 SHA512 a2de1672f06ca5d2d431db1265a8499808770c3781019ec4a3a40170df4685826d8e3ca120841dcc5df4681ca8c935a993317bd0dc70465b21bf8e0efef65afa
 DIST util-linux-2.39.4.tar.sign 833 BLAKE2B cbefaa4968ac82491c9eaa467c5e84e9b4a0c8dac74855aa04536a08f2c924e5f027f1a6389bd75e4366671addfe10a292f293295734041da7dc90971209134c SHA512 3f29551913cf8206c144edb0f3575beabf6e228564cf4aaf8f83d44d45ec8f24c22c7d178cc225804ecdfc66f6c24ee790e3b3660622975fdeec98fe7e2500aa
 DIST util-linux-2.39.4.tar.xz 8541176 BLAKE2B 53fef6f36b802d5e4c1112376c77e5cd832280d9eaeb9a6a98b2371334a1a3a8a48f5589d16f67c623a5050ae3b16dafc43ee26a9e8cb77079f9b6a2ee6c9480 SHA512 94e0282ac9705ca666d3c3864f2656bd1a21d879339164edd2c413ae7665b1cfec01f9c58a83b3148b8c4b4e857653447e5523c3b27230b175dd39f75ac6fae0
-DIST util-linux-2.40.1-rc1.tar.sign 833 BLAKE2B ba3b6d9314f23b6d9ff810c3de42c3f15ea5f5b372995bf1a9b4b3ab9946d037eda8fac3f5f61b14db7c9491e693e09738140a20477b0cc508f44a08f81cf8d5 SHA512 eaeba8f822f84a399ce0a7df2bac6a609c1802c7c33877b3cd18279869d007c32d6d267488222475846acc05ec0dc2b93b90975fd67b7df3dc17c50a46d8cf2d
-DIST util-linux-2.40.1-rc1.tar.xz 8766372 BLAKE2B 7903f75c01ba18fd73ac3f65ab7233f6d3e77954c19f28236744dbd9eec6539774a130fb20aea887e9d77d960bef62281feec1fe71623fde4d8a81932b04c33c SHA512 6023ed8f98599e1145e8d74ed5bdfe6877da5e806ac05f5e5737cf3150aac4d473e38c63e3ae7ae3d81862936bff1000bcba080166b6e673d5f226dbe271d2ff
+DIST util-linux-2.40.1.tar.sign 833 BLAKE2B 2f8537cd4f52e0c203360d081a91f17c2db13c0f6054ef02f967e8fdf03099bb8c42604864003bfb911ea7804033f4020e2f56a933667fc84ac9c4b8d01e9ed5 SHA512 ab73a27fc8601041bf7b8a088586b78c49ca83cf9c8cfe5877280c0b5c607e95695512804335a8c0ac1d243e4433595f44256407fdbfb053451b8ab40d605502
+DIST util-linux-2.40.1.tar.xz 8823784 BLAKE2B a51fcf9b63c033e470da4f4f0094f0f923fdeb5a649a5c59d2d44888e5e741dfd95e589247355296e050d9ec8dc4334c5898453af055abcb30082af6b835a3e3 SHA512 58ec6eb41d4b6bfc544a80e95c71b5f3798ab4d2a9435d3ee9e5edd56f9b3f09bcb154bdd70e002dc018938937e2e946ae731dcda0f86b362fc43423689e41fc
 EBUILD util-linux-2.39.3-r2.ebuild 10872 BLAKE2B c44068bc288acf9c77d4c697cc8b7848e3c85ab0d548672283cc76bf34eae1bf80aa39cc9afaa7105e5ad9bf0ed0494ddbebe062e7dba6aa9ec0616ee77a7eb2 SHA512 b8cc2a20122f1c094cfbd4fb3652672cf7def1d6d9b38971f2f52511893f9de1e7774ed06c03a17c4b19d58cc564a1291833974ffe0c43778d077165f6f6f538
 EBUILD util-linux-2.39.3-r7.ebuild 11232 BLAKE2B 09dcc169238dbec2e428420511062be1571484086784925f8c727ad89c10e4db37d164f2777c7f259f43ef6399c8a36d7478fe2ccb5215fbb683f6e79a81a73a SHA512 ca017f44d330ca86e64413fc78353118cbb75304e60d8c700f1e30e466a614fd888670e9232a12445311828bc356fa00008ea60b935840115da7b96347b40e42
 EBUILD util-linux-2.39.4.ebuild 11092 BLAKE2B eddaf690fd796e95c66a8965c207960ba8184833e40593b590d78d58baf58bfaa369055d1a5766a6ff8c7a33a549289d6dec316c0661ac1c7b2e632375e89acb SHA512 43467deb4af0e6a9de45f3c9f9af49b741e457d564e6cb5928a580d3e605b09c8f612b09d5493f0903a0e8cb1a0e1b2b1f58c4e7ef43dc467a2bec32bfc1f2d7
-EBUILD util-linux-2.40.1_rc1.ebuild 10897 BLAKE2B 2069f34b0066525e8c8c11d1a4f1bbe98f183066f62d18fa99943ae57bf7eb7c66ac81515b1796d89a2f4b19b84581103de226a03a4f30c0fa8ba162eaaa4428 SHA512 1cee6021f2ed2cdb729e83f0100503629724e80fae3fcb10abe17d62d7b25c88f64986b64f59efeebb35c1deeb1a5a121bc9c16e68ad1747c01f64e4f3834b1b
-EBUILD util-linux-9999.ebuild 10897 BLAKE2B 2069f34b0066525e8c8c11d1a4f1bbe98f183066f62d18fa99943ae57bf7eb7c66ac81515b1796d89a2f4b19b84581103de226a03a4f30c0fa8ba162eaaa4428 SHA512 1cee6021f2ed2cdb729e83f0100503629724e80fae3fcb10abe17d62d7b25c88f64986b64f59efeebb35c1deeb1a5a121bc9c16e68ad1747c01f64e4f3834b1b
+EBUILD util-linux-2.40.1.ebuild 10990 BLAKE2B 3475fd3c526682b3472ca51b06837c45e8b497a55329571ada5d942af015e3437ee086225d650d65be6087825dc0f11925ec99c65f376b151ba2c73c0e22254c SHA512 4762cf9a4df02848c55a1ee2ff807f795b22b82c9806f9ce0568739dc8afa36ff6eed04f95e67eaf0894f65f10e0889c9e8a399fd08b630acfdc00cfa790689a
+EBUILD util-linux-9999.ebuild 10934 BLAKE2B 7fdf6877800c580544ea5a31b7e09276822fadeb54fccb5d14f7e5087ba6706c7fc9740455a9e8c5911af214f79a86e532b381ac87684843cf5510ec30ebe537 SHA512 ad84402170eb5fa1afba21bb7c99470544532186d7546254fc486c4f774961ab7cdedb40120dbc4a580557347892c3e932bd2b9d007d301f4675218e6731b8ba
 MISC metadata.xml 1553 BLAKE2B 1c4a18f6d91be4c90bf2505745cae42f6d249a1295c6a46fc1b8ea08297842b4d3a2aa232e679a167af9fef26730ed71f651b2f71b58cbfe66bd7a5cd3743c3b SHA512 e01d390c983ac47b9a6684f70b11cc796cde1355ae7d4c12406b3d6fc5b0897a9471720844e74fceee1648f4c7d685e6b12f157adc1ad951506acefb7441635c
diff --git a/sys-apps/util-linux/util-linux-2.40.1_rc1.ebuild b/sys-apps/util-linux/util-linux-2.40.1.ebuild
index 6bf89abd6a80..fefca19af628 100644
--- a/sys-apps/util-linux/util-linux-2.40.1_rc1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.40.1.ebuild
@@ -234,6 +234,7 @@ multilib_src_configure() {
 		# TODO: Wire this up (bug #931118)
 		--without-econf
 
+		# TODO: Wire this up (bug #931297)
 		# TODO: investigate build failure w/ 2.40.1_rc1
 		--disable-liblastlog2
 		--disable-pam-lastlog2
@@ -357,7 +358,8 @@ multilib_src_install() {
 	fi
 
 	# This needs to be called AFTER python_install call, bug #689190
-	emake DESTDIR="${D}" install
+	# XXX: -j1 as temporary workaround for bug #931301
+	emake DESTDIR="${D}" install -j1
 }
 
 multilib_src_install_all() {
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index 6bf89abd6a80..a3c518db9e1d 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -234,6 +234,7 @@ multilib_src_configure() {
 		# TODO: Wire this up (bug #931118)
 		--without-econf
 
+		# TODO: Wire this up (bug #931297)
 		# TODO: investigate build failure w/ 2.40.1_rc1
 		--disable-liblastlog2
 		--disable-pam-lastlog2