diff --git a/net-mail/hydroxide/Manifest b/net-mail/hydroxide/Manifest
index fb50f1e9c1..4a5b77fd07 100644
--- a/net-mail/hydroxide/Manifest
+++ b/net-mail/hydroxide/Manifest
@@ -7,3 +7,6 @@ DIST hydroxide-0.2.28.tar.gz.sig 566 BLAKE2B 7215a833a084bc5331e8c133a05669178c7
 DIST hydroxide-0.2.29-deps.tar.xz 149650952 BLAKE2B a9f6826dcf3fd5a14669a30320b41407678d5d19721e8bc65c6417511cb4b7d8091aebcc6a58e111b7ca26e76d5566887566c1b05e5fea78f1d325ca65f8b396 SHA512 d50d32d56ada23928a94d5bc830a2b8c5f7dee1497959aa1a4f975fdaa59224f935e0655ad48e5ec0ba77ba8d683fa0c1b36e48b10c405b9c606a94f84b84744
 DIST hydroxide-0.2.29.tar.gz 45800 BLAKE2B f6ed6e35be661317f84afb34f89e093d6e9e84bab55d3debc192d1a667e7fc6bc44d33bbd142b81e93153d0416a7936aeee0798c20b534d2622bf8a776cdf416 SHA512 f35b75aef6d4fa16b1af96cb4b568915af76d938d1bf1e397e6488360366c9d4ea5216a4f83cbc91800141cc791858913f4c0b5991260e0dde40ec5653c7870b
 DIST hydroxide-0.2.29.tar.gz.sig 566 BLAKE2B d34aecea8ca5591a519c79adf86000e19950c1ec5412db1903ee6ac9992315c3f5da4a0b8efb7d639334cad04a73e8b69cf7c2c6ca53da4ed526a04d87b5da3c SHA512 da1b55f24274d3f33a84a78d5aaf7a84730453e3659030e5e0ef666967b05e1ed1adf70fc57fbde8fbf63238a3276cd87d2cd166f519cf7d7ecee30d143a899f
+DIST hydroxide-0.2.31-deps.tar.xz 32844724 BLAKE2B 62f672578fb4e24271d51a8243e272b1ca91f51de693a5e1898d5d44f3298b26bc0bd91dcb524506a34451102fb2fb4606088a5ff572063f59cd60770686f5ba SHA512 640ab2866032e4fa367c59befe2b31d8f6650dd64ff960f879453b6925394d054d5609cb1c4968d8c9a18fdcb04103a0ec4448fdcf61e011657ed994ba08e43a
+DIST hydroxide-0.2.31.tar.gz 45827 BLAKE2B f228bb8493ee104a31d27781a503f1c0b8922b18128745b05507238a573a5771ab6d327c42eda38fa539644dd47ab3de2f92d765be2206721a8a24a30201a145 SHA512 0d3be977e2a9af945bbdf86d9de34b24e693399a75afe4cd69e55221a8c807f4a12ec8f0e726e7491579e6b09cdef94127110f156175794073d3af503bf43d70
+DIST hydroxide-0.2.31.tar.gz.sig 566 BLAKE2B 3a2300faf27b7f3bc919415cc18e7c76a02f3460e245f329ea1ac6de7e53ead66fe27984f888db4b71b93d3bcc56ee30c1cea986f8a2b7e361b41f45fec3d204 SHA512 bfcbe0ac69c8fdc9e247d556c8a783e656803cd95480cc33e95f9b57011b2bd8cc87a7c0e5b1e0723c45ad188284cd2e3b1aa003f739ddf0d84a14f107107d5e
diff --git a/net-mail/hydroxide/hydroxide-0.2.31.ebuild b/net-mail/hydroxide/hydroxide-0.2.31.ebuild
new file mode 100644
index 0000000000..3e5ddeb6a2
--- /dev/null
+++ b/net-mail/hydroxide/hydroxide-0.2.31.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2022-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module multiprocessing
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/emersion/hydroxide.git"
+else
+	inherit verify-sig
+	SRC_URI="https://github.com/emersion/${PN}/releases/download/v${PV}/${P}.tar.gz
+		verify-sig? ( https://github.com/emersion/${PN}/releases/download/v${PV}/${P}.tar.gz.sig )
+		https://github.com/ingenarel/guru-depfiles/releases/download/${P}-deps.tar.xz/${P}-go-mod-deps.tar.xz ->
+		${P}-deps.tar.xz
+	"
+	# you can either use -go-mod-deps or -vendor-deps for the file
+	# vendor-deps are small, but may not work for some packages/version
+	# go-mod-deps are LARGE, but will most likely always work
+	VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/emersion.asc"
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-emersion )"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="A third-party, open-source ProtonMail CardDAV, IMAP and SMTP bridge"
+HOMEPAGE="https://github.com/emersion/hydroxide"
+
+LICENSE="MIT"
+#gentoo-go-license hydroxide-0.2.31.ebuild
+LICENSE+=" BSD MIT "
+SLOT="0"
+BDEPEND+=" >=dev-lang/go-1.24.0"
+DOCS=( README.md )
+
+src_unpack() {
+	if [[ ${PV} == *9999* ]]; then
+		git-r3_src_unpack
+		go-module_live_vendor
+	else
+		if use verify-sig; then
+			verify-sig_verify_detached "${DISTDIR}/${P}".tar.gz{,.sig}
+		fi
+		go-module_src_unpack
+	fi
+}
+
+src_compile() {
+	ego build -v -x -p "$(get_makeopts_jobs)" ./cmd/hydroxide
+}
+
+src_install() {
+	default
+	dobin "${PN}"
+}