gentoo auto-resync : 03:06:2024 - 00:07:25

25 files changed, 237 insertions, 501 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 3a24871d79ab..2a0434d40356 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/capstone/Manifest b/dev-libs/capstone/Manifest
index cc925d39276e..dc791ad7a6f5 100644
--- a/dev-libs/capstone/Manifest
+++ b/dev-libs/capstone/Manifest
@@ -1,8 +1,5 @@
-AUX capstone-4.0.2-libsuffix.patch 347 BLAKE2B 5478a08d072cff0873c3410ce99dcf20c7aa12594148102498c7d0ed3216af95712f0daef5e9484d1faf368b93b2b014832ead5466d60d139e9ed7bb2bd1ed02 SHA512 81ffee2dc4a406e980025402dc3f8bee886cba9f305312e03c735d4b47e69887e90240274ae1949ff9900ba2a66413d33e7ef7a9ebb83a3dc9d2769f3d008395
-AUX capstone-9999-werror.patch 533 BLAKE2B ec2589edaf25bcf551cc3b3321fd77109551270da3fbac1c0457031b14aa9bd85dff06440e219e0db22017898d7f2e779e11f63fdcc7e7112baee040393ca1f4 SHA512 c98e83e296147d4520b5323393347739b07e93ef00a339154de131a31c4eba420a6387c23a4f9382408fa9dc243b55a262f73a48412da6bc7d7d1b31cfb19f11
-DIST capstone-4.0.2.tar.gz 3439542 BLAKE2B 435729a8fef2dce6495635352101b3befe563c8404efdbb0dccabecbe2bded332221665bacdbcd9043dda72b652b6f29c0e1a548cefb8c64d5b6b9dc174ed3d9 SHA512 7f93534517307b737422a8825b66b2a1f3e1cca2049465d60ab12595940154aaf843ba40ed348fce58de58b990c19a0caef289060eb72898cb008a88c470970e
+AUX capstone-9999-werror.patch 791 BLAKE2B f8456764a5af797eb0c5ad9460a44c7621e96d0a673450ed7c529b9ba73d90ebd3221aefaee95f210e65c900471aebdc82e6224f9b0ed24d4b855e28b4042ece SHA512 708908bd93f6fad559075414ccd6449fa285afe18d92c377fffaddf475755249fda9cd66e5504379976f350beaf934e5cdd37e8697ff00cc24532372caed15f9
 DIST capstone-5.0.1.tar.gz 7654195 BLAKE2B 83f6681d4c9c748df00daf59f7b33637ab72eee661261c22acae40a6db2def70bb6b5339d731244fdbae6f1e1b0b5b22bb6f60c1390a1bebceb97b3f810aedb0 SHA512 350aba77ce2d96b5c25764913591ba80e4497177ae0a8b2c820c6755ee8310848fbfc54e7ccac27fafc2dbc6778118ad92c53d1b5cb601d4fa146dec7d7e11e5
-EBUILD capstone-4.0.2-r2.ebuild 1536 BLAKE2B ff48fcc776ee396d790f6c1a52a9059fc1db4650b1f73ef5b2de2caa0ed51c662ffef2d53c0008d7a3abb5261dd7ae22fbc0f214882b33e674ab7e64c2929831 SHA512 6b5913274cf1d6c9d6deb0972a2e2d3532b81e52acc88191560effa22bfc8df3374d09ea2ffa5f6ca804c292e671d523793dd937c7e658fe03cbc53ff331f3f7
-EBUILD capstone-5.0.1.ebuild 1772 BLAKE2B f76ea315ba0d0f008d73b41aba175fefb2c97c7bd2b59a5f7d1239d04a925d558cd443a2bc52a18f64d9fb960d6fd6430db0b8a3ae7a9a48eac604a6be46d048 SHA512 a5c49ebf8c4794bac61d2125711cf6f746e8ceab4e8df7b4ab6277a07c759f8d956e87de395b02fc7a4c93f9943d67d6a2b15eabf73c2625a66df45d5f406137
-EBUILD capstone-9999.ebuild 2011 BLAKE2B ba99ea124dc4bde09972d93f5f13878eb79efba8faec9fe0be830a4b925257bdcba3776d5eedf7675c5788438935993e05e987c4c4e22cf74a43e793cbd809ca SHA512 0f43f3a9a17bf0b20aedaa6373c774ec15b551e6641b311857c3d7fba83cc2f0a7c2e04c3f7eb48ff85a95343fa53ef6ce22e8f850a86db484f93d637a9130cc
+EBUILD capstone-5.0.1.ebuild 1799 BLAKE2B 1cf12fc111a83bf589f9f0d29a8eefe3a35bebaba45a6657e05a3a62373046e0a0a8525b7af77c47c397bacafbc92ba92eed4f8976e71362ab62616b28af2134 SHA512 9c591b8383f45d3a7d9cd64f66977f6b7b86fd869028745a422f061cf8844849106f3682c982f1a6b11f93482b33774c779cf06e22a1ca3ac5714592dffdd344
+EBUILD capstone-9999.ebuild 2043 BLAKE2B 1f3402a4ec5367ee7a345a67bbf904dbe90caee87c9a877f52ac736844ee182c9af81c0d4eb80c94f3f17cb45a43bb92988d662a34ea313a57f0159d6fc14f64 SHA512 b74f47af67c46a46bc2aae10bc64049e7875f81205cdf8f5b4d3a962fefd8823d76841e25df2ff93be3001448db3606385a59daf1efa97179767fc4d34504e3c
 MISC metadata.xml 484 BLAKE2B 32c39bf06443ce4ca18191a4c9626cf517d5bd4f837c179e6186a68a0053217bf41d61d2c4d46c9792b1974879d22b36e4a02fa461a1b085acf5c4406bde4891 SHA512 f06dcd3133982f72cf21c5bb3d9a34207d7083233b5e70856f6a1dab60ef361cf1432659af30ea6b90fcb38cfdaec49f0792623ef841e136bc33cb5e1c40d1cf
diff --git a/dev-libs/capstone/capstone-4.0.2-r2.ebuild b/dev-libs/capstone/capstone-4.0.2-r2.ebuild
deleted file mode 100644
index 579ef58d9929..000000000000
--- a/dev-libs/capstone/capstone-4.0.2-r2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake distutils-r1 toolchain-funcs
-
-DESCRIPTION="disassembly/disassembler framework + bindings"
-HOMEPAGE="https://www.capstone-engine.org/"
-SRC_URI="https://github.com/capstone-engine/capstone/archive/${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/4" # libcapstone.so.4
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-# A few disassembly outputs need an update
-RESTRICT="test"
-
-IUSE="python static-libs test"
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
-"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-#TODO: needs upstream fixes
-#distutils_enable_tests setup.py
-
-S=${WORKDIR}/${P/_rc/-rc}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-libsuffix.patch
-)
-
-wrap_python() {
-	local phase=$1
-	shift
-
-	if use python; then
-		pushd bindings/python >/dev/null || die
-		echo distutils-r1_${phase} "$@"
-		pwd
-		distutils-r1_${phase} "$@"
-		popd >/dev/null
-	fi
-}
-
-src_prepare() {
-	tc-export RANLIB
-	cmake_src_prepare
-
-	wrap_python ${FUNCNAME}
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCAPSTONE_BUILD_TESTS="$(usex test)"
-		-DCAPSTONE_BUILD_STATIC="$(usex static-libs)"
-	)
-	cmake_src_configure
-
-	wrap_python ${FUNCNAME}
-}
-
-src_compile() {
-	cmake_src_compile
-
-	wrap_python ${FUNCNAME}
-}
-
-src_test() {
-	cmake_src_test
-
-	wrap_python ${FUNCNAME}
-}
-
-src_install() {
-	cmake_src_install
-
-	wrap_python ${FUNCNAME}
-}
diff --git a/dev-libs/capstone/capstone-5.0.1.ebuild b/dev-libs/capstone/capstone-5.0.1.ebuild
index 2e024af16add..3fc30763814c 100644
--- a/dev-libs/capstone/capstone-5.0.1.ebuild
+++ b/dev-libs/capstone/capstone-5.0.1.ebuild
@@ -35,7 +35,7 @@ DEPEND="${RDEPEND}
 BDEPEND="${DISTUTILS_DEPS}"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-distutils_enable_tests setup.py
+RESTRICT="!test? ( test )"
 
 if [[ ${PV} == *_rc* ]]; then
 	# Upstream doesn't flag release candidates (bug 858350)
@@ -90,3 +90,7 @@ src_install() {
 		find "${ED}" -name '*.a' -delete || die
 	fi
 }
+
+python_test() {
+	emake check
+}
diff --git a/dev-libs/capstone/capstone-9999.ebuild b/dev-libs/capstone/capstone-9999.ebuild
index 6d46a0133be7..ae151ecdb8fb 100644
--- a/dev-libs/capstone/capstone-9999.ebuild
+++ b/dev-libs/capstone/capstone-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -35,15 +35,15 @@ DEPEND="${RDEPEND}
 BDEPEND="${DISTUTILS_DEPS}"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
+RESTRICT="!test? ( test )"
+
 PATCHES=(
 	# Currently "-Werror" is only added in the `next`-development branch, but
-	# not merged into 5.* releases. Eventually this patch may be needed in
-	# version 5 releas line. See bug #911481.
+	# not merged into 5.* releases. Eventually this patch may be needed in the
+	# version 5 release line. See bug #911481.
 	"${FILESDIR}/${P}-werror.patch"
 )
 
-distutils_enable_tests setup.py
-
 if [[ ${PV} == *_rc* ]]; then
 	# Upstream doesn't flag release candidates (bug 858350)
 	QA_PKGCONFIG_VERSION=""
@@ -97,3 +97,7 @@ src_install() {
 		find "${ED}" -name '*.a' -delete || die
 	fi
 }
+
+python_test() {
+	emake check
+}
diff --git a/dev-libs/capstone/files/capstone-4.0.2-libsuffix.patch b/dev-libs/capstone/files/capstone-4.0.2-libsuffix.patch
deleted file mode 100644
index 056140be13df..000000000000
--- a/dev-libs/capstone/files/capstone-4.0.2-libsuffix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-cmake does not provide 'LIBSUFFIX' variables, but provides 'LIB_SUFFIX'.
-https://bugs.gentoo.org/730722
---- a/capstone.pc.in
-+++ b/capstone.pc.in
-@@ -1,6 +1,6 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=${prefix}
--libdir=${prefix}/lib@LIBSUFFIX@
-+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
- includedir=${prefix}/include/capstone
- 
- Name: capstone
diff --git a/dev-libs/capstone/files/capstone-9999-werror.patch b/dev-libs/capstone/files/capstone-9999-werror.patch
index 1ec58fa056a3..d5f09ca7d656 100644
--- a/dev-libs/capstone/files/capstone-9999-werror.patch
+++ b/dev-libs/capstone/files/capstone-9999-werror.patch
@@ -2,12 +2,12 @@ Bug: https://bugs.gentoo.org/911481
 Upstream: https://github.com/capstone-engine/capstone/pull/2114
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -28,7 +28,7 @@ project(capstone
- if (MSVC)
-     add_compile_options(/W1 /w14189)
- else()
--    add_compile_options(-Werror -Wformat -Wmissing-braces -Wunused-function -Warray-bounds -Wunused-variable -Wparentheses -Wint-in-bool-context)
-+    add_compile_options(-Wformat -Wmissing-braces -Wunused-function -Warray-bounds -Wunused-variable -Wparentheses -Wint-in-bool-context)
- endif()
+@@ -25,7 +25,7 @@ project(capstone
+     VERSION 5.0
+ )
  
+-set(UNIX_COMPILER_OPTIONS -Werror -Wall -Warray-bounds -Wshift-negative-value -Wreturn-type -Wformat -Wmissing-braces -Wunused-function -Warray-bounds -Wunused-variable -Wparentheses -Wint-in-bool-context -Wmisleading-indentation)
++set(UNIX_COMPILER_OPTIONS -Wall -Warray-bounds -Wshift-negative-value -Wreturn-type -Wformat -Wmissing-braces -Wunused-function -Warray-bounds -Wunused-variable -Wparentheses -Wint-in-bool-context -Wmisleading-indentation)
  
+ # maybe-unitialzied is only supported by newer versions of GCC.
+ # Unfortunately, it is pretty unreliable and reports wrong results.
diff --git a/dev-libs/libliftoff/Manifest b/dev-libs/libliftoff/Manifest
index 72be9f5d2716..93e94c21d2c2 100644
--- a/dev-libs/libliftoff/Manifest
+++ b/dev-libs/libliftoff/Manifest
@@ -1,5 +1,5 @@
-DIST libliftoff-0.3.0.tar.gz 31691 BLAKE2B 7584518f709b9a6eb975ece00b4e194de2d1e8dde71d831600b13785b8cef86b5e36493068c2345f02b85c20454d88a7cabc6082170591e7769c44f9894fd2be SHA512 696f771aef60a9bcd71e1e2e04b5abea4f3c67a0aae231f360b43cdb5835a2181f482372ab1128fe152b0cb214786f924c33ee9ecf13dfe08c1b260d03d241a4
 DIST libliftoff-0.4.1.tar.gz 36504 BLAKE2B 23e73a9bb10a3c80caa21719bc2b857d612606f68559792731c04bf5b32d072b798e6f1a44da172910fbd2fbe6b439ef27d3848bf5c993a9f2a4d062a1038581 SHA512 4144dda17775a2b6f9f32bb62de9119365e93625ffeb6fb16c49224fcbe76991c18e66382a458ac4a648e5d72879c52be089ef3673e825edc158d73c97c874dc
-EBUILD libliftoff-0.3.0.ebuild 424 BLAKE2B b92b27a48682fb61d7c3cb5c76b658f6ef5282a529dc03238815a1557b520fad8c7f3513e0dee2d6342f3502f7f496f1a206c5c9d99198d7cb071345528f8f13 SHA512 92d3c14c6ff8be3098d101fe5fdae9d41351930178efe871e1c4560be74395a3603e4f0025f0df5576a9f4296d42a64a915626c4d8d134d8c598e5c0f749bfe2
+DIST libliftoff-0.5.0.tar.gz 39076 BLAKE2B a5c35c734a5ba4049661ce336401bd88d393001d7c49786d486146998d39530c364f7752b53968f5ab48f5eb774fa9c4245087bdb016f459a729991377023f61 SHA512 ce808f6a087f1f629cfebef95bfc7e216a09fb409b96b3c9f6b84d9d986ce50c5d7bf5b45c68e8baa99566b3627d754c269855b6f4ec3be63ae7b9f5109d5f08
 EBUILD libliftoff-0.4.1.ebuild 456 BLAKE2B 89e35c5c88b57571c669928cd797e955c5ddb050796c6f7629d37ef632ba1f2b0f047e6cd1f45b3dd869e3286071fca7c646491bce1447707e171be4f22156c1 SHA512 aba52a87e100c31d52e77df0d2648929df2752be4736f152ba907504c54098e09ac0f80890a88455eb9e0e830ddf44a0a13728a978cf0c28248514e4d6daa8e3
-MISC metadata.xml 248 BLAKE2B edac7e3ba8c55e21f79f34bf97705bdd8ceb89a6433c8bb250caa9e0549ac8960551566884194fb09ba596c54fe5166708c66f4d3185389c142f6fc08c53763c SHA512 c8d7e336ee4062bfc9a9fb25250d7388b837e839dc641adcbb9caf1bfb80b197e1f6171cc7842ca7edfbc26c27db5ee8b348b4e35f5a88dd5f8dbc7a8031108b
+EBUILD libliftoff-0.5.0.ebuild 457 BLAKE2B 5707119c1e418cc5c1c4e36f721de1ff422c3372a5345a410457159d5ba9137279fcdbc1133e83e5035183a53043b4fffb6f2884680b25772c2a7b28e3771cae SHA512 6e997d3b51aa2f8d545b5fcef444d6b58beaf2d7cf522d9904c168b4da030b746b86fa15ee0cdb179a4c5cc1ab2debd81660568cd2584bda5f3e9d17394786ee
+MISC metadata.xml 344 BLAKE2B 9bebaf9d80e8d44371d67afebd3a231d3a77ae61252cbf34ccf8f4a07595fb699b02046fa0aef5460cc27670dfe2e200cd363b59d8e0ca4ec21e778e48d822f3 SHA512 d36ce2d4e1e8aec0f949dcedb9c9dcc4c86d1855818c6ebd843259f32b66f3d30f3426a20427a55480b3a08ac711b127b7a9d9dca5c12086b9c8f8a5127ed9b9
diff --git a/dev-libs/libliftoff/libliftoff-0.3.0.ebuild b/dev-libs/libliftoff/libliftoff-0.5.0.ebuild
index bb61df9cef3f..7056705fe1a1 100644
--- a/dev-libs/libliftoff/libliftoff-0.3.0.ebuild
+++ b/dev-libs/libliftoff/libliftoff-0.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,9 +8,9 @@ inherit meson
 DESCRIPTION="Lightweight KMS plane library"
 HOMEPAGE="https://gitlab.freedesktop.org/emersion/libliftoff"
 SRC_URI="https://gitlab.freedesktop.org/emersion/${PN}/-/releases/v${PV}/downloads/${P}.tar.gz"
-KEYWORDS="~amd64"
 LICENSE="MIT"
 SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	x11-libs/libdrm
diff --git a/dev-libs/libliftoff/metadata.xml b/dev-libs/libliftoff/metadata.xml
index 96b4fdc27920..f1762d449434 100644
--- a/dev-libs/libliftoff/metadata.xml
+++ b/dev-libs/libliftoff/metadata.xml
@@ -5,4 +5,7 @@
 		<email>chewi@gentoo.org</email>
 		<name>James Le Cuirot</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="freedesktop-gitlab">emersion/libliftoff</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/liblouis/Manifest b/dev-libs/liblouis/Manifest
index 2cff72f5d9e4..9c0bdbf96f68 100644
--- a/dev-libs/liblouis/Manifest
+++ b/dev-libs/liblouis/Manifest
@@ -1,5 +1,7 @@
 DIST liblouis-3.23.0.tar.gz 16738612 BLAKE2B b4508d27eaa9669bb2a1fbaac55edb3a85d3d2df18a8b26f4c9c396579b04614da3b3bcd6af45459d9129d2b81a920262dcb8fef7bee4290752174411fd66109 SHA512 25819758fc987ed378c439c5d40efd2692247a6020a40e5909320021e518e0518f5b022dda4ea5c7006a0f1ce2a4225d4ee1404560987bb2dd83504d58aa09db
 DIST liblouis-3.25.0.tar.gz 16939419 BLAKE2B f67dc1ee3aa9eb32fcf0693b3a31d40c56f048b393785011ec2b4c61611a3ab67d181d1e76148c489e443e3b0c4d5f7846ac1b4810ffa2c6a6e1d081cceab6ae SHA512 4e6456f30e845b955e98346cb94bdd4eaa6aff30f3e29fbd4e91c5bb58d1182c679fbf8afa27d7031c80d5755ae8567b830fa57c175522a038ef18d1bdc0707d
+DIST liblouis-3.29.0.tar.gz 17073843 BLAKE2B b7735f4c59c46cef55f4748b54395b95f4f3623be37bd42bbed4249232d5ab4ad966e4f08945f91516be30f19735ed774411cfe4bc8e1c7822f04af2d0b0db27 SHA512 c2f51686e869921658a95a58102799ebcf45da9b73f7d81912462451236134be7c148b78f35a1e0586cd349bbcb62238218c9ae547092bed9303238c22963589
 EBUILD liblouis-3.23.0.ebuild 1759 BLAKE2B 912ab7776d3d0e4dad6906c993f4bc3dc47466ebb286705edac8205ec188187897769881181026839c2057ea6c11cc433d6a648fa99af5fd8a58c305ce177b58 SHA512 c2e7c1ff3ad718f1ebc651dcc87c516a96599468f9d3f3605a4715fccc2e6bc0353e77c409b6c5355ad6080fa5a9523a12a9e69040b52ac621e07d4c95a5e3d4
 EBUILD liblouis-3.25.0.ebuild 2418 BLAKE2B d91afdba655494c4e8c7f350ae675d6a4647b52d2732d418b9cd2bc3279dae85726d472b9d0d3d1c4190975eda3f3dc2362e4136f1a3f5b5035b6341ccf93592 SHA512 cb5ff4d9424be649235e31cf3af3e84a5386bcd293dd87b60a7d24d06360a44687ad5444b0dcd435dc27b39f2fbfe6de49fead1dc000edae850825813d6a6a95
+EBUILD liblouis-3.29.0.ebuild 2836 BLAKE2B 116a70679950f694f132df8a9cbd64e97a4b7795107b7cb65aba516ccd19e0a19a10a85142075e02393c10b82a3e244624a39ef890621c485b5f69307bd262d6 SHA512 bd8ec8938709b5a0dff2d9a221f5ca086be6cc13b77078757baba9e4f9b89fb001b230b4c5712085e87c6696c2c52ffac28ee53ed69bdda1619687189e4bbf3e
 MISC metadata.xml 352 BLAKE2B 5c562663af1cb8a830ef585416cd7dbd4977393310fb2216ac6fb5bbaa594ad4fb144bac1a49d161e5946978cbc28acdbaf5d59e781da5438d7116f34c259290 SHA512 23c7fd40c40c8e574d995d0fdbe56242e9b1874d576ba8a34cee80e3c3e41785e782ca37fb3f89665c24d5857cb956b70c9219dc3dc35cb209f947f0b267c4be
diff --git a/dev-libs/liblouis/liblouis-3.29.0.ebuild b/dev-libs/liblouis/liblouis-3.29.0.ebuild
new file mode 100644
index 000000000000..fdd585cad1e6
--- /dev/null
+++ b/dev-libs/liblouis/liblouis-3.29.0.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="An open-source braille translator and back-translator"
+HOMEPAGE="https://github.com/liblouis/liblouis"
+SRC_URI="https://github.com/liblouis/liblouis/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/20" # follows LIBLOUIS_CURRENT in configure.ac
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+# texlive-core for patgen which is required by lou_maketable
+RDEPEND="
+	${PYTHON_DEPS}
+	app-text/texlive-core
+	test? ( dev-libs/libyaml )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${DISTUTILS_DEPS}
+	${PYTHON_DEPS}
+	sys-apps/help2man
+"
+
+src_prepare() {
+	default
+
+	#1. bug #913705
+	#2. Use correct python version
+	sed -i \
+		-e "s|\$CURDIR/lou_maketable.d|${EPREFIX}/usr/libexec/lou_maketable|" \
+		-e "s|python3|${EPYTHON}|" \
+		tools/lou_maketable.d/lou_maketable.in || die
+
+	pushd python > /dev/null || die
+	distutils-r1_src_prepare
+	popd > /dev/null || die
+}
+
+src_configure() {
+	# -fanalyzer substantially slows down the build and isn't useful for
+	# us. It's useful for upstream as it's static analysis, but it's not
+	# useful when just getting something built.
+	export gl_cv_warn_c__fanalyzer=no
+
+	econf --enable-ucs4 $(use_with test yaml)
+}
+
+src_compile() {
+	default
+
+	pushd python > /dev/null || die
+	# setup.py imports liblouis to get the version number,
+	# and this causes the shared library to be dlopened
+	# at build-time.  Hack around it with LD_PRELOAD.
+	# Thanks ArchLinux.
+	LD_PRELOAD+=":${S}/liblouis/.libs/liblouis.so" distutils-r1_src_compile
+	popd > /dev/null || die
+}
+
+src_test() {
+	default
+
+	pushd python > /dev/null || die
+	LD_PRELOAD+=":${S}/liblouis/.libs/liblouis.so" distutils-r1_src_test
+	popd > /dev/null || die
+}
+
+python_test() {
+	local -x LOUIS_TABLEPATH="${S}"/tables
+	"${EPYTHON}" tests/test_louis.py || die
+}
+
+python_install() {
+	distutils-r1_python_install
+	python_scriptinto /usr/libexec/lou_maketable
+	python_doexe ../tools/lou_maketable.d/*.py
+}
+
+src_install() {
+	pushd python > /dev/null || die
+	LD_PRELOAD+=":${S}/liblouis/.libs/liblouis.so" distutils-r1_src_install
+	popd > /dev/null || die
+
+	# These need to be after distutils src_install, or it'll try to install them from under python/ as well
+	DOCS=( README AUTHORS NEWS ChangeLog doc/liblouis.txt )
+	HTML_DOCS=( doc/liblouis.html )
+	default
+
+	# bug #913705
+	mkdir -p "${ED}"/usr/libexec/lou_maketable || die
+	mv "${ED}"/usr/bin/lou_maketable.d/*.{mk,pl,sh} "${ED}"/usr/libexec/lou_maketable/ || die
+	rm -r "${ED}"/usr/bin/lou_maketable.d || die
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libratbag/Manifest b/dev-libs/libratbag/Manifest
index 2d2a789fb7b4..bfb1d005c41d 100644
--- a/dev-libs/libratbag/Manifest
+++ b/dev-libs/libratbag/Manifest
@@ -1,10 +1,7 @@
-AUX libratbag-0.16-musl-error.h.patch 1786 BLAKE2B 80e333dfa7e7e2a6d207885836b3654f01c821a21d1cda233770eb4d5879239b74e0886826f2118b1e7f5674f35e697ec933b79b43f0f415c94a1c62e159594e SHA512 43fd1e68670228a438c68714987d7ff930abfc271dc54abc26e0c7809e2302c7d3d45d3293ae9edfde2887b54a74dcda9eeff372145165eed5cb048672d8c69a
+AUX libratbag-0.17-python3.12-imp.patch 1345 BLAKE2B 8b65589c91e7f8f1b81bb88961eb5b549c12f16bef5ae8d435d9c8fc3c233d44e04d5d94f317fb0e0c0a3bf3b31956457ba0fbaa52fb7323ca48f772f03e7b70 SHA512 6272dcc3ea3b746e1976b985a2dd04c16eb30e950fb1f97e85a163416a0e2aacbb688c6f3e6bcc44b866ed04e48f4646bdc033ca039d9860ab868e5762d410e6
 AUX ratbagd.init 336 BLAKE2B c6f2ef095cd7d929c3097a18e912ae4b3615bd0ebbdfdaa9f4151b312614c016af2f3581c2fbb2853472cb70ce47d5f26f254772fb9f3dabba2ce93626b672b7 SHA512 3908b3481b49bcebc84e3023ff911dcbc1773e4322356def0067ed4aa426184cf43e12de702e98210157d17c2806d57c1cb4bc79ddb0b8660036a6fe3974607e
-DIST libratbag-0.15.tar.gz 249492 BLAKE2B 0f5b35800cb9f82cb892dacd5e3b041843cf5513507ee4882ec5b3f8c8aec8a24594736f2eb1c8e373a0ee38ace1e6328cbd4816d6e5b2cd1f2154ebd803a5fa SHA512 add47a6b3d771de77c6307e128a549f5295e216059b5a2375aa6b2b6bbebcf9a93d7bf148181b3f39f855976e9b6f57072dd9198d07828bebe85409f4ad994aa
-DIST libratbag-0.16.tar.gz 253080 BLAKE2B ede56838c822519b4fe4c6846f5d6d237104fc06f96fb17aa62b4c712965f00827973ebe732ee5ac9a16f101baf0b63eb445fbb97746df3b8ed24d6e085b34e1 SHA512 b3f2fee39ec85c0e08d257753241fb0e553de53eb7409a3b95f93a0fac3989a9411c53c915e72bef19bcfc5682fe9cdafaeb1f41f2718ab02766859f565415e3
 DIST libratbag-0.17.tar.gz 279273 BLAKE2B 7252afc8bca5d95c24d61dbd68c4e486550df7d6d9fa74a8c9d2a58c6363ed2ee289c0d02cdd72c968618f5c08a0687c97836dd2c47b457ba4228f4716b50cb9 SHA512 80ab5c895d83e28b6b6adcd0669854944d7932ef037c8d64b923a7362399e861475e9d81c5ee2cf814f654d7796b00a81314cc177f34e13c8684d525974068c8
-EBUILD libratbag-0.15.ebuild 2089 BLAKE2B 32577021a0a4033ef11dafa52d602c18edd756c0139bedcced067a830fe66db3e57320026f65edf5c2b8eaf9a5ead02f6260c636916026d63edd59b817aff1b5 SHA512 b28697fe6e63a9a4e0f77fb801bd0e58cb232276412cbffc4af25c3e09f4d2ad643e930dae985eea2249174aaa283c7514f38f6d08db6faabc3b9e27292dba98
-EBUILD libratbag-0.16.ebuild 2147 BLAKE2B 01f7df46baa647ca78d387e311292f70622bcb511699bb9da683bad33f0cc72e1a841d5ee326d5a8700e6ace862c3d0223921bf9005af620180eee7117c84b0f SHA512 8345e54c264f4fa9e41cda1ccc9d5f6d157c438c40dda2b2eb78aeab0696fa0501ed53ff6d67c39e621fe4ef50b58b1aaa24ce823a0e1d792f3df0d5420278d5
 EBUILD libratbag-0.17-r1.ebuild 2314 BLAKE2B 41f25df17270fd0f537d91534dade949bac360b80399ce8302b6fcc95c7b5c57d49c8699138756d3396bbf432db746c3ab8835b3181f3e33d79a4af5af68a4fe SHA512 8a5a703725c2dfc7fcf5440d3a3ebf3e35399078bb32a724a0bf8f41147c99b9cbdb8dfcc597c1647bcba12e7c70f42b96265b8f71569dd0e9719e8378a7204c
-EBUILD libratbag-9999.ebuild 2314 BLAKE2B 41f25df17270fd0f537d91534dade949bac360b80399ce8302b6fcc95c7b5c57d49c8699138756d3396bbf432db746c3ab8835b3181f3e33d79a4af5af68a4fe SHA512 8a5a703725c2dfc7fcf5440d3a3ebf3e35399078bb32a724a0bf8f41147c99b9cbdb8dfcc597c1647bcba12e7c70f42b96265b8f71569dd0e9719e8378a7204c
+EBUILD libratbag-0.17-r2.ebuild 2378 BLAKE2B 9d7a0dc9b30be878e69e4147ea230a398ccf8358639bd399a31865356d12447dcfe70de97009d031c6c6f04aecc3c3bdbe164f25571c0a6f64bb422029fd19c6 SHA512 3c10d0316bd84746263b2e872e9de509e5b70d36daa6d20d6daedb85707260cb8d180a4a58df7a771d2a1738917c3bc0f3e298c0f46943ef92fbd720f5de4443
+EBUILD libratbag-9999.ebuild 2314 BLAKE2B 154fbe01378273fc6a0a7c2c4fe4824db1a5de068d8d58930cf32ffd93b40ce9a1b1c697b4de6780b04d0a0a8cf8e0252930f6a9a17547a6303f13a47bb41bc0 SHA512 e66b1202c01d54ecb458128bd52bc064e3519725c872867e72e068be4af0084efb5bce809022bbf7cd333444bac3eb90267f7dc2eda0dcec639d34b51f490072
 MISC metadata.xml 490 BLAKE2B 1acac7162603488b92a2a99c2bf9ee12971b79d62b48ebea2bc6fdbb5e45f351002cb932cd6a8222fcd23acdffa77d4cd708b71459a5f557f668a9687da66efa SHA512 e55ba297fed6952b379b92bf14adfe02fd4a90a7f305d70126fb28ff12c63e64ff2781f378c279bd17392bf917d31f4ed2b3679b308ecf0e713e42eccbc9d1a0
diff --git a/dev-libs/libratbag/files/libratbag-0.16-musl-error.h.patch b/dev-libs/libratbag/files/libratbag-0.16-musl-error.h.patch
deleted file mode 100644
index a3b0b187c154..000000000000
--- a/dev-libs/libratbag/files/libratbag-0.16-musl-error.h.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-# Since musl doesn't provide error.h we need to check before adding it. If
-# error.h is present in system only then we include it else we use err.h.
-# Already there exists a bug report for this upstream [1]. The devs are open to
-# a custom implementation of error but for now this patch for do it.
-#
-# [1]: https://github.com/libratbag/libratbag/issues/1253
-#
-# Closes: https://bugs.gentoo.org/830557
---- a/meson.build
-+++ b/meson.build
-@@ -74,8 +74,13 @@ dep_libevdev = dependency('libevdev')
- dep_glib = dependency('glib-2.0')
- dep_json_glib = dependency('json-glib-1.0')
- dep_lm = cc.find_library('m')
-+error_exists = cc.has_header('error.h')
- dep_unistring = cc.find_library('unistring')
-
-+if error_exists
-+	add_global_arguments('-DHAVE_ERROR_H', language : 'c')
-+endif
-+
- if get_option('logind-provider') == 'elogind'
- 	dep_logind = dependency('libelogind', version : '>=227')
- else
---- a/tools/hidpp10-dump-page.c
-+++ b/tools/hidpp10-dump-page.c
-@@ -23,7 +23,12 @@
-
- #include <config.h>
- #include <errno.h>
-+#ifdef HAVE_ERROR_H
- #include <error.h>
-+#else
-+#include <err.h>
-+#define error(status, errno, ...) err(status, __VA_ARGS__)
-+#endif
- #include <fcntl.h>
-
- #include <hidpp10.h>
---- a/tools/hidpp20-dump-page.c
-+++ b/tools/hidpp20-dump-page.c
-@@ -23,7 +23,12 @@
-
- #include <config.h>
- #include <errno.h>
-+#ifdef HAVE_ERROR_H
- #include <error.h>
-+#else
-+#include <err.h>
-+#define error(status, errno, ...) err(status, __VA_ARGS__)
-+#endif
- #include <fcntl.h>
-
- #include <hidpp20.h>
---- a/tools/hidpp20-reset.c
-+++ b/tools/hidpp20-reset.c
-@@ -23,7 +23,12 @@
-
- #include <config.h>
- #include <errno.h>
-+#ifdef HAVE_ERROR_H
- #include <error.h>
-+#else
-+#include <err.h>
-+#define error(status, errno, ...) err(status, __VA_ARGS__)
-+#endif
- #include <fcntl.h>
-
- #include <hidpp20.h>
diff --git a/dev-libs/libratbag/files/libratbag-0.17-python3.12-imp.patch b/dev-libs/libratbag/files/libratbag-0.17-python3.12-imp.patch
new file mode 100644
index 000000000000..6ded679b1bad
--- /dev/null
+++ b/dev-libs/libratbag/files/libratbag-0.17-python3.12-imp.patch
@@ -0,0 +1,38 @@
+https://bugs.gentoo.org/929423
+https://github.com/libratbag/libratbag/pull/1569
+https://github.com/libratbag/libratbag/commit/27b0d4a2d9cd21fa9f11a0770d94c578db6324d1
+--- a/tools/toolbox.py
++++ b/tools/toolbox.py
+@@ -21,7 +21,8 @@
+ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ # DEALINGS IN THE SOFTWARE.
+ 
+-import imp
++import importlib.util
++import importlib.machinery
+ import os
+ import subprocess
+ import sys
+@@ -45,8 +46,11 @@ def import_non_standard_path(name, path):
+     # If any of the following calls raises an exception,
+     # there's a problem we can't handle -- let the caller handle it.
+ 
+-    with open(path, 'rb') as fp:
+-        module = imp.load_module(name, fp, os.path.basename(path), ('.py', 'rb', imp.PY_SOURCE))
++    loader = importlib.machinery.SourceFileLoader(name, path)
++    spec = importlib.util.spec_from_file_location(name, path, loader=loader)
++    module = importlib.util.module_from_spec(spec)
++    sys.modules[name] = module
++    loader.exec_module(module)
+ 
+     return module
+ 
+@@ -107,7 +111,7 @@ def sync_dbus():
+         main_context.iteration(False)
+ 
+ 
+-ratbagctl = import_non_standard_path(RATBAGCTL_NAME, RATBAGCTL_PATH)
++import_non_standard_path(RATBAGCTL_NAME, RATBAGCTL_PATH)
+ 
+ from ratbagctl import open_ratbagd, get_parser, RatbagError, RatbagErrorCapability  # NOQA
+ 
diff --git a/dev-libs/libratbag/libratbag-0.15.ebuild b/dev-libs/libratbag/libratbag-0.15.ebuild
deleted file mode 100644
index ba7c076793e6..000000000000
--- a/dev-libs/libratbag/libratbag-0.15.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_10 )
-
-inherit meson python-single-r1 systemd udev
-
-DESCRIPTION="Library to configure gaming mice"
-HOMEPAGE="https://github.com/libratbag/libratbag"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc elogind systemd test"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	^^ ( elogind systemd )
-"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/swig
-	virtual/pkgconfig
-	doc? (
-		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
-		')
-	)
-	test? (
-		dev-libs/check
-		dev-libs/gobject-introspection
-		dev-debug/valgrind
-		$(python_gen_cond_dep '
-			dev-python/evdev[${PYTHON_USEDEP}]
-			dev-python/pygobject:3[${PYTHON_USEDEP}]
-		')
-	)
-"
-RDEPEND="
-	${PYTHON_DEPS}
-	acct-group/plugdev
-	dev-libs/glib:2
-	dev-libs/json-glib
-	dev-libs/libevdev
-	dev-libs/libunistring:=
-	virtual/libudev:=
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/evdev[${PYTHON_USEDEP}]
-	')
-	elogind? ( sys-auth/elogind )
-	systemd? ( sys-apps/systemd )
-"
-DEPEND="
-	${RDEPEND}
-	dev-libs/gobject-introspection
-"
-
-src_prepare() {
-	default
-
-	if use elogind ; then
-		# Fix systemd includes for elogind
-		sed -i -e 's@include <systemd@include <elogind@' \
-			ratbagd/ratbag*.c || die
-	fi
-}
-
-src_configure() {
-	python_setup
-
-	local emesonargs=(
-		$(meson_use doc documentation)
-		$(meson_use systemd)
-		$(meson_use test tests)
-		-Ddbus-group="plugdev"
-		-Dlogind-provider=$(usex elogind elogind systemd)
-		-Dsystemd-unit-dir="$(systemd_get_systemunitdir)"
-		-Dudev-dir="${EPREFIX}$(get_udevdir)"
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	python_fix_shebang "${ED}"/usr/bin/
-	newinitd "${FILESDIR}"/ratbagd.init ratbagd
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		elog 'You need to be in "plugdev" group in order to access the'
-		elog 'ratbagd dbus interface'
-	fi
-}
diff --git a/dev-libs/libratbag/libratbag-0.16.ebuild b/dev-libs/libratbag/libratbag-0.17-r2.ebuild
index ad08ddd3c6db..7620f30d382d 100644
--- a/dev-libs/libratbag/libratbag-0.16.ebuild
+++ b/dev-libs/libratbag/libratbag-0.17-r2.ebuild
@@ -3,17 +3,23 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_10 )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit meson python-single-r1 systemd udev
 
 DESCRIPTION="Library to configure gaming mice"
 HOMEPAGE="https://github.com/libratbag/libratbag"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/libratbag/libratbag.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 IUSE="doc elogind systemd test"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
@@ -62,7 +68,7 @@ DEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.16-musl-error.h.patch
+	"${FILESDIR}"/libratbag-0.17-python3.12-imp.patch
 )
 
 src_prepare() {
@@ -102,4 +108,5 @@ pkg_postinst() {
 		elog 'You need to be in "plugdev" group in order to access the'
 		elog 'ratbagd dbus interface'
 	fi
+	elog 'You may be required to create and/or be part of the "games" group if you intend on using piper'
 }
diff --git a/dev-libs/libratbag/libratbag-9999.ebuild b/dev-libs/libratbag/libratbag-9999.ebuild
index e1cf833f0ff6..47fc210ab543 100644
--- a/dev-libs/libratbag/libratbag-9999.ebuild
+++ b/dev-libs/libratbag/libratbag-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit meson python-single-r1 systemd udev
 
diff --git a/dev-libs/libsodium/Manifest b/dev-libs/libsodium/Manifest
index b4555ff65b41..4a6c8a32bd8c 100644
--- a/dev-libs/libsodium/Manifest
+++ b/dev-libs/libsodium/Manifest
@@ -1,13 +1,8 @@
-AUX libsodium-1.0.10-cpuflags.patch 1232 BLAKE2B 07d8d993af926db81135b6366fc2219b52c82d3e04abe7208bddcc62b4ec9db5dc9480f7c3c40b6d750a4d5465942b49e4d3840189bf92586a93d99f7510e254 SHA512 0559e5073c3238d887fc34a9f9cd78bde6d628e36c8741ff8bdd0e7db5bca4f510e3b0e2b858c0ecb83433b3cb74ad1c957c61d68ae406843f42139af8b382fd
 AUX libsodium-1.0.19-cpuflags.patch 1448 BLAKE2B 36a54f26c3e8522109e39e08908291d461de8fe25c554c34d87b0487f07f25cb74f1ef93d567da0cc5695868c1bb83ee073f28956292aa467ce95d48bb5fde02 SHA512 8fcf8b59ca151eb8604ae4ea5ab55f9005a125eb4eb7e0493e01862ddbcbfc2eb3a17e4d4c043a311af84b90717bd979019d380de045bf7829a92f94d7b63f95
-DIST libsodium-1.0.18_p20220618.tar.gz 1869858 BLAKE2B 60d46f722c4e5c9896226e3e03c31768a2183bae80a535234b23ac5bc9a2c3632d6c891ce72cbc1d6dc633a15b539111e322c2d210f993f99d6e5bd32f8a8b63 SHA512 14d1c6109de2ac02ba6cb5541746275f6deb25302b60cb3f65a7922b34d2c3bd5f17a4d730acf77a53d5837be00228c68fa06c6a2e9095ea97f6d8c4b782ab6b
-DIST libsodium-1.0.18_p20220618.tar.gz.minisig 318 BLAKE2B a2cba3c62ca5a84e7897373cdfe4033c636c652c848bf9beff15765d359f1dd2a8834dc3a4d4443d0b9418a59a94309cf9c5c917ae9c8965778411e21f98e4e6 SHA512 ca1ac892b41c5cb6dd1ba9d4bbde8e75987e66023d29cfc81839bbb3b99efa215f7db1ef903c375dd9d2d5a76f6064b3c7eab833081d21983693b7db87175160
-DIST libsodium-1.0.19.tar.gz 1945523 BLAKE2B de43520150b55760142d186404cc3e49471c6e911a7a590c7ae08bc61e928c063c459555f49cd88155238fb0008ef3924b6d7c14ba9cff2f90f1e96201e1259c SHA512 8e9b6d796f6330e00921ce37f1b43545966094250938626ae227deef5fd1279f2fc18b5cd55e23484732a27df4d919cf0d2f07b9c2f1aa0c0ef689e668b0d439
-DIST libsodium-1.0.19.tar.gz.minisig 318 BLAKE2B e86e653107478d9e9281894632baafda57358229f2d56fcaf55591098e38d6be72ed2f599a7f2c16d5b9978d2cbfe8e07db4e772b053a832a61fd325fc1efae4 SHA512 8b5993bd7e541a5913ea1659c1009c4edefd9b5907e0a7c9090fa604c23d77006ad9d9a897d66243162742d63ce9bc1f2c81091d50a584f1495dd3bd87d4451e
 DIST libsodium-1.0.19_p20240117.tar.gz 1946650 BLAKE2B 6faa56733ed28f34d58b41a71a41d6ba6369e2f5686e01169f83d5fe955523825bd250cfd59e15515b24f67cef1610af41749b6f56bc370e7f77708a86bd7684 SHA512 2cefd883b60fba5522bf4a6f3c73f9bc54164340400377089eea8fbb01447f1137fcb7f6183845a6c5e2aad51982122a356272b4eda5452d7b550a65aa576140
 DIST libsodium-1.0.19_p20240117.tar.gz.minisig 318 BLAKE2B f951b547f53b2569ed1493dcdbff1cc93519437f56cdf97a764d61a7e1fa98b383b49d4f4a9c4b7b199e2060037971f293796e641bd689c9cd6c7ae2c90b7a20 SHA512 202f9686fabcb7b362923b7f1eeac8544c5f21e7eaa0b4cdd7329733a62a5ec9efd18713bc63187055149525a066540a6904776870d718fd3b238b71ba4b9a35
-EBUILD libsodium-1.0.18_p20220618.ebuild 1998 BLAKE2B c0971b1d0f9e13ee2365093c311cd6a7186de26a557461b66111a8e9f75691e8ce4318a285074cd873d3e122b15be2f646bd341b261220f94e0fe170ddc21b0b SHA512 1c0e04a0540c2bb0fc9e6f141c370c28a5c20e086f32cf5548cb6d73937ab2bcc4305d973d248b476a4c932b8450f4462e25185c1f82cefa6aff091abd538221
-EBUILD libsodium-1.0.19-r1.ebuild 1998 BLAKE2B 50b3fc86c63c7721fd3a3d3bda38648fed17127558c34b6e08e3e025fb47550748aaffe614d8393833c6cc4d433079b854411ae0000029fb79fdeb2876744071 SHA512 165a6d4bfba97d9049af1f9a06160a7d92aec6bc7d23205d2ab1c860a17b3310d305cf8bc16919935503a4ee67ba3cffe347c374b0c1f842909a3b50826100a2
-EBUILD libsodium-1.0.19-r2.ebuild 1966 BLAKE2B 575da13973413adc01e6fb9ecdb58e554275b817e5064ec94b7f801274a30ac0a15c6ed4e542ac8d387268d31a0279a291f2d2d5c054d59e9ee06f2dbe8bc4b5 SHA512 1b2a79ea96928e63f0c0194f01626c7a75c264e34640a41417a56e4cbf08a9723d11dfd6890d7b348917dd9d81b38bd07975999d30396d51182dc5ca545f149e
+DIST libsodium-1.0.20.tar.gz 1925167 BLAKE2B 2f1d8b2dc8a65f95433132b12bdccb7e0e4750326b05c4f42ddd3a74bf568faa2515384bfe94bba2ef420aff35c515d3d44945ea5a68f72e6a73b3a9b5bb234c SHA512 7ea165f3c1b1609790e30a16348b9dfdc5731302da00c07c65e125c8ab115c75419a5631876973600f8a4b560ca2c8267001770b68f2eb3eebc9ba095d312702
+DIST libsodium-1.0.20.tar.gz.minisig 318 BLAKE2B b5939a9ca9b25332c39484b3ef02ced54aa75b2dc732d384d4f42daa0b6bd276f0c3359a8cbe8c97d8ab76b8c49e9f66959dcf350e3cf00fae10a279826109ae SHA512 fc5a4282093d58eb42559f88ccf75ea3788449afda9d882d313714e448e78ef11c22ff1e52091af026f6bf3ba01917d606040b1dca240dd1a32278c901b4affb
 EBUILD libsodium-1.0.19_p20240117.ebuild 2045 BLAKE2B ccf03b49b0495cdf89159644672763a013aae0de1609025c18e00b152b11fd23fa57b885dd1c3e2dea2b54dee1374fc1b45f744fe2350a2adc130671e94df5f2 SHA512 e2c9033937ab8b0bf2ad721f9d59fc8b7059f597edd7ad99ed29c3fd10ccf508f05b5a67498824e7fafd11d5a522440ba735b81d8c4a1ee8e33428b03629300e
+EBUILD libsodium-1.0.20.ebuild 2053 BLAKE2B 984b99e22aace5e4956652c97e5c89ac24b8844a277dae8bd5dec0d1c414e67a308fb24aa72e6c741dfd6eeb5aa17667347ba640e0fb952eb184af1a61b24fb2 SHA512 399705179463ae9fba760b4374025223d97fc89230fa180d80ff566e8e6544285dbf9ebf42df4f70400542af67b5a2754681691654e6cb4a46dd1dadb180349c
 MISC metadata.xml 806 BLAKE2B 069f36bae588b263d664f00b50c9a0f4c2348b1a1f0ff2e5c5902217ccf14a81e648997fae2f789220d5b9fa5aef440a7c0526918a7d7f402870dd80067e3744 SHA512 1902268ec9dbb312b9740f9bc9b2df5e66f50dc066ba281b438fbf6d2b5317c589c587305c400c929c068af95c30918fde7a6324ab53b76503ef183aab034886
diff --git a/dev-libs/libsodium/files/libsodium-1.0.10-cpuflags.patch b/dev-libs/libsodium/files/libsodium-1.0.10-cpuflags.patch
deleted file mode 100644
index e03a703d7fae..000000000000
--- a/dev-libs/libsodium/files/libsodium-1.0.10-cpuflags.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -344,6 +344,10 @@
-     [AC_MSG_RESULT(no)])
-   CFLAGS="$oldcflags"
- 
-+AC_ARG_ENABLE(sse4_1, [AS_HELP_STRING(--disable-sse4_1,Do not use sse4.1 code)],
-+  AS_IF([test "x$enableval" = "xyes"], check_sse4_1="yes", check_sse4_1="no"),
-+  check_sse4_1="yes")
-+AS_IF([test "$check_sse4_1" = "yes"],[
-   oldcflags="$CFLAGS"
-   AX_CHECK_COMPILE_FLAG([-msse4.1], [CFLAGS="$CFLAGS -msse4.1"])
-   AC_MSG_CHECKING(for SSE4.1 instructions set)
-@@ -356,6 +360,7 @@
-      AX_CHECK_COMPILE_FLAG([-msse4.1], [CFLAGS_SSE41="-msse4.1"])],
-     [AC_MSG_RESULT(no)])
-   CFLAGS="$oldcflags"
-+  ])
- 
-   oldcflags="$CFLAGS"
-   AX_CHECK_COMPILE_FLAG([-mavx], [CFLAGS="$CFLAGS -mavx"])
-@@ -393,6 +398,10 @@
-     [AC_MSG_RESULT(no)])
-   CFLAGS="$oldcflags"
- 
-+AC_ARG_ENABLE(aesni, [AS_HELP_STRING(--disable-aesni,Do not use aesni code)],
-+  AS_IF([test "x$enableval" = "xyes"], check_aesni="yes", check_aesni="no"),
-+  check_aesni="yes")
-+AS_IF([test "$check_aesni" = "yes"],[
-   oldcflags="$CFLAGS"
-   AX_CHECK_COMPILE_FLAG([-maes], [CFLAGS="$CFLAGS -maes"])
-   AX_CHECK_COMPILE_FLAG([-mpclmul], [CFLAGS="$CFLAGS -mpclmul"])
-@@ -410,6 +419,7 @@
-      ],
-     [AC_MSG_RESULT(no)])
-   CFLAGS="$oldcflags"
-+  ])
- 
- ])
- 
diff --git a/dev-libs/libsodium/libsodium-1.0.18_p20220618.ebuild b/dev-libs/libsodium/libsodium-1.0.18_p20220618.ebuild
deleted file mode 100644
index bcd05ad21ed0..000000000000
--- a/dev-libs/libsodium/libsodium-1.0.18_p20220618.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libsodium.minisig
-VERIFY_SIG_METHOD=minisig
-inherit autotools multilib-minimal verify-sig
-
-DESCRIPTION="Portable fork of NaCl, a higher-level cryptographic library"
-HOMEPAGE="https://libsodium.org"
-
-if [[ ${PV} == *_p* ]] ; then
-	MY_P=${PN}-$(ver_cut 1-3)-stable-$(ver_cut 5-)
-
-	# We use _pN to represent 'stable releases'
-	# These are backports from upstream to the last release branch
-	# See https://download.libsodium.org/libsodium/releases/README.html
-	SRC_URI="
-		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_P}.tar.gz -> ${P}.tar.gz
-		verify-sig? ( https://dev.gentoo.org/~sam/distfiles/dev-libs/libsodium/${MY_P}.tar.gz.minisig -> ${P}.tar.gz.minisig )
-	"
-else
-	SRC_URI="
-		https://download.libsodium.org/${PN}/releases/${P}.tar.gz
-		verify-sig? ( https://download.libsodium.org/${PN}/releases/${P}.tar.gz.minisig )
-	"
-fi
-
-S="${WORKDIR}"/${PN}-stable
-
-LICENSE="ISC"
-SLOT="0/23"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
-IUSE="+asm minimal static-libs +urandom"
-
-CPU_USE=( cpu_flags_x86_{aes,sse4_1} )
-IUSE+=" ${CPU_USE[@]}"
-
-BDEPEND=" verify-sig? ( sec-keys/minisig-keys-libsodium )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.10-cpuflags.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable asm)
-		$(use_enable cpu_flags_x86_aes aesni)
-		$(use_enable cpu_flags_x86_sse4_1 sse4_1)
-		$(use_enable minimal)
-		$(use_enable static-libs static)
-		$(use_enable !urandom blocking-random)
-	)
-
-	# --disable-pie is needed on x86, see bug #512734
-	# TODO: Check if still needed?
-	if [[ ${ABI} == x86 ]] ; then
-		myeconfargs+=( --disable-pie )
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	default
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/dev-libs/libsodium/libsodium-1.0.19-r1.ebuild b/dev-libs/libsodium/libsodium-1.0.19-r1.ebuild
deleted file mode 100644
index 575daa8a5059..000000000000
--- a/dev-libs/libsodium/libsodium-1.0.19-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libsodium.minisig
-VERIFY_SIG_METHOD=minisig
-inherit autotools multilib-minimal verify-sig
-
-DESCRIPTION="Portable fork of NaCl, a higher-level cryptographic library"
-HOMEPAGE="https://libsodium.org"
-
-if [[ ${PV} == *_p* ]] ; then
-	MY_P=${PN}-$(ver_cut 1-3)-stable-$(ver_cut 5-)
-
-	# We use _pN to represent 'stable releases'
-	# These are backports from upstream to the last release branch
-	# See https://download.libsodium.org/libsodium/releases/README.html
-	SRC_URI="
-		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_P}.tar.gz -> ${P}.tar.gz
-		verify-sig? ( https://dev.gentoo.org/~sam/distfiles/dev-libs/libsodium/${MY_P}.tar.gz.minisig -> ${P}.tar.gz.minisig )
-	"
-else
-	SRC_URI="
-		https://download.libsodium.org/${PN}/releases/${P}.tar.gz
-		verify-sig? ( https://download.libsodium.org/${PN}/releases/${P}.tar.gz.minisig )
-	"
-fi
-
-S="${WORKDIR}"/${PN}-stable
-
-LICENSE="ISC"
-SLOT="0/26"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
-IUSE="+asm minimal static-libs +urandom"
-
-CPU_USE=( cpu_flags_x86_{aes,sse4_1} )
-IUSE+=" ${CPU_USE[@]}"
-
-BDEPEND=" verify-sig? ( sec-keys/minisig-keys-libsodium )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.10-cpuflags.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable asm)
-		$(use_enable cpu_flags_x86_aes aesni)
-		$(use_enable cpu_flags_x86_sse4_1 sse4_1)
-		$(use_enable minimal)
-		$(use_enable static-libs static)
-		$(use_enable !urandom blocking-random)
-	)
-
-	# --disable-pie is needed on x86, see bug #512734
-	# TODO: Check if still needed?
-	if [[ ${ABI} == x86 ]] ; then
-		myeconfargs+=( --disable-pie )
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	default
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/dev-libs/libsodium/libsodium-1.0.19-r2.ebuild b/dev-libs/libsodium/libsodium-1.0.20.ebuild
index eebd3c520e94..35a5bc16739b 100644
--- a/dev-libs/libsodium/libsodium-1.0.19-r2.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.20.ebuild
@@ -20,6 +20,7 @@ if [[ ${PV} == *_p* ]] ; then
 		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_P}.tar.gz -> ${P}.tar.gz
 		verify-sig? ( https://dev.gentoo.org/~sam/distfiles/dev-libs/libsodium/${MY_P}.tar.gz.minisig -> ${P}.tar.gz.minisig )
 	"
+	S="${WORKDIR}"/${PN}-stable
 else
 	SRC_URI="
 		https://download.libsodium.org/${PN}/releases/${P}.tar.gz
@@ -27,11 +28,9 @@ else
 	"
 fi
 
-S="${WORKDIR}"/${PN}-stable
-
 LICENSE="ISC"
 SLOT="0/26"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="+asm static-libs +urandom"
 
 CPU_USE=( cpu_flags_x86_{aes,sse4_1} )
@@ -39,8 +38,12 @@ IUSE+=" ${CPU_USE[@]}"
 
 BDEPEND=" verify-sig? ( sec-keys/minisig-keys-libsodium )"
 
+QA_CONFIG_IMPL_DECL_SKIP=(
+	_rdrand64_step # depends on target, bug #924154
+)
+
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.10-cpuflags.patch
+	"${FILESDIR}"/${PN}-1.0.19-cpuflags.patch
 )
 
 src_prepare() {
diff --git a/dev-libs/mimalloc/Manifest b/dev-libs/mimalloc/Manifest
index 77545a09754e..af6c3bba649d 100644
--- a/dev-libs/mimalloc/Manifest
+++ b/dev-libs/mimalloc/Manifest
@@ -1,7 +1,9 @@
 DIST mimalloc-2.1.2.tar.gz 1163868 BLAKE2B bba29671fdca81b682edeefe16a1239640ea28fee4e44c97d0422ae81e0b3e7141c733459ccafc6672780157af67ff7d2a10cf4157180e003b458332a79d8481 SHA512 927b046e67783b325a6e41e3a9a6d3d78306fa1c82255defd1f3a7a60a27fd809a601f65b1b27fa38f2064e124f29856d7c0e5ccc33c54c2e4b6ebb9816d74b1
 DIST mimalloc-2.1.4.tar.gz 1133761 BLAKE2B 6271f54b8c0c0397bc0d7fb909009e05b9119c15ad3f926a82f078f3ffa7320503cc679487414d3b8e17bb41b17a43f71982727f80c7288b3b2d473992d706e5 SHA512 cdc43b212b9c67cd50b31bfae875387e3099165260fec995681a4079ca107c275452c2aadc5ee9a177391d1856750e0e2b104191bbb9829aeb5a42406267832e
 DIST mimalloc-2.1.6.tar.gz 1134456 BLAKE2B 1d4d0053e6c6b582d2c82f573b61dba7b3d1d6748999d313493d9db5bfb62e7379b48c72f88afab4e8b609971974488c9d42f96e2486d5905e2a9d78730d3231 SHA512 cbecca799be7a38b291c44ac765aa6ce36c6aeb0f064da942c568da38073350a122e7d1553e7929ee4f72f61ab3b767fa565f252cfd819463d2e1c73c25c5163
+DIST mimalloc-2.1.7.tar.gz 1181422 BLAKE2B 2c4c2d61837ab315e00a5c12d1c74c8f003aa3e9159403194ba61f5dfef2f4c2497b83487f07b20ba506ecde40a6754df6b7048a3818af58168ca90b8ed44470 SHA512 4e30976758015c76a146acc1bfc8501e2e5c61b81db77d253de0d58a8edef987669243f232210667b32ef8da3a33286642acb56ba526fd24c4ba925b44403730
 EBUILD mimalloc-2.1.2.ebuild 850 BLAKE2B df1b87e00239d319dd692395fe31c6376fb2e197208a002234cb6f62a2f43429fb0e7a90b0ba308a880e7dcfb343caa716d2bad7b2add0a9e7c9a49ff1741ae1 SHA512 847340d9b4a95d81fc7a5fe99b724cacd1eb96cd794f67ca934a7af32e1cfc11c3f8a58d0cd3403e9155b0d74150962d6971bcaa8f2c0dbaa998bf7a5fb02dbc
 EBUILD mimalloc-2.1.4.ebuild 994 BLAKE2B d04db9996415aede3568ddd1f40c1b14cceb5ad2ea53c4b90c23d4925a3a68572135db859c1f6ad81ceb5121c22effb32c3906639df8ae14fe2ab0fed9e5f31b SHA512 e1c2f5f9d19e794f3a23a63214b5fdf318d2e09b3bab0e5d2953202cfbb3acbe573b34786c1a1fa6c78a4c222cc1558708c90991014d53c4ebbeb1cc3dfbfe92
 EBUILD mimalloc-2.1.6.ebuild 1099 BLAKE2B 56768e1ca66cc2e5a70420ea93a035251415c2b242c511957fa000a7079200e7972a632c2e0959c83e3bd74507af3bd42801c35cfeb7ca061ec051d234276698 SHA512 2e9e7fdb9624b2653acb5daeb4e54bf8febdff6c8294bc5a76d50ccb3327e1eea27e804af5c05cd03cd016766678b18dac338e618208077c49c819617e55126e
+EBUILD mimalloc-2.1.7.ebuild 836 BLAKE2B 5f6ac7302068165b29e1556df21e968c1171c78785ccdf77ea233b8756e161eb23f01df38b8c9e8650d2101911c2d09eb35c432b5a95b20a193bdd0918a9a3c0 SHA512 a1e775ec6b3b1dbd6505f46349f886b802c1be8ac0ca3fb0f80ba57ae58c119f5df9ba8edf29838537b7a1f1993064eb46514cd2cc3b4b8446cc0b4e2affd3c5
 MISC metadata.xml 504 BLAKE2B cf6477282968a5469d072cfd81ce800e3ef0a48deb5353c85a1cabc837560cafdb9f9739cb4e98784238d2cc512a29cae5efee401f92a19bf75fb5d810154f76 SHA512 4e8fcc49881f3c479424cf363665d9b12c58eb52f7d962b98b81f5b3e186ba3bd14c2b5dac488d819147121a16c2d9613e75cb77f71fa04e820ca2c1e538baa6
diff --git a/dev-libs/mimalloc/mimalloc-2.1.7.ebuild b/dev-libs/mimalloc/mimalloc-2.1.7.ebuild
new file mode 100644
index 000000000000..f7bb6dcf66e8
--- /dev/null
+++ b/dev-libs/mimalloc/mimalloc-2.1.7.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+DESCRIPTION="A compact general purpose allocator with excellent performance"
+HOMEPAGE="https://github.com/microsoft/mimalloc"
+SRC_URI="https://github.com/microsoft/mimalloc/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/2"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
+IUSE="hardened test valgrind"
+RESTRICT="!test? ( test )"
+
+DEPEND="valgrind? ( dev-debug/valgrind )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DMI_SECURE=$(usex hardened)
+		-DMI_INSTALL_TOPLEVEL=ON
+		-DMI_BUILD_TESTS=$(usex test)
+		-DMI_BUILD_OBJECT=OFF
+		-DMI_BUILD_STATIC=OFF
+		-DMI_TRACK_VALGRIND=$(usex valgrind)
+		-DMI_LIBC_MUSL=$(usex elibc_musl)
+	)
+
+	cmake-multilib_src_configure
+}