Merge updates from master

24 files changed, 9 insertions, 629 deletions

diff --git a/app-portage/mgorny-dev-scripts/Manifest b/app-portage/mgorny-dev-scripts/Manifest
index 00da5c96b07b..bb29b5e44f0a 100644
--- a/app-portage/mgorny-dev-scripts/Manifest
+++ b/app-portage/mgorny-dev-scripts/Manifest
@@ -1,2 +1 @@
-DIST mgorny-dev-scripts-52.tar.gz 19574 BLAKE2B 4518fe70cb340db351f30bfb7d441713b1f37918e0cfe5f5e39e80043a0cd89523ed2d2eb3255250b1fd73f8d41943289883d9b01f53d13f3f149570d1ddb79a SHA512 606a10eb78f88c459d9fcabf94d4b2095a4c50442a4ea6aab829c7664b2537b5e1c2b7fafdade82ce0e54268aaf22c89c5c3e224343d250befce44c1ce5a9e05
 DIST mgorny-dev-scripts-53.tar.gz 19568 BLAKE2B 16e5dd8071c537c1adb0b52502e2301709acb46c8a5d0faf219178639f38e7c26ecd9df9aad9733886e076d52c222b21a3f0a0af9e912d336f177b3b9697b757 SHA512 e2dd3bab51ebef331f079bb5475bc6ca6dc849f1cb8cbff2f8409ca7cb000398e800d24e64d4c761d0a99778eefb23727a3a3f14c935bf89f7fb9ae04a11c67a
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-52.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-52.ebuild
deleted file mode 100644
index 5dbebceb9a95..000000000000
--- a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-52.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Handy scripts for ebuild development and more"
-HOMEPAGE="https://github.com/projg2/mgorny-dev-scripts/"
-SRC_URI="
-	https://github.com/projg2/mgorny-dev-scripts/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
-
-RDEPEND="
-	app-portage/gentoolkit
-	>=app-portage/gpyutils-0.12
-	dev-perl/URI
-	dev-util/pkgcheck
-	dev-vcs/git
-	net-misc/wget
-	sys-apps/portage
-	x11-misc/xdg-utils
-"
-
-src_install() {
-	dodoc README.rst
-	rm -f COPYING README.rst || die
-	dobin *
-}
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-53.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-53.ebuild
index 0b89f83d564d..5dbebceb9a95 100644
--- a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-53.ebuild
+++ b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-53.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	app-portage/gentoolkit
diff --git a/dev-python/jupyter-server/Manifest b/dev-python/jupyter-server/Manifest
index 88d1041b7c03..fc1a06866101 100644
--- a/dev-python/jupyter-server/Manifest
+++ b/dev-python/jupyter-server/Manifest
@@ -1,2 +1 @@
-DIST jupyter_server-2.14.0.tar.gz 719491 BLAKE2B 6a742c2b4a269a23af7c54e72d551045cc17b017efe88e0cb5848aff9d9a9d0855c74ed066b316bb87d15f49984cc5787250b6191f036c8ae8bd0af7a6b53695 SHA512 57258afae5e64af6b499795795c469fd08fb2562da770ba06b78716dccee12f6662b0d6465739857aa5f3fea084eb2d8553c7205edc7b6813e4f5d61815917b3
 DIST jupyter_server-2.14.1.tar.gz 719107 BLAKE2B 2b38fbc709346bdb8c2734dd5f22cf958f0555660af0df23b08b6af8b3dee9130daa0538b7e78c5a0c63d66511a973babbb544c638d1aed267368ebba7d10c36 SHA512 1770fe0fc34c164952a74b75bf765fc737ab59cc52c04f61c0a28d5f6c747587ddee4c6cd3dcb90e2ccb72029d0f52de321569ed7a55bddbad50326e728b53fd
diff --git a/dev-python/jupyter-server/jupyter-server-2.14.0.ebuild b/dev-python/jupyter-server/jupyter-server-2.14.0.ebuild
deleted file mode 100644
index 29564bc55704..000000000000
--- a/dev-python/jupyter-server/jupyter-server-2.14.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Core services, APIs, and REST endpoints to Jupyter web applications"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyter-server/jupyter_server/
-	https://pypi.org/project/jupyter-server/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/anyio-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/argon2-cffi-21.1[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-client-7.4.4[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-core-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-server-terminals-0.4.4[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-events-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/nbconvert-6.4.4[${PYTHON_USEDEP}]
-	>=dev-python/nbformat-5.3.0[${PYTHON_USEDEP}]
-	>=dev-python/overrides-5.0[${PYTHON_USEDEP}]
-	>=dev-python/packaging-22.0[${PYTHON_USEDEP}]
-	>=dev-python/prometheus-client-0.9[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-24[${PYTHON_USEDEP}]
-	>=dev-python/send2trash-1.8.2[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.2[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.6.0[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-1.7[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-jupyter-builder[${PYTHON_USEDEP}]
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		>=dev-python/pytest-jupyter-0.7[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# This fails if your terminal is zsh (and maybe other non-bash as well?)
-		tests/test_terminal.py
-		# Fails because above is ignored
-		tests/auth/test_authorizer.py
-		# Fails with additional extensions installed
-		tests/extension/test_app.py::test_stop_extension
-	)
-
-	# FIXME: tests seem to be affected by previously installed version
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest \
-		-p pytest_tornasync.plugin \
-		-p jupyter_server.pytest_plugin \
-		-p pytest_console_scripts \
-		-p pytest_timeout \
-		-o tmp_path_retention_policy=all
-}
diff --git a/dev-python/jupyter-server/jupyter-server-2.14.1.ebuild b/dev-python/jupyter-server/jupyter-server-2.14.1.ebuild
index 51d0d35e0e59..29564bc55704 100644
--- a/dev-python/jupyter-server/jupyter-server-2.14.1.ebuild
+++ b/dev-python/jupyter-server/jupyter-server-2.14.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/anyio-3.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/mapbox-vector-tile/mapbox-vector-tile-2.1.0.ebuild b/dev-python/mapbox-vector-tile/mapbox-vector-tile-2.1.0.ebuild
index 17a2fcdba745..a302a0497ee8 100644
--- a/dev-python/mapbox-vector-tile/mapbox-vector-tile-2.1.0.ebuild
+++ b/dev-python/mapbox-vector-tile/mapbox-vector-tile-2.1.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/tilezen/mapbox-vector-tile/archive/refs/tags/v${PV}.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 arm64 ~x86"
 
 RDEPEND="
 	dev-python/protobuf-python[${PYTHON_USEDEP}]
diff --git a/dev-python/moto/moto-5.0.9.ebuild b/dev-python/moto/moto-5.0.9.ebuild
index 0dc0cf6ad9e8..3741bd8843b7 100644
--- a/dev-python/moto/moto-5.0.9.ebuild
+++ b/dev-python/moto/moto-5.0.9.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/aws-xray-sdk-0.93[${PYTHON_USEDEP}]
diff --git a/dev-python/openpyxl/Manifest b/dev-python/openpyxl/Manifest
index 5787eaec1862..6272b23492cc 100644
--- a/dev-python/openpyxl/Manifest
+++ b/dev-python/openpyxl/Manifest
@@ -1,3 +1,2 @@
-DIST openpyxl-3.1.2.tar.bz2 2733302 BLAKE2B 7030c698c2dfa3c3f27f23485e33cc9f4ffc0c473e590785ebfa03a958f7c1deab98503890b7350f32cbb4607b3fbf543b35299c0f8abfbfcc779e96ddda9ee1 SHA512 307d82dcf839c60be606c01f862701f69017573894c7fd26e35ec3edead2ea2a126aecca61b0c7f6727ff834dd6bed844095b9a56f2b510689ab071926a7a742
 DIST openpyxl-3.1.3.tar.bz2 2739587 BLAKE2B 64161f8ea0629f4bd2ef65187c2d1c0cfa23e155df7b5a4a81c386c48d339956e3d854da040157170852df19ab53d65fd0be9a4f1d4f5b5f6eed20e0fe1e89f9 SHA512 dee9dac201319ed6b3c14cb0cd396148a7caedebb2a95534a1b9fcb75afc445bfd73e67fdbd750334872e4bd3bf1a71d20c48930ff6b195f4f1c6312a5e762f8
 DIST openpyxl-3.1.4.tar.bz2 2738775 BLAKE2B 88236c4a5d49d02f746c0a5393cf0e996ee2864c38e9f9b9774355b5263447dfb73eaa027ae8d710fd81585a99ba5a20f1cbecc6615f153387b94516faea4820 SHA512 f2b4d7566428d3e5ff36be37cfce12c247f90e1ab10cfd4e04e285106b48c4d9b30791a9b1f1c6f388ea063e69d9843801b9f7568d4694cfcd20d4e8d0d723b8
diff --git a/dev-python/openpyxl/files/openpyxl-3.1.2-pytest-8.patch b/dev-python/openpyxl/files/openpyxl-3.1.2-pytest-8.patch
deleted file mode 100644
index 72ed1fab7638..000000000000
--- a/dev-python/openpyxl/files/openpyxl-3.1.2-pytest-8.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From 517ce7d21194da275f8083fa2fd7de6977dc7e95 Mon Sep 17 00:00:00 2001
-From: Charlie Clark <charlie.clark@clark-consulting.eu>
-Date: Mon, 11 Mar 2024 13:38:08 +0100
-Subject: [PATCH] Looks like pytest has dropped support for unittest setup
- methods so switched to fixture.
-
---HG--
-branch : 3.1
----
- openpyxl/drawing/tests/test_drawing.py | 46 ++++++++++++++------------
- 1 file changed, 24 insertions(+), 22 deletions(-)
-
-diff --git a/openpyxl/drawing/tests/test_drawing.py b/openpyxl/drawing/tests/test_drawing.py
-index c4c0712dd..befd2267c 100644
---- a/openpyxl/drawing/tests/test_drawing.py
-+++ b/openpyxl/drawing/tests/test_drawing.py
-@@ -1,20 +1,20 @@
- # Copyright (c) 2010-2024 openpyxl
- 
- import pytest
--
- from openpyxl.xml.functions import tostring
--
- from openpyxl.tests.helper import compare_xml
- 
-+@pytest.fixture
-+def Drawing():
-+    from ..drawing import Drawing
-+    return Drawing
-+
- 
- class TestDrawing(object):
- 
--    def setup(self):
--        from ..drawing import Drawing
--        self.drawing = Drawing()
- 
--    def test_ctor(self):
--        d = self.drawing
-+    def test_ctor(self, Drawing):
-+        d = Drawing()
-         assert d.coordinates == ((1, 2), (16, 8))
-         assert d.width == 21
-         assert d.height == 192
-@@ -26,34 +26,34 @@ class TestDrawing(object):
-         assert d.description == ""
-         assert d.name == ""
- 
--    def test_width(self):
--        d = self.drawing
-+    def test_width(self, Drawing):
-+        d = Drawing()
-         d.width = 100
-         d.height = 50
-         assert d.width == 100
- 
--    def test_proportional_width(self):
--        d = self.drawing
-+    def test_proportional_width(self, Drawing):
-+        d = Drawing()
-         d.resize_proportional = True
-         d.width = 100
-         d.height = 50
-         assert (d.width, d.height) == (5, 50)
- 
--    def test_height(self):
--        d = self.drawing
-+    def test_height(self, Drawing):
-+        d = Drawing()
-         d.height = 50
-         d.width = 100
-         assert d.height == 50
- 
--    def test_proportional_height(self):
--        d = self.drawing
-+    def test_proportional_height(self, Drawing):
-+        d = Drawing()
-         d.resize_proportional = True
-         d.height = 50
-         d.width = 100
-         assert (d.width, d.height) == (100, 1000)
- 
--    def test_set_dimension(self):
--        d = self.drawing
-+    def test_set_dimension(self, Drawing):
-+        d = Drawing()
-         d.resize_proportional = True
-         d.set_dimension(100, 50)
-         assert d.width == 6
-@@ -65,8 +65,9 @@ class TestDrawing(object):
- 
- 
-     @pytest.mark.pil_required
--    def test_absolute_anchor(self):
--        node = self.drawing.anchor
-+    def test_absolute_anchor(self, Drawing):
-+        drawing = Drawing()
-+        node = drawing.anchor
-         xml = tostring(node.to_tree())
-         expected = """
-         <absoluteAnchor>
-@@ -80,9 +81,10 @@ class TestDrawing(object):
- 
- 
-     @pytest.mark.pil_required
--    def test_onecell_anchor(self):
--        self.drawing.anchortype =  "oneCell"
--        node = self.drawing.anchor
-+    def test_onecell_anchor(self, Drawing):
-+        drawing = Drawing()
-+        drawing.anchortype =  "oneCell"
-+        node = drawing.anchor
-         xml = tostring(node.to_tree())
-         expected = """
-         <oneCellAnchor>
--- 
-GitLab
-
diff --git a/dev-python/openpyxl/openpyxl-3.1.2.ebuild b/dev-python/openpyxl/openpyxl-3.1.2.ebuild
deleted file mode 100644
index 20b72e6cf240..000000000000
--- a/dev-python/openpyxl/openpyxl-3.1.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2024 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 )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure python reader and writer of Excel OpenXML files"
-HOMEPAGE="
-	https://openpyxl.readthedocs.io/en/stable/
-	https://foss.heptapod.net/openpyxl/openpyxl/
-"
-SRC_URI="
-	https://foss.heptapod.net/openpyxl/openpyxl/-/archive/${PV}/${P}.tar.bz2
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
-
-RDEPEND="
-	dev-python/et-xmlfile[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff,jpeg]
-	)
-"
-
-distutils_enable_sphinx doc \
-	dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
-
-PATCHES=(
-	# https://foss.heptapod.net/openpyxl/openpyxl/-/commit/517ce7d21194da275f8083fa2fd7de6977dc7e95
-	"${FILESDIR}/${P}-pytest-8.patch"
-)
-
-python_test() {
-	local EPYTEST_DESELECT=()
-
-	if has_version ">=dev-python/numpy-2[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			# https://foss.heptapod.net/openpyxl/openpyxl/-/issues/2187
-			openpyxl/compat/tests/test_compat.py::test_numpy_tostring
-		)
-	fi
-
-	case ${EPYTHON} in
-		python3.12)
-			EPYTEST_DESELECT+=(
-				# deprecation warnings
-				openpyxl/reader/tests/test_workbook.py::TestWorkbookParser::test_broken_sheet_ref
-				openpyxl/reader/tests/test_workbook.py::TestWorkbookParser::test_defined_names_print_area
-				openpyxl/reader/tests/test_workbook.py::TestWorkbookParser::test_name_invalid_index
-				openpyxl/styles/tests/test_stylesheet.py::test_no_styles
-			)
-			;;
-	esac
-
-	epytest
-}
diff --git a/dev-python/openpyxl/openpyxl-3.1.3.ebuild b/dev-python/openpyxl/openpyxl-3.1.3.ebuild
index e1d43c5174d6..d89a683a1e32 100644
--- a/dev-python/openpyxl/openpyxl-3.1.3.ebuild
+++ b/dev-python/openpyxl/openpyxl-3.1.3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	dev-python/et-xmlfile[${PYTHON_USEDEP}]
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index 154343007820..efbbda4ca0b8 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -1,3 +1 @@
-DIST requests-2.32.1.tar.gz 129920 BLAKE2B 9f46afeb3ea62e8bb537fb793bcf1b65b5cc2ae3f22263151b0bf5879aa2a11a1e87777453cc325f552964551750ef81524ef99ce132bb19df5161e1df5fe77f SHA512 6ae12ca26f04c3c001ef1882d17cd7f12412114214961db42d6b5f3f507640d1f07e325034761e02e7e5d9daacaab10a16884c2cb2c4128ca059a142b52bace8
-DIST requests-2.32.2.tar.gz 130327 BLAKE2B 46fd3e49a63f55133126a1896bb693050a63a062c7258f119e285a735004671b12595debd87955b5f6f084996495e8a100bb0b09a43c376df0dcb0a6a8d083e2 SHA512 6f85e41f30d8bdf8d3343092d7fc163342c22c21cf0490eabd65cb66b59a464fbd6a4cd28f1f3ab1eac636adff2a8d55ded54c40351df93deafeb2aba62bcbde
 DIST requests-2.32.3.tar.gz 131218 BLAKE2B c36bd80e0544e83b80c001e6bfdde7b8552e65b888d44d781f95d5a6302dd34dfd4368e18dbfeab3a014d7170946c502e3bf3a6dbd027a60a2f0f535c674d75c SHA512 20d413597ff4803a62156ada25ef2e8a5edd0d4dbf7d79cc7fcd88d51a76e019a7dacf41d7c3d546306f37c506ede68f16b9afea57c918db64e702382b1ae420
diff --git a/dev-python/requests/requests-2.32.1.ebuild b/dev-python/requests/requests-2.32.1.ebuild
deleted file mode 100644
index a59ea6ebead2..000000000000
--- a/dev-python/requests/requests-2.32.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="HTTP library for human beings"
-HOMEPAGE="
-	https://requests.readthedocs.io/
-	https://github.com/psf/requests/
-	https://pypi.org/project/requests/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
-IUSE="socks5 test-rust"
-
-RDEPEND="
-	>=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
-	<dev-python/charset-normalizer-4[${PYTHON_USEDEP}]
-	<dev-python/idna-4[${PYTHON_USEDEP}]
-	<dev-python/urllib3-3[${PYTHON_USEDEP}]
-	socks5? ( >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] )
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/pytest-httpbin-2.0.0[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
-		test-rust? (
-			dev-python/trustme[${PYTHON_USEDEP}]
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Internet (doctests)
-		requests/__init__.py::requests
-		requests/api.py::requests.api.request
-		requests/models.py::requests.models.PreparedRequest
-		requests/sessions.py::requests.sessions.Session
-		# require IPv4 interface in 10.* range
-		tests/test_requests.py::TestTimeout::test_connect_timeout
-		tests/test_requests.py::TestTimeout::test_total_timeout_connect
-		# TODO: openssl?
-		tests/test_requests.py::TestRequests::test_pyopenssl_redirect
-		# flask-2
-		tests/test_requests.py::TestRequests::test_cookie_sent_on_redirect
-		tests/test_requests.py::TestRequests::test_cookie_removed_on_expire
-		tests/test_requests.py::TestPreparingURLs::test_redirecting_to_bad_url
-	)
-
-	case ${EPYTHON} in
-		python3.13)
-			;&
-		python3.12)
-			EPYTEST_DESELECT+=(
-				# different repr()
-				requests/utils.py::requests.utils.from_key_val_list
-			)
-			;;
-	esac
-
-	if ! has_version "dev-python/trustme[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			tests/test_requests.py::TestRequests::test_https_warnings
-		)
-	fi
-
-	epytest
-}
diff --git a/dev-python/requests/requests-2.32.2.ebuild b/dev-python/requests/requests-2.32.2.ebuild
deleted file mode 100644
index 35aa92871750..000000000000
--- a/dev-python/requests/requests-2.32.2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="HTTP library for human beings"
-HOMEPAGE="
-	https://requests.readthedocs.io/
-	https://github.com/psf/requests/
-	https://pypi.org/project/requests/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
-IUSE="socks5 test-rust"
-
-RDEPEND="
-	>=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
-	<dev-python/charset-normalizer-4[${PYTHON_USEDEP}]
-	<dev-python/idna-4[${PYTHON_USEDEP}]
-	<dev-python/urllib3-3[${PYTHON_USEDEP}]
-	socks5? ( >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] )
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/pytest-httpbin-2.0.0[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
-		test-rust? (
-			dev-python/trustme[${PYTHON_USEDEP}]
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Internet (doctests)
-		requests/__init__.py::requests
-		requests/api.py::requests.api.request
-		requests/models.py::requests.models.PreparedRequest
-		requests/sessions.py::requests.sessions.Session
-		# require IPv4 interface in 10.* range
-		tests/test_requests.py::TestTimeout::test_connect_timeout
-		tests/test_requests.py::TestTimeout::test_total_timeout_connect
-		# TODO: openssl?
-		tests/test_requests.py::TestRequests::test_pyopenssl_redirect
-		# flask-2
-		tests/test_requests.py::TestRequests::test_cookie_sent_on_redirect
-		tests/test_requests.py::TestRequests::test_cookie_removed_on_expire
-		tests/test_requests.py::TestPreparingURLs::test_redirecting_to_bad_url
-	)
-
-	case ${EPYTHON} in
-		python3.13)
-			;&
-		python3.12)
-			EPYTEST_DESELECT+=(
-				# different repr()
-				requests/utils.py::requests.utils.from_key_val_list
-			)
-			;;
-	esac
-
-	if ! has_version "dev-python/trustme[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			tests/test_requests.py::TestRequests::test_https_warnings
-		)
-	fi
-
-	epytest
-}
diff --git a/dev-python/requests/requests-2.32.3.ebuild b/dev-python/requests/requests-2.32.3.ebuild
index 35aa92871750..a59ea6ebead2 100644
--- a/dev-python/requests/requests-2.32.3.ebuild
+++ b/dev-python/requests/requests-2.32.3.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 IUSE="socks5 test-rust"
 
 RDEPEND="
diff --git a/dev-python/scikit-build-core/Manifest b/dev-python/scikit-build-core/Manifest
index 1805801eac3f..b458bcab9211 100644
--- a/dev-python/scikit-build-core/Manifest
+++ b/dev-python/scikit-build-core/Manifest
@@ -1,3 +1,2 @@
-DIST scikit_build_core-0.9.4.tar.gz 228198 BLAKE2B 86987ce34ed840d22a84a56fa0b62e8b6420f6f91763199945d5dfd0709ffb3b12778e996611cc652364637b8b8e0013cf39322fe322f1c2d3bbc22670c52876 SHA512 bc5252bf1f52e7fa0ea4d9e27d57fbf82a35e2061dfd8b8fbecc32b2da0ae88a2c3197bbece28f1285c1fb33ce91f27907bec093d76b937b382fa7dca072d0d9
 DIST scikit_build_core-0.9.5.tar.gz 228404 BLAKE2B 6b3aa905a63b73147e1a760bf8e0265395f6e2b5cce2a24594ee384f6e8ad31d7d16e76e7666115e5a962f49c2f2a4c622a33ac5e3a11443cfc2ed50e0801589 SHA512 fade6192347ea9d3010a24de7c1b868aea14fa2028a064fe397db26e15437f74f3d9b017be940855d57db32cb867cfa9bab1902bc1f51f96589a38b9478d01bc
 DIST scikit_build_core-0.9.6.tar.gz 228743 BLAKE2B da5dff989ca053c9ee1abfff739d0b755bb14f9d810020e4b44ba5caad670dfe24ef99b4cb93a18ae162dca8fe21d6d09c4d692ff1406bfa3a64ca25c24aeddb SHA512 b2b1e9b4baefc360b26dfc0bbf0edef20d7b6681140ef9a413c565666869e67ddce2cdd3027f3de6af29b7ef76bd7eeb401c08f3803524706d0ace9106b63f65
diff --git a/dev-python/scikit-build-core/scikit-build-core-0.9.4.ebuild b/dev-python/scikit-build-core/scikit-build-core-0.9.4.ebuild
deleted file mode 100644
index dac757db0521..000000000000
--- a/dev-python/scikit-build-core/scikit-build-core-0.9.4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Build backend for CMake based projects"
-HOMEPAGE="
-	https://github.com/scikit-build/scikit-build-core/
-	https://pypi.org/project/scikit-build-core/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
-
-# we always want [pyproject] extra
-RDEPEND="
-	app-alternatives/ninja
-	dev-build/cmake
-	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
-	>=dev-python/pathspec-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/pyproject-metadata-0.5[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/exceptiongroup[${PYTHON_USEDEP}]
-		>=dev-python/tomli-1.2.2[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/build[${PYTHON_USEDEP}]
-		>=dev-python/cattrs-22.2.0[${PYTHON_USEDEP}]
-		dev-python/fastjsonschema[${PYTHON_USEDEP}]
-		dev-python/pybind11[${PYTHON_USEDEP}]
-		>=dev-python/pytest-subprocess-1.5[${PYTHON_USEDEP}]
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local _EPYTEST_DESELECT=(
-		# TODO / we don't package validate_pyproject anyway
-		tests/test_schema.py::test_compare_schemas
-		# setuptools now respects PEP 625
-		tests/test_setuptools_pep517.py::test_pep517_sdist
-	)
-	local EPYTEST_IGNORE=(
-		# needs unpackaged validate_pyproject
-		tests/test_schema.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p subprocess -m "not isolated and not network"
-}
diff --git a/dev-python/scikit-build-core/scikit-build-core-0.9.5.ebuild b/dev-python/scikit-build-core/scikit-build-core-0.9.5.ebuild
index 729919e913ae..dac757db0521 100644
--- a/dev-python/scikit-build-core/scikit-build-core-0.9.5.ebuild
+++ b/dev-python/scikit-build-core/scikit-build-core-0.9.5.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 # we always want [pyproject] extra
 RDEPEND="
diff --git a/net-news/rssguard/Manifest b/net-news/rssguard/Manifest
index 419062e5422d..f90d5d182a6a 100644
--- a/net-news/rssguard/Manifest
+++ b/net-news/rssguard/Manifest
@@ -1,2 +1 @@
-DIST rssguard-4.6.6.gh.tar.gz 23432162 BLAKE2B f9febdc9d91ebfd4f8e8ade9de7b9ba6748bea9f5fa0e3ced0c4eaa908daedcbc2ae31c77e472418a05a8aca7fc30c7d56ab19aa144df40ea14a4530ac520e3d SHA512 82dbc1e5cbc527a965d17afe77aea978908544c2f8997a134749374e6acaf287de90c6be9a8e818c1097f826b54af94731f5f39fa9232ff8ee2491ac99e24063
 DIST rssguard-4.7.2.gh.tar.gz 23466960 BLAKE2B 39f563e7ffd824bc0412d64372b4a9c367eb2dc100efadee6a903b83473268f2ca9503c3ee10c1c7e2b49a9fc9135d9a2ce4fe3f9dc94ed1fc6675abadba86f1 SHA512 6094a57cbb0cf8ab948f101b3c2815b7a3da2219b1ead4bc67ec043a11195fb94a6dc61a373fafd9c11cf00b3584138bb10a9b49d16e5fb6ffa435937635fce3
diff --git a/net-news/rssguard/rssguard-4.6.6.ebuild b/net-news/rssguard/rssguard-4.6.6.ebuild
deleted file mode 100644
index 1f8402333811..000000000000
--- a/net-news/rssguard/rssguard-4.6.6.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake optfeature xdg
-
-DESCRIPTION="Simple (yet powerful) news feed reader"
-HOMEPAGE="https://github.com/martinrotter/rssguard/"
-SRC_URI="
-	https://github.com/martinrotter/rssguard/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="|| ( LGPL-3 GPL-2+ ) AGPL-3+ BSD GPL-3+ MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="libmpv mysql qt6 qtmultimedia +sqlite webengine"
-REQUIRED_USE="
-	|| ( mysql sqlite )
-	?? ( libmpv qtmultimedia )
-"
-
-BDEPEND="
-	!qt6? ( dev-qt/linguist-tools:5 )
-	qt6? ( dev-qt/qttools:6[linguist] )
-"
-DEPEND="
-	sys-libs/zlib:=
-	libmpv? ( media-video/mpv:= )
-	!qt6? (
-		dev-qt/qtconcurrent:5
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtdeclarative:5
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5[gstreamer]
-		dev-qt/qtnetwork:5[ssl]
-		dev-qt/qtsql:5[mysql?,sqlite?]
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-		libmpv? (
-			dev-qt/qtopengl:5
-		)
-		qtmultimedia? (
-			dev-qt/qtmultimedia:5
-			dev-qt/qtopengl:5
-		)
-		webengine? ( dev-qt/qtwebengine:5[widgets(+)] )
-	)
-	qt6? (
-		dev-qt/qtbase:6[concurrent,dbus,gui,mysql?,network,sql,sqlite?,ssl,widgets]
-		dev-qt/qtdeclarative:6
-		dev-qt/qtmultimedia:6[gstreamer]
-		dev-qt/qt5compat:6
-		media-libs/libglvnd
-		libmpv? (
-			dev-qt/qtbase:6[opengl]
-		)
-		qtmultimedia? (
-			dev-qt/qtbase:6[opengl]
-			dev-qt/qtmultimedia:6
-		)
-		webengine? ( dev-qt/qtwebengine:6[widgets(+)] )
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_WITH_QT6=$(usex qt6)
-		-DNO_LITE=$(usex webengine)
-		-DREVISION_FROM_GIT=OFF
-		-DNO_UPDATE_CHECK=ON
-		-DENABLE_COMPRESSED_SITEMAP=ON
-		-DENABLE_MEDIAPLAYER_QTMULTIMEDIA=$(usex qtmultimedia)
-		-DENABLE_MEDIAPLAYER_LIBMPV=$(usex libmpv)
-		# recommended
-		-DMEDIAPLAYER_FORCE_OPENGL=ON
-	)
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "ad blocking functionality" "net-libs/nodejs[npm]"
-}
diff --git a/net-news/rssguard/rssguard-4.7.2.ebuild b/net-news/rssguard/rssguard-4.7.2.ebuild
index 3625148b6cb5..1f8402333811 100644
--- a/net-news/rssguard/rssguard-4.7.2.ebuild
+++ b/net-news/rssguard/rssguard-4.7.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="|| ( LGPL-3 GPL-2+ ) AGPL-3+ BSD GPL-3+ MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="libmpv mysql qt6 qtmultimedia +sqlite webengine"
 REQUIRED_USE="
 	|| ( mysql sqlite )
diff --git a/net-wireless/blueman/blueman-2.4.2.ebuild b/net-wireless/blueman/blueman-2.4.2.ebuild
index bec135aa318c..b62ee00d3e7e 100644
--- a/net-wireless/blueman/blueman-2.4.2.ebuild
+++ b/net-wireless/blueman/blueman-2.4.2.ebuild
@@ -21,7 +21,7 @@ else
 		https://github.com/blueman-project/blueman/releases/download/${PV/_/.}/${P/_/.}.tar.xz
 	"
 	S=${WORKDIR}/${P/_/.}
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 # icons are GPL-2
diff --git a/profiles/package.mask b/profiles/package.mask
index 248be7fef473..3c01fde03859 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -414,12 +414,6 @@ sec-keys/openpgp-keys-jiatan
 # 20240-06-26.
 dev-ruby/uconv
 
-# Michał Górny <mgorny@gentoo.org> (2024-05-26)
-# Upstream broke support for custom ssl_context, and they are still
-# debating what the best way forward is.
-# https://github.com/psf/requests/pull/6667#issuecomment-2124283071
-=dev-python/requests-2.32.2
-
 # Arthur Zamarin <arthurzam@gentoo.org> (2024-05-23)
 # EAPI=6, maintainer-needed, dead HOMEPAGE, fails to compile.
 # Removal on 2024-06-22.  Bugs #932571, #902899, #887625, #853025, #672702.