gentoo resync : 10.02.2019

16 files changed, 303 insertions, 931 deletions

diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 942868fd73c1..e428d35ec241 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index bce2b5d70871..e7fa72fb13f0 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -1,13 +1,4 @@
-AUX claws-mail-3.15.0-old_profile_segfault.patch 2758 BLAKE2B 64b98598814de6ac03894a7750a1da40edda7b8468c32b87f74c83f1fd6027c51d1804a95570909525630b7aff6f1eac81c1d8ad55f87538f32f03bac85aad83 SHA512 3ef1a001b6817d42b626754160aeb971263cca066294d9683403079d08eadbe86a9661ff6dbc8f3034c10db12d6d8b99a74f22f315b03fcf6e8ee581ca44583b
-DIST claws-mail-3.15.0.tar.xz 5665648 BLAKE2B f25356372b65f2df072eb2774fca87514c2da59811e78650e26ae58c1b518e229cba62cf1b0d0ad72107e292c9d87450f7d2508c02f34c5c9c70d944f9866823 SHA512 667cb0ea2f7c5d8e8b6046313ed7698c378f504caeeaa54348ba228317538dfc040e4ddf80f4aaa1491858a7803954e89599b1e479febe7cf1ab4bae5a638dc8
-DIST claws-mail-3.15.1.tar.xz 5665468 BLAKE2B c6d4c5875f82f836815193b330427bdd533be5445706fc437b1c30be8e52325a2b824e8a1d1332bb286ac9ea2bd4b872943709d9ff78b20a6a3ff5b781808d25 SHA512 11113ab2bc75571b9a71b11ee3f7fe4773ff7b17132f29e6637aa7b7b9a7f8ed125430ee7e5ab5c9842463d776a96be150d7c8e1e3d682b955dd582a6a6ce68c
-DIST claws-mail-3.16.0.tar.xz 5913948 BLAKE2B 6744045de6bc3945221569a9ae1cdcd849ec11c4f5dbfe966ca70c7c2ab3f5d9ded1dbd5bcedffdc756809c1802d31d955b5c6c53f20a00be5abc861db340d0f SHA512 5c96e21b4c5117b67ccfe4178c68e2f1b1449f882d6ecf22041e41f08fd607c6ce7afe6c7fdbd039da7ffc5673d366551b15d3e4b7de8d758fc1554a8eadc55e
-DIST claws-mail-3.17.2.tar.xz 6166160 BLAKE2B d31feb49cbeddbf4f95540f984c76a4d91edb95fccf2a7d97933ddaacfa9a5fedb464e602cb85a97bc75dc341bc7004cef9bea27d8dfb51d42a62d3f2f46fa1d SHA512 c68d31f7097f1b5fd5c768f4d97fd9edfbe54794e06ad6980e092743ff5ac96efbc2354021040315ef355d9a272fb71065e4c02bd8ac1804e7db7953a8cff615
 DIST claws-mail-3.17.3.tar.xz 6164392 BLAKE2B ac0781c4c7e4423f4a8b494a9bd007d62443e8c540feaeef089ca65f641da5ecabfa2c5c0662750d6f58c8913c1d95750a3dfb6b4628e573b0105f8f526bc066 SHA512 b562d785eaedbdec408c4a3db8f4d9326183266fe314509a189c9e1220f15b4f41ccd9d8c58c5194c0267842e8efe900e88eb17c0d17d6069e2543870efa5ef8
-EBUILD claws-mail-3.15.0-r2.ebuild 5783 BLAKE2B 0379c36e250fcb353aef4ad418e0075b1662e6f6b77254a37a4f20a5c2202bedf9cd6c6903a1cceb953de0f7bdfef943dceb9429ba549e8f3cecb255676164b5 SHA512 27f2da1967d168c90b9193715d8c74c47880aed9e1f5467c42edf1cf5edf151cda6ff4361ee096f5e3041c267ee080e6b0b32010a06cafd304fc677f912156de
-EBUILD claws-mail-3.15.1.ebuild 5726 BLAKE2B 4a090763b5dc9db6d43c780fa330214797d2814387b9144e9669fde7f4f3e32af36b2f26f6b7c8819fb1b4974662a67891387ffc4a9539d213df95c5c1f9e73f SHA512 463e7b78ee9fd2f6e4d43348d7d072410b099a51e566583f94b2d8d272f436a4bd52db62a44e4c2d685a2a0cf879bc2fe166788ccbf5bcf28ceb06cc4cbbfa4e
-EBUILD claws-mail-3.16.0.ebuild 5731 BLAKE2B db3e462cd6e5505d2edb260131e8132aeb72c5e1ea5b33a3fe6a075da5030fb385db6ed6579483e97649dc78c7479ae02d6b094ff1a3c78ebc325c1a29ca47d4 SHA512 c9cdfd36c79349887c0904e8e91fda6e1471114753ccb7ac3fbb2d350668a133917d8a6cbba2630c3554be4d12f6e2da92298cb83ced7cbbd9b0f23dbfaf3b9b
-EBUILD claws-mail-3.17.2.ebuild 5861 BLAKE2B ceed0400412a3208a6606b6487fc5ab4ea44cef591592061518939390537fdd37a2fb15dfe63e461df26dd73fd2fd658f8909cb3dd144277df281bbb844c0239 SHA512 8f6fa2bb989e057eb7c3839f5e4960f92d005491d5e629326808324a04aa7062585cad42f925b04d18e637e59085a2b83a35e70c692422dc20966dc23a6ce864
-EBUILD claws-mail-3.17.3.ebuild 5861 BLAKE2B ceed0400412a3208a6606b6487fc5ab4ea44cef591592061518939390537fdd37a2fb15dfe63e461df26dd73fd2fd658f8909cb3dd144277df281bbb844c0239 SHA512 8f6fa2bb989e057eb7c3839f5e4960f92d005491d5e629326808324a04aa7062585cad42f925b04d18e637e59085a2b83a35e70c692422dc20966dc23a6ce864
+EBUILD claws-mail-3.17.3.ebuild 5858 BLAKE2B e3bec36e2e07a2a136d936fd844e972ff93a53fd4ddbfb56a898d0f311702a6b51fe367fdf62a3d6d0e72a6baef4bbe4738d68da425eae2e40bb2530e2362b4f SHA512 40e41d6a9e6d6a4545e6e2f534e2595ed9ef00b7aa7cccaae5fb2f8da90c8a75ccd3d852967b03da70581fa6347de6df05030904605fee9b5e64eaae1b731386
 EBUILD claws-mail-9999.ebuild 5928 BLAKE2B 51ad0f197647f077234f37861157fcd61476972c0f648c8b88e5ae42f1d44c7dbefc3a9573151daefffcb58b249530b6e8ebd31ee5beab7aae0bb51aa16b64bb SHA512 c6dad312be3febfaadef4048484475291cde4bd62558435530aba166269d05c3b234764ae21582e040a369b9545153ea46c3f5b89da130413b776a8411a69694
 MISC metadata.xml 1661 BLAKE2B ce48032773773b29728b3a6a177c43572e4c6df0f50df4e17935df77a317f1107527a82fd576765fca018edd73bb31e165029258e49640ed84ff9061f6f1a53f SHA512 5e297601a56a53db9e2463da1e785b0d8e7a358b9df68689c1a3da4efc5d3ffccc92af7ee2202d67e4c6226b298bb562fa0f590fd36a425749e21b1c15516076
diff --git a/mail-client/claws-mail/claws-mail-3.15.0-r2.ebuild b/mail-client/claws-mail/claws-mail-3.15.0-r2.ebuild
deleted file mode 100644
index 7e7feaa001ca..000000000000
--- a/mail-client/claws-mail/claws-mail-3.15.0-r2.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# 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="https://www.claws-mail.org/"
-
-SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
-
-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.20: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
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${P}-old_profile_segfault.patch"
-)
-
-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
-	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/claws-mail/claws-mail-3.15.1.ebuild b/mail-client/claws-mail/claws-mail-3.15.1.ebuild
deleted file mode 100644
index 2392454c221e..000000000000
--- a/mail-client/claws-mail/claws-mail-3.15.1.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# 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="https://www.claws-mail.org/"
-
-SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-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.20: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
-	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/claws-mail/claws-mail-3.16.0.ebuild b/mail-client/claws-mail/claws-mail-3.16.0.ebuild
deleted file mode 100644
index cc00879ebd7a..000000000000
--- a/mail-client/claws-mail/claws-mail-3.16.0.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# 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="https://www.claws-mail.org/"
-
-SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-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.20: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
-	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/claws-mail/claws-mail-3.17.2.ebuild b/mail-client/claws-mail/claws-mail-3.17.2.ebuild
deleted file mode 100644
index ba540a3ae23f..000000000000
--- a/mail-client/claws-mail/claws-mail-3.17.2.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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="https://www.claws-mail.org/"
-
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.claws-mail.org/claws.git"
-else
-	SRC_URI="https://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 dillo doc gdata +gnutls +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="
-	dev-libs/nettle
-	net-mail/ytnef
-	>=x11-libs/gtk+-2.24:2
-	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 )
-	dillo? ( www-client/dillo )
-	gnutls? ( >=net-libs/gnutls-3.0 )
-	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 dillo dillo-plugin)
-		$(use_enable doc manual)
-		$(use_enable gdata gdata-plugin)
-		$(use_enable gnutls)
-		$(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 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/claws-mail/claws-mail-3.17.3.ebuild b/mail-client/claws-mail/claws-mail-3.17.3.ebuild
index ba540a3ae23f..fcf7a62de7dd 100644
--- a/mail-client/claws-mail/claws-mail-3.17.3.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.17.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ if [[ "${PV}" == 9999 ]] ; then
 	EGIT_REPO_URI="git://git.claws-mail.org/claws.git"
 else
 	SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
 fi
 
 SLOT="0"
diff --git a/mail-client/claws-mail/files/claws-mail-3.15.0-old_profile_segfault.patch b/mail-client/claws-mail/files/claws-mail-3.15.0-old_profile_segfault.patch
deleted file mode 100644
index b19bf8f39d67..000000000000
--- a/mail-client/claws-mail/files/claws-mail-3.15.0-old_profile_segfault.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From: Ricardo Mones <ricardo@mones.org>
-Date: Wed, 9 Aug 2017 14:48:38 +0000 (+0200)
-Subject: Fix bug #3855: segfault at startup with old profile and IMAP account
-X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=667c9d3eaf0487193cc7873e6d3a63959a03d7f9;hp=63677adb68c57479f6bc7534cfbf2f234b1f4fb1
-
-Fix bug #3855: segfault at startup with old profile and IMAP account
-
-Revert "Remove duplicated code and include".
-
-This reverts commit 300f811f3bbf10455ca55d9b01da6705dd1e07bb.
----
-
-diff --git a/src/imap.c b/src/imap.c
-index 0e1e777..25bb283 100644
---- a/src/imap.c
-+++ b/src/imap.c
-@@ -77,6 +77,8 @@ typedef struct _IMAPSession	IMAPSession;
- typedef struct _IMAPNameSpace	IMAPNameSpace;
- typedef struct _IMAPFolderItem	IMAPFolderItem;
- 
-+#include "prefs_account.h"
-+
- #define IMAP_FOLDER(obj)	((IMAPFolder *)obj)
- #define IMAP_FOLDER_ITEM(obj)	((IMAPFolderItem *)obj)
- #define IMAP_SESSION(obj)	((IMAPSession *)obj)
-@@ -425,6 +427,7 @@ static gint imap_get_flags			(Folder 	*folder,
- 						 FolderItem 	*item,
-                     				 MsgInfoList 	*msglist,
- 						 GHashTable 	*msgflags);
-+static gchar *imap_folder_get_path		(Folder		*folder);
- static gchar *imap_item_get_path		(Folder		*folder,
- 						 FolderItem	*item);
- static MsgInfo *imap_parse_msg(const gchar *file, FolderItem *item);
-@@ -3042,6 +3045,35 @@ static FolderItem *imap_create_special_folder(Folder *folder,
- 	return new_item;
- }
- 
-+static gchar *imap_folder_get_path(Folder *folder)
-+{
-+	gchar *folder_path;
-+
-+	g_return_val_if_fail(folder != NULL, NULL);
-+        g_return_val_if_fail(folder->account != NULL, NULL);
-+
-+#ifdef G_OS_WIN32
-+	gchar *sanitized_dirname = g_strdup(folder->account->recv_server);
-+	g_strdelimit(sanitized_dirname, ":", ',');
-+#endif
-+
-+        folder_path = g_strconcat(get_imap_cache_dir(),
-+                                  G_DIR_SEPARATOR_S,
-+#ifdef G_OS_WIN32
-+																	sanitized_dirname,
-+#else
-+                                  folder->account->recv_server,
-+#endif
-+                                  G_DIR_SEPARATOR_S,
-+                                  folder->account->userid,
-+                                  NULL);
-+
-+#ifdef G_OS_WIN32
-+	g_free(sanitized_dirname);
-+#endif
-+	return folder_path;
-+}
-+
- #ifdef G_OS_WIN32
- static gchar *imap_encode_unsafe_chars(const gchar *str)
- {
-@@ -3078,9 +3110,8 @@ static gchar *imap_item_get_path(Folder *folder, FolderItem *item)
- 	gchar *item_path = NULL;
- 	
- 	g_return_val_if_fail(folder != NULL, NULL);
--	g_return_val_if_fail(folder->account != NULL, NULL);
- 	g_return_val_if_fail(item != NULL, NULL);
--	folder_path = prefs_account_cache_dir(folder->account, FALSE);
-+	folder_path = imap_folder_get_path(folder);
- 
- 	g_return_val_if_fail(folder_path != NULL, NULL);
- 
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 1dff33f78500..4b38e378747e 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -3,10 +3,13 @@ AUX Muttrc.mbox 486 BLAKE2B dd7f15b08f185800b2a7d26545e5a1b0f7b21f8f7cff2b4fce39
 DIST mutt-1.10.1.tar.gz 4255890 BLAKE2B 2a0e7629c42ba11ec5c3686d9c17e283ed9cb1f9874decec9453cf01ae0780c7993ac0104db7987571f27c04e408c1eff47d3b73918eb9754c253b6249ad48f4 SHA512 13509ff159c65e23614696967b4bd8baf7b8e16c0e85cfd89e2df8201de2dc97e6c4a426f5919f05051dee2b14f847c7203e0b236931d3cdf81dbbb221551726
 DIST mutt-1.11.1.tar.gz 4579062 BLAKE2B e0bc0fffbed0f9df36d0773ccc1032d797d2d693f315976ceaf7e21f7d22f027e5b7e857e2c3a1fe90e66f4764235b0394f8f0addf7a310b1a3200812f5c55eb SHA512 dc6cfe5c2aa23650c362a8b9c1a13c0d65902e71f8effd517304f183fcc1d1fddf7df1e0b8be5547b847c75afe3732b198353559e2c947839a009be38b087de0
 DIST mutt-1.11.2.tar.gz 4579279 BLAKE2B 6bb03c14c2a2a13a149d3c333169d69d2844d98d7545abce6fd959761ee19b6be77f0138a7551dabb5e033e635ef08d8d4e810034c9008e30f168fd38a893e99 SHA512 6428ea5decf89ae023533247dbc1b6b492673c6e2a9f7c499e8546a1648e5219bf9e5f52ba252381e9c7c843521853633bc0cd6cf2149f9a972f70e5e06d6f7d
+DIST mutt-1.11.3.tar.gz 4581196 BLAKE2B 12f7a067bdfab72628e3fd25e9391d252c8665db845963df5c4a8f66f7d68ce1385e94fd35527718fdbedc9759910e2ee7253430ecddb8ea92f6368078be9a03 SHA512 381079254f01cdd85b9e556a10bb1ddf0b49d96b54fe21d70dd735199dcbbfd46956ad85201fe8a4e8cdf7bdb121664c7b4edc0659da6b14dc8eaf6adf9827df
 DIST mutt-gentoo-1.10.1-patches-r0.tar.xz 108396 BLAKE2B 86edca04154f96efce27543326f8610dffba0085c7d69e82a7ac5f48ae9cd6662bcf6afa0e55b3d83ec054ee2eb86dff70b0c15a5170f41cc57887e17a661406 SHA512 1e0675803abc2bc116ef6e726f5009c43b0fb7bbf9bd3141a7cbbded51033695ddcc5228612f228cd19dae4181719e756a85e3fa2c8c9a9a4a9aefb4170bd5f5
 DIST mutt-gentoo-1.11.1-patches-r2.tar.xz 107204 BLAKE2B 8064e466b7e1bbf6a6ccea3c1e4749bfd360b5f2a481d2f708ed0eb77dc421dc7c93ac3d4528bd253fb52b1beb91112e8ec38d1ab7c15120e2e854564a592ae5 SHA512 c7ddc28f05062cfbb13d6f385cfe420bb78b57a6b0b871b9bc468c70e4f68f810948cfbafebb88c3d5e5e787bb9432b3f9cad486b22ae6d54023e42144436148
 DIST mutt-gentoo-1.11.2-patches-r1.tar.xz 107784 BLAKE2B b48fba367c0f848cf0d93f6e719da69341a188623c959d0cb2f1f29a258ffa593fba3c5cf374d1825090e1c7e02d3f39b245049e906a0a21bfc1f95af90fd724 SHA512 8ea0743c419fcfea0a5d48feb4b045de6b15e7faba8c5d17ffa28287727dfa4e80abac3272ecc62e965a9a35ef14ff0dc730a63133b97344d0e504697316f29e
+DIST mutt-gentoo-1.11.3-patches-r0.tar.xz 107172 BLAKE2B bb82a95baf3fe5af191d5da7bd56d0f51d43a390be08442c945515330fd11d5d3a0c2893a5a595ea8a23421ec5ea79aa36a05e46ce71d449c28193b819154c9b SHA512 2d1579f03876398eb793548b31fe8bfc15d226651334dfe07a65eff45ab777eebaae66d85dd0a59e05649ae0924fdb45cfced438eb0dff9742bc13b1fb1ae671
 EBUILD mutt-1.10.1.ebuild 9182 BLAKE2B 04bc41d9445b10bb829b7506f76e7d47b4c98a08428f7ad4ba693ba3c1badea96dd69c1895fd3ea7953be657d08913d9a56e6b1a62afc07c9848c6768c249007 SHA512 3439e6b15dbc93f99392ae36e0e5bd36f2f987c1ff4fa65d31195543f97b6ef010bdcec9539acf15ffa03190df278f2e31e152e67883e518243bfc39fb4b3287
 EBUILD mutt-1.11.1-r2.ebuild 9465 BLAKE2B 51353a7eb0ee7cd6f8e12c5320bbb94693d66c00067f19d5cf74e9b96d6536ba6d83ed01e73d276b3d95dd6ec73a25d232c5f3ad2804c2cec3911839082319b4 SHA512 db08486c09688f4022ddc396aab1a1faab19f8d9ed4838df591c352f3ac166e274ad85b6efa984d3f8b206b78a7ee38128a7bf53f6508816999e7fe3c2be42bb
 EBUILD mutt-1.11.2-r1.ebuild 9465 BLAKE2B 9428dcce9c36e85acab9748da77333f83861fe5ccb3af9aa496b68e819aec1629ba95f6576a4a5988ffb7b6774a45362c9d44206826ea3c1f32b50f06c3c2af6 SHA512 f6a9ed44d57149977e0c1c5199cfbdff9f6bda540a63eb7955413a005cc3901ce4a25e8cb2957c5f4eb2cded95f398ebcc2d71f6befb35880968c26482d5f56c
+EBUILD mutt-1.11.3.ebuild 9465 BLAKE2B 34cdefad0da015cb40cdb2ee86e91751b7d0034bdecb950e575272af64c63a6ae583cba3a7354f7205522abf67b61128f3e6cb83250fab4648352e7d2e820911 SHA512 b4ed87fd162eeee0e29ce6d0882e0359c248e2d46cd9cae2cdc087b1c26804fc3844c45417c9030a4c1acf32c3f8b4897d14c489b9d08b3dd727ff5b1f436d8f
 MISC metadata.xml 1809 BLAKE2B 55772e2ff845cd7106179138fcb98c96eb4e3b6a40adf43fee91119d0c8608853f10aa1c32cfe44ff6bbde858670411fa78a9ba33cfb9a34d320d3c9f34ad8d9 SHA512 fca920e7ee455ce8991635f46a1badd4f4a191a21fdaffffea78cabfdb556ad23ca3eaed6dc8474b239a7e71d7610590c3df8b697a996fefbf01143c94bfc36a
diff --git a/mail-client/mutt/mutt-1.11.3.ebuild b/mail-client/mutt/mutt-1.11.3.ebuild
new file mode 100644
index 000000000000..e7a091241ec9
--- /dev/null
+++ b/mail-client/mutt/mutt-1.11.3.ebuild
@@ -0,0 +1,288 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils flag-o-matic autotools
+
+PATCHREV="r0"
+PATCHSET="gentoo-${PVR}/${PATCHREV}"
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="http://www.mutt.org/"
+MUTT_G_PATCHES="mutt-gentoo-${PV}-patches-${PATCHREV}.tar.xz"
+SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
+	https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
+	https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES}"
+IUSE="berkdb crypt debug doc gdbm gnutls gpg gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls nntp notmuch pgp_classic pop qdbm +sasl selinux slang smime smime_classic +smtp +ssl tokyocabinet vanilla prefix"
+# hcache: allow multiple, bug #607360
+REQUIRED_USE="
+	hcache?           ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) )
+	imap?             ( ssl )
+	pop?              ( ssl )
+	nntp?             ( ssl )
+	smime?            ( ssl !gnutls )
+	smime_classic?    ( ssl !gnutls )
+	smtp?             ( ssl sasl )
+	sasl?             ( || ( imap pop smtp nntp ) )
+	kerberos?         ( || ( imap pop smtp nntp ) )"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+# yes, we overdepend on the backend impls here, hopefully one day we can
+# have REQUIRED_USE do what it is made for again. bug #607360
+CDEPEND="
+	app-misc/mime-types
+	virtual/libiconv
+
+	berkdb?        ( >=sys-libs/db-4:= )
+	gdbm?          ( sys-libs/gdbm )
+	lmdb?          ( dev-db/lmdb:= )
+	qdbm?          ( dev-db/qdbm )
+	tokyocabinet?  ( dev-db/tokyocabinet )
+
+	ssl? (
+		gnutls?    ( >=net-libs/gnutls-1.0.17:= )
+		!gnutls? (
+			libressl? ( dev-libs/libressl:= )
+			!libressl? ( >=dev-libs/openssl-0.9.6:0= )
+		)
+	)
+
+	nls?           ( virtual/libintl )
+	sasl?          ( >=dev-libs/cyrus-sasl-2 )
+	kerberos?      ( virtual/krb5 )
+	idn?           ( net-dns/libidn2 )
+	gpg?           ( >=app-crypt/gpgme-0.9.0:= )
+	gpgme?         ( >=app-crypt/gpgme-0.9.0:= )
+	notmuch?       ( net-mail/notmuch:= )
+	slang?         ( sys-libs/slang )
+	!slang?        ( >=sys-libs/ncurses-5.2:0= )
+"
+DEPEND="${CDEPEND}
+	net-mail/mailbase
+	doc? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+		|| ( www-client/lynx www-client/w3m www-client/elinks )
+	)"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-mutt )
+	smime? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) )
+	smime_classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) )
+	crypt? ( app-crypt/gnupg )
+	pgp_classic? ( app-crypt/gnupg )
+"
+
+src_prepare() {
+	local PATCHDIR="${WORKDIR}"/mutt-gentoo-${PV}-patches-${PATCHREV}
+
+	if use !vanilla ; then
+		# apply patches
+		export EPATCH_FORCE="yes"
+		export EPATCH_SUFFIX="patch"
+		# http://hg.code.sf.net/p/gentoomuttpatches/code/file/mutt-1.10
+		local patches=(
+			patches-mutt
+			bugs-gentoo
+			features-common
+			features-extra
+			gentoo
+		)
+		local patchset
+		for patchset in "${patches[@]}" ; do
+			[[ -d "${PATCHDIR}/${patchset}" ]] || continue
+			einfo "Patches for ${PATCHSET} patchset ${patchset}"
+			EPATCH_SOURCE="${PATCHDIR}"/${patchset} epatch \
+				|| die "patchset ${patchset} failed"
+		done
+		# add some explanation as to why not to go upstream
+		sed -i \
+			-e '/ReachingUs = N_(/aThis release of Mutt is heavily enriched with patches.\\nFor this reason, any bugs are better reported at https://bugs.gentoo.org/\\nor re-emerge with USE=vanilla and try to reproduce your problem.\\n\\' \
+			main.c || die "Failed to add bug instructions"
+	fi
+
+	local upatches=
+	# allow user patches
+	eapply_user && upatches=" with user patches"
+
+	# patch version string for bug reports
+	local patchset=
+	use vanilla || patchset=", ${PATCHSET}"
+	sed -i -e 's|"Mutt %s (%s)"|"Mutt %s (%s'"${patchset}${upatches}"')"|' \
+		muttlib.c || die "failed patching in Gentoo version"
+
+	# many patches touch the buildsystem, we always need this
+	AT_M4DIR="m4" eautoreconf
+
+	# the configure script contains some "cleverness" whether or not to setgid
+	# the dotlock program, resulting in bugs like #278332
+	sed -i -e 's/@DOTLOCK_GROUP@//' Makefile.in || die "sed failed"
+}
+
+src_configure() {
+	local myconf=(
+		# signing and encryption
+		# clumpsy blocks for transition period of USE-flag renames
+		$(use crypt         && use_enable crypt pgp)
+		$(use pgp_classic   && use_enable pgp_classic pgp)
+		$(use !crypt && use !pgp_classic && echo "--disable-pgp")
+
+		$(use smime         && use_enable smime)
+		$(use smime_classic && use_enable smime_classic smime)
+		$(use !smime && use !smime_classic && echo "--disable-smime")
+
+		$(use gpg           && use_enable gpg gpgme)
+		$(use gpgme         && use_enable gpgme)
+		$(use !gpg && use !gpgme && echo "--disable-gpgme")
+
+		# features
+		$(use_enable debug)
+		$(use_enable doc)
+		$(use_enable nls)
+		$(use_enable notmuch)
+
+		# protocols
+		$(use_enable imap)
+		$(use_enable pop)
+		$(use_enable nntp)
+		$(use_enable smtp)
+
+		$(use  ssl && use  gnutls && echo --with-gnutls    --without-ssl)
+		$(use  ssl && use !gnutls && echo --without-gnutls --with-ssl   )
+		$(use !ssl &&                echo --without-gnutls --without-ssl)
+
+		$(use_with sasl)
+		$(use_with idn idn2) --without-idn  # avoid automagic libidn dep
+		$(use_with kerberos gss)
+		"$(use slang && echo --with-slang="${EPREFIX}"/usr || echo a=b)"
+		"$(use_with !slang curses "${EPREFIX}"/usr)"
+
+		"--enable-compressed"
+		"--enable-external-dotlock"
+		"--enable-iconv"
+		"--enable-nfs-fix"
+		"--enable-sidebar"
+		"--sysconfdir=${EPREFIX}/etc/${PN}"
+		"--with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR}"
+		"--with-regex"
+		"--with-exec-shell=${EPREFIX}/bin/sh"
+	)
+
+	if [[ ${CHOST} == *-solaris2.* && ${CHOST#*-solaris2.} -le 10 ]] ; then
+		# arrows in index view do not show when using wchar_t
+		# or misalign due to wrong computations
+		myconf+=( "--without-wc-funcs" )
+	fi
+
+	# note: REQUIRED_USE should have selected only one of these, but for
+	# bug #607360 we're forced to allow multiple.  For that reason, this
+	# list is ordered to preference, and only the first is taken.
+	local hcaches=(
+		"lmdb"
+		"qdbm"
+		"tokyocabinet"
+		"gdbm"
+		"berkdb:bdb"
+	)
+	local ucache hcache lcache
+	for hcache in "${hcaches[@]}" ; do
+		if use ${hcache%%:*} ; then
+			ucache=${hcache}
+			break
+		fi
+	done
+	if [[ -n ${ucache} ]] ; then
+		myconf+=( "--enable-hcache" )
+	else
+		myconf+=( "--disable-hcache" )
+	fi
+	for hcache in "${hcaches[@]}" ; do
+		[[ ${hcache} == ${ucache} ]] \
+			&& myconf+=( "--with-${hcache#*:}" ) \
+			|| myconf+=( "--without-${hcache#*:}" )
+	done
+
+	if use mbox; then
+		myconf+=( "--with-mailpath=${EPREFIX}/var/spool/mail" )
+	else
+		myconf+=( "--with-homespool=Maildir" )
+	fi
+
+	econf "${myconf[@]}" || die "configure failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	if use mbox; then
+		insinto /etc/mutt
+		newins "${FILESDIR}"/Muttrc.mbox Muttrc
+	else
+		insinto /etc/mutt
+		doins "${FILESDIR}"/Muttrc
+	fi
+
+	# A newer file is provided by app-misc/mime-types. So we link it.
+	rm "${ED}"/etc/${PN}/mime.types
+	dosym "${EPREFIX}"/etc/mime.types /etc/${PN}/mime.types
+
+	# A man-page is always handy, so fake one
+	if use !doc; then
+		emake -C doc DESTDIR="${D}" muttrc.man || die
+		# make the fake slightly better, bug #413405
+		sed -e 's#@docdir@/manual.txt#http://www.mutt.org/doc/devel/manual.html#' \
+			-e 's#in @docdir@,#at http://www.mutt.org/,#' \
+			-e "s#@sysconfdir@#${EPREFIX}/etc/${PN}#" \
+			-e "s#@bindir@#${EPREFIX}/usr/bin#" \
+			doc/mutt.man > mutt.1 || die
+		cp doc/muttrc.man muttrc.5 || die
+		doman mutt.1 muttrc.5
+	else
+		# nuke manpages that should be provided by an MTA, bug #177605
+		rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \
+			|| ewarn "failed to remove files, please file a bug"
+	fi
+
+	if use !prefix ; then
+		fowners root:mail /usr/bin/mutt_dotlock
+		fperms g+s /usr/bin/mutt_dotlock
+	fi
+
+	dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		echo
+		elog "If you are new to mutt you may want to take a look at"
+		elog "the Gentoo QuickStart Guide to Mutt E-Mail:"
+		elog "   https://wiki.gentoo.org/wiki/Mutt"
+		echo
+	else
+		ewarn "This release removes the conditional date feature in favour"
+		ewarn "of Dynamic \$index_format Content, see:"
+		ewarn "  http://www.mutt.org/doc/manual/#index-format-hook"
+	fi
+	if use crypt || use gpg || use smime ; then
+		ewarn "Please note that the crypto related USE-flags of mutt have changed."
+		ewarn "To remove some unclarity, the following USE-flags are renamed:"
+		ewarn "(see https://bugs.gentoo.org/637176)"
+		ewarn "  crypt -> pgp_classic"
+		ewarn "  gpg   -> gpgme"
+		ewarn "  smime -> smime_classic"
+		ewarn "The old USE flags still work but their use is deprecated and will"
+		ewarn "be removed in a future release.  Please update your package.use"
+		if use gpg && ( use crypt || use smime ) ; then
+			ewarn "  Note that gpgme (old gpg) includes both pgp and smime"
+			ewarn "  support.  You can probably remove pgp_classic (old crypt)"
+			ewarn "  and smime_classic (old smime) from your USE-flags and"
+			ewarn "  only enable gpgme."
+		fi
+	fi
+	if use gpgme ; then
+		ewarn "Note: in order for Mutt to actually use the gpgme backend"
+		ewarn "      you MUST include 'set crypt_use_gpgme=yes' in .muttrc"
+		ewarn "      https://dev.mutt.org/doc/manual.html#crypt-use-gpgme"
+	fi
+}
diff --git a/mail-client/novell-groupwise-client/Manifest b/mail-client/novell-groupwise-client/Manifest
index 4f5cd7d937ec..8c4ea9e1bd33 100644
--- a/mail-client/novell-groupwise-client/Manifest
+++ b/mail-client/novell-groupwise-client/Manifest
@@ -1,3 +1,3 @@
 DIST gw802_hp3_client_linux_multi.tar.gz 209918505 BLAKE2B 9e0788334f5fbe7a69a19d4b81dc439ce9e8b01fc0fb50c9ff9cf34a020dcbbeddb726e10005e4c9d48b7f385327eb74ebbb86ec034dfd405c19c38daf491946 SHA512 3a03ac02954f86c2e797404128441bff980f82cdc9936668fb528aef0190240891f92e4094fe53d58a0684ef8e94ebac7c73fbfa262e72bc450fab8ea9872efd
-EBUILD novell-groupwise-client-8.0.2.96933-r1.ebuild 2537 BLAKE2B e19430ea34e593ffb62f6df374e170a3b34413e4463a9678bae21a06d2d90b75697e61d8ac425437a52277a8e9927bef991e9b4028c3bf3d569d98111ab3faf7 SHA512 61b9b6310e5ec1c363b52a76bf6a9252f9a0d00aea9c3550db01f94f647df76ae88fcc70c189d719f1979045a960430d410c5aa2e50fe191d89b31c877310019
+EBUILD novell-groupwise-client-8.0.2.96933-r1.ebuild 2548 BLAKE2B c279e1cf5c424152dadf08856eee94b53dff79d0540a782f29dbbb12c45975a3c78640357c807ec9ac3b125e01e604b315855512800f89dce51aa803c0b23c73 SHA512 8a05b46878e792bd91a76f79bdb889b3b586bd8287d39e6477d633b999ffac2a40c465cab70b9b3c0ee40e9013f1df45b84221705c8f3fcf5e8faf21efa6290a
 MISC metadata.xml 224 BLAKE2B f5f8be74b864fb579516bbffb5e8adcd95c4274cd6223fe89094a32374858a6b6742846c114fd94a7e6158baa0c83d9dda195c350a609e937010458a4cf6c1a3 SHA512 8793a074cebd46dcb7e9813eb09462292ca552d1e457c8ed5b714217f397cd8f95696f1f92d98ac179876bf39574d20ae4fbd9a5a67548f375a89c7dcd2a6309
diff --git a/mail-client/novell-groupwise-client/novell-groupwise-client-8.0.2.96933-r1.ebuild b/mail-client/novell-groupwise-client/novell-groupwise-client-8.0.2.96933-r1.ebuild
index 4bc65dc713d5..5248da6119d0 100644
--- a/mail-client/novell-groupwise-client/novell-groupwise-client-8.0.2.96933-r1.ebuild
+++ b/mail-client/novell-groupwise-client/novell-groupwise-client-8.0.2.96933-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -78,7 +78,7 @@ src_install() {
 pkg_nofetch() {
 	einfo "You can obtain an evaluation version of the Groupwise client at"
 	einfo "${HOMEPAGE} - please download ${SRC_URI}"
-	einfo "and place it in ${DISTDIR}. Alternatively request the file"
-	einfo "from the Groupwise server provider of your organization."
+	einfo "and place it into your DISTDIR directory. Alternatively request"
+	einfo "the file from the Groupwise server provider of your organization."
 	einfo "Note that the client is useless without a server account."
 }
diff --git a/mail-client/roundcube/Manifest b/mail-client/roundcube/Manifest
index b7de41c9618a..b0520336ff33 100644
--- a/mail-client/roundcube/Manifest
+++ b/mail-client/roundcube/Manifest
@@ -1,5 +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.8-complete.tar.gz 5534385 BLAKE2B 2f0cb528d0901d267c74d57baa18d1f057fdd2eb0f872f3cef1053847861998f8c6551fc17506ae365086ed1f86c3ee9e73a96adb2e43c6c32025e7afaf63710 SHA512 34dc9205cd93be6d6551086f4d22654dad7213b4b09000dc4def08357acdc634744ce1f560144a3d3b46e936258e90482e77fc4c691a55c205bcfdfe3745441e
-EBUILD roundcube-1.3.8.ebuild 2420 BLAKE2B 8ad358236ebe1ff411451869bd4f4599f0e562fa31f0788c94e1ca4f1ad3870731d239f52831a1ed27fd491e1ebc30e04e565c0d2518ab47edddb9c879bbcd55 SHA512 d7dbc9d111f41f3c8f0e246c9ec89a4ab4dde50d994ee2bae2979bd457cd2183f227f7584f4b3ffde2e4ae3d3cf230798f378d3b770568f393f96d07ca663c05
+EBUILD roundcube-1.3.8.ebuild 2426 BLAKE2B 3028d0e6f300d6eaa7d1cda1ec854b2a3f1149dc5a56e29a89a4de71e3e4b1f2f8d927f5f89cc202e78dfa34d603f58430aee493c03c11cfb9edd7636503b298 SHA512 60d2e8bbf22312f9f81a6ade6628e7ed67ca771ba914e8045cabd2786941c13fb0b363575d6b2edfb9f847e92f255b0441535d12655f08588fd479611e2eca9a
 MISC metadata.xml 955 BLAKE2B ca9dd109384433cdaca59b820aae795a4555459cf36f057b17949d601bd5ece8222dbb59502872ac6a16387e55839f859b91a6c6718523aaf66e4b677d25d33e SHA512 ff1b796f79f002814b038763305a404ee2b65d49346a10b423dc8df982ccd4116548c8159bbcd551ccdcdb5824ef6b0774abf6a6bdc851beb896f6e5ed97bf1a
diff --git a/mail-client/roundcube/roundcube-1.3.8.ebuild b/mail-client/roundcube/roundcube-1.3.8.ebuild
index f8f2785064cc..18511c401a1e 100644
--- a/mail-client/roundcube/roundcube-1.3.8.ebuild
+++ b/mail-client/roundcube/roundcube-1.3.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~hppa ppc ppc64 sparc x86"
 
 IUSE="change-password enigma ldap managesieve mysql postgres sqlite ssl spell"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 42220c5d3884..20644e600266 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -179,5 +179,5 @@ DIST thunderbird-60.5.0-zh-TW.xpi 626190 BLAKE2B 43f34e19d95a7ec4b7e51b4e22e8499
 DIST thunderbird-60.5.0.source.tar.xz 285636196 BLAKE2B c1b0040156017c6dbbaf16695feefa29b32d02b74655ca357201dcff22be7c61fcd3d2357e175939aada11c0d0211d0ecd8479528d08168f93f9ca1963cf9fd0 SHA512 b18bad3d0ec33a813ec8f2f7f539a9ba08bd05432a16b1838671a101a85d66b2acdd2573d9fc3117cecaa9aa1429c178d4ddbae987a3ce6e4e4211981eecb8d2
 EBUILD thunderbird-52.9.1.ebuild 10477 BLAKE2B afcc8251288a25fab08a79fa124a4160885c1f0649c5288c170a87de543144c89086aa1c1299cc7bf73edc2c8ff445d9f4805f7c85e698c307181956017398fe SHA512 0e5ec531150c4803e9fdbed0065ecba4817c5fce5c61cc5c5b89e0cf1e7e66cf77b5d10c441fa8da44242261c42b843a0613bfb119db997163f26e87cb27ef90
 EBUILD thunderbird-60.4.0.ebuild 17506 BLAKE2B 1545cd3099e76df51602d7758390701a89aac1dcefd44c1adfaa370b5af8b2d4ca496694e18b73f5a7398a9437e08aa49e59c483bffb2f4bf4e49bb148f3e911 SHA512 a52895b93085328c22b5b5f1dcd97a9b410bb6ebc83e6dd25e99dad50d654d4cc5759202ca5cac108e348c7a7143a748ed0370dcd072b3d80cf1ecf49ec0bfd4
-EBUILD thunderbird-60.5.0.ebuild 17508 BLAKE2B 0fd0e1ae8eeae32a00d1e44074ca3bd26a666a7dde3af364fefecd70ef23d313e75c3e139a8cd1b1b54cbab7b35a30433d5afee7a20dd787cf8d145d4d42049e SHA512 d60b52c4898ae6eec7385d341ed873ed3f7e4f30822123b8a1c5f52152b4c9f7a4607b332d926d7a174fc0bb48b157d232d7472c23f605861a58cb91025e8572
+EBUILD thunderbird-60.5.0.ebuild 17507 BLAKE2B 32478b9cbdf7b455f2960682efffd8c8110fa4b37eb923c28d31437dc212813ec9e3267a8b4a75076c0080de153223a0f696e3459a9b801bf3e2f1f98bb87183 SHA512 a4a69b4f470cc14cb47f75824c18bfad8c1aaae3b652cce600f4712bc189c8e3fc9c43aa52ef6c89f56c946bcb96c152b5095407aae1043d19f767b219519bf5
 MISC metadata.xml 1922 BLAKE2B ab89f183e54a3b58bd9b4b8df547c1172f264d00e3e8d753869d0d421c413bcc8ff06a24dd0910c28c70fd5b05cbc5154fc73ebfddf26e3db4d58d80e6e7d2c7 SHA512 0bdec29294b4b1aa77b965ecf78e2267ac75821c7ba7600783b5190755bd4380c675afbcfcb718a50a765dc35cb88112b8fa4956d298c467e91d21ec84509101
diff --git a/mail-client/thunderbird/thunderbird-60.5.0.ebuild b/mail-client/thunderbird/thunderbird-60.5.0.ebuild
index fc26a4a1a17d..0884a2e75a64 100644
--- a/mail-client/thunderbird/thunderbird-60.5.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-60.5.0.ebuild
@@ -37,7 +37,7 @@ inherit check-reqs flag-o-matic toolchain-funcs gnome2-utils llvm mozcoreconf-v6
 DESCRIPTION="Thunderbird Mail Client"
 HOMEPAGE="https://www.mozilla.org/thunderbird"
 
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
 IUSE="bindist clang dbus debug hardened jack lightning neon pulseaudio