Adding metadata

15 files changed, 367 insertions, 56 deletions

diff --git a/gui-apps/labwc-tweaks/labwc-tweaks-0.1.0.ebuild b/gui-apps/labwc-tweaks/labwc-tweaks-0.1.0.ebuild
index 42c332f25ef7..49e7915f0094 100644
--- a/gui-apps/labwc-tweaks/labwc-tweaks-0.1.0.ebuild
+++ b/gui-apps/labwc-tweaks/labwc-tweaks-0.1.0.ebuild
@@ -31,6 +31,12 @@ BDEPEND="
 	x11-libs/libxkbcommon
 "
 
+src_prepare() {
+	sed -i 's/^cmake_minimum_required(VERSION 3\.5)$/cmake_minimum_required(VERSION 3.10)/' CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_BUILD_TYPE=None
diff --git a/gui-apps/labwc-tweaks/labwc-tweaks-9999.ebuild b/gui-apps/labwc-tweaks/labwc-tweaks-9999.ebuild
index 42c332f25ef7..49e7915f0094 100644
--- a/gui-apps/labwc-tweaks/labwc-tweaks-9999.ebuild
+++ b/gui-apps/labwc-tweaks/labwc-tweaks-9999.ebuild
@@ -31,6 +31,12 @@ BDEPEND="
 	x11-libs/libxkbcommon
 "
 
+src_prepare() {
+	sed -i 's/^cmake_minimum_required(VERSION 3\.5)$/cmake_minimum_required(VERSION 3.10)/' CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_BUILD_TYPE=None
diff --git a/gui-apps/noctalia-greeter/noctalia-greeter-1.0.0.ebuild b/gui-apps/noctalia-greeter/noctalia-greeter-1.0.0.ebuild
index 0ebf592e68b3..3d4ef46505bd 100644
--- a/gui-apps/noctalia-greeter/noctalia-greeter-1.0.0.ebuild
+++ b/gui-apps/noctalia-greeter/noctalia-greeter-1.0.0.ebuild
@@ -21,19 +21,20 @@ SLOT="0"
 
 DEPEND="
 	dev-libs/glib:2
+	dev-libs/libinput
 	dev-libs/wayland
 	gnome-base/librsvg:2
-	media-libs/fontconfig
-	media-libs/freetype
-	sys-apps/dbus
 	gui-libs/greetd
 	gui-libs/wlroots:0.20=
-	x11-libs/pango
+	media-libs/fontconfig
+	media-libs/freetype
 	media-libs/libwebp
 	media-libs/mesa
+	sys-apps/dbus
 	virtual/opengl
 	x11-libs/cairo[glib]
 	x11-libs/libxkbcommon
+	x11-libs/pango
 "
 
 RDEPEND="${DEPEND}"
diff --git a/gui-apps/noctalia-greeter/noctalia-greeter-9999.ebuild b/gui-apps/noctalia-greeter/noctalia-greeter-9999.ebuild
index 07d6a2554e96..5af090d83750 100644
--- a/gui-apps/noctalia-greeter/noctalia-greeter-9999.ebuild
+++ b/gui-apps/noctalia-greeter/noctalia-greeter-9999.ebuild
@@ -21,20 +21,21 @@ SLOT="0"
 
 DEPEND="
 	dev-libs/glib:2
+	dev-libs/libinput
+	dev-cpp/tomlplusplus
 	dev-libs/wayland
 	gnome-base/librsvg:2
-	media-libs/fontconfig
-	media-libs/freetype
-	sys-apps/dbus
 	gui-libs/greetd
 	gui-libs/wlroots:0.20=
-	x11-libs/pango
+	media-libs/fontconfig
+	media-libs/freetype
 	media-libs/libwebp
 	media-libs/mesa
+	sys-apps/dbus
 	virtual/opengl
 	x11-libs/cairo[glib]
 	x11-libs/libxkbcommon
-	dev-cpp/tomlplusplus
+	x11-libs/pango
 "
 
 RDEPEND="${DEPEND}"
@@ -49,5 +50,6 @@ src_configure() {
 	local emesonargs=(
 		-Dsystem_tomlplusplus=true
 	)
+
 	meson_src_configure
 }
diff --git a/gui-apps/noctalia/Manifest b/gui-apps/noctalia/Manifest
index 4ff6e28e576c..b9eb37357188 100644
--- a/gui-apps/noctalia/Manifest
+++ b/gui-apps/noctalia/Manifest
@@ -1,2 +1,3 @@
 DIST noctalia-5.0.0_beta1.tar.gz 5185610 BLAKE2B b5fbb732af28625493e075575adc10c423d3bab54f94ca143af255bdae5f8efcd43f4e10ad999969647e38f9f860149c3a40a336c4306410f7e18582e80feeba SHA512 88a8d6fcf080ee798bf6e606d5cf701d09b0be1cbcd22fc663c8942071e99eb74e3dd7ebe2f9747700390f5dfddfbfa04c88d987982ff4ed0d7d75e55b5447fc
+DIST noctalia-5.0.0_beta2.tar.gz 4915967 BLAKE2B 7aeeb0fdcefeeb57f45bb9600f6eea76d15206c7a11a8bd05afccce690678994f1c05929c42dfc8c4ebad9f18eba52ba6646a6789654f3910e82f0a0753166d2 SHA512 48d0ad096a7f3b96b40003a8c02260e2737c62dde9abf155e875ad32c83dc79522916723e63f65efbcbb5d3b20877aa28593723956d46ff1b996556db6534d6c
 DIST noctalia-v4.7.7.tar.gz 25414718 BLAKE2B a8af942e0b746d8fc52a0e979aab27e1ebd91190ec71924b519d56d5224a560e2edaf9c64c51768d68cb791d70d03c7ba5572fec1d1fa38f3244fd698189d89c SHA512 7f1ccdd6180e40ce1e898688f93aab348d327e8b46a90e1a193a73f00468fb7ae4dd2655588006da7774ccace4675853cb05dcd3cee540a7c5bbedf57da202c2
diff --git a/gui-apps/noctalia/noctalia-5.0.0_beta1.ebuild b/gui-apps/noctalia/noctalia-5.0.0_beta1.ebuild
index 7d381cc871b9..5b91c018c857 100644
--- a/gui-apps/noctalia/noctalia-5.0.0_beta1.ebuild
+++ b/gui-apps/noctalia/noctalia-5.0.0_beta1.ebuild
@@ -21,9 +21,11 @@ IUSE="+jemalloc"
 
 DEPEND="
 	dev-cpp/sdbus-c++
+	dev-cpp/tomlplusplus
 	dev-libs/glib:2
 	jemalloc? ( dev-libs/jemalloc:= )
 	dev-libs/libxml2
+	dev-libs/md4c
 	dev-libs/wayland
 	gnome-base/librsvg:2
 	media-libs/fontconfig
@@ -31,6 +33,7 @@ DEPEND="
 	media-libs/libwebp
 	media-libs/mesa
 	media-video/pipewire
+	media-video/wireplumber
 	net-misc/curl
 	sci-libs/libqalculate
 	sys-auth/polkit
@@ -39,11 +42,12 @@ DEPEND="
 	x11-libs/cairo[glib]
 	x11-libs/libxkbcommon
 	x11-libs/pango
-	dev-cpp/tomlplusplus
-	dev-libs/md4c
 "
 
-RDEPEND="${DEPEND}"
+RDEPEND="
+	${DEPEND}
+	dev-vcs/git
+"
 
 BDEPEND="
 	dev-libs/wayland
diff --git a/gui-apps/noctalia/noctalia-5.0.0_beta2.ebuild b/gui-apps/noctalia/noctalia-5.0.0_beta2.ebuild
new file mode 100644
index 000000000000..62581dbc6e78
--- /dev/null
+++ b/gui-apps/noctalia/noctalia-5.0.0_beta2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson optfeature xdg
+
+MY_PV="${PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="A lightweight Wayland shell and bar built directly on Wayland + OpenGL ES"
+HOMEPAGE="https://noctalia.dev/ https://github.com/noctalia-dev/noctalia"
+
+SRC_URI="https://github.com/noctalia-dev/noctalia/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+
+IUSE="+jemalloc"
+
+DEPEND="
+	dev-cpp/nlohmann_json
+	dev-cpp/sdbus-c++
+	dev-cpp/tomlplusplus
+	dev-libs/glib:2
+	jemalloc? ( dev-libs/jemalloc:= )
+	dev-libs/libxml2
+	dev-libs/md4c
+	dev-libs/stb
+	dev-libs/wayland
+	gnome-base/librsvg:2
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libwebp
+	media-libs/mesa
+	media-video/pipewire
+	media-video/wireplumber
+	net-misc/curl
+	sci-libs/libqalculate
+	sys-auth/polkit
+	sys-libs/pam
+	virtual/opengl
+	x11-libs/cairo[glib]
+	x11-libs/libxkbcommon
+	x11-libs/pango
+"
+
+RDEPEND="
+	${DEPEND}
+	dev-vcs/git
+"
+
+BDEPEND="
+	dev-libs/wayland
+	dev-libs/wayland-protocols
+	dev-util/wayland-scanner
+"
+
+DOCS=( {README,CREDITS}.md example.toml )
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature jemalloc)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "external display brightness control" app-misc/ddcutil
+	optfeature "hardware-accelerated screen recording" media-video/gpu-screen-recorder
+}
diff --git a/gui-apps/noctalia/noctalia-9999.ebuild b/gui-apps/noctalia/noctalia-9999.ebuild
index 33c9c4b67f82..22f7289fc484 100644
--- a/gui-apps/noctalia/noctalia-9999.ebuild
+++ b/gui-apps/noctalia/noctalia-9999.ebuild
@@ -16,10 +16,14 @@ SLOT="0"
 IUSE="+jemalloc"
 
 DEPEND="
+	dev-cpp/nlohmann_json
 	dev-cpp/sdbus-c++
+	dev-cpp/tomlplusplus
 	dev-libs/glib:2
 	jemalloc? ( dev-libs/jemalloc:= )
 	dev-libs/libxml2
+	dev-libs/md4c
+	dev-libs/stb
 	dev-libs/wayland
 	gnome-base/librsvg:2
 	media-libs/fontconfig
@@ -27,6 +31,7 @@ DEPEND="
 	media-libs/libwebp
 	media-libs/mesa
 	media-video/pipewire
+	media-video/wireplumber
 	net-misc/curl
 	sci-libs/libqalculate
 	sys-auth/polkit
@@ -35,11 +40,12 @@ DEPEND="
 	x11-libs/cairo[glib]
 	x11-libs/libxkbcommon
 	x11-libs/pango
-	dev-cpp/tomlplusplus
-	dev-libs/md4c
 "
 
-RDEPEND="${DEPEND}"
+RDEPEND="
+	${DEPEND}
+	dev-vcs/git
+"
 
 BDEPEND="
 	dev-libs/wayland
@@ -52,8 +58,6 @@ DOCS=( {README,CREDITS}.md example.toml )
 src_configure() {
 	local emesonargs=(
 		$(meson_feature jemalloc)
-		-Dsystem_md4c=true
-		-Dsystem_tomlplusplus=true
 	)
 	meson_src_configure
 }
diff --git a/gui-apps/organicmaps/Manifest b/gui-apps/organicmaps/Manifest
new file mode 100644
index 000000000000..f66e704f61ac
--- /dev/null
+++ b/gui-apps/organicmaps/Manifest
@@ -0,0 +1,3 @@
+DIST organicmaps-2026.06.24.16-fast_obj-d620667f10a548dee94dbc8c144bb22f79162176.tar.gz 29932 BLAKE2B bb631fe5ec8243d1f86678026916dac25847af9f3273d0aba4dc266e2f7c48b26c563eb7ac83ac707a35356ac3bd31c150bf1bd243a7c1b2b77bec5d27884bcf SHA512 a24920f2574ded1471ff96070f6a82e98b7437b036de67ec03d8e46a0aa75e1be82cae1daf4b5582d1198ca2750761a5450bd5c0a5e461bdf4625ff5d7291572
+DIST organicmaps-2026.06.24.16-just_gtfs-7516753825500f90ac2de6f18c256d5abec1ff33.tar.gz 16181 BLAKE2B 64ca9f94fc7aa0d9aac6faebf8b7c281af910d6969da04c24f117f4b48061916bdf49d9e6d19668551476638a5a0723b4b0802944b23eb45249b9598f087632d SHA512 b1095b4cf0e5268c49344a9d64a5d805b5b2923657dd1bde72e5a097453b83b3cfdac3e8c032ec492da57c39700ea3f2e0ad53a4ddf4f23244fe8564776378a8
+DIST organicmaps-2026.06.24.16.tar.gz 224108349 BLAKE2B 69d81f721c994234a1c8c994480e76a7d80f8604ef316a65c1c5833bfa6e2e0d98b6b0d3a5788741898fd3fdd4771fb0977c0055702b2099206c0d6489227750 SHA512 cc03bf8bce7a9fd2acaa0811bb2756822a8f309a3cd7872142d7cb5ba3c584363a50b66564b62a2fa6e70853b1a787758fb150c9dcdfde1f99ef1919e90fbdfe
diff --git a/gui-apps/organicmaps/files/more-3party-2026.06.24-16.patch b/gui-apps/organicmaps/files/more-3party-2026.06.24-16.patch
new file mode 100644
index 000000000000..cd3e4a62dd11
--- /dev/null
+++ b/gui-apps/organicmaps/files/more-3party-2026.06.24-16.patch
@@ -0,0 +1,95 @@
+diff --git a/3party/CMakeLists.txt b/3party/CMakeLists.txt
+index 0160603c82..0c1a7cea7c 100644
+--- a/3party/CMakeLists.txt
++++ b/3party/CMakeLists.txt
+@@ -43,10 +43,18 @@ if (NOT WITH_SYSTEM_PROVIDED_3PARTY)
+   target_include_directories(utf8cpp SYSTEM INTERFACE "${OMIM_ROOT}/3party/utfcpp/source")
+ endif()
+ 
++find_package(PkgConfig REQUIRED)
++pkg_check_modules(BLAKE3 REQUIRED IMPORTED_TARGET GLOBAL libblake3)
++add_library(BLAKE3::blake3 ALIAS PkgConfig::BLAKE3)
++
++find_package(glaze CONFIG REQUIRED)
++set_target_properties(glaze::glaze PROPERTIES IMPORTED_GLOBAL TRUE)
++if (NOT TARGET glaze::glaze)
++  add_library(glaze::glaze ALIAS glaze)
++endif()
++
+ add_subdirectory(agg)
+-add_subdirectory(BLAKE3/c)
+ add_subdirectory(bsdiff-courgette)
+-add_subdirectory(glaze)
+ add_subdirectory(minizip)
+ add_subdirectory(open-location-code)
+ add_subdirectory(opening_hours)
+@@ -57,19 +65,4 @@ add_subdirectory(vulkan_wrapper)
+ 
+ if (PLATFORM_DESKTOP)
+   add_subdirectory(libtess2)
+-
+-  set(GLFW_BUILD_DOCS OFF CACHE BOOL "")
+-  set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "")
+-  set(GLFW_BUILD_TESTS OFF CACHE BOOL "")
+-  set(GLFW_INSTALL OFF CACHE BOOL "")
+-  set(GLFW_VULKAN_STATIC OFF CACHE BOOL "")
+-  set(GLFW_BUILD_WAYLAND OFF CACHE BOOL "")
+-  # Disable ARC for glfw and re-enable after it because it's globally set in the root CMakeLists.txt
+-  set(CMAKE_OBJC_FLAGS "")
+-  add_subdirectory(glfw)
+-  set_target_properties(glfw PROPERTIES UNITY_BUILD OFF)
+-  set_target_properties(glfw PROPERTIES XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC NO)
+-  set(CMAKE_OBJC_FLAGS -fobjc-arc)
+-
+-  add_subdirectory(imgui)
+ endif()
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d32429e298..7e82299617 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -226,7 +226,7 @@ find_package(Python3 REQUIRED COMPONENTS Interpreter)
+ add_subdirectory(libs)
+ 
+ if (PLATFORM_DESKTOP)
+-  add_subdirectory(dev_sandbox)
++  #add_subdirectory(dev_sandbox)
+   add_subdirectory(generator)
+   add_subdirectory(tools)
+   if (NOT SKIP_QT_GUI)
+diff --git a/libs/coding/blake3.hpp b/libs/coding/blake3.hpp
+index d56caa1871..cb81705bd1 100644
+--- a/libs/coding/blake3.hpp
++++ b/libs/coding/blake3.hpp
+@@ -1,6 +1,6 @@
+ #pragma once
+ 
+-#include "3party/BLAKE3/c/blake3.h"
++#include <blake3.h>
+ 
+ #include <array>
+ #include <cstddef>
+diff --git a/libs/search/search_quality/CMakeLists.txt b/libs/search/search_quality/CMakeLists.txt
+index 376310e14e..a7b80dec23 100644
+--- a/libs/search/search_quality/CMakeLists.txt
++++ b/libs/search/search_quality/CMakeLists.txt
+@@ -19,12 +19,12 @@ target_link_libraries(${PROJECT_NAME}
+     indexer
+ )
+ 
+-if (NOT SKIP_QT_GUI)
+-  omim_add_tool_subdirectory(assessment_tool)
++if (BUILD_TESTING)
++  if (NOT SKIP_QT_GUI)
++   omim_add_tool_subdirectory(assessment_tool)
++  endif()
++  omim_add_tool_subdirectory(features_collector_tool)
++  omim_add_tool_subdirectory(samples_generation_tool)
++  omim_add_tool_subdirectory(search_quality_tool)
++  omim_add_test_subdirectory(search_quality_tests)
+ endif()
+-
+-omim_add_tool_subdirectory(features_collector_tool)
+-omim_add_tool_subdirectory(samples_generation_tool)
+-omim_add_tool_subdirectory(search_quality_tool)
+-
+-omim_add_test_subdirectory(search_quality_tests)
diff --git a/gui-apps/organicmaps/files/more-3party.patch b/gui-apps/organicmaps/files/more-3party.patch
index 58ccaf7f0ed9..4a987aec04c7 100644
--- a/gui-apps/organicmaps/files/more-3party.patch
+++ b/gui-apps/organicmaps/files/more-3party.patch
@@ -1,46 +1,42 @@
-From b77c26e242945fe06be94059b87c3c2eebdb78eb Mon Sep 17 00:00:00 2001
-From: Gerion Entrup <gerion.entrup@flump.de>
-Date: Fri, 8 Dec 2023 23:45:56 +0100
-Subject: [PATCH] cmake: use some internal libraries without external
- alternative
-
----
- 3party/CMakeLists.txt | 6 +++---
- base/CMakeLists.txt   | 4 +---
- 2 files changed, 4 insertions(+), 6 deletions(-)
-
 diff --git a/3party/CMakeLists.txt b/3party/CMakeLists.txt
-index bd44e1b7b8..4f5cb99807 100644
+index 90f917b215..502f5b6fc5 100644
 --- a/3party/CMakeLists.txt
 +++ b/3party/CMakeLists.txt
-@@ -34,11 +34,11 @@ else()
- 
-   # Add pugixml library.
-   add_subdirectory(pugixml)
--
--  # Add protobuf library.
--  add_subdirectory(protobuf)
+@@ -86,8 +86,11 @@ if (NOT WITH_SYSTEM_PROVIDED_3PARTY)
+   endif()
  endif()
  
-+# Add protobuf library.
-+add_subdirectory(protobuf)
++find_package(PkgConfig REQUIRED)
++pkg_check_modules(BLAKE3 REQUIRED IMPORTED_TARGET GLOBAL libblake3)
++add_library(BLAKE3::blake3 ALIAS PkgConfig::BLAKE3)
 +
  add_subdirectory(agg)
+-add_subdirectory(BLAKE3/c)
  add_subdirectory(bsdiff-courgette)
+ add_subdirectory(glaze)
+ add_subdirectory(minizip)
+diff --git a/libs/search/search_quality/CMakeLists.txt b/libs/search/search_quality/CMakeLists.txt
+index 376310e14e..6daeabd6ed 100644
+--- a/libs/search/search_quality/CMakeLists.txt
++++ b/libs/search/search_quality/CMakeLists.txt
+@@ -19,12 +19,12 @@ target_link_libraries(${PROJECT_NAME}
+     indexer
+ )
  
-diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt
-index 7e762b242a..0d7d6c5d10 100644
---- a/base/CMakeLists.txt
-+++ b/base/CMakeLists.txt
-@@ -111,8 +111,6 @@ set(THREADS_PREFER_PTHREAD_FLAG ON)
- find_package(Threads REQUIRED)
- target_link_libraries(${PROJECT_NAME} INTERFACE Threads::Threads)
- 
--if (NOT WITH_SYSTEM_PROVIDED_3PARTY)
--  target_include_directories(${PROJECT_NAME} PRIVATE "${OMIM_ROOT}/3party/fast_double_parser/include")
--endif()
-+target_include_directories(${PROJECT_NAME} PRIVATE "${OMIM_ROOT}/3party/fast_double_parser/include")
- 
- omim_add_test_subdirectory(base_tests)
--- 
-2.41.0
+-if (NOT SKIP_QT_GUI)
+-  omim_add_tool_subdirectory(assessment_tool)
++if (BUILD_TESTING)
++  if (NOT SKIP_QT_GUI)
++    omim_add_tool_subdirectory(assessment_tool)
++  endif()
++  omim_add_tool_subdirectory(features_collector_tool)
++  omim_add_tool_subdirectory(samples_generation_tool)
++  omim_add_tool_subdirectory(search_quality_tool)
++  omim_add_test_subdirectory(search_quality_tests)
+ endif()
+-
+-omim_add_tool_subdirectory(features_collector_tool)
+-omim_add_tool_subdirectory(samples_generation_tool)
+-omim_add_tool_subdirectory(search_quality_tool)
+-
+-omim_add_test_subdirectory(search_quality_tests)
diff --git a/gui-apps/organicmaps/organicmaps-2026.06.24.16.ebuild b/gui-apps/organicmaps/organicmaps-2026.06.24.16.ebuild
new file mode 100644
index 000000000000..37074369eabb
--- /dev/null
+++ b/gui-apps/organicmaps/organicmaps-2026.06.24.16.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{13..14} )
+inherit python-r1 xdg cmake
+
+JUST_GTFS_COMMIT="7516753825500f90ac2de6f18c256d5abec1ff33"
+FAST_OBJ_COMMIT="d620667f10a548dee94dbc8c144bb22f79162176"
+
+IUSE="test"
+DESCRIPTION="A privacy-first offline maps & GPS app for hiking, cycling, biking, and driving."
+HOMEPAGE="https://organicmaps.app"
+
+SLOT="0"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+MY_PV="${PV%.*}-${PV##*.}-android"
+SRC_URI="
+	https://github.com/${PN}/${PN}/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/mapsme/just_gtfs/archive/${JUST_GTFS_COMMIT}.tar.gz -> ${P}-just_gtfs-${JUST_GTFS_COMMIT}.tar.gz
+	https://github.com/thisistherk/fast_obj/archive/${FAST_OBJ_COMMIT}.tar.gz -> ${P}-fast_obj-${FAST_OBJ_COMMIT}.tar.gz
+"
+
+LICENSE="Apache-2.0"
+# depend on virtual/zlib:=[minizip] when it is not pulled in as subproject anymore
+RDEPEND="
+	dev-libs/blake3
+	dev-cpp/gflags
+	dev-db/sqlite
+	dev-lang/python
+	dev-libs/boost
+	dev-libs/icu
+	dev-libs/jansson
+	dev-libs/utfcpp
+	dev-qt/qtpositioning:6
+	dev-qt/qtsvg:6
+	dev-util/vulkan-headers
+	media-libs/freetype
+	>=dev-cpp/glaze-6.5.1
+	virtual/zlib:=
+	test? ( dev-cpp/gtest )
+	${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+PATCHES=( "${FILESDIR}"/more-3party-2026.06.24-16.patch )
+
+WORLD_FEED_TESTS_S="${WORKDIR}/world_feed_integration_tests_data-${PV}"
+
+src_prepare() {
+	cmake_src_prepare
+	rmdir "${S}/3party/just_gtfs" "${S}/3party/fast_obj" 2>/dev/null
+	cp -r "${WORKDIR}/just_gtfs-${JUST_GTFS_COMMIT}" "${S}/3party/just_gtfs" || die
+	cp -r "${WORKDIR}/fast_obj-${FAST_OBJ_COMMIT}" "${S}/3party/fast_obj" || die
+}
+
+src_configure() {
+	# organicmaps wants a ./configure.sh execution.
+	# However, this setups mainly stuff for Android and XCode builds that we don't need.
+	# We need just this line here
+	#cp private_default.h private.h || die
+
+	CMAKE_BUILD_TYPE="RelWithDebInfo"
+	local mycmakeargs=(
+		-DWITH_SYSTEM_PROVIDED_3PARTY=yes
+		-DBUILD_SHARED_LIBS=off
+		-DTEST_DATA_REPO_URL="${WORLD_FEED_TESTS_S}"
+		-DBUILD_TESTING=$(usex test)
+		-DPLATFORM_DESKTOP=ON
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+
+	einfo "For dark  mode type in search ?dark"
+	einfo "For light mode type in search ?light"
+}
diff --git a/gui-apps/organicmaps/organicmaps-9999.ebuild b/gui-apps/organicmaps/organicmaps-9999.ebuild
index da72f63a71b5..dd805c53d3ea 100644
--- a/gui-apps/organicmaps/organicmaps-9999.ebuild
+++ b/gui-apps/organicmaps/organicmaps-9999.ebuild
@@ -17,8 +17,15 @@ EGIT_SUBMODULES=(
 	3party/just_gtfs
 	3party/protobuf/protobuf # wait for https://github.com/organicmaps/organicmaps/pull/6310
 	3party/fast_obj
+
+	3party/glfw
+	3party/minizip-ng
+	3party/glaze
+	3party/BLAKE3
+	3party/imgui/imgui
 )
 
+IUSE="test"
 DESCRIPTION="Offline maps and navigation using OpenStreetMap data"
 HOMEPAGE="https://organicmaps.app"
 
@@ -29,6 +36,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # depend on virtual/zlib:=[minizip] when it is not pulled in as subproject anymore
 RDEPEND="
+	dev-libs/blake3
 	dev-cpp/gflags
 	dev-db/sqlite
 	dev-lang/python
@@ -41,11 +49,12 @@ RDEPEND="
 	dev-util/vulkan-headers
 	media-libs/freetype
 	virtual/zlib:=
+	test? ( dev-cpp/gtest )
 	${PYTHON_DEPS}
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/more-3party.patch "${FILESDIR}"/no-dynamic-download.patch )
+PATCHES=( "${FILESDIR}"/more-3party.patch )
 
 WORLD_FEED_TESTS_S="${WORKDIR}/world_feed_integration_tests_data-${PV}"
 
@@ -60,13 +69,15 @@ src_configure() {
 	# organicmaps wants a ./configure.sh execution.
 	# However, this setups mainly stuff for Android and XCode builds that we don't need.
 	# We need just this line here
-	cp private_default.h private.h || die
+	#cp private_default.h private.h || die
 
 	CMAKE_BUILD_TYPE="RelWithDebInfo"
 	local mycmakeargs=(
 		-DWITH_SYSTEM_PROVIDED_3PARTY=yes
 		-DBUILD_SHARED_LIBS=off
 		-DTEST_DATA_REPO_URL="${WORLD_FEED_TESTS_S}"
+		-DBUILD_TESTING=$(usex test)
+		-DPLATFORM_DESKTOP=ON
 	)
 	cmake_src_configure
 }
diff --git a/gui-apps/wl-scripts/Manifest b/gui-apps/wl-scripts/Manifest
index 1db01ddbd103..97b4790c1235 100644
--- a/gui-apps/wl-scripts/Manifest
+++ b/gui-apps/wl-scripts/Manifest
@@ -1 +1,2 @@
 DIST wl-scripts-1.2.3.tar.gz 14354 BLAKE2B 815668d4ff0d4b99698d8e487fd9ab794de4663cf084f48a117f81f6bb3080ca7e4d38a711be0dd077c2307a83127fc3d94798a1d62046322b766226d0f1c3f9 SHA512 02067f83ec15cdd8275be305dcd38631172cc1a8a2cba2263fe82d3722732fc980dced277f02bf37087c1b6779ff0f826c7ab477591beaa40a7ef90b5ac6a111
+DIST wl-scripts-1.3.1.tar.gz 14987 BLAKE2B 674c4fbeb5d271c7057203fd41e1ca5d9279aad8c269d95feafa71504ed0f125ee86713361a565868404882f40a15fd543dde67b27a3019f2e23a53e0507d5c8 SHA512 f0e09fdb1f5390dad43cbf11105f4223a81a34faf7296e40c26050b213309a4d459a910afb8a1b8f80b023cf2ae372ffdb2a1bbc03d1f701b5f832ca5d7ff511
diff --git a/gui-apps/wl-scripts/wl-scripts-1.3.1.ebuild b/gui-apps/wl-scripts/wl-scripts-1.3.1.ebuild
new file mode 100644
index 000000000000..ae3e641aad57
--- /dev/null
+++ b/gui-apps/wl-scripts/wl-scripts-1.3.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A set of utils for wlroots window managers"
+HOMEPAGE="https://github.com/mazunki/wl-scripts"
+SRC_URI="https://github.com/mazunki/wl-scripts/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	app-alternatives/awk
+	app-misc/jq
+	>=gui-apps/wofi-1.3
+	gui-apps/slurp
+	gui-libs/wlroots
+"
+
+src_install() {
+	exeinto "/usr/bin/"
+	doexe "${S}"/src/*
+}