gentoo resync : 10.04.2018

10 files changed, 29 insertions, 24 deletions

diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 056381211b59..c34f1a905ef9 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/mailx/Manifest b/mail-client/mailx/Manifest
index 9f485999ca92..3cf2b98cfb9f 100644
--- a/mail-client/mailx/Manifest
+++ b/mail-client/mailx/Manifest
@@ -5,5 +5,5 @@ DIST bsd-mailx_8.1.2-0.20160123cvs.orig.tar.bz2 76715 BLAKE2B c6491cd88e99b62184
 DIST mailx_8.1.2-0.20050715cvs-1.diff.gz 36758 BLAKE2B 825e4a62fa2d33e29c25092ec466e07be6be2abed0f1da5623f37be179cbb1212baade400a621fa838eced88a84393078c67c3126774ff08030680f4f0dbdd54 SHA512 6506261f24d5a022fd9cee596a78488a279a0b39b7281cdad9c3e52b5c7f6c2506a1b24970c28cf7b4ffa4ce2d71fec650f42d22959b53aeca0f160b2885b2fe
 DIST mailx_8.1.2-0.20050715cvs.orig.tar.gz 94664 BLAKE2B 0b0b9f4db18bda8b6572c97c33784f7e29c16d500b3658b79f31fb80947035e2bfc7eaf6e8bc50e621ee13ae5e61d7760aa882c29f0b082ce8974f7b1aa8416f SHA512 1c1d991a0e522b2e78a49b9c78eed80b1f6d4f68ca0427ef720ebe77a3a2881bcd3d63967ab04f5d6f75fbf2212e260e4a841152f8a69d300c46acd90bb48d68
 EBUILD mailx-8.1.2.20050715-r6.ebuild 1611 BLAKE2B b0ee36ea309f4aa4cf1f691f931e3bc303e0d15425425fa439d3b8101b74e27c09b21130062dd582cd0b2fb9b288d3b971c4cbff4703a7400d4b1cbb77331dd8 SHA512 08097bbdade032ffd4ec92527b56ff4aaaaf356e7c6ea990fca3a8210567abf9f5e0c31c46beaf9fb803306fd83642b600a0dc16ef80b4f6bca7ff59eb9cb711
-EBUILD mailx-8.1.2.20160123.ebuild 1257 BLAKE2B 23285dab995be8d862b8b3419ccbedc6a3214fd9fde98472be9efa82ed05dccc22b802204447e1ed3f3a1fa2b4e111151fcfba90fc98258ac555fca5094e83fa SHA512 10bcfb037d1bca015bd0c59c4ab80b04b652754bb312ec5fdf9a24247ac6d0438789e9cbd325f41a3ed96143ccb1a4a6f40d53daa063986b615e2a5940484550
+EBUILD mailx-8.1.2.20160123.ebuild 1254 BLAKE2B da2a38227d81628be9591b41b338f136c484bccbdbc80141b8309a5e2f1398eeaaf15b6e87652f601170b3638c3194ac757e47dea8721787a4d766a666976ae6 SHA512 ef33d5566cd54bdff85a352488882f8ca1783c3747262ba25564b80d8fb69f6be58dbb793ebad2cfa36b1e0da94bb7991e98b46cd06df4f77ccb0580ac7ac8df
 MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db
diff --git a/mail-client/mailx/mailx-8.1.2.20160123.ebuild b/mail-client/mailx/mailx-8.1.2.20160123.ebuild
index 733e6dbf0fd0..5ab5c2a4012e 100644
--- a/mail-client/mailx/mailx-8.1.2.20160123.ebuild
+++ b/mail-client/mailx/mailx-8.1.2.20160123.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${DP/_/-}.orig"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND=">=net-libs/liblockfile-1.03
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 8f6736748e15..d477558fff18 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -5,5 +5,5 @@ DIST mutt-1.9.4.tar.gz 4197655 BLAKE2B b34224622f590f2cb528644c636e6f5ddc39215f8
 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
 EBUILD mutt-1.7.2.ebuild 7597 BLAKE2B 293f44f17fcac1ef39c1a02adeafa4096b57ebf62d4000ce64f2dce89c241cd87f83f7dd96e42b0ce245e5f1e1eae016025187d785c08ec5e2639494b820709e SHA512 4316b6c10d5b70071cc8e0d2185d89056763210bacf626d11c8632ce93e8638cdef2c59d87806b588551db590d8c0bcaebf6b487bb2eaa5c6556d57b51aeb2ef
-EBUILD mutt-1.9.4-r1.ebuild 8852 BLAKE2B a16320bea0df08d20e40087a320b757a82e98df7c293103f9cae10ac1f5539a8180cb93fc2a33e8c88f3d13cf23a2a5a41c891b33cfeb591b35f21bd54e34a3c SHA512 e4acc6b28b04b35c62899173336a7aab99766ad01de3b4f10b6b16feac1e91ba54df61bf2aa73090dae6df6a917aa4ab13d1fa6469f9a1bc42759da9348d5b53
+EBUILD mutt-1.9.4-r1.ebuild 9172 BLAKE2B 26333cd839231fe71fb5df861b45b13a9a65c9563a2628022572ab9ecc47e96c85ca9b7f0d1182f4b74a60f82f91ade1e8ddae71238ad8df79f16c10a2eda803 SHA512 347c532369e24c5eb0a19bcdffe99d2e211f4b2e8df4dfcc79dcde247bdbb7a5d03f6109e78591aebad9f8ed740ce13d8e7b9d66ecc7e431724b1b7fdfcb45d3
 MISC metadata.xml 1866 BLAKE2B 4ce87ce0025fdf35622e7029d1200e0e4ad0cc66dd8bb40e1830d2fbcbc2d2de6e22c46ef86579c50224e17df42efcb349a1df55bb836eb5649110440aba17bc SHA512 1c494d1b5a628417d19d836473da2ba99e1d0f1e6f5a453f03ef84f9c601d2f31f53edf03bd242abfa8cb2a7f84de9385014828b607c1fbd6de38acdba228b82
diff --git a/mail-client/mutt/mutt-1.9.4-r1.ebuild b/mail-client/mutt/mutt-1.9.4-r1.ebuild
index 158b60319d21..3a03f9c5bfda 100644
--- a/mail-client/mutt/mutt-1.9.4-r1.ebuild
+++ b/mail-client/mutt/mutt-1.9.4-r1.ebuild
@@ -15,8 +15,9 @@ 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 ) )
+	hcache?           ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) )
 	imap?             ( ssl )
 	pop?              ( ssl )
 	nntp?             ( ssl )
@@ -27,7 +28,9 @@ 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="
 	app-misc/mime-types
 
@@ -171,13 +174,15 @@ src_configure() {
 		myconf+=( "--without-wc-funcs" )
 	fi
 
-	# REQUIRED_USE should have selected only one of these
+	# 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=(
-		"berkdb:bdb"
-		"gdbm"
 		"lmdb"
 		"qdbm"
 		"tokyocabinet"
+		"gdbm"
+		"berkdb:bdb"
 	)
 	local ucache hcache lcache
 	for hcache in "${hcaches[@]}" ; do
diff --git a/mail-client/sylpheed/Manifest b/mail-client/sylpheed/Manifest
index ccf29d8bab69..91013296eeab 100644
--- a/mail-client/sylpheed/Manifest
+++ b/mail-client/sylpheed/Manifest
@@ -2,6 +2,6 @@ DIST sylpheed-3.5.1.tar.bz2 3561816 BLAKE2B 811d433a2930d32dd6d2a5aa3010c4cfe54e
 DIST sylpheed-3.6.0.tar.bz2 3568998 BLAKE2B 283ea6c956eb67332b9f1ba34cecb2be853a079d398b5165e925b9adfe33b75d5eab559b91a707b5c76d9253f35acbf4177afcbb90e86fb48b45bcd9aa517768 SHA512 84c59e327690ed7e637e9ce60e630da6cdad771ccc278e31e490ed643da55c295fb47e999ad421fc59dbbcfed990882022b96cf478bd47253692d2e86279c591
 DIST sylpheed-3.7.0.tar.bz2 3612328 BLAKE2B bd8182db8a46b956e12b3da4b15d3ee8184a612e2fb216aca20fd4a022610b17416f994d36b390a5a92835915e95f08bd59bf71154a86962c9564162be891f21 SHA512 490837528bf7ba9d26994cd5fff00b6e5390a127419b9d0efd9fc25c38be1291d55c5b8daebdf5ca9d9159a51c938449e76212328f3eae40cc039db88cb5caa4
 EBUILD sylpheed-3.5.1.ebuild 1562 BLAKE2B de18e090c09ad9df8e8ff26fdd2af1499e7f7c273891cd6b74f2852209f42b8713ce320b20fc6f0a4dc4fd0f684de720215b2cf0c06b946aa765d566bcce87bf SHA512 d7660a0451164cea86d5c52a19ec3823a1ee6dec6a9aeb67155c447efc9db47735b0eddd2e4703d39bb15c71168933b75701ab0a138d17cc8a4852f8909b72ca
-EBUILD sylpheed-3.6.0.ebuild 1617 BLAKE2B e3e6bb60400bc6b3cda4d2faea44897f8acc17dfeec65c37e33416ce61d956db81b7bbd2b082545484413176f05f5b562b080455ee9f55f6113b01f3bfc28ce3 SHA512 65d4c1d6bdbf6638d1b23bfa5cdb28ef198037ac2d2d81a75d7e7d8ad13ef863363fee6f5bdf6ba3028914354910dd58db80be3b20da0f5b0f71496fe7a99be1
+EBUILD sylpheed-3.6.0.ebuild 1616 BLAKE2B 8c8693e53d6e421ca79ef5c0f3b4ff72de4a85a9604e6f804feeb2df15596aa38580a7657df2c871ae0449fb5dd60bac48decc82e0ce5a5f055b4ace2b751017 SHA512 b2d0169576bd7cb31979ffae86b288b2bffb041873d22f4cadf5ae59c5c8a853fd1a3b23b1d002500a92e9bbbc60306e77a2edfcd1d8b0e44026585b07b74892
 EBUILD sylpheed-3.7.0.ebuild 1623 BLAKE2B 8f6bcfdb9684cb2091803a3125eaccacb3b980e21a324a60f5becae76a360582ecd8a63b64200774f26731a46995beb0184327e2463321690cde42df0d77ed86 SHA512 9ca225e89923b4eeda0439377c362519a06eac6696cbfe72a262390103e77ebeb17f9b40e85e9ad1b3a2070111fb8a5edde371863e71beca28e954b5ebad342d
 MISC metadata.xml 440 BLAKE2B efcb9ca3d9130ca42ba924b3466975f87869800e50cd286d892331a0bf97b21dfacd3fdf02704091341a391e60052ee2b3322f2e90dfe66b076ff4f1db51fb31 SHA512 69ac2f825b9dd04550e139906f492e50eceb5e8922a95b2a44196c664215095dbc0809f9677d403dcb7deb5093dc0c8723b56ad840b3a93ea9101b55ac38de84
diff --git a/mail-client/sylpheed/sylpheed-3.6.0.ebuild b/mail-client/sylpheed/sylpheed-3.6.0.ebuild
index 98b90da34967..ea2a5a03bade 100644
--- a/mail-client/sylpheed/sylpheed-3.6.0.ebuild
+++ b/mail-client/sylpheed/sylpheed-3.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://${PN}.sraoss.jp/${PN}/v${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ~ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="crypt ipv6 ldap libressl nls oniguruma pda spell ssl xface"
 
 CDEPEND="net-libs/liblockfile
diff --git a/mail-client/trojita/Manifest b/mail-client/trojita/Manifest
index ff0eca151363..690ad5536348 100644
--- a/mail-client/trojita/Manifest
+++ b/mail-client/trojita/Manifest
@@ -1,6 +1,6 @@
 AUX trojita-0.7-gpg-tests.patch 1465 BLAKE2B f336368c8166987dc096991a0855a05d83374b7d509dbd8b39e7a12f6f8b14b86c6405ea55882192601163cee9eadaf9ab306bfbdcae347857bf4dc2f3c5908a SHA512 e494de83085dbbd7c545e47fcb1116cfb48e787f7b8706bee51f30f74a9047d1cf835f20086355671643ee0ef88d01428683999765d4bb59c3d9d943e92c69eb
 AUX trojita-0.7-gpgme.patch 1416 BLAKE2B dba95c0954a6ac704e5145d140e905bf6f886db4b84f7a5dbc67ea0494b188d9ff79ccf096faaedc6a179167bc9394ced0203e9df69cc6368694e885fbb61836 SHA512 4031feb66e7ce53e5669e00dd8ca91a6a53a22207aae90e13ef38012777b76275911d78fbdcd58809571a7c649fb4025cdb7de97e9793102c62f5e8b7b0561e1
 DIST trojita-0.7.tar.xz 1038212 BLAKE2B 92dfb01fc1849d04958fd26ea731835c7287d5a6989d8e0c97c6679ce8f1c9f33a0f67c3f293fc85188e9d289c0dddee9847f4151b6f64396f3de86635b11f32 SHA512 fe4d9316f97d913619f27d24a5023c3d8dd4a6b9fb058651be12c67188f394aa8cbb60c7593e5eb28fc12fc883b76deeeb5f4f631edd255fdec4c5862c9a91c8
-EBUILD trojita-0.7-r2.ebuild 1849 BLAKE2B 034ab5206bff312447204ff7e8fcfcdeb154f94da3f30af5c24602e50b0c7205431dc8792d9e9b66e20965d66dec6dea57e3ddebee20e3132ef79dfdddfb82f4 SHA512 54c1095763d5b3b4a97d84f996ab0c316bdd0c35271f4715de2f024e2e4506efa29e28e4b50dffa464eaad7fb7e4136aa63e6142c46fca7dbc2e14ffb6951b32
-EBUILD trojita-9999.ebuild 1769 BLAKE2B a8699c6cb23ec6844866ad9b6538f5ad96451b013ddfbe881fc35cd98682a4d458ed0b215ffb64bad5d297b754425955ebd2a6fe46e5baa22e3ceb89b25ba983 SHA512 01280ad986a648dc5cde48f195b5a32610c7fd8b787c439e6ae3d631162676159688e2e40f03aab519a7c29d0888619b11a533eadb6a622964e86b39ea836b1f
+EBUILD trojita-0.7-r2.ebuild 1842 BLAKE2B 5e1ce49a18be6db8e23146b2e06ec0573843abb2d92919b71694693a2a459c47776974dce585c96f58c7c4fd495aa454f6b3b990026ea814798d412a2aa7e503 SHA512 26f788471744577804fdcd0c99ba23468dea37b8d6e75afa775f23227babe099fef32d253462918eab65aea5c494a71ee2106989328472939c21fe4620f98959
+EBUILD trojita-9999.ebuild 1762 BLAKE2B 656a86170f4be86d501226b1b5cc7dd4e423687c53e281d6841ccfba8d329f5a595ca5c2a1a8a993a243a057e226ac5ba853c5891ebcc4ec6b142322ee6eac89 SHA512 470c450bf372fe8945df1483abd6b30e09c51110a7f1a864d7ca60a116f8171a409f43bf63ff3c43fef36e4f57a721be2d119f57d19dcd8ad1b607ce16cbc722
 MISC metadata.xml 640 BLAKE2B e60d0eb2b469e6b8f497b6884eea116364f3fbc93632b76367386e65a8d1f3b0a7dff42c48e2a2959799cc61febf5022d3d6ddb4ad6e5e3535dc08ab4633e813 SHA512 3149333258d5506d34854c9b0cc3da3f6560d9a44cf7b26a908e7c2726a145ccfc98c1b521bb56da74517af196e1c3f53a4f0c1d9f4e27fcd3493f5350a4e8e4
diff --git a/mail-client/trojita/trojita-0.7-r2.ebuild b/mail-client/trojita/trojita-0.7-r2.ebuild
index bc979f3f5ee6..7bdba08a79cc 100644
--- a/mail-client/trojita/trojita-0.7-r2.ebuild
+++ b/mail-client/trojita/trojita-0.7-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-EGIT_REPO_URI="git://anongit.kde.org/${PN}.git"
-inherit cmake-utils fdo-mime gnome2-utils virtualx
+EGIT_REPO_URI="https://anongit.kde.org/${PN}.git"
+inherit cmake-utils gnome2-utils virtualx xdg-utils
 [[ ${PV} == 9999 ]] && inherit git-r3
 
 DESCRIPTION="A Qt IMAP e-mail client"
@@ -78,11 +78,11 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 	gnome2_icon_cache_update
 }
diff --git a/mail-client/trojita/trojita-9999.ebuild b/mail-client/trojita/trojita-9999.ebuild
index 4988ce563e13..070ef4d1f87f 100644
--- a/mail-client/trojita/trojita-9999.ebuild
+++ b/mail-client/trojita/trojita-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 EGIT_REPO_URI="https://anongit.kde.org/${PN}.git"
-inherit cmake-utils fdo-mime gnome2-utils virtualx
+inherit cmake-utils gnome2-utils virtualx xdg-utils
 [[ ${PV} == 9999 ]] && inherit git-r3
 
 DESCRIPTION="A Qt IMAP e-mail client"
@@ -16,7 +16,7 @@ fi
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-IUSE="+crypt debug +dbus +password test +zlib"
+IUSE="+crypt +dbus debug +password test +zlib"
 
 RDEPEND="
 	dev-qt/qtcore:5
@@ -27,8 +27,8 @@ RDEPEND="
 	dev-qt/qtwebkit:5
 	dev-qt/qtwidgets:5
 	crypt? (
-		dev-libs/mimetic
 		>=app-crypt/gpgme-1.8.0[cxx,qt5]
+		dev-libs/mimetic
 	)
 	dbus? ( dev-qt/qtdbus:5 )
 	password? ( dev-libs/qtkeychain[qt5(+)] )
@@ -40,7 +40,7 @@ DEPEND="${RDEPEND}
 	zlib? ( virtual/pkgconfig )
 "
 
-DOCS="README LICENSE"
+DOCS=( README LICENSE )
 
 src_prepare() {
 	cmake-utils_src_prepare
@@ -73,11 +73,11 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 	gnome2_icon_cache_update
 }