Adding metadata

17 files changed, 132 insertions, 626 deletions

diff --git a/dev-python/clang/Manifest b/dev-python/clang/Manifest
index b7114fc7aeab..534a9e0fb12c 100644
--- a/dev-python/clang/Manifest
+++ b/dev-python/clang/Manifest
@@ -13,4 +13,5 @@ DIST llvm-project-19.1.6.src.tar.xz.sig 438 BLAKE2B 1791e98252ab78a9a762ef601ff9
 DIST llvm-project-19.1.7.src.tar.xz 141249332 BLAKE2B 1259ed7f9aca7b35e89d818befdee20fd8bed4d2dc2c2c6f6f56451fd43d35ac03a0a5a406e142d22b25137999dc5b17471c196f8fcf79f20a8296832d900f6d SHA512 c7d63286d662707a9cd54758c9e3aaf52794a91900c484c4a6efa62d90bc719d5e7a345e4192feeb0c9fd11c82570d64677c781e5be1d645556b6aa018e47ec8
 DIST llvm-project-19.1.7.src.tar.xz.sig 438 BLAKE2B 4015140f4ba77de45039bdbdfbaf6f30e75705123d067ea97175d91d7a5b6a75008df01d99ae7aa16aaa3b101f3f41e38d01f04158f95a261d617b3ede0254cd SHA512 195797b06ac80a742e0ccbc03a50dc06dd2e04377d783d5474e3e72c5a75203b60292b047929312a411d22b137a239943fba414a4d136a2be14cbff978eb6bda
 DIST llvm-project-8af4d206e0f979f68925a08f9dffd60a98ce97e2.tar.gz 224825146 BLAKE2B 36e9c8f9615d65fc72beb699c4ce5959676975267a4c4288a01009d26ab84ae411f2855e4e6475957b91ddc21da29251ab22e331395bc9fee0f9bc907a05384a SHA512 ec72cdd7cc6d9bef31ae9295606d18e4935468fe60ab632aced21261d437e76f11d83d0d7199a6028689990260d9155098f7d64e97db0e0af28ea6c75a773bcc
+DIST llvm-project-97c3a990f05606cb807faf53bc41302fb62c7980.tar.gz 226261635 BLAKE2B 9dd0bdfaa6ee984747f2d9d8b9606cd8d2e75fa64d45fd7c87227ddca7cffe888a1d932d73c123b25360690fd687554cc333fb3d871ab0e72ddd2b1158bae2e0 SHA512 466ae8aea014fd396f3fd6b77055238a672f012b79f25ed0b215e01f968a56dd4eeaf148d03246701b1ac4cbb8f02a4325142d6e5503fb6231e330c2e49e28e7
 DIST llvm-project-c3a935e3f967f8f22f5db240d145459ee621c1e0.tar.gz 225133913 BLAKE2B ced922010bad14df6bce0dbbb9323ee3cc9d7bf2f764f8c982d134d7a97e38d84b0b81635bbb16031aa1899c744e7c036cec5d1957733bbed7a2f18f89db0b6f SHA512 0ea083defb3c0ecaa5d8d28682f140c68ec6b3ab6cbfc60fc38a9265a8eb88b618c075d6ae03170ed54c5e7dcb3b7003eaacea2fcb115e9864b64a17cea0013d
diff --git a/dev-python/clang/clang-20.0.0_pre20250122.ebuild b/dev-python/clang/clang-20.0.0_pre20250122.ebuild
new file mode 100644
index 000000000000..a99c5601e047
--- /dev/null
+++ b/dev-python/clang/clang-20.0.0_pre20250122.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+inherit llvm.org python-r1
+
+DESCRIPTION="Python bindings for llvm-core/clang"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# The module is opening libclang.so directly, and doing some blasphemy
+# on top of it.
+DEPEND="
+	>=llvm-core/clang-${PV}:*
+	!llvm-core/llvm:0[clang(-),python(-)]
+	!llvm-core/clang:0[python(-)]
+"
+RDEPEND="
+	${DEPEND}
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	test? (
+		llvm-core/clang:${LLVM_MAJOR}
+	)
+"
+
+LLVM_COMPONENTS=( clang/bindings/python )
+llvm.org_set_globals
+
+python_test() {
+	# tests rely on results from a specific clang version, so override
+	# the search path
+	local -x CLANG_LIBRARY_PATH=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)
+	local -x CLANG_NO_DEFAULT_CONFIG=1
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+src_test() {
+	python_foreach_impl python_test
+}
+
+src_install() {
+	python_foreach_impl python_domodule clang
+}
diff --git a/dev-python/id/id-1.5.0.ebuild b/dev-python/id/id-1.5.0.ebuild
index 1c1e1ea82686..d307cbab63e0 100644
--- a/dev-python/id/id-1.5.0.ebuild
+++ b/dev-python/id/id-1.5.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
diff --git a/dev-python/langdetect/Manifest b/dev-python/langdetect/Manifest
index 37a64204a00a..a11d7c268c91 100644
--- a/dev-python/langdetect/Manifest
+++ b/dev-python/langdetect/Manifest
@@ -1,3 +1 @@
 DIST langdetect-1.0.9.tar.gz 981474 BLAKE2B ea8a9c3f16a2987c080742473bff4f2c1503f53fb3c2b40b0b1d6212bb6133ea22dce7864ffcfb8968c3a46b157d45cb3e2cf6f84bdbed0266cc716a853b032c SHA512 7558d674c47b080c79e43a00a25d2c7f77188cf60bea2cecb3bebb803d75e1aa42b43c74bd26ea1b541f4cb927421908882cbec01a91f0913984217e71ccc8db
-EBUILD langdetect-1.0.9.ebuild 494 BLAKE2B 9b3521c5721afa49a58e0c35267f7d82bb56bd7e1d6d3152be0d36cd220180a526cb20b90b1113fbf0fff4a512137570f0b3bcf864498b7b7cc00403cb61ca27 SHA512 16d311400bf84a5f04e15f3da4b68b2810e4b005009f4d03dc8a487176dfc294403c976c412c83dcfa8084a49ef7b7d5389b43fb2ba446ce107ce4595e3558c6
-MISC metadata.xml 457 BLAKE2B 630128a3e982b6d60cc7b9f74c79fcb5ee47a71a02c73a50af9da8cedb6fad8e20a7f74b881e5b25c6483b92c9edbd56552cd38b2d9cbfa8b3eb4530facea969 SHA512 674f4f5cd809c6c77bc14e0f5687fa972bef14bdfa0b3343c5d66b7163eef1906eb87d060c8288732f825de71dce291ad0b841a5f2f0dd230f957b5687e45d45
diff --git a/dev-python/langdetect/files/langdetect-1.0.9-explicit-config.patch b/dev-python/langdetect/files/langdetect-1.0.9-explicit-config.patch
new file mode 100644
index 000000000000..637368d2f237
--- /dev/null
+++ b/dev-python/langdetect/files/langdetect-1.0.9-explicit-config.patch
@@ -0,0 +1,13 @@
+Fix "Package 'langdetect.profiles' is absent from the `packages` configuration."
+
+--- a/setup.py
++++ b/setup.py
+@@ -18,7 +18,7 @@ setup(
+     author_email='michal.danilak@gmail.com',
+     url='https://github.com/Mimino666/langdetect',
+     keywords='language detection library',
+-    packages=['langdetect', 'langdetect.utils', 'langdetect.tests'],
++    packages=['langdetect', 'langdetect.utils', 'langdetect.tests', 'langdetect.profiles'],
+     include_package_data=True,
+     install_requires=['six'],
+     license='MIT',
diff --git a/dev-python/langdetect/langdetect-1.0.9.ebuild b/dev-python/langdetect/langdetect-1.0.9.ebuild
index 56733bbffc48..eb2586280d80 100644
--- a/dev-python/langdetect/langdetect-1.0.9.ebuild
+++ b/dev-python/langdetect/langdetect-1.0.9.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
@@ -19,4 +19,6 @@ KEYWORDS="~amd64"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 
+PATCHES=( "${FILESDIR}/${P}-explicit-config.patch" )
+
 distutils_enable_tests unittest
diff --git a/dev-python/langdetect/metadata.xml b/dev-python/langdetect/metadata.xml
index 020e07f2a3dd..c0f74ac187e2 100644
--- a/dev-python/langdetect/metadata.xml
+++ b/dev-python/langdetect/metadata.xml
@@ -2,11 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
-  <email>marcin.deranek@slonko.net</email>
-  <name>Marcin Deranek</name>
+  <email>pastalian46@gmail.com</email>
+  <name>Takuya Wakazono</name>
  </maintainer>
- <upstream>
-  <bugs-to>https://github.com/Mimino666/langdetect/issues</bugs-to>
- </upstream>
- <origin>slonko-overlay</origin>
+ 
+ <origin>gentoo-guru-overlay</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index b7114fc7aeab..534a9e0fb12c 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -13,4 +13,5 @@ DIST llvm-project-19.1.6.src.tar.xz.sig 438 BLAKE2B 1791e98252ab78a9a762ef601ff9
 DIST llvm-project-19.1.7.src.tar.xz 141249332 BLAKE2B 1259ed7f9aca7b35e89d818befdee20fd8bed4d2dc2c2c6f6f56451fd43d35ac03a0a5a406e142d22b25137999dc5b17471c196f8fcf79f20a8296832d900f6d SHA512 c7d63286d662707a9cd54758c9e3aaf52794a91900c484c4a6efa62d90bc719d5e7a345e4192feeb0c9fd11c82570d64677c781e5be1d645556b6aa018e47ec8
 DIST llvm-project-19.1.7.src.tar.xz.sig 438 BLAKE2B 4015140f4ba77de45039bdbdfbaf6f30e75705123d067ea97175d91d7a5b6a75008df01d99ae7aa16aaa3b101f3f41e38d01f04158f95a261d617b3ede0254cd SHA512 195797b06ac80a742e0ccbc03a50dc06dd2e04377d783d5474e3e72c5a75203b60292b047929312a411d22b137a239943fba414a4d136a2be14cbff978eb6bda
 DIST llvm-project-8af4d206e0f979f68925a08f9dffd60a98ce97e2.tar.gz 224825146 BLAKE2B 36e9c8f9615d65fc72beb699c4ce5959676975267a4c4288a01009d26ab84ae411f2855e4e6475957b91ddc21da29251ab22e331395bc9fee0f9bc907a05384a SHA512 ec72cdd7cc6d9bef31ae9295606d18e4935468fe60ab632aced21261d437e76f11d83d0d7199a6028689990260d9155098f7d64e97db0e0af28ea6c75a773bcc
+DIST llvm-project-97c3a990f05606cb807faf53bc41302fb62c7980.tar.gz 226261635 BLAKE2B 9dd0bdfaa6ee984747f2d9d8b9606cd8d2e75fa64d45fd7c87227ddca7cffe888a1d932d73c123b25360690fd687554cc333fb3d871ab0e72ddd2b1158bae2e0 SHA512 466ae8aea014fd396f3fd6b77055238a672f012b79f25ed0b215e01f968a56dd4eeaf148d03246701b1ac4cbb8f02a4325142d6e5503fb6231e330c2e49e28e7
 DIST llvm-project-c3a935e3f967f8f22f5db240d145459ee621c1e0.tar.gz 225133913 BLAKE2B ced922010bad14df6bce0dbbb9323ee3cc9d7bf2f764f8c982d134d7a97e38d84b0b81635bbb16031aa1899c744e7c036cec5d1957733bbed7a2f18f89db0b6f SHA512 0ea083defb3c0ecaa5d8d28682f140c68ec6b3ab6cbfc60fc38a9265a8eb88b618c075d6ae03170ed54c5e7dcb3b7003eaacea2fcb115e9864b64a17cea0013d
diff --git a/dev-python/lit/lit-20.0.0_pre20250122.ebuild b/dev-python/lit/lit-20.0.0_pre20250122.ebuild
new file mode 100644
index 000000000000..4230fa63b2a4
--- /dev/null
+++ b/dev-python/lit/lit-20.0.0_pre20250122.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+
+inherit distutils-r1 llvm.org
+
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+BDEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		llvm-core/llvm
+	)
+"
+
+LLVM_COMPONENTS=( llvm/utils/lit )
+llvm.org_set_globals
+
+# TODO: move the manpage generation here (from llvm-core/llvm)
+
+src_prepare() {
+	# flaky test
+	# https://github.com/llvm/llvm-project/issues/72022
+	rm tests/progress-bar.py || die
+
+	cd "${WORKDIR}" || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x LIT_PRESERVES_TMP=1
+	local litflags=$(get_lit_flags)
+	./lit.py ${litflags//;/ } tests || die
+}
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 07eeb342843e..b5b2d168c6c9 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -1,7 +1,5 @@
 DIST freetype-2.6.1.tar.gz 2302080 BLAKE2B 6a5fb98e5fa6cf4b7d7533ad44e364227d8c2f7dded4c552d6e22e204c32b7858f20d41d1e809ecdad6e5353d6cec81bea0e0b06a4533363a41ecab83ce3f7ca SHA512 ff2daed64d712737085924c50e75862fafbcbb24eef6d72dac9eaae63bb656d7245397fd828f5d3e47ac847f7ff83d73dedfdd61fde1f7d6e0f0cdeb49bcf83b
 DIST matplotlib-3.10.0.tar.gz 36686418 BLAKE2B b154d4d2512a7989d967e7e257ef148e530b1bb030375fe0443f0feb3adea8b0cdc0287d292587832542f6263ccbbb89860fa0b827301fb9dbed34f6a197a475 SHA512 31a71640ef9cbc8cae928156c70119a0bdc1a8c44c8dc5af5333f5484525dd6a375e6f263d739ad3422b0e35d474f7742e08c71c40df0f1f71b526e21adc17e1
 DIST matplotlib-3.9.0.tar.gz 36069890 BLAKE2B 02ddb25901b5a93a8daf6f26c98b92d5e35abe2e98783b039928338abb1d628adbf3fd4786c08cb1610bf405cb558ca31fc12dbde77ec5f2a633143c7ea659a1 SHA512 135ee2f97c26cb60479cc10bf8a833384c393993d8a905ab869f4c73b91a50ffa596f84ce349af7f1a0b08a21e1906394cf6a702bb567a9c3999d40f54974326
-DIST matplotlib-3.9.1.tar.gz 36084124 BLAKE2B b7cc9e219664849411cc3133afbdb676f956c943f92d447ba5cca0467da56d1575796fe1046e7503e6d7c4dfdfad6e5181404f331ed7ac1397c8c61f4a30bd23 SHA512 a1d48c42a5f4f04b57e34d25df842917e6380b8d6b6d1018c9b630cbbea4619b1d75729a218a6f52b63d4a61c2204bb26ad8f741566f84e41ca73190e419f672
 DIST matplotlib-3.9.2.tar.gz 36088381 BLAKE2B c84d08b7afa1f0460b5b57447481ef90f22380c02d20227c3a45b6f603032a11359b223397f18c8dc9111ad36fbd7510e2d5496502b3202e3074ddf8e8258bb7 SHA512 4b7437eeb085915a90db64600d0e6c59501ea1513d07b8298a159a763461ef6947a0cb332dcde1a5f0996840320ca7dd1d972d7514ff6f87b036fc631e79885f
-DIST matplotlib-3.9.3.tar.gz 36113438 BLAKE2B 6d51d11e04a71e2a01eaa9b76c072633cbbcb393b91be069f0db2f8a523711d244c93f7a4a9e0f8bc50b14928567d22865f5091a39000c7d7160fc258e21cab5 SHA512 f42a1bc8febf88369b5164879f32bc7967fe0930e42d12395722ac3d2c10a8c59ac9419b68c4bcb499c7df26dfc429dafb672b61f85aee971dd270b0e29742ed
 DIST matplotlib-3.9.4.tar.gz 36106529 BLAKE2B f95791bce82bf62d922e3db7ebe8e34e5759896c26cf952e2c67e92d5c4e5e190c556ba3ff4d7160d60de3c90ed5e1dc4d7ca2866647ded6b96dd35e16d4e259 SHA512 adfa875cba0b030ee0efaf11ed1be881858dc13391c966a2d9485ae2358fccf0b5356e16966a0c9da9f682e4a9d2f3960551756aca30ddc048632346548b1447
diff --git a/dev-python/matplotlib/matplotlib-3.9.1.ebuild b/dev-python/matplotlib/matplotlib-3.9.1.ebuild
deleted file mode 100644
index c3ba8230038b..000000000000
--- a/dev-python/matplotlib/matplotlib-3.9.1.ebuild
+++ /dev/null
@@ -1,301 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=meson-python
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 pypi virtualx
-
-FT_PV=2.6.1
-DESCRIPTION="Pure python plotting library with matlab like syntax"
-HOMEPAGE="
-	https://matplotlib.org/
-	https://github.com/matplotlib/matplotlib/
-	https://pypi.org/project/matplotlib/
-"
-SRC_URI+="
-	test? (
-		https://downloads.sourceforge.net/project/freetype/freetype2/${FT_PV}/freetype-${FT_PV}.tar.gz
-	)
-"
-
-# Main license: matplotlib
-# Some modules: BSD
-# matplotlib/backends/qt4_editor: MIT
-# Fonts: BitstreamVera, OFL-1.1
-LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
-IUSE="cairo excel gtk3 latex qt5 tk webagg wxwidgets"
-
-DEPEND="
-	media-libs/freetype:2
-	>=media-libs/qhull-2013:=
-	>=dev-python/numpy-1.25:=[${PYTHON_USEDEP}]
-"
-# internal copy of pycxx highly patched
-#	dev-python/pycxx
-RDEPEND="
-	${DEPEND}
-	>=dev-python/contourpy-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/cycler-0.10.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/fonttools-4.22.0[${PYTHON_USEDEP}]
-	>=dev-python/kiwisolver-1.3.1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	>=dev-python/pillow-8[jpeg,webp,${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.7[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-	media-fonts/dejavu
-	media-fonts/stix-fonts
-	media-libs/libpng:0
-	virtual/imagemagick-tools[jpeg,tiff]
-	cairo? (
-		dev-python/cairocffi[${PYTHON_USEDEP}]
-	)
-	excel? (
-		dev-python/xlwt[${PYTHON_USEDEP}]
-	)
-	gtk3? (
-		>=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection]
-	)
-	latex? (
-		virtual/latex-base
-		app-text/dvipng
-		app-text/ghostscript-gpl
-		app-text/poppler[utils]
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		dev-texlive/texlive-xetex
-	)
-	qt5? (
-		$(python_gen_cond_dep '
-			dev-python/pyqt5[gui,widgets,${PYTHON_USEDEP}]
-		' 'python3*')
-	)
-	webagg? (
-		>=dev-python/tornado-6.0.4[${PYTHON_USEDEP}]
-	)
-	wxwidgets? (
-		$(python_gen_cond_dep '
-			dev-python/wxpython:*[${PYTHON_USEDEP}]
-		' python3_{10..12})
-	)
-"
-
-BDEPEND="
-	${RDEPEND}
-	dev-python/pybind11[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-scm-7[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	test? (
-		$(python_gen_impl_dep 'tk')
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		>=dev-python/tornado-6.0.4[${PYTHON_USEDEP}]
-		!hppa? ( !s390? (
-			|| (
-				media-video/ffmpeg[openh264]
-				media-video/ffmpeg[x264]
-			)
-		) )
-		gtk3? (
-			>=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
-			x11-libs/gtk+:3[introspection]
-		)
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_unpack() {
-	# do not unpack freetype
-	unpack "${P}.tar.gz"
-}
-
-python_prepare_all() {
-	# Affects installed _version.py, bug #854600
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-	local PATCHES=(
-		"${FILESDIR}"/matplotlib-3.9.0-test.patch
-	)
-
-	# increase lock timeout to 30 s
-	sed -i -e 's:retries = 50:retries = 300:' lib/matplotlib/cbook.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_configure() {
-	unset DISPLAY # bug #278524
-	export XDG_RUNTIME_DIR="${T}/runtime-dir"
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	DISTUTILS_ARGS=(
-		-Dsystem-freetype=true
-		-Dsystem-qhull=true
-		-Dmacosx=false
-	)
-}
-
-src_test() {
-	mkdir subprojects/packagecache || die
-	cp "${DISTDIR}/freetype-${FT_PV}.tar.gz" subprojects/packagecache/ || die
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# broken by -Wdefault
-		"tests/test_rcparams.py::test_validator_invalid[validate_strlist-arg6-MatplotlibDeprecationWarning]"
-		"tests/test_rcparams.py::test_validator_invalid[validate_strlist-arg7-MatplotlibDeprecationWarning]"
-		tests/test_testing.py::test_warn_to_fail
-		tests/test_legend.py::test_legend_nolabels_warning
-		# TODO?
-		tests/test_backend_qt.py::test_fig_sigint_override
-		tests/test_backend_qt.py::test_ipython
-		tests/test_backend_nbagg.py::test_ipynb
-		# leak tests are fragile
-		tests/test_backends_interactive.py::test_figure_leak_20490
-		# major "images not close", new texlive perhaps
-		tests/test_contour.py::test_all_algorithms
-		# "no warnings"
-		tests/test_backend_pdf.py::test_invalid_metadata
-		tests/test_figure.py::test_too_many_figures
-	)
-
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# TODO: warning isn't passed through
-				tests/test_image.py::test_large_image
-				# TODO
-				tests/test_pickle.py::test_complete
-				tests/test_pickle.py::test_no_pyplot
-				tests/test_pickle.py::test_pickle_load_from_subprocess
-				tests/test_pickle.py::test_simple
-				tests/test_texmanager.py::test_openin_any_paranoid
-				tests/test_widgets.py::test_check_buttons
-				tests/test_widgets.py::test_check_buttons_lines
-				tests/test_widgets.py::test_check_radio_buttons_image
-				tests/test_widgets.py::test_radio_buttons
-			)
-			if has_version "<dev-python/pypy3_10-exe-7.3.13_p2" ||
-				has_version "<dev-python/pypy3_10-exe-bin-7.3.13_p2"
-			then
-				EPYTEST_DESELECT+=(
-					# TypeError is raised when exception is raised in a starred
-					# expression referencing a generator that uses "yield from"
-					# and raises -- non-critical, since some exception is raised
-					# after all
-					# https://foss.heptapod.net/pypy/pypy/-/issues/4032
-					tests/test_axes.py::test_bad_plot_args
-					tests/test_axes.py::test_plot_errors
-					tests/test_axes.py::test_plot_format_errors
-				)
-			fi
-			;;
-		python3.11)
-			EPYTEST_DESELECT+=(
-				# https://github.com/matplotlib/matplotlib/issues/23384
-				"tests/test_backends_interactive.py::test_figure_leak_20490[time_mem1-{'MPLBACKEND': 'qtagg', 'QT_API': 'PyQt5'}]"
-				"tests/test_backends_interactive.py::test_figure_leak_20490[time_mem1-{'MPLBACKEND': 'qtcairo', 'QT_API': 'PyQt5'}]"
-			)
-			;;
-		python3.12)
-			EPYTEST_DESELECT+=(
-				tests/test_constrainedlayout.py::test_compressed1
-			)
-			;;
-	esac
-
-	case ${ABI} in
-		hppa)
-			EPYTEST_DESELECT+=(
-				'tests/test_mathtext.py::test_mathtext_exceptions[hspace without value]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[hspace with invalid value]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[function without space]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[accent without space]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[frac without parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[frac with empty parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[binom without parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[binom with empty parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[genfrac without parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[genfrac with empty parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[sqrt without parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[sqrt with invalid value]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[overline without parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[overline with empty parameter]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[left with invalid delimiter]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[right with invalid delimiter]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[unclosed parentheses with sizing]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[unclosed parentheses without sizing]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[dfrac without parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[dfrac with empty parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[overset without parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[underset without parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[unknown symbol]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[double superscript]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[double subscript]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[super on sub without braces]'
-				'tests/test_quiver.py::test_barbs[png]'
-				'tests/test_quiver.py::test_barbs_pivot[png]'
-				'tests/test_quiver.py::test_barbs_flip[png]'
-				'tests/test_text.py::test_parse_math'
-				'tests/test_text.py::test_parse_math_rcparams'
-			)
-			;&
-		alpha|arm|m68k|o32|ppc|s390|sh|sparc|x86)
-			EPYTEST_DESELECT+=(
-				# too large for 32-bit platforms
-				'tests/test_axes.py::test_psd_csd[png]'
-			)
-			;;
-		*)
-			;;
-	esac
-
-	# we need to rebuild mpl against bundled freetype, otherwise
-	# over 1000 tests will fail because of mismatched font rendering
-	local DISTUTILS_ARGS=(
-		"${DISTUTILS_ARGS[@]}"
-		-Dsystem-freetype=false
-	)
-	distutils_pep517_install "${BUILD_DIR}"/test
-	cp -r "${BUILD_DIR}"/{install,test}"${EPREFIX}/usr/bin" || die
-	local -x PATH=${BUILD_DIR}/test${EPREFIX}/usr/bin:${PATH}
-
-	pushd lib >/dev/null || die
-	local path
-	local sitedir=${BUILD_DIR}/test$(python_get_sitedir)
-	# sigh, upstream doesn't install these
-	while IFS= read -d '' path; do
-		cp -r "${path}" "${sitedir}/${path}" || die
-	done < <(
-		find \( \
-				-name baseline_images -o \
-				-name '*.ipynb' -o \
-				-name '*.pfb' -o \
-				-name '*.ttf' -o \
-				-name tinypages \
-			\) -print0
-	)
-	popd >/dev/null || die
-
-	# speed tests up
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# pretend we're on CI to increase timeouts
-	local -x CI=1
-	nonfatal epytest --pyargs matplotlib -m "not network" \
-		-p rerunfailures --reruns=3 \
-		-o tmp_path_retention_policy=all || die
-}
diff --git a/dev-python/matplotlib/matplotlib-3.9.3.ebuild b/dev-python/matplotlib/matplotlib-3.9.3.ebuild
deleted file mode 100644
index d465b2c54ff5..000000000000
--- a/dev-python/matplotlib/matplotlib-3.9.3.ebuild
+++ /dev/null
@@ -1,301 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=meson-python
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 pypi virtualx
-
-FT_PV=2.6.1
-DESCRIPTION="Pure python plotting library with matlab like syntax"
-HOMEPAGE="
-	https://matplotlib.org/
-	https://github.com/matplotlib/matplotlib/
-	https://pypi.org/project/matplotlib/
-"
-SRC_URI+="
-	test? (
-		https://downloads.sourceforge.net/project/freetype/freetype2/${FT_PV}/freetype-${FT_PV}.tar.gz
-	)
-"
-
-# Main license: matplotlib
-# Some modules: BSD
-# matplotlib/backends/qt4_editor: MIT
-# Fonts: BitstreamVera, OFL-1.1
-LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
-IUSE="cairo excel gtk3 latex qt5 tk webagg wxwidgets"
-
-DEPEND="
-	media-libs/freetype:2
-	>=media-libs/qhull-2013:=
-	>=dev-python/numpy-1.25:=[${PYTHON_USEDEP}]
-"
-# internal copy of pycxx highly patched
-#	dev-python/pycxx
-RDEPEND="
-	${DEPEND}
-	>=dev-python/contourpy-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/cycler-0.10.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/fonttools-4.22.0[${PYTHON_USEDEP}]
-	>=dev-python/kiwisolver-1.3.1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	>=dev-python/pillow-8[jpeg,webp,${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.7[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-	media-fonts/dejavu
-	media-fonts/stix-fonts
-	media-libs/libpng:0
-	virtual/imagemagick-tools[jpeg,tiff]
-	cairo? (
-		dev-python/cairocffi[${PYTHON_USEDEP}]
-	)
-	excel? (
-		dev-python/xlwt[${PYTHON_USEDEP}]
-	)
-	gtk3? (
-		>=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection]
-	)
-	latex? (
-		virtual/latex-base
-		app-text/dvipng
-		app-text/ghostscript-gpl
-		app-text/poppler[utils]
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		dev-texlive/texlive-xetex
-	)
-	qt5? (
-		$(python_gen_cond_dep '
-			dev-python/pyqt5[gui,widgets,${PYTHON_USEDEP}]
-		' 'python3*')
-	)
-	webagg? (
-		>=dev-python/tornado-6.0.4[${PYTHON_USEDEP}]
-	)
-	wxwidgets? (
-		$(python_gen_cond_dep '
-			dev-python/wxpython:*[${PYTHON_USEDEP}]
-		' python3_{10..12})
-	)
-"
-
-BDEPEND="
-	${RDEPEND}
-	dev-python/pybind11[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-scm-7[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	test? (
-		$(python_gen_impl_dep 'tk')
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		>=dev-python/tornado-6.0.4[${PYTHON_USEDEP}]
-		!hppa? ( !s390? (
-			|| (
-				media-video/ffmpeg[openh264]
-				media-video/ffmpeg[x264]
-			)
-		) )
-		gtk3? (
-			>=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
-			x11-libs/gtk+:3[introspection]
-		)
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_unpack() {
-	# do not unpack freetype
-	unpack "${P}.tar.gz"
-}
-
-python_prepare_all() {
-	# Affects installed _version.py, bug #854600
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-	local PATCHES=(
-		"${FILESDIR}"/matplotlib-3.9.3-test.patch
-	)
-
-	# increase lock timeout to 30 s
-	sed -i -e 's:retries = 50:retries = 300:' lib/matplotlib/cbook.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_configure() {
-	unset DISPLAY # bug #278524
-	export XDG_RUNTIME_DIR="${T}/runtime-dir"
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	DISTUTILS_ARGS=(
-		-Dsystem-freetype=true
-		-Dsystem-qhull=true
-		-Dmacosx=false
-	)
-}
-
-src_test() {
-	mkdir subprojects/packagecache || die
-	cp "${DISTDIR}/freetype-${FT_PV}.tar.gz" subprojects/packagecache/ || die
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# broken by -Wdefault
-		"tests/test_rcparams.py::test_validator_invalid[validate_strlist-arg6-MatplotlibDeprecationWarning]"
-		"tests/test_rcparams.py::test_validator_invalid[validate_strlist-arg7-MatplotlibDeprecationWarning]"
-		tests/test_testing.py::test_warn_to_fail
-		tests/test_legend.py::test_legend_nolabels_warning
-		# TODO?
-		tests/test_backend_qt.py::test_fig_sigint_override
-		tests/test_backend_qt.py::test_ipython
-		tests/test_backend_nbagg.py::test_ipynb
-		# leak tests are fragile
-		tests/test_backends_interactive.py::test_figure_leak_20490
-		# major "images not close", new texlive perhaps
-		tests/test_contour.py::test_all_algorithms
-		# "no warnings"
-		tests/test_backend_pdf.py::test_invalid_metadata
-		tests/test_figure.py::test_too_many_figures
-	)
-
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# TODO: warning isn't passed through
-				tests/test_image.py::test_large_image
-				# TODO
-				tests/test_pickle.py::test_complete
-				tests/test_pickle.py::test_no_pyplot
-				tests/test_pickle.py::test_pickle_load_from_subprocess
-				tests/test_pickle.py::test_simple
-				tests/test_texmanager.py::test_openin_any_paranoid
-				tests/test_widgets.py::test_check_buttons
-				tests/test_widgets.py::test_check_buttons_lines
-				tests/test_widgets.py::test_check_radio_buttons_image
-				tests/test_widgets.py::test_radio_buttons
-			)
-			if has_version "<dev-python/pypy3_10-exe-7.3.13_p2" ||
-				has_version "<dev-python/pypy3_10-exe-bin-7.3.13_p2"
-			then
-				EPYTEST_DESELECT+=(
-					# TypeError is raised when exception is raised in a starred
-					# expression referencing a generator that uses "yield from"
-					# and raises -- non-critical, since some exception is raised
-					# after all
-					# https://foss.heptapod.net/pypy/pypy/-/issues/4032
-					tests/test_axes.py::test_bad_plot_args
-					tests/test_axes.py::test_plot_errors
-					tests/test_axes.py::test_plot_format_errors
-				)
-			fi
-			;;
-		python3.11)
-			EPYTEST_DESELECT+=(
-				# https://github.com/matplotlib/matplotlib/issues/23384
-				"tests/test_backends_interactive.py::test_figure_leak_20490[time_mem1-{'MPLBACKEND': 'qtagg', 'QT_API': 'PyQt5'}]"
-				"tests/test_backends_interactive.py::test_figure_leak_20490[time_mem1-{'MPLBACKEND': 'qtcairo', 'QT_API': 'PyQt5'}]"
-			)
-			;;
-		python3.12)
-			EPYTEST_DESELECT+=(
-				tests/test_constrainedlayout.py::test_compressed1
-			)
-			;;
-	esac
-
-	case ${ABI} in
-		hppa)
-			EPYTEST_DESELECT+=(
-				'tests/test_mathtext.py::test_mathtext_exceptions[hspace without value]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[hspace with invalid value]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[function without space]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[accent without space]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[frac without parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[frac with empty parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[binom without parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[binom with empty parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[genfrac without parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[genfrac with empty parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[sqrt without parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[sqrt with invalid value]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[overline without parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[overline with empty parameter]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[left with invalid delimiter]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[right with invalid delimiter]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[unclosed parentheses with sizing]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[unclosed parentheses without sizing]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[dfrac without parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[dfrac with empty parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[overset without parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[underset without parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[unknown symbol]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[double superscript]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[double subscript]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[super on sub without braces]'
-				'tests/test_quiver.py::test_barbs[png]'
-				'tests/test_quiver.py::test_barbs_pivot[png]'
-				'tests/test_quiver.py::test_barbs_flip[png]'
-				'tests/test_text.py::test_parse_math'
-				'tests/test_text.py::test_parse_math_rcparams'
-			)
-			;&
-		alpha|arm|m68k|o32|ppc|s390|sh|sparc|x86)
-			EPYTEST_DESELECT+=(
-				# too large for 32-bit platforms
-				'tests/test_axes.py::test_psd_csd[png]'
-			)
-			;;
-		*)
-			;;
-	esac
-
-	# we need to rebuild mpl against bundled freetype, otherwise
-	# over 1000 tests will fail because of mismatched font rendering
-	local DISTUTILS_ARGS=(
-		"${DISTUTILS_ARGS[@]}"
-		-Dsystem-freetype=false
-	)
-	distutils_pep517_install "${BUILD_DIR}"/test
-	cp -r "${BUILD_DIR}"/{install,test}"${EPREFIX}/usr/bin" || die
-	local -x PATH=${BUILD_DIR}/test${EPREFIX}/usr/bin:${PATH}
-
-	pushd lib >/dev/null || die
-	local path
-	local sitedir=${BUILD_DIR}/test$(python_get_sitedir)
-	# sigh, upstream doesn't install these
-	while IFS= read -d '' path; do
-		cp -r "${path}" "${sitedir}/${path}" || die
-	done < <(
-		find \( \
-				-name baseline_images -o \
-				-name '*.ipynb' -o \
-				-name '*.pfb' -o \
-				-name '*.ttf' -o \
-				-name tinypages \
-			\) -print0
-	)
-	popd >/dev/null || die
-
-	# speed tests up
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# pretend we're on CI to increase timeouts
-	local -x CI=1
-	nonfatal epytest --pyargs matplotlib -m "not network" \
-		-p rerunfailures --reruns=3 \
-		-o tmp_path_retention_policy=all || die
-}
diff --git a/dev-python/pyqt5/metadata.xml b/dev-python/pyqt5/metadata.xml
index 7d9461af9e6e..e9a6eb43ce4b 100644
--- a/dev-python/pyqt5/metadata.xml
+++ b/dev-python/pyqt5/metadata.xml
@@ -14,7 +14,6 @@
   <doc>https://www.riverbankcomputing.com/static/Docs/PyQt5/</doc>
  </upstream>
  <use>
-  <flag name="bluetooth">Build bindings for the QtBluetooth module</flag>
   <flag name="dbus">Build bindings for the QtDBus module</flag>
   <flag name="declarative">Build bindings for the QtQml and QtQuick modules and enable the qmlscene plugin</flag>
   <flag name="designer">Build bindings for the QtDesigner module and enable the designer plugin</flag>
diff --git a/dev-python/pyqt5/pyqt5-5.15.11.ebuild b/dev-python/pyqt5/pyqt5-5.15.11.ebuild
index abb6d40c351f..e525b80282cb 100644
--- a/dev-python/pyqt5/pyqt5-5.15.11.ebuild
+++ b/dev-python/pyqt5/pyqt5-5.15.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,7 +19,7 @@ SLOT="0"
 KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"
 
 IUSE="
-	bluetooth dbus debug declarative designer examples gles2-only gui help location
+	dbus debug declarative designer examples gles2-only gui help location
 	multimedia network opengl positioning printsupport sensors serialport speech
 	sql +ssl svg testlib webchannel websockets widgets x11extras xmlpatterns
 "
@@ -27,7 +27,6 @@ IUSE="
 # The requirements below were extracted from the qmake_QT declarations
 # in project.py and from the output of 'grep -r "%Import " ${S}/sip'
 REQUIRED_USE="
-	bluetooth? ( gui )
 	declarative? ( gui network )
 	designer? ( widgets )
 	help? ( gui widgets )
@@ -53,7 +52,6 @@ QT_PV="5.15:5"
 DEPEND="
 	>=dev-qt/qtcore-${QT_PV}
 	>=dev-qt/qtxml-${QT_PV}
-	bluetooth? ( >=dev-qt/qtbluetooth-${QT_PV} )
 	dbus? (
 		dev-python/dbus-python[${PYTHON_USEDEP}]
 		>=dev-qt/qtdbus-${QT_PV}
@@ -125,7 +123,6 @@ python_configure_all() {
 		--enable=pyrcc
 		--enable=Qt
 		--enable=QtCore
-		$(pyqt_use_enable bluetooth QtBluetooth)
 		$(pyqt_use_enable dbus QtDBus)
 		$(pyqt_use_enable declarative QtQml QtQuick \
 			$(usev widgets QtQuickWidgets))
@@ -153,6 +150,9 @@ python_configure_all() {
 		--enable=QtXml
 		$(pyqt_use_enable xmlpatterns QtXmlPatterns)
 
+		# no longer supported in Gentoo for PyQt5, use PyQt6
+		--disable=QtBluetooth
+
 		$(usev debug '--debug --qml-debug --tracing')
 
 		$(usev !dbus --no-dbus-python)
diff --git a/dev-python/qtpy/metadata.xml b/dev-python/qtpy/metadata.xml
index 994d0a7bbab7..9afab0307bea 100644
--- a/dev-python/qtpy/metadata.xml
+++ b/dev-python/qtpy/metadata.xml
@@ -11,14 +11,14 @@
  </maintainer>
  <longdescription>
 		QtPy is a small abstraction layer that lets you write applications using a single API call to either PyQt or PySide.
-		It provides support for PyQt5, PyQt4, PySide2 and PySide using the Qt5 layout (where the QtGui module has been split into QtGui and QtWidgets).
-		Basically, you can write your code as if you were using PySide2 but import Qt modules from qtpy instead of PySide2 (or PyQt5)
+		It provides support for PyQt6, PyQt5 and PySide6.
+		Basically, you can write your code as if you were using PyQt6 but import Qt modules from qtpy instead of PyQt6 (or PySide6)
 	</longdescription>
  
  <use>
   <flag name="pyqt5">Use <pkg>dev-python/pyqt5</pkg> as Qt for Python implementation</flag>
   <flag name="pyqt6">Use <pkg>dev-python/pyqt6</pkg> as Qt for Python implementation</flag>
-  <flag name="pyside2">Use <pkg>dev-python/pyside2</pkg> as Qt for Python implementation</flag>
+  <flag name="pyside2">Use dev-python/pyside2 as Qt for Python implementation</flag>
   <flag name="pyside6">Use <pkg>dev-python/pyside6</pkg> as Qt for Python implementation</flag>
   <flag name="designer">Pull in bindings for the QtDesigner module and enable the designer plugin</flag>
   <flag name="gui">Pull in bindings for the QtGui module</flag>
diff --git a/dev-python/qtpy/qtpy-2.4.2.ebuild b/dev-python/qtpy/qtpy-2.4.2.ebuild
index 73889dae2f86..c0c0c1ca0e39 100644
--- a/dev-python/qtpy/qtpy-2.4.2.ebuild
+++ b/dev-python/qtpy/qtpy-2.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -114,7 +114,7 @@ BDEPEND="
 		dev-python/pytest-qt[${PYTHON_USEDEP}]
 		pyqt5? (
 			dev-python/pyqt5[${PYTHON_USEDEP}]
-			dev-python/pyqt5[bluetooth,dbus,declarative,designer,gui,help,location]
+			dev-python/pyqt5[dbus,declarative,designer,gui,help,location]
 			dev-python/pyqt5[multimedia,network,opengl,positioning,printsupport]
 			dev-python/pyqt5[sensors,serialport,speech(-),sql,svg,testlib,webchannel]
 			dev-python/pyqt5[websockets,widgets,x11extras,xml(+),xmlpatterns]
diff --git a/dev-python/twine/twine-6.1.0.ebuild b/dev-python/twine/twine-6.1.0.ebuild
index eb97c596ddba..766d3e89ce80 100644
--- a/dev-python/twine/twine-6.1.0.ebuild
+++ b/dev-python/twine/twine-6.1.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]