diff --git a/app-arch/libzim/Manifest b/app-arch/libzim/Manifest
new file mode 100644
index 0000000000..c4eb04b09e
--- /dev/null
+++ b/app-arch/libzim/Manifest
@@ -0,0 +1 @@
+DIST libzim-9.2.1.tar.gz 251633 BLAKE2B 9fd7acf2c24d9c346dd26fe19edf0758a60b3cb3695c322d8cc7a9422f6506f2b343fbeff159aed2ba17c17803b4debc8ebcfb1a43d8e0a0c79a142986ba3265 SHA512 13daa28d8c8860936da16df1914d008adc519eba5d18d2e5de82ff1c605f6e7f46f2ce13c1b78f4b3810cd55396afc57d5577942d12190d988e0c6df7d2e2780
diff --git a/app-arch/libzim/libzim-9.2.1.ebuild b/app-arch/libzim/libzim-9.2.1.ebuild
new file mode 100644
index 0000000000..b935f5022b
--- /dev/null
+++ b/app-arch/libzim/libzim-9.2.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="ZIM file format: an offline storage solution for content coming from the Web"
+HOMEPAGE="https://wiki.openzim.org/wiki/OpenZIM"
+SRC_URI="https://github.com/openzim/$PN/archive/$PV.tar.gz -> $P.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="sys-libs/zlib
+	app-arch/lzma
+	dev-libs/icu
+	app-arch/zstd
+	dev-libs/xapian
+	sys-fs/e2fsprogs"
+
+DEPEND="virtual/pkgconfig"
diff --git a/app-arch/libzim/metadata.xml b/app-arch/libzim/metadata.xml
new file mode 100644
index 0000000000..2b6009258e
--- /dev/null
+++ b/app-arch/libzim/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>zdanevich.vitaly@ya.ru</email>
+		<name>Vitaly Zdanevich</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">openzim/libzim</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-embedded/idf-component-manager/Manifest b/dev-embedded/idf-component-manager/Manifest
index f9a0eba845..60fbf9985a 100644
--- a/dev-embedded/idf-component-manager/Manifest
+++ b/dev-embedded/idf-component-manager/Manifest
@@ -1,2 +1 @@
-DIST idf-component-manager-1.4.1.gh.tar.gz 222994 BLAKE2B 659272939460a95f67156aaa978ad78e00f9dd138a63310559e8229927e6328d0c2939a9df15dd5c54af2f7f2527e10ac90211974c90c9cc4b127e000ac5b653 SHA512 fe1205728b6dd91dbc158a2112b0b216b3631fae8982b4f51e2905bdcf45cf5ad697201b56cac9413b72c663d61ce55c831a758453a4c0c904a29f5b1d64cfbf
-DIST idf-component-manager-1.5.2.gh.tar.gz 318633 BLAKE2B 13064fdbebf672dee91b764c83ee07bebf64504676ec25ec9c40d181425c177e4080e6da2b3435115afeeff2608bc2a2a5545dc64d0e5d01e1e817c88fcdc0a9 SHA512 113d750956ce5935483f54884ea7290d6ebcc463ffaab5ae602a8ea341326ea1dffde5c929de155514fbd8692964801c787bc962d0c78dc87a27d841e004bd99
+DIST idf-component-manager-1.5.3.gh.tar.gz 321425 BLAKE2B 1c5b1bd1dc50b214b5b9a8d4ae40681fd33118f4d83469d793de152627d2cd2e2497f3a7e771b27a5aac68886d242e2f3d44c69d94f38ce3385d8bec0700190a SHA512 6a8d5c493f5f361c3b02a145685b58862e8e96261cbe3c5436354446f95f5ca5782a9dd7fa5397bc58438166c07aea6bb958348d596f6a604d5044edba0584c0
diff --git a/dev-embedded/idf-component-manager/idf-component-manager-1.4.1.ebuild b/dev-embedded/idf-component-manager/idf-component-manager-1.4.1.ebuild
deleted file mode 100644
index 2168162050..0000000000
--- a/dev-embedded/idf-component-manager/idf-component-manager-1.4.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{11,12} )
-DISTUTILS_USE_PEP517=poetry
-
-inherit distutils-r1
-
-DESCRIPTION="Tool for installing ESP-IDF components"
-HOMEPAGE="https://github.com/espressif/idf-component-manager"
-SRC_URI="https://github.com/espressif/${PN}/archive/refs/tags/v${PV}.tar.gz	-> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-BDEPEND="
-	test? (
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/vcrpy[${PYTHON_USEDEP}]
-		dev-python/filelock[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-RDEPEND="
-	dev-python/cachecontrol[${PYTHON_USEDEP}]
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests-toolbelt[${PYTHON_USEDEP}]
-	dev-python/requests-file[${PYTHON_USEDEP}]
-	dev-python/schema[${PYTHON_USEDEP}]
-	dev-python/tqdm[${PYTHON_USEDEP}]
-	<dev-python/urllib3-2.0.0[${PYTHON_USEDEP}]
-"
-
-# Requires additional files not available in the tarball
-EPYTEST_DESELECT=(
-	tests/test_component_manager.py::test_pack_component_with_examples_errors
-)
-
-distutils_enable_tests pytest
diff --git a/dev-embedded/idf-component-manager/idf-component-manager-1.5.2.ebuild b/dev-embedded/idf-component-manager/idf-component-manager-1.5.3.ebuild
similarity index 94%
rename from dev-embedded/idf-component-manager/idf-component-manager-1.5.2.ebuild
rename to dev-embedded/idf-component-manager/idf-component-manager-1.5.3.ebuild
index 436be49355..2ce0d756ac 100644
--- a/dev-embedded/idf-component-manager/idf-component-manager-1.5.2.ebuild
+++ b/dev-embedded/idf-component-manager/idf-component-manager-1.5.3.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
@@ -37,7 +37,7 @@ RDEPEND="
 	dev-python/requests-file[${PYTHON_USEDEP}]
 	dev-python/schema[${PYTHON_USEDEP}]
 	dev-python/tqdm[${PYTHON_USEDEP}]
-	<dev-python/urllib3-2.0.0[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
 "
 
 # Requires additional files not available in the tarball
diff --git a/mpv-plugin/mpv-youtube-upnext/Manifest b/mpv-plugin/mpv-youtube-upnext/Manifest
index 9d02b3e7c3..def1cc3a92 100644
--- a/mpv-plugin/mpv-youtube-upnext/Manifest
+++ b/mpv-plugin/mpv-youtube-upnext/Manifest
@@ -1,3 +1 @@
-DIST mpv-youtube-upnext-20221230.tar.gz 383022 BLAKE2B 65ce4f8d796ffeac924345408ca41da584a3d53011ba0692daada1559d33ed97fef26f612523edc0ca6839c18286b4af2bc3f48fd5209be719c3df8e4d8919ed SHA512 6dfb4c2d6798502b05afc3d3fdbbfe3851742c9a3dfa5c45e215a967bd555571a208aa9b4ead3c0b8b964e255d615eddb4610bb340b5973c03f2d5e1f952e9a4
-DIST mpv-youtube-upnext-20230409.tar.gz 554221 BLAKE2B 3891ae1a1f5e651359d2916258508e35954e150e24afa4d6d1d413a297a2ee3cc1e7cdea4d62cf0d5e27d1e89b502928914ac999ac2a5b8fbd6531dc786a1a4c SHA512 0850b078c3e2e84577ee22d8bf3b39d2ece715a5dc9e7ab9ce9567021babafddae366ac42ddd77ef2da582816434178e173d7ab0984f86fefa29a2e79e185c1a
-DIST mpv-youtube-upnext-20230709.tar.gz 557465 BLAKE2B a15cb92cdcfb3dc91121a254db4b4a4fc899535505887c3ace5689d65df32612c7171d5c70d5bd17ec5a489e0b8a311d253564c4a24eb031d91dcde83cc116ba SHA512 87234b7d8eb1f6619b5eb7fea01bdcd5840ba670f7d93f4d75704270194cff77a2eb436fc1b69d977d9506e1c0c6d58419edd8624f024dbae9b05d8f67e86b57
+DIST mpv-youtube-upnext-20240513.tar.gz 557384 BLAKE2B f9079226bcd447c7b30566973a6c46f9f17cd4c2659d9f4cb5dd16de4db155388dacaa586d3b8baf1e21fa906d899cea1e23bf787bd87c81acc7d4487a68d00e SHA512 030a21d3f2717a01c029e4240e1cda2501ec3faf9e70ea80ea7bd078856def85b6ed3806d1c88307c7373b66f017140e3ce08a42f8341f30062cd03393ccb72e
diff --git a/mpv-plugin/mpv-youtube-upnext/mpv-youtube-upnext-20221230.ebuild b/mpv-plugin/mpv-youtube-upnext/mpv-youtube-upnext-20221230.ebuild
deleted file mode 100644
index 188acb8dc8..0000000000
--- a/mpv-plugin/mpv-youtube-upnext/mpv-youtube-upnext-20221230.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_MPV="rdepend"
-MPV_REQ_USE="lua"
-inherit mpv-plugin
-
-COMMIT="ba6d9ff95347bbf2d577ace2e2c46caa823a8a6a"
-MY_P="${PN}-${COMMIT}"
-
-DESCRIPTION="A userscript that allows you to play \"up next\"/recommended youtube videos"
-HOMEPAGE="https://github.com/cvzi/mpv-youtube-upnext"
-SRC_URI="https://github.com/cvzi/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-KEYWORDS="~amd64"
-
-MPV_PLUGIN_FILES=( youtube-upnext.lua )
diff --git a/mpv-plugin/mpv-youtube-upnext/mpv-youtube-upnext-20230409.ebuild b/mpv-plugin/mpv-youtube-upnext/mpv-youtube-upnext-20230409.ebuild
deleted file mode 100644
index 68cd58e5e2..0000000000
--- a/mpv-plugin/mpv-youtube-upnext/mpv-youtube-upnext-20230409.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_MPV="rdepend"
-MPV_REQ_USE="lua"
-inherit mpv-plugin
-
-COMMIT="fccdcfb19afb9100f7e8291716f906fee0710aa3"
-MY_P="${PN}-${COMMIT}"
-
-DESCRIPTION="A userscript that allows you to play \"up next\"/recommended youtube videos"
-HOMEPAGE="https://github.com/cvzi/mpv-youtube-upnext"
-SRC_URI="https://github.com/cvzi/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-KEYWORDS="~amd64"
-
-MPV_PLUGIN_FILES=( youtube-upnext.lua )
diff --git a/mpv-plugin/mpv-youtube-upnext/mpv-youtube-upnext-20230709.ebuild b/mpv-plugin/mpv-youtube-upnext/mpv-youtube-upnext-20240513.ebuild
similarity index 85%
rename from mpv-plugin/mpv-youtube-upnext/mpv-youtube-upnext-20230709.ebuild
rename to mpv-plugin/mpv-youtube-upnext/mpv-youtube-upnext-20240513.ebuild
index 11094f42aa..e321551280 100644
--- a/mpv-plugin/mpv-youtube-upnext/mpv-youtube-upnext-20230709.ebuild
+++ b/mpv-plugin/mpv-youtube-upnext/mpv-youtube-upnext-20240513.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,7 +7,7 @@ USE_MPV="rdepend"
 MPV_REQ_USE="lua"
 inherit mpv-plugin
 
-COMMIT="0fa763e49ad15b88d3babd45cfccc3b90590c90f"
+COMMIT="6c0428285c44edbe3809eda8335ef4789da1bf19"
 MY_P="${PN}-${COMMIT}"
 
 DESCRIPTION="A userscript that allows you to play \"up next\"/recommended youtube videos"