gentoo resync : 28.04.2018

11 files changed, 25 insertions, 17 deletions

diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 47512af9d45d..764c28d1008c 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/dbmail/Manifest b/net-mail/dbmail/Manifest
index e60c4e437c53..d0bf948bb6ce 100644
--- a/net-mail/dbmail/Manifest
+++ b/net-mail/dbmail/Manifest
@@ -5,7 +5,7 @@ AUX dbmail-timsieved.initd 1558 BLAKE2B 79990327315d5f61262f519f9236910fc1043cca
 DIST dbmail-3.2.2.tar.gz 2444241 BLAKE2B 0fb601e66aa0b41b85c0d4ad4cb6cec6e09358cab0dd7c792cd479ecbab0d94d841b9d8e3610cf7f0e90eca82671c6364ea2b26ca794edf6bfe6630f4a7b88c3 SHA512 a2125ea3b9d0ec387135d87854510f36ef0fe87b70f33d54f8af89f22a83802e5838979ba94d6ba66ef986f6f67b08aa6d5e2bfc2f1f2bc44edf03a9f51afb37
 DIST dbmail-3.2.3.tar.gz 2444227 BLAKE2B baa812fb3e925e6d896762596426208fc2ac5fcb01cb8100cfbd0464f1342f934c099ca52fd857e05fc82b97227155e9dcfc987d6c9b5c37e7daf21b167c9841 SHA512 29cc89830278f2ff28a4221fc81d4ff13cc371fbca7fb51d5376e9243234220b552cb4b6ec035c150e6cfa178435c4f36b9ce132fc02334bc6cdeb1a41c8ed85
 EBUILD dbmail-3.2.2.ebuild 4851 BLAKE2B 0bb2a237364f867f483e0f99dbd9eb434337f2941f5eb72e89d31c4e7e6bfd741f1b6f1f615fde1d9453935a677b7a9ed392860def571ab3c8dd3ec2f1daef17 SHA512 a94c7341158cb6d10d56c16b93d9d34f317f0cccd4cd70365267b4fac2c64dc1dea2e1d392baddf013cff7a97bcd8487c86466d8a6d6f150475baeb908349aca
-EBUILD dbmail-3.2.3-r1.ebuild 4613 BLAKE2B a3a6c512bbfce63c0b878bbe4eafc6cfc9a34ce5cd3d9a38f9ea37471e6920a3996f3d6970b7d35c7d1f03c2e0124f953a0b51f90fc264c3a2c624f5ab70cb27 SHA512 c1957a239fd669a6262bc22a2fa30649640cc67af44cd29a299ea0d1bb2f5a7689fc77376123e7ede1ad5eed10554dfa8c100ff4497c5bb5ae1b3168103202b0
-EBUILD dbmail-3.2.3-r2.ebuild 4715 BLAKE2B 33e881d875c01ac66f4fab4b8b4a259be0598770eb60c706208752ffae9b1d8567677b443fe74486d8ea181a02e0f30f216ea558ded97dd2a0337e0145687ec2 SHA512 785a447392075e52020ddc95b7d44d77493e95de01da08502553070ca56a71ff4f9a3a18035f2f2eabe86fd675d87222e27a3a0c943e5839dbc143aaf1fea69b
+EBUILD dbmail-3.2.3-r1.ebuild 4680 BLAKE2B 97cf83e0334b3c9f595bdaf535b5033c2e98be7343631e3b6942d8ed83e540e77c03ca2aa60f1941ee6179dd51cf571554ec40bf9a969f28c920c2f3cf19fd34 SHA512 a6735361b215507ab298b9c7d1f701f10e90b9a6e79c5b73b7e0a4e11d630ddcd40de89d318359b0ad3cb84ebe270942290563b1b5dc87a60ede08a6da95f155
+EBUILD dbmail-3.2.3-r2.ebuild 4782 BLAKE2B d8f242f55ea4d9400e79d7d6c3ab3c8b91cb782b99c413c87358c53ad57edadb801fe71335ac7fbf14a7705972ae015b94ef8670f15a63ccbfa5a38f5efb95b2 SHA512 bc68b548a4ff3cfb0e10eac6da813fce88bf61a01854045797deac3e120384f3e08662fb0ade81bbe9bd70eb7b5c16d2262e84a726236dcd50f6068a4bf99717
 EBUILD dbmail-3.2.3.ebuild 4853 BLAKE2B 0aaa8ad89b7c999b6c5a66c215d3152ed93bd2a895e9be4260fb246af5e3e0d60c7d19d12c65ba32ccf23613ccff88a2c4e68f01bff3961c1fae7e344b3f9694 SHA512 a52a6edfe30085c263c4f3b4b83e475917d63f68a36f765fea643a30845d0eac2ed503b499b0d0a4351426b4cee839bccd30cecaa6f22c6f80deb226aa5c7427
 MISC metadata.xml 681 BLAKE2B 235beb3355fffb0d6508af4753088efa341d74a62b87481bb5012c2668ff79194796ede4e76960dd1aca3f2a4a576268a0e36eb8b83ad012418611db194cd2ce SHA512 905c493d1ec543b10a58a152a4ea78ce59e831eb477baebfef4e930c39f268f24bccacb06ebc9ddbe398da27bf222910004fc6b74712b48bc619f7dbb94c60e5
diff --git a/net-mail/dbmail/dbmail-3.2.3-r1.ebuild b/net-mail/dbmail/dbmail-3.2.3-r1.ebuild
index 61bff9022a7b..9ac49a99e820 100644
--- a/net-mail/dbmail/dbmail-3.2.3-r1.ebuild
+++ b/net-mail/dbmail/dbmail-3.2.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="http://www.dbmail.org/download/$(get_version_component_range 1-2)/${P}.
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="ldap sieve ssl static"
+IUSE="ldap libressl sieve ssl static"
 
 DEPEND="dev-db/libzdb
 	sieve? ( >=mail-filter/libsieve-2.2.1 )
@@ -24,7 +24,10 @@ DEPEND="dev-db/libzdb
 	dev-libs/gmime:2.6
 	>=dev-libs/glib-2.16
 	dev-libs/libevent
-	ssl? ( dev-libs/openssl )"
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
 RDEPEND="${DEPEND}"
 
 DOCS="AUTHORS README.md INSTALL THANKS UPGRADING"
diff --git a/net-mail/dbmail/dbmail-3.2.3-r2.ebuild b/net-mail/dbmail/dbmail-3.2.3-r2.ebuild
index 6d19833506fc..2875f819a206 100644
--- a/net-mail/dbmail/dbmail-3.2.3-r2.ebuild
+++ b/net-mail/dbmail/dbmail-3.2.3-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.dbmail.org/download/$(get_version_component_range 1-2)/${P}.
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="ldap sieve ssl static"
+IUSE="ldap libressl sieve ssl static"
 
 DEPEND="dev-db/libzdb
 	sieve? ( >=mail-filter/libsieve-2.2.1 )
@@ -24,7 +24,10 @@ DEPEND="dev-db/libzdb
 	dev-libs/gmime:2.6
 	>=dev-libs/glib-2.16
 	dev-libs/libevent
-	ssl? ( dev-libs/openssl )"
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
 RDEPEND="${DEPEND}"
 
 pkg_setup() {
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 83f08bb236aa..ad7365661adc 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -17,7 +17,7 @@ DIST dovecot-2.3.1.tar.gz 6703089 BLAKE2B a9a021531241f86083cd5bf31f7b9211df77b2
 EBUILD dovecot-2.2.19.ebuild 9072 BLAKE2B 27ccb93298e73d91e8402b6fa0666a35d0cc4c59ff5ea5a5b5a8c1e421b75bb29d6ded7d0a8ae3128a59ab39c88ca89dffc383bb85353e4236174397e119a8a5 SHA512 46683dd02f04b8c03a6261983e89ac0b3bf1b80ba05e7a574c0275f0699ab6c85a0f44cb4106b1d967a83f8f92aa4b8a74eced4054e7e14ee128a08ee118c3d4
 EBUILD dovecot-2.2.29.1.ebuild 9215 BLAKE2B 4797bfb9f28d498d156d75e5837211ffba13f60da38990b55ef62960479af213a8a4eadb4de3b95a2d600089edccd3ec406cf97744d13918598020f18e756458 SHA512 e83a87950486c3f0b07b856b98430d99c42b42fb32fd796c1ef4ed192e05dc3d774429281e73a806855e809cec0e3ff1a7c6209de5d7608e01d17a29a3653bae
 EBUILD dovecot-2.2.32.ebuild 8655 BLAKE2B 9f500ad24385b63fe899c6c66e546d6e3f68f9059af9d7c10d406e3df75a4085a38ce19dfaaab7a7b1d022d07fef4bdcb033d1d20fed5752a5f864f0a0ff8a0e SHA512 f4ca664c39c32400528b5e01a8c0e58ef71d51f4ef52c827ec58b66bffd96281ddd91dad388be496ab78f887746f4c1ac9deb272ed108854e542ce5d4ae2348d
-EBUILD dovecot-2.2.34.ebuild 8654 BLAKE2B 63cbb9a4c7626db3726147d33c37066289055b7cda3dd7e5e2a0b4094fa698c9f05f76611dc20c8cb6425a5b3fd955f7b926d466f06ae8f0a681ddd2628837be SHA512 6102d9a667a90dd99574e0dcc1e475e46c8cf118f6fe0b2656d2de41944ae59f56dad5520bca481687af1ae56d460e159e6dd5f8730cc5ff10dd2a108772914e
+EBUILD dovecot-2.2.34.ebuild 8653 BLAKE2B 64e6349d3c3ffd2b884bb41e27b87d6fc2d678241f5826e3c80c6b99f20a7d4ea2da707c99ce7b215da3120f51decb5f28439399e3582f66ef65c65f03702e3e SHA512 0d8512e55d31a30a3629e595b1b4fe0e7ba6bac413173e8741399f47daea7c7eabba01ab54040049d254f982ec5e2ffc909c568aed86c107e0632ecc12749b4a
 EBUILD dovecot-2.2.35.ebuild 8680 BLAKE2B ee3b5978fcda5ffe294bfa7dde81c6018a4023edaeb3d8fc74ce14edcc414ffeb41f87807cf1a25f4e07b2d563ca32e0a5fe57f565c3268455fcdee69205b74f SHA512 d65e27a65e31e9d1cbd4745c5bf46c73d0d4bd7e1d073f26490b4473ed9b4ea5b0cfaeefcf271cefe909b9a4d932d52f85b937e9a6de3430e9b20ed70c604933
 EBUILD dovecot-2.3.0.1.ebuild 8678 BLAKE2B 6ba17ac442f7d88698444bae891690e4fe840d0b3fb0ab17033639f3c38b9a7da3041fe8dfaf42dab6269519a23b0300773b89a9b5dd9129a89e02a25b9e3e6f SHA512 6f058b5793c9c1ffe2cd1894fb4f40508befd87a36a66c00d6f5d202e99b014a638ff873eb68ffd7ccf59ff3941cb27f2981a4658ce7b8402d3c24449ff1fcf5
 EBUILD dovecot-2.3.1.ebuild 8676 BLAKE2B ea98fd811bdfec3f54d867a82598c46b0853c370ee06df43aa033eb4ea272385b2783ae91a577856e3a975ffabb251ca2073789612b66259b1f0216a51297219 SHA512 aa2b5e14e32fa6392a193b987eef13dbdddd725b61aba22e45b4bc3e466086d55ebfda58bd2d8ed93dc55ec7823eccfd5de311955693e9a0c362a8723aac4a48
diff --git a/net-mail/dovecot/dovecot-2.2.34.ebuild b/net-mail/dovecot/dovecot-2.2.34.ebuild
index 31dcedc18f0c..00fa9fc389d3 100644
--- a/net-mail/dovecot/dovecot-2.2.34.ebuild
+++ b/net-mail/dovecot/dovecot-2.2.34.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="https://www.dovecot.org/"
 
 SLOT="0"
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~ppc ppc64 ~s390 ~sparc x86"
 
 IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
 IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
diff --git a/net-mail/gnubiff/Manifest b/net-mail/gnubiff/Manifest
index 964ede7e4ea7..36e751e5109f 100644
--- a/net-mail/gnubiff/Manifest
+++ b/net-mail/gnubiff/Manifest
@@ -3,6 +3,6 @@ AUX gnubiff-2.2.15-gold.patch 511 BLAKE2B c0ef1cdecfcc91ead4d1adf5e3fdecee1b4d85
 AUX gnubiff-2.2.15-underlink.patch 337 BLAKE2B ea045a75986fd13e63549b7f187315ac7979ddf71b0be7ad4bd6ab3300af7e74fe4f9ccf8be01753180949648c7018b23eb51f9fe67e34725eeed621658a6c44 SHA512 6d03040784eed725848cde01533304e33c8b0045e0488936a9782ec2edcb8492ebd47fb263ff142510e0e96c06e60c3de84bb074171e54ad2860e6b3c1d4eeb4
 DIST gnubiff-2.2.15.tar.gz 851638 BLAKE2B dd6d8527664470497d0f7eccd5f435f06f67935a831ace025152f717986c80bd39d49730f1f92b94ded4da8fd0d6aba30705f81b245c6a51dc8257bfe6c95238 SHA512 592a9934f34cec65869bef6bb7a488fd1a44515d513e47b440a36ef15ff9c44dbedb33c27e375ac6cc9590d9a0f02b315307913059f3d7e44ee64a87d95f52c4
 DIST gnubiff-2.2.17.tar.gz 897817 BLAKE2B 5ee58828211eb7b85ab017129feec48c6d2b2df4de862f7791f15f361bda7919cbdc7aa37403130da044a1f9e2068154ddc5ae8629eb9f4d38956d759477fb80 SHA512 2fe715d584fb057255d4922275de152ff5b1167abcbdd27d33124921a4c659c3db301944a73d58622ecd22f62615d44b5bebb83838bbd53c67a2dd8286592d89
-EBUILD gnubiff-2.2.15-r2.ebuild 1077 BLAKE2B 0ba3a26bc0b238fdcd42b054c2fb9aa9758d1ea61364719b8d59319977934d42a3be2def99af4c3a97c51680d66aae54013e103b8cc16dd5db123eff3bc42f7c SHA512 c673ae24f23dbd097bdfcaa68be4a456f8a77a790881e406ffdef3f7b9f15cf0c6878f22aaaa0440c5aba6412bf012d6c1e15df2b4fbf2a1b3ba121dbd3894ed
-EBUILD gnubiff-2.2.17.ebuild 1127 BLAKE2B 40b5f62531fc267c18d60ec5a6802b5cb76c1e515cc2d2058698fb12bed1c980d4c9284ad26c150fa721c85cc231426e04fba828ded2f9850c23d619fe3fccd5 SHA512 2bfd8d085705f1dc3cad98f00c6a49c7ac9ae44262f8118728f8c263a06f5bf7eed406184028d49f472503025e6f8521db4b22a26ecbf43bcbeab6bd9b53243e
+EBUILD gnubiff-2.2.15-r3.ebuild 1059 BLAKE2B f0b824e9610600bafc9a3a634333d261c7ad080233eac7495804510c23c26daac1433a2efa373e65bd9cd40222050236594e56b7ccfd0a38b9065d724a739ca0 SHA512 d6ab12975a623075abd8ebdd479f0d43d51397166e585abe27f1987816bd48c9659fdb4ecac72e4e3a7eef94b07a8706d1e9631f69339dbe7e184ff9eee7bda0
+EBUILD gnubiff-2.2.17-r1.ebuild 1109 BLAKE2B 92424de5c679d56c01ce2f5aaacec79d39c29e4f70f6837ed8656771e2dbf6f7fd90bf39895bd412385b81bfad0ade83a3cf56caeab13bde6a393f3761e82c6e SHA512 7ba8e1bc715f9f9aa3843ba02b00e9e4788172821ea01b12c6ba114d5af0fb9bb432f6fc470a293161a4ee35ecca1dc8a91d16a9836622d51f4473e6e3544170
 MISC metadata.xml 441 BLAKE2B 32d4e54f87f31b0c58ec3ed963923431c65507c9d8bb42607c2fab2a5e7ac4769c3c8211aa1167108f9ad2891fd64bc79c646af3b90b99055bcce4941cf176de SHA512 05e73c040168ab771d6b48e72ad1f24ff2e85fd6aef619f0bff8cc06b0f0ffd52816ee48ae2c3d7c58fab4630242c9d20945ea8a06698db7f768074328690a27
diff --git a/net-mail/gnubiff/gnubiff-2.2.15-r2.ebuild b/net-mail/gnubiff/gnubiff-2.2.15-r3.ebuild
index 42858029624e..d37d1433a5c2 100644
--- a/net-mail/gnubiff/gnubiff-2.2.15-r2.ebuild
+++ b/net-mail/gnubiff/gnubiff-2.2.15-r3.ebuild
@@ -19,7 +19,6 @@ RDEPEND="
 	dev-libs/popt
 	password? ( dev-libs/openssl )
 	fam? ( virtual/fam )
-	x11-proto/xproto
 	x11-libs/libX11
 	x11-libs/pango
 	x11-libs/gdk-pixbuf
diff --git a/net-mail/gnubiff/gnubiff-2.2.17.ebuild b/net-mail/gnubiff/gnubiff-2.2.17-r1.ebuild
index a370cd6f9114..3312ee12e0a0 100644
--- a/net-mail/gnubiff/gnubiff-2.2.17.ebuild
+++ b/net-mail/gnubiff/gnubiff-2.2.17-r1.ebuild
@@ -19,7 +19,6 @@ RDEPEND="
 	dev-libs/popt
 	password? ( dev-libs/openssl:* )
 	fam? ( virtual/fam )
-	x11-proto/xproto
 	x11-libs/libX11
 	x11-libs/pango
 	x11-libs/gdk-pixbuf
diff --git a/net-mail/imapsync/Manifest b/net-mail/imapsync/Manifest
index 9cef2de4882b..144a91d037b9 100644
--- a/net-mail/imapsync/Manifest
+++ b/net-mail/imapsync/Manifest
@@ -7,5 +7,5 @@ EBUILD imapsync-1.592-r1.ebuild 756 BLAKE2B fd235050e9336afebd5c73044791cfafb258
 EBUILD imapsync-1.607-r1.ebuild 784 BLAKE2B 815bc5222b7ca23748aa95e0e5865b794ae52abe0d69f777bd39ad3a0fb02cef83a62cc3b182c2a944a4ba08b595ec96897e990cea884c695f0014ab9c0a503c SHA512 1054903e5ddb44df2a80cf69e9c3757cf359e20ebae2fa064f331797e6965adbc3d13f7286c39be29759ada3bf6ba0f87cd008749ab0154451b1fc2849c6ccd9
 EBUILD imapsync-1.644.ebuild 784 BLAKE2B b29b0d59d6b6e91c3f90f56fa9553ccc49715e6c185935316d7afe692c245e5de4d3b48994e45fcf4c88b77e31237ee1e2eaab187a898f0f51a2c050b9939f95 SHA512 a1e581107f28d4b030f489dac3b5dfc87159b20f950d030e5112b6e0a6aaca194b958fbab946fcf72bbd46b6075b51379f1055c0f93e4aa7de6c200ab1d6e77a
 EBUILD imapsync-1.684.ebuild 785 BLAKE2B 510b45d577026bad26eed137c20475fc86cf6bf205f2f454478464f36e718084d996556ec90b14844c8d88a8ba16d5af7bbed847e976121d84ed8867415c948a SHA512 0f38b8221b85c460ba9a149ee5cec573143e2413d1fabbe26469d169052f82eec1dff823a9775d2afc93efec961e8d521100c889db3b11f4706446258587e540
-EBUILD imapsync-1.836.ebuild 897 BLAKE2B 7876e826a8fd67d71d1fbbd1190ffd8654d86c7e5278bf89c0250a881268da9e67f534069d9681010468d61bd0f6644e0962b0c527bcb82b37f0e17edeff5f38 SHA512 8669afa9202a1a52fe372b457adc918b0983802b7ac80e0a5259b57407ac1ba9aa869ecb1d6927ea1598dc5c1b96593975a3b355b8a29b3d1a1cdce0bb4fe93c
+EBUILD imapsync-1.836.ebuild 921 BLAKE2B 4bdff06ddc043c38875613b673683f2d97b7d25055fb199e22463ca2feb2bad7bed7debaca1102c8141d0169a14033c2d5265748ebcefbd31138ad49e39fa295 SHA512 6e4c5c4bccc4810b379639edf16db43c997d1239a9ba8eb77f29a0ace593f40909039103bf9d0ef3adeda8064b708b05fca4c303b70a394ff0423723b755d481
 MISC metadata.xml 326 BLAKE2B 5bc18c049b6907e1efa4ebd4bcf8d07346ca02ff93a48cd69df9461a44d3394167c110aadab2f90f1d721188c65c818477d6cf861306a3274fa1a1725111d499 SHA512 b16222d629a0208e627ab47284c4eec08f0598c5c12e1ed62b8dbe23727711b396b5764429c07f7b85ef035d04398a9233b400344fc72e974dcbae90d4e7d8b7
diff --git a/net-mail/imapsync/imapsync-1.836.ebuild b/net-mail/imapsync/imapsync-1.836.ebuild
index 4982c8458d86..1a4e6a72185c 100644
--- a/net-mail/imapsync/imapsync-1.836.ebuild
+++ b/net-mail/imapsync/imapsync-1.836.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,14 +11,18 @@ LICENSE="WTFPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
+DEPEND="
+	dev-lang/perl"
+
+RDEPEND="
+	${DEPEND}
 	dev-perl/Digest-HMAC
 	dev-perl/File-Copy-Recursive
 	dev-perl/IO-Socket-INET6
 	dev-perl/IO-Socket-SSL
 	dev-perl/IO-Tee
 	dev-perl/Mail-IMAPClient
+	dev-perl/Readonly
 	dev-perl/Sys-MemInfo
 	dev-perl/TermReadKey
 	dev-perl/Unicode-String