Merge updates from master

2026-07-17 19:13:13 -04:00 · 2024-12-04 15:03:23 +00:00
parent 87dce9e742 f9b1b8f1bb
commit b4cd7cb92a
77 changed files with 1671 additions and 1290 deletions
--- a/app-admin/gentoo_update/gentoo_update-0.2.4.ebuild
+++ b/app-admin/gentoo_update/gentoo_update-0.2.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=8

 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{10..13} pypy3 )

 inherit distutils-r1 optfeature

--- a/app-admin/pulumi-bin/Manifest
+++ b/app-admin/pulumi-bin/Manifest
@@ -1,4 +1,4 @@
-DIST pulumi-v3.138.0-linux-x64.tar.gz 137933838 BLAKE2B 554da287cea3103b2843218daad4568d70803734042fee49d317df4d25db6eda63f008415b90ced484e0479a5cae9b021ab0d0b5117e0a193fa63324ed55b038 SHA512 85db740bcacab2dbfea7631b7c09331f891f546493bab321910104a94cc7c9883cb1d92d978cab2244e092b84cb7d2b12d8e26e1886cc32fdfb622452d9ac3e1
 DIST pulumi-v3.139.0-linux-x64.tar.gz 138048062 BLAKE2B 6de83f6a70c683d8c048e6a0515ef8b32411a67a4650735665452f209e17a27c78d01f98e057a7fdea6c41cc4114cf310b4d37e420f8a873fdf48b7dc70f3f74 SHA512 fb259aa56f9c1cdfc201db687409c2a6d280009f439a7bccba030b2cf415284b9504a7681cc2eb4b3adea6dcd8989a52a211c60ef4517de8b42c8349a255b2a4
 DIST pulumi-v3.140.0-linux-x64.tar.gz 138052465 BLAKE2B 4b5b6c3fc3e474405fa17a4897578da15019258469e2a5f169df88ba876029b32a6656e4fe779167873543ecd79eb1975110c9dca99b5e5217cadb857d4afa3b SHA512 7de4af4258963dd4a01b45d3fb8be8c0d323be46a67f17f44e8998ff86bf397d4202809b1ed5a52917705cca2d4a5c4a3dc8bfabd8241d2c67e9bc4f94599d70
 DIST pulumi-v3.141.0-linux-x64.tar.gz 138173923 BLAKE2B c5e3fbe5c09808c7d7cbcc187801a8fbc59aba1a3ebfe53894ce396b7505e2b8a797ba99e2cfb32a81d5931889013a4dbba56d485f88a5782493036e4550d9f3 SHA512 bf6817e74ba800d626d5db57c33402f0fdd61d2549400f299e3e0b1b34a637e707023d0829eb548beeb2473438c04f7ffad76c0220a523b2a860438b8533539a
+DIST pulumi-v3.142.0-linux-x64.tar.gz 96427204 BLAKE2B 6af3cbcc36c53236e1f4cc8351666bb34d34e11f75e5c3eacc14ca17d115422554b1c0dbd9ad3b9c648bd6319c7b5fe84ad3969fbdc7d020d673f8f8688c772d SHA512 7c037b84714f2675c47131a95c0c8555636ec2ea710e14928d89f6d15cd28d3d2af5481e498f20abed94c229a6e09da613d96bd979d62ac3eece0cf3a46511a4
--- a/app-admin/pulumi-bin/pulumi-bin-3.142.0.ebuild
+++ b/app-admin/pulumi-bin/pulumi-bin-3.142.0.ebuild
--- a/app-crypt/firefox-decrypt/firefox-decrypt-1.1.1.ebuild
+++ b/app-crypt/firefox-decrypt/firefox-decrypt-1.1.1.ebuild
@@ -3,7 +3,7 @@

 EAPI=8

-PYTHON_COMPAT=( python3_{11..13} )
+PYTHON_COMPAT=( python3_{11..13} pypy3 )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_SINGLE_IMPL=1
--- a/app-text/dooit/Manifest
+++ b/app-text/dooit/Manifest
@@ -1 +1 @@
-DIST dooit-3.0.4.gh.tar.gz 1408903 BLAKE2B 7cd45da303504c05bc4bb8c6973fa64bdeb840d62c742c0a83b19758408d33e386c788bcc0ded92cee2c160b79e80a6271009db1c97c9fe51f7d7a977b7d28b3 SHA512 cfe5bedf006e414107098b32cf155abf36a09feff5458fab0b87407ee43d02cf7b0a5a182debabe65c17679b109c79da8d6985a9f0ef08ae71a363f4c00f6af0
+DIST dooit-3.1.0.gh.tar.gz 1411686 BLAKE2B e575c9034f12169bada658c00c42f6fd15699da35bfc418ac3a92e5953904f59af389c92d569b5ceb0646e9811cdedda2695745ed01ac013556dc23b3599c7d9 SHA512 54b79d7a60f78962d0792c5f7c019110a5c3c18919235fa2b875e488d4299a325278f421373d6f5f33dc75d282bb722bde634b31e10161d7ac167428eb1b2207
--- a/app-text/dooit/dooit-3.1.0.ebuild
+++ b/app-text/dooit/dooit-3.1.0.ebuild
@@ -19,16 +19,17 @@ KEYWORDS="~amd64"
 BDEPEND="
 	test? (
 		=dev-python/pytest-asyncio-0.24*[${PYTHON_USEDEP}]
+		=dev-python/textual-dev-1*[${PYTHON_USEDEP}]
 		~dev-python/faker-30.8.2[${PYTHON_USEDEP}]
 	)
 "

 RDEPEND="
 	=dev-python/pyperclip-1.9*[${PYTHON_USEDEP}]
-	=dev-python/pyyaml-6*[${PYTHON_USEDEP}]
-	=dev-python/tzlocal-5.2*[${PYTHON_USEDEP}]
-	=dev-python/textual-0.86*[${PYTHON_USEDEP}]
 	=dev-python/python-dateutil-2.9*[${PYTHON_USEDEP}]
+	=dev-python/pyyaml-6*[${PYTHON_USEDEP}]
+	=dev-python/textual-0.88*[${PYTHON_USEDEP}]
+	=dev-python/tzlocal-5.2*[${PYTHON_USEDEP}]
 	~dev-python/sqlalchemy-2.0.36[${PYTHON_USEDEP}]
 	~dev-python/platformdirs-4.3.6[${PYTHON_USEDEP}]
 	~dev-python/click-8.1.7[${PYTHON_USEDEP}]
--- a/app-text/libspelling/metadata.xml
+++ b/app-text/libspelling/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>cyber+gentoo@sysrq.in</email>
-		<name>Anna</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<doc>https://chergert.pages.gitlab.gnome.org/libspelling/libspelling-1/</doc>
 		<remote-id type="gnome-gitlab">chergert/libspelling</remote-id>
--- a/dev-crystal/kemal/kemal-1.1.2-r1.ebuild
+++ b/dev-crystal/kemal/kemal-1.1.2-r1.ebuild
@@ -18,6 +18,6 @@ KEYWORDS="~amd64"
 RESTRICT="test"

 RDEPEND="
-	dev-crystal/exception_page
+	<dev-crystal/exception_page-0.5
 	dev-crystal/radix
 "
--- a/dev-crystal/kemal/kemal-1.6.0-r1.ebuild
+++ b/dev-crystal/kemal/kemal-1.6.0-r1.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="~amd64"

 RDEPEND="
-	dev-crystal/exception_page
+	<dev-crystal/exception_page-0.5
 	dev-crystal/radix
 "

--- a/dev-crystal/protodec/metadata.xml
+++ b/dev-crystal/protodec/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>cyber+gentoo@sysrq.in</email>
+		<name>Anna</name>
+	</maintainer>
 	<upstream>
 		<maintainer>
 			<name>Omar Roth</name>
--- a/dev-crystal/protodec/protodec-0.1.5-r2.ebuild
+++ b/dev-crystal/protodec/protodec-0.1.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@@ -16,7 +16,7 @@ KEYWORDS="~amd64"
 DEPEND="
 	dev-libs/boehm-gc
 	dev-libs/libevent:=
-	dev-libs/libpcre
+	dev-libs/libpcre2:=
 "
 RDEPEND="${DEPEND}"

@@ -28,3 +28,8 @@ src_prepare() {
 		-e 's/\(CURRENT_COMMIT \) = .*/\1 = "gentoo"/' \
 		-e "s/\(CURRENT_VERSION\) = .*/\1 = \"v${PV}\"/" || die
 }
+
+src_install() {
+	dobin protodec
+	shards_src_install
+}
--- a/dev-libs/mtxclient/Manifest
+++ b/dev-libs/mtxclient/Manifest
@@ -1,2 +1 @@
 DIST mtxclient-0.10.0.tar.gz 633765 BLAKE2B c76c4592e51c46418e5ad610432b2edc39f4bcfe3a9f8642888addc91296b7aa129e5716b818a1257e6e1cc8b945bac7d3434d283d9ba9705cd9250f6b6ad59b SHA512 584831f67d7c15c293dd3c3cdca6e5b76c8fd477d5daa5eecea4de43431db0628f5af846f2c1cb1cfdabbd53e3f696b45c8aa736bd615729df583a33157958bd
-DIST mtxclient-0.9.2.tar.gz 623481 BLAKE2B 322506eaac9abf2463c08bee5e17547d7a33cf473785839566ec185db97303f7e33d5b58aa85735fa066f7f2f507e682bec985dc9dffa83f9b9ac799ed78c80d SHA512 87c9cd23ce8a52b2f850e3770eb51d03f40f4a5e45b5e536b2446932fc866b8835212d9364c5890af7404843da2547bdc94bb5d3d1933903fea8374b8900fd73
--- a/dev-libs/mtxclient/files/mtxclient-0.10.0-fmt11.patch
+++ b/dev-libs/mtxclient/files/mtxclient-0.10.0-fmt11.patch
@@ -0,0 +1,49 @@
+From 4a4726c77123f805cff8b954909663eaed296558 Mon Sep 17 00:00:00 2001
+From: Kefu Chai <tchaikov@gmail.com>
+Date: Mon, 15 Jul 2024 11:35:09 +0800
+Subject: [PATCH] Fix build with fmt 11
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+fmt 11 enforces that fmt::formatter<..>::format() should be const.
+otherwise the tree does not build:
+
+```
+/usr/include/fmt/base.h:1392:29: error: passing â€˜const fmt::v11::formatter<std::optional<mtx::http::ClientError> >â€™ as â€˜thisâ€™ argument discards qualifiers [-fpermissive]
+ 1392 |     ctx.advance_to(cf.format(*static_cast<qualified_type*>(arg), ctx));
+      |                    ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+```
+
+so let's mark the `format()` with `const` specifier.
+
+Signed-off-by: Kefu Chai <tchaikov@gmail.com>
+---
+ include/mtxclient/http/errors.hpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/mtxclient/http/errors.hpp b/include/mtxclient/http/errors.hpp
+index 2d0e7a4..b99ff90 100644
+--- a/include/mtxclient/http/errors.hpp
+++ b/include/mtxclient/http/errors.hpp
+@@ -87,7 +87,7 @@ struct fmt::formatter<mtx::http::ClientError>
+     // Formats the point p using the parsed format specification (presentation)
+     // stored in this formatter.
+     template<typename FormatContext>
+-    auto format(const mtx::http::ClientError &e, FormatContext &ctx) -> decltype(ctx.out())
+    auto format(const mtx::http::ClientError &e, FormatContext &ctx) const -> decltype(ctx.out())
+     {
+         // ctx.out() is an output iterator to write to.
+         bool prepend_comma = false;
+@@ -132,7 +132,7 @@ struct fmt::formatter<std::optional<mtx::http::ClientError>> : formatter<mtx::ht
+ {
+     // parse is inherited from formatter<string_view>.
+     template<typename FormatContext>
+-    auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx)
+    auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx) const
+     {
+         if (!c)
+             return fmt::format_to(ctx.out(), "(no error)");
+-- 
+2.47.1
+
--- a/dev-libs/mtxclient/files/mtxclient-0.6.0-remove-network-tests.patch
+++ b/dev-libs/mtxclient/files/mtxclient-0.6.0-remove-network-tests.patch
--- a/dev-libs/mtxclient/mtxclient-0.10.0-r1.ebuild
+++ b/dev-libs/mtxclient/mtxclient-0.10.0-r1.ebuild
@@ -31,7 +31,8 @@ DEPEND="
 "

 PATCHES=(
-	"${FILESDIR}/0.6.0_remove_network_tests.patch"
+	"${FILESDIR}"/${PN}-0.6.0-remove-network-tests.patch
+	"${FILESDIR}"/${PN}-0.10.0-fmt11.patch
 )

 src_configure() {
--- a/dev-libs/mtxclient/mtxclient-0.9.2.ebuild
+++ b/dev-libs/mtxclient/mtxclient-0.9.2.ebuild
@@ -1,45 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Client API library for Matrix, built on top of libcurl"
-HOMEPAGE="https://github.com/Nheko-Reborn/mtxclient"
-SRC_URI="https://github.com/Nheko-Reborn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}" # ABI may break even on patch version changes
-KEYWORDS="~amd64"
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-cpp/coeurl-0.3.0:=[ssl]
-	dev-libs/libfmt:=
-	dev-libs/olm
-	>=dev-libs/openssl-1.1.0:=
-	>=dev-libs/re2-0.2022.04.01:=
-	dev-libs/spdlog:=
-"
-DEPEND="
-	${RDEPEND}
-	dev-cpp/nlohmann_json
-	test? ( dev-cpp/gtest )
-"
-
-PATCHES=(
-	"${FILESDIR}/0.6.0_remove_network_tests.patch"
-)
-
-src_configure() {
-	local -a mycmakeargs=(
-		-DBUILD_LIB_TESTS="$(usex test)"
-		-DBUILD_LIB_EXAMPLES=OFF
-		-DCMAKE_POSITION_INDEPENDENT_CODE=OFF
-	)
-
-	cmake_src_configure
-}
--- a/dev-lua/compat53/compat53-0.14.3.ebuild
+++ b/dev-lua/compat53/compat53-0.14.3.ebuild
@@ -3,7 +3,7 @@

 EAPI=8

-LUA_COMPAT=( lua5-1 luajit )
+LUA_COMPAT=( lua5-{1..4} luajit )

 inherit edo lua toolchain-funcs

@@ -39,8 +39,8 @@ lua_src_compile() {
 	local u=""
 	for u in *.c; do
 		edo $(tc-getCC) -shared -fPIC \
-		${CPPFLAGS} -DCOMPAT53_PREFIX="compat53" \
-		${CFLAGS} $(lua_get_CFLAGS) -Ic-api \
+		${CPPFLAGS} \
+		${CFLAGS} $(lua_get_CFLAGS) \
 		${SOFLAGS} \
 		${LDFLAGS} $(lua_get_LIBS) \
 		-o "${u/.c/.so}" ${u} c-api/compat-5.3.c
@@ -61,5 +61,6 @@ lua_src_install() {

 src_install() {
 	lua_foreach_impl lua_src_install
+	doheader c-api/*
 	einstalldocs
 }
--- a/dev-lua/cqueues/cqueues-20200726.ebuild
+++ b/dev-lua/cqueues/cqueues-20200726.ebuild
@@ -9,7 +9,8 @@ MY_P="${PN}-rel-${PV}"
 inherit lua toolchain-funcs

 DESCRIPTION="Stackable Continuation Queues"
-HOMEPAGE="http://25thandclement.com/~william/projects/cqueues.html https://github.com/wahern/cqueues"
+HOMEPAGE="https://github.com/wahern/cqueues"
+HOMEPAGE+=" http://25thandclement.com/~william/projects/cqueues.html"
 SRC_URI="https://github.com/wahern/${PN}/archive/rel-${PV}.tar.gz -> ${MY_P}.tar.gz"

 S="${WORKDIR}/${MY_P}"
@@ -24,22 +25,60 @@ REQUIRED_USE="${LUA_REQUIRED_USE}"
 DEPEND="
 	${LUA_DEPS}
 	dev-libs/openssl:0=
+	dev-lua/compat53[${LUA_USEDEP}]
 "
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"

 DOCS=( "doc/." )

-PATCHES="${FILESDIR}/cqueues-20200726-5-4_tests.patch"
+PATCHES=(
+	"${FILESDIR}"/${PN}-20200726-5-4_tests.patch
+)
+
+lua_src_prepare() {
+	pushd "${BUILD_DIR}" || die
+
+	if [[ ${ELUA} != luajit ]]; then
+		LUA_VERSION="$(ver_cut 1-2 $(lua_get_version))"
+		# these two tests are forced upstream for luajit only
+		rm "${BUILD_DIR}"/regress/{44-resolvers-gc,51-join-defunct-thread}.lua || die
+	else
+		# Thanks to dev-lua/luaossl for this workaround
+		# This is a workaround for luajit, as it confirms to lua5.1
+		# and the 'GNUmakefile' doesn't understand LuaJITs version.
+		LUA_VERSION="5.1"
+	fi
+
+	if [[ ${LUA_VERSION} != 5.3 ]]; then
+		# this test is forced upstream for lua5-3 only
+		rm "${BUILD_DIR}"/regress/152-thread-integer-passing.lua || die
+	fi
+
+	# install tests for lua_version only
+	sed -e 's:for V in 5.1 5.2 5.3 5.4:for V in '${LUA_VERSION}':' \
+		-i "${BUILD_DIR}"/regress/GNUmakefile || die
+
+	popd
+}

 src_prepare() {
 	default
-
+	rm -r vendor || die
 	sed \
-		-e '/LUAPATH :=/d' \
-		-e '/LUAPATH_FN =/d' \
+		-e '/HAVE_API_FN =/d' \
+		-e '/ALL_CFLAGS += -g/d' \
 		-i GNUmakefile || die

+	# use header from package compat53 instead of vendor
+	sed	-e 's:-DCOMPAT53_PREFIX=cqueues::' \
+		-e 's:$$(d)/../vendor/compat53/c-api/compat-5.3.h::' \
+		-e '/)\/compat53/,/)\/compat53/d' \
+		-i src/GNUmakefile || die
+
+	sed -e 's:"../vendor/compat53/c-api\/compat-5.3.h":<compat-5.3.h>:' \
+		-i src/cqueues.h || die
+
 	# tests deleted :
 	# 22, 73, 87 = weak/old ssl
 	# 30 = call google.com
@@ -49,6 +88,7 @@ src_prepare() {
 		regress/30-starttls-completion.lua || die

 	lua_copy_sources
+	lua_foreach_impl lua_src_prepare
 }

 lua_src_compile() {
@@ -57,18 +97,13 @@ lua_src_compile() {
 	if [[ ${ELUA} != luajit ]]; then
 		LUA_VERSION="$(ver_cut 1-2 $(lua_get_version))"
 	else
-		# Thanks to dev-lua/luaossl for this workaround
-		# This is a workaround for luajit, as it confirms to lua5.1
-		# and the 'GNUmakefile' doesn't understand LuaJITs version.
 		LUA_VERSION="5.1"
 	fi

-	emake CC="$(tc-getCC)" \
-		ALL_CFLAGS="${CFLAGS} -std=gnu99 -fPIC $(lua_get_CFLAGS)" \
-		ALL_CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE" \
-		ALL_SOFLAGS="${SOFLAGS} -shared" \
-		ALL_LDFLAGS="${LDFLAGS}" \
-		all${LUA_VERSION}
+	tc-env_build emake \
+				$(lua_get_CFLAGS) \
+				ALL_LDFLAGS="${LDFLAGS}" \
+				all${LUA_VERSION}

 	popd
 }
@@ -82,18 +117,11 @@ lua_src_test() {

 	if [[ ${ELUA} != luajit ]]; then
 		LUA_VERSION="$(ver_cut 1-2 $(lua_get_version))"
-		# these two tests are forced upstream for luajit only
-		rm "${BUILD_DIR}"/regress/{44-resolvers-gc,51-join-defunct-thread}.lua || die
 	else
 		LUA_VERSION="5.1"
 	fi

-	if [[ ${ELUA} != lua5.3 ]]; then
-		# this test is forced upstream for lua5-3 only
-		rm "${BUILD_DIR}"/regress/152-thread-integer-passing.lua || die
-	fi
-
-	default
+	emake CC=$(tc-getCC) check

 	popd
 }
@@ -111,7 +139,8 @@ lua_src_install() {
 		LUA_VERSION="5.1"
 	fi

-	emake "DESTDIR=${D}" \
+	emake CC=$(tc-getCC) \
+		"DESTDIR=${D}" \
 		"lua${LUA_VERSION/./}cpath=$(lua_get_cmod_dir)" \
 		"lua${LUA_VERSION/./}path=$(lua_get_lmod_dir)" \
 		"prefix=${EPREFIX}/usr" \
--- a/dev-lua/cqueues/files/cqueues-20200726-5-4_tests.patch
+++ b/dev-lua/cqueues/files/cqueues-20200726-5-4_tests.patch
@@ -1,6 +1,4 @@
-From ef7c2b2547fc3e1d26bc1d423edc2792a8056649 Mon Sep 17 00:00:00 2001
-From: Nicolas PARLANT <nicolas.parlant@parhuet.fr>
-Date: Mon, 2 Dec 2024 09:14:19 +0000
+https://github.com/wahern/cqueues/commit/ad517a210caa3cd6cc18da73015886a5a2b88b3f
 Subject: [PATCH] add 5.4

 ---
--- a/dev-nim/cligen/metadata.xml
+++ b/dev-nim/cligen/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>cyber+gentoo@sysrq.in</email>
+		<name>Anna</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">c-blake/cligen</remote-id>
 	</upstream>
--- a/dev-python/autopxd/Manifest
+++ b/dev-python/autopxd/Manifest
@@ -0,0 +1 @@
+DIST autopxd2-2.5.0.tar.gz 109511 BLAKE2B 599ac008291d60a5734de034ff7341048b83114c835056525b08efbce20b9fd087e211cd00debd35ff2b050d9304e2218e48402ee12b47a731ed94be9dfaa009 SHA512 e1eecf7742d0520e62d850eff98904635507d75aaf1c6180d85d606050dfa216d5acd3e955a252db51986c11726f6e48b1ab8d2d9ea0893b0f5827332edd7ce0
--- a/dev-python/autopxd/autopxd-2.5.0.ebuild
+++ b/dev-python/autopxd/autopxd-2.5.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+PYPI_PN="${PN}2"
+inherit distutils-r1 pypi
+
+DESCRIPTION="generates .pxd files automatically from .h files"
+HOMEPAGE="
+	https://github.com/elijahr/python-autopxd2
+	https://pypi.org/project/autopxd2
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+RDEPEND="
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/pycparser[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	epytest
+}
--- a/dev-python/autopxd/metadata.xml
+++ b/dev-python/autopxd/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+        <maintainer type="person">
+                <email>wuzhenyu@ustc.edu</email>
+                <name>Wu, Zhenyu</name>
+        </maintainer>
+        <upstream>
+                <remote-id type="pypi">autopxd2</remote-id>
+                <remote-id type="github">elijahr/python-autopxd2</remote-id>
+        </upstream>
+</pkgmetadata>
--- a/dev-python/click-aliases/click-aliases-1.0.5.ebuild
+++ b/dev-python/click-aliases/click-aliases-1.0.5.ebuild
@@ -4,7 +4,7 @@
 EAPI=8

 DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{10..13} pypy3 )

 inherit distutils-r1

--- a/dev-python/cryptg/cryptg-0.5.0_p0.ebuild
+++ b/dev-python/cryptg/cryptg-0.5.0_p0.ebuild
@@ -8,7 +8,7 @@ EAPI=8
 CARGO_OPTIONAL=1
 DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_EXT=1
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{10..13} pypy3 )

 CRATES="
 	aes@0.8.4
--- a/dev-python/hachoir/hachoir-3.3.0.ebuild
+++ b/dev-python/hachoir/hachoir-3.3.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8

 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{10..13} pypy3 )

 inherit distutils-r1

--- a/dev-python/lru-dict/lru-dict-1.3.0.ebuild
+++ b/dev-python/lru-dict/lru-dict-1.3.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8

 DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_EXT=1
-PYTHON_COMPAT=( python3_{11..13} )
+PYTHON_COMPAT=( python3_{11..13} pypy3 )
 PYPI_NO_NORMALIZE=1
 inherit distutils-r1 pypi

--- a/dev-python/pillow-heif/Manifest
+++ b/dev-python/pillow-heif/Manifest
@@ -1 +1 @@
-DIST pillow_heif-0.20.0.tar.gz 16173556 BLAKE2B aa549d4344e2e7f04e85d287e5b800068823dd9c9af22cbc24d6891c7e7c23d2e875979a83aa3cd2fbaf1fe60488a885257d644f2b3528f5029c0900101689ea SHA512 2c11cc0d93b0b684a80c1b2b6c076928417f021cda1aa46f1806c39ed24a5283d7878a679bf7e6293b9e6f90d3c60c10c7ce1597c528c269cd8892dd18a8aa9b
+DIST pillow_heif-0.21.0.tar.gz 16178019 BLAKE2B 1ac057f4485331c36348f277b31d073dfe5d3aab69baaef0947449002fb095c81ffd562442f059afc29a19cafb3fa898b011c17a622963e6813a53dd2779c2f7 SHA512 9683b3eea9ea4dc0730bfab2e1163545ea31719b62cfd90a4f58aaf7ab401aef27afb7b9458c93daf9e5fa445b8f7f1ec3b3174fa9ae44513d9baaa10e777913
--- a/dev-python/pillow-heif/files/pillow-heif-0.21.0-respect-cflags.patch
+++ b/dev-python/pillow-heif/files/pillow-heif-0.21.0-respect-cflags.patch
@@ -1,10 +1,10 @@
 --- a/setup.py
 +++ b/setup.py
-@@ -206,7 +206,7 @@
+@@ -206,7 +206,7 @@ class PillowHeifBuildExt(build_ext):
             self._add_directory(library_dirs, "/usr/lib")
             self._add_directory(library_dirs, "/lib")
 
-            self._update_extension("_pillow_heif", ["heif"], extra_compile_args=["-Ofast", "-Werror"])
+-            self._update_extension("_pillow_heif", ["heif"], extra_compile_args=["-O3", "-Werror"])
 +            self._update_extension("_pillow_heif", ["heif"])
 
         self.compiler.library_dirs = library_dirs + self.compiler.library_dirs
--- a/dev-python/pillow-heif/pillow-heif-0.21.0.ebuild
+++ b/dev-python/pillow-heif/pillow-heif-0.21.0.ebuild
@@ -36,6 +36,13 @@ BDEPEND="
 	)
 "

-PATCHES=( "${FILESDIR}/${PN}-0.15.0-respect-cflags.patch" )
+PATCHES=( "${FILESDIR}/${P}-respect-cflags.patch" )
+
+EPYTEST_DESELECT=(
+	# only works with libeif-1.19.5
+	# https://github.com/bigcat88/pillow_heif/pull/312/commits/d740dcce7d967d025c4100611cc7a4632aa3fc3a
+	"tests/read_test.py::test_heif_read_images[image_path16]"
+	"tests/read_test.py::test_heif_read_images[image_path43]"
+)

 distutils_enable_tests pytest
--- a/dev-python/pydantic-settings/pydantic-settings-2.6.1.ebuild
+++ b/dev-python/pydantic-settings/pydantic-settings-2.6.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8

 DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{11..13} )
+PYTHON_COMPAT=( python3_{11..13} pypy3 )

 inherit distutils-r1 pypi

--- a/dev-python/pyglm/Manifest
+++ b/dev-python/pyglm/Manifest
@@ -0,0 +1,2 @@
+DIST pyglm-2.7.3-glm.gh.tar.gz 232356 BLAKE2B ae9c1dada06c33240eac906af5e6ecad903a19d62640aa569371a0aa223ebc0afa6d7f3cfc4ad419376bc43d5877e5e606f5e419d048306247f8b3eba352ca1d SHA512 9005100f39990b5b61eced679863d116bb6375060384c6e4cddbd2dc0caa3a66d165d9b294de84fdfe58e610f15500ffa172ca0760eba4efff9d91c65a310852
+DIST pyglm-2.7.3.gh.tar.gz 735017 BLAKE2B 9584c9f7dd7121843ccaa8b036d535532b29b3d4eee48b5ce24daddd1669160cf9f5262c08ef8c6912ccb3f8e39958a63563a2e0369ebc88b5673a3bd4822c77 SHA512 e48019abc27f8c6dfbad48d7fd94169f0cea24fb8ba3428ea7f418e7129eb900fc1c670b96637a3b7ff8a5fefbd3dbaa399738eb508523460d5b2a62e148a202
--- a/dev-python/pyglm/metadata.xml
+++ b/dev-python/pyglm/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM 'https://www.gentoo.org/dtd/metadata.dtd'>
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gasc@eurecom.fr</email>
+		<name>Gasc Henri</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">PyGLM</remote-id>
+		<remote-id type="github">Zuzu-Typ/PyGLM</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/dev-python/pyglm/pyglm-2.7.3.ebuild
+++ b/dev-python/pyglm/pyglm-2.7.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1
+
+HASH="fbc534be62f8c785db989f8ae7526edf6d0dc306"
+DESCRIPTION="Fast OpenGL Mathematics (GLM) for Python"
+HOMEPAGE="https://github.com/Zuzu-Typ/PyGLM https://pypi.org/project/PyGLM"
+SRC_URI="
+	https://github.com/Zuzu-Typ/PyGLM/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz
+	https://github.com/Zuzu-Typ/glm/archive/${HASH}.tar.gz -> ${P}-glm.gh.tar.gz
+"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	media-libs/glm
+	test? ( dev-python/numpy[${PYTHON_USEDEP}] )
+"
+
+src_prepare() {
+	default
+	mv "${WORKDIR}/glm-${HASH}"/* -t "${S}/glm"
+}
+
+EPYTEST_DESELECT=(
+	# Tests fails, see https://github.com/Zuzu-Typ/PyGLM/issues/227
+	test/PyGLM_test.py::test_findMSB
+	test/PyGLM_test.py::test_bitCount
+)
+distutils_enable_tests pytest
--- a/dev-python/pyrime/Manifest
+++ b/dev-python/pyrime/Manifest
@@ -1 +1 @@
-DIST pyrime-0.0.4.tar.gz 44562 BLAKE2B c120a3f52fada357db3249a352a46a1d7f62bd525f2c5080884a2cad26ff89711a2ec30c42fbaf92c6f6c3d30cb383afe97e91d721855758f73013f36a95ce13 SHA512 b19439ec60b2bf02209aefff28e2422a8668f97dfb8715f9a85dfb9fc0d952d15f209f43849955bb9a7b7839480a54850d46f11479a895967b212940721d9cc6
+DIST pyrime-0.0.7.tar.gz 42660 BLAKE2B 0166f8248c2af6451a39096dedba69e0f8448b92119795813813a306affebdf492e27c05c91e884df7b509ae53a37e9546419bc38abf127b85b870c5944da480 SHA512 e88cfa65ae9cba052fbf1110bf0270cabc3fe44898bdbbf5f59ca83cff192b678c0b2ea86d8385f4a2c43765b94c22667de605a2958099bd8444bdafe23f32af
--- a/dev-python/pyrime/pyrime-0.0.7.ebuild
+++ b/dev-python/pyrime/pyrime-0.0.7.ebuild
@@ -21,6 +21,8 @@ IUSE="+prompt-toolkit +ptpython"

 DEPEND="
 	app-i18n/librime
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/autopxd[${PYTHON_USEDEP}]
 "

 EPYTEST_XDIST=1
@@ -28,8 +30,8 @@ distutils_enable_tests pytest

 RDEPEND="
 	$DEPEND
-	prompt-toolkit? ( dev-python/prompt-toolkit )
-	ptpython? ( dev-python/ptpython )
+	prompt-toolkit? ( dev-python/prompt-toolkit[${PYTHON_USEDEP}] )
+	ptpython? ( dev-python/ptpython[${PYTHON_USEDEP}] )
 "

 python_test() {
--- a/dev-python/python-olm/python-olm-3.2.16.ebuild
+++ b/dev-python/python-olm/python-olm-3.2.16.ebuild
@@ -3,7 +3,7 @@

 EAPI=8

-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
 DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_EXT=1
 inherit distutils-r1
@@ -20,7 +20,9 @@ KEYWORDS="~amd64"
 DEPEND="dev-libs/olm"
 RDEPEND="
 	${DEPEND}
-	dev-python/cffi[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/cffi[${PYTHON_USEDEP}]
+	' 'python*')
 "

 EPYTEST_DESELECT=(
--- a/dev-python/python-statemachine/Manifest
+++ b/dev-python/python-statemachine/Manifest
@@ -1,2 +1,3 @@
 DIST python-statemachine-2.3.6.gh.tar.gz 351057 BLAKE2B 03d605b0389dd9fac3e2d8a979295ab7724a79b2b1e677cbd114d8eddaa9a987f361aebbea29eb670930fd7978cb1d9f59ef2a40ec98f9c515d080fcc902f25c SHA512 cc8400a118da6d54b97108ff8b11462aee32dc28ada97fbf2a68049de2659c5a7faaa24802fab376b72586c1052db13b67b570a5d62eb9c28252572d14634215
 DIST python-statemachine-2.4.0.gh.tar.gz 362766 BLAKE2B 79a34b43841cf920ae1eb87821c19d31f4dc1eb59903ad1cce6166586b44ed7437278ae647ffac190bd1dc795d251b81022b51aef644607d5f2f7b92f1c89e9e SHA512 fc51668efee69a2a59c5f3a5bbb08e6a6647a819175bbd02305e6eac51d0f8ef31c4e89f85dcb7451c24681ee76f0534e676995e134c0cbbed4d680c5418c612
+DIST python-statemachine-2.5.0.gh.tar.gz 405778 BLAKE2B 5c85d7c75de1fe77694acc50a31b9f389a1b0b7ec572939a9662ef2b538b506d8acc30ee3d8168d21ca229c1ce7bfd14b4c54946dfa5d7577cb67ec1a3867352 SHA512 79331758fe305525fd7f97e3e1a9eecc22f79e96047080a31ad8df8d033b506d39c79fa5fe9e20cc2cb63db271517842ffcdab3f1fdb9785d135d3f65dffce6d
--- a/dev-python/python-statemachine/python-statemachine-2.5.0.ebuild
+++ b/dev-python/python-statemachine/python-statemachine-2.5.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{11..13} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Finite State Machines made easy."
+HOMEPAGE="
+	https://pypi.org/project/python-statemachine/
+	https://github.com/fgmacedo/python-statemachine
+"
+SRC_URI="https://github.com/fgmacedo/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-python/pydot[${PYTHON_USEDEP}]"
+
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	tests/test_mixins.py::test_mixin_should_instantiate_a_machine
+)
+
+EPYTEST_IGNORE=(
+	tests/test_profiling.py
+	tests/django_project/workflow/tests.py
+)
+
+python_test() {
+	epytest -o 'addopts=""'
+
+}
--- a/dev-python/questionary/questionary-2.0.1.ebuild
+++ b/dev-python/questionary/questionary-2.0.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8

 DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{11..13} )
+PYTHON_COMPAT=( python3_{11..13} pypy3 )

 inherit distutils-r1

--- a/dev-python/repology-client/Manifest
+++ b/dev-python/repology-client/Manifest
@@ -1,2 +1,2 @@
-DIST repology_client-0.0.2.tar.gz 432386 BLAKE2B 5ef3b7ed8a9f79a889ef5dd6506cb9d3b44d0f2e45419412629c3d4bb31d0166a2279a5db26e93a136da3f2d885f92feb5f1626d511cf2b2a21cc30b498fa1d5 SHA512 fa58633c03e451bc751d478464f2c3deadb5558ae603139bb658bb273e111d11da43dcdc28afc9c7d397adb2b9a158501ee008a74ba435c83a55af0c4c482687
 DIST repology_client-0.2.0.tar.gz 801523 BLAKE2B a6d9c1ed1f419d770930cfb5b5e64dee6381da516b7f1e6014f4e72394de73a02d3552f13cd0eee85e6ec827fc6d34b442d63099645988a120fd93b8ec39c06a SHA512 f60bf0c428093e4bbbf239fada260d0e4dbdeedd0f38ee3f802ad7b3dd95faef966c77ddf0ca3ce92cb130a6f35c31266dff6b1f7db25959eb725ba043389290
+DIST repology_client-0.3.0.tar.gz 895370 BLAKE2B 2bf22860735d33ca0db570c4f4880084f0be2863fbacddaedef096f3e5bb216f2b678057f9e9d6b3318889181013ad8dbd9bc2d228caf8632a9bc72bfc4e1753 SHA512 b3a22e1c86c351ce9a44299e85e5001f0cd9abe5e3125e15c0b83f237b3ed31541d28bc543060ccb81a04413b2ceb596a8b91b0adfa01d061f2fc158066aba8d
--- a/dev-python/repology-client/repology-client-0.3.0.ebuild
+++ b/dev-python/repology-client/repology-client-0.3.0.ebuild
@@ -3,7 +3,7 @@

 EAPI=8

-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{11..13} )
 DISTUTILS_USE_PEP517=hatchling
 inherit distutils-r1 pypi

@@ -16,12 +16,14 @@ HOMEPAGE="
 LICENSE="CC-BY-SA-3.0 EUPL-1.2"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="test"

 RDEPEND="
+	>=dev-python/aiohttp-3[${PYTHON_USEDEP}]
 	<dev-python/aiohttp-4[${PYTHON_USEDEP}]
 	>=dev-python/pydantic-2[${PYTHON_USEDEP}]
 	<dev-python/pydantic-3[${PYTHON_USEDEP}]
+	>=dev-python/pydantic-core-2[${PYTHON_USEDEP}]
+	<dev-python/pydantic-core-3[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
@@ -33,5 +35,5 @@ BDEPEND="
 distutils_enable_tests pytest

 distutils_enable_sphinx docs \
-	dev-python/aiohttp-theme \
+	dev-python/alabaster \
 	dev-python/sphinx-prompt
--- a/dev-python/rich-click/rich-click-1.8.5.ebuild
+++ b/dev-python/rich-click/rich-click-1.8.5.ebuild
@@ -4,7 +4,7 @@
 EAPI=8

 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{11..13} )
+PYTHON_COMPAT=( python3_{11..13} pypy3 )

 inherit click-app distutils-r1

--- a/dev-python/rst2ansi/rst2ansi-0.1.5-r3.ebuild
+++ b/dev-python/rst2ansi/rst2ansi-0.1.5-r3.ebuild
@@ -3,7 +3,7 @@

 EAPI=8

-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
 DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1 pypi

--- a/dev-python/sphinx-sitemap/sphinx-sitemap-2.6.0.ebuild
+++ b/dev-python/sphinx-sitemap/sphinx-sitemap-2.6.0.ebuild
@@ -3,7 +3,7 @@

 EAPI=8

-PYTHON_COMPAT=( python3_{11..13} pypy3 )
+PYTHON_COMPAT=( python3_{11..13} )
 DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1

--- a/dev-python/textual-serve/Manifest
+++ b/dev-python/textual-serve/Manifest
@@ -1 +1 @@
-DIST textual-serve-1.1.0.gh.tar.gz 447911 BLAKE2B 04b40d5511c7087e8172bbba93b45914a491a394604076f9c6f84f1963221798b7552c0b41bfc21110e8905091e9a5cebf2e5a65a3350f686f635385fd3dab96 SHA512 f8aa93fc006922494ba17161d92b4c86dc7f089952324b63fcfda079b950e92994f918ebb7e131cd8b479be806abc2c6d46ec84b9e84ae0c749f8102ca5cb01d
+DIST textual-serve-1.1.1.gh.tar.gz 447915 BLAKE2B 851d8147e37bc9921cab94beca811193e98b88d2d9bf625bbf5e2fbca398cead9c6570e6a1a3c9aefa369aef7636250cca75dddf52adb52455b753db6b30f520 SHA512 af684e13b6280bff66a51ea018832e14ca6a258394980a83ab41fbd472b4c7b5d804c4abb8b666fd69c9035caa10d0b1b831092e82acd60bab48d62c101400eb
--- a/dev-python/textual-serve/textual-serve-1.1.1.ebuild
+++ b/dev-python/textual-serve/textual-serve-1.1.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{10..13} )

 inherit distutils-r1

-HASH="3ddc373822ff16a680d5dff647f52f0afcf552cf"
+HASH="6d13319e689766f41cb6bd589379d4a692cae081"
 DESCRIPTION="Serve Textual apps locally"
 HOMEPAGE="https://github.com/Textualize/textual-serve https://pypi.org/project/textual-serve/"
 SRC_URI="https://github.com/Textualize/${PN}/archive/${HASH}.tar.gz -> ${P}.gh.tar.gz"
--- a/dev-python/textual/Manifest
+++ b/dev-python/textual/Manifest
@@ -1 +1 @@
-DIST textual-0.86.3.gh.tar.gz 29492586 BLAKE2B 78eb3b3e0904389286dbbd03b9d269b4ec5c1478f3d23321ea78a4d2eb04a17ee14f7ef77333699ff6833f91f4cdd1c3f38235094699dea18d1ce5217ed6c2ec SHA512 dc24f54a92aea4be7a65c1516a0f8dde34aa71a0d9ed9f1da7ac62dcbcd7af1dbe8aabb2d921e642bbb1cc44c4299b5e06c70ed59c402a810db2ca2ee316411a
+DIST textual-0.88.1.gh.tar.gz 29517235 BLAKE2B 457caef7957eab0b7317e94ce4dd991cf0da54c4b7c9b670089de6cb762b1fd28c1021b8be89e66947717452dcc4925ff70eb856cef470eacda6062322df2e7a SHA512 7c849dac56ca93853b36ad8c67f5544f5a071ad3b23f7753f46a6b62a1017098b40ce2be0aa526aa5a4de397ec26bb7b42a245170516e22ef297ccbc49321394
--- a/dev-python/textual/textual-0.88.1.ebuild
+++ b/dev-python/textual/textual-0.88.1.ebuild
@@ -38,7 +38,6 @@ BDEPEND="
 		dev-python/httpx[${PYTHON_USEDEP}]
 		dev-python/platformdirs[${PYTHON_USEDEP}]
 		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
 		=dev-python/textual-dev-1.7*[${PYTHON_USEDEP}]
 	)
 "
@@ -50,6 +49,7 @@ DEPEND="${RDEPEND}"
 # 	"${FILESDIR}/fix-mkdocstrings.patch"
 # )

+EPYTEST_XDIST=1
 EPYTEST_DESELECT=(
 	# Those tests ask to press keys
 	tests/snapshot_tests/test_snapshots.py
@@ -59,6 +59,17 @@ EPYTEST_DESELECT=(
 	tests/text_area/test_languages.py
 )
 distutils_enable_tests pytest
+python_test() {
+	if [[ ${EPYTHON} == python3.13 ]]; then
+		EPYTEST_DESELECT+=(
+			# See https://github.com/Textualize/textual/issues/5327
+			"tests/text_area"
+		)
+		epytest -m 'not syntax' tests
+	else
+		epytest tests
+	fi
+}

 python_compile_all() {
 	echo "INHERIT: mkdocs-offline.yml" > "${S}/mkdocs.yml"
--- a/dev-util/distribution-gpg-keys/Manifest
+++ b/dev-util/distribution-gpg-keys/Manifest
@@ -1 +1 @@
-DIST distribution-gpg-keys-1.105-1.tar.gz 67292024 BLAKE2B 2ff487b651222aa7470b143e9b8a90f5dba8488e2475b0ffaf1b90dc1c6fd1de95759d286aa4c47bf2a0cee6d3ebb010299163ad8f629443cd466fc94ff87e23 SHA512 5ac631cd4e60919f7d164c53ecb930b548090239ebdd8c431a7350cf1448b27ddadd4449f023a40ce81b21b058330806bc8dd2a4b31d340b90779f44c83b0d4c
+DIST distribution-gpg-keys-1.106-1.tar.gz 75279538 BLAKE2B e963ce5ce7be62448bc7905172e2f81bedae3d8e3b9bc2256f81da02c28e3416e9bb21cad62391a693d6e823f3428b35caac87793d82dd8aa05f99d21227c1be SHA512 c883e3ecbc8c023808490b3eedba164eaa10a4bf4fa0dcdb1cfb6fb3e0c295b771258923f20a6d2bb078448e696d62328e87fabcd84840aeb1b41119ebe798f5
--- a/dev-util/distribution-gpg-keys/distribution-gpg-keys-1.106.ebuild
+++ b/dev-util/distribution-gpg-keys/distribution-gpg-keys-1.106.ebuild
--- a/dev-util/find-work/find-work-9999.ebuild
+++ b/dev-util/find-work/find-work-9999.ebuild
@@ -41,8 +41,8 @@ RDEPEND="
 	>=dev-python/typing-extensions-4.3.0[${PYTHON_USEDEP}]
 	<dev-python/typing-extensions-5[${PYTHON_USEDEP}]
 	!minimal? (
-		>=dev-python/lxml-4.5[${PYTHON_USEDEP}]
-		dev-python/tabulate[${PYTHON_USEDEP}]
+		$(python_gen_any_dep '>=dev-python/lxml-4.5[${PYTHON_USEDEP}]')
+		$(python_gen_any_dep 'dev-python/tabulate[${PYTHON_USEDEP}]')
 	)
 "
 BDEPEND="
@@ -51,12 +51,11 @@ BDEPEND="
 	)
 "

-# No ${PYTHON_USEDEP} because plugin deps can lag behind
 PDEPEND="
 	!minimal? (
-		dev-util/find-work-bugzilla
-		dev-util/find-work-pkgcheck
-		dev-util/find-work-repology
+		$(python_gen_any_dep 'dev-util/find-work-bugzilla[${PYTHON_USEDEP}]')
+		$(python_gen_any_dep 'dev-util/find-work-pkgcheck[${PYTHON_USEDEP}]')
+		$(python_gen_any_dep 'dev-util/find-work-repology[${PYTHON_USEDEP}]')
 	)
 "

--- a/dev-util/mh/Manifest
+++ b/dev-util/mh/Manifest
@@ -1 +1 @@
-DIST mh-1.0.3.tar.gz 929281 BLAKE2B 4a565dc317c9d0d6d3678bc9c4de56b186175414a84437c59deb0c10b8c3d6432e974deb995c9ed954e144bc8e7bac0145215409de88956d71c570eb8590ed63 SHA512 7f3e64bcac4743b746e5c0fbbc7579066ec563ac3a5f5fbbc1eb540111843ed72000c7b0fbb3787b1f9015d9c434fa99af5179f7c47cf7f217bf27a3f7ae6b05
+DIST mh-1.4.1.tar.gz 933304 BLAKE2B 1d68f35911d05b00cec9a1e7ab9b92b415aaf7695f0613d27a16127f1996d74bdd995ef7c3ef11f0090de12ed0c99d65786eafc8d8eb981f589a6938d9e87f25 SHA512 88af321f124aae1a51938268d318600fc0de5309f7da158679bd810e25ce172c8c246c1fecce33e5022816f45a00dc00734670573a9e276cfe0bdc177bc5f119
--- a/dev-util/mh/mh-1.4.1.ebuild
+++ b/dev-util/mh/mh-1.4.1.ebuild
--- a/gui-apps/azote/Manifest
+++ b/gui-apps/azote/Manifest
@@ -1 +1 @@
-DIST azote-1.13.1.tar.gz 7973313 BLAKE2B 86c54fc1f9b06ff8a8405784a5d54e6021d1f43d0dce45e3211f4395a68238ae6fb7e088634826eb95b05126dea717e96373348958380427d24639a1376f64b7 SHA512 fd6d1ac24e05ed98785b20d1e47b65e77b5bf3a55a25ce7fb29e0394f0ce540d11cc39dfb40f0aa12a4900d9524219bf534fc411360009a48456c71c2774da2a
+DIST azote-1.14.0.tar.gz 7973989 BLAKE2B 016f9ded87c603b563ed874892d79f5e0f15e6608ad435546329c319a43ec31a7334631bdcc7f8be5fff98413ca77aaebd8682ea2563b02a8bd666eeeab8911b SHA512 c700946cb56c9d15111949f46e107cc6b9887916ab90c782fe78c7deb09a6964cf19e69f143b86cdc44a34ea6aaeec5b0d28d64f7bc24402fc44fc201531f9ef
--- a/gui-apps/azote/azote-1.14.0.ebuild
+++ b/gui-apps/azote/azote-1.14.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/nwg-piotr/azote"
 else
-	SRC_URI="https://github.com/nwg-piotr/azote/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/nwg-piotr/azote/archive/v${PV}/${P}.tar.gz"
 	KEYWORDS="~amd64"
 fi

@@ -29,10 +29,6 @@ RDEPEND="
 	dev-python/send2trash[${PYTHON_USEDEP}]
 "

-PATCHES=(
-	"${FILESDIR}"/${PN}-1.13.1-pyproject.patch
-)
-
 DOCS=( README.md )

 python_install_all() {
--- a/gui-apps/azote/azote-9999.ebuild
+++ b/gui-apps/azote/azote-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/nwg-piotr/azote"
 else
-	SRC_URI="https://github.com/nwg-piotr/azote/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/nwg-piotr/azote/archive/v${PV}/${P}.tar.gz"
 	KEYWORDS="~amd64"
 fi

@@ -29,10 +29,6 @@ RDEPEND="
 	dev-python/send2trash[${PYTHON_USEDEP}]
 "

-PATCHES=(
-	"${FILESDIR}"/${PN}-1.13.1-pyproject.patch
-)
-
 DOCS=( README.md )

 python_install_all() {
--- a/gui-apps/azote/files/azote-1.13.1-pyproject.patch
+++ b/gui-apps/azote/files/azote-1.13.1-pyproject.patch
@@ -1,92 +0,0 @@
-From d3605d93627f0d756c2c570e7ef0ad6e751d8eb3 Mon Sep 17 00:00:00 2001
-From: Aisha Tammy <aisha@bsd.ac>
-Date: Sun, 7 Apr 2024 20:32:01 -0400
-Subject: [PATCH 1/2] feat: add pyproject.toml
-
---
- pyproject.toml | 27 +++++++++++++++++++++++++++
- 1 file changed, 27 insertions(+)
- create mode 100644 pyproject.toml
-
-diff --git a/pyproject.toml b/pyproject.toml
-new file mode 100644
-index 0000000..fec8478
--- /dev/null
-+++ b/pyproject.toml
-@@ -0,0 +1,27 @@
-+[build-system]
-+requires = ["setuptools >= 61.0"]
-+build-backend = "setuptools.build_meta"
-+
-+[project]
-+name = "azote"
-+version = "1.12.6"
-+description = "Wallpaper manager for sway and some other WMs"
-+readme = "README.md"
-+license = {text = "GPL3"}
-+requires-python = ">= 3.8.0"
-+authors = [
-+  {name = "Piotr Miller", email = "nwg.piotr@gmail.com"},
-+]
-+dependencies = [
-+  "pillow",
-+  "PyGObject",
-+  "PyYAML",
-+  "Send2Trash",
-+]
-+
-+[project.urls]
-+Repository = "https://github.com/nwg-piotr/azote"
-+License = "https://github.com/nwg-piotr/azote/blob/master/LICENSE"
-+
-+[project.scripts]
-+azote = "azote.main:main"
-
-From 769d027dfa40c218075827ca50241a2395240bea Mon Sep 17 00:00:00 2001
-From: Aisha Tammy <aisha@bsd.ac>
-Date: Sun, 7 Apr 2024 20:33:21 -0400
-Subject: [PATCH 2/2] scratch
-
---
- dist/azote |  5 -----
- setup.py   | 24 ------------------------
- 2 files changed, 29 deletions(-)
- delete mode 100755 dist/azote
- delete mode 100644 setup.py
-
-diff --git a/setup.py b/setup.py
-deleted file mode 100644
-index 8f1e4f6..0000000
--- a/setup.py
-+++ /dev/null
-@@ -1,30 +0,0 @@
-import os
-
-from setuptools import setup, find_packages
-
-
-def read(f_name):
-    return open(os.path.join(os.path.dirname(__file__), f_name)).read()
-
-
-setup(
-    name='azote',
-    version='1.13.1',
-    description='Wallpaper manager for sway and some other WMs',
-    packages=find_packages(),
-    include_package_data=True,
-    package_data={
-        "": ["images/*", "langs/*"]
-    },
-    url='https://github.com/nwg-piotr/azote',
-    license='GPL3',
-    author='Piotr Miller',
-    author_email='nwg.piotr@gmail.com',
-    python_requires='>=3.8.0',
-    install_requires=[],
-    entry_points={
-        'gui_scripts': [
-            'azote = azote.main:main'
-        ]
-    }
-)
--- a/gui-libs/mir/Manifest
+++ b/gui-libs/mir/Manifest
@@ -1 +1,2 @@
 DIST mir-2.18.3.tar.gz 6759986 BLAKE2B f651fd7b743d7f1faa4c6d83a1ba9eecd8fe20afb437fffee5f03bbe8238731034577c154cc4b0fc953156e708d613fbb5cc17bff3e86ce2b48e6a031bca4298 SHA512 7a2cc6678ff622cb131ba4aad5b84843d63ff054897e7990c6a605327ec5b599b7903a7ce68c356c62196680d90aa7adb90671dcc31706b8a07b1eb3d97fc752
+DIST mir-2.19.2.tar.gz 6811003 BLAKE2B 012ad7852974c88abba53e98f5fed3e8f2873f3ad5c3ba8a89c1b43ac67a9871cb7b1eba0034dacb5bd5a410dc931f03290096c9e31020c312788f55b2e851fd SHA512 99e5b09e3321b51bfd9427d778b5983b5a62628648b927c64bacfccb2a757f4c0db4664aaf3b87614472837c9434351681cdae42221b3760c8f947e2895712c2
--- a/gui-libs/mir/mir-2.18.3.ebuild
+++ b/gui-libs/mir/mir-2.18.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://mir-server.io/"
 SRC_URI="https://github.com/canonical/mir/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="|| ( GPL-2 GPL-3 ) || ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
+SLOT="0/${PV}"
 KEYWORDS="~amd64"
 IUSE="test X"
 RESTRICT="!test? ( test )"
--- a/gui-libs/mir/mir-2.19.2.ebuild
+++ b/gui-libs/mir/mir-2.19.2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="Set of libraries for building Wayland based shells"
+HOMEPAGE="https://mir-server.io/"
+SRC_URI="https://github.com/canonical/mir/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 GPL-3 ) || ( LGPL-2.1 LGPL-3 )"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="test X"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-cpp/glibmm:2
+	dev-cpp/libxmlpp:2.6
+	dev-cpp/yaml-cpp:=
+	dev-libs/boost:=
+	dev-libs/glib:2
+	dev-libs/libinput:=
+	dev-libs/wayland
+	dev-util/lttng-ust:=
+	media-libs/freetype
+	media-libs/libepoxy
+	media-libs/libglvnd
+	media-libs/mesa
+	sys-apps/util-linux
+	x11-libs/libXcursor
+	x11-libs/libdrm
+	x11-libs/libxcb:=
+	x11-libs/libxkbcommon
+	virtual/libudev:=
+	X? ( x11-libs/libX11 )
+"
+DEPEND="
+	${RDEPEND}
+	media-libs/glm
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	virtual/pkgconfig
+	test? (
+		dev-cpp/gtest
+		dev-util/umockdev
+		x11-base/xwayland
+	)
+"
+
+PATCHES=(
+	# bug 932786
+	"${FILESDIR}/${PN}-2.17.0-remove-debug-flags.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+	cmake_comment_add_subdirectory examples/
+}
+
+src_configure() {
+	local platforms="gbm-kms;atomic-kms;wayland"
+	use X && platforms="${platforms};x11"
+
+	local mycmakeargs=(
+		# wlcs is not packaged
+		-DMIR_ENABLE_WLCS_TESTS=OFF
+		-DMIR_ENABLE_TESTS="$(usex test)"
+		-DMIR_FATAL_COMPILE_WARNINGS=OFF
+		-DMIR_PLATFORM="${platforms}"
+	)
+	use test && mycmakeargs+=(
+		# likely will not work in build environment
+		-DMIR_BUILD_PERFORMANCE_TESTS=OFF
+		-DMIR_BUILD_PLATFORM_TEST_HARNESS=OFF
+		-DMIR_BUILD_UNIT_TESTS=OFF
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use test; then
+		# remove dummy libraries
+		rm -f "${ED}/usr/$(get_libdir)/mir/server-platform/"{graphics-dummy.so,input-stub.so} || die
+	fi
+}
--- a/gui-wm/miracle-wm/miracle-wm-0.3.7-r1.ebuild
+++ b/gui-wm/miracle-wm/miracle-wm-0.3.7-r1.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 	dev-libs/glib:2
 	dev-libs/json-c:=
 	dev-libs/libevdev
-	>=gui-libs/mir-2.18
+	<gui-libs/mir-2.19:=
 	dev-libs/libpcre2:=
 	media-libs/libglvnd
 	x11-base/xwayland
--- a/media-sound/spotify-player/Manifest
+++ b/media-sound/spotify-player/Manifest
--- a/media-sound/spotify-player/spotify-player-0.18.2.ebuild
+++ b/media-sound/spotify-player/spotify-player-0.18.2.ebuild
@@ -1,637 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-	ab_glyph@0.2.26
-	ab_glyph_rasterizer@0.1.8
-	addr2line@0.21.0
-	adler@1.0.2
-	aes-ctr@0.6.0
-	aes-soft@0.6.4
-	aes@0.6.0
-	aesni@0.10.0
-	ahash@0.8.11
-	aho-corasick@1.1.3
-	allocator-api2@0.2.18
-	alsa-sys@0.3.1
-	alsa@0.6.0
-	android-activity@0.6.0
-	android-properties@0.2.2
-	android-tzdata@0.1.1
-	android_system_properties@0.1.5
-	ansi_colours@1.2.2
-	anstream@0.6.14
-	anstyle-parse@0.2.4
-	anstyle-query@1.0.3
-	anstyle-wincon@3.0.3
-	anstyle@1.0.7
-	anyhow@1.0.86
-	array-init@2.1.0
-	arrayref@0.3.7
-	arrayvec@0.7.4
-	as-raw-xcb-connection@1.0.1
-	async-stream-impl@0.3.5
-	async-stream@0.3.5
-	async-trait@0.1.80
-	atomic-waker@1.1.2
-	autocfg@1.3.0
-	backtrace@0.3.71
-	base64@0.13.1
-	base64@0.21.7
-	base64@0.22.1
-	bindgen@0.69.4
-	bit_field@0.10.2
-	bitflags@1.3.2
-	bitflags@2.5.0
-	block-buffer@0.10.4
-	block-buffer@0.9.0
-	block2@0.5.1
-	block@0.1.6
-	bumpalo@3.16.0
-	bytemuck@1.16.0
-	byteorder@1.5.0
-	bytes@1.6.0
-	calloop-wayland-source@0.2.0
-	calloop@0.12.4
-	cassowary@0.3.0
-	castaway@0.2.2
-	cc@1.0.98
-	cesu8@1.1.0
-	cexpr@0.6.0
-	cfg-expr@0.15.8
-	cfg-if@1.0.0
-	cfg_aliases@0.2.1
-	chrono@0.4.38
-	cipher@0.2.5
-	clang-sys@1.7.0
-	clap@4.5.4
-	clap_builder@4.5.2
-	clap_complete@4.5.2
-	clap_derive@4.5.4
-	clap_lex@0.7.0
-	clipboard-win@5.3.1
-	cocoa-foundation@0.1.2
-	cocoa@0.24.1
-	color_quant@1.1.0
-	colorchoice@1.0.1
-	combine@4.6.7
-	compact_str@0.7.1
-	concurrent-queue@2.5.0
-	config_parser2@0.1.5
-	config_parser_derive@0.1.3
-	console@0.15.8
-	core-foundation-sys@0.8.6
-	core-foundation@0.9.4
-	core-graphics-types@0.1.3
-	core-graphics@0.22.3
-	core-graphics@0.23.2
-	coreaudio-rs@0.10.0
-	coreaudio-sys@0.2.15
-	cpal@0.13.5
-	cpufeatures@0.2.12
-	crc32fast@1.4.2
-	crossbeam-deque@0.8.5
-	crossbeam-epoch@0.9.18
-	crossbeam-utils@0.8.20
-	crossterm@0.27.0
-	crossterm_winapi@0.9.1
-	crunchy@0.2.2
-	crypto-common@0.1.6
-	crypto-mac@0.11.0
-	ctr@0.6.0
-	cursor-icon@1.1.0
-	daemonize@0.5.0
-	darling@0.13.4
-	darling_core@0.13.4
-	darling_macro@0.13.4
-	dbus-crossroads@0.5.2
-	dbus@0.9.7
-	deranged@0.3.11
-	digest@0.10.7
-	digest@0.9.0
-	dirs-next@2.0.0
-	dirs-sys-next@0.1.2
-	dispatch@0.2.0
-	dlib@0.5.2
-	downcast-rs@1.2.1
-	dpi@0.1.1
-	either@1.12.0
-	encode_unicode@0.3.6
-	encoding_rs@0.8.34
-	enum_dispatch@0.3.13
-	env_filter@0.1.0
-	env_logger@0.11.3
-	equivalent@1.0.1
-	errno@0.3.9
-	error-code@3.2.0
-	exr@1.72.0
-	fastrand@2.1.0
-	fdeflate@0.3.4
-	fixedbitset@0.4.2
-	flate2@1.0.30
-	flume@0.11.0
-	fnv@1.0.7
-	foreign-types-macros@0.2.3
-	foreign-types-shared@0.1.1
-	foreign-types-shared@0.3.1
-	foreign-types@0.3.2
-	foreign-types@0.5.0
-	form_urlencoded@1.2.1
-	futf@0.1.5
-	futures-channel@0.3.30
-	futures-core@0.3.30
-	futures-executor@0.3.30
-	futures-io@0.3.30
-	futures-macro@0.3.30
-	futures-sink@0.3.30
-	futures-task@0.3.30
-	futures-util@0.3.30
-	futures@0.3.30
-	generic-array@0.14.7
-	gethostname@0.4.3
-	getrandom@0.2.15
-	gif@0.13.1
-	gimli@0.28.1
-	glib-macros@0.15.13
-	glib-sys@0.15.10
-	glib@0.15.12
-	glob@0.3.1
-	gobject-sys@0.15.10
-	gstreamer-app-sys@0.18.0
-	gstreamer-app@0.18.7
-	gstreamer-audio-sys@0.18.3
-	gstreamer-audio@0.18.7
-	gstreamer-base-sys@0.18.0
-	gstreamer-base@0.18.0
-	gstreamer-sys@0.18.0
-	gstreamer@0.18.8
-	h2@0.4.5
-	half@2.4.1
-	hashbrown@0.12.3
-	hashbrown@0.14.5
-	headers-core@0.2.0
-	headers@0.3.9
-	heck@0.4.1
-	heck@0.5.0
-	hermit-abi@0.3.9
-	hmac@0.11.0
-	home@0.5.9
-	hostname@0.3.1
-	html5ever@0.27.0
-	http-body-util@0.1.1
-	http-body@0.4.6
-	http-body@1.0.0
-	http@0.2.12
-	http@1.1.0
-	httparse@1.8.0
-	httpdate@1.0.3
-	hyper-proxy@0.9.1
-	hyper-rustls@0.26.0
-	hyper-tls@0.6.0
-	hyper-util@0.1.4
-	hyper@0.14.28
-	hyper@1.3.1
-	iana-time-zone-haiku@0.1.2
-	iana-time-zone@0.1.60
-	ident_case@1.0.1
-	idna@0.5.0
-	if-addrs@0.7.0
-	image@0.24.9
-	indexmap@1.9.3
-	indexmap@2.2.6
-	instant@0.1.13
-	ipnet@2.9.0
-	is_terminal_polyfill@1.70.0
-	itertools@0.12.1
-	itoa@1.0.11
-	jack-sys@0.2.2
-	jack-sys@0.4.0
-	jack@0.10.0
-	jack@0.8.3
-	jni-sys@0.3.0
-	jni@0.19.0
-	jni@0.21.1
-	jobserver@0.1.31
-	jpeg-decoder@0.3.1
-	js-sys@0.3.69
-	lazy_static@1.4.0
-	lazycell@1.3.0
-	lebe@0.5.2
-	lewton@0.10.2
-	libc@0.2.155
-	libdbus-sys@0.2.5
-	libloading@0.6.7
-	libloading@0.7.4
-	libloading@0.8.3
-	libm@0.2.8
-	libmdns@0.7.5
-	libpulse-binding@2.28.1
-	libpulse-simple-binding@2.28.1
-	libpulse-simple-sys@1.21.1
-	libpulse-sys@1.21.0
-	libredox@0.0.2
-	libredox@0.1.3
-	librespot-audio@0.4.2
-	librespot-connect@0.4.2
-	librespot-core@0.4.2
-	librespot-discovery@0.4.2
-	librespot-metadata@0.4.2
-	librespot-playback@0.4.2
-	librespot-protocol@0.4.2
-	linked-hash-map@0.5.6
-	linux-raw-sys@0.4.14
-	lock_api@0.4.12
-	log@0.4.21
-	lru@0.12.3
-	mac-notification-sys@0.6.1
-	mac@0.1.1
-	mach@0.3.2
-	make-cmd@0.1.0
-	malloc_buf@0.0.6
-	markup5ever@0.12.1
-	markup5ever_rcdom@0.3.0
-	match_cfg@0.1.0
-	matchers@0.1.0
-	maybe-async@0.2.10
-	memchr@2.7.2
-	memmap2@0.9.4
-	memoffset@0.6.5
-	mime@0.3.17
-	minimal-lexical@0.2.1
-	miniz_oxide@0.7.3
-	mio@0.8.11
-	muldiv@1.0.1
-	multimap@0.8.3
-	nanorand@0.7.0
-	native-tls@0.2.11
-	ndk-context@0.1.1
-	ndk-glue@0.6.2
-	ndk-macro@0.3.0
-	ndk-sys@0.3.0
-	ndk-sys@0.6.0+11769913
-	ndk@0.6.0
-	ndk@0.9.0
-	new_debug_unreachable@1.0.6
-	nix@0.23.2
-	nom@7.1.3
-	notify-rust@4.11.0
-	nu-ansi-term@0.46.0
-	num-bigint@0.4.5
-	num-conv@0.1.0
-	num-derive@0.3.3
-	num-integer@0.1.46
-	num-rational@0.4.2
-	num-traits@0.2.19
-	num_cpus@1.16.0
-	num_enum@0.5.11
-	num_enum@0.7.2
-	num_enum_derive@0.5.11
-	num_enum_derive@0.7.2
-	objc-foundation@0.1.1
-	objc-sys@0.3.5
-	objc2-app-kit@0.2.2
-	objc2-core-data@0.2.2
-	objc2-core-image@0.2.2
-	objc2-encode@4.0.3
-	objc2-foundation@0.2.2
-	objc2-metal@0.2.2
-	objc2-quartz-core@0.2.2
-	objc2@0.5.2
-	objc@0.2.7
-	objc_id@0.1.1
-	object@0.32.2
-	oboe-sys@0.4.5
-	oboe@0.4.6
-	ogg@0.8.0
-	once_cell@1.19.0
-	opaque-debug@0.3.1
-	openssl-macros@0.1.1
-	openssl-probe@0.1.5
-	openssl-sys@0.9.102
-	openssl@0.10.64
-	option-operations@0.4.1
-	orbclient@0.3.47
-	overload@0.1.1
-	owned_ttf_parser@0.21.0
-	parking_lot@0.11.2
-	parking_lot@0.12.3
-	parking_lot_core@0.8.6
-	parking_lot_core@0.9.10
-	paste@1.0.15
-	pbkdf2@0.8.0
-	percent-encoding@2.3.1
-	petgraph@0.6.5
-	phf@0.11.2
-	phf_codegen@0.11.2
-	phf_generator@0.10.0
-	phf_generator@0.11.2
-	phf_shared@0.10.0
-	phf_shared@0.11.2
-	pin-project-internal@1.1.5
-	pin-project-lite@0.2.14
-	pin-project@1.1.5
-	pin-utils@0.1.0
-	pkg-config@0.3.30
-	png@0.17.13
-	polling@3.7.0
-	portaudio-rs@0.3.2
-	portaudio-sys@0.1.1
-	powerfmt@0.2.0
-	ppv-lite86@0.2.17
-	precomputed-hash@0.1.1
-	pretty-hex@0.3.0
-	priority-queue@1.4.0
-	proc-macro-crate@1.3.1
-	proc-macro-crate@3.1.0
-	proc-macro-error-attr@1.0.4
-	proc-macro-error@1.0.4
-	proc-macro2@1.0.83
-	protobuf-codegen-pure@2.28.0
-	protobuf-codegen@2.28.0
-	protobuf@2.28.0
-	qoi@0.4.1
-	quick-xml@0.31.0
-	quote@1.0.36
-	rand@0.8.5
-	rand_chacha@0.3.1
-	rand_core@0.6.4
-	rand_distr@0.4.3
-	ratatui@0.26.3
-	raw-window-handle@0.6.2
-	rayon-core@1.12.1
-	rayon@1.10.0
-	redox_syscall@0.2.16
-	redox_syscall@0.4.1
-	redox_syscall@0.5.1
-	redox_users@0.4.5
-	regex-automata@0.1.10
-	regex-automata@0.4.6
-	regex-syntax@0.6.29
-	regex-syntax@0.8.3
-	regex@1.10.4
-	reqwest@0.12.4
-	rgb@0.8.37
-	ring@0.17.8
-	rodio@0.15.0
-	rpassword@7.3.1
-	rspotify-http@0.13.1
-	rspotify-macros@0.13.1
-	rspotify-model@0.13.1
-	rspotify@0.13.1
-	rtoolbox@0.0.2
-	rustc-demangle@0.1.24
-	rustc-hash@1.1.0
-	rustc_version@0.4.0
-	rustix@0.38.34
-	rustls-pemfile@2.1.2
-	rustls-pki-types@1.7.0
-	rustls-webpki@0.102.4
-	rustls@0.22.4
-	rustversion@1.0.17
-	ryu@1.0.18
-	same-file@1.0.6
-	schannel@0.1.23
-	scoped-tls@1.0.1
-	scopeguard@1.2.0
-	sctk-adwaita@0.9.0
-	sdl2-sys@0.35.2
-	sdl2@0.35.2
-	security-framework-sys@2.11.0
-	security-framework@2.11.0
-	semver@1.0.23
-	serde@1.0.202
-	serde_derive@1.0.202
-	serde_json@1.0.117
-	serde_spanned@0.6.6
-	serde_urlencoded@0.7.1
-	sha-1@0.9.8
-	sha1@0.10.6
-	sha2@0.10.8
-	shannon@0.2.0
-	sharded-slab@0.1.7
-	shell-words@1.1.0
-	shlex@1.3.0
-	signal-hook-mio@0.2.3
-	signal-hook-registry@1.4.2
-	signal-hook@0.3.17
-	simd-adler32@0.3.7
-	siphasher@0.3.11
-	sixel-rs@0.3.3
-	sixel-sys@0.3.1
-	slab@0.4.9
-	smallvec@1.13.2
-	smithay-client-toolkit@0.18.1
-	smol_str@0.2.2
-	socket2@0.4.10
-	socket2@0.5.7
-	souvlaki@0.7.3
-	spin@0.9.8
-	stability@0.2.0
-	static_assertions@1.1.0
-	stdweb@0.1.3
-	strict-num@0.1.1
-	string_cache@0.8.7
-	string_cache_codegen@0.5.2
-	strsim@0.10.0
-	strsim@0.11.1
-	strum@0.26.2
-	strum_macros@0.26.2
-	subtle@2.5.0
-	syn@1.0.109
-	syn@2.0.66
-	sync_wrapper@0.1.2
-	system-configuration-sys@0.5.0
-	system-configuration@0.5.1
-	system-deps@6.2.2
-	target-lexicon@0.12.14
-	tauri-winrt-notification@0.2.1
-	tempfile@3.10.1
-	tendril@0.4.3
-	termcolor@1.4.1
-	thiserror-impl@1.0.61
-	thiserror@1.0.61
-	thread-id@4.2.1
-	thread_local@1.1.8
-	tiff@0.9.1
-	time-core@0.1.2
-	time@0.3.36
-	tiny-skia-path@0.11.4
-	tiny-skia@0.11.4
-	tinyvec@1.6.0
-	tinyvec_macros@0.1.1
-	tokio-macros@2.2.0
-	tokio-native-tls@0.3.1
-	tokio-rustls@0.25.0
-	tokio-socks@0.5.1
-	tokio-stream@0.1.15
-	tokio-util@0.7.11
-	tokio@1.37.0
-	toml@0.8.13
-	toml_datetime@0.6.6
-	toml_edit@0.19.15
-	toml_edit@0.21.1
-	toml_edit@0.22.13
-	tower-layer@0.3.2
-	tower-service@0.3.2
-	tower@0.4.13
-	tracing-attributes@0.1.27
-	tracing-core@0.1.32
-	tracing-log@0.2.0
-	tracing-subscriber@0.3.18
-	tracing@0.1.40
-	try-lock@0.2.5
-	ttf-parser@0.21.1
-	ttl_cache@0.5.1
-	typenum@1.17.0
-	unicode-bidi@0.3.15
-	unicode-ident@1.0.12
-	unicode-normalization@0.1.23
-	unicode-segmentation@1.11.0
-	unicode-truncate@1.0.0
-	unicode-width@0.1.12
-	untrusted@0.9.0
-	url@2.5.0
-	utf-8@0.7.6
-	utf8parse@0.2.1
-	uuid@1.8.0
-	valuable@0.1.0
-	vcpkg@0.2.15
-	vergen@3.2.0
-	version-compare@0.1.1
-	version-compare@0.2.0
-	version_check@0.9.4
-	viuer@0.7.1
-	walkdir@2.5.0
-	want@0.3.1
-	wasi@0.11.0+wasi-snapshot-preview1
-	wasm-bindgen-backend@0.2.92
-	wasm-bindgen-futures@0.4.42
-	wasm-bindgen-macro-support@0.2.92
-	wasm-bindgen-macro@0.2.92
-	wasm-bindgen-shared@0.2.92
-	wasm-bindgen@0.2.92
-	wayland-backend@0.3.3
-	wayland-client@0.31.2
-	wayland-csd-frame@0.3.0
-	wayland-cursor@0.31.1
-	wayland-protocols-plasma@0.2.0
-	wayland-protocols-wlr@0.2.0
-	wayland-protocols@0.31.2
-	wayland-scanner@0.31.1
-	wayland-sys@0.31.1
-	web-sys@0.3.69
-	web-time@1.1.0
-	webpki-roots@0.26.1
-	weezl@0.1.8
-	which@6.0.1
-	winapi-i686-pc-windows-gnu@0.4.0
-	winapi-util@0.1.8
-	winapi-x86_64-pc-windows-gnu@0.4.0
-	winapi@0.3.9
-	windows-core@0.52.0
-	windows-core@0.56.0
-	windows-implement@0.56.0
-	windows-interface@0.56.0
-	windows-result@0.1.1
-	windows-sys@0.45.0
-	windows-sys@0.48.0
-	windows-sys@0.52.0
-	windows-targets@0.42.2
-	windows-targets@0.48.5
-	windows-targets@0.52.5
-	windows-version@0.1.1
-	windows@0.44.0
-	windows@0.56.0
-	windows_aarch64_gnullvm@0.42.2
-	windows_aarch64_gnullvm@0.48.5
-	windows_aarch64_gnullvm@0.52.5
-	windows_aarch64_msvc@0.42.2
-	windows_aarch64_msvc@0.48.5
-	windows_aarch64_msvc@0.52.5
-	windows_i686_gnu@0.42.2
-	windows_i686_gnu@0.48.5
-	windows_i686_gnu@0.52.5
-	windows_i686_gnullvm@0.52.5
-	windows_i686_msvc@0.42.2
-	windows_i686_msvc@0.48.5
-	windows_i686_msvc@0.52.5
-	windows_x86_64_gnu@0.42.2
-	windows_x86_64_gnu@0.48.5
-	windows_x86_64_gnu@0.52.5
-	windows_x86_64_gnullvm@0.42.2
-	windows_x86_64_gnullvm@0.48.5
-	windows_x86_64_gnullvm@0.52.5
-	windows_x86_64_msvc@0.42.2
-	windows_x86_64_msvc@0.48.5
-	windows_x86_64_msvc@0.52.5
-	winit@0.30.0
-	winnow@0.5.40
-	winnow@0.6.8
-	winreg@0.52.0
-	winsafe@0.0.19
-	x11-dl@2.21.0
-	x11rb-protocol@0.13.1
-	x11rb@0.13.1
-	xcursor@0.3.5
-	xkbcommon-dl@0.4.2
-	xkeysym@0.2.0
-	xml5ever@0.18.0
-	zerocopy-derive@0.6.6
-	zerocopy-derive@0.7.34
-	zerocopy@0.6.6
-	zerocopy@0.7.34
-	zeroize@1.7.0
-	zune-inflate@0.2.54
-"
-
-inherit cargo
-
-DESCRIPTION="spotify_player is a fast, easy to use, and configurable terminal music player."
-HOMEPAGE="https://github.com/aome510/spotify-player"
-SRC_URI="
-	https://github.com/aome510/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	${CARGO_CRATE_URIS}
-"
-LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 ISC LGPL-3 LGPL-3+ MIT MPL-2.0 Unicode-DFS-2016 Unlicense ZLIB"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="daemon image +libnotify lyrics +media-control pulseaudio sixel +streaming"
-REQUIRED_USE="
-	sixel? ( image )
-	daemon? ( streaming )
-"
-DEPEND="
-	dev-libs/openssl
-	sys-apps/dbus
-	libnotify? ( x11-libs/libnotify )
-	pulseaudio? ( media-libs/libpulse )
-	sixel? ( media-libs/libsixel )
-	streaming? ( media-libs/alsa-lib )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	initfeatures=(
-		"$(usex daemon daemon '')"
-		"$(usex image image '')"
-		"$(usex libnotify notify '')"
-		"$(usex lyrics lyric-finder '')"
-		"$(usex media-control media-control '')"
-		"$(usex pulseaudio pulseaudio-backend alsa-backend)"
-		"$(usex sixel sixel '')"
-		"$(usex streaming streaming '')"
-	)
-	newfeatures=$(
-		IFS=,
-		echo "${initfeatures[*]}"
-	) || die
-	cargo_src_configure --features ${newfeatures} --no-default-features
-}
-
-src_install() {
-	cargo_src_install --path ./spotify_player
-}
-QA_FLAGS_IGNORED="usr/bin/spotify_player"
--- a/media-sound/spotify-player/spotify-player-0.20.3.ebuild
+++ b/media-sound/spotify-player/spotify-player-0.20.3.ebuild
@@ -0,0 +1,745 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	ab_glyph@0.2.29
+	ab_glyph_rasterizer@0.1.8
+	addr2line@0.24.2
+	adler2@2.0.0
+	aes@0.8.4
+	ahash@0.8.11
+	aho-corasick@1.1.3
+	aligned-vec@0.5.0
+	allocator-api2@0.2.21
+	alsa-sys@0.3.1
+	alsa@0.9.1
+	android-activity@0.6.0
+	android-properties@0.2.2
+	android-tzdata@0.1.1
+	android_system_properties@0.1.5
+	ansi_colours@1.2.3
+	anstream@0.6.18
+	anstyle-parse@0.2.6
+	anstyle-query@1.1.2
+	anstyle-wincon@3.0.6
+	anstyle@1.0.10
+	anyhow@1.0.93
+	arbitrary@1.4.1
+	arg_enum_proc_macro@0.3.4
+	arrayref@0.3.9
+	arrayvec@0.7.6
+	as-raw-xcb-connection@1.0.1
+	async-stream-impl@0.3.6
+	async-stream@0.3.6
+	async-trait@0.1.83
+	atomic-waker@1.1.2
+	atomic_refcell@0.1.13
+	autocfg@1.4.0
+	av1-grain@0.2.3
+	avif-serialize@0.8.2
+	aws-lc-rs@1.11.1
+	aws-lc-sys@0.23.1
+	backtrace@0.3.74
+	base64@0.13.1
+	base64@0.21.7
+	base64@0.22.1
+	base64ct@1.6.0
+	bindgen@0.69.5
+	bindgen@0.70.1
+	bit_field@0.10.2
+	bitflags@1.3.2
+	bitflags@2.6.0
+	bitstream-io@2.6.0
+	block-buffer@0.10.4
+	block2@0.5.1
+	block@0.1.6
+	built@0.7.5
+	bumpalo@3.16.0
+	bytemuck@1.20.0
+	byteorder-lite@0.1.0
+	byteorder@1.5.0
+	bytes@1.9.0
+	calloop-wayland-source@0.3.0
+	calloop@0.13.0
+	cassowary@0.3.0
+	castaway@0.2.3
+	cc@1.2.2
+	cesu8@1.1.0
+	cexpr@0.6.0
+	cfg-expr@0.15.8
+	cfg-expr@0.17.2
+	cfg-if@1.0.0
+	cfg_aliases@0.2.1
+	chrono@0.4.38
+	cipher@0.4.4
+	clang-sys@1.8.1
+	clap@4.5.21
+	clap_builder@4.5.21
+	clap_complete@4.5.38
+	clap_derive@4.5.18
+	clap_lex@0.7.3
+	clipboard-win@5.4.0
+	cmake@0.1.52
+	cocoa-foundation@0.1.2
+	cocoa@0.24.1
+	color_quant@1.1.0
+	colorchoice@1.0.3
+	combine@4.6.7
+	compact_str@0.8.0
+	concurrent-queue@2.5.0
+	config_parser2@0.1.5
+	config_parser_derive@0.1.3
+	console@0.15.8
+	const-oid@0.9.6
+	core-foundation-sys@0.8.7
+	core-foundation@0.10.0
+	core-foundation@0.9.4
+	core-graphics-types@0.1.3
+	core-graphics@0.22.3
+	core-graphics@0.23.2
+	coreaudio-rs@0.11.3
+	coreaudio-sys@0.2.16
+	cpal@0.15.3
+	cpufeatures@0.2.16
+	crc32fast@1.4.2
+	crossbeam-deque@0.8.5
+	crossbeam-epoch@0.9.18
+	crossbeam-utils@0.8.20
+	crossterm@0.28.1
+	crossterm_winapi@0.9.1
+	crunchy@0.2.2
+	crypto-common@0.1.6
+	ctr@0.9.2
+	cursor-icon@1.1.0
+	daemonize@0.5.0
+	darling@0.20.10
+	darling_core@0.20.10
+	darling_macro@0.20.10
+	dasp_sample@0.11.0
+	data-encoding@2.6.0
+	dbus-crossroads@0.5.2
+	dbus@0.9.7
+	der@0.7.9
+	deranged@0.3.11
+	derive_builder@0.20.2
+	derive_builder_core@0.20.2
+	derive_builder_macro@0.20.2
+	diff@0.1.13
+	digest@0.10.7
+	dirs-next@2.0.0
+	dirs-sys-next@0.1.2
+	dispatch@0.2.0
+	displaydoc@0.2.5
+	dlib@0.5.2
+	downcast-rs@1.2.1
+	dpi@0.1.1
+	dunce@1.0.5
+	either@1.13.0
+	encode_unicode@0.3.6
+	encoding_rs@0.8.35
+	enum_dispatch@0.3.13
+	env_filter@0.1.2
+	env_logger@0.11.5
+	equivalent@1.0.1
+	errno@0.3.10
+	error-code@3.3.1
+	exr@1.73.0
+	fastrand@2.2.0
+	fdeflate@0.3.6
+	fixedbitset@0.4.2
+	flate2@1.0.35
+	flume@0.11.1
+	fnv@1.0.7
+	foldhash@0.1.3
+	foreign-types-macros@0.2.3
+	foreign-types-shared@0.1.1
+	foreign-types-shared@0.3.1
+	foreign-types@0.3.2
+	foreign-types@0.5.0
+	form_urlencoded@1.2.1
+	fs_extra@1.3.0
+	futf@0.1.5
+	futures-channel@0.3.31
+	futures-core@0.3.31
+	futures-executor@0.3.31
+	futures-io@0.3.31
+	futures-macro@0.3.31
+	futures-sink@0.3.31
+	futures-task@0.3.31
+	futures-timer@3.0.3
+	futures-util@0.3.31
+	futures@0.3.31
+	fuzzy-matcher@0.3.7
+	generic-array@0.14.7
+	gethostname@0.4.3
+	getrandom@0.2.15
+	gif@0.13.1
+	gimli@0.31.1
+	gio-sys@0.20.6
+	glib-macros@0.20.5
+	glib-sys@0.20.6
+	glib@0.20.6
+	glob@0.3.1
+	gobject-sys@0.20.4
+	governor@0.6.3
+	gstreamer-app-sys@0.23.2
+	gstreamer-app@0.23.3
+	gstreamer-audio-sys@0.23.3
+	gstreamer-audio@0.23.2
+	gstreamer-base-sys@0.23.3
+	gstreamer-base@0.23.3
+	gstreamer-sys@0.23.3
+	gstreamer@0.23.3
+	h2@0.3.26
+	h2@0.4.7
+	half@2.4.1
+	hashbrown@0.15.2
+	headers-core@0.3.0
+	headers@0.4.0
+	heck@0.5.0
+	hermit-abi@0.4.0
+	hmac@0.12.1
+	home@0.5.9
+	html-escape@0.2.13
+	html5ever@0.27.0
+	http-body-util@0.1.2
+	http-body@0.4.6
+	http-body@1.0.1
+	http@0.2.12
+	http@1.1.0
+	httparse@1.9.5
+	httpdate@1.0.3
+	hyper-proxy2@0.1.0
+	hyper-rustls@0.24.2
+	hyper-rustls@0.26.0
+	hyper-rustls@0.27.3
+	hyper-tls@0.6.0
+	hyper-util@0.1.10
+	hyper@0.14.31
+	hyper@1.5.1
+	iana-time-zone-haiku@0.1.2
+	iana-time-zone@0.1.61
+	icu_collections@1.5.0
+	icu_locid@1.5.0
+	icu_locid_transform@1.5.0
+	icu_locid_transform_data@1.5.0
+	icu_normalizer@1.5.0
+	icu_normalizer_data@1.5.0
+	icu_properties@1.5.1
+	icu_properties_data@1.5.0
+	icu_provider@1.5.0
+	icu_provider_macros@1.5.0
+	ident_case@1.0.1
+	idna@1.0.3
+	idna_adapter@1.2.0
+	image-webp@0.2.0
+	image@0.25.5
+	imgref@1.11.0
+	indexmap@2.7.0
+	indoc@2.0.5
+	inout@0.1.3
+	instability@0.3.3
+	interpolate_name@0.2.4
+	ipnet@2.10.1
+	is_terminal_polyfill@1.70.1
+	itertools@0.12.1
+	itertools@0.13.0
+	itoa@1.0.14
+	jack-sys@0.5.1
+	jack@0.11.4
+	jni-sys@0.3.0
+	jni@0.21.1
+	jobserver@0.1.32
+	jpeg-decoder@0.3.1
+	js-sys@0.3.74
+	lazy_static@1.5.0
+	lazycell@1.3.0
+	lebe@0.5.2
+	libc@0.2.167
+	libdbus-sys@0.2.5
+	libfuzzer-sys@0.4.8
+	libloading@0.7.4
+	libloading@0.8.6
+	libm@0.2.11
+	libpulse-binding@2.28.2
+	libpulse-simple-binding@2.28.1
+	libpulse-simple-sys@1.21.1
+	libpulse-sys@1.21.0
+	libredox@0.1.3
+	librespot-audio@0.6.0
+	librespot-connect@0.6.0
+	librespot-core@0.6.0
+	librespot-metadata@0.6.0
+	librespot-oauth@0.6.0
+	librespot-playback@0.6.0
+	librespot-protocol@0.6.0
+	linked-hash-map@0.5.6
+	linux-raw-sys@0.4.14
+	litemap@0.7.4
+	lock_api@0.4.12
+	log@0.4.22
+	loop9@0.1.5
+	lru@0.12.5
+	mac-notification-sys@0.6.2
+	mac@0.1.1
+	mach2@0.4.2
+	make-cmd@0.1.0
+	malloc_buf@0.0.6
+	markup5ever@0.12.1
+	markup5ever_rcdom@0.3.0
+	matchers@0.1.0
+	maybe-async@0.2.10
+	maybe-rayon@0.1.1
+	memchr@2.7.4
+	memmap2@0.9.5
+	mime@0.3.17
+	minimal-lexical@0.2.1
+	miniz_oxide@0.8.0
+	mio@1.0.3
+	muldiv@1.0.1
+	nanorand@0.7.0
+	native-tls@0.2.12
+	ndk-context@0.1.1
+	ndk-sys@0.5.0+25.2.9519653
+	ndk-sys@0.6.0+11769913
+	ndk@0.8.0
+	ndk@0.9.0
+	new_debug_unreachable@1.0.6
+	no-std-compat@0.4.1
+	nom@7.1.3
+	nonzero_ext@0.3.0
+	noop_proc_macro@0.3.0
+	notify-rust@4.11.3
+	ntapi@0.4.1
+	nu-ansi-term@0.46.0
+	num-bigint-dig@0.8.4
+	num-bigint@0.4.6
+	num-conv@0.1.0
+	num-derive@0.3.3
+	num-derive@0.4.2
+	num-integer@0.1.46
+	num-iter@0.1.45
+	num-rational@0.4.2
+	num-traits@0.2.19
+	num_enum@0.7.3
+	num_enum_derive@0.7.3
+	num_threads@0.1.7
+	oauth2@4.4.2
+	objc-foundation@0.1.1
+	objc-sys@0.3.5
+	objc2-app-kit@0.2.2
+	objc2-cloud-kit@0.2.2
+	objc2-contacts@0.2.2
+	objc2-core-data@0.2.2
+	objc2-core-image@0.2.2
+	objc2-core-location@0.2.2
+	objc2-encode@4.0.3
+	objc2-foundation@0.2.2
+	objc2-link-presentation@0.2.2
+	objc2-metal@0.2.2
+	objc2-quartz-core@0.2.2
+	objc2-symbols@0.2.2
+	objc2-ui-kit@0.2.2
+	objc2-uniform-type-identifiers@0.2.2
+	objc2-user-notifications@0.2.2
+	objc2@0.5.2
+	objc@0.2.7
+	objc_id@0.1.1
+	object@0.36.5
+	oboe-sys@0.6.1
+	oboe@0.6.1
+	once_cell@1.20.2
+	openssl-macros@0.1.1
+	openssl-probe@0.1.5
+	openssl-sys@0.9.104
+	openssl@0.10.68
+	option-operations@0.5.0
+	orbclient@0.3.48
+	overload@0.1.1
+	owned_ttf_parser@0.25.0
+	parking_lot@0.12.3
+	parking_lot_core@0.9.10
+	paste@1.0.15
+	pbkdf2@0.12.2
+	pem-rfc7468@0.7.0
+	percent-encoding@2.3.1
+	petgraph@0.6.5
+	phf@0.11.2
+	phf_codegen@0.11.2
+	phf_generator@0.10.0
+	phf_generator@0.11.2
+	phf_shared@0.10.0
+	phf_shared@0.11.2
+	pin-project-internal@1.1.7
+	pin-project-lite@0.2.15
+	pin-project@1.1.7
+	pin-utils@0.1.0
+	pkcs1@0.7.5
+	pkcs8@0.10.2
+	pkg-config@0.3.31
+	png@0.17.14
+	polling@3.7.4
+	portable-atomic@1.10.0
+	portaudio-rs@0.3.2
+	portaudio-sys@0.1.1
+	powerfmt@0.2.0
+	ppv-lite86@0.2.20
+	precomputed-hash@0.1.1
+	pretty_assertions@1.4.1
+	prettyplease@0.2.25
+	priority-queue@2.1.1
+	proc-macro-crate@3.2.0
+	proc-macro2@1.0.92
+	profiling-procmacros@1.0.16
+	profiling@1.0.16
+	protobuf-codegen@3.7.1
+	protobuf-parse@3.7.1
+	protobuf-support@3.7.1
+	protobuf@3.7.1
+	qoi@0.4.1
+	quick-error@2.0.1
+	quick-xml@0.31.0
+	quick-xml@0.36.2
+	quinn-proto@0.11.9
+	quinn-udp@0.5.7
+	quinn@0.11.6
+	quote@1.0.37
+	rand@0.8.5
+	rand_chacha@0.3.1
+	rand_core@0.6.4
+	rand_distr@0.4.3
+	ratatui@0.29.0
+	rav1e@0.7.1
+	ravif@0.11.11
+	raw-window-handle@0.6.2
+	rayon-core@1.12.1
+	rayon@1.10.0
+	redox_syscall@0.4.1
+	redox_syscall@0.5.7
+	redox_users@0.4.6
+	regex-automata@0.1.10
+	regex-automata@0.4.9
+	regex-syntax@0.6.29
+	regex-syntax@0.8.5
+	regex@1.11.1
+	reqwest@0.11.27
+	reqwest@0.12.9
+	rgb@0.8.50
+	ring@0.17.8
+	rodio@0.19.0
+	rsa@0.9.7
+	rspotify-http@0.13.3
+	rspotify-macros@0.13.3
+	rspotify-model@0.13.3
+	rspotify@0.13.3
+	rustc-demangle@0.1.24
+	rustc-hash@1.1.0
+	rustc-hash@2.1.0
+	rustix@0.38.41
+	rustls-native-certs@0.7.3
+	rustls-native-certs@0.8.1
+	rustls-pemfile@1.0.4
+	rustls-pemfile@2.2.0
+	rustls-pki-types@1.10.0
+	rustls-webpki@0.101.7
+	rustls-webpki@0.102.8
+	rustls@0.21.12
+	rustls@0.22.4
+	rustls@0.23.19
+	rustversion@1.0.18
+	ryu@1.0.18
+	same-file@1.0.6
+	schannel@0.1.27
+	scoped-tls@1.0.1
+	scopeguard@1.2.0
+	sct@0.7.1
+	sctk-adwaita@0.10.1
+	sdl2-sys@0.37.0
+	sdl2@0.37.0
+	security-framework-sys@2.12.1
+	security-framework@2.11.1
+	security-framework@3.0.1
+	serde@1.0.215
+	serde_derive@1.0.215
+	serde_json@1.0.133
+	serde_path_to_error@0.1.16
+	serde_spanned@0.6.8
+	serde_urlencoded@0.7.1
+	sha1@0.10.6
+	sha2@0.10.8
+	shannon@0.2.0
+	sharded-slab@0.1.7
+	shell-words@1.1.0
+	shlex@1.3.0
+	signal-hook-mio@0.2.4
+	signal-hook-registry@1.4.2
+	signal-hook@0.3.17
+	signature@2.2.0
+	simd-adler32@0.3.7
+	simd_helpers@0.1.0
+	siphasher@0.3.11
+	sixel-rs@0.3.3
+	sixel-sys@0.3.1
+	slab@0.4.9
+	smallvec@1.13.2
+	smithay-client-toolkit@0.19.2
+	smol_str@0.2.2
+	socket2@0.5.8
+	souvlaki@0.7.3
+	spin@0.9.8
+	spinning_top@0.3.0
+	spki@0.7.3
+	stable_deref_trait@1.2.0
+	static_assertions@1.1.0
+	strict-num@0.1.1
+	string_cache@0.8.7
+	string_cache_codegen@0.5.2
+	strsim@0.11.1
+	strum@0.26.3
+	strum_macros@0.26.4
+	subtle@2.6.1
+	symphonia-bundle-mp3@0.5.4
+	symphonia-codec-vorbis@0.5.4
+	symphonia-core@0.5.4
+	symphonia-format-ogg@0.5.4
+	symphonia-metadata@0.5.4
+	symphonia-utils-xiph@0.5.4
+	symphonia@0.5.4
+	syn@1.0.109
+	syn@2.0.90
+	sync_wrapper@0.1.2
+	sync_wrapper@1.0.2
+	synstructure@0.13.1
+	sysinfo@0.31.4
+	system-configuration-sys@0.5.0
+	system-configuration-sys@0.6.0
+	system-configuration@0.5.1
+	system-configuration@0.6.1
+	system-deps@6.2.2
+	system-deps@7.0.3
+	target-lexicon@0.12.16
+	tauri-winrt-notification@0.2.1
+	tempfile@3.14.0
+	tendril@0.4.3
+	termcolor@1.4.1
+	thiserror-impl@1.0.69
+	thiserror-impl@2.0.3
+	thiserror@1.0.69
+	thiserror@2.0.3
+	thread-id@4.2.2
+	thread_local@1.1.8
+	tiff@0.9.1
+	time-core@0.1.2
+	time-macros@0.2.18
+	time@0.3.36
+	tiny-skia-path@0.11.4
+	tiny-skia@0.11.4
+	tinystr@0.7.6
+	tinyvec@1.8.0
+	tinyvec_macros@0.1.1
+	tokio-macros@2.4.0
+	tokio-native-tls@0.3.1
+	tokio-rustls@0.24.1
+	tokio-rustls@0.25.0
+	tokio-rustls@0.26.0
+	tokio-socks@0.5.2
+	tokio-stream@0.1.16
+	tokio-tungstenite@0.24.0
+	tokio-util@0.7.12
+	tokio@1.41.1
+	toml@0.8.19
+	toml_datetime@0.6.8
+	toml_edit@0.22.22
+	tower-service@0.3.3
+	tracing-attributes@0.1.28
+	tracing-core@0.1.33
+	tracing-log@0.2.0
+	tracing-subscriber@0.3.19
+	tracing@0.1.41
+	try-lock@0.2.5
+	ttf-parser@0.25.1
+	ttl_cache@0.5.1
+	tungstenite@0.24.0
+	typenum@1.17.0
+	unicode-ident@1.0.14
+	unicode-segmentation@1.12.0
+	unicode-truncate@1.1.0
+	unicode-width@0.1.14
+	unicode-width@0.2.0
+	untrusted@0.9.0
+	url@2.5.4
+	utf-8@0.7.6
+	utf16_iter@1.0.5
+	utf8-width@0.1.7
+	utf8_iter@1.0.4
+	utf8parse@0.2.2
+	uuid@1.11.0
+	v_frame@0.3.8
+	valuable@0.1.0
+	vcpkg@0.2.15
+	vergen-gitcl@1.0.2
+	vergen-lib@0.1.5
+	vergen@9.0.2
+	version-compare@0.1.1
+	version-compare@0.2.0
+	version_check@0.9.5
+	viuer@0.9.1
+	walkdir@2.5.0
+	want@0.3.1
+	wasi@0.11.0+wasi-snapshot-preview1
+	wasm-bindgen-backend@0.2.97
+	wasm-bindgen-futures@0.4.47
+	wasm-bindgen-macro-support@0.2.97
+	wasm-bindgen-macro@0.2.97
+	wasm-bindgen-shared@0.2.97
+	wasm-bindgen@0.2.97
+	wayland-backend@0.3.7
+	wayland-client@0.31.7
+	wayland-csd-frame@0.3.0
+	wayland-cursor@0.31.7
+	wayland-protocols-plasma@0.3.5
+	wayland-protocols-wlr@0.3.5
+	wayland-protocols@0.32.5
+	wayland-scanner@0.31.5
+	wayland-sys@0.31.5
+	web-sys@0.3.74
+	web-time@1.1.0
+	webpki-roots@0.25.4
+	webpki-roots@0.26.7
+	webpki@0.22.4
+	weezl@0.1.8
+	which@4.4.2
+	which@7.0.0
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-util@0.1.9
+	winapi-x86_64-pc-windows-gnu@0.4.0
+	winapi@0.3.9
+	windows-core@0.52.0
+	windows-core@0.54.0
+	windows-core@0.56.0
+	windows-core@0.57.0
+	windows-core@0.58.0
+	windows-implement@0.56.0
+	windows-implement@0.57.0
+	windows-implement@0.58.0
+	windows-interface@0.56.0
+	windows-interface@0.57.0
+	windows-interface@0.58.0
+	windows-registry@0.2.0
+	windows-result@0.1.2
+	windows-result@0.2.0
+	windows-strings@0.1.0
+	windows-sys@0.45.0
+	windows-sys@0.48.0
+	windows-sys@0.52.0
+	windows-sys@0.59.0
+	windows-targets@0.42.2
+	windows-targets@0.48.5
+	windows-targets@0.52.6
+	windows-version@0.1.1
+	windows@0.44.0
+	windows@0.54.0
+	windows@0.56.0
+	windows@0.57.0
+	windows@0.58.0
+	windows_aarch64_gnullvm@0.42.2
+	windows_aarch64_gnullvm@0.48.5
+	windows_aarch64_gnullvm@0.52.6
+	windows_aarch64_msvc@0.42.2
+	windows_aarch64_msvc@0.48.5
+	windows_aarch64_msvc@0.52.6
+	windows_i686_gnu@0.42.2
+	windows_i686_gnu@0.48.5
+	windows_i686_gnu@0.52.6
+	windows_i686_gnullvm@0.52.6
+	windows_i686_msvc@0.42.2
+	windows_i686_msvc@0.48.5
+	windows_i686_msvc@0.52.6
+	windows_x86_64_gnu@0.42.2
+	windows_x86_64_gnu@0.48.5
+	windows_x86_64_gnu@0.52.6
+	windows_x86_64_gnullvm@0.42.2
+	windows_x86_64_gnullvm@0.48.5
+	windows_x86_64_gnullvm@0.52.6
+	windows_x86_64_msvc@0.42.2
+	windows_x86_64_msvc@0.48.5
+	windows_x86_64_msvc@0.52.6
+	winit@0.30.5
+	winnow@0.6.20
+	winreg@0.50.0
+	winsafe@0.0.19
+	write16@1.0.0
+	writeable@0.5.5
+	x11-dl@2.21.0
+	x11rb-protocol@0.13.1
+	x11rb@0.13.1
+	xcursor@0.3.8
+	xkbcommon-dl@0.4.2
+	xkeysym@0.2.1
+	xml5ever@0.18.1
+	yansi@1.0.1
+	yoke-derive@0.7.5
+	yoke@0.7.5
+	zerocopy-derive@0.7.35
+	zerocopy@0.7.35
+	zerofrom-derive@0.1.5
+	zerofrom@0.1.5
+	zeroize@1.8.1
+	zerovec-derive@0.10.3
+	zerovec@0.10.4
+	zune-core@0.4.12
+	zune-inflate@0.2.54
+	zune-jpeg@0.4.13
+"
+
+inherit cargo
+
+DESCRIPTION="spotify_player is a fast, easy to use, and configurable terminal music player."
+HOMEPAGE="https://github.com/aome510/spotify-player"
+SRC_URI="
+	https://github.com/aome510/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	${CARGO_CRATE_URIS}
+"
+LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 ISC LGPL-3 LGPL-3+ MIT MPL-2.0 Unicode-DFS-2016 Unlicense ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="daemon image +libnotify lyrics +media-control pulseaudio sixel +streaming"
+REQUIRED_USE="
+	sixel? ( image )
+	daemon? ( streaming )
+"
+DEPEND="
+	dev-libs/openssl
+	sys-apps/dbus
+	libnotify? ( x11-libs/libnotify )
+	pulseaudio? ( media-libs/libpulse )
+	sixel? ( media-libs/libsixel )
+	streaming? ( media-libs/alsa-lib )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	initfeatures=(
+		"$(usex daemon daemon '')"
+		"$(usex image image '')"
+		"$(usex libnotify notify '')"
+		"$(usex lyrics lyric-finder '')"
+		"$(usex media-control media-control '')"
+		"$(usex pulseaudio pulseaudio-backend alsa-backend)"
+		"$(usex sixel sixel '')"
+		"$(usex streaming streaming '')"
+	)
+	newfeatures=$(
+		IFS=,
+		echo "${initfeatures[*]}"
+	) || die
+	cargo_src_configure --features ${newfeatures} --no-default-features
+}
+
+src_install() {
+	cargo_src_install --path ./spotify_player
+}
+QA_FLAGS_IGNORED="usr/bin/spotify_player"
--- a/net-misc/gmcapsule/gmcapsule-0.7.0.ebuild
+++ b/net-misc/gmcapsule/gmcapsule-0.7.0.ebuild
@@ -3,7 +3,7 @@

 EAPI=8

-PYTHON_COMPAT=( python3_{11..13} )
+PYTHON_COMPAT=( python3_{11..13} pypy3 )
 DISTUTILS_USE_PEP517=hatchling
 inherit distutils-r1 pypi systemd

--- a/net-p2p/dogecoin-qt/dogecoin-qt-1.14.8.ebuild
+++ b/net-p2p/dogecoin-qt/dogecoin-qt-1.14.8.ebuild
@@ -3,7 +3,7 @@

 EAPI=8
 WANT_AUTOCONF="2.5"
-inherit autotools desktop flag-o-matic xdg-utils
+inherit autotools desktop xdg-utils
 DESCRIPTION="Dogecoin Core Qt for desktop. Downloaded blockchain is under 2.2GB. Much secure."
 HOMEPAGE="https://github.com/dogecoin"
 SRC_URI="https://github.com/dogecoin/dogecoin/archive/refs/tags/v${PV}.tar.gz -> ${PN}-v${PV}.tar.gz"
@@ -89,7 +89,7 @@ src_configure() {
 	local my_econf=(
 		--bindir="${DOGEDIR}/bin"
 		--disable-bench
-		--enable-c++14
+		--enable-c++17
 		$(use_with gui qt5)
 		$(use_with intel-avx2 intel-avx2)
 		$(use_with dogecoind daemon)
--- a/net-p2p/dogecoin-qt/dogecoin-qt-1.14.9.ebuild
+++ b/net-p2p/dogecoin-qt/dogecoin-qt-1.14.9.ebuild
@@ -3,7 +3,7 @@

 EAPI=8
 WANT_AUTOCONF="2.5"
-inherit autotools desktop flag-o-matic xdg-utils
+inherit autotools desktop xdg-utils
 DESCRIPTION="Dogecoin Core Qt for desktop. Downloaded blockchain is under 2.2GB. Much secure."
 HOMEPAGE="https://github.com/dogecoin"
 SRC_URI="https://github.com/dogecoin/dogecoin/archive/refs/tags/v${PV}.tar.gz -> ${PN}-v${PV}.tar.gz"
@@ -89,7 +89,7 @@ src_configure() {
 	local my_econf=(
 		--bindir="${DOGEDIR}/bin"
 		--disable-bench
-		--enable-c++14
+		--enable-c++17
 		$(use_with gui qt5)
 		$(use_with intel-avx2 intel-avx2)
 		$(use_with dogecoind daemon)
--- a/net-p2p/dogecoin-qt/dogecoin-qt-9999.ebuild
+++ b/net-p2p/dogecoin-qt/dogecoin-qt-9999.ebuild
@@ -3,7 +3,7 @@

 EAPI=8
 WANT_AUTOCONF="2.5"
-inherit autotools desktop flag-o-matic git-r3 xdg-utils
+inherit autotools desktop git-r3 xdg-utils
 DESCRIPTION="Dogecoin Core Qt for desktop. Downloaded blockchain is under 2.2GB. Much secure."
 HOMEPAGE="https://github.com/dogecoin"
 EGIT_REPO_URI="https://github.com/dogecoin/dogecoin.git"
@@ -86,7 +86,7 @@ src_configure() {
 	local my_econf=(
 		--bindir="${DOGEDIR}/bin"
 		--disable-bench
-		--enable-c++14
+		--enable-c++17
 		$(use_with gui qt5)
 		$(use_with intel-avx2 intel-avx2)
 		$(use_with dogecoind daemon)
--- a/phosh-base/phosh-osk-stub/Manifest
+++ b/phosh-base/phosh-osk-stub/Manifest
@@ -2,3 +2,5 @@ DIST phosh-osk-stub-0.41.0.tar.xz 317516 BLAKE2B 2a17399c2966983e96051a048bfe9dd
 DIST phosh-osk-stub-0.41.0.tar.xz.asc 833 BLAKE2B 66075735b50ca4eabad8851618d3c9d1d9f1da057b5e80e307efd502d28e6185ec4709c2296645831cff7151478daabcbbbae42f474a811ee37bc94dd4051c3c SHA512 60852c5890612f7cb74eb976074c5fc7c0f14cf91a46b871ef622bdd9edecc29f4e3cf1be0fc1bae9422db139f257b30110c790bf76275614e8d69f30c7806df
 DIST phosh-osk-stub-0.41.1.tar.xz 317632 BLAKE2B caff385e44fe9c59fd371fac8b03e4c1a95f9769f9118ea944cc3cb47401ac10b2ecbd6ec26fd4b49b775df0fa99f7ae9e13fa5620f21cee0d596e917cd01ca1 SHA512 bba73d561b001e620a2d5b5825463f41a946f17284e36e3abe54267362b7dc4ea8c0cd6293b90ce73086a1ef3818863f4f73be7a8724c077275a5377f3d10abf
 DIST phosh-osk-stub-0.41.1.tar.xz.asc 833 BLAKE2B 9eed6487d10ffcc4cc56c44cb2685edfdff9cbcfa2efcaddc5724414ee2e29d84e1898af766325c0d95c9e5cbc7a48c4c9b0e9c90bc25f80ec156e1c81ff849f SHA512 058fff4ed0cd4d404d5364c281d404d0c921fe8f24771a911f5826fdd5095845f26ca2a184854f864415ba005a68dae85836857f4331df4adf7dccd7507aad20
+DIST phosh-osk-stub-0.42.0.tar.xz 322832 BLAKE2B 04b61aee3f052561a9605fc7ef1ab053c9bedfced1f2c4868bc65e09689f105379881a348a2e69efc57d31977f40c397e1bf6137adc2e9aa39dedc6f1f211535 SHA512 bfc8c5d4da07bb44b18d42a548d567baaad54d57d24334e07efcb0baf2d6a56e40bb69ec20082d6c4bd775bea328014a5511256c0e68d4ed1db699ebc1b99345
+DIST phosh-osk-stub-0.42.0.tar.xz.asc 833 BLAKE2B 6708017deee1947e726ba989a7b5f929058f519940f45afad0393ff3db0d2159c53fa0e392cc7f9e002b71dd15817459e11e9b254d525ee9db0a4f42a04256d4 SHA512 34572065a6bd21e726225cf5eff25c6dd93f74990b3187665b31400d58d50c6c455c31b59c13f96c2f6109cf4dee62862cb1145ba5ae487ee0df78ba7e274795
--- a/phosh-base/phosh-osk-stub/phosh-osk-stub-0.42.0.ebuild
+++ b/phosh-base/phosh-osk-stub/phosh-osk-stub-0.42.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2-utils meson virtualx verify-sig xdg
+
+DESCRIPTION="On-screen keyboard stub"
+HOMEPAGE="https://gitlab.gnome.org/guidog/phosh-osk-stub"
+SRC_URI="https://sources.phosh.mobi/releases/${PN}/${P}.tar.xz
+	verify-sig? ( https://sources.phosh.mobi/releases/${PN}/${P}.tar.xz.asc )"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="elogind gtk-doc man test"
+RESTRICT="!test? ( test )"
+
+# TODO: package govarnam
+# TODO: hunspell is automagic
+COMMON_DEPEND="
+	app-shells/fzf
+	app-text/hunspell:=
+	>=dev-libs/glib-2.80:2
+	>=dev-libs/gmobile-0.2.0
+	dev-libs/feedbackd
+	dev-libs/json-glib
+	>=dev-libs/wayland-1.14
+	>=gnome-base/gnome-desktop-3.26:3
+	>=gui-libs/libhandy-1.1.90:1
+	x11-libs/cairo
+	>=x11-libs/gtk+-3.22:3[wayland]
+	x11-libs/libxkbcommon[wayland]
+	x11-libs/pango
+	elogind? ( >=sys-auth/elogind-241 )
+	!elogind? ( >=sys-apps/systemd-241:= )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/wayland-protocols-1.12
+"
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/gsettings-desktop-schemas
+"
+BDEPEND="
+	dev-libs/glib:2
+	dev-libs/libxml2:2
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/wayland-scanner
+	sys-devel/gettext
+	gtk-doc? ( dev-util/gi-docgen )
+	man? ( dev-python/docutils )
+	test? ( dev-libs/json-glib )
+	verify-sig? ( sec-keys/openpgp-keys-phosh )
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/phosh.asc"
+
+QA_DESKTOP_FILE="usr/share/applications/sm.puri.Phosh.OskStub.desktop"
+
+src_configure() {
+	local emesonargs=(
+		-Ddefault_osk=false
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use man)
+		$(meson_use test tests)
+	)
+
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+src_install() {
+	meson_src_install
+
+	if use gtk-doc; then
+		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
+		mv "${ED}"/usr/share/doc/pos-${SLOT} "${ED}"/usr/share/gtk-doc/html/ || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
--- a/sys-apps/mission-center/metadata.xml
+++ b/sys-apps/mission-center/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM 'https://www.gentoo.org/dtd/metadata.dtd'>
 <pkgmetadata>
-	<maintainer type="person">
-		<email>brettalcox@gmail.com</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">Syllo/nvtop</remote-id>
 		<remote-id type="gitlab">mission-center-devs/mission-center</remote-id>
--- a/www-apps/invidious/Manifest
+++ b/www-apps/invidious/Manifest
@@ -1,7 +1,4 @@
-DIST invidious-2024.04.27.tar.gz 3286563 BLAKE2B cdbf50dcd56e5cb70384069698322c3dff3d197a7ea7e652d27ca74a37799bc808f3e57a31d8ded1ee2e4ab661151bcdb4493fcb7794e4b40a52038a163155ac SHA512 39e0a3eb44da30a6d8f862ad82f2a9f12701918ee1b7b9fca9a7a21c1e9f14e0e3cc09ce7aba5e7633774df1e813502bb946a3fb4211480ba0a99368ba43b24a
-DIST invidious-2024.08.25.1.tar.gz 3301626 BLAKE2B 63f1e82eb1ec0f90fc6157a47872c733145aefd275fdee79f8de9b6ce07a2a01e8a73c20a08e3302ca35aa1bb5ae5da95b9218001cb2327d215f135e56aaa1f7 SHA512 e34e934b8e60a726838a7d3341f0c766c7233a1fdff17a68e42b2ae72ed008b582da619a5c460f8b1c3d072f12e344d295de488f442e2e43036c19335dc714e9
 DIST invidious-2024.11.10.0.tar.gz 3310536 BLAKE2B 8e122fb5c4ed250e049a3e8fdd6d3d5c41e443c3916ca36e8edb455d9fa8d32e3231d6f5e8af2226ff7340972eed26acf8d00b32bea75f7bafb20ce2251ffa05 SHA512 3ed9d47c520736d9df95541f6a85cc456c4b9ce03bd8f38905f7a11542ba0875d9d1736be82bee8d56039937b0321188ce0228d760ad616e6cc2d0aa7cbd8535
-DIST invidious-mocks-11ec372.tar.gz 180392 BLAKE2B 899db54d4efdfc231d588155d52784d70a364c7382bd1652a3c384dc618435d646a50e957c1407f6ac7ade410e811438b23a16d9949e63f7791e34960bba1fc6 SHA512 7bc1aa17f555babaceca15fe51061400a6c8a9cb01ad15c5d22c155f3164aca7c6e49c8dcdbd894e1593c2c69d3ddaa201544b068510281e910b90a11a407e59
 DIST invidious-mocks-b55d58d.tar.gz 222861 BLAKE2B 3391b290be5e869610d8dfc31307fd046aa2fe726d6fe98323a5509da1ffcc838668ba3f6aaecce04cf1eee9c90f029a7b49b560b2c49a5905570117fc7f2cf0 SHA512 c19deb047baa570f16194ca26ca7e5eab3538b21db8e6139f404e6f3bcbe5f4f8aff9b45e7e5e9a3b525581da403e6d5bef10ac55a654e5b8f031565d472d625
 DIST video.js-7.12.1.tgz 3511060 BLAKE2B 9ae5b1f6a0afab918b7dc3555fff2708963d4abb6c7903e13145b2d5393fb80e4ab6302c423b0ba15c805a624a23c25dd3db7865f1510c44cfc5d1d5ab1dbf54 SHA512 d0ec25eeae196e6e981d7f783fd595a90daf9e97de3723ad4cdc2e4c41282a8bd9a20a2a57631c3949ac40633811db60e2f19388fef816fe8755ad55e857917e
 DIST videojs-contrib-quality-levels-2.1.0.tgz 18770 BLAKE2B f6c4789835379380bde941d032bb0afbc49d093eb9407308094afd0b9c1f25781f57d8f8db928e318eb270927574a5fd505f08af13f0baf55897723ec489b769 SHA512 76a19019b2fd00586e731922ed9874737908847d0f00f707121ea351d47268509578ebaa9c9ace62cff7c0db6ca240dd05d45fd83bb66a79e9bb86765da49946
--- a/www-apps/invidious/invidious-2024.04.27.ebuild
+++ b/www-apps/invidious/invidious-2024.04.27.ebuild
@@ -1,158 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit check-reqs shards systemd
-
-MY_PV="2.$(ver_rs 1- '')"
-MOCKS_COMMIT="11ec372f72747c09d48ffef04843f72be67d5b54"
-MOCKS_P="${PN}-mocks-${MOCKS_COMMIT:0:7}"
-DESCRIPTION="Invidious is an alternative front-end to YouTube"
-HOMEPAGE="
-	https://invidious.io/
-	https://github.com/iv-org/invidious
-"
-IV_ORG="https://github.com/iv-org"
-NPM="https://registry.npmjs.org"
-SRC_URI="
-	${IV_ORG}/${PN}/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz
-	${NPM}/video.js/-/video.js-7.12.1.tgz
-	${NPM}/videojs-contrib-quality-levels/-/videojs-contrib-quality-levels-2.1.0.tgz
-	${NPM}/videojs-http-source-selector/-/videojs-http-source-selector-1.1.6.tgz
-	${NPM}/videojs-markers/-/videojs-markers-1.0.1.tgz
-	${NPM}/videojs-mobile-ui/-/videojs-mobile-ui-0.6.1.tgz
-	${NPM}/videojs-overlay/-/videojs-overlay-2.1.4.tgz
-	${NPM}/videojs-share/-/videojs-share-3.2.1.tgz
-	${NPM}/videojs-vr/-/videojs-vr-1.8.0.tgz
-	${NPM}/videojs-vtt-thumbnails/-/videojs-vtt-thumbnails-0.0.13.tgz
-	test? (
-		${IV_ORG}/mocks/archive/${MOCKS_COMMIT}.tar.gz -> ${MOCKS_P}.tar.gz
-	)
-"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="AGPL-3 Apache-2.0 MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-db/sqlite:3
-	dev-libs/boehm-gc
-	dev-libs/libevent:=
-	dev-libs/libpcre2:=
-	dev-libs/libxml2:2
-	dev-libs/libyaml
-	dev-libs/openssl:=
-	sys-libs/zlib:=
-"
-RDEPEND="${COMMON_DEPEND}
-	acct-user/invidious
-	gnome-base/librsvg
-"
-DEPEND="${COMMON_DEPEND}
-	dev-crystal/athena-negotiation
-	>=dev-crystal/kemal-1.1.0
-	<dev-crystal/kemal-1.2.0
-	dev-crystal/kilt
-	>=dev-crystal/protodec-0.1.5
-	virtual/crystal-db[postgres,sqlite]
-	test? (
-		dev-crystal/spectator
-	)
-"
-
-DOCS=( {CHANGELOG,README}.md TRANSLATION )
-
-CHECKREQS_MEMORY="2G"
-
-CRYSTAL_DEFINES=( -Dskip_videojs_download )
-
-src_unpack() {
-	local src depname destname js css
-
-	for src in ${A}; do
-		if [[ ${src} == "${P}.tar.gz" ]]; then
-			unpack ${src}
-		elif [[ ${src} == "${MOCKS_P}.tar.gz" ]]; then
-			unpack "${src}"
-			mkdir -p "${S}"/mocks || die
-			rmdir "${S}"/mocks || die
-			mv mocks-${MOCKS_COMMIT} "${S}"/mocks || die
-		else
-			depname="${src%-*}"
-
-			case ${depname} in
-				video.js)
-					js="video.js" ;;
-				*)
-					js="${depname}.js" ;;
-			esac
-
-			case ${depname} in
-				video.js)
-					css="video-js.css" ;;
-				videojs-markers)
-					css="videojs.markers.css" ;;
-				*)
-					css="${depname}.css" ;;
-			esac
-
-			# Create the destination directory
-			destname="${S}/assets/videojs/${depname}"
-			mkdir -p "${destname}" || die
-
-			# Create a temporary directory
-			mkdir -p "${WORKDIR}"/${depname} || die
-			cd "${WORKDIR}"/${depname} || die
-
-			# Copy assets
-			unpack ${src}
-			cd package/dist || die
-			mv ${js} ${destname} || die
-			if [[ -f ${css} ]]; then
-				mv ${css} ${destname} || die
-			fi
-
-			cd "${WORKDIR}" || die
-		fi
-	done
-}
-
-src_prepare() {
-	default
-
-	local datadir="${EPREFIX}/usr/share/invidious"
-	sed -i src/invidious.cr \
-		-e 's/\(CURRENT_BRANCH \) = .*/\1 = "master"/' \
-		-e "s/\(CURRENT_COMMIT \) = .*/\1 = \"${COMMIT:0:7}\"/" \
-		-e "s/\(CURRENT_VERSION\) = .*/\1 = \"${PV}\"/" \
-		-e "s/\(ASSET_COMMIT\) = .*/\1 = \"${COMMIT:0:7}\"/" || die
-
-	# fix paths
-	sed -i src/invidious.cr \
-		-e "s|\(public_folder\) \"assets\"|\1 \"${datadir}/assets\"|" || die
-	sed -i src/invidious/helpers/i18n.cr \
-		-e "s|File.read(\"locales/|File.read(\"${datadir}/locales/|" || die
-	sed -i src/invidious/database/base.cr \
-		-e "s|config/sql|${datadir}/\0|g" || die
-
-	rm shard.lock || die
-}
-
-src_install() {
-	dobin invidious
-	einstalldocs
-
-	insinto /usr/share/invidious
-	doins -r assets config locales
-
-	insinto /etc/invidious
-	newins config/config.example.yml config.yml
-
-	systemd_dounit "${FILESDIR}"/invidious.service
-	newinitd "${FILESDIR}"/invidious.initd ${PN}
-	newconfd "${FILESDIR}"/invidious.confd ${PN}
-}
--- a/www-apps/invidious/invidious-2024.08.25.1.ebuild
+++ b/www-apps/invidious/invidious-2024.08.25.1.ebuild
@@ -1,158 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit check-reqs shards systemd
-
-MY_PV="2.$(ver_rs 1-2 '')"
-MOCKS_COMMIT="11ec372f72747c09d48ffef04843f72be67d5b54"
-MOCKS_P="${PN}-mocks-${MOCKS_COMMIT:0:7}"
-DESCRIPTION="Invidious is an alternative front-end to YouTube"
-HOMEPAGE="
-	https://invidious.io/
-	https://github.com/iv-org/invidious
-"
-IV_ORG="https://github.com/iv-org"
-NPM="https://registry.npmjs.org"
-SRC_URI="
-	${IV_ORG}/${PN}/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz
-	${NPM}/video.js/-/video.js-7.12.1.tgz
-	${NPM}/videojs-contrib-quality-levels/-/videojs-contrib-quality-levels-2.1.0.tgz
-	${NPM}/videojs-http-source-selector/-/videojs-http-source-selector-1.1.6.tgz
-	${NPM}/videojs-markers/-/videojs-markers-1.0.1.tgz
-	${NPM}/videojs-mobile-ui/-/videojs-mobile-ui-0.6.1.tgz
-	${NPM}/videojs-overlay/-/videojs-overlay-2.1.4.tgz
-	${NPM}/videojs-share/-/videojs-share-3.2.1.tgz
-	${NPM}/videojs-vr/-/videojs-vr-1.8.0.tgz
-	${NPM}/videojs-vtt-thumbnails/-/videojs-vtt-thumbnails-0.0.13.tgz
-	test? (
-		${IV_ORG}/mocks/archive/${MOCKS_COMMIT}.tar.gz -> ${MOCKS_P}.tar.gz
-	)
-"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="AGPL-3 Apache-2.0 MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-db/sqlite:3
-	dev-libs/boehm-gc
-	dev-libs/libevent:=
-	dev-libs/libpcre2:=
-	dev-libs/libxml2:2
-	dev-libs/libyaml
-	dev-libs/openssl:=
-	sys-libs/zlib:=
-"
-RDEPEND="${COMMON_DEPEND}
-	acct-user/invidious
-	gnome-base/librsvg
-"
-DEPEND="${COMMON_DEPEND}
-	dev-crystal/athena-negotiation
-	>=dev-crystal/kemal-1.1.0
-	<dev-crystal/kemal-1.2.0
-	dev-crystal/kilt
-	>=dev-crystal/protodec-0.1.5
-	virtual/crystal-db[postgres,sqlite]
-	test? (
-		dev-crystal/spectator
-	)
-"
-
-DOCS=( {CHANGELOG,README}.md TRANSLATION )
-
-CHECKREQS_MEMORY="2G"
-
-CRYSTAL_DEFINES=( -Dskip_videojs_download )
-
-src_unpack() {
-	local src depname destname js css
-
-	for src in ${A}; do
-		if [[ ${src} == "${P}.tar.gz" ]]; then
-			unpack ${src}
-		elif [[ ${src} == "${MOCKS_P}.tar.gz" ]]; then
-			unpack "${src}"
-			mkdir -p "${S}"/mocks || die
-			rmdir "${S}"/mocks || die
-			mv mocks-${MOCKS_COMMIT} "${S}"/mocks || die
-		else
-			depname="${src%-*}"
-
-			case ${depname} in
-				video.js)
-					js="video.js" ;;
-				*)
-					js="${depname}.js" ;;
-			esac
-
-			case ${depname} in
-				video.js)
-					css="video-js.css" ;;
-				videojs-markers)
-					css="videojs.markers.css" ;;
-				*)
-					css="${depname}.css" ;;
-			esac
-
-			# Create the destination directory
-			destname="${S}/assets/videojs/${depname}"
-			mkdir -p "${destname}" || die
-
-			# Create a temporary directory
-			mkdir -p "${WORKDIR}"/${depname} || die
-			cd "${WORKDIR}"/${depname} || die
-
-			# Copy assets
-			unpack ${src}
-			cd package/dist || die
-			mv ${js} ${destname} || die
-			if [[ -f ${css} ]]; then
-				mv ${css} ${destname} || die
-			fi
-
-			cd "${WORKDIR}" || die
-		fi
-	done
-}
-
-src_prepare() {
-	default
-
-	local datadir="${EPREFIX}/usr/share/invidious"
-	sed -i src/invidious.cr \
-		-e 's/\(CURRENT_BRANCH \) = .*/\1 = "master"/' \
-		-e "s/\(CURRENT_COMMIT \) = .*/\1 = \"${COMMIT:0:7}\"/" \
-		-e "s/\(CURRENT_VERSION\) = .*/\1 = \"${PV}\"/" \
-		-e "s/\(ASSET_COMMIT\) = .*/\1 = \"${COMMIT:0:7}\"/" || die
-
-	# fix paths
-	sed -i src/invidious.cr \
-		-e "s|\(public_folder\) \"assets\"|\1 \"${datadir}/assets\"|" || die
-	sed -i src/invidious/helpers/i18n.cr \
-		-e "s|File.read(\"locales/|File.read(\"${datadir}/locales/|" || die
-	sed -i src/invidious/database/base.cr \
-		-e "s|config/sql|${datadir}/\0|g" || die
-
-	rm shard.lock || die
-}
-
-src_install() {
-	dobin invidious
-	einstalldocs
-
-	insinto /usr/share/invidious
-	doins -r assets config locales
-
-	insinto /etc/invidious
-	newins config/config.example.yml config.yml
-
-	systemd_dounit "${FILESDIR}"/invidious.service
-	newinitd "${FILESDIR}"/invidious.initd ${PN}
-	newconfd "${FILESDIR}"/invidious.confd ${PN}
-}
--- a/www-apps/invidious/invidious-2024.11.10.0.ebuild
+++ b/www-apps/invidious/invidious-2024.11.10.0.ebuild
@@ -56,7 +56,7 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 	dev-crystal/athena-negotiation
 	dev-crystal/http_proxy
-	>=dev-crystal/kemal-1.1.0
+	>=dev-crystal/kemal-1.1.2-r1
 	<dev-crystal/kemal-1.2.0
 	dev-crystal/kilt
 	>=dev-crystal/protodec-0.1.5
--- a/www-apps/invidious/metadata.xml
+++ b/www-apps/invidious/metadata.xml
@@ -1,12 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>cyber+gentoo@sysrq.in</email>
+		<name>Anna</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">iv-org/invidious</remote-id>
 		<maintainer>
 			<name>Omar Roth</name>
 			<email>omarroth@protonmail.com</email>
 		</maintainer>
+		<maintainer>
+			<name>Invidious team</name>
+			<email>contact@invidious.io</email>
+		</maintainer>
+		<doc>https://docs.invidious.io</doc>
 	</upstream>
 </pkgmetadata>
				`@@ -0,0 +1 @@`
				`DIST autopxd2-2.5.0.tar.gz 109511 BLAKE2B 599ac008291d60a5734de034ff7341048b83114c835056525b08efbce20b9fd087e211cd00debd35ff2b050d9304e2218e48402ee12b47a731ed94be9dfaa009 SHA512 e1eecf7742d0520e62d850eff98904635507d75aaf1c6180d85d606050dfa216d5acd3e955a252db51986c11726f6e48b1ab8d2d9ea0893b0f5827332edd7ce0`