diff --git a/mail-client/roundcube/Manifest b/mail-client/roundcube/Manifest
index af2865882b3c6..a4a7ddad063fb 100644
--- a/mail-client/roundcube/Manifest
+++ b/mail-client/roundcube/Manifest
@@ -1,3 +1,4 @@
 DIST roundcubemail-1.6.10-complete.tar.gz 5839015 BLAKE2B cdf826e42b7cbc19ee5d8eb0d2584527182223b05f2dcfc35cd947752aec8699df74406b18e7f704e09eb7091e1591e736c76e9db08340c6f4ef583e0bb8663a SHA512 e9d8d3cf8c0a751a8b33558de04238f1f831d23ceaf090802a34b826a5aeb49e2ca6235c90250d903da7e0f636fcf2e687205f2ab14427e423ed3408966f4c54
 DIST roundcubemail-1.6.11-complete.tar.gz 5839956 BLAKE2B 1f032ac60ef0671560227b1c6f60c4b6beb6289a84aa0f4159aba9f5a25f77633bebfcfb5718a4eb082998c084fae52dbe13a747df87e269cc49a4419c03caed SHA512 842d6b0f9bfdb0661de798fb83ccfbf202583214cf478fb7092529785f31b9aa8d7a1fcd63c1d6b967e396e1e2a7750669e238d112875befb3f017b6034acacc
 DIST roundcubemail-1.6.7-complete.tar.gz 5899345 BLAKE2B c22803f3651c32f863081afe28d05e4b7918ba0cb1238c11de646a0fe3a16a6faff633a3a193a5813a50be710a71a8900d049f0e628661b6c7c036c0d69055ab SHA512 aedc940e769e881d448eced2ef0b603c87f9a9e18624cae4d14a946e6f9509c827f75e6fb294a760970e37caa9ab0bfb0a7ec8843b12542f59f350948d2d8d3b
+DIST roundcubemail-1.7-beta2-complete.tar.gz 6183780 BLAKE2B fd4d5120ad3188cb75fe44ee3e3c4210d38170af7341bd0d385ba656a2ec33e26db167ec91ac986bf81b5a2eaafb77a4ac3557bf064b5f712deec84eee4ae82e SHA512 ed7ad6ab4002f41dc3cd5c04733a841e1193f3dfd5c902b30085ee2301fe661d3d6025a789388b565239ccaf3b80c12698082e693688c7aa8e8b4928e7e50bf3
diff --git a/mail-client/roundcube/roundcube-1.7_beta2.ebuild b/mail-client/roundcube/roundcube-1.7_beta2.ebuild
new file mode 100644
index 0000000000000..186dfa59d304b
--- /dev/null
+++ b/mail-client/roundcube/roundcube-1.7_beta2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit webapp
+
+MY_PN=${PN}mail
+MY_PV=${PV/_/-}
+MY_P=${MY_PN}-${MY_PV}
+
+DESCRIPTION="A browser-based multilingual IMAP client with an application-like user interface"
+HOMEPAGE="https://roundcube.net"
+
+# roundcube is GPL-licensed, the rest of the licenses here are
+# for bundled PEAR components, googiespell and utf8.class.php
+LICENSE="GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain"
+
+IUSE="change-password enigma exif fileinfo ldap mysql postgres sqlite ssl spell zip"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+# this function only sets DEPEND so we need to include that in RDEPEND
+need_httpd_cgi
+
+RDEPEND="
+	${DEPEND}
+	>=dev-lang/php-7.4.0[exif?,fileinfo?,filter,gd,iconv,intl,json(+),ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml,zip?]
+	virtual/httpd-php
+	change-password? (
+		dev-lang/php[sockets]
+	)
+	enigma? (
+		app-alternatives/gpg
+	)
+	mysql? (
+		|| (
+			dev-lang/php[mysql]
+			dev-lang/php[mysqli]
+		)
+	)
+	spell? ( dev-lang/php[curl,spell] )
+"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/roundcube/roundcubemail"
+	EGIT_BRANCH="master"
+	BDEPEND="${BDEPEND}
+		app-arch/unzip
+		dev-php/composer
+		net-misc/curl"
+else
+	SRC_URI="https://github.com/${PN}/${MY_PN}/releases/download/${MY_PV}/${MY_P}-complete.tar.gz"
+	S="${WORKDIR}/${MY_P}"
+	KEYWORDS="amd64 arm ~hppa ppc ppc64 ~sparc x86"
+fi
+
+src_unpack() {
+	if [[ "${PV}" == *9999* ]]; then
+		git-r3_src_unpack
+		pushd "${S}" > /dev/null || die
+		rm Makefile || die
+		mv composer.json-dist composer.json || die
+		composer install --no-dev || die
+		./bin/install-jsdeps.sh || die
+		popd > /dev/null || die
+	else
+		default
+	fi
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc CHANGELOG.md README.md
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r [[:lower:]]* SQL
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/logs
+	webapp_serverowned "${MY_HTDOCSDIR}"/temp
+
+	webapp_configfile "${MY_HTDOCSDIR}"/config/defaults.inc.php
+	webapp_postupgrade_txt en "${FILESDIR}/POST-UPGRADE_complete.txt"
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		elog "You can review the post-upgrade instructions at:"
+		elog "${EROOT}/usr/share/webapps/${PN}/${PV}/postupgrade-en.txt"
+	fi
+}