gentoo resync : 24.12.2018

4 files changed, 2 insertions, 201 deletions

diff --git a/mail-client/roundcube/Manifest b/mail-client/roundcube/Manifest
index 50a8a319144d..b7de41c9618a 100644
--- a/mail-client/roundcube/Manifest
+++ b/mail-client/roundcube/Manifest
@@ -1,9 +1,5 @@
 AUX POST-UPGRADE.txt 1020 BLAKE2B 40e8eb52fcb1c7b46843a136e1617c825e6cb2dc9031f225635ceb19a2c7f4aafd1f4baf7fadc033514da429c7f6893bd6950ef09fb55570db60267ddc5f7219 SHA512 45b3fd6d2323ac8b43117908385c9ebb681b59b3f77aa516074d13196a259d9614369eeb1a8969fa514555e7240846c2d85502b8a9fed9a31a0379b1086861c1
 AUX roundcube-1.3.7-pear-removed-installed.json 6981 BLAKE2B 3caa7d2d18f4fdda2d5ec6cdbc78f4f8fc6a55b176ab6f3158cd6ad930581b2ee291d7fb7f01bf20e9ff9e6bc9bed3b677575ef23cf4023fd27658cbf97574dd SHA512 a49112c063b24757f12cebdfc6d2ab4e84842b33f622e8cea07fb9b248fdfdebce83a190b91bfa820a69e8f4c62bc7b37bc3663bf1761216eed99c3f463fd69b
-DIST roundcubemail-1.3.6-complete.tar.gz 5529370 BLAKE2B 49fd04d81b7047c61d33007b49aff2fe8d68fb0572d305b51aa0ae997c06e4924a3ff32861c19741f0c4d82adb9abb317781de8c1b324120e57d77f413cfa480 SHA512 fc1627d4b539742524c43b3faaa8cb5d64f934ad03f7cf8a461580a3a38dccb11140d08499b988742a0892534b1eda52f37a50f0911015983b6e27703294c70e
-DIST roundcubemail-1.3.7-complete.tar.gz 5533537 BLAKE2B 48d0c8e50d3d4878fa901bde40791bd9f6b11498f1acfed798bdd889817dc58baeec1985ad67b82326b48428f08b40730f301d2383df5a8700cf89bd31c01c0f SHA512 2e6c1e94866750835d843b4f4ea77148e467dfbee3a15e20bd7c9086c11ad9919f0ddc6097c40cacfcdbc2ceacf2f6fb1b7e8546a7fcb9f20d0e5bf84283d724
 DIST roundcubemail-1.3.8-complete.tar.gz 5534385 BLAKE2B 2f0cb528d0901d267c74d57baa18d1f057fdd2eb0f872f3cef1053847861998f8c6551fc17506ae365086ed1f86c3ee9e73a96adb2e43c6c32025e7afaf63710 SHA512 34dc9205cd93be6d6551086f4d22654dad7213b4b09000dc4def08357acdc634744ce1f560144a3d3b46e936258e90482e77fc4c691a55c205bcfdfe3745441e
-EBUILD roundcube-1.3.6.ebuild 2573 BLAKE2B fe8366da66738483a876bd8c2f481905a73ff24eb3f2cda13f879500ee12bb158bd6950a57806f2d628384d32ed1e8d82f28ae2e7b470f10605fa918593401c8 SHA512 a1eae4d3c3d1eedbda34664a4b225efdcbc3dc95b45a202a7a0ec499a576f6f08de5094cc5b9684e748958925ed4f75da41f58bcc483ba4dfef9342836c85868
-EBUILD roundcube-1.3.7.ebuild 2409 BLAKE2B 9d5f8706df18aa5dfe4a0efe87d697b09c769f716ddce35f9e7e5e42a839507d16ee2c88cd285997476a0ea2212912995709034d0ab3a9f76be85fbc26fae0ae SHA512 0f70f3dd9eea3b0be6bd75574c8f256f4fb240a5c94c6a08dfe92e483c73115260740cd033a99e64855b30a8eddfab11e7b1bf3f2339e5ec17eee6d18d52f43a
-EBUILD roundcube-1.3.8.ebuild 2422 BLAKE2B 1be59dac0c8f15dcda12f7929b29ba6c83c8930649125ad99316b44bba53e97028dfa98b2912611ff269b368b1d0ea9a63c0a25046c4de90b15e84320fa98f59 SHA512 5cc5509730dece9ee36dcc69aa041e5d1d525da080d0058c0a38bf9fb9f340c9f99a79491db9721a5a3cb39f24d7bcfb939e320eb8b5131fb77c545aa1585f94
+EBUILD roundcube-1.3.8.ebuild 2420 BLAKE2B 8ad358236ebe1ff411451869bd4f4599f0e562fa31f0788c94e1ca4f1ad3870731d239f52831a1ed27fd491e1ebc30e04e565c0d2518ab47edddb9c879bbcd55 SHA512 d7dbc9d111f41f3c8f0e246c9ec89a4ab4dde50d994ee2bae2979bd457cd2183f227f7584f4b3ffde2e4ae3d3cf230798f378d3b770568f393f96d07ca663c05
 MISC metadata.xml 955 BLAKE2B ca9dd109384433cdaca59b820aae795a4555459cf36f057b17949d601bd5ece8222dbb59502872ac6a16387e55839f859b91a6c6718523aaf66e4b677d25d33e SHA512 ff1b796f79f002814b038763305a404ee2b65d49346a10b423dc8df982ccd4116548c8159bbcd551ccdcdb5824ef6b0774abf6a6bdc851beb896f6e5ed97bf1a
diff --git a/mail-client/roundcube/roundcube-1.3.6.ebuild b/mail-client/roundcube/roundcube-1.3.6.ebuild
deleted file mode 100644
index 1c2eadee9c8a..000000000000
--- a/mail-client/roundcube/roundcube-1.3.6.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit webapp
-
-MY_PN=${PN}mail
-MY_P=${MY_PN}-${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/${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 ppc ppc64 ~sparc x86"
-
-IUSE="enigma ldap managesieve 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
-
-# :TODO: Support "endriod/qrcode: ~1.6.5" dep (ebuild needed)
-RDEPEND="
-	${DEPEND}
-	>=dev-lang/php-5.4.0[filter,gd,iconv,json,ldap?,pdo,postgres?,session,sockets,sqlite?,ssl?,unicode,xml]
-	>=dev-php/PEAR-Auth_SASL-1.1.0
-	>=dev-php/PEAR-Mail_Mime-1.10.0
-	>=dev-php/PEAR-Mail_mimeDecode-1.5.5
-	>=dev-php/PEAR-Net_IDNA2-0.2.0
-	>=dev-php/PEAR-Net_SMTP-1.7.1
-	>=dev-php/PEAR-Net_Socket-1.2.1
-	dev-php/PEAR-Console_CommandLine
-	dev-php/PEAR-Console_Getopt
-	dev-php/PEAR-Exception
-	virtual/httpd-php
-	enigma? (
-		>=dev-php/PEAR-Crypt_GPG-1.6.0
-		app-crypt/gnupg
-	)
-	ldap? (
-		>=dev-php/PEAR-Net_LDAP2-2.2.0
-		dev-php/PEAR-Net_LDAP3
-	)
-	managesieve? ( >=dev-php/PEAR-Net_Sieve-1.4.0 )
-	mysql? (
-		|| (
-			dev-lang/php[mysql]
-			dev-lang/php[mysqli]
-		)
-	)
-	spell? ( dev-lang/php[curl,spell] )
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	default
-
-	# Redundant. (Bug #644896)
-	rm -r vendor/pear || die
-}
-
-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.txt"
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-
-	ewarn
-	ewarn "When upgrading from <= 0.9, note that the old configuration files"
-	ewarn "named main.inc.php and db.inc.php are deprecated and should be"
-	ewarn "replaced with one single config.inc.php file."
-	ewarn
-	ewarn "Run the ./bin/update.sh script to convert those"
-	ewarn "or manually merge the files."
-	ewarn
-	ewarn "The new config.inc.php should only contain options that"
-	ewarn "differ from the ones listed in defaults.inc.php."
-	ewarn
-}
diff --git a/mail-client/roundcube/roundcube-1.3.7.ebuild b/mail-client/roundcube/roundcube-1.3.7.ebuild
deleted file mode 100644
index bcfc53201e2a..000000000000
--- a/mail-client/roundcube/roundcube-1.3.7.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit webapp
-
-MY_PN=${PN}mail
-MY_P=${MY_PN}-${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/${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 ppc ppc64 sparc x86"
-
-IUSE="change-password enigma ldap managesieve 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
-
-# :TODO: Support "endriod/qrcode: ~1.6.5" dep (ebuild needed)
-RDEPEND="
-	${DEPEND}
-	>=dev-lang/php-5.4.0[filter,gd,iconv,json,ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml]
-	>=dev-php/PEAR-Auth_SASL-1.1.0
-	>=dev-php/PEAR-Mail_Mime-1.10.0
-	>=dev-php/PEAR-Mail_mimeDecode-1.5.5
-	>=dev-php/PEAR-Net_IDNA2-0.2.0
-	>=dev-php/PEAR-Net_SMTP-1.7.1
-	virtual/httpd-php
-	change-password? (
-		>=dev-php/PEAR-Net_Socket-1.2.1
-		dev-lang/php[sockets]
-	)
-	enigma? (
-		>=dev-php/PEAR-Crypt_GPG-1.6.0
-		app-crypt/gnupg
-	)
-	ldap? (
-		>=dev-php/PEAR-Net_LDAP2-2.2.0
-		dev-php/PEAR-Net_LDAP3
-	)
-	managesieve? ( >=dev-php/PEAR-Net_Sieve-1.4.0 )
-	mysql? (
-		|| (
-			dev-lang/php[mysql]
-			dev-lang/php[mysqli]
-		)
-	)
-	spell? ( dev-lang/php[curl,spell] )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Redundant. (Bug #644896)
-	rm -r vendor/pear || die
-	# Remove references to PEAR. (Bug #650910)
-	cp "${FILESDIR}"/${P}-pear-removed-installed.json \
-	   vendor/composer/installed.json \
-	   || die
-}
-
-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.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.3.8.ebuild b/mail-client/roundcube/roundcube-1.3.8.ebuild
index d1a39af89b12..f8f2785064cc 100644
--- a/mail-client/roundcube/roundcube-1.3.8.ebuild
+++ b/mail-client/roundcube/roundcube-1.3.8.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${MY_PN}/releases/download/${PV}/${MY_P}-compl
 # 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 ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm ppc ppc64 sparc x86"
 
 IUSE="change-password enigma ldap managesieve mysql postgres sqlite ssl spell"
 REQUIRED_USE="|| ( mysql postgres sqlite )"