gentoo resync : 15.09.2018

12 files changed, 261 insertions, 11 deletions

diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index ac798391db99..3e048e1d49b8 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/alpine/Manifest b/mail-client/alpine/Manifest
index f36376d22353..eb68791b0565 100644
--- a/mail-client/alpine/Manifest
+++ b/mail-client/alpine/Manifest
@@ -6,6 +6,7 @@ AUX 2.00-qa.patch 409 BLAKE2B 2d74c9835079a8b62721f58d21c10071b69d9c3821ad5ecaa5
 DIST alpine-2.00-chappa-115-all.patch.gz 212705 BLAKE2B 99c21a7b74a4ea04c3bb54947868b31f0e65eef0e35e515d14d9a701e5809fa1a7191444a353de3ba08b821bdf71543faaf261d4a427c2d1e366bbc00d4bf337 SHA512 5e9fcb6a80dbd18bed26109caa6b7aa5eeb88de420861d9998c32f031e8279d6367c28b6670fb54203d1b14c3dc47cf5ad25b42e4949157de64f3f1fd36d0aa7
 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.00-r7.ebuild 2684 BLAKE2B 594c7069474bac9f97bf5038c3d5a3a0fd3fe1eedef1062f80a46d4ec006b0a4e95b5450ac37ce43abf60e56c191f0b670cb72e8d212e8cc9099a834275f94dd SHA512 2af02575f7cfede96b434e3a5563e283b8aef8ffdb7d045089ad7ad86c0e51d6be05a03bbf98b8ad1906f552d618aa2acd183a7b80ec7c5d192e21ea2d3b7472
+EBUILD alpine-2.21.1-r1.ebuild 2206 BLAKE2B 06d13526b9f5dfd0ae4140b4549d7b8e12ea5a2d961af155fade096b8c7b702705230290642ba4812dca100d014459510c7995d9cbe1110384a1a466575a4bfc SHA512 d771105d9a43ec2756b64e0e4300a66fbbc6177f0f219fe1fa1123e95c50615cc7a5f6abc66f0cbf29a186ea51d4ee2df725ffc18bfddf88f7944dbb82245cd9
 EBUILD alpine-2.21.1.ebuild 1996 BLAKE2B 27e5c9baa52016fd349fc56c8593fe8d7be104f24e053be21518d404310f62b397fe01d3f6187f724dc32296a4e8d9e0a4bf3705920a8a9e5d894adb36e01d46 SHA512 cf7346f4db6a1392b3a61d12d2aac4a8c58e6e995bcaa91851af805b1dec87fd7df786edeec39b0559c96cab1d896aa13a312e74d24d26503242a144d46e94a0
 MISC metadata.xml 845 BLAKE2B 1a7529f7bbcb5464d3ea41f8fe9afdacf8ebe099a0cd109f8e4826a4538d7f2025477b0a817eff7e4c02096ad0d2083155e589ef143ef3fd7661909504ea97b8 SHA512 bd16db341dbade41763360c32ebf2d4a33111eb3b41ce43e2619c1fb184d15e9351d518316a603517e28a293f8de22308d6a6aa5f1b0c82adcb67837a3bd5773
diff --git a/mail-client/alpine/alpine-2.00-r7.ebuild b/mail-client/alpine/alpine-2.00-r7.ebuild
index 1d84f4e87279..f9fe604f1b25 100644
--- a/mail-client/alpine/alpine-2.00-r7.ebuild
+++ b/mail-client/alpine/alpine-2.00-r7.ebuild
@@ -8,7 +8,7 @@ CHAPPA_PL=115
 DESCRIPTION="An easy to use text-based based mail and news client"
 HOMEPAGE="http://www.washington.edu/alpine/ http://alpine.freeiz.com/alpine/"
 SRC_URI="ftp://ftp.cac.washington.edu/alpine/${P}.tar.bz2
-	chappa? ( http://alpine.freeiz.com/alpine/patches/${P}/all.patch.gz
+	chappa? ( http://alpine.x10host.com/alpine/patches/${P}/all.patch.gz
 	-> ${P}-chappa-${CHAPPA_PL}-all.patch.gz )"
 
 LICENSE="Apache-2.0"
diff --git a/mail-client/alpine/alpine-2.21.1-r1.ebuild b/mail-client/alpine/alpine-2.21.1-r1.ebuild
new file mode 100644
index 000000000000..a02a0c5018b8
--- /dev/null
+++ b/mail-client/alpine/alpine-2.21.1-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools toolchain-funcs vcs-snapshot
+
+DESCRIPTION="An easy to use text-based based mail and news client"
+HOMEPAGE="http://www.washington.edu/alpine/ http://repo.or.cz/alpine.git/"
+GIT_COMMIT="843b2f16abfd949e09b1c5465387b1b0f724994a"
+SRC_URI="http://repo.or.cz/alpine.git/snapshot/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+RESTRICT="mirror"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86"
+IUSE="doc ipv6 kerberos ldap libressl nls onlyalpine passfile smime spell ssl threads"
+
+DEPEND="virtual/pam
+	>=sys-libs/ncurses-5.1:0=
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	ldap? ( net-nds/openldap )
+	kerberos? ( app-crypt/mit-krb5 )
+	spell? ( app-text/aspell )
+"
+RDEPEND="${DEPEND}
+	app-misc/mime-types
+	!onlyalpine? ( !mail-client/pine )
+	!<=net-mail/uw-imap-2004g
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	myconf=(
+		--without-tcl
+		--with-system-pinerc="${EPREFIX}"/etc/pine.conf
+		--with-system-fixed-pinerc="${EPREFIX}"/etc/pine.conf.fixed
+	)
+
+	if use ssl; then
+		myconf+=(
+			--with-ssl-include-dir="${EPREFIX}"/usr/include/openssl
+			--with-ssl-lib-dir="${EPREFIX}"/usr/$(get_libdir)
+			--with-ssl-certs-dir="${EPREFIX}"/etc/ssl/certs
+		)
+	fi
+	econf \
+		$(use_with ldap) \
+		$(use_with ssl) \
+		$(use_with passfile passfile .pinepwd) \
+		$(use_with kerberos krb5) \
+		$(use_with threads pthread) \
+		$(use_with spell interactive-spellcheck /usr/bin/aspell) \
+		$(use_enable nls) \
+		$(use_with ipv6) \
+		$(use_with smime) \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	emake AR=$(tc-getAR)
+}
+
+src_install() {
+	if use onlyalpine ; then
+		dobin alpine/alpine
+		doman doc/man1/alpine.1
+	else
+		emake DESTDIR="${D}" install
+		doman doc/man1/*.1
+	fi
+
+	dodoc NOTICE README*
+
+	if use doc ; then
+		dodoc doc/brochure.txt
+
+		dodoc doc/tech-notes/tech-notes.txt
+		newdoc ${S}/doc/mailcap.unx mailcap.unx.sample
+		newdoc ${S}/doc/mime.types mime.types.sample
+		docinto html/tech-notes
+		dohtml -r doc/tech-notes/
+		docompress -x /usr/share/doc/${PF}/mailcap.unx.sample /usr/share/doc/${PF}/mime.types.sample
+	fi
+}
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index bbd9e6f065c2..ad717de9db8d 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -2,6 +2,8 @@ AUX 3.24.6-DESTDIR-honoring.patch 1948 BLAKE2B a8f90d369e3428c29ce9eaaf7e4043cfd
 AUX 3.24.6-libical3-compat.patch 10788 BLAKE2B 414a007abf354309bf3c29b7df4dcc7c93ca47c4ffa41dc4d311390a64688b86f8f228502efb3b6999e3df0885af30be4b141ed12efb250364cc9c442f711e6e SHA512 02145b859ab4e559728c5437e0d584fb57273264fb812ce4cfe65eb16b4c7c444b1db96c7ad0c9dcb817a7e71928a3dec3583d08cf3d59df2d3d12f310867231
 DIST evolution-3.22.4.tar.xz 12272488 BLAKE2B 7740d1d6e734fb7212d2b36f0a64dca03360ab059f0ca716522312c490f2b071a8fc6b383c98b429a6cb22ea5afec0e7e6c05dcb63b3908053ee891aa4129cdb SHA512 dd73a11d4d7903be6a99bf0d937f5a217a26f0dffb9dc0cea2ca81142d5783c42f889a8b913d565678e9f55b7f2f2a1d42f06c30e3cb004926c19f44dae3b70f
 DIST evolution-3.24.6.tar.xz 12153692 BLAKE2B ced20d9e08f6b9aac65be6f5ecd5beb861feec40dddc4411b1bdc6519e249de8db8b3319450808d7a31b80386f9830f351b7edacb3c6fcd28fe5fdfe343329f7 SHA512 da5c9062791996735e52575894763597cc957cb17bc0abe46a966f0e3e6706550ce534ae03b2c444d142547119f3a59aec6ee17e0302a002d8437da166ef7178
+DIST evolution-3.26.6.tar.xz 12036120 BLAKE2B b0828f172935ce75bad6e2fa9859b65e96f8b8369d8f2c4b836ef9dd992168dcdca256df4aa0577117819f8d21da3976b338fb66b75f0e2511b7f1d23712befa SHA512 34a6f3ec12c6330c2b742281030f641a0998293663d3c2ac4151eef24067ff95403fec37550be2d8d22e43e334b4349f1ece40b75cc23b1dfcec88a9a694363f
 EBUILD evolution-3.22.4.ebuild 4086 BLAKE2B 43e3c62a5c89f72a4539e92f4695db1fa8e890d4638c81045bf359f53d64d969fc958e20c1bb47885f4ea77895f651e2d023b613ca8ba2f45914947094531303 SHA512 6b419b6eba9a57551b889ca94fc18770789a24a7e8aeba1aa6c49186aa656b27d3045f571f05781aada1bcb18dfecaeff557fa28404a0e5380cbf1eb7b03e744
 EBUILD evolution-3.24.6.ebuild 4541 BLAKE2B f2c413c32d733c4149ffde0022721b60f20f47f4783014cdc8d7f23b9a99ba3848434c1b12c8bea4f273ec5e5e172ca306ddd97db189f7aab039d245c98f46c1 SHA512 97ddd3246d9c601a395f9027d5cbc197ff3f068a63d5dc5132a0e818990a340ab8794ba028a987638fa9402c5d779ad81a550e6234aecf43bced0a49ad71e9d6
+EBUILD evolution-3.26.6.ebuild 4531 BLAKE2B 973ffb34a89591e050d984f3daecbb3d18f8f9d89f974cb224486650b97fad99bbe8b81e128b082f8f0dbc0ce904f8d4207ac7fc8fc1b577be80ec20f2c583ff SHA512 186ca1793f2f3fa23d5975e2b1f71f5f35c3d04619d0974238c923ab59bfe9190a17263bbc8841521d85e3d2adb4c79b7e63adc96486499b333c6c3a1766f372
 MISC metadata.xml 1205 BLAKE2B 66e8fe4cec38cecf66a4a781c5d3498d8f11d72f1298a1df615a1b178b53cfd435bbbbcfbb6805662027be17be00082f429cc1e3c93fd5ce54cd2b88c873df8c SHA512 8713d5f9cbc7efdc7245cb7b18d30132c96095e396a1c8559e8f942c87157b6b5f3de03daade3b6d2ad9fc53067bc938b7af4369beeec70ca01291c198e438bd
diff --git a/mail-client/evolution/evolution-3.26.6.ebuild b/mail-client/evolution/evolution-3.26.6.ebuild
new file mode 100644
index 000000000000..439aa36d8475
--- /dev/null
+++ b/mail-client/evolution/evolution-3.26.6.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit cmake-utils gnome2 flag-o-matic readme.gentoo-r1
+
+DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
+
+# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
+LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
+SLOT="2.0"
+
+IUSE="archive +bogofilter crypt geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+
+# We need a graphical pinentry frontend to be able to ask for the GPG
+# password from inside evolution, bug 160302
+PINENTRY_DEPEND="|| ( app-crypt/pinentry[gnome-keyring] app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] app-crypt/pinentry[qt5] )"
+
+# glade-3 support is for maintainers only per configure.ac
+# pst is not mature enough and changes API/ABI frequently
+# dconf explicitely needed for backup plugin
+# gnome-desktop support is optional with --enable-gnome-desktop
+COMMON_DEPEND="
+	>=app-crypt/gcr-3.4:=[gtk]
+	>=app-text/enchant-1.1.7
+	>=dev-libs/glib-2.46:2[dbus]
+	>=dev-libs/libxml2-2.7.3:2
+	>=gnome-base/gnome-desktop-2.91.3:3=
+	>=gnome-base/gsettings-desktop-schemas-2.91.92
+	>=gnome-extra/evolution-data-server-${PV}:=[gtk,weather?]
+	>=media-libs/libcanberra-0.25[gtk3]
+	>=net-libs/libsoup-2.42:2.4
+	>=net-libs/webkit-gtk-2.16.0:4
+	>=x11-libs/cairo-1.9.15:=[glib]
+	>=x11-libs/gdk-pixbuf-2.24:2
+	>=x11-libs/gtk+-3.10:3
+	>=x11-libs/libnotify-0.7:=
+	>=x11-misc/shared-mime-info-0.22
+
+	>=app-text/iso-codes-0.49
+	dev-libs/atk
+	gnome-base/dconf
+	dev-libs/libical:=
+	x11-libs/libSM
+	x11-libs/libICE
+
+	archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] )
+	crypt? (
+		>=app-crypt/gnupg-1.4
+		${PINENTRY_DEPEND}
+		x11-libs/libcryptui )
+	geolocation? (
+		>=media-libs/libchamplain-0.12:0.12[gtk]
+		>=media-libs/clutter-1.0.0:1.0
+		>=media-libs/clutter-gtk-0.90:1.0
+		>=sci-geosciences/geocode-glib-3.10.0
+		x11-libs/mx:1.0 )
+	ldap? ( >=net-nds/openldap-2:= )
+	spell? ( app-text/gtkspell:3 )
+	ssl? (
+		>=dev-libs/nspr-4.6.1:=
+		>=dev-libs/nss-3.11:= )
+	weather? ( >=dev-libs/libgweather-3.10:2= )
+	ytnef? ( net-mail/ytnef )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	gtk-doc? ( dev-util/gtk-doc )
+	>=dev-util/intltool-0.40.0
+	>=sys-devel/gettext-0.18.3
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	bogofilter? ( mail-filter/bogofilter )
+	highlight? ( app-text/highlight )
+	spamassassin? ( mail-filter/spamassassin )
+	!gnome-extra/evolution-exchange
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="To change the default browser if you are not using GNOME, edit
+~/.local/share/applications/mimeapps.list so it includes the
+following content:
+
+[Default Applications]
+x-scheme-handler/http=firefox.desktop
+x-scheme-handler/https=firefox.desktop
+
+(replace firefox.desktop with the name of the appropriate .desktop
+file from /usr/share/applications if you use a different browser)."
+
+# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare
+# call; if needed, set them after cmake-utils_src_prepare call, if that works
+
+src_prepare() {
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Use NSS/NSPR only if 'ssl' is enabled.
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DENABLE_SCHEMAS_COMPILE=OFF
+		-DENABLE_GTK_DOC=$(usex gtk-doc)
+		-DWITH_OPENLDAP=$(usex ldap)
+		-DENABLE_SMIME=$(usex ssl)
+		-DENABLE_GNOME_DESKTOP=ON
+		-DENABLE_CANBERRA=ON
+		-DENABLE_AUTOAR=$(usex archive)
+		-DWITH_HELP=ON
+		-DENABLE_LIBCRYPTUI=$(usex crypt)
+		-DENABLE_YTNEF=OFF
+		-DWITH_BOGOFILTER=$(usex bogofilter)
+		-DWITH_SPAMASSASSIN=$(usex spamassassin)
+		-DENABLE_GTKSPELL=$(usex spell)
+		-DENABLE_TEXT_HIGHLIGHT=$(usex highlight)
+		-DENABLE_WEATHER=$(usex weather)
+		-DENABLE_CONTACT_MAPS=$(usex geolocation)
+		-DENABLE_YTNEF=$(usex ytnef)
+		-DENABLE_PST_IMPORT=OFF
+		-DWITH_GLADE_CATALOG=OFF
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Problems with prelink:
+	# https://bugzilla.gnome.org/show_bug.cgi?id=731680
+	# https://bugzilla.gnome.org/show_bug.cgi?id=732148
+	# https://bugzilla.redhat.com/show_bug.cgi?id=1114538
+	echo PRELINK_PATH_MASK=/usr/bin/evolution > ${T}/99${PN}
+	doenvd "${T}"/99${PN}
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 56b9e9bc441d..e6b9277df919 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -8,7 +8,7 @@ DIST mutt-gentoo-1.10.1-patches-r0.tar.xz 108396 BLAKE2B 86edca04154f96efce27543
 DIST mutt-gentoo-1.7.2-patches-r1.tar.xz 143816 BLAKE2B ecc845983dc00e388c25ced0ca0c253d9fdfa813e9df6a4f166f4ccbb05cc26b5522fa84ccdfd1f92d5cce7291ac3d70ddefaeac3e13dafc892f924236a62f11 SHA512 21703bc808ae510e26ede38e1dda5d7c74cad15823154584a83209e9dbf68bf6350961e66729cf2ede78bde003f3b92567d42f9f8f89ed53643dcfa536625b7e
 DIST mutt-gentoo-1.9.4-patches-r1.tar.xz 114212 BLAKE2B bb14bb8ce8c2088dd32d6528f60e666d213aa557ce3f830f8ccf6e9199ea2083ea8b6605bee7aba6e96a40d127c076a581de656eabc257a00aa584fba6263fbd SHA512 c011c24767ad8b4a096a91c8531f923057e98e4439f0d0e00e70d761b434fec8c8bb1394e765b3f1be16212df76f99abdaa4f3347299c88f4c73e9b6d13525e3
 DIST mutt-gentoo-1.9.5-patches-r0.tar.xz 113924 BLAKE2B d04ef58a310b913eef783814d608dc495d449baf8efcc43ab3203ef9fc136d26afcfa9261e8ba74d20a9abaa8f672a93aadd7e197478fecb970745a8cc610f65 SHA512 3740c66cffa356501538b16be51575391146c8bb2d0a04fa1f391e781fae52d8fc97d096a543fff3237da83c83b7c219319c7902a91af1d89d3515d5debc3a5f
-EBUILD mutt-1.10.1.ebuild 9187 BLAKE2B cf31eef4a03283219445572cfd167cbc6134cbba9eb6a1590073f7ee3716f444e4818b55caca81be0102718274bb50aba281002f53bd0139a13c2075785dfd97 SHA512 551b715d20f7eeeb8c000cdfc8656940b6fa562d77f93403c8517d93acff0904b9d848857aae08f3ab56c454e846258ed8714ce93918a3a11872e3755a75f488
+EBUILD mutt-1.10.1.ebuild 9186 BLAKE2B c7a021dea37478bfd55c1987cbc3387cbf84e9be2d83441e6e3349a39ff6343ebd8cf7f4d864bb6565ddbf8681175dbc8d052e88aae5b4d886c97d2b00b52e76 SHA512 4531b6ab5e7cde1e90fc155869cd6c5fb102d8b9b2638d23262430fa252eb491d45c06c74666044bbe6e4f4be210f3fc5268f5f7afc901370fab5f4430ff3fe8
 EBUILD mutt-1.7.2.ebuild 7598 BLAKE2B 1f7bd97da41b5d5edd538cba18ca40e4c916451c904d165fc166a2cc4fb75b8c9611a223efc178fcc26d6d9b9c66e6093b2e7b729c652d0c9147a1de16aa1e56 SHA512 a79dda2fc087f9c70befdad3c2b4f67a8ed75ccbe106e9a009d034b1c13fd3079f3d5e1077cfe29792310fa12d255efdfc5104285affaa1050604b5f01b8961e
 EBUILD mutt-1.9.4-r1.ebuild 9167 BLAKE2B 6a4d5caea9682471e41f4fc66d63486b5110e1677048b7e6db8e0c622ba76f9f9d85de2aecb7d60c0fb0633b70937a20938e9531537e23ca9b311a6944c7f155 SHA512 d4699a67185750447df9fd1d3b02abba60abf5a41323c27bd056020237c567fc729e4b65ad10a4cc7c4461b127d9eb2360f87b9a84c7e0fdee640856f352a92f
 EBUILD mutt-1.9.5.ebuild 9187 BLAKE2B 87fb00b9b056b6bc4d36f243221468d3e70867cc7e41bd29ad18d7597f166ba78dcc51b958fe1a66c24127f7f564e72f6496f8fda16b893c3e93e4637d020c8c SHA512 496b3a025566ea72335baead232f1af785797389937e79d3cf4b3b4325ca1b65e48b060b5ca2828ce22ab9858be63eb24b3622d23cf03323abd0e2f6b6ebbc64
diff --git a/mail-client/mutt/mutt-1.10.1.ebuild b/mail-client/mutt/mutt-1.10.1.ebuild
index 577cba9df1ab..fbd14407b225 100644
--- a/mail-client/mutt/mutt-1.10.1.ebuild
+++ b/mail-client/mutt/mutt-1.10.1.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="
 	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"
+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="
diff --git a/mail-client/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest
index 137116d712b9..f8109447764d 100644
--- a/mail-client/thunderbird-bin/Manifest
+++ b/mail-client/thunderbird-bin/Manifest
@@ -1,6 +1,6 @@
 AUX 10thunderbird-bin 36 BLAKE2B 4a1c1d5ff170a7f3a15402e5f52761dacb02e9afc518c9a850355fabf7d1a167f73f51c86fb77ef4ec651fa48cea3010752836feb51dc71c1ba787c95fe4deef SHA512 d65275c671277af884c5de99131dd785754fc68d222029fe2e863f08e821afb98e4b614ae0509b9b0aa7501ef72c52ae469f98806024ec661e09a684e2796d0f
 AUX icon/thunderbird-bin.desktop 229 BLAKE2B 2f9ec11f54483bb5c648a6fab4b95fd0c9b31a645c82f568263fd2b461b43921ea3a8261119ca210a531ca01955050f430fc881ab68a0c463d043953d9d0b02d SHA512 12906325b92fc3c336dc5d083f0b3ff56fd9892dd234abb9fa1a98ff51b718816b1ad50eb4063e718a86341e710e5410bc216bb398feff163eefff434ecaeccd
-AUX thunderbird-gentoo-default-prefs.js 404 BLAKE2B 488c7fa7faea76726e01c459ef41629a946ecc23c4034ec9326be0f124c17d2f39b7e0d6f70a4639d60910035c8af744c169185b1dd04ee21c44ae599f8f949e SHA512 7163d09a6e5760327b4fad5e5ef8402640a1b1bbb173a78101275a245248c2c406a5e5e0ca675b7e7281f07d6d272a8586f007bec39c73621f3261862da93d81
+AUX thunderbird-gentoo-default-prefs.js 310 BLAKE2B fb6473176d37e6377fe556a27c3dda154c93fc8a6cce228536a9d571ccbda1b60b38938a6c83b3f34f0a848b5e255f9b56c0d3ca04377a00013977b5212fdf2f SHA512 cf4192686bb07702239b14976cf42abd33dda539382f489d589fe6e35d926df019a16de86868cc7db0eeb15d4fa6ed1df770c973dbb89024eea9e054df5064ed
 DIST lightning-5.4.9.tar.xz 1891752 BLAKE2B 90b777814db2962ff669430cea5a29ba1612a842fbb0edaca597539e6e2d728a9d90114ec6196fe0d4758a4738a15bc0c985a345e1062cb125617eb84ecf79e1 SHA512 8e54865d50118154c3918d5dec5dade4fb026c24bc697ad2e360db9741509cbdbb71ba9477508a9b209be6c8a8190fb0b5e03d2e8fedcc2cae18f5c9e5a3a496
 DIST lightning-6.2.tar.xz 1647116 BLAKE2B 88a44c7ee6a1395372e260e8d0a0e00a6b2546398000ca701b74f98f85b73424e4126215c94543534ae1159de6644e81583353d53ae15b0e82592b17bf5fb2da SHA512 d51e56c6b21829dafa59cef086afb23f4afdd7dda5b1fdc1f6ad47ba0945e11dbedc826bb9764f42323275e251a48802eb5af2f0e5da27f3a64c105ee9f0dc4a
 DIST thunderbird-52.9.1-ar.xpi 604235 BLAKE2B 7981734de83b22d428e4b988adb938cf7b0ad0b54142ca14cc7e7bdf38729b57f4c9c56a22c939d322ce03aed55d6f1b726bf6fa23d5f35347602691a2b435e9 SHA512 03d93c275c0e38b07519bfbd893118ace69928eedde0d236e72c6900aafe2137641f76155a0e02fcb4b9185ff8e49c04937022b75b0e85d7ea9de05b90e2d727
@@ -116,6 +116,6 @@ DIST thunderbird-bin_i686-52.9.1.tar.bz2 51223475 BLAKE2B a30b4679ff844fc9f9752f
 DIST thunderbird-bin_i686-60.0.tar.bz2 52425890 BLAKE2B 1ac02fcade891d757f6a342ba26d47fdc75f2ce7110c1b72d0dcb39efa118181992d64fff32f02893f0eb0140d1976e32fbb3e55f2a750dcd2543a38561a4e7a SHA512 baf0334ba9803cdb79e1a05a6745f6a87575d52bf86f6169b664903608236eda8ba8965481a58b660fb1edb567c681211f328c3f0b9b298e267b5e572b41f642
 DIST thunderbird-bin_x86_64-52.9.1.tar.bz2 49930254 BLAKE2B d0029fc31e02f6790953fa5bdd6057be9d9aa68151bc70c6effa91c17812604998cddd14ef71f2458331ecc85422dcc069311de944e7b10019f422e50fc88fff SHA512 98a35a81f77b58e6f5fca79ee5a56330f8184072c118b571245c7f686d2a196e0cca6f4df131bee066651fcf69b83ca076bb9dd68fa71dd766962694df8e43a7
 DIST thunderbird-bin_x86_64-60.0.tar.bz2 50256875 BLAKE2B 7ce356f4ad795dab6377b0baa90a41ed818a73ee1f81d269cf0fba161ccd3998787d236e1a699bdfb9c4bcd93738d30e656be3c960bb8fd734826f5df5c5f8fe SHA512 87be28d46f22885c730e89c0a945ed307b23da11e331a5911b21353a53536587f8e95658de591d44a9bdf617dc3d50099f537bebe85680dbf1b3f25c7f18fdfb
-EBUILD thunderbird-bin-52.9.1.ebuild 4736 BLAKE2B 2002dc9eba63e845b7fe90f03796c55afe556300f5728e75af8656de46e4f6c0298087ae8ca953e807eb7fa7a9b62440396298fb4b711b884b0a8934d709528b SHA512 9212c41221a8c0a1fc860f01ef15a839f8f50619b1b2eb7e70518425e119081ca6c7d9ec8a96558b92e369ed47d04449b489f8ae9ab3ddc9e64db64dadc29e58
-EBUILD thunderbird-bin-60.0.ebuild 4718 BLAKE2B b02dc6236364a51663df477a8c3aa5f7c6137141370b9cc4a072336bd32a7fd0921919aa1a82770e9c09f931871d1c6c101cfd2f2e97c40ac3cbaf899cd814ef SHA512 9b74d158940f7870e42077b57fce39d39104b6f4179892f0b437a059afb1120fae294df4868182b98afe87dd414a908dd7db7c66ef7ef290b13354e92ecd0060
+EBUILD thunderbird-bin-52.9.1-r1.ebuild 4736 BLAKE2B 2002dc9eba63e845b7fe90f03796c55afe556300f5728e75af8656de46e4f6c0298087ae8ca953e807eb7fa7a9b62440396298fb4b711b884b0a8934d709528b SHA512 9212c41221a8c0a1fc860f01ef15a839f8f50619b1b2eb7e70518425e119081ca6c7d9ec8a96558b92e369ed47d04449b489f8ae9ab3ddc9e64db64dadc29e58
+EBUILD thunderbird-bin-60.0-r1.ebuild 4718 BLAKE2B b02dc6236364a51663df477a8c3aa5f7c6137141370b9cc4a072336bd32a7fd0921919aa1a82770e9c09f931871d1c6c101cfd2f2e97c40ac3cbaf899cd814ef SHA512 9b74d158940f7870e42077b57fce39d39104b6f4179892f0b437a059afb1120fae294df4868182b98afe87dd414a908dd7db7c66ef7ef290b13354e92ecd0060
 MISC metadata.xml 448 BLAKE2B 6bc86854f6ee50c3cbb028baebbed3da9d37342aca5a628b8d25de7553c0ef76eca88f54daa2d60d7e27564d6ebbd6c342aa69f2b99d4eee0d1a783fda8eb601 SHA512 bb5d5bed37f9880afbba222abcdd39b344e359098825954ead9052ee75b5bcf360cfa9af323480e81fe1c70eb9b3e5d79547772080294495e7c1db7c53d46d53
diff --git a/mail-client/thunderbird-bin/files/thunderbird-gentoo-default-prefs.js b/mail-client/thunderbird-bin/files/thunderbird-gentoo-default-prefs.js
index 5d26710a4f43..99bb2cae7540 100644
--- a/mail-client/thunderbird-bin/files/thunderbird-gentoo-default-prefs.js
+++ b/mail-client/thunderbird-bin/files/thunderbird-gentoo-default-prefs.js
@@ -4,8 +4,5 @@ pref("browser.display.use_system_colors",   true);
 pref("intl.locale.matchOS", true);
 pref("mail.shell.checkDefaultClient", false);
 
-# Disable global indexing by default
-pref("mailnews.database.global.indexer.enabled", false);
-
 # Do not switch to Smart Folders after upgrade to 3.0b4
-pref("mail.folder.views.version", "1")
+pref("mail.folder.views.version", "1");
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-52.9.1.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-52.9.1-r1.ebuild
index c669d7e37dea..c669d7e37dea 100644
--- a/mail-client/thunderbird-bin/thunderbird-bin-52.9.1.ebuild
+++ b/mail-client/thunderbird-bin/thunderbird-bin-52.9.1-r1.ebuild
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-60.0.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-60.0-r1.ebuild
index 6d83bfabe74a..6d83bfabe74a 100644
--- a/mail-client/thunderbird-bin/thunderbird-bin-60.0.ebuild
+++ b/mail-client/thunderbird-bin/thunderbird-bin-60.0-r1.ebuild