6 files changed, 209 insertions, 2 deletions
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 44f4f4f84eed..75fe2b798184 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/roundcube/Manifest b/mail-client/roundcube/Manifest
index 4337054f34bc..6772698bf38c 100644
--- a/mail-client/roundcube/Manifest
+++ b/mail-client/roundcube/Manifest
@@ -1,13 +1,17 @@
 AUX POST-UPGRADE_complete.txt 854 BLAKE2B e99a1ec9a316c90ee4adc112dd87f394d0e2ce37ca5d1195e3f812683a2da59bedf45688cd448cc3ca544a02ee1c0e125f3960e81a062b0f7949e2cde581563d SHA512 0328842265ca859e78fa7d5babeac7b6baa16fb25962f50d431bbca133d042694d98942f77ba3387832d66645cc4df8fb9f3c4591ca7ed4eade6782a92a3d445
 DIST roundcubemail-1.5.2-complete.tar.gz 7852981 BLAKE2B 36920aa30301b96e1157a586508f3d460c26cfd692919b803bc8cecb31d99ebec5f93a62c725dd5d1dbd1ff68d59c97278b07eaabec42c5fb02c320c72fac8bf SHA512 96faa8c95c23b538ebfa91f58fb918b37185dbd1c09f2d128c9f8c800a0e3d6a2abbfa52753fb6a7ee47b633f35e2b31c92623107116dc760dfa9a22a4b2a23c
 DIST roundcubemail-1.5.4-complete.tar.gz 7891674 BLAKE2B 898173304fb1a2618062f3cec1a156b64db893c3255f08de5eb1fb81bdd2b26bfe4939c45c1fe147d78d17be02787569919d4ae7724e22e1d10f8b2623bc4d39 SHA512 7205362dc93e24b97273e356f0e00c19f61e0241ed39b70e9a3b08e4798ea8bf494aa8822dcc26695f91cc67837fdbde54092aedc2b5a3e2701fe43e62950da8
+DIST roundcubemail-1.5.5-complete.tar.gz 7891254 BLAKE2B d5aee913740c29e3d6381717c3b24c31ff71d056493bc9c1fd2cd067d683c3f254ec0f580ec2ae07589d6601672e04db4e9b0d7db3ce8451bb72f1cecae9ba7b SHA512 aa76a3024735ae27176823763977f75084806dd15de66beaca1bb1a93560c7127951bae4b4375a0d7e38dcb37bbeade5e78af23d2ff98aad09604c038fe7f872
 DIST roundcubemail-1.6.1-complete.tar.gz 5970713 BLAKE2B b46545b4a26983fbb993550e2c2f1504aea26c2caba28eb86703c6a94ac61209fecf45041b07440a495b7d2ad58eb20cb688cf37718402ef409ccc5442f0f62e SHA512 d5804e91c2da3b732cf14ad86f06099254540dd826ae5b7f14b98a7af8b90a7e9457221da2945aace8d12a60381eec85161e8bc6e0af4572b798a66cb36f2f00
 DIST roundcubemail-1.6.2-complete.tar.gz 6004046 BLAKE2B 08e6b93cdb615ac2555dcf8a23317ac5be96c3ef2dd2a53b44992e04d17591fcbb16fa0e21cb22e92c3ccdc82c7da817cdb4f95c208476bcdd5d81b9d0fecc12 SHA512 1889548dbe9913555cec4115137157de9daf5e2cca9e4004fb19c8ddebd3081cce32b6d8634891341c890379c4f9e35a5c705739f24b0b3b93fc31449f090297
 DIST roundcubemail-1.6.3-complete.tar.gz 6026670 BLAKE2B f3108c5040a912ffdca83a08c2768224a1edd197abca8c9420985d6c241dd93c56e1ed6ee05ede4c385ed6fbb6f2e780e1914b54504cb19d46e14df419001f4f SHA512 9a44a898f8ed9a338f126af19b572b61a7b108412be5f0c445f6ff3d84636a1487cc594347629a757e2fa18fdfa2881c3dd373e2431132a906799992c935b548
+DIST roundcubemail-1.6.4-complete.tar.gz 6027429 BLAKE2B f83ee7662dfa6a27e6aae97f90e1af80fa5d68927a0336dd3dab84f438e88921cb60059d41256daa52eac44fff07673559a21c860b01ebc82747fe021b2fadda SHA512 ccfd6828ed0f9a25c3144133a9a0f091b7ef76251e74422fe90dc1eb6fdddee8522902869d97609cd594f0977ecb6eb7402378d390ae33d907d154a24a607f85
 EBUILD roundcube-1.5.2.ebuild 2350 BLAKE2B ff2a0434ccbf7d48fde64d6ac48cb3f30fa88424cd7ee992ee470d50d27a4557aef7b27053de747651555a7de060e2eefdf2eccb472d5d81370e3b783d4812da SHA512 b0a0c4f9765076f82d2009ea701039864d301fce32b84f2d45622a349b77685e584050efca992af389c15dcd4e92802d8807ef9ab67f5ab5982c04e14f1c7328
 EBUILD roundcube-1.5.4.ebuild 2356 BLAKE2B 34bc19151f4b75bddf7968f3525a25250a1e7d9835459324bddfb58e5453f77397ef148ff483528f5f7dbcba0f356e0e0e18492347b9321cbce81336ae8196ce SHA512 fcc05cdda5945ddf0e843052cb0011a4c5007d7547b586b54aa1bdfe49ae9f3f7b1307d1756d46ca365d669419be1a377810aacd07c4e1ebd653a15d99d194c7
+EBUILD roundcube-1.5.5.ebuild 2356 BLAKE2B 34bc19151f4b75bddf7968f3525a25250a1e7d9835459324bddfb58e5453f77397ef148ff483528f5f7dbcba0f356e0e0e18492347b9321cbce81336ae8196ce SHA512 fcc05cdda5945ddf0e843052cb0011a4c5007d7547b586b54aa1bdfe49ae9f3f7b1307d1756d46ca365d669419be1a377810aacd07c4e1ebd653a15d99d194c7
 EBUILD roundcube-1.6.1.ebuild 2356 BLAKE2B 34bc19151f4b75bddf7968f3525a25250a1e7d9835459324bddfb58e5453f77397ef148ff483528f5f7dbcba0f356e0e0e18492347b9321cbce81336ae8196ce SHA512 fcc05cdda5945ddf0e843052cb0011a4c5007d7547b586b54aa1bdfe49ae9f3f7b1307d1756d46ca365d669419be1a377810aacd07c4e1ebd653a15d99d194c7
 EBUILD roundcube-1.6.2.ebuild 2356 BLAKE2B 34bc19151f4b75bddf7968f3525a25250a1e7d9835459324bddfb58e5453f77397ef148ff483528f5f7dbcba0f356e0e0e18492347b9321cbce81336ae8196ce SHA512 fcc05cdda5945ddf0e843052cb0011a4c5007d7547b586b54aa1bdfe49ae9f3f7b1307d1756d46ca365d669419be1a377810aacd07c4e1ebd653a15d99d194c7
 EBUILD roundcube-1.6.3.ebuild 2352 BLAKE2B 357e217865855e79a92687cb81f04df9c768d5aec9e2ca272bf46d4fb762b77b3d081bc54a17f96f8d7bb7ad4411a6a91ed4cc7e859d38221b22413302cc78ca SHA512 1ea66c083acb55e6d3a17f1aa63dee1d2fe865b4bb8035348d3dcc3365ee33484927b9c4a2dd38b3e76184a792cebbcda3d3fdde222f4cc9706e86c4ca7e9cf9
+EBUILD roundcube-1.6.4.ebuild 2358 BLAKE2B a841177c837ac4047b1303f6f9f48b7f88c3bff13e74935055a91553baff286a8fc412b46fcea094d8136170c72da08e9b26931b8bfaca0b016618f1969daaf3 SHA512 b55e0868a351b4d8346b90c982942cda0039becfbd5ff14b49d30f0bddafaab53fb89e7e49fb5ed536ec657ae65f92f9b0ec153d290b379fca0b4da20654e97f
 EBUILD roundcube-9999.ebuild 2356 BLAKE2B 34bc19151f4b75bddf7968f3525a25250a1e7d9835459324bddfb58e5453f77397ef148ff483528f5f7dbcba0f356e0e0e18492347b9321cbce81336ae8196ce SHA512 fcc05cdda5945ddf0e843052cb0011a4c5007d7547b586b54aa1bdfe49ae9f3f7b1307d1756d46ca365d669419be1a377810aacd07c4e1ebd653a15d99d194c7
 MISC metadata.xml 1128 BLAKE2B b7ecf906ab635d9100c5c28e9950ff9a0d746a797502a672e8a8f3f2da36a67b4f42863133548dfe3b415382d8fe116229cdc6d24f7df1db0cdf3a4a9da7a4f3 SHA512 35e05c40b1175760b0e171acce265b1a5f0748824f010dfb93d7d3345e595c0814ba8ebd2ddfdb699893b5fd7fdd19fed68eccd3ec94a816876b88550412c486
diff --git a/mail-client/roundcube/roundcube-1.5.5.ebuild b/mail-client/roundcube/roundcube-1.5.5.ebuild
new file mode 100644
index 000000000000..97463b150dea
--- /dev/null
+++ b/mail-client/roundcube/roundcube-1.5.5.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2023 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-8.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-crypt/gnupg
+	)
+	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 INSTALL README.md UPGRADING SECURITY.md
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r [[:lower:]]* SQL
+	doins .htaccess
+
+	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
+}
diff --git a/mail-client/roundcube/roundcube-1.6.4.ebuild b/mail-client/roundcube/roundcube-1.6.4.ebuild
new file mode 100644
index 000000000000..190b5fa07b04
--- /dev/null
+++ b/mail-client/roundcube/roundcube-1.6.4.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2023 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-crypt/gnupg
+	)
+	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 INSTALL README.md UPGRADING SECURITY.md
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r [[:lower:]]* SQL
+	doins .htaccess
+
+	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
+}
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 2c29f944406f..a8520565a012 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -137,5 +137,5 @@ DIST thunderbird-115.3.2-zh-CN.xpi 740611 BLAKE2B 1a84b639a2873efb16db470101cb81
 DIST thunderbird-115.3.2-zh-TW.xpi 743527 BLAKE2B 1b56bec877791713d00d2a285c8bdcdef572b6f6da1c21abdfbebbf80bb04994cb056a136081bf5c1f3275b7f60cfa0da2cd4ce5f5808dd1c836586b6b45af9b SHA512 6f4df2f3fd9ff7dc543432c4b8929c358c0e2b9bc5bd22bd7093f52315b9af5655a5fb030e87dbf642a0f5dd63ebbbba06772b41ace9ed8ba566c394149e3f0c
 DIST thunderbird-115.3.2.source.tar.xz 533609600 BLAKE2B 94b149707dcf792fc17ac206a38f5c1cdde48c3813f5a0cb200d1033301b28ba852133ff6f381eb179cb918146e80a89bf0813c06db9ad449945d09f93f70607 SHA512 e94bdb940327296754324d8fcb055813247a79d377399b84184e0ff80123240d923aa3745c3076d37f06296c8cc49373db2d8e8a6ac4edeaf63cd56ca4652e35
 EBUILD thunderbird-115.3.1.ebuild 38443 BLAKE2B f6450b28ee1a84a7158d07da095309d032685c22dfa004887999c757f9039a385ddf131a23cbbd12ce3bad7ea3cf1e4907c0a6a950c4629e9a30fc0add4b6fae SHA512 4d27d14771deb4b4aa7f8d3bf11d9d5642b95b628ac889ae92b3f4e9089fbf1ecf6bfab5e92dc43f267ed274756d0c2c0df9b420aecc55157c6607c86afbbb58
-EBUILD thunderbird-115.3.2.ebuild 38445 BLAKE2B 60e8a250ecea02f9e082179c1e04290cd67961758b48d3f29c79c3d7ad79d6db80d4c207a0d6e26bf6225937bbf303b90fdc169f2951e39a6a5a94006d25c46f SHA512 662b44fef395288e998575f229247bdd17ec86fad57d9ddf5c1b2e4690ba136c4b408bc42700630c46428bc80e43f9556f7e10f65983cb634e0455b92f67533a
+EBUILD thunderbird-115.3.2.ebuild 38620 BLAKE2B e825056d1ebb1c92b053f778cfb21c3cc86fcf0d3e52577c817dd27f6aeeb2f685bdae2d3185afcb5e62a203d2ad8a6e03db77b0a782a32075a37076352b7687 SHA512 7b32167bfb6bee829c77bed84b865fd4babf3188d9cd8565d2ebf7737644dc05df45088572eb63d543e9e7aa9ad869979d56150a7744509fd088fe8afa808577
 MISC metadata.xml 2448 BLAKE2B 3685d528d3211fb49b23b0fb05c67269f1b4466bef7dd6f2d890803961ddc1b1c0d8bc06b2d421c17384b8a3769bac35236f6af07059c0cbf9e694edec8b1dbe SHA512 d9a8983f34c9691ed1d0174cac3c7300995b9f7b877c09271210cc3f2a27dd20d9fbee0c99c1f6c987ab9566eee71a0624d2d68f97c84665c1c500ac8f3ecfb6
diff --git a/mail-client/thunderbird/thunderbird-115.3.2.ebuild b/mail-client/thunderbird/thunderbird-115.3.2.ebuild
index be82d10736f6..b55a6da424d8 100644
--- a/mail-client/thunderbird/thunderbird-115.3.2.ebuild
+++ b/mail-client/thunderbird/thunderbird-115.3.2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 FIREFOX_PATCHSET="firefox-115esr-patches-06.tar.xz"
 
-LLVM_MAX_SLOT=16
+LLVM_MAX_SLOT=17
 
 PYTHON_COMPAT=( python3_{10..11} )
 PYTHON_REQ_USE="ncurses,sqlite,ssl"
@@ -82,6 +82,15 @@ TB_ONLY_DEPEND="!<x11-plugins/enigmail-2.2
 BDEPEND="${PYTHON_DEPS}
 	|| (
 		(
+			sys-devel/clang:17
+			sys-devel/llvm:17
+			clang? (
+				sys-devel/lld:17
+				virtual/rust:0/llvm-17
+				pgo? ( =sys-libs/compiler-rt-sanitizers-17*[profile] )
+			)
+		)
+		(
 			sys-devel/clang:16
 			sys-devel/llvm:16
 			clang? (