diff --git a/net-libs/libupnp/Manifest b/net-libs/libupnp/Manifest
index 6931e27b1cf4a..7ff96674f8ad3 100644
--- a/net-libs/libupnp/Manifest
+++ b/net-libs/libupnp/Manifest
@@ -1,3 +1,4 @@
 DIST libupnp-1.14.31.tar.gz 826590 BLAKE2B 2fcfcd00aab5e97821ad40125071d6c5354cfce63ff59a88783a1bed17658d71566a4834615826b37a681cc3f6ac26d9324f6202c824849e5399ca81e58f7b3a SHA512 be0f876adb7a0799187531cc83a29afd5bfe8f7772e909f88faf406e344f992ccb07ef410f7511766576bde8128478926e33cebfcfa8ed1ba15fe136e0bfc8c7
 DIST libupnp-1.18.5.tar.gz 833624 BLAKE2B d4e94020f3e01e55eccdca089ede45715c812653120122d627daa0270b84f30329c9bcf5fc9ab0a66fdd83886fdf8f0768a10edd78abf514f7a6af1ac459bdb6 SHA512 a4ffb5977d9e103f8ce3ed8f9dec6a336424258c9541ae38790accaa35cd7bf92165cded285ce30f57c7aa5e03f05f0a639d846436b460800ee5e5fcb4d2d7c8
 DIST libupnp-2.0.2.tar.gz 883481 BLAKE2B 54519b90438026ee8bd7b4a9a51cf79ee0207f021aaee0001399fccdb67dd26b34c3b0b5735cf75d10439d83cd1d5af2e3baa0adfad7cfb1d6d2cba3335d1b5f SHA512 93771162a0ad1933a1c044d61ca4af31ee92769ccea199407b2afafa368134bc0002d858c80ae16f351902b412b1207af1c9f2486db5dca46c71b1cdd3d5def7
+DIST libupnp-22.0.4.tar.gz 874436 BLAKE2B b50a9173185acac8f4aa0a10714c8aaf11e04a8f5bdb0d2f2d5de081a6bc983178c1a37fef94a8131d8733170e1fba69dcb5f18e3ad96b31cf5886cbf12802fd SHA512 dd1663909bcdff1217f7fcb04c3fd1c5a6a9d2c18bbcc58687483813161b9f3da31b8cdf4badcf6b4b3a50582c07698976b3c212e9ccb9f4942ea1ed32661bdd
diff --git a/net-libs/libupnp/files/libupnp-22.0.4-disable-network-tests.patch b/net-libs/libupnp/files/libupnp-22.0.4-disable-network-tests.patch
new file mode 100644
index 0000000000000..69ac5065ea711
--- /dev/null
+++ b/net-libs/libupnp/files/libupnp-22.0.4-disable-network-tests.patch
@@ -0,0 +1,39 @@
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -17,13 +17,6 @@
+ 	return()
+ endif()
+ 
+-add_test(
+-	NAME test-init-py
+-	COMMAND ${Python3_EXECUTABLE} -m pytest
+-		${CMAKE_CURRENT_SOURCE_DIR}/test_init.py
+-		-v
+-)
+-
+ set(_test_init_py_env "UPNP_BUILD_DIR=${CMAKE_BINARY_DIR}")
+ if(CMAKE_C_FLAGS MATCHES "sanitize=address" OR
+ 		CMAKE_SHARED_LINKER_FLAGS MATCHES "sanitize=address")
+@@ -38,10 +31,6 @@
+ 	list(APPEND _test_init_py_env "ASAN_OPTIONS=detect_leaks=0")
+ endif()
+ 
+-set_tests_properties(test-init-py PROPERTIES
+-	ENVIRONMENT "${_test_init_py_env}"
+-)
+-
+ add_test(
+ 	NAME test-issue-110-py
+ 	COMMAND ${Python3_EXECUTABLE} -m pytest
+--- a/upnp/test/CMakeLists.txt
++++ b/upnp/test/CMakeLists.txt
+@@ -1,9 +1,6 @@
+ UPNP_Add_Unit_Test(test-upnp-list test_list.c)
+-UPNP_Add_Unit_Test(test-upnp-init test_init.c)
+ UPNP_Add_Unit_Test(test-upnp-log test_log.c)
+ UPNP_Add_Unit_Test(test-upnp-url test_url.c)
+-UPNP_Add_Unit_Test(test-upnp-sock-io test_sock_io.c)
+-UPNP_Add_Unit_Test(test-upnp-ssdp-req-port test_ssdp_req_port.c)
+ # test_threadpool_overflow calls internal ThreadPool API (ThreadPoolInit,
+ # TPAttrInit, …) that have hidden visibility in the shared library.  Compile
+ # the three ThreadPool translation units directly into each test variant so
diff --git a/net-libs/libupnp/libupnp-22.0.4.ebuild b/net-libs/libupnp/libupnp-22.0.4.ebuild
new file mode 100644
index 0000000000000..b8e25faeb275c
--- /dev/null
+++ b/net-libs/libupnp/libupnp-22.0.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_PN="pupnp"
+
+DESCRIPTION="An Portable Open Source UPnP Development Kit"
+HOMEPAGE="http://pupnp.sourceforge.net/"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-release-${PV}"
+
+LICENSE="BSD"
+SLOT="0/22"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="blocking-tcp debug doc +reuseaddr samples +ssl static-libs"
+
+RDEPEND="ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${PN}-22.0.4-disable-network-tests.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DUPNP_BUILD_SAMPLES="$(usex samples ON OFF)"
+		-DUPNP_BUILD_STATIC="$(usex static-libs ON OFF)"
+		-DUPNP_ENABLE_BLOCKING_TCP_CONNECTIONS="$(usex blocking-tcp ON OFF)"
+		-DUPNP_ENABLE_DEBUG="$(usex debug ON OFF)"
+		-DUPNP_ENABLE_IPV6="ON"
+		-DUPNP_ENABLE_OPEN_SSL="$(usex ssl ON OFF)"
+		-DUPNP_MINISERVER_REUSEADDR="$(usex reuseaddr ON OFF)"
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	use doc && dodoc docs/UPnP_Programming_Guide.pdf
+	find "${ED}" -name '*.la' -delete || die
+}