diff --git a/app-admin/chezmoi/Manifest b/app-admin/chezmoi/Manifest
index 2e2fe89bb9..ff81a35eb4 100644
--- a/app-admin/chezmoi/Manifest
+++ b/app-admin/chezmoi/Manifest
@@ -8,3 +8,5 @@ DIST chezmoi-2.68.1.tar.gz 2594024 BLAKE2B 71c752fb2cfca874ca5a60a3ec3de5e2652cc
 DIST chezmoi-2.68.1-vendor.tar.xz 8765844 BLAKE2B e663167e10531edcd2d51da28f59dd3c871912dc678549f55628f1213a5d08993843df0435e64d3afea0e08930992531c91801db1803f9af83e5a265055e64a0 SHA512 305b013d9c827ce2f7d01ad9136219aabba672864f46a776489ab7acb5c9816927cce901ac0920cff0fe927a02e34242b650cd62bf1bc09bd28c3ad1592ac6a8
 DIST chezmoi-2.69.0.tar.gz 2611328 BLAKE2B 3a321e9e74174c9b8f3cb16ff83804b74b0378a2744478e24acd2bf9cbab4b9e57fcadc23e7b6b582bc1c2c006e76930d5e6b31b79609df7995576cdf46a5b6c SHA512 8fc2d5232914a9004377d14b2397bca3450a3023b4fbe460dc60b119dfec63e1f172e817f229f683c530d4ccd08576fca0c843e6cab77ca75e400936ec14bee9
 DIST chezmoi-2.69.0-vendor.tar.xz 8814896 BLAKE2B 6a950474feb251fd79ee7ee67ff2dcce4b421daf896a85667459f0b69645a43f1547b694c4ea7f3d87bc601e5655d13fbf466787b7cd94ef00955e11016f06cc SHA512 e54b4a01818cca40d0b6aba1cf12af486b45ac5e485c46071378954f7c716ac673bbe5d807b19f5aec40ee2a35e17dbfe1f1ed886f4d7899b34b877eb4b579d7
+DIST chezmoi-2.69.1.tar.gz 2611384 BLAKE2B 94ef652bff4045b5245d4ff219eff6234eb2cc9c8ca0da8d73177c8813cd766a29e17ae97f96d8872dd656abf31416c742b30264e44cae6135d114a5ce78e030 SHA512 bc5561894c4c793633eb6f559ec8dce5e1e7e7b4cc5e26f9452cd4cadcdb5cdf8216335fff264ec56ceaeca5296dd53ef5fbb4b6b9bdf8854d8fd5d39f2fc33a
+DIST chezmoi-2.69.1-vendor.tar.xz 8818080 BLAKE2B 6bd7e0d5d4217ff72863c17165477631ff8e137d92af4dab1a87a0bd98d54c2feee32382db9bf951d1233aacb1ad6bb2192cac52b0feed18ca4d7452f28cf612 SHA512 64cc9a616dec676c39a5c7ede2781ad3fd3ab2a20206b09d83e15297030cfad7a2cda3f56df0f4a581d8f61ba661e942a52778ee72f58a3bcf823b5d9a34c01e
diff --git a/app-admin/chezmoi/chezmoi-2.69.1.ebuild b/app-admin/chezmoi/chezmoi-2.69.1.ebuild
new file mode 100644
index 0000000000..f5f9f9c343
--- /dev/null
+++ b/app-admin/chezmoi/chezmoi-2.69.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module shell-completion
+
+DESCRIPTION="Manage your dotfiles across multiple machines, securely"
+HOMEPAGE="https://www.chezmoi.io/"
+SRC_URI="https://github.com/twpayne/chezmoi/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://github.com/iprok/distfiles/releases/download/${P}/${P}-vendor.tar.xz"
+
+LICENSE="BSD BSD-2 MIT Apache-2.0 MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+RESTRICT="mirror"
+
+BDEPEND=">=dev-lang/go-1.25.4"
+DEPEND="dev-vcs/git"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	ego build -o ${PN} -v -work -x -ldflags \
+		"-X main.version=${PV} -X main.date=$(date -u +%Y-%m-%dT%H:%M:%SZ)"
+}
+
+src_test() {
+	ego test -ldflags \
+		"-X github.com/twpayne/chezmoi/v2/pkg/chezmoitest.umaskStr=0o022"
+}
+
+src_install() {
+	dobin ${PN}
+
+	einstalldocs
+
+	newbashcomp completions/${PN}-completion.bash ${PN}
+	dofishcomp completions/${PN}.fish
+	newzshcomp completions/${PN}.zsh _${PN}
+}
diff --git a/app-text/frog/Manifest b/app-text/frog/Manifest
new file mode 100644
index 0000000000..4fb8c23103
--- /dev/null
+++ b/app-text/frog/Manifest
@@ -0,0 +1 @@
+DIST frog-1.6.0.tar.gz 13020690 BLAKE2B 4db4f5dca50dd624b7ed05f6f5129b5a21567476a3d1cbc3b3f9823a3907ecbb8a3a258c77d4ecae994686783f1f19c8b621a72606659af12dd9c0deb83628d6 SHA512 e1bda5397a0581b262777d71d30bce3dc3fa4ba9566a76aaa77b07d60a8c62d050499c1895a4a7bbb56f6c0c9fccdb028ec1c0acbaf331c08f644640385f8e67
diff --git a/app-text/frog/files/frog-1.6.0-install-the-AppData-file-into-the-metainfo-directory.patch b/app-text/frog/files/frog-1.6.0-install-the-AppData-file-into-the-metainfo-directory.patch
new file mode 100644
index 0000000000..da11b4d252
--- /dev/null
+++ b/app-text/frog/files/frog-1.6.0-install-the-AppData-file-into-the-metainfo-directory.patch
@@ -0,0 +1,17 @@
+From: Pavel Sobolev <contact@paveloom.dev>
+Subject: [PATCH] Install the AppData file into the `metainfo` directory.
+
+Signed-off-by: Pavel Sobolev <contact@paveloom.dev>
+
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -25,7 +25,7 @@ appstream_file = i18n.merge_file(
+   output: 'com.github.tenderowl.frog.appdata.xml',
+   po_dir: '../po',
+   install: true,
+-  install_dir: join_paths(get_option('datadir'), 'appdata')
++  install_dir: join_paths(get_option('datadir'), 'metainfo')
+ )
+ 
+ install_data('com.github.tenderowl.frog.gschema.xml',
+
diff --git a/app-text/frog/files/frog-1.6.0-remove-the-AppData-file-validation-test.patch b/app-text/frog/files/frog-1.6.0-remove-the-AppData-file-validation-test.patch
new file mode 100644
index 0000000000..4fc969e588
--- /dev/null
+++ b/app-text/frog/files/frog-1.6.0-remove-the-AppData-file-validation-test.patch
@@ -0,0 +1,22 @@
+From: Pavel Sobolev <contact@paveloom.dev>
+Subject: [PATCH] Remove the AppData file validation test.
+
+Signed-off-by: Pavel Sobolev <contact@paveloom.dev>
+
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -28,13 +28,6 @@ appstream_file = i18n.merge_file(
+   install_dir: join_paths(get_option('datadir'), 'appdata')
+ )
+ 
+-appstream_util = find_program('appstream-util', required: false)
+-if appstream_util.found()
+-  test('Validate appstream file', appstream_util,
+-    args: ['validate', appstream_file]
+-  )
+-endif
+-
+ install_data('com.github.tenderowl.frog.gschema.xml',
+   install_dir: join_paths(get_option('datadir'), 'glib-2.0/schemas')
+ )
+
diff --git a/app-text/frog/files/frog-1.6.0-use-the-system-tessdata-directory.patch b/app-text/frog/files/frog-1.6.0-use-the-system-tessdata-directory.patch
new file mode 100644
index 0000000000..d3a003d1d4
--- /dev/null
+++ b/app-text/frog/files/frog-1.6.0-use-the-system-tessdata-directory.patch
@@ -0,0 +1,59 @@
+From: Pavel Sobolev <contact@paveloom.dev>
+Subject: [PATCH] Use the system `tessdata` directory.
+
+Signed-off-by: Pavel Sobolev <contact@paveloom.dev>
+
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -32,11 +32,6 @@ install_data('com.github.tenderowl.frog.gschema.xml',
+   install_dir: join_paths(get_option('datadir'), 'glib-2.0/schemas')
+ )
+ 
+-# Default tesseract trained model
+-install_data('tessdata/eng.traineddata',
+-  install_dir: join_paths(get_option('datadir'), 'appdata')
+-)
+-
+ compile_schemas = find_program('glib-compile-schemas', required: false)
+ if compile_schemas.found()
+   test('Validate schema file', compile_schemas,
+--- a/frog/config.py
++++ b/frog/config.py
+@@ -35,10 +35,7 @@ RESOURCE_PREFIX = "/com/github/tenderowl/frog"
+ if not os.getenv('XDG_DATA_HOME'):
+     os.environ['XDG_DATA_HOME'] = os.path.expanduser('~/.local/share')
+ 
+-if not os.path.exists(os.path.join(os.environ['XDG_DATA_HOME'], 'tessdata')):
+-    os.mkdir(os.path.join(os.environ['XDG_DATA_HOME'], 'tessdata'))
+-
+ tessdata_url = "https://github.com/tesseract-ocr/tessdata/raw/main/"
+ tessdata_best_url = "https://github.com/tesseract-ocr/tessdata_best/raw/main/"
+-tessdata_dir = os.path.join(os.environ['XDG_DATA_HOME'], 'tessdata')
++tessdata_dir = "/usr/share/tessdata"
+ tessdata_config = f'--tessdata-dir {tessdata_dir} –psm 0 --oem 1'
+--- a/frog/language_manager.py
++++ b/frog/language_manager.py
+@@ -192,13 +192,6 @@ class LanguageManager(GObject.GObject):
+         if not os.path.exists(tessdata_dir):
+             os.mkdir(tessdata_dir)
+ 
+-        dest_path = os.path.join(tessdata_dir, 'eng.traineddata')
+-        source_path = pathlib.Path('/app/share/appdata/eng.traineddata')
+-        if os.path.exists(dest_path):
+-            return
+-
+-        copyfile(source_path, dest_path)
+-
+     @GObject.Property(type=GObject.TYPE_PYOBJECT)
+     def active_language(self) -> LanguageItem:
+         return self._active_language
+@@ -229,7 +222,8 @@ class LanguageManager(GObject.GObject):
+     def get_downloaded_codes(self, force: bool = False) -> List[str]:
+         if self._need_update_cache or force:
+             self._downloaded_codes = [os.path.splitext(lang_file)[0]
+-                                      for lang_file in os.listdir(tessdata_dir)]
++                                      for lang_file in os.listdir(tessdata_dir)
++                                      if lang_file.endswith('.traineddata')]
+             self._need_update_cache = False
+             logger.debug(f"Cache downloaded codes: {self._downloaded_codes}")
+         return sorted(self._downloaded_codes, key=lambda x: self.get_language(x))
diff --git a/app-text/frog/frog-1.6.0.ebuild b/app-text/frog/frog-1.6.0.ebuild
new file mode 100644
index 0000000000..c7040cb2af
--- /dev/null
+++ b/app-text/frog/frog-1.6.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=no
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{12..13} )
+
+inherit distutils-r1 gnome2-utils meson xdg
+
+DESCRIPTION="Extract text from any image, video, QR Code and etc."
+HOMEPAGE="https://github.com/TenderOwl/Frog"
+SRC_URI="https://github.com/TenderOwl/Frog/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+S="${WORKDIR}/Frog-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="test"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/libportal
+	gui-libs/gtk:4
+	gui-libs/libadwaita:1
+	media-libs/gstreamer:1.0
+	x11-libs/libnotify
+
+	|| (
+		app-text/tessdata_fast
+		app-text/tessdata_best
+		app-text/tessdata_legacy
+	)
+
+	$(python_gen_cond_dep '
+		dev-python/gtts[${PYTHON_USEDEP}]
+		dev-python/loguru[${PYTHON_USEDEP}]
+		dev-python/posthog[${PYTHON_USEDEP}]
+		dev-python/py-nanoid[${PYTHON_USEDEP}]
+		dev-python/pytesseract[${PYTHON_USEDEP}]
+		dev-python/pyzbar[${PYTHON_USEDEP}]
+	')
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-libs/glib:2
+	dev-util/blueprint-compiler
+	dev-util/desktop-file-utils
+	dev-util/gtk-update-icon-cache
+	sys-devel/gettext
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.6.0-install-the-AppData-file-into-the-metainfo-directory.patch"
+	"${FILESDIR}/${PN}-1.6.0-remove-the-AppData-file-validation-test.patch"
+	"${FILESDIR}/${PN}-1.6.0-use-the-system-tessdata-directory.patch"
+)
+
+distutils_enable_tests import-check
+
+python_test() {
+	epytest --import-check frog
+}
+
+src_test() {
+	meson_src_test
+	distutils-r1_src_test
+}
+
+src_install() {
+	meson_src_install
+
+	python_fix_shebang "${ED}/usr/bin"
+	python_optimize
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-text/frog/metadata.xml b/app-text/frog/metadata.xml
new file mode 100644
index 0000000000..c1a8ce7e98
--- /dev/null
+++ b/app-text/frog/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <name>Pavel Sobolev</name>
+    <email>contact@paveloom.dev</email>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/TenderOwl/Frog/issues</bugs-to>
+    <remote-id type="github">TenderOwl/Frog</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-text/komikku/Manifest b/app-text/komikku/Manifest
index c79d28b958..0a1e272884 100644
--- a/app-text/komikku/Manifest
+++ b/app-text/komikku/Manifest
@@ -1 +1 @@
-DIST komikku-1.86.0.tar.gz 4612281 BLAKE2B cbb5c36843fc191e1048e20f5662cd1862720a64365884cca95befba57e9a149c461cb87f2ff02cbf92847810becd2979adbdd294e00a516ddbdfa89aa31278d SHA512 d754c5dab7ae9d1652c30157d9b546cc1805e7b6ace12bca8164a60934b3696676a3870e91e1b9948b1bccbd841a537e9152a8a7f5e7d9c7a18bc3c98cafea3d
+DIST komikku-1.99.0.tar.gz 4691630 BLAKE2B 5c5cd7e6deff649be4c4758109e8061ffc872d4212e8eb08264306d3b6d493f8fdde0ff9ab9e06e323f00e33d0b68e97e724811a220f370da941765b4c1280f0 SHA512 c38252baf5a957a4364e1e5f759d2d9bc14228b6763dbe7aa85808a9355593a30e5cd4124232576d7cf2e46b5f1dbcf87ea5594948acf9d0161fa4a682c22a85
diff --git a/app-text/komikku/files/komikku-1.99.0-revert-pixbuf-2.44.3.patch b/app-text/komikku/files/komikku-1.99.0-revert-pixbuf-2.44.3.patch
new file mode 100644
index 0000000000..5559bbd7f6
--- /dev/null
+++ b/app-text/komikku/files/komikku-1.99.0-revert-pixbuf-2.44.3.patch
@@ -0,0 +1,84 @@
+https://codeberg.org/valos/Komikku/commit/64d61284f12606df42248755ffc6f628c7bab178
+Revert "Set minimal version of gdk-pixbuf to 2.44.3"
+
+x11-libs/gdk-pixbuf-2.44.3 is not packaged yet.
+This reverts commit 64d61284f12606df42248755ffc6f628c7bab178.
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -45,9 +45,8 @@ endif
+ #
+ # Dependencies
+ #
+-dependency('gobject-introspection-1.0')
+ dependency('glib-2.0')
+-dependency('gdk-pixbuf-2.0', version: '>=2.44.3')
++dependency('gobject-introspection-1.0')
+ dependency('gtk4', version: '>=4.18')
+ dependency('libadwaita-1', version: '>=1.8')
+ 
+--- a/komikku/consts.py
++++ b/komikku/consts.py
+@@ -6,6 +6,7 @@ COVER_WIDTH = 180
+ COVER_HEIGHT = 256
+ LOGO_SIZE = 32
+ MISSING_IMG_RESOURCE_PATH = '/info/febvre/Komikku/images/missing_file.png'
++PIXBUF_ANIMATION = False
+ 
+ DOWNLOAD_MAX_DELAY = 1  # in seconds
+ REQUESTS_TIMEOUT = 5
+--- a/komikku/reader/pager/image.py
++++ b/komikku/reader/pager/image.py
+@@ -27,6 +27,7 @@ from gi.repository.GdkPixbuf import Pixbuf
+ from gi.repository.GdkPixbuf import PixbufAnimation
+ 
+ from komikku.consts import MISSING_IMG_RESOURCE_PATH
++from komikku.consts import PIXBUF_ANIMATION
+ from komikku.utils import get_image_info
+ 
+ logger = logging.getLogger('komikku')
+@@ -542,7 +543,7 @@ class KImage(Gtk.Widget, Gtk.Scrollable):
+             elif data:
+                 stream = Gio.MemoryInputStream.new_from_data(data, None)
+ 
+-            if not info['is_animated']:
++            if not info['is_animated'] or not PIXBUF_ANIMATION:
+                 Pixbuf.new_from_stream_async(stream, None, self.load_ready, callback, info)
+             else:
+                 PixbufAnimation.new_from_stream_async(stream, None, self.load_ready, callback, info)
+@@ -580,7 +581,7 @@ class KImage(Gtk.Widget, Gtk.Scrollable):
+         stream.close()
+ 
+         try:
+-            if not info['is_animated']:
++            if not info['is_animated'] or not PIXBUF_ANIMATION:
+                 pixbuf = Pixbuf.new_from_stream_finish(result)
+ 
+                 self.textures = []
+--- a/komikku/utils.py
++++ b/komikku/utils.py
+@@ -36,6 +36,7 @@ from gi.repository import Gtk
+ from gi.repository.GdkPixbuf import Pixbuf
+ from gi.repository.GdkPixbuf import PixbufAnimation
+ 
++from komikku.consts import PIXBUF_ANIMATION
+ from komikku.consts import REQUESTS_TIMEOUT
+ 
+ logger = logging.getLogger('komikku')
+@@ -615,7 +616,7 @@ class CoverLoader(GObject.GObject):
+ 
+         try:
+             stream = Gio.MemoryInputStream.new_from_data(data, None)
+-            if info['is_animated'] and not static_animation:
++            if info['is_animated'] and not static_animation and PIXBUF_ANIMATION:
+                 pixbuf = PixbufAnimation.new_from_stream(stream)
+             else:
+                 pixbuf = Pixbuf.new_from_stream(stream)
+@@ -634,7 +635,7 @@ class CoverLoader(GObject.GObject):
+             return None
+ 
+         try:
+-            if info['is_animated'] and not static_animation:
++            if info['is_animated'] and not static_animation and PIXBUF_ANIMATION:
+                 pixbuf = PixbufAnimation.new_from_file(path)
+             else:
+                 pixbuf = Pixbuf.new_from_file(path)
diff --git a/app-text/komikku/komikku-1.86.0.ebuild b/app-text/komikku/komikku-1.99.0.ebuild
similarity index 80%
rename from app-text/komikku/komikku-1.86.0.ebuild
rename to app-text/komikku/komikku-1.99.0.ebuild
index e982c4e040..1f714fbe62 100644
--- a/app-text/komikku/komikku-1.86.0.ebuild
+++ b/app-text/komikku/komikku-1.99.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{11..13} )
+PYTHON_COMPAT=( python3_{12..14} )
 PYTHON_REQ_USE="sqlite(+),ssl(+)"
 DISTUTILS_USE_PEP517=no
 DISTUTILS_SINGLE_IMPL=1
@@ -26,15 +26,14 @@ RESTRICT="test"
 DEPEND="
 	dev-libs/glib:2
 	dev-libs/gobject-introspection
-	>=gui-libs/gtk-4.12:4
-	>=gui-libs/libadwaita-1.7:1[introspection]
+	>=gui-libs/gtk-4.18:4
+	>=gui-libs/libadwaita-1.8:1[introspection]
 	net-libs/webkit-gtk:6[introspection]
 "
 RDEPEND="
 	${DEPEND}
-	x11-libs/libnotify[introspection]
 	$(python_gen_cond_dep '
-		app-arch/brotli[python,${PYTHON_USEDEP}]
+		>=app-arch/brotli-1.2.0[python,${PYTHON_USEDEP}]
 		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/modern-colorthief[${PYTHON_USEDEP}]
 		dev-python/cryptography[${PYTHON_USEDEP}]
@@ -46,9 +45,11 @@ RDEPEND="
 		dev-python/piexif[${PYTHON_USEDEP}]
 		>=dev-python/pillow-11.3.0[${PYTHON_USEDEP}]
 		dev-python/pygobject[${PYTHON_USEDEP}]
+		>=dev-python/pyjwt-2.10.1[${PYTHON_USEDEP}]
+		>=dev-python/pypdf-6.4.2[${PYTHON_USEDEP}]
 		dev-python/python-magic[${PYTHON_USEDEP}]
 		dev-python/rarfile[compressed,${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.32.4[${PYTHON_USEDEP}]
 		dev-python/unidecode[${PYTHON_USEDEP}]
 	')
 "
@@ -57,6 +58,11 @@ BDEPEND="
 	sys-devel/gettext
 "
 
+PATCHES=(
+	# x11-libs/gdk-pixbuf-2.44.3 is not packaged yet
+	"${FILESDIR}/${P}-revert-pixbuf-2.44.3.patch"
+)
+
 EPYTEST_PLUGINS=( pytest-steps )
 distutils_enable_tests pytest
 
diff --git a/dev-python/colorthief/Manifest b/dev-python/colorthief/Manifest
new file mode 100644
index 0000000000..035d1c1423
--- /dev/null
+++ b/dev-python/colorthief/Manifest
@@ -0,0 +1 @@
+DIST colorthief-0.2.1.tar.gz 6164 BLAKE2B 7d05951c5ee6b2ab39aa882f871e5e49cf416f134aa696243e0800d1d7f41fbcb96b32374a2a72bdef3a0e01f9d0987b5789658abd1a6b56ed01a75d888d596b SHA512 33d8f048d6e0fb4b6f3b5a6d7fd53ec8156e1ab4b2fe9c8252d49954929a3046547536ae7cb6d7752c43fd2974b36acffabcc61d733ad462a2504ead36c99da7
diff --git a/dev-python/colorthief/colorthief-0.2.1.ebuild b/dev-python/colorthief/colorthief-0.2.1.ebuild
new file mode 100644
index 0000000000..d59b70a693
--- /dev/null
+++ b/dev-python/colorthief/colorthief-0.2.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{12..14} )
+inherit distutils-r1 pypi
+
+DESCRIPTION="Module for grabbing the color palette from an image"
+HOMEPAGE="
+	https://github.com/fengsp/color-thief-py
+	https://pypi.org/project/colorthief/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-python/pillow[${PYTHON_USEDEP}]"
diff --git a/dev-python/colorthief/metadata.xml b/dev-python/colorthief/metadata.xml
new file mode 100644
index 0000000000..6806dfc89e
--- /dev/null
+++ b/dev-python/colorthief/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pastalian46@gmail.com</email>
+		<name>Takuya Wakazono</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">fengsp/color-thief-py</remote-id>
+		<remote-id type="pypi">colorthief</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/gtts/Manifest b/dev-python/gtts/Manifest
new file mode 100644
index 0000000000..12a85059d2
--- /dev/null
+++ b/dev-python/gtts/Manifest
@@ -0,0 +1 @@
+DIST gtts-2.5.4.gh.tar.gz 41404 BLAKE2B dd4f99e4374922b7f8f5c1233ae84bb473f8b9c35652391aab519078dbdf1587bcdf1fb69674158c8082afe09b2b1bf14dbe109a9e85f9fe1da5cb0611c7a271 SHA512 9182aa809c2a889e399fe5e1cca00ad2bade99513b2a821d3f077e2d0560a0f8e10dd921bd7b66cfde87b972642213dfbc5a4dd4aea68f2e2cf04694611c7655
diff --git a/dev-python/gtts/gtts-2.5.4.ebuild b/dev-python/gtts/gtts-2.5.4.ebuild
new file mode 100644
index 0000000000..da8f1ddca0
--- /dev/null
+++ b/dev-python/gtts/gtts-2.5.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{12..14} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library and CLI tool to interface with Google Translate's API"
+HOMEPAGE="https://github.com/pndurette/gTTS https://pypi.org/project/gTTS/"
+SRC_URI="https://github.com/pndurette/gTTS/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+S="${WORKDIR}/gTTS-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="test"
+PROPERTIES="test_network"
+
+RDEPEND="
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/testfixtures[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/gtts/metadata.xml b/dev-python/gtts/metadata.xml
new file mode 100644
index 0000000000..31eb8f2c9d
--- /dev/null
+++ b/dev-python/gtts/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <name>Pavel Sobolev</name>
+    <email>contact@paveloom.dev</email>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/pndurette/gTTS/issues</bugs-to>
+    <remote-id type="github">pndurette/gTTS</remote-id>
+    <remote-id type="pypi">gTTS</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/hijridate/Manifest b/dev-python/hijridate/Manifest
index fa433411b2..d4f0314a40 100644
--- a/dev-python/hijridate/Manifest
+++ b/dev-python/hijridate/Manifest
@@ -1 +1 @@
-DIST hijridate-2.5.0.gh.tar.gz 46488 BLAKE2B f9a20c8cddf2e994e952d24dd16f9113c52564961f6a13d4d40b4cf5933ecacf763ebd735a88fc41fcdcdd4cf4620810ae3504ced71e1284fbcb39b6d6aed321 SHA512 ff096902f30a5664892bdfc6a167ac838e83640a7430db726bc02417e4b34d5790624c260f906ee8143a05efefdee55e37b9dbf390fde514cf2f462743995611
+DIST hijridate-2.6.0.gh.tar.gz 110192 BLAKE2B f951df86125eec79eff0822bf5c1eabab12b0f8afc8786f5fe8c675341be5e2f084f3fc2d424f5e1d51566a0ff0c427bc2b7496faae4ef140ed3bdd072872312 SHA512 35ab1672377d6e3ff6aee3db10b45ddf3b6ceff4f8744302e55443e524ce85ff9c1c0d93b76419cbe3b779eda8c7fbafc5ffab15e0571e8e7b1fd7f13817cfe3
diff --git a/dev-python/hijridate/hijridate-2.5.0.ebuild b/dev-python/hijridate/hijridate-2.6.0.ebuild
similarity index 91%
rename from dev-python/hijridate/hijridate-2.5.0.ebuild
rename to dev-python/hijridate/hijridate-2.6.0.ebuild
index 1153e874c6..f39917b0e7 100644
--- a/dev-python/hijridate/hijridate-2.5.0.ebuild
+++ b/dev-python/hijridate/hijridate-2.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,6 +18,7 @@ KEYWORDS="~amd64"
 
 BDEPEND="dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]"
 
+EPYTEST_PLUGINS=()
 distutils_enable_tests pytest
 
 distutils_enable_sphinx docs \
diff --git a/dev-python/modern-colorthief/Manifest b/dev-python/modern-colorthief/Manifest
index e1207849bf..f96393885a 100644
--- a/dev-python/modern-colorthief/Manifest
+++ b/dev-python/modern-colorthief/Manifest
@@ -1,2 +1,2 @@
-DIST modern-colorthief-0.1.7-crates.tar.xz 7660864 BLAKE2B e9c3970386e3d689d7def0582250e875f6fdd9601be9da2d479af7dea2c12e7879f35787092a8f38e3872961ff6391be9a2a59da86f2e9b394f92249282061af SHA512 9b2b4861e11c31a288fabdfc4c1d069b18fd5782fd19f65f09ff53ae2c7ad83a1f4cd034c3d241c78dbd14c50a2517ad4a6c932f6d5d887ebd9f4d3fd4a837ee
-DIST modern_colorthief-0.1.7.tar.gz 472437 BLAKE2B f6e742ed18a09a1830170c8f41534172b18a70f26e52e3406132aa16d06dd2641a5a5d91818eaede094028231fcab794a8365d765cadae17733abcd47c83630d SHA512 6350edbf336632932afc3e054ce5041faa609814c76c3c692e85fed1cbcd551d54913eaec9252fd4ea8d4ab51b87fa3280ec7ae016b9e300dc857cdc1b343bbc
+DIST modern-colorthief-0.1.12-crates.tar.xz 8041564 BLAKE2B ab6dbdd3054c61e68045b4d5ca1aee1055c2a5756e1420ae47001f6dc1efbed943dba909b3a79503aef720bdd69c330c3f45c025e95cb54f436d1a13be4037f9 SHA512 322c18af41d710b28b357947b6ad0c7ec272768aeb8d8ebcb6276802fb4e825396cf44e2d01a6d592fd8aae5a14fe3bfd6c07c33812829f44d443fada0e05f75
+DIST modern_colorthief-0.1.12.tar.gz 504449 BLAKE2B ff38d01dcb06f5473efcddaaa163c594ed1dccc3446c0bd488bb14a8f003dc8ebb553b8e399ccfb2158ae2f67ef81625cb3451c5703dad32867c0bf84ac15e45 SHA512 5d4940db86e7885d35f3d3160d323f5ee55694897ccc0436798f78a7dbd9d2b14a70426da081fd82bcddcb384fcbe7af93dddb6eb3c430115b03e0f800e360b2
diff --git a/dev-python/modern-colorthief/modern-colorthief-0.1.7.ebuild b/dev-python/modern-colorthief/modern-colorthief-0.1.12.ebuild
similarity index 81%
rename from dev-python/modern-colorthief/modern-colorthief-0.1.7.ebuild
rename to dev-python/modern-colorthief/modern-colorthief-0.1.12.ebuild
index cf0617b24c..78d3e92e2a 100644
--- a/dev-python/modern-colorthief/modern-colorthief-0.1.7.ebuild
+++ b/dev-python/modern-colorthief/modern-colorthief-0.1.12.ebuild
@@ -1,11 +1,12 @@
-# Copyright 2025 Gentoo Authors
+# Copyright 2025-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=maturin
-PYTHON_COMPAT=( python3_{11..13} )
+PYTHON_COMPAT=( python3_{11..14} )
+RUST_MIN_VER="1.85.0"
 
 inherit cargo distutils-r1 pypi
 
@@ -29,10 +30,12 @@ LICENSE+="
 SLOT="0"
 KEYWORDS="~amd64"
 
-QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/modern_colorthief/modern_colorthief.*.so"
+QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/modern_colorthief/_modern_colorthief.*.so"
 
+EPYTEST_PLUGINS=()
 distutils_enable_tests pytest
 
 EPYTEST_IGNORE=(
+	# fast_colorthief is not packaged
 	examples/test_time.py
 )
diff --git a/dev-python/posthog/Manifest b/dev-python/posthog/Manifest
new file mode 100644
index 0000000000..7d4482d872
--- /dev/null
+++ b/dev-python/posthog/Manifest
@@ -0,0 +1 @@
+DIST posthog-7.5.1.gh.tar.gz 595357 BLAKE2B 3a3e803755f596f8252e045f3769293b951e4bebc1a3fc3c6fedb71c66a4f1456a4a0c3b62f525a661cd95897582be15cbd1b866da7272cb6835672c8f14507c SHA512 9d0438cd80673ecbb13c71b1c9c879a3f79b9b64be7655c9e5d26e625c7843cd464655c4f3ccbd5bb2da7511e7aaa4365b936484a8d34297fcf3dbdea056ab6e
diff --git a/dev-python/posthog/metadata.xml b/dev-python/posthog/metadata.xml
new file mode 100644
index 0000000000..d12a5b6d6b
--- /dev/null
+++ b/dev-python/posthog/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <name>Pavel Sobolev</name>
+    <email>contact@paveloom.dev</email>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/PostHog/posthog-python/issues</bugs-to>
+    <remote-id type="github">PostHog/posthog-python</remote-id>
+    <remote-id type="pypi">posthog</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/posthog/posthog-7.5.1.ebuild b/dev-python/posthog/posthog-7.5.1.ebuild
new file mode 100644
index 0000000000..fe7db9fb5f
--- /dev/null
+++ b/dev-python/posthog/posthog-7.5.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{12..14} )
+
+inherit distutils-r1
+
+DESCRIPTION="Send usage data from your Python code to PostHog"
+HOMEPAGE="
+	https://github.com/PostHog/posthog-python
+	https://pypi.org/project/posthog/
+"
+SRC_URI="https://github.com/PostHog/posthog-python/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+S="${WORKDIR}/posthog-python-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/backoff[${PYTHON_USEDEP}]
+	dev-python/distro[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+		dev-python/pydantic[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_DESELECT=(
+	"posthog/test/test_consumer.py::TestConsumer::test_request"
+	"posthog/test/test_consumer.py::TestConsumer::test_upload"
+	"posthog/test/test_exception_capture.py::test_excepthook"
+	"posthog/test/test_feature_flags.py::TestLocalEvaluation::test_load_feature_flags_wrong_key"
+	"posthog/test/test_request.py::TestRequests::test_should_not_timeout"
+	"posthog/test/test_request.py::TestRequests::test_should_timeout"
+	"posthog/test/test_request.py::TestRequests::test_valid_request"
+)
+
+EPYTEST_PLUGINS=( pytest-asyncio )
+distutils_enable_tests pytest
diff --git a/dev-python/py-nanoid/Manifest b/dev-python/py-nanoid/Manifest
new file mode 100644
index 0000000000..449c552768
--- /dev/null
+++ b/dev-python/py-nanoid/Manifest
@@ -0,0 +1 @@
+DIST py-nanoid-0_pre20220201.gh.tar.gz 6514 BLAKE2B 0dabe059bb1fe582aff46050a491ad08d63828e00d5108efa8205f1fc99a42e2695a6e53809d86afcde98aaf941d5bbff8aa57f47ff0472771d02c267f9c9cbe SHA512 f8b7f66fac9b97d8b51f8c2184a41e346b901a556974f70e5c656e7dde8d0a612ac2a5231f9feb6e05058e11b029ec0fe0ce6b0639d92b6e31b56f1292969fe0
diff --git a/dev-python/py-nanoid/py-nanoid-9999.ebuild b/dev-python/py-nanoid/py-nanoid-0_pre20220201.ebuild
similarity index 54%
rename from dev-python/py-nanoid/py-nanoid-9999.ebuild
rename to dev-python/py-nanoid/py-nanoid-0_pre20220201.ebuild
index d8754a5207..c31967600a 100644
--- a/dev-python/py-nanoid/py-nanoid-9999.ebuild
+++ b/dev-python/py-nanoid/py-nanoid-0_pre20220201.ebuild
@@ -4,15 +4,20 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{11..12} )
+PYTHON_COMPAT=( python3_{11..14} )
 
-inherit distutils-r1 git-r3
+inherit distutils-r1
+
+EGIT_COMMIT="99e5b478c450f42d713b6111175886dccf16f156"
 
 DESCRIPTION="Python Nanoid"
 HOMEPAGE="https://github.com/puyuan/py-nanoid https://pypi.org/project/nanoid"
-EGIT_REPO_URI="https://github.com/puyuan/py-nanoid.git"
+SRC_URI="https://github.com/puyuan/py-nanoid/archive/${EGIT_COMMIT}.tar.gz -> ${P}.gh.tar.gz"
+
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
 
 LICENSE="MIT"
 SLOT="0"
+KEYWORDS="~amd64"
 
 distutils_enable_tests pytest
diff --git a/dev-util/lua-language-server/Manifest b/dev-util/lua-language-server/Manifest
index 0fb78ec967..55ec17b413 100644
--- a/dev-util/lua-language-server/Manifest
+++ b/dev-util/lua-language-server/Manifest
@@ -1,3 +1,2 @@
-DIST lua-language-server-3.15.0.zip 31509845 BLAKE2B 1ee07166d37e30f9832aba43b45bfc40eb5bfe26e12a3e29be7b307191f72b786ce82e7b245c640c8f1ff7c2debcf8bcd32eecb8613bfef9337f947747300022 SHA512 b7b270b4439dc7154b4cd47d0ecf95d4d9251225abc527bb3f6a99157ff0784902088f3436dc455b083b7c090d97267221ed407720c85b2ac163c3666dabe72c
-DIST lua-language-server-3.16.0.zip 31962898 BLAKE2B ab6a8dfe59f4856c1c0a1d56f953296515e4ca7242cce89c7a7c9898bdfaf5af9b5a214f054e6c3f85c653f6d7ca02bf0356ea5a9893b161fc25903bfe610afd SHA512 fa9c9020c8453c5ddd9a46388dd55ae5cd4e7787b0c1aa58c493b6135f7f2f1bc152976e0b260d44da12f7b95838cfb84026ad422a55319ef84fba258dcc414b
 DIST lua-language-server-3.16.1.zip 31995002 BLAKE2B 2c51f7b7cbefc96230d61ac23925521d284ef9875346cad4f5bc3a2ad499393925687eda8057c13ed4279fff03f2ac1d82d3f261d4287d45f40a9791542506a0 SHA512 0fd267ceb35284a7d300af2c1c464ffd6cb2e1fe3945ea936fe5e2316af52838ada4eb9b018a6bb396e95f9eac27e00309d7ed51a7f4bc34529077c3438234cf
+DIST lua-language-server-3.16.4.zip 32006835 BLAKE2B 84f4288b59b724a1332a10da03fd677d41a6062be9a0cb2f2f1f63cb4debca7332ec4d05a2b4b7b8969f18c9737c7c1b5b8d22e00688ec17cce8c9e414ec3533 SHA512 0787e5e2e5149e8a9df8e438b7e63cd55b6354f7fd6cc1cbd13b53df2efd4d185b64bb0fc25baf6800c7075e9f3e7c4826e619ab0786120e40e62679a531c332
diff --git a/dev-util/lua-language-server/files/3.15.0-build.ninja.patch b/dev-util/lua-language-server/files/3.15.0-build.ninja.patch
deleted file mode 100644
index bdf5fbf71a..0000000000
--- a/dev-util/lua-language-server/files/3.15.0-build.ninja.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- a/build/build.ninja
-+++ b/build/build.ninja
-@@ -11,7 +11,7 @@ rule configure
-   generator = 1
- rule c_source_bee
-   command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $
--    -fvisibility=hidden -I$builddir/lua54 -DNDEBUG -fPIC -o $out -c $in
-+    -fvisibility=hidden -I$builddir/lua54 -DNDEBUG -fPIC -o $out -c $in CFLAGS
-   description = Compile C   $out
-   deps = gcc
-   depfile = $out.d
-@@ -19,14 +19,14 @@ build $obj/source_bee/lua-seri.obj: c_source_bee $
-     3rd/bee.lua/3rd/lua-seri/lua-seri.c
- rule cxx_source_bee
-   command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
--    -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in
-+    -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in CXXFLAGS
-   description = Compile C++ $out
-   deps = gcc
-   depfile = $out.d
- build $obj/source_bee/format.obj: cxx_source_bee 3rd/bee.lua/3rd/fmt/format.cc
- rule cxx_source_bee_1
-   command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
--    -fvisibility=hidden -I3rd/bee.lua -DNDEBUG -fPIC -o $out -c $in
-+    -fvisibility=hidden -I3rd/bee.lua -DNDEBUG -fPIC -o $out -c $in CXXFLAGS
-   description = Compile C++ $out
-   deps = gcc
-   depfile = $out.d
-@@ -64,7 +64,7 @@ build $obj/source_bee/version.obj: cxx_source_bee_1 $
- rule cxx_source_bee_2
-   command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
-     -fvisibility=hidden -I3rd/bee.lua -I$builddir/lua54 -DBEE_STATIC $
--    -DNDEBUG -fPIC -o $out -c $in
-+    -DNDEBUG -fPIC -o $out -c $in CXXFLAGS
-   description = Compile C++ $out
-   deps = gcc
-   depfile = $out.d
-@@ -94,7 +94,7 @@ build $obj/source_bee/luaref.obj: cxx_source_bee_2 $
-     3rd/bee.lua/binding/luaref.cpp
- rule c_source_lua
-   command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall -DMAKE_LIB $
--    -DLUA_USE_LINUX -DNDEBUG -fPIC -Wno-maybe-uninitialized -o $out -c $in
-+    -DLUA_USE_LINUX -DNDEBUG -fPIC -Wno-maybe-uninitialized -o $out -c $in CFLAGS
-   description = Compile C   $out
-   deps = gcc
-   depfile = $out.d
-@@ -103,7 +103,7 @@ build $obj/source_lua/onelua.obj: c_source_lua 3rd/bee.lua/3rd/lua/onelua.c
- rule cxx_source_bootstrap
-   command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
-     -fvisibility=hidden -I3rd/bee.lua/3rd/lua -I3rd/bee.lua -DLUA_USE_LINUX $
--    -DNDEBUG -fPIC -o $out -c $in
-+    -DNDEBUG -fPIC -o $out -c $in CXXFLAGS
-   description = Compile C++ $out
-   deps = gcc
-   depfile = $out.d
-@@ -111,7 +111,7 @@ build $obj/source_bootstrap/main.obj: cxx_source_bootstrap $
-     3rd/bee.lua/bootstrap/main.cpp
- rule link_bootstrap
-   command = $cc $in -o $out -Wl,-E -static-libgcc -lm -ldl -lstdc++fs $
--    -pthread -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -s
-+    -pthread -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic LDFLAGS
-   description = Link    Exe $out
- rule copy
-   command = cp -fv $in$input $out 1>/dev/null
-@@ -126,8 +126,8 @@ rule cxx_code_format
-     -fvisibility=hidden -I3rd/EmmyLuaCodeStyle/Util/include $
-     -I3rd/EmmyLuaCodeStyle/CodeFormatCore/include $
-     -I3rd/EmmyLuaCodeStyle/LuaParser/include -I3rd/bee.lua/3rd/lua $
--    -I3rd/EmmyLuaCodeStyle/3rd/wildcards/include -DNDEBUG -Wall -Werror -o $
--    $out -c $in
-+    -I3rd/EmmyLuaCodeStyle/3rd/wildcards/include -DNDEBUG -Wall -o $
-+    $out -c $in CXXFLAGS
-   description = Compile C++ $out
-   deps = gcc
-   depfile = $out.d
-@@ -232,7 +232,7 @@ build $obj/code_format/Utf8.obj: cxx_code_format $
- rule c_lpeglabel
-   command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $
-     -fvisibility=hidden -I3rd/bee.lua/3rd/lua -DMAXRECLEVEL=1000 -DNDEBUG $
--    -o $out -c $in
-+    -o $out -c $in CFLAGS
-   description = Compile C   $out
-   deps = gcc
-   depfile = $out.d
-@@ -244,7 +244,7 @@ build $obj/lpeglabel/lplvm.obj: c_lpeglabel 3rd/lpeglabel/lplvm.c
- rule cxx_lua_language_server
-   command = $cc -MMD -MT $out -MF $out.d -std=c++17 -O2 -Wall $
-     -fvisibility=hidden -I3rd/bee.lua -I3rd/bee.lua/3rd/lua -DCODE_FORMAT $
--    -DNDEBUG -o $out -c $in
-+    -DNDEBUG -o $out -c $in CXXFLAGS
-   description = Compile C++ $out
-   deps = gcc
-   depfile = $out.d
-@@ -252,7 +252,7 @@ build $obj/lua-language-server/modules.obj: cxx_lua_language_server $
-     make/modules.cpp
- rule link_lua_language_server
-   command = $cc $in -o $out -rdynamic -lm -ldl -lstdc++fs -pthread $
--    -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -s
-+    -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic LDFLAGS
-   description = Link    Exe $out
- rule run_bee_test
-   command = $bin/lua-language-server $in
diff --git a/dev-util/lua-language-server/files/3.16.0-build.ninja.patch b/dev-util/lua-language-server/files/3.16.4-build.ninja.patch
similarity index 69%
rename from dev-util/lua-language-server/files/3.16.0-build.ninja.patch
rename to dev-util/lua-language-server/files/3.16.4-build.ninja.patch
index be6bc49d3c..54060cc541 100644
--- a/dev-util/lua-language-server/files/3.16.0-build.ninja.patch
+++ b/dev-util/lua-language-server/files/3.16.4-build.ninja.patch
@@ -3,17 +3,17 @@
 @@ -12,14 +12,14 @@ rule configure
  rule c_source_lua
    command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $
-     -I3rd/bee.lua/3rd/lua54 -DMAKE_LIB -DLUA_USE_LINUX -DNDEBUG -fPIC -o $
+     -I3rd/bee.lua/3rd/lua55 -DMAKE_LIB -DLUA_USE_LINUX -DNDEBUG -fPIC -o $
 -    $out -c $in
 +    $out -c $in CFLAGS
    description = Compile C   $out
    deps = gcc
    depfile = $out.d
- build $obj/source_lua/onelua.obj: c_source_lua 3rd/bee.lua/3rd/lua54/onelua.c
+ build $obj/source_lua/onelua.obj: c_source_lua 3rd/bee.lua/3rd/lua55/onelua.c
  rule cxx_source_bee
    command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
--    -fvisibility=hidden -I3rd/bee.lua/3rd/lua54 -DNDEBUG -fPIC -o $out -c $in
-+    -fvisibility=hidden -I3rd/bee.lua/3rd/lua54 -DNDEBUG -fPIC -o $out -c $in CXXFLAGS
+-    -fvisibility=hidden -I3rd/bee.lua/3rd/lua55 -DNDEBUG -fPIC -o $out -c $in
++    -fvisibility=hidden -I3rd/bee.lua/3rd/lua55 -DNDEBUG -fPIC -o $out -c $in CXXFLAGS
    description = Compile C++ $out
    deps = gcc
    depfile = $out.d
@@ -29,40 +29,40 @@
 @@ -36,7 +36,7 @@ build $obj/source_bee/format.obj: cxx_source_bee_1 $
  rule cxx_source_bee_2
    command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
-     -fvisibility=hidden -I3rd/bee.lua -I3rd/bee.lua/3rd/lua54 -DNDEBUG $
+     -fvisibility=hidden -I3rd/bee.lua -I3rd/bee.lua/3rd/lua55 -DNDEBUG $
 -    -fPIC -o $out -c $in
 +    -fPIC -o $out -c $in CXXFLAGS
    description = Compile C++ $out
    deps = gcc
    depfile = $out.d
-@@ -90,7 +90,7 @@ build $obj/source_bee/version.obj: cxx_source_bee_2 $
+@@ -84,7 +84,7 @@ build $obj/source_bee/version.obj: cxx_source_bee_2 $
  rule c_source_bee
    command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $
-     -fvisibility=hidden -I3rd/bee.lua -I3rd/bee.lua/3rd/lua54 -DBEE_STATIC $
+     -fvisibility=hidden -I3rd/bee.lua -I3rd/bee.lua/3rd/lua55 -DBEE_STATIC $
 -    -DNDEBUG -fPIC -o $out -c $in
 +    -DNDEBUG -fPIC -o $out -c $in CFLAGS
    description = Compile C   $out
    deps = gcc
    depfile = $out.d
-@@ -134,7 +134,7 @@ build $obj/source_bee/lua_time.obj: cxx_source_bee_3 $
+@@ -128,7 +128,7 @@ build $obj/source_bee/lua_time.obj: cxx_source_bee_3 $
  rule cxx_source_bootstrap
    command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
-     -fvisibility=hidden -I3rd/bee.lua -I3rd/bee.lua/3rd/lua54 $
+     -fvisibility=hidden -I3rd/bee.lua -I3rd/bee.lua/3rd/lua55 $
 -    -DLUA_USE_LINUX -DNDEBUG -fPIC -o $out -c $in
 +    -DLUA_USE_LINUX -DNDEBUG -fPIC -o $out -c $in CXXFLAGS
    description = Compile C++ $out
    deps = gcc
    depfile = $out.d
-@@ -144,7 +144,7 @@ build $obj/source_bootstrap/main.obj: cxx_source_bootstrap $
+@@ -138,7 +138,7 @@ build $obj/source_bootstrap/main.obj: cxx_source_bootstrap $
      3rd/bee.lua/bootstrap/main.cpp
  rule link_bootstrap
-   command = $cc $in -o $out -Wl,-E -static-libgcc -lstdc++fs -lunwind -lbfd $
--    -pthread -lm -ldl -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -s
-+    -pthread -lm -ldl -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -s LDFLAGS
+   command = $cc $in -o $out -Wl,-E -static-libgcc -lstdc++fs -pthread -lm $
+-    -ldl -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -s
++    -ldl -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -s LDFLAGS
    description = Link    Exe $out
  rule copy
    command = cp -fv $in$input $out 1>/dev/null
-@@ -159,8 +159,8 @@ rule cxx_code_format
+@@ -153,8 +153,8 @@ rule cxx_code_format
      -fvisibility=hidden -I3rd/EmmyLuaCodeStyle/Util/include $
      -I3rd/EmmyLuaCodeStyle/CodeFormatCore/include $
      -I3rd/EmmyLuaCodeStyle/LuaParser/include -I3rd/bee.lua/3rd/lua54 $
@@ -73,30 +73,30 @@
    description = Compile C++ $out
    deps = gcc
    depfile = $out.d
-@@ -265,7 +265,7 @@ build $obj/code_format/Utf8.obj: cxx_code_format $
+@@ -259,7 +259,7 @@ build $obj/code_format/Utf8.obj: cxx_code_format $
  rule c_lpeglabel
    command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $
-     -fvisibility=hidden -I3rd/bee.lua/3rd/lua54 -DMAXRECLEVEL=1000 -DNDEBUG $
+     -fvisibility=hidden -I3rd/bee.lua/3rd/lua55 -DMAXRECLEVEL=1000 -DNDEBUG $
 -    -o $out -c $in
 +    -o $out -c $in CFLAGS
    description = Compile C   $out
    deps = gcc
    depfile = $out.d
-@@ -277,7 +277,7 @@ build $obj/lpeglabel/lplvm.obj: c_lpeglabel 3rd/lpeglabel/lplvm.c
+@@ -271,7 +271,7 @@ build $obj/lpeglabel/lplvm.obj: c_lpeglabel 3rd/lpeglabel/lplvm.c
  rule cxx_lua_language_server
    command = $cc -MMD -MT $out -MF $out.d -std=c++17 -O2 -Wall $
-     -fvisibility=hidden -I3rd/bee.lua -I3rd/bee.lua/3rd/lua54 -DCODE_FORMAT $
+     -fvisibility=hidden -I3rd/bee.lua -I3rd/bee.lua/3rd/lua55 -DCODE_FORMAT $
 -    -DNDEBUG -o $out -c $in
 +    -DNDEBUG -o $out -c $in CXXFLAGS
    description = Compile C++ $out
    deps = gcc
    depfile = $out.d
-@@ -285,7 +285,7 @@ build $obj/lua-language-server/modules.obj: cxx_lua_language_server $
+@@ -279,7 +279,7 @@ build $obj/lua-language-server/modules.obj: cxx_lua_language_server $
      make/modules.cpp
  rule link_lua_language_server
-   command = $cc $in -o $out -rdynamic -lstdc++fs -lunwind -lbfd -pthread $
--    -lm -ldl -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -s
-+    -lm -ldl -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic LDFLAGS
+   command = $cc $in -o $out -rdynamic -lstdc++fs -pthread -lm -ldl $
+-    -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -s
++    -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -s LDFLAGS
    description = Link    Exe $out
  rule run_bee_test
    command = $bin/lua-language-server $in
diff --git a/dev-util/lua-language-server/files/3.16.4-linux.ninja.patch b/dev-util/lua-language-server/files/3.16.4-linux.ninja.patch
new file mode 100644
index 0000000000..4b31502884
--- /dev/null
+++ b/dev-util/lua-language-server/files/3.16.4-linux.ninja.patch
@@ -0,0 +1,63 @@
+--- a/3rd/luamake/compile/ninja/linux.ninja
++++ b/3rd/luamake/compile/ninja/linux.ninja
+@@ -2,20 +2,20 @@ ninja_required_version = 1.7
+ builddir = build/linux
+ bin = $builddir/bin
+ obj = $builddir/obj
+-cc = gcc
+-ar = ar
++cc = REPLACE_ME
++ar = REPLACE_AR
+ luamake = luamake
+ rule c_source_lua
+   command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $
+     -Ibee.lua/3rd/lua55 -DMAKE_LIB -DLUA_USE_LINUX -DNDEBUG -fPIC -o $out $
+     -c $in
+-  description = Compile C   $out
++  description = Compile C   $out CFLAGS
+   deps = gcc
+   depfile = $out.d
+ build $obj/source_lua/onelua.obj: c_source_lua bee.lua/3rd/lua55/onelua.c
+ rule cxx_source_bee
+   command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
+-    -fvisibility=hidden -Ibee.lua/3rd/lua55 -DNDEBUG -fPIC -o $out -c $in
++    -fvisibility=hidden -Ibee.lua/3rd/lua54 -DNDEBUG -fPIC -o $out -c $in CXXFLAGS
+   description = Compile C++ $out
+   deps = gcc
+   depfile = $out.d
+@@ -23,7 +23,7 @@ build $obj/source_bee/lua-seri.obj: cxx_source_bee $
+     bee.lua/3rd/lua-seri/lua-seri.cpp
+ rule cxx_source_bee_1
+   command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
+-    -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in
++    -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in CXXFLAGS
+   description = Compile C++ $out
+   deps = gcc
+   depfile = $out.d
+@@ -31,7 +31,7 @@ build $obj/source_bee/format.obj: cxx_source_bee_1 bee.lua/3rd/fmt/format.cc
+ rule cxx_source_bee_2
+   command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
+     -fvisibility=hidden -Ibee.lua -Ibee.lua/3rd/lua55 -DNDEBUG -fPIC -o $
+-    $out -c $in
++    $out -c $in CXXFLAGS
+   description = Compile C++ $out
+   deps = gcc
+   depfile = $out.d
+@@ -119,7 +119,7 @@ rule cxx_source_bootstrap
+   command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
+     -fvisibility=hidden -Ibee.lua -Ibee.lua/3rd/lua55 -DLUA_USE_LINUX $
+     -DNDEBUG -fPIC -o $out -c $in
+-  description = Compile C++ $out
++  description = Compile C++ $out CXXFLAGS
+   deps = gcc
+   depfile = $out.d
+ build $obj/source_bootstrap/bootstrap_init.obj: cxx_source_bootstrap $
+@@ -128,7 +128,7 @@ build $obj/source_bootstrap/main.obj: cxx_source_bootstrap $
+     bee.lua/bootstrap/main.cpp
+ rule link_bootstrap
+   command = $cc $in -o $out -Wl,-E -static-libgcc -lstdc++fs -pthread -lm $
+-    -ldl -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -s
++    -ldl -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -s LDFLAGS
+   description = Link    Exe $out
+ rule copy
+   command = cp -fv $in$input $out 1>/dev/null
diff --git a/dev-util/lua-language-server/files/lua-language-server-3.10.5-uint32_t-fix.patch b/dev-util/lua-language-server/files/lua-language-server-3.10.5-uint32_t-fix.patch
deleted file mode 100644
index 2f38d89708..0000000000
--- a/dev-util/lua-language-server/files/lua-language-server-3.10.5-uint32_t-fix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/3rd/EmmyLuaCodeStyle/Util/include/Util/SymSpell/SymSpell.h
-+++ b/3rd/EmmyLuaCodeStyle/Util/include/Util/SymSpell/SymSpell.h
-@@ -29,6 +29,7 @@
- #include <unordered_map>
- #include <unordered_set>
- #include <vector>
-+#include <stdint.h>
- 
- class SymSpell {
- public:
diff --git a/dev-util/lua-language-server/files/lua-language-server-3.16.0-ucontext_t.patch b/dev-util/lua-language-server/files/lua-language-server-3.16.0-ucontext_t.patch
deleted file mode 100644
index 60a0eb51e7..0000000000
--- a/dev-util/lua-language-server/files/lua-language-server-3.16.0-ucontext_t.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/3rd/bee.lua/bee/crash/unwind_linux.cpp
-+++ b/3rd/bee.lua/bee/crash/unwind_linux.cpp
-@@ -6,12 +6,8 @@
- namespace bee::crash {
-     void unwind(ucontext_t *ctx, uint16_t skip, unwind_callback func, void *ud) noexcept {
-         unw_cursor_t cursor;
--#if defined(__aarch64__)
-         unw_context_t *unw_ctx = (unw_context_t *)ctx;
-         unw_init_local(&cursor, unw_ctx);
--#else
--        unw_init_local(&cursor, ctx);
--#endif
-         while (unw_step(&cursor) > 0) {
-             unw_word_t pc;
-             unw_get_reg(&cursor, UNW_REG_IP, &pc);
---- a/3rd/luamake/bee.lua/bee/crash/unwind_linux.cpp
-+++ b/3rd/luamake/bee.lua/bee/crash/unwind_linux.cpp
-@@ -6,12 +6,8 @@
- namespace bee::crash {
-     void unwind(ucontext_t *ctx, uint16_t skip, unwind_callback func, void *ud) noexcept {
-         unw_cursor_t cursor;
--#if defined(__aarch64__)
-         unw_context_t *unw_ctx = (unw_context_t *)ctx;
-         unw_init_local(&cursor, unw_ctx);
--#else
--        unw_init_local(&cursor, ctx);
--#endif
-         while (unw_step(&cursor) > 0) {
-             unw_word_t pc;
-             unw_get_reg(&cursor, UNW_REG_IP, &pc);
diff --git a/dev-util/lua-language-server/lua-language-server-3.15.0.ebuild b/dev-util/lua-language-server/lua-language-server-3.15.0.ebuild
deleted file mode 100644
index 939b6403d0..0000000000
--- a/dev-util/lua-language-server/lua-language-server-3.15.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2022-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua{5-{1,3,4},jit} )
-
-inherit ninja-utils toolchain-funcs lua-single prefix
-
-DESCRIPTION="Lua language server"
-HOMEPAGE="https://github.com/LuaLS/lua-language-server"
-SRC_URI="https://github.com/LuaLS/lua-language-server/releases/download/${PV}/${P}-submodules.zip -> ${P}.zip"
-S="${WORKDIR}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-REQUIRE_USE="${LUA_REQUIRED_USE}"
-
-DEPEND="${LUA_DEPS}"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	app-alternatives/ninja
-	app-arch/unzip
-"
-RESTRICT="!test? ( test )"
-PATCHES=(
-	"${FILESDIR}/linux.ninja.patch"
-	"${FILESDIR}/${PV}-build.ninja.patch"
-	"${FILESDIR}/${PN}-3.10.5-uint32_t-fix.patch"
-)
-
-src_prepare() {
-	# Remove hardcoded gcc references
-	sed -i "/lm.cxx/a lm.cc = '$(tc-getCC)'" \
-		make.lua || die
-	sed -i "s/CC = gcc/ CC = ${tc-getCC}/" \
-		3rd/lpeglabel/makefile || die
-	# Shipped file doesn't respect CFLAGS/CXXFLAGS/LDFLAGS
-	eapply "${FILESDIR}/linux.ninja.patch"
-	eapply_user
-	sed -i -e "s/^cc = REPLACE_ME/cc = $(tc-getCC)/" \
-		-e "s/^ar = REPLACE_AR/ar = $(tc-getAR)/" \
-		-e "s/CFLAGS/${CFLAGS}/" \
-		-e "s/CXXFLAGS/${CXXFLAGS}/" \
-		-e "s/LDFLAGS/${LDFLAGS}/" \
-		3rd/luamake/compile/ninja/linux.ninja || die
-
-	prefixify_ro "${FILESDIR}/wrapper.sh"
-}
-
-src_compile() {
-	eninja -C 3rd/luamake -f compile/ninja/linux.ninja "$(usex test "test" "luamake")"
-	use test && eninja -C 3rd/luamake -f compile/ninja/linux.ninja luamake
-	./3rd/luamake/luamake init || die
-
-	# Generated file doesn't respect CFLAGS/CXXFLAGS/LDFLAGS
-	sed -i -e "s/^cc =.*./cc = REPLACE_ME/" \
-		-e "s/^ar =.*./ar = REPLACE_AR/" \
-		build/build.ninja || die
-
-	eapply "${FILESDIR}/${PV}-build.ninja.patch"
-	eapply "${FILESDIR}/${PN}-3.10.5-uint32_t-fix.patch"
-	sed -i -e "s/REPLACE_ME/$(tc-getCC)/" \
-		-e "s/REPLACE_AR/$(tc-getAR)/" \
-		-e "s|LUAMAKE_PATH|${S}/3rd/luamake/luamake|" \
-		-e "s/CFLAGS/${CFLAGS}/" \
-		-e "s/CXXFLAGS/${CXXFLAGS}/" \
-		-e "s/LDFLAGS/${LDFLAGS}/" \
-		build/build.ninja || die
-
-	use test && eninja -f build/build.ninja || eninja -f build/build.ninja all
-	rm -rf meta/198256b1
-}
-
-src_install() {
-	newbin "${T}/wrapper.sh" ${PN}
-
-	into /opt/${PN}
-	dobin bin/${PN}
-
-	insinto /opt/${PN}/bin
-	doins bin/main.lua
-
-	insinto /opt/${PN}
-	doins -r debugger.lua main.lua locale meta script
-
-	einstalldocs
-}
diff --git a/dev-util/lua-language-server/lua-language-server-3.16.1.ebuild b/dev-util/lua-language-server/lua-language-server-3.16.1.ebuild
index 74d32a498d..120c7502aa 100644
--- a/dev-util/lua-language-server/lua-language-server-3.16.1.ebuild
+++ b/dev-util/lua-language-server/lua-language-server-3.16.1.ebuild
@@ -47,8 +47,9 @@ src_prepare() {
 		-e "s/CXXFLAGS/${CXXFLAGS}/" \
 		-e "s/LDFLAGS/${LDFLAGS}/" \
 		3rd/luamake/compile/ninja/linux.ninja || die
-	[[ "$(tc-get-cxx-stdlib)" = "libc++" ]] &&
+	if [[ $(tc-get-cxx-stdlib) == libc++ ]]; then
 		sed -i "s/-lstdc++fs//" 3rd/luamake/compile/ninja/linux.ninja || die
+	fi
 
 	prefixify_ro "${FILESDIR}/wrapper.sh"
 }
@@ -71,8 +72,9 @@ src_compile() {
 		-e "s/CXXFLAGS/${CXXFLAGS}/" \
 		-e "s/LDFLAGS/${LDFLAGS}/" \
 		build/build.ninja || die
-	[[ "$(tc-get-cxx-stdlib)" = "libc++" ]] &&
+	if [[ $(tc-get-cxx-stdlib) == libc++ ]]; then
 		sed -i "s/-lstdc++fs//" build/build.ninja || die
+	fi
 
 	use test && eninja -f build/build.ninja || eninja -f build/build.ninja all
 	rm -rf meta/198256b1
diff --git a/dev-util/lua-language-server/lua-language-server-3.16.0.ebuild b/dev-util/lua-language-server/lua-language-server-3.16.4.ebuild
similarity index 81%
rename from dev-util/lua-language-server/lua-language-server-3.16.0.ebuild
rename to dev-util/lua-language-server/lua-language-server-3.16.4.ebuild
index 740786513b..9f9be2f484 100644
--- a/dev-util/lua-language-server/lua-language-server-3.16.0.ebuild
+++ b/dev-util/lua-language-server/lua-language-server-3.16.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2025 Gentoo Authors
+# Copyright 2022-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,15 +15,19 @@ S="${WORKDIR}"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
+IUSE="llvm-libunwind test"
 REQUIRE_USE="${LUA_REQUIRED_USE}"
 
-DEPEND="${LUA_DEPS}"
+DEPEND="
+	${LUA_DEPS}
+	sys-libs/binutils-libs
+"
 RDEPEND="${DEPEND}"
 BDEPEND="
 	app-alternatives/ninja
 	app-arch/unzip
-	sys-libs/libunwind
+	!llvm-libunwind? ( sys-libs/libunwind )
+	llvm-libunwind? ( llvm-runtimes/libunwind )
 "
 RESTRICT="!test? ( test )"
 
@@ -34,8 +38,7 @@ src_prepare() {
 	sed -i "s/CC = gcc/ CC = ${tc-getCC}/" \
 		3rd/lpeglabel/makefile || die
 	# Shipped file doesn't respect CFLAGS/CXXFLAGS/LDFLAGS
-	eapply "${FILESDIR}/${PV}-linux.ninja.patch"
-	eapply "${FILESDIR}/${PN}-${PV}-ucontext_t.patch"
+	eapply "${FILESDIR}/3.16.4-linux.ninja.patch"
 	eapply_user
 	sed -i -e "s/^cc = REPLACE_ME/cc = $(tc-getCC)/" \
 		-e "s/^ar = REPLACE_AR/ar = $(tc-getAR)/" \
@@ -43,6 +46,9 @@ src_prepare() {
 		-e "s/CXXFLAGS/${CXXFLAGS}/" \
 		-e "s/LDFLAGS/${LDFLAGS}/" \
 		3rd/luamake/compile/ninja/linux.ninja || die
+	if [[ $(tc-get-cxx-stdlib) == libc++ ]]; then
+		sed -i "s/-lstdc++fs//" 3rd/luamake/compile/ninja/linux.ninja || die
+	fi
 
 	prefixify_ro "${FILESDIR}/wrapper.sh"
 }
@@ -65,6 +71,9 @@ src_compile() {
 		-e "s/CXXFLAGS/${CXXFLAGS}/" \
 		-e "s/LDFLAGS/${LDFLAGS}/" \
 		build/build.ninja || die
+	if [[ $(tc-get-cxx-stdlib) == libc++ ]]; then
+		sed -i "s/-lstdc++fs//" build/build.ninja || die
+	fi
 
 	use test && eninja -f build/build.ninja || eninja -f build/build.ninja all
 	rm -rf meta/198256b1