Adding metadata

30 files changed, 213 insertions, 671 deletions

diff --git a/dev-python/aiohttp/aiohttp-3.11.16.ebuild b/dev-python/aiohttp/aiohttp-3.11.16-r1.ebuild
index a0fbae8f985c..ac46aa05fc35 100644
--- a/dev-python/aiohttp/aiohttp-3.11.16.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.11.16-r1.ebuild
@@ -17,10 +17,15 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="+native-extensions test-rust"
 
-RDEPEND="
+DEPEND="
+	$(python_gen_cond_dep '
+		native-extensions? ( net-libs/llhttp:= )
+	' 'python3*')
+"
+RDEPEND="${DEPEND}
 	>=dev-python/aiodns-3.2.0[${PYTHON_USEDEP}]
 	>=dev-python/aiohappyeyeballs-2.3.0[${PYTHON_USEDEP}]
 	>=dev-python/aiosignal-1.1.2[${PYTHON_USEDEP}]
@@ -57,6 +62,10 @@ BDEPEND="
 
 DOCS=( CHANGES.rst CONTRIBUTORS.txt README.rst )
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.11.16-devendor-llhttp.patch
+)
+
 EPYTEST_XDIST=1
 distutils_enable_tests pytest
 
@@ -66,6 +75,8 @@ src_prepare() {
 	# xfail_strict fails on py3.10
 	sed -i -e '/--cov/d' -e '/pytest_cov/d' -e '/xfail_strict/d' setup.cfg || die
 	sed -i -e 's:-Werror::' Makefile || die
+	# remove the bundled llhttp, we use the system one
+	rm -r vendor/llhttp || die
 
 	distutils-r1_src_prepare
 }
diff --git a/dev-python/aiohttp/files/aiohttp-3.11.16-devendor-llhttp.patch b/dev-python/aiohttp/files/aiohttp-3.11.16-devendor-llhttp.patch
new file mode 100644
index 000000000000..26aa843ad936
--- /dev/null
+++ b/dev-python/aiohttp/files/aiohttp-3.11.16-devendor-llhttp.patch
@@ -0,0 +1,54 @@
+https://src.fedoraproject.org/rpms/python-aiohttp/raw/bceb660b835a4aaffd763a261cb2cd2392ee06db/f/0001-Unbundle-llhttp.patch
+From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= <thrnciar@redhat.com>
+Date: Wed, 16 Feb 2022 13:57:57 +0100
+Subject: [PATCH] Unbundle llhttp
+
+Modified a little by arthurzam@gentoo.org to force cythonize
+
+--- a/aiohttp/_cparser.pxd
++++ b/aiohttp/_cparser.pxd
+@@ -1,7 +1,7 @@
+ from libc.stdint cimport int32_t, uint8_t, uint16_t, uint64_t
+
+
+-cdef extern from "../vendor/llhttp/build/llhttp.h":
++cdef extern from "llhttp.h":
+
+     struct llhttp__internal_s:
+         int32_t _index
+--- a/setup.py
++++ b/setup.py
+@@ -27,23 +27,21 @@ if IS_GIT_REPO and not (HERE / "vendor/llhttp/README.md").exists():
+ # NOTE: makefile cythonizes all Cython modules
+
+ extensions = [
+-    Extension("aiohttp._websocket.mask", ["aiohttp/_websocket/mask.c"]),
++    Extension("aiohttp._websocket.mask", ["aiohttp/_websocket/mask.pyx"]),
+     Extension(
+         "aiohttp._http_parser",
+         [
+-            "aiohttp/_http_parser.c",
+-            "aiohttp/_find_header.c",
+-            "vendor/llhttp/build/c/llhttp.c",
+-            "vendor/llhttp/src/native/api.c",
+-            "vendor/llhttp/src/native/http.c",
++            "aiohttp/_http_parser.pyx",
+         ],
+-        define_macros=[("LLHTTP_STRICT_MODE", 0)],
+-        include_dirs=["vendor/llhttp/build"],
+     ),
+-    Extension("aiohttp._http_writer", ["aiohttp/_http_writer.c"]),
++    Extension("aiohttp._http_writer", ["aiohttp/_http_writer.pyx"]),
+     Extension("aiohttp._websocket.reader_c", ["aiohttp/_websocket/reader_c.c"]),
+ ]
+
++if not NO_EXTENSIONS:
++    from Cython.Build import cythonize
++    extensions = cythonize(extensions, force=True, language_level=3)
++
+
+ build_type = "Pure" if NO_EXTENSIONS else "Accelerated"
+ setup_kwargs = {} if NO_EXTENSIONS else {"ext_modules": extensions}
+--
+2.48.1
+
diff --git a/dev-python/ansible-runner/Manifest b/dev-python/ansible-runner/Manifest
deleted file mode 100644
index 5c4eb4a20b5c..000000000000
--- a/dev-python/ansible-runner/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST 2.4.1.tar.gz 141183 BLAKE2B 37f6aaf01a33174561d87f64389b31bb18f59d02c44d534efa81aff1b47b743264be5f5d78ece2441e912fd136e3b8281e840f3865bd5f5ff69e16e9fbd6d2c4 SHA512 3df3d0c8740aad4c899bbf9b43eed5b11019841f58c773fbf6c17fc04a16bb6131a1d186e7d8685d19b95697b1c7e9dff8eadd321784efff840fcdd2dac7ba3e
-DIST ansible-runner-2.4.0.tar.gz 148802 BLAKE2B 30e84673f4f879fe1b78530ab11328fd2fd7b492a4a2cc03cec6c331bc9ff322cdacf011c419e92c2659d7429d59944f11caad755a63c57e97be1c3674a5a132 SHA512 6d883e423d51176353866da67b32c0d6c3341b8dcac7e929182898d89cc6f8fc67ba0f8abfff661250db6a435f3bca5383202c34830ba3625d90679f7453a640
diff --git a/dev-python/ansible-runner/ansible-runner-2.4.0.ebuild b/dev-python/ansible-runner/ansible-runner-2.4.0.ebuild
deleted file mode 100644
index 9010b4a712cc..000000000000
--- a/dev-python/ansible-runner/ansible-runner-2.4.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2023-2024 Liguros Authors
-# Distributed under the terms of the GNU General Public License v2
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A tool and python library that helps when interfacing with Ansible"
-HOMEPAGE="https://github.com/ansible/ansible-runner"
-# TODO: fix broken tests
-RESTRICT+=" test"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/python-daemon[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e '/cov/d' -i pytest.ini || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/ansible-runner/ansible-runner-2.4.1.ebuild b/dev-python/ansible-runner/ansible-runner-2.4.1.ebuild
deleted file mode 100644
index 4bace916ac5f..000000000000
--- a/dev-python/ansible-runner/ansible-runner-2.4.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2023-2025 Liguros Authors
-# Distributed under the terms of the GNU General Public License v2
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A tool and python library that helps when interfacing with Ansible"
-HOMEPAGE="https://github.com/ansible/ansible-runner"
-SRC_URI="https://github.com/ansible/ansible-runner/archive/refs/tags/${PV}.tar.gz"
-# TODO: fix broken tests
-RESTRICT+=" test"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/python-daemon[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e '/cov/d' -i pytest.ini || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/ansible-runner/metadata.xml b/dev-python/ansible-runner/metadata.xml
deleted file mode 100644
index b5a9e690792c..000000000000
--- a/dev-python/ansible-runner/metadata.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>dev@liguros.net</email>
-  <name>Development</name>
- </maintainer>
- <maintainer type="person">
-  <email>zmedico@gentoo.org</email>
-  <name>Zac Medico</name>
- </maintainer>
- <maintainer type="project">
-  <email>python@gentoo.org</email>
-  <name>Python</name>
- </maintainer>
- <longdescription lang="en">
-		A tool and python library that helps when interfacing with Ansible
-		directly or as part of another system whether that be through a
-		container image interface, as a standalone tool, or as a Python module
-		that can be imported. The goal is to provide a stable and consistent
-		interface abstraction to Ansible.
-	</longdescription>
- <upstream>
-  <remote-id type="cpe">cpe:/a:redhat:ansible_runner</remote-id>
- </upstream>
- <origin>ports</origin>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/m2crypto/Manifest b/dev-python/m2crypto/Manifest
index 84462629ce9a..c59b22254a3d 100644
--- a/dev-python/m2crypto/Manifest
+++ b/dev-python/m2crypto/Manifest
@@ -1,2 +1 @@
-DIST m2crypto-0.43.0.tar.gz 366785 BLAKE2B 611daee57c5605246c0a505604e54ec7e029301194ed75bcb7c02ec04f0246a3dc05e13c8c00f1cc15496495a81c098b203cf69a75ce5a65ea3c7a1c0445e5d3 SHA512 c5232956a88de51bd3a1e02859b7a308eabb4e055cc0c8aac2d8d34a60c60a4a4c7160db4060ec07f559134a04eb41c6ab116a194ec3f7441d342e6d38f9add9
 DIST m2crypto-0.44.0.tar.gz 363805 BLAKE2B 0a61574ebee8a82ff2b00fa595870fe8d7e965be893db1e82bd1796703ecec16d7c476185b4b4db754efee1e698f60f20c783d1da04f77ee604afb9a346a2077 SHA512 8f8e9d88852eb003eaad9242ca43a0218354d9af3a6f0d9666ceba0ef2c840cd0aca0ad8493a222eb1de9dd0253c0204dde5530fd6a59ee1c3f29be83ec23458
diff --git a/dev-python/m2crypto/files/m2crypto-libressl-0.38.0-r2.patch b/dev-python/m2crypto/files/m2crypto-libressl-0.38.0-r2.patch
deleted file mode 100644
index e125fc6c49ff..000000000000
--- a/dev-python/m2crypto/files/m2crypto-libressl-0.38.0-r2.patch
+++ /dev/null
@@ -1,185 +0,0 @@
-$OpenBSD: patch-src_M2Crypto_BIO_py,v 1.1 2021/07/24 20:02:04 sthen Exp $
-
-Partially revert https://gitlab.com/m2crypto/m2crypto/commit/738cd0bf3dc2ee619f598290d5bf4c2190987f16:
-
- * Fix BIO.File ... return type of BIO.readline() and close properly.
-   That is, flush BIO.File() before closing and close also underlying
-   system file.
-
-For Python 2 this results in:
-
-python2 -c "import M2Crypto; M2Crypto.BIO.openfile('/etc/ssl/cert.pem')"
-Traceback (most recent call last):
-  File "<string>", line 1, in <module>
-  File "/usr/local/lib/python2.7/site-packages/M2Crypto/BIO.py", line 284, in openfile
-    return File(f)
-  File "/usr/local/lib/python2.7/site-packages/M2Crypto/BIO.py", line 239, in __init__
-    pyfile.flush()
-IOError: [Errno 9] Bad file descriptor
-
-https://gitlab.com/m2crypto/m2crypto/issues/211
-
-Index: src/M2Crypto/BIO.py
---- a/src/M2Crypto/BIO.py.orig
-+++ b/src/M2Crypto/BIO.py
-@@ -235,8 +235,9 @@ class File(BIO):
-         #
-         #  https://docs.python.org/3.3/c-api/file.html
-         #
--        pyfile.flush()
--        self.fname = pyfile.name
-+        if six.PY3:
-+            pyfile.flush()
-+            self.fname = pyfile.name
-         self.pyfile = pyfile
-         # Be wary of https://github.com/openssl/openssl/pull/1925
-         # BIO_new_fd is NEVER to be used before OpenSSL 1.1.1
-@@ -246,7 +247,8 @@ class File(BIO):
-             self.bio = m2.bio_new_pyfile(pyfile, m2.bio_noclose)
- 
-         self.close_pyfile = close_pyfile
--        self.closed = False
-+        if six.PY3:
-+            self.closed = False
- 
-     def flush(self):
-         # type: () -> None
-@@ -255,8 +257,9 @@ class File(BIO):
- 
-     def close(self):
-         # type: () -> None
--        self.flush()
--        super(File, self).close()
-+        if six.PY3:
-+            self.flush()
-+            super(File, self).close()
-         if self.close_pyfile:
-             self.pyfile.close()
- 
-$OpenBSD: patch-src_SWIG__lib11_compat_i,v 1.2 2021/10/07 22:32:54 tb Exp $
-
-Provide CRYPTO_zalloc to fix build with LibreSSL
-
-Index: src/SWIG/_lib11_compat.i
---- a/src/SWIG/_lib11_compat.i.orig
-+++ b/src/SWIG/_lib11_compat.i
-@@ -8,7 +8,7 @@
-  */
- 
- %{
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 
- #include <string.h>
- #include <openssl/engine.h>
-@@ -24,6 +24,8 @@ static void *CRYPTO_zalloc(size_t num, const char *fil
-       return ret;
- }
- 
-+#endif
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- #include <openssl/bn.h>
- 
- #ifndef BN_F_BN_GENCB_NEW
-$OpenBSD: patch-src_SWIG__lib_i,v 1.2 2021/10/07 22:32:54 tb Exp $
-
-Fix build with LibreSSL
-
-Index: src/SWIG/_lib.i
---- a/src/SWIG/_lib.i.orig
-+++ b/src/SWIG/_lib.i
-@@ -21,7 +21,7 @@
- 
- %{
- /* OpenSSL 1.0.2 copmatbility shim */
--#if OPENSSL_VERSION_NUMBER < 0x10002000L
-+#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER)
- typedef void (*OPENSSL_sk_freefunc)(void *);
- typedef void *(*OPENSSL_sk_copyfunc)(const void *);
- typedef struct stack_st OPENSSL_STACK;
-$OpenBSD: patch-src_SWIG__threads_i,v 1.1 2021/07/24 20:02:04 sthen Exp $
-
-Fix build with LibreSSL
-
-Index: src/SWIG/_threads.i
---- a/src/SWIG/_threads.i.orig
-+++ b/src/SWIG/_threads.i
-@@ -5,7 +5,7 @@
- #include <pythread.h>
- #include <openssl/crypto.h>
- 
--#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- #define CRYPTO_num_locks()      (CRYPTO_NUM_LOCKS)
- static PyThread_type_lock lock_cs[CRYPTO_num_locks()];
- static long lock_count[CRYPTO_num_locks()];
-@@ -13,7 +13,7 @@ static int thread_mode = 0;
- #endif
- 
- void threading_locking_callback(int mode, int type, const char *file, int line) {
--#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-         if (mode & CRYPTO_LOCK) {
-                 PyThread_acquire_lock(lock_cs[type], WAIT_LOCK);
-                 lock_count[type]++;
-@@ -25,7 +25,7 @@ void threading_locking_callback(int mode, int type, co
- }
- 
- unsigned long threading_id_callback(void) {
--#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     return (unsigned long)PyThread_get_thread_ident();
- #else
-     return (unsigned long)0;
-@@ -35,7 +35,7 @@ unsigned long threading_id_callback(void) {
- 
- %inline %{
- void threading_init(void) {
--#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     int i;
-     if (!thread_mode) {
-         for (i=0; i<CRYPTO_num_locks(); i++) {
-@@ -50,7 +50,7 @@ void threading_init(void) {
- }
- 
- void threading_cleanup(void) {
--#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     int i;
-     if (thread_mode) {
-         CRYPTO_set_locking_callback(NULL);
-$OpenBSD: patch-SWIG__bio_i,v 1.4 2018/04/25 16:51:05 jasper Exp $
-
-BIO_meth_new() and BIO_meth_free() are non-static in LibreSSL
-
-Index: SWIG/_bio.i
---- a/src/SWIG/_bio.i.orig
-+++ a/src/SWIG/_bio.i
-@@ -293,8 +293,12 @@ int bio_should_write(BIO* a) {
- }
- 
- /* Macros for things not defined before 1.1.0 */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
--static BIO_METHOD *
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x3050000fL)
-+
-+#if !defined(LIBRESSL_VERSION_NUMBER)
-+static
-+#endif
-+BIO_METHOD *
- BIO_meth_new( int type, const char *name )
- {
-     BIO_METHOD *method = malloc( sizeof(BIO_METHOD) );
-@@ -306,7 +310,10 @@ BIO_meth_new( int type, const char *name )
-     return method;
- }
- 
--static void
-+#if !defined(LIBRESSL_VERSION_NUMBER)
-+static
-+#endif
-+void
- BIO_meth_free( BIO_METHOD *meth )
- {
-     if ( meth == NULL ) {
diff --git a/dev-python/m2crypto/m2crypto-0.43.0.ebuild b/dev-python/m2crypto/m2crypto-0.43.0.ebuild
deleted file mode 100644
index f3c010433b33..000000000000
--- a/dev-python/m2crypto/m2crypto-0.43.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 2021-2024 Liguros Authors
-# Distributed under the terms of the GNU General Public License v2
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-PYPI_NO_NORMALIZE=1
-PYPI_PN="M2Crypto"
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="A Python crypto and SSL toolkit"
-HOMEPAGE="https://gitlab.com/m2crypto/m2crypto https://pypi.org/project/M2Crypto/"
-SRC_URI="https://gitlab.com/m2crypto/m2crypto/-/archive/${PV}/m2crypto-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="libressl"
-
-BDEPEND="
-	>=dev-lang/swig-2.0.9
-"
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( >=dev-libs/libressl-3.5.0:0= )
-"
-DEPEND="${RDEPEND}"
-
-#PATCHES=(
-#	${FILESDIR}/${PN}-libressl-0.38.0-r2.patch
-#)
-
-swig_define() {
-	local x
-	for x; do
-		if tc-cpp-is-true "defined(${x})"; then
-			SWIG_FEATURES+=" -D${x}"
-		fi
-	done
-}
-
-src_prepare() {
-	if use libressl; then
-		eapply -p0 ${FILESDIR}/patch-src_SWIG__x509_i
-		eapply -p0 ${FILESDIR}/patch-src_SWIG__lib11_compat_i
-		eapply -p0 ${FILESDIR}/patch-src_SWIG__lib_i
-		eapply -p0 ${FILESDIR}/patch-src_SWIG__threads_i
-	fi
-
-	sed -e 's:test_server_simple_timeouts:_&:' \
-		-i tests/test_ssl.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	# setup.py looks at platform.machine() to determine swig options.
-	# For exotic ABIs, we need to give swig a hint.
-	local -x SWIG_FEATURES=
-
-	# https://bugs.gentoo.org/617946
-	swig_define __ILP32__
-	# https://bugs.gentoo.org/674112
-	swig_define __ARM_PCS_VFP
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	"${EPYTHON}" -m unittest -b -v tests.alltests.suite ||
-		die "Tests failed for ${EPYTHON}"
-}
diff --git a/dev-python/m2crypto/m2crypto-0.44.0.ebuild b/dev-python/m2crypto/m2crypto-0.44.0-r1.ebuild
index 0c1c0254256c..719402c27bea 100644
--- a/dev-python/m2crypto/m2crypto-0.44.0.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.44.0-r1.ebuild
@@ -5,8 +5,6 @@ EAPI=8
 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-PYPI_NO_NORMALIZE=1
-PYPI_PN="M2Crypto"
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 toolchain-funcs
@@ -29,10 +27,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-#PATCHES=(
-#	${FILESDIR}/${PN}-libressl-0.38.0-r2.patch
-#)
-
 swig_define() {
 	local x
 	for x; do
diff --git a/dev-python/pycodestyle/Manifest b/dev-python/pycodestyle/Manifest
index 2a826d38930f..42d52611bc1c 100644
--- a/dev-python/pycodestyle/Manifest
+++ b/dev-python/pycodestyle/Manifest
@@ -1,2 +1,2 @@
-DIST pycodestyle-2.12.1.tar.gz 80518 BLAKE2B e64dda57d1c349228f8ffeced4061d278b342af7db152377e34b3fad626db52f7eef4668df60d323196f1844e8fa28d9e231cc216145b2ea1da6ae32bc1f341f SHA512 7709c0611812c3294a55a5e6dde00d5affc67c4273ab1d37dec507a424b618b2736a6976d27872903fa448f208fe2ba4529f2bfbefc2902dcf947cb6bca5b09a
-DIST pycodestyle-2.13.0.tar.gz 80780 BLAKE2B 77886f6cf24b27974af6284a70d667dca5766c79325bb377825c4db6d27aacdce08130cef4cdaf8cfcbac284b2e07b1f05b25743eed8f282249ffa9cafc0b8cf SHA512 6e1ba1586b62a9ba3b63f2c67b9b98ee787785fffc29897a68d6dd138d226f5fc490a555ad11f4ca2a8c46082ad5ce8ea1c904c12183005abe4347ca80ca63be
+DIST pycodestyle-2.12.1.gh.tar.gz 80518 BLAKE2B e64dda57d1c349228f8ffeced4061d278b342af7db152377e34b3fad626db52f7eef4668df60d323196f1844e8fa28d9e231cc216145b2ea1da6ae32bc1f341f SHA512 7709c0611812c3294a55a5e6dde00d5affc67c4273ab1d37dec507a424b618b2736a6976d27872903fa448f208fe2ba4529f2bfbefc2902dcf947cb6bca5b09a
+DIST pycodestyle-2.13.0.gh.tar.gz 80780 BLAKE2B 77886f6cf24b27974af6284a70d667dca5766c79325bb377825c4db6d27aacdce08130cef4cdaf8cfcbac284b2e07b1f05b25743eed8f282249ffa9cafc0b8cf SHA512 6e1ba1586b62a9ba3b63f2c67b9b98ee787785fffc29897a68d6dd138d226f5fc490a555ad11f4ca2a8c46082ad5ce8ea1c904c12183005abe4347ca80ca63be
diff --git a/dev-python/pycodestyle/metadata.xml b/dev-python/pycodestyle/metadata.xml
index 36acccda7221..ea8988e8af6a 100644
--- a/dev-python/pycodestyle/metadata.xml
+++ b/dev-python/pycodestyle/metadata.xml
@@ -2,9 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="project">
-  <email>dev@liguros.net</email>
-  <name>Development</name>
+  <email>python@gentoo.org</email>
+  <name>Python</name>
  </maintainer>
  
- <origin>ports</origin>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/pycodestyle/pycodestyle-2.12.1.ebuild b/dev-python/pycodestyle/pycodestyle-2.12.1.ebuild
index 1b63cd97b62f..e075c86e1edb 100644
--- a/dev-python/pycodestyle/pycodestyle-2.12.1.ebuild
+++ b/dev-python/pycodestyle/pycodestyle-2.12.1.ebuild
@@ -1,36 +1,45 @@
-# Copyright 2020-2024 Liguros Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
 
 inherit distutils-r1
 
 DESCRIPTION="Python style guide checker (fka pep8)"
-HOMEPAGE="https://pypi.org/project/pycodestyle/"
-SRC_URI="https://github.com/PyCQA/pycodestyle/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="
+	https://pycodestyle.pycqa.org/en/latest/
+	https://github.com/PyCQA/pycodestyle/
+	https://pypi.org/project/pycodestyle/
+"
+# 2.11.0 broke sdist
+# https://github.com/PyCQA/pycodestyle/issues/1183
+SRC_URI="
+	https://github.com/PyCQA/pycodestyle/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+distutils_enable_sphinx docs \
+	dev-python/sphinx-rtd-theme
+distutils_enable_tests pytest
 
 python_test() {
-	PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py -v --statistics pycodestyle.py || die
-	PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py -v --testsuite=testsuite || die
-	PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py --doctest -v || die
-	esetup.py test
-}
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local EPYTEST_DESELECT=()
+
+	case ${EPYTHON} in
+		pypy3.11)
+			EPYTEST_DESELECT+=(
+				# https://github.com/pypy/pypy/issues/5234
+				tests/test_api.py::APITestCase::test_check_nullbytes
+			)
+			;;
+	esac
 
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
+	epytest
 }
diff --git a/dev-python/pycodestyle/pycodestyle-2.13.0.ebuild b/dev-python/pycodestyle/pycodestyle-2.13.0.ebuild
index ed521e5d6e36..d9a5c8cf3c1e 100644
--- a/dev-python/pycodestyle/pycodestyle-2.13.0.ebuild
+++ b/dev-python/pycodestyle/pycodestyle-2.13.0.ebuild
@@ -1,36 +1,45 @@
-# Copyright 2020-2025 Liguros Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
 
 inherit distutils-r1
 
 DESCRIPTION="Python style guide checker (fka pep8)"
-HOMEPAGE="https://pypi.org/project/pycodestyle/"
-SRC_URI="https://github.com/PyCQA/pycodestyle/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="
+	https://pycodestyle.pycqa.org/en/latest/
+	https://github.com/PyCQA/pycodestyle/
+	https://pypi.org/project/pycodestyle/
+"
+# 2.11.0 broke sdist
+# https://github.com/PyCQA/pycodestyle/issues/1183
+SRC_URI="
+	https://github.com/PyCQA/pycodestyle/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+distutils_enable_sphinx docs \
+	dev-python/sphinx-rtd-theme
+distutils_enable_tests pytest
 
 python_test() {
-	PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py -v --statistics pycodestyle.py || die
-	PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py -v --testsuite=testsuite || die
-	PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py --doctest -v || die
-	esetup.py test
-}
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local EPYTEST_DESELECT=()
+
+	case ${EPYTHON} in
+		pypy3.11)
+			EPYTEST_DESELECT+=(
+				# https://github.com/pypy/pypy/issues/5234
+				tests/test_api.py::APITestCase::test_check_nullbytes
+			)
+			;;
+	esac
 
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
+	epytest
 }
diff --git a/dev-python/python-soundfile/Manifest b/dev-python/python-soundfile/Manifest
deleted file mode 100644
index f86e78fea922..000000000000
--- a/dev-python/python-soundfile/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST python-soundfile-0.10.3.tar.gz 35004 BLAKE2B fc07147016767991dd33c29f42e624e02195c9dcc52af03be7fd4f35de89045438e6eb58699655d0791b4863597f39fc035aca3c359c383f09140e61bd3e7fdb SHA512 169938cc89f9ee556428c05266d4c75599348443f20521a04afba0cbf9a232c075f7850ee2e619b615942720687e0f9b3ced9595ae4032ebc569e48db1b905f3
-DIST python-soundfile-0.11.0.tar.gz 37610 BLAKE2B c70405ecc2a7545348f909a2d77af2a39582872fc649a3bc3c459337694ec30066b215b9f00ebd07203e773307ed0611aee79f72c69af43d2d609d2e4dd71339 SHA512 3503d2facfa00c0f859a50df3cac516e4a74467755f82d84bc11dc4e4a03609bb967431215ac62ed3032a2999e4374b750c5a504bffb20d063ea1b05217ba080
diff --git a/dev-python/python-soundfile/metadata.xml b/dev-python/python-soundfile/metadata.xml
deleted file mode 100644
index 36acccda7221..000000000000
--- a/dev-python/python-soundfile/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>dev@liguros.net</email>
-  <name>Development</name>
- </maintainer>
- 
- <origin>ports</origin>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/python-soundfile/python-soundfile-0.10.3-r1.ebuild b/dev-python/python-soundfile/python-soundfile-0.10.3-r1.ebuild
deleted file mode 100644
index 62abf19233db..000000000000
--- a/dev-python/python-soundfile/python-soundfile-0.10.3-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2021 Liguros Authors
-# Distributed under the terms of the GNU General Public License v2
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-inherit distutils-r1
-
-DESCRIPTION="SoundFile is an audio library based on libsndfile, CFFI and NumPy."
-HOMEPAGE="https://github.com/bastibe/python-soundfile"
-SRC_URI="${HOMEPAGE}/archive/refs/tags/${PV}post1.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/cffi
-	dev-python/numpy
-	media-libs/libsndfile"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P}post1"
diff --git a/dev-python/python-soundfile/python-soundfile-0.11.0-r1.ebuild b/dev-python/python-soundfile/python-soundfile-0.11.0-r1.ebuild
deleted file mode 100644
index 05ff798ec238..000000000000
--- a/dev-python/python-soundfile/python-soundfile-0.11.0-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2021-2022 Liguros Authors
-# Distributed under the terms of the GNU General Public License v2
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="SoundFile is an audio library based on libsndfile, CFFI and NumPy."
-HOMEPAGE="https://github.com/bastibe/python-soundfile"
-SRC_URI="https://github.com/bastibe/python-soundfile/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/cffi
-	dev-python/numpy
-	media-libs/libsndfile"
-RDEPEND="${DEPEND}"
-
-#S="${WORKDIR}/${P}post1"
diff --git a/dev-python/sounddevice/Manifest b/dev-python/sounddevice/Manifest
deleted file mode 100644
index ac9a849289d9..000000000000
--- a/dev-python/sounddevice/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST sounddevice-0.5.0.tar.gz 53661 BLAKE2B 71c9c77446f93cc62262c16213f0225be235637d233777fa03ab4a3b926effb3992efd47dca5b09e98e2f6f543ae5b9b05c31537386cc17ac4a3845af01f914d SHA512 a06966244f0ff54def3ad53839c553523a1e342609af84b8f8d4c0f3ed787f225035f80cf614e521d3642a0bf3e68f7e2924837a7b24d1dcc7d13d4ddac6a4a3
-DIST sounddevice-0.5.1.tar.gz 54145 BLAKE2B 78c3215c977ab336f70ad8947ef681a34e81dc2132ba5bb62f51d10312b7e0fe4365789c319c710d0e5989423000d48e3315d140038d85a45d01187c16549d28 SHA512 2e53ca607f6e9ef5911bd14ce2f8cc33b8d9b746815c98a51d831ce5c23da09dbac043e080c027ef1c50fd75e1727975e777c3a4262625a845769f8b5a3d9507
diff --git a/dev-python/sounddevice/metadata.xml b/dev-python/sounddevice/metadata.xml
deleted file mode 100644
index 36acccda7221..000000000000
--- a/dev-python/sounddevice/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>dev@liguros.net</email>
-  <name>Development</name>
- </maintainer>
- 
- <origin>ports</origin>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/sounddevice/sounddevice-0.5.0.ebuild b/dev-python/sounddevice/sounddevice-0.5.0.ebuild
deleted file mode 100644
index ff4025a76695..000000000000
--- a/dev-python/sounddevice/sounddevice-0.5.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2021-2024 Liguros Authors
-# Distributed under the terms of the GNU General Public License v2
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for PortAudio"
-HOMEPAGE="https://github.com/spatialaudio/python-sounddevice/ https://pypi.org/project/sounddevice/"
-SRC_URI="https://github.com/spatialaudio/python-sounddevice/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/cffi
-	media-libs/portaudio"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/python-${P}
diff --git a/dev-python/sounddevice/sounddevice-0.5.1.ebuild b/dev-python/sounddevice/sounddevice-0.5.1.ebuild
deleted file mode 100644
index ff4025a76695..000000000000
--- a/dev-python/sounddevice/sounddevice-0.5.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2021-2024 Liguros Authors
-# Distributed under the terms of the GNU General Public License v2
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for PortAudio"
-HOMEPAGE="https://github.com/spatialaudio/python-sounddevice/ https://pypi.org/project/sounddevice/"
-SRC_URI="https://github.com/spatialaudio/python-sounddevice/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/cffi
-	media-libs/portaudio"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/python-${P}
diff --git a/dev-python/sphinx-design/Manifest b/dev-python/sphinx-design/Manifest
index 0a6fbdf80b03..623f48c9ccd0 100644
--- a/dev-python/sphinx-design/Manifest
+++ b/dev-python/sphinx-design/Manifest
@@ -1,2 +1 @@
-DIST sphinx-design-0.6.0.gh.tar.gz 2634677 BLAKE2B c1adfe2406104b638be4fb4ac99f105c9bd53dec4f304343896dec3a412ec887fdb82a92f889adb916a72fcaa33bdd8429db4b2b146aeb0f763df08ab1ac180c SHA512 aa355b4ac675e431bb25de21a6060225edd5fe5a7ae7a3a4d6f8f7082dd74b16142512ef2381d0dd44e2f1a86c52c6ac39591d92ac0b7f1fb2ea5bd753a7db8a
 DIST sphinx-design-0.6.1.gh.tar.gz 2634942 BLAKE2B 24d392aebdfbe62dc5b7aa4459f146f32bd2bf64f53e7fe0bb2732e63501f59e3b06d437cde138b398d2c0c1454cd3678c2ce3fdffaaf11786a7353ac0a8a9b0 SHA512 7733d0f146f26b47c1b4db5c86aeb634194fc3d9330308812e7507aa2b76420d869a6a5846980f034e7127385f79c0b41dfcce2206d0ee69746aa8ced2a4a582
diff --git a/dev-python/sphinx-design/files/myst-parser.patch b/dev-python/sphinx-design/files/myst-parser.patch
deleted file mode 100644
index 9dbd9b6c22d0..000000000000
--- a/dev-python/sphinx-design/files/myst-parser.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From a5896e10b57444c2b027c7fe8b84c68e0753fadd Mon Sep 17 00:00:00 2001
-From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
-Date: Sat, 1 Jun 2024 10:34:03 +0000
-Subject: [PATCH] :arrow_up: Update myst-parser requirement from <3,>=1 to
- >=1,<4
-
-Updates the requirements on [myst-parser](https://github.com/executablebooks/MyST-Parser) to permit the latest version.
-- [Release notes](https://github.com/executablebooks/MyST-Parser/releases)
-- [Changelog](https://github.com/executablebooks/MyST-Parser/blob/master/CHANGELOG.md)
-- [Commits](https://github.com/executablebooks/MyST-Parser/compare/v1.0.0...v3.0.1)
-
----
-updated-dependencies:
-- dependency-name: myst-parser
-  dependency-type: direct:production
-...
-
-Signed-off-by: dependabot[bot] <support@github.com>
----
- pyproject.toml | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/pyproject.toml b/pyproject.toml
-index c307e72..6eb542f 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -35,9 +35,9 @@ Documentation = "https://sphinx-design.readthedocs.io"
- 
- [project.optional-dependencies]
- code-style = ["pre-commit>=3,<4"]
--rtd = ["myst-parser>=1,<3"]
-+rtd = ["myst-parser>=1,<4"]
- testing = [
--    "myst-parser>=1,<3",
-+    "myst-parser>=1,<4",
-     "pytest~=7.1",
-     "pytest-cov",
-     "pytest-regressions",
diff --git a/dev-python/sphinx-design/metadata.xml b/dev-python/sphinx-design/metadata.xml
index 36acccda7221..137044fdb488 100644
--- a/dev-python/sphinx-design/metadata.xml
+++ b/dev-python/sphinx-design/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="project">
-  <email>dev@liguros.net</email>
-  <name>Development</name>
+ <maintainer type="person">
+  <email>gasc@eurecom.fr</email>
+  <name>Gasc Henri</name>
  </maintainer>
  
- <origin>ports</origin>
+ <origin>gentoo-guru-overlay</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/sphinx-design/sphinx-design-0.6.0.ebuild b/dev-python/sphinx-design/sphinx-design-0.6.0.ebuild
deleted file mode 100644
index 2f862c3aa6f2..000000000000
--- a/dev-python/sphinx-design/sphinx-design-0.6.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2023-2024 Liguros Authors
-# Distributed under the terms of the GNU General Public License v2
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1
-
-DESCRIPTION="A sphinx extension for designing beautiful, view size responsive web components"
-HOMEPAGE="https://sphinx-design.readthedocs.io"
-SRC_URI="https://github.com/executablebooks/sphinx-design/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="code_style rtd theme_furo theme_pydata theme_rtd theme_sbt"
-
-RDEPEND="<dev-python/sphinx-8[${PYTHON_USEDEP}]
-	code_style? ( dev-vcs/pre-commit )
-	rtd? ( dev-python/myst-parser[${PYTHON_USEDEP}] )
-	theme_furo? ( >=dev-python/furo-2022.06.04[${PYTHON_USEDEP}] )
-	theme_pydata? ( dev-python/pydata-sphinx-theme[${PYTHON_USEDEP}] )
-	theme_rtd? ( dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}] )
-	theme_sbt? ( dev-python/sphinx-book-theme[${PYTHON_USEDEP}] )
-"
-BDEPEND="test? (
-		dev-python/pytest-regressions[${PYTHON_USEDEP}]
-		dev-python/myst-parser[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	${FILESDIR}/myst-parser.patch
-)
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/myst-parser
diff --git a/dev-python/sphinx-design/sphinx-design-0.6.1-r1.ebuild b/dev-python/sphinx-design/sphinx-design-0.6.1-r1.ebuild
deleted file mode 100644
index 702aeba87e1a..000000000000
--- a/dev-python/sphinx-design/sphinx-design-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2023-2024 Liguros Authors
-# Distributed under the terms of the GNU General Public License v2
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1
-
-DESCRIPTION="A sphinx extension for designing beautiful, view size responsive web components"
-HOMEPAGE="https://sphinx-design.readthedocs.io"
-SRC_URI="https://github.com/executablebooks/sphinx-design/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="code_style rtd theme_furo theme_pydata theme_rtd theme_sbt"
-
-RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]
-	code_style? ( dev-vcs/pre-commit )
-	rtd? ( dev-python/myst-parser[${PYTHON_USEDEP}] )
-	theme_furo? ( >=dev-python/furo-2022.06.04[${PYTHON_USEDEP}] )
-	theme_pydata? ( dev-python/pydata-sphinx-theme[${PYTHON_USEDEP}] )
-	theme_rtd? ( dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}] )
-	theme_sbt? ( dev-python/sphinx-book-theme[${PYTHON_USEDEP}] )
-"
-BDEPEND="test? (
-		dev-python/pytest-regressions[${PYTHON_USEDEP}]
-		dev-python/myst-parser[${PYTHON_USEDEP}]
-	)
-"
-
-#PATCHES=( ${FILESDIR}/sphinx.patch )
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/myst-parser
diff --git a/dev-python/sphinx-design/sphinx-design-0.6.1.ebuild b/dev-python/sphinx-design/sphinx-design-0.6.1.ebuild
index 15a4e1c3e5df..2cc8a4e2ffb3 100644
--- a/dev-python/sphinx-design/sphinx-design-0.6.1.ebuild
+++ b/dev-python/sphinx-design/sphinx-design-0.6.1.ebuild
@@ -1,34 +1,32 @@
-# Copyright 2023-2024 Liguros Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI=8
 
+DOCS_AUTODOC=0
+DOCS_BUILDER="sphinx"
+DOCS_DIR="docs"
+
 DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 docs
 
-DESCRIPTION="A sphinx extension for designing beautiful, view size responsive web components"
-HOMEPAGE="https://sphinx-design.readthedocs.io"
+DESCRIPTION="A sphinx extension for designing beautiful responsive web components"
+HOMEPAGE="https://github.com/executablebooks/sphinx-design https://pypi.org/project/sphinx_design/"
 SRC_URI="https://github.com/executablebooks/sphinx-design/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="code_style rtd theme_furo theme_pydata theme_rtd theme_sbt"
 
-RDEPEND="<dev-python/sphinx-8[${PYTHON_USEDEP}]
-	code_style? ( dev-vcs/pre-commit )
-	rtd? ( dev-python/myst-parser[${PYTHON_USEDEP}] )
-	theme_furo? ( >=dev-python/furo-2022.06.04[${PYTHON_USEDEP}] )
-	theme_pydata? ( dev-python/pydata-sphinx-theme[${PYTHON_USEDEP}] )
-	theme_rtd? ( dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}] )
-	theme_sbt? ( dev-python/sphinx-book-theme[${PYTHON_USEDEP}] )
-"
-BDEPEND="test? (
+BDEPEND="
+	test? (
 		dev-python/pytest-regressions[${PYTHON_USEDEP}]
+	)
+	doc? (
 		dev-python/myst-parser[${PYTHON_USEDEP}]
 	)
 "
 
 distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/myst-parser
diff --git a/dev-python/spyder-notebook/Manifest b/dev-python/spyder-notebook/Manifest
index fdfeac6f691a..be5a711930af 100644
--- a/dev-python/spyder-notebook/Manifest
+++ b/dev-python/spyder-notebook/Manifest
@@ -1 +1,2 @@
 DIST spyder_notebook-0.6.1.tar.gz 7118143 BLAKE2B d1893d96f91fb192eba13342edf67089ffa664b152b7777f3e626f8541ea2a2b7a20f1b73d72b55c2107abe02870cb63ee17b535dd13a3db882971b8c11eac33 SHA512 2bb7e4d1c4255cfb385e80bb46b3de7ae6c7fd4d4cdc27188cd530699cbc4654d2ace6e8341bc47b029d3e757dd860e2b0a65c2f00a91ae589032de86330cd84
+DIST spyder_notebook-0.6.2.tar.gz 7270229 BLAKE2B 85ec279a10adfc965d3da324a399d9f627626611fbafd3f0b2c8a16a5b7a6740b5ec6b5417de4704007599967b06279876d7547227277ed6be0f26f28591462b SHA512 e2bd545b14d90461cc30c4a1cffdae81bff4791be1d3b770c614369fb10bbbfaea9098089226c5333ab2cb8cb6d162254929d9dbd81faa305da93faf1192dc8f
diff --git a/dev-python/spyder-notebook/spyder-notebook-0.6.2.ebuild b/dev-python/spyder-notebook/spyder-notebook-0.6.2.ebuild
new file mode 100644
index 000000000000..8dcd93947dd5
--- /dev/null
+++ b/dev-python/spyder-notebook/spyder-notebook-0.6.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1 pypi virtualx
+
+DESCRIPTION="Jupyter notebook integration with Spyder"
+HOMEPAGE="https://github.com/spyder-ide/spyder-notebook"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	>=dev-python/notebook-7.3.3[${PYTHON_USEDEP}]
+	<dev-python/notebook-7.4[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/qdarkstyle[${PYTHON_USEDEP}]
+	dev-python/qtpy[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	>=dev-python/spyder-6[${PYTHON_USEDEP}]
+	<dev-python/spyder-7[${PYTHON_USEDEP}]
+	dev-python/tornado[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-qt[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( "README.md" "CHANGELOG.md" )
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Hangs
+	spyder_notebook/widgets/tests/test_main_widget.py::test_save_notebook
+	spyder_notebook/widgets/tests/test_main_widget.py::test_new_notebook
+	# Fails in sandbox
+	spyder_notebook/tests/test_plugin.py::test_open_console_when_no_kernel
+	spyder_notebook/widgets/tests/test_main_widget.py::test_shutdown_notebook_kernel
+	spyder_notebook/widgets/tests/test_main_widget.py::test_file_in_temp_dir_deleted_after_notebook_closed
+	# Some missing file
+	spyder_notebook/widgets/tests/test_main_widget.py::test_open_notebook_in_non_ascii_dir
+	spyder_notebook/widgets/tests/test_main_widget.py::test_close_nonexisting_notebook
+)
+
+python_test() {
+	virtx epytest
+}