diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest
index 33ef4f5434438..553c2cc77cdb6 100644
--- a/net-misc/openvswitch/Manifest
+++ b/net-misc/openvswitch/Manifest
@@ -1 +1,2 @@
DIST openvswitch-2.17.12.tar.gz 8176749 BLAKE2B eee2b7163e16884b3108c855bb0a9fd132a1edd495c15c5734bfcb4a53e4c664415be653f6e0fd4624902d852cc92ac8a1eb72c8350d3747e8ba6f89dd2a0582 SHA512 e434c1a2836efac45a295fe33f1fc7a9c47ac61919d86ac8b8a173b9528e5e0a58546772b47dc396ff006abb030df321cd8320e7faef132dba916d7a2d488e3b
+DIST openvswitch-3.3.8.tar.gz 9317938 BLAKE2B 59a40b0c1c9f89c79d2936c79f614bbfae5143b7b8c199f3368ed747a2a5e6f33f31ff27193a0f96b701e09eb11a29138a99577a45c4eeacebb74be5cd4b348f SHA512 3ac2632b36bdee5888783c7f30185dbcfa33ca41ce98eed05d1a73f295927940acc900d166c0a8f6deac648c34dfa2a894e0678f636ba0d849737e52afb6008c
diff --git a/net-misc/openvswitch/metadata.xml b/net-misc/openvswitch/metadata.xml
index fad2a4a6287dd..7387ce2ec7db9 100644
--- a/net-misc/openvswitch/metadata.xml
+++ b/net-misc/openvswitch/metadata.xml
@@ -10,6 +10,7 @@
openvswitch/ovs
diff --git a/net-misc/openvswitch/openvswitch-3.3.8.ebuild b/net-misc/openvswitch/openvswitch-3.3.8.ebuild
new file mode 100644
index 0000000000000..c9da07c259750
--- /dev/null
+++ b/net-misc/openvswitch/openvswitch-3.3.8.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{12..14} )
+inherit autotools dot-a linux-info multiprocessing python-single-r1
+inherit systemd tmpfiles
+
+DESCRIPTION="Production quality, multilayer virtual switch"
+HOMEPAGE="https://www.openvswitch.org"
+SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="debug monitor +ssl unwind valgrind xdp"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Check python/ovs/version.py in tarball for dev-python/ovs dep
+RDEPEND="
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ ~dev-python/ovs-3.3.8[${PYTHON_USEDEP}]
+ dev-python/twisted[${PYTHON_USEDEP}]
+ dev-python/zope-interface[${PYTHON_USEDEP}]
+ ')
+ sys-apps/lsb-release
+ debug? ( dev-lang/perl )
+ unwind? ( sys-libs/libunwind:= )
+ ssl? ( dev-libs/openssl:= )
+ xdp? (
+ dev-libs/libbpf:=
+ net-libs/xdp-tools
+ sys-process/numactl
+ )
+"
+DEPEND="
+ ${RDEPEND}
+ sys-apps/util-linux[caps]
+ virtual/os-headers
+ valgrind? ( dev-debug/valgrind )
+"
+BDEPEND="
+ virtual/pkgconfig
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ ')
+"
+
+CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN ~OPENVSWITCH"
+
+pkg_setup() {
+ if use xdp ; then
+ CONFIG_CHECK+=" ~BPF ~BPF_JIT ~BPF_SYSCALL ~HAVE_BPF_JIT ~XDP_SOCKETS"
+ fi
+
+ linux-info_pkg_setup
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ lto-guarantee-fat
+
+ # monitor is statically enabled for bug #596206
+ # use monitor || export ovs_cv_python="no"
+
+ # flake8 is primarily a style guide tool, running it as part of the tests
+ # in Gentoo does not make much sense, only breaks them: bug #607280
+ export ovs_cv_flake8="no"
+
+ # Only adds a diagram to the man page, just skip it as we don't
+ # want to add a BDEPEND on graphviz right now. bug #856286
+ export ovs_cv_dot="no"
+
+ export ac_cv_header_valgrind_valgrind_h=$(usex valgrind)
+ export ac_cv_lib_unwind_unw_backtrace=$(usex unwind)
+
+ local myeconfargs=(
+ --with-rundir=/run/openvswitch
+ --with-logdir=/var/log/openvswitch
+ --with-pkidir=/etc/ssl/openvswitch
+ --with-dbdir=/var/lib/openvswitch
+ $(use_enable ssl)
+ $(use_enable !debug ndebug)
+ $(use_enable xdp afxdp)
+ )
+
+ # Need PYTHON3 variable for bug #860240
+ export PYTHON3="${PYTHON}"
+ export CONFIG_SHELL="${BROOT}"/bin/bash SHELL="${BROOT}"/bin/bash
+
+ econf "${myeconfargs[@]}"
+}
+
+src_test() {
+ # https://docs.openvswitch.org/en/latest/topics/testing/
+ # RECHECK=yes because with parallel tests, sometimes a port is
+ # in use.
+ emake -Onone check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)" RECHECK=yes
+}
+
+src_install() {
+ default
+
+ strip-lto-bytecode
+
+ local SCRIPT
+ if use monitor; then
+ # ovs-bugtool is installed to sbin by the build system, but we
+ # install it to bin below, and these clash in merged-usr
+ # https://bugs.gentoo.org/889846
+ rm "${ED}"/usr/sbin/ovs-bugtool || die
+
+ for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpdump,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do
+ python_doscript utilities/"${SCRIPT}"
+ done
+ rm -r "${ED}"/usr/share/openvswitch/python || die
+ fi
+
+ keepdir /var/{lib,log}/openvswitch
+ # Used for system-id.conf
+ keepdir /etc/openvswitch
+ keepdir /etc/ssl/openvswitch
+ fperms 0750 /etc/ssl/openvswitch
+
+ rm -rf "${ED}"/var/run || die
+
+ newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server
+ newconfd "${FILESDIR}/ovs-vswitchd.confd-r2" ovs-vswitchd
+ newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server
+ newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd
+
+ systemd_newunit "${FILESDIR}/ovsdb-server-r3.service" ovsdb-server.service
+ systemd_newunit "${FILESDIR}/ovs-vswitchd-r3.service" ovs-vswitchd.service
+ systemd_newunit rhel/usr_lib_systemd_system_ovs-delete-transient-ports.service ovs-delete-transient-ports.service
+ newtmpfiles "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf
+
+ insinto /etc/logrotate.d
+ newins rhel/etc_logrotate.d_openvswitch openvswitch
+}
+
+pkg_postinst() {
+ tmpfiles_process openvswitch.conf
+
+ # Only needed on non-systemd, but helps anyway
+ elog "Use the following command to create an initial database for ovsdb-server:"
+ elog " emerge --config =${CATEGORY}/${PF}"
+ elog "(will create a database in ${EPREFIX}/var/lib/openvswitch/conf.db)"
+ elog "or to convert the database to the current schema after upgrading."
+}
+
+pkg_config() {
+ local db="${EROOT%}"/var/lib/openvswitch/conf.db
+ if [[ -e "${db}" ]] ; then
+ einfo "Database '${db}' already exists, doing schema migration..."
+ einfo "(if the migration fails, make sure that ovsdb-server is not running)"
+ ovsdb-tool convert "${db}" \
+ "${EROOT}"/usr/share/openvswitch/vswitch.ovsschema || die "converting database failed"
+ else
+ einfo "Creating new database '${db}'..."
+ ovsdb-tool create "${db}" \
+ "${EROOT}"/usr/share/openvswitch/vswitch.ovsschema || die "creating database failed"
+ fi
+}