diff --git a/dev-python/django-polymorphic/Manifest b/dev-python/django-polymorphic/Manifest
index 6b3175e1e369..f86c71792667 100644
--- a/dev-python/django-polymorphic/Manifest
+++ b/dev-python/django-polymorphic/Manifest
@@ -1 +1,2 @@
 DIST django-polymorphic-3.1.gh.tar.gz 104090 BLAKE2B de2a2b38f338a10198d00e70d1813e541bf627e2ba2f5e29f0844c9ec7034badba39c077a195fc8c2f71105f1b4e546b91218b95d2ac47020f0dc2e3a5b0baa8 SHA512 730f617009007f94e935870941fdd8973d0cd5995060afbd138622345de77fa48bf2afe037bfa2ad476cef0a31e90cab1eb55109c470ae815a98e1facfa8f125
+DIST django-polymorphic-4.0.0.gh.tar.gz 104146 BLAKE2B 10b80b40e93048df9e116e0c6a5f9b38e6e31c2c40644d2066176f8d17649b8af7091a4fa8fdff3c16a32163707adbcb52d6a247592630d85336cd2c9ff11321 SHA512 ca21831a2acc6775568898d53d47b221c8b971eb2a41c3b621ea8af3ae52875cfa2b98d04bd4cd8f1d556fe2c9932a3de44bdb8554302cb82ce0dc19d06abdb2
diff --git a/dev-python/django-polymorphic/django-polymorphic-4.0.0.ebuild b/dev-python/django-polymorphic/django-polymorphic-4.0.0.ebuild
new file mode 100644
index 000000000000..fa9b114f3680
--- /dev/null
+++ b/dev-python/django-polymorphic/django-polymorphic-4.0.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1
+
+DESCRIPTION="Seamless Polymorphic Inheritance for Django Models"
+HOMEPAGE="
+	https://github.com/jazzband/django-polymorphic/
+	https://pypi.org/project/django-polymorphic/
+"
+SRC_URI="
+	https://github.com/jazzband/django-polymorphic/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/django-3.2[$PYTHON_USEDEP]
+"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+		dev-python/dj-database-url[${PYTHON_USEDEP}]
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	# ecb85b3539c71e376eb0a111e98b5b374d5c9532
+	"${FILESDIR}/${P}-test.patch"
+)
diff --git a/dev-python/django-polymorphic/files/django-polymorphic-4.0.0-test.patch b/dev-python/django-polymorphic/files/django-polymorphic-4.0.0-test.patch
new file mode 100644
index 000000000000..022c0b3881d9
--- /dev/null
+++ b/dev-python/django-polymorphic/files/django-polymorphic-4.0.0-test.patch
@@ -0,0 +1,23 @@
+From ecb85b3539c71e376eb0a111e98b5b374d5c9532 Mon Sep 17 00:00:00 2001
+From: Jonathan he <jonathan.he@oracle.com>
+Date: Wed, 5 Feb 2025 16:02:04 -0500
+Subject: [PATCH] PolymorphicQuerySet: Prevent NoneType error in test___lookup
+
+---
+ polymorphic/query.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/polymorphic/query.py b/polymorphic/query.py
+index 8e93281..ba67529 100644
+--- a/polymorphic/query.py
++++ b/polymorphic/query.py
+@@ -277,7 +277,8 @@ class PolymorphicQuerySet(QuerySet):
+                 tree_node_test___lookup(self.model, a)
+             elif hasattr(a, "get_source_expressions"):
+                 for source_expression in a.get_source_expressions():
+-                    test___lookup(source_expression)
++                    if source_expression is not None:
++                        test___lookup(source_expression)
+             else:
+                 assert "___" not in a.name, ___lookup_assert_msg
+