gentoo resync : 04.05.2018

12 files changed, 215 insertions, 296 deletions

diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 9636aff5eb86..634e29fdfd51 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/alpine/Manifest b/mail-client/alpine/Manifest
index 035693db95a4..9e9c91eeb1dc 100644
--- a/mail-client/alpine/Manifest
+++ b/mail-client/alpine/Manifest
@@ -7,5 +7,5 @@ DIST alpine-2.00-chappa-115-all.patch.gz 212705 BLAKE2B 99c21a7b74a4ea04c3bb5494
 DIST alpine-2.00.tar.bz2 5222673 BLAKE2B 38a9cd1fe3e291119b889bca0d304333cdf9ad8c63bc7923ea0735d3528c933b7d4dfe70bb353fe7b6047dafdaee3218a35e561f542b6ac763b60cb986509371 SHA512 17c6e65fbe767d4f9ffb3d3c2bb3deeab9d3620cd046cbb0009290aa484c9254effa992957631f0603bd82b82aeca2923d391aee6d20a7684d5830fbca8ce4d2
 DIST alpine-2.21.1.tar.gz 7490699 BLAKE2B f3aeafb55697701f6edda43659c9d27c7d7dab74f8e332e867f354ce555c26037f4b642af80f18db249dd7269f80bd880bc315ba4ae08ae7f63abc7998cea073 SHA512 78b47bd9e9dfc652bc407fe736d8b7526625782c332803cf01e5214a2b0a5af21736b8a2e685348913f6e2b10c80dced12081202294e9c61e3168b3a2b9657b7
 EBUILD alpine-2.00-r7.ebuild 2683 BLAKE2B 8bdfd80a2561ce22fc8aa7a8fc63c1ef40f3bfd7bec025c3a19fca835963541a67a6f0fa64a54ea00624ed0d92b0a53e4ff0c040ea3786e48b7e6e63428698f9 SHA512 11901edf7ac5c494a1ad48a5f00d512b90b017f00413baef3682ebb2f33072fbd64c6fc3b2319df406bfa4b376534071ef25f07ecf41227e788fa62146e3b049
-EBUILD alpine-2.21.1.ebuild 2000 BLAKE2B 4f0f74f9e4e9d1d184942b9506c63b1e5f9823bd2ceb6586cbf02d8478e909186c0bcafe0cf126a846ce042b2145b16f7bfb6a720cc487005b74ed4538e2dbc0 SHA512 c9fbe15c930f74ef2a5f13a94717564f11b94ed7d8d2214ad46522a16e04aa5c71b018add73c824237fdcf59bcb9034df52c6c162ab4a913d1b5bdb3a8e7330e
+EBUILD alpine-2.21.1.ebuild 1998 BLAKE2B 177d621fb310af069148d0c6bdaaa11001c1f4a4ffa5604d6165f95f4a89b1535332d8c8e296addb8e659571a2a66d97ca988a0feb7f1296f46acd37d345fc87 SHA512 9f323ce07957f4fa8f558f7e9dab3e2c0d75f088a160769a81948e70df6d3ffe38e372d9ae426262948222cb64c961ae780eaa317ef82aa6f1d609c00aa48f2e
 MISC metadata.xml 845 BLAKE2B 1a7529f7bbcb5464d3ea41f8fe9afdacf8ebe099a0cd109f8e4826a4538d7f2025477b0a817eff7e4c02096ad0d2083155e589ef143ef3fd7661909504ea97b8 SHA512 bd16db341dbade41763360c32ebf2d4a33111eb3b41ce43e2619c1fb184d15e9351d518316a603517e28a293f8de22308d6a6aa5f1b0c82adcb67837a3bd5773
diff --git a/mail-client/alpine/alpine-2.21.1.ebuild b/mail-client/alpine/alpine-2.21.1.ebuild
index 16763b37a146..58e03a0fdcaa 100644
--- a/mail-client/alpine/alpine-2.21.1.ebuild
+++ b/mail-client/alpine/alpine-2.21.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://repo.or.cz/alpine.git/snapshot/${GIT_COMMIT}.tar.gz -> ${P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ia64 ~ppc sparc x86"
 IUSE="doc ipv6 kerberos ldap libressl nls onlyalpine passfile smime spell ssl threads"
 
 DEPEND="virtual/pam
diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index a45446f0afaa..af3add452723 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -5,4 +5,5 @@ DIST claws-mail-3.16.0.tar.xz 5913948 BLAKE2B 6744045de6bc3945221569a9ae1cdcd849
 EBUILD claws-mail-3.15.0-r2.ebuild 5779 BLAKE2B a12a18396d038ea3b8f70d67c756c2999deaabf3a91ac56bf786672cf305f4f725ce7d67303ceea5bd05d9b8f4dca5ce30a9274a26f40bb16be53a81f6ae8054 SHA512 da59097b2d7f9dea4a362297979c7a684f49baf056b7f58ec09a4c0d2b0cc895f298539c571b80ac7a6fddb8c27672889ccfd7673d33e3de826ee1c9eae69d12
 EBUILD claws-mail-3.15.1.ebuild 5722 BLAKE2B 83c5b02d2b93d40951a64cb01518baf568cbc9fdab952e6987474d72af1177de615e85dd352c949453a39f49aacd5564419614155a5eea0a08edbd54e3167868 SHA512 71c46238ddecf2a9470f00cda4fe37514e77bb951dc7ef12e9cecc61a929be977dded55b587e6401703ec27c5e822b259b2af13b5716f1fa75ec7d61ecc5c3e8
 EBUILD claws-mail-3.16.0.ebuild 5727 BLAKE2B 9d09a2252f3c37951771ae7c3bb7700368f7298bd1218467086011d5ed50f11f2049ab2e389b3a1fcd0d31769639a83359e0868618baf8350df769456bf8ddf5 SHA512 90dbd1adb59d2886eaa6ed700fbf83648bd0550e131febf884fdde4ec7146234dce8fa1ceec0c9a1e111a109ea761d547d9f7581c26ba1ccceab1ba9f4eb298a
+EBUILD claws-mail-9999.ebuild 5844 BLAKE2B 9217492f267b0c30a1cd2b3a6ad53d311f1fc6687279bc2043c387592be4a7eac365b2b9f6d1f41664fefdb4cccd3c95a4a9ed2e215694862707817d1c544b33 SHA512 a47a11ffede58f70141a99b437beebf81d5010ff8ee9573ab299f1f4a95b6eeb5b3fbbbcde02382b8e27240a618e2d6074eff782a24cd06626eadd3837295d33
 MISC metadata.xml 1601 BLAKE2B 7827fe2821ee1e9a6ddc747f269de28106a0ad9855fce1a298a0bef5a00de1383d0798bd3239e888dd0f88b477112ec14d4dcb9488c1709d6064b9fe9a2bad13 SHA512 824a2702d57d86e0ebfd451e12f374010559956e5770c65028c819b799de4e72a156c80587278fff7d246a5f402aeee8a30fae53a4c84a8922cd050a7c1c9340
diff --git a/mail-client/claws-mail/claws-mail-9999.ebuild b/mail-client/claws-mail/claws-mail-9999.ebuild
new file mode 100644
index 000000000000..065ab0571e88
--- /dev/null
+++ b/mail-client/claws-mail/claws-mail-9999.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit autotools gnome2-utils python-single-r1 xdg-utils
+
+DESCRIPTION="An email client (and news reader) based on GTK+"
+HOMEPAGE="http://www.claws-mail.org/"
+
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="git://git.claws-mail.org/claws.git"
+else
+	SRC_URI="http://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SLOT="0"
+LICENSE="GPL-3"
+
+IUSE="archive bogofilter calendar clamav dbus debug doc gdata +gnutls gtk3 +imap ipv6 ldap +libcanberra +libindicate +libnotify networkmanager nls nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface"
+REQUIRED_USE="libcanberra? ( notification )
+	libindicate? ( notification )
+	libnotify? ( notification )
+	networkmanager? ( dbus )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	smime? ( pgp )"
+
+COMMONDEPEND="
+	net-mail/ytnef
+	archive? (
+		app-arch/libarchive
+		>=net-misc/curl-7.9.7
+	)
+	bogofilter? ( mail-filter/bogofilter )
+	calendar? (
+		>=dev-libs/libical-2.0.0
+		>=net-misc/curl-7.9.7
+	)
+	dbus? ( >=dev-libs/dbus-glib-0.60 )
+	gdata? ( >=dev-libs/libgdata-0.17.2 )
+	gnutls? ( >=net-libs/gnutls-3.0 )
+	gtk3? ( x11-libs/gtk+:3 )
+	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
+	imap? ( >=net-libs/libetpan-0.57 )
+	ldap? ( >=net-nds/openldap-2.0.7 )
+	nls? ( >=sys-devel/gettext-0.18 )
+	nntp? ( >=net-libs/libetpan-0.57 )
+	notification? (
+		dev-libs/glib:2
+		libcanberra? (  media-libs/libcanberra[gtk] )
+		libindicate? ( dev-libs/libindicate:3[gtk] )
+		libnotify? ( x11-libs/libnotify )
+	)
+	pda? ( >=app-pda/jpilot-0.99 )
+	pdf? ( app-text/poppler[cairo] )
+	pgp? ( >=app-crypt/gpgme-1.0.0 )
+	session? (
+		x11-libs/libICE
+		x11-libs/libSM
+	)
+	smime? ( >=app-crypt/gpgme-1.0.0 )
+	spam-report? ( >=net-misc/curl-7.9.7 )
+	spell? ( >=app-text/enchant-1.0.0 )
+	startup-notification? ( x11-libs/startup-notification )
+	svg? ( >=gnome-base/librsvg-2.40.5 )
+	valgrind? ( dev-util/valgrind )
+"
+
+DEPEND="${COMMONDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	xface? ( >=media-libs/compface-1.4 )"
+
+RDEPEND="${COMMONDEPEND}
+	app-misc/mime-types
+	x11-misc/shared-mime-info
+	clamav? ( app-antivirus/clamav )
+	networkmanager? ( net-misc/networkmanager )
+	pdf? ( app-text/ghostscript-gpl )
+	perl? ( dev-lang/perl:= )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-python/pygtk-2.10.3
+	)
+	rss? (
+		dev-libs/libxml2
+		net-misc/curl
+	)"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# Don't use libsoup-gnome (bug #565924)
+	export HAVE_LIBSOUP_GNOME=no
+
+	local myeconfargs=(
+		--disable-bsfilter-plugin
+		--disable-fancy-plugin
+		--disable-generic-umpc
+		--enable-acpi_notifier-plugin
+		--enable-address_keeper-plugin
+		--enable-alternate-addressbook
+		--enable-att_remover-plugin
+		--enable-attachwarner-plugin
+		--enable-fetchinfo-plugin
+		--enable-mailmbox-plugin
+		--enable-newmail-plugin
+		--enable-tnef_parse-plugin
+		--with-password-encryption=$(usex gnutls gnutls old)
+		$(use_enable archive archive-plugin)
+		$(use_enable bogofilter bogofilter-plugin)
+		$(use_enable calendar vcalendar-plugin)
+		$(use_enable clamav clamd-plugin)
+		$(use_enable dbus)
+		$(use_enable debug crash-dialog)
+		$(use_enable doc manual)
+		$(use_enable gdata gdata-plugin)
+		$(use_enable gnutls)
+		$(use_enable gtk3)
+		$(use_enable ipv6)
+		$(use_enable ldap)
+		$(use_enable networkmanager)
+		$(use_enable nls)
+		$(use_enable notification notification-plugin)
+		$(use_enable pda jpilot)
+		$(use_enable pdf pdf_viewer-plugin)
+		$(use_enable perl perl-plugin)
+		$(use_enable pgp pgpcore-plugin)
+		$(use_enable pgp pgpinline-plugin)
+		$(use_enable pgp pgpmime-plugin)
+		$(use_enable python python-plugin)
+		$(use_enable rss rssyl-plugin)
+		$(use_enable session libsm)
+		$(use_enable sieve managesieve-plugin)
+		$(use_enable smime smime-plugin)
+		$(use_enable spam-report spam_report-plugin)
+		$(use_enable spamassassin spamassassin-plugin)
+		$(use_enable spell enchant)
+		$(use_enable startup-notification)
+		$(use_enable svg)
+		$(use_enable valgrind valgrind)
+		$(use_enable xface compface)
+	)
+
+	# libetpan is needed if user wants nntp or imap functionality
+	if use imap || use nntp ; then
+		myeconfargs+=( --enable-libetpan )
+	else
+		myeconfargs+=( --disable-libetpan )
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* )
+	default
+
+	# Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps
+	# => also install it in /usr/share/pixmaps for other desktop envs
+	# => also install higher resolution icons in /usr/share/icons/hicolor/...
+	insinto /usr/share/pixmaps
+	doins ${PN}.png
+	local size
+	for size in 64 128 ; do
+		newicon -s ${size} ${PN}-${size}x${size}.png ${PN}.png
+	done
+
+	docinto tools
+	dodoc tools/README*
+
+	domenu ${PN}.desktop
+
+	einfo "Installing extra tools"
+	cd "${S}"/tools || die
+	exeinto /usr/$(get_libdir)/${PN}/tools
+	doexe *.pl *.py *.conf *.sh
+	doexe tb2claws-mail update-po uudec uuooffice
+
+	# kill useless files
+	rm -f "${ED%/}"/usr/lib*/claws-mail/plugins/*.{a,la}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	ewarn "When upgrading from version 3.9.0 or below some changes have happened:"
+	ewarn "- There are no individual plugins in mail-client/claws-mail-* anymore, but they are integrated mostly controlled through USE flags"
+	ewarn "- Plugins with no special dependencies are just built and can be loaded through the interface"
+	ewarn "- The gtkhtml2, dillo and trayicon plugins have been dropped entirely"
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/mail-client/kube/Manifest b/mail-client/kube/Manifest
index ef06e0a39e3c..bb941c9f900f 100644
--- a/mail-client/kube/Manifest
+++ b/mail-client/kube/Manifest
@@ -1,5 +1,3 @@
-DIST kube-0.3.1.tar.xz 525956 BLAKE2B 97b47cee0b3634d1794f167984614b0c5d662ff46c3738c3e4b82e6898cd0587a3787174a52852563bdcd95ceb0fcb2d1f4f1d33aefa76ce0a90be3962684d41 SHA512 d87eb4ece50be3471f3a80e90de9cceb3a51447dbf7f845f36334e3dcc1c78c6a3af5e2dd4a8e459dbf884f7f2f19cd60edc4fbdf85a9b97a231c15c7780230a
 DIST kube-0.5.0.tar.gz 990978 BLAKE2B 7bdabbe89e81ab26465f7e3d8ad769b4b07fccb09bdec5a9cd905eec89de7b25a0165ec1f1b916c668cf50d9f2e889f9763bddfe49c4223b167bf69a61bd5658 SHA512 90579ad21b755ff151bfed362f389fdfa66185f92a8fc72b7c9eb4e0108d97a8fdfbbd7a07f81a5c6d6cdcdf79255c3e614bfd43961984863866de8f13a21d28
-EBUILD kube-0.3.1.ebuild 845 BLAKE2B 5129fbce86e5653ef13e52466680d9cc137deac308ee5350750e120162b24a904298d48bd10aca3eda292662459529588d3e47285fde559ea4b81f05b054a532 SHA512 f42e99a2b2f7264a9d1b8ba7264d4e728579e13fece4327932977c658668636e57268a0f0f60b6a3b8acf02dc83c4df195b44f79b7ae4308022ea412b4768af6
-EBUILD kube-0.5.0.ebuild 1087 BLAKE2B 53c8f6ec981423428bca6d59471d3ebf6f43da0e55ed08ce35dc347fcf12b857cc6dcdceb9efab8b85deefca19c8bb4d1dc0bc931124ba768577ba308c35997a SHA512 98113396e04de087a8ade9af962ef32c0b16a0be9a5c854bec488ef8e55066a0c1bf2a9e0541c605788aa188633f55fc4fb133e32e74e0f5a7df0ea7b32374aa
+EBUILD kube-0.5.0-r1.ebuild 1087 BLAKE2B f8a253d1df15613a926a88ef2304f01850cf0ea5ddfc30d38f7fa25a4f465440470eed361f73ad65717aa3bdf9ac68cc957a4cd3083865fcdfbd59e9c3d34670 SHA512 992e30ea5e7f80c66c0704970e56e067bfdecbc3dcb9dd92fbc023ea0615eb4a4cf5e9aafbe3e39efe11908bbc5ada0524e675afe89c3bdda89d92c0963f5468
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/mail-client/kube/kube-0.3.1.ebuild b/mail-client/kube/kube-0.3.1.ebuild
deleted file mode 100644
index 55f2bbf28bbd..000000000000
--- a/mail-client/kube/kube-0.3.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional-recursive"
-inherit kde5
-
-DESCRIPTION="A mail client by KDE"
-HOMEPAGE="https://kube.kde.org/"
-SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.xz"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	$(add_frameworks_dep breeze-icons)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kpackage)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtquickcontrols)
-	$(add_qt_dep qtquickcontrols2)
-	$(add_qt_dep qttest)
-	$(add_qt_dep qtwebengine)
-	$(add_qt_dep qtwidgets)
-	>=app-crypt/gpgme-1.7.1:=[cxx,qt5]
-	dev-libs/kasync
-	>=dev-libs/sink-0.3.0
-"
-DEPEND="${RDEPEND}"
-
-RESTRICT+=" test"
diff --git a/mail-client/kube/kube-0.5.0.ebuild b/mail-client/kube/kube-0.5.0-r1.ebuild
index 9ba678e79b32..14c545bd70e2 100644
--- a/mail-client/kube/kube-0.5.0.ebuild
+++ b/mail-client/kube/kube-0.5.0-r1.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 	$(add_qt_dep qtwidgets)
 	>=app-crypt/gpgme-1.7.1:=[cxx,qt5]
 	dev-libs/kasync
-	>=dev-libs/sink-0.3.0
+	>=dev-libs/sink-0.5.0
 "
 DEPEND="${RDEPEND}
 	test? ( $(add_qt_dep qttest) )
diff --git a/mail-client/roundcube/Manifest b/mail-client/roundcube/Manifest
index 992ee191f5ae..c5c6fb651baa 100644
--- a/mail-client/roundcube/Manifest
+++ b/mail-client/roundcube/Manifest
@@ -1,10 +1,4 @@
 AUX POST-UPGRADE.txt 1101 BLAKE2B b162d5e445195412a126b0977b1f21b6619757ba0a8cef4aeb7da84850707b4476e15819ebc903b49b904ca9118db796ede72f8f4917283d46a933ed24a77226 SHA512 715c6c377b9816f0f836acace019c39cf22d536d1a0ae5538cbf3dcf3fec12ae584450881264dab792c941627f1af649f776bca6d5015b13c08648fde726b948
-DIST roundcubemail-1.2.7-complete.tar.gz 3904612 BLAKE2B b001a9c57f2358b00e0290493f0bfb82001c769987ef98e2d34d6e6d9432a5c612fab6ba10306279a8bb73d1015332f29f1233a10ee32fd7f713cbf44d9cf7b5 SHA512 545b3fe05ecfaede3d887ae71e41fc91aaaae280c71b67db9a5dcb516b5b238371327c2b1fabe87cf073cce38bc5a57b3db2592eb96d436bae280896c1f7017c
-DIST roundcubemail-1.3.3-complete.tar.gz 5339032 BLAKE2B bb0b595ba13947db3b0644ad5bc76fa8280ac74733e3bf02a758ffaa49fb0c2ef80005081fb1f24500fa767b57d0df59751abb098a807bc6e04b5a63de3fc1ed SHA512 1f634fbc5d0967f28a7aa990a9b23f105b93030d43927237fc9b5decabe1b959de75c7c21bdb27389ec53730378565e7f309d7c009be427c7615372634273931
-DIST roundcubemail-1.3.4-complete.tar.gz 5506887 BLAKE2B de353400706d893b8e95b23e20ebcab7478273bd6dbd009c766537826e260cd98f065f9d7d38740c60254ccbecd376ec6aafe82791be177bbee6ffc8d61a733b SHA512 e3442651bf762ceda3cb9ff78cb512703a7f82466d7de860848d1c9471f10b2561c2dd7a570218048fbc0df0fa573c6e2381ba8c0063e718c531c8ce1138a5e4
 DIST roundcubemail-1.3.6-complete.tar.gz 5529370 BLAKE2B 49fd04d81b7047c61d33007b49aff2fe8d68fb0572d305b51aa0ae997c06e4924a3ff32861c19741f0c4d82adb9abb317781de8c1b324120e57d77f413cfa480 SHA512 fc1627d4b539742524c43b3faaa8cb5d64f934ad03f7cf8a461580a3a38dccb11140d08499b988742a0892534b1eda52f37a50f0911015983b6e27703294c70e
-EBUILD roundcube-1.2.7.ebuild 2286 BLAKE2B c7b34d0d45035d02fcfb59f5b43e1c49ffc60219579d709bff1c5b8d6b4cc5fcc426b94989079aba16e2a43defeb57460fdd2af9d3c8f5a4478ca8f8ab3d9a76 SHA512 b4b0075658f1331f086ca0bf34b1118475836468c7735dca32d77fac9981f60fd929c7ae24b736fa71eaec472e95699f0dc6fe1fb034c88c26bf457140f5632f
-EBUILD roundcube-1.3.3-r1.ebuild 2380 BLAKE2B c58468a39a852201afc0b4233fb18d49967535187c3cd4d20b7ac5d67932388238d08a79b891e912d674afd5d8e5a230deb630aba4ce9a83d91096813811ae57 SHA512 89d66b6fe22a4797935d809d9a6518fc6c36c3b166906d6d9702fa4f1964fdda4197215ef84459e2b8c20eee18d75e6b421c0361811900d9f160b141708c1831
-EBUILD roundcube-1.3.4.ebuild 2575 BLAKE2B e5b4dbc799a81eec29fee1450374bd6612591af3162f9afcc2a409eb58403d8277d5ad80c78c2df9c53257cada33eeb623c32644427082c6d556af82c5ac709b SHA512 166a7d2a6c6170eed3d8a226c69628096f4bed573394491601b9cb9ecbdd8d37fc5b698d8dad50043d90f574e2bcd201d52a0256c5eb1aa7097960b3b77a8437
 EBUILD roundcube-1.3.6.ebuild 2573 BLAKE2B fe8366da66738483a876bd8c2f481905a73ff24eb3f2cda13f879500ee12bb158bd6950a57806f2d628384d32ed1e8d82f28ae2e7b470f10605fa918593401c8 SHA512 a1eae4d3c3d1eedbda34664a4b225efdcbc3dc95b45a202a7a0ec499a576f6f08de5094cc5b9684e748958925ed4f75da41f58bcc483ba4dfef9342836c85868
 MISC metadata.xml 860 BLAKE2B 8135a487928f879b6dd9665e171dc18e53f4cdbada44b71e41891e376ce6e4c76a80cb85d3dbbb9303fdb2c4be330952c144305499c5193f52b2d3ab9e538307 SHA512 b17b6d05898493d08d52f08b333f762518442ae519b23e8f2811fb6a369c6b26688a380656e8e95d7da706834547d6fe7d52db6992ebf0bf5b9a30ad0d21c56f
diff --git a/mail-client/roundcube/roundcube-1.2.7.ebuild b/mail-client/roundcube/roundcube-1.2.7.ebuild
deleted file mode 100644
index dd429291c3d6..000000000000
--- a/mail-client/roundcube/roundcube-1.2.7.ebuild
+++ /dev/null
@@ -1,74 +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 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
-
-RDEPEND="
-	${DEPEND}
-	>=dev-lang/php-5.3.7[crypt,filter,gd,iconv,json,ldap?,pdo,postgres?,session,sockets,sqlite?,ssl?,unicode,xml]
-	>=dev-php/PEAR-Auth_SASL-1.0.6
-	>=dev-php/PEAR-Mail_Mime-1.8.9
-	>=dev-php/PEAR-Mail_mimeDecode-1.5.5
-	>=dev-php/PEAR-Net_IDNA2-0.1.1
-	>=dev-php/PEAR-Net_SMTP-1.6.2
-	virtual/httpd-php
-	enigma? ( >=dev-php/PEAR-Crypt_GPG-1.4.0 app-crypt/gnupg )
-	ldap? ( >=dev-php/PEAR-Net_LDAP2-2.0.12 dev-php/PEAR-Net_LDAP3 )
-	managesieve? ( >=dev-php/PEAR-Net_Sieve-1.3.2 )
-	mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) )
-	spell? ( dev-lang/php[curl,spell] )
-"
-
-S=${WORKDIR}/${MY_P}
-
-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.3-r1.ebuild b/mail-client/roundcube/roundcube-1.3.3-r1.ebuild
deleted file mode 100644
index 7dc18c409288..000000000000
--- a/mail-client/roundcube/roundcube-1.3.3-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 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 ~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
-	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_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.4.ebuild b/mail-client/roundcube/roundcube-1.3.4.ebuild
deleted file mode 100644
index 2f2cce8e7736..000000000000
--- a/mail-client/roundcube/roundcube-1.3.4.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
-}