4 files changed, 59 insertions, 30 deletions
diff --git a/dev-python/multidict/Manifest b/dev-python/multidict/Manifest
index 260184259127..5de60752053a 100644
--- a/dev-python/multidict/Manifest
+++ b/dev-python/multidict/Manifest
@@ -1 +1 @@
-DIST multidict-5.1.0.tar.gz 58801 BLAKE2B 9b9194447a7d91d673b07e440d5f1d2068c79b15890c63a5ab679016b02471996adc73173bb303c14609b2aec230d8ebda36ab978b22b67c008f6b03e6f663f2 SHA512 7dfc8862048d274f37341dda72d93c0fab6d5463fade4f5e241f5b8bf65dcea5c0b5120376847a77f00c7246e87a1cfe14502b6f64bf97e4d00594fed6735466
+DIST multidict-6.0.5.gh.tar.gz 72819 BLAKE2B 668b5db8174c0dbc6651eae281f777d5c1dfb59a4f4d9d5301355148bf40063e33e26844d2f8ff543ebe7b9c91cf7fffb4abd57ca6786684757f50af27b7df56 SHA512 500d3b2a139d40442462a2b49f9dd0c01631643ef9905367d8b7c472a1030437c26a042a28e11ba94058a17821628d96f19ec6ca479d5831e2f1263ff0069871
diff --git a/dev-python/multidict/metadata.xml b/dev-python/multidict/metadata.xml
index 73a1bb0ceb7f..de495329e26d 100644
--- a/dev-python/multidict/metadata.xml
+++ b/dev-python/multidict/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>zmedico@gentoo.org</email>
@@ -13,4 +13,10 @@
 		<remote-id type="github">aio-libs/multidict</remote-id>
 		<remote-id type="pypi">multidict</remote-id>
 	</upstream>
+	<use>
+		<flag name="native-extensions">
+			Compile native C extensions (speedups, instead of using Python
+			fallback code).
+		</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-python/multidict/multidict-5.1.0.ebuild b/dev-python/multidict/multidict-5.1.0.ebuild
deleted file mode 100644
index f7429c25891e..000000000000
--- a/dev-python/multidict/multidict-5.1.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="multidict implementation"
-HOMEPAGE="https://github.com/aio-libs/multidict/"
-SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-BDEPEND=">=dev-python/cython-0.28.4[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs --no-autodoc
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't enable coverage or other pytest settings
-	sed -i -e 's:--cov.*::' setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/multidict/multidict-6.0.5.ebuild b/dev-python/multidict/multidict-6.0.5.ebuild
new file mode 100644
index 000000000000..a189c70f9a80
--- /dev/null
+++ b/dev-python/multidict/multidict-6.0.5.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="multidict implementation"
+HOMEPAGE="
+	https://github.com/aio-libs/multidict/
+	https://pypi.org/project/multidict/
+"
+SRC_URI="
+	https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+IUSE="+native-extensions"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't enable coverage or other pytest settings
+	sed -i -e '/cov/d' pyproject.toml pytest.ini || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! use native-extensions || [[ ${EPYTHON} == pypy3 ]]; then
+		local -x MULTIDICT_NO_EXTENSIONS=1
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	rm -rf multidict || die
+
+	local cext=--c-extensions
+	if ! use native-extensions || [[ ${EPYTHON} == pypy3 ]]; then
+		cext=--no-c-extensions
+	fi
+	epytest "${cext}"
+}