gentoo auto-resync : 15:09:2023 - 16:50:39

5 files changed, 101 insertions, 2 deletions

diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index b8e44934a999..bb496d31ec04 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/roundcube/Manifest b/mail-client/roundcube/Manifest
index 966b03f6a8d5..268d0d4a21b6 100644
--- a/mail-client/roundcube/Manifest
+++ b/mail-client/roundcube/Manifest
@@ -2,8 +2,10 @@ AUX POST-UPGRADE_complete.txt 854 BLAKE2B e99a1ec9a316c90ee4adc112dd87f394d0e2ce
 DIST roundcubemail-1.5.2-complete.tar.gz 7852981 BLAKE2B 36920aa30301b96e1157a586508f3d460c26cfd692919b803bc8cecb31d99ebec5f93a62c725dd5d1dbd1ff68d59c97278b07eaabec42c5fb02c320c72fac8bf SHA512 96faa8c95c23b538ebfa91f58fb918b37185dbd1c09f2d128c9f8c800a0e3d6a2abbfa52753fb6a7ee47b633f35e2b31c92623107116dc760dfa9a22a4b2a23c
 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
 EBUILD roundcube-1.5.2.ebuild 2350 BLAKE2B ff2a0434ccbf7d48fde64d6ac48cb3f30fa88424cd7ee992ee470d50d27a4557aef7b27053de747651555a7de060e2eefdf2eccb472d5d81370e3b783d4812da SHA512 b0a0c4f9765076f82d2009ea701039864d301fce32b84f2d45622a349b77685e584050efca992af389c15dcd4e92802d8807ef9ab67f5ab5982c04e14f1c7328
 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 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.6.3.ebuild b/mail-client/roundcube/roundcube-1.6.3.ebuild
new file mode 100644
index 000000000000..190b5fa07b04
--- /dev/null
+++ b/mail-client/roundcube/roundcube-1.6.3.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 f30c930d283e..b3d5812c3142 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -202,6 +202,6 @@ DIST thunderbird-115.2.2-zh-CN.xpi 740786 BLAKE2B e2b1623fe8a323d852b9b49b46e920
 DIST thunderbird-115.2.2-zh-TW.xpi 744413 BLAKE2B 295da23ab1803db39a516629fc86fc576c185e50a580d1c3153f5b4472b3dda9b0949cf5257ebb66f26283514ae14d4f7ffcd1295132360cbbfe71ff7bba59e4 SHA512 446489c2ca1a1bfc6e5d3459618c5cd4e8551d09083f70575998ceeaa91a5de6ec6a1e012383f8b61fb1d5b47fbd30617e1710539b54ae94d960d18c5e25e05a
 DIST thunderbird-115.2.2.source.tar.xz 531561372 BLAKE2B 634460d713c102a2b923aac44865e22d24dff57c3fd1750018cbcfa67a908ca0912beec74803a35a668f7a685dd26e65c7a861efa1ac05a1e5835f29b3c6b898 SHA512 45843709c21eb19d69d43205da6b2f943b584811a29942ffef1933c1ce7882b48046b201c2ff198658fec2c53d479311d8a353731afe6ea53f97b31674d6074a
 EBUILD thunderbird-102.15.0.ebuild 34354 BLAKE2B a68df1c77b37b38f53cf82a733f3a1c576bd530a56e938730fa5190332b005cb4af87a308794d98c426b5a3189669a6a2b6e244391ea9591c1558553b508642b SHA512 0013574a7f370afe8ee500f21d8cf97f30acb7f133a1636218ee85baf9c72240a9d0e707deb6663a7ba0857ea7ba78bf0d271e55c5523614781b2ccc80b71a7f
-EBUILD thunderbird-102.15.1.ebuild 34356 BLAKE2B f1b674adf054d5d7986e6a834f9bb358e9ec290c38fef0de70ee3d66d95b88f42e01679485d4d88dd347653c3fa9cf94ae1021343af868a2782fa4b8d628c7a3 SHA512 43262d41bd321cdb0cffa16583ae373bc5bb1bc770f52ff86212cebc10778cc3ae00ba26cf2310c53b63a00ab060c928169f05996948ebbe7a7c24ab2aa87438
+EBUILD thunderbird-102.15.1.ebuild 34354 BLAKE2B a68df1c77b37b38f53cf82a733f3a1c576bd530a56e938730fa5190332b005cb4af87a308794d98c426b5a3189669a6a2b6e244391ea9591c1558553b508642b SHA512 0013574a7f370afe8ee500f21d8cf97f30acb7f133a1636218ee85baf9c72240a9d0e707deb6663a7ba0857ea7ba78bf0d271e55c5523614781b2ccc80b71a7f
 EBUILD thunderbird-115.2.2.ebuild 38445 BLAKE2B 251eb835b8faf10735b2aab271bdcd48d8361b59fcc0e6cd2cff576da8c158898e8cbb08194c83cdb24a249729600b353c3f44fc9b11cbfa6f4770e04f931311 SHA512 51d47dbd35c3fe983f9d2ed92195761a6fa844cc0a57780c8e4afd23fa8adcce5d4bbb2e2491b2caeaff7753d892e6b9a28aebd65aa2019799a1530f5124c164
 MISC metadata.xml 2448 BLAKE2B 3685d528d3211fb49b23b0fb05c67269f1b4466bef7dd6f2d890803961ddc1b1c0d8bc06b2d421c17384b8a3769bac35236f6af07059c0cbf9e694edec8b1dbe SHA512 d9a8983f34c9691ed1d0174cac3c7300995b9f7b877c09271210cc3f2a27dd20d9fbee0c99c1f6c987ab9566eee71a0624d2d68f97c84665c1c500ac8f3ecfb6
diff --git a/mail-client/thunderbird/thunderbird-102.15.1.ebuild b/mail-client/thunderbird/thunderbird-102.15.1.ebuild
index 20088fd5208f..1d625e370530 100644
--- a/mail-client/thunderbird/thunderbird-102.15.1.ebuild
+++ b/mail-client/thunderbird/thunderbird-102.15.1.ebuild
@@ -57,7 +57,7 @@ SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}
 DESCRIPTION="Thunderbird Mail Client"
 HOMEPAGE="https://www.thunderbird.net/"
 
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"