gentoo christmass resync : 25.12.2020

15 files changed, 191 insertions, 369 deletions

diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index d40b31db9153..28c030d3d9e4 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 40660d54afca..05c237fc0a14 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -8,5 +8,5 @@ AUX imapd.conf 1471 BLAKE2B 5373950ac08b630a82fc00b5bf3fed9d400e092458310b64cb66
 DIST cyrus-imapd-3.0.13.tar.gz 10840005 BLAKE2B f4790837a198673b42d553bc7cbc825456ff5a3d1d14ff382ca0f40252d09eb355f92c2020c0a974cc99eda9af4323a3a5b9428375288bf8892dfba35602da4e SHA512 5cd066916797efb975cdb97720f65edc72d3fe82afbd78a26aa8369d95ae4ca09c0593dd4bec5521156c64ea38af7a13065f3b35447a76267dec93feb0ac6ac6
 DIST cyrus-imapd-3.0.14.tar.gz 10865880 BLAKE2B 36f3e60d715d2eab430040964e93cb332cfc4d9097f0f863b94325eb4eb964a4030d1d0f8ddb7870a08b655e1694bbc751d5aab99af6670ab33ad6747f55f6bd SHA512 0bade56f4f7834ef51efc4081f2915bf0f98a2a555cd1b847f13a34418e4c52f2abcb4018906c144c161241433a8ff9ddc6d88499804d3fe616a05f186a3f209
 EBUILD cyrus-imapd-3.0.13.ebuild 6068 BLAKE2B f6f8e1e4ed70120380a8115820fde63a86bf1eec1472ab58b3a382eb73fd643b87668fa5bb6af48b752d8f6df91b39b3e99083a0401b71bc36fa22399f8f5fb1 SHA512 dd16ecf950d4ef61c7cee53133d8890d940a2d91d10ff32bc56ce17b9a7fb9ae0da47a40d31e1435e9ed14d26579de1a4e6945b787b712f09e2773ed9316bf74
-EBUILD cyrus-imapd-3.0.14.ebuild 6030 BLAKE2B e7d0db2591288b58214176f1095180d3fe4b6ea2fb02747dc4d716e321b84f5ddb1265a91b404a3aa4e1966631705efc63a3ceeb41def4ed0a410968f5049ccc SHA512 425664231a5b1e38c8e67cf97e6d2c42e7b8a1f8692abc5ec7c4e537e625a0b9855d585e6394d9bdb9c4e40d628294be52308c708f8043cd12fe7bed4ee7ec4b
+EBUILD cyrus-imapd-3.0.14.ebuild 6029 BLAKE2B a42974b90673ee9d7306e21732fc2d98ddfb1e6e79a98fb10de8e5cc2062eb040f3840ab1c6d7804bf50a3845b6a6ef8b937fa74119eefe11830c46a7ce0dabb SHA512 ad87a1b5cab6503d30f8c0bd22c0ad67e22f4d09e1c6d5d859eaae741b140439af984d3b4943cdd707dc9683c144e3cc2e73b4fc5411be0927511afa6b982db3
 MISC metadata.xml 688 BLAKE2B 123d6658cc5bd6f9ac3c20dcc7a06cf6300dcb83129d59e8b275d82b64c1c3ff2c315891c0ee432e6cfb445f74c78f49195e89a20616a51d70ef8bf25aeb9092 SHA512 77075e3673b25f4b4c31815f0bfa8f112e6609a36b9c57a843be5bcf9d5d1ad743e05010fbb4809960b0b74498763bc69b6abbe16e8eced683268398a7be077b
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.14.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.14.ebuild
index c7bac016fb15..fb2128585464 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.14.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.14.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
 IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
 	mysql nntp pam perl postgres replication +server sieve snmp \
 	sqlite ssl static-libs tcpd test xapian"
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 81de961518ba..5d197e3910fd 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,20 +1,16 @@
 AUX dovecot-2.3.11.3-apop-fix.patch 2226 BLAKE2B 47971fc29ff3add43ca7ee253c4e1579dd22e603c6692f592c605a742330df80309ee06f8bb811e64de03392e0dee19efe1964229f61209b9f48fb0dd557b7d2 SHA512 6ebc10a6e0ca9f4790cbe57a9e9283838c5fbe124e9be305fcd16e472a5edea97a055700613fb6a1a43fe139537da80a603493f250b34f2179f969da2a09f2cc
+AUX dovecot-2.3.11.3-autoconf-lua-version.patch 538 BLAKE2B 3978ebff83cb42591f60fc1cc155bd67a743d78c24d7d7ddfc0776c8df53fbdfad5cee79d1377e6436d69f6ca429ccf33b154adf470f8fc9d6429a746d49788f SHA512 a3e7403fb636078607b5452a580d229ce1d2e240d30e24138f33c3964ff008d99fef6477605f3d64dbdd8fc53187c9c6ad4eb82c58375b329dc9f8be87192eb7
 AUX dovecot-fix-search-crash.patch 3417 BLAKE2B 3d3b63d7be8d19fea2f159b6191fb1dcb94be4abe6cbbde5984c0c6e55fcb56a6e32bbe07650a2d218b3ecc55ede620e95befff24dce3a562733b119142e216d SHA512 9cb34a7f6de6d19ec7d6e4c3206c5d15f6531f92027d7dbef21284206ddd9f3418d4a1266d2860789dfa56f97579a89f3cafc54f24152f321dddb9b470d9f473
 AUX dovecot-unwind-generic.patch 645 BLAKE2B 6598abbd2819f7109d4caacbce5123b8810b93b623956561a12a749cbc582667caa160eac62305067db6037f820c8e1a8bd8a22da09a454afcb9e21209cc5fd3 SHA512 6ede0edd5bd6d1123ff1567886898eee5795baa549c610ba8a3567c0f8fee27d69028aaf8b6067c2f37b915a07e165aa0d6a2d5fb8314deffd61a187b18de4ae
 AUX dovecot-userdb-passwd-fix.patch 500 BLAKE2B 133e7b13cf3dd1515db5694945abd2d00ecd89c4a766ea873099ebbdd450700e70b80696ba58b21cc4f7160fa3becde6453c9334d41cdad426e3f59bd9e5491e SHA512 18a26eed0c793b0ccee828dc5eafc6448dda94d705597b19c3333f21944e838b677af2884f5fb65eb2f6dc79158ad8b3143b24d3788d841038de6dd24885fc0d
 AUX dovecot.init-r6 1573 BLAKE2B 206318cbf7a6ef0276cb93237b091dd34dc2603a00f13ed288c787dc81f8902e770f7774c54eba90de49e9634eb93873046a043bd7825cfb65bab5b2ea9ce108 SHA512 982f9897e4a0a5a3957bb12785961c9cde72a2c941f55efdb23e9a26cec19efe89e3be4effe79522c297ea2b258d201db78c19b6e3f9cd5e68d3736c2a0f0063
 DIST dovecot-2.2-pigeonhole-0.4.24.2.tar.gz 1833284 BLAKE2B bee45fd129aee3d5126bd48b27829e7e266a5c1043411b6b23655bbf32e2f684763b82bff476a954bf7f0c7aae4e038c0892be70776726c7b324e409a8f89d78 SHA512 a51de88bcbac83ced7d314a560bd44f119dd80bf58f350da522501f072c0a4c02ff8c11152e2b858f14bb8ca9a9b665960cbe37a0c8ef4600b430e65ddbf3bf4
 DIST dovecot-2.2.36.4.tar.gz 6257899 BLAKE2B 3260e96f369e85f2dfd5ece0d9b12902c7192d057369e8a151cc6ab7b4f2033d4e1029fb862d412f2837fd384d7fe729cf1ab15cac9ac335e943bb1fdb532b51 SHA512 e33ab2f6c5f7b4ffca3d57580329f1df8e1655c755a1a6b575a4e49d57ea94d1ab67df2419033c9d68acf5959c6edfa596815dc2bc43798e9aef3d17d271cc4d
-DIST dovecot-2.3-pigeonhole-0.5.10.tar.gz 1899237 BLAKE2B a308500d6a51d4a9b99ae16b75829f1f799351675a31d91e450c4ea1b095d7719af424534f4b7736559b06819a337e7be0bd44307b77a775c8a54359e41822c1 SHA512 f3d380edba4d25d20ee52db21d2965e3a6b229924e9a04fbf45cfe32e1d25448977ee41b12ba41ad8cf8b795f19bb1dbef1d7d09e775598d782123268f61dc8b
 DIST dovecot-2.3-pigeonhole-0.5.11.tar.gz 1912411 BLAKE2B ed35cbae5ea2c1da24a1a255c1fc943b9a8c35280840ea42c1b5f83ea327872bb83ae8901696abfe3b0d27dfd6c11d3fb1661614fad54eeab9d700b5f0b7b13a SHA512 793d93edc50192c52654e2f7244d3e01aaa4e69f786e3ecfcd658a4ab26a5099cc5319cb93221150db4ce94bc4515ffb38115b1d0eeb6e052b956efec680b33d
-DIST dovecot-2.3-pigeonhole-0.5.7.2.tar.gz 1857602 BLAKE2B 8de6200bb1ca99d25b48c963c007e9fda07e21f0708d4542e497985a61c07270febd8f29171d607c4025f4651c2ef17d84447a789ebad896c55aa36ec2cd876c SHA512 7fc8d89ee31c8e8c16a9aeaeffb591f4188de36fc80e3a30a9ae10bc5acd7ea5d5d91e077fda566e61d588d9221ec53044ce17a9cc0c9c219dbe6824558a1d60
-DIST dovecot-2.3.10.1.tar.gz 7226958 BLAKE2B 2f9223d9184b3f8809b573ebd5637e1fd32885a377d95284bbf6d0d975b61462e351d42c515ca860a2348e39634ff440cb58dc6894008782a0e7d5a4dead4d77 SHA512 5c07436a3e861993f241caa2c60f035c533c5fceb5c8540c1717d31bedd54b82299f7ea11bfee12c72d4d33985d93a7130c4f56877864a7ad21cf7373a29cc06
 DIST dovecot-2.3.11.3.tar.gz 7353412 BLAKE2B 0067989b35fe29c0d23f6ca25712a87fa69608cc4ee6081d9eb929d63e7a586ccc0d86fcdbe1aac67aea9f2678ab0e150f053667817b08f4a7246947bb812fdb SHA512 d83e52a7faab918a8e6f6257acc5936b81733c10489affd042c3a043cb842db060286cba9978be378e4958e9ac2e60b55ce289d7f3a88df08e7637e4785e23bb
-DIST dovecot-2.3.7.2.tar.gz 7076231 BLAKE2B 2cb93aa594db722489063b490469dfe284b1f997b64c9a699b506ccbd04e8e7c2d503ddc12a2598958dfca88560c19487801a728f386b8fea5f637a75b83812e SHA512 172f7f0edb884259e4c050607510aee67a35c3a20b7dd147e7c8a25a04921c18f7d6b5c85af2c69ae8c4d53791550970e471b033dbfae94253e331053b6a317d
 EBUILD dovecot-2.2.36.4.ebuild 8605 BLAKE2B b649cd8db3cc6ed5fe93a6013a16e7f99a121e35d684fdfa9fc74aec1487f571fb1f59f4433ad89a6bdcd33de0d916b111226a33bdacc084383580c881d98551 SHA512 811bd1cb2ebec984f98d02a975c7774e0449e1b87c26840107d2e93c79ba69f0c8714d2db5c63513233893c0230080d2fd002962aa6b536f12f6ba6d36f7b5a9
-EBUILD dovecot-2.3.10.1.ebuild 8630 BLAKE2B 225309f96696de58410097589fef31f07c3ae25d91d42577ec140a7ffb4ed6d7f230fe78e65cd330ae6cfa8b8d3a275d57984927755cbf99713e07ac72084c5e SHA512 4f806e5741cc787d6a5d15e052d126f7f187814502cd1879bf45bb174bf30a82c868305cc98c8cf91079101ee03905e9a8f37f7d2108ef937314ba473dcd75cf
 EBUILD dovecot-2.3.11.3-r1.ebuild 8838 BLAKE2B d2db4a8a2f3dd6d6ee2cd4ab6401dbddb34834fbc2bf60bfe27800b30560e42aefa9d977c2ccd8109c31208cbd4c95f5a435cedb50dc718c311a610cc74542e8 SHA512 796c4e3b0cf7677b52af6a8c03c68479c37b7ee797aff2222a09ffcfd24cccebd1ab8208c035ec8fa4f4d02ea1b58f7b29e43a08d8c060ca635ad77634d4490c
-EBUILD dovecot-2.3.11.3-r2.ebuild 8883 BLAKE2B c87d5ede5ed17d3fff195063dac545466964ca659cc2b6f09abc63965cf8c66ac0c4be7fb89ae8e88bf62aa69ad1d3bb6c511e326c3eed45272e891a9223d7a6 SHA512 e79953c4ef81d4551450cbf4df9c9b20151752291092ced4320fb3e43954367d8243927e37d02cc84dd36f7b95708f156b697e72d800f27c77da9eb68445cd25
+EBUILD dovecot-2.3.11.3-r100.ebuild 9059 BLAKE2B bd8f4ebecbd5452c8ef6591455d0b8cec94d53c579a5b701b53a3113747b1501d475273259d20b9443bb728ce7d72f18d1950a744c79b3838b8f1d6c9b326204 SHA512 a23e69effb144d437b522136d3f024a1f4fb9cc237f00079af557b9e5e328e65282bb46481b64312a6e664cd92b89d3acdad3bda6bea973c3d32737753e123be
+EBUILD dovecot-2.3.11.3-r2.ebuild 8878 BLAKE2B 6796b48d607fe36c8fb6a741bee5a8b702f4c1d309d24533f248b4f6359bc4c9e8c28fb0f81bbcbf23363737de54f01977364fdffc9c4c0acd56310efa238d5f SHA512 bbadf212ea9f462606aa2a424960fe38a1bee71ed28334bc665f39db1ec1602f4193d42b7ad33fbe83e8cec4ff8334c60151d7de54093a7b6744e24711de9e61
 EBUILD dovecot-2.3.11.3.ebuild 8676 BLAKE2B ddede1b054dde5b42d23cccfb06f4e66060d720b934c49804edeee423191baae808ae34fb50c86caf0b5b953eb5a073408396f2504e9f32ccf9834a7490f4a99 SHA512 8ff4591d1b3122c084d644b19ba4e482490f7700b14fa20d680ab023e472d8d570528b568cf159b4949f24bbdb991b0bfecb6393cd714117ba5abf771b223b08
-EBUILD dovecot-2.3.7.2.ebuild 8718 BLAKE2B 5ef26dfdf336f8f81d23f9e74a79146f4fe796bf84a159645a4c074603702eb9240cfbf5f6dc6fd5279d3d8d7405ef3168b099edbb1d9d595149dfaaf180b0ad SHA512 2dfe8a18c6b4e006028c84ebf48ba0e8cc35fc33000db39becab5ed835a911e41b12360869a6ca9112030151708abed3e93f776041a0b3d79955f5cf4931ead7
 MISC metadata.xml 998 BLAKE2B c65428e9f0019e942fc1d634d53c2a85c7f8a699e34cf9c49ae09bfe9ce8a54fd368512f7a4d74f6a10baff949a9fe8021e1e0c009f8315b100fb5736efd34ae SHA512 f285f0928dc0915c8e8cebb966de84f5564be9f7dd3baa7c0cccb3343da75507003aeadf80fe34ffb4b69dd9208997a80fdb47c20bfd65fdc60c43423a00813c
diff --git a/net-mail/dovecot/dovecot-2.3.10.1.ebuild b/net-mail/dovecot/dovecot-2.3.11.3-r100.ebuild
index f22ac9b03955..abdea9f60035 100644
--- a/net-mail/dovecot/dovecot-2.3.10.1.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.11.3-r100.ebuild
@@ -3,14 +3,16 @@
 
 EAPI=7
 
+LUA_COMPAT=( lua5-{1..3} )
+
 # do not add a ssl USE flag.  ssl is mandatory
 SSL_DEPS_SKIP=1
-inherit autotools ssl-cert systemd toolchain-funcs
+inherit autotools lua-single ssl-cert systemd toolchain-funcs
 
 MY_P="${P/_/.}"
 #MY_S="${PN}-ce-${PV}"
 major_minor="$(ver_cut 1-2)"
-sieve_version="0.5.10"
+sieve_version="0.5.11"
 if [[ ${PV} == *_rc* ]] ; then
 	rc_dir="rc/"
 else
@@ -28,26 +30,29 @@ HOMEPAGE="https://www.dovecot.org/"
 
 SLOT="0"
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite vpopmail"
-IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
-IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 libressl lucene managesieve selinux sieve solr static-libs suid tcpd textcat unwind"
+IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib zstd"
+IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 libressl lucene managesieve rpc selinux sieve solr static-libs suid tcpd textcat unwind"
 
 IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
 
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
 DEPEND="argon2? ( dev-libs/libsodium )
 	bzip2? ( app-arch/bzip2 )
 	caps? ( sys-libs/libcap )
 	kerberos? ( virtual/krb5 )
 	ldap? ( net-nds/openldap )
-	lua? ( dev-lang/lua:0= )
+	lua? ( ${LUA_DEPS} )
 	lucene? ( >=dev-cpp/clucene-2.3 )
 	lzma? ( app-arch/xz-utils )
 	lz4? ( app-arch/lz4 )
 	mysql? ( dev-db/mysql-connector-c:0= )
 	pam? ( sys-libs/pam )
 	postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
+	rpc? ( net-libs/libtirpc net-libs/rpcsvc-proto )
 	selinux? ( sec-policy/selinux-dovecot )
 	solr? ( net-misc/curl dev-libs/expat )
 	sqlite? ( dev-db/sqlite:* )
@@ -59,6 +64,7 @@ DEPEND="argon2? ( dev-libs/libsodium )
 	unwind? ( sys-libs/libunwind )
 	vpopmail? ( net-mail/vpopmail )
 	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd )
 	virtual/libiconv
 	dev-libs/icu:="
 
@@ -69,7 +75,15 @@ RDEPEND="${DEPEND}
 	acct-user/dovenull
 	net-mail/mailbase"
 
+PATCHES=(
+	"${FILESDIR}/${P}"-apop-fix.patch
+	"${FILESDIR}/${P}"-autoconf-lua-version.patch
+	"${FILESDIR}/${PN}"-unwind-generic.patch
+	"${FILESDIR}/${PN}"-fix-search-crash.patch
+	)
+
 pkg_setup() {
+	use lua && lua-single_pkg_setup
 	if use managesieve && ! use sieve; then
 		ewarn "managesieve USE flag selected but sieve USE flag unselected"
 		ewarn "sieve USE flag will be turned on"
@@ -79,8 +93,8 @@ pkg_setup() {
 src_prepare() {
 	default
 	# bug 657108
-	elibtoolize
-	#eautoreconf
+	#elibtoolize
+	eautoreconf
 }
 
 src_configure() {
@@ -91,7 +105,7 @@ src_configure() {
 	fi
 
 	# turn valgrind tests off. Bug #340791
-	VALGRIND=no econf \
+	VALGRIND=no LUAPC="${ELUA}" econf \
 		--with-rundir="${EPREFIX}/run/dovecot" \
 		--with-statedir="${EPREFIX}/var/lib/dovecot" \
 		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
@@ -120,6 +134,7 @@ src_configure() {
 		$( use_with unwind libunwind ) \
 		$( use_with vpopmail ) \
 		$( use_with zlib ) \
+		$( use_with zstd ) \
 		$( use_enable static-libs static ) \
 		${conf}
 
diff --git a/net-mail/dovecot/dovecot-2.3.11.3-r2.ebuild b/net-mail/dovecot/dovecot-2.3.11.3-r2.ebuild
index 8c5a2e86c596..8c6836bd9cb4 100644
--- a/net-mail/dovecot/dovecot-2.3.11.3-r2.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.11.3-r2.ebuild
@@ -28,7 +28,7 @@ HOMEPAGE="https://www.dovecot.org/"
 
 SLOT="0"
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 s390 ~sparc x86"
 
 IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite vpopmail"
 IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib zstd"
diff --git a/net-mail/dovecot/dovecot-2.3.7.2.ebuild b/net-mail/dovecot/dovecot-2.3.7.2.ebuild
deleted file mode 100644
index fafbab682ee1..000000000000
--- a/net-mail/dovecot/dovecot-2.3.7.2.ebuild
+++ /dev/null
@@ -1,291 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# do not add a ssl USE flag.  ssl is mandatory
-SSL_DEPS_SKIP=1
-inherit autotools eapi7-ver ssl-cert systemd toolchain-funcs user
-
-MY_P="${P/_/.}"
-#MY_S="${PN}-ce-${PV}"
-major_minor="$(ver_cut 1-2)"
-sieve_version="0.5.7.2"
-if [[ ${PV} == *_rc* ]] ; then
-	rc_dir="rc/"
-else
-	rc_dir=""
-fi
-SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
-	sieve? (
-	https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	)
-	managesieve? (
-	https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="https://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86"
-
-IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite vpopmail"
-IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
-IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 libressl lucene managesieve selinux sieve solr static-libs suid tcpd textcat"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
-
-DEPEND="argon2? ( dev-libs/libsodium )
-	bzip2? ( app-arch/bzip2 )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	lua? ( dev-lang/lua:0= )
-	lucene? ( >=dev-cpp/clucene-2.3 )
-	lzma? ( app-arch/xz-utils )
-	lz4? ( app-arch/lz4 )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	pam? ( sys-libs/pam )
-	postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
-	selinux? ( sec-policy/selinux-dovecot )
-	solr? ( net-misc/curl dev-libs/expat )
-	sqlite? ( dev-db/sqlite:* )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	suid? ( acct-group/mail )
-	tcpd? ( sys-apps/tcp-wrappers )
-	textcat? ( app-text/libexttextcat )
-	vpopmail? ( net-mail/vpopmail )
-	zlib? ( sys-libs/zlib )
-	virtual/libiconv
-	dev-libs/icu:="
-
-RDEPEND="${DEPEND}
-	net-mail/mailbase"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-userdb-passwd-fix.patch"
-)
-
-pkg_setup() {
-	if use managesieve && ! use sieve; then
-		ewarn "managesieve USE flag selected but sieve USE flag unselected"
-		ewarn "sieve USE flag will be turned on"
-	fi
-	# default internal user
-	enewgroup dovecot 97
-	enewuser dovecot 97 -1 /dev/null dovecot
-	# default login user
-	enewuser dovenull -1 -1 /dev/null
-}
-
-src_prepare() {
-	default
-	# bug 657108
-	elibtoolize
-	#eautoreconf
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	# turn valgrind tests off. Bug #340791
-	VALGRIND=no econf \
-		--with-rundir="${EPREFIX}/run/dovecot" \
-		--with-statedir="${EPREFIX}/var/lib/dovecot" \
-		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-		--without-stemmer \
-		--disable-rpath \
-		--without-libbsd \
-		--with-icu \
-		--with-ssl \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		$( use_with argon2 sodium ) \
-		$( use_with bzip2 bzlib ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with lua ) \
-		$( use_with ldap ) \
-		$( use_with lucene ) \
-		$( use_with lz4 ) \
-		$( use_with lzma ) \
-		$( use_with mysql ) \
-		$( use_with pam ) \
-		$( use_with postgres pgsql ) \
-		$( use_with sqlite ) \
-		$( use_with solr ) \
-		$( use_with tcpd libwrap ) \
-		$( use_with textcat ) \
-		$( use_with vpopmail ) \
-		$( use_with zlib ) \
-		$( use_enable static-libs static ) \
-		${conf}
-
-	if use sieve || use managesieve ; then
-		# The sieve plugin needs this file to be build to determine the plugin
-		# directory and the list of libraries to link to.
-		emake dovecot-config
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		econf \
-			$( use_enable static-libs static ) \
-			--localstatedir="${EPREFIX}/var" \
-			--enable-shared \
-			--with-dovecot="${S}" \
-			$( use_with managesieve )
-	fi
-}
-
-src_compile() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-	fi
-}
-
-src_test() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		default
-	fi
-}
-
-src_install() {
-	default
-
-	# insecure:
-	# use suid && fperms u+s /usr/libexec/dovecot/deliver
-	# better:
-	if use suid;then
-		einfo "Changing perms to allow deliver to be suided"
-		fowners root:mail "/usr/libexec/dovecot/dovecot-lda"
-		fperms 4750 "/usr/libexec/dovecot/dovecot-lda"
-	fi
-
-	newinitd "${FILESDIR}"/dovecot.init-r6 dovecot
-
-	rm -rf "${ED}"/usr/share/doc/dovecot
-
-	dodoc AUTHORS NEWS README TODO
-	dodoc doc/*.{txt,cnf,xml,sh}
-	docinto example-config
-	dodoc doc/example-config/*.{conf,ext}
-	docinto example-config/conf.d
-	dodoc doc/example-config/conf.d/*.{conf,ext}
-	docinto wiki
-	dodoc doc/wiki/*
-	doman doc/man/*.{1,7}
-
-	# Create the dovecot.conf file from the dovecot-example.conf file that
-	# the dovecot folks nicely left for us....
-	local conf="${ED}/etc/dovecot/dovecot.conf"
-	local confd="${ED}/etc/dovecot/conf.d"
-
-	insinto /etc/dovecot
-	doins doc/example-config/*.{conf,ext}
-	insinto /etc/dovecot/conf.d
-	doins doc/example-config/conf.d/*.{conf,ext}
-	fperms 0600 /etc/dovecot/dovecot-{ldap,sql}.conf.ext
-	rm -f "${confd}/../README"
-
-	# .maildir is the Gentoo default
-	local mail_location="maildir:~/.maildir"
-	sed -i -e \
-		"s|#mail_location =|mail_location = ${mail_location}|" \
-		"${confd}/10-mail.conf" \
-		|| die "failed to update mail location settings in 10-mail.conf"
-
-	# We're using pam files (imap and pop3) provided by mailbase
-	if use pam; then
-		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
-			"${confd}/auth-system.conf.ext" \
-			|| die "failed to update PAM settings in auth-system.conf.ext"
-		# mailbase does not provide a sieve pam file
-		use managesieve && dosym imap /etc/pam.d/sieve
-		sed -i -e \
-			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update PAM settings in 10-auth.conf"
-	fi
-
-	# Disable ipv6 if necessary
-	if ! use ipv6; then
-		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
-			|| die "failed to update listen settings in dovecot.conf"
-	fi
-
-	# Update ssl cert locations
-	sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
-		|| die "ssl conf failed"
-	sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
-		-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
-		"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
-
-	# Install SQL configuration
-	if use mysql || use postgres; then
-		sed -i -e \
-			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
-			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
-			10-auth.conf"
-	fi
-
-	# Install LDAP configuration
-	if use ldap; then
-		sed -i -e \
-			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update ldap settings in 10-auth.conf"
-	fi
-
-	if use vpopmail; then
-		sed -i -e \
-			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update vpopmail settings in 10-auth.conf"
-	fi
-
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake DESTDIR="${ED}" install
-		sed -i -e \
-			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
-			|| die "failed to update sieve settings in 15-lda.conf"
-		rm -rf "${ED}"/usr/share/doc/dovecot
-		docinto example-config/conf.d
-		dodoc doc/example-config/conf.d/*.conf
-		insinto /etc/dovecot/conf.d
-		doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
-		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
-		docinto sieve/rfc
-		dodoc doc/rfc/*.txt
-		docinto sieve/devel
-		dodoc doc/devel/DESIGN
-		docinto plugins
-		dodoc doc/plugins/*.txt
-		docinto extensions
-		dodoc doc/extensions/*.txt
-		docinto locations
-		dodoc doc/locations/*.txt
-		doman doc/man/*.{1,7}
-	fi
-
-	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
-}
-
-pkg_postinst() {
-	# Let's not make a new certificate if we already have one
-	if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
-		einfo "Creating SSL	certificate"
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-		install_cert /etc/ssl/dovecot/server
-	fi
-
-	elog "Please read https://doc.dovecot.org/installation_guide/upgrading/ for upgrade notes."
-}
diff --git a/net-mail/dovecot/files/dovecot-2.3.11.3-autoconf-lua-version.patch b/net-mail/dovecot/files/dovecot-2.3.11.3-autoconf-lua-version.patch
new file mode 100644
index 000000000000..5572271929ef
--- /dev/null
+++ b/net-mail/dovecot/files/dovecot-2.3.11.3-autoconf-lua-version.patch
@@ -0,0 +1,17 @@
+--- a/m4/want_lua.m4
++++ b/m4/want_lua.m4
+@@ -13,13 +13,12 @@
+   AC_MSG_RESULT([$with_lua])
+ 
+   AS_IF([test "x$with_lua" != "xno"],
+-    [for LUAPC in lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51 lua; do
++    [
+        PKG_CHECK_MODULES([LUA], $LUAPC >= 5.1, [
+          AC_DEFINE([HAVE_LUA], [1], [Define to 1 if you have lua])
+          with_lua=yes
+        ], [LUAPC=""]) # otherwise pkg_check will fail
+        if test "x$LUA_LIBS" != "x"; then break; fi
+-     done
+   ])
+ 
+   AS_IF([test "x$with_lua" = "xyes"], [
diff --git a/net-mail/lbdb/Manifest b/net-mail/lbdb/Manifest
index 3e0100238899..450c653ae672 100644
--- a/net-mail/lbdb/Manifest
+++ b/net-mail/lbdb/Manifest
@@ -1,5 +1,3 @@
-DIST lbdb_0.41.tar.gz 160632 BLAKE2B 7cbb0178f2983255eef8ce86146e104e33a1d31b6fd5cf3e5dea69cad8fa485424a5d8b89d1e2024f34a688bfb018724b05bf8e5e57ab5338c9973b78d203d4b SHA512 c99d8c4549d781252192e07dfb89adbae6daae5a4f4c94de692c4289848ba8599c2b0aeb28bac69313e6828995eac32acf3fbc76b1695c6464c6339236cdb341
 DIST lbdb_0.47.tar.gz 182477 BLAKE2B 9ac0073ea4151ae84f9aeafb1a6bde52a39809987da87bd252665f9ef729ad1a5ee4cf91e4c1ebec1f8be17e1a9a3e31dbfda5484ae114fc99cd273f93b39cf9 SHA512 95cae9b108d875203dce2a8243c3dcb979606529202fd9b4d1ddd211a3d617a421440f6532abd38432607b39da84a6da4d09b15e95cddc01f94e018b9e712078
-EBUILD lbdb-0.41.ebuild 1358 BLAKE2B ea4aab82df8950ae3881c4b9568fa142abfea76527e61f4772e8c74d6908d7ac3e70bd898f8839b9bc811ea7eb574747bb5398aae6705f60bbe2c9552c7fcdc6 SHA512 763463673da26cc678b93468702a3629a3294316bbfee7144616338359919a0611241a171f3676c021faf9b3b78ab3065dd1407fe134c535348d9901653cac4e
-EBUILD lbdb-0.47.ebuild 1485 BLAKE2B 63a26a6eedda8b9c23ed13ea8fd6a203d0b4fbcee5e1b15dc88793ac3e8a818d7f01cb9b45a9821dd35a4887f271eaede9f728156b0296b22c600474b3bc5a9e SHA512 fb8c7d50ea380ae98d15750b2d8f116d64ea980583ef9a6648c2ed2de549e7aed2129e39a4dfcaac4aa93a524ee6fd6691d5f2e3430c4e93d27aa8d6fc2f610b
+EBUILD lbdb-0.47.ebuild 1483 BLAKE2B befc891f045d6e9006af750ac91cc34b72bcb4f2d43acf5f2649e342a617244e1e9347107870e7bc68449aea3b36a54df6de4ec0258ba55cefa4f7c2c2bfd7ff SHA512 5d31c52eef6ddefd468bbc7bd11d0df522c5c083af325909c89448b4e200c0b8f5d1729e5ea9a7012f44ded3a34d196c7d462d72b47c0edc4bbded70dc99c402
 MISC metadata.xml 452 BLAKE2B fb14006c0ff46ee5b6e9c72682db885497f93a3b48e6852c87128a2b17b91a0459ccdb2d5fe94cf2e26459c9176251f79ac18ec31d3f03cf060c0ea2f8294c5f SHA512 38c22e435ea247d967a8d04092be6f0195436db16fc03d7fd7aa3cd0fe0f3dbfbda3ffe6a58cb7e8a5d1dfb18fb0a048b7d525300bd265a7d0522dc91d991a79
diff --git a/net-mail/lbdb/lbdb-0.41.ebuild b/net-mail/lbdb/lbdb-0.41.ebuild
deleted file mode 100644
index 82bcdb4c6e0f..000000000000
--- a/net-mail/lbdb/lbdb-0.41.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-MY_P=${P/-/_}
-DESCRIPTION="Little Brother database"
-SRC_URI="http://www.spinnaker.de/debian/${MY_P}.tar.gz"
-HOMEPAGE="http://www.spinnaker.de/lbdb/"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-LICENSE="GPL-2"
-IUSE="pda ldap finger abook crypt evo"
-
-DEPEND="dev-libs/libvformat
-	evo? ( mail-client/evolution )
-	finger? ( net-misc/netkit-fingerd )
-	abook? ( app-misc/abook )
-	crypt? ( app-crypt/gnupg )"
-RDEPEND="${DEPEND}
-	pda? ( dev-perl/Palm )
-	ldap? ( dev-perl/perl-ldap )"
-
-src_configure() {
-	local evoversion
-	local evolution_addressbook_export
-
-	if use evo ; then
-		evoversion=$(best_version mail-client/evolution)
-		evoversion=${evoversion##mail-client/evolution-}
-		evolution_addressbook_export="/usr/libexec/evolution/$(get_version_component_range 1-2 ${evoversion})/evolution-addressbook-export"
-	fi
-
-	econf $(use_with finger) \
-		$(use_with abook) \
-		--without-ypcat \
-		$(use_with crypt gpg) \
-		$(use_with evo evolution-addressbook-export "${evolution_addressbook_export}" ) \
-		--enable-lbdb-dotlock \
-		--without-pgpk --without-pgp \
-		--without-niscat --without-addr-email --with-getent \
-		--libdir=/usr/$(get_libdir)/lbdb
-}
-
-src_install() {
-	emake install_prefix="${D}" install
-	dodoc README TODO debian/changelog
-}
diff --git a/net-mail/lbdb/lbdb-0.47.ebuild b/net-mail/lbdb/lbdb-0.47.ebuild
index 724b8c323066..af873aceae50 100644
--- a/net-mail/lbdb/lbdb-0.47.ebuild
+++ b/net-mail/lbdb/lbdb-0.47.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.spinnaker.de/lbdb/"
 SRC_URI="https://www.spinnaker.de/lbdb/download/${MY_P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 LICENSE="GPL-2"
 IUSE="abook bbdb crypt evo finger ldap pda test"
 RESTRICT="!test? ( test )"
diff --git a/net-mail/mailbox-count/Manifest b/net-mail/mailbox-count/Manifest
index f53c41cbc9f6..8dd16e4dbd8e 100644
--- a/net-mail/mailbox-count/Manifest
+++ b/net-mail/mailbox-count/Manifest
@@ -1,3 +1,3 @@
 DIST mailbox-count-0.0.5.tar.gz 21476 BLAKE2B 3ad79233ae1dbb202bc46c60e8a7d13d5d6820f74e090056f37eacb7b37c2f18498f599603d1ee32a7ac43b5f9931f26aba1780ff5160333c66129889ac6812b SHA512 3c63bd9021f64ba745572907eae8bc25e9ddc7d443d5ab84626dd90f95af71267cbffb9d371f0e308988fbdf14f3a126d93a727d55bf9ee3e02037e687267d26
-EBUILD mailbox-count-0.0.5.ebuild 985 BLAKE2B 7ea08dc98897050f08b4066384ef0c9488caafe53c008ac1cde03ff19af3828410d8da96477b4a6a008df7bde208904cd54ddf3d5a1df9d0d1343a6494bddc7b SHA512 b0ed10746ead2a817c910444cfdfe4db7bab9ba4b7e1ff6dea115e2a0fa769c94e8e5a74c6f2972104ee379ea5352537ffb275428dc28ad74ffb5c69a81caadf
+EBUILD mailbox-count-0.0.5.ebuild 890 BLAKE2B 37b6d4023299f9ae3dd2e23851dab6b4949a6c412709e729f726ecca622a09c2d547eb833e5a5a6b117f9aed674397b827ec5451d5e95d4bf8550c25e417eaeb SHA512 b5f5012af1f1008feafa4daa5a658822387a32f86e3835dc138dea6f7e0f6525acf729573e25809cf5618d5914a4448364205303aa53fe616bb1efb8d10928eb
 MISC metadata.xml 3288 BLAKE2B 15a60ecab50dad246513c9060e9cf73b4a00c4a6264085357c04461e83a262497780c831823fd54a94d2c2a2b10cd836c51632e24683bbc5d0541d657e383a4e SHA512 95bbd72ec2a640fc2f4d9b67ce8388edbf3b7e01e181bc874fd62d11fabc5858506c35e613bb9215e6732ae4c968ad87df3b93b917cded023691452d0368e8d9
diff --git a/net-mail/mailbox-count/mailbox-count-0.0.5.ebuild b/net-mail/mailbox-count/mailbox-count-0.0.5.ebuild
index 5173370716a2..bcdc6ed7c3f7 100644
--- a/net-mail/mailbox-count/mailbox-count-0.0.5.ebuild
+++ b/net-mail/mailbox-count/mailbox-count-0.0.5.ebuild
@@ -24,10 +24,7 @@ RDEPEND="
 	>=dev-haskell/missingh-1.2
 	>=dev-haskell/tasty-0.8
 	>=dev-haskell/tasty-hunit-0.8
-	|| ( >=dev-lang/ghc-8.0
-		 ( >=dev-lang/ghc-7.10.1
-		   <dev-lang/ghc-8.0
-		   <dev-haskell/semigroups-0.18.2 ) )
+	>=dev-lang/ghc-8.0
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.16.0
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index cc729e5324c6..2ac9c0332e17 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -11,9 +11,11 @@ AUX mailutils-3.9-underlinking.patch 404 BLAKE2B d162f818580bcdbba54f0aa56fff494
 AUX mailutils.rc 258 BLAKE2B 3dc68190e11c8bf5016b0fe8b22c61f79ba7de96a1f230f7d0743ba23fa903cb9f99fac94a7363c7d80b7bbaf76e2d4de848e7ac726642fb23c56caf43a46568 SHA512 691bcc81fd355d8f2776e72006c149996273579e099f24970ff0c5dd6bdf65cd64e31597f8b3d8e0a900a91c3325b8d2a1a96682a9b3ff53acd41218fe8721fe
 AUX pop3d.initd 563 BLAKE2B fd09d7a7499c888eddfb812644102f979c2423e9b1a9f0077655b6ae4c1eb4214f685ef7843e74a808e52ee988cc3fbefa278754db824256a4972c83fc0ada31 SHA512 7847c29a03f21df82d36c077ccb38329457a332cccdfba24bee3b1c9a8170fc71c07ee674408f069693953dd1bf44b8b8f782dcc35d6b16e62f70b2b32ce018f
 DIST mailutils-3.10.tar.xz 3102328 BLAKE2B 49ea417f71816db2ca1e6a514e5f662d7ef66dc72ae93141ebb8ee006d78ad89587f4b09a96985fdb17335b5f58f8eb654cef23d64fc6d994948786e4a4b1410 SHA512 3a74c9a4bb197feecb2e2c4acfdfac6104c723722b1b2026183bc4cdb6872a45563034f82a56374fd3f51a79999b0f1d47e1169c971d1222fdc1f7b67e66550f
+DIST mailutils-3.11.tar.xz 3114388 BLAKE2B 69c648c412db8480366a27bdd654fcbac076e42417519eaaf4a30ea1bf87a8bc58ebbf8dd8499ea5fa81bcdbf844f6066644c8f7b0abf678fadfd8c8e6b3208d SHA512 98584c827780405c701afb1d75aab30a1a63be0456e51ff1ecff0f89422b993cad573d4d8559444de73ace738a7899fd491b6778294ecd0c96b279be833b5438
 DIST mailutils-3.8.tar.xz 2998596 BLAKE2B 4d09c7b5113129b3d2f3b113808d4460d025d4f0eec00dd1209a95f23abe97683b5d50cfe5229f1e5db48ddd6ca66c73fa6b0c1bfe03b324dbf40b6a26ff76f5 SHA512 4d081ae492beb0f9c1945541d63b52f155f11ca172abaedbe465955ac11097037f440e1aaed8d512cd3aab65f7792b755a7e4b9428a90ad7a833de87b1c4f1f9
 DIST mailutils-3.9.tar.xz 3075268 BLAKE2B 43ee5bf297951b3c894b467a46d3983dac3e115c02169da0ee2ccbc23f8b71d7439083093f4b0710f19c78f108df99dee3310f5f6adc5b7c1792a0a7be33aab6 SHA512 1eef9bebeeafbf974e54b87705444ee02b663a86e22442a9ec5db16ade38e6e9a3079ee8a8267393e97d6e9e477917617b2e1d57d3287ab19e4df73b66e5a8d4
 EBUILD mailutils-3.10.ebuild 3655 BLAKE2B 6b34da19de69f19160256cbcf613ecd8fe194b8e31e0c9701f9d1f93226726d54e0630c03b14f24269c76ac1fe93497e5aaee167a1dabb7665dca69d484d263c SHA512 d0c35a6299ac8b3983ed1d4aeb6b66333cc29cc310a95d86d4ab6536c8b2077d87065db65bb38ea103a847431b0553c3afb1ee98ac24855d86325a7a636437c2
+EBUILD mailutils-3.11.ebuild 3612 BLAKE2B 6ba6c4eb69eb81903b286530b8a792dc791b5bfc98073d5d4063b680c6dc6829043f4d519770d67b610c598c9162af86490fb4bcd484d8fbf6196745b209ed36 SHA512 a4e7a1ad2dab7e14fd34c4bf465bdee9507cfc816284af545b532e23dd5d00f20429847d61eea6f4d846976becaa679f2793fa7cab748ddd15e4354177c1571c
 EBUILD mailutils-3.8.ebuild 3728 BLAKE2B d09f95b50dab9521553121380f839d30babf0c00c607051c73f8c0a6db58f04dbc17219536ac1d8d445df5185869b4fa8d315b939006b5fad8d786d599be447c SHA512 4add163fc3f0d120fcb75405858f993f36ed1e44bbb5fa3f40221e18653aea750bb0a9ac35026755a3bf160ce046d95ad98bf0f7b13ec0488461b1f0c8c7f4c6
 EBUILD mailutils-3.9.ebuild 3739 BLAKE2B 13fb7f18735f13d30efae2f7c2648cb5c4086a22b6040b1fb8bc241db05f2564b13cde55e89e1fab7f860cb5a1fe0c8031cd9f13a59797d0a733f77135983387 SHA512 ae48e56b879c5fa53332632d9afab159faa7d34db252d7e4b6ae7c7188b1e4eec0b0b6b4b8287b9ab226e72e5947ef17fe71e3ce783592660786a599f728551a
 MISC metadata.xml 602 BLAKE2B e29b6203ef727041c0bb5483d46ddbd256f55f40d26ff94008fc3869dea23036369029a168a5b31fe3da8ee9c529d8c1cd9d0004691670cb9bebe77ef4973270 SHA512 602ef10835b14c359ac19dbce157ef5c073acb52286f7349feb4b8ec3940899ea4dba9d77ad4d4a3d540d86576cfb9f46e502cb9e8aa60cecb4a2f4b0b6358da
diff --git a/net-mail/mailutils/mailutils-3.11.ebuild b/net-mail/mailutils/mailutils-3.11.ebuild
new file mode 100644
index 000000000000..38ebb719eb21
--- /dev/null
+++ b/net-mail/mailutils/mailutils-3.11.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit autotools elisp-common eutils flag-o-matic python-single-r1 toolchain-funcs
+
+DESCRIPTION="A useful collection of mail servers, clients, and filters"
+HOMEPAGE="https://www.gnu.org/software/mailutils/mailutils.html"
+SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
+	ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd \
+	tokyocabinet"
+
+RDEPEND="!mail-client/nmh
+	!mail-filter/libsieve
+	!mail-client/mailx
+	!mail-client/nail
+	sys-libs/ncurses:=
+	sys-libs/readline:=
+	dev-libs/libltdl:0
+	virtual/mta
+	berkdb? ( sys-libs/db:= )
+	bidi? ( dev-libs/fribidi )
+	emacs? ( >=app-editors/emacs-23.1:* )
+	gdbm? ( sys-libs/gdbm:= )
+	guile? ( dev-scheme/guile:12/2.2-1 )
+	kerberos? ( virtual/krb5 )
+	kyotocabinet? ( dev-db/kyotocabinet )
+	ldap? ( net-nds/openldap )
+	mysql? ( dev-db/mysql-connector-c )
+	nls? ( sys-devel/gettext )
+	pam? ( sys-libs/pam )
+	postgres? ( dev-db/postgresql:= )
+	python? ( ${PYTHON_DEPS} )
+	sasl? ( virtual/gsasl )
+	servers? ( virtual/libiconv dev-libs/libunistring )
+	ssl? ( net-libs/gnutls:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+	tokyocabinet? ( dev-db/tokyocabinet )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+	servers? ( tcpd ldap )"
+
+DOCS=( ABOUT-NLS AUTHORS COPYING COPYING.LESSER ChangeLog INSTALL NEWS README THANKS TODO )
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5-add-include.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	if use mysql; then
+		sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \
+			sql/Makefile.am || die
+	fi
+	eautoreconf
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	# maildir is the Gentoo default
+	econf MU_DEFAULT_SCHEME=maildir \
+		CURSES_LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" \
+		$(use_with berkdb berkeley-db) \
+		$(use_with bidi fribidi) \
+		$(use_enable ipv6) \
+		$(use_with gdbm) \
+		$(use_with sasl gsasl) \
+		$(use_with guile) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with mysql) \
+		$(use_enable nls) \
+		$(use_enable pam) \
+		$(use_with postgres) \
+		$(use_enable python) \
+		$(use_with ssl gnutls) \
+		$(use_enable static-libs static) \
+		$(use_enable threads pthread) \
+		$(use_with tokyocabinet) \
+		$(use_with kyotocabinet) \
+		$(use_with tcpd tcp-wrappers) \
+		$(use_enable servers build-servers) \
+		$(use_with servers unistring ) \
+		$(use_enable clients build-clients) \
+		EMACS=$(usex emacs emacs no) \
+		--with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
+		--with-mail-spool=/var/spool/mail \
+		--with-readline \
+		--enable-sendmail \
+		--disable-debug
+}
+
+src_install() {
+	default
+
+	insinto /etc
+	# bug 613112
+	newins "${FILESDIR}/mailutils.rc" mailutils.conf
+	keepdir /etc/mailutils.d/
+	insinto /etc/mailutils.d
+	doins "${FILESDIR}/mail"
+
+	if use python; then
+		python_optimize
+		if use static-libs; then
+			rm -r "${D}$(python_get_sitedir)/mailutils"/*.{a,la} || die
+		fi
+	fi
+
+	if use servers; then
+		newinitd "${FILESDIR}"/imap4d.initd imap4d
+		newinitd "${FILESDIR}"/pop3d.initd pop3d
+		newinitd "${FILESDIR}"/comsatd.initd comsatd
+	fi
+
+	# compatibility link
+	if use clients && use split-usr; then
+		dosym ../usr/bin/mail /bin/mail
+	fi
+
+	if ! use static-libs; then
+		find "${D}" -name "*.la" -delete || die
+	fi
+}