gentoo new year resync : 01.01.2021

4 files changed, 131 insertions, 7 deletions

diff --git a/mail-client/roundcube/Manifest b/mail-client/roundcube/Manifest
index 5dcff13aba3a..9e5460ff6775 100644
--- a/mail-client/roundcube/Manifest
+++ b/mail-client/roundcube/Manifest
@@ -1,6 +1,7 @@
 AUX POST-UPGRADE_complete.txt 854 BLAKE2B e99a1ec9a316c90ee4adc112dd87f394d0e2ce37ca5d1195e3f812683a2da59bedf45688cd448cc3ca544a02ee1c0e125f3960e81a062b0f7949e2cde581563d SHA512 0328842265ca859e78fa7d5babeac7b6baa16fb25962f50d431bbca133d042694d98942f77ba3387832d66645cc4df8fb9f3c4591ca7ed4eade6782a92a3d445
+DIST roundcubemail-1.4.10-complete.tar.gz 7043181 BLAKE2B aa442c9e4fb4d31bc9ddd77d888637d9d7afb8ac6c264ca5d378bd7bfc160f2f31379fae208638b2f79e6127add83f0254d1526e22c2ca24656b31ee75dc695e SHA512 e0a661ae5b928ce2c93129775d32a679ad2512ca4af21e8dd1711d38a62818ff9ee1e1fc922aae68e0a8bca034ca780fc3e3e988731a2ce9b2190b2c1d8e08a6
 DIST roundcubemail-1.4.8-complete.tar.gz 7032822 BLAKE2B 61c5329d9abe65baba3274d3cb9a6a435f886a0196c2881153da473eb415ad4c63dfdab49c67c75a2fd92ff55f9e6da7bdfcece7041ce408b2be628da47045d4 SHA512 8b7734cdec95954b7e18a0e44957da6ef74b5b0c3d28a1449e8634faa230844f5e0c28954245641758f8b2d9102aa32f279765ed3dfa20fa7b00dee4e5347362
-DIST roundcubemail-1.4.9-complete.tar.gz 7043437 BLAKE2B a1b7c6e160d29f61e2ca9c25f725b55411cb52c0f0d00fc4b3dc2ab1eb0edf190176ec932a297d6052b34047673e5dfb8cb13ad3a7b8b755e9d8e9265fb85aa9 SHA512 c6395757544b85693e808234f3dc6baac618ba115fb2c9eefc309ee18e74b2fdfbc0af00ac2b3b980fdd2abc56eefde47b535cdf688cfd2a5ce975786aca6572
+EBUILD roundcube-1.4.10.ebuild 2280 BLAKE2B 58c1e1ae779e5df8a48263227ea5e675809653f7070ecd12250fb4224089d9689a7096b73682fe89e70a87190b2bbfaf3729d8ce5d49c0bd7464efa24b91e8d3 SHA512 06035fda968d1e94d19207e9d040805e7fbd61edf93bc36e3a72895c0a3c5e41ae1ef463dd97847554dcb26239ddff362efc370c28ce34cbce1f87b03279b73a
 EBUILD roundcube-1.4.8.ebuild 1792 BLAKE2B 6ee68871faba7e25719ea805518faf117e5619cc265235e7df8189d557af0fbc48b4c1ee14f1241854e64bae810f05679d6a154a209795c2738fcd8e5f7b3626 SHA512 60ecc662e19e21ba510947dcb07db3dd62912f675ca9b5c1a4502df456d6be8109c7803b8e4322b307ca9daa28cc70ab39f037b7f290e14e96fa1c2539cb1862
-EBUILD roundcube-1.4.9.ebuild 1801 BLAKE2B c1ffa52b415ee208cc39cbfb9d04a96bf79d0ac6dd8b385c5de52aed64bfe72a7c4dda038f122db5d42a4b0406e4807b7b5acc938f2d9b17a773bf24a52a7866 SHA512 2c72d3d5ae3ad265ee8a219077cf935df68f1783f32a11057b209c5846a19dbba73af1e1ce05d01ec1200324d0bebb4d52be613d8fc29de3a026b5daa4c13e47
-MISC metadata.xml 888 BLAKE2B 08166287c0fc134f79884a6bd5cf96d67ab12a74422393d0ef8b4c89b588911e03d587f99bc62bff132494d021fc03b79fbe25a3a7e19ac9ae3107495f2d45c5 SHA512 c5522fd989d08c1de91aac7783e7fb8cbdf94669ca645357b58b3565ed604a52bf563d6417f28b6e2833ad51ee65ec4dfb76412ba88e1b280e346ad8d35b4f86
+EBUILD roundcube-9999.ebuild 2280 BLAKE2B 58c1e1ae779e5df8a48263227ea5e675809653f7070ecd12250fb4224089d9689a7096b73682fe89e70a87190b2bbfaf3729d8ce5d49c0bd7464efa24b91e8d3 SHA512 06035fda968d1e94d19207e9d040805e7fbd61edf93bc36e3a72895c0a3c5e41ae1ef463dd97847554dcb26239ddff362efc370c28ce34cbce1f87b03279b73a
+MISC metadata.xml 997 BLAKE2B 60bf23d71ef0014f432b1f09779263618f12eb2de5adb51e14b6c491d69c7a6b15d92f050d145d83d6ba0a6fc04b67906477ff1b6ce34d69c0ccf90cc2aaff1f SHA512 ed338883744882344de018e49854eaf1e6fdaf4af5a15cde8baabea5f315ff2904c1d161499ba68ba988e355336b962c1d6dcc64b550f2ef8875ece77f97ae83
diff --git a/mail-client/roundcube/metadata.xml b/mail-client/roundcube/metadata.xml
index a250c22d53a2..ea20d1f28957 100644
--- a/mail-client/roundcube/metadata.xml
+++ b/mail-client/roundcube/metadata.xml
@@ -5,6 +5,10 @@
 		<email>titanofold@gentoo.org</email>
 		<name>Aaron W. Swenson</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>candrews@gentoo.org</email>
+		<name>Craig Andrews</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>web-apps@gentoo.org</email>
 		<name>Gentoo Webapps</name>
diff --git a/mail-client/roundcube/roundcube-1.4.9.ebuild b/mail-client/roundcube/roundcube-1.4.10.ebuild
index e3ccf0af49aa..54ae74d1e868 100644
--- a/mail-client/roundcube/roundcube-1.4.9.ebuild
+++ b/mail-client/roundcube/roundcube-1.4.10.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit webapp
 
@@ -11,12 +11,10 @@ MY_P=${MY_PN}-${MY_PV}
 
 DESCRIPTION="A browser-based multilingual IMAP client with an application-like user interface"
 HOMEPAGE="https://roundcube.net"
-SRC_URI="https://github.com/${PN}/${MY_PN}/releases/download/${MY_PV}/${MY_P}-complete.tar.gz"
 
 # 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"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE="change-password enigma ldap mysql postgres sqlite ssl spell"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
@@ -43,7 +41,32 @@ RDEPEND="
 	spell? ( dev-lang/php[curl,spell] )
 "
 
-S="${WORKDIR}/${MY_P}"
+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
diff --git a/mail-client/roundcube/roundcube-9999.ebuild b/mail-client/roundcube/roundcube-9999.ebuild
new file mode 100644
index 000000000000..54ae74d1e868
--- /dev/null
+++ b/mail-client/roundcube/roundcube-9999.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2020 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 ldap mysql postgres sqlite ssl spell"
+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.4.0[filter,gd,iconv,json(+),ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml]
+	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 INSTALL README.md UPGRADING
+
+	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
+}