gentoo resync : 08.07.2021

4 files changed, 107 insertions, 5 deletions

diff --git a/mail-client/roundcube/Manifest b/mail-client/roundcube/Manifest
index e25406507a4b..6bc60b5dd28a 100644
--- a/mail-client/roundcube/Manifest
+++ b/mail-client/roundcube/Manifest
@@ -1,5 +1,7 @@
 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
-EBUILD roundcube-9999.ebuild 2281 BLAKE2B 115e376bdaf848b55b3f68576d9864f4e3d573d2e4851d14a1927063290d42886623641c84b0e0595446738e4ed7a45b737c768ec8e7174cdfca6110538d668c SHA512 f694ef3da3c3506642f48fbabfa0bd3faa1401a0d1dffd1b351530fc774dff402654e68804ca41b2b5a783cce58aa3692e1028a44f6767a589dd5460be85f1f5
-MISC metadata.xml 997 BLAKE2B b5cd9926232a99e10bbecc0959e8bcbda0bd16b6adc3bf79031b9e6eb696f596c98b6cf075fc177fa883b912c0dfba9458809a025395f4827757fbc7046d8997 SHA512 cfec343fe60d9c6513456ffc12ab6dc391651c53e91fa89699e7e7aea035ad6063f655090d7dfe9bf761dae973bfe968c19a015d9983a5ccfceede54df38e277
+EBUILD roundcube-1.5_rc.ebuild 2337 BLAKE2B 5e2f9c8fbacc0ad8130170a4c6cf63de55608cc714b1e3d7539b92a0ac1dc0c9a16fce52c8b25b0398ea4aa7313d52d7f87442cacb46f824ee55ec7fe708815b SHA512 1cb7e351fcd9537f4201aa31128eb8db02ea27398068978b33bc6b602f97a361e885b88e6a3c799afe66a55e6a615a6fdad9a38dfe7f10115a5cdcf3fee7a15a
+EBUILD roundcube-9999.ebuild 2337 BLAKE2B 5e2f9c8fbacc0ad8130170a4c6cf63de55608cc714b1e3d7539b92a0ac1dc0c9a16fce52c8b25b0398ea4aa7313d52d7f87442cacb46f824ee55ec7fe708815b SHA512 1cb7e351fcd9537f4201aa31128eb8db02ea27398068978b33bc6b602f97a361e885b88e6a3c799afe66a55e6a615a6fdad9a38dfe7f10115a5cdcf3fee7a15a
+MISC metadata.xml 1117 BLAKE2B 261adf82c703e6eb1c00a5313642fc14679de68fa6c5ec67b5ef3b7ec0fd1b420dfb3ced2076a1d6cbf51eca705b6b58254575f9282f04dc0808ad5a8aebbeb0 SHA512 2a1d7529fb775b156fc26e27214ed0204a740a5514280864933591f6647705d4ffb949c1a708d0a5348436ece35131fb7d3aa3a6fe864e20c76a553037b1ab4e
diff --git a/mail-client/roundcube/metadata.xml b/mail-client/roundcube/metadata.xml
index 9564101cfbeb..d07ba4da8522 100644
--- a/mail-client/roundcube/metadata.xml
+++ b/mail-client/roundcube/metadata.xml
@@ -25,6 +25,10 @@
 			Add dependencies to support server-side GnuPG signing
 			and/or encryption through the enigma plugin
 		</flag>
+		<flag name="fileinfo">
+			Use the dev-lang/php fileinfo extension to guess the 
+			mime_type of attachments
+		</flag>
 		<flag name="ldap">
 			Add dependencies to support connecting to an LDAP address
 			book server
diff --git a/mail-client/roundcube/roundcube-1.5_rc.ebuild b/mail-client/roundcube/roundcube-1.5_rc.ebuild
new file mode 100644
index 000000000000..9052cdcb124f
--- /dev/null
+++ b/mail-client/roundcube/roundcube-1.5_rc.ebuild
@@ -0,0 +1,96 @@
+# 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
+		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-9999.ebuild b/mail-client/roundcube/roundcube-9999.ebuild
index 5df9f9d2a851..9052cdcb124f 100644
--- a/mail-client/roundcube/roundcube-9999.ebuild
+++ b/mail-client/roundcube/roundcube-9999.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://roundcube.net"
 # 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 ldap mysql postgres sqlite ssl spell"
+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
@@ -24,7 +24,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-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]
@@ -71,7 +71,7 @@ src_unpack() {
 src_install() {
 	webapp_src_preinst
 
-	dodoc CHANGELOG.md INSTALL README.md UPGRADING
+	dodoc CHANGELOG.md INSTALL README.md UPGRADING SECURITY.md
 
 	insinto "${MY_HTDOCSDIR}"
 	doins -r [[:lower:]]* SQL