Merge updates from master

2026-07-18 11:33:15 -04:00 · 2024-01-09 12:18:02 +00:00
parent 80780ecdc4 bf5dd7c748
commit 518aac1902
57 changed files with 1072 additions and 867 deletions
--- a/app-editors/imhex/Manifest
+++ b/app-editors/imhex/Manifest
@@ -1,2 +1,2 @@
-DIST imhex-1.31.0.tar.gz 25062606 BLAKE2B 9db337f5aa54ccefd925175f8b4869ece873a7c466d6ddded88c26d6f4fd7ba73a7789964ad2ae6a902d2ec653980ef2482434ddcbbbc224aaac8906b16e92c5 SHA512 483a89e84746ba74eb968f84140ae52edb7046d1074160a97eb6ebad6eac0284beccaf39004141cbe1eebcd8ca92d1fd486c45790880503bbcc40c7bdd586cb8
-DIST imhex-patterns-1.31.0.tar.gz 4448476 BLAKE2B 0bace799f0d2280ccd11a1fcafa9d22620a74691f6b5622d3ad0e260143792c8239158ba021de8e775d5d8589f6dfee990d25beab4288c053d9a5b138b8cc252 SHA512 aaeb2028bbc8235fb49ba75bdca71acf725da0035395c86df97c3976bb70f33ad34f9ce3089d72141de6767cc511c575cc3ac85b66ee4eeba8caa252fc874dba
+DIST imhex-1.32.2.tar.gz 26875075 BLAKE2B 75d595e5acb05429b114f4d4c61981080797f7b88d41a219c93f6512c4b204dd164a8886c00af4ee539cb7d6f7baaa49084b349806357fb872a1ebb30e82cfba SHA512 72e3fda050220fa9098f4ad9ed1777db565c81549daf09a5d113e35036d26780ab50c5a45ddf97ec6daa22e832a0d0b916097082706bd7314d56c2f97abcbb11
+DIST imhex-patterns-1.32.2.tar.gz 4556923 BLAKE2B b171669c17c0a7aef0ba65b66c2f68f7581a8e11d61365363fd28cfedfa2658c8833181d5e8a4c789ff011c5afadafec8149b43852319cae161c9bb5c26be2ec SHA512 3f6d1c874e1d6bc4e2e035361c5c7c1da4374cfcaeb6123f187302cacf91ce781db3f4fbe74e259e1bdb18418987fe48067365dcc3324190fbadcaf0b5ab9333
--- a/app-editors/imhex/files/remove-Werror.patch
+++ b/app-editors/imhex/files/remove-Werror.patch
@@ -1,44 +0,0 @@
-From 94126d5ff7e5a6d6cdd7f515097383619725953b Mon Sep 17 00:00:00 2001
-From: Leoriem-code <henrigasc@duck.com>
-Subject: [PATCH] remove -Werror
-
-diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake
-index da078878..3848fbeb 100644
--- a/cmake/build_helpers.cmake
-+++ b/cmake/build_helpers.cmake
-@@ -435,7 +435,7 @@ endfunction()
- macro(setupCompilerFlags target)
-     if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
-         if (IMHEX_STRICT_WARNINGS)
-            set(IMHEX_COMMON_FLAGS "-Wall -Wextra -Wpedantic -Werror")
-+            set(IMHEX_COMMON_FLAGS "-Wall -Wextra -Wpedantic")
-         endif()
- 
-         set(IMHEX_C_FLAGS "${IMHEX_COMMON_FLAGS} -Wno-array-bounds")
-
-diff --git a/lib/external/pattern_language/cli/CMakeLists.txt b/lib/external/pattern_language/cli/CMakeLists.txt
-index 39e6f90..01b5e87 100644
--- a/lib/external/pattern_language/cli/CMakeLists.txt
-+++ b/lib/external/pattern_language/cli/CMakeLists.txt
-@@ -28,7 +28,7 @@ if(NOT CLI11_FOUND)
-     set(CLI11_LIBRARIES CLI11::CLI11)
- endif()
- 
-target_compile_options(plcli PRIVATE -Wall -Wextra -Werror -Wno-unknown-pragmas -Wno-array-bounds)
-+target_compile_options(plcli PRIVATE -Wall -Wextra -Wno-unknown-pragmas -Wno-array-bounds)
- target_include_directories(plcli PUBLIC include)
- target_link_libraries(plcli PUBLIC ${CLI11_LIBRARIES} libpl libpl-gen fmt::fmt-header-only)
- 
-diff --git a/lib/external/pattern_language/lib/CMakeLists.txt b/lib/external/pattern_language/lib/CMakeLists.txt
-index dab1499..0bfac35 100644
--- a/lib/external/pattern_language/lib/CMakeLists.txt
-+++ b/lib/external/pattern_language/lib/CMakeLists.txt
-@@ -71,7 +71,7 @@ add_library(libpl ${LIBRARY_TYPE}
- )
- 
- if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
-    target_compile_options(libpl PRIVATE -Wall -Wextra -Werror -Wpedantic -Wno-unknown-pragmas -Wno-array-bounds)
-+    target_compile_options(libpl PRIVATE -Wall -Wextra -Wpedantic -Wno-unknown-pragmas -Wno-array-bounds)
-     if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
-         target_compile_options(libpl PRIVATE -Wno-stringop-overflow)
-     endif()
--- a/app-editors/imhex/files/require-llvm-16.patch
+++ b/app-editors/imhex/files/require-llvm-16.patch
@@ -1,17 +0,0 @@
-From 8d86cd22a743c39a04d34d4cf1a104952cf7fbac Mon Sep 17 00:00:00 2001
-From: xiaoming <xiangluoming2015@outlook.com>
-Subject: [PATCH] require llvm 16
-
-diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake
-index 0d4839e7..da078878 100644
--- a/cmake/build_helpers.cmake
-+++ b/cmake/build_helpers.cmake
-@@ -525,7 +525,7 @@ macro(addBundledLibraries)
-         add_subdirectory(${EXTERN_LIBS_FOLDER}/llvm-demangle EXCLUDE_FROM_ALL)
-         set_target_properties(LLVMDemangle PROPERTIES POSITION_INDEPENDENT_CODE ON)
-     else()
-        find_package(LLVM REQUIRED Demangle)
-+        find_package(LLVM 16 REQUIRED Demangle)
-     endif()
- 
-     if (NOT USE_SYSTEM_YARA)
--- a/app-editors/imhex/imhex-1.32.2.ebuild
+++ b/app-editors/imhex/imhex-1.32.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@@ -20,14 +20,11 @@ S_PATTERNS="${WORKDIR}/ImHex-Patterns-ImHex-v${PV}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="+system-llvm"
-
-PATCHES=(
-	"${FILESDIR}/require-llvm-16.patch"
-	"${FILESDIR}/remove-Werror.patch"
-)
+IUSE="+system-llvm test"
+RESTRICT="test" # the tests need the shared library to work

 DEPEND="
+	app-arch/zstd[zlib]
 	app-forensics/yara
 	>=dev-cpp/nlohmann_json-3.10.2
 	dev-libs/capstone
@@ -47,7 +44,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 BDEPEND="
-	system-llvm? ( <sys-devel/llvm-17 )
+	system-llvm? ( sys-devel/llvm )
 	app-admin/chrpath
 	gnome-base/librsvg
 	sys-devel/lld
@@ -61,6 +58,10 @@ pkg_pretend() {
 }

 src_configure() {
+	if use test; then
+		sed -ie "s/tests EXCLUDE_FROM_ALL/tests ALL/" "${S}/CMakeLists.txt"
+	fi
+
 	local mycmakeargs=(
 		-D CMAKE_BUILD_TYPE="Release" \
 		-D CMAKE_C_COMPILER_LAUNCHER=ccache \
--- a/app-misc/corectrl/Manifest
+++ b/app-misc/corectrl/Manifest
@@ -1 +1 @@
-DIST corectrl-v1.3.7.tar.bz2 570815 BLAKE2B fe8231ba71948d17b1e5d598bf19cde0e51ec13a20849b7bb12fa4cc8401d671123a5de00705cddd141e1ed68c097a315d676df060e704c5f0c0cf18c3383963 SHA512 f0c8ddc8180cb20935f58e0d473fc5436a430313f939adb6f1c41b0d278e689aaf6dd9d12b02ff81144dba494e713ccb4008bd3131bf8aa0769e13ac4de563be
+DIST corectrl-v1.3.8.tar.bz2 571563 BLAKE2B 65a768589ab5b60092888ae9d50d3350a02642508b3c05b15a2bc69874e20e9f133c58c29eb9cb61127c393029636dd3914b48ea10d01f51b469e27c00e0d1e6 SHA512 099f13afd246ecbadfbe1b8e2e61dfd9a5fbecfd7dda09bbc1e28415d3729fe46b1bff11651672b13cbc5d3d8b2610ac78b367afa8f681499fe45bb7dded2588
--- a/app-misc/corectrl/corectrl-1.3.8.ebuild
+++ b/app-misc/corectrl/corectrl-1.3.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@@ -46,12 +46,9 @@ DEPEND="

 BDEPEND="${DEPEND}"

-PATCHES=(
-	"${FILESDIR}"/${P}-headers-6.6.patch
-)
 src_configure() {
-	local mycmakeargs+=(
+	local mycmakeargs=(
 		-DBUILD_TESTING=$(usex test ON OFF)
 	)
-	cmake_src_configure
+	ecm_src_configure
 }
--- a/app-misc/corectrl/corectrl-9999.ebuild
+++ b/app-misc/corectrl/corectrl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@@ -47,8 +47,8 @@ DEPEND="
 BDEPEND="${DEPEND}"

 src_configure() {
-	local mycmakeargs+=(
+	local mycmakeargs=(
 		-DBUILD_TESTING=$(usex test ON OFF)
 	)
-	cmake_src_configure
+	ecm_src_configure
 }
--- a/app-misc/corectrl/files/corectrl-1.3.7-headers-6.6.patch
+++ b/app-misc/corectrl/files/corectrl-1.3.7-headers-6.6.patch
@@ -1,540 +0,0 @@
-From 8cb2d9038a5e92212f79904353a05ba7d9f8aa5f Mon Sep 17 00:00:00 2001
-From: Kostadin Shishmanov <kocelfc@tutanota.com>
-Date: Sat, 4 Nov 2023 23:00:14 +0200
-Subject: [PATCH] Fix compilation with Linux 6.6 API headers
-
-Due to some changes in cn_proc.h in Linux 6.6 headers, including and using it
-mixed with C++ code is no longer posible without specifying that the code is C
-code and must be compiled with a C compiler.
-
-Isolate all process connector related code into its own C file, which is now
-compiled using a C compiler, and adapt it to adhere to the new changes.
-
---
- CMakeLists.txt                          |   4 +-
- src/helper/CMakeLists.txt               |   1 +
- src/helper/pmon/nlprocexecsocket.cpp    | 204 +++---------------------
- src/helper/pmon/nlprocexecsocket.h      |   6 -
- src/helper/pmon/processeventconnector.c | 193 ++++++++++++++++++++++
- src/helper/pmon/processeventconnector.h |  27 ++++
- 6 files changed, 244 insertions(+), 191 deletions(-)
- create mode 100644 src/helper/pmon/processeventconnector.c
- create mode 100644 src/helper/pmon/processeventconnector.h
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 38ab229..275f48b 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,7 +1,7 @@
- cmake_minimum_required(VERSION 3.3)
- 
-project(CoreCtrl LANGUAGES CXX)
-set(PROJECT_HOMEPAGE_URL "https://gitlab.com/corectrl/corectrl")
-+project(CoreCtrl
-+        HOMEPAGE_URL "https://gitlab.com/corectrl/corectrl")
- set(PROJECT_FQDN "org.corectrl.corectrl")
- set(PROJECT_VERSION 1.3.7)
- 
-diff --git a/src/helper/CMakeLists.txt b/src/helper/CMakeLists.txt
-index 2bc779f..13bdcbf 100644
--- a/src/helper/CMakeLists.txt
-+++ b/src/helper/CMakeLists.txt
-@@ -47,6 +47,7 @@ list(APPEND PROCESS_MONITOR_SRC
-   pmon/processregistry.cpp
-   pmon/appregistry.cpp
-   pmon/msgdispatcher.cpp
-+  pmon/processeventconnector.c
- )
- 
- list(APPEND SYSTEM_CONTROL_SRC
-diff --git a/src/helper/pmon/nlprocexecsocket.cpp b/src/helper/pmon/nlprocexecsocket.cpp
-index 947ea38..e09c5e7 100644
--- a/src/helper/pmon/nlprocexecsocket.cpp
-+++ b/src/helper/pmon/nlprocexecsocket.cpp
-@@ -4,213 +4,51 @@
- #include "nlprocexecsocket.h"
- 
- #include "processevent.h"
-#include <cstdint>
-#include <linux/bpf_common.h>
-#include <linux/cn_proc.h>
-#include <linux/connector.h>
-#include <linux/filter.h>
-#include <linux/netlink.h>
-#include <netinet/in.h>
-#include <stddef.h>
-#include <string.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <unistd.h>
-+
-+extern "C" {
-+#include "processeventconnector.h"
-+}
- 
- NLProcExecSocket::FDHandle::~FDHandle()
- {
-  if (fd >= 0)
-    close(fd);
-+  process_event_connector_close(fd);
- }
- 
- NLProcExecSocket::NLProcExecSocket()
- {
-  sockFd_.fd = createSocket();
-+  sockFd_.fd = process_event_connector_new();
-   if (sockFd_.fd < 0)
-     throw std::runtime_error("Cannot create netlink socket");
- 
-  if (setTimeout(5) < 0)
-+  if (process_event_connector_set_timeout(sockFd_.fd, 5) < 0)
-     throw std::runtime_error("Cannot set socket timeout");
- 
-  if (installSocketFilter() < 0)
-+  if (process_event_connector_install_filter(sockFd_.fd) < 0)
-     throw std::runtime_error("Cannot install socket filters");
- 
-  if (bindToSocket() < 0)
-+  if (process_event_connector_bind(sockFd_.fd) < 0)
-     throw BindError("Cannot bind to socket");
- 
-  if (subscribeToProcEvents(true) < 0)
-+  if (process_event_connector_subscribe(sockFd_.fd, true) < 0)
-     throw std::runtime_error("Cannot subscribe to proc events");
- }
- 
- NLProcExecSocket::~NLProcExecSocket()
- {
-  subscribeToProcEvents(false);
-+  process_event_connector_subscribe(sockFd_.fd, false);
- }
- 
- ProcessEvent NLProcExecSocket::waitForEvent() const
- {
-  struct nlcn_msg_t
-  {
-    struct nlmsghdr nl_hdr __attribute__((aligned(NLMSG_ALIGNTO)));
-    struct cn_msg cn_msg;
-  };
-
-  auto const msg_size =
-      NLMSG_LENGTH(sizeof(struct cn_msg) + sizeof(struct proc_event));
-  std::uint8_t msg_buffer[msg_size] = {0};
-  auto msg = (struct nlcn_msg_t *)msg_buffer;
-
-  ssize_t const rc = recv(sockFd_.fd, msg, msg_size, 0);
-  if (rc > 0) {
-    auto const event = ((struct proc_event *)msg->cn_msg.data);
-    switch (event->what) {
-      case proc_event::PROC_EVENT_EXEC:
-        return ProcessEvent{ProcessEvent::Type::EXEC,
-                            event->event_data.exec.process_pid};
-
-      case proc_event::PROC_EVENT_EXIT:
-        return ProcessEvent{ProcessEvent::Type::EXIT,
-                            event->event_data.exit.process_pid};
-      default:
-        return ProcessEvent{ProcessEvent::Type::IGNORE, -1};
-    }
-+  auto event = process_event_connector_read_event(sockFd_.fd);
-+  switch (event.type) {
-+    case process_event_type::PROCESS_EVENT_EXEC:
-+      return ProcessEvent{ProcessEvent::Type::EXEC, event.pid};
-+      break;
-+    case process_event_type::PROCESS_EVENT_EXIT:
-+      return ProcessEvent{ProcessEvent::Type::EXIT, event.pid};
-+      break;
-+    default:
-+      return ProcessEvent{ProcessEvent::Type::IGNORE, -1};
-   }
-
-  return ProcessEvent{ProcessEvent::Type::IGNORE, -1};
-}
-
-inline int NLProcExecSocket::createSocket() const
-{
-  return socket(PF_NETLINK, SOCK_DGRAM, NETLINK_CONNECTOR);
-}
-
-int NLProcExecSocket::setTimeout(unsigned int seconds) const
-{
-  struct timeval duration;
-  duration.tv_sec = seconds;
-  duration.tv_usec = 0;
-
-  return setsockopt(sockFd_.fd, SOL_SOCKET, SO_RCVTIMEO, &duration,
-                    sizeof(duration));
-}
-
-int NLProcExecSocket::bindToSocket() const
-{
-  struct sockaddr_nl sa_nl;
-  sa_nl.nl_family = AF_NETLINK;
-  sa_nl.nl_groups = CN_IDX_PROC;
-  sa_nl.nl_pid = 0; // 0 = lets the kernel to handle nl_pid
-
-  return bind(sockFd_.fd, reinterpret_cast<struct sockaddr *>(&sa_nl),
-              sizeof(sa_nl));
-}
-
-int NLProcExecSocket::installSocketFilter() const
-{
-  struct sock_filter filter[] = {
-      // clang-format off
-
-      // check message from kernel
-      BPF_STMT(BPF_LD | BPF_W | BPF_ABS, offsetof(struct nlmsghdr, nlmsg_pid)),
-      BPF_JUMP(BPF_JMP | BPF_JEQ | BPF_K, 0, 1, 0),
-      BPF_STMT(BPF_RET | BPF_K, 0x0), // drop message
-
-      // check message type NLMSG_DONE
-      BPF_STMT(BPF_LD | BPF_H | BPF_ABS, offsetof(struct nlmsghdr, nlmsg_type)),
-      BPF_JUMP(BPF_JMP | BPF_JEQ | BPF_K, htons(NLMSG_DONE), 1, 0),
-      BPF_STMT(BPF_RET | BPF_K, 0x0), // drop message
-
-      // check proc connector event CN_IDX_PROC
-      BPF_STMT(BPF_LD | BPF_W | BPF_ABS, NLMSG_LENGTH(0) +
-                                         offsetof(struct cn_msg, id) +
-                                         offsetof(struct cb_id, idx)),
-      BPF_JUMP(BPF_JMP | BPF_JEQ | BPF_K, htonl(CN_IDX_PROC), 1, 0),
-      BPF_STMT(BPF_RET | BPF_K, 0x0), // drop message
-
-      // check proc connector event CN_VAL_PROC
-      BPF_STMT(BPF_LD | BPF_W | BPF_ABS, NLMSG_LENGTH(0) +
-                                         offsetof(struct cn_msg, id) +
-                                         offsetof(struct cb_id, val)),
-      BPF_JUMP(BPF_JMP | BPF_JEQ | BPF_K, htonl(CN_VAL_PROC), 1, 0),
-      BPF_STMT(BPF_RET | BPF_K, 0x0), // drop message
-
-      // accept exec messages from processes
-      BPF_STMT(BPF_LD | BPF_W | BPF_ABS, NLMSG_LENGTH(0) +
-                                         offsetof(struct cn_msg, data) +
-                                         offsetof(struct proc_event, what)),
-      BPF_JUMP(BPF_JMP | BPF_JEQ | BPF_K, htonl(proc_event::PROC_EVENT_EXEC), 0, 6),
-
-      // processes have process_pid == process_tgid (thread group leaders)
-      BPF_STMT(BPF_LD | BPF_W | BPF_ABS, NLMSG_LENGTH(0) +
-                                         offsetof(struct cn_msg, data) +
-                                         offsetof(struct proc_event, event_data.exec.process_pid)),
-      BPF_STMT(BPF_ST, 0),
-      BPF_STMT(BPF_LDX | BPF_W | BPF_MEM, 0),
-      BPF_STMT(BPF_LD | BPF_W | BPF_ABS, NLMSG_LENGTH(0) +
-                                         offsetof(struct cn_msg, data) +
-                                         offsetof(struct proc_event, event_data.exec.process_tgid)),
-      BPF_JUMP(BPF_JMP | BPF_JEQ | BPF_X, 0, 0, 1),
-      BPF_STMT(BPF_RET | BPF_K, 0xffffffff),
-
-      // accept exit messages from processes
-      BPF_STMT(BPF_LD | BPF_W | BPF_ABS, NLMSG_LENGTH(0) +
-                                         offsetof(struct cn_msg, data) +
-                                         offsetof(struct proc_event, what)),
-      BPF_JUMP(BPF_JMP | BPF_JEQ | BPF_K, htonl(proc_event::PROC_EVENT_EXIT), 0, 6),
-
-      // processes have process_pid == process_tgid
-      BPF_STMT(BPF_LD | BPF_W | BPF_ABS, NLMSG_LENGTH(0) +
-                                         offsetof(struct cn_msg, data) +
-                                         offsetof(struct proc_event, event_data.exit.process_pid)),
-      BPF_STMT(BPF_ST, 0),
-      BPF_STMT(BPF_LDX | BPF_W | BPF_MEM, 0),
-      BPF_STMT(BPF_LD | BPF_W | BPF_ABS, NLMSG_LENGTH(0) +
-                                         offsetof(struct cn_msg, data) +
-                                         offsetof(struct proc_event, event_data.exit.process_tgid)),
-      BPF_JUMP(BPF_JMP | BPF_JEQ | BPF_X, 0, 0, 1),
-      BPF_STMT(BPF_RET | BPF_K, 0xffffffff),
-
-      // drop any other messages
-      BPF_STMT(BPF_RET | BPF_K, 0x0),
-
-      // clang-format on
-  };
-
-  struct sock_fprog fprog;
-  memset(&fprog, 0, sizeof(fprog));
-  fprog.filter = filter;
-  fprog.len = sizeof(filter) / sizeof(*filter);
-
-  return setsockopt(sockFd_.fd, SOL_SOCKET, SO_ATTACH_FILTER, &fprog,
-                    sizeof(fprog));
-}
-
-int NLProcExecSocket::subscribeToProcEvents(bool subscribe) const
-{
-  struct nlcn_msg_t
-  {
-    struct nlmsghdr nl_hdr __attribute__((aligned(NLMSG_ALIGNTO)));
-    struct cn_msg cn_msg;
-  };
-
-  auto const msg_size =
-      NLMSG_LENGTH(sizeof(struct cn_msg) + sizeof(enum proc_cn_mcast_op));
-  std::uint8_t msg_buffer[msg_size] = {0};
-  auto msg = (struct nlcn_msg_t *)msg_buffer;
-
-  msg->nl_hdr.nlmsg_len = msg_size;
-  msg->nl_hdr.nlmsg_pid = 0;
-  msg->nl_hdr.nlmsg_type = NLMSG_DONE;
-
-  msg->cn_msg.id.idx = CN_IDX_PROC;
-  msg->cn_msg.id.val = CN_VAL_PROC;
-  msg->cn_msg.len = sizeof(enum proc_cn_mcast_op);
-
-  auto mcast = (enum proc_cn_mcast_op *)msg->cn_msg.data;
-  *mcast = subscribe ? PROC_CN_MCAST_LISTEN : PROC_CN_MCAST_IGNORE;
-
-  if (send(sockFd_.fd, msg, msg_size, 0) < 0)
-    return -1;
-
-  return 0;
- }
-diff --git a/src/helper/pmon/nlprocexecsocket.h b/src/helper/pmon/nlprocexecsocket.h
-index 902e20e..be119e0 100644
--- a/src/helper/pmon/nlprocexecsocket.h
-+++ b/src/helper/pmon/nlprocexecsocket.h
-@@ -22,12 +22,6 @@ class NLProcExecSocket final
-   ProcessEvent waitForEvent() const;
- 
-  private:
-  inline int createSocket() const;
-  int setTimeout(unsigned int seconds) const;
-  int bindToSocket() const;
-  int installSocketFilter() const;
-  int subscribeToProcEvents(bool subscribe) const;
-
-   struct FDHandle
-   {
-     int fd{-1};
-diff --git a/src/helper/pmon/processeventconnector.c b/src/helper/pmon/processeventconnector.c
-new file mode 100644
-index 0000000..a18070e
--- /dev/null
-+++ b/src/helper/pmon/processeventconnector.c
-@@ -0,0 +1,193 @@
-+// SPDX-License-Identifier: GPL-3.0-or-later
-+// Copyright 2023 Juan Palacios <jpalaciosdev@gmail.com>
-+
-+#include "processeventconnector.h"
-+
-+#include <linux/bpf_common.h>
-+#include <linux/cn_proc.h>
-+#include <linux/connector.h>
-+#include <linux/filter.h>
-+#include <linux/netlink.h>
-+#include <linux/version.h>
-+#include <netinet/in.h>
-+#include <string.h>
-+#include <sys/socket.h>
-+#include <sys/time.h>
-+#include <unistd.h>
-+
-+#define SUBSCRIBE_MSG_SIZE                                                     \
-+  NLMSG_LENGTH(sizeof(struct cn_msg) + sizeof(enum proc_cn_mcast_op))
-+#define READ_EVENT_MSG_SIZE                                                    \
-+  NLMSG_LENGTH(sizeof(struct cn_msg) + sizeof(struct proc_event))
-+
-+int process_event_connector_new()
-+{
-+  return socket(PF_NETLINK, SOCK_DGRAM, NETLINK_CONNECTOR);
-+}
-+
-+int process_event_connector_close(int socket_fd)
-+{
-+  if (socket_fd >= 0)
-+    return close(socket_fd);
-+
-+  return 0;
-+}
-+
-+int process_event_connector_set_timeout(int socket_fd, unsigned int seconds)
-+{
-+  struct timeval duration;
-+  duration.tv_sec = seconds;
-+  duration.tv_usec = 0;
-+
-+  return setsockopt(socket_fd, SOL_SOCKET, SO_RCVTIMEO, &duration,
-+                    sizeof(duration));
-+}
-+
-+int process_event_connector_bind(int socket_fd)
-+{
-+  struct sockaddr_nl sa_nl;
-+  sa_nl.nl_family = AF_NETLINK;
-+  sa_nl.nl_groups = CN_IDX_PROC;
-+  sa_nl.nl_pid = 0; // 0 = lets the kernel to handle nl_pid
-+
-+  return bind(socket_fd, (struct sockaddr *)(&sa_nl), sizeof(sa_nl));
-+}
-+
-+int process_event_connector_subscribe(int socket_fd, bool subscribe)
-+{
-+  typedef struct nlcn_msg_t
-+  {
-+    struct nlmsghdr nl_hdr __attribute__((aligned(NLMSG_ALIGNTO)));
-+    struct cn_msg cn_msg;
-+  } nlcn_msg;
-+
-+  char msg_buffer[SUBSCRIBE_MSG_SIZE] = {0};
-+  nlcn_msg *msg = (nlcn_msg *)msg_buffer;
-+
-+  msg->nl_hdr.nlmsg_len = SUBSCRIBE_MSG_SIZE;
-+  msg->nl_hdr.nlmsg_pid = 0;
-+  msg->nl_hdr.nlmsg_type = NLMSG_DONE;
-+
-+  msg->cn_msg.id.idx = CN_IDX_PROC;
-+  msg->cn_msg.id.val = CN_VAL_PROC;
-+  msg->cn_msg.len = sizeof(enum proc_cn_mcast_op);
-+
-+  enum proc_cn_mcast_op *mcast = (enum proc_cn_mcast_op *)msg->cn_msg.data;
-+  *mcast = subscribe ? PROC_CN_MCAST_LISTEN : PROC_CN_MCAST_IGNORE;
-+
-+  if (send(socket_fd, msg, SUBSCRIBE_MSG_SIZE, 0) < 0)
-+    return -1;
-+
-+  return 0;
-+}
-+
-+int process_event_connector_install_filter(int socket_fd)
-+{
-+  struct sock_filter filter[] = {
-+      // clang-format off
-+
-+      // check message from kernel
-+      BPF_STMT(BPF_LD | BPF_W | BPF_ABS, offsetof(struct nlmsghdr, nlmsg_pid)),
-+      BPF_JUMP(BPF_JMP | BPF_JEQ | BPF_K, 0, 1, 0),
-+      BPF_STMT(BPF_RET | BPF_K, 0x0), // drop message
-+
-+      // check message type NLMSG_DONE
-+      BPF_STMT(BPF_LD | BPF_H | BPF_ABS, offsetof(struct nlmsghdr, nlmsg_type)),
-+      BPF_JUMP(BPF_JMP | BPF_JEQ | BPF_K, htons(NLMSG_DONE), 1, 0),
-+      BPF_STMT(BPF_RET | BPF_K, 0x0), // drop message
-+
-+      // check proc connector event CN_IDX_PROC
-+      BPF_STMT(BPF_LD | BPF_W | BPF_ABS, NLMSG_LENGTH(0) +
-+                                         offsetof(struct cn_msg, id) +
-+                                         offsetof(struct cb_id, idx)),
-+      BPF_JUMP(BPF_JMP | BPF_JEQ | BPF_K, htonl(CN_IDX_PROC), 1, 0),
-+      BPF_STMT(BPF_RET | BPF_K, 0x0), // drop message
-+
-+      // check proc connector event CN_VAL_PROC
-+      BPF_STMT(BPF_LD | BPF_W | BPF_ABS, NLMSG_LENGTH(0) +
-+                                         offsetof(struct cn_msg, id) +
-+                                         offsetof(struct cb_id, val)),
-+      BPF_JUMP(BPF_JMP | BPF_JEQ | BPF_K, htonl(CN_VAL_PROC), 1, 0),
-+      BPF_STMT(BPF_RET | BPF_K, 0x0), // drop message
-+
-+      // accept exec messages from processes
-+      BPF_STMT(BPF_LD | BPF_W | BPF_ABS, NLMSG_LENGTH(0) +
-+                                         offsetof(struct cn_msg, data) +
-+                                         offsetof(struct proc_event, what)),
-+      BPF_JUMP(BPF_JMP | BPF_JEQ | BPF_K, htonl(PROC_EVENT_EXEC), 0, 6),
-+
-+      // processes have process_pid == process_tgid (thread group leaders)
-+      BPF_STMT(BPF_LD | BPF_W | BPF_ABS, NLMSG_LENGTH(0) +
-+                                         offsetof(struct cn_msg, data) +
-+                                         offsetof(struct proc_event, event_data.exec.process_pid)),
-+      BPF_STMT(BPF_ST, 0),
-+      BPF_STMT(BPF_LDX | BPF_W | BPF_MEM, 0),
-+      BPF_STMT(BPF_LD | BPF_W | BPF_ABS, NLMSG_LENGTH(0) +
-+                                         offsetof(struct cn_msg, data) +
-+                                         offsetof(struct proc_event, event_data.exec.process_tgid)),
-+      BPF_JUMP(BPF_JMP | BPF_JEQ | BPF_X, 0, 0, 1),
-+      BPF_STMT(BPF_RET | BPF_K, 0xffffffff),
-+
-+      // accept exit messages from processes
-+      BPF_STMT(BPF_LD | BPF_W | BPF_ABS, NLMSG_LENGTH(0) +
-+                                         offsetof(struct cn_msg, data) +
-+                                         offsetof(struct proc_event, what)),
-+      BPF_JUMP(BPF_JMP | BPF_JEQ | BPF_K, htonl(PROC_EVENT_EXIT), 0, 6),
-+
-+      // processes have process_pid == process_tgid
-+      BPF_STMT(BPF_LD | BPF_W | BPF_ABS, NLMSG_LENGTH(0) +
-+                                         offsetof(struct cn_msg, data) +
-+                                         offsetof(struct proc_event, event_data.exit.process_pid)),
-+      BPF_STMT(BPF_ST, 0),
-+      BPF_STMT(BPF_LDX | BPF_W | BPF_MEM, 0),
-+      BPF_STMT(BPF_LD | BPF_W | BPF_ABS, NLMSG_LENGTH(0) +
-+                                         offsetof(struct cn_msg, data) +
-+                                         offsetof(struct proc_event, event_data.exit.process_tgid)),
-+      BPF_JUMP(BPF_JMP | BPF_JEQ | BPF_X, 0, 0, 1),
-+      BPF_STMT(BPF_RET | BPF_K, 0xffffffff),
-+
-+      // drop any other messages
-+      BPF_STMT(BPF_RET | BPF_K, 0x0),
-+
-+      // clang-format on
-+  };
-+
-+  struct sock_fprog fprog;
-+  memset(&fprog, 0, sizeof(fprog));
-+  fprog.filter = filter;
-+  fprog.len = sizeof(filter) / sizeof(*filter);
-+
-+  return setsockopt(socket_fd, SOL_SOCKET, SO_ATTACH_FILTER, &fprog,
-+                    sizeof(fprog));
-+}
-+
-+process_event process_event_connector_read_event(int socket_fd)
-+{
-+  typedef struct nlcn_msg_t
-+  {
-+    struct nlmsghdr nl_hdr __attribute__((aligned(NLMSG_ALIGNTO)));
-+    struct cn_msg cn_msg;
-+  } nlcn_msg;
-+
-+  char msg_buffer[READ_EVENT_MSG_SIZE] = {0};
-+  nlcn_msg *msg = (nlcn_msg *)msg_buffer;
-+
-+  ssize_t const rc = recv(socket_fd, msg, READ_EVENT_MSG_SIZE, 0);
-+  if (rc > 0) {
-+    struct proc_event *event = ((struct proc_event *)msg->cn_msg.data);
-+    switch (event->what) {
-+      case PROC_EVENT_EXEC:
-+        return (process_event){.type = PROCESS_EVENT_EXEC,
-+                               .pid = event->event_data.exec.process_pid};
-+
-+      case PROC_EVENT_EXIT:
-+        return (process_event){.type = PROCESS_EVENT_EXIT,
-+                               .pid = event->event_data.exit.process_pid};
-+
-+      default:
-+        return (process_event){.type = PROCESS_EVENT_OTHER, .pid = -1};
-+    }
-+  }
-+
-+  return (process_event){.type = PROCESS_EVENT_OTHER, .pid = -1};
-+}
-diff --git a/src/helper/pmon/processeventconnector.h b/src/helper/pmon/processeventconnector.h
-new file mode 100644
-index 0000000..35c4b5b
--- /dev/null
-+++ b/src/helper/pmon/processeventconnector.h
-@@ -0,0 +1,27 @@
-+// SPDX-License-Identifier: GPL-3.0-or-later
-+// Copyright 2023 Juan Palacios <jpalaciosdev@gmail.com>
-+
-+#pragma once
-+
-+#include <stdbool.h>
-+#include <stddef.h>
-+
-+typedef enum process_event_type_t {
-+  PROCESS_EVENT_EXEC,
-+  PROCESS_EVENT_EXIT,
-+  PROCESS_EVENT_OTHER,
-+} process_event_type;
-+
-+typedef struct process_event_t
-+{
-+  process_event_type type;
-+  int pid;
-+} process_event;
-+
-+int process_event_connector_new();
-+int process_event_connector_close(int socket_fd);
-+int process_event_connector_set_timeout(int socket_fd, unsigned int seconds);
-+int process_event_connector_bind(int socket_fd);
-+int process_event_connector_subscribe(int socket_fd, bool subscribe);
-+int process_event_connector_install_filter(int socket_fd);
-+process_event process_event_connector_read_event(int socket_fd);
-- 
-2.42.1
-
--- a/dev-cpp/blurhash/Manifest
+++ b/dev-cpp/blurhash/Manifest
@@ -1 +1,2 @@
 DIST blurhash-0.2.0.tar.gz 137426 BLAKE2B 9a41049983866d896e937fde46800f47984ab52f83269023bef040d7694bea5f04449df0f849566cb79a3b1e796d4b02e810d5cab32f348c1dfa2ee7fcde3a01 SHA512 849b0e297816a62c65873bec26a9da46e711e6b4e31b82e1223349a8e840acf96e0b7eec72faeb6d78a9ad63faf6a2968695df4d97fa117607a4f371795818a5
+DIST blurhash-v0.2.0.tar.bz2 121080 BLAKE2B 7eecf8eb343e9617e9e6b1b39c46def8bc334d1a353297034a28c989789658d711e7b92c0826a0e3d33febd30dba7de2f409ba27cecfffc2db3f23b0c5fc3998 SHA512 7a9f5b80bb3db96ca078dac4d83258cdb0e3f8f0b0afbbbbf67290b1ca0f472d1436bc3614a042cac6c843ebe0b76ff4cc446a10d7401cb1286e832b5ab1a203
--- a/dev-cpp/blurhash/blurhash-0.2.0-r1.ebuild
+++ b/dev-cpp/blurhash/blurhash-0.2.0-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+MY_P="${PN}-v${PV}"
+DESCRIPTION="C++ blurhash encoder/decoder"
+HOMEPAGE="https://nheko.im/nheko-reborn/blurhash"
+SRC_URI="https://nheko.im/nheko-reborn/${PN}/-/archive/v${PV}/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Boost-1.0"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-cpp/doctest )"
+
+src_configure() {
+	local -a emesonargs=(
+		$(meson_use test tests)
+
+		# https://bugs.gentoo.org/921619
+		-Dexamples=true
+	)
+	meson_src_configure
+}
--- a/dev-cpp/indicators/Manifest
+++ b/dev-cpp/indicators/Manifest
@@ -1,2 +1 @@
-DIST indicators-2.2.tar.gz 8974714 BLAKE2B 538e9d77c7d4f19cc81d4476288ce7f78198a61252885a78e166f39137e8653082d02861cbf2469b08cc3af5f6ed4e76c343ca1d95aec67d35f2dbcde4ba72c2 SHA512 7ced2d3c320d51c7e0569104744730c8e2f952350bcae214a9781eb43ef4002c8314937db78461351741fc4c3aee7a1364582b1274991e95eb30006a5f2a7ef9
 DIST indicators-2.3.tar.gz 8970430 BLAKE2B d81ba95908302c74830bef4aff5b07fe0352c88630bcb5480f7b2701efe20f3d32fc3c2279cbba558be40ece98cbbd8f9f02c1008c915149eb698ac517b58abd SHA512 59fb17e93c886cec2418e93e221febd2bf3160691b3473363417f8f8fa3d50d42d1de0e55d62598eba800b13c1d5ab1422d0a2c867246006b61340ba32d99232
--- a/dev-cpp/indicators/files/indicators-2.3-include.patch
+++ b/dev-cpp/indicators/files/indicators-2.3-include.patch
@@ -0,0 +1,12 @@
+Fix "error: 'uint8_t' has not been declared"
+
+--- a/include/indicators/termcolor.hpp
+++ b/include/indicators/termcolor.hpp
+@@ -14,6 +14,7 @@
+ 
+ #include <iostream>
+ #include <cstdio>
+#include <cstdint>
+ 
+ // Detect target's platform and set some macros in order to wrap platform
+ // specific code this library depends on.
--- a/dev-cpp/indicators/indicators-2.3-r1.ebuild
+++ b/dev-cpp/indicators/indicators-2.3-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=7
+EAPI=8

 inherit cmake

@@ -14,6 +14,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="examples"

+PATCHES=( "${FILESDIR}"/${P}-include.patch )
+
 QA_PKGCONFIG_VERSION="${PV}.0"

 src_install() {
--- a/dev-python/sphinxcontrib-zopeext/Manifest
+++ b/dev-python/sphinxcontrib-zopeext/Manifest
@@ -1 +0,0 @@
-DIST sphinxcontrib_zopeext-0.4.2.tar.gz 13887 BLAKE2B ce77989ff34fa76bf1263f0764a872a840cea2cf7817ab1697a8176b1bf4444f4791430b2aab8cd72026a5e56248c9dc43d1052e0e1a891456388f86bb8551d3 SHA512 acf78a943ff6842184b347251398df3e20f045601bbba755152f891ee8a5d08e137dea5dbbc38f8a82ea5f045681dce6ac83a2329d74d378d56758031111c317
--- a/dev-python/sphinxcontrib-zopeext/files/pyproject.patch
+++ b/dev-python/sphinxcontrib-zopeext/files/pyproject.patch
@@ -1,28 +0,0 @@
-diff --git a/pyproject.toml b/pyproject.toml
-index b204a4d..5633f69 100644
--- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -16,14 +16,6 @@ dev = [
- testpaths = [
-     "tests",
- ]
-addopts = [
-    "--doctest-modules",
-    "--cov=sphinxcontrib.zopeext",
-    "--cov-report=html",
-    "--cov-fail-under=85",
-    "--no-cov-on-fail",
-    "--pdb",
-]
- doctest_optionflags = [
-     "ELLIPSIS",
-     "NORMALIZE_WHITESPACE",
-@@ -87,6 +79,6 @@ doc = [
- 
- [build-system]
- requires = [
-    "pdm-backend",
-+    "pdm-pep517",
- ]
-build-backend = "pdm.backend"
-+build-backend = "pdm.pep517.api"
--- a/dev-python/sphinxcontrib-zopeext/metadata.xml
+++ b/dev-python/sphinxcontrib-zopeext/metadata.xml
@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<name>Julien Roy</name>
-		<email>julien@jroy.ca</email>
-	</maintainer>
-	<upstream>
-		<bugs-to>https://github.com/sphinx-contrib/zopeext/issues</bugs-to>
-		<changelog>https://github.com/sphinx-contrib/zopeext/blob/main/CHANGES</changelog>
-		<remote-id type="github">sphinx-contrib/zopeext</remote-id>
-		<remote-id type="pypi">sphinxcontrib-zopeext</remote-id>
-		<maintainer>
-			<name>Michael McNeil Forbes</name>
-			<email>mforbes@alum.mit.edu</email>
-		</maintainer>
-		<doc>https://zopeext.readthedocs.io/en/latest/</doc>
-	</upstream>
-</pkgmetadata>
--- a/dev-python/sphinxcontrib-zopeext/sphinxcontrib-zopeext-0.4.2-r1.ebuild
+++ b/dev-python/sphinxcontrib-zopeext/sphinxcontrib-zopeext-0.4.2-r1.ebuild
@@ -1,36 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=pdm
-PYTHON_COMPAT=( python3_{10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Sphinx extension for using Zope interfaces"
-HOMEPAGE="https://github.com/sphinx-contrib/zopeext"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/importlib-metadata[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/pyproject.patch"
-)
-
-distutils_enable_tests pytest
-
-# Tests requires sphinx-testing which has been removed from ::gentoo
-RESTRICT="test"
--- a/dev-python/tulir-telethon/Manifest
+++ b/dev-python/tulir-telethon/Manifest
@@ -1,2 +1,2 @@
-DIST tulir-telethon-1.33.0_alpha1.gh.tar.gz 496284 BLAKE2B 6bba90dd4be4b6aeb2f1a4bd9bd4dc59740504cf2ef75606a5df861df00292d9f935c29a397c98bc6c83cfad80c5413700ca5cc131896a5710748848e01a7b78 SHA512 b8eb5ff95f2450ab7d29af6d9ccea63f562b14d984aedc946b82f80a4d68338133767a81432da10a6b6d9aa9c26ac431ad33d73a5a5a9b733702d37747b49a10
 DIST tulir-telethon-1.34.0a2.tar.gz 575337 BLAKE2B e76172e38ab22383a584e18ac376cf1aaf5f9ae54428ed09e9cd99f7707b45aa11f5f2da5e601baa998d75e2df6fc036fb03516cf911d80241c3d82f83c439e4 SHA512 bc20db27b4d32675e38386a95b610be21ba83dead18a27907ff0673afc5f2d93002a4e79e62d7ac1f8d18d784c3e0904c760ea9b7fc93f88417c04197d5d7ab6
+DIST tulir-telethon-1.34.0a3.tar.gz 577740 BLAKE2B 2759d72ff83ee27e7f22b756099d9fd312026e6c28417a3a9243f8be941ff01997a2794324ecee8d71864c240ea7adc9770c04b12b0302c4d3b5a34ec26e3dd5 SHA512 f197a8b6192266da628750776863fda125d29530ce7bdfda1f65845ba8b6bcb95fa32cfb810e4b72b6c1825b20f9e2d794b3b5d2226a91589c4f03493ee3d490
--- a/dev-python/tulir-telethon/tulir-telethon-1.34.0_alpha3.ebuild
+++ b/dev-python/tulir-telethon/tulir-telethon-1.34.0_alpha3.ebuild
@@ -3,16 +3,15 @@

 EAPI=8

+PYPI_NO_NORMALIZE=1
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{10..11} )

-inherit distutils-r1
+inherit distutils-r1 pypi

 MY_PV="${PV/_alph/}"
 DESCRIPTION="Pure Python 3 MTProto API Telegram client library, for bots too!"
 HOMEPAGE="https://github.com/tulir/Telethon/"
-SRC_URI="https://github.com/tulir/Telethon/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
-S="${WORKDIR}/Telethon-${MY_PV}"

 LICENSE="MIT"
 SLOT="0"
@@ -33,9 +32,3 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	tests/readthedocs/quick_references/test_client_reference.py::test_all_methods_present
-)
--- a/dev-util/find-work/Manifest
+++ b/dev-util/find-work/Manifest
@@ -1 +1,2 @@
 DIST find_work-0.1.1.tar.gz 10530 BLAKE2B 51294e6b9e21c72fcd2da77c4ecd0c0cb3614d631b7d4840dbc3d774d83aa910a5b83277c7be2c16adb3f0827b5841e5ad24107ac7a546380d4c056e9a8e275a SHA512 b0f06689554ec2a8d27da270874c89fc31683c0f211d0bacbbe7fee8482a0115107f21836c7ebdaf13ea297030d0870bc53919a90e68ccf10da615eeb9111c5f
+DIST find_work-0.2.0.tar.gz 11440 BLAKE2B 507da062ca3a30885fedf49831be2454ea2012aabab052599fd3d2740d3a30b602c5b0eb2e7e69699dc5858f279d7dc041481f1fd9c7403b19f18c3953d32d76 SHA512 ad38a464bb682c18e5ae49f15e00041909bc6104ba59efb21a2447b7da84872b2ec191071a60721d50e6eacfeecbbe46d790faffe1e4232a49d8da31bce40e5d
--- a/dev-util/find-work/find-work-0.2.0.ebuild
+++ b/dev-util/find-work/find-work-0.2.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_USE_PEP517=hatchling
+inherit distutils-r1 pypi shell-completion
+
+DESCRIPTION="Personal advice utility for Gentoo package maintainers"
+HOMEPAGE="
+	https://find-work.sysrq.in/
+	https://pypi.org/project/find-work/
+"
+
+LICENSE="WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	<app-portage/gentoopm-2[${PYTHON_USEDEP}]
+	>=dev-python/aiohttp-3[${PYTHON_USEDEP}]
+	<dev-python/aiohttp-4[${PYTHON_USEDEP}]
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/click-aliases[${PYTHON_USEDEP}]
+	>=dev-python/pydantic-2[${PYTHON_USEDEP}]
+	<dev-python/pydantic-3[${PYTHON_USEDEP}]
+	>=dev-python/repology-client-0.0.2[${PYTHON_USEDEP}]
+	<dev-python/repology-client-2[${PYTHON_USEDEP}]
+	dev-python/sortedcontainers[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+distutils_enable_sphinx docs \
+	dev-python/insipid-sphinx-theme \
+	dev-python/sphinx-prompt
+
+src_prepare() {
+	distutils-r1_src_prepare
+	mkdir completions || die
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	local -x PATH="${BUILD_DIR}/install${EPREFIX}/usr/bin:${PATH}"
+	local -x PYTHONPATH="${BUILD_DIR}/lib:${PYTHONPATH}"
+	emake completions/find-work.{bash,zsh,fish}
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	local mymakeargs=(
+		DESTDIR="${D}"
+		PREFIX="${EPREFIX}"/usr
+
+		BASHCOMPDIR="$(get_bashcompdir)"
+		ZSHCOMPDIR="$(get_zshcompdir)"
+		FISHCOMPDIR="$(get_fishcompdir)"
+	)
+
+	emake "${mymakeargs[@]}" install-data
+}
--- a/dev-util/xmake/Manifest
+++ b/dev-util/xmake/Manifest
@@ -1 +1 @@
-DIST xmake-v2.7.9.tar.gz 2742959 BLAKE2B 61b905b133e687e0f03a16f67e16d973dd098c3bd8987f807e59944633228b73b43426b22b422165df4a46ad4cb031b19cd10ef5300db10f64ee806b8e324d44 SHA512 e725f4c3ffb500d63cf6baa3fde2020b7110b44dfe8e39b3964e0761c120e0738e76dafc3808d243e47f3f202a9b9acfc6ab5a2cf06998e19f38ed8a740182cf
+DIST xmake-v2.8.6.tar.gz 2792484 BLAKE2B eee06090c260576cff3fca50998f0e912a41786eb65e1a67119194e0eb20956795eeff092dfa59d92989ad9fe8fc190eb6ce2a35653c54582652a3cb2e1202bd SHA512 86808a38dc6e28a44b64f9598b26eadb8d6314dc2ff14929eb7cbcd0c01172240dd8475e1e88f874abff651436536c7391ad2294fd57b261529dd4560b8c563b
--- a/dev-util/xmake/xmake-2.8.6.ebuild
+++ b/dev-util/xmake/xmake-2.8.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8

-inherit optfeature
+inherit bash-completion-r1 optfeature

 DESCRIPTION="A cross-platform build utility based on Lua"
 HOMEPAGE="https://xmake.io"
@@ -17,7 +17,7 @@ else
 fi

 # tarball doesn't provide tests
-RESTRICT="test strip"
+RESTRICT="test"
 LICENSE="Apache-2.0"
 SLOT="0"

@@ -38,13 +38,35 @@ DOCS=(
 	NOTICE.md README.md README_zh.md
 )

-src_configure(){
+src_prepare() {
+	default
+
+	# Don't strip binaries
+	sed -i 's/"-s"/""/' configure || die
+}
+
+src_configure() {
 	econf --prefix="${EPREFIX}"/usr \
 		--plat=linux
 		# --plat=linux is necessary, which enables correct directory:
 		# build/linux/ARCH other than build/ARCH/ARCH
 }

+src_install() {
+	default
+
+	doman scripts/man/*
+
+	newbashcomp xmake/scripts/completions/register-completions.bash xmake
+	bashcomp_alias xmake xrepo
+
+	insinto /usr/share/zsh/site-functions
+	newins xmake/scripts/completions/register-completions.zsh xmake.zsh
+
+	insinto /usr/share/fish/vendor_completions.d
+	newins xmake/scripts/completions/register-completions.fish xmake.fish
+}
+
 pkg_postinst() {
 	optfeature "cached compilation for your xmake projects" dev-util/ccache
 }
--- a/dev-util/xmake/xmake-9999.ebuild
+++ b/dev-util/xmake/xmake-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8

-inherit optfeature
+inherit bash-completion-r1 optfeature

 DESCRIPTION="A cross-platform build utility based on Lua"
 HOMEPAGE="https://xmake.io"
@@ -17,7 +17,7 @@ else
 fi

 # tarball doesn't provide tests
-RESTRICT="test strip"
+RESTRICT="test"
 LICENSE="Apache-2.0"
 SLOT="0"

@@ -38,13 +38,35 @@ DOCS=(
 	NOTICE.md README.md README_zh.md
 )

-src_configure(){
+src_prepare() {
+	default
+
+	# Don't strip binaries
+	sed -i 's/"-s"/""/' configure || die
+}
+
+src_configure() {
 	econf --prefix="${EPREFIX}"/usr \
 		--plat=linux
 		# --plat=linux is necessary, which enables correct directory:
 		# build/linux/ARCH other than build/ARCH/ARCH
 }

+src_install() {
+	default
+
+	doman scripts/man/*
+
+	newbashcomp xmake/scripts/completions/register-completions.bash xmake
+	bashcomp_alias xmake xrepo
+
+	insinto /usr/share/zsh/site-functions
+	newins xmake/scripts/completions/register-completions.zsh xmake.zsh
+
+	insinto /usr/share/fish/vendor_completions.d
+	newins xmake/scripts/completions/register-completions.fish xmake.fish
+}
+
 pkg_postinst() {
 	optfeature "cached compilation for your xmake projects" dev-util/ccache
 }
--- a/gui-apps/phosh-tour/Manifest
+++ b/gui-apps/phosh-tour/Manifest
@@ -1 +1,2 @@
 DIST phosh-tour-v0.28.0.tar.bz2 120380 BLAKE2B 629bd6eae4cca4d65d0725299d6d6303d32056b46c5df9109ffd9558f81d1e206acbd160c3ff244a328f42d33438d44642f31a2f77389cebb3dd60d793229ca8 SHA512 0c49f8bf0d89399fec5e67480374f1f396d01bb47a01906111395b7df37e33eaac6255c7374a7313edd6c1c7e3b5b829695e7a564b2b204036d045484bc77a63
+DIST phosh-tour-v0.35.0.tar.bz2 121098 BLAKE2B cd229c7d7a406dd4cea1a4e5bdf6c271f93025c2337d974873995c7b000316d7d210dcf729955d3c49dbb6360f79d1d28d6198c257142dd252cf263ab1089693 SHA512 af435e228f4a3151accf122faf7eb33d1198ccc890fee8d45e9005dfa3887a5fd0ae7a931756a707bcbe0511c20a54e1adf967873dca126f9904bf43174769c3
--- a/gui-apps/phosh-tour/phosh-tour-0.35.0.ebuild
+++ b/gui-apps/phosh-tour/phosh-tour-0.35.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2-utils meson xdg
+
+MY_P="${PN}-v${PV}"
+DESCRIPTION="Introduction to phosh on smartphones"
+HOMEPAGE="https://gitlab.gnome.org/guidog/phosh-tour"
+SRC_URI="https://gitlab.gnome.org/guidog/${PN}/-/archive/v${PV}/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	dev-libs/glib:2
+	>=gui-libs/gtk-4.4:4
+	>=gui-libs/libadwaita-1.1:1
+"
+RDEPEND="${DEPEND}"
+BDEPEND="sys-devel/gettext"
+
+QA_DESKTOP_FILE="usr/share/applications/mobi.phosh.PhoshTour.desktop"
+
+src_configure() {
+	local emesonargs=(
+		-Dbrand="smartphone"
+		-Dvendor="Gentoo"
+	)
+	meson_src_configure
+}
+
+src_test() {
+	# No useful tests
+	:
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
--- a/gui-libs/xdg-desktop-portal-hyprland/Manifest
+++ b/gui-libs/xdg-desktop-portal-hyprland/Manifest
@@ -1,7 +1,9 @@
 DIST proto-subproject-1.2.2.tar.gz 6343 BLAKE2B cffa25c1fbac992db9aee57956615c2a5f8a6e90150d86246218e6d346e566a43527f56cab08b07359bd2f56b1e02b741fb0dbb37ec35fbadd22dfdb2006d3b0 SHA512 f8534c0f6562ce3c770ed9c79b8b78504d6f3aa75001c74ecfa5418af939e88a020ca1cef08d20c62e73c764d66452b5ce212a0f0d2e9a3aaba635ee80b142c5
 DIST proto-subproject-1.2.5.tar.gz 6343 BLAKE2B cffa25c1fbac992db9aee57956615c2a5f8a6e90150d86246218e6d346e566a43527f56cab08b07359bd2f56b1e02b741fb0dbb37ec35fbadd22dfdb2006d3b0 SHA512 f8534c0f6562ce3c770ed9c79b8b78504d6f3aa75001c74ecfa5418af939e88a020ca1cef08d20c62e73c764d66452b5ce212a0f0d2e9a3aaba635ee80b142c5
 DIST proto-subproject-1.2.6.tar.gz 6343 BLAKE2B cffa25c1fbac992db9aee57956615c2a5f8a6e90150d86246218e6d346e566a43527f56cab08b07359bd2f56b1e02b741fb0dbb37ec35fbadd22dfdb2006d3b0 SHA512 f8534c0f6562ce3c770ed9c79b8b78504d6f3aa75001c74ecfa5418af939e88a020ca1cef08d20c62e73c764d66452b5ce212a0f0d2e9a3aaba635ee80b142c5
+DIST proto-subproject-1.3.1.tar.gz 6343 BLAKE2B cffa25c1fbac992db9aee57956615c2a5f8a6e90150d86246218e6d346e566a43527f56cab08b07359bd2f56b1e02b741fb0dbb37ec35fbadd22dfdb2006d3b0 SHA512 f8534c0f6562ce3c770ed9c79b8b78504d6f3aa75001c74ecfa5418af939e88a020ca1cef08d20c62e73c764d66452b5ce212a0f0d2e9a3aaba635ee80b142c5
 DIST xdg-desktop-hyprland-1.1.0.tar.gz 42732 BLAKE2B aa78b9f3a5812988e8324b71cc265c4b2ca23d0b12239c3ac13d068a46200504685da0fb57093f0689101fc2235cb7825646a4669bfe1894928d57a3259df9e3 SHA512 e02fa5bb19ca20cdee9a2e6ad0beb507d96118e095b1e5a1836cc16a35492a9ba5db36b06e5be561adcbf16d8716c38cbb1ed373965416696c69448fbd020c10
 DIST xdg-desktop-hyprland-1.2.2.tar.gz 43233 BLAKE2B 3d3d955596051da3a3384dab75a516a47627175ac584e6c8967ffe83607a99d99b8c8365b04f57976b8fe41917354217ca0bf3cb07f5e64cc099a1fb6fc3ef8a SHA512 10c8a0eb23a65535dcb16c30d42e2a71268d5a05b88f14ff4c1bedc127241e4da6c516217287b3499677c92f06034f8ebc0f743c181d4dd3bf7a35423128e141
 DIST xdg-desktop-hyprland-1.2.5.tar.gz 45688 BLAKE2B d99a399b9e3ff12ddd73293638177b919a37d7922eb35071efdc86f6c5c311995578b1143fd1bb337171aebb9b43b9719957bb40a2a668563fd6ac7dd62c7ad0 SHA512 8ee18e1535a419a146fc7ae2adce53a3fbab8a339ed48594022d525d5892bc979c9ffb6f28da76ec2e4d566213cbeab876470dab8949f218a24bc705877f0c67
 DIST xdg-desktop-hyprland-1.2.6.tar.gz 46109 BLAKE2B e5f714812d8a0eb1a98eef6a19d79b1d9fe6f1a5bc9a499cd8707e73a8b3709552b710c863d6a98aa653dbb5fa1eaf223cc20b4e3991146b5c19d5a7eb2b2870 SHA512 b51a9ea71a8365f5ad08e99e43257794af737a9fb4083b4e00a6d246b45bc6aba0e6204fc480c92a31b665aa836a4cb2193cab7047fadc8a8acf36de4a111516
+DIST xdg-desktop-hyprland-1.3.1.tar.gz 46999 BLAKE2B 17dd6883d90985075dc8bdeb4901ad393fb6ab541aba901536f761464e313e87485a4589f6691321e1e9615817206318362afeaef424ef8f603868ed0d7f26d6 SHA512 8d0f9b97fca4566efe717de6d739d10ec51ce5aa33459940f759fc90543fcca3b094d3e570446c5f82c9146249ce39c00fa215b0b83573a466a9907aec9366f3
--- a/gui-libs/xdg-desktop-portal-hyprland/files/xdg-desktop-portal-hyprland-1.3.1_use_sys_sdbus-c++.patch
+++ b/gui-libs/xdg-desktop-portal-hyprland/files/xdg-desktop-portal-hyprland-1.3.1_use_sys_sdbus-c++.patch
@@ -0,0 +1,32 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 73f429b..e760098 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -38,17 +38,12 @@ add_compile_options(-Wall -Wextra -Wno-unused-parameter -Wno-unused-value
+ message(STATUS "Checking deps...")
+ add_subdirectory(hyprland-share-picker)
+ 
+find_package(sdbus-c++ REQUIRED)
+ find_package(Threads REQUIRED)
+ find_package(PkgConfig REQUIRED)
+ pkg_check_modules(deps REQUIRED IMPORTED_TARGET wayland-client wayland-protocols libpipewire-0.3 libspa-0.2 libdrm gbm hyprlang>=0.2.0)
+ 
+ # check whether we can find sdbus-c++ through pkg-config
+-pkg_check_modules(SDBUS IMPORTED_TARGET sdbus-c++)
+-if(NOT SDBUS_FOUND)
+-    include_directories("subprojects/sdbus-cpp/include/")
+-    add_subdirectory(subprojects/sdbus-cpp)
+-    add_library(PkgConfig::SDBUS ALIAS sdbus-c++)
+-endif()
+ 
+ # same for hyprland-protocols
+ pkg_check_modules(HYPRLAND_PROTOS IMPORTED_TARGET hyprland-protocols)
+@@ -60,7 +55,7 @@ endif()
+ 
+ file(GLOB_RECURSE SRCFILES CONFIGURE_DEPENDS "src/*.cpp")
+ add_executable(xdg-desktop-portal-hyprland ${SRCFILES})
+-target_link_libraries(xdg-desktop-portal-hyprland PRIVATE rt PkgConfig::SDBUS Threads::Threads PkgConfig::deps)
+target_link_libraries(xdg-desktop-portal-hyprland PRIVATE rt sdbus-c++ Threads::Threads PkgConfig::deps)
+ 
+ # protocols
+ find_program(WaylandScanner NAMES wayland-scanner)
--- a/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.3.1.ebuild
+++ b/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.3.1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake toolchain-funcs
+
+DESCRIPTION="xdg-desktop-portal backend for hyprland"
+HOMEPAGE="https://github.com/hyprwm/xdg-desktop-portal-hyprland"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/hyprwm/xdg-desktop-portal-hyprland.git"
+	inherit git-r3
+else
+	PROTO_COMMIT="4d29e48433270a2af06b8bc711ca1fe5109746cd"
+	SRC_URI="https://github.com/hyprwm/xdg-desktop-portal-hyprland/archive/refs/tags/v${PV}.tar.gz \
+		-> xdg-desktop-hyprland-${PV}.tar.gz
+	https://github.com/hyprwm/hyprland-protocols/archive/${PROTO_COMMIT}.tar.gz \
+		-> proto-subproject-${PV}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="elogind systemd"
+REQUIRED_USE="?? ( elogind systemd )"
+
+DEPEND="
+	>=media-video/pipewire-0.3.41:=
+	dev-cpp/sdbus-c++
+	dev-libs/inih
+	dev-libs/wayland
+	dev-qt/qtbase
+	dev-qt/qtcore
+	dev-qt/qtgui
+	dev-qt/qtwayland:6
+	dev-qt/qtwidgets
+	media-libs/mesa
+	sys-apps/util-linux
+	x11-libs/libdrm
+	|| (
+		systemd? ( >=sys-apps/systemd-237 )
+		elogind? ( >=sys-auth/elogind-237 )
+		sys-libs/basu
+	)
+"
+
+RDEPEND="
+	${DEPEND}
+	sys-apps/xdg-desktop-portal
+	dev-libs/hyprlang
+"
+
+BDEPEND="
+	>=dev-libs/wayland-protocols-1.24
+	dev-libs/hyprland-protocols
+	virtual/pkgconfig
+	|| ( >=sys-devel/gcc-13:* >=sys-devel/clang-17:* )
+"
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if tc-is-gcc && ver_test $(gcc-version) -lt 13 ; then
+		eerror "XDPH needs >=gcc-13 or >=clang-17 to compile."
+		eerror "Please upgrade GCC: emerge -v1 sys-devel/gcc"
+		die "GCC version is too old to compile XDPH!"
+	elif tc-is-clang && ver_test $(clang-version) -lt 17 ; then
+		eerror "XDPH needs >=gcc-13 or >=clang-17 to compile."
+		eerror "Please upgrade Clang: emerge -v1 sys-devel/clang"
+		die "Clang version is too old to compile XDPH!"
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+	else
+		default
+		rmdir "${S}/subprojects/hyprland-protocols" || die
+		mv "hyprland-protocols-${PROTO_COMMIT}" "${S}/subprojects/hyprland-protocols" || die
+	fi
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/xdg-desktop-portal-hyprland-1.3.1_use_sys_sdbus-c++.patch"
+	sed -i "/add_compile_options(-O3)/d" "${S}/CMakeLists.txt" || die
+	cmake_src_prepare
+}
--- a/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-9999.ebuild
+++ b/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8

-inherit systemd cmake toolchain-funcs
+inherit cmake toolchain-funcs

 DESCRIPTION="xdg-desktop-portal backend for hyprland"
 HOMEPAGE="https://github.com/hyprwm/xdg-desktop-portal-hyprland"
@@ -48,6 +48,7 @@ DEPEND="
 RDEPEND="
 	${DEPEND}
 	sys-apps/xdg-desktop-portal
+	dev-libs/hyprlang
 "

 BDEPEND="
@@ -82,36 +83,7 @@ src_unpack() {
 }

 src_prepare() {
-	eapply "${FILESDIR}/xdg-desktop-portal-hyprland-1.2.6_use_sys_sdbus-c++.patch"
+	eapply "${FILESDIR}/xdg-desktop-portal-hyprland-1.3.1_use_sys_sdbus-c++.patch"
 	sed -i "/add_compile_options(-O3)/d" "${S}/CMakeLists.txt" || die
 	cmake_src_prepare
 }
-
-src_compile() {
-	cmake_src_compile all
-}
-
-src_install() {
-	LIBEXEC="/usr/libexec"
-	SYSTEMD_SERVICE="${S}/contrib/systemd/xdg-desktop-portal-hyprland.service"
-	DBUS_SERVICE="${S}/org.freedesktop.impl.portal.desktop.hyprland.service"
-
-	cmake_src_install
-
-	exeinto $LIBEXEC
-	doexe "${BUILD_DIR}/xdg-desktop-portal-hyprland"
-
-	insinto /usr/share/xdg-desktop-portal/portals
-	doins "${S}/hyprland.portal"
-
-	# systemd service
-	sed -i "s|@libexecdir@|${LIBEXEC}|g" "${SYSTEMD_SERVICE}.in" || die
-	mv "${SYSTEMD_SERVICE}.in" "${SYSTEMD_SERVICE}" || die
-	systemd_douserunit "${SYSTEMD_SERVICE}"
-
-	# dbus service
-	sed -i "s|@libexecdir@|${LIBEXEC}|g" "${DBUS_SERVICE}.in" || die
-	mv "${DBUS_SERVICE}.in" "${DBUS_SERVICE}"
-	insinto /usr/share/dbus-1/services/
-	doins "${DBUS_SERVICE}"
-}
--- a/media-sound/tidal-hifi-bin/Manifest
+++ b/media-sound/tidal-hifi-bin/Manifest
@@ -1 +1 @@
-DIST tidal-hifi-bin-5.7.1.tar.gz 102968892 BLAKE2B 8f6399f9584f5d9e69bb7c5ca0cf47ae5b3f0e23d4052609c865f6552f4971345280bdc390a32cac0e5426e6d7109a3ad04866ea5fae7132c2d5460f1585c717 SHA512 b691161a061f6bfe5c88dbbb1f28dfc669ed889063a3a21f52cd3e1adc792fd6d267ca88c242c32bff1cedfd5e1b51e54163c522ebe6f2ee93216ede2cc66531
+DIST tidal-hifi-bin-5.8.0.tar.gz 110335163 BLAKE2B c2115b28014fae7a07ecabb2bf8c0653b3b897e9ea964a76c658c2eec5a25d213933c6a02609029e47ed04f6f26b99e6be0208b0f08a3f34506aa18d04642293 SHA512 91832766324ea3a65670bed19d40d8eb2e06385545200413fadd760db4d13674334a6ad007c3e2c605baccedf36ff2e5744152b593fc38135e4b38b99cf414ca
--- a/media-sound/tidal-hifi-bin/tidal-hifi-bin-5.8.0.ebuild
+++ b/media-sound/tidal-hifi-bin/tidal-hifi-bin-5.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
--- a/media-video/wl-screenrec/wl-screenrec-0.1.2.ebuild
+++ b/media-video/wl-screenrec/wl-screenrec-0.1.2.ebuild
@@ -107,6 +107,7 @@ SRC_URI="
 LICENSE="Apache-2.0 BSD Boost-1.0 ISC MIT Unicode-DFS-2016 Unlicense WTFPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
+RESTRICT="test" # Need wayland environment for tests

 BDEPEND="
 	media-video/ffmpeg
--- a/net-im/chatterino/Manifest
+++ b/net-im/chatterino/Manifest
@@ -1,9 +1,10 @@
-DIST chatterino-2.3.5.tar.gz 1753250 BLAKE2B 0f723439d582af3d1cf386f186b1a71c93efab4c3edebd1f2cccc94cff2876a91087ced264a065233448a96be80df1071e4ae8f01ac021dea4a1aa65a9860cac SHA512 b3c28dea751bb6e7f9b44dfcc34d508ac89528a46c72f863957149519f2c229822165a073c3004baa1347dc0a78d7deec37dd0a1dd6f9674209d4a72427a823f
-DIST libcommuni-a7b32cd.tar.gz 477832 BLAKE2B 97c9f2bb01153220466a6b82e576a80acb733e866817c3add0f5206d131a5f1e43889a7b89253f7648ac035839e261fdab6ff7de13e83f2633be96901aa2340d SHA512 66369c1650b0c3f91cceb3645c5cbcec9ae3bc002a16bb9a54d85b4042eac90c324bff44d037512e4ad67919bef77ba4aebdb368fd484c901aacd0049aa4b837
-DIST qtkeychain-de95462.tar.gz 45283 BLAKE2B cee78a9afed2c9bbea664b723264fdf67fee555b5cc20189bd51acb69e025749e5adffa3cb4325d2ffbd3947717029677a80ab2bd1f90ebca970b3b64702d1a9 SHA512 563c8a5a931cecb8982d8c5d8e196f77a61953539a3b5f0ebe83de243ac1c7748c15b656cbfb4d7343be121dd55986da225e20c126779ec218d14a03c6b5a722
+DIST chatterino-2.4.6.tar.gz 1899260 BLAKE2B 8527ccf49dec7e1b4c5e7551f8d4d07e309db0744fe736cf033e2b9bcef614f4cae7066f6a5b1b8eca83f2e0bdf4c9847035a3ffc1fbfde14442aa7e35d3d47f SHA512 6bd42cd88e144ca29cf85e1ad86dc06843140fe3841e4304fdb8e3d6ecb5e70739d88e190cca05e4608966c9b5817ff176c34d430d29a024368fbcd7889392b6
+DIST libcommuni-030710a.tar.gz 477847 BLAKE2B 5da62609ee0551f8aa722fa6da5427297dc960de87733a88d54dc75e9db061664bfa42955b1cb30bb27ebb1668138c80bd6e8f1f932ecec096dd1ffb026557b8 SHA512 4a056c6c69b5a6b1f29118034f7769de68f06c99549714272f515182e118bb744ba43956795ec42f1b283c89c30db53b19ac27988c31d185132ce71741e3b062
+DIST magic_enum-e1a68e9.tar.gz 172016 BLAKE2B 08742840e395c125e8ab06039dfe6d0a98085660ae6c8aa560be4d48672d8123f0219dfddda3000236100331b051d06b0570ee30ee671b90dd96678f5f701161 SHA512 76a88937e713d0560f915d6ea68b03bdca0acb81d5644b02e25fd0ed3427cddcad93634d095c9b002d0f97589c5bd1b26cc9a56ca9ccf9f6d1b3d46866b8c110
+DIST miniaudio-3898fff.tar.gz 1454527 BLAKE2B b891ad87adbdf330db9c29a9ae522651c8c2047e2726f921a6de3d6c06a2fb9ccdd572687f4f725dcb0f3cab888584688ae2a55c23e3e6375d834e693d6f7b7c SHA512 c1d6c5c846e648b975dae34eea437ba4b4b999f6ba64298171853abcdc2649b29fb55789dd8332835e9f5089274ebe6c7c6f12f42f146e60cb56b6a24960c652
 DIST rapidjson-d87b698.tar.gz 1057391 BLAKE2B 37364a1e1ac33ed3b4751dd8826d9f0af237d2402c686937e185ea32819ea2e3c03bff3846ccccb3472ae4d9bf310cf5fdd7162f7daa53b12efeb49cdcd323ab SHA512 1770668c954e1bfa40da3956ccf2252703d2addb058bb8c0bf579abac585262452d0e15dcfed9ac2fa358c0da305d706226fdab8310b584017aba98e4f31db4f
-DIST sanitizers-cmake-99e159e.tar.gz 7339 BLAKE2B e600886c9afed2681ea7ad5fd9900af7d3f98a7d96291af7c9ef648be438d149e86ee143f3fa5af0dee08457008ce66be43177adcac79401ef025ddd0d8d40fe SHA512 61df4641f3dbeca38cff44336df6fcea75d02d97135a677df51a02353b5580a96dd77af268bd42944afe36a58512fd948200098ea96a41d20ec503fc33a69421
-DIST serialize-7d37cbf.tar.gz 9033 BLAKE2B 4de939d3850113aed18b3ef2d1915bc97d068abfcdbf7e1f97a881a2cefa0a46dca9dcec91392845b8caef44d05266b2c2b3684407d013f67cbdd79ab78a83ee SHA512 14b7abd15b2bb2357071d4be1d92079a610554d6da48f6f53234da81f116cf9f2db2c84ae197f779f499e53dab79db139b8191f8f4821308f8fe17079d3e05e1
-DIST settings-04792d8.tar.gz 111204 BLAKE2B 190e93cb2deeab5c261a72e71509edbb8b334461648e7a8b75d08e6ed65d988e539cf28e6d575c880b2dba549d35cf2a5a66351ea4999324e4061d3e92cc844f SHA512 5df5cefa950290b8cb96c8ddc884dd8b8e119161b8949ced4fd56edb8602616b29067c6a2aa6b86eb54628bf5c64621641a07cba600609a8a51abd88e1c72395
-DIST signals-25e4ec3.tar.gz 10063 BLAKE2B 58bbaaaf9685d2b47f60fd327b72bb49cfb7374809cf3c29bb345badece7c2c0d315e6798fb73ae74d903512300d1f1067742cb757f9b2adf95dfdc3501255bb SHA512 9f7e9212b3c9fcf1c490303d404b9fe92a49e161d71b41b1b262eaf4329064672b61884a4217466f8c4670b79c68f1a998c7fe9f837218fb23a383d9f2f4c4e0
-DIST websocketpp-1b11fd3.tar.gz 701611 BLAKE2B c55b9f6d5e0ea22b4dcbe7eafb96a920e77181417366fc89685ea735ae482de8286a88e6c0b4e1f614a2cd392bc290fb8bab5c296ff4c2ee5a8976fd1e91e62d SHA512 7ff63bac4c00a34d4db92dd0318dc38981f7ee2f45fcc24d6bde4baac2e099e90d96b26ec2c9f958d2ea44845b2cbcff02a2e376d0ee10975b02b7d26fc3d3bc
+DIST sanitizers-cmake-c3dc841.tar.gz 7433 BLAKE2B 4a49004309460a62a26ece8f1964106a0fd1d3790274f38d94c2b3a05fbb6ca32e2f6864bb5b93a4607d0e7b2e980b3952378adddd852ecfa79287899624443b SHA512 ef8704d1b47fb3b36f8101f0f0df40b6c4235ea657edeedce4d641e5fe68503639af457e21aa75e5eaa559aea440edf5dd63a643fd09551ba503c5324cc9b569
+DIST serialize-bbf0a34.tar.gz 10279 BLAKE2B c814cdcdac5143cdf7b8bc3d64f28b5c7f10cd809e5115f7b07f7c3ab413930dc57bb29c6af51c7c362a487d0a69fa74c7025e16621d80a011c71218d2219bd5 SHA512 8c1b44c6fbfa1c30f25cef842e36486d1e9e0a50ce13f82e76e6539f64f44db993a51091d7e9c34c3a0f7530097ef76b34079bff06ad74b6bd691593f7de5e50
+DIST settings-f168c09.tar.gz 35679 BLAKE2B f6fae9c67d845eee736c7589bb7c9b644b17b8e4dc23a0372e3e220ec92db102443dd94d65b19e01986c2316b20fa37329d9dab547c2b85368e298f4dd511d0f SHA512 8538255dffe41133ddd92ef780313b8ce91aa237f0061c100139a63354551d2800845ab5806b4e93f34178ad45e08f1126b3f5404b5eca78ef87856bb4de1e4c
+DIST signals-6561aa5.tar.gz 14645 BLAKE2B 35302a32756dc9c007a980689e52fb3a59204e59f147012f700073b5bea01f820d8983ce45273eb987d271676e8c8d64430d296e789c332afcb3c190d0c7a54a SHA512 a332f947a3d669843ed9d4b3a9d9f7d071e9702c74b8fe80f0081941c26e2bfdbb8d9a273530f744930e22138eed4f811206e2f6bb6d3e8460ccd276bc5e03bc
+DIST websocketpp-b9aeec6.tar.gz 716277 BLAKE2B 4e43e5a1c49215d5cdbe64a526dcfd31637c0b463a74b7b49857fdcd0a2e1e7ca3060b1ff3043df6ae1f2445d55e14cc3a5ef40b11392c74e5e3e1ae37c23817 SHA512 5449a10086c1b80d0d2865bac90539f64613156050816e97a2da1a2bc1f6710ac72305747e839a13e49b2ce1b25610480c110743aef60d7d148f2c39339289c4
--- a/net-im/chatterino/chatterino-2.3.5-r3.ebuild
+++ b/net-im/chatterino/chatterino-2.3.5-r3.ebuild
@@ -1,64 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake optfeature xdg-utils
-
-DESCRIPTION="Chat client for https://twitch.tv"
-HOMEPAGE="https://chatterino.com/"
-SRC_URI="https://github.com/Chatterino/chatterino2/archive/v${PV}.tar.gz -> ${P}.tar.gz
-https://github.com/Chatterino/libcommuni/archive/a7b32cd.tar.gz -> libcommuni-a7b32cd.tar.gz
-https://github.com/Chatterino/qtkeychain/archive/de95462.tar.gz -> qtkeychain-de95462.tar.gz
-https://github.com/Tencent/rapidjson/archive/d87b698.tar.gz -> rapidjson-d87b698.tar.gz
-https://github.com/zaphoyd/websocketpp/archive/1b11fd3.tar.gz -> websocketpp-1b11fd3.tar.gz
-https://github.com/pajlada/serialize/archive/7d37cbf.tar.gz -> serialize-7d37cbf.tar.gz
-https://github.com/pajlada/signals/archive/25e4ec3.tar.gz -> signals-25e4ec3.tar.gz
-https://github.com/pajlada/settings/archive/04792d8.tar.gz -> settings-04792d8.tar.gz
-https://github.com/arsenm/sanitizers-cmake/archive/99e159e.tar.gz -> sanitizers-cmake-99e159e.tar.gz
-"
-
-S=${WORKDIR}/chatterino2-${PV}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-BDEPEND="dev-qt/qtsvg:5
-	dev-qt/qtconcurrent:5
-	dev-qt/linguist-tools:5
-	dev-libs/boost"
-RDEPEND="dev-qt/qtcore:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtdbus:5
-	dev-libs/openssl:="
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	rmdir --ignore-fail-on-non-empty ./lib/*/ ./cmake/*/ || die
-	ln -sr ../libcommuni-* ./lib/libcommuni || die
-	ln -sr ../qtkeychain-* ./lib/qtkeychain || die
-	ln -sr ../rapidjson-* ./lib/rapidjson || die
-	ln -sr ../websocketpp-* ./lib/websocketpp || die
-	ln -sr ../serialize-* ./lib/serialize || die
-	ln -sr ../signals-* ./lib/signals || die
-	ln -sr ../settings-* ./lib/settings || die
-	ln -sr ../sanitizers-cmake-* ./cmake/sanitizers-cmake || die
-	cmake_src_prepare
-}
-
-src_install() {
-	cmake_src_install
-	mv "${D}"/usr/share/icons/hicolor/256x256/apps/{com.chatterino.,}chatterino.png || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	optfeature "for opening streams in a local video player" net-misc/streamlink
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
--- a/net-im/chatterino/chatterino-2.4.6.ebuild
+++ b/net-im/chatterino/chatterino-2.4.6.ebuild
@@ -0,0 +1,80 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake optfeature xdg-utils
+
+DESCRIPTION="Chat client for https://twitch.tv"
+HOMEPAGE="https://chatterino.com/"
+SRC_URI="
+	https://github.com/Chatterino/chatterino2/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/Chatterino/libcommuni/archive/030710a.tar.gz -> libcommuni-030710a.tar.gz
+	https://github.com/Neargye/magic_enum/archive/e1a68e9.tar.gz -> magic_enum-e1a68e9.tar.gz
+	https://github.com/mackron/miniaudio/archive/3898fff.tar.gz -> miniaudio-3898fff.tar.gz
+	https://github.com/Tencent/rapidjson/archive/d87b698.tar.gz -> rapidjson-d87b698.tar.gz
+	https://github.com/pajlada/serialize/archive/bbf0a34.tar.gz -> serialize-bbf0a34.tar.gz
+	https://github.com/pajlada/settings/archive/f168c09.tar.gz -> settings-f168c09.tar.gz
+	https://github.com/pajlada/signals/archive/6561aa5.tar.gz -> signals-6561aa5.tar.gz
+	https://github.com/zaphoyd/websocketpp/archive/b9aeec6.tar.gz -> websocketpp-b9aeec6.tar.gz
+	https://github.com/arsenm/sanitizers-cmake/archive/c3dc841.tar.gz -> sanitizers-cmake-c3dc841.tar.gz
+"
+
+S=${WORKDIR}/chatterino2-${PV}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/openssl:=
+	dev-libs/qtkeychain:=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+"
+DEPEND="
+	${RDEPEND}
+	dev-libs/boost
+"
+BDEPEND="dev-qt/linguist-tools:5"
+
+src_prepare() {
+	rmdir --ignore-fail-on-non-empty ./lib/*/ ./cmake/*/ || die
+	ln -sr ../libcommuni-* ./lib/libcommuni || die
+	ln -sr ../magic_enum-* ./lib/magic_enum || die
+	ln -sr ../miniaudio-* ./lib/miniaudio || die
+	ln -sr ../rapidjson-* ./lib/rapidjson || die
+	ln -sr ../serialize-* ./lib/serialize || die
+	ln -sr ../settings-* ./lib/settings || die
+	ln -sr ../signals-* ./lib/signals || die
+	ln -sr ../websocketpp-* ./lib/websocketpp || die
+	ln -sr ../sanitizers-cmake-* ./cmake/sanitizers-cmake || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_SYSTEM_QTKEYCHAIN=ON
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	mv "${D}"/usr/share/icons/hicolor/256x256/apps/{com.chatterino.,}chatterino.png || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	optfeature "for opening streams in a local video player" net-misc/streamlink
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
--- a/sci-biology/cmdock/cmdock-0.2.0-r1.ebuild
+++ b/sci-biology/cmdock/cmdock-0.2.0-r1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+BOINC_APP_OPTIONAL="true"
+inherit boinc-app flag-o-matic meson optfeature python-any-r1
+
+DESCRIPTION="Program for docking ligands to proteins and nucleic acids"
+HOMEPAGE="https://gitlab.com/Jukic/cmdock"
+SRC_URI="https://gitlab.com/Jukic/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
+S="${WORKDIR}/${PN}-v${PV}"
+
+LICENSE="LGPL-3 ZLIB"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="apidoc boinc cpu_flags_x86_sse2 doc test"
+
+# Flaky tests
+RESTRICT="test"
+
+RDEPEND="
+	boinc? ( sci-misc/boinc-wrapper )
+"
+DEPEND="
+	dev-cpp/eigen:3
+	>=dev-cpp/indicators-2.3-r1
+	>=dev-cpp/pcg-cpp-0.98.1_p20210406-r1
+	>=dev-libs/cxxopts-3
+"
+BDEPEND="
+	apidoc? (
+		app-doc/doxygen
+		dev-texlive/texlive-fontutils
+	)
+	doc? (
+		$(python_gen_any_dep '
+			dev-python/insipid-sphinx-theme[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+		')
+	)
+	test? ( ${PYTHON_DEPS} )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-include.patch
+	"${FILESDIR}"/${P}-cxxopts.patch
+)
+
+DOCS=( README.md changelog.md )
+
+BOINC_MASTER_URL="https://www.sidock.si/sidock/"
+BOINC_INVITATION_CODE="Crunch_4Science"
+BOINC_APP_HELPTEXT=\
+"The easiest way to do something useful with this application
+is to attach it to SiDock@home BOINC project."
+
+INSTALL_PREFIX="${EPREFIX}/opt/${P}"
+
+python_check_deps() {
+	use doc || return 0
+
+	python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/insipid-sphinx-theme[${PYTHON_USEDEP}]"
+}
+
+foreach_wrapper_job() {
+	sed -e "s:@PREFIX@:${INSTALL_PREFIX}:g" -i "${1}" || die
+}
+
+src_prepare() {
+	default
+	python_fix_shebang "${S}"/bin
+}
+
+src_configure() {
+	# very weird directory layout
+	local emesonargs=(
+		--prefix="${INSTALL_PREFIX}"
+		$(meson_use apidoc)
+		$(meson_use doc)
+		$(meson_use test tests)
+		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+	)
+	meson_src_configure
+
+	use cpu_flags_x86_sse2 || append-cppflags "-DBUNDLE_NO_SSE"
+}
+
+src_install() {
+	meson_src_install
+	python_optimize "${D}${INSTALL_PREFIX}"/bin
+
+	if use boinc; then
+		doappinfo "${FILESDIR}"/app_info_${PV}.xml
+		dowrapper cmdock-l
+
+		# install cmdock executable
+		exeinto "$(get_project_root)"
+		exeopts --owner root --group boinc
+		newexe "${D}${INSTALL_PREFIX}"/bin/cmdock cmdock-${PV}
+
+		# install a blank file
+		touch "${T}"/docking_out || die
+		insinto "$(get_project_root)"
+		insopts --owner root --group boinc
+		doins "${T}"/docking_out
+	fi
+}
+
+pkg_postinst() {
+	optfeature "sdtether.py and sdrmsd.py scripts" "dev-python/numpy sci-chemistry/openbabel[python]"
+	use boinc && boinc-app_pkg_postinst
+}
+
+pkg_postrm() {
+	use boinc && boinc-app_pkg_postrm
+}
--- a/sci-biology/cmdock/cmdock-0.2.0.ebuild
+++ b/sci-biology/cmdock/cmdock-0.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8

-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 BOINC_APP_OPTIONAL="true"
 inherit boinc-app flag-o-matic meson optfeature python-any-r1

--- a/sci-biology/cmdock/files/cmdock-0.2.0-cxxopts.patch
+++ b/sci-biology/cmdock/files/cmdock-0.2.0-cxxopts.patch
@@ -0,0 +1,122 @@
+Update to cxxopts 3.0
+
+--- a/meson.build
+++ b/meson.build
+@@ -40,7 +40,7 @@ if cpp_compiler.get_id() == 'msvc'
+   message('Applying workaround for MSVC by adding flag /Zc:twoPhase-: https://stackoverflow.com/questions/56782470/why-do-i-have-warning-c4199-two-phase-name-lookup-is-not-supported-for-c-cli')
+ endif
+ 
+-cxxopts_dep = dependency('cxxopts', fallback : ['cxxopts', 'cxxopts_dep'])
+cxxopts_dep = dependency('cxxopts', version : '>=3.0', fallback : ['cxxopts', 'cxxopts_dep'])
+ eigen3_dep = dependency('eigen3', fallback : ['eigen', 'eigen_dep'])
+ openmp_dep = dependency('openmp', required : false)
+ 
+diff --git a/src/exe/cmcavity.cxx b/src/exe/cmcavity.cxx
+index 427d3c0..3a5c747 100644
+--- a/src/exe/cmcavity.cxx
+++ b/src/exe/cmcavity.cxx
+@@ -41,7 +41,7 @@ void PrintHeaderAddon(std::ostream &outputStream) {
+ // MAIN PROGRAM STARTS HERE
+ /////////////////////////////////////////////////////////////////////
+ 
+-int main(int argc, char *argv[]) {
+int main(const int argc, const char *argv[]) {
+   // Handle obsolete arguments, if any
+   for (int i = 0; i < argc; i++) {
+     std::string opt = argv[i];
+@@ -451,7 +451,7 @@ int main(int argc, char *argv[]) {
+ 
+       logFile.close();
+     }
+-  } catch (const cxxopts::OptionException &e) {
+  } catch (const cxxopts::exceptions::exception &e) {
+     std::cout << "Error parsing options: " << e.what() << std::endl;
+     return 1;
+   } catch (RbtError &e) {
+@@ -463,4 +463,4 @@ int main(int argc, char *argv[]) {
+   _RBTOBJECTCOUNTER_DUMP_(std::cout)
+ 
+   return 0;
+-}
+\ No newline at end of file
+}
+diff --git a/src/exe/cmdock.cxx b/src/exe/cmdock.cxx
+index 10e18ca..86bbff1 100644
+--- a/src/exe/cmdock.cxx
+++ b/src/exe/cmdock.cxx
+@@ -80,7 +80,7 @@ void printHelpFooter() {
+ // MAIN PROGRAM STARTS HERE
+ /////////////////////////////////////////////////////////////////////
+ 
+-int main(int argc, char *argv[]) {
+int main(const int argc, const char *argv[]) {
+   // Handle premature termination
+   signal (SIGINT, terminator);
+   
+@@ -941,7 +941,7 @@ int main(int argc, char *argv[]) {
+     log << "Thank you for using " << Rbt::GetProgramName() << " "
+               << Rbt::GetVersion() << "." << std::endl;
+     logFile.close();
+-  } catch (const cxxopts::OptionException &e) {
+  } catch (const cxxopts::exceptions::exception &e) {
+     std::cout << "Error parsing options: " << e.what() << std::endl;
+     return 1;
+   } catch (RbtError &e) {
+@@ -953,4 +953,4 @@ int main(int argc, char *argv[]) {
+   _RBTOBJECTCOUNTER_DUMP_(std::cout)
+ 
+   return 0;
+-}
+\ No newline at end of file
+}
+diff --git a/src/exe/cmmoegrid.cxx b/src/exe/cmmoegrid.cxx
+index 4bff8f3..bf74b52 100644
+--- a/src/exe/cmmoegrid.cxx
+++ b/src/exe/cmmoegrid.cxx
+@@ -57,7 +57,7 @@ RbtModelList CreateProbes(std::string anAtomTypeStr) {
+ // MAIN PROGRAM STARTS HERE
+ /////////////////////////////////////////////////////////////////////
+ 
+-int main(int argc, char *argv[]) {
+int main(const int argc, const char *argv[]) {
+   std::cout.setf(std::ios_base::left, std::ios_base::adjustfield);
+ 
+   // Strip off the path to the executable, leaving just the file name
+@@ -268,7 +268,7 @@ int main(int argc, char *argv[]) {
+       }
+       std::cout << "done." << std::endl;
+     }
+-  } catch (const cxxopts::OptionException &e) {
+  } catch (const cxxopts::exceptions::exception &e) {
+     std::cout << "Error parsing options: " << e.what() << std::endl;
+     return 1;
+   } catch (RbtError &e) {
+diff --git a/src/exe/cmzip.cxx b/src/exe/cmzip.cxx
+index 1d1f69a..043d7be 100644
+--- a/src/exe/cmzip.cxx
+++ b/src/exe/cmzip.cxx
+@@ -504,7 +504,7 @@ void rescue(cxxopts::ParseResult result){
+ }
+ 
+ // ENTRY POINT
+-int main(int argc, char *argv[]) {
+int main(const int argc, const char *argv[]) {
+   // Handle premature termination
+   signal (SIGINT, terminator);
+ 
+@@ -580,7 +580,7 @@ Use this if CmDock terminates prematurely. CmZIP will search for records in the
+       return 0;
+     }
+ 
+-  } catch (const cxxopts::OptionException &e) {
+  } catch (const cxxopts::exceptions::exception &e) {
+     std::cout << "Error parsing options: " << e.what() << std::endl;
+     return 1;
+   } catch (const std::exception &exc) {
+@@ -589,4 +589,4 @@ Use this if CmDock terminates prematurely. CmZIP will search for records in the
+   /*} catch (...) {
+       std::cout << "Unknown exception" << std::endl;
+   }*/
+-}
+\ No newline at end of file
+}
--- a/sci-biology/cmdock/files/cmdock-0.2.0-include.patch
+++ b/sci-biology/cmdock/files/cmdock-0.2.0-include.patch
@@ -0,0 +1,19 @@
+Rbt.cxx: Add missing include
+
+--- a/src/lib/Rbt.cxx
+++ b/src/lib/Rbt.cxx
+@@ -15,6 +15,7 @@
+ #include <algorithm> //For sort
+ #include <climits>   //For PATH_MAX
+ #include <cstdlib>   //For getenv
+#include <cstdint>   //For int types
+ #include <ctime>     //For time functions
+ #include <dirent.h>  //For directory handling
+ #include <fstream>   //For ifstream
+@@ -581,4 +582,4 @@ bool Rbt::endsWith (std::string const &fullString, std::string const &ending) {
+     } else {
+         return false;
+     }
+-}
+\ No newline at end of file
+}
--- a/sci-biology/cmdock/files/cmdock-l_job_0.2.0.xml
+++ b/sci-biology/cmdock/files/cmdock-l_job_0.2.0.xml
@@ -0,0 +1,15 @@
+<job_desc>
+	<task>
+		<application>cmdock</application>
+		<stdout_filename>docking_log</stdout_filename>
+		<command_line>-c -j 1 -b 1 -x -r target.prm -p "@PREFIX@/data/scripts/dock.prm" -f htvs.ptc -i ligands.sdf -o docking_out</command_line>
+		<checkpoint_filename>docking_out.chk</checkpoint_filename>
+		<fraction_done_filename>docking_out.progress</fraction_done_filename>
+		<setenv>CMDOCK_ROOT=@PREFIX@</setenv>
+		<setenv>LD_LIBRARY_PATH=@PREFIX@/lib:$LD_LIBRARY_PATH</setenv>
+		<setenv>PERL5LIB=@PREFIX@/lib:$PERL5LIB</setenv>
+	</task>
+	<unzip_input>
+		<zipfilename>ligands.zip</zipfilename>
+	</unzip_input>
+</job_desc>
--- a/sys-devel/just/Manifest
+++ b/sys-devel/just/Manifest
@@ -9,6 +9,7 @@ DIST camino-1.1.6.crate 30519 BLAKE2B 3696bee362c9a6c7331079f86823aede0df06c1c36
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST clap-2.34.0.crate 202210 BLAKE2B f383adf1d757ac4b68995132b33837686ce451f85a02a8d05d2c746da398510d05d46330f3efade063c3952aacb1754cdac73dd0afcae0df5340a89f9353aa1c SHA512 c648a761b9996a7e7464a538bb53621bae22090b846a42c3b729beca3363958ae67e3da9f93f58b10a10e043cadf7ff930388680d168646178c2824177832db8
 DIST cpufeatures-0.2.11.crate 12727 BLAKE2B 5b91dffb779e437606db9b75d2b05c2de19069575a8272112e9a0389f5bd8de0f753cd90330b5a5bb6a3f84c9e794e96328664557db31c43853ba43097229efc SHA512 af179e269a4d5f48b50134a5e98ac541a9a0d6aa34f13fb8fd9ce8d5092352e1b322437254449ecb1bce608d8558b1cca2c79232ac1327efd887193bd1d36031
+DIST cpufeatures-0.2.12.crate 12837 BLAKE2B 5b518c58c548d9116f94cefc2214fe2faf87c3aaf3fffbb0bf4085f75372cf7fc5144bc3f827101a3a14a51363d06d8075db94ff5ed853ab2ccffaf597728093 SHA512 52742595702fc3371d4126fb355f3d7a6da514a94e43170f1db041cc6c560027f92115eab7846131dba1018ca5c72003ae36f945c1de88d57a0e7f66331623c6
 DIST cradle-0.2.2.crate 30309 BLAKE2B cb0da3568421d31f2b40a308d3b76b6bd1ed70a9e435182bea8b67c208c22f05cdb315692dbeb6068179c7c1a196f22e6e6255a24b3411927c6ae57149387f48 SHA512 a020f5c0a0b17b2645c28939d62fc27d4be476ac67579ffc4977e8d2a7746f7367facdd3bad54e4616ba5a3406667f738a90767cf759e76c4311aab703e43dea
 DIST crypto-common-0.1.6.crate 8760 BLAKE2B f2422bfb89c15d47a8f91c8f6695e05eb56990a922e3cdf3d426044736f9932324c0d899a151a6df4d6683e6a6b21659c657d3988734014c02cd854bb4b924e7 SHA512 471dbc43f517089d2cfe0868e29510c6ca579875b3bb5d013c70796db969b609b6c4bb35c9a07b9a2917012dc5708b717d48e317a20038adbe7e7039bf3ada6f
 DIST ctrlc-3.4.2.crate 14171 BLAKE2B 65bcbaff2a58a78370888e988e52bdf7b8c1dec5963854374a87fa31b4db633f41b7a7e9965027411c14b089680eaaf32db1ab26ceeebaecbe09c0c3b5e1fce9 SHA512 99fc52445a51438bbbefefedf6409efc6b9c8db8f8932bde8eebeda3bfa952d116923b6ea9762e3bd28521ddee17ca1c8fb9b24cf8fe287063ec2ffc696ec408
@@ -38,9 +39,11 @@ DIST is-terminal-0.4.10.crate 7683 BLAKE2B 9b7cdea9ad36be80fe334a05d89c36154d08a
 DIST itoa-1.0.10.crate 10534 BLAKE2B 8ffcb345d07070cc01651fd44c19f3e0659185eda733c407fd4be0955a301879ae1272dae7f425279dae8dcb7f7dc954465c9a09b5c521938a503d34fecfe2a7 SHA512 fc496be0873e31afa6ddf7f2958030f8fcb517cadb86a48280a0c50ce50460afda189af1e6c26e5ff6f85c750d772c21503864c32b526c4fe4bcdb5b07918538
 DIST just-1.21.0.crate 223872 BLAKE2B 393c4f0809131b577438cdfca4d0062709fecacc26242c3446125875ef8764b805e7d4afb87fc4f8c70ab0f6ae4649707b86fee11070a322ba387eda96121bbe SHA512 cbe66707c322a7fa412554359863bdda9cfbe78b26775b6d0f5a6732f7b7ddda3d7e2c26d836265cafa0fab3b8776551d83a4c26fab9844d02d3e1fe031ea833
 DIST just-1.22.0.crate 224226 BLAKE2B 4573bb6f077ace702f9f667f5b155c93928a7478dc90e7291912e43b2cefc78acf39bca072dc2a9f578a34fa86ea590e6f356076c6549e8b45952ac88851e6e5 SHA512 3981f46a3ff75ba56cff5c5ed4055045af73332e46d5257d963f83e395c17addf03e7814a99f874262a3650b18e360105e41057c39f9dc4f18deb5200fff35e4
+DIST just-1.22.1.crate 224846 BLAKE2B 2e2cacb203580c8d5380dcf00acb0bf1913ad03aceb938791513a24364758126609447f7fae94017a7d4707d0f6ba8d8b43bd4abecad1afd6175cb016fe5ec31 SHA512 cf7e01815e817acfd6135a4af8aecca0e54c5b625afa64758874489f28453234ddf53c43e2f1ccad83ace5285f36fcfcd08ff60e20832956bc040bfefe42b271
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST lexiclean-0.0.1.crate 5362 BLAKE2B c60a82de8de091263d24c8f5de8f04f7a0908b7689d24daff1f85548ca158cc7f81f84a55ec50f4499fea237a26a7892a594f6d5319b2232db06232a0428a291 SHA512 5f60056a6830fcd21ece4fbdbaba5cf4b8bf33d85aa520c32de44a2f821c6dab60d2c9ec108981bd081f394e216ae45b62c9aa7f223eaf6702dd0586157ec868
 DIST libc-0.2.151.crate 736640 BLAKE2B ba8ea6d22b0eefdc5c1c5ee9fab960b6ea0eb7098a21b032563ec78b5d6e2a8f1d7ca4d5bb721c71de2c5de28e105029f229b9b03cd5168c78a65c7164e6d07d SHA512 2039bdfd704c5a876ff7d609622bb968260d6e0fd264ca457e92b75660503eca10e1ff21864b3c919d2656de521f03ef443895f5c0150271ae2502857742b0ec
+DIST libc-0.2.152.crate 740278 BLAKE2B 8eecde477063207d77b6894d6f9194c8dd10e55b69585e3d66296eaa0b9d3f6e2d033e667207182bf4c3cf31f6d38820c9187b2006f4b5ebee898adafb4b2751 SHA512 1722f6f52077efab90026aae3d10306f8c38ebba95366593c3c1adf707fae121ab450064ad9e8be5a667caf6af0b90fad4d1ca1009db0f2220093c44e33c4b5c
 DIST libredox-0.0.1.crate 4212 BLAKE2B fecbb90e2842a69f3967bb2a09b0181dce1720b60c5d762a334a279b52c00a9b4b52de72c6484603981c0c3e1cd8e173ef5e15fa290ce8b8888739204956be92 SHA512 31a9234201f5128f1519e108f7424d1740a67699828265cc725304a70f6a51e139f1d0c0e626b487857a7b421f25ad93e81b95b65cf0d3e0ad912388deecfb41
 DIST linked-hash-map-0.5.6.crate 15049 BLAKE2B 0f30e388633c60433dcbee353507f1c6857bd210f0b61a4d166a9b95067bdadaebe49d5fca4fa6ce13072e26037c6f75d46cc30cf8dc3c9cfcb3f33b33630093 SHA512 031a87645381c96beff33572e4bac1a9877e52fd2f99d39918fbede17d72291b35e2eb69e07edec20c3058554c35cc38fe85b8f175c2a3c69366136fcc71f707
 DIST linux-raw-sys-0.4.12.crate 1465800 BLAKE2B 2f70a344c427093fd55732b68239f771cf6563edfe2db4b2f50cdbc904dfc7565b30bf06454b91482eaeea787b9cd4214979665bfa32f3c1c586551333cf4d2e SHA512 d9564d02d5f41356478066592e438629adb3275df0e5a1a44030cc99bf8856b8af64f18f27371f84122a828b34712aae16495a1a16050fbdbece6d95e9cdace9
@@ -55,10 +58,12 @@ DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315
 DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495
 DIST proc-macro2-1.0.71.crate 44407 BLAKE2B 74d21761dc35130363ac46717c55e876c9d7c2e8fdd72ef5437c2e5825c600c9179273eaec444b356f963025cfbc565751b36ba22c8dcbf712636596931149cc SHA512 d8f970a55446ddb85ca875a867bc17ca790711ccd222de1d273e5370a37b0fd9b62c76d1d0c514ea3a620ddfa7a719e4aae483fc59f9c21dfc45e5e1fd4ec459
 DIST proc-macro2-1.0.72.crate 45263 BLAKE2B e306e21cd3ce36fdbf8ddc47cd97d0286eadae1d0ec5e8f7400c8675861d7081d15b67945a26f907fdf2f162846ea25e5da5dd4826c6287f96869030fc196bd8 SHA512 469121d50808a5925c98862f5b2b0f664ff0f875c8450654892949f27bd0569ddfa8becd1d5d84e0590d0248ed3efdfa568306a7a2e0017adf277b3f8305ae63
+DIST proc-macro2-1.0.76.crate 45660 BLAKE2B 40b538d9d9fec10b9e4b147ce0a86efb10feedf9e0452e5568e8ad7d2b88a201ca6ffd2cd62d8815a1ee72d557fe6280120a913868c3d868c1235686742cd8b8 SHA512 2ea7ade475171166489ab3e745e8c526e49c7521bc39b1bfec6dd2fd0807fd3cc5579235f77534be855f9ecab481205e77e66b14ebb22e66d2c3cff842567247
 DIST pulldown-cmark-0.9.3.crate 117339 BLAKE2B 0b4105a9452139865723a66e434804da7fec35771a90335debe579164ce7ddd78192949db77ad5427ff80b44805a8fa5ca497e6b4111344aaa014faaa508904f SHA512 2f5acf1b6f345ea2f82c6daeb4b73c93c2772dcfb7ccff6fba9e51b8840b0662202eb3bd1c917f8f81be1ba86b58fb3d5f87616dbdca991e0ef6fc249dc888fe
 DIST pulldown-cmark-to-cmark-10.0.4.crate 17917 BLAKE2B 956fec0f042b70754f681640b1ad90454da5376b246a56539a029c4c53f64c6743bf9e4e938cb75bedc2eb3d960a2cc577f78120eff1f9942d6e0b33d7833426 SHA512 00030ee97d0d69738fa160bb0b87cc5777769061775077e162e7daacc52b1558477048d2bc36485576c94bc05f03d01086137740f2f6ed92b13e2c75653bda12
 DIST quote-1.0.33.crate 28090 BLAKE2B 77c4b166f1200e1ee2ab94a5014acd334c1fe4b7d72851d73768d491c56c6779a0882a304c1f30c88732a6168351f0f786b10516ae537cff993892a749175848 SHA512 c1e76c3c017e8554eebe309f8167fd56fce931981c06798aa85a0cc6d64a9cba6ab103f5a1324e69c6f9ca5dc47a8e31ff2e847850542748697afcd265b5939c
 DIST quote-1.0.34.crate 28139 BLAKE2B f8c85ef3ca3a88e68711f5ef0c0fab3e26115eedbc84d8b46032285b53c84aafce3ab4c5a4f219890e82df3dac34d84eb61368b7ffa4fa5ec43b28c12f5320eb SHA512 c53e32ac870fd85518968bbd334c2b16533d3591dd9766ee9fec2d73ac17814d6240f69a3898a2f39b5b8a60c2d34c3edf020046eeee59e42bd107d58da5091d
+DIST quote-1.0.35.crate 28136 BLAKE2B 81424245e1e2b94459df68bb3a9a866c6a364102b5e1d010ede9c5f8278f8406d7b651957d091c5914e936b494b0f6e9a6a1dd8b7d35cd7d7100f86dee4ec12e SHA512 f5314fb6af17cf36c228e1970c569c29ec248954a450a5f90ba9e2896d04f74904c9cec5a1f74325f2489295a94491eee4ce8fb461e22cd4b34e53f1f881efd2
 DIST redox_syscall-0.4.1.crate 24858 BLAKE2B c3301137a0b84e03b09d28dfa377ab3bea74d574a08cee21d35713b278d8b5b30ca2a1d73a0981baeb4644cbb88c86c8eb15ab3bb2692e38b93e6b35fab4e0da SHA512 073ed9d96090cf46eab9877742277a013c62d8da86d9caf2310b4fa868af306511936553579e01309f27067d344226cc8dc5e3aef01d9b900da2febd33848f8d
 DIST redox_users-0.4.4.crate 15438 BLAKE2B 5f44e9ef20f1a6c8b22239838f8f6a6648dbebd5b4386b3a2c417e39add8c4a0dc32e4369b8bb4e0ea17678140f596b9bc981b1d56f06de6a38a503600420481 SHA512 7c208116d1171b1f52f22aedcf8ad00076a3d1f062f4018f4a9f5fb2c38d7ed83258589062d1559f64e43f3e2a9ddf789799f57cf87a49ad8a37463ea09aa269
 DIST regex-1.10.2.crate 252839 BLAKE2B 4be7bede72d41634c52eea25566fb13337a84a055aae6fb73d3b18ab9168085ed04ffbfd5b6f87c2f85c9922893b9c9a253a8c874eae9185b2100850443b1517 SHA512 e594f70cc540586e4039e7b905ede9e507757b531f22a94aae185e47732ae0d54bceb2c6aceb815819a9652c01ccf697798d372631f2f864c04ca2eec59759d3
@@ -69,13 +74,19 @@ DIST rustix-0.38.28.crate 365398 BLAKE2B cd9401511363c806f0c8de5076031aebd22a9c6
 DIST rustversion-1.0.14.crate 17261 BLAKE2B db30d01914059a893bdb4c448ed0bf04852085c2d948bfbed8819a1d2317c34133cf609abdd806ad628b86974a9c1ab9d09f79743cb8e13257ef32cd444f49c6 SHA512 466d753c28c4899ab3da3e9f3366f7ecc435d484f51e0c07acfa5f3367af0de27ea3bc75efda22159b4990c976b1466a27e7c31c834c72a87d8234318357454b
 DIST ryu-1.0.16.crate 47351 BLAKE2B 13c72ec8aa608f6c53cf27c95d06b90839c5bec5e54b0441e9c4f779af3dece30d01a2276c717a733f92406a5a02b09c045b2b5f92714fe492d7263b6c6808e6 SHA512 89e3e18346ae6e4035787766f286a6eb62f5294e39ad902cc29e95c53781c4e5dd629f567f22ecc7e9fe9d1c273323da9b867aadc9cd8a066727c58330b51b10
 DIST semver-1.0.20.crate 30451 BLAKE2B 7a08bd65749e99d0a881ef315f611f9f02215991aafb317294925e0b88b125acf33e713a45113d229646401520fba22c6f6527015c12b9859d7a65d126de647b SHA512 35a55f1d1e4dc8674d48053da36b7152b5e3bfeb72eebf7d307c491b02d77e6bd4552212551be29e2a2c3951afde292c2614829e668d9382fec0f258dc6484fe
+DIST semver-1.0.21.crate 30445 BLAKE2B 1c779c25576723ee7e44e7c831eacc5dc6bb33cbf051bd0748f688573e01595d05808cdef4ae48a6423df15e474cea58a0664ad7fa5cad490a61f89473f426d7 SHA512 bc3ceb11f2b729be086120c06ca2cefc34c5141d2d4af64279b0868456894eb9097b234b326249f2aa83d8b99086fcac4c5b7ef4a1e14b1198ae808fde245c35
 DIST serde-1.0.193.crate 76863 BLAKE2B 163097e85b5542451896d7381607aa297e3b0342a2641887a01689b13122c6c1ca566fcb7f32f51bb0ecc861aed014f1467edfe21338223d5361555f870425a3 SHA512 82259ca302f42116ecffca3c88bc1212785ce5430f9d29390a9041d4e5943c13b13de119fde644a583960102c4b6e850a16f962d36dc76ac69fc2297ed65a506
+DIST serde-1.0.195.crate 76856 BLAKE2B 6a80b59335f222ae48d5e377c30611f30fe6416e6853ca47a39016e21f649cb9dfbe4964ce19e5da977fb9a963228a6a81c1e85af99ae12d7a0a5722901aa2f5 SHA512 0002ecb933d08fbdc8585ee74efb4048d385459f629261f5a4a8401b794f1c02b8296db79f479013a0b2a47ba99bee6c02d60d0fc2454e32f1b038b4071e8727
 DIST serde_derive-1.0.193.crate 55692 BLAKE2B eeb2a2fbcd0daf5fee1bd6a4f584fed330db58cbd786073311d6a94308c63dfc6b7c2dfbc4b8980064ed66509f0127525b79d99aa96ca0134226fe21715999bb SHA512 05efb144aeee293a0e7dc7540106eb8c4920b2d8dfc25771d73afa8ffcba330104643430a6e396ea2adabbed4ccb23591251479b75449b9c8322799f91d38c41
+DIST serde_derive-1.0.195.crate 55687 BLAKE2B 4da7916e36f71dfe82defa6c45b3075395cae54631cdff08a4607e962290020e7214288258fd316439c02536073325f5902e7b00144f97269a207fc453496599 SHA512 8a82ae4e7cfe0c3ac27688cc95d74bf4c2e10c1fe845ab28fb57579b2f47f36d13218c2ae603f93f00114065d47c3e46166dea39b205be673f443c34305dacce
 DIST serde_json-1.0.108.crate 146476 BLAKE2B 9c0ceae5566a4e0ce7a6264939862f9dd920bb47d18acebb179798b036c376d97a4e9b0717092903ab90cfbf6fb73d37518e3cc25f3217af010296f5644de396 SHA512 7d8d1b74515388d99983ffbc5696cba022305cf4c797d3ff5d2959fc8fc8f4ce01cc4c9e7ccae7097b06b5acf5307027f6b7315df1fd8f58e681cc5968e79fb6
+DIST serde_json-1.0.111.crate 146447 BLAKE2B a3509185e78c438f495ee9d5b5b7c23cd3b565d45178500f2b9ceb8cc8b1cc509b8d25d217f2c98bb597bab205566d660c3f60506c836da903c52206e6fb160e SHA512 11851e34a9a40de32654a12ada1d1bd01abb11531c5804f5d0747bbb01bf59025dd92be916104fbc278bbba5c89c77920941b83c0ac2f0da23f5d61a7788e83f
 DIST sha2-0.10.8.crate 26357 BLAKE2B 1d01b381223a931dc631ad3a1191f5378b1d2f3f9f20474c5f020e366624c73b08330ce8dc4bdd3e63b15f647276f533de655b545b77f70fbedc1a1846f44f0a SHA512 3be73133a6b7690e14acaead47914dc92395dca4191fb657a2ea186fefd0ccd94d12a1121d63a26027d9a9c62b775c53202473edc461587b9dcd75472af77785
 DIST similar-2.4.0.crate 53147 BLAKE2B b30771e3c26300f9ad691566af22faf4592225de44dd55abb1231aa3641a32ca71c83fe9253dfcfb0c438b6f599c77358595fa03125d5f343cc617e99354dfbf SHA512 6c8f1cb194c165ff6ad64298d37deb6bab0abdd51921e29395e1c86268c65db1b4a67ac03ba37dbc69a0ea35c0f3770e894de7253f0e410be7bfc7845a45ce7a
 DIST snafu-0.7.5.crate 65229 BLAKE2B 7ab41547d6775fe92a0be3810847a00567cd3c82fe12b7f6f5170f1c5ede011b763fcc8f470c7d4dad9369956e9ce6d5e66edd4d66f4bb6c8a260dbd1deaea2e SHA512 50a10d3d1c13a28136227219da1e43c8655309bd1ca44e81a76516ce7661ba3cda8ba2f4e0ad16b3b1e7d5e07b2dcf50e158bbd6ff54077709a105633e6bcb50
+DIST snafu-0.8.0.crate 68031 BLAKE2B d8d50e5f9d392e99478f1695913adcb67bbed071e3b51210d2bc98d886038365340babfb291315f93f34809d8f2fb9a1f834356ab0a662d4851840ecf1c126af SHA512 e4b419e618c2aeb1f75b17e14c4f753b7668b78d6086e7ec902b81d16e06c90f12073d3ba1f964e65191324784a7f0e753d1656f792967e72279942a0dcc04d9
 DIST snafu-derive-0.7.5.crate 28208 BLAKE2B aee0f63ef6fa1c414a42d6bd625067d5c1065ef6df4178ace3c5b2bed733f719126ac428b723d77522cf5b1a384382aaa03c0acfb32a7b5a7703b3212c2c9d9d SHA512 6e07fae7d75ca975bf2b90ba10e2bd7368a0bee7670e1d9f4cc90512d9290c9d131b4fa6accbf6e177cb23a17072e029e879a55c5b1bb595b3e4ab447ce445c4
+DIST snafu-derive-0.8.0.crate 28423 BLAKE2B bf9607ad7fcb1ba43221236a9946d3f4fe317b9bb4c31cc0cc6f2b9ea96856262b127684cb1fcfccf0c1e0cca42d110e0265200303d0da742537f6810c4cb3a3 SHA512 fffa258ae9c49f04e6bbf34fd3ed650ea741cd395408329126f7874cd96be2486dde7b458813436a7f87bb96723914ef3ceaff3eb0c2cde1e70e3cab5305035a
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
 DIST structopt-0.3.26.crate 53798 BLAKE2B 04be64637d18bcc87d261320668023459a42c167bb5a4c52216df556a7dd19be28032e7bf759cbcf710a3729a9dfaeb20c29f37f35fcf33533db583ac4fa049a SHA512 dec27090b57107473c9d398db68bde3b1b5191e7c7980d7d2c20fc723f92c64a6cf1d391d5122a103222c4262253d8073fd0fdfb11c74f235af79b2ae0caf069
 DIST structopt-derive-0.4.18.crate 20996 BLAKE2B 2ae17e0d365a7ce7a4d0e007513623ee0d5acf45afdc3844114e02975b855fd1a9f7df404a24044cf33a3a4cc4142eccc34d1e97925646d54d460a89baa28275 SHA512 68a7f9c2ed987993fdd8bb7e81c31969a1fdf5351c58cba9de61a2f5957aba1626be4b0742f31d4de502301675ba24b0d91dd3acb24f5607bdeec83070626a57
@@ -83,6 +94,7 @@ DIST strum-0.25.0.crate 5539 BLAKE2B 9c031e5ce19e2ecaa63e63118197c740ae9295b8881
 DIST strum_macros-0.25.3.crate 22570 BLAKE2B 511af0d1f0f76df7ad1528c79987b6e09390bfb33e1c34078fb5450171aca7f169afb83fa2f2338a861ded6842c8535ea6e4cdb0d31f341edab0a06d7eeac16c SHA512 e6ebc00943d9f88104815a5bd6a302a391a06fb0ed5ff836e01d341150628684e00e5e2e5b3f6466ece92d376985246f818243a0d1d775cfa55d1c50c0ec0c62
 DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d
 DIST syn-2.0.43.crate 248363 BLAKE2B fda1da22ad62e407dbe4f7006a3fb2781fd400dd1f67be2f200b6804c7f979e0072734707eb591175c7cd76200c6f326c7c1bf01b3c9030442fec2b45e66a308 SHA512 af9356e0e6e65999d758633debcc08396bc134b46fefbb78059d95b972be12fbca0f571a09776976d355dbe391d4fbf910c1a3619f5b8256980f98d1f553ba55
+DIST syn-2.0.48.crate 250566 BLAKE2B e46b0863af76c3116c84d01b654a9820b7edc51f75c9c5301a7967d12284f78da602409f34fc40524728350dc6b998a4d738f08b8868f95236b3e5d24c460580 SHA512 926c0ad55cc743df20f9166b6d71fd44421aeb1f073fd86b6ddb53e13cd508b539c0360ce64b07b65597bb14639c8f33acf7e60951e1e9128624517aa3aee325
 DIST target-2.0.0.crate 6761 BLAKE2B 6b366d9b7df3d7edb8e83d9a77da778c47347c3726b14afd37fd83afea1ad6bf65ba7025e5ae7b5e11945cb6250948d83489203cb0eb79dd2209531b7487f1cc SHA512 08261b96ebf3e1b1634764b88f7971735b76de32a97181102e2d96a48f9cdb9f353957f45af050bb5c07329820f5af53bf11c1497ae3c6acb5f397a2e43681ab
 DIST tempfile-3.9.0.crate 32182 BLAKE2B 4e802990988aff3ab5173bd96dbd906651a8df46b2619e6a500a3b9e7f4a3cd01dc7ee977791343f7875afdc4793a845000bb363d8c1a6599aeb6b1efcce5d56 SHA512 04e06c966bfa7a1567e7185ebd5c2876b96e46e36af14931bf0eba63795cd20d1c3427b6709a4cab2a68b8d289fdabd5537a50e5407a76e3a9fa0dcc7d3ce6d7
 DIST temptree-0.2.0.crate 6520 BLAKE2B 8a1536fb0cd0d2e2e57d87fd0772f20432baf570f8d59c525687b2baafe363baccff603117152ab12e512a3b32c5b9197088fb1011b204b4eef8db5493d841e3 SHA512 4754a5842ffc9e2334f7a954c7596c46f68cea55c62a5d698653c6e84bcb401d825557f3875eb1f52904930141110c4f69c33f6b7eec07ce8d4a048ab60ba852
@@ -91,8 +103,10 @@ DIST termcolor-1.4.0.crate 18765 BLAKE2B d7286fcc84843296e2edf074e316ee8fcceb018
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST thiserror-1.0.52.crate 20115 BLAKE2B 02b86808a6279c9d815feee3dde1f9265d26cf75f38cbf2ba14a2a6467844059bfa5f8d463714f01b8d8c78d82865c0065f84387a86f4c0d590c5f05cfc28f12 SHA512 73a3b8b6d86f352a7e671886c823a96feefe9d694f9e3f8af580ce25a4493a63c228f22db9a892331944150da9950a6c404da91673a2725654416c2d89443a81
 DIST thiserror-1.0.53.crate 20533 BLAKE2B aa24bb36d1194c0363700eb39eb5e1cb037798d0d7774826f52b56dffd3978e0aeae67b8f1fbc055d550069fcdba9e24d362b2fd8917848055533accdc4825b4 SHA512 600efba17b4c8a668e97bb8a24202a26834f62d99fbb6d196b514922da241f903bb812e38dbc46091bd14e485c2141367fe35440378383949add89e57363018d
+DIST thiserror-1.0.56.crate 20592 BLAKE2B e98c8bba8d21342c981646e88b72a7cbc146c695a200aae3e076b55948791cc51a29e8818d64451b17233ed4d095d0ef63ba4fb07502f4ffde5af738b8629c37 SHA512 6b7c856745256d6ef9e7ab2ea0027f9c1ed2c75ed5b075068af57cf706abfd835fd4552d9ec7578bece1f820086828c5dec85a9cbada409569838cdc9d63936c
 DIST thiserror-impl-1.0.52.crate 15371 BLAKE2B 143e40a012edbe5e8b9c1df7517855f2d7730a03ad7e4b85a2be768c30efd1931a9e871b54d01fd72304d2ea0e257e8686c98dfa59ca3884fae9ada96daa01bf SHA512 02a62addb29b9c8ecb55b2c7401083954f2538720d97bb562ad9088a666a768e194504ebf219e367f4007683f20bb6ce73270cbe5c868868384a5e460c56af2e
 DIST thiserror-impl-1.0.53.crate 15372 BLAKE2B 1724b5fd1e292adaa42295e74b83ab93cfac86a653a58f02de0c7ebfa208aff4652f79bb28aacfcc2cb85fe79b139a831eee2843e50f9f6bf2d78e7696a67c17 SHA512 73e584e83d5ec4f91c41cade3e3f83dbeafce7bebfd3e3a28a65b590ee08b61cd49f9df9c5a87140dd09954b616ed9b00c187763174cfac66d44edb348609c8d
+DIST thiserror-impl-1.0.56.crate 15367 BLAKE2B 6fad787eb1e2c0f25fee7bef160be794fb8000a0aa292ec0d2d66d7a4d1fcb226c3e2e690ff6a61ba2d8704208014eea84044dba27523d4b2c26d2f7d4ba64d5 SHA512 da66f4674cf699083f7142f3a60c1c9334767b4de3690b4c7af460ffda787fab2089f5bca231e92b6e71724d46fe7dbdcaa19073f5d8100838536d10971efbde
 DIST typed-arena-2.0.2.crate 11848 BLAKE2B 1d2821519c959b8e5f32942fb106f836a9aa753a43058cad6898588f8e0d9abcbe7a94a91ec8d30c62e59833563df48229c6aeec8bf7a396de20895e39571d11 SHA512 33f43488ff63ab763e4330d124e3290ece41e50ab78b6f12dae3a2be4d7f5bdf6ec876ab3b1f8cd81874e335fc41f3a2254994f250d3d6aba682fce557a6a399
 DIST typenum-1.17.0.crate 42849 BLAKE2B a6d1162050679e2c4ab2467f3a77d301f6861882eb7c9749f31d047f383dd5bd2ed5846ad63eed99ccc04d6ac36cc697a305861e1d65880b4d2ef04ee0a79b94 SHA512 99773d5d9f850c0602db4bb67dd062b0ade6f086e155216f1bb2fb6569461ba7e1b7c2f2af81ea8833bc3bfcf3fe5033edecb7c438adae63f59d3e30cf63a508
 DIST unicase-2.7.0.crate 23783 BLAKE2B 2b74b932b45c9d5b984b57bfe8249496c192944e2e66916919177eac81c509e2d7a5d30a85ea58e8cd5a0b47fec746bdb18723f3f14002fc64af3a0d320a9e7d SHA512 c2b05a3bbd8996e1cf65d7458f5ad95de9797c8349484f8db04967bde15c1f057f62b2f7a60e7367871512071ed5076c0da042169dbbdcaf4d6c16cae62da828
--- a/sys-devel/just/just-1.22.1.ebuild
+++ b/sys-devel/just/just-1.22.1.ebuild
@@ -0,0 +1,178 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	aho-corasick@1.1.2
+	ansi_term@0.12.1
+	atty@0.2.14
+	bitflags@1.3.2
+	bitflags@2.4.1
+	block-buffer@0.10.4
+	bstr@0.2.17
+	camino@1.1.6
+	cfg-if@1.0.0
+	clap@2.34.0
+	cpufeatures@0.2.12
+	cradle@0.2.2
+	crypto-common@0.1.6
+	ctrlc@3.4.2
+	derivative@2.2.0
+	diff@0.1.13
+	digest@0.10.7
+	dirs@5.0.1
+	dirs-sys@0.4.1
+	dotenvy@0.15.7
+	edit-distance@2.1.0
+	either@1.9.0
+	env_logger@0.10.1
+	errno@0.3.8
+	executable-path@1.0.0
+	fastrand@2.0.1
+	generic-array@0.14.7
+	getopts@0.2.21
+	getrandom@0.2.11
+	heck@0.3.3
+	heck@0.4.1
+	hermit-abi@0.1.19
+	hermit-abi@0.3.3
+	home@0.5.9
+	humantime@2.1.0
+	is-terminal@0.4.10
+	itoa@1.0.10
+	lazy_static@1.4.0
+	lexiclean@0.0.1
+	libc@0.2.152
+	libredox@0.0.1
+	linked-hash-map@0.5.6
+	linux-raw-sys@0.4.12
+	log@0.4.20
+	memchr@2.7.1
+	nix@0.27.1
+	num_cpus@1.16.0
+	once_cell@1.19.0
+	option-ext@0.2.0
+	pretty_assertions@1.4.0
+	proc-macro-error@1.0.4
+	proc-macro-error-attr@1.0.4
+	proc-macro2@1.0.76
+	pulldown-cmark@0.9.3
+	pulldown-cmark-to-cmark@10.0.4
+	quote@1.0.35
+	redox_syscall@0.4.1
+	redox_users@0.4.4
+	regex@1.10.2
+	regex-automata@0.1.10
+	regex-automata@0.4.3
+	regex-syntax@0.8.2
+	rustix@0.38.28
+	rustversion@1.0.14
+	ryu@1.0.16
+	semver@1.0.21
+	serde@1.0.195
+	serde_derive@1.0.195
+	serde_json@1.0.111
+	sha2@0.10.8
+	similar@2.4.0
+	snafu@0.8.0
+	snafu-derive@0.8.0
+	strsim@0.8.0
+	structopt@0.3.26
+	structopt-derive@0.4.18
+	strum@0.25.0
+	strum_macros@0.25.3
+	syn@1.0.109
+	syn@2.0.48
+	target@2.0.0
+	tempfile@3.9.0
+	temptree@0.2.0
+	term_size@0.3.2
+	termcolor@1.4.0
+	textwrap@0.11.0
+	thiserror@1.0.56
+	thiserror-impl@1.0.56
+	typed-arena@2.0.2
+	typenum@1.17.0
+	unicase@2.7.0
+	unicode-ident@1.0.12
+	unicode-segmentation@1.10.1
+	unicode-width@0.1.11
+	uuid@1.6.1
+	vec_map@0.8.2
+	version_check@0.9.4
+	wasi@0.11.0+wasi-snapshot-preview1
+	which@5.0.0
+	winapi@0.3.9
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-util@0.1.6
+	winapi-x86_64-pc-windows-gnu@0.4.0
+	windows-sys@0.48.0
+	windows-sys@0.52.0
+	windows-targets@0.48.5
+	windows-targets@0.52.0
+	windows_aarch64_gnullvm@0.48.5
+	windows_aarch64_gnullvm@0.52.0
+	windows_aarch64_msvc@0.48.5
+	windows_aarch64_msvc@0.52.0
+	windows_i686_gnu@0.48.5
+	windows_i686_gnu@0.52.0
+	windows_i686_msvc@0.48.5
+	windows_i686_msvc@0.52.0
+	windows_x86_64_gnu@0.48.5
+	windows_x86_64_gnu@0.52.0
+	windows_x86_64_gnullvm@0.48.5
+	windows_x86_64_gnullvm@0.52.0
+	windows_x86_64_msvc@0.48.5
+	windows_x86_64_msvc@0.52.0
+	yaml-rust@0.4.5
+	yansi@0.5.1
+	${P}
+"
+
+inherit cargo shell-completion toolchain-funcs
+
+DESCRIPTION="Just a command runner (with syntax inspired by 'make')"
+HOMEPAGE="
+	https://just.systems/
+	https://crates.io/crates/just
+	https://github.com/casey/just
+"
+SRC_URI="$(cargo_crate_uris ${CRATES})"
+
+LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 CC0-1.0 MIT Unicode-DFS-2016 Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+RESTRICT="mirror"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+
+src_test() {
+	# $USER must be set or tests fail Bug #890889
+	export USER=portage
+	default
+}
+
+src_prepare() {
+	default
+	tc-export CC
+}
+
+src_install() {
+	local DOCS=( README.md )
+
+	cargo_src_install
+
+	doman man/*
+
+	einstalldocs
+
+	# bash-completion
+	newbashcomp "completions/${PN}.bash" "${PN}"
+
+	# zsh-completion
+	newzshcomp "completions/${PN}.zsh" "_${PN}"
+
+	# fish-completion
+	dofishcomp "completions/${PN}.fish"
+}
--- a/sys-firmware/lenovolegionlinux/lenovolegionlinux-9999.ebuild
+++ b/sys-firmware/lenovolegionlinux/lenovolegionlinux-9999.ebuild
@@ -28,9 +28,14 @@ BDEPEND="sys-kernel/linux-headers
 "

 RDEPEND="
-	legion-tools? ( dev-python/PyQt5 dev-python/pyyaml dev-python/argcomplete dev-python/darkdetect )
+	gui? (
+		dev-python/PyQt6[gui,widgets]
+		dev-python/pyyaml
+		dev-python/argcomplete
+		dev-python/darkdetect
+	)
 	downgrade-nvidia? ( <=x11-drivers/nvidia-drivers-525 )
-	legion-acpi? ( sys-power/acpid )
+	acpi? ( sys-power/acpid )
 	radeon-dgpu? ( dev-util/rocm-smi )
 	ryzenadj? ( sys-power/RyzenAdj )
 	undervolt-intel? ( dev-python/undervolt )
@@ -40,8 +45,8 @@ DEPEND="${RDEPEND}"

 LICENSE="GPL-2"
 SLOT="0"
-IUSE="legion-tools legion-acpi systemd radeon-dgpu downgrade-nvidia ryzenadj undervolt-intel"
-REQUIRED_USE="|| ( systemd legion-acpi radeon-dgpu downgrade-nvidia ryzenadj legion-tools undervolt-intel ) legion-acpi? ( legion-tools ) radeon-dgpu? ( !downgrade-nvidia legion-tools ) downgrade-nvidia? ( !radeon-dgpu legion-tools ) undervolt-intel? ( !ryzenadj legion-tools ) ryzenadj? ( !undervolt-intel legion-tools )"
+IUSE="gui acpi systemd radeon-dgpu downgrade-nvidia ryzenadj undervolt-intel"
+REQUIRED_USE="|| ( systemd acpi radeon-dgpu downgrade-nvidia ryzenadj gui undervolt-intel ) acpi? ( gui ) radeon-dgpu? ( !downgrade-nvidia gui ) downgrade-nvidia? ( !radeon-dgpu gui ) undervolt-intel? ( !ryzenadj gui ) ryzenadj? ( !undervolt-intel gui )"

 MODULES_KERNEL_MIN=5.10

@@ -51,7 +56,7 @@ src_compile() {
 	)
 	export KERNELVERSION=${KV_FULL}
 	linux-mod-r1_src_compile
-	if use legion-tools; then
+	if use gui; then
 		if [[ ${PV} == "9999" ]]; then
 			#fix python package version
 			sed -i "s/version = _VERSION/version = 9999/g" "${WORKDIR}/${P}/python/legion_linux/setup.cfg"
@@ -71,7 +76,7 @@ src_install() {
 	pushd python/legion_linux/ || die
 	make forcereloadmodule
 	popd || die
-	if use legion-tools; then
+	if use gui; then
 		#Define build dir (fix sandboxed)
 		cd "${WORKDIR}/${P}/python/legion_linux/"
 		distutils-r1_src_install --build-dir "${WORKDIR}/${P}/python/legion_linux/build"
@@ -82,9 +87,11 @@ src_install() {
 			systemd_dounit service/legion-linux.service service/legion-linux.path
 		fi

-		if use legion-acpi; then
-			insinto /usr/share/legion_linux/acpi/events && doins acpi/events/{ac_adapter_legion-fancurve,novo-button,PrtSc-button,fn-r-refrate}
-			insinto /usr/share/legion_linux/acpi/actions  && doins acpi/actions/{battery-legion-quiet.sh,snipping-tool.sh,fn-r-refresh-rate.sh}
+		if use acpi; then
+			insinto /usr/share/legion_linux/acpi/events
+			doins acpi/events/{ac_adapter_legion-fancurve,novo-button,PrtSc-button,fn-r-refrate}
+			insinto /usr/share/legion_linux/acpi/actions
+			doins acpi/actions/{battery-legion-quiet.sh,snipping-tool.sh,fn-r-refresh-rate.sh}
 		fi
 	fi
 }
@@ -102,7 +109,7 @@ pkg_postinst() {
 			ewarn "Note: Edit /etc/legion_linux/.env to enable nvidia TDP control\n"
 		fi
 	fi
-	use legion-acpi && ewarn "Acpi exemples are included in /usr/share/legion_linux/acpi\n"
+	use acpi && ewarn "Acpi exemples are included in /usr/share/legion_linux/acpi\n"
 	ewarn "Note for 2023-2023 Legion user: It need help for testing the features"
 	ewarn "Pls test the feature how is decribe in the README of the project!"
 	ewarn "and also go to this issue in github: https://github.com/johnfanv2/LenovoLegionLinux/issues/46"
--- a/sys-firmware/lenovolegionlinux/metadata.xml
+++ b/sys-firmware/lenovolegionlinux/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<use>
-		<flag name="legion-tools">Build and install legion_gui and legion_cli</flag>
-		<flag name="legion-acpi">Provide acpi exemple /usr/share/legion_linux/acpi </flag>
+		<flag name="gui">Build and install legion_gui and legion_cli</flag>
+		<flag name="acpi">Provide acpi exemple /usr/share/legion_linux/acpi </flag>
 		<flag name="radeon-dgpu">Enable AMD GPU TDP control (systemd-service)</flag>
 		<flag name="downgrade-nvidia">Downgrade nvidia for 525 to enable TDP control (systemd-service)</flag>
 		<flag name="ryzenadj">[AMD] CPU and APU control using ryzenadj (systemd-service)</flag>
--- a/sys-fs/dwarfs-bin/Manifest
+++ b/sys-fs/dwarfs-bin/Manifest
@@ -1 +1,2 @@
-DIST dwarfs-bin-0.7.4.tar.xz 6489712 BLAKE2B b854e0cd7afa118dcbb8f46aead848b2293ee8cac6d6f74d85a789b70ccfdfff94d3d4751018ea0a1c44d1d07997ee32bbe07a5d88bd398515223c48c010f1cc SHA512 a420c10e6190034f584d9710506a874c1ea011a61aff25e8525a2576664bde51799e602884cbaa92ecd27e1450cbe2fce48b040631061723cc3e810d854e8c40
+DIST dwarfs-bin-0.7.4-amd64.tar.xz 6489712 BLAKE2B b854e0cd7afa118dcbb8f46aead848b2293ee8cac6d6f74d85a789b70ccfdfff94d3d4751018ea0a1c44d1d07997ee32bbe07a5d88bd398515223c48c010f1cc SHA512 a420c10e6190034f584d9710506a874c1ea011a61aff25e8525a2576664bde51799e602884cbaa92ecd27e1450cbe2fce48b040631061723cc3e810d854e8c40
+DIST dwarfs-bin-0.7.4-arm64.tar.gz 5628380 BLAKE2B e9224f2881e34b9dc09a61098b63d26010655ba1287d069138fede6276fd075a7b4655a91c9e72b0fc57fc926fd6ff42bed367007ba7a6455d91d4692dcc192d SHA512 f2889a9c88872610873b0527342cd0fa4738dd50c5b0ee6ac388d2edefb88548371d193b1206b37d7aa4969b1018f3bdd579d54306266201eb75fe4369775444
--- a/sys-fs/dwarfs-bin/dwarfs-bin-0.7.4.ebuild
+++ b/sys-fs/dwarfs-bin/dwarfs-bin-0.7.4.ebuild
@@ -5,11 +5,14 @@ EAPI=7

 DESCRIPTION="Static version of a fast very high compression read-only FUSE file system"
 HOMEPAGE="https://github.com/mhx/dwarfs"
-SRC_URI="https://github.com/mhx/dwarfs/releases/download/v${PV}/dwarfs-${PV}-Linux-x86_64.tar.xz -> dwarfs-bin-${PV}.tar.xz"
+SRC_URI="
+	amd64? ( https://github.com/mhx/dwarfs/releases/download/v${PV}/dwarfs-${PV}-Linux-x86_64.tar.xz -> ${P}-amd64.tar.xz )
+	arm64? ( https://github.com/mhx/dwarfs/releases/download/v${PV}/dwarfs-${PV}-Linux-aarch64.tar.xz -> ${P}-arm64.tar.gz )
+"

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="-* ~amd64 ~arm64"

 RDEPEND="
 	${PYTHON_DEPS}
@@ -19,11 +22,21 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 "
-S="${WORKDIR}/dwarfs-${PV}-Linux-x86_64/"
 QA_PREBUILT="
 	sbin/dwarfs
 	bin/*
 "
+
+src_unpack() {
+	if use amd64; then
+		S="${WORKDIR}/dwarfs-${PV}-Linux-x86_64"
+	elif use arm64; then
+		S="${WORKDIR}/dwarfs-${PV}-Linux-aarch64"
+	fi
+
+	default
+}
+
 src_prepare() {
 	default
 	einfo "Removing legacy fuse2-related stuff..."
--- a/sys-fs/dwarfs-bin/metadata.xml
+++ b/sys-fs/dwarfs-bin/metadata.xml
@@ -5,6 +5,10 @@
 		<email>denis7774@gmail.com</email>
 		<name>Denis Reva</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>zhuyifei1999@gmail.com</email>
+		<name>YiFei Zhu</name>
+	</maintainer>
 	<longdescription lang="en">
 		DwarFS is a read-only file system with a focus on achieving very high compression ratios in particular for very redundant data.
 		This probably doesn't sound very exciting, because if it's redundant, it should compress well. However, I found that other read-only, compressed file systems don't do a very good job at making use of this redundancy. See here for a comparison with other compressed file systems.
--- a/sys-fs/dwarfs/dwarfs-0.7.4-r2.ebuild
+++ b/sys-fs/dwarfs/dwarfs-0.7.4-r2.ebuild
@@ -17,8 +17,6 @@ KEYWORDS="~amd64"
 IUSE="python +jemalloc test man"
 S="${WORKDIR}/dwarfs-${PV}"

-PATCHES=()
-
 RDEPEND="
 	${PYTHON_DEPS}
 	app-arch/libarchive
@@ -71,10 +69,18 @@ QA_SONAME=(
 "/usr/bin/dwarfsextract"
 "/usr/bin/mkdwarfs"
 )
+
 src_prepare(){
 	rm -r zstd xxHash parallel-hashmap || die
-	cmake_src_prepare
 	sed "s/DESTINATION lib/DESTINATION $(get_libdir)/" -i CMakeLists.txt || die
+
+	# Bug #900016, but upstream discourages O3
+	sed '/FLAGS_RELEASE/s# -O2 -g##' -i CMakeLists.txt || die
+	sed '/CMAKE_CXX_FLAGS_COMMON/s#-g ##' -i folly/CMake/FollyCompilerUnix.cmake || die
+	sed '/^\s*-g$/d' -i folly/CMake/FollyCompilerUnix.cmake || die
+	replace-flags -O3 -O2
+
+	cmake_src_prepare
 }

 src_configure(){
@@ -91,6 +97,7 @@ src_configure(){
 		-DPREFER_SYSTEM_GTEST=ON
 		-DPREFER_SYSTEM_LIBFMT=ON
 		-DWITH_LEGACY_FUSE=OFF
+		-DDISABLE_CCACHE=ON  # Use FEATURES=ccache
 	)
 	use python && mycmakeargs+=( "-DWITH_PYTHON_VERSION=${EPYTHON#python}" )
 	cmake_src_configure
@@ -102,9 +109,6 @@ src_install(){
 	dolib.so libdwarfs.so libdwarfs_main.so libdwarfs_tool.so libdwarfs_compression.so libthrift_light.so libmetadata_thrift.so || die "Install failed"
 	dolib.so folly/libfolly.so folly/libfolly.so.0.58.0-dev libmkdwarfs_main.so libdwarfsbench_main.so || die "Install failed"
 	dolib.so libdwarfsck_main.so libdwarfsextract_main.so || die "Install failed"
-	# See https://github.com/mhx/dwarfs/issues/184
-	dolib.so folly/folly/experimental/exception_tracer/libfolly_exception_tracer_base.so || die "Install failed"
-	dolib.so folly/folly/experimental/exception_tracer/libfolly_exception_tracer_base.so.0.58.0-dev || die "Install failed"
 }

 pkg_postinst(){
--- a/sys-fs/dwarfs/metadata.xml
+++ b/sys-fs/dwarfs/metadata.xml
@@ -6,6 +6,10 @@
 		<name>Denis Reva</name>
 		<description>rarogcmex</description>
 	</maintainer>
+	<maintainer type="person">
+		<email>zhuyifei1999@gmail.com</email>
+		<name>YiFei Zhu</name>
+	</maintainer>
 	<longdescription lang="en">
 		DwarFS is a read-only file system with a focus on achieving very high compression ratios in particular for very redundant data.
 		This probably doesn't sound very exciting, because if it's redundant, it should compress well. However, I found that other read-only, compressed file systems don't do a very good job at making use of this redundancy. See here for a comparison with other compressed file systems.
--- a/sys-kernel/uek-sources/Manifest
+++ b/sys-kernel/uek-sources/Manifest
@@ -7,6 +7,9 @@ DIST genpatches-5.15-143.extras.tar.xz 3936 BLAKE2B c942135c9120024effcc516070b8
 DIST genpatches-5.15-154.base.tar.xz 5941944 BLAKE2B b32e3bbeadf0b2b3e121d1cd017c3e77320fa8b7365e4106d6574934899ca1c0d4604370774da759a840c09693f89006365078cb77bcf1c23da5bc463d4a36fe SHA512 e32978ea17b1770d5180ebeaa6ba5f9e91e6b4bca70fc4dfced04c93aa7b6d76adf8c83c1b94a182b61fb6a5b73d3778789a0183ef9b49e887647348fadbf2e3
 DIST genpatches-5.15-154.experimental.tar.xz 5420 BLAKE2B 162a76e418af594045ec24fed99dba3204f14cb6370f990d39dfc02bc953cb438d090868308cda33459e506c032bd7e27d14551512b133b7f7981774a21c2f89 SHA512 9bc64f0e16e29443036341f7439e1f9a827423ba0a132aadfe5bc2f14b67cd9c591e3cbd31476197d2c3225aaff1f394ead9b93bf6054f39b70bf4bac2277d47
 DIST genpatches-5.15-154.extras.tar.xz 3936 BLAKE2B 6940bf38e7c0ea4008d745171b61b4dc9825ed418a10e5d5c7fbd0ecd7a6bbabcb6c747830bc60f5d75250b826c308bb221e4720be47275e0cb653b3e21d8f10 SHA512 6b70c21c724be7e42d4e9b7ca0ee5af7aba1f7d2532ae73a571137290cebc4c6ba5146d4c0b73c9424827b876c1fba18e6b60868f09022902e0c8369b73cf2d5
+DIST genpatches-5.15-155.base.tar.xz 5989160 BLAKE2B d0b4b6b84a87f5ce4f7f22ae2b0c21cf21acbdba1de9f22839a327c1fe581023ce4b6a2886e6871220189618bd4adf865eb073388ef14b6becf8bcc8861f690f SHA512 1d7454c1e628e0f4a281c14ae0c330d69611dc96a074f25a0c6573bb83ebf4c3d6a3137ee3599421ab70b55c98f71e9a2934c45afc45d4c02b7f1c4614288c79
+DIST genpatches-5.15-155.experimental.tar.xz 5420 BLAKE2B eb9f7eb09937679d6ef889a86102cd00390a5f1c5db371fda97b91e7f9b8697c1606b5876cd2b170165d506de5d3ad10ff7ceee102e5e4536a49217ee221f0c7 SHA512 ab1178811176c1ce671f78da2776ad21b14a1f6a7e2ef99a714c8d177cff69487204fe23e246f786ee9fbf663ae7f71f5f22e76edaeeff7791d77d67b5aa1a81
+DIST genpatches-5.15-155.extras.tar.xz 3936 BLAKE2B 8fafbb8cab4811a4c460aead75e719bb0cfddc8045fb64a566c4f08ad7b9c90923cb670d68d376279e08152bb08cc9e3213948f8cbdc17a03992ed0be65aba00 SHA512 2b5d8ecf9644c8f8ef5248f33bddc945edfd5ede85d84779d04574e48a39bf855d390e27107d130aa46805eb19bc825d921101832f5121f3b2073ad39b9cfe0e
 DIST genpatches-5.15-80.base.tar.xz 3218432 BLAKE2B f2478969a4e7a24bd7a30328e2d17d5daafa9fbd741dd7eb295c025f27c08ccf8efbde13003e084c509a8bcf5f1d28f45189a28467b31c48c2a4d344a726ec4f SHA512 60737de4d0f8e3acc02ed07a82853d9226daf54b3b5a1b990d94e78b3dcd9fae26b9e6cf8854e5074b88dd826d286440155b70c4fc19f271ce795b2bbcc61b1a
 DIST genpatches-5.15-80.experimental.tar.xz 5424 BLAKE2B a01c40dc5f3bb9f4c315f64830244d69fb7a81f4f0c3e1b987f53d867f1174fd8a4d91fc5e9cac38554b0fabac393af97a91a8203f285010def930634ddf5402 SHA512 b0338c9664906a20fa63ad1673a82517656905b370849c668dfa5c0b1bdfd6059178dd50e690db26e47ddc104b60ffa048ace4119f7b3b2427215bc3ab817d80
 DIST genpatches-5.15-80.extras.tar.xz 3932 BLAKE2B 50940b69b0793c1ab7f19908daca488e7dce5c48d74bcb636d5faa60fc510217b94f175669a28963347911291204f0f6384322b55148c70e63cc54e21dc74d1d SHA512 9434da5bf439f12adb55e70fb8f5d675b9d452dcb2a364da9cb65a2f4cd405cc0469c2c291fdc6b0f015a0d52d08ca0475a389e45041cca532f049e1784d06b3
--- a/sys-kernel/uek-sources/uek-sources-5.15.0.202.135.1-r1.ebuild
+++ b/sys-kernel/uek-sources/uek-sources-5.15.0.202.135.1-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_VERSION=$(ver_cut 1-3)
+KERNEL_TRUNK=$(ver_cut 1-2)
+UEK_PATCH_VERSION=$(ver_cut 4-6)
+UEK_VERSION="${KERNEL_VERSION}-${UEK_PATCH_VERSION}"
+
+ETYPE="sources"
+
+K_GENPATCHES_VER="155"
+K_SECURITY_UNSUPPORTED="1"
+CKV="${KERNEL_VERSION}_p${UEK_PATCH_VERSION}"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+DESCRIPTION="Unbreakable Enterprise Kernel (UEK) sources built from Oracle"
+HOMEPAGE="https://github.com/oracle/linux-uek"
+SRC_URI="
+	https://github.com/oracle/linux-uek/archive/refs/tags/v${UEK_VERSION}.tar.gz
+		-> linux-uek-${UEK_VERSION}.tar.gz
+	mirror://gentoo/genpatches-${KERNEL_TRUNK}-${K_GENPATCHES_VER}.base.tar.xz
+	mirror://gentoo/genpatches-${KERNEL_TRUNK}-${K_GENPATCHES_VER}.experimental.tar.xz
+	mirror://gentoo/genpatches-${KERNEL_TRUNK}-${K_GENPATCHES_VER}.extras.tar.xz
+"
+S="${WORKDIR}/linux-uek-${UEK_VERSION}"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64"
+IUSE="+gentoo experimental"
+
+PATCHES=(
+	"${FILESDIR}"/uek-sources-5.4.17.2136.303.2-O3.patch
+)
+
+src_unpack() {
+	default
+
+	# remove all backup files
+	find . -iname "*~" -print -exec rm {} \; 2>/dev/null
+
+	unpack_set_extraversion
+	unpack_fix_install_path
+
+	env_setup_xmakeopts
+}
+
+src_prepare() {
+	use gentoo && PATCHES+=(
+		"${WORKDIR}"/1500_XATTR_USER_PREFIX.patch
+		"${WORKDIR}"/1510_fs-enable-link-security-restrictions-by-default.patch
+		"${WORKDIR}"/2000_BT-Check-key-sizes-only-if-Secure-Simple-Pairing-enabled.patch
+		"${WORKDIR}"/2920_sign-file-patch-for-libressl.patch
+		"${WORKDIR}"/3000_Support-printing-firmware-info.patch
+		"${WORKDIR}"/4567_distro-Gentoo-Kconfig.patch
+	)
+	use experimental && PATCHES+=(
+		"${WORKDIR}"/5010_enable-cpu-optimizations-universal.patch
+	)
+	default
+}
--- a/x11-terms/rio-terminfo/Manifest
+++ b/x11-terms/rio-terminfo/Manifest
@@ -1,2 +1,2 @@
 DIST rio-0.0.28.tar.gz 34177343 BLAKE2B 38a2077a85d3008a361a91d76581128e73bc6a49b7a656d64f44c13512772deec6d0190880f323e41e12c6f6552549675a3f06ae7b20285f0a3bdb0bb5c01292 SHA512 6dd1992ab761d6c5b7ad78c483fe0096a4d1c93b241480c14cf10799cc831029023989f676be835d744f7a170733f3503f37f90ed92e3790dfb8fa334c07e68b
-DIST rio-0.0.33.tar.gz 34516996 BLAKE2B 73a83e9b7b039e4959080a68e96ff252dff6278de519db2c2f67be9b3cc40d3a572a34a20487bc52103750eeb2613045f830ea45655551f653bf466db69bc9e8 SHA512 a69a4e7b6aad396d8753671d44b1f02cc061ff7bc9eb124e4669b7bcc0e7a108d52260966d0915f42dd0a5bff4789fcb0b3e1c6eaddf3f646ec1f77293894f08
+DIST rio-0.0.34.tar.gz 35557809 BLAKE2B e757ee50445664044c44e49e93588b096876c8e4a6c4fd7a0b0229704324d7c6f8da64936bf77eeba271b28cf34760ff92f452c87f3452e30e4871fa4d21e180 SHA512 9a0a01e02a432e030b9dc01fcf62606016f57724b8bdf11b4f347a077ff373bc7e03843294e883ff4add24a6d69e9baf628ea0b05252a7028dc18e315f44a4de
--- a/x11-terms/rio-terminfo/rio-terminfo-0.0.34.ebuild
+++ b/x11-terms/rio-terminfo/rio-terminfo-0.0.34.ebuild
--- a/x11-terms/rio/Manifest
+++ b/x11-terms/rio/Manifest
@@ -75,6 +75,7 @@ DIST core-graphics-0.22.3.crate 29514 BLAKE2B 6e89281ea95f323c60d1948aa2ebc808bd
 DIST core-graphics-0.23.1.crate 30714 BLAKE2B 291e5cc4cfcf1a6507dc0e4dbeb304fb445530c60d7bef79dbaa53524233fc453d1ee977e7ed43513319e1d5641e756749f43b536535fee730308322190462e8 SHA512 2b0e2c00900d4a9e09c718197692ab2aa0d009a43fc03a30075eb33ed7648f6ef640bc2d827fd9cf17f752b810eaecb77107096aeb1daa0348b3b7e17ae47fe4
 DIST core-graphics-types-0.1.2.crate 2641 BLAKE2B fd7934217cbe745934247657ce36ae8f9379d42e1cfecaad74176cbdcf8ae8e8813a21dea12f2822ceaefb4f14c0f8ce9475b709b56494b7e9bc9719cb8fa4ba SHA512 f4e9252d93eac57e35984b177b8e6c5dc014c1dc8947687aa86139a7abe833a55c30e06da9ddb219a3bf13d7d8f8bd970bcc6f12521eb259a970a61449041088
 DIST core-text-19.2.0.crate 18446 BLAKE2B ea2d6e2adca87a9b7febd66230dbb49ef0775869bd25c4f9dadb756197e70286068f202b3f39010a0b33afa1f610871e241532b32db766e887caeba9b76c1645 SHA512 37bfa0c75849ada37fca77793a5791dce7dadfb9fd20b353e6761c12d0a7d06df3ffbd99efd8b6885356dad00e827e7fefffcbcfc49ccd0c5dda50717986f4cc
+DIST core-text-20.1.0.crate 20836 BLAKE2B 8987aa9c14935afb5f6d587e91818855047420ffef8815da5887749d1dce0b3c35b99cbf53b308b7654ae027376c8db748ed01cf9e0380599fb37402282bdc9e SHA512 3fd68fc80bfc670f3a1f3dff444484d403b3aad8eb91e78305c7a37ed2cc48a45a7111e5d5e371541a4c0e01e73d1e88200569f048ac9db0884ea09953d88685
 DIST crc32fast-1.3.2.crate 38661 BLAKE2B ce3762b03d24d5367d89738991c060f4b3af7840e0a7ac7fc17d01ed438caf964bbaefad0fc4d0c438dafa5a578429ddd353c71197f8b54b1ec441395f2f7ee0 SHA512 a683943e252afdb1b9d626a07533ed11cf7a63af603c19640056c5d2b9c884ad9aff33ac54c0853ffca2f6cf94b0730eae6c05abf3e53e55e709d180c8152357
 DIST criterion-0.5.1.crate 110088 BLAKE2B b99018b6a6f97fe47d90a2135e3d483ee624d43088d7881bafb2c35ba385629f1a4353110bf190c04903abc4ee99ad1735bc9c5afc6c2854a1aa9221fd714617 SHA512 6a1a32437bdb95f8472bafb5b04bb5999a6ff6fee4ca5965028ec53b4867d01b529241d01809a003722ec7d5710c323274b6f3b50ca0935919a9dee693f4d3b0
 DIST criterion-plot-0.5.0.crate 22706 BLAKE2B 28a50375f2871ce6f168aafabff46f4368bf55cac379c67a2b4396403259372759dba3355786e695b566b1cddee9091a469755a04c06ee949f00aee8e9a28699 SHA512 971e96dcc64a5afa7488f1a99475f0f5639c0ef63f9eeebcada351868697cbff397e99827cc07c0a52e7d7d1a87856fe1fc48c22075776b3bc9c94af62d79f14
@@ -83,6 +84,7 @@ DIST crossbeam-deque-0.8.3.crate 21746 BLAKE2B c24025c65d7c1c98e442af95491749dd4
 DIST crossbeam-epoch-0.9.15.crate 48553 BLAKE2B 23aa0532d3126e22efc779859478098e505b4ec895c643530a3f7e8dba0543df3d8ffcb6825b1d3869a4418e17d798d464b3e1bb51522435d50f53ac224e22c8 SHA512 d9292c059ef1d156da52950137b2b3ea5eab66c4cc2f763d02078d0b0106980839ebed2ae2aec53e026ee7b3ddc37c4b51370d925ada1ad13d9981934daa7bde
 DIST crossbeam-utils-0.8.16.crate 42508 BLAKE2B dfaf9e7cade2cb5a2de90dc622e58a69c5b28fe9f69d3cbb945431683cf48fb409565190e3414a815563afb12631d990476919890fc482ce6b5792fdc25536a7 SHA512 4b8d599a8b93015eea2fd404cdf1526fbb94662fffc7c64d2f0659aeef349e4ad682f61b2b85d075c7f3fbbc4d8106cd7caf6e65dae117ba982f31262df3f831
 DIST crossfont-0.5.1.crate 31985 BLAKE2B 0442725c3cb06b24b7922ae38d50b07bd9f4566bbb8d6b16d26c80ec680cf887320b64c127b73ffd6ad79240ab654e78c21c7cb453eb061a01f59ea1275e6873 SHA512 0dbf63cbe316ab79f86186157994a1ba4dc6bb484a71ba9379db15280bd5899826b1fd2077513b3bd3427eb5ff54b0b445038c5fdf346047cbee7d8f6155140d
+DIST crossfont-0.7.0.crate 32167 BLAKE2B 8ade5766700aa1939cdbc8d9ba133ef7a80f67ad43433a5cdb6c6d3b35f5a78aef739f73f6ed4a9d5c400c08966f470f9ee9328289ec11d56d8edfe36e14adca SHA512 de6a002742aa814ad57219403af185323acc8cf6ef9639af71aa93d16ffd7d06ac0a09c70c61fc15fe98eeb490c1f02fba2533e4b6ab7bc4d1632709a1a6aa47
 DIST crunchy-0.2.2.crate 2995 BLAKE2B 74ddf8c5e0deb2ceab65c20a2743e1230739ac6aa3af60c9e867a7852270697a1278b7dee00df8949fc4268f9756a4a098df1211ab3b3e31a122652c3ba0a6fb SHA512 36dc0aebc41a3aac5f1b178a7e61b65bcd9bb5c8539b2024f79428200f7c62daa7098af55c6ab0765febd2f8969bd6c0ac8096f73cdc0958e5c4e4eb6a4f7025
 DIST cursor-icon-1.1.0.crate 11453 BLAKE2B 964bae7d3fe138e00c51e52ad187ddf5b71a86d9b1bc9bb394fd27869d714cafdcbd539e2c62eca9b0912593d08187d550f5507e73754a00112560acb83912d7 SHA512 4e3b74cb17773ec2b89312fd4fe60330b785cff850102e9643bd06e99b5d96c11cce14a9350f295c6063c4133dc0179cbca13fefd7ab816e57c915f75d066d2e
 DIST d3d12-0.7.0.crate 17319 BLAKE2B aff7692ca8aaf6f9a55917dbcbcbeb7ba68abc5e5c8306c8ef2f738aabb5a88d8369f3a49a62ca587228831a8b226e429af6e33d16f597cfb9a677059cb8be16 SHA512 55e1506e35c65059c9c1f5448e9c1e628ad317e124773a516ed7bacad35e7dcf400e88c9b853c95a38cca94ef15db887f34874582bd287b8707527e6a08f55e8
@@ -104,6 +106,7 @@ DIST fdeflate-0.3.0.crate 21790 BLAKE2B 3c96f6395fc42f66e436fbf6b747c2f3c2dfd8c3
 DIST filetime-0.2.22.crate 15029 BLAKE2B 068f4a84388d04d900bc5518a94895985ecba9c618a47b6483cabc31abd267e37ce69d78c51703ec5745307800d96ac801f37ac9959c60283c3c3d6ccd349c0a SHA512 d40d8baeb57ec85bb9ccf76ff0f898915c4e6cf384020121b53f4a2a1ef2840af5b4c9e8e1ff177034273f4f7a6bf81d2dd7a02cf498b61ea31ceaa30b877067
 DIST flate2-1.0.28.crate 73690 BLAKE2B c9f141bde0eda6b9c42da0a3ed69322c12c6c29bc522131f51ad56f6e2758646aa5585382407409257a8301f5f07a1825d150838bbb55822f2d49037f6279aa8 SHA512 9db6f3ddc4e1e91960b07c08712beabd911b297d93db8be3ecb97a392a4262e608c75ed8e9e34d87d58c3e67d1b7987734e14ab3d45fd837a2767e8016380284
 DIST flume-0.11.0.crate 67502 BLAKE2B aadebeda44f899b6290df4ccddfc0fc49c4e55709243e9b1eb26b6a232aee042d2260c9b504d554551be54ad4e4ae1b1dc6ee861fee0cbb6eb92fbebb5a7d9ad SHA512 29e499f3de970d2d400c3826e912a49a01408dae8d933068dc94576cb0c2ca0e42ec4a9ebeffd17a20f56869f09eec04a2b90a335bfaa6462b8df474b2a49fcd
+DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
 DIST fontconfig-parser-0.5.3.crate 38070 BLAKE2B 5f53284a34e1f33eb02aff5eac54c49b369a6b49f274897f380073e3f88e84738e76be395fadccc4fc909d09103a4e9f1ba70fd62a86609aa3db1836cadf7861 SHA512 a87c793feda68a07eaf8a55bf769e1aed56b7e63eff10b3f16f311fa84ad4ac92fe6425b65fabe2a0be4adc7fdae7254068a5a4471f66333b7845e1f75381bac
 DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232
 DIST foreign-types-0.5.0.crate 7824 BLAKE2B 01a5111a11e48462914f9877d3228008590093633e957883fdafd3a7017e144c14fbbe713bb8b0061ebae78d20a49978191ce416a4e28317b67ec69e38acb879 SHA512 d07c92cf99c99419a3ebe05ba9154e396ab88116f46af736ffdd958c8e47741bca5d9f478f6719d5361360e844375968c1cbf6ac40995d47128a5e5fda3f6c82
@@ -126,6 +129,7 @@ DIST futures-sink-0.3.29.crate 7853 BLAKE2B 2c5dc852006b364be92e59a9adcc200bc096
 DIST futures-task-0.3.29.crate 11853 BLAKE2B 050df023d7942207ea11cbe5e1cb5316a255763948b0c07d479828a3245ca34b82a71d1854ddbb13e01e853bd4ce424b319b2182346c36122d0246649390961e SHA512 6f8da7141899cceaa498c857a81c69330c093cf518e101dc53ee1e37123fae918536fcb1dde038e06c08f05c5f378a50970265a35229fb31c2377146cf94be39
 DIST futures-util-0.3.29.crate 160207 BLAKE2B 2f545d3387d5ca21c13bc157eb219ef767b7b0c9957329f3ccf247e6402295f5384e01121a1e1ed062223568f6d7db13602b38878a280f19d26c26cf184508d7 SHA512 48fae22d9b5f38aa85b423ade3022dc693775aad5c3e6988d35e4d529b9395c0f35ceeb394492e0f3ec96719cc3f3fe4ed3811df045b840b63231921e42fd65a
 DIST gethostname-0.3.0.crate 8440 BLAKE2B a8598187c628c15bb74739d3a8033ac6b33194433ea13f0af9ddc8b455305a35933218d3ee7bc5133a1908b172b7ef3f9cfd361e1951041bdb85d67a68dd3bac SHA512 1655174eb6713d40519f70f487dc6dc65f93f03f84f9289bd1781587c06692823fa0e97f5f821938680d47ea9680cd127e0b9ffa8863f730c39abe9fe0a0f741
+DIST gethostname-0.4.3.crate 9336 BLAKE2B 12be5fdca0b6e3788cf3d67a4a80f283d240611b4fd37b6d1c37eb2503e4a7025b17bbb70adf421ac840d8f952434bdedf4691f31362780a267e21e8c4d3a006 SHA512 8c5dc404132f2ecf9bf82d8b89cbd698b4cb6d43141c47a60b95401da2e8c314347ab0a0ad5fba50cf98f01a621faa68293cb78f48977d3ddfe6e6f21926abf7
 DIST getrandom-0.2.10.crate 34955 BLAKE2B 8e7b8554ae360484ceca2a05f834c2664b08f41cbc6c955663e1f8f22fb5750481518bf1c7b49f49223a99a66914ef013347b9186acc97a20249f3222a13f9d4 SHA512 82af9e0417bff9272ed0478be4ac90426405ce210014b21899c6b95fde1b16893bf46295388ff5f13fa712a04c99c46b770fab83f41a1343af1590a86ca8da3b
 DIST gif-0.12.0.crate 634734 BLAKE2B 067baacc4a10ad1d992aadecb578034bc820ff2470eb2fe1b63212584ae1f73fb6febe3652a309a3931fc6fc6823533af2c3d567414925118c5086970a09bdf3 SHA512 9cee5c4f68b02252f6214fccabda29087c89cadd8408df4fb6b9479da7958a9759dfc4b13ad2bc7e1447be9050cea6d3757d891b774a7e6fe8c6fd25bca3b74a
 DIST gimli-0.28.0.crate 269277 BLAKE2B 4d651d9f71b826d06b3089cb09933f30d785801b8072228c9a5c9ed2011172c679e86205dd507cb1866634238b20721773e60410bd25fbcc5c3421c72ba565be SHA512 a5a861c7398ec655635a39c3a421ca5c9effb03f4980a000c342b81b9bf229481639a8a62c4396508a9800ec9d313317036a8e4e7da3add5adeca596f1c09d51
@@ -261,7 +265,7 @@ DIST regex-syntax-0.8.2.crate 347228 BLAKE2B 211fd1c35ad0f28874d4b4d276e0fb0a27e
 DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
 DIST renderdoc-sys-1.0.0.crate 10336 BLAKE2B 9f9b0221f11376093771aa9d91b2122a60fab45ae3363e38a778b2cd647729f6ac8df4e79049079ad1e84b4d60b362b5658f080a91abd5939df11c482c060e8c SHA512 a9e36c82853edf10e143fde02359aceac879ca42d23c95a3a7c66e99ef027a6449937136c9d1c90efc1cc542aa532513690fa235e7cfbcc59ab951c535a26890
 DIST rio-0.0.28.tar.gz 34177343 BLAKE2B 38a2077a85d3008a361a91d76581128e73bc6a49b7a656d64f44c13512772deec6d0190880f323e41e12c6f6552549675a3f06ae7b20285f0a3bdb0bb5c01292 SHA512 6dd1992ab761d6c5b7ad78c483fe0096a4d1c93b241480c14cf10799cc831029023989f676be835d744f7a170733f3503f37f90ed92e3790dfb8fa334c07e68b
-DIST rio-0.0.33.tar.gz 34516996 BLAKE2B 73a83e9b7b039e4959080a68e96ff252dff6278de519db2c2f67be9b3cc40d3a572a34a20487bc52103750eeb2613045f830ea45655551f653bf466db69bc9e8 SHA512 a69a4e7b6aad396d8753671d44b1f02cc061ff7bc9eb124e4669b7bcc0e7a108d52260966d0915f42dd0a5bff4789fcb0b3e1c6eaddf3f646ec1f77293894f08
+DIST rio-0.0.34.tar.gz 35557809 BLAKE2B e757ee50445664044c44e49e93588b096876c8e4a6c4fd7a0b0229704324d7c6f8da64936bf77eeba271b28cf34760ff92f452c87f3452e30e4871fa4d21e180 SHA512 9a0a01e02a432e030b9dc01fcf62606016f57724b8bdf11b4f347a077ff373bc7e03843294e883ff4add24a6d69e9baf628ea0b05252a7028dc18e315f44a4de
 DIST roxmltree-0.18.1.crate 43040 BLAKE2B 3b27385805466363d082dba273f35a975d1b2f02842f150a91cb94f86b478bb220a1824150d3650677af069e225f0498f90733e9c2462b7614fde382c78366fa SHA512 36409eb077bb3b26663096ad6457338f124eaad7bfb11de08d57bf44eef0653736d234a9bf8ed6d49ea357741d775e0f01bea931b298aa4445a086d58bcea937
 DIST rustc-demangle-0.1.23.crate 28970 BLAKE2B 611d2e41a8a9799db2f8bcb8fc8fefcda361d055a417d2bfaaf2dedcce9d6f388c69d905a28c65e6691b4d408d7922ccdc97ce524c87c3cccb8467e314bc87b9 SHA512 8cd29800254b1305ad50f1fc008838c52d9659f97a51a68e9f2bd6d0a60126f3ebdd1c79760f96445b3bf998d0773526ddf663b174acca81babdc0b423247247
 DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544
@@ -271,6 +275,7 @@ DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764
 DIST scoped-tls-1.0.1.crate 8202 BLAKE2B 20be49f0546691bcff3f0fc257345e432e200836a60b297ff3fe698699ef6a2fe8a5dc6977902a08f7dc63c578aa27607dae0f1889b849c257c59c48a458e1ed SHA512 342f43d53edd33ea3e2197faf5dce37bfbeb0b20b6f0febad4dc6244c3185df127b2c10488e95561260a0ef968f32707460f2d0d23667cebece19b167c0a0c25
 DIST scopeguard-1.2.0.crate 11619 BLAKE2B 8b7e9ed6cefef9ee55407fb9690d57a2a98bb93e5105aeebdb475a52485e9e185255249e1dce8f83cd80534e7402d485aac3efa7e8493b13135de27550cd4bc4 SHA512 6247719a15fe1e4e2d179127b9a934bd2f99367724f41175ed9522f58824b6bc69b35002eae66b35880375ff61d77ac43ddaa78cbde7160a35183a1da32d3fbb
 DIST sctk-adwaita-0.7.0.crate 49423 BLAKE2B c8f88552717c210ee9b86d195b901c86f3fb2fcbf87ba2f06ba87afd0aa2c0b5987c26ace8ea9c6ef1ad22194e9c7f60b5dd72dc44a8516c53aa1406755f3fda SHA512 952744d34c6ccb65ac00b7d19ace7b889ffbffd17c6fcd52126f0740afa6449d2cebf67a242cdcb0eba032726076d9c0f8d6ccb0d322b5851e5ac247798d1367
+DIST sctk-adwaita-0.8.1.crate 53712 BLAKE2B 2d54470cc5b8f3c6bbca1cec1760c5e647973fc1b377bd0397f279213e81d792f0ba31b6b81dd84599b41d93cfd014abba890febd9987c94ac6c6fe8e139bb1e SHA512 7eba66a3f4f7d9f5e33615d0c1245c211e599106573c8d68e7e6a07a9d297261f0a01fd31b90a3ded934b4082e722ac93a5004acfd56e0aff280597a715d58f1
 DIST serde-1.0.190.crate 76455 BLAKE2B d0f6a52615136d810760c6da3078387abc67ff5119e25953004d470ec6f5c569abf1c324b777c004714b4b15bd49a9972ec592372c807b26f3b4f124d534c833 SHA512 7f1cbe819fbae803865beb20b5d8b9fa52d503e04083be7181c1d04b702aaecf553796db960bfea87dc17ef864246e78a919219588064fb083e77dd2c6c16ce1
 DIST serde_derive-1.0.190.crate 55676 BLAKE2B a6558987927298a6551a52d7a8e265acf1a3a0576716a881329803637b6f7ee7b3329e161bf5b37e410264c03913c2c16166df7dd25110b1295d61806600f4f2 SHA512 5b37b659c45ab95b0333d787cc5e8374076121d548837556774cbe768073b02aef4a6889e32b738ce5d85613264ba78570c0af48d049102d4d687ad791dd09ea
 DIST serde_json-1.0.107.crate 146458 BLAKE2B 753be6076826ee0ba41a067e81c031e6fd69b539086a2d649e6595136fd05d61b717c3d4cb6774af0a0c02102f7f4588e682bd21732450afa93877d093596880 SHA512 ecd4ef86538df402f2a397cb86c5b4b277a9a43d742e2af3d51ab5ac0ba31c677bfc72db06c10f8abbc970ee41d5f77d758f1f70ea18495d96bf78cb7d66c2bc
@@ -375,12 +380,15 @@ DIST windows_x86_64_gnullvm-0.48.5.crate 418486 BLAKE2B 12a2199d434617c1df1a839e
 DIST windows_x86_64_msvc-0.42.2.crate 666936 BLAKE2B bc3a456e7f8bc272f8978ec69506ec9d89f97b7582ebbe05d8bd57bdf8156ef62d0d2dc6137a97e81d54059d70db97a24af9a038adff357f5dfd28805d6193b5 SHA512 53a35f438903fceb59e36bd2ac331773fb8e6c8c5a6d984e79021761f91b3b4a23efe49d219667a4d0d23dcdbf906da9c24e74fb1cff93395b5c55ff524e3788
 DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0
 DIST winit-0.29.4.crate 570692 BLAKE2B 70a1415b4c0846b66ad6698b605d85d11d29afaaefe416b44bba73847552c5a478757704711fb3f0ef68fb463479e2007a72d06de93c4febd62a3e4dbb9a1d6f SHA512 6b618a6494604d8ef3bee59ed2e3973a5003148c353a9f8bc78b96c47b3d758c44d84eec991287ed855eeeaacc78589033016c94381942b7ccb59d1ecb243e0b
+DIST winit-0.29.9.crate 573854 BLAKE2B 76a37df12165ee7105b9088f008787d7e0305560ea3bedaec3d900659f63febcde5019aca57a5ee5f1840ca27b72de3b188ec4b3041cdd81286f9ea76e919d38 SHA512 fcbb979df14f76d092f6f4c609ea6fcbe6e53dd53521995bc930487c656fbb1f9f362bbb1ab4fbb321d14ecb39a357461887703f850d1d85c6b385d48585ae67
 DIST winnow-0.5.17.crate 147147 BLAKE2B 09adb991e02214666f6e2117bddd144b2ff6c93a044387d86cd01a37593c9c191a8e74e53be482805e31e4dd60ecb5f7228c010492993695e55fd8cad994e261 SHA512 632b9610a41626103583e7981f2621b79cecccb7cb4c9e003538be19f9f12dae0c4a3d94fcd55a3b0f62e7305d6de56668a6d672fa9739bf044cd30db8c093bc
 DIST wio-0.2.2.crate 11214 BLAKE2B 7356229f90aa50d6ac8a7651637967de3e06755a7a45eab2a144e13c876058553c22129abffb07717b1715233f6cfc1efe90ff60c1877f4291fabaa4b5ea283d SHA512 13838de6e01b20de8996c7aa9efbaca5bcd9e4551614cfc10bee45ecca4bcc70b953b2c59fe460d1a054b3ecac13445b020aa244ea70686fd19be8d65c539b0e
 DIST x11-clipboard-0.8.1.crate 8609 BLAKE2B 809689bd1d8d31ca8e6ebc04b12913523156865ec8807f16921390460a62f616d1a2fc5f3743fd24860e9ae9811ca5405a7b5e4572310ebfe21a1230ae11015c SHA512 fd040632a4e0068a641accaccf493f67aed0d941b2c660df8196b298a82e4d244e235feeb7a4367c24bca0a12565a1faa56bad612d66544c5aa88dfaeb9eefec
 DIST x11-dl-2.21.0.crate 66823 BLAKE2B 83305b44ec89e765ecb2dc48fc3aa93bc67d30f12e9782348bca822ca636207e9a9c2b707ab33b6dfc7fadd2b2cdaa599480470eef7a29a15332e923413a7cce SHA512 b864b0865720a9b2afc6d986fb7ebe19734671433449897d7f00488e019f3781f417f8e3763f09fa0db100a1d0c7e709ea9ac43c6dd48775f3daf803ebaebee5
 DIST x11rb-0.12.0.crate 218514 BLAKE2B a067d012cf2aa5e7a20a11270fa1101bf6a2464bbb1855569d752bbf781f70d827c3f24912d062b23fa625b2ff9eaba4b59b8c28b7614e0340fed5f046535b6f SHA512 1e2122effd38c5f67d1fc24e6a9b74e14a04713166980e4cb071860616a19cfa9ed87e4733c1f029df10de1a17e732b928a138027e8ee0e4a1f4242f251f5f78
+DIST x11rb-0.13.0.crate 222396 BLAKE2B 279dd73a1b342d773097cbbac7ce3ce198ee503c809f6d3b89c2c69b2e40dd21005e47cde708c0e9b12f2d944c0c1965a815eee774b86d9620d4dd51289cf0fa SHA512 9e86c7fab70d20193804a85608aaf46697b56f3d78eec50dd835c4ddd4a45ff56c0819309b443baa4a58f93e7d37f303e29ef279dbcd5d8c917c559751ca00b8
 DIST x11rb-protocol-0.12.0.crate 478311 BLAKE2B f00f66053ef81d664a6f8bd083bd91ebe5c607b9190e9e7259bfd6f4b2920dbc05c0b85267a1cf878d0f43cd4b11fc5e45233744c18b5aeea02dad6d04445479 SHA512 3ef8a79a98f428e82b250c2162357f9965618aa3d9b92e37521e42de884d7b71fd7de51c56ba117f0cced674151c9bc6451dc919326ddea362b4e44f839ae492
+DIST x11rb-protocol-0.13.0.crate 507838 BLAKE2B 11955c1908fef177bef859c1207f8fb9e644a8841ccbef885446a021152cb37a113bcb988a0d645e8b9289dc760d03d66ea0a6836e28bc25717e6ba571d02cb0 SHA512 36f412ed83634c402cfb3fea3fc64b9782b348fde3e98617a6c478867a0e93bacd9a69b1feb8d7ee5c01de578ddb85fff1ab86dfaaf88391c3e03dc7aeb3dca7
 DIST xcursor-0.3.4.crate 6069 BLAKE2B 0597eb71a6ad7ad5360674c76bab042a80f1f52f490edcdd824661288eae98f2bf2c4d7da7079bffda0fbfed0409a7ddb329d855deb784fc952d1c2f2d5dbdd1 SHA512 229ea7516d8a07c3fac46b70329e89c19fcf282134b5063b8302a64f8723d31b52b4fcf23c49aecd3a3a0a736ba4a52cd033f8c3db21a775084c6c0a0e1f6c1e
 DIST xi-unicode-0.3.0.crate 87001 BLAKE2B 1d44488a32dc9bd9284df6ee26f0f05c5145c458dc76943cfab88f2f2544762477bbe1378bc1f5e365cd5a5ecf79e41fa66140190047f37ea5dfe678c97a542e SHA512 39875839dcf90b391e76a6b2c2efb2e6f8bfdfdaa59c4815bab8f24412f840c6b01232b5bd79a8f8c6bf7733333e5915c2a7235d27f890b883d6658094bf6271
 DIST xkbcommon-dl-0.4.1.crate 5832 BLAKE2B 86c89218eacebe67e2244fa905bd240952517970d1e18d6669c6bc4f54929dbe1b63a797875fe313c62d9a2290c21cc887e74c767c5e7feb75d653ba868525ae SHA512 36662b7ae4a07189b10558fc4fd8e9edf44948e67947166ad1601dbd6d5b6d4bc679659de6aa4a913d3ba8243b538623f413ab9a27cb34604a17101e71dbd7f9
--- a/x11-terms/rio/rio-0.0.34.ebuild
+++ b/x11-terms/rio/rio-0.0.34.ebuild
@@ -66,7 +66,6 @@ CRATES="
 	clipboard-win@3.1.1
 	cmake@0.1.50
 	cocoa-foundation@0.1.2
-	cocoa@0.24.1
 	cocoa@0.25.0
 	codespan-reporting@0.11.1
 	color_quant@1.1.0
@@ -80,9 +79,8 @@ CRATES="
 	core-foundation-sys@0.8.4
 	core-foundation@0.9.3
 	core-graphics-types@0.1.2
-	core-graphics@0.22.3
 	core-graphics@0.23.1
-	core-text@19.2.0
+	core-text@20.1.0
 	crc32fast@1.3.2
 	criterion-plot@0.5.0
 	criterion@0.5.1
@@ -90,7 +88,7 @@ CRATES="
 	crossbeam-deque@0.8.3
 	crossbeam-epoch@0.9.15
 	crossbeam-utils@0.8.16
-	crossfont@0.5.1
+	crossfont@0.7.0
 	crunchy@0.2.2
 	cursor-icon@1.1.0
 	d3d12@0.7.0
@@ -112,11 +110,10 @@ CRATES="
 	filetime@0.2.22
 	flate2@1.0.28
 	flume@0.11.0
+	fnv@1.0.7
 	fontconfig-parser@0.5.3
 	foreign-types-macros@0.2.3
-	foreign-types-shared@0.1.1
 	foreign-types-shared@0.3.1
-	foreign-types@0.3.2
 	foreign-types@0.5.0
 	freetype-rs@0.26.0
 	freetype-sys@0.13.1
@@ -134,6 +131,7 @@ CRATES="
 	futures-util@0.3.29
 	futures@0.3.29
 	gethostname@0.3.0
+	gethostname@0.4.3
 	getrandom@0.2.10
 	gif@0.12.0
 	gimli@0.28.0
@@ -275,7 +273,7 @@ CRATES="
 	same-file@1.0.6
 	scoped-tls@1.0.1
 	scopeguard@1.2.0
-	sctk-adwaita@0.7.0
+	sctk-adwaita@0.8.1
 	serde@1.0.190
 	serde_derive@1.0.190
 	serde_json@1.0.107
@@ -379,13 +377,15 @@ CRATES="
 	windows_x86_64_gnullvm@0.48.5
 	windows_x86_64_msvc@0.42.2
 	windows_x86_64_msvc@0.48.5
-	winit@0.29.4
+	winit@0.29.9
 	winnow@0.5.17
 	wio@0.2.2
 	x11-clipboard@0.8.1
 	x11-dl@2.21.0
 	x11rb-protocol@0.12.0
+	x11rb-protocol@0.13.0
 	x11rb@0.12.0
+	x11rb@0.13.0
 	xcursor@0.3.4
 	xi-unicode@0.3.0
 	xkbcommon-dl@0.4.1
--- a/x11-wm/phoc/phoc-0.35.0.ebuild
+++ b/x11-wm/phoc/phoc-0.35.0.ebuild
@@ -13,6 +13,7 @@ LICENSE="|| ( GPL-3+ MIT ) GPL-3+ LGPL-2.1+ MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64"
 IUSE="+X gtk-doc man test"
+REQUIRED_USE="test? ( X )"
 RESTRICT="!test? ( test )"

 DEPEND="
@@ -61,6 +62,11 @@ src_test() {
 src_install() {
 	meson_src_install

+	if use gtk-doc; then
+		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
+		mv "${ED}"/usr/share/doc/${PN}-${SLOT} "${ED}"/usr/share/gtk-doc/html/ || die
+	fi
+
 	newbin helpers/auto-maximize phoc-auto-maximize
 	newbin helpers/scale-to-fit phoc-scale-to-fit
 }
				`@@ -1 +0,0 @@`
				`DIST sphinxcontrib_zopeext-0.4.2.tar.gz 13887 BLAKE2B ce77989ff34fa76bf1263f0764a872a840cea2cf7817ab1697a8176b1bf4444f4791430b2aab8cd72026a5e56248c9dc43d1052e0e1a891456388f86bb8551d3 SHA512 acf78a943ff6842184b347251398df3e20f045601bbba755152f891ee8a5d08e137dea5dbbc38f8a82ea5f045681dce6ac83a2329d74d378d56758031111c317`