diff --git a/dev-python/desktop-notifier/Manifest b/dev-python/desktop-notifier/Manifest
index 8c4ab269ca..3a5318455e 100644
--- a/dev-python/desktop-notifier/Manifest
+++ b/dev-python/desktop-notifier/Manifest
@@ -1,2 +1 @@
-DIST desktop-notifier-6.1.0.gh.tar.gz 3876246 BLAKE2B c44833e65f9a7fc1f5965545cad6f7bf68068c41bf1eb6e820f0e2b9403645003eb88745eb344c5b7c70c3335559e125a330ae0bc96f7dcb759a0f8d8b59b89f SHA512 9e7bc21e2814e087e5cd483811272cf573f9a0020dc95cbcb19dc05b53f846526b59ff15025983ffabfdb2e2348312b507e25bf386b04d9c217662712e309cd4
 DIST desktop-notifier-6.1.1.gh.tar.gz 3876119 BLAKE2B 04837aa94c32b7cb869272791ae14790c92f7b3f83f9442be793e05e7dcc7dba627e1ec36442488080c2d8c8987b3acf1a4b7f3e10453756157f832daf46ebae SHA512 dc96fee153d3a36238794f8ecd65b5e2fb0b20dfbc3c8a5a6530870f24e172b689c8c67229706b3bf58dbe3053f91f89b9f16979496bd60fc68536907d7cac68
diff --git a/dev-python/desktop-notifier/desktop-notifier-6.1.0.ebuild b/dev-python/desktop-notifier/desktop-notifier-6.1.0.ebuild
deleted file mode 100644
index 2fc0e6d378..0000000000
--- a/dev-python/desktop-notifier/desktop-notifier-6.1.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2021-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{11..13} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1
-
-DESCRIPTION="desktop-notifier is a Python library for cross-platform desktop notifications"
-HOMEPAGE="
-	https://desktop-notifier.readthedocs.io
-	https://pypi.org/project/desktop-notifier/
-	https://github.com/samschott/desktop-notifier
-"
-SRC_URI="https://github.com/samschott/desktop-notifier/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/dbus-fast[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/build[${PYTHON_USEDEP}]
-	test? (
-		dev-python/bidict
-		dev-python/pytest-asyncio
-	)
-"
-
-# Most tests fail, they need some prior setup
-EPYTEST_DESELECT=(
-	tests/test_api.py::test_send
-	tests/test_api.py::test_clear
-	tests/test_api.py::test_clear_all
-	tests/test_callbacks
-	tests/test_sync_api
-)
-distutils_enable_tests pytest
diff --git a/dev-python/dropbox/Manifest b/dev-python/dropbox/Manifest
index bae8fd436a..cf1942f724 100644
--- a/dev-python/dropbox/Manifest
+++ b/dev-python/dropbox/Manifest
@@ -1,2 +1 @@
-DIST dropbox-sdk-python-11.36.2.gh.tar.gz 1166700 BLAKE2B afd0592bd1e18416f91d1fd673f2b7b7f605eaab80c02a9d8535fefa7fb23c8bc6a08c191492e1ced5d4b2d17fa72e8e5b6a58ba797f170c0efb75e755a451c9 SHA512 ec27685b4e5344e706bffb68b110ef2d7b307a5865bed3e042d6835f3666d2eefca646627a07bae1a3142e5f0346865fe285b037b00f3da081eb5797f9a768f5
 DIST dropbox-sdk-python-12.0.2.gh.tar.gz 1155008 BLAKE2B cc0006909a204f0b9efab7605680027b144dfff5c91ddf31460884ada4948b285ff0777f19f9395a1fc447a906018c3a43b40bc7651bdbb715c597849e7ecba9 SHA512 73834c89e2dc8b129a549d082a7862ec81f731c4977c6650cc421c08b62903b78c9fa1e191a330022591e2cb0e29b825e89e2d04056e2f4e6362a168b57fec39
diff --git a/dev-python/dropbox/dropbox-11.36.2.ebuild b/dev-python/dropbox/dropbox-11.36.2.ebuild
deleted file mode 100644
index 09f749d0ba..0000000000
--- a/dev-python/dropbox/dropbox-11.36.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{11..12} )
-inherit distutils-r1
-
-GH_PN=dropbox-sdk-python
-
-DESCRIPTION="The offical Dropbox SDK for Python"
-HOMEPAGE="https://www.dropbox.com/developers"
-# pypi does not have tests, stick with gh
-SRC_URI="https://github.com/dropbox/${GH_PN}/archive/refs/tags/v${PV}.tar.gz -> ${GH_PN}-${PV}.gh.tar.gz"
-S="${WORKDIR}"/${GH_PN}-${PV}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/requests-2.16.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
-	>=dev-python/stone-2.0.0[${PYTHON_USEDEP}]
-"
-
-# disable tests that need SCOPED_USER_DROPBOX_TOKEN
-# and tests that fail
-EPYTEST_DESELECT=(
-	test/integration/test_dropbox.py
-	test/unit/test_dropbox_unit.py::TestClient
-	test/unit/test_dropbox_unit.py::TestOAuth::test_NoRedirect_whole_flow
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# this is wrong
-	sed -i -e "s/^import mock$/from unittest import mock/" test/unit/test_dropbox_unit.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/dropbox/dropbox-12.0.2.ebuild b/dev-python/dropbox/dropbox-12.0.2.ebuild
index 1acc87ded2..cf9d12a323 100644
--- a/dev-python/dropbox/dropbox-12.0.2.ebuild
+++ b/dev-python/dropbox/dropbox-12.0.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{11..12} )
+PYTHON_COMPAT=( python3_{11..14} )
 inherit distutils-r1
 
 GH_PN=dropbox-sdk-python
diff --git a/dev-python/sphinx-paramlinks/sphinx-paramlinks-0.6.0.ebuild b/dev-python/sphinx-paramlinks/sphinx-paramlinks-0.6.0.ebuild
index ccf50f596e..74fcc1089b 100644
--- a/dev-python/sphinx-paramlinks/sphinx-paramlinks-0.6.0.ebuild
+++ b/dev-python/sphinx-paramlinks/sphinx-paramlinks-0.6.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{11..12} )
+PYTHON_COMPAT=( python3_{11..13} )
 PYPI_NO_NORMALIZE=1
 inherit distutils-r1 pypi
 
diff --git a/dev-python/stone/Manifest b/dev-python/stone/Manifest
index 3b7db4c057..1bf8dddc36 100644
--- a/dev-python/stone/Manifest
+++ b/dev-python/stone/Manifest
@@ -1,2 +1 @@
-DIST stone-3.3.8.gh.tar.gz 281200 BLAKE2B 17af8af8d5cf01483ab4f63ebb694076e675880c0374a11a4b38f02d8783a35c4b518a9109721523fb3efe5b9f6f3381f288a4e00322dfda62343f77f2768f43 SHA512 bd7cd80a44f59225cbd322e385cfc6b6eccd7e30d8e6f0939d0fd65405b75773b1bc4449f6737366d0fa481c5860931b20ffe048eff57aad34ae90be47d18020
 DIST stone-3.3.9.gh.tar.gz 290882 BLAKE2B ad6e579d98b95d1828d0050ec29c53c6e5e52968def1fc10d315d311afdb8f350e9a7fd26330dce692c8f2419fe62ee22dba5ae54f0bcc91f09f51d7a7368f9c SHA512 916e8bce6e46114da8e684af25666d15257aa33bb0abb571c10f84457cfb958c309ca35bd3884f816ef8091c877e20b56b392cf5c85a760fab95f116efc7b321
diff --git a/dev-python/stone/stone-3.3.8.ebuild b/dev-python/stone/stone-3.3.8.ebuild
deleted file mode 100644
index 6894d90cea..0000000000
--- a/dev-python/stone/stone-3.3.8.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2021-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
-
-DESCRIPTION="The Official Api Spec Language for Dropbox"
-HOMEPAGE="
-	https://www.dropbox.com/developers
-	https://github.com/dropbox/stone
-	https://pypi.org/project/stone/
-"
-SRC_URI="https://github.com/dropbox/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/ply[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/stone/stone-3.3.9.ebuild b/dev-python/stone/stone-3.3.9.ebuild
index 4699b9fe2b..655688dcbe 100644
--- a/dev-python/stone/stone-3.3.9.ebuild
+++ b/dev-python/stone/stone-3.3.9.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{11..13} )
+PYTHON_COMPAT=( python3_{11..14} )
 
 inherit distutils-r1
 
diff --git a/dev-python/survey/Manifest b/dev-python/survey/Manifest
index 2670d5cf11..50b1b1e88e 100644
--- a/dev-python/survey/Manifest
+++ b/dev-python/survey/Manifest
@@ -1,2 +1 @@
-DIST survey-5.3.1.gh.tar.gz 1564902 BLAKE2B de8bafd2fc5a683ca0364f9e1540e177bf2f10344406563ff3ef6723abd2c415517e72ffacccae51e1d69912b966bf678c2abc62b22545f1c5871d4f3459d121 SHA512 383d7339e93760294095881b6ebf3fd00d687210865303aa2c17a51a390f8087b8666364e0ba7b7657e009803665cf02e64f280c8a09a535ce1fa1ebeaafe963
 DIST survey-5.4.2.gh.tar.gz 1565387 BLAKE2B f2e8542bb43e029ffc59335461f65d5216128273d01ff3237cf828bb5be2aac613b9872a0504186ab30b11d42438e76c16e758960ea39e686b95bfa89faa642d SHA512 3d3bf0911e1ef49814bd040bf01d3ae7024cecb5d0e20e46dcbaf6e1f8896d4cb9eeb9ed1dae7ff3431acfb706a334d6c2afa89d4f1cd9b82661a0defe53803c
diff --git a/dev-python/survey/survey-5.3.1.ebuild b/dev-python/survey/survey-5.3.1.ebuild
deleted file mode 100644
index 39643f2d9b..0000000000
--- a/dev-python/survey/survey-5.3.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{11..12} )
-inherit distutils-r1
-
-DESCRIPTION="A simple library for creating beautiful interactive prompts"
-HOMEPAGE="
-	https://github.com/Exahilosys/survey
-	https://pypi.org/project/survey/
-"
-MY_PV=${PV/_/-}
-SRC_URI="https://github.com/Exahilosys/survey/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-autodoc-typehints \
-	dev-python/sphinx-paramlinks \
-	dev-python/sphinx-rtd-theme
-
-src_configure() {
-	distutils-r1_src_configure
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
diff --git a/dev-python/survey/survey-5.4.2.ebuild b/dev-python/survey/survey-5.4.2.ebuild
index 39643f2d9b..323dcf82a1 100644
--- a/dev-python/survey/survey-5.4.2.ebuild
+++ b/dev-python/survey/survey-5.4.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{11..12} )
+PYTHON_COMPAT=( python3_{11..14} )
 inherit distutils-r1
 
 DESCRIPTION="A simple library for creating beautiful interactive prompts"
diff --git a/games-util/curseforge/Manifest b/games-util/curseforge/Manifest
index f81c73a71c..aa060d4e89 100644
--- a/games-util/curseforge/Manifest
+++ b/games-util/curseforge/Manifest
@@ -1 +1 @@
-DIST curseforge-1.277.0_p25562.deb 90169970 BLAKE2B dcb2905e097eb5d8bf03cb2026e56b98700ea1a74796e31497e014e51e331f8796f93d565009e380b3aad332d6b050ab01297f0def3659ea47a60337537a8922 SHA512 1ed5201cc0e357af6afc31861f762109bc6e5953d010a91c4845262ccdacace668854cba4b5e6911f1d9e2e47065a58ef04367963a3f30cff49b99d03ed1bd27
+DIST curseforge-1.278.0_p25906.deb 90252740 BLAKE2B 5be2e16b4aed2def891373f4c4a905dbf8b3ee764593bc3579e13b7a2262db00b0acf8766c40e45bc26dc341f43a0d0cd3e2fd0a9e9a5f55812e46c2be9449ac SHA512 464edbe6394117cc0b704fe6d253f1034453199920151c59c4763edbd6ab0f4285e57d6d4a4132496e1d84f3bf2b04d451fb4016ece9908db12a353629141267
diff --git a/games-util/curseforge/curseforge-1.277.0_p25562.ebuild b/games-util/curseforge/curseforge-1.278.0_p25906.ebuild
similarity index 100%
rename from games-util/curseforge/curseforge-1.277.0_p25562.ebuild
rename to games-util/curseforge/curseforge-1.278.0_p25906.ebuild
diff --git a/media-libs/wivrn/wivrn-9999.ebuild b/media-libs/wivrn/wivrn-9999.ebuild
index 058c7e1e36..2445e711db 100644
--- a/media-libs/wivrn/wivrn-9999.ebuild
+++ b/media-libs/wivrn/wivrn-9999.ebuild
@@ -84,7 +84,7 @@ if [[ ${PV} == 9999 ]]; then
 		git-r3_src_unpack
 		default_src_unpack
 
-		local MONADO_COMMIT=$(grep "GIT_TAG" "${P}/CMakeLists.txt" | awk '{print $2}' | tail -1)
+		local MONADO_COMMIT=$(cat "${P}/monado-rev")
 		git-r3_fetch "${MONADO_REPO_URI}" "${MONADO_COMMIT}"
 		git-r3_checkout "${MONADO_REPO_URI}" "${WORKDIR}/monado-src"
 	}
diff --git a/media-sound/qbitmplayer/Manifest b/media-sound/qbitmplayer/Manifest
index fc2d51e498..38912eec6a 100644
--- a/media-sound/qbitmplayer/Manifest
+++ b/media-sound/qbitmplayer/Manifest
@@ -1,2 +1,3 @@
 DIST QBitMPlayer-2.7.0.tar.gz 28591 BLAKE2B e7e3b8244502b81f70250dea75f004c7ae2bae5e2b272b99ed3081a8945e72d405a66f968f8e7f16305556b115c8f534b59dddc6a2e71f0f4e549b586994fff9 SHA512 5264f5ac9f1f289c80a49479786dae96f740f802bc50b0b821dee6bf3ddcc10e4ba9780e8d09a36269c13d341867832c19166d5ce53292f5c87190bd69855605
 DIST QBitMPlayer-2.8.0.tar.gz 30101 BLAKE2B a6ac09bb87ca6e3671eb740f286206aa5c0c2770e281b0ed660ae1baea6d05aba83e6c8012d3e6485f8bb9b7f1c53cc0f62d311f80ca0c31228e560e3c4c084e SHA512 61d426a59835aa39f79fd6c81709c37e14a02a77761d6285d1609fbdef549775cd01420d2efec2084101e38cf89a86ac9a4c73b4dfa92f75373edec73edad8ea
+DIST QBitMPlayer-2.9.0.tar.gz 32527 BLAKE2B 0d57d08bb9ec5540aadda6a8458dbbbea17b0a1895b4ef0bacad433e0bf92e175f01b4983f55ed2a18aff7c49c2d2a2b652baa047b1e1c9e9ffd030d2c81e576 SHA512 70e36c3392b8d2fca73f8f9806a56004c41d12cd62a1d67b09e4d6e995a9c43d03ae9e9ef8da70dbab87fa582364c24e1504d3e61ded3a297c2fe2b386a782e4
diff --git a/media-sound/qbitmplayer/qbitmplayer-2.9.0.ebuild b/media-sound/qbitmplayer/qbitmplayer-2.9.0.ebuild
new file mode 100644
index 0000000000..bab70d1614
--- /dev/null
+++ b/media-sound/qbitmplayer/qbitmplayer-2.9.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2024-2025 Brayan M. Salazar <this.brayan@proton.me>
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="Music Player written in C++ & Qt."
+HOMEPAGE="https://github.com/brookiestein/QBitMPlayer"
+SRC_URI="https://github.com/brookiestein/QBitMPlayer/archive/refs/tags/${PV}.tar.gz -> QBitMPlayer-${PV}.tar.gz"
+S="${WORKDIR}/QBitMPlayer-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="dbus +libnotify"
+
+DEPEND="
+	dev-qt/qtmultimedia:6
+	dev-qt/qtbase:6[widgets]
+	dbus? ( dev-qt/qtbase:6[dbus] )
+	libnotify? ( x11-libs/libnotify )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	>=dev-build/cmake-3.28
+	dev-qt/qttools:6[linguist]
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DQT_VERSION_MAJOR=6
+	)
+
+	if use dbus; then
+		mycmakeargs+=(
+			-DUSE_IPC=1
+		)
+	fi
+
+	if use libnotify; then
+		mycmakeargs+=(
+			-DUSE_NOTIFICATIONS=1
+		)
+	fi
+
+	cmake_src_configure
+}
diff --git a/net-misc/maestral-qt/maestral-qt-1.9.4.ebuild b/net-misc/maestral-qt/maestral-qt-1.9.4.ebuild
index 0f2b984bf6..1df5acb3f2 100644
--- a/net-misc/maestral-qt/maestral-qt-1.9.4.ebuild
+++ b/net-misc/maestral-qt/maestral-qt-1.9.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{11..12} )
+PYTHON_COMPAT=( python3_{11..13} )
 inherit desktop distutils-r1
 
 MY_PV=${PV/_rc/.dev}
diff --git a/net-misc/maestral/maestral-1.9.4.ebuild b/net-misc/maestral/maestral-1.9.4.ebuild
index a916168420..5a16187d5d 100644
--- a/net-misc/maestral/maestral-1.9.4.ebuild
+++ b/net-misc/maestral/maestral-1.9.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{11..12} )
+PYTHON_COMPAT=( python3_{11..13} )
 inherit distutils-r1 xdg
 
 MY_PV=${PV/_rc/.dev}
@@ -39,6 +39,9 @@ RDEPEND="
 "
 BDEPEND="
 	dev-python/build[${PYTHON_USEDEP}]
+	test? (
+		dev-python/bidict[${PYTHON_USEDEP}]
+	)
 "
 
 EPYTEST_DESELECT=(