diff --git a/app-admin/pulumi-bin/Manifest b/app-admin/pulumi-bin/Manifest
index 007215507b..a2243ce210 100644
--- a/app-admin/pulumi-bin/Manifest
+++ b/app-admin/pulumi-bin/Manifest
@@ -1,4 +1,4 @@
-DIST pulumi-v3.100.0-linux-x64.tar.gz 154992145 BLAKE2B f075796f9deeec8dd7bc57247f07631005b25cf537e67cf538577e0e5ec229bf3269dacd6a35dfbc2e1370b4e41edaa8231e170178694767b714626b729ad400 SHA512 aeac482b0863ff0499cd2ad619073d8189cb90a0d35df0bf5d715920f8286b008f73a3ff5f7b65457496b21cb8fccd32321cbfddc022065109d6337b8bcc9904
 DIST pulumi-v3.101.0-linux-x64.tar.gz 154756478 BLAKE2B b38af0d4cb9016305b29f134290d670494a113f336098502b031db75e59faacd6940a467e481c77eac895bdf3244604edb4046fafcb334bbb33b731881531541 SHA512 89df1e03b669aaa57575da33a3cd05f7c89d51897a173430b488826daf64e6e2bc7c6c9c072cd7b469fbd5b74596560979a24b8c02c8c052647e1758a81c7b21
 DIST pulumi-v3.101.1-linux-x64.tar.gz 154992917 BLAKE2B ef96ce6ab8f47c9feb4d0b95ad2a56bcbddb855e4e929e3ce03308d3f999c0cda7ddc0d48d6ff372805b70ab7c2236789a2456fd1968318fcfdbb37464b0068b SHA512 879a0824b836797db23fb8b1e0a1c7fe64636a99d87ad76c503d862edcb69425efa0dfae7cd6a1aedb9e4ff5b8f594022f1a828f7b6060edad7752167b0b71f4
 DIST pulumi-v3.102.0-linux-x64.tar.gz 154970812 BLAKE2B e5aa0fed9961de13aa22c866881fc4baa3065928c1c52ff57a2504bb6f2f081752d4a25fd02c67b6260d06585b1d8f87ff059e2dffdfd07593fbb66fcbbd05df SHA512 140a2e7f4728790e1abb6f97602e3b2f7c812ceb1ba07f1678b688691a047d640ed0710e1b7d9197aea3e61d6cac9ef529f5843487b960b91f7c5d22b9dfca48
+DIST pulumi-v3.103.1-linux-x64.tar.gz 155023148 BLAKE2B adac83d1b00a116de7c170f2db81136932fe268d1051ae8439af0daa2b77910278f2f4e6078fccd0b005cfee72bccc3b2171e08ba74ffcd6873aaca52ca16cf5 SHA512 310ffe08b6b32f5e5c1387018f667bad3bbfd1325b085d1e3d22eca501625f5c031037e4c0da0637b7f679d9032b82868eb8713f86dd0905f8c4049ae4de3841
diff --git a/app-admin/pulumi-bin/pulumi-bin-3.100.0.ebuild b/app-admin/pulumi-bin/pulumi-bin-3.103.1.ebuild
similarity index 100%
rename from app-admin/pulumi-bin/pulumi-bin-3.100.0.ebuild
rename to app-admin/pulumi-bin/pulumi-bin-3.103.1.ebuild
diff --git a/app-misc/ledger-live/Manifest b/app-misc/ledger-live/Manifest
index d0b7729699..a82d14980f 100644
--- a/app-misc/ledger-live/Manifest
+++ b/app-misc/ledger-live/Manifest
@@ -1,5 +1,5 @@
 DIST ledger-live-2.68.1.AppImage 146875467 BLAKE2B 42477731d4485ee02bd420105683daf4d746e99f3a9cde0e6a42e749095e1cf060b2df150a39a9f673f723fac293776b643b268000829c0ffe766d55678671be SHA512 7e7d9b4e1e6e3cd513d113ce6964a0044f9eee46aa9f3f63d58ae2cc2e4888b179ba9c353553a13aa924477f2670a145977e88302ee06b7aefbd6eab1d48a19f
-DIST ledger-live-desktop-2.66.0-linux-x86_64.AppImage 135854948 BLAKE2B fa877e470e929c98c4c9cf94432e8a654c12fdf61796fbd7b8127f4243e7b1b11a237e1785671bd0e2be1ecf03fe836ffc5d25e361ca50e1f1d3f3ae6821812d SHA512 4c27e11021473ed81850717a3f7ed428ea67024819abd4dac0a75d9b3f38f4584b320345a6f9f6dc402b39f5e5302ad1d97d615a1ced1f91300a312227078b34
 DIST ledger-live-desktop-2.71.1-linux-x86_64.AppImage 150998121 BLAKE2B 63cc9c02b0b599c0988bdf331d80d015c628b085f3bab46ffb1237dd6fd3370f5f098f2437c0ef2fdf364edc4581c1e825817947caf44f952255843f3539a136 SHA512 674e4eebde2ec280d6afa03471256877fd4fdc4e3ddb781e09fd2678252336a5e0773a3fda336dcd7262d6cf1b7b122776cfcee5de20965db7677ecc84cc5fa2
 DIST ledger-live-desktop-2.73.0-linux-x86_64.AppImage 151169979 BLAKE2B 17133ca1031d51a5bb1e1e32f68d7a5e20c52044d762937bf838828654bb50b577de5bc22b2fd9357673accfd9a0a5589ef897b5e507f1fcb17ca5b008360652 SHA512 a0581914c44ba7b8dfbc3cff3fa568a7eed9048a0b0f5212a0ac076b85929f4d62e2d92fe636d6bd83139b2333a711f6e373a5b7a42b4a65eb2a9a8f166a7846
 DIST ledger-live-desktop-2.73.1-linux-x86_64.AppImage 151165637 BLAKE2B 2ccf93d6c8fa94f627786091a2697f1d7d70cd4595ba281dfda90f11f204be129e3a114003cd2c3e3d0e2467566ed1708537d2b10a93887179cfe1d306c1f0c6 SHA512 849649f9f104d1a66e4705d0b83ab0c6edee553aad19b7ac8f10afecaf93b0f64e360abdad0ce2771c3cf290575ad266a63f2109cb998d3378ef6114abe6d153
+DIST ledger-live-desktop-2.75.0-linux-x86_64.AppImage 151854414 BLAKE2B 2dcd75b23300ec7ec0b10caa9c817b9b439ac3bfdf4e2cb1bcb7b5dfa2a37d29d632ff5645713f4420b9df00ada1f8a7cbba12fdfb667513c0ac77e7118b20f0 SHA512 2a4e77a8de337e8d5e7bd77888da963f9de3305be7d0c9ef384724445a173e800ef87d8fb6cca02352c280f30f79c9ba8e305cb47544e5bfdf692c092e1e7628
diff --git a/app-misc/ledger-live/ledger-live-2.66.0.ebuild b/app-misc/ledger-live/ledger-live-2.75.0.ebuild
similarity index 92%
rename from app-misc/ledger-live/ledger-live-2.66.0.ebuild
rename to app-misc/ledger-live/ledger-live-2.75.0.ebuild
index e5c511dd3f..f2c7605466 100644
--- a/app-misc/ledger-live/ledger-live-2.66.0.ebuild
+++ b/app-misc/ledger-live/ledger-live-2.75.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Foundation
+# Copyright 1999-2024 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-embedded/rauc/Manifest b/dev-embedded/rauc/Manifest
index 71ea35cd2e..fcfb7ca789 100644
--- a/dev-embedded/rauc/Manifest
+++ b/dev-embedded/rauc/Manifest
@@ -1 +1 @@
-DIST rauc-1.10.1.tar.xz 912140 BLAKE2B 3cdaa88886e0d4f97623939af06a0a90de1a166535ff1cdaf523938a1778bfdd24049387886732d1a13c0d94a43d66f73d9328cc005beb3a73f33b3afda49b22 SHA512 794a1a517c9a9eacf7466710054f88fc48bf57e34cb460f202f62ca976777054c0faf74dd045164ea29977aa8f5d9d268f5154621b51642898ffafc831c75bbb
+DIST rauc-1.11.1.tar.xz 927392 BLAKE2B ba1aa015be1b28f50014ccd43154b296170faa680f97e27e14a98d6af58f0b0151cef33f4fb4f13bfd304a278edbcd7d9cc9134612ae7a14de04c3a169ab9e00 SHA512 09f6e7218f884404b56d9d69a028e6098ab2c3d44033d107dcfeffa3ed26ccbd7fff0c27ba1b7c9a74c635b7483f2db1253da148a695bd7db75a2a674438e0f3
diff --git a/dev-embedded/rauc/files/rauc-1.10.1-tests.patch b/dev-embedded/rauc/files/rauc-1.10.1-tests.patch
deleted file mode 100644
index 49171f4eba..0000000000
--- a/dev-embedded/rauc/files/rauc-1.10.1-tests.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From cfeab43e8c1ebbe952bca9b71fb8400a9947d229 Mon Sep 17 00:00:00 2001
-From: Kurt Kanzenbach <kurt@kmk-computers.de>
-Date: Sat, 15 Aug 2020 08:45:21 +0200
-Subject: [PATCH] tests: Disable failed tests
-
-The network and squashfs tests won't work within portage. Disable them.
-
-Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
----
- Makefile.am |    7 -------
- test/rauc.t |   24 ++++++++++++------------
- 2 files changed, 12 insertions(+), 19 deletions(-)
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -171,10 +171,6 @@ check_PROGRAMS = \
- 	test/slot.test \
- 	test/stats.test
- 
--if WANT_NETWORK
--check_PROGRAMS += test/network.test
--endif
--
- if ENABLE_STREAMING
- check_PROGRAMS += test/nbd.test
- endif
-@@ -283,9 +279,6 @@ test_utils_test_LDADD = librauctest.la
- test_install_test_SOURCES = test/install.c
- test_install_test_LDADD = librauctest.la
- 
--test_network_test_SOURCES = test/network.c
--test_network_test_LDADD = librauctest.la
--
- test_progress_test_SOURCES = test/progress.c
- test_progress_test_LDADD = librauctest.la
- 
---- a/test/rauc.t
-+++ b/test/rauc.t
-@@ -371,18 +371,18 @@ test_expect_success "rauc bundle (test c
-   test -f ${TEST_TMPDIR}/out.raucb
- "
- 
--test_expect_success "rauc bundle mksquashfs extra args" "
--  test_when_finished rm -rf ${TEST_TMPDIR}/install-content &&
--  test_when_finished rm -f ${TEST_TMPDIR}/out.raucb &&
--  cp -rL ${SHARNESS_TEST_DIRECTORY}/install-content ${TEST_TMPDIR}/ &&
--  rauc \
--    --cert $SHARNESS_TEST_DIRECTORY/openssl-ca/dev/autobuilder-1.cert.pem \
--    --key $SHARNESS_TEST_DIRECTORY/openssl-ca/dev/private/autobuilder-1.pem \
--    bundle \
--    --mksquashfs-args=\"-comp xz -info -progress\" \
--    ${TEST_TMPDIR}/install-content ${TEST_TMPDIR}/out.raucb &&
--  rauc -c $SHARNESS_TEST_DIRECTORY/test.conf info ${TEST_TMPDIR}/out.raucb
--"
-+# test_expect_success "rauc bundle mksquashfs extra args" "
-+#   test_when_finished rm -rf ${TEST_TMPDIR}/install-content &&
-+#   test_when_finished rm -f ${TEST_TMPDIR}/out.raucb &&
-+#   cp -rL ${SHARNESS_TEST_DIRECTORY}/install-content ${TEST_TMPDIR}/ &&
-+#   rauc \
-+#     --cert $SHARNESS_TEST_DIRECTORY/openssl-ca/dev/autobuilder-1.cert.pem \
-+#     --key $SHARNESS_TEST_DIRECTORY/openssl-ca/dev/private/autobuilder-1.pem \
-+#     bundle \
-+#     --mksquashfs-args=\"-comp xz -info -progress\" \
-+#     ${TEST_TMPDIR}/install-content ${TEST_TMPDIR}/out.raucb &&
-+#   rauc -c $SHARNESS_TEST_DIRECTORY/test.conf info ${TEST_TMPDIR}/out.raucb
-+# "
- 
- test_expect_success PKCS11 "rauc bundle with PKCS11 (key 1)" "
-   test_when_finished rm -rf ${TEST_TMPDIR}/install-content &&
diff --git a/dev-embedded/rauc/files/rauc-1.11.1-tests.patch b/dev-embedded/rauc/files/rauc-1.11.1-tests.patch
new file mode 100644
index 0000000000..b2faf59ca3
--- /dev/null
+++ b/dev-embedded/rauc/files/rauc-1.11.1-tests.patch
@@ -0,0 +1,43 @@
+From cfeab43e8c1ebbe952bca9b71fb8400a9947d229 Mon Sep 17 00:00:00 2001
+From: Kurt Kanzenbach <kurt@kmk-computers.de>
+Date: Sat, 15 Aug 2020 08:45:21 +0200
+Subject: [PATCH] tests: Disable failed tests
+
+The network and squashfs tests won't work within portage. Disable them.
+
+Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
+---
+ test/meson.build |   18 ------------------
+ 1 file changed, 18 deletions(-)
+
+--- a/test/meson.build
++++ b/test/meson.build
+@@ -24,10 +24,6 @@ tests = [
+   'stats',
+ ]
+ 
+-if get_option('network')
+-  tests += 'network'
+-endif
+-
+ if get_option('streaming')
+   tests += 'nbd'
+ endif
+@@ -63,17 +59,3 @@ fakerand = executable(
+   'fakerand',
+   'fakerand.c',
+ )
+-
+-rauc_t = find_program(
+-  'rauc.t'
+-)
+-
+-test(
+-  'rauc.t',
+-  rauc_t,
+-  args : '-v',
+-  is_parallel : false,
+-  timeout : 360,
+-  env : ['SHARNESS_BUILD_DIRECTORY=' + meson.build_root()],
+-  workdir : meson.current_source_dir(),
+-)
diff --git a/dev-embedded/rauc/rauc-1.10.1.ebuild b/dev-embedded/rauc/rauc-1.11.1.ebuild
similarity index 70%
rename from dev-embedded/rauc/rauc-1.10.1.ebuild
rename to dev-embedded/rauc/rauc-1.11.1.ebuild
index be67d61054..9c6745225b 100644
--- a/dev-embedded/rauc/rauc-1.10.1.ebuild
+++ b/dev-embedded/rauc/rauc-1.11.1.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
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{10..12} )
 DOCS_BUILDER="sphinx"
 DOCS_DIR="${S}/docs"
 
-inherit autotools python-any-r1 docs
+inherit meson python-any-r1 docs
 
 DESCRIPTION="Lightweight update client that runs on your Embedded Linux device"
 HOMEPAGE="https://rauc.io/"
@@ -21,8 +21,15 @@ IUSE="gpt json network service test"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
+	${PYTHON_DEPS}
 	dev-util/gdbus-codegen
 	virtual/pkgconfig
+	doc? (
+		$(python_gen_any_dep '
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
+		')
+	)
 	test? (
 		dev-libs/opensc
 		net-misc/casync
@@ -44,22 +51,17 @@ DEPEND="
 
 PATCHES=( "${FILESDIR}/${P}-tests.patch" )
 
-src_prepare() {
-	default
-	eautoreconf
-}
-
 src_configure() {
-	local myconf=(
-		$(use_enable gpt)
-		$(use_enable json)
-		$(use_enable network)
-		$(use_enable service)
+	local emesonargs=(
+		$(meson_feature gpt)
+		$(meson_feature json)
+		$(meson_use network)
+		$(meson_use service)
 	)
-	econf "${myconf[@]}"
+	meson_src_configure
 }
 
 src_compile() {
-	default
+	meson_src_compile
 	docs_compile
 }
diff --git a/dev-libs/StringiFor/Manifest b/dev-libs/StringiFor/Manifest
index e3c68a11d0..e5f9d05f62 100644
--- a/dev-libs/StringiFor/Manifest
+++ b/dev-libs/StringiFor/Manifest
@@ -1 +1 @@
-DIST StringiFor-1.1.4.tar.gz 571734 BLAKE2B 2f830b266fbe9022a41f23f4abc13062bb581fe103a5348305050d46cf575a96a4c1998cb99ea68745209b54bc4862d52aef9c724c41d8341ff5ec7a5a8ef994 SHA512 3176a0eacdc8cfc1049373bd3313c64b8f7744d430f05b2aba4768311145e509ac1783152061da3e10af3dff9fa949da7e2554c2f8ad6a648d51eacbef007d30
+DIST StringiFor-1.1.4.tar.gz 574105 BLAKE2B 553667619289350d00e9654fc410126c7bd88a0e99ccd4dd0f3af0a2c1be06b166bf06d66c13050739052decd8af296213166c8450ef689a3e42cf3e51f8e394 SHA512 37eb18200996258fb12245bc810a8e3f9f09e0cc1469765585fb71293167f0b8e7bc7dd7aa8524c20c0a71abaf63bd11c3d48176c608df64a546449996e7112b
diff --git a/dev-python/convertdate/convertdate-2.4.0.ebuild b/dev-python/convertdate/convertdate-2.4.0.ebuild
index bc3a578f70..a68be7af63 100644
--- a/dev-python/convertdate/convertdate-2.4.0.ebuild
+++ b/dev-python/convertdate/convertdate-2.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1
 
diff --git a/dev-python/dateparser/Manifest b/dev-python/dateparser/Manifest
index 1425c2c3c3..44c8fffea2 100644
--- a/dev-python/dateparser/Manifest
+++ b/dev-python/dateparser/Manifest
@@ -1,2 +1 @@
-DIST dateparser-1.1.7.tar.gz 295818 BLAKE2B 11bb07f6c3c46a5e19111715a8801b8789d7f1fd0fd407232a071ddd40b337153dce3b42197f3a2fd8081c505f4418abb3ff265e25641a95eed31575c6ad2a70 SHA512 d333fa2007c069f7424def9694544767a8885eec5d476e9dd73605754fd53f5a9dbbeb19f24291ac6c6ffa09b4014a3135ad8fbabadae1655c78a8d5fe36f907
-DIST dateparser-1.1.8.tar.gz 296595 BLAKE2B 0e1bedbfc0b54d3a763a5f982774685e0c4aebe418dcfe5190c613a6de1e8d445c9906b9c7e8ca87ea37b2ef508eb8bd789e07b7b5f11fac3df7d16f24a08c00 SHA512 45fc6ee67be77ae9ece818b25e680a9416c30bbe8d71746a2b08910b57406d65e6b9f0c51ada1697034ea1f3f9a0952c2f0616c9fa1be4c7886e459e1cc2d898
+DIST dateparser-1.2.0.tar.gz 307260 BLAKE2B b4611dfc4fccaf5f129e4d9aa3debe4a6d4242a44896305b909e6c34728ba153be92659b2f0c3a5da028d3863789d9c3a4236676087346b5f3f4aeb1f57b7a1e SHA512 74d5975f515dee096d83d10b72e5dc66ab197d50f24c129560ffb87eef4abd1422d8236555496d1ab1c0bfb832729e9c0d3ea2ca2c9c49da19963f0f2c1c1eb4
diff --git a/dev-python/dateparser/dateparser-1.1.8.ebuild b/dev-python/dateparser/dateparser-1.1.8.ebuild
deleted file mode 100644
index 5133e74d74..0000000000
--- a/dev-python/dateparser/dateparser-1.1.8.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1 optfeature pypi
-
-DESCRIPTION="Date parsing library designed to parse dates from HTML pages"
-HOMEPAGE="
-	https://pypi.org/project/dateparser/
-	https://github.com/scrapinghub/dateparser
-"
-
-LICENSE="BSD-4"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	dev-python/tzlocal[${PYTHON_USEDEP}]
-"
-BDEPEND="test? (
-	dev-libs/fastText[python,${PYTHON_USEDEP}]
-	dev-python/convertdate[${PYTHON_USEDEP}]
-	dev-python/hijri-converter[${PYTHON_USEDEP}]
-	dev-python/langdetect[${PYTHON_USEDEP}]
-	dev-python/parameterized[${PYTHON_USEDEP}]
-)"
-
-EPYTEST_IGNORE=(
-	# tests that require network
-	tests/test_dateparser_data_integrity.py
-)
-
-EPYTEST_DESELECT=(
-	# tests that require network
-	tests/test_language_detect.py::CustomLangDetectParserTest::test_custom_language_detect_fast_text_{0,1}
-	# broken
-	tests/test_search.py::TestTranslateSearch::test_relative_base_setting_1_en
-	tests/test_search.py::TestTranslateSearch::test_splitting_of_not_parsed_1_en
-	tests/test_search.py::TestTranslateSearch::test_splitting_of_not_parsed_5_en
-	tests/test_search.py::TestTranslateSearch::test_splitting_of_not_parsed_6_sv
-)
-
-distutils_enable_tests pytest
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-rtd-theme
-
-pkg_postinst() {
-	optfeature "calendars support" "dev-python/hijri-converter dev-python/convertdate"
-	optfeature "fasttext support" "dev-libs/fastText[python]"
-	optfeature "langdetect support" dev-python/langdetect
-}
diff --git a/dev-python/dateparser/dateparser-1.1.7.ebuild b/dev-python/dateparser/dateparser-1.2.0.ebuild
similarity index 81%
rename from dev-python/dateparser/dateparser-1.1.7.ebuild
rename to dev-python/dateparser/dateparser-1.2.0.ebuild
index 744f0b6ad5..45704719e0 100644
--- a/dev-python/dateparser/dateparser-1.1.7.ebuild
+++ b/dev-python/dateparser/dateparser-1.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1 optfeature pypi
 
@@ -13,7 +13,7 @@ HOMEPAGE="
 	https://github.com/scrapinghub/dateparser
 "
 
-LICENSE="BSD-4"
+LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
 
@@ -26,11 +26,13 @@ RDEPEND="
 BDEPEND="test? (
 	dev-libs/fastText[python,${PYTHON_USEDEP}]
 	dev-python/convertdate[${PYTHON_USEDEP}]
-	dev-python/hijri-converter[${PYTHON_USEDEP}]
+	dev-python/hijridate[${PYTHON_USEDEP}]
 	dev-python/langdetect[${PYTHON_USEDEP}]
 	dev-python/parameterized[${PYTHON_USEDEP}]
 )"
 
+PATCHES=( "${FILESDIR}/${P}-migrate-hijridate.patch" )
+
 EPYTEST_IGNORE=(
 	# tests that require network
 	tests/test_dateparser_data_integrity.py
@@ -47,7 +49,7 @@ distutils_enable_sphinx docs \
 	dev-python/sphinx-rtd-theme
 
 pkg_postinst() {
-	optfeature "calendars support" "dev-python/hijri-converter dev-python/convertdate"
+	optfeature "calendars support" "dev-python/hijridate dev-python/convertdate"
 	optfeature "fasttext support" "dev-libs/fastText[python]"
 	optfeature "langdetect support" dev-python/langdetect
 }
diff --git a/dev-python/dateparser/files/dateparser-1.2.0-migrate-hijridate.patch b/dev-python/dateparser/files/dateparser-1.2.0-migrate-hijridate.patch
new file mode 100644
index 0000000000..3d488ca53b
--- /dev/null
+++ b/dev-python/dateparser/files/dateparser-1.2.0-migrate-hijridate.patch
@@ -0,0 +1,71 @@
+https://github.com/scrapinghub/dateparser/pull/1211
+From: pastalian <pastalian46@gmail.com>
+Date: Thu, 25 Jan 2024 21:14:28 +0900
+Subject: [PATCH] Migrate from hijri-converter to hijridate
+
+--- a/dateparser/calendars/hijri_parser.py
++++ b/dateparser/calendars/hijri_parser.py
+@@ -1,4 +1,4 @@
+-from hijri_converter import convert
++from hijridate import Gregorian, Hijri
+ 
+ from dateparser.calendars import non_gregorian_parser
+ 
+@@ -6,19 +6,17 @@
+ class hijri:
+     @classmethod
+     def to_gregorian(cls, year=None, month=None, day=None):
+-        g = convert.Hijri(
+-            year=year, month=month, day=day, validate=False
+-        ).to_gregorian()
++        g = Hijri(year=year, month=month, day=day, validate=False).to_gregorian()
+         return g.datetuple()
+ 
+     @classmethod
+     def from_gregorian(cls, year=None, month=None, day=None):
+-        h = convert.Gregorian(year, month, day).to_hijri()
++        h = Gregorian(year, month, day).to_hijri()
+         return h.datetuple()
+ 
+     @classmethod
+     def month_length(cls, year, month):
+-        h = convert.Hijri(year=year, month=month, day=1)
++        h = Hijri(year=year, month=month, day=1)
+         return h.month_length()
+ 
+ 
+--- a/docs/introduction.rst
++++ b/docs/introduction.rst
+@@ -223,13 +223,13 @@ Dependencies
+ 
+   * dateutil_'s module ``relativedelta`` for its freshness parser.
+   * convertdate_ to convert *Jalali* dates to *Gregorian*.
+-  * hijri-converter_ to convert *Hijri* dates to *Gregorian*.
++  * hijridate_ to convert *Hijri* dates to *Gregorian*.
+   * tzlocal_ to reliably get local timezone.
+   * ruamel.yaml_ (optional) for operations on language files.
+ 
+ .. _dateutil: https://pypi.python.org/pypi/python-dateutil
+ .. _convertdate: https://pypi.python.org/pypi/convertdate
+-.. _hijri-converter: https://pypi.python.org/pypi/hijri-converter
++.. _hijridate: https://pypi.python.org/pypi/hijridate
+ .. _tzlocal: https://pypi.python.org/pypi/tzlocal
+ .. _ruamel.yaml: https://pypi.python.org/pypi/ruamel.yaml
+ 
+@@ -261,4 +261,4 @@ To be able to use them you need to install the `calendar` extra by typing:
+     >>> HijriCalendar('17-01-1437 هـ 08:30 مساءً').get_date()
+     DateData(date_obj=datetime.datetime(2015, 10, 30, 20, 30), period='day', locale=None)
+ 
+-.. note:: `HijriCalendar` only works with Python ≥ 3.6.
++.. note:: `HijriCalendar` only works with Python ≥ 3.7.
+--- a/setup.py
++++ b/setup.py
+@@ -41,7 +41,7 @@
+         "console_scripts": ["dateparser-download = dateparser_cli.cli:entrance"],
+     },
+     extras_require={
+-        "calendars": ["hijri-converter", "convertdate"],
++        "calendars": ["hijridate", "convertdate"],
+         "fasttext": ["fasttext"],
+         "langdetect": ["langdetect"],
+     },
diff --git a/dev-python/decopatch/Manifest b/dev-python/decopatch/Manifest
index db88ebb453..c5b1e1dc13 100644
--- a/dev-python/decopatch/Manifest
+++ b/dev-python/decopatch/Manifest
@@ -1,2 +1 @@
 DIST decopatch-1.4.10.tar.gz 69538 BLAKE2B 812305abb0648c42fe786f6153820ff68e3bf3cb23bf0b3eecb139085b88071f914aa556f17a90bd45b39cdf42a563fb3c30178095bbdd16331d36ec2ff29e58 SHA512 7554c5bdef6aeb06968334c8aef3f67b56bd3ff8be5e05cb6289f3088848d946d46ecc1d9f73bab9db80b6981aa4f9039c359eb8a0fe9f4acee62addf4f0ed96
-DIST decopatch-1.4.9.tar.gz 68419 BLAKE2B bb49ffd093aead65373f6c56955d2dfcdf73f5654acb12ddfbfc0b5c94f9db8e10c70493489cc06a569bef312f04c3e5cb94bbc9e64ba2f75866777fa7721aff SHA512 2f131bbc485ab177c86abb782cdd0b66b7370a7fb97b62e27da5fb62f3c115ae540eae22a346d8ecb0946216661c111f952d8e22e60b40de21371cd38b93264a
diff --git a/dev-python/decopatch/decopatch-1.4.10.ebuild b/dev-python/decopatch/decopatch-1.4.10.ebuild
index e4e7446c82..cda3b4998c 100644
--- a/dev-python/decopatch/decopatch-1.4.10.ebuild
+++ b/dev-python/decopatch/decopatch-1.4.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_USE_PEP517=setuptools
 
 DOCS_BUILDER="mkdocs"
@@ -26,6 +26,8 @@ BDEPEND="
 	test? ( dev-python/pytest-cases[${PYTHON_USEDEP}] )
 "
 
+PATCHES=( "${FILESDIR}/${P}-python12.patch" )
+
 distutils_enable_tests pytest
 
 python_prepare_all() {
diff --git a/dev-python/decopatch/decopatch-1.4.9.ebuild b/dev-python/decopatch/decopatch-1.4.9.ebuild
deleted file mode 100644
index cc40a744cc..0000000000
--- a/dev-python/decopatch/decopatch-1.4.9.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-DISTUTILS_USE_PEP517=setuptools
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="dev-python/mkdocs-material"
-
-inherit distutils-r1 docs pypi
-
-DESCRIPTION="Create decorators easily in python"
-HOMEPAGE="https://pypi.org/project/decopatch/ https://github.com/smarie/python-decopatch"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-python/makefun[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest-cases[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed "/pytest-runner/d" -i setup.cfg || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	docs_compile
-}
diff --git a/dev-python/decopatch/files/decopatch-1.4.10-python12.patch b/dev-python/decopatch/files/decopatch-1.4.10-python12.patch
new file mode 100644
index 0000000000..24ca2082e9
--- /dev/null
+++ b/dev-python/decopatch/files/decopatch-1.4.10-python12.patch
@@ -0,0 +1,61 @@
+https://github.com/smarie/python-decopatch/pull/34
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Tue, 25 Jul 2023 13:31:12 +0200
+Subject: [PATCH] Adjust for whitespace changes with python 3.12
+
+Tests would fail with python3-3.12.0~b4-1.fc39.x86_64.
+--- a/tests/test_doc.py
++++ b/tests/test_doc.py
+@@ -1,5 +1,5 @@
+ from __future__ import print_function
+-
++import re
+ 
+ import pytest
+ from makefun import wraps
+@@ -182,7 +182,8 @@ def add_ints(a, b):
+     with capsys.disabled():
+         print(captured.out)
+ 
+-    assert captured.out == """hello, world !
++    out = re.sub(r'[ \t]+\n', '\n', captured.out)
++    assert out == """hello, world !
+ <executing foo>
+ hello, world !
+ <executing bar>
+@@ -195,7 +196,7 @@ def add_ints(a, b):
+ say_hello(person='world')
+     This decorator wraps the decorated function so that a nice hello
+     message is printed before each call.
+-    
++
+     :param person: the person name in the print message. Default = "world"
+ 
+ Signature: (person='world')
+--- a/tests/test_doc_advanced.py
++++ b/tests/test_doc_advanced.py
+@@ -1,4 +1,5 @@
+ from __future__ import print_function
++import re
+ import sys
+ 
+ import pytest
+@@ -200,7 +201,8 @@ def custom(a, b):
+     with capsys.disabled():
+         print(captured.out)
+ 
+-    assert captured.out == """hello, world !
++    out = re.sub(r'[ \t]+\n', '\n', captured.out)
++    assert out == """hello, world !
+ hello, world !
+ hello, you !
+ Help on function say_hello in module tests.test_doc_advanced:
+@@ -208,7 +210,7 @@ def custom(a, b):
+ say_hello(person='world')
+     This decorator modifies the decorated function so that a nice hello
+     message is printed before the call.
+-    
++
+     :param person: the person name in the print message. Default = "world"
+     :param f: represents the decorated item. Automatically injected.
+     :return: a modified version of `f` that will print a hello message before executing
diff --git a/dev-python/hijri-converter/Manifest b/dev-python/hijri-converter/Manifest
deleted file mode 100644
index a504e2f684..0000000000
--- a/dev-python/hijri-converter/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hijri-converter-2.2.4.tar.gz 34899 BLAKE2B 749d50ed8f669766d4b605dbec30173c69be7a0a66eb7bcbfc65a915ad5c340a75f0948a045edafa4111a9c0386b8a502c92236168e691535dac95aeb0a08705 SHA512 3d11bf642c97ad5b2dd50f0015d69ba7f63557ab0977fd174418e3ee2ae4406189b571ce9f0e0f7960ea13248206ba12287d63a7090bb0781d3b9baf7b79dd98
diff --git a/dev-python/hijri-converter/hijri-converter-2.2.4.ebuild b/dev-python/hijri-converter/hijri-converter-2.2.4.ebuild
deleted file mode 100644
index f50c010b15..0000000000
--- a/dev-python/hijri-converter/hijri-converter-2.2.4.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} pypy3 )
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-inherit distutils-r1 pypi
-
-DESCRIPTION="Accurate Hijri-Gregorian date converter based on the Umm al-Qura calendar"
-HOMEPAGE="https://github.com/dralshehri/hijri-converter"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-distutils_enable_tests pytest
diff --git a/dev-python/hijri-converter/metadata.xml b/dev-python/hijri-converter/metadata.xml
deleted file mode 100644
index f9f4b325d2..0000000000
--- a/dev-python/hijri-converter/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<description>co-maintainers welcome</description>
-		<email>lssndrbarbieri@gmail.com</email>
-		<name>Alessandro Barbieri</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">dralshehri/hijri-converter</remote-id>
-		<remote-id type="pypi">hijri-converter</remote-id>
-		<doc>https://hijri-converter.readthedocs.io</doc>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/hijridate/Manifest b/dev-python/hijridate/Manifest
index cc251c2c0b..454c2f9058 100644
--- a/dev-python/hijridate/Manifest
+++ b/dev-python/hijridate/Manifest
@@ -1 +1 @@
-DIST hijridate-2.3.0.gh.tar.gz 42409 BLAKE2B 3a06adb44542def4a49c33951f4ae8e2a0057f1fdc276d28ce05462aa93111d387e36a86786beaf18b8009d40b9db661f4704a2c97c3da4406da10a171e90eb8 SHA512 5b67337d7acf9e44e9d38f0cce8c0e7d0cf4ffbeee4d8e7f7813e42d079f364422529c08572f0f7cf64aa08ba2519c3e834a28f5a3aec16e79ce3fef91ff34bb
+DIST hijridate-2.4.1.gh.tar.gz 42771 BLAKE2B 7640d2eb6760f1e496468f0cb11d25c3bb4bf8fc4274b1d802d25b8392a44a83c46564d3f2372f53a37ec10fd914c1fbf096dab359018350662b747f8c1c65a6 SHA512 64fc38afbb59ce5de3611602ed8b0262cf410b66236f57e30aeb3d39db904afbfb17b300dba0ac7ab2163b7c4c000b2d444fa3769f00c7a7e80b8fe4bbc7216c
diff --git a/dev-python/hijridate/hijridate-2.3.0.ebuild b/dev-python/hijridate/hijridate-2.4.1.ebuild
similarity index 85%
rename from dev-python/hijridate/hijridate-2.3.0.ebuild
rename to dev-python/hijridate/hijridate-2.4.1.ebuild
index 3f03e203fa..0d3a22cfac 100644
--- a/dev-python/hijridate/hijridate-2.3.0.ebuild
+++ b/dev-python/hijridate/hijridate-2.4.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} pypy3 )
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
 
 inherit distutils-r1
 
@@ -19,6 +19,7 @@ KEYWORDS="~amd64"
 distutils_enable_tests pytest
 
 distutils_enable_sphinx docs \
+	dev-python/furo \
 	dev-python/myst-parser \
 	dev-python/sphinx-notfound-page \
 	dev-python/sphinx-rtd-theme
diff --git a/dev-python/langdetect/files/langdetect-1.0.9-explicit-config.patch b/dev-python/langdetect/files/langdetect-1.0.9-explicit-config.patch
new file mode 100644
index 0000000000..637368d2f2
--- /dev/null
+++ b/dev-python/langdetect/files/langdetect-1.0.9-explicit-config.patch
@@ -0,0 +1,13 @@
+Fix "Package 'langdetect.profiles' is absent from the `packages` configuration."
+
+--- a/setup.py
++++ b/setup.py
+@@ -18,7 +18,7 @@ setup(
+     author_email='michal.danilak@gmail.com',
+     url='https://github.com/Mimino666/langdetect',
+     keywords='language detection library',
+-    packages=['langdetect', 'langdetect.utils', 'langdetect.tests'],
++    packages=['langdetect', 'langdetect.utils', 'langdetect.tests', 'langdetect.profiles'],
+     include_package_data=True,
+     install_requires=['six'],
+     license='MIT',
diff --git a/dev-python/langdetect/langdetect-1.0.9.ebuild b/dev-python/langdetect/langdetect-1.0.9.ebuild
index 5a5c248cb1..4ccb48f61f 100644
--- a/dev-python/langdetect/langdetect-1.0.9.ebuild
+++ b/dev-python/langdetect/langdetect-1.0.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} pypy3 )
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
 DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1 pypi
 
@@ -19,4 +19,6 @@ KEYWORDS="~amd64"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 
+PATCHES=( "${FILESDIR}/${P}-explicit-config.patch" )
+
 distutils_enable_tests unittest
diff --git a/dev-python/pure-protobuf/Manifest b/dev-python/pure-protobuf/Manifest
index 64a457a06a..0dff758925 100644
--- a/dev-python/pure-protobuf/Manifest
+++ b/dev-python/pure-protobuf/Manifest
@@ -1,2 +1 @@
-DIST pure_protobuf-2.2.3.tar.gz 16445 BLAKE2B 38f13a975b4364e900e30e80d66e735ba4d871455002778f7caace14574de38fbfcf6735115b41a9c77cf023fea49dcaa1e43817e93f54388538f7619f26225a SHA512 b2189ff0971c0f797a526c056691e2d2e860d9a07be2d78ea30f5e74f940f95646235f2570c8d5d42559f184d37e0e3250f8caf4659092f567dd598c7b926a98
 DIST pure_protobuf-2.3.0.tar.gz 16481 BLAKE2B b56d024b13ef4711c9b53ffc47029fb4e49e025d8c096b547926d44a89769a26d180420698dbf51c2db4b58f8b8df6825d368c921babdd9774e4c3a4f0d72e7e SHA512 2b2eb372cde5b7c765fa878b06fe1a82f57061d0887f560aa84799db09d506a4947b54feffff51391ebf2c87923845f93badbab19e1cf45f998c79f6df75fb05
diff --git a/dev-python/pure-protobuf/pure-protobuf-2.2.3.ebuild b/dev-python/pure-protobuf/pure-protobuf-2.2.3.ebuild
deleted file mode 100644
index a737d0c949..0000000000
--- a/dev-python/pure-protobuf/pure-protobuf-2.2.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-DISTUTILS_USE_PEP517=hatchling
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python implementation of Protocol Buffers data types with dataclasses support"
-HOMEPAGE="
-	https://github.com/eigenein/protobuf
-	https://pypi.org/project/pure-protobuf/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# ModuleNotFoundError
-RESTRICT="test"
-
-BDEPEND="dev-python/hatch-vcs[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pure-protobuf/pure-protobuf-2.3.0.ebuild b/dev-python/pure-protobuf/pure-protobuf-2.3.0.ebuild
index 1431c4c79b..c7322ca000 100644
--- a/dev-python/pure-protobuf/pure-protobuf-2.3.0.ebuild
+++ b/dev-python/pure-protobuf/pure-protobuf-2.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_USE_PEP517=hatchling
 inherit distutils-r1 pypi
 
diff --git a/dev-python/pymeeus/Manifest b/dev-python/pymeeus/Manifest
index 10f81071e2..bcec1ec7bb 100644
--- a/dev-python/pymeeus/Manifest
+++ b/dev-python/pymeeus/Manifest
@@ -1,2 +1 @@
-DIST PyMeeus-0.5.11.tar.gz 5368346 BLAKE2B d1bde9d62bd3349533b086ecbf5f6c455caf333cbdb0f32d11cac450db07708e442bc44cb085ec5140231158b95068e688e9c8abfcc62ba0e52e1cdd2de294b8 SHA512 9c109a7ed0ff3635e8b1eb4ee444bc5086528169fc942719385b02c5d5eca1f1ec3d3988bb06140e94f3d4ab741473880d8a36e187c468b9b91a3254575b92e6
 DIST PyMeeus-0.5.12.tar.gz 5752712 BLAKE2B f7c80c79d72c071a57a19373ce818892f2e56e5339c4b8f2e2e2ff32e7363d8607046962f4289b7802a3219d03fafbd6ad233a271dba1f0d46ee29052d0125c1 SHA512 33f68f352cb6737aeec9782727c5ded921cf6f5561cfd7ecb237f7cf4b431e1010f7dff49d779ea368c8298a3012da84f6fa3afc7efc08579b798bb17558c423
diff --git a/dev-python/pymeeus/pymeeus-0.5.11.ebuild b/dev-python/pymeeus/pymeeus-0.5.11.ebuild
deleted file mode 100644
index ac4d598252..0000000000
--- a/dev-python/pymeeus/pymeeus-0.5.11.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} pypy3 )
-DISTUTILS_USE_PEP517=setuptools
-PYPI_PN="PyMeeus"
-PYPI_NO_NORMALIZE=1
-inherit distutils-r1 pypi
-
-MY_PN="PyMeeus"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Python implementation of Jean Meeus astronomical routines"
-HOMEPAGE="
-	https://pypi.org/project/PyMeeus/
-	https://github.com/architest/pymeeus
-"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-distutils_enable_tests pytest
-
-distutils_enable_sphinx docs/source \
-	dev-python/sphinx-rtd-theme
diff --git a/dev-python/pymeeus/pymeeus-0.5.12.ebuild b/dev-python/pymeeus/pymeeus-0.5.12.ebuild
index 70c65c2e31..aa3a9a7241 100644
--- a/dev-python/pymeeus/pymeeus-0.5.12.ebuild
+++ b/dev-python/pymeeus/pymeeus-0.5.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} pypy3 )
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
 DISTUTILS_USE_PEP517=setuptools
 PYPI_PN="PyMeeus"
 PYPI_NO_NORMALIZE=1
diff --git a/dev-python/pytest-cases/Manifest b/dev-python/pytest-cases/Manifest
index 570ddba2bf..60bc279571 100644
--- a/dev-python/pytest-cases/Manifest
+++ b/dev-python/pytest-cases/Manifest
@@ -1,2 +1 @@
-DIST pytest-cases-3.6.13.tar.gz 1082993 BLAKE2B c5259d78ce11dbeff2acca63762360622758edc19b8982f4cbade44459ae347c0c5b4334d9fcf42cf587ef301a193b9ab4c3a496462c403550580549c9be869b SHA512 70bb05afce137cc456dc98fd62d5fa778ce8728c7ffb30a05b765b88a689ce2ff01005f594c5be90e4892debbe925b2c05961d9e4bc567610da1be5b01f5a659
-DIST pytest-cases-3.6.14.tar.gz 1083239 BLAKE2B be32c3762f0baf74149276553e07817b75f7eb722ff54bfa46eb8756183fea1ac30089735cb4db7c45406d2c2477c7f95a80779aee388561bac55ac8c5cd84d2 SHA512 a621f55836cae197e3fd1f3460c56d6c1f813e3d0e42e8b193f6cb8c88496a3be18643b1df51cc499f15e09e25cebb8ed3f0e593779ea6d8a4c03a2bd92f6f30
+DIST pytest-cases-3.8.2.tar.gz 1094993 BLAKE2B 2a5b1dd57dca9b159756287b8bd4d2a54fa1f48e2256959343bb196867ab57ff6852826744f166ac39dbb0f06bcce4918a718a1097d5d2e3841b0a516838bf40 SHA512 5da2b8db56e91d3f0948b90b9225d21fad5c4cf2c319388844aca9b74b69ec9c91f7a661e28cc06b9ab8a85a11272fc4d5fc81d0d9d4b0abff80fb83d34744ad
diff --git a/dev-python/pytest-cases/pytest-cases-3.6.13.ebuild b/dev-python/pytest-cases/pytest-cases-3.6.13.ebuild
deleted file mode 100644
index 514163671d..0000000000
--- a/dev-python/pytest-cases/pytest-cases-3.6.13.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="dev-python/mkdocs-material"
-
-inherit distutils-r1 docs pypi
-
-DESCRIPTION="Separate test code from test cases in pytest"
-HOMEPAGE="https://pypi.org/project/pytest-cases/ https://github.com/smarie/python-pytest-cases"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/decopatch[${PYTHON_USEDEP}]
-	>=dev-python/makefun-1.9.5[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-harvest[${PYTHON_USEDEP}]
-		dev-python/pytest-steps[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_DESELECT=(
-	tests/pytest_extension/doc/test_doc_fixture_graph_union.py::test_closure
-	tests/pytest_extension/fixtures/fixture_unions/test_fixture_closure_edits.py::test_super_closure_edits2
-	tests/pytest_extension/fixtures/fixture_unions/test_fixtures_union_2hard.py::test_super_closure
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed "/pytest-runner/d" -i setup.cfg || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	docs_compile
-}
diff --git a/dev-python/pytest-cases/pytest-cases-3.6.14.ebuild b/dev-python/pytest-cases/pytest-cases-3.8.2.ebuild
similarity index 60%
rename from dev-python/pytest-cases/pytest-cases-3.6.14.ebuild
rename to dev-python/pytest-cases/pytest-cases-3.8.2.ebuild
index b24ac8c873..7d635e99d4 100644
--- a/dev-python/pytest-cases/pytest-cases-3.6.14.ebuild
+++ b/dev-python/pytest-cases/pytest-cases-3.8.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_USE_PEP517=setuptools
 PYPI_NO_NORMALIZE=1
 
@@ -27,7 +27,8 @@ KEYWORDS="~amd64"
 
 RDEPEND="
 	dev-python/decopatch[${PYTHON_USEDEP}]
-	>=dev-python/makefun-1.9.5[${PYTHON_USEDEP}]
+	>=dev-python/makefun-1.15.1[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 "
 BDEPEND="
@@ -39,19 +40,8 @@ BDEPEND="
 	)
 "
 
-EPYTEST_DESELECT=(
-	tests/pytest_extension/doc/test_doc_fixture_graph_union.py::test_closure
-	tests/pytest_extension/fixtures/fixture_unions/test_fixture_closure_edits.py::test_super_closure_edits2
-	tests/pytest_extension/fixtures/fixture_unions/test_fixtures_union_2hard.py::test_super_closure
-)
-
 distutils_enable_tests pytest
 
-python_prepare_all() {
-	sed "/pytest-runner/d" -i setup.cfg || die
-	distutils-r1_python_prepare_all
-}
-
 python_compile_all() {
 	docs_compile
 }
diff --git a/dev-python/pytest-harvest/files/pytest-harvest-1.10.4-strict-mkdocs.patch b/dev-python/pytest-harvest/files/pytest-harvest-1.10.4-strict-mkdocs.patch
new file mode 100644
index 0000000000..eb63fdfa01
--- /dev/null
+++ b/dev-python/pytest-harvest/files/pytest-harvest-1.10.4-strict-mkdocs.patch
@@ -0,0 +1,20 @@
+https://www.mkdocs.org/about/release-notes/#stricter-directory-validation
+
+diff --git a/docs/mkdocs.yml b/mkdocs.yml
+similarity index 95%
+rename from docs/mkdocs.yml
+rename to mkdocs.yml
+index 7819dac..4a6d73e 100644
+--- a/docs/mkdocs.yml
++++ b/mkdocs.yml
+@@ -1,8 +1,8 @@
+ site_name: pytest_harvest
+ # site_description: 'A short description of my project'
+ repo_url: https://github.com/smarie/python-pytest-harvest
+-docs_dir: .
+-site_dir: ../site
++docs_dir: ./docs
++site_dir: ./site
+ nav:
+     - Home: index.md
+     - API reference: api_reference.md
diff --git a/dev-python/pytest-harvest/pytest-harvest-1.10.4.ebuild b/dev-python/pytest-harvest/pytest-harvest-1.10.4.ebuild
index a8ee9bb9b7..293c2e1d4c 100644
--- a/dev-python/pytest-harvest/pytest-harvest-1.10.4.ebuild
+++ b/dev-python/pytest-harvest/pytest-harvest-1.10.4.ebuild
@@ -1,15 +1,14 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_USE_PEP517=setuptools
 PYPI_NO_NORMALIZE=1
 
 DOCS_BUILDER="mkdocs"
 DOCS_DEPEND="dev-python/mkdocs-material"
-DOCS_DIR="docs"
 
 inherit distutils-r1 docs pypi
 
@@ -35,6 +34,8 @@ BDEPEND="
 	)
 "
 
+PATCHES=( "${FILESDIR}/${P}-strict-mkdocs.patch" )
+
 EPYTEST_DESELECT=(
 	"pytest_harvest/tests/test_all_raw_with_meta_check.py::test_run_all_tests[test_get_session_results.py]"
 	"pytest_harvest/tests/test_all_raw_with_meta_check.py::test_run_all_tests[test_get_session_results_indirect_and_noparam.py]"
diff --git a/dev-python/pytest-steps/files/pytest-steps-1.8.0-strict-mkdocs.patch b/dev-python/pytest-steps/files/pytest-steps-1.8.0-strict-mkdocs.patch
new file mode 100644
index 0000000000..b9b833a46a
--- /dev/null
+++ b/dev-python/pytest-steps/files/pytest-steps-1.8.0-strict-mkdocs.patch
@@ -0,0 +1,20 @@
+https://www.mkdocs.org/about/release-notes/#stricter-directory-validation
+
+diff --git a/docs/mkdocs.yml b/mkdocs.yml
+similarity index 95%
+rename from docs/mkdocs.yml
+rename to mkdocs.yml
+index 8359d3f..b4c34c4 100644
+--- a/docs/mkdocs.yml
++++ b/mkdocs.yml
+@@ -1,8 +1,8 @@
+ site_name: pytest_steps
+ # site_description: 'A short description of my project'
+ repo_url: https://github.com/smarie/python-pytest-steps
+-docs_dir: .
+-site_dir: ../site
++docs_dir: ./docs
++site_dir: ./site
+ nav:
+     - Home: index.md
+     - API reference: api_reference.md
diff --git a/dev-python/pytest-steps/pytest-steps-1.8.0.ebuild b/dev-python/pytest-steps/pytest-steps-1.8.0.ebuild
index 8d813d0651..57301eca54 100644
--- a/dev-python/pytest-steps/pytest-steps-1.8.0.ebuild
+++ b/dev-python/pytest-steps/pytest-steps-1.8.0.ebuild
@@ -1,15 +1,14 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_USE_PEP517=setuptools
 PYPI_NO_NORMALIZE=1
 
 DOCS_BUILDER="mkdocs"
 DOCS_DEPEND="dev-python/mkdocs-material"
-DOCS_DIR="docs"
 
 inherit distutils-r1 docs pypi
 
@@ -35,6 +34,8 @@ BDEPEND="
 	)
 "
 
+PATCHES=( "${FILESDIR}/${P}-strict-mkdocs.patch" )
+
 EPYTEST_DESELECT=(
 	# tests fail with recent Pandas
 	pytest_steps/tests/test_docs_example_with_harvest.py::test_synthesis_df
diff --git a/net-misc/gmid/Manifest b/net-misc/gmid/Manifest
index 674e720be6..7598d362f8 100644
--- a/net-misc/gmid/Manifest
+++ b/net-misc/gmid/Manifest
@@ -1,2 +1,4 @@
 DIST gmid-1.8.6.sha.sig 417 BLAKE2B b6b4735580d63d2a741cd26a45d7b418c7219425ce615a1ed767a14132938f880f860481e9f4e47d187efd68d33adb29287731b497a0e23576c9f25076afd21a SHA512 d9c2520abd668b4dd5d2def375e0aba2ba41940b93ff2941237e05ba92380d88f5037dbfe84f982d027fe7fbc0b5743af63b8abe83686cdf0d1ac9444247371f
 DIST gmid-1.8.6.tar.gz 121648 BLAKE2B a5d30434603c7b45a12541baa2119377e313309499fcc33af1960f55c71b9dbb330e35f5d845f216a9452fb14670b775151174280fed6360d050e11a6621ddc3 SHA512 fce40e041a313c918acd0fdbe48d1a2d3d9e8907f8e8251c887cb0fcaf6e82b7128936dfc804241b00530d26901448752ac01b590819ed2aee10734c0f29eaae
+DIST gmid-2.0.1.sha256.sig 239 BLAKE2B b118bd39fc529a05112f405589ce2d1c44d4436b19edecb388709ff2cfe4f49ec15506082da6e8a9aecba7cd9ed2d308aafef5432f1692145d6eabe3b5e53683 SHA512 83eff56ffec7ed55338dfe1e48d670779008c523634c86050a63f333ed328541dcaeb1a0d3fccb01bdf2f6d3bbea20c2898bfbd115ee7590203c04bd24baa064
+DIST gmid-2.0.1.tar.gz 182989 BLAKE2B 4973711ee94babd0b0f470cf84f460343c39867753858817b7262d8ca3947e79b2e20fe004627e8acf00728a3b43db4bfddf446115acca8eadf190dcc6ef533f SHA512 38d29775968c40fe174b8ead3393c3cd77dd535dae18d3051eb9b98b248a56929d84909c07c3405ddc6035e7d1fc66ea856a2a1dd96e53ac8d30fd231c764478
diff --git a/net-misc/gmid/files/gmid.conf-r1 b/net-misc/gmid/files/gmid.conf-r1
new file mode 100644
index 0000000000..811a33b3af
--- /dev/null
+++ b/net-misc/gmid/files/gmid.conf-r1
@@ -0,0 +1,12 @@
+certdir = "/etc/ssl/gmid"
+
+user "gemini" # drop privileges
+
+server "localhost" {
+		listen on * port 1965;
+		cert $certdir "/gmid.crt"
+		key  $certdir "/gmid.key"
+
+		root "/var/gemini/localhost"
+		auto index on
+}
diff --git a/net-misc/gmid/gmid-2.0.1.ebuild b/net-misc/gmid/gmid-2.0.1.ebuild
new file mode 100644
index 0000000000..f046fc3257
--- /dev/null
+++ b/net-misc/gmid/gmid-2.0.1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+SSL_DAYS=36500
+SSL_CERT_MANDATORY=1
+VERIFY_SIG_METHOD="signify"
+inherit edo ssl-cert systemd toolchain-funcs verify-sig
+
+DESCRIPTION="Simple and secure Gemini server"
+HOMEPAGE="https://gmid.omarpolo.com"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://git.omarpolo.com/${PN} https://github.com/omar-polo/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/omar-polo/${PN}/releases/download/${PV}/${P}.tar.gz
+		verify-sig? ( https://github.com/omar-polo/${PN}/releases/download/${PV}/${P}.sha256.sig )"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD ISC MIT"
+SLOT="0"
+IUSE="seccomp test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	acct-user/gemini
+	dev-libs/libevent:=
+	dev-libs/libretls:=
+	dev-libs/openssl:=
+	!elibc_Darwin? ( dev-libs/libbsd )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	app-alternatives/yacc
+	seccomp? ( sys-kernel/linux-headers )
+"
+if [[ ${PV} != 9999 ]]; then
+	BDEPEND+="verify-sig? ( sec-keys/signify-keys-gmid:$(ver_cut 1-2) )"
+fi
+
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/signify-keys/${PN}-$(ver_cut 1-2).pub"
+
+DOCS=( README.md ChangeLog contrib/README )
+
+# not an autoconf configure script
+QA_CONFIG_IMPL_DECL_SKIP=( "*" )
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+	else
+		if use verify-sig; then
+			# Too many levels of symbolic links
+			cp "${DISTDIR}"/${P}.{sha256.sig,tar.gz} "${WORKDIR}" || die
+			cd "${WORKDIR}" || die
+			verify-sig_verify_signed_checksums \
+				${P}.sha256.sig sha256 ${P}.tar.gz
+		fi
+		default
+	fi
+}
+
+src_configure() {
+	local conf_args
+	tc-export CC
+
+	# note: not an autoconf configure script
+	conf_args=(
+		--prefix="${EPREFIX}"/usr
+		--mandir="${EPREFIX}"/usr/share/man
+		--sysconfdir="${EPREFIX}"/etc
+		--with-libtls=system
+		$(use_enable seccomp sandbox)
+	)
+	edo ./configure "${conf_args[@]}"
+
+	if use seccomp && has usersandbox ${FEATURES}; then
+		export SKIP_RUNTIME_TESTS=1
+	fi
+}
+
+src_install() {
+	default
+
+	insinto /etc/gmid
+	newins "${FILESDIR}"/gmid.conf-r1 gmid.conf
+
+	insinto /usr/share/vim/vimfiles
+	doins -r contrib/vim/*
+
+	systemd_dounit "${FILESDIR}"/gmid.service
+	newinitd "${FILESDIR}"/gmid.initd gmid
+	newconfd "${FILESDIR}"/gmid.confd gmid
+
+	keepdir /var/gemini/localhost
+}
+
+pkg_postinst() {
+	if [[ ! -f "${EROOT}"/etc/ssl/${PN}/${PN}.key ]]; then
+		install_cert /etc/ssl/${PN}/${PN}
+		chown gemini:gemini "${EROOT}"/etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
+	fi
+
+	einfo "This gemini server can be run as a user with zero configuration.\n"
+	einfo "In order to use it with the init service you will need to generate a"
+	einfo "self-signed TLS certificate and a key and set up the configuration"
+	einfo "file (see man 1 gmid for details)."
+}
diff --git a/net-misc/gmid/gmid-9999.ebuild b/net-misc/gmid/gmid-9999.ebuild
index 6809adf5d8..f046fc3257 100644
--- a/net-misc/gmid/gmid-9999.ebuild
+++ b/net-misc/gmid/gmid-9999.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
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/omar-polo/${PN}/releases/download/${PV}/${P}.tar.gz
-		verify-sig? ( https://github.com/omar-polo/${PN}/releases/download/${PV}/SHA256.sig -> ${P}.sha.sig )"
+		verify-sig? ( https://github.com/omar-polo/${PN}/releases/download/${PV}/${P}.sha256.sig )"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -27,7 +27,6 @@ RESTRICT="!test? ( test )"
 
 DEPEND="
 	acct-user/gemini
-	dev-libs/imsg-compat
 	dev-libs/libevent:=
 	dev-libs/libretls:=
 	dev-libs/openssl:=
@@ -43,21 +42,23 @@ if [[ ${PV} != 9999 ]]; then
 	BDEPEND+="verify-sig? ( sec-keys/signify-keys-gmid:$(ver_cut 1-2) )"
 fi
 
-QA_CONFIG_IMPL_DECL_SKIP=1
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/signify-keys/${PN}-$(ver_cut 1-2).pub"
 
 DOCS=( README.md ChangeLog contrib/README )
 
+# not an autoconf configure script
+QA_CONFIG_IMPL_DECL_SKIP=( "*" )
+
 src_unpack() {
 	if [[ ${PV} == 9999 ]]; then
 		git-r3_src_unpack
 	else
 		if use verify-sig; then
 			# Too many levels of symbolic links
-			cp "${DISTDIR}"/${P}.{sha.sig,tar.gz} "${WORKDIR}" || die
+			cp "${DISTDIR}"/${P}.{sha256.sig,tar.gz} "${WORKDIR}" || die
 			cd "${WORKDIR}" || die
 			verify-sig_verify_signed_checksums \
-				${P}.sha.sig sha256 ${P}.tar.gz
+				${P}.sha256.sig sha256 ${P}.tar.gz
 		fi
 		default
 	fi
@@ -69,14 +70,15 @@ src_configure() {
 
 	# note: not an autoconf configure script
 	conf_args=(
-		PREFIX="${EPREFIX}"/usr
-		MANDIR="${EPREFIX}"/usr/share/man
+		--prefix="${EPREFIX}"/usr
+		--mandir="${EPREFIX}"/usr/share/man
+		--sysconfdir="${EPREFIX}"/etc
+		--with-libtls=system
 		$(use_enable seccomp sandbox)
 	)
-
 	edo ./configure "${conf_args[@]}"
 
-	if use seccomp && has usersandbox ${FEATURES} ; then
+	if use seccomp && has usersandbox ${FEATURES}; then
 		export SKIP_RUNTIME_TESTS=1
 	fi
 }
@@ -85,7 +87,7 @@ src_install() {
 	default
 
 	insinto /etc/gmid
-	doins "${FILESDIR}"/gmid.conf
+	newins "${FILESDIR}"/gmid.conf-r1 gmid.conf
 
 	insinto /usr/share/vim/vimfiles
 	doins -r contrib/vim/*
diff --git a/net-misc/megasync/Manifest b/net-misc/megasync/Manifest
index 701233efc4..66528caaaa 100644
--- a/net-misc/megasync/Manifest
+++ b/net-misc/megasync/Manifest
@@ -1,2 +1,2 @@
-DIST megasync-4.11.0.0.tar.gz 20313571 BLAKE2B 8c5c58912fef730bf3e4c56c5de0b2c6f4825be6c91ec19e6c5f5946a76efa5fd9f36f6afdee3d886b31a13c924dea81f7999d29fbab0bb0f1acefbe52c449f5 SHA512 ab43b83d05d56b8eb1bf66ed89801889cfb8d21d9bae86245607a1d7c36f7436fa8879f6fd94cb07c4a2e8567532b9e0919ec9e78e2ca85d8fca262b1479b482
-DIST megasync-sdk-4.11.0.0.tar.gz 3714994 BLAKE2B 6d6d217d8acb7f191c88f18bc0b2ef9b6f743502a9916841177a93452c1818cffcb8275134cc2a32162693c59af829d42249497f2ed18b66e3c0f032f0ba6780 SHA512 471102d280d02b90f41c46f5700c0d71d88f74ccf7c605c717a66ad154c84c725ce231d11779fd480b2eb81b073da0bbea00dbc149918e6519fe89694b185ef4
+DIST megasync-4.12.0.0.tar.gz 25266988 BLAKE2B 0c126feb273d6d11e05a3ec3a5e7925f27bfd86e2ef23306fce4c9b2564b178dc5918b7bef9dcea33a8a5d0462e9c1e8d771c299de6e0f8ed5d4bed616ed58f9 SHA512 fd3ea7b624e66e3d4576c436d983a027e711783d41c585eedf540ba6bbf25ab9128ab4a3c0d2e6806705d54cea5e470d7339d49cc72a635385861f9efd64faf9
+DIST megasync-sdk-4.12.0.0.tar.gz 3580874 BLAKE2B 7fe63ccd998ac0fe4f6d31d4fb38041d01180044b6a36658da28b0793c2c0c9a95984a937ffa74b11449818ca63a55d7d1faef65e69ea29309d42c4d7646b2c3 SHA512 e97d5901e5445bd677b2d7c50d684dbd6975efcba43ed6618b76d9452b33f5c42eaa8279e920987cf5af63da6ad951589e644bf01814b69739e4260c651aa68b
diff --git a/net-misc/megasync/megasync-4.11.0.0.ebuild b/net-misc/megasync/megasync-4.12.0.0.ebuild
similarity index 79%
rename from net-misc/megasync/megasync-4.11.0.0.ebuild
rename to net-misc/megasync/megasync-4.12.0.0.ebuild
index 0d4b8ab3f4..78d77b1684 100644
--- a/net-misc/megasync/megasync-4.11.0.0.ebuild
+++ b/net-misc/megasync/megasync-4.12.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]];then
 	EGIT_BRANCH="master"
 	EGIT_SUBMODULES=( '*' )
 else
-	MEGA_SDK_REV="6d4c102940dab277974090cd4292e58f08ac6032" # commit of src/MEGASync/mega submodule
+	MEGA_SDK_REV="2e9307d114c379967f415211d466262162e074d4" # commit of src/MEGASync/mega submodule
 	MEGA_TAG_SUFFIX="Win"
 	SRC_URI="
 		https://github.com/meganz/MEGAsync/archive/v${PV}_${MEGA_TAG_SUFFIX}.tar.gz -> ${P}.tar.gz
@@ -37,14 +37,15 @@ DEPEND="
 	dev-libs/libsodium:=
 	dev-libs/libuv:=
 	dev-libs/openssl:0=
-	dev-qt/qtcore:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtgui:5
 	dev-qt/qtconcurrent:5
-	dev-qt/qtnetwork:5
+	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
 	dev-qt/qtimageformats:5
 	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	media-libs/libmediainfo
 	media-libs/libraw
@@ -69,39 +70,39 @@ BDEPEND="
 	dolphin? ( kde-frameworks/extra-cmake-modules )
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-4.10.0.0_ffmpeg6.patch"
+	"${FILESDIR}/${PN}-4.10.0.0_fix-build.patch"
+)
+
 CMAKE_USE_DIR="${S}/src/MEGAShellExtDolphin"
 
 src_prepare() {
 	if [[ ${PV} != 9999 ]]; then
-		rmdir src/MEGASync/mega
-		mv "${WORKDIR}/sdk-${MEGA_SDK_REV}" src/MEGASync/mega
+		rmdir src/MEGASync/mega || die
+		mv "${WORKDIR}/sdk-${MEGA_SDK_REV}" src/MEGASync/mega || die
 	fi
 
-	if has_version ">=media-video/ffmpeg-6.0"; then
-		eapply "${FILESDIR}/${PN}-4.10.0.0_ffmpeg6.patch"
-	fi
-	eapply "${FILESDIR}/${PN}-4.10.0.0_fix-build.patch"
-
 	if use dolphin; then
 		cmake_src_prepare
 	else
 		default
 	fi
 
-	cd "${S}/src/MEGASync/mega"
+	cd "${S}/src/MEGASync/mega" || die
 	eautoreconf
 }
 
 src_configure() {
-	cd "${S}/src/MEGASync/mega"
+	cd "${S}/src/MEGASync/mega" || die
 	econf \
 		"--disable-curl-checks" \
 		"--disable-examples" \
 		$(use_enable threads posix-threads) \
 		$(use_with freeimage)
 
-	cd "${S}/src"
-	local myeqmakeargs=(
+	cd "${S}/src" || die
+	local myqmakeargs=(
 		MEGA.pro
 		CONFIG+="release"
 		$(usex freeimage "" "CONFIG+=nofreeimage")
@@ -110,8 +111,8 @@ src_configure() {
 		$(usev thunar "SUBDIRS+=MEGAShellExtThunar")
 	)
 
-	eqmake5 ${myeqmakeargs[@]}
-	$(qt5_get_bindir)/lrelease MEGASync/MEGASync.pro
+	eqmake5 "${myqmakeargs[@]}"
+	$(qt5_get_bindir)/lrelease MEGASync/MEGASync.pro || die
 
 	use dolphin && cmake_src_configure
 }
@@ -127,8 +128,8 @@ src_install() {
 	dobin "src/MEGASync/${PN}"
 	dodoc CREDITS.md README.md
 
-	rm -rf "${D}"/usr/share/doc/megasync
-	rm -rf "${D}"/usr/share/icons/ubuntu-mono-dark
+	rm -rf "${D}"/usr/share/doc/megasync || die
+	rm -rf "${D}"/usr/share/icons/ubuntu-mono-dark || die
 
 	use dolphin && cmake_src_install
 }
diff --git a/net-misc/megasync/megasync-9999.ebuild b/net-misc/megasync/megasync-9999.ebuild
index 0d4b8ab3f4..78d77b1684 100644
--- a/net-misc/megasync/megasync-9999.ebuild
+++ b/net-misc/megasync/megasync-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]];then
 	EGIT_BRANCH="master"
 	EGIT_SUBMODULES=( '*' )
 else
-	MEGA_SDK_REV="6d4c102940dab277974090cd4292e58f08ac6032" # commit of src/MEGASync/mega submodule
+	MEGA_SDK_REV="2e9307d114c379967f415211d466262162e074d4" # commit of src/MEGASync/mega submodule
 	MEGA_TAG_SUFFIX="Win"
 	SRC_URI="
 		https://github.com/meganz/MEGAsync/archive/v${PV}_${MEGA_TAG_SUFFIX}.tar.gz -> ${P}.tar.gz
@@ -37,14 +37,15 @@ DEPEND="
 	dev-libs/libsodium:=
 	dev-libs/libuv:=
 	dev-libs/openssl:0=
-	dev-qt/qtcore:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtgui:5
 	dev-qt/qtconcurrent:5
-	dev-qt/qtnetwork:5
+	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
 	dev-qt/qtimageformats:5
 	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	media-libs/libmediainfo
 	media-libs/libraw
@@ -69,39 +70,39 @@ BDEPEND="
 	dolphin? ( kde-frameworks/extra-cmake-modules )
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-4.10.0.0_ffmpeg6.patch"
+	"${FILESDIR}/${PN}-4.10.0.0_fix-build.patch"
+)
+
 CMAKE_USE_DIR="${S}/src/MEGAShellExtDolphin"
 
 src_prepare() {
 	if [[ ${PV} != 9999 ]]; then
-		rmdir src/MEGASync/mega
-		mv "${WORKDIR}/sdk-${MEGA_SDK_REV}" src/MEGASync/mega
+		rmdir src/MEGASync/mega || die
+		mv "${WORKDIR}/sdk-${MEGA_SDK_REV}" src/MEGASync/mega || die
 	fi
 
-	if has_version ">=media-video/ffmpeg-6.0"; then
-		eapply "${FILESDIR}/${PN}-4.10.0.0_ffmpeg6.patch"
-	fi
-	eapply "${FILESDIR}/${PN}-4.10.0.0_fix-build.patch"
-
 	if use dolphin; then
 		cmake_src_prepare
 	else
 		default
 	fi
 
-	cd "${S}/src/MEGASync/mega"
+	cd "${S}/src/MEGASync/mega" || die
 	eautoreconf
 }
 
 src_configure() {
-	cd "${S}/src/MEGASync/mega"
+	cd "${S}/src/MEGASync/mega" || die
 	econf \
 		"--disable-curl-checks" \
 		"--disable-examples" \
 		$(use_enable threads posix-threads) \
 		$(use_with freeimage)
 
-	cd "${S}/src"
-	local myeqmakeargs=(
+	cd "${S}/src" || die
+	local myqmakeargs=(
 		MEGA.pro
 		CONFIG+="release"
 		$(usex freeimage "" "CONFIG+=nofreeimage")
@@ -110,8 +111,8 @@ src_configure() {
 		$(usev thunar "SUBDIRS+=MEGAShellExtThunar")
 	)
 
-	eqmake5 ${myeqmakeargs[@]}
-	$(qt5_get_bindir)/lrelease MEGASync/MEGASync.pro
+	eqmake5 "${myqmakeargs[@]}"
+	$(qt5_get_bindir)/lrelease MEGASync/MEGASync.pro || die
 
 	use dolphin && cmake_src_configure
 }
@@ -127,8 +128,8 @@ src_install() {
 	dobin "src/MEGASync/${PN}"
 	dodoc CREDITS.md README.md
 
-	rm -rf "${D}"/usr/share/doc/megasync
-	rm -rf "${D}"/usr/share/icons/ubuntu-mono-dark
+	rm -rf "${D}"/usr/share/doc/megasync || die
+	rm -rf "${D}"/usr/share/icons/ubuntu-mono-dark || die
 
 	use dolphin && cmake_src_install
 }
diff --git a/sys-kernel/uek-sources/Manifest b/sys-kernel/uek-sources/Manifest
index 74b61e4a55..c5a2bc60d5 100644
--- a/sys-kernel/uek-sources/Manifest
+++ b/sys-kernel/uek-sources/Manifest
@@ -13,6 +13,9 @@ DIST genpatches-5.15-155.extras.tar.xz 3936 BLAKE2B 8fafbb8cab4811a4c460aead75e7
 DIST genpatches-5.15-156.base.tar.xz 6004636 BLAKE2B f70c2a3bfc3d65fea8d4764b953d147a1725162aeaf319701a3d4b1d47c846932c4c8cd009bf81b4ce33754e966dac4630e2f690c403ec5181e3cc122496db09 SHA512 4d2fd08626d433d7230b27fb1cbd8a3fec9a942ddbd01988dba8632f25b510353b5086f4db1d529b88770e579189fc7bf6a4d02828c662fcb230e51efbecad9c
 DIST genpatches-5.15-156.experimental.tar.xz 5420 BLAKE2B 5cb4d75abca17c536532382c23491a5d4251a5508110aa41ff99df8f656060fabfad8d69a6e1629cd5f9793155cdf44ba602717b1e1f4c52772e9c5825e8276d SHA512 423ff044bd344d3afd0280deed045287ab2fe2a78dba9ada6163eb3f2581f68704ca5ce23dfa893cf1f4e3197ae402adb819e4b14349cd945d8d9dc2c2d3ad85
 DIST genpatches-5.15-156.extras.tar.xz 3936 BLAKE2B ad08b5d93b943236326d333c627ae8cd279d78fd2b8f8df420ce75be815472dca9785b8eb14015ca2dbc92560a8589d31b9f9edbf81280c85d1ce6fe58aed0b1 SHA512 580ba97a039ff7417b448d4df13b67ed262b7a47be449515ca80125a89b5da3eeee773757db6ff7389b501daee6ab708e19dc2713088ee118859e1e9d3f4b303
+DIST genpatches-5.15-157.base.tar.xz 6083340 BLAKE2B da2898a405bfd934e761180064107f4d87d144105ade4c825ff9299cb4a0b57324927cf34d3a55fc7a0227d9db053caf5b0f8159ca0ddbd946d31459b2683e1f SHA512 04c2d322ec1f0946b7f0f551e0fc0342da749cade5f20f2da1a1e60fd0cd946593a797c053bbd0eb8121f70e69f6766f8c945a99fd77fca3eef89aeae6d5b871
+DIST genpatches-5.15-157.experimental.tar.xz 5424 BLAKE2B 146f16bbfc049fabd87adcad9216e97949d0d25ac1d6ce0087b441dedee29611eaf5c20196c22a1f803d497e931c006bfc8a3d435d55b4ca61f55c9d0e9c6c0b SHA512 3bce31759cce8ac4594be37748ae8517f13d0809aa10877646d10b5287643bae623fea1662106dedb24f02f7bf00586014f7d13737b53ff31e99b49037217c07
+DIST genpatches-5.15-157.extras.tar.xz 3936 BLAKE2B d559b4c240ab2b8a0b522d846c3d9707b0beacd800e137517c29b51253283b47caf05f7facbdd7be747255dc2485170ecfad04a3ba5293d749c8d22ae60886f7 SHA512 e99880adebd2d08067fbcc73bf01eb844c39cef7c06e99b95c9622949e38a2ed58045f27e71bde4d5321dc06212848c884c8f4added4c41a8a1197cd375091b8
 DIST genpatches-5.15-80.base.tar.xz 3218432 BLAKE2B f2478969a4e7a24bd7a30328e2d17d5daafa9fbd741dd7eb295c025f27c08ccf8efbde13003e084c509a8bcf5f1d28f45189a28467b31c48c2a4d344a726ec4f SHA512 60737de4d0f8e3acc02ed07a82853d9226daf54b3b5a1b990d94e78b3dcd9fae26b9e6cf8854e5074b88dd826d286440155b70c4fc19f271ce795b2bbcc61b1a
 DIST genpatches-5.15-80.experimental.tar.xz 5424 BLAKE2B a01c40dc5f3bb9f4c315f64830244d69fb7a81f4f0c3e1b987f53d867f1174fd8a4d91fc5e9cac38554b0fabac393af97a91a8203f285010def930634ddf5402 SHA512 b0338c9664906a20fa63ad1673a82517656905b370849c668dfa5c0b1bdfd6059178dd50e690db26e47ddc104b60ffa048ace4119f7b3b2427215bc3ab817d80
 DIST genpatches-5.15-80.extras.tar.xz 3932 BLAKE2B 50940b69b0793c1ab7f19908daca488e7dce5c48d74bcb636d5faa60fc510217b94f175669a28963347911291204f0f6384322b55148c70e63cc54e21dc74d1d SHA512 9434da5bf439f12adb55e70fb8f5d675b9d452dcb2a364da9cb65a2f4cd405cc0469c2c291fdc6b0f015a0d52d08ca0475a389e45041cca532f049e1784d06b3
diff --git a/sys-kernel/uek-sources/uek-sources-5.15.0.203.146.3-r1.ebuild b/sys-kernel/uek-sources/uek-sources-5.15.0.203.146.3-r1.ebuild
new file mode 100644
index 0000000000..c838750ed1
--- /dev/null
+++ b/sys-kernel/uek-sources/uek-sources-5.15.0.203.146.3-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_VERSION=$(ver_cut 1-3)
+KERNEL_TRUNK=$(ver_cut 1-2)
+UEK_PATCH_VERSION=$(ver_cut 4-6)
+UEK_VERSION="${KERNEL_VERSION}-${UEK_PATCH_VERSION}"
+
+ETYPE="sources"
+
+K_GENPATCHES_VER="157"
+K_SECURITY_UNSUPPORTED="1"
+CKV="${KERNEL_VERSION}_p${UEK_PATCH_VERSION}"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+DESCRIPTION="Unbreakable Enterprise Kernel (UEK) sources built from Oracle"
+HOMEPAGE="https://github.com/oracle/linux-uek"
+SRC_URI="
+	https://github.com/oracle/linux-uek/archive/refs/tags/v${UEK_VERSION}.tar.gz
+		-> linux-uek-${UEK_VERSION}.tar.gz
+	mirror://gentoo/genpatches-${KERNEL_TRUNK}-${K_GENPATCHES_VER}.base.tar.xz
+	mirror://gentoo/genpatches-${KERNEL_TRUNK}-${K_GENPATCHES_VER}.experimental.tar.xz
+	mirror://gentoo/genpatches-${KERNEL_TRUNK}-${K_GENPATCHES_VER}.extras.tar.xz
+"
+S="${WORKDIR}/linux-uek-${UEK_VERSION}"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64"
+IUSE="+gentoo experimental"
+
+PATCHES=(
+	"${FILESDIR}"/uek-sources-5.4.17.2136.303.2-O3.patch
+)
+
+src_unpack() {
+	default
+
+	# remove all backup files
+	find . -iname "*~" -print -exec rm {} \; 2>/dev/null
+
+	unpack_set_extraversion
+	unpack_fix_install_path
+
+	env_setup_xmakeopts
+}
+
+src_prepare() {
+	use gentoo && PATCHES+=(
+		"${WORKDIR}"/1500_XATTR_USER_PREFIX.patch
+		"${WORKDIR}"/1510_fs-enable-link-security-restrictions-by-default.patch
+		"${WORKDIR}"/2000_BT-Check-key-sizes-only-if-Secure-Simple-Pairing-enabled.patch
+		"${WORKDIR}"/2920_sign-file-patch-for-libressl.patch
+		"${WORKDIR}"/3000_Support-printing-firmware-info.patch
+		"${WORKDIR}"/4567_distro-Gentoo-Kconfig.patch
+	)
+	use experimental && PATCHES+=(
+		"${WORKDIR}"/5010_enable-cpu-optimizations-universal.patch
+	)
+	default
+}