gentoo resync : 20.10.2021

3 files changed, 101 insertions, 1 deletions

diff --git a/mail-client/roundcube/Manifest b/mail-client/roundcube/Manifest
index 039f22e19514..31b6868090ce 100644
--- a/mail-client/roundcube/Manifest
+++ b/mail-client/roundcube/Manifest
@@ -1,7 +1,9 @@
 AUX POST-UPGRADE_complete.txt 854 BLAKE2B e99a1ec9a316c90ee4adc112dd87f394d0e2ce37ca5d1195e3f812683a2da59bedf45688cd448cc3ca544a02ee1c0e125f3960e81a062b0f7949e2cde581563d SHA512 0328842265ca859e78fa7d5babeac7b6baa16fb25962f50d431bbca133d042694d98942f77ba3387832d66645cc4df8fb9f3c4591ca7ed4eade6782a92a3d445
 DIST roundcubemail-1.4.11-complete.tar.gz 7048262 BLAKE2B aaf5e6ce5b07577f687788730bc9181334402bb2ff5e78fb306425913b62b4a8f72505547bdcc8673806b48b9ba8252b8059b59399efc95a51877d5c672a4760 SHA512 2bfe0ff3716f76bf9eb5bf5f7b62c738b233c57e67d6ac767c044d1a3a694ae003642d9cc68a18d6f6ba94135aa7ee1692db920e9127128669faee9ddf78fe80
 DIST roundcubemail-1.5-rc-complete.tar.gz 7683911 BLAKE2B e67bbb8ad3d5ffa69091c18b519f78a3dc6d4cc1783921aab9de3c86351d2946cbf784267f5db69434da25413ad1f961161289b47408f14d9e6fa26d8b1e0999 SHA512 4e49e91bb53546e6ac348e33e64019afeee2ce6b78caa4375148fc6fac5abbe8e5db42670c5527e3678abe838ddf349275353e7919584d751bf4c321a62fe795
-EBUILD roundcube-1.4.11.ebuild 2272 BLAKE2B ff467e66c84492af33462c4f26b896344b43ae10585ad551afc105e8fe76e0878bac85b98adf17c0fed649509e3cb2c77e5670a4589510364cdecfe97085d606 SHA512 2a8d669a627042f377f61ee1b742e39a59cf2e3b65f3f8497106624970a5e3a1001b5d1d4d57cf0e7a2a1224244da58eb228c04d29c371b310cc34612320f5d6
+DIST roundcubemail-1.5.0-complete.tar.gz 7802014 BLAKE2B d81a521c264b47b55b7f868caf4fd8f0d7fdb2f0d04bf560bf1774c39aa4d0b4143ba1edb977941a4596848921671ec47a0dfd21f20f7e28778a021d58bec402 SHA512 cba32ee2b86864af9d9163d83fa49763267e3420bee59b86d47b889e1bc53871ed2ff5b2c1444778324f4b259e99752faa3b72f909a8f9c26c7af9c96ba08a54
+EBUILD roundcube-1.4.11.ebuild 2289 BLAKE2B 3e24731cb8fa44a45ff7c34aeaf0f2766849d1cec59e6c5ae26fb639443e9288889e435a976686328860fdd6bc64b98369d0ad585f879b57202cdbf6dbdd6d06 SHA512 858450c270914701ad910de943f35985c538a817cc325cef345ed6d582507fc365b3df11df2d1f800c107cebd3cd8ed0251e5d055dcb568f91423c5c62017bc6
+EBUILD roundcube-1.5.0.ebuild 2358 BLAKE2B e44b1329bb7d68f7d328c5b8a2b4adb394b81781e0245dd709d1a0827e813a44b59f4f934dbcf157fc236159ad735b6dfdcb2b894f7f6710d40f522476270924 SHA512 b207366b024710c60da353129ca2316009d256060164198a6a374d6cec9eeb733b89b81acf6f2256b0e996b716d3caa9ec9905e77569b758e25997662564b483
 EBUILD roundcube-1.5_rc.ebuild 2337 BLAKE2B 5e2f9c8fbacc0ad8130170a4c6cf63de55608cc714b1e3d7539b92a0ac1dc0c9a16fce52c8b25b0398ea4aa7313d52d7f87442cacb46f824ee55ec7fe708815b SHA512 1cb7e351fcd9537f4201aa31128eb8db02ea27398068978b33bc6b602f97a361e885b88e6a3c799afe66a55e6a615a6fdad9a38dfe7f10115a5cdcf3fee7a15a
 EBUILD roundcube-9999.ebuild 2358 BLAKE2B e44b1329bb7d68f7d328c5b8a2b4adb394b81781e0245dd709d1a0827e813a44b59f4f934dbcf157fc236159ad735b6dfdcb2b894f7f6710d40f522476270924 SHA512 b207366b024710c60da353129ca2316009d256060164198a6a374d6cec9eeb733b89b81acf6f2256b0e996b716d3caa9ec9905e77569b758e25997662564b483
 MISC metadata.xml 1118 BLAKE2B 2872ed8444c98f6c9f96642089c879225e14ee2b53ad2dc70b307a82b8a1e0988e19c24fc9da8f98c63bacd6cfb105941ee5a5bc8e4ee756e216e0dd6d970e84 SHA512 3bb6ac4d95aaa94e0a23f1382b79220de90a45f45e1c98dac00c91e4bf12d35646c95b633713896062c729777e0ec57a6ebcc5d4d1b416105dc63378b50afb47
diff --git a/mail-client/roundcube/roundcube-1.4.11.ebuild b/mail-client/roundcube/roundcube-1.4.11.ebuild
index cb9a6709c782..9e557b1fae0c 100644
--- a/mail-client/roundcube/roundcube-1.4.11.ebuild
+++ b/mail-client/roundcube/roundcube-1.4.11.ebuild
@@ -25,6 +25,7 @@ need_httpd_cgi
 RDEPEND="
 	${DEPEND}
 	>=dev-lang/php-5.4.0[filter,gd,iconv,json(+),ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml]
+	<dev-lang/php-8
 	virtual/httpd-php
 	change-password? (
 		dev-lang/php[sockets]
diff --git a/mail-client/roundcube/roundcube-1.5.0.ebuild b/mail-client/roundcube/roundcube-1.5.0.ebuild
new file mode 100644
index 000000000000..e63578dfa2c6
--- /dev/null
+++ b/mail-client/roundcube/roundcube-1.5.0.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2021 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-5.5.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
+}