From 8174b0263a34b60b4ca6db259484e1679d3e589e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kacper=20S=C5=82omi=C5=84ski?=
 <kacper.slominski72@gmail.com>
Date: Mon, 23 Jun 2025 13:49:12 +0200
Subject: [PATCH 01/30] sys-boot/limine: add 9.3.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Kacper Słomiński <kacper.slominski72@gmail.com>
---
 sys-boot/limine/Manifest            |  1 +
 sys-boot/limine/limine-9.3.4.ebuild | 49 +++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+)
 create mode 100644 sys-boot/limine/limine-9.3.4.ebuild

diff --git a/sys-boot/limine/Manifest b/sys-boot/limine/Manifest
index 0339162061..c2c9ec4c39 100644
--- a/sys-boot/limine/Manifest
+++ b/sys-boot/limine/Manifest
@@ -1,2 +1,3 @@
 DIST limine-9.3.0.tar.gz 598597 BLAKE2B 09db8fde9b1d3a78cbf9a7f5c29c295c658bc521db5f0dcf00497d191b942549eb7d8b4eb747904420f1fa8dad70ef09343d0139ed6f0ee1aba0d1b7c626a904 SHA512 23729d0d45f9ee5b8b7a60699c0bf574cc130516244d45174514a87e592cd91ae7378fe8de09da0ce289d7c992b1f12d081285d8af0678b8a97c2bdcc0f69328
 DIST limine-9.3.2.tar.gz 569632 BLAKE2B 1017eb95c1827d36e8208cb7e745ef0784cbd19fcc1e0d2b841e72bfd88a766d19a7f4d23c7c202663759d381c9f2dbfcfddc5a66d8cfeadb4bd5416d7e7955a SHA512 ddcf82497b38f0b4f67f36ae6401d73838689624a432bd38f2b21c98e229348538309a771ff7c746bb797852cc29f766ee318030be7068e8b27733e57123447b
+DIST limine-9.3.4.tar.gz 567667 BLAKE2B 76a2efd447e14026a3688cb2133ccde48d51059606524959fa90943e1c44b202d0c0d75e0f889cb033f39986ce7dd68aba26300db167ea23e5980298bea6427a SHA512 801e8c6a547c031022a38d69a099b209906f00916ca3ed889f5161d6876a6038eecaadb6f8bba5e2f2b544245112045481d800520e995246ed7612dffcfa1e17
diff --git a/sys-boot/limine/limine-9.3.4.ebuild b/sys-boot/limine/limine-9.3.4.ebuild
new file mode 100644
index 0000000000..8292bb8292
--- /dev/null
+++ b/sys-boot/limine/limine-9.3.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {16..20} )
+inherit llvm-r1
+
+DESCRIPTION="Limine is a modern, advanced, and portable BIOS/UEFI multiprotocol bootloader"
+HOMEPAGE="https://limine-bootloader.org/"
+SRC_URI="https://github.com/limine-bootloader/limine/releases/download/v${PV}/limine-${PV}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+bios +bios-pxe +bios-cd +cd-efi +uefi32 +uefi64 +uefiaa64 +uefirv64 +uefiloong64"
+
+MY_LLVM_TARGETS="AArch64 ARM X86 RISCV LoongArch"
+MY_LLVM_FLAGS="llvm_targets_${MY_LLVM_TARGETS// /(-),llvm_targets_}(-)"
+
+BDEPEND="
+	app-alternatives/gzip
+	dev-lang/nasm
+	sys-apps/findutils
+	$(llvm_gen_dep "
+		llvm-core/llvm:\${LLVM_SLOT}[${MY_LLVM_FLAGS}]
+		llvm-core/clang:\${LLVM_SLOT}[${MY_LLVM_FLAGS}]
+		llvm-core/lld:\${LLVM_SLOT}
+	")
+	cd-efi? ( sys-fs/mtools )
+"
+
+src_configure() {
+	local myconf=(
+		"$(use_enable bios)"
+		"$(use_enable bios-cd)"
+		"$(use_enable bios-pxe)"
+
+		"$(use_enable uefi32 uefi-ia32)"
+		"$(use_enable uefi64 uefi-x86-64)"
+		"$(use_enable uefiaa64 uefi-aarch64)"
+		"$(use_enable uefirv64 uefi-riscv64)"
+		"$(use_enable uefiloong64 uefi-loongarch64)"
+		"$(use_enable cd-efi uefi-cd)"
+	)
+
+	TOOLCHAIN_FOR_TARGET=llvm \
+	econf "${myconf[@]}"
+}

From 10733bcfb8de7f827fd4646509c734cfea2904a0 Mon Sep 17 00:00:00 2001
From: Lucio Sauer <watermanpaint@posteo.net>
Date: Mon, 23 Jun 2025 15:53:30 +0200
Subject: [PATCH 02/30] profiles/package.mask: mask dev-util/qshaderedit for
 removal

Bug: https://bugs.gentoo.org/932403
Signed-off-by: Lucio Sauer <watermanpaint@posteo.net>
---
 profiles/package.mask | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/profiles/package.mask b/profiles/package.mask
index 264592bc83..6179326915 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -18,6 +18,12 @@
 
 # New entries go on top.
 
+# Lucio Sauer <watermanpaint@posteo.net> (2025-06-23)
+# Upstream inactive since 2021 and we're the only ones to package it.
+# No revdeps, depends on Qt5, bug #932403.
+# Removal on 2025-07-23
+dev-util/qshaderedit
+
 # Lucio Sauer <watermanpaint@posteo.net> (2025-06-22)
 # Ebuild unmaintained since 2020 and several versions out of date.
 # Depends on Qt5, see bug #948836.

From c4f671b2b3b8fb2b23355a3a3905133773a06111 Mon Sep 17 00:00:00 2001
From: David Roman <davidroman96@gmail.com>
Date: Mon, 23 Jun 2025 15:59:48 +0200
Subject: [PATCH 03/30] dev-cpp/wt: drop 4.11.2

Signed-off-by: David Roman <davidroman96@gmail.com>
---
 dev-cpp/wt/Manifest                           |  1 -
 .../wt-workaround-deprecated-boost.patch      | 79 -------------------
 dev-cpp/wt/wt-4.11.2.ebuild                   | 60 --------------
 3 files changed, 140 deletions(-)
 delete mode 100644 dev-cpp/wt/files/wt-workaround-deprecated-boost.patch
 delete mode 100644 dev-cpp/wt/wt-4.11.2.ebuild

diff --git a/dev-cpp/wt/Manifest b/dev-cpp/wt/Manifest
index acd78274c0..282fbfec45 100644
--- a/dev-cpp/wt/Manifest
+++ b/dev-cpp/wt/Manifest
@@ -1,3 +1,2 @@
-DIST wt-4.11.2.tar.gz 10581246 BLAKE2B 6b1ac3e53a8eab572354f4a43ed20cf92ce1049f79aae0333730fb283cd3c4fc274f8ebe94a08fffeafb73a1ccccf1771d180189ef6d825336172ab891992cbc SHA512 e512c88616878b8fa3b992aa9d2f232d994ee6108607af4e5d511a2fecd7ae35cf33a63435a0ff356df715b386f2061731dcfb28c529bc43c901f17787686f34
 DIST wt-4.11.3.tar.gz 10601583 BLAKE2B dd838a1f42fedc93f127f8a496feccc47359bd6883103ec7574e85f47d8e4452d83b48def467e68c97b5f3b3d354b0ed96722b62b306d98ac3d12b09eaf308cb SHA512 de1cf49e1b1d788841b1a87e6455bf5170ab857d0076ef7c60a5592bfb83bcdbc4621b23cac411f4b9dce2fd96b237fb4c80d854c195e575cf2e03515c399e3d
 DIST wt-4.11.4.tar.gz 10616646 BLAKE2B d6c5ab376f9c992afff75ebfd8e2d7630cd49627d6217b0fcb9cfcc01f6870d350ba0ba59e18d4a753c93b83ab6aebd0e69e4cc562104141f4e024e66bd7c30c SHA512 e266e8333823a2960fe47645386dea6a9638a83caa4fdeee83af6bffd3e99ee43eb94d9c7afab6e4811a1c25d58df2f4c4f108308ba7f67e4359ed89f69ffd42
diff --git a/dev-cpp/wt/files/wt-workaround-deprecated-boost.patch b/dev-cpp/wt/files/wt-workaround-deprecated-boost.patch
deleted file mode 100644
index 655c459865..0000000000
--- a/dev-cpp/wt/files/wt-workaround-deprecated-boost.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff --git a/src/http/Server.C b/src/http/Server.C
-index 1b21529d..946cd1b6 100644
---- a/src/http/Server.C
-+++ b/src/http/Server.C
-@@ -331,7 +331,7 @@ std::vector<asio::ip::address> Server::resolveAddress(asio::ip::tcp::resolver &r
-       LOG_DEBUG_S(&wt_, "Failed to resolve hostname \"" << address << "\" as IPv4: " <<
-                   Wt::AsioWrapper::system_error(errc).what());
-     // Resolve IPv6
--    query = Wt::AsioWrapper::asio::ip::tcp::resolver::query(Wt::AsioWrapper::asio::ip::tcp::v6(), address, "http");
-+    auto q = Wt::AsioWrapper::asio::ip::tcp::resolver::query(Wt::AsioWrapper::asio::ip::tcp::v6(), address, "http");
-     for (Wt::AsioWrapper::asio::ip::tcp::resolver::iterator it = resolver.resolve(query, errc);
-          !errc && it != end; ++it) {
-       result.push_back(it->endpoint().address());
-diff --git a/src/web/FileUtils.C b/src/web/FileUtils.C
-index 122e2a94..c6ce732b 100644
---- a/src/web/FileUtils.C
-+++ b/src/web/FileUtils.C
-@@ -6,6 +6,7 @@
- 
- #include "web/FileUtils.h"
- 
-+#include <filesystem>
- #include <boost/filesystem/operations.hpp>
- 
- #include "web/WebUtils.h"
-@@ -45,7 +46,7 @@ namespace Wt {
- 
-     unsigned long long size(const std::string &file)
-     {
--      return (unsigned long long) boost::filesystem::file_size(file);
-+      return (unsigned long long) std::filesystem::file_size(file);
-     }
- 
-     std::string* fileToString(const std::string& fileName)
-@@ -60,35 +61,35 @@ namespace Wt {
- 
-     std::chrono::system_clock::time_point lastWriteTime(const std::string &file)
-     {
--      return std::chrono::system_clock::from_time_t(boost::filesystem::last_write_time(file));
-+      return std::chrono::system_clock::time_point{std::chrono::duration_cast<std::chrono::milliseconds>(std::filesystem::last_write_time(file).time_since_epoch())};
-     }
- 
-     bool exists(const std::string &file)
-     {
--      boost::filesystem::path path(file);
--      return boost::filesystem::exists(path);
-+      std::filesystem::path path(file);
-+      return std::filesystem::exists(path);
-     }
- 
-     bool isDirectory(const std::string &file)
-     {
--      boost::filesystem::path path(file);
--      return boost::filesystem::is_directory(path);
-+      std::filesystem::path path(file);
-+      return std::filesystem::is_directory(path);
-     }
- 
-     void listFiles(const std::string &directory,
-                    std::vector<std::string> &files)
-     {
--      boost::filesystem::path path(directory);
--      boost::filesystem::directory_iterator end_itr;
-+      std::filesystem::path path(directory);
-+      std::filesystem::directory_iterator end_itr;
- 
--      if (!boost::filesystem::is_directory(path)) {
-+      if (!std::filesystem::is_directory(path)) {
-         std::string error
-           = "listFiles: \"" + directory + "\" is not a directory";
-         LOG_ERROR(error);
-         throw WException(error);
-       }
- 
--      for (boost::filesystem::directory_iterator i(path); i != end_itr; ++i) {
-+      for (std::filesystem::directory_iterator i(path); i != end_itr; ++i) {
-         std::string f = (*i).path().string();
-         files.push_back(f);
-       }
diff --git a/dev-cpp/wt/wt-4.11.2.ebuild b/dev-cpp/wt/wt-4.11.2.ebuild
deleted file mode 100644
index 5447c6aec9..0000000000
--- a/dev-cpp/wt/wt-4.11.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Wt, C++ Web Toolkit"
-HOMEPAGE="https://www.webtoolkit.eu/wt https://github.com/emweb/wt"
-SRC_URI="https://github.com/emweb/wt/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="doc mysql opengl +pango pdf postgres ssl"
-
-DEPEND="
-	mysql? ( virtual/mysql )
-	opengl? ( virtual/opengl )
-	pango? ( x11-libs/pango )
-	postgres? ( dev-db/postgresql )
-	ssl? ( dev-libs/openssl )
-	<=dev-libs/boost-1.86.0:=
-	media-libs/libharu
-	media-gfx/graphicsmagick[jpeg,png]
-	sys-libs/zlib
-"
-RDEPEND="${DEPEND}"
-
-BDEPEND="
-	doc? (
-		app-text/doxygen[dot]
-		dev-qt/qttools[qdoc]
-	)
-"
-
-PATCHES=( "${FILESDIR}/wt-no-rundir.patch")
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIB_INSTALL_DIR=$(get_libdir)
-		-DBUILD_EXAMPLES=OFF
-		-DINSTALL_DOCUMENTATION=$(usex doc)
-		-DDOCUMENTATION_DESTINATION="share/doc/${PF}"
-		-DENABLE_SSL=$(usex ssl)
-		-DENABLE_HARU=$(usex pdf)
-		-DENABLE_PANGO=$(usex pango)
-		-DENABLE_SQLITE=ON
-		-DENABLE_POSTGRES=$(usex postgres)
-		-DENABLE_MYSQL=$(usex mysql)
-		-DENABLE_FIREBIRD=OFF
-		-DENABLE_QT4=OFF
-		-DENABLE_QT5=OFF
-		-DENABLE_QT6=ON
-		-DENABLE_SAML=ON
-		-DENABLE_OPENGL=$(usex opengl)
-	)
-
-	cmake_src_configure
-}

From 8a6c2424a8c8350de9f27f70adde5198f504454d Mon Sep 17 00:00:00 2001
From: David Roman <davidroman96@gmail.com>
Date: Mon, 23 Jun 2025 16:58:41 +0200
Subject: [PATCH 04/30] dev-cpp/wt: add missing dep on qtbase:6

Also add :6 slot dep for qtdoc & fix order of deps

Thanks @antecrescent for letting me know about this

Signed-off-by: David Roman <davidroman96@gmail.com>
---
 dev-cpp/wt/wt-4.11.4-r1.ebuild | 62 ++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 dev-cpp/wt/wt-4.11.4-r1.ebuild

diff --git a/dev-cpp/wt/wt-4.11.4-r1.ebuild b/dev-cpp/wt/wt-4.11.4-r1.ebuild
new file mode 100644
index 0000000000..48c9df4780
--- /dev/null
+++ b/dev-cpp/wt/wt-4.11.4-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Wt, C++ Web Toolkit"
+HOMEPAGE="https://www.webtoolkit.eu/wt https://github.com/emweb/wt"
+SRC_URI="https://github.com/emweb/wt/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="doc mysql opengl +pango pdf postgres ssl"
+
+DEPEND="
+	dev-qt/qtbase:6
+	<=dev-libs/boost-1.86.0:=
+	media-libs/libharu
+	media-gfx/graphicsmagick[jpeg,png]
+	sys-libs/zlib
+
+	mysql? ( virtual/mysql )
+	opengl? ( virtual/opengl )
+	pango? ( x11-libs/pango )
+	postgres? ( dev-db/postgresql )
+	ssl? ( dev-libs/openssl )
+"
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+	doc? (
+		app-text/doxygen[dot]
+		dev-qt/qttools:6[qdoc]
+	)
+"
+
+PATCHES=( "${FILESDIR}/wt-no-rundir.patch")
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIB_INSTALL_DIR=$(get_libdir)
+		-DBUILD_EXAMPLES=OFF
+		-DINSTALL_DOCUMENTATION=$(usex doc)
+		-DDOCUMENTATION_DESTINATION="share/doc/${PF}"
+		-DENABLE_SSL=$(usex ssl)
+		-DENABLE_HARU=$(usex pdf)
+		-DENABLE_PANGO=$(usex pango)
+		-DENABLE_SQLITE=ON
+		-DENABLE_POSTGRES=$(usex postgres)
+		-DENABLE_MYSQL=$(usex mysql)
+		-DENABLE_FIREBIRD=OFF
+		-DENABLE_QT4=OFF
+		-DENABLE_QT5=OFF
+		-DENABLE_QT6=ON
+		-DENABLE_SAML=ON
+		-DENABLE_OPENGL=$(usex opengl)
+	)
+
+	cmake_src_configure
+}

From cc99faca8ff3e9453933e3212ba638489898381d Mon Sep 17 00:00:00 2001
From: Timo van Veen <timovanveen@hotmail.nl>
Date: Mon, 23 Jun 2025 18:44:05 +0200
Subject: [PATCH 05/30] app-text/harper: add 0.44.0, drop 0.40.0

Signed-off-by: Timo van Veen <timovanveen@hotmail.nl>
---
 app-text/harper/Manifest                                      | 4 ++--
 .../harper/{harper-0.40.0.ebuild => harper-0.44.0.ebuild}     | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename app-text/harper/{harper-0.40.0.ebuild => harper-0.44.0.ebuild} (100%)

diff --git a/app-text/harper/Manifest b/app-text/harper/Manifest
index 3e3c93acc5..d14d471e9c 100644
--- a/app-text/harper/Manifest
+++ b/app-text/harper/Manifest
@@ -1,2 +1,2 @@
-DIST harper-0.40.0-crates.tar.xz 26139800 BLAKE2B 90d57b6418ce4f7dc8465e2457dd06f3fa9fe628e2dca17ce0889ce6efdd9dcafa557cfa468a0936ea04df5b10485844f23f818ccfa25ae13d75f47f3547df40 SHA512 8fa1d7192acb51279c26ac7aa0d2f48d0653aa87ed54546a26b8762cf2883f4317411c5827e0e8b1497619dda0caadf709bc3c20a24def67d0ef9dece8742eaf
-DIST harper-0.40.0.tar.gz 3875281 BLAKE2B 2bd3e559e57a9de2a82c6197b052d9129a0c083316d2a473fecdda33b105a6e4871b2f44c8fe50751d1e9e30f5f043868981e2e2bb213e5aebd88ed02af3a737 SHA512 ab677deeefab725b11d664e673ce6d425750f433b6b2ca243a461fbb9677f0466e4613f37104ce2ee89942bc98d9ec3942875ce28a5b552c43d5f115a12c0b10
+DIST harper-0.44.0-crates.tar.xz 25123724 BLAKE2B da48e66bc1ffa5efe69af176f6daecfca9b0df8ed8b9e88403a3b14dd95b0c36675c0bb9ceb174c05645b5e17f30a0a45e778f869160a08338f997286b9e3f2e SHA512 41e0402d8c5f5330a2ee95c6284f9c5bf22eaa7df539c8e018c2aa0b498335c3c8fb06938c77daffa180626593831bc84dfe3f4e4de0044ac9f9a718b60d103e
+DIST harper-0.44.0.tar.gz 4099561 BLAKE2B b8ec499f817ebb37ff61737df9cbc83501dc51339c87e88924716cc8e98020c0ad445e2f7b58dd4cdb83f09e2bd94111ce22f8cb1f07eee30cdde11e7e8dc7b4 SHA512 676166b2fc618bfa15a2f91f64db96c8c629b6cbd8830014ba7faf845d3187cb43bbb03871b047ee8dfd44faa543ea307ced5812f8109da8baaca0dcc95c22e1
diff --git a/app-text/harper/harper-0.40.0.ebuild b/app-text/harper/harper-0.44.0.ebuild
similarity index 100%
rename from app-text/harper/harper-0.40.0.ebuild
rename to app-text/harper/harper-0.44.0.ebuild

From 25a3d5cfc202c18dd5c145ca41023c1e2b9ec128 Mon Sep 17 00:00:00 2001
From: Timo van Veen <timovanveen@hotmail.nl>
Date: Mon, 23 Jun 2025 19:23:51 +0200
Subject: [PATCH 06/30] app-text/tinymist: add 0.13.14, drop 0.13.12

Signed-off-by: Timo van Veen <timovanveen@hotmail.nl>
---
 app-text/tinymist/Manifest                                   | 5 +++--
 .../{tinymist-0.13.12.ebuild => tinymist-0.13.14.ebuild}     | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)
 rename app-text/tinymist/{tinymist-0.13.12.ebuild => tinymist-0.13.14.ebuild} (93%)

diff --git a/app-text/tinymist/Manifest b/app-text/tinymist/Manifest
index 738bc5d5c4..ff89fefa5d 100644
--- a/app-text/tinymist/Manifest
+++ b/app-text/tinymist/Manifest
@@ -1,4 +1,5 @@
-DIST tinymist-0.13.12-crates.tar.xz 43086704 BLAKE2B f18462b84005f7cefb6d5bf2b034d8faa223945e794beac6d0ad99866a8553aac9a939c47fb84345f390ceb722514e58cdf4a977ab72214f00a6b738284361ba SHA512 d363e3af5ed3b24db9b927aa3cc60fee265b2755d6d023479e42e1bbc201d54bb00d6b501da113c0e9e5e62715e051dd82d32bcba765be9e3ca0787e716ed6a0
-DIST tinymist-0.13.12.tar.gz 1300187 BLAKE2B 6e4d5816938eec3e5234f4bdf448a960913ec3b2097c01c68d545c510dd2cea33cd2599214fb409432fa2dc08e3a618af6655cde1ec9be350096088534d42f9d SHA512 3474414f972d1a86d001b9fd2f815d86cb5f8ad733afb00e3836240db2f1be213d473c87fba697270289914d7a3e9e09e3a15d9feeae5fe9daaa8e67a28734fc
+DIST docx-rs-db49a729f68dbdb9e8e91857fbb1c3d414209871.gh.tar.gz 7716256 BLAKE2B cc4f111b89028b04b2e6aa4d7b76bdcf3ccfe7e14db5ddaff28fc1cc1c8083b8f89d131c2ce1548358972a6e774e3ec2f30ec129ec652ece660942e391963cdd SHA512 dd10581e4a68fa649b593d8c41e92bba5c06850fec3eac3f8604d6f9ad7de2962d37f293ff8b1aa6425bf4acd666df2cdb665a368f33a715ea41423ae819f075
+DIST tinymist-0.13.14-crates.tar.xz 43069840 BLAKE2B 53419f631c0f68ce89ffade7189e257dfeb31865410d77b619c03768c2a3c07b08f087760fc7e168b172b809f0d566ae8dfbefdc7ebd482b6e7e00b32fba75bb SHA512 1c3126de4c187ee418e05c62f9ee024e5e53f848cf433580c43ecfaab63f632810ae341f314b09bfdf274fc2aae204790d502e6896e535749bc814cd6f3a0ff7
+DIST tinymist-0.13.14.tar.gz 1371693 BLAKE2B 7e14c65380c90cd758f4e111355e35f8790a257f3c542588998522ecc78d3d65319507172cc9c9381387f5f5c8d6bb8f4b8f2cf7f62c60ac85d352141c42d9d6 SHA512 cae3b10df62c2a41b6681b4034b41e1a21593e325530e99287dde4170c6ec1fe09d90de7a975c00f7de949f06a88264195b3c504519df16a7b7ba36cb6fd38b1
 DIST typst-946ea31fb554bcf62e3215f64ddda87d70b026af.gh.tar.gz 3642248 BLAKE2B 5fcaf5df3adbcebc59fd2fb0b24e2cd3ec80003591a0dd08a3459001aaa1aa7d3b49d50e2cf0b4e2c3fa8072605eaa875449530fbf4453ab025340f382b66d62 SHA512 f5c5266bb3de5015071b2e6a5eeb7007a895a30cfd64bfd2800f85d20b851574c7f50f941161e100060ff0becd1e87e30dbd8568405e56d264b75c764cbe7d4c
 DIST typstfmt-cdfe44ed065a90d80040c3b29dee7ed431a710ee.gh.tar.gz 40943 BLAKE2B a55875c3b461f15c31a98d6e5adfcfb3ac338e6ea63b95d3405be3deb46159a7312675517b0e4d56b28ea5e93b74de9008796061e29343b522a69c501f286f50 SHA512 f54e59bd3cc50fcf56e1e47f9c3c3dd0c5a3d0c5e55fe83b8d143c97872fc73d1382f81395dc32d8730674b50a5d598c3cc5a8381d748f6566547ee9f08ba865
diff --git a/app-text/tinymist/tinymist-0.13.12.ebuild b/app-text/tinymist/tinymist-0.13.14.ebuild
similarity index 93%
rename from app-text/tinymist/tinymist-0.13.12.ebuild
rename to app-text/tinymist/tinymist-0.13.14.ebuild
index 8495d9ddee..bfa9031820 100644
--- a/app-text/tinymist/tinymist-0.13.12.ebuild
+++ b/app-text/tinymist/tinymist-0.13.14.ebuild
@@ -12,6 +12,7 @@ CRATES=" "
 TYPST_HASH="946ea31fb554bcf62e3215f64ddda87d70b026af"
 
 declare -A GIT_CRATES=(
+	[docx-rs]='https://github.com/Myriad-Dreamin/docx-rs;db49a729f68dbdb9e8e91857fbb1c3d414209871;docx-rs-%commit%/docx-core'
 	[typst-eval]="https://github.com/Myriad-Dreamin/typst;${TYPST_HASH};typst-%commit%/crates/typst-eval"
 	[typst-html]="https://github.com/Myriad-Dreamin/typst;${TYPST_HASH};typst-%commit%/crates/typst-html"
 	[typst-layout]="https://github.com/Myriad-Dreamin/typst;${TYPST_HASH};typst-%commit%/crates/typst-layout"
@@ -68,6 +69,7 @@ src_prepare() {
 			"s|^(${crate}[[:space:]]*=[[:space:]]*[{].*)([[:space:]]*git[[:space:]]*=[[:space:]]*['\"][[:graph:]]+['\"][[:space:]]*)(.*[}])|\1path = '${WORKDIR}/${crate_dir//%commit%/${commit}}'\3|;"
 			"s|^(${crate}[[:space:]]*=[[:space:]]*[{].*)([,][[:space:]]*branch[[:space:]]*=[[:space:]]*['\"][[:graph:]]+['\"][[:space:]]*)(.*[}])|\1\3|;"
 			"s|^(${crate}[[:space:]]*=[[:space:]]*[{].*)([,][[:space:]]*tag[[:space:]]*=[[:space:]]*['\"][[:graph:]]+['\"][[:space:]]*)(.*[}])|\1\3|;"
+			"s|^(${crate}[[:space:]]*=[[:space:]]*[{].*)([,][[:space:]]*rev[[:space:]]*=[[:space:]]*['\"][[:graph:]]+['\"][[:space:]]*)(.*[}])|\1\3|;"
 		)
 	done
 	sed -i -E -e "${sed_scripts[*]}" Cargo.toml ||

From 848aa9aa9d53c0a833f7d6be7c5801ad5e9d7cad Mon Sep 17 00:00:00 2001
From: Sebastian Engel <sighunter@gmx.de>
Date: Sun, 22 Jun 2025 22:25:44 +0200
Subject: [PATCH 07/30] media-sound/fooyin: add 0.8.1_p20250622

Fix build with Qt 6.9
Fix build with USE=sndfile

Signed-off-by: Sebastian Engel <sighunter@gmx.de>
---
 media-sound/fooyin/Manifest                   |  1 +
 .../fooyin/fooyin-0.8.1_p20250622.ebuild      | 89 +++++++++++++++++++
 2 files changed, 90 insertions(+)
 create mode 100644 media-sound/fooyin/fooyin-0.8.1_p20250622.ebuild

diff --git a/media-sound/fooyin/Manifest b/media-sound/fooyin/Manifest
index 43dfc70ab5..7de9ad0d44 100644
--- a/media-sound/fooyin/Manifest
+++ b/media-sound/fooyin/Manifest
@@ -1 +1,2 @@
 DIST fooyin-0.8.1.tar.gz 1743303 BLAKE2B aa393dea6eca447320782fd4b766cda9cf6379150eb80451dfe63707fa51b48605daf082abf6e041da7bf5c384ee702d109f915daf4872f1dec927f0705958e3 SHA512 0204d7fe713d0f4f2602b56d51c7808fd4d14fae8405e77ceabb76cb64201a54a20411395fd648b333782889730e77525f96a20293dd7feb68db2b65973c7d3e
+DIST fooyin-0.8.1_p20250622.tar.gz 1924840 BLAKE2B 5125e3d5e5568f9a9a1808b0c6112d99aab2c67a1283b843a9ba326fe8ad1a0330e65a974266b608c9ecab2e45279b653bb75e5487d85ede98b53a6613ff5e8b SHA512 207c7f8d2a68387e61bc65ca6ab380382927702affea5db883e37a93ed00f1c428adc5a25dbaef9fa47af32aec83ea7e13708dd45507889b7f010d02b1f1ea62
diff --git a/media-sound/fooyin/fooyin-0.8.1_p20250622.ebuild b/media-sound/fooyin/fooyin-0.8.1_p20250622.ebuild
new file mode 100644
index 0000000000..d8d5382db2
--- /dev/null
+++ b/media-sound/fooyin/fooyin-0.8.1_p20250622.ebuild
@@ -0,0 +1,89 @@
+# Copyright 2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+COMMIT="8303633a2d11bad54ab54d2b64b31ca03bac6ab3"
+
+DESCRIPTION="A customizable music player, Qt clone of foobar2000"
+HOMEPAGE="https://www.fooyin.org/"
+SRC_URI="https://github.com/fooyin/fooyin/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="alsa +archive openmpt +pipewire +replaygain sdl sndfile test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	|| ( alsa pipewire sdl )
+"
+
+RDEPEND="
+	dev-libs/icu:=
+	dev-libs/kdsingleapplication
+	dev-qt/qtbase:6[concurrent,dbus,gui,network,sql,widgets]
+	dev-qt/qtimageformats:6
+	dev-qt/qtsvg:6
+	media-libs/taglib:=
+	media-video/ffmpeg:=
+	alsa? ( media-libs/alsa-lib )
+	archive? ( app-arch/libarchive:= )
+	openmpt? ( media-libs/libopenmpt )
+	pipewire? ( media-video/pipewire:= )
+	replaygain? ( media-libs/libebur128:= )
+	sdl? ( media-libs/libsdl2 )
+	sndfile? ( media-libs/libsndfile )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-qt/qttools:6[linguist]
+	test? ( dev-cpp/gtest )
+"
+
+src_prepare() {
+	sed -i CMakeLists.txt \
+		-e "s|/doc/${PN}|/doc/${PF}|g" \
+		-e '/option(BUILD_TESTING/aenable_testing()' \
+		|| die
+
+	sed \
+		-e "s#:/audio#data/audio#g" \
+		-i \
+			tests/tagwritertest.cpp \
+			tests/tagreadertest.cpp \
+		|| die
+
+	cmake_src_prepare
+}
+
+# libvgm and libgme dependencies can currently not be satisfied,
+# so building their input plugins is unconditionally disabled for now.
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_ALSA=$(usex alsa)
+		-DBUILD_TESTING=$(usex test)
+		-DBUILD_CCACHE=OFF
+		-DBUILD_LIBVGM=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_LIBGME=ON
+		-DINSTALL_HEADERS=ON
+		$(cmake_use_find_package archive LibArchive)
+		$(cmake_use_find_package openmpt OpenMpt)
+		$(cmake_use_find_package pipewire PipeWire)
+		$(cmake_use_find_package replaygain Ebur128)
+		$(cmake_use_find_package sdl SDL2)
+		$(cmake_use_find_package sndfile SndFile)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	mkdir -p "${BUILD_DIR}/tests/data" || die
+	ln -sr "${CMAKE_USE_DIR}/tests/data/audio" "${BUILD_DIR}/tests/data/audio" || die
+
+	cmake_src_test
+}

From 7a47c00620b9962d843b13632c04225f53e6834e Mon Sep 17 00:00:00 2001
From: Pavel Sobolev <contact@paveloom.dev>
Date: Mon, 23 Jun 2025 21:13:06 +0300
Subject: [PATCH 08/30] ios-safari-remote-debug: add support for Gentoo Prefix

Signed-off-by: Pavel Sobolev <contact@paveloom.dev>
---
 ...0_pre20250506-copy-injected-code-from-the-system.patch | 6 +++---
 .../ios-safari-remote-debug-0_pre20250506.ebuild          | 8 +++++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/dev-util/ios-safari-remote-debug/files/ios-safari-remote-debug-0_pre20250506-copy-injected-code-from-the-system.patch b/dev-util/ios-safari-remote-debug/files/ios-safari-remote-debug-0_pre20250506-copy-injected-code-from-the-system.patch
index 52fc5f4f6f..45b9fb540c 100644
--- a/dev-util/ios-safari-remote-debug/files/ios-safari-remote-debug-0_pre20250506-copy-injected-code-from-the-system.patch
+++ b/dev-util/ios-safari-remote-debug/files/ios-safari-remote-debug-0_pre20250506-copy-injected-code-from-the-system.patch
@@ -11,8 +11,8 @@ Signed-off-by: Pavel Sobolev <contact@paveloom.dev>
  	additionsDir := fmt.Sprintf("%s/WebKitAdditions/WebInspectorUI", baseDir)
 -	cp.Copy("injectedCode/WebInspectorUIAdditions.css", fmt.Sprintf("%s/WebInspectorUIAdditions.css", additionsDir))
 -	cp.Copy("injectedCode/WebInspectorUIAdditions.js", fmt.Sprintf("%s/WebInspectorUIAdditions.js", additionsDir))
-+	cp.Copy("/usr/share/ios-safari-remote-debug/injectedCode/WebInspectorUIAdditions.css", fmt.Sprintf("%s/WebInspectorUIAdditions.css", additionsDir))
-+	cp.Copy("/usr/share/ios-safari-remote-debug/injectedCode/WebInspectorUIAdditions.js", fmt.Sprintf("%s/WebInspectorUIAdditions.js", additionsDir))
++	cp.Copy("@GENTOO_PORTAGE_EPREFIX@/usr/share/ios-safari-remote-debug/injectedCode/WebInspectorUIAdditions.css", fmt.Sprintf("%s/WebInspectorUIAdditions.css", additionsDir))
++	cp.Copy("@GENTOO_PORTAGE_EPREFIX@/usr/share/ios-safari-remote-debug/injectedCode/WebInspectorUIAdditions.js", fmt.Sprintf("%s/WebInspectorUIAdditions.js", additionsDir))
  
  	log.Debug().TimeDiff("loadFiles", time.Now(), loadFilesTime).Send()
  	getRelevantFilesTime := time.Now()
@@ -21,7 +21,7 @@ Signed-off-by: Pavel Sobolev <contact@paveloom.dev>
  	bundleTime := time.Now()
  
 -	cp.Copy("views", outputDir)
-+	cp.Copy("/usr/share/ios-safari-remote-debug/views", outputDir)
++	cp.Copy("@GENTOO_PORTAGE_EPREFIX@/usr/share/ios-safari-remote-debug/views", outputDir)
  	os.Mkdir(fmt.Sprintf("%s/debug", outputDir), os.ModePerm)
  	os.Mkdir(fmt.Sprintf("%s/debug/Lib", outputDir), os.ModePerm)
  	os.Mkdir(fmt.Sprintf("%s/debug/Protocols", outputDir), os.ModePerm)
diff --git a/dev-util/ios-safari-remote-debug/ios-safari-remote-debug-0_pre20250506.ebuild b/dev-util/ios-safari-remote-debug/ios-safari-remote-debug-0_pre20250506.ebuild
index ed894da844..53b4a94823 100644
--- a/dev-util/ios-safari-remote-debug/ios-safari-remote-debug-0_pre20250506.ebuild
+++ b/dev-util/ios-safari-remote-debug/ios-safari-remote-debug-0_pre20250506.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit go-module
+inherit go-module prefix
 
 EGIT_COMMIT="d73d1215b38abb82f64513f472fd75ee2b8224f5"
 
@@ -24,6 +24,12 @@ PATCHES=(
 	"${FILESDIR}/${P}-copy-injected-code-from-the-system.patch"
 )
 
+src_prepare() {
+	default
+
+	eprefixify build/build.go
+}
+
 src_compile() {
 	ego build
 }

From e3aa4a857f642567e59fde41239754f8070dd27a Mon Sep 17 00:00:00 2001
From: Jan-Espen Oversand <sigsegv@radiotube.org>
Date: Tue, 24 Jun 2025 07:03:50 +0200
Subject: [PATCH 09/30] dev-db/soci: keyword 4.1.2 for ~x86

Signed-off-by: Jan-Espen Oversand <sigsegv@radiotube.org>
---
 dev-db/soci/soci-4.1.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/soci/soci-4.1.2.ebuild b/dev-db/soci/soci-4.1.2.ebuild
index 4a07e165de..cd4a38396d 100644
--- a/dev-db/soci/soci-4.1.2.ebuild
+++ b/dev-db/soci/soci-4.1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://sourceforge.net/projects/soci/files/soci/${P}/${P}.tar.gz/downl
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="odbc sqlite oracle postgres mysql static-libs test lto"
 RESTRICT="!test? ( test )"
 

From c7bdb9d8c04569087f98adad5c25194086e92e9e Mon Sep 17 00:00:00 2001
From: Alexander Tsoy <alexander@tsoy.me>
Date: Tue, 24 Jun 2025 08:28:08 +0300
Subject: [PATCH 10/30] media-sound/zita-ajbridge: shorten longdescription

Signed-off-by: Alexander Tsoy <alexander@tsoy.me>
---
 media-sound/zita-ajbridge/metadata.xml | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/media-sound/zita-ajbridge/metadata.xml b/media-sound/zita-ajbridge/metadata.xml
index b9f76961cc..7df5d07ee9 100644
--- a/media-sound/zita-ajbridge/metadata.xml
+++ b/media-sound/zita-ajbridge/metadata.xml
@@ -2,22 +2,14 @@
 <!DOCTYPE pkgmetadata SYSTEM 'https://www.gentoo.org/dtd/metadata.dtd'>
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<longdescription lang="en">Zita-ajbridge provides two applications, zita-a2j and zita-j2a. They allow to use an ALSA device as a Jack client, to provide additional capture (a2j) or playback (j2a) channels. Functionally these are equivalent to the alsa_in and alsa_out clients that come with Jack, but they provide much better audio quality. The resampling ratio will typically be stable within 1 PPM and change only very smoothly. Delay will be stable as well even under worse case conditions, e.g. the Jack client running near the end of the cycle.
-
-The theory of operation and internals of these apps are the subject of a paper presented at LAC 2012.
-
-The alsa device should be a 'hw:' one, i.e. direct access to a soundcard and not an ALSA 'plug' device. A well-working Jack system is assumed, running in real-time mode.
-
-The sample rate can be the same as Jack's one, or different. Minimum delay is obtained by running the alsa device at a lower period size than Jack. This can be done safely as the alsa thread will run at a higher priority, and apart from copying to/from an internal buffer no work is done there. There are no restrictions on the product of period_size and number_of_periods as there are for alsa_in and alsa_out.
-
-Both apps will optionally (-v option) print some information four times per second. The first number is the average loop error over the last quarter second, in samples. It should be reduced to small randowm values close to zero after 15 seconds or so. The second is the dynamic correction factor of the nominal resampling ratio. This should converge to a value close to one and not move much. You may observe small variations in these numbers when Jack apps are started or stopped. This is normal. Anything else isn't - please report.
-
-The same -v option will enable detailed error reporting from the ALSA interface, or if all is OK print a summary of the ALSA device configuration.
-
-The -L option forces the ALSA device to 2 channels and 16-bit sample format. This can be required when using the ALSA loop device if the other side (e.g. mplayer) does not support more channels or a floating point sample format. This will fail on real hw: devices as these can be opened in mmap mode only with their real number of channels.
-
-When starting, and in case of major trouble, you will see the 'Starting synchronisation' message. This can happen if there is a timeout on the Jack server, e.g. a client crashed or terminated in a dirty way. Jack1 will skip one or more cycles when new apps are started, or when a large number of port connections is done in a short time. This may interrupt the audio signal, but should otherwise not have any ill consequences nor require a restart.
-
-Both apps will suspend operation while Jack is in 'freewheeling' mode. When using Jack1, returning from freewheeling to normal mode may generate large timing errors, the result of Jack's DLL not being re-initialised properly. Both apps will wait for 15 seconds before restarting if that happens. Patches to Jack1 have been submitted, so this problem should go away in the future.
+	<longdescription lang="en">
+		Zita-ajbridge provides two applications, zita-a2j and zita-j2a. They
+		allow to use an ALSA device as a Jack client, to provide additional
+		capture (a2j) or playback (j2a) channels. Functionally these are
+		equivalent to the alsa_in and alsa_out clients that come with Jack,
+		but they provide much better audio quality. The resampling ratio will
+		typically be stable within 1 PPM and change only very smoothly. Delay
+		will be stable as well even under worse case conditions, e.g. the Jack
+		client running near the end of the cycle.
 	</longdescription>
 </pkgmetadata>

From 69d05494c259a2b3abd23bc7d585dabf4c8fdc30 Mon Sep 17 00:00:00 2001
From: Alexander Tsoy <alexander@tsoy.me>
Date: Tue, 24 Jun 2025 08:40:47 +0300
Subject: [PATCH 11/30] media-sound/zita-ajbridge: add myself as a maintainer

Signed-off-by: Alexander Tsoy <alexander@tsoy.me>
---
 media-sound/zita-ajbridge/metadata.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/media-sound/zita-ajbridge/metadata.xml b/media-sound/zita-ajbridge/metadata.xml
index 7df5d07ee9..8cb4288b17 100644
--- a/media-sound/zita-ajbridge/metadata.xml
+++ b/media-sound/zita-ajbridge/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM 'https://www.gentoo.org/dtd/metadata.dtd'>
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>alexander@tsoy.me</email>
+		<name>Alexander Tsoy</name>
+	</maintainer>
 	<longdescription lang="en">
 		Zita-ajbridge provides two applications, zita-a2j and zita-j2a. They
 		allow to use an ALSA device as a Jack client, to provide additional

From d8d02263ed28dd1664197eb29e34479420f8b9ed Mon Sep 17 00:00:00 2001
From: Alexander Tsoy <alexander@tsoy.me>
Date: Tue, 24 Jun 2025 08:33:41 +0300
Subject: [PATCH 12/30] media-sound/zita-ajbridge: rewrite and revbump

* make it more in line with other zita-* ebuilds
* EAPI 8
* fix CXXFLAGS
* fix LICENSE
* remove app-arch/gzip from BDEPEND

Closes: https://bugs.gentoo.org/887785
Signed-off-by: Alexander Tsoy <alexander@tsoy.me>
---
 .../files/zita-ajbridge-0.8.4-makefile.patch  | 39 ++++++++++++++++++
 .../zita-ajbridge-0.8.4-r2.ebuild             | 41 +++++++++++++++++++
 2 files changed, 80 insertions(+)
 create mode 100644 media-sound/zita-ajbridge/files/zita-ajbridge-0.8.4-makefile.patch
 create mode 100644 media-sound/zita-ajbridge/zita-ajbridge-0.8.4-r2.ebuild

diff --git a/media-sound/zita-ajbridge/files/zita-ajbridge-0.8.4-makefile.patch b/media-sound/zita-ajbridge/files/zita-ajbridge-0.8.4-makefile.patch
new file mode 100644
index 0000000000..6f986a1313
--- /dev/null
+++ b/media-sound/zita-ajbridge/files/zita-ajbridge-0.8.4-makefile.patch
@@ -0,0 +1,39 @@
+--- a/source/Makefile	2020-04-05 23:36:32.000000000 +0300
++++ b/source/Makefile	2025-06-24 08:11:05.070000000 +0300
+@@ -24,10 +24,10 @@ MANDIR ?= /usr/share/man/man1
+ 
+ VERSION = 0.8.4
+ CPPFLAGS +=  -MMD -MP -DVERSION=\"$(VERSION)\"
+-CXXFLAGS += -O2 -Wall
++CXXFLAGS += -Wall
+ 
+ 
+-all:	zita-a2j zita-j2a zita-ajbridge.1.gz zita-a2j.1.gz zita-j2a.1.gz 
++all:	zita-a2j zita-j2a
+ 
+ 
+ ZITA-A2J_O = zita-a2j.o alsathread.o jackclient.o pxthread.o lfqueue.o
+@@ -63,17 +63,17 @@ install:	all
+ 	install -d $(DESTDIR)$(MANDIR)
+ 	install -m 755 zita-a2j $(DESTDIR)$(BINDIR)
+ 	install -m 755 zita-j2a $(DESTDIR)$(BINDIR)
+-	install -m 644 zita-ajbridge.1.gz $(DESTDIR)$(MANDIR)
+-	install -m 644 zita-a2j.1.gz $(DESTDIR)$(MANDIR)
+-	install -m 644 zita-j2a.1.gz $(DESTDIR)$(MANDIR)
++	install -m 644 zita-ajbridge.1 $(DESTDIR)$(MANDIR)
++	install -m 644 zita-a2j.1 $(DESTDIR)$(MANDIR)
++	install -m 644 zita-j2a.1 $(DESTDIR)$(MANDIR)
+ 
+ 
+ uninstall:
+ 	/bin/rm -f  $(DESTDIR)$(BINDIR)/zita-a2j
+ 	/bin/rm -f  $(DESTDIR)$(BINDIR)/zita-j2a
+-	/bin/rm -f  $(DESTDIR)$(MANDIR)/zita-ajbridge.1.gz
+-	/bin/rm -f  $(DESTDIR)$(MANDIR)/zita-a2j.1.gz
+-	/bin/rm -f  $(DESTDIR)$(MANDIR)/zita-j2a.1.gz
++	/bin/rm -f  $(DESTDIR)$(MANDIR)/zita-ajbridge.1
++	/bin/rm -f  $(DESTDIR)$(MANDIR)/zita-a2j.1
++	/bin/rm -f  $(DESTDIR)$(MANDIR)/zita-j2a.1
+ 
+ 
+ clean:
diff --git a/media-sound/zita-ajbridge/zita-ajbridge-0.8.4-r2.ebuild b/media-sound/zita-ajbridge/zita-ajbridge-0.8.4-r2.ebuild
new file mode 100644
index 0000000000..b9a69de933
--- /dev/null
+++ b/media-sound/zita-ajbridge/zita-ajbridge-0.8.4-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="zita-a2j and zita-j2a - bridges between ALSA and JACK"
+HOMEPAGE="https://kokkinizita.linuxaudio.org/linuxaudio/zita-ajbridge-doc/quickguide.html"
+SRC_URI="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	media-libs/alsa-lib
+	>=media-libs/zita-alsa-pcmi-0.3.0
+	>=media-libs/zita-resampler-1.6.0
+	virtual/jack
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.4-makefile.patch
+)
+
+src_compile() {
+	tc-export CXX
+	emake -C source
+}
+
+src_install() {
+	local myemakeargs=(
+		DESTDIR="${D}"
+		PREFIX="${EPREFIX}/usr"
+	)
+	emake -C source "${myemakeargs[@]}" install
+
+	einstalldocs
+}

From 8256dbbb2b573a152f1a323915bed3cca4fa3420 Mon Sep 17 00:00:00 2001
From: Alexander Tsoy <alexander@tsoy.me>
Date: Tue, 24 Jun 2025 08:36:50 +0300
Subject: [PATCH 13/30] media-sound/zita-ajbridge: drop 0.8.4

Signed-off-by: Alexander Tsoy <alexander@tsoy.me>
---
 .../zita-ajbridge/zita-ajbridge-0.8.4.ebuild  | 49 -------------------
 1 file changed, 49 deletions(-)
 delete mode 100644 media-sound/zita-ajbridge/zita-ajbridge-0.8.4.ebuild

diff --git a/media-sound/zita-ajbridge/zita-ajbridge-0.8.4.ebuild b/media-sound/zita-ajbridge/zita-ajbridge-0.8.4.ebuild
deleted file mode 100644
index 49921c235d..0000000000
--- a/media-sound/zita-ajbridge/zita-ajbridge-0.8.4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="zita-a2j and zita-j2a - bridges between ALSA and JACK"
-HOMEPAGE="https://kokkinizita.linuxaudio.org/linuxaudio/zita-ajbridge-doc/quickguide.html"
-SOURCE_URI="https://kokkinizita.linuxaudio.org/linuxaudio/downloads"
-SRC_URI="${SOURCE_URI}/${P}.tar.bz2"
-
-S="${WORKDIR}/${P}/source"
-ADIR="${WORKDIR}/${P}/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="media-libs/alsa-lib
->=media-libs/zita-alsa-pcmi-0.3.0
->=media-libs/zita-resampler-1.6.0
-virtual/jack"
-DEPEND="${RDEPEND}"
-BDEPEND="app-arch/gzip"
-
-DOCS=( ${ADIR}/AUTHORS ${ADIR}/COPYING ${ADIR}/README )
-
-src_prepare() {
-	default
-	sed -i -e "/ldconfig/d" "${S}"/Makefile || die
-}
-
-src_compile() {
-	tc-export CXX
-	default
-}
-
-src_install() {
-	dodir /usr/bin
-	dodir /usr/share/man/man1
-	emake DESTDIR="${D}" PREFIX=/usr install
-	einstalldocs
-	pushd "${D}"/usr/share/man/man1 > /dev/null
-	gzip -d zita-a2j.1.gz
-	gzip -d zita-ajbridge.1.gz
-	gzip -d zita-j2a.1.gz
-	popd > /dev/null
-}

From 53a47d30030fe7fd2e64c2715f24aad8e5c93678 Mon Sep 17 00:00:00 2001
From: Itai Ferber <itai@itaiferber.net>
Date: Tue, 24 Jun 2025 06:28:39 -0400
Subject: [PATCH 14/30] net-vpn/mullvadvpn-app: add 2025.7, drop 2025.6,
 2025.7_beta1

Signed-off-by: Itai Ferber <itai@itaiferber.net>
---
 net-vpn/mullvadvpn-app/Manifest               |   6 +-
 ....6.ebuild => mullvadvpn-app-2025.7.ebuild} |   0
 .../mullvadvpn-app-2025.7_beta1.ebuild        | 152 ------------------
 3 files changed, 2 insertions(+), 156 deletions(-)
 rename net-vpn/mullvadvpn-app/{mullvadvpn-app-2025.6.ebuild => mullvadvpn-app-2025.7.ebuild} (100%)
 delete mode 100644 net-vpn/mullvadvpn-app/mullvadvpn-app-2025.7_beta1.ebuild

diff --git a/net-vpn/mullvadvpn-app/Manifest b/net-vpn/mullvadvpn-app/Manifest
index 275485001b..e9e49171ce 100644
--- a/net-vpn/mullvadvpn-app/Manifest
+++ b/net-vpn/mullvadvpn-app/Manifest
@@ -1,4 +1,2 @@
-DIST MullvadVPN-2025.6_aarch64.rpm 84081953 BLAKE2B 73219680ff5ed792d54af3003a8ccec4995879bf945250e91ffce807e2cdca26867f66d0ae13115fd995b4d6009e0c840649a6f3f6b77301bb495d029df46fbb SHA512 dc6ef9f30b752a451dc011b33dbd49073627f621994b51d85396bf76f457ecf4589dedf36684d6c75c3908869604fb3ccf113fad9a8935e41f516680c7b82fcd
-DIST MullvadVPN-2025.6_x86_64.rpm 89423673 BLAKE2B 6c8fcd6a9a05f1ba3ef31c6b9421398b21f8649484337a425168abe01e954cdd01e7b85c8a54b6839ddae712dd4e8b5b66767b1647b7faa9ca642ab4cebb8753 SHA512 6bec6a3116d21f0dd3185c21a5ae14bec5c969ea1e4472d41a7761fcce918bb689e913c822c2eeb6f55c077c048bd95a561a77e9dacac570e0fd09da24c6829d
-DIST MullvadVPN-2025.7-beta1_aarch64.rpm 84695385 BLAKE2B 7948b360f51bafc8295bda07502ab29cdc7c4d7560ec2f1677d992afc4ab4be8e71caf8badd1bfd8ab90c76a9d905d58881f7eb9cabcf0ef74010e406655c6e7 SHA512 30c5c48d5dc88f8113e70809f9c6905830707f08dc0f6059e625e530190e3a967fe7c34edd8b27ec4ee456cfc14b7e023e0175c270242a21d014349f8ab58b63
-DIST MullvadVPN-2025.7-beta1_x86_64.rpm 90089637 BLAKE2B 9c4345b72fe117bb1d573a0879f1bd2221ecf363b8078af9b731315fc9c5afff3a6e16e55ec089908c9edfbcb5881c77b8eb21ff158a2a0761edd594a51f903b SHA512 21143c9784fcc74890217d53eaba2f29bebc751c611e4c3a17ed089501fa404533cd5e6b37eab3d02ead71d4275718b22f411703252fa06a9f74525ec3b766c5
+DIST MullvadVPN-2025.7_aarch64.rpm 84714301 BLAKE2B ae14d94cc533d91b48f030439777a9b55460251324e7dd5c976ecc60c96045640a2efc21eea06e7fbab363209f8df01941469e04dfeea6b91d91a92117919fe0 SHA512 a3fbb0c5a447409f954d1d965abed7fb1f019d7b3d8cb8a69f784242f52a9893c1f4e9c71fd4aed6b5b4fa20eabb411a8660e65b3e6966d7635348eb4d3dcffe
+DIST MullvadVPN-2025.7_x86_64.rpm 90085325 BLAKE2B 197a709c3623bdaba7397d670267d39d8c0922d4a01561fa63e5b09a9ff8ea00b1e134a569745f7423d79cf3ade6e21b2d26362ccd3b3704aad1d78d36cd3f23 SHA512 28973f67e019eb9d8f1d5882b564b1d9763dd59c212a19339550e23812de4333c26a17f13a17039ab8fcac9091d820ba9de58e4f685a59c10f5965bbd85e89ce
diff --git a/net-vpn/mullvadvpn-app/mullvadvpn-app-2025.6.ebuild b/net-vpn/mullvadvpn-app/mullvadvpn-app-2025.7.ebuild
similarity index 100%
rename from net-vpn/mullvadvpn-app/mullvadvpn-app-2025.6.ebuild
rename to net-vpn/mullvadvpn-app/mullvadvpn-app-2025.7.ebuild
diff --git a/net-vpn/mullvadvpn-app/mullvadvpn-app-2025.7_beta1.ebuild b/net-vpn/mullvadvpn-app/mullvadvpn-app-2025.7_beta1.ebuild
deleted file mode 100644
index 8d1312be68..0000000000
--- a/net-vpn/mullvadvpn-app/mullvadvpn-app-2025.7_beta1.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop rpm systemd shell-completion xdg
-
-MYPV="${PV/_beta/-beta}"
-DESCRIPTION="Tool used to manage daemon setup"
-HOMEPAGE="https://github.com/mullvad/mullvadvpn-app https://mullvad.net/"
-SRC_URI="
-	amd64? ( https://github.com/mullvad/mullvadvpn-app/releases/download/${MYPV}/MullvadVPN-${MYPV}_x86_64.rpm )
-	arm64? ( https://github.com/mullvad/mullvadvpn-app/releases/download/${MYPV}/MullvadVPN-${MYPV}_aarch64.rpm )
-"
-
-S="${WORKDIR}"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm64"
-
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	app-accessibility/at-spi2-core:2
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/mesa
-	net-print/cups
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gtk+:3
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libxkbcommon
-	x11-libs/libXrandr
-	x11-libs/pango
-"
-
-QA_PREBUILT="*"
-
-src_install() {
-	sed -i "s|SCRIPT_DIR=.*|SCRIPT_DIR=\"/opt/Mullvad VPN/\"|g" "${S}/opt/Mullvad VPN/mullvad-vpn" || die
-
-	# Using doins -r would strip executable bits from all binaries
-	cp -pPR opt "${D}"/ || die "Failed to copy files"
-	fperms +x "/opt/Mullvad VPN/chrome_crashpad_handler"
-	fperms 4755 "/opt/Mullvad VPN/chrome-sandbox"
-
-	dobin ./usr/bin/mullvad
-	dobin ./usr/bin/mullvad-daemon
-	dobin ./usr/bin/mullvad-exclude
-	dosym -r "/opt/Mullvad VPN/mullvad-vpn" /usr/bin/mullvad-vpn
-	dosym -r "/opt/Mullvad VPN/resources/mullvad-problem-report" /usr/bin/mullvad-problem-report
-
-	# mullvad-exclude uses cgroups to manage exclusions, which requires root permissions, but is
-	# also most often used to exclude graphical applications which can't or shouldn't run as root
-	# (i.e., can't be run under `sudo/doas /usr/bin/mullvad-exclude ...`, because `sudo`/`doas`
-	# change user). The setuid bit allows any user to exclude executables under their own UID.
-	fperms 4755 /usr/bin/mullvad-exclude
-
-	newinitd "${FILESDIR}"/mullvad-daemon.initd mullvad-daemon
-
-	systemd_newunit ./usr/lib/systemd/system/mullvad-daemon.service mullvad-daemon.service
-	systemd_newunit ./usr/lib/systemd/system/mullvad-early-boot-blocking.service mullvad-early-boot-blocking.service
-
-	newbashcomp ./usr/share/bash-completion/completions/mullvad mullvad
-	newfishcomp ./usr/share/fish/vendor_completions.d/mullvad.fish mullvad
-	newzshcomp ./usr/share/zsh/site-functions/_mullvad _mullvad
-
-	domenu ./usr/share/applications/mullvad-vpn.desktop
-	local x
-	for x in 16 32 48 64 128 256 512 1024; do
-		doicon -s "${x}" "./usr/share/icons/hicolor/${x}x${x}/apps/mullvad-vpn.png"
-	done
-}
-
-MULLVAD_IS_BEING_UPDATED=false
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	[[ -n "$(best_version "${CATEGORY}/${PN}")" ]] && MULLVAD_IS_BEING_UPDATED=true
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-
-	if [[ ${MULLVAD_IS_BEING_UPDATED} = "false" ]]; then
-		if ! command -v pgrep &>/dev/null || pgrep -f "mullvad-(daemon|gui)"; then
-			elog "Mullvad has been uninstalled. To stop the service,"
-			elog "1. Quit the Mullvad app"
-			elog "   * Manually: 'Disconnect & quit' from the Mullvad menu"
-			elog "     OR"
-			elog "   * Command line: pkill -f mullvad-gui"
-			elog "2. Stop the daemon"
-			elog "   * OpenRC: rc-service mullvad-daemon stop"
-			elog "     OR"
-			elog "   * systemd: systemctl stop mullvad-daemon"
-			elog "     OR"
-			elog "   * other: pkill -f mullvad-daemon"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if [[ ${MULLVAD_IS_BEING_UPDATED} = "true" ]]; then
-		if command -v pgrep &>/dev/null && pgrep -f "mullvad-(daemon|gui)" &>/dev/null; then
-			elog "Mullvad has been updated. To restart the service,"
-			elog "1. Restart the daemon"
-			elog "   * OpenRC: rc-service mullvad-daemon restart"
-			elog "     OR"
-			elog "   * systemd: systemctl restart mullvad-daemon"
-			elog "2. Restart the app"
-			elog "   * Manually: 'Disconnect & quit' from the Mullvad menu and relaunch using"
-			elog "               your preferred desktop launcher"
-			elog "     OR"
-			elog "   * Command line: pkill -f mullvad-gui && '/opt/Mullvad VPN/mullvad-vpn' & disown"
-		else
-			elog "Mullvad has been updated. To start the service,"
-			elog "1. Start the daemon"
-			elog "   * OpenRC: rc-service mullvad-daemon start"
-			elog "     OR"
-			elog "   * systemd: systemctl start mullvad-daemon"
-			elog "2. Launch the app"
-			elog "   * Manually: use your preferred desktop launcher"
-			elog "     OR"
-			elog "   * Command line: '/opt/Mullvad VPN/mullvad-vpn' & disown"
-		fi
-	else
-		elog "Mullvad has been installed. To start the service,"
-		elog "1. Enable and start the daemon"
-		elog "   * OpenRC: rc-update add mullvad-daemon default"
-		elog "             rc-service mullvad-daemon start"
-		elog "     OR"
-		elog "   * systemd: systemctl enable mullvad-daemon"
-		elog "              systemctl start mullvad-daemon"
-		elog "2. Launch the app"
-		elog "   * Manually: use your preferred desktop launcher"
-		elog "     OR"
-		elog "   * Command line: '/opt/Mullvad VPN/mullvad-vpn' & disown"
-	fi
-}

From fe8d6d0eea84736dcdf0a7c6f04889aec139fd37 Mon Sep 17 00:00:00 2001
From: Paul Zander <negril.nx+gentoo@gmail.com>
Date: Wed, 18 Jun 2025 16:36:26 +0200
Subject: [PATCH 15/30] sci-ml/ollama: add 0.9.1

Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
---
 sci-ml/ollama/Manifest            |   2 +
 sci-ml/ollama/ollama-0.9.1.ebuild | 308 ++++++++++++++++++++++++++++++
 2 files changed, 310 insertions(+)
 create mode 100644 sci-ml/ollama/ollama-0.9.1.ebuild

diff --git a/sci-ml/ollama/Manifest b/sci-ml/ollama/Manifest
index 539c94148a..db7ff5e1a5 100644
--- a/sci-ml/ollama/Manifest
+++ b/sci-ml/ollama/Manifest
@@ -4,3 +4,5 @@ DIST ollama-0.8.0-vendor.tar.xz 4407120 BLAKE2B db48867f9cbb01fff84d79c278bae4c3
 DIST ollama-0.8.0.gh.tar.gz 8345667 BLAKE2B d04b498ef5e108e6740d7c79efd1e100bf8cf004f736d31964318b9fe3f5860b91e221488e24e07abe2f28668c0d04aa333b9a5829957eaaeb7c00078f76e2c4 SHA512 c5a45fb86ec8472fe27dd2e4f3f597a7bfb5fa4a954332b4cde3ffa961feb8983ffeeec213bd2e59a02896dba683e9462572bb4a1b0e931e67adca3120a0b830
 DIST ollama-0.9.0-vendor.tar.xz 4412428 BLAKE2B 8d84c7020d350cf6aaf67216ef37be69676ca781b30ab8768d36776b19e7b988a662cf34bbebd514809c91f9e81bd6fb2c1e2b17f4fb668cc25e261553597dfd SHA512 7127e2e7fc3e9a13f3b6e0124c5ab8f41f4444a4b5ba30bef24d0c6b7caa52db9840e11133ff09850094997f88c6c6ca9cadf17b5129c65b295f4c34594d37d3
 DIST ollama-0.9.0.gh.tar.gz 8353746 BLAKE2B 14b685fdc017c0a0485917d3690430e5205366de94291623f07cb3b9c9862ba96894b62ba4798876f841cb3a3ee7497dbae71b253bfb513556bdfc9153deb45c SHA512 32ef42663ea831556fa033bc03a481d103f09e8f5c16f611b3f2308ae80c81daec924192800a2f7c22f70ac86c5440377f892a88cce522223cbbdff793114091
+DIST ollama-0.9.1-vendor.tar.xz 4414480 BLAKE2B 60854edfd5f4a0abb674bb4a430694f4a51fae75cfdda268fd0589cc73f467bc6f2fb1fc451c009627818909fa79539f101654069f86583a5457a9e243413f51 SHA512 1b4bc511a74289ccff9940c6a11fab48205d46f2bbbaae028a64476353ff204038703143c5e3207e5dbfc4a27160806e47564728282d8b47030d7303654263b1
+DIST ollama-0.9.1.gh.tar.gz 8358070 BLAKE2B 601b93e38247046ad958b332caac074a78554c97cbac93cf3b2eff87f4353d901cc3c807e597a4b217e20aaa2982ec0be6c80e2825ffa87061ad926bcf393f55 SHA512 dffc3da4f2b0c5b50c195a98c1ab8ace049f61536297658cb1ac8dc90a35cd0402e92f61aa11b5283791a5c2e7ac6756b9232a9713d30aee4d7cc24fa2a577e3
diff --git a/sci-ml/ollama/ollama-0.9.1.ebuild b/sci-ml/ollama/ollama-0.9.1.ebuild
new file mode 100644
index 0000000000..81e1307e83
--- /dev/null
+++ b/sci-ml/ollama/ollama-0.9.1.ebuild
@@ -0,0 +1,308 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# supports ROCM/HIP >=5.5, but we define 6.1 due to the eclass
+ROCM_VERSION=6.1
+inherit cuda rocm
+inherit cmake
+inherit go-module systemd toolchain-funcs
+
+DESCRIPTION="Get up and running with Llama 3, Mistral, Gemma, and other language models."
+HOMEPAGE="https://ollama.com"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ollama/ollama.git"
+else
+	SRC_URI="
+		https://github.com/ollama/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz
+		https://github.com/negril/gentoo-overlay-vendored/raw/refs/heads/blobs/${P}-vendor.tar.xz
+	"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+X86_CPU_FLAGS=(
+	sse4_2
+	avx
+	f16c
+	avx2
+	bmi2
+	fma3
+	avx512f
+	avx512vbmi
+	avx512_vnni
+	avx_vnni
+)
+CPU_FLAGS=( "${X86_CPU_FLAGS[@]/#/cpu_flags_x86_}" )
+IUSE="${CPU_FLAGS[*]} cuda blas mkl rocm"
+# IUSE+=" opencl vulkan"
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+	cuda? (
+		dev-util/nvidia-cuda-toolkit:=
+	)
+	blas? (
+		!mkl? (
+			virtual/blas
+		)
+		mkl? (
+			sci-libs/mkl
+		)
+	)
+	rocm? (
+		>=sci-libs/hipBLAS-5.5:=[${ROCM_USEDEP}]
+	)
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	>=dev-lang/go-1.23.4
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	acct-group/${PN}
+	>=acct-user/${PN}-3[cuda?]
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.6.3-use-GNUInstallDirs.patch"
+)
+
+pkg_pretend() {
+	if use amd64; then
+		if use cpu_flags_x86_f16c && use cpu_flags_x86_avx2 && use cpu_flags_x86_fma3 && ! use cpu_flags_x86_bmi2; then
+			ewarn
+			ewarn "CPU_FLAGS_X86: bmi2 not enabled."
+			ewarn "  Not building haswell runner."
+			ewarn "  Not building skylakex runner."
+			ewarn "  Not building icelake runner."
+			ewarn "  Not building alderlake runner."
+			ewarn
+			if grep bmi2 /proc/cpuinfo > /dev/null; then
+				ewarn "bmi2 found in /proc/cpuinfo"
+				ewarn
+			fi
+		fi
+	fi
+}
+
+src_unpack() {
+	if [[ "${PV}" == *9999* ]]; then
+		git-r3_src_unpack
+		go-module_live_vendor
+	else
+		go-module_src_unpack
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed \
+		-e "/set(GGML_CCACHE/s/ON/OFF/g" \
+		-e "/PRE_INCLUDE_REGEXES.*cu/d" \
+		-e "/PRE_INCLUDE_REGEXES.*hip/d" \
+		-i CMakeLists.txt || die sed
+
+	sed \
+		-e "s/ -O3//g" \
+		-i ml/backend/ggml/ggml/src/ggml-cpu/cpu.go || die sed
+
+	# fix library location
+	sed \
+		-e "s#lib/ollama#$(get_libdir)/ollama#g" \
+		-i CMakeLists.txt || die sed
+
+	sed \
+		-e "s/\"..\", \"lib\"/\"..\", \"$(get_libdir)\"/" \
+		-e "s#\"lib/ollama\"#\"$(get_libdir)/ollama\"#" \
+		-i \
+			ml/backend/ggml/ggml/src/ggml.go \
+			discover/path.go \
+		|| die
+
+	if use amd64; then
+		if
+			! use cpu_flags_x86_sse4_2; then
+			sed -e "/ggml_add_cpu_backend_variant(sse42/s/^/# /g" -i ml/backend/ggml/ggml/src/CMakeLists.txt || die
+			# SSE42)
+		fi
+		if
+			! use cpu_flags_x86_sse4_2 ||
+			! use cpu_flags_x86_avx; then
+			sed -e "/ggml_add_cpu_backend_variant(sandybridge/s/^/# /g" -i ml/backend/ggml/ggml/src/CMakeLists.txt || die
+			# SSE42 AVX)
+		fi
+		if
+			! use cpu_flags_x86_sse4_2 ||
+			! use cpu_flags_x86_avx ||
+			! use cpu_flags_x86_f16c ||
+			! use cpu_flags_x86_avx2 ||
+			! use cpu_flags_x86_bmi2 ||
+			! use cpu_flags_x86_fma3; then
+			sed -e "/ggml_add_cpu_backend_variant(haswell/s/^/# /g" -i ml/backend/ggml/ggml/src/CMakeLists.txt || die
+			# SSE42 AVX F16C AVX2 BMI2 FMA)
+		fi
+		if
+			! use cpu_flags_x86_sse4_2 ||
+			! use cpu_flags_x86_avx ||
+			! use cpu_flags_x86_f16c ||
+			! use cpu_flags_x86_avx2 ||
+			! use cpu_flags_x86_bmi2 ||
+			! use cpu_flags_x86_fma3 ||
+			! use cpu_flags_x86_avx512f; then
+			sed -e "/ggml_add_cpu_backend_variant(skylakex/s/^/# /g" -i ml/backend/ggml/ggml/src/CMakeLists.txt ||  die
+			# SSE42 AVX F16C AVX2 BMI2 FMA AVX512)
+		fi
+		if
+			! use cpu_flags_x86_sse4_2 ||
+			! use cpu_flags_x86_avx ||
+			! use cpu_flags_x86_f16c ||
+			! use cpu_flags_x86_avx2 ||
+			! use cpu_flags_x86_bmi2 ||
+			! use cpu_flags_x86_fma3 ||
+			! use cpu_flags_x86_avx512f ||
+			! use cpu_flags_x86_avx512vbmi ||
+			! use cpu_flags_x86_avx512_vnni; then
+			sed -e "/ggml_add_cpu_backend_variant(icelake/s/^/# /g" -i ml/backend/ggml/ggml/src/CMakeLists.txt || die
+			# SSE42 AVX F16C AVX2 BMI2 FMA AVX512 AVX512_VBMI AVX512_VNNI)
+		fi
+		if
+			! use cpu_flags_x86_sse4_2 ||
+			! use cpu_flags_x86_avx ||
+			! use cpu_flags_x86_f16c ||
+			! use cpu_flags_x86_avx2 ||
+			! use cpu_flags_x86_bmi2 ||
+			! use cpu_flags_x86_fma3 ||
+			! use cpu_flags_x86_avx_vnni; then
+			sed -e "/ggml_add_cpu_backend_variant(alderlake/s/^/# /g" -i ml/backend/ggml/ggml/src/CMakeLists.txt || die
+			# SSE42 AVX F16C AVX2 BMI2 FMA AVX_VNNI)
+		fi
+
+		# ml/backend/ggml/ggml/src/CMakeLists.txt
+	fi
+
+	# default
+	# return
+	if use cuda; then
+		cuda_src_prepare
+	fi
+
+	if use rocm; then
+		# --hip-version gets appended to the compile flags which isn't a known flag.
+		# This causes rocm builds to fail because -Wunused-command-line-argument is turned on.
+		# Use nuclear option to fix this.
+		# Disable -Werror's from go modules.
+		find "${S}" -name ".go" -exec sed -i "s/ -Werror / /g" {} + || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DGGML_CCACHE="no"
+
+		# -DGGML_CPU="yes"
+		-DGGML_BLAS="$(usex blas)"
+		# -DGGML_CUDA="$(usex cuda)"
+		# -DGGML_HIP="$(usex rocm)"
+
+		# -DGGML_METAL="yes" # apple
+		# missing from ml/backend/ggml/ggml/src/
+		# -DGGML_CANN="yes"
+		# -DGGML_MUSA="yes"
+		# -DGGML_RPC="yes"
+		# -DGGML_SYCL="yes"
+		# -DGGML_KOMPUTE="$(usex kompute)"
+		# -DGGML_OPENCL="$(usex opencl)"
+		# -DGGML_VULKAN="$(usex vulkan)"
+	)
+
+	if use blas; then
+		if use mkl; then
+			mycmakeargs+=(
+				-DGGML_BLAS_VENDOR="Intel"
+			)
+		else
+			mycmakeargs+=(
+				-DGGML_BLAS_VENDOR="Generic"
+			)
+		fi
+	fi
+	if use cuda; then
+		local -x CUDAHOSTCXX CUDAHOSTLD
+		CUDAHOSTCXX="$(cuda_gccdir)"
+		CUDAHOSTLD="$(tc-getCXX)"
+
+		cuda_add_sandbox -w
+		addpredict "/dev/char/"
+	else
+		mycmakeargs+=(
+			-DCMAKE_CUDA_COMPILER="NOTFOUND"
+		)
+	fi
+
+	if use rocm; then
+		mycmakeargs+=(
+			-DCMAKE_HIP_ARCHITECTURES="$(get_amdgpu_flags)"
+			-DCMAKE_HIP_PLATFORM="amd"
+			# ollama doesn't honor the default cmake options
+			-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		)
+
+		local -x HIP_PATH="${ESYSROOT}/usr"
+
+		check_amdgpu
+	else
+		mycmakeargs+=(
+			-DCMAKE_HIP_COMPILER="NOTFOUND"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_compile() {
+	ego build
+
+	cmake_src_compile
+}
+
+src_install() {
+	dobin ollama
+
+	cmake_src_install
+
+	newinitd "${FILESDIR}/ollama.init" "${PN}"
+	newconfd "${FILESDIR}/ollama.confd" "${PN}"
+
+	systemd_dounit "${FILESDIR}/ollama.service"
+}
+
+pkg_preinst() {
+	keepdir /var/log/ollama
+	fperms 750 /var/log/ollama
+	fowners "${PN}:${PN}" /var/log/ollama
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		einfo "Quick guide:"
+		einfo "\tollama serve"
+		einfo "\tollama run llama3:70b"
+		einfo
+		einfo "See available models at https://ollama.com/library"
+	fi
+
+	if use cuda ; then
+		einfo "When using cuda the user running ${PN} has to be in the video group or it won't detect devices."
+		einfo "The ebuild ensures this for user ${PN} via acct-user/${PN}[cuda]"
+	fi
+}

From 0f8375f5909a39b095ace204f3b593e14aa9bfbb Mon Sep 17 00:00:00 2001
From: Paul Zander <negril.nx+gentoo@gmail.com>
Date: Tue, 24 Jun 2025 13:32:43 +0200
Subject: [PATCH 16/30] sci-ml/ollama: add 0.9.2

Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
---
 sci-ml/ollama/Manifest            |   2 +
 sci-ml/ollama/ollama-0.9.2.ebuild | 308 ++++++++++++++++++++++++++++++
 2 files changed, 310 insertions(+)
 create mode 100644 sci-ml/ollama/ollama-0.9.2.ebuild

diff --git a/sci-ml/ollama/Manifest b/sci-ml/ollama/Manifest
index db7ff5e1a5..4eb171a912 100644
--- a/sci-ml/ollama/Manifest
+++ b/sci-ml/ollama/Manifest
@@ -6,3 +6,5 @@ DIST ollama-0.9.0-vendor.tar.xz 4412428 BLAKE2B 8d84c7020d350cf6aaf67216ef37be69
 DIST ollama-0.9.0.gh.tar.gz 8353746 BLAKE2B 14b685fdc017c0a0485917d3690430e5205366de94291623f07cb3b9c9862ba96894b62ba4798876f841cb3a3ee7497dbae71b253bfb513556bdfc9153deb45c SHA512 32ef42663ea831556fa033bc03a481d103f09e8f5c16f611b3f2308ae80c81daec924192800a2f7c22f70ac86c5440377f892a88cce522223cbbdff793114091
 DIST ollama-0.9.1-vendor.tar.xz 4414480 BLAKE2B 60854edfd5f4a0abb674bb4a430694f4a51fae75cfdda268fd0589cc73f467bc6f2fb1fc451c009627818909fa79539f101654069f86583a5457a9e243413f51 SHA512 1b4bc511a74289ccff9940c6a11fab48205d46f2bbbaae028a64476353ff204038703143c5e3207e5dbfc4a27160806e47564728282d8b47030d7303654263b1
 DIST ollama-0.9.1.gh.tar.gz 8358070 BLAKE2B 601b93e38247046ad958b332caac074a78554c97cbac93cf3b2eff87f4353d901cc3c807e597a4b217e20aaa2982ec0be6c80e2825ffa87061ad926bcf393f55 SHA512 dffc3da4f2b0c5b50c195a98c1ab8ace049f61536297658cb1ac8dc90a35cd0402e92f61aa11b5283791a5c2e7ac6756b9232a9713d30aee4d7cc24fa2a577e3
+DIST ollama-0.9.2-vendor.tar.xz 4408288 BLAKE2B 704b11317733e10d95f4782a86d7762bb259b20cd1cf879385f236824cfe2378b617bf96ca455d018d4a4dea84db2165459e8015aa6c320bdaf1aea1de0fb9f9 SHA512 4dd32d6c67bafa05db47a0bcc4a7852b5fbd8776acde470bdd524a4772d312a3724778025011ea85135184229b0eac89ccfe4c2323bc02d218686a3497949400
+DIST ollama-0.9.2.gh.tar.gz 8351627 BLAKE2B 84aba6436304260a5743d43eb3c74d48dc3b3168679db26ecb76c25ec78c517bb4d9318eba166e2e2053e6d444d06d3798849f5fe1de53851b01607d18aaeb59 SHA512 a68c581af7a7ea7a2193165773a9e5f1d832ab53e6e5f9f1786d530deab4c7a1e01b39cb1b2775f8415b3e9556991b6cf3e1e2a1066d1070d3ae500433217a33
diff --git a/sci-ml/ollama/ollama-0.9.2.ebuild b/sci-ml/ollama/ollama-0.9.2.ebuild
new file mode 100644
index 0000000000..81e1307e83
--- /dev/null
+++ b/sci-ml/ollama/ollama-0.9.2.ebuild
@@ -0,0 +1,308 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# supports ROCM/HIP >=5.5, but we define 6.1 due to the eclass
+ROCM_VERSION=6.1
+inherit cuda rocm
+inherit cmake
+inherit go-module systemd toolchain-funcs
+
+DESCRIPTION="Get up and running with Llama 3, Mistral, Gemma, and other language models."
+HOMEPAGE="https://ollama.com"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ollama/ollama.git"
+else
+	SRC_URI="
+		https://github.com/ollama/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz
+		https://github.com/negril/gentoo-overlay-vendored/raw/refs/heads/blobs/${P}-vendor.tar.xz
+	"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+X86_CPU_FLAGS=(
+	sse4_2
+	avx
+	f16c
+	avx2
+	bmi2
+	fma3
+	avx512f
+	avx512vbmi
+	avx512_vnni
+	avx_vnni
+)
+CPU_FLAGS=( "${X86_CPU_FLAGS[@]/#/cpu_flags_x86_}" )
+IUSE="${CPU_FLAGS[*]} cuda blas mkl rocm"
+# IUSE+=" opencl vulkan"
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+	cuda? (
+		dev-util/nvidia-cuda-toolkit:=
+	)
+	blas? (
+		!mkl? (
+			virtual/blas
+		)
+		mkl? (
+			sci-libs/mkl
+		)
+	)
+	rocm? (
+		>=sci-libs/hipBLAS-5.5:=[${ROCM_USEDEP}]
+	)
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	>=dev-lang/go-1.23.4
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	acct-group/${PN}
+	>=acct-user/${PN}-3[cuda?]
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.6.3-use-GNUInstallDirs.patch"
+)
+
+pkg_pretend() {
+	if use amd64; then
+		if use cpu_flags_x86_f16c && use cpu_flags_x86_avx2 && use cpu_flags_x86_fma3 && ! use cpu_flags_x86_bmi2; then
+			ewarn
+			ewarn "CPU_FLAGS_X86: bmi2 not enabled."
+			ewarn "  Not building haswell runner."
+			ewarn "  Not building skylakex runner."
+			ewarn "  Not building icelake runner."
+			ewarn "  Not building alderlake runner."
+			ewarn
+			if grep bmi2 /proc/cpuinfo > /dev/null; then
+				ewarn "bmi2 found in /proc/cpuinfo"
+				ewarn
+			fi
+		fi
+	fi
+}
+
+src_unpack() {
+	if [[ "${PV}" == *9999* ]]; then
+		git-r3_src_unpack
+		go-module_live_vendor
+	else
+		go-module_src_unpack
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed \
+		-e "/set(GGML_CCACHE/s/ON/OFF/g" \
+		-e "/PRE_INCLUDE_REGEXES.*cu/d" \
+		-e "/PRE_INCLUDE_REGEXES.*hip/d" \
+		-i CMakeLists.txt || die sed
+
+	sed \
+		-e "s/ -O3//g" \
+		-i ml/backend/ggml/ggml/src/ggml-cpu/cpu.go || die sed
+
+	# fix library location
+	sed \
+		-e "s#lib/ollama#$(get_libdir)/ollama#g" \
+		-i CMakeLists.txt || die sed
+
+	sed \
+		-e "s/\"..\", \"lib\"/\"..\", \"$(get_libdir)\"/" \
+		-e "s#\"lib/ollama\"#\"$(get_libdir)/ollama\"#" \
+		-i \
+			ml/backend/ggml/ggml/src/ggml.go \
+			discover/path.go \
+		|| die
+
+	if use amd64; then
+		if
+			! use cpu_flags_x86_sse4_2; then
+			sed -e "/ggml_add_cpu_backend_variant(sse42/s/^/# /g" -i ml/backend/ggml/ggml/src/CMakeLists.txt || die
+			# SSE42)
+		fi
+		if
+			! use cpu_flags_x86_sse4_2 ||
+			! use cpu_flags_x86_avx; then
+			sed -e "/ggml_add_cpu_backend_variant(sandybridge/s/^/# /g" -i ml/backend/ggml/ggml/src/CMakeLists.txt || die
+			# SSE42 AVX)
+		fi
+		if
+			! use cpu_flags_x86_sse4_2 ||
+			! use cpu_flags_x86_avx ||
+			! use cpu_flags_x86_f16c ||
+			! use cpu_flags_x86_avx2 ||
+			! use cpu_flags_x86_bmi2 ||
+			! use cpu_flags_x86_fma3; then
+			sed -e "/ggml_add_cpu_backend_variant(haswell/s/^/# /g" -i ml/backend/ggml/ggml/src/CMakeLists.txt || die
+			# SSE42 AVX F16C AVX2 BMI2 FMA)
+		fi
+		if
+			! use cpu_flags_x86_sse4_2 ||
+			! use cpu_flags_x86_avx ||
+			! use cpu_flags_x86_f16c ||
+			! use cpu_flags_x86_avx2 ||
+			! use cpu_flags_x86_bmi2 ||
+			! use cpu_flags_x86_fma3 ||
+			! use cpu_flags_x86_avx512f; then
+			sed -e "/ggml_add_cpu_backend_variant(skylakex/s/^/# /g" -i ml/backend/ggml/ggml/src/CMakeLists.txt ||  die
+			# SSE42 AVX F16C AVX2 BMI2 FMA AVX512)
+		fi
+		if
+			! use cpu_flags_x86_sse4_2 ||
+			! use cpu_flags_x86_avx ||
+			! use cpu_flags_x86_f16c ||
+			! use cpu_flags_x86_avx2 ||
+			! use cpu_flags_x86_bmi2 ||
+			! use cpu_flags_x86_fma3 ||
+			! use cpu_flags_x86_avx512f ||
+			! use cpu_flags_x86_avx512vbmi ||
+			! use cpu_flags_x86_avx512_vnni; then
+			sed -e "/ggml_add_cpu_backend_variant(icelake/s/^/# /g" -i ml/backend/ggml/ggml/src/CMakeLists.txt || die
+			# SSE42 AVX F16C AVX2 BMI2 FMA AVX512 AVX512_VBMI AVX512_VNNI)
+		fi
+		if
+			! use cpu_flags_x86_sse4_2 ||
+			! use cpu_flags_x86_avx ||
+			! use cpu_flags_x86_f16c ||
+			! use cpu_flags_x86_avx2 ||
+			! use cpu_flags_x86_bmi2 ||
+			! use cpu_flags_x86_fma3 ||
+			! use cpu_flags_x86_avx_vnni; then
+			sed -e "/ggml_add_cpu_backend_variant(alderlake/s/^/# /g" -i ml/backend/ggml/ggml/src/CMakeLists.txt || die
+			# SSE42 AVX F16C AVX2 BMI2 FMA AVX_VNNI)
+		fi
+
+		# ml/backend/ggml/ggml/src/CMakeLists.txt
+	fi
+
+	# default
+	# return
+	if use cuda; then
+		cuda_src_prepare
+	fi
+
+	if use rocm; then
+		# --hip-version gets appended to the compile flags which isn't a known flag.
+		# This causes rocm builds to fail because -Wunused-command-line-argument is turned on.
+		# Use nuclear option to fix this.
+		# Disable -Werror's from go modules.
+		find "${S}" -name ".go" -exec sed -i "s/ -Werror / /g" {} + || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DGGML_CCACHE="no"
+
+		# -DGGML_CPU="yes"
+		-DGGML_BLAS="$(usex blas)"
+		# -DGGML_CUDA="$(usex cuda)"
+		# -DGGML_HIP="$(usex rocm)"
+
+		# -DGGML_METAL="yes" # apple
+		# missing from ml/backend/ggml/ggml/src/
+		# -DGGML_CANN="yes"
+		# -DGGML_MUSA="yes"
+		# -DGGML_RPC="yes"
+		# -DGGML_SYCL="yes"
+		# -DGGML_KOMPUTE="$(usex kompute)"
+		# -DGGML_OPENCL="$(usex opencl)"
+		# -DGGML_VULKAN="$(usex vulkan)"
+	)
+
+	if use blas; then
+		if use mkl; then
+			mycmakeargs+=(
+				-DGGML_BLAS_VENDOR="Intel"
+			)
+		else
+			mycmakeargs+=(
+				-DGGML_BLAS_VENDOR="Generic"
+			)
+		fi
+	fi
+	if use cuda; then
+		local -x CUDAHOSTCXX CUDAHOSTLD
+		CUDAHOSTCXX="$(cuda_gccdir)"
+		CUDAHOSTLD="$(tc-getCXX)"
+
+		cuda_add_sandbox -w
+		addpredict "/dev/char/"
+	else
+		mycmakeargs+=(
+			-DCMAKE_CUDA_COMPILER="NOTFOUND"
+		)
+	fi
+
+	if use rocm; then
+		mycmakeargs+=(
+			-DCMAKE_HIP_ARCHITECTURES="$(get_amdgpu_flags)"
+			-DCMAKE_HIP_PLATFORM="amd"
+			# ollama doesn't honor the default cmake options
+			-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		)
+
+		local -x HIP_PATH="${ESYSROOT}/usr"
+
+		check_amdgpu
+	else
+		mycmakeargs+=(
+			-DCMAKE_HIP_COMPILER="NOTFOUND"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_compile() {
+	ego build
+
+	cmake_src_compile
+}
+
+src_install() {
+	dobin ollama
+
+	cmake_src_install
+
+	newinitd "${FILESDIR}/ollama.init" "${PN}"
+	newconfd "${FILESDIR}/ollama.confd" "${PN}"
+
+	systemd_dounit "${FILESDIR}/ollama.service"
+}
+
+pkg_preinst() {
+	keepdir /var/log/ollama
+	fperms 750 /var/log/ollama
+	fowners "${PN}:${PN}" /var/log/ollama
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		einfo "Quick guide:"
+		einfo "\tollama serve"
+		einfo "\tollama run llama3:70b"
+		einfo
+		einfo "See available models at https://ollama.com/library"
+	fi
+
+	if use cuda ; then
+		einfo "When using cuda the user running ${PN} has to be in the video group or it won't detect devices."
+		einfo "The ebuild ensures this for user ${PN} via acct-user/${PN}[cuda]"
+	fi
+}

From ed4eb69dfc6dcd4ad729f326c1b0863595dc9c52 Mon Sep 17 00:00:00 2001
From: Paul Zander <negril.nx+gentoo@gmail.com>
Date: Tue, 24 Jun 2025 13:34:46 +0200
Subject: [PATCH 17/30] dev-python/fastapi: add 0.115.13

Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
---
 dev-python/fastapi/Manifest                |   1 +
 dev-python/fastapi/fastapi-0.115.13.ebuild | 110 +++++++++++++++++++++
 2 files changed, 111 insertions(+)
 create mode 100644 dev-python/fastapi/fastapi-0.115.13.ebuild

diff --git a/dev-python/fastapi/Manifest b/dev-python/fastapi/Manifest
index 5ea7c4b7b0..f09dd65d38 100644
--- a/dev-python/fastapi/Manifest
+++ b/dev-python/fastapi/Manifest
@@ -1 +1,2 @@
 DIST fastapi-0.115.12.tar.gz 295236 BLAKE2B 224b74553668721dde3592a50a3d5b02a967a58f55d3beb6bec753755cddfbb803f0661ce6cc41af3ddfc28bb304d053f41aad8ab9d8965048ff80cad6c3207e SHA512 8eb8d998643ca748744b9c00e14cdd62f02e58145e2a64dcf090361d56fa52a12b643b8fc3dc98f41af74c06d46b787acf92ae2be828d99b6d4290c20ced7f6f
+DIST fastapi-0.115.13.tar.gz 295680 BLAKE2B 04fa6fec81e25045f6e6601dc6207973fa4afe7b2fe6ebd27645a48f5b6f0a30758581dba947972fbcfb62e6e5dcf119c03f007c9f31ddc80236f1ea7e39d453 SHA512 0c337265d118ce86e1800251caba4f55ece9c8262870000cf5b3b36f21467079043377a136c1c5aa17f96b724c3633cc600c96093192ced7a2ffa18eba7c8171
diff --git a/dev-python/fastapi/fastapi-0.115.13.ebuild b/dev-python/fastapi/fastapi-0.115.13.ebuild
new file mode 100644
index 0000000000..6923a9ffbd
--- /dev/null
+++ b/dev-python/fastapi/fastapi-0.115.13.ebuild
@@ -0,0 +1,110 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=pdm-backend
+PYTHON_COMPAT=( python3_{12..13} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="FastAPI framework, high performance, easy to learn, ready for production"
+HOMEPAGE="
+	https://fastapi.tiangolo.com/
+	https://pypi.org/project/fastapi/
+	https://github.com/fastapi/fastapi
+"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/fastapi/fastapi.git"
+else
+	inherit pypi
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="
+	<dev-python/pydantic-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pydantic-1.7.4[${PYTHON_USEDEP}]
+	<dev-python/starlette-0.48.0[${PYTHON_USEDEP}]
+	>=dev-python/starlette-0.40.0[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-4.8.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/aiosqlite[${PYTHON_USEDEP}]
+		>=dev-python/anyio-3.2.1[${PYTHON_USEDEP}]
+		dev-python/bcrypt[${PYTHON_USEDEP}]
+		dev-python/dirty-equals[${PYTHON_USEDEP}]
+		dev-python/email-validator[${PYTHON_USEDEP}]
+		>=dev-python/flask-1.1.2[${PYTHON_USEDEP}]
+		>=dev-python/inline-snapshot-0.21.1[${PYTHON_USEDEP}]
+		>=dev-python/jinja2-3.1.5[${PYTHON_USEDEP}]
+		dev-python/orjson[${PYTHON_USEDEP}]
+		<dev-python/passlib-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/passlib-1.7.2[${PYTHON_USEDEP}]
+		dev-python/pydantic-settings[${PYTHON_USEDEP}]
+		dev-python/pyjwt[${PYTHON_USEDEP}]
+		>=dev-python/python-multipart-0.0.18[${PYTHON_USEDEP}]
+		<dev-python/pyyaml-7.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
+		dev-python/sqlmodel[${PYTHON_USEDEP}]
+		dev-python/trio[${PYTHON_USEDEP}]
+		dev-python/ujson[${PYTHON_USEDEP}]
+	)
+"
+# brotli and zstd due to starlette based tests expecting it
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.115.6-httpx-0.28-test-fix.patch"
+	"${FILESDIR}/${PN}-0.115.12-starlette-0.48.0.patch"
+)
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Depends on coverage
+	"tests/test_fastapi_cli.py::test_fastapi_cli"
+	# Test result affected by unrelated packages such as brotli and zstd
+	# https://github.com/fastapi/fastapi/blob/7c6f2f8fde68f488163376c9e92a59d46c491298/tests/test_tutorial/test_header_param_models/test_tutorial001.py#L77
+	"tests/test_tutorial/test_header_param_models/test_tutorial001.py::test_header_param_model_invalid"
+	"tests/test_tutorial/test_header_param_models/test_tutorial003.py::test_header_param_model_invalid"
+	"tests/test_tutorial/test_header_param_models/test_tutorial003.py::test_header_param_model_no_underscore"
+	# https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6afa196ca0cb1604875847b1b84fa64896a06f6e
+	"tests/test_multipart_installation.py::test_incorrect_multipart_installed_form"
+	"tests/test_multipart_installation.py::test_incorrect_multipart_installed_file_upload"
+	"tests/test_multipart_installation.py::test_incorrect_multipart_installed_file_bytes"
+	"tests/test_multipart_installation.py::test_incorrect_multipart_installed_multi_form"
+	"tests/test_multipart_installation.py::test_incorrect_multipart_installed_form_file"
+	"tests/test_multipart_installation.py::test_no_multipart_installed"
+	"tests/test_multipart_installation.py::test_no_multipart_installed_file"
+	"tests/test_multipart_installation.py::test_no_multipart_installed_file_bytes"
+	"tests/test_multipart_installation.py::test_no_multipart_installed_multi_form"
+	"tests/test_multipart_installation.py::test_no_multipart_installed_form_file"
+	"tests/test_multipart_installation.py::test_old_multipart_installed"
+	# Hangs with network-sandbox
+	"tests/test_tutorial/test_websockets/test_tutorial003_py39.py::test_websocket_handle_disconnection"
+
+)
+
+python_prepare_all() {
+	# Dont install fastapi executable as fastapi-cli is supposed to handle it
+	sed -i -e '/\[project.scripts\]/,/^$/d' pyproject.toml || die
+
+	distutils-r1_python_prepare_all
+}
+
+pkg_postinst() {
+	optfeature "commandline interface" dev-python/fastapi-cli
+	optfeature "test client" dev-python/httpx
+	optfeature "templates" dev-python/jinja2
+	optfeature "forms and file uploads" dev-python/python-multipart
+	optfeature "validate emails" dev-python/email-validator
+	optfeature "uvicorn with uvloop" dev-python/uvicorn
+	optfeature_header "Alternative JSON responses"
+	optfeature "ORJSONResponse" dev-python/orjson
+	optfeature "UJSONResponse" dev-python/ujson
+}

From bc5f6ad82bdf7c025fe49488e27dc62e8229d973 Mon Sep 17 00:00:00 2001
From: Paul Zander <negril.nx+gentoo@gmail.com>
Date: Tue, 24 Jun 2025 13:38:07 +0200
Subject: [PATCH 18/30] sys-apps/coolercontrol-liqctld: drop 2.1.0

Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
---
 sys-apps/coolercontrol-liqctld/Manifest       |  1 -
 .../coolercontrol-liqctld-2.1.0.ebuild        | 39 -------------------
 2 files changed, 40 deletions(-)
 delete mode 100644 sys-apps/coolercontrol-liqctld/coolercontrol-liqctld-2.1.0.ebuild

diff --git a/sys-apps/coolercontrol-liqctld/Manifest b/sys-apps/coolercontrol-liqctld/Manifest
index 004dc1cbb1..43511891ff 100644
--- a/sys-apps/coolercontrol-liqctld/Manifest
+++ b/sys-apps/coolercontrol-liqctld/Manifest
@@ -1,3 +1,2 @@
-DIST coolercontrol-2.1.0.tar.bz2 15732132 BLAKE2B e90692b6b5d9b99ebc2bd26d519f9311600664c8296d1264ccd3d1d81b70e80ffa353eeae65a55e8398fc6e992dec0e7c451f22fe39bc0eec9cee1364a9004e8 SHA512 975877f0bbea06e294ff7b1d07ad7c12543b4dfc044e1500daf4658d3a9b13e49c52a66847b81f4d81d6c8604b6e3526c9fdc93f0a830650f8e0b3b081cefd81
 DIST coolercontrol-2.2.0.tar.bz2 15848078 BLAKE2B d6e332ed01e8399020f243322f908fef964799368c4e3118483bf117d45d9ecc107062f583c03cbabc7f44251dd4285a82a4f19d152444e790666ee2b1f67e15 SHA512 ff7c87d8d22d5063605820a17fe0f6c5a559f067cabf8980027d3a1c936101df6979711738697c7b6007ea988a6c9f3f1dae44e8be5335410de37127d0eeab4a
 DIST coolercontrol-2.2.1.tar.bz2 15866674 BLAKE2B aace4917a7c778de60f10387f0a90777479fdcdcbcabcc584e32c570dfe683a75015c31f3793acc91c7d503bdef4cccbea8c3f19fb7e752ba6e77ad58906ea23 SHA512 435a7a6f1ee0f14061f482df16f28adc0f40c9f35add6703e2953c7682897d77204fc7d45a04ea39d2715be104895bb8ed7d4fc59a1a8e024cd18f5d576b3a42
diff --git a/sys-apps/coolercontrol-liqctld/coolercontrol-liqctld-2.1.0.ebuild b/sys-apps/coolercontrol-liqctld/coolercontrol-liqctld-2.1.0.ebuild
deleted file mode 100644
index f35d1240f9..0000000000
--- a/sys-apps/coolercontrol-liqctld/coolercontrol-liqctld-2.1.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{12..13} )
-inherit distutils-r1 systemd
-
-DESCRIPTION="Monitor and control your cooling and other devices (liqctld)"
-HOMEPAGE="https://gitlab.com/coolercontrol/coolercontrol"
-SRC_URI="
-	https://gitlab.com/coolercontrol/coolercontrol/-/archive/${PV}/coolercontrol-${PV}.tar.bz2
-"
-S="${WORKDIR}/coolercontrol-${PV}/${PN}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	app-misc/liquidctl[${PYTHON_USEDEP}]
-	dev-python/fastapi[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	dev-python/uvicorn[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	pushd .. >/dev/null || die
-	default
-	popd >/dev/null || die
-}
-
-python_install_all() {
-	doinitd ../packaging/openrc/init.d/coolercontrol-liqctld
-	doconfd ../packaging/openrc/conf.d/coolercontrol-liqctld
-
-	systemd_dounit ../packaging/systemd/coolercontrol-liqctld.service
-}

From d05f854c033828bd964a8b213076297fe188c1b3 Mon Sep 17 00:00:00 2001
From: Paul Zander <negril.nx+gentoo@gmail.com>
Date: Tue, 24 Jun 2025 13:38:23 +0200
Subject: [PATCH 19/30] sys-apps/coolercontrol: drop 2.1.0

Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
---
 sys-apps/coolercontrol/Manifest               |  1 -
 .../coolercontrol/coolercontrol-2.1.0.ebuild  | 40 -------------------
 2 files changed, 41 deletions(-)
 delete mode 100644 sys-apps/coolercontrol/coolercontrol-2.1.0.ebuild

diff --git a/sys-apps/coolercontrol/Manifest b/sys-apps/coolercontrol/Manifest
index 004dc1cbb1..43511891ff 100644
--- a/sys-apps/coolercontrol/Manifest
+++ b/sys-apps/coolercontrol/Manifest
@@ -1,3 +1,2 @@
-DIST coolercontrol-2.1.0.tar.bz2 15732132 BLAKE2B e90692b6b5d9b99ebc2bd26d519f9311600664c8296d1264ccd3d1d81b70e80ffa353eeae65a55e8398fc6e992dec0e7c451f22fe39bc0eec9cee1364a9004e8 SHA512 975877f0bbea06e294ff7b1d07ad7c12543b4dfc044e1500daf4658d3a9b13e49c52a66847b81f4d81d6c8604b6e3526c9fdc93f0a830650f8e0b3b081cefd81
 DIST coolercontrol-2.2.0.tar.bz2 15848078 BLAKE2B d6e332ed01e8399020f243322f908fef964799368c4e3118483bf117d45d9ecc107062f583c03cbabc7f44251dd4285a82a4f19d152444e790666ee2b1f67e15 SHA512 ff7c87d8d22d5063605820a17fe0f6c5a559f067cabf8980027d3a1c936101df6979711738697c7b6007ea988a6c9f3f1dae44e8be5335410de37127d0eeab4a
 DIST coolercontrol-2.2.1.tar.bz2 15866674 BLAKE2B aace4917a7c778de60f10387f0a90777479fdcdcbcabcc584e32c570dfe683a75015c31f3793acc91c7d503bdef4cccbea8c3f19fb7e752ba6e77ad58906ea23 SHA512 435a7a6f1ee0f14061f482df16f28adc0f40c9f35add6703e2953c7682897d77204fc7d45a04ea39d2715be104895bb8ed7d4fc59a1a8e024cd18f5d576b3a42
diff --git a/sys-apps/coolercontrol/coolercontrol-2.1.0.ebuild b/sys-apps/coolercontrol/coolercontrol-2.1.0.ebuild
deleted file mode 100644
index 8cdb355210..0000000000
--- a/sys-apps/coolercontrol/coolercontrol-2.1.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop xdg
-
-DESCRIPTION="Monitor and control your cooling and other devices"
-HOMEPAGE="https://gitlab.com/coolercontrol/coolercontrol"
-SRC_URI="
-	https://gitlab.com/coolercontrol/coolercontrol/-/archive/${PV}/${P}.tar.bz2
-"
-S="${WORKDIR}/coolercontrol-${PV}/coolercontrol/"
-
-LICENSE="GPL-3+ CC0-1.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
-	dev-qt/qtbase:6[dbus,widgets]
-	dev-qt/qtwebchannel:6
-	dev-qt/qtwebengine:6[widgets]
-"
-RDEPEND="
-	${DEPEND}
-	sys-apps/coolercontrold
-"
-
-src_install() {
-	cmake_src_install
-	einstalldocs
-
-	domenu ../packaging/metadata/org.coolercontrol.CoolerControl.desktop
-	doicon -s 256 ../packaging/metadata/org.coolercontrol.CoolerControl.png
-	doicon -s scalable ../packaging/metadata/org.coolercontrol.CoolerControl.svg
-	insinto /usr/share/icons/hicolor/symbolic/apps
-	doins  ../packaging/metadata/org.coolercontrol.CoolerControl-symbolic.svg
-	insinto /usr/share/metainfo
-	doins ../packaging/metadata/org.coolercontrol.CoolerControl.metainfo.xml
-}

From 8bb8899d4644a151e13cf7e01b92379840bda37b Mon Sep 17 00:00:00 2001
From: Paul Zander <negril.nx+gentoo@gmail.com>
Date: Tue, 24 Jun 2025 13:38:40 +0200
Subject: [PATCH 20/30] sys-apps/coolercontrold: drop 2.1.0

Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
---
 sys-apps/coolercontrold/Manifest              |  3 -
 .../coolercontrold-2.1.0.ebuild               | 90 -------------------
 2 files changed, 93 deletions(-)
 delete mode 100644 sys-apps/coolercontrold/coolercontrold-2.1.0.ebuild

diff --git a/sys-apps/coolercontrold/Manifest b/sys-apps/coolercontrold/Manifest
index 6df8f06994..1abeadc9c5 100644
--- a/sys-apps/coolercontrold/Manifest
+++ b/sys-apps/coolercontrold/Manifest
@@ -1,10 +1,7 @@
-DIST coolercontrol-2.1.0-dist.tar.xz 867648 BLAKE2B 529ed66ae42f8cd35e2818ab7bd7a4d893850a216286153b0583f74cb31a529e14359579d4698bd6fec1fce00a4765ab85d7b94c992d01fb441954354e929b25 SHA512 d210fedb513e8c21f7ce93a814074d025c490cbc9726fd78d740b706ad07f1f7acda58fd572c582c221fe05680188ce720b718daa0fc2832d3ce7c770e0cec75
-DIST coolercontrol-2.1.0.tar.bz2 15732132 BLAKE2B e90692b6b5d9b99ebc2bd26d519f9311600664c8296d1264ccd3d1d81b70e80ffa353eeae65a55e8398fc6e992dec0e7c451f22fe39bc0eec9cee1364a9004e8 SHA512 975877f0bbea06e294ff7b1d07ad7c12543b4dfc044e1500daf4658d3a9b13e49c52a66847b81f4d81d6c8604b6e3526c9fdc93f0a830650f8e0b3b081cefd81
 DIST coolercontrol-2.2.0-dist.tar.xz 993312 BLAKE2B 880aadbe1c18cd82ac7d2860d5908484fecde923787ddad1025e21096ee4f3f148621869fa6903884d31150943be720dd3f4f38ddf3704c3b55b5c097502e90d SHA512 2359990647835fd95ace8ec9d0cbb4cb765d136354ab44ef13d029d4367f3cf7d313e3d8f7a00af319e1a925546c66147969964ec4f3da9a48abebbaec4486c3
 DIST coolercontrol-2.2.0.tar.bz2 15848078 BLAKE2B d6e332ed01e8399020f243322f908fef964799368c4e3118483bf117d45d9ecc107062f583c03cbabc7f44251dd4285a82a4f19d152444e790666ee2b1f67e15 SHA512 ff7c87d8d22d5063605820a17fe0f6c5a559f067cabf8980027d3a1c936101df6979711738697c7b6007ea988a6c9f3f1dae44e8be5335410de37127d0eeab4a
 DIST coolercontrol-2.2.1-dist.tar.xz 992932 BLAKE2B 1dcda744e4e45588f1ba010309de250edd82c47c2130a1c1506c7d191a213471fc4e3c856423ec0276a879133759e5ddc13e51cb0c87263823c9919d061e2d5c SHA512 1a3942f55ba05011ba0c46af095ce0ffdc07ce84ca7d1eab013a6acfe4b560c913dddde0339d810c7383ea86c4467ee20adea34e7edbe8b0cc8491c5c577db06
 DIST coolercontrol-2.2.1.tar.bz2 15866674 BLAKE2B aace4917a7c778de60f10387f0a90777479fdcdcbcabcc584e32c570dfe683a75015c31f3793acc91c7d503bdef4cccbea8c3f19fb7e752ba6e77ad58906ea23 SHA512 435a7a6f1ee0f14061f482df16f28adc0f40c9f35add6703e2953c7682897d77204fc7d45a04ea39d2715be104895bb8ed7d4fc59a1a8e024cd18f5d576b3a42
-DIST coolercontrold-2.1.0-crates.tar.xz 45467392 BLAKE2B e0e26e43b86df39e6c896c46beb3fdb4c4115628ef58d5d5ad03a0c353dd9af3f420a7c3f1b3d0799d45d1bb5b28e144f1f4cccc82a74ca50de071f073ad8821 SHA512 4dec1899ab32b6df6f2da642c868cb18519df2da88e9908dd4a0c108cca78bbe054b825402e0621099ac4bb556a3a031fdaecd033f76186c184091f2f0ac6ef1
 DIST coolercontrold-2.2.0-crates.tar.xz 34591084 BLAKE2B 800809394a2ad27e239d9b999d3e94729b55fc0e1b72d439c691f67c68bf428cb8693f1171e723a93349aab67a6a4a6e9f058da7f5c39937cf5508d672504c12 SHA512 9883e3399fcbcf9f5c565a3d1cc3605dc5c43b458fffc82c8e39de57c491117874554b176cb97f7943204e8d7e6d8ee94db54957d7d3a4d52f1d80becc7c978b
 DIST coolercontrold-2.2.1-crates.tar.xz 35510096 BLAKE2B b9f2ab744df4bdacd80d2205e58ca06628dc403d650384719462fa14e9432b8130a78fb61259d3da95e89099b6104f586fea63d3d779bdc1af1d4227dcf9b772 SHA512 af8d33f3122a7b50e43166e47a51d17eb3e5a24ff95b670f8dd499dd6da31805324a7369e5cd11e60405804fb104d53ec96b239a5b7dfcc497d5efaada0ed28d
 DIST nvml-wrapper-572095f631da93be8d243c73820e581676969897.gh.tar.gz 234938 BLAKE2B 91820ff38212c176027ab6fb0552efb1544e539fc0dda29e1f7d82e2cec8dce1ecd6cc499c120049869cde638ecf3918db3f73f86ea73214135e83c4bccbf8b7 SHA512 1ead616cd59058e3c2f100cc0dff9b6f4f97aeb70d30ef7d9667eef3e8b272bfae487e1c68e042680c4be8667246b4048cf8124ffe6a7011899cd2b87d8e9ec2
diff --git a/sys-apps/coolercontrold/coolercontrold-2.1.0.ebuild b/sys-apps/coolercontrold/coolercontrold-2.1.0.ebuild
deleted file mode 100644
index ef884d141d..0000000000
--- a/sys-apps/coolercontrold/coolercontrold-2.1.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2024-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-"
-
-declare -A GIT_CRATES=(
-	[nvml-wrapper-sys]='https://github.com/codifryed/nvml-wrapper;572095f631da93be8d243c73820e581676969897;nvml-wrapper-%commit%/nvml-wrapper-sys'
-	[nvml-wrapper]='https://github.com/codifryed/nvml-wrapper;572095f631da93be8d243c73820e581676969897;nvml-wrapper-%commit%/nvml-wrapper'
-	[tower_governor]='https://github.com/codifryed/tower-governor;fd799d86418e58179468953c80ad7094a81a9e37;tower-governor-%commit%'
-)
-
-inherit cargo optfeature systemd
-
-DESCRIPTION="Monitor and control your cooling and other devices (daemon)"
-HOMEPAGE="https://gitlab.com/coolercontrol/coolercontrol"
-SRC_URI="
-	https://gitlab.com/coolercontrol/coolercontrol/-/archive/${PV}/coolercontrol-${PV}.tar.bz2
-	https://gitlab.com/api/v4/projects/32909921/packages/generic/coolercontrol/${PV}/coolercontrol-${PV}-dist.tar.xz
-	https://gitlab.com/api/v4/projects/32909921/packages/generic/coolercontrol/${PV}/coolercontrold-${PV}-crates.tar.xz
-	${CARGO_CRATE_URIS}
-"
-S="${WORKDIR}/coolercontrol-${PV}/${PN}"
-
-LICENSE="GPL-3+"
-# Dependent crate licenses
-LICENSE+="
-	AGPL-3+ Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD CC-PD
-	GPL-3+ ISC MIT MPL-2.0 UoI-NCSA Unicode-3.0 ZLIB
-"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="video_cards_amdgpu"
-
-RDEPEND="
-	app-arch/zstd:=
-	video_cards_amdgpu? (
-		x11-libs/libdrm[video_cards_amdgpu]
-	)
-"
-DEPEND="${RDEPEND}"
-
-QA_FLAGS_IGNORED=".*"
-
-PATCHES=(
-	"${FILESDIR}"/coolercontrold-2.1.0-optional-libdrm_amdgpu.patch
-)
-
-src_prepare() {
-	pushd .. >/dev/null || die
-	default
-	popd >/dev/null || die
-
-	# Disable stripping
-	sed -i -e '/^strip =/d' Cargo.toml || die
-
-	cp -rf "${WORKDIR}"/dist/* "${S}"/resources/app/ || die
-}
-
-src_configure() {
-	export ZSTD_SYS_USE_PKG_CONFIG=1
-
-	local myfeatures=(
-		$(usev video_cards_amdgpu libdrm_amdgpu)
-	)
-
-	cargo_src_configure
-}
-
-src_install() {
-	cargo_src_install
-
-	einstalldocs
-
-	doinitd ../packaging/openrc/init.d/coolercontrol
-	doconfd ../packaging/openrc/conf.d/coolercontrol
-
-	systemd_dounit ../packaging/systemd/coolercontrold.service
-}
-
-pkg_postinst() {
-	optfeature "interact with AIO liquid coolers and other devices" sys-apps/coolercontrol-liqctld
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		elog "Remember to restart coolercontrol service to use the new version."
-	fi
-}

From 5a996201bc6e2aedd3da126408883816303f7154 Mon Sep 17 00:00:00 2001
From: Paul Zander <negril.nx+gentoo@gmail.com>
Date: Tue, 24 Jun 2025 13:39:20 +0200
Subject: [PATCH 21/30] sys-apps/coolercontrol-liqctld: drop 2.2.0

Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
---
 sys-apps/coolercontrol-liqctld/Manifest       |  1 -
 .../coolercontrol-liqctld-2.2.0.ebuild        | 39 -------------------
 2 files changed, 40 deletions(-)
 delete mode 100644 sys-apps/coolercontrol-liqctld/coolercontrol-liqctld-2.2.0.ebuild

diff --git a/sys-apps/coolercontrol-liqctld/Manifest b/sys-apps/coolercontrol-liqctld/Manifest
index 43511891ff..39dbc22c56 100644
--- a/sys-apps/coolercontrol-liqctld/Manifest
+++ b/sys-apps/coolercontrol-liqctld/Manifest
@@ -1,2 +1 @@
-DIST coolercontrol-2.2.0.tar.bz2 15848078 BLAKE2B d6e332ed01e8399020f243322f908fef964799368c4e3118483bf117d45d9ecc107062f583c03cbabc7f44251dd4285a82a4f19d152444e790666ee2b1f67e15 SHA512 ff7c87d8d22d5063605820a17fe0f6c5a559f067cabf8980027d3a1c936101df6979711738697c7b6007ea988a6c9f3f1dae44e8be5335410de37127d0eeab4a
 DIST coolercontrol-2.2.1.tar.bz2 15866674 BLAKE2B aace4917a7c778de60f10387f0a90777479fdcdcbcabcc584e32c570dfe683a75015c31f3793acc91c7d503bdef4cccbea8c3f19fb7e752ba6e77ad58906ea23 SHA512 435a7a6f1ee0f14061f482df16f28adc0f40c9f35add6703e2953c7682897d77204fc7d45a04ea39d2715be104895bb8ed7d4fc59a1a8e024cd18f5d576b3a42
diff --git a/sys-apps/coolercontrol-liqctld/coolercontrol-liqctld-2.2.0.ebuild b/sys-apps/coolercontrol-liqctld/coolercontrol-liqctld-2.2.0.ebuild
deleted file mode 100644
index f35d1240f9..0000000000
--- a/sys-apps/coolercontrol-liqctld/coolercontrol-liqctld-2.2.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{12..13} )
-inherit distutils-r1 systemd
-
-DESCRIPTION="Monitor and control your cooling and other devices (liqctld)"
-HOMEPAGE="https://gitlab.com/coolercontrol/coolercontrol"
-SRC_URI="
-	https://gitlab.com/coolercontrol/coolercontrol/-/archive/${PV}/coolercontrol-${PV}.tar.bz2
-"
-S="${WORKDIR}/coolercontrol-${PV}/${PN}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	app-misc/liquidctl[${PYTHON_USEDEP}]
-	dev-python/fastapi[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	dev-python/uvicorn[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	pushd .. >/dev/null || die
-	default
-	popd >/dev/null || die
-}
-
-python_install_all() {
-	doinitd ../packaging/openrc/init.d/coolercontrol-liqctld
-	doconfd ../packaging/openrc/conf.d/coolercontrol-liqctld
-
-	systemd_dounit ../packaging/systemd/coolercontrol-liqctld.service
-}

From cb33fe5291cb634a297475aabc3c89c789b56760 Mon Sep 17 00:00:00 2001
From: Paul Zander <negril.nx+gentoo@gmail.com>
Date: Tue, 24 Jun 2025 13:39:34 +0200
Subject: [PATCH 22/30] sys-apps/coolercontrol: drop 2.2.0

Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
---
 sys-apps/coolercontrol/Manifest               |  1 -
 .../coolercontrol/coolercontrol-2.2.0.ebuild  | 40 -------------------
 2 files changed, 41 deletions(-)
 delete mode 100644 sys-apps/coolercontrol/coolercontrol-2.2.0.ebuild

diff --git a/sys-apps/coolercontrol/Manifest b/sys-apps/coolercontrol/Manifest
index 43511891ff..39dbc22c56 100644
--- a/sys-apps/coolercontrol/Manifest
+++ b/sys-apps/coolercontrol/Manifest
@@ -1,2 +1 @@
-DIST coolercontrol-2.2.0.tar.bz2 15848078 BLAKE2B d6e332ed01e8399020f243322f908fef964799368c4e3118483bf117d45d9ecc107062f583c03cbabc7f44251dd4285a82a4f19d152444e790666ee2b1f67e15 SHA512 ff7c87d8d22d5063605820a17fe0f6c5a559f067cabf8980027d3a1c936101df6979711738697c7b6007ea988a6c9f3f1dae44e8be5335410de37127d0eeab4a
 DIST coolercontrol-2.2.1.tar.bz2 15866674 BLAKE2B aace4917a7c778de60f10387f0a90777479fdcdcbcabcc584e32c570dfe683a75015c31f3793acc91c7d503bdef4cccbea8c3f19fb7e752ba6e77ad58906ea23 SHA512 435a7a6f1ee0f14061f482df16f28adc0f40c9f35add6703e2953c7682897d77204fc7d45a04ea39d2715be104895bb8ed7d4fc59a1a8e024cd18f5d576b3a42
diff --git a/sys-apps/coolercontrol/coolercontrol-2.2.0.ebuild b/sys-apps/coolercontrol/coolercontrol-2.2.0.ebuild
deleted file mode 100644
index 8cdb355210..0000000000
--- a/sys-apps/coolercontrol/coolercontrol-2.2.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop xdg
-
-DESCRIPTION="Monitor and control your cooling and other devices"
-HOMEPAGE="https://gitlab.com/coolercontrol/coolercontrol"
-SRC_URI="
-	https://gitlab.com/coolercontrol/coolercontrol/-/archive/${PV}/${P}.tar.bz2
-"
-S="${WORKDIR}/coolercontrol-${PV}/coolercontrol/"
-
-LICENSE="GPL-3+ CC0-1.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
-	dev-qt/qtbase:6[dbus,widgets]
-	dev-qt/qtwebchannel:6
-	dev-qt/qtwebengine:6[widgets]
-"
-RDEPEND="
-	${DEPEND}
-	sys-apps/coolercontrold
-"
-
-src_install() {
-	cmake_src_install
-	einstalldocs
-
-	domenu ../packaging/metadata/org.coolercontrol.CoolerControl.desktop
-	doicon -s 256 ../packaging/metadata/org.coolercontrol.CoolerControl.png
-	doicon -s scalable ../packaging/metadata/org.coolercontrol.CoolerControl.svg
-	insinto /usr/share/icons/hicolor/symbolic/apps
-	doins  ../packaging/metadata/org.coolercontrol.CoolerControl-symbolic.svg
-	insinto /usr/share/metainfo
-	doins ../packaging/metadata/org.coolercontrol.CoolerControl.metainfo.xml
-}

From 28082b9e072f50bc4ee71165fd7d73751ca5c734 Mon Sep 17 00:00:00 2001
From: Paul Zander <negril.nx+gentoo@gmail.com>
Date: Tue, 24 Jun 2025 13:39:44 +0200
Subject: [PATCH 23/30] sys-apps/coolercontrold: drop 2.2.0

Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
---
 sys-apps/coolercontrold/Manifest              |  3 -
 .../coolercontrold-2.2.0.ebuild               | 90 -------------------
 2 files changed, 93 deletions(-)
 delete mode 100644 sys-apps/coolercontrold/coolercontrold-2.2.0.ebuild

diff --git a/sys-apps/coolercontrold/Manifest b/sys-apps/coolercontrold/Manifest
index 1abeadc9c5..856067ad9e 100644
--- a/sys-apps/coolercontrold/Manifest
+++ b/sys-apps/coolercontrold/Manifest
@@ -1,8 +1,5 @@
-DIST coolercontrol-2.2.0-dist.tar.xz 993312 BLAKE2B 880aadbe1c18cd82ac7d2860d5908484fecde923787ddad1025e21096ee4f3f148621869fa6903884d31150943be720dd3f4f38ddf3704c3b55b5c097502e90d SHA512 2359990647835fd95ace8ec9d0cbb4cb765d136354ab44ef13d029d4367f3cf7d313e3d8f7a00af319e1a925546c66147969964ec4f3da9a48abebbaec4486c3
-DIST coolercontrol-2.2.0.tar.bz2 15848078 BLAKE2B d6e332ed01e8399020f243322f908fef964799368c4e3118483bf117d45d9ecc107062f583c03cbabc7f44251dd4285a82a4f19d152444e790666ee2b1f67e15 SHA512 ff7c87d8d22d5063605820a17fe0f6c5a559f067cabf8980027d3a1c936101df6979711738697c7b6007ea988a6c9f3f1dae44e8be5335410de37127d0eeab4a
 DIST coolercontrol-2.2.1-dist.tar.xz 992932 BLAKE2B 1dcda744e4e45588f1ba010309de250edd82c47c2130a1c1506c7d191a213471fc4e3c856423ec0276a879133759e5ddc13e51cb0c87263823c9919d061e2d5c SHA512 1a3942f55ba05011ba0c46af095ce0ffdc07ce84ca7d1eab013a6acfe4b560c913dddde0339d810c7383ea86c4467ee20adea34e7edbe8b0cc8491c5c577db06
 DIST coolercontrol-2.2.1.tar.bz2 15866674 BLAKE2B aace4917a7c778de60f10387f0a90777479fdcdcbcabcc584e32c570dfe683a75015c31f3793acc91c7d503bdef4cccbea8c3f19fb7e752ba6e77ad58906ea23 SHA512 435a7a6f1ee0f14061f482df16f28adc0f40c9f35add6703e2953c7682897d77204fc7d45a04ea39d2715be104895bb8ed7d4fc59a1a8e024cd18f5d576b3a42
-DIST coolercontrold-2.2.0-crates.tar.xz 34591084 BLAKE2B 800809394a2ad27e239d9b999d3e94729b55fc0e1b72d439c691f67c68bf428cb8693f1171e723a93349aab67a6a4a6e9f058da7f5c39937cf5508d672504c12 SHA512 9883e3399fcbcf9f5c565a3d1cc3605dc5c43b458fffc82c8e39de57c491117874554b176cb97f7943204e8d7e6d8ee94db54957d7d3a4d52f1d80becc7c978b
 DIST coolercontrold-2.2.1-crates.tar.xz 35510096 BLAKE2B b9f2ab744df4bdacd80d2205e58ca06628dc403d650384719462fa14e9432b8130a78fb61259d3da95e89099b6104f586fea63d3d779bdc1af1d4227dcf9b772 SHA512 af8d33f3122a7b50e43166e47a51d17eb3e5a24ff95b670f8dd499dd6da31805324a7369e5cd11e60405804fb104d53ec96b239a5b7dfcc497d5efaada0ed28d
 DIST nvml-wrapper-572095f631da93be8d243c73820e581676969897.gh.tar.gz 234938 BLAKE2B 91820ff38212c176027ab6fb0552efb1544e539fc0dda29e1f7d82e2cec8dce1ecd6cc499c120049869cde638ecf3918db3f73f86ea73214135e83c4bccbf8b7 SHA512 1ead616cd59058e3c2f100cc0dff9b6f4f97aeb70d30ef7d9667eef3e8b272bfae487e1c68e042680c4be8667246b4048cf8124ffe6a7011899cd2b87d8e9ec2
 DIST tower-governor-fd799d86418e58179468953c80ad7094a81a9e37.gh.tar.gz 31787 BLAKE2B 452d9423efbb4230bd88dfd58418850d0ccd53d5d7a45ff5f60005f292637c296c4c67d75397a7f4a59af51028b2fa95a2ef69b372c18b1dc02408437e8aac81 SHA512 40819f6d2dd7f1471af403e0314d261d043c6fddde12c55b797412d07f0ae6db3cfb640cbe3e2ebfea1be11794ed8ded20c39ca489784a4dbbbfdead3ff2f38c
diff --git a/sys-apps/coolercontrold/coolercontrold-2.2.0.ebuild b/sys-apps/coolercontrold/coolercontrold-2.2.0.ebuild
deleted file mode 100644
index 408eed3764..0000000000
--- a/sys-apps/coolercontrold/coolercontrold-2.2.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2024-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-"
-
-declare -A GIT_CRATES=(
-	[nvml-wrapper-sys]='https://github.com/codifryed/nvml-wrapper;572095f631da93be8d243c73820e581676969897;nvml-wrapper-%commit%/nvml-wrapper-sys'
-	[nvml-wrapper]='https://github.com/codifryed/nvml-wrapper;572095f631da93be8d243c73820e581676969897;nvml-wrapper-%commit%/nvml-wrapper'
-	[tower_governor]='https://github.com/codifryed/tower-governor;fd799d86418e58179468953c80ad7094a81a9e37;tower-governor-%commit%'
-)
-
-inherit cargo optfeature systemd
-
-DESCRIPTION="Monitor and control your cooling and other devices (daemon)"
-HOMEPAGE="https://gitlab.com/coolercontrol/coolercontrol"
-SRC_URI="
-	https://gitlab.com/coolercontrol/coolercontrol/-/archive/${PV}/coolercontrol-${PV}.tar.bz2
-	https://gitlab.com/api/v4/projects/32909921/packages/generic/coolercontrol/${PV}/coolercontrol-${PV}-dist.tar.xz
-	https://gitlab.com/api/v4/projects/32909921/packages/generic/coolercontrol/${PV}/coolercontrold-${PV}-crates.tar.xz
-	${CARGO_CRATE_URIS}
-"
-S="${WORKDIR}/coolercontrol-${PV}/${PN}"
-
-LICENSE="GPL-3+"
-# Dependent crate licenses
-LICENSE+="
-	AGPL-3+ Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD GPL-3+
-	ISC MIT MPL-2.0 UoI-NCSA Unicode-3.0 ZLIB
-"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="video_cards_amdgpu"
-
-RDEPEND="
-	app-arch/zstd:=
-	video_cards_amdgpu? (
-		x11-libs/libdrm[video_cards_amdgpu]
-	)
-"
-DEPEND="${RDEPEND}"
-
-QA_FLAGS_IGNORED=".*"
-
-PATCHES=(
-	"${FILESDIR}"/coolercontrold-2.1.0-optional-libdrm_amdgpu.patch
-)
-
-src_prepare() {
-	pushd .. >/dev/null || die
-	default
-	popd >/dev/null || die
-
-	# Disable stripping
-	sed -i -e '/^strip =/d' Cargo.toml || die
-
-	cp -rf "${WORKDIR}"/dist/* "${S}"/resources/app/ || die
-}
-
-src_configure() {
-	export ZSTD_SYS_USE_PKG_CONFIG=1
-
-	local myfeatures=(
-		$(usev video_cards_amdgpu libdrm_amdgpu)
-	)
-
-	cargo_src_configure
-}
-
-src_install() {
-	cargo_src_install
-
-	einstalldocs
-
-	doinitd ../packaging/openrc/init.d/coolercontrol
-	doconfd ../packaging/openrc/conf.d/coolercontrol
-
-	systemd_dounit ../packaging/systemd/coolercontrold.service
-}
-
-pkg_postinst() {
-	optfeature "interact with AIO liquid coolers and other devices" sys-apps/coolercontrol-liqctld
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		elog "Remember to restart coolercontrol service to use the new version."
-	fi
-}

From 6b6da159f8c97a9ad290ef24d0c6e403f1d1d91b Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Tue, 24 Jun 2025 17:31:47 +0200
Subject: [PATCH 24/30] dev-util/deblob: add "<dev-lang/hare-0.25.2" to DEPEND

Signed-off-by: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
---
 dev-util/deblob/deblob-0.10.ebuild | 1 +
 dev-util/deblob/deblob-0.9.ebuild  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/dev-util/deblob/deblob-0.10.ebuild b/dev-util/deblob/deblob-0.10.ebuild
index b47bdbc3ac..1468c83b98 100644
--- a/dev-util/deblob/deblob-0.10.ebuild
+++ b/dev-util/deblob/deblob-0.10.ebuild
@@ -33,6 +33,7 @@ RESTRICT="!test? ( test )"
 
 DEPEND="
 	>=dev-lang/hare-0.24.2:=
+	<dev-lang/hare-0.25.2
 	dev-hare/hare-json
 "
 
diff --git a/dev-util/deblob/deblob-0.9.ebuild b/dev-util/deblob/deblob-0.9.ebuild
index e78c29f40e..46a77953dc 100644
--- a/dev-util/deblob/deblob-0.9.ebuild
+++ b/dev-util/deblob/deblob-0.9.ebuild
@@ -25,6 +25,7 @@ SLOT="0"
 
 DEPEND="
 	>=dev-lang/hare-0.24.2:=
+	<dev-lang/hare-0.25.2
 	dev-hare/hare-json
 "
 

From 994731d5eec159fd92f12541b417afd3c54af77a Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Tue, 24 Jun 2025 17:33:01 +0200
Subject: [PATCH 25/30] app-admin/himitsu: add "<dev-lang/hare-0.25.2" to
 DEPEND

Signed-off-by: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
---
 app-admin/himitsu/himitsu-0.8.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-admin/himitsu/himitsu-0.8.ebuild b/app-admin/himitsu/himitsu-0.8.ebuild
index 5230a71fc4..185bc972c9 100644
--- a/app-admin/himitsu/himitsu-0.8.ebuild
+++ b/app-admin/himitsu/himitsu-0.8.ebuild
@@ -19,6 +19,7 @@ LICENSE="GPL-3"
 
 DEPEND="
 	>=dev-lang/hare-0.24.2:=
+	<dev-lang/hare-0.25.2
 "
 RDEPEND="
 	gui-apps/hiprompt-gtk-py

From 898d2e35edcc34241b239caa4358d83fb6477f82 Mon Sep 17 00:00:00 2001
From: Denis Reva <denis7774@gmail.com>
Date: Tue, 24 Jun 2025 21:49:40 +0500
Subject: [PATCH 26/30] 1.5.4: fixed regression for 1.5.3

Signed-off-by: Denis Reva <denis7774@gmail.com>
---
 app-containers/waydroid/Manifest                   |  2 +-
 ...waydroid-1.5.3.ebuild => waydroid-1.5.4.ebuild} | 14 ++++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)
 rename app-containers/waydroid/{waydroid-1.5.3.ebuild => waydroid-1.5.4.ebuild} (91%)

diff --git a/app-containers/waydroid/Manifest b/app-containers/waydroid/Manifest
index 7a31ab31b5..4d581d1384 100644
--- a/app-containers/waydroid/Manifest
+++ b/app-containers/waydroid/Manifest
@@ -1,4 +1,4 @@
 DIST waydroid-1.4.3.tar.gz 240785 BLAKE2B e654f2ed74f8d22810417ee5d6f6134ee5050b4e105dd2c643fa39df660e8c325a80f8e75176dd65e052deba187890f8afd94c384d707e0287027d3454a533ea SHA512 e94edeca7097cb1572296d0b6e308483b1bd21e1bd50d9e6d2bd54d4ba75ffeb8bd4e1d1f8143fbcf49dddd30155da2e3c5a58240a85b159dae4e71985e547aa
 DIST waydroid-1.5.1.tar.gz 241421 BLAKE2B 0368304d2088f8920d3dd65cd7fcb9d9517097146b543d838219f337f55444e32d10e2dfc4d0ec2570268959f005686cc3a756c8a44cb89bd87a473cf40a05d1 SHA512 fde8c699fdd67d49ee355c96dbba5c94ce2061c280bb28533035982cd460335f93cd9350de90b525d286f72bd3e4bad73a341fca31909e9623553e9280fe7463
 DIST waydroid-1.5.2.tar.gz 241865 BLAKE2B 39ba1f759a9420fa92d02ea289cedfb8342e680ff57b304df3b94772991564d8385b8b722f2061dd1e0e9a40e0aa6aab52b6de5d3fc60e69a93d75b387693549 SHA512 80be97409d73c3dc649482ff9b8a9b3c316f7cfa7560c87e26a2b68a0efdcaa34c070825334789b6830e3ee0a88eb0967e9101575e4eadc4a39bda099c0f7651
-DIST waydroid-1.5.3.tar.gz 242090 BLAKE2B f90eef963c604a19dc5bbe837aa304b283e604d063fe1c3ca2a2da002a47a4a99761fa92ec0972582f76fe7f94e85d0a2cbc2270f090cf3ab695a0c8966c3317 SHA512 58d5a9384aa9755368a79992f69a863805b231f1f2f85c35eb46cc4a07b283b666a8d75cdc7651d28eee97001b81a4dc5353e7c3f32e301b19eab532083b9a29
+DIST waydroid-1.5.4.tar.gz 242228 BLAKE2B 4df700f312b4c290fb3622bf8b0e1013b6c24d48f3c004c154bda562bb650b733b8670209a888c3a0de21db62631be2cd736be89080cc421d6381926a73302f0 SHA512 c6fc3860ed059676bf770b672be3df14b8e47b2a2b4a44e4d5672fedd3651959d7cb2b75fc34a7a037f3a770b3b82b78e12d0f3c9f3979ae821474eef4fad90c
diff --git a/app-containers/waydroid/waydroid-1.5.3.ebuild b/app-containers/waydroid/waydroid-1.5.4.ebuild
similarity index 91%
rename from app-containers/waydroid/waydroid-1.5.3.ebuild
rename to app-containers/waydroid/waydroid-1.5.4.ebuild
index fb15f99c5e..61dc1fd948 100644
--- a/app-containers/waydroid/waydroid-1.5.3.ebuild
+++ b/app-containers/waydroid/waydroid-1.5.4.ebuild
@@ -14,12 +14,11 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-IUSE="apparmor +clipboard systemd"
+IUSE="apparmor +clipboard"
 
 DEPEND="|| ( virtual/linux-sources virtual/dist-kernel )"
 RDEPEND="
-	systemd? ( sys-apps/systemd )
-	app-containers/lxc[systemd?,apparmor?,seccomp]
+	app-containers/lxc[apparmor?,seccomp]
 	$(python_gen_cond_dep '
 		clipboard? ( >=dev-python/pyclip-0.7.0[wayland,${PYTHON_USEDEP}] )
 		dev-python/pygobject[${PYTHON_USEDEP}]
@@ -30,6 +29,7 @@ RDEPEND="
 	net-dns/dnsmasq
 	>=dev-libs/libglibutil-1.0.79
 	>=dev-libs/gbinder-1.1.41
+	x11-themes/hicolor-icon-theme
 	${PYTHON_DEPS}
 "
 CONFIG_CHECK="
@@ -79,11 +79,9 @@ src_prepare() {
 
 src_install() {
 	python_fix_shebang waydroid.py
-	emake install DESTDIR="${D}" USE_NFTABLES=1 USE_SYSTEMD=$(usex systemd 1 0)
-	if ! use systemd; then
-		elog "Installing waydroid OpenRC daemon"
-		doinitd "${FILESDIR}"/waydroid
-	fi
+	emake install DESTDIR="${D}" USE_NFTABLES=1 USE_SYSTEMD=1
+	elog "Installing waydroid OpenRC daemon"
+	doinitd "${FILESDIR}"/waydroid
 }
 
 pkg_postinst() {

From f2a13e581b8628a75f15951889b62ab1f23452e5 Mon Sep 17 00:00:00 2001
From: Denis Reva <denis7774@gmail.com>
Date: Tue, 24 Jun 2025 21:52:19 +0500
Subject: [PATCH 27/30] app-containers/waydroid: drop 1.4.3, 1.4.3-r1, 1.5.1

Signed-off-by: Denis Reva <denis7774@gmail.com>
---
 app-containers/waydroid/Manifest              |   2 -
 .../waydroid/files/waydroid-1.4.3-r1.patch    | 174 ------------------
 .../waydroid/waydroid-1.4.3-r1.ebuild         | 113 ------------
 app-containers/waydroid/waydroid-1.4.3.ebuild |  95 ----------
 app-containers/waydroid/waydroid-1.5.1.ebuild | 110 -----------
 5 files changed, 494 deletions(-)
 delete mode 100644 app-containers/waydroid/files/waydroid-1.4.3-r1.patch
 delete mode 100644 app-containers/waydroid/waydroid-1.4.3-r1.ebuild
 delete mode 100644 app-containers/waydroid/waydroid-1.4.3.ebuild
 delete mode 100644 app-containers/waydroid/waydroid-1.5.1.ebuild

diff --git a/app-containers/waydroid/Manifest b/app-containers/waydroid/Manifest
index 4d581d1384..792e1bbbd9 100644
--- a/app-containers/waydroid/Manifest
+++ b/app-containers/waydroid/Manifest
@@ -1,4 +1,2 @@
-DIST waydroid-1.4.3.tar.gz 240785 BLAKE2B e654f2ed74f8d22810417ee5d6f6134ee5050b4e105dd2c643fa39df660e8c325a80f8e75176dd65e052deba187890f8afd94c384d707e0287027d3454a533ea SHA512 e94edeca7097cb1572296d0b6e308483b1bd21e1bd50d9e6d2bd54d4ba75ffeb8bd4e1d1f8143fbcf49dddd30155da2e3c5a58240a85b159dae4e71985e547aa
-DIST waydroid-1.5.1.tar.gz 241421 BLAKE2B 0368304d2088f8920d3dd65cd7fcb9d9517097146b543d838219f337f55444e32d10e2dfc4d0ec2570268959f005686cc3a756c8a44cb89bd87a473cf40a05d1 SHA512 fde8c699fdd67d49ee355c96dbba5c94ce2061c280bb28533035982cd460335f93cd9350de90b525d286f72bd3e4bad73a341fca31909e9623553e9280fe7463
 DIST waydroid-1.5.2.tar.gz 241865 BLAKE2B 39ba1f759a9420fa92d02ea289cedfb8342e680ff57b304df3b94772991564d8385b8b722f2061dd1e0e9a40e0aa6aab52b6de5d3fc60e69a93d75b387693549 SHA512 80be97409d73c3dc649482ff9b8a9b3c316f7cfa7560c87e26a2b68a0efdcaa34c070825334789b6830e3ee0a88eb0967e9101575e4eadc4a39bda099c0f7651
 DIST waydroid-1.5.4.tar.gz 242228 BLAKE2B 4df700f312b4c290fb3622bf8b0e1013b6c24d48f3c004c154bda562bb650b733b8670209a888c3a0de21db62631be2cd736be89080cc421d6381926a73302f0 SHA512 c6fc3860ed059676bf770b672be3df14b8e47b2a2b4a44e4d5672fedd3651959d7cb2b75fc34a7a037f3a770b3b82b78e12d0f3c9f3979ae821474eef4fad90c
diff --git a/app-containers/waydroid/files/waydroid-1.4.3-r1.patch b/app-containers/waydroid/files/waydroid-1.4.3-r1.patch
deleted file mode 100644
index 1bfa0b99c0..0000000000
--- a/app-containers/waydroid/files/waydroid-1.4.3-r1.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-From c9ea5abff749e660c9aca0fcd224875464c3dacd Mon Sep 17 00:00:00 2001
-From: Alessandro Astone <ales.astone@gmail.com>
-Date: Sat, 10 Aug 2024 16:10:14 +0200
-Subject: [PATCH 1/3] debian: Use new polkitd package
-
-Prefer the new polkitd name but keep supporting policykit-1 for
-older distros
-
-Fixes: #1484
----
- debian/control | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/debian/control b/debian/control
-index 2b63f56b..8f0dfa42 100644
---- a/debian/control
-+++ b/debian/control
-@@ -20,7 +20,7 @@ Depends: ${misc:Depends},
-          gir1.2-gtk-3.0,
-          python3-dbus,
-          dbus,
--         policykit-1,
-+         polkitd | policykit-1,
- 	 iptables
- Description: Android™ application support
-  waydroid allows running a separate Android™ environment
-
-From 5000c9703de873e4f477ebcdd3556ad163252115 Mon Sep 17 00:00:00 2001
-From: Alessandro Astone <ales.astone@gmail.com>
-Date: Wed, 4 Sep 2024 23:27:58 +0200
-Subject: [PATCH 2/3] initializer: Refactor setup to better handle preinstalled
- images
-
-Bail out early when using preinstalled images.
-There's no reason to attempt fetching the OTA channels if we're
-going to use preinstalled images.
-
-Fixes: #1550
----
- tools/actions/initializer.py | 52 ++++++++++++++++++++----------------
- 1 file changed, 29 insertions(+), 23 deletions(-)
-
-diff --git a/tools/actions/initializer.py b/tools/actions/initializer.py
-index 8f6c2c3b..87250971 100644
---- a/tools/actions/initializer.py
-+++ b/tools/actions/initializer.py
-@@ -35,20 +35,37 @@ def setup_config(args):
-     args.arch = helpers.arch.host()
-     cfg["waydroid"]["arch"] = args.arch
- 
-+    args.vendor_type = get_vendor_type(args)
-+    cfg["waydroid"]["vendor_type"] = args.vendor_type
-+
-+    helpers.drivers.setupBinderNodes(args)
-+    cfg["waydroid"]["binder"] = args.BINDER_DRIVER
-+    cfg["waydroid"]["vndbinder"] = args.VNDBINDER_DRIVER
-+    cfg["waydroid"]["hwbinder"] = args.HWBINDER_DRIVER
-+
-+    has_preinstalled_images = False
-     preinstalled_images_paths = tools.config.defaults["preinstalled_images_paths"]
--    if not args.images_path:
--        for preinstalled_images in preinstalled_images_paths:
--            if os.path.isdir(preinstalled_images):
--                if os.path.isfile(preinstalled_images + "/system.img") and os.path.isfile(preinstalled_images + "/vendor.img"):
--                    args.images_path = preinstalled_images
--                    break
--                else:
--                    logging.warning("Found directory {} but missing system or vendor image, ignoring...".format(preinstalled_images))
-+    for preinstalled_images in preinstalled_images_paths:
-+        if os.path.isdir(preinstalled_images):
-+            if os.path.isfile(preinstalled_images + "/system.img") and os.path.isfile(preinstalled_images + "/vendor.img"):
-+                has_preinstalled_images = True
-+                args.images_path = preinstalled_images
-+                break
-+            else:
-+                logging.warning("Found directory {} but missing system or vendor image, ignoring...".format(preinstalled_images))
- 
-     if not args.images_path:
-         args.images_path = tools.config.defaults["images_path"]
-     cfg["waydroid"]["images_path"] = args.images_path
- 
-+    if has_preinstalled_images:
-+        cfg["waydroid"]["system_ota"] = args.system_ota = "None"
-+        cfg["waydroid"]["vendor_ota"] = args.vendor_ota = "None"
-+        cfg["waydroid"]["system_datetime"] = tools.config.defaults["system_datetime"]
-+        cfg["waydroid"]["vendor_datetime"] = tools.config.defaults["vendor_datetime"]
-+        tools.config.save(args, cfg)
-+        return True
-+
-     channels_cfg = tools.config.load_channels()
-     if not args.system_channel:
-         args.system_channel = channels_cfg["channels"]["system_channel"]
-@@ -67,11 +84,8 @@ def setup_config(args):
-         "/waydroid_" + args.arch + "/" + args.system_type + ".json"
-     system_request = helpers.http.retrieve(args.system_ota)
-     if system_request[0] != 200:
--        if args.images_path not in preinstalled_images_paths:
--            raise ValueError(
--                "Failed to get system OTA channel: {}, error: {}".format(args.system_ota, system_request[0]))
--        else:
--            args.system_ota = "None"
-+        raise ValueError(
-+            "Failed to get system OTA channel: {}, error: {}".format(args.system_ota, system_request[0]))
- 
-     device_codename = helpers.props.host_get(args, "ro.product.device")
-     args.vendor_type = None
-@@ -85,12 +99,8 @@ def setup_config(args):
-             break
- 
-     if not args.vendor_type:
--        if args.images_path not in preinstalled_images_paths:
--            raise ValueError(
--                "Failed to get vendor OTA channel: {}".format(vendor_ota))
--        else:
--            args.vendor_ota = "None"
--            args.vendor_type = get_vendor_type(args)
-+        raise ValueError(
-+            "Failed to get vendor OTA channel: {}".format(vendor_ota))
- 
-     if args.system_ota != cfg["waydroid"].get("system_ota"):
-         cfg["waydroid"]["system_datetime"] = tools.config.defaults["system_datetime"]
-@@ -100,10 +110,6 @@ def setup_config(args):
-     cfg["waydroid"]["vendor_type"] = args.vendor_type
-     cfg["waydroid"]["system_ota"] = args.system_ota
-     cfg["waydroid"]["vendor_ota"] = args.vendor_ota
--    helpers.drivers.setupBinderNodes(args)
--    cfg["waydroid"]["binder"] = args.BINDER_DRIVER
--    cfg["waydroid"]["vndbinder"] = args.VNDBINDER_DRIVER
--    cfg["waydroid"]["hwbinder"] = args.HWBINDER_DRIVER
-     tools.config.save(args, cfg)
-     return True
- 
-
-From 023c4e31e06e2a31110a346516a841e68063d473 Mon Sep 17 00:00:00 2001
-From: Alessandro Astone <ales.astone@gmail.com>
-Date: Sat, 14 Dec 2024 16:40:05 +0100
-Subject: [PATCH 3/3] gpu: Use intel_hasvk on intel graphics gen 8 or lower
-
-Closes: #1604
----
- tools/helpers/gpu.py | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/tools/helpers/gpu.py b/tools/helpers/gpu.py
-index 55343d42..2a38cfe8 100644
---- a/tools/helpers/gpu.py
-+++ b/tools/helpers/gpu.py
-@@ -4,6 +4,9 @@
- 
- unsupported = ["nvidia"]
- 
-+def getMinor(args, dev):
-+    return tools.helpers.props.file_get(args, "/sys/class/drm/{}/uevent".format(dev), "MINOR")
-+
- def getKernelDriver(args, dev):
-     return tools.helpers.props.file_get(args, "/sys/class/drm/{}/device/uevent".format(dev), "DRIVER")
- 
-@@ -32,6 +35,16 @@ def getVulkanDriver(args, dev):
-         "nouveau": "nouveau",
-     }
-     kernel_driver = getKernelDriver(args, dev)
-+
-+    if kernel_driver == "i915":
-+        try:
-+            gen = tools.helpers.run.user(args,["awk", "/^graphics version:|^gen:/ {print $NF}",
-+                "/sys/kernel/debug/dri/{}/i915_capabilities".format(getMinor(args, dev))], output_return=True)
-+            if int(gen) < 9:
-+                return "intel_hasvk"
-+        except:
-+            pass
-+
-     if kernel_driver in mapping:
-         return mapping[kernel_driver]
-     return ""
diff --git a/app-containers/waydroid/waydroid-1.4.3-r1.ebuild b/app-containers/waydroid/waydroid-1.4.3-r1.ebuild
deleted file mode 100644
index 28a77f22dd..0000000000
--- a/app-containers/waydroid/waydroid-1.4.3-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 2022-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{11..13} )
-inherit linux-info xdg python-single-r1
-
-DESCRIPTION="Container-based approach to boot a full Android system on Linux systems"
-HOMEPAGE="https://waydro.id"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-IUSE="apparmor +clipboard systemd"
-
-PATCHES=(
-	"${FILESDIR}/waydroid-1.4.3-r1.patch"
-	)
-DEPEND="|| ( virtual/linux-sources virtual/dist-kernel )"
-RDEPEND="
-	systemd? ( sys-apps/systemd )
-	app-containers/lxc[systemd?,apparmor?,seccomp]
-	$(python_gen_cond_dep '
-		clipboard? ( >=dev-python/pyclip-0.7.0[wayland,${PYTHON_USEDEP}] )
-		dev-python/pygobject[${PYTHON_USEDEP}]
-		>=dev-python/gbinder-1.1.1[${PYTHON_USEDEP}]
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-	')
-	net-firewall/nftables
-	net-dns/dnsmasq
-	>=dev-libs/libglibutil-1.0.79
-	>=dev-libs/gbinder-1.1.41
-	${PYTHON_DEPS}
-"
-CONFIG_CHECK="
-	~ANDROID_BINDER_IPC
-	~ANDROID_BINDERFS
-	~MEMFD_CREATE
-	~NETFILTER_XT_TARGET_MASQUERADE
-	~NETFILTER_XT_NAT
-	~PSI
-	~!PSI_DEFAULT_DISABLED
-	~NF_TABLES
-	~NF_TABLES_INET
-	~NF_TABLES_NETDEV
-	~NFT_NUMGEN
-	~NFT_NAT
-	~NFT_TUNNEL
-	~NFT_QUOTA
-	~NFT_SOCKET
-	~NF_FLOW_TABLE
-	~NFT_BRIDGE_META
-	~NFT_BRIDGE_REJECT
-"
-ERROR_ANDROID_BINDERFS="CONFIG_ANDROID_BINDERFS: need for creating Android-specific binder IPC channels"
-ERROR_ANDROID_BINDER_IPC="CONFIG_ANDROID_BINDER_IPC: need for creating Android-specific binder IPC channels"
-ERROR_MEMFD_CREATE="CONFIG_MEMFD_CREATE: it completely replaced deprecated ISHMEM drivers,
-	therefore it's vital for android-specific memory management"
-ERROR_NETFILTER_XT_NAT="CONFIG_NETFILTER_XT_NAT: see bug #937106"
-ERROR_NETFILTER_XT_TARGET_MASQUERADE="CONFIG_NETFILTER_XT_TARGET_MASQUERADE: see bug #937106"
-ERROR_PSI="CONFIG_PSI: see bug #947280"
-ERROR_NF_TABLES="CONFIG_NF_TABLES: Make sure you have NFTABLES up and running in your kernel"
-ERROR_NFT_NAT="CONFIG_NFT_NAT: see bug #947280"
-ERROR_NFT_BRIDGE_META="CONFIG_NFT_BRIDGE_META: see bug #947280"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if ! use apparmor; then
-		# https://github.com/waydroid/waydroid/issues/652
-		sed -e '/^lxc\.apparmor\.profile =/d' \
-			-i data/configs/config_3 || die
-	fi
-	default
-}
-
-src_install() {
-	python_fix_shebang waydroid.py
-	emake install DESTDIR="${D}" USE_NFTABLES=1 USE_SYSTEMD=$(usex systemd 1 0)
-	if ! use systemd; then
-		elog "Installing waydroid OpenRC daemon"
-		doinitd "${FILESDIR}"/waydroid
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog "After package installation run either 'emerge --config app-containers/waydroid'"
-	elog "or 'waydroid init' from root shell to install android container runtime"
-	elog "To run waydroid, 1. Start container: 'rc-service waydroid start'"
-	elog "2. start wayland channel (from user shell) 'waydroid session start'"
-	elog "Contact https://docs.waydro.id/usage/install-on-desktops for how-to guides"
-	elog "(does not cover Gentoo-specific things sadly)"
-	elog
-	ewarn "Make sure you have NFTABLES up and running in your kernel. See"
-	ewarn "https://wiki.gentoo.org/wiki/Nftables for how-to details"
-	ewarn
-	if use apparmor; then
-		ewarn "Check the known issues for apparmor:"
-		ewarn "https://docs.waydro.id/debugging/known-issues"
-	fi
-}
-
-pkg_config() {
-	"${EROOT}"/usr/bin/waydroid init
-}
diff --git a/app-containers/waydroid/waydroid-1.4.3.ebuild b/app-containers/waydroid/waydroid-1.4.3.ebuild
deleted file mode 100644
index c0ad5d631e..0000000000
--- a/app-containers/waydroid/waydroid-1.4.3.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{11..13} )
-inherit linux-info xdg python-single-r1
-
-DESCRIPTION="Container-based approach to boot a full Android system on Linux systems"
-HOMEPAGE="https://waydro.id"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-IUSE="apparmor +clipboard systemd"
-
-DEPEND="|| ( virtual/linux-sources virtual/dist-kernel )"
-RDEPEND="
-	systemd? ( sys-apps/systemd )
-	app-containers/lxc[systemd?,apparmor?,seccomp]
-	$(python_gen_cond_dep '
-		clipboard? ( >=dev-python/pyclip-0.7.0[wayland,${PYTHON_USEDEP}] )
-		dev-python/pygobject[${PYTHON_USEDEP}]
-		>=dev-python/gbinder-1.1.1[${PYTHON_USEDEP}]
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-	')
-	net-firewall/nftables
-	net-dns/dnsmasq
-	>=dev-libs/libglibutil-1.0.79
-	>=dev-libs/gbinder-1.1.41
-	${PYTHON_DEPS}
-"
-
-CONFIG_CHECK="
-	~ANDROID_BINDER_IPC
-	~ANDROID_BINDERFS
-	~MEMFD_CREATE
-	~NETFILTER_XT_TARGET_MASQUERADE
-	~NETFILTER_XT_NAT
-"
-ERROR_ANDROID_BINDERFS="CONFIG_ANDROID_BINDERFS: need for creating Android-specific binder IPC channels"
-ERROR_ANDROID_BINDER_IPC="CONFIG_ANDROID_BINDER_IPC: need for creating Android-specific binder IPC channels"
-ERROR_MEMFD_CREATE="CONFIG_MEMFD_CREATE: it completely replaced deprecated ISHMEM drivers,
-	therefore it's vital for android-specific memory management"
-ERROR_NETFILTER_XT_NAT="CONFIG_NETFILTER_XT_NAT: see bug #937106"
-ERROR_NETFILTER_XT_TARGET_MASQUERADE="CONFIG_NETFILTER_XT_TARGET_MASQUERADE: see bug #937106"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if ! use apparmor; then
-		# https://github.com/waydroid/waydroid/issues/652
-		sed -e '/^lxc\.apparmor\.profile =/d' \
-			-i data/configs/config_3 || die
-	fi
-	default
-}
-
-src_install() {
-	python_fix_shebang waydroid.py
-	emake install DESTDIR="${D}" USE_NFTABLES=1 USE_SYSTEMD=$(usex systemd 1 0)
-	if ! use systemd; then
-		elog "Installing waydroid OpenRC daemon"
-		doinitd "${FILESDIR}"/waydroid
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog "After package installation run either 'emerge --config app-containers/waydroid'"
-	elog "or 'waydroid init' from root shell to install android container runtime"
-	elog "To run waydroid, 1. Start container: 'rc-service waydroid start'"
-	elog "2. start wayland channel (from user shell) 'waydroid session start'"
-	elog "Contact https://docs.waydro.id/usage/install-on-desktops for how-to guides"
-	elog "(does not cover Gentoo-specific things sadly)"
-	elog
-
-	ewarn "Make sure you have NFTABLES up and running in your kernel. See"
-	ewarn "https://wiki.gentoo.org/wiki/Nftables for how-to details"
-	ewarn
-
-	if use apparmor; then
-		ewarn "Apparmor support has not been tested by package maintainer yet"
-	fi
-}
-
-pkg_config() {
-	"${EROOT}"/usr/bin/waydroid init
-}
diff --git a/app-containers/waydroid/waydroid-1.5.1.ebuild b/app-containers/waydroid/waydroid-1.5.1.ebuild
deleted file mode 100644
index fb15f99c5e..0000000000
--- a/app-containers/waydroid/waydroid-1.5.1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 2022-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{11..13} )
-inherit linux-info xdg python-single-r1
-
-DESCRIPTION="Container-based approach to boot a full Android system on Linux systems"
-HOMEPAGE="https://waydro.id"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-IUSE="apparmor +clipboard systemd"
-
-DEPEND="|| ( virtual/linux-sources virtual/dist-kernel )"
-RDEPEND="
-	systemd? ( sys-apps/systemd )
-	app-containers/lxc[systemd?,apparmor?,seccomp]
-	$(python_gen_cond_dep '
-		clipboard? ( >=dev-python/pyclip-0.7.0[wayland,${PYTHON_USEDEP}] )
-		dev-python/pygobject[${PYTHON_USEDEP}]
-		>=dev-python/gbinder-1.1.1[${PYTHON_USEDEP}]
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-	')
-	net-firewall/nftables
-	net-dns/dnsmasq
-	>=dev-libs/libglibutil-1.0.79
-	>=dev-libs/gbinder-1.1.41
-	${PYTHON_DEPS}
-"
-CONFIG_CHECK="
-	~ANDROID_BINDER_IPC
-	~ANDROID_BINDERFS
-	~MEMFD_CREATE
-	~NETFILTER_XT_TARGET_MASQUERADE
-	~NETFILTER_XT_NAT
-	~PSI
-	~!PSI_DEFAULT_DISABLED
-	~NF_TABLES
-	~NF_TABLES_INET
-	~NF_TABLES_NETDEV
-	~NFT_NUMGEN
-	~NFT_NAT
-	~NFT_TUNNEL
-	~NFT_QUOTA
-	~NFT_SOCKET
-	~NF_FLOW_TABLE
-	~NFT_BRIDGE_META
-	~NFT_BRIDGE_REJECT
-"
-ERROR_ANDROID_BINDERFS="CONFIG_ANDROID_BINDERFS: need for creating Android-specific binder IPC channels"
-ERROR_ANDROID_BINDER_IPC="CONFIG_ANDROID_BINDER_IPC: need for creating Android-specific binder IPC channels"
-ERROR_MEMFD_CREATE="CONFIG_MEMFD_CREATE: it completely replaced deprecated ISHMEM drivers,
-	therefore it's vital for android-specific memory management"
-ERROR_NETFILTER_XT_NAT="CONFIG_NETFILTER_XT_NAT: see bug #937106"
-ERROR_NETFILTER_XT_TARGET_MASQUERADE="CONFIG_NETFILTER_XT_TARGET_MASQUERADE: see bug #937106"
-ERROR_PSI="CONFIG_PSI: see bug #947280"
-ERROR_NF_TABLES="CONFIG_NF_TABLES: Make sure you have NFTABLES up and running in your kernel"
-ERROR_NFT_NAT="CONFIG_NFT_NAT: see bug #947280"
-ERROR_NFT_BRIDGE_META="CONFIG_NFT_BRIDGE_META: see bug #947280"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if ! use apparmor; then
-		# https://github.com/waydroid/waydroid/issues/652
-		sed -e '/^lxc\.apparmor\.profile =/d' \
-			-i data/configs/config_3 || die
-	fi
-	default
-}
-
-src_install() {
-	python_fix_shebang waydroid.py
-	emake install DESTDIR="${D}" USE_NFTABLES=1 USE_SYSTEMD=$(usex systemd 1 0)
-	if ! use systemd; then
-		elog "Installing waydroid OpenRC daemon"
-		doinitd "${FILESDIR}"/waydroid
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog "After package installation run either 'emerge --config app-containers/waydroid'"
-	elog "or 'waydroid init' from root shell to install android container runtime"
-	elog "To run waydroid, 1. Start container: 'rc-service waydroid start'"
-	elog "2. start wayland channel (from user shell) 'waydroid session start'"
-	elog "Contact https://docs.waydro.id/usage/install-on-desktops for how-to guides"
-	elog "(does not cover Gentoo-specific things sadly)"
-	elog
-	ewarn "Make sure you have NFTABLES up and running in your kernel. See"
-	ewarn "https://wiki.gentoo.org/wiki/Nftables for how-to details"
-	ewarn
-	if use apparmor; then
-		ewarn "Check the known issues for apparmor:"
-		ewarn "https://docs.waydro.id/debugging/known-issues"
-	fi
-}
-
-pkg_config() {
-	"${EROOT}"/usr/bin/waydroid init
-}

From 31065574d5607a9a9eb1366c6d3abdd30cb8e14e Mon Sep 17 00:00:00 2001
From: Sergey Alirzaev <l29ah@riseup.net>
Date: Wed, 25 Jun 2025 03:11:46 +0200
Subject: [PATCH 28/30] net-misc/toot: add 0.48.1

Signed-off-by: Sergey Alirzaev <l29ah@riseup.net>
---
 net-misc/toot/Manifest           |  1 +
 net-misc/toot/toot-0.48.1.ebuild | 29 +++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 net-misc/toot/toot-0.48.1.ebuild

diff --git a/net-misc/toot/Manifest b/net-misc/toot/Manifest
index a19c00e22a..47a069b022 100644
--- a/net-misc/toot/Manifest
+++ b/net-misc/toot/Manifest
@@ -1 +1,2 @@
 DIST toot-0.38.1.tar.gz 904085 BLAKE2B a3b4bd153f604299625a7ab656928b9874f558dfd9ca78d7b3573a5e71017018403a53c59d516927ed6c70863da8fef9ee8d698420b15af11fb4672c77dd2cff SHA512 eb00f40f628fec33abf2c340515e059bdc68e3a453e9dd403ca66e4d28ca24d67d9499420fb87a7050abe605fe4666abbce5ee57edd2250a6a2816d92d61c37e
+DIST toot-0.48.1.tar.gz 1328964 BLAKE2B 141eb633815b5fe301fff6d58cab5ae150669027b1d52e1a6a4e11e0b3d5b0336fe95d10e133c4d826cf0a86b5b92fae8b5c3bfb51f06187fce47372d43b9f91 SHA512 8c51bf2a10aeff8807a90184caca6fd947700857d7e14485b4009a9705a93b9d47a175a7b11ae5cf8b4b2012417e5e6fb9a22b5cde0adee75e3b01cde259d26e
diff --git a/net-misc/toot/toot-0.48.1.ebuild b/net-misc/toot/toot-0.48.1.ebuild
new file mode 100644
index 0000000000..088e94a35e
--- /dev/null
+++ b/net-misc/toot/toot-0.48.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{11..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="toot - Mastodon CLI & TUI"
+HOMEPAGE="https://github.com/ihabunek/toot"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+		>=dev-python/urwid-2.1.2-r1[${PYTHON_USEDEP}]
+		>=dev-python/wcwidth-0.2.6[${PYTHON_USEDEP}]
+		media-fonts/ttf-ancient-fonts
+		>=dev-python/beautifulsoup4-4.12.2[${PYTHON_USEDEP}]
+		>=dev-python/tomlkit-0.11.8[${PYTHON_USEDEP}]
+		test? ( dev-python/psycopg:2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-7.4.0[${PYTHON_USEDEP}] )
+"
+RDEPEND="${DEPEND}"
+
+distutils_enable_tests pytest

From 50c1c944011f65b3b1c1a2be543227ff86ae11dd Mon Sep 17 00:00:00 2001
From: David Roman <davidroman96@gmail.com>
Date: Wed, 25 Jun 2025 10:33:27 +0200
Subject: [PATCH 29/30] profiles: mask gui-apps/paperde

Signed-off-by: David Roman <davidroman96@gmail.com>
---
 profiles/package.mask | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/profiles/package.mask b/profiles/package.mask
index 6179326915..75e1cca6a4 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -18,6 +18,10 @@
 
 # New entries go on top.
 
+# David (stkw0) Roman <davidroman96@gmail.com> (2025-06-25)
+# Depends on masked dev-libs/libdbusmenu-qt
+gui-apps/paperde
+
 # Lucio Sauer <watermanpaint@posteo.net> (2025-06-23)
 # Upstream inactive since 2021 and we're the only ones to package it.
 # No revdeps, depends on Qt5, bug #932403.

From 17da92520482e0853233b3f10e1f1dfdc9c78841 Mon Sep 17 00:00:00 2001
From: David Roman <davidroman96@gmail.com>
Date: Wed, 25 Jun 2025 10:34:39 +0200
Subject: [PATCH 30/30] media-sound/lms: drop 3.65.0

Signed-off-by: David Roman <davidroman96@gmail.com>
---
 media-sound/lms/Manifest          |  1 -
 media-sound/lms/lms-3.65.0.ebuild | 68 -------------------------------
 2 files changed, 69 deletions(-)
 delete mode 100644 media-sound/lms/lms-3.65.0.ebuild

diff --git a/media-sound/lms/Manifest b/media-sound/lms/Manifest
index ed25cb2e0d..f335cfaa19 100644
--- a/media-sound/lms/Manifest
+++ b/media-sound/lms/Manifest
@@ -1,3 +1,2 @@
-DIST lms-3.65.0.tar.gz 508205 BLAKE2B 6112359993ca710f1e62e4f771ca12f79bdf5fcd1c3c71bfb54672c52ba0c4c259d941ce6691aff4e8a787298f3efea30e32f2ebe47a6ce18b91e708aa21cb91 SHA512 6d7156aac8d3588e9aad90087864201d51053a74ee66adff7e7597b0b69fbb4b4ea8caba39553722adac06913068a1d96418b4ec0712c01b9752ab43aeaf7bd1
 DIST lms-3.66.0.tar.gz 518810 BLAKE2B 0f8b9a6631657f4e0d84f7fb6a98097e8da15384d8787d12f3590ebb884249659a75174c7b4543d393ea36587acbe6beba129f6c5e0543ee64b530ba859da93e SHA512 79234dea4bb7eb57273acd22dec5f0461d42fac5dc708bb789b258259da87a091e3c9b1af2e2026cc9bf3feedbc703a6d1dc4db031853b6236f966881d416448
 DIST lms-3.66.1.tar.gz 521133 BLAKE2B f92446f0b7910ba4cdca659b266e684c0cfa4e93dc0605d1a8d09005288da1d168847e64e08f3110d39a4be28db71656f521605801bb3fff0d9370be74bdcdd8 SHA512 62ae1b8b9eed38fd272aadfe3527d8dcb60bf8d51167bd290e29af360a3a6e873b6e93b1415dcca411ca6d5e4ee1adaad2c0da5e2c68c287f97f424096afe1e6
diff --git a/media-sound/lms/lms-3.65.0.ebuild b/media-sound/lms/lms-3.65.0.ebuild
deleted file mode 100644
index 19ed2a079c..0000000000
--- a/media-sound/lms/lms-3.65.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 2024-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake pam systemd
-
-DESCRIPTION="Lightweight Music Server."
-HOMEPAGE="https://lms-demo.poupon.dev/ https://github.com/epoupon/lms"
-SRC_URI="https://github.com/epoupon/lms/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test +stb"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-arch/libarchive
-	acct-user/lms
-	dev-cpp/wt:=
-	dev-libs/boost:=
-	dev-libs/libconfig[cxx]
-	media-libs/taglib:=
-	media-video/ffmpeg[lame,opus]
-	sys-libs/pam
-
-	!stb? ( media-gfx/graphicsmagick )
-
-"
-
-DEPEND="
-	${RDEPEND}
-	dev-libs/xxhash
-	stb? ( dev-libs/stb )
-"
-
-BDEPEND="
-	test? ( dev-cpp/gtest )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DLMS_IMAGE_BACKEND=$(usex stb stb graphicsmagick)
-		-DENABLE_TESTS=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	systemd_newunit conf/systemd/default.service lms.service
-	newinitd "${FILESDIR}/lms.init" lms
-	dopamd conf/pam/lms
-	mv "${ED}/usr/share/lms/lms.conf" "${ED}/etc/lms.conf" || die
-
-	# Already installed in the proper directory
-	rm "${ED}/usr/share/lms/default.service" || die
-	rm "${ED}/usr/share/lms/lms" || die
-
-	keepdir /var/log/lms
-	fowners -R lms:lms /var/log/lms
-
-	keepdir /var/lms
-	fowners lms:lms /var/lms
-}