diff --git a/app-admin/pulumi-bin/Manifest b/app-admin/pulumi-bin/Manifest
index 0986603cbf..1b5cbc115e 100644
--- a/app-admin/pulumi-bin/Manifest
+++ b/app-admin/pulumi-bin/Manifest
@@ -1,3 +1,3 @@
-DIST pulumi-v3.127.0-linux-x64.tar.gz 161988518 BLAKE2B 413e9476288cb465a0db8863808b12378b7e52dc2a3b7657d3311dc077306d9863b1eb0f213dac71787d71521e043b43a12c4ecab3de0c3a9cedfd05ae9e0656 SHA512 b13843f3d0d8f9d3783827398fac4b095f8955334adcc21b8a996280f2be3610cedb95f8712fe4d8c2c9ceff74082146c8971d72a588abe224588894a5558675
 DIST pulumi-v3.128.0-linux-x64.tar.gz 162055509 BLAKE2B 630660eed429c6268f681aefdb3e16e7f2bf06bc1e491805e8cdbd18f4f4013307100a3709552c920cebb41bb5d9f1c6a037d9a3cd1d944cea33b7b2b7289e5d SHA512 1632ebcb9e7959b6fd144c283d1bea387e228998783696ee06e3a5e0ec2ef4447e1e809119967cea316412086b2036e6b0cd8c4e07f387dfb552f49221a91613
 DIST pulumi-v3.129.0-linux-x64.tar.gz 162054494 BLAKE2B b9d085b5d71da7f9cb36247dbc79deb2e4052365d2faa2c5b7e90b51d29c803489875fbdd718eb7610488a8cbca8674c56dca8bb71f4cc264c8bcbd5d59c1017 SHA512 f5613e7ca2c029954cd96239f1eebb277a872b6f0d5a089838320d26cd2764047f0ab87da45593004932cc5d771706f6387d69855915ede492ea2ef9c3ee7188
+DIST pulumi-v3.130.0-linux-x64.tar.gz 162111404 BLAKE2B 6b4097a685290b5d1d9c3ad8be9f00590f3afb9946d98efd61afaf8b7d3e031bc5d588b07a64440f0e9b767bf950c37c4367ef7967e261159aef49ad3e074135 SHA512 64dfb7a7a7050f03a83e8413702cb166623769e9f5b3479948e545169cfd24940853431cfb2294642f3919f4b1344e0124408d512565bd1c73f57409f2debc58
diff --git a/app-admin/pulumi-bin/pulumi-bin-3.127.0.ebuild b/app-admin/pulumi-bin/pulumi-bin-3.130.0.ebuild
similarity index 100%
rename from app-admin/pulumi-bin/pulumi-bin-3.127.0.ebuild
rename to app-admin/pulumi-bin/pulumi-bin-3.130.0.ebuild
diff --git a/app-misc/xplr/xplr-0.21.3.ebuild b/app-misc/xplr/xplr-0.21.3.ebuild
index 3d74241e2b..d594caf7d9 100644
--- a/app-misc/xplr/xplr-0.21.3.ebuild
+++ b/app-misc/xplr/xplr-0.21.3.ebuild
@@ -248,12 +248,12 @@ src_compile() {
 src_install() {
 	dodoc README.md
 
-	dobin target/$(usex debug debug release)/xplr
-	newicon -s 16 assets/icon/${PN}16.png ${PN}.png
-	newicon -s 32 assets/icon/${PN}32.png ${PN}.png
-	newicon -s 64 assets/icon/${PN}64.png ${PN}.png
-	newicon -s 128 assets/icon/${PN}128.png ${PN}.png
-	doicon -s scalable assets/icon/${PN}.svg
+	dobin "$(cargo_target_dir)/xplr"
+	newicon -s 16 "assets/icon/${PN}16.png" "${PN}.png"
+	newicon -s 32 "assets/icon/${PN}32.png" "${PN}.png"
+	newicon -s 64 "assets/icon/${PN}64.png" "${PN}.png"
+	newicon -s 128 "assets/icon/${PN}128.png" "${PN}.png"
+	doicon -s scalable "assets/icon/${PN}.svg"
 	domenu assets/desktop/xplr.desktop
 }
 
diff --git a/dev-cpp/toml11/Manifest b/dev-cpp/toml11/Manifest
deleted file mode 100644
index 8cb697cfc1..0000000000
--- a/dev-cpp/toml11/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST toml-0.5.0.tar.gz 1609475 BLAKE2B ed9c2fd5f885411c9a607b84a0c484c8ad3d26c16cdf31b5800be74c928b15faaa1cad53c913d5f43c74bce260ed10f74a1b81d72679eca291a9de503414fdda SHA512 5a84a2704ee0bffefcf27ef15a45689ca3d76350842e16c2c847500c4420a22254e78804f3b26005fec17263a4717bd01127a53e56335fe2a3c828cc02e75d37
-DIST toml11-3.8.1.tar.gz 135565 BLAKE2B 96cf39e097e8fc587faab980f993c36f720ca6185938accd4200277380a189fd8604d04f3a24fe06a6cc4708e23e5271d930135d2be9b6fb37b56ad1a845f1c1 SHA512 74a70abe413e21b94284242c281645c49f08b930c62f5479e6698cee45a99b56511d0a8888f1f6f2af3fc245bb0dfd5048a0b810b474ca1066211e25a1ce33bb
-DIST toml11-4.2.0.tar.gz 345359 BLAKE2B 771de7b1af5b3a8f93c114ff4a4ea84b2884c9a0a9a3c304aa3489e4a4aed90d31bca41287a183ee58519455839d7fb4a3075c48d689232991dca67a850f785a SHA512 acb29d37150e5752526cf0a38ae7f207fcfd142d3c78d280e706ad404b2d32f5bae6d44d6ce13cc0bdfd3b0fa4a0a94cf732d70b1fd2a01c3c517fee8a4ef05b
diff --git a/dev-cpp/toml11/files/toml11-3.8.1-werror.patch b/dev-cpp/toml11/files/toml11-3.8.1-werror.patch
deleted file mode 100644
index 0d1e905f64..0000000000
--- a/dev-cpp/toml11/files/toml11-3.8.1-werror.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Unset -Werror from the builds
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -156,9 +156,6 @@ endif()
- if(COMPILER_SUPPORTS_WPEDANTIC)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wpedantic")
- endif()
--if(COMPILER_SUPPORTS_WERROR)
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
- if(COMPILER_SUPPORTS_WSHADOW)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wshadow")
- endif()
diff --git a/dev-cpp/toml11/files/toml11-4.1.0-system-doctest.patch b/dev-cpp/toml11/files/toml11-4.1.0-system-doctest.patch
deleted file mode 100644
index fce2e9876c..0000000000
--- a/dev-cpp/toml11/files/toml11-4.1.0-system-doctest.patch
+++ /dev/null
@@ -1,410 +0,0 @@
-unbundle doctest
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -43,15 +43,16 @@ set(TOML11_TEST_NAMES
- 
- if(BUILD_TESTING)
-     add_library(toml11_test_utility STATIC utility.cpp)
-+    find_package(doctest REQUIRED)
-     target_include_directories(toml11_test_utility
--        PRIVATE ${PROJECT_SOURCE_DIR}/tests/extlib/doctest/doctest/
-+        PRIVATE ${DOCTEST_INCLUDE_DIR}
-         )
-     target_link_libraries(toml11_test_utility PUBLIC toml11)
- 
-     foreach(TEST_NAME ${TOML11_TEST_NAMES})
-         add_executable(${TEST_NAME} ${TEST_NAME}.cpp)
-         target_include_directories(${TEST_NAME}
--            PRIVATE ${PROJECT_SOURCE_DIR}/tests/extlib/doctest/doctest/
-+            PRIVATE ${DOCTEST_INCLUDE_DIR}
-             )
-         target_link_libraries(${TEST_NAME} PUBLIC toml11 toml11_test_utility)
-         if(MSVC)
---- a/tests/test_comments.cpp
-+++ b/tests/test_comments.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include <toml.hpp>
- 
---- a/tests/test_datetime.cpp
-+++ b/tests/test_datetime.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include <toml11/datetime.hpp>
- 
---- a/tests/test_error_message.cpp
-+++ b/tests/test_error_message.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include <toml.hpp>
- 
---- a/tests/test_find.cpp
-+++ b/tests/test_find.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include "utility.hpp"
- 
---- a/tests/test_find_or.cpp
-+++ b/tests/test_find_or.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include "utility.hpp"
- 
---- a/tests/test_format_floating.cpp
-+++ b/tests/test_format_floating.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include <toml11/parser.hpp>
- #include <toml11/serializer.hpp>
---- a/tests/test_format_integer.cpp
-+++ b/tests/test_format_integer.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include <toml11/parser.hpp>
- #include <toml11/serializer.hpp>
---- a/tests/test_format_table.cpp
-+++ b/tests/test_format_table.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include <toml11/parser.hpp>
- #include <toml11/serializer.hpp>
---- a/tests/test_get.cpp
-+++ b/tests/test_get.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include "utility.hpp"
- 
---- a/tests/test_get_or.cpp
-+++ b/tests/test_get_or.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include "utility.hpp"
- 
---- a/tests/test_literal.cpp
-+++ b/tests/test_literal.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include <iostream>
- 
---- a/tests/test_location.cpp
-+++ b/tests/test_location.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include <toml11/location.hpp>
- 
---- a/tests/test_parse_array.cpp
-+++ b/tests/test_parse_array.cpp
-@@ -5,7 +5,7 @@
- #include <toml11/parser.hpp>
- #include <toml11/types.hpp>
- 
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- TEST_CASE("testing an array")
- {
---- a/tests/test_parse_boolean.cpp
-+++ b/tests/test_parse_boolean.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include "utility.hpp"
- 
---- a/tests/test_parse_datetime.cpp
-+++ b/tests/test_parse_datetime.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include "utility.hpp"
- 
---- a/tests/test_parse_floating.cpp
-+++ b/tests/test_parse_floating.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include "utility.hpp"
- 
---- a/tests/test_parse_inline_table.cpp
-+++ b/tests/test_parse_inline_table.cpp
-@@ -5,7 +5,7 @@
- #include <toml11/parser.hpp>
- #include <toml11/types.hpp>
- 
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- TEST_CASE("testing an inline table v1.0")
- {
---- a/tests/test_parse_integer.cpp
-+++ b/tests/test_parse_integer.cpp
-@@ -1,6 +1,6 @@
- 
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include "utility.hpp"
- 
---- a/tests/test_parse_null.cpp
-+++ b/tests/test_parse_null.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include "utility.hpp"
- 
---- a/tests/test_parse_string.cpp
-+++ b/tests/test_parse_string.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include "utility.hpp"
- #include <iostream>
---- a/tests/test_parse_table.cpp
-+++ b/tests/test_parse_table.cpp
-@@ -5,7 +5,7 @@
- #include <toml11/parser.hpp>
- #include <toml11/types.hpp>
- 
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- TEST_CASE("testing a table")
- {
---- a/tests/test_parse_table_keys.cpp
-+++ b/tests/test_parse_table_keys.cpp
-@@ -5,7 +5,7 @@
- #include <toml11/parser.hpp>
- #include <toml11/types.hpp>
- 
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- TEST_CASE("testing table keys")
- {
---- a/tests/test_result.cpp
-+++ b/tests/test_result.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include <toml11/result.hpp>
- 
---- a/tests/test_scanner.cpp
-+++ b/tests/test_scanner.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include "utility.hpp"
- 
---- a/tests/test_serialize.cpp
-+++ b/tests/test_serialize.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include <toml.hpp>
- 
---- a/tests/test_spec.cpp
-+++ b/tests/test_spec.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include <toml11/spec.hpp>
- 
---- a/tests/test_storage.cpp
-+++ b/tests/test_storage.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include <toml11/storage.hpp>
- 
---- a/tests/test_syntax_boolean.cpp
-+++ b/tests/test_syntax_boolean.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include "utility.hpp"
- 
---- a/tests/test_syntax_comment.cpp
-+++ b/tests/test_syntax_comment.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include "utility.hpp"
- 
---- a/tests/test_syntax_datetime.cpp
-+++ b/tests/test_syntax_datetime.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include "utility.hpp"
- 
---- a/tests/test_syntax_floating.cpp
-+++ b/tests/test_syntax_floating.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include "utility.hpp"
- 
---- a/tests/test_syntax_integer.cpp
-+++ b/tests/test_syntax_integer.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include "utility.hpp"
- 
---- a/tests/test_syntax_key.cpp
-+++ b/tests/test_syntax_key.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include "utility.hpp"
- 
---- a/tests/test_syntax_string.cpp
-+++ b/tests/test_syntax_string.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include "utility.hpp"
- 
---- a/tests/test_traits.cpp
-+++ b/tests/test_traits.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include <toml11/types.hpp>
- 
---- a/tests/test_types.cpp
-+++ b/tests/test_types.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include <toml11/types.hpp>
- 
---- a/tests/test_user_defined_conversion.cpp
-+++ b/tests/test_user_defined_conversion.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include <toml.hpp>
- #include "utility.hpp"
---- a/tests/test_utility.cpp
-+++ b/tests/test_utility.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include <toml11/utility.hpp>
- 
---- a/tests/test_value.cpp
-+++ b/tests/test_value.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include "utility.hpp"
- 
---- a/tests/test_visit.cpp
-+++ b/tests/test_visit.cpp
-@@ -1,5 +1,5 @@
- #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include <toml11/comments.hpp>
- #include <toml11/types.hpp>
---- a/tests/utility.cpp
-+++ b/tests/utility.cpp
-@@ -1,4 +1,4 @@
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include "utility.hpp"
- 
---- a/tests/utility.hpp
-+++ b/tests/utility.hpp
-@@ -9,7 +9,7 @@
- #include <toml11/serializer.hpp>
- #include <toml11/value.hpp>
- 
--#include "doctest.h"
-+#include <doctest/doctest.h>
- 
- #include <ostream>
- #include <string>
diff --git a/dev-cpp/toml11/files/toml11-4.1.0-werror.patch b/dev-cpp/toml11/files/toml11-4.1.0-werror.patch
deleted file mode 100644
index df06c2acb4..0000000000
--- a/dev-cpp/toml11/files/toml11-4.1.0-werror.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-unset Werror
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -44,7 +44,6 @@ include(CheckCXXCompilerFlag)
- check_cxx_compiler_flag("-Wall"                 TOML11_COMPILER_SUPPORTS_WALL)
- check_cxx_compiler_flag("-Wextra"               TOML11_COMPILER_SUPPORTS_WEXTRA)
- check_cxx_compiler_flag("-Wpedantic"            TOML11_COMPILER_SUPPORTS_WPEDANTIC)
--check_cxx_compiler_flag("-Werror"               TOML11_COMPILER_SUPPORTS_WERROR)
- check_cxx_compiler_flag("-Wsign-conversion"     TOML11_COMPILER_SUPPORTS_WSIGN_CONVERSION)
- check_cxx_compiler_flag("-Wconversion"          TOML11_COMPILER_SUPPORTS_WCONVERSION)
- check_cxx_compiler_flag("-Wduplicated-cond"     TOML11_COMPILER_SUPPORTS_WDUPLICATED_COND)
diff --git a/dev-cpp/toml11/toml11-3.8.1.ebuild b/dev-cpp/toml11/toml11-3.8.1.ebuild
deleted file mode 100644
index 728c5aea13..0000000000
--- a/dev-cpp/toml11/toml11-3.8.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-SPEC_V=0.5.0
-
-DESCRIPTION="TOML for Modern C++"
-HOMEPAGE="https://github.com/ToruNiina/toml11"
-SRC_URI="
-	https://github.com/ToruNiina/toml11/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/toml-lang/toml/archive/refs/tags/v0.5.0.tar.gz -> toml-${SPEC_V}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-libs/boost )"
-
-PATCHES=( "${FILESDIR}/${P}-werror.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_CXX_STANDARD=11
-		-DTOML11_LANGSPEC_SOURCE_DIR="${WORKDIR}/toml-${SPEC_V}"
-		-Dtoml11_BUILD_TEST=$(usex test)
-	)
-	cmake_src_configure
-}
diff --git a/dev-cpp/toml11/toml11-4.2.0.ebuild b/dev-cpp/toml11/toml11-4.2.0.ebuild
deleted file mode 100644
index 09fbf2898e..0000000000
--- a/dev-cpp/toml11/toml11-4.2.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="TOML for Modern C++"
-HOMEPAGE="https://github.com/ToruNiina/toml11"
-SRC_URI="https://github.com/ToruNiina/toml11/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-cpp/doctest )"
-
-PATCHES=(
-	# unbundle doctest
-	"${FILESDIR}/${PN}-4.1.0-system-doctest.patch"
-	# unset Werror
-	"${FILESDIR}/${PN}-4.1.0-werror.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DTOML11_BUILD_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
diff --git a/dev-perl/File-Util/File-Util-4.131591.ebuild b/dev-perl/File-Util/File-Util-4.131591.ebuild
new file mode 100644
index 0000000000..0fa87db6e3
--- /dev/null
+++ b/dev-perl/File-Util/File-Util-4.131591.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=TOMMY
+DIST_EXAMPLES=( examples/load_a_file_into_a_variable.pl )
+inherit perl-module
+
+DESCRIPTION="Easy, versatile, portable file handling"
+
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	dev-perl/Module-Build
+	dev-perl/Unicode-UTF8
+	dev-perl/Test-NoWarnings
+"
+
+RDEPEND="
+	virtual/perl-Exporter
+"
diff --git a/dev-perl/File-Util/Manifest b/dev-perl/File-Util/Manifest
new file mode 100644
index 0000000000..f442a05e12
--- /dev/null
+++ b/dev-perl/File-Util/Manifest
@@ -0,0 +1 @@
+DIST File-Util-4.131591.tar.gz 126352 BLAKE2B 0d512ae5c8473b9f002417ea900219ae8f773c7cc83f42eeb8cf75f998a40801eb5aa94db82fe0dab088e21946cf44effec0c14ad6fe97112722cda88be7c0ba SHA512 61953b4bb375194ad5189169697616c24bf82afb20dd57ef0eb540cfec4eddd32dd522e77bcb47eb9c4117113a61127303f615f6722ac33fccdcbe7a2c44f21c
diff --git a/dev-perl/File-Util/metadata.xml b/dev-perl/File-Util/metadata.xml
new file mode 100644
index 0000000000..764d349460
--- /dev/null
+++ b/dev-perl/File-Util/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>zdanevich.vitaly@ya.ru</email>
+		<name>Vitaly Zdanevich</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">tommybutler/file-util</remote-id>
+		<remote-id type="cpan-module">File::Util</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/gui-apps/nwg-panel/Manifest b/gui-apps/nwg-panel/Manifest
index d21e744b7e..e0a68ffcb5 100644
--- a/gui-apps/nwg-panel/Manifest
+++ b/gui-apps/nwg-panel/Manifest
@@ -2,3 +2,4 @@ DIST nwg-panel-0.9.32.tar.gz 231248 BLAKE2B d7964b47a4edc8e625f5033524519b9476c9
 DIST nwg-panel-0.9.33.tar.gz 236374 BLAKE2B 43debadb835752cded87164ca81095dfa36f66bbdcd3ce8b33f9112d6423557a50a46995ffcfe6cbb4de60904c7a66f2ba3402987b4f0ab40f6318e5aa3428ce SHA512 5f9be9f85bd62987a79afc69827a8937e50cfa373288d866aaeaa00e041ab89adf234badca88a97bc268b2f6dcf6aab67c13b5aaa159226ed615bb92c9f7e005
 DIST nwg-panel-0.9.34.tar.gz 236364 BLAKE2B e922885708b974ed8318bf51f3aac29089eacad05127514a267c05c87212e03727aac5ec57952a0831492510dee572a49d998662581db08220e394c7803e23a8 SHA512 b34bdfda19b47e61abf57df44ac4ec71ea897e35a7e957ff42ffb761854db2b770216641936f6859bc801c3f2ee37f9e9f0a959bff2d42559b450c51ab39cdb6
 DIST nwg-panel-0.9.37.tar.gz 236621 BLAKE2B 1b06cd8e123afdd68c3a1d802b6c2816ba3ced0f76ebd0a425af14dd758c27f2d461a642fd42be6c3afd28267d47d91c79f97b1dbe6e6365cd4f0836152e05c2 SHA512 02383ea626a3cf0b843e6ff6d2bbeb62b7b2d1cd3526811dde9ad33effb6a5e8890aab95f0286a961acfa1ea150624fe5a45c9fa9ab0dcb47cf54864ab082280
+DIST nwg-panel-0.9.38.tar.gz 237533 BLAKE2B 5f104e46d9861f92ef1f5dfb99467710f794fc86d553db4ca1a7c30b562b903b346345f08f3b11711e071b95dd6c409023b293802731608277ab6d473371e92d SHA512 55d13c9eed2f9ae8044e2c5c804ac5e77473504f9ac1d2db9810acb9054bad270028b0e101c25aadb921b85e6cfb07a8f0fe42eb4633554703e677c4e7bd993f
diff --git a/gui-apps/nwg-panel/nwg-panel-0.9.38.ebuild b/gui-apps/nwg-panel/nwg-panel-0.9.38.ebuild
new file mode 100644
index 0000000000..7161950788
--- /dev/null
+++ b/gui-apps/nwg-panel/nwg-panel-0.9.38.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..12} )
+DISTUTILS_USE_PEP517=setuptools
+inherit desktop distutils-r1 systemd xdg-utils
+
+if [[ "${PV}" == 9999 ]]
+then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/nwg-piotr/nwg-panel.git"
+else
+	SRC_URI="https://github.com/nwg-piotr/nwg-panel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="GTK3-based panel for sway and Hyprland Wayland compositors"
+HOMEPAGE="https://github.com/nwg-piotr/nwg-panel"
+LICENSE="MIT"
+
+SLOT="0"
+
+RDEPEND="
+	x11-libs/gtk+:3
+	dev-python/pygobject[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/i3ipc[${PYTHON_USEDEP}]
+	dev-python/dasbus[${PYTHON_USEDEP}]
+	gui-apps/nwg-icon-picker
+	media-sound/playerctl
+	gui-libs/gtk-layer-shell
+"
+DEPEND="${RDEPEND}"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	domenu nwg-panel-config.desktop
+	domenu nwg-processes.desktop
+	doicon nwg-panel.svg
+	doicon nwg-processes.svg
+	doicon nwg-shell.svg
+	systemd_dounit nwg-panel.service
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/swayimg/Manifest b/media-gfx/swayimg/Manifest
index 1f427d4d7d..bdaef1448c 100644
--- a/media-gfx/swayimg/Manifest
+++ b/media-gfx/swayimg/Manifest
@@ -1 +1 @@
-DIST swayimg-2.2.tar.gz 313340 BLAKE2B 51c7bb01df02469a9b089cf9b83bcade78247e0c8d60031ce5a540a184f87b00fd7cce2732d0d99f256f1023a6d3ed4a79eb2e5dcc6f9e1097ee209048616491 SHA512 d7923c8bcb09c4a271dec41374df02e936d847f268d5e8e7dc9e50ebb639fc52592bc5a602e8df702bd536320c90e3277c699ebfa63d33327706c4350466e681
+DIST swayimg-3.2.tar.gz 665154 BLAKE2B 6ece41b6f57190babb7236acdfc74b4855bc67b8e32916af8c8c34e482ba427d77a6fb242995457ef44bf7757cb381252a480cb0ef24dfc8916558448e17454e SHA512 9355e4b66e602b9cd6aabce834bdfd138952e8605fb60b7a78aef39fa1a6bf2ae83a04d745e7f8e133b3f94cdcd7361cf6faff55865ed8d243f62ba7e683b893
diff --git a/media-gfx/swayimg/swayimg-2.2.ebuild b/media-gfx/swayimg/swayimg-3.2.ebuild
similarity index 93%
rename from media-gfx/swayimg/swayimg-2.2.ebuild
rename to media-gfx/swayimg/swayimg-3.2.ebuild
index 1d064fdff9..cbd1ce7647 100644
--- a/media-gfx/swayimg/swayimg-2.2.ebuild
+++ b/media-gfx/swayimg/swayimg-3.2.ebuild
@@ -1,3 +1,4 @@
+
 # Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
@@ -7,7 +8,7 @@ inherit meson xdg
 
 DESCRIPTION="A lightweight image viewer for Wayland display servers"
 HOMEPAGE="https://github.com/artemsen/swayimg"
-SRC_URI="https://github.com/artemsen/swayimg/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/artemsen/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/net-im/matterhorn-bin/Manifest b/net-im/matterhorn-bin/Manifest
index e2db46ad3c..00984ff673 100644
--- a/net-im/matterhorn-bin/Manifest
+++ b/net-im/matterhorn-bin/Manifest
@@ -1,3 +1,2 @@
-DIST matterhorn-bin-50200.13.0.tar.bz2 8840191 BLAKE2B 4b321f035cba7bfeb9a29803c3620ed406610b28d9356ed6070760764d237a755e23e39bde4d53cb6c5909dde6e9592fe4ec46b08d17565f95e07a7749caccfb SHA512 34536c0219fbbbe77a608793fa1e735b4e1ad8679f118cd0389c282e932359d07a439cb62d30b167134956de589be26b16fddb56ee39be2b88dcc9c0a38990dd
-DIST matterhorn-bin-50200.19.0.tar.bz2 9794365 BLAKE2B 21a71a2d38f4f92824341cbdae174687eb3554cc6b6e837625150a723fc797f5a7c1f9f67538ce08db83daa496356b4dfc7fd7cd1a86bf914396b9b20bc414db SHA512 461f4edb7e98f0518b580c09665eafdc6f2a734fa5c5b2b615f6140b84ae2e7939fbec2ce7935b6dc21fb350b1c11c368d9e9b5944ef09d08324dbe0b7e4f406
 DIST matterhorn-bin-90000.0.0.tar.bz2 10042565 BLAKE2B d523aa9a87a741ce60be4b0b85bd276981182237112c26f26ff94e9d728fe7db9d09005803e8dcfd5231fae40c21f39bd68e303704c4afa6b3e06a3cebf54da6 SHA512 e4e73eeea5d2441a8e04e2b4394ecc2924a44478482a2db49c3c3cbd3983c45620f9e0b22f42e99d9febdf979c223f5a29c407afad0313cf3b55133d139b382e
+DIST matterhorn-bin-90000.0.1.tar.bz2 10380853 BLAKE2B c8296851b4b7e6a7efb28ee9d1c569e85ac2aee5e8ad9a6bdc65c9e46a6425c31ea4f7cf1a703431429d2b7bdb8e39056f3a1ad7b2ad7d9e78bcbe8517e428c9 SHA512 0719fec269922fab3d0535409c751ec39c6ad1ee983481ffd00482e987818ee4b48b8961f9bb52ec4b55fa9871f4f1ba96d8764df3807f20716046b61b65b68d
diff --git a/net-im/matterhorn-bin/matterhorn-bin-50200.13.0.ebuild b/net-im/matterhorn-bin/matterhorn-bin-50200.13.0.ebuild
deleted file mode 100644
index dbdbfd8702..0000000000
--- a/net-im/matterhorn-bin/matterhorn-bin-50200.13.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN="${PN%-bin}"
-MY_P="${MY_PN}-${PV}-fedora-29-x86_64"
-
-DESCRIPTION="Terminal based Mattermost client"
-HOMEPAGE="https://github.com/matterhorn-chat/matterhorn"
-SRC_URI="https://github.com/matterhorn-chat/${MY_PN}/releases/download/${PV}/${MY_P}.tar.bz2 -> ${P}.tar.bz2"
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-
-RDEPEND="
-	${DEPEND}
-	dev-libs/gmp:0
-	sys-libs/ncurses:0/6
-	sys-libs/zlib:0/1
-"
-
-QA_PREBUILT="*"
-
-src_install() {
-	default
-
-	dobin matterhorn
-
-	dodoc docs/commands.md
-	dodoc docs/keybindings.md
-
-	insinto /usr/share/${MY_PN}
-	exeinto /usr/share/${MY_PN}/notification-scripts
-	doins -r emoji
-	doins -r syntax
-	doexe notification-scripts/notify
-}
diff --git a/net-im/matterhorn-bin/matterhorn-bin-50200.19.0.ebuild b/net-im/matterhorn-bin/matterhorn-bin-90000.0.1.ebuild
similarity index 94%
rename from net-im/matterhorn-bin/matterhorn-bin-50200.19.0.ebuild
rename to net-im/matterhorn-bin/matterhorn-bin-90000.0.1.ebuild
index 548ad7db08..178617c2eb 100644
--- a/net-im/matterhorn-bin/matterhorn-bin-50200.19.0.ebuild
+++ b/net-im/matterhorn-bin/matterhorn-bin-90000.0.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 MY_PN="${PN%-bin}"
-MY_P="${MY_PN}-${PV}-fedora-29-x86_64"
+MY_P="${MY_PN}-${PV}-ubuntu-22.04-jammy-x86_64"
 
 DESCRIPTION="Terminal based Mattermost client"
 HOMEPAGE="https://github.com/matterhorn-chat/matterhorn"
diff --git a/net-misc/mbpoll/Manifest b/net-misc/mbpoll/Manifest
new file mode 100644
index 0000000000..6a3a77f9c3
--- /dev/null
+++ b/net-misc/mbpoll/Manifest
@@ -0,0 +1 @@
+DIST mbpoll-1.5.2.tar.gz 100948 BLAKE2B 043337e7d1aef9f5b274c2da272ce35e175bf9486e3969888c790c11c5c24485b76dd92a60e93ee3aa1b0d2b208d254ff9d36b5706fa8f27a5e810cfaeed9fc2 SHA512 738b1b57002c0920ca574954d02609998d96d8a492a5a2b7178ff95a40442f957fabec88f116d883c5deb7a54bfc414a56583734a5314da4305db819da53b081
diff --git a/net-misc/mbpoll/mbpoll-1.5.2.ebuild b/net-misc/mbpoll/mbpoll-1.5.2.ebuild
new file mode 100644
index 0000000000..30d654f8af
--- /dev/null
+++ b/net-misc/mbpoll/mbpoll-1.5.2.ebuild
@@ -0,0 +1,17 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="command line utility to communicate with ModBus slave (RTU or TCP) "
+HOMEPAGE="https://github.com/epsilonrt/mbpoll"
+SRC_URI="https://github.com/epsilonrt/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="dev-libs/libmodbus"
+RDEPEND="${DEPEND}"
diff --git a/net-misc/mbpoll/mbpoll-9999.ebuild b/net-misc/mbpoll/mbpoll-9999.ebuild
new file mode 100644
index 0000000000..85fefda9fd
--- /dev/null
+++ b/net-misc/mbpoll/mbpoll-9999.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit git-r3 cmake
+
+DESCRIPTION="command line utility to communicate with ModBus slave (RTU or TCP) "
+HOMEPAGE="https://github.com/epsilonrt/mbpoll"
+EGIT_REPO_URI="https://github.com/epsilonrt/${PN}"
+
+LICENSE="GPL-3"
+SLOT="0"
+
+DEPEND="dev-libs/libmodbus"
+RDEPEND="${DEPEND}"
diff --git a/dev-cpp/toml11/metadata.xml b/net-misc/mbpoll/metadata.xml
similarity index 62%
rename from dev-cpp/toml11/metadata.xml
rename to net-misc/mbpoll/metadata.xml
index ad1b5bb30b..38c0e395f4 100644
--- a/dev-cpp/toml11/metadata.xml
+++ b/net-misc/mbpoll/metadata.xml
@@ -2,10 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>pastalian46@gmail.com</email>
-		<name>Takuya Wakazono</name>
+		<email>dev@pyl.onl</email>
+		<name>Zen</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">ToruNiina/toml11</remote-id>
+		<remote-id type="github">epsilonrt/mbpoll</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/profiles/package.mask b/profiles/package.mask
index 7a7d3039a4..275dc51d4c 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -18,6 +18,15 @@
 
 # New entries go on top.
 
+# Takuya Wakazono <pastalian46@gmail.com> (2024-08-27)
+# Does not build anymore. Unmaintained in guru since 2021.
+# Removal on 2024-09-27. Bugs #807112, #839606
+app-misc/apidb
+dev-libs/octetos-db
+dev-libs/octetos-db-abstract
+dev-libs/octetos-db-maria
+dev-libs/octetos-db-postgresql
+
 # Takuya Wakazono <pastalian46@gmail.com> (2024-08-19)
 # Maintainer has no intention of keeping those anymore. No revdeps left.
 # Removal on 2024-09-19. Bugs #848459, #900000, #930786, #932330, #932331, #932334.
diff --git a/sys-apps/dnf5/Manifest b/sys-apps/dnf5/Manifest
index 626508bd35..df918dcba4 100644
--- a/sys-apps/dnf5/Manifest
+++ b/sys-apps/dnf5/Manifest
@@ -1 +1,5 @@
+DIST dnf5-5.2.5.0-toml11-1.patch 19355 BLAKE2B 6de22ffcee99ab9eff5926b3d255af0f5be59524b4804048be900905a4750a740736454f56b0162af1f43a536495f1e1f644642c7902593c114ee4bbea859eb5 SHA512 f94103259e6b47ed41b97090a47c7a9978c82711c34c984285cbf704344147947c62f6f506c70bdfe9f678feda564da88fbbc8da2dfdb08a3e7abbf2fdce4bbf
+DIST dnf5-5.2.5.0-toml11-2.patch 1245 BLAKE2B 8396ff3028462f91ea97174d43d511ebfe6b13fda0c8f419f590961a4207e62a2b0301ad8bab8d1a02050fd8124561ba1f29c880d04833ff96283d8d5c7b61a9 SHA512 2a56125d84024236d789797f6ede473f29367b4ca0a6fa64c2fa6f93909dbda7bae7fe8de34ab791bed148995cb44a99c6f8cd767186b086b0d15fb29d19d28a
+DIST dnf5-5.2.5.0-toml11-3.patch 4223 BLAKE2B 2b1afd2188e7ca4a72208227d3f081041eef651299ea7242dff9273a23df7e0592777c3007af3ba3c581dc6737150d28212b94370d40d16567bfefa33bf5df96 SHA512 8f9abf420845c0240da4c2d776c933722af3858bfe638206390c62dbf3748ad5d4c6bf8482b864e2b43c74ba3b49bab5b2ac15d90a8d815a6e7f42069bd09ec4
+DIST dnf5-5.2.5.0-toml11-4.patch 11747 BLAKE2B 83a6cd0f54bcb471b0009e204d10d2eeafc9bf1ad7af1e0a07c0294cb76ebcd728ce43403be8ae5428313adcfd0839886681273f75caefe915496f5e166d7468 SHA512 eb67693605cf6d401393fb11e5d8508f374bc92d10815a881890cbf73c70e057d3d0cfa9e48f888edbde07f24f7741f50162a60c7adbb6e94e84876be6061215
 DIST dnf5-5.2.5.0.tar.gz 1303914 BLAKE2B c9fd30aaa74e7e063b1ffbce645a839ba1b82aad92bae70299254a6a62e087246d006af58205f46720f57c1f1eb193eaabe323b6b8d67b31b4ce763b98e573f5 SHA512 9339bdb39a2b55006941909bd9c5e2ebba01258a15952952c346d88bb270cf51b2db91d1938b2bb8ace3c20c58dab3ec11b25454394d270de76580ea6ee49980
diff --git a/sys-apps/dnf5/dnf5-5.2.5.0-r1.ebuild b/sys-apps/dnf5/dnf5-5.2.5.0-r2.ebuild
similarity index 66%
rename from sys-apps/dnf5/dnf5-5.2.5.0-r1.ebuild
rename to sys-apps/dnf5/dnf5-5.2.5.0-r2.ebuild
index ce9db4292b..9d1230127f 100644
--- a/sys-apps/dnf5/dnf5-5.2.5.0-r1.ebuild
+++ b/sys-apps/dnf5/dnf5-5.2.5.0-r2.ebuild
@@ -7,7 +7,17 @@ inherit cmake
 
 DESCRIPTION="Command-line package manager"
 HOMEPAGE="https://github.com/rpm-software-management/dnf5"
-SRC_URI="https://github.com/rpm-software-management/dnf5/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="
+	https://github.com/rpm-software-management/dnf5/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/rpm-software-management/dnf5/commit/f2f730229d10431272ee8991b600a17607c40f36.patch
+		-> ${P}-toml11-1.patch
+	https://github.com/rpm-software-management/dnf5/commit/87b11dc2fd152bc662bc97ff2340a6e4d10b0dc8.patch
+		-> ${P}-toml11-2.patch
+	https://github.com/rpm-software-management/dnf5/commit/7b2a6e58b103e1100bcff06e097bb94b34bde22e.patch
+		-> ${P}-toml11-3.patch
+	https://github.com/rpm-software-management/dnf5/commit/1746eabb865bc3882956128adef5f228323855a0.patch
+		-> ${P}-toml11-4.patch
+"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
@@ -19,7 +29,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	>=app-arch/rpm-4.17.0
 	dev-cpp/sdbus-c++:=
-	<dev-cpp/toml11-4.0.0
+	dev-cpp/toml11
 	>=dev-db/sqlite-3.35.0:3
 	>=dev-libs/glib-2.46.0:2
 	dev-libs/json-c:=
@@ -48,6 +58,11 @@ PATCHES=(
 	"${FILESDIR}/${P}-remove-empty-dir.patch"
 	# Prevent test suite from writing to system files.
 	"${FILESDIR}/${P}-sandbox-test.patch"
+	# toml11-4 support
+	"${DISTDIR}/${P}-toml11-1.patch"
+	"${DISTDIR}/${P}-toml11-2.patch"
+	"${DISTDIR}/${P}-toml11-3.patch"
+	"${DISTDIR}/${P}-toml11-4.patch"
 )
 
 src_prepare() {
diff --git a/sys-power/system76-power/metadata.xml b/sys-power/system76-power/metadata.xml
new file mode 100644
index 0000000000..e33b70a428
--- /dev/null
+++ b/sys-power/system76-power/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>saigon-tech@tuta.io</email>
+		<name>Michal Vu</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">pop-os/system76-power</remote-id>
+	</upstream>
+	<longdescription lang="en">
+        Power manager developed by System76 for systemd Linux distributions. This power manager allows for switching
+        between battery, balanced and performance mode and handles power consumption on dual-GPU laptops.
+	</longdescription>
+</pkgmetadata>
diff --git a/sys-power/system76-power/system76-power-9999.ebuild b/sys-power/system76-power/system76-power-9999.ebuild
new file mode 100644
index 0000000000..60054d3eeb
--- /dev/null
+++ b/sys-power/system76-power/system76-power-9999.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cargo git-r3
+
+DESCRIPTION="System76 Power Management Tool for systemd"
+HOMEPAGE="https://github.com/pop-os/system76-power"
+EGIT_REPO_URI="https://github.com/pop-os/system76-power"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+
+DEPEND="sys-apps/systemd"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/rust"
+
+src_unpack(){
+	git-r3_src_unpack
+	cargo_live_src_unpack
+}
+
+src_install(){
+	default
+	elog "Enable the service: 'systemctl enable --now com.system76.PowerDaemon.service'"
+}