Adding metadata

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2024-07-16 18:56:48 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2024-07-16 18:56:48 +0000
commit: 14d6204b592398e0b8babddbe65d3c628ff936ca (patch)
tree: 184f81256b00b8a5be5713b7b77ffe83a8ce1df0 /dev-python
parent: fba2b9f4c84a3f0c9ff16e5d77e6b995705ef2aa (diff)
download: baldeagleos-repo-14d6204b592398e0b8babddbe65d3c628ff936ca.tar.gz
baldeagleos-repo-14d6204b592398e0b8babddbe65d3c628ff936ca.tar.xz
baldeagleos-repo-14d6204b592398e0b8babddbe65d3c628ff936ca.zip
60 files changed, 720 insertions, 912 deletions
diff --git a/dev-python/backports-strenum/Manifest b/dev-python/backports-strenum/Manifest
new file mode 100644
index 000000000000..88686fc247d5
--- /dev/null
+++ b/dev-python/backports-strenum/Manifest
@@ -0,0 +1 @@
+DIST backports.strenum-1.3.1.gh.tar.gz 15064 BLAKE2B 749e319c9bdbec9eb1f3beab32355f015469336d688a3672380238f44694ce82747d7515330587821a60c92e1be0c7d8afc24ed70e3fa6ece368f6e74956958a SHA512 6a285bc63e6e3cb93e67da09eac9a1546af663d80e26448eed502494910db7850437bc13b6bee8f50e5debdea3335950c2f7c612238ecfbbfb454d5216c9513e
diff --git a/dev-python/backports-strenum/backports-strenum-1.3.1.ebuild b/dev-python/backports-strenum/backports-strenum-1.3.1.ebuild
new file mode 100644
index 000000000000..c7cef8dfd883
--- /dev/null
+++ b/dev-python/backports-strenum/backports-strenum-1.3.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
+
+inherit distutils-r1
+
+MY_P=${P/-/.}
+DESCRIPTION="Create enumerated constants that are also subclasses of str"
+HOMEPAGE="
+	https://github.com/clbarnes/backports.strenum/
+	https://pypi.org/project/backports.strenum/
+"
+# no tests in sdist
+SRC_URI="
+	https://github.com/clbarnes/backports.strenum/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+distutils_enable_tests pytest
diff --git a/dev-python/backports-strenum/metadata.xml b/dev-python/backports-strenum/metadata.xml
new file mode 100644
index 000000000000..a0d4c5913ba0
--- /dev/null
+++ b/dev-python/backports-strenum/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-python/cachetools/Manifest b/dev-python/cachetools/Manifest
index 94f7b1d875a1..b470036e6f83 100644
--- a/dev-python/cachetools/Manifest
+++ b/dev-python/cachetools/Manifest
@@ -1 +1,2 @@
 DIST cachetools-5.3.3.tar.gz 26522 BLAKE2B 56eb1ab02fa50a7980d977d9a136c4c43b4981308c1c9fd5b2de596ce5fc79b2e3fbdefdade594fa3aa632eb5b26742f2afb7359dc87705d27389a8312247095 SHA512 ece7b1e54839aa8cae65a6164dc8dce6b1553c72ead551e1ae1d8a5e5ee937b952773504dc0d63c423521adfd20d6839bb3ea066dcbc6ab296649bd4ab8f7d83
+DIST cachetools-5.4.0.tar.gz 26975 BLAKE2B cdceb90771686dfee1be9117b3d12fd60e832683be7dd1825f2c430eb9f897d0565cac12b9238090e56391ea2cb097762b7c43726602ec82ffe7fcdf4885aa3c SHA512 ee45747725bed2e3f06b493cf052896af48485907792f1a8331b1dcfca8a52942d2a49eb8c2bf4942ef749f4266d239e95d4165fb681a74fa57d0fe126fc4397
diff --git a/dev-python/cachetools/cachetools-5.4.0.ebuild b/dev-python/cachetools/cachetools-5.4.0.ebuild
new file mode 100644
index 000000000000..14db04873cc7
--- /dev/null
+++ b/dev-python/cachetools/cachetools-5.4.0.ebuild
@@ -0,0 +1,21 @@
+# 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_{8,9,10,11,12} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Extensible memoizing collections and decorators"
+HOMEPAGE="
+	https://github.com/tkem/cachetools/
+	https://pypi.org/project/cachetools/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/click-option-group/Manifest b/dev-python/click-option-group/Manifest
index e9598de37516..46abf7cb74a0 100644
--- a/dev-python/click-option-group/Manifest
+++ b/dev-python/click-option-group/Manifest
@@ -1,2 +1 @@
-DIST click-option-group-0.5.5.gh.tar.gz 18488 BLAKE2B 87bd7bf585a5ea0d7fcb49695a10e79fcecead334ae23058508a17d7e2347b132767703abc4a8918564c3b04f21ab8db30dfeb46a0d8e3a07d224eb6cbf344a5 SHA512 114f47846668c3b3d7465ac22d0e6fce79de230a267432d55a4a1a60be7c1511a376b8f39c3e1f3dac556fd89d00e2015977b01df05ae60d8fb5d46756bec9df
-DIST click-option-group-0.5.6.gh.tar.gz 18938 BLAKE2B db666d1a04f079ebe8ad9cab0605cf49cec054e912ce35d5062f40e0dcc000c227735569269fe16003476e8103ab5a94f9605be6d6ef962322fde503270e3674 SHA512 791bb027cdc9055124d6ff26b3ac775c8047f1dacc32f9783a17fd64f3df744030b5efe3fdf01926a61c04294e523d6e2f70ad106243d2cdb7724dc1fa11eb60
+DIST click-option-group-0.5.6.tar.gz 16517 BLAKE2B 8edc9e1c7aff7ff03f86fea41a43a37b9605efb11cae402ebaaa18620b21fd50237d92979f024b319b7de7b244f3168a3557efcc4f754c83e1bc4cd05b578428 SHA512 7ac321a0c2dedcacf9b0383cb6b1ae6f7dd0ec6855e4f88cd4817ddece0c2c043c8b10fab04a41aefce38f871075a793bdc7b000f3b99adc7d93a3b6f0cf9884
diff --git a/dev-python/click-option-group/click-option-group-0.5.5.ebuild b/dev-python/click-option-group/click-option-group-0.5.5.ebuild
deleted file mode 100644
index 52eb73ef17c3..000000000000
--- a/dev-python/click-option-group/click-option-group-0.5.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1
-
-DESCRIPTION=" Option groups missing in Click "
-HOMEPAGE="https://github.com/click-contrib/click-option-group"
-SRC_URI="https://github.com/click-contrib/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="test"
-
-RDEPEND="dev-python/click[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="
-"
-# dev-python/coveralls currently masked in ::guru due to
-# https://github.com/TheKevJames/coveralls-python/issues/377
-	# test? (
-	# 	dev-python/pytest-cov[${PYTHON_USEDEP}]
-	# 	<dev-python/coverage-7[${PYTHON_USEDEP}]
-	# 	dev-python/coveralls[${PYTHON_USEDEP}]
-	# )
-
-distutils_enable_tests pytest
diff --git a/dev-python/click-option-group/click-option-group-0.5.6.ebuild b/dev-python/click-option-group/click-option-group-0.5.6.ebuild
index 52eb73ef17c3..b145a1174861 100644
--- a/dev-python/click-option-group/click-option-group-0.5.6.ebuild
+++ b/dev-python/click-option-group/click-option-group-0.5.6.ebuild
@@ -1,32 +1,26 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
-DESCRIPTION=" Option groups missing in Click "
-HOMEPAGE="https://github.com/click-contrib/click-option-group"
-SRC_URI="https://github.com/click-contrib/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+DESCRIPTION="Click-extension package that adds option groups missing in Click"
+HOMEPAGE="
+	https://github.com/click-contrib/click-option-group
+	https://pypi.org/project/click-option-group/
+"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="test"
+KEYWORDS="~amd64 ~arm64"
 
-RDEPEND="dev-python/click[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="
+RDEPEND="
+	dev-python/click[${PYTHON_USEDEP}]
 "
-# dev-python/coveralls currently masked in ::guru due to
-# https://github.com/TheKevJames/coveralls-python/issues/377
-	# test? (
-	# 	dev-python/pytest-cov[${PYTHON_USEDEP}]
-	# 	<dev-python/coverage-7[${PYTHON_USEDEP}]
-	# 	dev-python/coveralls[${PYTHON_USEDEP}]
-	# )
 
 distutils_enable_tests pytest
diff --git a/dev-python/click-option-group/metadata.xml b/dev-python/click-option-group/metadata.xml
index facf862bfcd1..8051c7f9a166 100644
--- a/dev-python/click-option-group/metadata.xml
+++ b/dev-python/click-option-group/metadata.xml
@@ -2,23 +2,14 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
-  <email>julien@jroy.ca</email>
-  <name>Julien Roy</name>
+  <email>sam@gentoo.org</email>
+  <name>Sam James</name>
  </maintainer>
- <longdescription>Click is a package for creating powerful and beautiful command line interfaces (CLI) in Python, but it has no the functionality for creating option groups.
-
-Option groups are convenient mechanism for logical structuring CLI, also it allows you to set the specific behavior and set the relationship among grouped options (mutually exclusive options for example). Moreover, argparse stdlib package contains this functionality out of the box.
-
-The aim of this package is to provide group options with extensible functionality using canonical and clean API (Click-like API as far as possible).
-	</longdescription>
- <upstream>
-  <maintainer>
-   <email>esp.home@gmail.com</email>
-   <name>Eugene Prilepin</name>
-  </maintainer>
-  <changelog>https://github.com/click-contrib/click-option-group/releases</changelog>
-  <bugs-to>https://github.com/click-contrib/click-option-group/issues</bugs-to>
-  <doc>https://click-option-group.readthedocs.io/</doc>
- </upstream>
- <origin>gentoo-guru-overlay</origin>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-python/griffe/Manifest b/dev-python/griffe/Manifest
index a373fe8d0c63..c65ab5dc412c 100644
--- a/dev-python/griffe/Manifest
+++ b/dev-python/griffe/Manifest
@@ -1,2 +1,2 @@
-DIST griffe-0.46.1.gh.tar.gz 232727 BLAKE2B c056cb47e7423931336db55b2871f7a0908e453abc930fe82ef5dce0dc38d2de223b4349547362d54f061d5cbc8f1c8802a7277f776ea4c7e6630794774865a2 SHA512 07ee210c8e3b9c814d5e419ac3bb2a37065ecdda26b9215fcbb3b87dcdd542d5a52de186c69542aa25c20eb70e2a21a6274dbd9c8e19650fe8a48f483c4efbdc
 DIST griffe-0.47.0.gh.tar.gz 233418 BLAKE2B cb31882f9ddd7210ac36eb400d182395b0da3cd37e38458f23582117aae4c83e9cd62a3dfb16067ec518a42ed6b4f6d9d77d6927be2ca462297c6420bcd25cd8 SHA512 d1d0603a81a8c859c67791ceeaf3c03a134ae221d7554b2a1133ed60a3ca85d157980b26c6930c282c50d9d46a02f26a44dffcfe0c1bd844a3f0ba58f2a1c52c
+DIST griffe-0.48.0.gh.tar.gz 370711 BLAKE2B 197da160c0e20d9669a5347fbf256db58c5a3e5e33094ddd104ae02ac9112d2daa17778ba64bc6611117a7d20af42b1b3e4101b3ec56ef8cc0dc2297d6d38a3a SHA512 3b999fbd05b206c973fe5dc7c89500f2fbfe9376529d0b5cc1714dee30f2a17985e4ed6903e638e0b96600e546747f105cab11620190185c133c53dd1df9a364
diff --git a/dev-python/griffe/griffe-0.46.1.ebuild b/dev-python/griffe/griffe-0.48.0.ebuild
index 6b674e3230b3..605d579be1e2 100644
--- a/dev-python/griffe/griffe-0.46.1.ebuild
+++ b/dev-python/griffe/griffe-0.48.0.ebuild
@@ -22,14 +22,18 @@ SRC_URI="
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="~amd64"
 
 RDEPEND="
 	>=dev-python/colorama-0.4[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/backports-strenum-1.3[${PYTHON_USEDEP}]
+	' 3.10)
 "
 BDEPEND="
 	test? (
 		>=dev-python/jsonschema-4.17[${PYTHON_USEDEP}]
+		dev-python/mkdocstrings[${PYTHON_USEDEP}]
 		>=dev-python/pytest-xdist-2.4[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/langdetect/Manifest b/dev-python/langdetect/Manifest
index a11d7c268c91..37a64204a00a 100644
--- a/dev-python/langdetect/Manifest
+++ b/dev-python/langdetect/Manifest
@@ -1 +1,3 @@
 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
deleted file mode 100644
index 637368d2f237..000000000000
--- a/dev-python/langdetect/files/langdetect-1.0.9-explicit-config.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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 630fe63c6f53..c09b7356f549 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-2024 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,6 +19,4 @@ 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 736a1167c898..020e07f2a3dd 100644
--- a/dev-python/langdetect/metadata.xml
+++ b/dev-python/langdetect/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
- 
- <origin>gentoo-guru-overlay</origin>
+ <maintainer type="person">
+  <email>marcin.deranek@slonko.net</email>
+  <name>Marcin Deranek</name>
+ </maintainer>
+ <upstream>
+  <bugs-to>https://github.com/Mimino666/langdetect/issues</bugs-to>
+ </upstream>
+ <origin>slonko-overlay</origin>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-python/pdm-backend/Manifest b/dev-python/pdm-backend/Manifest
index 432d9d52f336..a88fa7271b3f 100644
--- a/dev-python/pdm-backend/Manifest
+++ b/dev-python/pdm-backend/Manifest
@@ -1,2 +1,3 @@
 DIST pdm-backend-2.3.1.gh.tar.gz 136710 BLAKE2B 72293989700a429bfddb1d865b14f0467d56e024d69976264909d1c5113be67fd6892f3821803b6e86d73653f54a62b15ccb02f3dc16a190f6ccd0ca5e0650b5 SHA512 6a1a4d45a95b08f0a06f54635224c6faabc000384f489eb1e462d7dfffdd9899a3040a0fb708d193b3da541e2704b30921185728a178517fa55ecf3314f9903d
 DIST pdm-backend-2.3.2.gh.tar.gz 136819 BLAKE2B 15f1375a646337f25fa37b94cd88d257849dbaa79cc2153ca608c4bc35d8e243f7d2a63ddcac87d435bea2fa5200b2d254544720d959566584526c8f182f9152 SHA512 acbf3be68dba894152b0257dbb99ba21e120e5dd48c5989fe5047a6c0073c58f829cb52f8537f32b096838202f0a29f2c38cab43d5c284d1b610811c9f2c25a3
+DIST pdm-backend-2.3.3.gh.tar.gz 136942 BLAKE2B 14f2584f22f1c4e08f687c77621269ae1e5acfe4babb1ab427c10d65ff07841b8175479f867870b9a5745db76444ca140a7da497a94c831ca6d0ea1e67b4e88f SHA512 382ad95e2811f1142fee66065f96ede1a646c3e2b9fbfafc6afb17442d3aeccfbf1ff6260952986a025791d3d56a2c4b730decb3cb65e893c25a710e16cbcfc8
diff --git a/dev-python/pdm-backend/pdm-backend-2.3.3.ebuild b/dev-python/pdm-backend/pdm-backend-2.3.3.ebuild
new file mode 100644
index 000000000000..c3952a450dd6
--- /dev/null
+++ b/dev-python/pdm-backend/pdm-backend-2.3.3.ebuild
@@ -0,0 +1,75 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A PEP 517 backend for PDM that supports PEP 621 metadata"
+HOMEPAGE="
+	https://pypi.org/project/pdm-backend/
+	https://github.com/pdm-project/pdm-backend/
+"
+SRC_URI="
+	https://github.com/pdm-project/pdm-backend/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# see src/pdm/backend/_vendor/vendor.txt
+RDEPEND="
+	>=dev-python/editables-0.5[${PYTHON_USEDEP}]
+	>=dev-python/packaging-24.0[${PYTHON_USEDEP}]
+	>=dev-python/pyproject-metadata-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
+
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+# setuptools are used to build C extensions
+RDEPEND+="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	rm -r src/pdm/backend/_vendor || die
+	find -name '*.py' -exec sed \
+		-e 's:from pdm\.backend\._vendor\.:from :' \
+		-e 's:from pdm\.backend\._vendor ::' \
+		-e 's:import pdm\.backend\._vendor\.:import :' \
+		-i {} + || die
+	distutils-r1_src_prepare
+}
+
+src_compile() {
+	# this must not be set during src_test()
+	local -x PDM_BUILD_SCM_VERSION=${PV}
+	distutils-r1_src_compile
+}
+
+src_test() {
+	git config --global user.email "test@example.com" || die
+	git config --global user.name "Test User" || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -k "not [hg"
+}
diff --git a/dev-python/pycpio/Manifest b/dev-python/pycpio/Manifest
index 1de5d63fe067..81df698a05fd 100644
--- a/dev-python/pycpio/Manifest
+++ b/dev-python/pycpio/Manifest
@@ -1,5 +1 @@
-DIST pycpio-1.0.0.tar.gz 17890 BLAKE2B beeec891fc17416280247e8a15373628f40be10946b596889b2d2a14d3e9ab5ee2014e6a4c6f5c4d612385f602e5ae14601cf0e379a165c2ed5d335832b3cfa2 SHA512 1ee2b09f01eab4b8adfd050845ff810b3da663386544321021de1b9a53b7846a31f3a6ab9e132fbffb9eeb04ad2b7b81235f59a333a63c3679d51755b822b320
-DIST pycpio-1.1.2.tar.gz 18207 BLAKE2B acc92b626b5a110b8aa1672449fa1065283edfeb300c406b654e5a045bc554d9f79d3cd8f7edb53142405e600ceec21fa811a863907af3464d310482aa3fc528 SHA512 9a420edabec91e633b618f68878942d047d851eecad861255705f3db3f9fa8d14fa364f19320eb22758bbb7f1b23e7231b5db7aca117e670286e73f1dcb289ce
-DIST pycpio-1.1.4.tar.gz 18235 BLAKE2B 5b7aa4f9af1903b02361cad228673a83deaa497b3259ef7094d1b6995860eed8710e0d0aa6fc4603a4f52f6f7ab3c4356bc37134a70f80f0a1e4f36ce782beb3 SHA512 46cf8f43cb95332d55b75318b5620f81632151010d1329177243853bca5cf8dbc2881805d2d304bfd1889d504fa0f03ac54e5377a42ba1e0b8f1166c12e9fa3c
-DIST pycpio-1.1.6.tar.gz 18281 BLAKE2B c0a6d39ec20c91ec39d6f7ef99cb05d039ea1e89369205196fe40c924f8ed9757e26ea8f31a8036693f8ea04901343421405c4b50cec33df90b548550f0f2f81 SHA512 34a59a279ff1d271fb824c9f7be94da0b3bfedd49c09a8fe8855851363200f104b67a9d7686cc8f1364f325b8d8c86e6fe3dff162bb49ddc6a9b8ec10ee75724
 DIST pycpio-1.2.1.tar.gz 18512 BLAKE2B e835e3810d174d8f4cd5afc2984c0d84d55f9492725c16afdcd1b760dc8c58b4b83a1d13c0b266c8ec9407ab5c1114fe95468d742b202ba99e3c4a76a69dff15 SHA512 4611829339a45a848deb0c5c35098215ac7c378714e4fb1e10975e00b386e5e6bcd295fde83f361998f234f506276b906a4424a7d4aa925fe2bd92a0d7311d86
diff --git a/dev-python/pycpio/metadata.xml b/dev-python/pycpio/metadata.xml
index af8c55886ddf..431f8bca4750 100644
--- a/dev-python/pycpio/metadata.xml
+++ b/dev-python/pycpio/metadata.xml
@@ -5,6 +5,10 @@
   <email>dev@pyl.onl</email>
   <name>Zen</name>
  </maintainer>
+ <maintainer type="person">
+  <email>andrewammerlaan@gentoo.org</email>
+  <name>Andrew Ammerlaan</name>
+ </maintainer>
  
- <origin>gentoo-guru-overlay</origin>
+ <origin>gentoo-staging</origin>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-python/pycpio/pycpio-1.0.0.ebuild b/dev-python/pycpio/pycpio-1.0.0.ebuild
deleted file mode 100644
index 06449bbe31ae..000000000000
--- a/dev-python/pycpio/pycpio-1.0.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-inherit distutils-r1
-
-DESCRIPTION="Python CPIO library"
-HOMEPAGE="https://github.com/desultory/pycpio"
-SRC_URI="https://github.com/desultory/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="=dev-python/zenlib-2*[${PYTHON_USEDEP}]"
diff --git a/dev-python/pycpio/pycpio-1.1.2-r1.ebuild b/dev-python/pycpio/pycpio-1.1.2-r1.ebuild
deleted file mode 100644
index dcabaa8c0d7e..000000000000
--- a/dev-python/pycpio/pycpio-1.1.2-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-inherit distutils-r1
-
-DESCRIPTION="Python CPIO library"
-HOMEPAGE="https://github.com/desultory/pycpio"
-SRC_URI="https://github.com/desultory/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-DEPEND=">=dev-python/zenlib-2.1.2[${PYTHON_USEDEP}]"
diff --git a/dev-python/pycpio/pycpio-1.1.4.ebuild b/dev-python/pycpio/pycpio-1.1.4.ebuild
deleted file mode 100644
index dcabaa8c0d7e..000000000000
--- a/dev-python/pycpio/pycpio-1.1.4.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-inherit distutils-r1
-
-DESCRIPTION="Python CPIO library"
-HOMEPAGE="https://github.com/desultory/pycpio"
-SRC_URI="https://github.com/desultory/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-DEPEND=">=dev-python/zenlib-2.1.2[${PYTHON_USEDEP}]"
diff --git a/dev-python/pycpio/pycpio-1.1.6.ebuild b/dev-python/pycpio/pycpio-1.1.6.ebuild
deleted file mode 100644
index 5b7d2938a5d7..000000000000
--- a/dev-python/pycpio/pycpio-1.1.6.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-inherit distutils-r1
-
-DESCRIPTION="Python CPIO library"
-HOMEPAGE="https://github.com/desultory/pycpio"
-SRC_URI="https://github.com/desultory/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-RDEPEND=">=dev-python/zenlib-2.1.2[${PYTHON_USEDEP}]"
diff --git a/dev-python/pydot/Manifest b/dev-python/pydot/Manifest
index 7f0890e5c6eb..956c10470279 100644
--- a/dev-python/pydot/Manifest
+++ b/dev-python/pydot/Manifest
@@ -1 +1,2 @@
 DIST pydot-2.0.0.gh.tar.gz 275188 BLAKE2B 58f1598196861795bd44c6b97683e0c37b3c05e848a69d42a3fc898849f272466c989e7ff72e0be22a322a1e92c31c6b76a9317e56f3ec26743c20801daf8bfd SHA512 09102930a59ac4339e1d1e4f7a9d075f99eda6cb060885631a72f1fded90d001bd02940b55addc0c92856e95321cb3b344a1797b4809ac7c9048ac57c81d4707
+DIST pydot-3.0.0.gh.tar.gz 280655 BLAKE2B 0c58f5a03cdb2eb325aec96e532bbe4808170a3828377ba3a278c8c5631de9c74716a19426ebb0834ecba063b92c31ef41965edb1ee22018ed658e0e4e17bc7a SHA512 493601a54e9727d727b1ff3fa9133da400dd02ca147f04b5c446a2baeda3b5ae60d0edccaf122e946abe984f7d9e375cda553a22608b070e06e8f59eda82d565
diff --git a/dev-python/pydot/pydot-3.0.0.ebuild b/dev-python/pydot/pydot-3.0.0.ebuild
new file mode 100644
index 000000000000..c9ac0072cdbb
--- /dev/null
+++ b/dev-python/pydot/pydot-3.0.0.ebuild
@@ -0,0 +1,38 @@
+# 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_{8,9,10,11,12} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface to Graphviz's Dot language"
+HOMEPAGE="
+	https://github.com/pydot/pydot/
+	https://pypi.org/project/pydot/
+"
+# pypi releases don't include tests
+SRC_URI="
+	https://github.com/pydot/pydot/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/pyparsing-3.0.9[${PYTHON_USEDEP}]
+	media-gfx/graphviz
+"
+BDEPEND="
+	test? (
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/pyside6-tools/Manifest b/dev-python/pyside6-tools/Manifest
index a847fdbd896f..6bad2ad97ee1 100644
--- a/dev-python/pyside6-tools/Manifest
+++ b/dev-python/pyside6-tools/Manifest
@@ -1,2 +1 @@
-DIST pyside-setup-everywhere-src-6.7.1.tar.xz 14400976 BLAKE2B 1f6e2705aedc4151147e259da2a8fbab19a1815f19f1a36ea46dbf0bf2282a453e85a33ea8c6862072bb22699be39ab8375b48cd6d5b879de8bed5fad8cf60cb SHA512 6ca73f0b16ef43bc018aeb9e0f51d8ae91b13b79ebdfd71f5524bc0e8ef78322ba0aca81203cc5532e5096a55441fb4dabf3b628de3234b876b7a70327b714d4
 DIST pyside-setup-everywhere-src-6.7.2.tar.xz 14402156 BLAKE2B 321717ba46c7ed29404ee326f852cd4032f93e23b6b32a16e4e05305ff04a00a2029ee7c1d50ad7191a836ffd9a3ae858483bac35e8254bdcaeb474e2c92df60 SHA512 4376aba85867b5a04dab9d8889f5e32cb503cb8010757c1e810e60d29755f15a002b582594d0737a4119c030b48ede26964e8b1392700a6c061d7d631cdfe73e
diff --git a/dev-python/pyside6-tools/pyside6-tools-6.7.1.ebuild b/dev-python/pyside6-tools/pyside6-tools-6.7.1.ebuild
deleted file mode 100644
index 3b6dcfe756cf..000000000000
--- a/dev-python/pyside6-tools/pyside6-tools-6.7.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# TODO: Add PyPy once officially supported. See also:
-#     https://bugreports.qt.io/browse/PYSIDE-535
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-LLVM_COMPAT=( {15..18} )
-
-inherit cmake llvm-r1 python-r1
-
-MY_PN="pyside-setup-everywhere-src"
-
-DESCRIPTION="PySide development tools (pyside6-lupdate with support for Python)"
-HOMEPAGE="https://wiki.qt.io/PySide6"
-SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-${PV}-src/${MY_PN}-${PV}.tar.xz"
-S="${WORKDIR}/${MY_PN}-${PV}/sources/pyside-tools"
-
-LICENSE="GPL-2"
-SLOT="6/${PV}"
-KEYWORDS="amd64 ~arm ~arm64"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Minimal supported version of Qt.
-QT_PV="$(ver_cut 1-3)*:6"
-
-RDEPEND="${PYTHON_DEPS}
-	=dev-python/shiboken6-${QT_PV}[${PYTHON_USEDEP},${LLVM_USEDEP}]
-	=dev-python/pyside6-${QT_PV}[quick,${PYTHON_USEDEP},${LLVM_USEDEP}]
-	!dev-python/pyside6-tools:0
-"
-DEPEND="${RDEPEND}
-	$(llvm_gen_dep '
-		sys-devel/clang:${LLVM_SLOT}
-		sys-devel/llvm:${LLVM_SLOT}
-	')
-"
-
-src_prepare() {
-	cmake_src_prepare
-
-	python_copy_sources
-}
-
-src_configure() {
-	pyside-tools_configure() {
-		local mycmakeargs=(
-			# If this is enabled cmake just makes copies of /lib64/qt6/bin/*
-			-DNO_QT_TOOLS=yes
-		)
-		cmake_src_configure
-	}
-
-	python_foreach_impl pyside-tools_configure
-}
-
-src_compile() {
-	pyside-tools_compile() {
-		cmake_src_compile
-	}
-
-	python_foreach_impl pyside-tools_compile
-}
-
-src_install() {
-	pyside-tools_install() {
-		# This replicates the contents of the PySide6 pypi wheel
-		DESTDIR="${BUILD_DIR}" cmake_build install
-		cp __init__.py "${BUILD_DIR}/usr/bin" || die
-		rm -r  "${BUILD_DIR}/usr/bin/qtpy2cpp_lib/tests" || die
-		python_moduleinto PySide6/scripts
-		python_domodule "${BUILD_DIR}/usr/bin/."
-	}
-
-	python_foreach_impl pyside-tools_install
-
-	einstalldocs
-}
diff --git a/dev-python/pyside6/Manifest b/dev-python/pyside6/Manifest
index a847fdbd896f..6bad2ad97ee1 100644
--- a/dev-python/pyside6/Manifest
+++ b/dev-python/pyside6/Manifest
@@ -1,2 +1 @@
-DIST pyside-setup-everywhere-src-6.7.1.tar.xz 14400976 BLAKE2B 1f6e2705aedc4151147e259da2a8fbab19a1815f19f1a36ea46dbf0bf2282a453e85a33ea8c6862072bb22699be39ab8375b48cd6d5b879de8bed5fad8cf60cb SHA512 6ca73f0b16ef43bc018aeb9e0f51d8ae91b13b79ebdfd71f5524bc0e8ef78322ba0aca81203cc5532e5096a55441fb4dabf3b628de3234b876b7a70327b714d4
 DIST pyside-setup-everywhere-src-6.7.2.tar.xz 14402156 BLAKE2B 321717ba46c7ed29404ee326f852cd4032f93e23b6b32a16e4e05305ff04a00a2029ee7c1d50ad7191a836ffd9a3ae858483bac35e8254bdcaeb474e2c92df60 SHA512 4376aba85867b5a04dab9d8889f5e32cb503cb8010757c1e810e60d29755f15a002b582594d0737a4119c030b48ede26964e8b1392700a6c061d7d631cdfe73e
diff --git a/dev-python/pyside6/pyside6-6.7.1.ebuild b/dev-python/pyside6/pyside6-6.7.1.ebuild
deleted file mode 100644
index e3bfdcbf257d..000000000000
--- a/dev-python/pyside6/pyside6-6.7.1.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# TODO: Add PyPy once officially supported. See also:
-#     https://bugreports.qt.io/browse/PYSIDE-535
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-LLVM_COMPAT=( {15..18} )
-
-inherit cmake llvm-r1 python-r1 virtualx
-
-# TODO: Add conditional support for "QtRemoteObjects" via a new "remoteobjects"
-# USE flag after an external "dev-qt/qtremoteobjects" package has been created.
-# TODO: Add conditional support for apidoc generation via a new "doc" USE flag.
-# Note that doing so requires the Qt source tree, sphinx, and graphviz. Once
-# ready, pass the ${QT_SRC_DIR} variable to cmake to enable this support.
-# TODO: Disable GLES support if the "gles2-only" USE flag is disabled. Note
-# that the "PySide6/QtGui/CMakeLists.txt" and
-# "PySide6/QtOpenGLFunctions/CMakeLists.txt" files test for GLES support by
-# testing whether the "Qt5::Gui" list property defined by
-# "/usr/lib64/cmake/Qt5Gui/Qt5GuiConfig.cmake" at "dev-qt/qtgui" installation
-# time contains the substring "opengles2". Since cmake does not permit
-# properties to be overridden from the command line, these files must instead
-# be conditionally patched to avoid these tests. An issue should be filed with
-# upstream requesting a CLI-settable variable to control this.
-
-MY_PN="pyside-setup-everywhere-src"
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="https://wiki.qt.io/PySide6"
-SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-${PV}-src/${MY_PN}-${PV}.tar.xz"
-S="${WORKDIR}/${MY_PN}-${PV}/sources/pyside6"
-
-# See "sources/pyside6/PySide6/licensecomment.txt" for licensing details.
-# Shall we allow essential modules to be disabled? They are:
-# (core), gui, widgets, printsupport, sql, network, testlib, concurrent,
-# x11extras (for X)
-LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 )"
-SLOT="6/${PV}"
-KEYWORDS="amd64 ~arm ~arm64"
-IUSE="
-	3d bluetooth charts +concurrent +dbus designer gles2-only +gui help location
-	multimedia +network network-auth nfc positioning +opengl pdfium positioning
-	+printsupport qml quick quick3d serialport scxml sensors spatialaudio speech
-	+sql svg test +testlib webchannel webengine	websockets +widgets +xml
-"
-
-# Manually reextract these requirements on version bumps by running the
-# following one-liner from within "${S}":
-#     $ grep 'set.*_deps' PySide6/Qt*/CMakeLists.txt
-# Note that the "designer" USE flag corresponds to the "Qt6UiTools" module.
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	3d? ( gui network )
-	charts? ( gui widgets )
-	designer? ( widgets )
-	gles2-only? ( gui )
-	gui? ( dbus opengl )
-	help? ( network sql widgets )
-	location? ( gui network positioning quick )
-	multimedia? ( gui network )
-	network-auth? ( network )
-	opengl? ( gui )
-	pdfium? ( gui )
-	printsupport? ( widgets )
-	qml? ( network )
-	quick? ( gui network opengl qml )
-	quick3d? ( gui network opengl qml quick )
-	spatialaudio? ( multimedia )
-	speech? ( multimedia )
-	sql? ( widgets )
-	svg? ( gui )
-	testlib? ( widgets )
-	webchannel? ( qml )
-	webengine? ( network gui printsupport quick webchannel )
-	websockets? ( network )
-	widgets? ( gui )
-"
-
-# Tests fail pretty bad and I'm not fixing them right now
-RESTRICT="test"
-
-# Minimal supported version of Qt.
-QT_PV="$(ver_cut 1-3)*:6"
-
-RDEPEND="${PYTHON_DEPS}
-	=dev-python/shiboken6-${QT_PV}[${PYTHON_USEDEP},${LLVM_USEDEP}]
-	=dev-qt/qtbase-${QT_PV}[concurrent?,dbus?,gles2-only=,network?,opengl?,sql?,widgets?,xml?]
-	3d? ( =dev-qt/qt3d-${QT_PV}[qml?,gles2-only=] )
-	bluetooth? ( =dev-qt/qtconnectivity-${QT_PV}[bluetooth] )
-	charts? ( =dev-qt/qtcharts-${QT_PV} )
-	designer? ( =dev-qt/qttools-${QT_PV}[designer] )
-	gui? (
-		=dev-qt/qtbase-${QT_PV}[gui,jpeg(+)]
-		x11-libs/libxkbcommon
-	)
-	help? ( =dev-qt/qttools-${QT_PV}[assistant] )
-	location? ( =dev-qt/qtlocation-${QT_PV} )
-	multimedia? ( =dev-qt/qtmultimedia-${QT_PV} )
-	network? ( =dev-qt/qtbase-${QT_PV}[ssl] )
-	network-auth? ( =dev-qt/qtnetworkauth-${QT_PV} )
-	nfc? ( =dev-qt/qtconnectivity-${QT_PV}[nfc] )
-	pdfium? ( =dev-qt/qtwebengine-${QT_PV}[pdfium(-),widgets?] )
-	positioning? ( =dev-qt/qtpositioning-${QT_PV} )
-	printsupport? ( =dev-qt/qtbase-${QT_PV}[gui,widgets] )
-	qml? ( =dev-qt/qtdeclarative-${QT_PV}[widgets?] )
-	quick3d? ( =dev-qt/qtquick3d-${QT_PV} )
-	scxml? ( =dev-qt/qtscxml-${QT_PV} )
-	sensors? ( =dev-qt/qtsensors-${QT_PV}[qml?] )
-	speech? ( =dev-qt/qtspeech-${QT_PV} )
-	serialport? ( =dev-qt/qtserialport-${QT_PV} )
-	svg? ( =dev-qt/qtsvg-${QT_PV} )
-	testlib? ( =dev-qt/qtbase-${QT_PV}[gui] )
-	webchannel? ( =dev-qt/qtwebchannel-${QT_PV} )
-	webengine? ( || (
-		=dev-qt/qtwebengine-${QT_PV}[alsa,widgets?]
-		=dev-qt/qtwebengine-${QT_PV}[pulseaudio,widgets?]
-		)
-	)
-	websockets? ( =dev-qt/qtwebsockets-${QT_PV} )
-	!dev-python/pyside6:0
-"
-DEPEND="${RDEPEND}
-	$(llvm_gen_dep '
-		sys-devel/clang:${LLVM_SLOT}
-		sys-devel/llvm:${LLVM_SLOT}
-	')
-	test? ( =dev-qt/qtbase-${QT_PV}[gui] )
-"
-# testlib is toggled by the gui flag on qtbase
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.3.1-no-strip.patch"
-	# References files not present in our dev-qt/qtbase
-	"${FILESDIR}/${PN}-6.6.0-no-qtexampleicons.patch"
-)
-
-src_configure() {
-	# See collect_module_if_found macros in PySideHelpers.cmake
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DAnimation=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DCore=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DExtras=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DInput=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DLogic=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DRender=$(usex !3d)
-		#-DCMAKE_DISABLE_FIND_PACKAGE_Qt6AxContainer=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Bluetooth=$(usex !bluetooth)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Charts=$(usex !charts)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Concurrent=$(usex !concurrent)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6DataVisualization=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6DBus=$(usex !dbus)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Designer=$(usex !designer)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Gui=$(usex !gui)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Help=$(usex !help)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6HttpServer=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Location=$(usex !location)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Multimedia=$(usex !multimedia)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6MultimediaWidgets=$(usex !multimedia yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6NetworkAuth=$(usex !network-auth)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Network=$(usex !network)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Nfc=$(usex !nfc)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6OpenGL=$(usex !opengl)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6OpenGLWidgets=$(usex !opengl yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Pdf=$(usex !pdfium)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6PdfWidgets=$(usex !pdfium yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Positioning=$(usex !positioning)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6PrintSupport=$(usex !printsupport)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Qml=$(usex !qml)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Quick3D=$(usex !quick3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Quick=$(usex !quick)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6QuickControls2=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6QuickWidgets=$(usex !quick yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6RemoteObjects=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Scxml=$(usex !scxml)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Sensors=$(usex !sensors)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6SerialPort=$(usex !serialport)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6SpatialAudio=$(usex !spatialaudio)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Sql=$(usex !sql)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6StateMachine=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Svg=$(usex !svg)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6SvgWidgets=$(usex !svg yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Test=$(usex !testlib)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6TextToSpeech=$(usex !speech)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6UiTools=$(usex !designer)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebChannel=$(usex !webchannel)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineCore=$(usex !webengine)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineQuick=$(usex !webengine yes $(usex !quick))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineWidgets=$(usex !webengine yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebSockets=$(usex !websockets)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets=$(usex !widgets)
-		#-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WinExtras=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Xml=$(usex !xml)
-		# try to avoid pre-stripping
-		-DQFP_NO_OVERRIDE_OPTIMIZATION_FLAGS=yes
-		-DQFP_NO_STRIP=yes
-
-	)
-
-	pyside6_configure() {
-		local mycmakeargs=(
-			"${mycmakeargs[@]}"
-			-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
-			-DPYTHON_SITE_PACKAGES="$(python_get_sitedir)"
-			-DSHIBOKEN_PYTHON_SHARED_LIBRARY_SUFFIX="-${EPYTHON}"
-		)
-		cmake_src_configure
-	}
-	python_foreach_impl pyside6_configure
-}
-
-src_compile() {
-	python_foreach_impl cmake_src_compile
-}
-
-src_test() {
-	local -x PYTHONDONTWRITEBYTECODE
-	python_foreach_impl virtx cmake_src_test
-}
-
-src_install() {
-	pyside6_install() {
-		cmake_src_install
-		python_optimize
-
-		# Uniquify the shiboken6 pkgconfig dependency in the PySide6 pkgconfig
-		# file for the current Python target. See also:
-		#     https://github.com/leycec/raiagent/issues/73
-		sed -i -e 's~^Requires: shiboken6$~&-'${EPYTHON}'~' \
-			"${ED}/usr/$(get_libdir)"/pkgconfig/${PN}.pc || die
-
-		# Uniquify the PySide6 pkgconfig file for the current Python target,
-		# preserving an unversioned "pyside6.pc" file arbitrarily associated
-		# with the last Python target. (See the previously linked issue.)
-		cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die
-	}
-	python_foreach_impl pyside6_install
-
-	# CMakeLists.txt installs a "PySide6Targets-gentoo.cmake" file forcing
-	# downstream consumers (e.g., pyside6-tools) to target one
-	# "libpyside6-*.so" library linked to one Python interpreter. See also:
-	#     https://bugreports.qt.io/browse/PYSIDE-1053
-	#     https://github.com/leycec/raiagent/issues/74
-	sed -i -e 's~pyside6-python[[:digit:]]\+\.[[:digit:]]\+~pyside6${PYTHON_CONFIG_SUFFIX}~g' \
-		"${ED}/usr/$(get_libdir)/cmake/PySide6/PySide6Targets-${CMAKE_BUILD_TYPE,,}.cmake" || die
-}
diff --git a/dev-python/pysubs2/Manifest b/dev-python/pysubs2/Manifest
index c1c1f3c87ea6..abc8b7a0881c 100644
--- a/dev-python/pysubs2/Manifest
+++ b/dev-python/pysubs2/Manifest
@@ -1,3 +1 @@
-DIST pysubs2-1.4.4.tar.gz 850577 BLAKE2B 00fe742dd0545d816e335370c7691a456f148dc33b7c0f772941c69d6aef7c4ff43e734feecaf56bb8d0f199bc57e558a9a6bf5c3aa8223b87c3e51529eff5a1 SHA512 c8ae6742cafa7097a935dee2a5e2d67620e66bba2f0fefa7ee52d03c5ba53f227b6e6d761b0a60598afd16b34f3bbf9da3d0c423a3133983d1f3cb9437dcc094
-DIST pysubs2-1.5.0.tar.gz 851633 BLAKE2B 2f0ee302495931cfb32283f9e9236c2825b90db8224b356d6c517a084f4be6f61e805071b78d3187a2507703bdd4a7e6b4328a3da931dc745c28ee12aaf6ff06 SHA512 c13cb843da1e684e17c40e0704010182ab574627e66597cc9eb0fb70a25bfe1fa3fecc1aa2dd76bf45f64741fcb4750267e14eae647019f4716f1caee52b0efa
-DIST pysubs2-1.6.1.tar.gz 1148547 BLAKE2B ce5b2f902de6c4b7e101688d9aa0c27c6fc70f110a821442a4bbd4a6094997028720713a2928f24f89498fcc0794251e3e019f95216037ccffc4a50e0d31a165 SHA512 64e9b04f9f513b094e73f97ea09285dfe5c046e900fc321b2bb360a7b7eb9eb8070c7d3665008a7239caedd9a4adb1c47bc9aee75934535ee3e200044a5634a0
+DIST pysubs2-1.7.2.tar.gz 1123677 BLAKE2B 771e05b41eb9da3f18ce932988b7cdd60d461e49cb9a9f03129dd5104a7e1161c8fae898169d737652c7dd596fe3f92d93ba3a6ed082090b9a8d8825cc033f06 SHA512 5732cbd5bfdaeb1c680b4107304d4b94e1e0c7cc43483a71581da03b7be840fcf95bae8d2b5691b8c88ee59f34e6f587033266e24014778f71393b4c78bb08bf
diff --git a/dev-python/pysubs2/metadata.xml b/dev-python/pysubs2/metadata.xml
index d6987e74ec82..8051c7f9a166 100644
--- a/dev-python/pysubs2/metadata.xml
+++ b/dev-python/pysubs2/metadata.xml
@@ -2,9 +2,14 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
-  <email>smaniotto.nicola@gmail.com</email>
-  <name>Nicola Smaniotto</name>
+  <email>sam@gentoo.org</email>
+  <name>Sam James</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+  <name>Python</name>
  </maintainer>
  
- <origin>gentoo-guru-overlay</origin>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-python/pysubs2/pysubs2-1.4.4.ebuild b/dev-python/pysubs2/pysubs2-1.4.4.ebuild
deleted file mode 100644
index 399d72cdfa40..000000000000
--- a/dev-python/pysubs2/pysubs2-1.4.4.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1
-
-DESCRIPTION="A library for editing subtitle files"
-HOMEPAGE="https://github.com/tkarabela/pysubs2"
-SRC_URI="https://github.com/tkarabela/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pysubs2/pysubs2-1.5.0.ebuild b/dev-python/pysubs2/pysubs2-1.5.0.ebuild
deleted file mode 100644
index 399d72cdfa40..000000000000
--- a/dev-python/pysubs2/pysubs2-1.5.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1
-
-DESCRIPTION="A library for editing subtitle files"
-HOMEPAGE="https://github.com/tkarabela/pysubs2"
-SRC_URI="https://github.com/tkarabela/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pysubs2/pysubs2-1.6.1.ebuild b/dev-python/pysubs2/pysubs2-1.6.1.ebuild
deleted file mode 100644
index 399d72cdfa40..000000000000
--- a/dev-python/pysubs2/pysubs2-1.6.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1
-
-DESCRIPTION="A library for editing subtitle files"
-HOMEPAGE="https://github.com/tkarabela/pysubs2"
-SRC_URI="https://github.com/tkarabela/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pysubs2/pysubs2-1.7.2.ebuild b/dev-python/pysubs2/pysubs2-1.7.2.ebuild
new file mode 100644
index 000000000000..bd7162b53dfb
--- /dev/null
+++ b/dev-python/pysubs2/pysubs2-1.7.2.ebuild
@@ -0,0 +1,21 @@
+# 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_{8,9,10,11,12} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python library for editing subtitle files"
+HOMEPAGE="
+	https://github.com/tkarabela/pysubs2
+	https://pypi.org/project/pysubs2/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pytest-import-check/Manifest b/dev-python/pytest-import-check/Manifest
index 99b6add99604..474e5f6fe7f0 100644
--- a/dev-python/pytest-import-check/Manifest
+++ b/dev-python/pytest-import-check/Manifest
@@ -1 +1,2 @@
 DIST pytest_import_check-0.0.1.tar.gz 3019 BLAKE2B 7e34c3aa7b59b1c3af2eccd336cfa6e6b33ac596648c36c1fef647eb9d4f24e560b865fd8b58191f5ae94463f199f855c701f00d48912c73ee8474dfbc32d0b5 SHA512 e582af2017531318bd95acea7c96050a3f5f6373a4c1deeb7aa290e67a068bc46c398279a72dee5ef34c2585ccad75a7d9e74011335b845e86bcb1e9a1adaa2b
+DIST pytest_import_check-0.0.2.tar.gz 16309 BLAKE2B 94e6f9d316194f6765a38ddc97ecb4a9df7d4413077e0f9a1d638b0535920e4d379f2cc538f102176e10cdd54b4b535531e0e9bf02c42c7c085b02a82c3f1a56 SHA512 fd2a5e0bb55d2cb0a3e8d0c6281f05996a4213ffa554636e02660882281af5aa43d759b801853b272b9b572b4c7de6c3c659861f4c4b780907eb8b0e6ec802e1
diff --git a/dev-python/pytest-import-check/pytest-import-check-0.0.2.ebuild b/dev-python/pytest-import-check/pytest-import-check-0.0.2.ebuild
new file mode 100644
index 000000000000..8673193afb9e
--- /dev/null
+++ b/dev-python/pytest-import-check/pytest-import-check-0.0.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="pytest plugin to check whether Python modules can be imported"
+HOMEPAGE="
+	https://github.com/projg2/pytest-import-check/
+	https://pypi.org/project/pytest-import-check/
+"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/pytest-8.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=pytest_import_check
+	epytest
+}
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index f5b472d64894..cbd8a7dabe11 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,3 +1,4 @@
 DIST sentry-python-1.45.0.gh.tar.gz 475425 BLAKE2B 8dc46154dfc1c7c9104a706be032b5269d407dee6845da252f1c603ea4f9486d02d1d3c6bec314064b821dee31b503d07a9c17935ca1f4dd6cc4d7b9c3165094 SHA512 dad23a3f6a8e6ef5fe78e1d38a61977d8974edf306d5688537f331801d8fa0f60743d18cc3dadf6e9a9666c55a01c98b9ff8d8808ece7d8f95ee68a69b6cb9be
+DIST sentry-python-2.10.0.gh.tar.gz 534265 BLAKE2B 34f447323476aad6fb463036e58d4100e44368964d50c0d32ae8d4d7d4a89a0adfc70b8fbf7b091843181a21c37eef901f66702fe9e4655287eb5d19c003b096 SHA512 87e0c655fcb96b3462847980c58bde708b5064f80f17433e6ae5ca67d8432150268a542b18779dc5644c153146029141438b9c0a958feb3d35cf9cb6f5cc4b6a
 DIST sentry-python-2.7.1.gh.tar.gz 528495 BLAKE2B 7846e726aaca3d916a5b901aa1cde6ac04e79c32f71a631955a354143fc9937ba8881ccf1e3ed387ec12afcd4e6734ea4eee0614512447bcd58d8875fe97cd35 SHA512 afe034553ddb5eeefa00db26e13cebe82d946f990eb62f8cfde670ad5d9d5c93c0ffb2d0ed5f01f55ac533dca66ab6f53553e5b8f011e08705213cb515146516
 DIST sentry-python-2.9.0.gh.tar.gz 531490 BLAKE2B 8b67caa6911fd44e58c2a1d1206e6ecb9dc31f81c15c66763a04f1a65fc89d4667e60f27e055016342c6b4cac5470729c802ffb046e6e0796d5bfd7044caf27d SHA512 aed112a2ee35e23a1431486ff18e67772476ecfc63eacc388d17454a723b98f6e05cfa95a6c9db2cb6be572eed73d249951a411c60184b20eb251520071a4254
diff --git a/dev-python/sentry-sdk/sentry-sdk-2.10.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-2.10.0.ebuild
new file mode 100644
index 000000000000..1d2a2bd98e46
--- /dev/null
+++ b/dev-python/sentry-sdk/sentry-sdk-2.10.0.ebuild
@@ -0,0 +1,128 @@
+# 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_{8,9,10,11,12} )
+
+inherit distutils-r1
+
+MY_P=sentry-python-${PV}
+DESCRIPTION="Python client for Sentry"
+HOMEPAGE="
+	https://sentry.io/
+	https://github.com/getsentry/sentry-python/
+	https://pypi.org/project/sentry-sdk/
+"
+SRC_URI="
+	https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/asttokens[${PYTHON_USEDEP}]
+		dev-python/executing[${PYTHON_USEDEP}]
+		dev-python/fakeredis[${PYTHON_USEDEP}]
+		dev-python/flask-login[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pyrsistent[${PYTHON_USEDEP}]
+		<dev-python/pytest-8[${PYTHON_USEDEP}]
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/python-socks[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/werkzeug[${PYTHON_USEDEP}]
+		dev-python/zope-event[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}/sentry-sdk-1.21.0-ignore-warnings.patch"
+)
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# tests require Internet access
+		tests/integrations/httpx/test_httpx.py
+		tests/integrations/requests/test_requests.py
+		tests/integrations/django/test_basic.py
+		tests/integrations/socket/test_socket.py
+		# wtf is it supposed to do?!
+		tests/integrations/gcp/test_gcp.py
+		# TODO
+		tests/integrations/bottle
+		# TODO: most of them hang
+		tests/integrations/starlette
+		# TODO
+		tests/integrations/tornado
+		# requires mockupdb
+		tests/integrations/pymongo
+		# requires AWS access
+		tests/integrations/aws_lambda
+		# requires quart_auth
+		tests/integrations/quart
+		# TODO: require opentelemetry (with py3.10)
+		tests/integrations/opentelemetry
+		# broken (incompatible rq version?)
+		tests/integrations/rq
+	)
+
+	local EPYTEST_DESELECT=(
+		# hangs
+		tests/integrations/threading/test_threading.py::test_propagates_threadpool_hub
+		# broken teardown?
+		tests/test_client.py::test_uwsgi_warnings
+		# too many dependencies installed, sigh
+		tests/test_new_scopes_compat_event.py
+		# Internet
+		tests/integrations/stdlib/test_httplib.py::test_outgoing_trace_headers
+		tests/integrations/stdlib/test_httplib.py::test_outgoing_trace_headers_head_sdk
+		tests/integrations/aiohttp/test_aiohttp.py::test_span_origin
+		tests/integrations/stdlib/test_httplib.py::test_span_origin
+		tests/integrations/stdlib/test_subprocess.py::test_subprocess_span_origin
+		# TODO
+		tests/integrations/aiohttp/test_aiohttp.py::test_basic
+		tests/integrations/django
+		tests/integrations/sqlalchemy/test_sqlalchemy.py::test_orm_queries
+		tests/integrations/sqlalchemy/test_sqlalchemy.py::test_query_source
+		tests/integrations/sqlalchemy/test_sqlalchemy.py::test_transactions
+		tests/integrations/stdlib/test_subprocess.py::test_subprocess_basic
+		tests/integrations/threading/test_threading.py
+		tests/integrations/wsgi/test_wsgi.py
+		tests/test_basics.py::test_auto_enabling_integrations_catches_import_error
+		tests/test_client.py::test_databag_breadth_stripping
+		tests/test_client.py::test_databag_depth_stripping
+		tests/test_client.py::test_databag_string_stripping
+		tests/test_utils.py::test_default_release
+		tests/tracing/test_sampling.py::test_records_lost_event_only_if_traces_sample_rate_enabled
+		tests/tracing/test_sampling.py::test_records_lost_event_only_if_traces_sampler_enabled
+		tests/utils/test_contextvars.py::test_leaks
+		# pointless, fragile to packages being installed in parallel
+		tests/test_utils.py::test_installed_modules
+		# TODO
+		tests/profiler/test_continuous_profiler.py::test_continuous_profiler_auto_start_and_manual_stop
+		tests/profiler/test_continuous_profiler.py::test_continuous_profiler_manual_start_and_stop
+		tests/profiler/test_transaction_profiler.py::test_minimum_unique_samples_required
+		tests/profiler/test_transaction_profiler.py::test_profile_captured
+		tests/profiler/test_transaction_profiler.py::test_profiles_sample_rate
+		tests/profiler/test_transaction_profiler.py::test_profiles_sampler
+		tests/new_scopes_compat/test_new_scopes_compat_event.py
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p asyncio -p aiohttp -p pytest_forked -o addopts=
+}
diff --git a/dev-python/shiboken6/Manifest b/dev-python/shiboken6/Manifest
index a847fdbd896f..6bad2ad97ee1 100644
--- a/dev-python/shiboken6/Manifest
+++ b/dev-python/shiboken6/Manifest
@@ -1,2 +1 @@
-DIST pyside-setup-everywhere-src-6.7.1.tar.xz 14400976 BLAKE2B 1f6e2705aedc4151147e259da2a8fbab19a1815f19f1a36ea46dbf0bf2282a453e85a33ea8c6862072bb22699be39ab8375b48cd6d5b879de8bed5fad8cf60cb SHA512 6ca73f0b16ef43bc018aeb9e0f51d8ae91b13b79ebdfd71f5524bc0e8ef78322ba0aca81203cc5532e5096a55441fb4dabf3b628de3234b876b7a70327b714d4
 DIST pyside-setup-everywhere-src-6.7.2.tar.xz 14402156 BLAKE2B 321717ba46c7ed29404ee326f852cd4032f93e23b6b32a16e4e05305ff04a00a2029ee7c1d50ad7191a836ffd9a3ae858483bac35e8254bdcaeb474e2c92df60 SHA512 4376aba85867b5a04dab9d8889f5e32cb503cb8010757c1e810e60d29755f15a002b582594d0737a4119c030b48ede26964e8b1392700a6c061d7d631cdfe73e
diff --git a/dev-python/shiboken6/files/shiboken6-6.7.1-add-missing-include.patch b/dev-python/shiboken6/files/shiboken6-6.7.1-add-missing-include.patch
deleted file mode 100644
index 8516809e6253..000000000000
--- a/dev-python/shiboken6/files/shiboken6-6.7.1-add-missing-include.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-2765?filter=allopenissues
-diff --git a/libshiboken/sbkmodule.cpp b/libshiboken/sbkmodule.cpp
-index 47977d747..c45bf391f 100644
---- a/libshiboken/sbkmodule.cpp
-+++ b/libshiboken/sbkmodule.cpp
-@@ -7,6 +7,7 @@
- #include "bindingmanager.h"
- #include "sbkstring.h"
- #include "sbkcppstring.h"
-+#include "sbkconverter_p.h"
- 
- #include <unordered_map>
- #include <unordered_set>
diff --git a/dev-python/shiboken6/shiboken6-6.7.1.ebuild b/dev-python/shiboken6/shiboken6-6.7.1.ebuild
deleted file mode 100644
index daabf0fdabe6..000000000000
--- a/dev-python/shiboken6/shiboken6-6.7.1.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# TODO: Split the "/usr/bin/shiboken6" binding generator from the
-# "/usr/lib64/libshiboken6-*.so" family of shared libraries. The former
-# requires everything (including Clang) at runtime; the latter only requires
-# Qt and Python at runtime. Note that "pip" separates these two as well. See:
-# https://doc.qt.io/qtforpython/shiboken6/faq.html#is-there-any-runtime-dependency-on-the-generated-binding
-# Once split, the PySide6 ebuild should be revised to require
-# "/usr/bin/shiboken6" at build time and "libshiboken6-*.so" at runtime.
-# TODO: Add PyPy once officially supported. See also:
-#     https://bugreports.qt.io/browse/PYSIDE-535
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-LLVM_COMPAT=( {15..18} )
-
-inherit cmake flag-o-matic llvm-r1 python-r1 toolchain-funcs
-
-MY_PN="pyside-setup-everywhere-src"
-
-DESCRIPTION="Python binding generator for C++ libraries"
-HOMEPAGE="https://wiki.qt.io/PySide6"
-SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-${PV}-src/${MY_PN}-${PV}.tar.xz"
-S="${WORKDIR}/${MY_PN}-${PV}/sources/shiboken6"
-
-# The "sources/shiboken6/libshiboken" directory is triple-licensed under the
-# GPL v2, v3+, and LGPL v3. All remaining files are licensed under the GPL v3
-# with version 1.0 of a Qt-specific exception enabling shiboken6 output to be
-# arbitrarily relicensed. (TODO)
-LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3"
-SLOT="6/${PV}"
-KEYWORDS="amd64 ~arm ~arm64"
-IUSE="+docstrings numpy test vulkan"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Tests fail pretty bad and I'm not fixing them right now
-RESTRICT="test"
-
-# Minimal supported version of Qt.
-QT_PV="$(ver_cut 1-3)*:6"
-
-# Since Clang is required at both build- and runtime, BDEPEND is omitted here.
-RDEPEND="${PYTHON_DEPS}
-	=dev-qt/qtbase-${QT_PV}
-	$(llvm_gen_dep '
-		sys-devel/clang:${LLVM_SLOT}
-		sys-devel/llvm:${LLVM_SLOT}
-	')
-	docstrings? (
-		>=dev-libs/libxml2-2.6.32
-		>=dev-libs/libxslt-1.1.19
-	)
-	numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
-	vulkan? ( dev-util/vulkan-headers )
-	!dev-python/shiboken6:0
-"
-DEPEND="${RDEPEND}
-	test? ( =dev-qt/qtbase-${QT_PV}[gui] )
-"
-# testlib is toggled by the gui flag on qtbase
-
-DOCS=( AUTHORS )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.3.1-no-strip.patch"
-	"${FILESDIR}/${PN}-6.7.1-add-missing-include.patch"
-)
-
-src_prepare() {
-	# TODO: File upstream issue requesting a sane way to disable NumPy support.
-	if ! use numpy; then
-		sed -i -e '/\bprint(os\.path\.realpath(numpy))/d' \
-			libshiboken/CMakeLists.txt || die
-	fi
-
-	# Shiboken6 assumes Vulkan headers live under either "$VULKAN_SDK/include"
-	# or "$VK_SDK_PATH/include" rather than "${EPREFIX}/usr/include/vulkan".
-	if use vulkan; then
-		sed -i -e "s~\bdetectVulkan(&headerPaths);~headerPaths.append(HeaderPath{QByteArrayLiteral(\"${EPREFIX}/usr/include/vulkan\"), HeaderType::System});~" \
-			ApiExtractor/clangparser/compilersupport.cpp || die
-	fi
-
-	local clangver="$(CPP=clang clang-major-version)"
-
-	# Clang 15 and older used the full version as a directory name.
-	if [[ ${clangver} -lt 16 ]]; then
-		clangver="$(CPP=clang clang-fullversion)"
-	fi
-
-	# Shiboken6 assumes the "/usr/lib/clang/${CLANG_NEWEST_VERSION}/include/"
-	# subdirectory provides Clang builtin includes (e.g., "stddef.h") for the
-	# currently installed version of Clang, where ${CLANG_NEWEST_VERSION} is
-	# the largest version specifier that exists under the "/usr/lib/clang/"
-	# subdirectory. This assumption is false in edge cases, including when
-	# users downgrade from newer Clang versions but fail to remove those
-	# versions with "emerge --depclean". See also:
-	#     https://github.com/leycec/raiagent/issues/85
-	#
-	# Sadly, the clang-* family of functions exported by the "toolchain-funcs"
-	# eclass are defective, returning nonsensical placeholder strings if the
-	# end user has *NOT* explicitly configured their C++ compiler to be Clang.
-	# PySide6 does *NOT* care whether the end user has done so or not, as
-	# PySide6 unconditionally requires Clang in either case. See also:
-	#     https://bugs.gentoo.org/619490
-	sed -i -e 's~(findClangBuiltInIncludesDir())~(QStringLiteral("'"${EPREFIX}"'/usr/lib/clang/'"${clangver}"'/include"))~' \
-		ApiExtractor/clangparser/compilersupport.cpp || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# -Werror=odr
-	# https://bugs.gentoo.org/925479
-	# https://bugreports.qt.io/browse/PYSIDE-2619
-	filter-lto
-
-	# Minimal tests for now, 2 failing with the extended version
-	# FIXME Subscripted generics cannot be used with class and instance checks
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-		-DDISABLE_DOCSTRINGS=$(usex !docstrings)
-	)
-
-	shiboken6_configure() {
-		local mycmakeargs=(
-			"${mycmakeargs[@]}"
-			-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
-			-DUSE_PYTHON_VERSION="${EPYTHON#python}"
-			-DFORCE_LIMITED_API=OFF
-		)
-		# CMakeLists.txt expects LLVM_INSTALL_DIR as an environment variable.
-		local -x LLVM_INSTALL_DIR="$(get_llvm_prefix)"
-		cmake_src_configure
-	}
-	python_foreach_impl shiboken6_configure
-}
-
-src_compile() {
-	python_foreach_impl cmake_src_compile
-}
-
-src_test() {
-	python_foreach_impl cmake_src_test
-}
-
-src_install() {
-	shiboken6_install() {
-		cmake_src_install
-		python_optimize
-
-		# Uniquify the "shiboken6" executable for the current Python target,
-		# preserving an unversioned "shiboken6" file arbitrarily associated
-		# with the last Python target.
-		cp "${ED}"/usr/bin/${PN}{,-${EPYTHON}} || die
-
-		# Uniquify the Shiboken6 pkgconfig file for the current Python target,
-		# preserving an unversioned "shiboken6.pc" file arbitrarily associated
-		# with the last Python target. See also:
-		#     https://github.com/leycec/raiagent/issues/73
-		cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die
-	}
-	python_foreach_impl shiboken6_install
-
-	# CMakeLists.txt installs a "Shiboken6Targets-gentoo.cmake" file forcing
-	# downstream consumers (e.g., PySide6) to target one "libshiboken6-*.so"
-	# library and one "shiboken6" executable linked to one Python interpreter.
-	# See also:
-	#     https://bugreports.qt.io/browse/PYSIDE-1053
-	#     https://github.com/leycec/raiagent/issues/74
-	sed -i \
-		-e 's~shiboken6-python[[:digit:]]\+\.[[:digit:]]\+~shiboken6${PYTHON_CONFIG_SUFFIX}~g' \
-		-e 's~/bin/shiboken6~/bin/shiboken6${PYTHON_CONFIG_SUFFIX}~g' \
-		"${ED}/usr/$(get_libdir)"/cmake/Shiboken6/Shiboken6Targets-${CMAKE_BUILD_TYPE,,}.cmake || die
-
-	# Remove the broken "shiboken_tool.py" script. By inspection, this script
-	# reduces to a noop. Moreover, this script raises the following exception:
-	#     FileNotFoundError: [Errno 2] No such file or directory: '/usr/bin/../shiboken_tool.py': '/usr/bin/../shiboken_tool.py'
-	rm "${ED}"/usr/bin/shiboken_tool.py || die
-}
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index 527315057dd6..e5e08475bae2 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1,3 +1,4 @@
 DIST sphinx-7.2.6.gh.tar.gz 7067425 BLAKE2B 4da1cb5ccebea4df0dc134c552311d7b70ce9b76424ea4355ad67b1ece60c9b445e56c96b838832d4df2f50940832b3fa9555b596390464a4017a573bcf514c3 SHA512 204e859318ad5044639f2e682098b07c7cc675b54ba801feeb3322290bfd15316cc15a2cae8fa6a55e6ec6d1e9690790e5402652eb04720bfe96e172f4c8bdbc
 DIST sphinx-7.3.7.gh.tar.gz 7165383 BLAKE2B bcc68f26937e6aefe60cedea533a5c8e245c76b59ab4913fb6516f285e3afc32be60b336c662ac8305fb88e82fcc2b477128f2d8b9bf92f037b124f4c855df2a SHA512 540553ecddc55b3e673c79bc776a899d2c660f1e93ef819711be52174accf5b70465883a46bed81d163534e56718caf0765b4bae153e9307a3792387d8228df5
 DIST sphinx-7.4.0.gh.tar.gz 8186356 BLAKE2B 968d2bc887c6326c44c741cfdfeb67bb303c718d4283d8149b1ab7bafa84ef7f3ef5ff3fd72b82a207846e91bda3fff72ed6c8953c1bcf8482bc79b992f636f3 SHA512 fea84f86e414bba741537f4db68a1f0e0922f8fe6eea5e0eefac4a76bfb30d5eb97eb5590404c7e427b03c57b589844ebba8ef5f3f6d786ca91bb2dbbc704d8f
+DIST sphinx-7.4.4.gh.tar.gz 8184232 BLAKE2B cf75b1dc39d194293845a621c12246fd78249541634dc5edee6ed6da15285ab763223729a63ef2c375215a394c12e189333d248b7f047195b66d8e7c6706ed18 SHA512 4f2ef5f0c4270517a12b9dc169903ece7ec809687c14961522c37a5ea829d1624ee45926a5fe48fefce77ac73b5dc4035e2452b2b6c4bbdf14c06e9201596f66
diff --git a/dev-python/sphinx/sphinx-7.4.4.ebuild b/dev-python/sphinx/sphinx-7.4.4.ebuild
new file mode 100644
index 000000000000..ae5dfe3be3ca
--- /dev/null
+++ b/dev-python/sphinx/sphinx-7.4.4.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="
+	https://www.sphinx-doc.org/
+	https://github.com/sphinx-doc/sphinx/
+	https://pypi.org/project/Sphinx/
+"
+SRC_URI="
+	https://github.com/sphinx-doc/sphinx/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc latex"
+
+RDEPEND="
+	>=dev-python/alabaster-0.7.14[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.13[${PYTHON_USEDEP}]
+	<dev-python/docutils-0.22[${PYTHON_USEDEP}]
+	>=dev-python/docutils-0.20[${PYTHON_USEDEP}]
+	>=dev-python/imagesize-1.3[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.1[${PYTHON_USEDEP}]
+	>=dev-python/packaging-23.0[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.14[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.30.0[${PYTHON_USEDEP}]
+	>=dev-python/snowballstemmer-2.2[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
+	>=dev-python/sphinxcontrib-htmlhelp-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/sphinxcontrib-serializinghtml-1.1.9[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-2[${PYTHON_USEDEP}]
+	' 3.10)
+	latex? (
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)
+"
+BDEPEND="
+	doc? (
+		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+		media-gfx/graphviz
+	)
+	test? (
+		app-text/dvipng
+		>=dev-python/cython-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/defusedxml-0.7.1[${PYTHON_USEDEP}]
+		>=dev-python/setuptools-67.0[${PYTHON_USEDEP}]
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		virtual/imagemagick-tools[jpeg,png,svg]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/sphinx-3.2.1-doc-link.patch"
+	#"${FILESDIR}/sphinx-4.3.2-doc-link.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# disable internet access
+	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
+		doc/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# we can't use distutils_enable_sphinx because it would
+	# introduce a dep on itself
+	use doc && build_sphinx doc
+}
+
+python_test() {
+	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
+	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
+
+	local EPYTEST_DESELECT=(
+		# less interesting failures
+		tests/test_builders/test_build_latex.py::test_build_latex_doc
+		tests/test_extensions/test_ext_math.py::test_imgmath_png
+		tests/test_extensions/test_ext_math.py::test_imgmath_numfig_html
+	)
+	case ${EPYTHON} in
+		python3.13)
+			EPYTEST_DESELECT+=(
+				tests/test_extensions/test_ext_autodoc.py::test_autodoc_special_members
+				tests/test_extensions/test_ext_autodoc_configs.py::test_autodoc_type_aliases
+				tests/test_extensions/test_ext_autodoc_configs.py::test_autodoc_typehints_format_fully_qualified
+				tests/test_extensions/test_ext_autodoc_configs.py::test_autodoc_typehints_none
+				tests/test_extensions/test_ext_autodoc_configs.py::test_autodoc_typehints_signature
+			)
+			;;
+		pypy3)
+			EPYTEST_DESELECT+=(
+				tests/test_extensions/test_ext_autodoc.py::test_autodoc_exception
+				tests/test_extensions/test_ext_autodoc.py::test_autodoc_ignore_module_all
+				tests/test_extensions/test_ext_autodoc.py::test_autodoc_inherited_members_None
+				tests/test_extensions/test_ext_autodoc.py::test_autodoc_subclass_of_builtin_class
+				tests/test_extensions/test_ext_autodoc.py::test_automethod_for_builtin
+				tests/test_extensions/test_ext_autodoc.py::test_cython
+				tests/test_extensions/test_ext_autodoc.py::test_format_signature
+				tests/test_extensions/test_ext_autodoc.py::test_partialfunction
+				tests/test_extensions/test_ext_autodoc_autoclass.py::test_autodoc_process_bases
+				tests/test_extensions/test_ext_autodoc_autoclass.py::test_show_inheritance_for_decendants_of_generic_type
+				tests/test_extensions/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
+				tests/test_extensions/test_ext_autodoc_autofunction.py::test_builtin_function
+				tests/test_extensions/test_ext_autodoc_autofunction.py::test_methoddescriptor
+				tests/test_extensions/test_ext_autodoc_automodule.py::test_automodule_inherited_members
+				tests/test_extensions/test_ext_autodoc_preserve_defaults.py::test_preserve_defaults_special_constructs
+				tests/test_extensions/test_ext_autosummary.py::test_autosummary_generate_content_for_module
+				tests/test_extensions/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
+				tests/test_util/test_util_inspect.py::test_isattributedescriptor
+				tests/test_util/test_util_inspect.py::test_signature
+				tests/test_util/test_util_typing.py::test_is_invalid_builtin_class
+			)
+			;;
+	esac
+
+	# note: pytest-xdist causes random test failures
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/sqlparse/Manifest b/dev-python/sqlparse/Manifest
index a00a2773f92d..79683220a0af 100644
--- a/dev-python/sqlparse/Manifest
+++ b/dev-python/sqlparse/Manifest
@@ -1 +1,2 @@
 DIST sqlparse-0.5.0.tar.gz 83475 BLAKE2B 6553de08385e90bbb0b7ce45db5894aabceb997885f1c610d83725b1a5d632caae1944e022ef43b3ed586ed05d160d5e88e450a077a6531955abda8a794dc173 SHA512 eade99e832054ddbc466d1c56a4d5ce6f79d31be8dbfa0b175b8413e4326af18baa20a42d9661bc09e91f04edd8329d4c0df2ca6f62983df3daef67d38342269
+DIST sqlparse-0.5.1.tar.gz 84502 BLAKE2B b0569552848795053c33e616966075629ae52e61cdc6950bfbc9c4a4976a1b39d6c80f26c25ed5bbd125395f38ed495e5df7532d5f3289e8eece398acc4abaf1 SHA512 5d93e942d6a26a544827a877cb2035328f406dc8e8475e217ba75571672b6c5eaca6f87c2c76244c0dea32449c818fcca9bb8fff53679e6f0ba2bef2a6b92b6f
diff --git a/dev-python/sqlparse/sqlparse-0.5.1.ebuild b/dev-python/sqlparse/sqlparse-0.5.1.ebuild
new file mode 100644
index 000000000000..8881536ac0ae
--- /dev/null
+++ b/dev-python/sqlparse/sqlparse-0.5.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A non-validating SQL parser module for Python"
+HOMEPAGE="
+	https://github.com/andialbrecht/sqlparse/
+	https://pypi.org/project/sqlparse/
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_sphinx docs/source
+distutils_enable_tests pytest
diff --git a/dev-python/srt/Manifest b/dev-python/srt/Manifest
index f343f484e958..44dabb10bc72 100644
--- a/dev-python/srt/Manifest
+++ b/dev-python/srt/Manifest
@@ -1,3 +1 @@
-DIST srt-3.5.1.tar.gz 24003 BLAKE2B 0ba77727043090310d2db69d9569bde53fcd69a55715e9721a83ee148d382459b1d68b369eee52fc7f99ba5e8aca017128a2d999e44b5ae77dda027a23ecc8bc SHA512 0523b5b31d78db195911ea632adbd25e76d1270510cf9c7432a44bd96e44d4928196c7e4f2eed05bbd73c1d96dcbe99ecea2bd755d697ff659924773c3e6a05e
-DIST srt-3.5.2.tar.gz 24416 BLAKE2B 7da4401cce45045058f4d91a3ea3b688ae65f48d039b642abdf649acf2a8e416e096a5959235dc0165ac0a2169ca63a66b101bac6d8f20b0b330d165626b5010 SHA512 5367d7fa3ed23523f03efad1524fcb44c1a8e1c95e2f3032c0e11ff67795a1399eb32b27365e4b0f98ed5b1d7671d576ab8cd342d50bb4005554faaf03ea9c8a
 DIST srt-3.5.3.tar.gz 28296 BLAKE2B 97f8852a799e80401f09219b43b41f5d5f9fe2c7283e2b43312aef70d783d7f1c1bf126e076c3a13c10e74e80ff48f25075cc7a1cef58a99fb4ef32cfa5b2587 SHA512 434331d31763a339ebb7d5b335b9d924b7f6939f307ecd0e5476b91da19b39e0febf1a387199e22f0b15365a4305c24021d85a32a7b65058905abd7946865b70
diff --git a/dev-python/srt/metadata.xml b/dev-python/srt/metadata.xml
index d6987e74ec82..8051c7f9a166 100644
--- a/dev-python/srt/metadata.xml
+++ b/dev-python/srt/metadata.xml
@@ -2,9 +2,14 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
-  <email>smaniotto.nicola@gmail.com</email>
-  <name>Nicola Smaniotto</name>
+  <email>sam@gentoo.org</email>
+  <name>Sam James</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+  <name>Python</name>
  </maintainer>
  
- <origin>gentoo-guru-overlay</origin>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-python/srt/srt-3.5.1.ebuild b/dev-python/srt/srt-3.5.1.ebuild
deleted file mode 100644
index 799793710668..000000000000
--- a/dev-python/srt/srt-3.5.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A tiny library for parsing, modifying, and composing SRT files"
-HOMEPAGE="https://github.com/cdown/srt"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-distutils_enable_tests pytest
-
-DEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-src_prepare() {
-	default
-
-	mv "${S}"/srt_tools/srt "${S}"/srt_tools/srt-cdown || die "Cannot rename the file"
-	sed -e 's|"srt_tools/srt"|"srt_tools/srt-cdown"|' \
-		-i "${S}"/setup.py || die "Cannot update setup.py"
-
-}
-
-pkg_postinst() {
-	ewarn "To avoid conflict with dev-python/pysrt::gentoo the binary has been"
-	ewarn "renamed /usr/bin/srt-cdown. The python module is still called srt."
-}
diff --git a/dev-python/srt/srt-3.5.2.ebuild b/dev-python/srt/srt-3.5.2.ebuild
deleted file mode 100644
index 2eb689c54282..000000000000
--- a/dev-python/srt/srt-3.5.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A tiny library for parsing, modifying, and composing SRT files"
-HOMEPAGE="https://github.com/cdown/srt"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-distutils_enable_tests pytest
-
-DEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-src_prepare() {
-	default
-
-	mv "${S}"/srt_tools/srt "${S}"/srt_tools/srt-cdown || die "Cannot rename the file"
-	sed -e 's|"srt_tools/srt"|"srt_tools/srt-cdown"|' \
-		-i "${S}"/setup.py || die "Cannot update setup.py"
-
-}
-
-pkg_postinst() {
-	ewarn "To avoid conflict with dev-python/pysrt::gentoo the binary has been"
-	ewarn "renamed /usr/bin/srt-cdown. The python module is still called srt."
-}
diff --git a/dev-python/srt/srt-3.5.3.ebuild b/dev-python/srt/srt-3.5.3.ebuild
index 2eb689c54282..be28a6e5f989 100644
--- a/dev-python/srt/srt-3.5.3.ebuild
+++ b/dev-python/srt/srt-3.5.3.ebuild
@@ -1,38 +1,27 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
 
 inherit distutils-r1 pypi
 
-DESCRIPTION="A tiny library for parsing, modifying, and composing SRT files"
-HOMEPAGE="https://github.com/cdown/srt"
+DESCRIPTION="Tiny library for parsing, modifying, and composing SRT files"
+HOMEPAGE="
+	https://github.com/cdown/srt
+	https://pypi.org/project/srt/
+"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
-
-distutils_enable_tests pytest
+KEYWORDS="~amd64 ~arm64"
 
-DEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
+RDEPEND="!dev-python/pysrt"
+BDEPEND="
+	test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )
 "
 
-src_prepare() {
-	default
-
-	mv "${S}"/srt_tools/srt "${S}"/srt_tools/srt-cdown || die "Cannot rename the file"
-	sed -e 's|"srt_tools/srt"|"srt_tools/srt-cdown"|' \
-		-i "${S}"/setup.py || die "Cannot update setup.py"
-
-}
-
-pkg_postinst() {
-	ewarn "To avoid conflict with dev-python/pysrt::gentoo the binary has been"
-	ewarn "renamed /usr/bin/srt-cdown. The python module is still called srt."
-}
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
diff --git a/dev-python/types-requests/Manifest b/dev-python/types-requests/Manifest
index 27585e968e11..73bde6e554d4 100644
--- a/dev-python/types-requests/Manifest
+++ b/dev-python/types-requests/Manifest
@@ -1 +1 @@
-DIST types-requests-2.32.0.20240622.tar.gz 17675 BLAKE2B 8535aabe9bbb9a77e87be71c7a18aad791dcb426f58ed1238dae553aec1646035a4763acf26ffdb7cb83a2d16080651372ea500080df69a4b5352a6de1064194 SHA512 8423eab482aedbcd23dfe4a2d8b8e09c5d0d2bceb139abe7bdc9e680f7ee7706b1a5026fce4ef6ef3eab70db5317db708323c5c9a3273df9a2830a5c6e47780a
+DIST types-requests-2.32.0.20240712.tar.gz 17896 BLAKE2B 113c45898e73fe0a8b99251bd5b98aa0a6f4ddf7a743e8a80913a44c098c2d7942b41ee1b14451a521c9151fa5d14777f4f1313fd37d4f23ad82b2b24068919c SHA512 e54392d4a5f4bc923e7600141e468fc28de3bfdef8f1e54c6c4384bffc29707b3f86bb5125e5ac8822125a27fb3f0f4f498ca0b3f6448cb9cf5fe6c3fdb78527
diff --git a/dev-python/types-requests/types-requests-2.32.0.20240622.ebuild b/dev-python/types-requests/types-requests-2.32.0.20240712.ebuild
index 77d37dec3cd8..77d37dec3cd8 100644
--- a/dev-python/types-requests/types-requests-2.32.0.20240622.ebuild
+++ b/dev-python/types-requests/types-requests-2.32.0.20240712.ebuild
diff --git a/dev-python/uv/Manifest b/dev-python/uv/Manifest
index cefa759e991a..f499be579e38 100644
--- a/dev-python/uv/Manifest
+++ b/dev-python/uv/Manifest
@@ -1,5 +1,8 @@
+DIST pubgrub-3f0ba760951ab0deeac874b98bb18fc90103fcf7.gh.tar.gz 87050 BLAKE2B d76bc40a71ead4c535eff493901247f2ee2f0a213d12db17bf96c89008be482829ff9b0d47196bb04ffc8c20842f15a2c7a4aa663d4c3f6c3eb82461250853ce SHA512 cd55d4512590eb86628d933598bd3f276a09018dce8dd720496f4314872afe1ad8d0b79d16f1b358e4a77a8613c1d06c742117d3a2a9c39e4f34d0ccd86eb536
 DIST pubgrub-b4435e2f3af10dab2336a0345b35dcd622699d06.gh.tar.gz 86966 BLAKE2B 783191e6a6d6eaeb6d8b1f773d449de5aebd7864296758b8a0fa87df62fae855c0c0edcb4ddb11694d70a3cd8870d7b14b0c7b48a2788026d3a6104685bf46dd SHA512 2e58fad9633070adc8e7549475a8d01c2d8d56d0b6492ab3fa773cff94dc004ca1d841e3428a84dfb495e664850a184d4699d364a4d8e4298b6b8370282d110d
 DIST reqwest-middleware-21ceec9a5fd2e8d6f71c3ea2999078fecbd13cbe.gh.tar.gz 39176 BLAKE2B 00b2d0f51e4bbe29649fea50a8cc41c7b4d534f87440dd0bf487e8f7104077ad2cde824673b6624ff71924512b8a6b33ed4ac548f64bfbf78a5e0fb1366a446f SHA512 29f80816d054838af330a0ccfb8509ab22469aaecdb369d4a63c03eb3ed2aea3cc113458dd29c649e5bf7c33dbf5ef8b1e5d5a89e1cca72f9eab212f000c594f
 DIST rs-async-zip-1dcb40cfe1bf5325a6fd4bfcf9894db40241f585.gh.tar.gz 96766 BLAKE2B f9efab73c65394e33e090a6292875ebf35e6669b15c356f102eb109784a4503606ae39106cd0ebe3d7d479cb0b30806d7baaaebf22d826836a24f7ed49100934 SHA512 3b845b05d97c5ab5cea286a7c11846838b40bb1fac98a51782600849a53231be8fa205094c6bdd00f6e193c807b10b28f947698696382be99cae0a8d681dabdc
 DIST uv-0.2.23-crates.tar.xz 63724280 BLAKE2B 32f66ef8a6580d1dd0b7369656784c40da7f1f060c4543b359aa4f45ce33926f56d0d02222acf888a0923317d4cc02e96e1d27b3dab84038bf3714d316399f4b SHA512 04a31a451beb68f0d884cde3a35260a71020453217cfb616703b2ea8fd7af273b850239f66b8e77b1c73f241b2a8945ff9833fd0f445f2c6f3aa3412fee3e0e8
 DIST uv-0.2.23.gh.tar.gz 1314282 BLAKE2B 0d662a513b77a4da73945c3eedfa381cd65ad615975b22790ccde2eb467b356a70eacff20a15d37fff6f7b41b155824b0fda9f715d3a45f02c37c5f992f6fe0b SHA512 6b0c8f65e51dc8bf0654976b8866cb225784d91f44af935b243507a404ac4f297697ea22df29da43038eb335938be04e42fda39cbb292fe02715841c9f818380
+DIST uv-0.2.25-crates.tar.xz 63731168 BLAKE2B 5693f7db28756e74ad619f1ed0ad9f1c7a14b385da65b71abd0989ef8cce3f961d5e6edb9b8318a495b76ba8352ef0c6b557bbdec2741ff35073b407756cbd90 SHA512 40813d91c90b949f0666f4734717abc6430be293c3fe7336ed907e75a809fc51fc79d520d308fc8d8ddb8f11251137f9219b755b5e3711bf3b9f55fcecac10c0
+DIST uv-0.2.25.gh.tar.gz 1377235 BLAKE2B c8c3a68b16c82d51de31700973e52e6745c26a5349696065e9b140f2304ca5cfc30e8a0922178c4630ed6a4823141a82bf0cd8a6631b1a4de1e77a733b70251a SHA512 c78a4bf66ac1140767d0fb7af35ba3f3cd044d04447862a9374b9491742a627e7a27df04689ee64f9dcb6445619a419022e0ae0da4a0fdedf531db9f902583e0
diff --git a/dev-python/uv/uv-0.2.25.ebuild b/dev-python/uv/uv-0.2.25.ebuild
new file mode 100644
index 000000000000..b1debaea8bca
--- /dev/null
+++ b/dev-python/uv/uv-0.2.25.ebuild
@@ -0,0 +1,109 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+"
+
+declare -A GIT_CRATES=(
+	[async_zip]='https://github.com/charliermarsh/rs-async-zip;1dcb40cfe1bf5325a6fd4bfcf9894db40241f585;rs-async-zip-%commit%'
+	[pubgrub]='https://github.com/astral-sh/pubgrub;3f0ba760951ab0deeac874b98bb18fc90103fcf7;pubgrub-%commit%'
+	[reqwest-middleware]='https://github.com/astral-sh/reqwest-middleware;21ceec9a5fd2e8d6f71c3ea2999078fecbd13cbe;reqwest-middleware-%commit%/reqwest-middleware'
+	[reqwest-retry]='https://github.com/astral-sh/reqwest-middleware;21ceec9a5fd2e8d6f71c3ea2999078fecbd13cbe;reqwest-middleware-%commit%/reqwest-retry'
+)
+
+inherit cargo check-reqs
+
+CRATE_PV=${PV}
+DESCRIPTION="A Python package installer and resolver, written in Rust"
+HOMEPAGE="
+	https://github.com/astral-sh/uv/
+	https://pypi.org/project/uv/
+"
+# pypi sdist misses scripts/, needed for tests
+SRC_URI="
+	https://github.com/astral-sh/uv/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	${CARGO_CRATE_URIS}
+"
+if [[ ${PKGBUMPING} != ${PVR} ]]; then
+	SRC_URI+="
+		https://dev.gentoo.org/~mgorny/dist/uv-${CRATE_PV}-crates.tar.xz
+	"
+fi
+
+# most of the code
+LICENSE="|| ( Apache-2.0 MIT )"
+# crates/pep508-rs is || ( Apache-2.0 BSD-2 ) which is covered below
+# Dependent crate licenses
+LICENSE+="
+	0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT
+	MPL-2.0 Unicode-DFS-2016
+"
+# ring crate
+LICENSE+=" openssl"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="test"
+PROPERTIES="test_network"
+
+BDEPEND="
+	>=virtual/rust-1.77
+	test? (
+		dev-lang/python:3.8
+		dev-lang/python:3.9
+		dev-lang/python:3.10
+		dev-lang/python:3.11
+		dev-lang/python:3.12
+	)
+"
+
+QA_FLAGS_IGNORED="usr/bin/.*"
+
+check_space() {
+	local CHECKREQS_DISK_BUILD=3G
+	use debug && CHECKREQS_DISK_BUILD=9G
+	check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+	check_space
+}
+
+pkg_setup() {
+	check_space
+}
+
+src_prepare() {
+	default
+
+	# remove patch.* that breaks GIT_CRATES
+	sed -i -e "/^\[patch/,\$s@^\(reqwest-middleware = \).*@\1 { path = \"${WORKDIR}/reqwest-middleware-21ceec9a5fd2e8d6f71c3ea2999078fecbd13cbe/reqwest-middleware\" }@" Cargo.toml || die
+
+	# https://github.com/vorot93/tokio-tar/pull/23
+	# (fortunately uv already depends on portable-atomic, so we don't
+	# have to fight Cargo.lock)
+	cd "${ECARGO_VENDOR}/tokio-tar-0.3.1" || die
+	eapply "${FILESDIR}/tokio-tar-0.3.1-ppc.patch"
+}
+
+src_compile() {
+	cd crates/uv || die
+	cargo_src_compile
+}
+
+src_test() {
+	# work around https://github.com/astral-sh/uv/issues/4376
+	local -x PATH=${BROOT}/usr/lib/python-exec/python3.12:${PATH}
+	local -x COLUMNS=100
+
+	cd crates/uv || die
+	cargo_src_test --no-fail-fast
+}
+
+src_install() {
+	cd crates/uv || die
+	cargo_src_install
+}
diff --git a/dev-python/zenlib/Manifest b/dev-python/zenlib/Manifest
index 7c073246a58e..e41725b9cd43 100644
--- a/dev-python/zenlib/Manifest
+++ b/dev-python/zenlib/Manifest
@@ -1,4 +1 @@
-DIST zenlib-2.0.0.tar.gz 16921 BLAKE2B a9bedfd8bd28e2f50bbc11dbab21ba6c0f35b60e4e1438b1ad7666ed3b8688a6b9c611f88d8fbf915f69ebddc5420315080a6a0a8ed2983d14125bb28d091749 SHA512 2e4fa3d299d8da79930ea3a0f948472d49fb430727f100bb6b9f9e28d4792a229d2dc33ecaabd20d9e790a783acecb1ccb00381b97dcc02f8c5353abef74fb31
-DIST zenlib-2.0.4.tar.gz 16971 BLAKE2B e5e58aa86742914c67a58e072c312c92db94b96947cdffdf3adbfc50d8efe6dde1fae88965ccf5685d2225bbf7b745f717529b1f0ed41857260199a0f3d8d2d2 SHA512 12ffef2e2ab23136bdc24cdac5eb3a031bb581d346a107306455aa5dc5a66757599596770cf7b7e6ecde73fbec39b4276efcd3a191a2d29f64e75e5a01ed25d1
-DIST zenlib-2.1.1.tar.gz 17139 BLAKE2B f9ff56b120d72786bd43cf60120f65c4b8b6d2ed47eb6656bc0c377e3b35ba60d6b1f348dce12b1096ebb752f073dd7113cb6765da98de279818bb7062ca8522 SHA512 f5db26e895e07266334b788530186cfa8f8ac9c239f65b8ee253d250cb47bd5a57ba6605b0b78f07b744f53cc5b3f9ab2ff229d098c6604d7d2d46e97ba34629
 DIST zenlib-2.1.2.tar.gz 17293 BLAKE2B 3d5067b9796f31d28d0ca04c842b4ef1807e0557a77c5b6ec5798cfa2aa04ee5e7eafa3549df6add4228e7c3014ca33eb1584c0aee6db9c0acc882f170972b36 SHA512 a0a53ed63a3efe83dc8f49fd512685b82ed383494f404072a47734c02a1955e0a4c9a6c9df48503419c82cb7479783669b6de8deef174a597ab73cad61da5c3e
diff --git a/dev-python/zenlib/metadata.xml b/dev-python/zenlib/metadata.xml
index af8c55886ddf..431f8bca4750 100644
--- a/dev-python/zenlib/metadata.xml
+++ b/dev-python/zenlib/metadata.xml
@@ -5,6 +5,10 @@
   <email>dev@pyl.onl</email>
   <name>Zen</name>
  </maintainer>
+ <maintainer type="person">
+  <email>andrewammerlaan@gentoo.org</email>
+  <name>Andrew Ammerlaan</name>
+ </maintainer>
  
- <origin>gentoo-guru-overlay</origin>
+ <origin>gentoo-staging</origin>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-python/zenlib/zenlib-2.0.0.ebuild b/dev-python/zenlib/zenlib-2.0.0.ebuild
deleted file mode 100644
index 3b19cd41c055..000000000000
--- a/dev-python/zenlib/zenlib-2.0.0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-inherit distutils-r1
-
-DESCRIPTION="Useful python decorators and utilities"
-HOMEPAGE="https://github.com/desultory/zenlib"
-SRC_URI="https://github.com/desultory/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
diff --git a/dev-python/zenlib/zenlib-2.0.4.ebuild b/dev-python/zenlib/zenlib-2.0.4.ebuild
deleted file mode 100644
index 3b19cd41c055..000000000000
--- a/dev-python/zenlib/zenlib-2.0.4.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-inherit distutils-r1
-
-DESCRIPTION="Useful python decorators and utilities"
-HOMEPAGE="https://github.com/desultory/zenlib"
-SRC_URI="https://github.com/desultory/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
diff --git a/dev-python/zenlib/zenlib-2.1.1.ebuild b/dev-python/zenlib/zenlib-2.1.1.ebuild
deleted file mode 100644
index 2fcd7edde0d5..000000000000
--- a/dev-python/zenlib/zenlib-2.1.1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-inherit distutils-r1
-
-DESCRIPTION="Useful python decorators and utilities"
-HOMEPAGE="https://github.com/desultory/zenlib"
-SRC_URI="https://github.com/desultory/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2024-07-16 18:56:48 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2024-07-16 18:56:48 +0000
commit	14d6204b592398e0b8babddbe65d3c628ff936ca (patch)
tree	184f81256b00b8a5be5713b7b77ffe83a8ce1df0 /dev-python
parent	fba2b9f4c84a3f0c9ff16e5d77e6b995705ef2aa (diff)
download	baldeagleos-repo-14d6204b592398e0b8babddbe65d3c628ff936ca.tar.gz baldeagleos-repo-14d6204b592398e0b8babddbe65d3c628ff936ca.tar.xz baldeagleos-repo-14d6204b592398e0b8babddbe65d3c628ff936ca.zip