commit fd80b55ae8734062922b794e08e1fb7b8e8418a8
Author: lucascouts <lucascs@protonmail.com>
Date: Wed Jul 22 09:18:15 2026 -0300

fix(overlay): resolve committed merge-conflict markers across 37 files

Broken autoupdate merge 8bbf9c25 committed unresolved <<<<<<< markers into
30 packages (ebuild + Manifest + md5-cache), breaking `emerge` sourcing
(vulkan-layers depend phase die + 36 more). Resolved taking the autoupdate
target side (4eb9e849), restoring the coherent snapshot.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

commit 8bbf9c2579e0044bbd7e2816e80aff0a6dc08484
Author: neirochap <neirochap@proton.me>
Date: Wed Jul 22 07:20:45 2026 -0300

add(app-editors/{cursor-3.12.17, devin-desktop-bin-3.5.17, kiro-1.0.198, trilium-0.104.0, vim-9.2.0829, vim-core-9.2.0829, zed-1.13.0_pre20260722}, app-emulation/{crossover-bin-26.3.0, d7vk-2.0}, app-misc/claude-desktop-bin-1.24012.1, app-portage/bentoolkit-0.14.0, dev-games/godot-4.8_alpha2, dev-lang/flutter-3.44.7, dev-libs/sentry-native-0.15.4, dev-python/uv-bin-0.11.31, dev-ruby/erb-6.0.6, dev-util/codex{,-bin}-0.145.0, dev-vcs/gitkraken-12.3.1, media-libs/{mesa-26.2.0_pre20260722, vulkan-layers-1.4.352_p20260721, vulkan-loader-1.4.354_p20260720}, net-misc/{modemmanager-1.25.1_p20260721, postman-bin-12.20.1}, sci-ml/llama-cpp-0_pre10085, sys-apps/pnpm-11.15.1, www-client/brave-browser-1.92.141), add(metadata/{md5-cache/app-editors/cursor-3.12.17, md5-cache/app-editors/devin-desktop-bin-3.5.17, md5-cache/app-editors/kiro-1.0.198, md5-cache/app-editors/trilium-0.104.0, md5-cache/app-editors/vim-9.2.0829, md5-cache/app-editors/vim-core-9.2.0829, md5-cache/app-editors/zed-1.13.0_pre20260717, md5-cache/app-editors/zed-1.13.0_pre20260722, md5-cache/app-emulation/crossover-bin-26.3.0, md5-cache/app-emulation/d7vk-2.0, md5-cache/app-misc/claude-desktop-bin-1.24012.1, md5-cache/app-portage/bentoolkit-0.14.0, md5-cache/dev-games/godot-4.8_alpha2, md5-cache/dev-lang/flutter-3.44.7, md5-cache/dev-libs/sentry-native-0.15.4, md5-cache/dev-python/uv-bin-0.11.31, md5-cache/dev-ruby/erb-6.0.6, md5-cache/dev-util/claude-agent-acp-plus-0.4.0, md5-cache/dev-util/claude-code-2.1.217, md5-cache/dev-util/codex-0.145.0, md5-cache/dev-util/codex-bin-0.145.0, md5-cache/dev-util/glslang-1.4.350.1_p20260721, md5-cache/dev-util/mesa_clc-26.2.0_pre20260722, md5-cache/dev-util/spirv-tools-1.4.350.0_p20260717, md5-cache/dev-util/vulkan-tools-1.4.354_p20260720, md5-cache/dev-vcs/gitkraken-12.3.1, md5-cache/mail-client/betterbird-bin-140.13.0, md5-cache/media-libs/mesa-26.2.0_pre20260722, md5-cache/media-libs/vulkan-layers-1.4.352_p20260721, md5-cache/media-libs/vulkan-loader-1.4.354_p20260720, md5-cache/net-misc/modemmanager-1.25.1_p20260721, md5-cache/net-misc/postman-bin-12.20.1, md5-cache/sci-ml/llama-cpp-0_pre10085, md5-cache/sys-apps/pnpm-11.15.1, md5-cache/www-client/brave-browser-1.92.141}), mod(metadata/{md5-cache/app-editors/vim-9.2.0782, md5-cache/app-emulation/crossover-bin-26.2.0, md5-cache/app-emulation/d7vk-1.12, md5-cache/app-portage/bentoolkit-0.13.1, md5-cache/dev-games/godot-4.8_alpha1, md5-cache/dev-util/glslang-1.4.350.1_p20260716, md5-cache/dev-util/mesa_clc-26.2.0_pre20260702, md5-cache/dev-util/mesa_clc-26.2.0_pre20260717, md5-cache/dev-util/spirv-tools-1.4.350.0_p20260716, md5-cache/dev-util/vulkan-tools-1.4.354_p20260715, md5-cache/media-libs/mesa-26.2.0_pre20260717, md5-cache/media-libs/vulkan-layers-1.4.352_p20260716, md5-cache/net-misc/modemmanager-1.25.1_p20260713})

commit 5b36a8599537616718549a0b3e23dfae206aecaa
Author: lucascouts <lucascs@protonmail.com>
Date: Mon Jul 20 07:52:57 2026 -0300

add(metadata/{md5-cache/app-editors/vim-9.2.0811, md5-cache/app-editors/vim-core-9.2.0811, md5-cache/app-editors/zed-1.13.0_pre20260720, md5-cache/dev-ruby/erb-6.0.6, md5-cache/media-libs/vulkan-layers-1.4.352_p20260720, md5-cache/net-misc/postman-bin-12.20.0, md5-cache/sci-ml/llama-cpp-0_pre10069}), up(app-editors/{vim-9.2.0810 -> 9.2.0811, vim-core-9.2.0810 -> 9.2.0811, zed-1.13.0_pre20260719 -> 1.13.0_pre20260720}, dev-ruby/erb-6.0.5 -> 6.0.6, media-libs/vulkan-layers-1.4.352_p20260719 -> 1.4.352_p20260720, net-misc/postman-bin-12.19.6 -> 12.20.0, sci-ml/llama-cpp-0_pre10068 -> 0_pre10069)

commit ec649e7b6730092286d5fcfee67bcb98e20575d0
Author: lucascouts <lucascs@protonmail.com>
Date: Thu Jul 16 18:23:24 2026 -0300

add(metadata/{md5-cache/app-editors/cursor-3.12.10, md5-cache/dev-ruby/erb-6.0.5, md5-cache/dev-util/glslang-1.4.350.1_p20260716, md5-cache/media-libs/vulkan-loader-1.4.354_p20260716, md5-cache/sci-ml/llama-cpp-0_pre10043, md5-cache/sci-ml/llama-cpp-0_pre10051, md5-cache/sci-ml/ollama-0.32.1, md5-cache/sci-ml/ollama-bin-0.32.1}), mod(app-editors/zed-1.12.0_pre20260716), mod(metadata/{md5-cache/app-editors/zed-1.12.0_pre20260716, md5-cache/dev-lang/rust-1.97.1, md5-cache/dev-lang/rust-bin-1.97.1}), up(app-editors/cursor-3.11.25 -> 3.12.10, app-office/libreoffice-l10n-26.8.0.0_beta1 -> 26.8.0.1, dev-ruby/erb-6.0.4 -> 6.0.5, dev-util/glslang-1.4.350.1_p20260714 -> 1.4.350.1_p20260716, media-libs/vulkan-loader-1.4.354_p20260714 -> 1.4.354_p20260716, sci-ml/ollama{,-bin}-0.32.0 -> 0.32.1)

commit 2e0db4ab2be3f83aaf2e4fe9d46c7440bb0cbc30
Author: lucascouts <lucascs@protonmail.com>
Date: Thu Apr 23 09:54:14 2026 -0300

add(dev-util/mesa_clc-26.1_rc1_p20260423, media-libs/mesa-26.1_rc1_p20260423), del(dev-util/mesa_clc-26.1_rc1_p20260417, media-libs/mesa-26.1_rc1_p20260417), up(app-containers/{docker, docker-cli}-29.4.0 -> 29.4.1, app-editors/{cursor-3.1.15 -> 3.1.17, vim-9.2.0361 -> 9.2.0389, vim-core-9.2.0361 -> 9.2.0389, windsurf-2.0.61 -> 2.0.67, zed-bin-0.232.3 -> 0.233.7}, dev-ruby/erb-6.0.3 -> 6.0.4, dev-util/spirv-tools-1.4.341.0_p20260418 -> 1.4.341.0_p20260422, dev-vcs/gitkraken-12.0.0 -> 12.0.1, media-gfx/pixieditor-bin-2.1.0.20 -> 2.1.0.22, media-libs/vulkan-layers-1.4.349_p20260416 -> 1.4.349_p20260422, net-ftp/filezilla-3.70.3 -> 3.70.4, net-misc/postman-bin-12.6.3 -> 12.7.0, net-vpn/openvpn-2.7.1 -> 2.7.2, sci-ml/ollama{,-bin}-0.21.0 -> 0.21.1, sys-apps/xdg-desktop-portal-1.21.1_p20260413 -> 1.21.1_p20260422, www-client/brave-browser-1.89.137 -> 1.89.143), down(app-office/{libreoffice, libreoffice-l10n}-26.2.3.1 -> 26.2.3.1_pre)

commit aa45305771e634d809ddee42c0d6dfe11d0a6ddf
Author: lucascouts <lucascs@protonmail.com>
Date: Thu Apr 16 19:33:24 2026 -0300

add(dev-util/mesa_clc-26.1_rc1_p20260416, media-libs/mesa-26.1_rc1_p20260416), del(dev-util/mesa_clc-26.1_rc1_p20260415, media-libs/mesa-26.1_rc1_p20260415), mod(app-editors/zed-0.234.0_pre20260416), up(app-containers/{docker-compose-5.1.2 -> 5.1.3, pods-2.4.0 -> 3.0.0}, app-editors/{cursor-3.1.10 -> 3.1.15, vim-9.2.0332 -> 9.2.0360, vim-core-9.2.0332 -> 9.2.0360, windsurf-1.9600.41 -> 2.0.50, zed-bin-0.231.2 -> 0.232.2}, app-emulation/qemu-11.0.0_rc3 -> 11.0.0_rc4, app-office/{libreoffice, libreoffice-l10n}-26.2.2.2 -> 26.2.3.1, dev-libs/{fzssh-1.1.10 -> 1.2.0, libfilezilla-0.55.3 -> 0.55.4, sentry-native-0.13.6 -> 0.13.7}, dev-ruby/erb-6.0.2 -> 6.0.3, dev-util/{claude-code-2.1.111 -> 2.1.112, glslang-1.4.341.0_p20260410 -> 1.4.341.0_p20260416, spirv-headers-1.4.341.0_p20260410 -> 1.4.341.0_p20260416, spirv-tools-1.4.341.0_p20260413 -> 1.4.341.0_p20260416, vulkan-utility-libraries-1.4.349_p20260413 -> 1.4.349_p20260416}, dev-vcs/gitkraken-11.10.0 -> 12.0.0, mail-mta/proton-mail-bridge-3.24.0 -> 3.24.1, media-gfx/blender{,-bin}-5.1.0 -> 5.1.1, media-libs/vulkan-layers-1.4.349_p20260413 -> 1.4.349_p20260416, media-video/vlc-4.0.0_pre20260413 -> 4.0.0_pre20260416, net-libs/libqmi-1.38.1_pre20260403 -> 1.38.1_pre20260416, net-misc/{modemmanager-1.25.1_p20260403 -> 1.25.1_p20260416, postman-bin-12.5.6 -> 12.6.3}, www-client/brave-browser-1.89.132 -> 1.89.137)

commit 654dfb424db1a0673f402da66f07dc2c529bd944
Author: lucascouts <lucascs@protonmail.com>
Date: Wed Apr 1 23:17:05 2026 -0300

add(dev-ruby/erb-6.0.2)